@tolgee/cli 2.1.7 → 2.2.0

package/dist/extractor/parserNgx/tokenMergers/translateMerger.js

@@ -0,0 +1,41 @@
+const SERVICE_NAME_POSSIBILITIES = ['translateService'];
+const TRANSLATE_FUNCTION_NAMES = ['translate', 'instant', 'get'];
+// translateService.translate('key1', 'default-1', { ns: 'ns-1' })
+export const translateMerger = {
+    initial: 0 /* S.Idle */,
+    step: (state, t, end) => {
+        const type = t.customType;
+        const token = t.token;
+        switch (state) {
+            case 0 /* S.Idle */:
+                if (['variable', 'function.call.pipe'].includes(type) &&
+                    SERVICE_NAME_POSSIBILITIES.includes(token)) {
+                    return 2 /* S.ExpectDot */;
+                }
+                break;
+            case 2 /* S.ExpectDot */:
+                if (type === 'acessor.dot') {
+                    return 3 /* S.ExpectCall */;
+                }
+                break;
+            case 3 /* S.ExpectCall */:
+                if (type === 'function.call' &&
+                    TRANSLATE_FUNCTION_NAMES.includes(token)) {
+                    return 1 /* S.ExpectBracket */;
+                }
+                break;
+            case 1 /* S.ExpectBracket */:
+                if (type === 'expression.begin') {
+                    return end.MERGE_CUSTOM;
+                }
+        }
+    },
+    customType: 'trigger.translate.function',
+    customMerge(tokens) {
+        return {
+            before: tokens.slice(0, -2),
+            toMerge: tokens.slice(-2),
+            after: [],
+        };
+    },
+};

package/dist/extractor/parserSvelte/svelteMapper.js

