@plasmicapp/cli 0.1.185 → 0.1.187

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

@@ -1,6 +1,8 @@
-export interface LocalizationStringsArgs {
+import { CommonArgs } from "..";
+export interface LocalizationStringsArgs extends CommonArgs {
     host: string;
     projects: readonly string[];
+    projectTokens?: readonly string[];
     format: "po" | "json" | "lingui";
     output: string;
     forceOverwrite: boolean;

package/dist/actions/localization-strings.js

@@ -14,31 +14,59 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.localizationStrings = void 0;
 const chalk_1 = __importDefault(require("chalk"));
+const lodash_1 = require("lodash");
 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 get_context_1 = require("../utils/get-context");
 const user_utils_1 = require("../utils/user-utils");
 function localizationStrings(opts) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         if (!opts.projects || opts.projects.length === 0) {
             throw new lib_1.HandledError(`Missing projects.`);
         }
+        if (!opts.baseDir)
+            opts.baseDir = process.cwd();
+        const parsedProjectTokens = ((_a = opts.projectTokens) !== null && _a !== void 0 ? _a : []).map((val) => {
+            const [projectId, projectApiToken] = val.split(":");
+            if (!projectId || !projectApiToken) {
+                throw new Error(`Invalid value passed to '--project-tokens': ${val}\nPlease provide the API tokens with the format PROJECT_ID:PROJECT_API_TOKEN`);
+            }
+            return {
+                projectId: projectId.trim(),
+                projectApiToken: projectApiToken.trim(),
+            };
+        });
         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);
+        const projectTokensFromConfig = [];
+        const auth = yield auth_utils_1.getCurrentAuth(opts.auth);
+        const maybeConfigFile = opts.config || config_utils_1.findConfigFile(opts.baseDir, { traverseParents: true });
+        if (maybeConfigFile) {
+            const context = yield get_context_1.getContext(opts, { enableSkipAuth: true });
+            context.config.projects.forEach((p) => {
+                projectTokensFromConfig.push(lodash_1.pick(p, "projectId", "projectApiToken"));
+            });
+        }
+        const projectIdsAndTokens = [
+            ...parsedProjectTokens,
+            ...projectTokensFromConfig,
+        ].filter((v) => !!v && !!v.projectId && !!v.projectApiToken);
+        if (auth || projectIdsAndTokens.length > 0) {
+            const api = new api_1.PlasmicApi(auth !== null && auth !== void 0 ? auth : {
+                host: config_utils_1.DEFAULT_HOST,
+                user: "",
+                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);
+            const data = yield api.genLocalizationStrings(opts.projects, opts.format, 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) {
@@ -49,7 +77,10 @@ function localizationStrings(opts) {
             deps_1.logger.info(`Localization strings have been written to ${output}`);
         }
         else {
-            deps_1.logger.error("Missing auth information");
+            deps_1.logger.error(`Missing auth information. You can follow any of the steps below to fix it:
+- Run 'plasmic auth'
+- Provide the project API token to 'plasmic.json'
+- Or provide the project API token through '--project-tokens' flag`);
         }
     });
 }

package/dist/actions/sync-styles.d.ts

@@ -1,3 +1,3 @@
 import { StyleTokensMap } from "../api";
 import { PlasmicContext } from "../utils/config-utils";
-export declare function upsertStyleTokens(context: PlasmicContext, newStyleMap: StyleTokensMap): Promise<void>;
+export declare function upsertStyleTokens(context: PlasmicContext, newStyleMap: StyleTokensMap, projectId: string): Promise<void>;

package/dist/actions/sync-styles.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.upsertStyleTokens = void 0;
 const error_1 = require("../utils/error");
 const file_utils_1 = require("../utils/file-utils");
-function upsertStyleTokens(context, newStyleMap) {
+function upsertStyleTokens(context, newStyleMap, projectId) {
     return __awaiter(this, void 0, void 0, function* () {
         const curStyleMap = yield readCurStyleMap(context);
         for (const prop of newStyleMap.props) {
@@ -24,6 +24,19 @@ function upsertStyleTokens(context, newStyleMap) {
                 curStyleMap.props.push(prop);
             }
         }
+        const allNewPropIds = new Set(newStyleMap.props.map((prop) => prop.meta.id));
+        curStyleMap.props = curStyleMap.props.filter((prop) => {
+            if (prop.meta.projectId !== projectId) {
+                // Keep all tokens from other projects
+                return true;
+            }
+            if (allNewPropIds.has(prop.meta.id)) {
+                // Keep the current tokens in this project
+                return true;
+            }
+            // Delete the tokens that have been removed from the project
+            return false;
+        });
         curStyleMap.props.sort((prop1, prop2) => prop1.name === prop2.name ? 0 : prop1.name < prop2.name ? -1 : 1);
         yield file_utils_1.writeFileContent(context, context.config.tokens.tokensFilePath, JSON.stringify(curStyleMap, undefined, 2), { force: true });
     });

package/dist/actions/sync.js

@@ -381,7 +381,7 @@ function syncProject(context, opts, projectIdsAndTokens, projectId, componentIds
         yield sync_global_variants_1.syncGlobalVariants(context, projectBundle.projectConfig, projectBundle.globalVariants, projectBundle.checksums, opts.baseDir);
         yield syncProjectConfig(context, projectBundle.projectConfig, projectApiToken, projectVersion, dependencies, projectBundle.components, opts.forceOverwrite, !!opts.appendJsxOnMissingBase, summary, pendingMerge, projectBundle.checksums, opts.baseDir, indirect);
         syncCodeComponentsMeta(context, projectId, projectBundle.codeComponentMetas);
-        yield sync_styles_1.upsertStyleTokens(context, projectBundle.usedTokens);
+        yield sync_styles_1.upsertStyleTokens(context, projectBundle.usedTokens, projectBundle.projectConfig.projectId);
         yield sync_icons_1.syncProjectIconAssets(context, projectId, projectVersion, projectBundle.iconAssets, projectBundle.checksums, opts.baseDir);
         yield sync_images_1.syncProjectImageAssets(context, projectId, projectVersion, projectBundle.imageAssets, projectBundle.checksums);
         (projectBundle.usedNpmPackages || []).forEach((pkg) => externalNpmPackages.add(pkg));

package/dist/api.d.ts

@@ -189,7 +189,7 @@ export declare class PlasmicApi {
         metadata?: Metadata;
     }): Promise<ProjectBundle>;
     projectMeta(projectId: string): Promise<ProjectMetaInfo>;
-    genLocalizationStrings(projects: readonly string[], format: "po" | "json" | "lingui"): Promise<string>;
+    genLocalizationStrings(projects: readonly string[], format: "po" | "json" | "lingui", 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, versionRange?: string): Promise<StyleTokensMap>;
     projectIcons(projectId: string, versionRange?: string, iconIds?: string[]): Promise<ProjectIconsResponse>;

package/dist/api.js

@@ -99,11 +99,15 @@ class PlasmicApi {
             return result.data;
         });
     }
-    genLocalizationStrings(projects, format) {
+    genLocalizationStrings(projects, format, 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
                 .map((p) => `projectId=${p}`)
-                .join("&")}`);
+                .join("&")}`, undefined, {
+                "x-plasmic-api-project-tokens": projectIdsAndTokens
+                    .map(({ projectId, projectApiToken }) => `${projectId}:${projectApiToken}`)
+                    .join(","),
+            });
             return result.data;
         });
     }
