@logto/cli 1.10.1 → 1.12.0

package/lib/commands/translate/openai.js

@@ -29,7 +29,7 @@ export const translate = async ({ api, targetLanguage, sourceFilePath, extraProm
     const response = await trySafe(api
         .post('chat/completions', {
         json: {
-            model: 'gpt-3.5-turbo',
+            model: 'gpt-3.5-turbo-1106',
             messages: getTranslationPromptMessages({
                 sourceFileContent,
                 targetLanguage,

package/lib/commands/translate/sync-keys/utils.d.ts

@@ -1,11 +1,11 @@
 type FileStructure = {
-    [key: string]: {
+    [key: string | number]: {
         filePath?: string;
         structure: FileStructure;
     };
 };
 type NestedPhraseObject = {
-    [key: string]: [phrase: string, isTranslated: boolean] | NestedPhraseObject;
+    [key: string | number]: [phrase: string, isTranslated: boolean] | NestedPhraseObject;
 };
 type ParsedTuple = readonly [NestedPhraseObject, FileStructure];
 /**

package/lib/commands/translate/sync-keys/utils.js

@@ -4,6 +4,28 @@ import path from 'node:path';
 import { tryThat } from '@silverhand/essentials';
 import ts from 'typescript';
 import { consoleLog } from '../../../utils.js';
+const getValue = (property) => {
+    if (ts.isStringLiteral(property.initializer) ||
+        ts.isNoSubstitutionTemplateLiteral(property.initializer)) {
+        return property.initializer.getText();
+    }
+    consoleLog.fatal('Unsupported property:', property.getFullText());
+};
+const hasLeadingUntranslatedComment = (fullText) => {
+    const commentRanges = ts.getLeadingCommentRanges(fullText, 0);
+    if (commentRanges?.[0]) {
+        if (commentRanges.length > 1) {
+            consoleLog.fatal('Multiple comments found for property.');
+        }
+        const commentRange = commentRanges[0];
+        const comment = fullText.slice(commentRange.pos, commentRange.end);
+        if (comment.includes(untranslatedMark)) {
+            return true;
+        }
+        consoleLog.warn('Unsupported comment:', comment);
+    }
+    return false;
+};
 const untranslatedMark = 'UNTRANSLATED';
 /**
  * Given a entrypoint file path of a language, parse the nested object of
@@ -94,33 +116,27 @@ export const parseLocaleFiles = (filePath) => {
                     fileStructure[key] = { structure };
                     /* eslint-enable @silverhand/fp/no-mutation */
                 }
-                else if (ts.isStringLiteral(property.initializer) ||
-                    ts.isNoSubstitutionTemplateLiteral(property.initializer)) {
-                    const value = property.initializer.getText();
-                    const commentRanges = ts.getLeadingCommentRanges(property.getFullText(), 0);
-                    if (commentRanges?.[0]) {
-                        if (commentRanges.length > 1) {
-                            consoleLog.fatal('Multiple comments found for property:', property);
-                        }
-                        const commentRange = commentRanges[0];
-                        const comment = property.getFullText().slice(commentRange.pos, commentRange.end);
-                        if (comment.includes(untranslatedMark)) {
-                            // eslint-disable-next-line @silverhand/fp/no-mutation
-                            nestedObject[key] = [value, false];
-                        }
-                        else {
-                            // eslint-disable-next-line @silverhand/fp/no-mutation
-                            nestedObject[key] = [value, true];
-                            consoleLog.warn('Unsupported comment:', comment);
+                else if (ts.isArrayLiteralExpression(property.initializer)) {
+                    const elements = property.initializer.elements.map((element) => {
+                        if (ts.isStringLiteralLike(element)) {
+                            return [
+                                [element.getText(), !hasLeadingUntranslatedComment(element.getFullText())],
+                                {},
+                            ];
                         }
-                    }
-                    else {
-                        // eslint-disable-next-line @silverhand/fp/no-mutation
-                        nestedObject[key] = [value, true];
-                    }
+                        return traverseNode(element, {}, {});
+                    });
+                    /* eslint-disable @silverhand/fp/no-mutation */
+                    nestedObject[key] = Object.fromEntries(elements.map(([phrases], index) => [index, phrases]));
+                    fileStructure[key] = {
+                        structure: Object.fromEntries(elements.map(([, structure], index) => [index, { structure }])),
+                    };
+                    /* eslint-enable @silverhand/fp/no-mutation */
                 }
                 else {
-                    consoleLog.fatal('Unsupported property:', property);
+                    const value = getValue(property);
+                    // eslint-disable-next-line @silverhand/fp/no-mutation
+                    nestedObject[key] = [value, !hasLeadingUntranslatedComment(property.getFullText())];
                 }
             }
         };
@@ -210,10 +226,13 @@ const traverseNode = async (baseline, targetObject, targetFilePath, isRoot = fal
     await fs.appendFile(targetFilePath, `const ${identifier} = {\n`);
     // Recursively traverse the nested object of phrases and the file structure
     // of the baseline language
+    // eslint-disable-next-line complexity
     const traverseObject = async (baseline, targetObject, tabSize) => {
         const [baselineObject, baselineStructure] = baseline;
+        const isBaselineArray = 0 in baselineObject;
         for (const [key, value] of Object.entries(baselineObject)) {
             const existingValue = targetObject[key];
+            const keyOutput = isBaselineArray ? '' : `${key}: `;
             if (Array.isArray(value)) {
                 const [phrase] = value;
                 // If the key exists in the target language and the value is a translated
@@ -221,11 +240,11 @@ const traverseNode = async (baseline, targetObject, targetFilePath, isRoot = fal
                 // of the baseline language and add a comment to indicate that the phrase
                 // is untranslated to help identify missing translations.
                 if (Array.isArray(existingValue) && existingValue[1]) {
-                    await fs.appendFile(targetFilePath, `${' '.repeat(tabSize)}${key}: ${existingValue[0]},\n`);
+                    await fs.appendFile(targetFilePath, `${' '.repeat(tabSize)}${keyOutput}${existingValue[0]},\n`);
                 }
                 else {
                     await fs.appendFile(targetFilePath, `${' '.repeat(tabSize)}/** ${untranslatedMark} */\n`);
-                    await fs.appendFile(targetFilePath, `${' '.repeat(tabSize)}${key}: ${phrase},\n`);
+                    await fs.appendFile(targetFilePath, `${' '.repeat(tabSize)}${keyOutput}${phrase},\n`);
                 }
             }
             // Not a string, treat it as a nested object or an import
@@ -236,11 +255,12 @@ const traverseNode = async (baseline, targetObject, targetFilePath, isRoot = fal
                     await fs.appendFile(targetFilePath, `${' '.repeat(tabSize)}${key},\n`);
                     await traverseNode([value, keyStructure.structure], Array.isArray(existingValue) ? {} : existingValue ?? {}, path.join(targetDirectory, keyStructure.filePath));
                 }
-                // Otherwise, treat it as a nested object.
+                // Otherwise, treat it as a nested object or array.
                 else {
-                    await fs.appendFile(targetFilePath, `${' '.repeat(tabSize)}${key}: {\n`);
+                    const isValueArray = 0 in value;
+                    await fs.appendFile(targetFilePath, `${' '.repeat(tabSize)}${keyOutput}${isValueArray ? '[' : '{'}\n`);
                     await traverseObject([value, keyStructure?.structure ?? {}], Array.isArray(existingValue) ? {} : existingValue ?? {}, tabSize + 2);
-                    await fs.appendFile(targetFilePath, `${' '.repeat(tabSize)}},\n`);
+                    await fs.appendFile(targetFilePath, `${' '.repeat(tabSize)}${isValueArray ? ']' : '}'},\n`);
                 }
             }
         }

package/lib/commands/translate/sync.js

@@ -8,7 +8,7 @@ const sync = {
     command: ['sync'],
     describe: 'Translate all untranslated phrases using ChatGPT. Note the environment variable `OPENAI_API_KEY` is required to work.',
     handler: async ({ path: inputPath }) => {
-        const queue = new PQueue({ concurrency: 1 });
+        const queue = new PQueue({ concurrency: 5 });
         const instancePath = await inquireInstancePath(inputPath);
         for (const languageTag of Object.keys(languages)) {
             if (languageTag === baseLanguage) {

package/lib/package-json.js

@@ -1,6 +1,6 @@
 export const packageJson = {
     "name": "@logto/cli",
-    "version": "1.10.1",
+    "version": "1.12.0",
     "description": "Logto CLI.",
     "author": "Silverhand Inc. <contact@silverhand.io>",
     "homepage": "https://github.com/logto-io/logto#readme",
@@ -44,11 +44,11 @@ export const packageJson = {
     },
     "dependencies": {
         "@logto/connector-kit": "workspace:^2.0.0",
-        "@logto/core-kit": "workspace:^2.2.0",
+        "@logto/core-kit": "workspace:^2.2.1",
         "@logto/language-kit": "workspace:^1.0.0",
-        "@logto/phrases": "workspace:^1.6.0",
-        "@logto/phrases-experience": "workspace:^1.3.1",
-        "@logto/schemas": "workspace:1.10.1",
+        "@logto/phrases": "workspace:^1.8.0",
+        "@logto/phrases-experience": "workspace:^1.5.0",
+        "@logto/schemas": "workspace:1.12.0",
         "@logto/shared": "workspace:^3.0.0",
         "@silverhand/essentials": "^2.8.4",
         "chalk": "^5.0.0",
@@ -71,7 +71,7 @@ export const packageJson = {
         "tar": "^6.1.11",
         "typescript": "^5.0.0",
         "yargs": "^17.6.0",
-        "zod": "^3.22.3"
+        "zod": "^3.22.4"
     },
     "devDependencies": {
         "@silverhand/eslint-config": "4.0.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/cli",
-  "version": "1.10.1",
+  "version": "1.12.0",
   "description": "Logto CLI.",
   "author": "Silverhand Inc. <contact@silverhand.io>",
   "homepage": "https://github.com/logto-io/logto#readme",
@@ -29,11 +29,11 @@
   },
   "dependencies": {
     "@logto/connector-kit": "^2.0.0",
-    "@logto/core-kit": "^2.2.0",
+    "@logto/core-kit": "^2.2.1",
     "@logto/language-kit": "^1.0.0",
-    "@logto/phrases": "^1.6.0",
-    "@logto/phrases-experience": "^1.3.1",
-    "@logto/schemas": "1.10.1",
+    "@logto/phrases": "^1.8.0",
+    "@logto/phrases-experience": "^1.5.0",
+    "@logto/schemas": "1.12.0",
     "@logto/shared": "^3.0.0",
     "@silverhand/essentials": "^2.8.4",
     "chalk": "^5.0.0",
@@ -56,7 +56,7 @@
     "tar": "^6.1.11",
     "typescript": "^5.0.0",
     "yargs": "^17.6.0",
-    "zod": "^3.22.3"
+    "zod": "^3.22.4"
   },
   "devDependencies": {
     "@silverhand/eslint-config": "4.0.1",