@plasmicapp/cli 0.1.176 → 0.1.179

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

@@ -0,0 +1,8 @@
+export interface LocalizationStringsArgs {
+    host: string;
+    projects: readonly string[];
+    format: "po" | "json" | "lingui";
+    output: string;
+    forceOverwrite: boolean;
+}
+export declare function localizationStrings(opts: LocalizationStringsArgs): Promise<void>;

package/dist/actions/localization-strings.js

@@ -0,0 +1,56 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.localizationStrings = void 0;
+const chalk_1 = __importDefault(require("chalk"));
+const api_1 = require("../api");
+const deps_1 = require("../deps");
+const lib_1 = require("../lib");
+const auth_utils_1 = require("../utils/auth-utils");
+const config_utils_1 = require("../utils/config-utils");
+const file_utils_1 = require("../utils/file-utils");
+const user_utils_1 = require("../utils/user-utils");
+function localizationStrings(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!opts.projects || opts.projects.length === 0) {
+            throw new lib_1.HandledError(`Missing projects.`);
+        }
+        const output = !opts.output
+            ? opts.format === "po"
+                ? "data.po"
+                : "data.json"
+            : opts.output;
+        const auth = yield auth_utils_1.getOrStartAuth({
+            baseDir: "",
+            host: opts.host || config_utils_1.DEFAULT_HOST,
+        });
+        if (auth) {
+            const api = new api_1.PlasmicApi(auth);
+            deps_1.logger.info(`Generating localization strings for ${chalk_1.default.bold(opts.projects.join(", "))}...`);
+            const data = yield api.genLocalizationStrings(opts.projects, opts.format);
+            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) {
+                    throw new lib_1.HandledError(`Cannot write to ${output}; file already exists.`);
+                }
+            }
+            file_utils_1.writeFileText(output, data);
+            deps_1.logger.info(`Localization strings have been written to ${output}`);
+        }
+        else {
+            deps_1.logger.error("Missing auth information");
+        }
+    });
+}
+exports.localizationStrings = localizationStrings;

package/dist/actions/sync-global-contexts.js

@@ -13,9 +13,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalContextsResourcePath = exports.syncGlobalContexts = void 0;
+const lodash_1 = __importDefault(require("lodash"));
 const deps_1 = require("../deps");
 const code_utils_1 = require("../utils/code-utils");
-const lodash_1 = __importDefault(require("lodash"));
 const file_utils_1 = require("../utils/file-utils");
 const COMPONENT_NAME = "PlasmicGlobalContextsProvider";
 function syncGlobalContexts(context, projectMeta, projectConfig, projectLock, checksums, baseDir) {
@@ -28,7 +28,7 @@ function syncGlobalContexts(context, projectMeta, projectConfig, projectLock, ch
             if (context.config.code.lang === "js") {
                 projectMeta.globalContextBundle.contextModule = code_utils_1.formatScript(code_utils_1.tsxToJsx(projectMeta.globalContextBundle.contextModule), baseDir);
             }
-            file_utils_1.writeFileContent(context, resourcePath, projectMeta.globalContextBundle.contextModule, { force: false });
+            file_utils_1.writeFileContent(context, resourcePath, projectMeta.globalContextBundle.contextModule, { force: true });
             projectConfig.globalContextsFilePath = resourcePath;
             const fl = projectLock.fileLocks.find((fl) => fl.assetId === projectConfig.projectId && fl.type === "globalContexts");
             if (fl) {

package/dist/actions/watch.js

@@ -74,17 +74,47 @@ function watchProjects(opts, metadataDefaults, onProjectUpdate) {
             socket.on("error", (data) => {
                 reject(new error_1.HandledError(data));
             });
-            socket.on("update", (data) => __awaiter(this, void 0, void 0, function* () {
+            socket.on("update", asyncOneAtATime((data) => __awaiter(this, void 0, void 0, function* () {
                 // Just run syncProjects() for now when any project has been updated
                 // Note on the 'updated to revision' part: this is parsed by the
                 // loader package to know that we finished updating the components.
                 yield sync_1.sync(syncOpts, syncMetadata);
                 deps_1.logger.info(`[${moment_1.default().format("HH:mm:ss")}] Project ${data.projectId} updated to revision ${data.revisionNum}`);
                 onProjectUpdate === null || onProjectUpdate === void 0 ? void 0 : onProjectUpdate();
-            }));
+            }), true));
         });
         deps_1.logger.info(`Watching projects ${latestProjects} ...`);
         return promise;
     });
 }
 exports.watchProjects = watchProjects;
