@plasmicapp/cli 0.1.188 → 0.1.190

package/dist/actions/localization-strings.d.ts

@@ -6,5 +6,6 @@ export interface LocalizationStringsArgs extends CommonArgs {
     format: "po" | "json" | "lingui";
     output: string;
     forceOverwrite: boolean;
+    keyScheme: "content" | "hash";
 }
 export declare function localizationStrings(opts: LocalizationStringsArgs): Promise<void>;

package/dist/actions/localization-strings.js

@@ -66,7 +66,7 @@ function localizationStrings(opts) {
                 token: "",
             });
             deps_1.logger.info(`Generating localization strings for ${chalk_1.default.bold(opts.projects.join(", "))}...`);
-            const data = yield api.genLocalizationStrings(opts.projects, opts.format, projectIdsAndTokens);
+            const data = yield api.genLocalizationStrings(opts.projects, opts.format, opts.keyScheme, projectIdsAndTokens);
             if (file_utils_1.existsBuffered(output)) {
                 const overwrite = yield user_utils_1.confirmWithUser(`File ${output} already exists. Do you want to overwrite?`, opts.forceOverwrite);
                 if (!overwrite) {

package/dist/api.d.ts

@@ -192,7 +192,7 @@ export declare class PlasmicApi {
         metadata?: Metadata;
     }): Promise<ProjectBundle>;
     projectMeta(projectId: string): Promise<ProjectMetaInfo>;
-    genLocalizationStrings(projects: readonly string[], format: "po" | "json" | "lingui", projectIdsAndTokens: ProjectIdAndToken[]): Promise<string>;
+    genLocalizationStrings(projects: readonly string[], format: "po" | "json" | "lingui", keyScheme: "content" | "hash", projectIdsAndTokens: ProjectIdAndToken[]): Promise<string>;
     uploadBundle(projectId: string, bundleName: string, bundleJs: string, css: string[], metaJson: string, genModulePath: string | undefined, genCssPaths: string[], pkgVersion: string | undefined, extraPropMetaJson: string | undefined, themeProviderWrapper: string | undefined, themeModule: string | undefined): Promise<StyleTokensMap>;
     projectStyleTokens(projectId: string, branchName: string, versionRange?: string): Promise<StyleTokensMap>;
     projectIcons(projectId: string, branchName: string, versionRange?: string, iconIds?: string[]): Promise<ProjectIconsResponse>;

package/dist/api.js

@@ -100,9 +100,9 @@ class PlasmicApi {
             return result.data;
         });
     }
