Removed configuration 'deepl.usePro' to improve usability

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to the "vscode-deepl" extension will be documented in this f
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+### 1.0.8
+
+- You no longer need to explicitly set "deepl.usePro" in the configuration to use the DeepL Pro API because its now determined based on the given api key
+
 ### 1.0.7
 
 - Added new configuration options "defaultTargetLanguage" and "defaultSourceLanguage" to set global default languages.

README.md

@@ -43,7 +43,6 @@ You can store the API key via the following settings.
 This extension contributes the following settings:
 
 * `deepl.apiKey`: The key is used to authenticate with the DeepL API. [See offical documentation](https://www.deepl.com/docs-api/accessing-the-api/authentication/)
-* `deepl.usePro`: Whether to use the DeepL Pro API - check this option if you use the paid plan.
 
 For this extension to work, the above settings must be made.
 
@@ -71,6 +70,10 @@ Dont use this extension if you dont agree with their privacy policy!
 
 ## Release Notes
 
+### 1.0.8
+
+- You no longer need to explicitly set "deepl.usePro" in the configuration to use the DeepL Pro API because its now determined based on the given api key
+
 ### 1.0.7
 
 - Added new configuration options "defaultTargetLanguage" and "defaultSourceLanguage" to set global default languages.

package.json

@@ -2,7 +2,7 @@
 	"name": "vscode-deepl",
 	"displayName": "DeepL for Visual Studio Code",
 	"description": "Easily translate into more than 25 languages directly from your favourite editor using DeepL.",
-	"version": "1.0.7",
+	"version": "1.0.8",
 	"keywords": [
 		"DeepL",
 		"Translate",
@@ -50,11 +50,6 @@
 						"default": "",
 						"markdownDescription": "The key is used to authenticate with the DeepL API. [See offical documentation](https://www.deepl.com/docs-api/accessing-the-api/authentication/)"
 					},
-					"deepl.usePro": {
-						"type": "boolean",
-						"default": false,
-						"description": "Whether to use the DeepL Pro API"
-					},
 					"deepl.formality": {
 						"type": "string",
 						"default": "default",
@@ -280,6 +275,7 @@
 	},
 	"dependencies": {
 		"axios": "^1.6.0",
+		"deepl-node": "^1.11.0",
 		"vue": "^3.1.5",
 		"xstate": "^4.23.0"
 	}

src/commands.ts

@@ -3,7 +3,7 @@ import * as debug from './debug';
 import * as vscode from 'vscode';
 import { state } from './state';
 import { showMessageWithTimeout } from './vscode';
-import { showApiKeyInput, showSourceLanguageInput, showTargetLanguageInput, showUseProInput } from "./inputs";
+import { showApiKeyInput, showSourceLanguageInput, showTargetLanguageInput } from "./inputs";
 import { TranslateCommandParam, TranslateParam } from './types';
 import { getDefaultSourceLanguage, getDefaultTargetLanguage } from './helper';
 
@@ -111,5 +111,4 @@ export const configureSettings = async () => {
   if (!state.apiKey) {
     return;
   }
-  state.usePro = await showUseProInput();
 };

src/deepl.ts

@@ -1,6 +1,7 @@
 import axios from 'axios';
 import { state } from './state';
 import { Language, LanguageType, Translation } from './types';
+import { isFreeAccountAuthKey } from 'deepl-node';
 
 /* eslint-disable */
 export enum DeepLErrorCodes {
@@ -62,9 +63,9 @@ const errorHandlers: ErrorHandler[] = [];
 const formalityAllowed: string[] = ["DE", "FR", "IT", "ES", "NL", "PL", "PT-PT", "PT-BR", "RU"];
 
 http.interceptors.request.use((config) => {
-  config.baseURL = state.usePro
-    ? 'https://api.deepl.com'
-    : 'https://api-free.deepl.com';
+  config.baseURL = isFreeAccountAuthKey(state.apiKey!)
+    ? 'https://api-free.deepl.com'
+    : 'https://api.deepl.com';
 
   if (!config.params) {
     config.params = {};

src/inputs.ts

@@ -29,15 +29,4 @@ export function showApiKeyInput() {
     placeHolder: 'Please enter your DeepL API key',
     ignoreFocusOut: true
   }).then(x => x ?? null);
-} 
-
-export function showUseProInput() {
-  return vscode.window.showQuickPick(
-    ['No', 'Yes'],
-    {
-      title: 'Do you want to use the DeepL Pro API?',
-      placeHolder: 'Do you want to use the DeepL Pro API?',
-      ignoreFocusOut: true
-    }
-  ).then(x => x === 'Yes');
 }

src/state.ts

@@ -10,7 +10,6 @@ export const state = reactive<ExtensionState>({
   targetLanguage: null,
   sourceLanguage: null,
   apiKey: null,
-  usePro: false,
   tagHandling: "off",
   ignoreTags: "",
   nonSplittingTags: "",
@@ -34,7 +33,6 @@ export function setup(context: vscode.ExtensionContext) {
 
   const config = vscode.workspace.getConfiguration('deepl');
 
-  state.usePro = config.get('usePro') ?? false;
   state.apiKey = config.get('apiKey') ?? null;
   state.formality = config.get('formality') ?? "default";
   state.ignoreTags = config.get('ignoreTags') ?? "";
@@ -50,7 +48,6 @@ export function setup(context: vscode.ExtensionContext) {
   debug.write(`Initialized extension using state:`);
   debug.write(JSON.stringify(state, null, 2));
 
-  watch(() => state.usePro, () => config.update('usePro', state.usePro, vscode.ConfigurationTarget.Global));
   watch(() => state.apiKey, () => config.update('apiKey', state.apiKey, vscode.ConfigurationTarget.Global));
   watch(() => state.formality, () => config.update('formality', state.formality, vscode.ConfigurationTarget.Global));
   watch(() => state.ignoreTags, () => config.update('ignoreTags', state.ignoreTags, vscode.ConfigurationTarget.Global));
@@ -70,9 +67,8 @@ export function setup(context: vscode.ExtensionContext) {
 
     debug.write(`Extension configuration has changed! Updating extension state...`);
 
-    const { usePro, apiKey, formality, splitSentences, tagHandling, ignoreTags, preserveFormatting, splittingTags, nonSplittingTags, glossaryId, defaultTargetLanguage, defaultSourceLanguage } = vscode.workspace.getConfiguration('deepl');
+    const { apiKey, formality, splitSentences, tagHandling, ignoreTags, preserveFormatting, splittingTags, nonSplittingTags, glossaryId, defaultTargetLanguage, defaultSourceLanguage } = vscode.workspace.getConfiguration('deepl');
 
-    state.usePro = usePro;
     state.apiKey = apiKey;
     state.formality = formality;
     state.ignoreTags = ignoreTags;

src/types.ts

@@ -15,7 +15,6 @@ export interface ExtensionState {
   targetLanguage: string | null,
   sourceLanguage: string | null,
   apiKey: string | null,
-  usePro: boolean,
   tagHandling: 'html' | 'xml' | 'off',
   ignoreTags: string,
   formality: string,

src/vscode.ts

@@ -41,7 +41,7 @@ const sleep = (timeout: number) => new Promise(resolve => {
 export const waitFor = async (timeout: number, condition: () => boolean): Promise<boolean> => {
   while (!condition() && timeout > 0) {
       timeout -= 100;
-      await sleep(100)
+      await sleep(100);
   }
 
   return timeout > 0 ? true : false;