@plasmicapp/cli 0.1.293 → 0.1.295

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/cli",
-  "version": "0.1.293",
+  "version": "0.1.295",
   "description": "plasmic cli for syncing local code with Plasmic designs",
   "engines": {
     "node": ">=12"
@@ -36,8 +36,8 @@
     "@types/uuid": "^8.3.0",
     "@types/wrap-ansi": "^3.0.0",
     "@types/yargs": "^15.0.5",
-    "@typescript-eslint/eslint-plugin": "^3.8.0",
-    "@typescript-eslint/parser": "^3.8.0",
+    "@typescript-eslint/eslint-plugin": "^5.61.0",
+    "@typescript-eslint/parser": "^5.61.0",
     "eslint": "^7.7.0",
     "jest": "^26.1.0",
     "jest-circus": "^26.1.0",
@@ -71,7 +71,7 @@
     "prettier": "^2.0.5",
     "semver": "^7.3.2",
     "socket.io-client": "^4.1.2",
-    "typescript": "^3.9.6",
+    "typescript": "^4.9.5",
     "upath": "^1.2.0",
     "update-notifier": "^4.1.0",
     "utility-types": "^3.10.0",
@@ -80,5 +80,5 @@
     "wrap-ansi": "^7.0.0",
     "yargs": "^15.4.1"
   },
-  "gitHead": "44f8c8ab413dee1f09112df30df9bdf323ac5214"
+  "gitHead": "d6193c35e278eaf8149c584a38c6ac9cd8f38dee"
 }

package/src/actions/init.ts

@@ -286,7 +286,7 @@ async function deriveInitAnswers(
     simulatePrompt(useExpressQuestion, "yes", true);
     return answers;
   } else {
-    const useExpress = await inquirer.prompt([useExpressQuestion]);
+    const useExpress: any = await inquirer.prompt([useExpressQuestion]);
     if (useExpress.continue === "yes") {
       return answers;
     }
@@ -312,7 +312,7 @@ async function deriveInitAnswers(
           default: answers[name],
         });
         // Not sure why TS complains here without this cast.
-        (answers as any)[name] = ans[name];
+        (answers as any)[name] = (ans as any)[name];
       }
       // Other questions are silently skipped
     }

package/src/actions/localization-strings.ts

@@ -25,10 +25,40 @@ export interface LocalizationStringsArgs extends CommonArgs {
 export async function localizationStrings(
   opts: LocalizationStringsArgs
 ): Promise<void> {
-  if (!opts.projects || opts.projects.length === 0) {
+  if (!opts.baseDir) {
+    opts.baseDir = process.cwd();
+  }
+
+  const maybeConfigFile =
+    opts.config || findConfigFile(opts.baseDir, { traverseParents: true });
+
+  let projectSpecs = opts.projects;
+  let keyScheme = opts.keyScheme;
+  let tagPrefix = opts.tagPrefix;
+  const projectTokensFromConfig: ProjectIdAndToken[] = [];
+  if (maybeConfigFile) {
+    // if plasmic.json exists, then we can derive some settings from
+    // there instead.
+    logger.info(`Using settings from ${maybeConfigFile}...`);
+    const context = await getContext(opts, { enableSkipAuth: true });
+    context.config.projects.forEach((p) => {
+      projectTokensFromConfig.push(pick(p, "projectId", "projectApiToken"));
+    });
+    if (!projectSpecs || projectSpecs.length === 0) {
+      projectSpecs = context.config.projects.map(
+        (p) => p.projectId + (p.version === "latest" ? "" : `@${p.version}`)
+      );
+    }
+    if (!keyScheme) {
+      keyScheme = context.config.i18n?.keyScheme;
+    }
+    if (!tagPrefix) {
+      tagPrefix = context.config.i18n?.tagPrefix;
+    }
+  }
+  if (!projectSpecs || projectSpecs.length === 0) {
     throw new HandledError(`Missing projects.`);
   }
-  if (!opts.baseDir) opts.baseDir = process.cwd();
   const parsedProjectTokens: ProjectIdAndToken[] = (
     opts.projectTokens ?? []
   ).map((val) => {
@@ -48,24 +78,7 @@ export async function localizationStrings(
       ? "data.po"
       : "data.json"
     : opts.output;
-  let keyScheme = opts.keyScheme;
-  let tagPrefix = opts.tagPrefix;
-  const projectTokensFromConfig: ProjectIdAndToken[] = [];
   const auth = await getCurrentAuth(opts.auth);
-  const maybeConfigFile =
-    opts.config || findConfigFile(opts.baseDir, { traverseParents: true });
-  if (maybeConfigFile) {
-    const context = await getContext(opts, { enableSkipAuth: true });
-    context.config.projects.forEach((p) => {
-      projectTokensFromConfig.push(pick(p, "projectId", "projectApiToken"));
-    });
-    if (!keyScheme) {
-      keyScheme = context.config.i18n?.keyScheme;
-    }
-    if (!tagPrefix) {
-      tagPrefix = context.config.i18n?.tagPrefix;
-    }
-  }
 
   const projectIdsAndTokens = [
     ...parsedProjectTokens,
@@ -82,11 +95,11 @@ export async function localizationStrings(
     );
     logger.info(
       `Generating localization strings for ${chalk.bold(
-        opts.projects.join(", ")
+        projectSpecs.join(", ")
       )}...`
     );
     const data = await api.genLocalizationStrings(
-      opts.projects,
+      projectSpecs,
       opts.format,
       keyScheme ?? "content",
       tagPrefix,

package/src/index.ts

@@ -238,7 +238,7 @@ yargs
         .option("projects", {
           alias: "p",
           describe:
-            "One or more projects to generate localization strings, separated by comma. Version constraints can be specified using @. Example: projectid, projectid@>=version",
+            "One or more projects to generate localization strings, separated by comma. Version constraints can be specified using @. Example: projectid, projectid@>=version. If not specified, will be derived from plasmic.json if you are using codegen.",
           type: "array",
         })
         .option("host", {

package/src/utils/config-utils.ts

@@ -351,10 +351,10 @@ export interface ProjectLock {
 
 export interface I18NConfig {
   /**
-   * For localization, whether the extracted strings are keyed by its content
-   * or by a hash of its content
+   * For localization, whether the extracted strings are keyed by its content,
+   * or by a hash of its content, or by where the string is found ("path")
    */
-  keyScheme: "content" | "hash";
+  keyScheme: "content" | "hash" | "path";
   /**
    * For localization, rich text with embedded tags are exported as
    * "Hello <0>there</0>, I am <1>here</1>".  Some frameworks, like