+function asyncOneAtATime(f, bounceValue) {
+    let waitingCall = undefined, currentPromise = undefined;
+    function invoke({ args, resolve, reject }) {
+        const onCompletion = () => {
+            currentPromise = undefined;
+            if (waitingCall) {
+                invoke(waitingCall);
+                waitingCall = undefined;
+            }
+        };
+        currentPromise = f(...args);
+        currentPromise.then(onCompletion, onCompletion);
+        currentPromise.then(resolve, reject);
+    }
+    return (...args) => {
+        return new Promise((resolve, reject) => {
+            if (!currentPromise) {
+                // Free to proceed.
+                invoke({ args, resolve, reject });
+            }
+            else {
+                // Evict current waiter, and enqueue self.
+                if (waitingCall) {
+                    waitingCall.resolve(bounceValue);
+                }
+                waitingCall = { args, resolve, reject };
+            }
+        });
+    };
+}

package/dist/api.d.ts

@@ -188,12 +188,14 @@ export declare class PlasmicApi {
         metadata?: Metadata;
     }): Promise<ProjectBundle>;
     projectMeta(projectId: string): Promise<ProjectMetaInfo>;
+    genLocalizationStrings(projects: readonly string[], format: "po" | "json" | "lingui"): 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, versionRange?: string): Promise<StyleTokensMap>;
     projectIcons(projectId: string, versionRange?: string, iconIds?: string[]): Promise<ProjectIconsResponse>;
     projectSyncMetadata(projectId: string, revision: number, rethrowAppError: boolean): Promise<ProjectSyncMetadataModel>;
     connectSocket(): SocketIOClient.Socket;
     private post;
+    private get;
     private makeErrorMessage;
     private makeHeaders;
     private projectIdsAndTokens?;

package/dist/api.js

@@ -99,6 +99,14 @@ class PlasmicApi {
             return result.data;
         });
     }