@@ -176,11 +180,11 @@ class PlasmicApi {
             }
         });
     }
-    get(url, rethrowAppError) {
+    get(url, rethrowAppError, extraHeaders) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 return yield axios_1.default.get(url, {
-                    headers: this.makeHeaders(),
+                    headers: Object.assign(Object.assign({}, this.makeHeaders()), (extraHeaders !== null && extraHeaders !== void 0 ? extraHeaders : {})),
                 });
             }
             catch (e) {

package/dist/index.js

@@ -213,6 +213,11 @@ yargs_1.default
     type: "boolean",
     describe: "Overwrite the output file.",
     default: false,
+})
+    .option("project-tokens", {
+    type: "array",
+    default: [],
+    describe: "(Optional) List of project API tokens to be used for auth, in the format PROJECT_ID:PROJECT_API_TOKEN (the pairs should be separated by comma)",
 }), (argv) => error_1.handleError(localization_strings_1.localizationStrings(argv)))
     .demandCommand()
     .strict()

package/dist/utils/npm-utils.js

@@ -155,7 +155,9 @@ function findInstalledPackageJsonFile(context, pkg) {
     const rootDir = packageJsonPath
         ? path_1.default.dirname(packageJsonPath)
         : context.rootDir;
-    const files = fast_glob_1.default.sync(`${rootDir}/**/node_modules/${pkg}/package.json`);
+    const files = fast_glob_1.default.sync(`${rootDir}/**/node_modules/${pkg}/package.json`, {
+        ignore: [`**/node_modules/**/node_modules/**`],
+    });
     return files.length > 0 ? files[0] : undefined;
 }
 function parsePackageJson(path) {

package/package.json

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

package/src/actions/localization-strings.ts

@@ -1,15 +1,23 @@
 import chalk from "chalk";
-import { PlasmicApi } from "../api";
+import { pick } from "lodash";
+import { CommonArgs } from "..";
+import { PlasmicApi, ProjectIdAndToken } from "../api";
 import { logger } from "../deps";
 import { HandledError } from "../lib";
-import { getOrStartAuth } from "../utils/auth-utils";
-import { DEFAULT_HOST } from "../utils/config-utils";
+import { getCurrentAuth, getOrStartAuth } from "../utils/auth-utils";
+import {
+  DEFAULT_HOST,
+  findConfigFile,
+  PlasmicContext,
+} from "../utils/config-utils";
 import { existsBuffered, writeFileText } from "../utils/file-utils";
+import { getContext } from "../utils/get-context";
 import { confirmWithUser } from "../utils/user-utils";
 
-export interface LocalizationStringsArgs {
+export interface LocalizationStringsArgs extends CommonArgs {
   host: string;
   projects: readonly string[];
+  projectTokens?: readonly string[];
   format: "po" | "json" | "lingui";
   output: string;
   forceOverwrite: boolean;
@@ -21,23 +29,60 @@ export async function localizationStrings(
   if (!opts.projects || opts.projects.length === 0) {
     throw new HandledError(`Missing projects.`);
   }
+  if (!opts.baseDir) opts.baseDir = process.cwd();
+  const parsedProjectTokens: ProjectIdAndToken[] = (
+    opts.projectTokens ?? []
+  ).map((val) => {
+    const [projectId, projectApiToken] = val.split(":");
+    if (!projectId || !projectApiToken) {
+      throw new Error(
+        `Invalid value passed to '--project-tokens': ${val}\nPlease provide the API tokens with the format PROJECT_ID:PROJECT_API_TOKEN`
+      );
+    }
+    return {
+      projectId: projectId.trim(),
+      projectApiToken: projectApiToken.trim(),
+    };
+  });
   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);
+  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"));
+    });
+  }
+
+  const projectIdsAndTokens = [
+    ...parsedProjectTokens,
+    ...projectTokensFromConfig,
+  ].filter((v) => !!v && !!v.projectId && !!v.projectApiToken);
+
+  if (auth || projectIdsAndTokens.length > 0) {
+    const api = new PlasmicApi(
+      auth ?? {
+        host: DEFAULT_HOST,
+        user: "",
+        token: "",
+      }
+    );
     logger.info(
       `Generating localization strings for ${chalk.bold(
         opts.projects.join(", ")
       )}...`
     );
-    const data = await api.genLocalizationStrings(opts.projects, opts.format);
+    const data = await api.genLocalizationStrings(
+      opts.projects,
+      opts.format,
+      projectIdsAndTokens
+    );
     if (existsBuffered(output)) {
       const overwrite = await confirmWithUser(
         `File ${output} already exists. Do you want to overwrite?`,
@@ -52,6 +97,9 @@ export async function localizationStrings(
     writeFileText(output, data);
     logger.info(`Localization strings have been written to ${output}`);
   } else {
-    logger.error("Missing auth information");
+    logger.error(`Missing auth information. You can follow any of the steps below to fix it:
+- Run 'plasmic auth'
+- Provide the project API token to 'plasmic.json'
+- Or provide the project API token through '--project-tokens' flag`);
   }
 }

package/src/actions/sync-styles.ts

@@ -9,7 +9,8 @@ import {
 
 export async function upsertStyleTokens(
   context: PlasmicContext,
-  newStyleMap: StyleTokensMap
+  newStyleMap: StyleTokensMap,
+  projectId: string
 ) {
   const curStyleMap = await readCurStyleMap(context);
   for (const prop of newStyleMap.props) {
@@ -22,6 +23,19 @@ export async function upsertStyleTokens(
       curStyleMap.props.push(prop);
     }
   }
+  const allNewPropIds = new Set(newStyleMap.props.map((prop) => prop.meta.id));
+  curStyleMap.props = curStyleMap.props.filter((prop) => {
+    if (prop.meta.projectId !== projectId) {
+      // Keep all tokens from other projects
+      return true;
+    }
+    if (allNewPropIds.has(prop.meta.id)) {
+      // Keep the current tokens in this project
+      return true;
+    }
+    // Delete the tokens that have been removed from the project
+    return false;
+  });
   curStyleMap.props.sort((prop1, prop2) =>
     prop1.name === prop2.name ? 0 : prop1.name < prop2.name ? -1 : 1
   );

package/src/actions/sync.ts

@@ -672,7 +672,11 @@ async function syncProject(
     indirect
   );
   syncCodeComponentsMeta(context, projectId, projectBundle.codeComponentMetas);
-  await upsertStyleTokens(context, projectBundle.usedTokens);
+  await upsertStyleTokens(
+    context,
+    projectBundle.usedTokens,
+    projectBundle.projectConfig.projectId
+  );
   await syncProjectIconAssets(
     context,
     projectId,

package/src/api.ts

@@ -289,14 +289,24 @@ export class PlasmicApi {
 
   async genLocalizationStrings(
     projects: readonly string[],
-    format: "po" | "json" | "lingui"
+    format: "po" | "json" | "lingui",
+    projectIdsAndTokens: ProjectIdAndToken[]
   ) {
     const result = await this.get(
       `${
         this.codegenHost
       }/api/v1/localization/gen-texts?format=${format}&preview=true&${projects
         .map((p) => `projectId=${p}`)
-        .join("&")}`
+        .join("&")}`,
+      undefined,
+      {
+        "x-plasmic-api-project-tokens": projectIdsAndTokens
+          .map(
+            ({ projectId, projectApiToken }) =>
+              `${projectId}:${projectApiToken}`
+          )
+          .join(","),
+      }
     );
     return result.data as string;
   }
@@ -408,10 +418,10 @@ export class PlasmicApi {
     }
   }
 
-  private async get(url: string, rethrowAppError?: boolean) {
+  private async get(url: string, rethrowAppError?: boolean, extraHeaders?: {}) {
     try {
       return await axios.get(url, {
-        headers: this.makeHeaders(),
+        headers: { ...this.makeHeaders(), ...(extraHeaders ?? {}) },
       });
     } catch (e) {
       const error = e as AxiosError;

package/src/index.ts

@@ -261,6 +261,12 @@ yargs
           type: "boolean",
           describe: "Overwrite the output file.",
           default: false,
+        })
+        .option("project-tokens", {
+          type: "array",
+          default: [],
+          describe:
+            "(Optional) List of project API tokens to be used for auth, in the format PROJECT_ID:PROJECT_API_TOKEN (the pairs should be separated by comma)",
         }),
     (argv) => handleError(localizationStrings(argv))
   )

package/src/utils/npm-utils.ts

@@ -169,7 +169,9 @@ function findInstalledPackageJsonFile(context: PlasmicContext, pkg: string) {
   const rootDir = packageJsonPath
     ? path.dirname(packageJsonPath)
     : context.rootDir;
-  const files = glob.sync(`${rootDir}/**/node_modules/${pkg}/package.json`);
+  const files = glob.sync(`${rootDir}/**/node_modules/${pkg}/package.json`, {
+    ignore: [`**/node_modules/**/node_modules/**`],
+  });
   return files.length > 0 ? files[0] : undefined;
 }