@@ -2,9 +2,9 @@ export const svelteMapper = (token) => {
     switch (token.type) {
         // strings
         case 'punctuation.definition.string.begin.svelte':
-            return 'string.begin';
+            return 'string.quote';
         case 'punctuation.definition.string.end.svelte':
-            return 'string.end';
+            return 'string.quote';
         case 'string.quoted.svelte':
             return 'string.body';
         case 'string.unquoted.svelte':

package/dist/extractor/parserVue/vueMapper.js

@@ -24,9 +24,9 @@ export const vueMapper = (token) => {
             return 'operator.assignment';
         // html string attributes
         case 'punctuation.definition.string.begin.html':
-            return 'string.begin';
+            return 'string.quote';
         case 'punctuation.definition.string.end.html':
-            return 'string.end';
+            return 'string.quote';
         case 'string.quoted.single.html':
         case 'string.quoted.double.html':
             return 'string.body';

package/dist/extractor/runner.js

@@ -16,7 +16,14 @@ export async function extractKeysFromFile(file, parserType, options, extractor)
 }
 export function findPossibleFrameworks(fileNames) {
     const possibleFrameworks = [];
-    const extensions = new Set(fileNames.map((name) => extname(name)));
+    const extensions = new Set(fileNames.map((name) => {
+        if (name.endsWith('.component.html')) {
+            return '.component.html';
+        }
+        else {
+            return extname(name);
+        }
+    }));
     if (extensions.has('.jsx') || extensions.has('.tsx')) {
         possibleFrameworks.push('react');
     }
@@ -26,6 +33,9 @@ export function findPossibleFrameworks(fileNames) {
     if (extensions.has('.svelte')) {
         possibleFrameworks.push('svelte');
     }
+    if (extensions.has('.component.html')) {
+        possibleFrameworks.push('ngx');
+    }
     return possibleFrameworks;
 }
 function detectParserType(fileNames) {

package/dist/extractor/tokenizer.js

@@ -9,6 +9,7 @@ const GrammarFiles = {
     ["source.tsx" /* Grammar.TYPESCRIPT_TSX */]: new URL('TypeScriptReact.tmLanguage', GRAMMAR_PATH),
     ["source.svelte" /* Grammar.SVELTE */]: new URL('Svelte.tmLanguage', GRAMMAR_PATH),
     ["source.vue" /* Grammar.VUE */]: new URL('Vue.tmLanguage', GRAMMAR_PATH),
+    ["html-template.ng" /* Grammar.ANGULAR_HTML */]: new URL('AngularHtml.tmLanguage', GRAMMAR_PATH),
     ["text.html.basic" /* Grammar.HTML */]: new URL('HTML.tmLanguage', GRAMMAR_PATH),
     ["text.html.derivative" /* Grammar.HTML_D */]: new URL('HTML.tmLanguage', GRAMMAR_PATH),
 };
@@ -33,8 +34,9 @@ async function loadGrammar(scope) {
     const grammar = await readFile(file, 'utf8');
     return JSON.parse(grammar);
 }
-function extnameToGrammar(extname) {
-    switch (extname) {
+function fileNameToGrammar(fileName) {
+    const ext = extname(fileName);
+    switch (ext) {
         case '.js':
         case '.mjs':
         case '.cjs':
@@ -50,7 +52,12 @@ function extnameToGrammar(extname) {
         case '.svelte':
             return "source.svelte" /* Grammar.SVELTE */;
         case '.html':
-            return "text.html.basic" /* Grammar.HTML */;
+            if (/.*\.component\.html/.test(fileName)) {
+                return "html-template.ng" /* Grammar.ANGULAR_HTML */;
+            }
+            else {
+                return "text.html.basic" /* Grammar.HTML */;
+            }
     }
 }
 function tokenize(code, grammar) {
@@ -98,10 +105,9 @@ export default async function (code, fileName) {
             loadGrammar: loadGrammar,
         });
     }
-    const fileType = extname(fileName);
-    const grammarName = extnameToGrammar(fileType);
+    const grammarName = fileNameToGrammar(fileName);
     if (!grammarName) {
-        throw new Error(`Cannot find grammar for file type ${fileType}`);
+        throw new Error(`Cannot find grammar for file type ${fileName}`);
     }
     const grammar = await registry.loadGrammar(grammarName);
     if (!grammar) {

package/dist/options.js

@@ -59,5 +59,5 @@ export const FILE_PATTERNS = new Option('-pt, --patterns <patterns...>', 'File g
 export const STRICT_NAMESPACE = new Option('--strict-namespace').hideHelp(true);
 export const STRICT_NAMESPACE_NEGATION = new Option('--no-strict-namespace', "No require namespace to be reachable, use if you don't use namespaces.");
 export const DEFAULT_NAMESPACE = new Option('--default-namespace <namespace>', 'Default namespace used in extraction if not specified otherwise.');
-export const PARSER = new Option('--parser <parser>', 'Override parser detection.').choices(['react', 'vue', 'svelte']);
+export const PARSER = new Option('--parser <parser>', 'Override parser detection.').choices(['react', 'vue', 'svelte', 'ngx']);
 export const VERBOSE = new Option('-v, --verbose [rules...]', 'Enable verbose logging. If you want more info to be logged pass an option.').choices(['extractor']);

package/extractor.d.ts

@@ -18,7 +18,7 @@ export type ExtractOptions = {
     strictNamespace: boolean;
     defaultNamespace: string | undefined;
 };
-export type ParserType = 'react' | 'vue' | 'svelte';
+export type ParserType = 'react' | 'vue' | 'svelte' | 'ngx';
 export type Extractor = (fileContents: string, fileName: string, options: ExtractOptions) => ExtractionResult;
 export type ExtractionResult = {
     keys: ExtractedKey[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/cli",
-  "version": "2.1.7",
+  "version": "2.2.0",
   "type": "module",
   "description": "A tool to interact with the Tolgee Platform through CLI",
   "repository": {

package/schema.json

@@ -33,7 +33,7 @@
     },
     "parser": {
       "description": "Override parser detection.",
-      "enum": ["react", "vue", "svelte"]
+      "enum": ["react", "vue", "svelte", "ngx"]
     },
     "push": {
       "type": "object",