+    genLocalizationStrings(projects, format) {
+        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
+                .map((p) => `projectId=${p}`)
+                .join("&")}`);
+            return result.data;
+        });
+    }
     uploadBundle(projectId, bundleName, bundleJs, css, metaJson, genModulePath, genCssPaths, pkgVersion, extraPropMetaJson, themeProviderWrapper, themeModule) {
         return __awaiter(this, void 0, void 0, function* () {
             const result = yield this.post(`${this.codegenHost}/api/v1/projects/${projectId}/jsbundle/upload`, {
@@ -168,6 +176,26 @@ class PlasmicApi {
             }
         });
     }
+    get(url, rethrowAppError) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                return yield axios_1.default.get(url, {
+                    headers: this.makeHeaders(),
+                });
+            }
+            catch (e) {
+                const error = e;
+                const errorMsg = this.makeErrorMessage(error);
+                if (rethrowAppError) {
+                    throw new AppServerError(errorMsg);
+                }
+                if (!errorMsg) {
+                    throw e;
+                }
+                throw new error_1.HandledError(errorMsg);
+            }
+        });
+    }
     makeErrorMessage(error) {
         var _a, _b;
         const response = error.response;

package/dist/index.js

@@ -30,6 +30,7 @@ const auth = __importStar(require("./actions/auth"));
 const fix_imports_1 = require("./actions/fix-imports");
 const info_1 = require("./actions/info");
 const init_1 = require("./actions/init");
+const localization_strings_1 = require("./actions/localization-strings");
 const projectToken = __importStar(require("./actions/project-token"));
 const sync_1 = require("./actions/sync");
 const upload_bundle_1 = require("./actions/upload-bundle");
@@ -186,6 +187,33 @@ yargs_1.default
     type: "string",
     default: "https://studio.plasmic.app",
 }), (argv) => error_1.handleError(projectToken.projectToken(argv)))
+    .command("localization-strings", false, (yargs) => 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",
+    type: "array",
+})
+    .option("host", {
+    describe: "Plasmic host to use",
+    type: "string",
+    default: "https://studio.plasmic.app",
+})
+    .option("format", {
+    describe: 'Output format. Either "json", "po" or "lingui"',
+    type: "string",
+    choices: ["json", "po", "lingui"],
+    default: "json",
+})
+    .option("output", {
+    alias: "o",
+    describe: "Output file",
+    type: "string",
+})
+    .option("force-overwrite", {
+    type: "boolean",
+    describe: "Overwrite the output file.",
+    default: false,
+}), (argv) => error_1.handleError(localization_strings_1.localizationStrings(argv)))
     .demandCommand()
     .strict()
     .help("h")

package/package.json

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

package/src/actions/localization-strings.ts

@@ -0,0 +1,57 @@
+import chalk from "chalk";
+import { PlasmicApi } from "../api";
+import { logger } from "../deps";
+import { HandledError } from "../lib";
+import { getOrStartAuth } from "../utils/auth-utils";
+import { DEFAULT_HOST } from "../utils/config-utils";
+import { existsBuffered, writeFileText } from "../utils/file-utils";
+import { confirmWithUser } from "../utils/user-utils";
+
+export interface LocalizationStringsArgs {
+  host: string;
+  projects: readonly string[];
+  format: "po" | "json" | "lingui";
+  output: string;
+  forceOverwrite: boolean;
+}
+
+export async function localizationStrings(
+  opts: LocalizationStringsArgs
+): Promise<void> {
+  if (!opts.projects || opts.projects.length === 0) {
+    throw new HandledError(`Missing projects.`);
+  }
+  const output = !opts.output
+    ? opts.format === "po"
+      ? "data.po"
+      : "data.json"
+    : opts.output;
+  const auth = await getOrStartAuth({
+    baseDir: "",
+    host: opts.host || DEFAULT_HOST,
+  });
+  if (auth) {
+    const api = new PlasmicApi(auth);
+    logger.info(
+      `Generating localization strings for ${chalk.bold(
+        opts.projects.join(", ")
+      )}...`
+    );
+    const data = await api.genLocalizationStrings(opts.projects, opts.format);
+    if (existsBuffered(output)) {
+      const overwrite = await confirmWithUser(
+        `File ${output} already exists. Do you want to overwrite?`,
+        opts.forceOverwrite
+      );
+      if (!overwrite) {
+        throw new HandledError(
+          `Cannot write to ${output}; file already exists.`
+        );
+      }
+    }
+    writeFileText(output, data);
+    logger.info(`Localization strings have been written to ${output}`);
+  } else {
+    logger.error("Missing auth information");
+  }
+}

package/src/actions/sync-global-contexts.ts

@@ -1,7 +1,7 @@
+import L from "lodash";
 import { ChecksumBundle, ProjectMetaBundle } from "../api";
 import { logger } from "../deps";
 import { formatScript, tsxToJsx } from "../utils/code-utils";
-import L from "lodash";
 import {
   PlasmicContext,
   ProjectConfig,
@@ -41,7 +41,7 @@ export async function syncGlobalContexts(
       context,
       resourcePath,
       projectMeta.globalContextBundle.contextModule,
-      { force: false }
+      { force: true }
     );
     projectConfig.globalContextsFilePath = resourcePath;
     const fl = projectLock.fileLocks.find(

package/src/actions/watch.ts

@@ -75,21 +75,72 @@ export async function watchProjects(
     socket.on("error", (data: any) => {
       reject(new HandledError(data));
     });
-    socket.on("update", async (data: any) => {
-      // Just run syncProjects() for now when any project has been updated
-      // Note on the 'updated to revision' part: this is parsed by the
-      // loader package to know that we finished updating the components.
-      await sync(syncOpts, syncMetadata);
-      logger.info(
-        `[${moment().format("HH:mm:ss")}] Project ${
-          data.projectId
-        } updated to revision ${data.revisionNum}`
-      );
+    socket.on(
+      "update",
+      asyncOneAtATime(async (data: any) => {
+        // Just run syncProjects() for now when any project has been updated
+        // Note on the 'updated to revision' part: this is parsed by the
+        // loader package to know that we finished updating the components.
+        await sync(syncOpts, syncMetadata);
+        logger.info(
+          `[${moment().format("HH:mm:ss")}] Project ${
+            data.projectId
+          } updated to revision ${data.revisionNum}`
+        );
 
-      onProjectUpdate?.();
-    });
+        onProjectUpdate?.();
+      }, true)
+    );
   });
 
   logger.info(`Watching projects ${latestProjects} ...`);
   return promise;
 }
+
+/**
+ * Throttle invocations of a function to allow a single outstanding invocation
+ * at a time.
+ *
+ * But, has a buffer of size one, so that after the current invocation
+ * completes, it calls the last attempted invocation.
+ *
+ * Other invocations that get evicted from the buffer get returned bounceValue
+ * upon eviction.
+ */
+type AsyncCallable = (...args: any[]) => Promise<any>;
+
+function asyncOneAtATime(f: AsyncCallable, bounceValue: any): AsyncCallable {
+  interface CallInfo {
+    args: any[];
+    resolve: any;
+    reject: any;
+  }
+  let waitingCall: CallInfo | undefined = undefined,
+    currentPromise: Promise<any> | undefined = undefined;
+  function invoke({ args, resolve, reject }: CallInfo) {
+    const onCompletion = () => {
+      currentPromise = undefined;
+      if (waitingCall) {
+        invoke(waitingCall);
+        waitingCall = undefined;
+      }
+    };
+    currentPromise = f(...args);
+    currentPromise.then(onCompletion, onCompletion);
+    currentPromise.then(resolve, reject);
+  }
+  return (...args: any[]) => {
+    return new Promise((resolve, reject) => {
+      if (!currentPromise) {
+        // Free to proceed.
+        invoke({ args, resolve, reject });
+      } else {
+        // Evict current waiter, and enqueue self.
+        if (waitingCall) {
+          waitingCall.resolve(bounceValue);
+        }
+        waitingCall = { args, resolve, reject };
+      }
+    });
+  };
+}

package/src/api.ts

@@ -286,6 +286,20 @@ export class PlasmicApi {
     return result.data as ProjectMetaInfo;
   }
 
+  async genLocalizationStrings(
+    projects: readonly string[],
+    format: "po" | "json" | "lingui"
+  ) {
+    const result = await this.get(
+      `${
+        this.codegenHost
+      }/api/v1/localization/gen-texts?format=${format}&preview=true&${projects
+        .map((p) => `projectId=${p}`)
+        .join("&")}`
+    );
+    return result.data as string;
+  }
+
   async uploadBundle(
     projectId: string,
     bundleName: string,
@@ -393,6 +407,27 @@ export class PlasmicApi {
     }
   }
 
+  private async get(url: string, rethrowAppError?: boolean) {
+    try {
+      return await axios.get(url, {
+        headers: this.makeHeaders(),
+      });
+    } catch (e) {
+      const error = e as AxiosError;
+      const errorMsg = this.makeErrorMessage(error);
+
+      if (rethrowAppError) {
+        throw new AppServerError(errorMsg);
+      }
+
+      if (!errorMsg) {
+        throw e;
+      }
+
+      throw new HandledError(errorMsg);
+    }
+  }
+
   private makeErrorMessage(error: AxiosError) {
     const response = error.response;
     if (!response) {

package/src/index.ts

@@ -6,6 +6,10 @@ import * as auth from "./actions/auth";
 import { fixImports, FixImportsArgs } from "./actions/fix-imports";
 import { InfoArgs, printProjectInfo } from "./actions/info";
 import { getYargsOption, InitArgs, initPlasmic } from "./actions/init";
+import {
+  localizationStrings,
+  LocalizationStringsArgs,
+} from "./actions/localization-strings";
 import * as projectToken from "./actions/project-token";
 import { sync, SyncArgs } from "./actions/sync";
 import { UploadBundleArgs, uploadJsBundle } from "./actions/upload-bundle";
@@ -226,6 +230,40 @@ yargs
         }),
     (argv) => handleError(projectToken.projectToken(argv))
   )
+  .command<LocalizationStringsArgs>(
+    "localization-strings",
+    false,
+    (yargs) =>
+      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",
+          type: "array",
+        })
+        .option("host", {
+          describe: "Plasmic host to use",
+          type: "string",
+          default: "https://studio.plasmic.app",
+        })
+        .option("format", {
+          describe: 'Output format. Either "json", "po" or "lingui"',
+          type: "string",
+          choices: ["json", "po", "lingui"],
+          default: "json",
+        })
+        .option("output", {
+          alias: "o",
+          describe: "Output file",
+          type: "string",
+        })
+        .option("force-overwrite", {
+          type: "boolean",
+          describe: "Overwrite the output file.",
+          default: false,
+        }),
+    (argv) => handleError(localizationStrings(argv))
+  )
   .demandCommand()
   .strict()
   .help("h")

package/dist/migrations/0.1.143-ensureImportModuleType.d.ts

@@ -1,2 +0,0 @@
-import { PlasmicConfig } from "../utils/config-utils";
-export declare function ensureImportModuleType(config: PlasmicConfig): PlasmicConfig;

package/dist/migrations/0.1.143-ensureImportModuleType.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureImportModuleType = void 0;
-function ensureImportModuleType(config) {
-    for (const project of config.projects) {
-        for (const component of project.components) {
-            component.importSpec.moduleType = "local";
-        }
-    }
-    return config;
-}
-exports.ensureImportModuleType = ensureImportModuleType;