-    genLocalizationStrings(projects, format, projectIdsAndTokens) {
+    genLocalizationStrings(projects, format, keyScheme, projectIdsAndTokens) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.get(`${this.codegenHost}/api/v1/localization/gen-texts?format=${format}&preview=true&${projects
+            const result = yield this.get(`${this.codegenHost}/api/v1/localization/gen-texts?format=${format}&keyScheme=${keyScheme}&preview=true&${projects
                 .map((p) => `projectId=${p}`)
                 .join("&")}`, undefined, {
                 "x-plasmic-api-project-tokens": projectIdsAndTokens

package/dist/index.js

@@ -203,6 +203,12 @@ yargs_1.default
     type: "string",
     choices: ["json", "po", "lingui"],
     default: "json",
+})
+    .option("key-scheme", {
+    describe: "What value to use as message keys; either the message content itself, or a hash of it",
+    type: "string",
+    choices: ["content", "hash"],
+    default: "content",
 })
     .option("output", {
     alias: "o",

package/dist/utils/resolve-utils.js

@@ -78,7 +78,8 @@ function checkProjectMeta(meta, root, context, opts) {
         // If the codegen version on-disk is invalid, we will sync again the project.
         const checkCodegenVersion = () => __awaiter(this, void 0, void 0, function* () {
             const projectLock = context.lock.projects.find((p) => p.projectId === projectId);
-            if (!!(projectLock === null || projectLock === void 0 ? void 0 : projectLock.codegenVersion) && semver.gte(projectLock.codegenVersion, yield context.api.latestCodegenVersion())) {
+            if (!!(projectLock === null || projectLock === void 0 ? void 0 : projectLock.codegenVersion) &&
+                semver.gte(projectLock.codegenVersion, yield context.api.latestCodegenVersion())) {
                 return false;
             }
             return true;
@@ -92,9 +93,10 @@ function checkProjectMeta(meta, root, context, opts) {
                 // Always sync if we haven't seen sync'ed before
                 return true;
             }
-            if (semver.isLatest(versionOnDisk) &&
-                semver.isLatest(newVersion) &&
-                meta !== root) {
+            // If version is a branch name, we want to get the latest of the branch
+            const newVersionIsLatest = semver.isLatest(newVersion) || !semver.valid(newVersion);
+            const versionOnDiskIsLatest = semver.isLatest(versionOnDisk) || !semver.valid(versionOnDisk);
+            if (versionOnDiskIsLatest && newVersionIsLatest && meta !== root) {
                 // If this is a dependency (not root), and we're dealing with latest dep version
                 // just skip, it's confusing
                 if (!isOnDiskCodeInvalid) {
@@ -102,11 +104,11 @@ function checkProjectMeta(meta, root, context, opts) {
                 }
                 return false;
             }
-            if (semver.isLatest(newVersion)) {
+            if (newVersionIsLatest) {
                 // Always sync when version set to "latest"
                 return true;
             }
-            if (semver.isLatest(versionOnDisk)) {
+            if (versionOnDiskIsLatest) {
                 // Explicitly allow downgrades from "latest" to published version
                 return true;
             }
@@ -152,8 +154,10 @@ function checkProjectMeta(meta, root, context, opts) {
                     : deps_1.logger.info(`'${projectName} has never been synced before. Syncing...'`);
                 return true;
             }
+            // If version is a branch name, we want to get the latest of the branch
+            const versionRangeIsLatest = semver.isLatest(versionRange) || !semver.valid(versionRange);
             // If satisfies range in plasmic.json
-            if (semver.satisfies(newVersion, versionRange)) {
+            if (versionRangeIsLatest || semver.satisfies(newVersion, versionRange)) {
                 deps_1.logger.info(`Updating project '${projectName}' to ${newVersion}`);
                 return true;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/cli",
-  "version": "0.1.188",
+  "version": "0.1.190",
   "description": "plasmic cli for syncing local code with Plasmic designs",
   "engines": {
     "node": ">=12"

package/src/actions/localization-strings.ts

@@ -4,12 +4,8 @@ import { CommonArgs } from "..";
 import { PlasmicApi, ProjectIdAndToken } from "../api";
 import { logger } from "../deps";
 import { HandledError } from "../lib";
-import { getCurrentAuth, getOrStartAuth } from "../utils/auth-utils";
-import {
-  DEFAULT_HOST,
-  findConfigFile,
-  PlasmicContext,
-} from "../utils/config-utils";
+import { getCurrentAuth } from "../utils/auth-utils";
+import { DEFAULT_HOST, findConfigFile } from "../utils/config-utils";
 import { existsBuffered, writeFileText } from "../utils/file-utils";
 import { getContext } from "../utils/get-context";
 import { confirmWithUser } from "../utils/user-utils";
@@ -21,6 +17,7 @@ export interface LocalizationStringsArgs extends CommonArgs {
   format: "po" | "json" | "lingui";
   output: string;
   forceOverwrite: boolean;
+  keyScheme: "content" | "hash";
 }
 
 export async function localizationStrings(
@@ -81,6 +78,7 @@ export async function localizationStrings(
     const data = await api.genLocalizationStrings(
       opts.projects,
       opts.format,
+      opts.keyScheme,
       projectIdsAndTokens
     );
     if (existsBuffered(output)) {

package/src/api.ts

@@ -294,12 +294,13 @@ export class PlasmicApi {
   async genLocalizationStrings(
     projects: readonly string[],
     format: "po" | "json" | "lingui",
+    keyScheme: "content" | "hash",
     projectIdsAndTokens: ProjectIdAndToken[]
   ) {
     const result = await this.get(
       `${
         this.codegenHost
-      }/api/v1/localization/gen-texts?format=${format}&preview=true&${projects
+      }/api/v1/localization/gen-texts?format=${format}&keyScheme=${keyScheme}&preview=true&${projects
         .map((p) => `projectId=${p}`)
         .join("&")}`,
       undefined,

package/src/index.ts

@@ -252,6 +252,13 @@ yargs
           choices: ["json", "po", "lingui"],
           default: "json",
         })
+        .option("key-scheme", {
+          describe:
+            "What value to use as message keys; either the message content itself, or a hash of it",
+          type: "string",
+          choices: ["content", "hash"],
+          default: "content",
+        })
         .option("output", {
           alias: "o",
           describe: "Output file",

package/src/utils/resolve-utils.ts

@@ -1,5 +1,4 @@
 import L from "lodash";
-import { InvalidatedProjectKind } from "typescript";
 import { SyncArgs } from "../actions/sync";
 import { ProjectVersionMeta, VersionResolution } from "../api";
 import { logger } from "../deps";
@@ -74,7 +73,13 @@ async function checkProjectMeta(
       (p) => p.projectId === projectId
     );
 
-    if (!!projectLock?.codegenVersion && semver.gte(projectLock.codegenVersion, await context.api.latestCodegenVersion())) {
+    if (
+      !!projectLock?.codegenVersion &&
+      semver.gte(
+        projectLock.codegenVersion,
+        await context.api.latestCodegenVersion()
+      )
+    ) {
       return false;
     }
 
@@ -95,11 +100,13 @@ async function checkProjectMeta(
       return true;
     }
 
-    if (
-      semver.isLatest(versionOnDisk) &&
-      semver.isLatest(newVersion) &&
-      meta !== root
-    ) {
+    // If version is a branch name, we want to get the latest of the branch
+    const newVersionIsLatest =
+      semver.isLatest(newVersion) || !semver.valid(newVersion);
+    const versionOnDiskIsLatest =
+      semver.isLatest(versionOnDisk) || !semver.valid(versionOnDisk);
+
+    if (versionOnDiskIsLatest && newVersionIsLatest && meta !== root) {
       // If this is a dependency (not root), and we're dealing with latest dep version
       // just skip, it's confusing
       if (!isOnDiskCodeInvalid) {
@@ -110,12 +117,12 @@ async function checkProjectMeta(
       return false;
     }
 
-    if (semver.isLatest(newVersion)) {
+    if (newVersionIsLatest) {
       // Always sync when version set to "latest"
       return true;
     }
 
-    if (semver.isLatest(versionOnDisk)) {
+    if (versionOnDiskIsLatest) {
       // Explicitly allow downgrades from "latest" to published version
       return true;
     }
@@ -128,7 +135,7 @@ async function checkProjectMeta(
         );
         return true;
       } else {
-        if (!isOnDiskCodeInvalid) { 
+        if (!isOnDiskCodeInvalid) {
           logger.info(
             `Project '${projectName}'@${newVersion} is already up to date; skipping. (To force an update, run again with "--force")`
           );
@@ -186,8 +193,12 @@ async function checkProjectMeta(
       return true;
     }
 
+    // If version is a branch name, we want to get the latest of the branch
+    const versionRangeIsLatest =
+      semver.isLatest(versionRange) || !semver.valid(versionRange);
+
     // If satisfies range in plasmic.json
-    if (semver.satisfies(newVersion, versionRange)) {
+    if (versionRangeIsLatest || semver.satisfies(newVersion, versionRange)) {
       logger.info(`Updating project '${projectName}' to ${newVersion}`);
       return true;
     }
@@ -230,12 +241,12 @@ async function checkProjectMeta(
     // we should always sync it, even if nothing has changed
     return true;
   }
-  const checkedVersion = 
+  const checkedVersion =
     (await checkVersionLock()) &&
     (await checkVersionRange()) &&
     (await checkIndirect());
 
- if(!checkedVersion && isOnDiskCodeInvalid) {
+  if (!checkedVersion && isOnDiskCodeInvalid) {
     // sync, but try to keep the current version on disk
     const projectLock = context.lock.projects.find(
       (p) => p.projectId === projectId
@@ -244,7 +255,7 @@ async function checkProjectMeta(
     logger.warn(
       `Project '${projectName}' was synced by an incompatible version of Plasmic Codegen. Syncing again on the same version ${projectName}@${versionOnDisk}`
     );
-    
+
     meta.version = versionOnDisk ?? meta.version;
     return true;
   } else if (checkedVersion) {