@plasmicapp/cli 0.1.341 → 0.1.343

package/src/utils/checksum.ts

@@ -33,6 +33,12 @@ function getFilesByFileLockAssetId(
     splitsProvider: {
       [projectConfig.projectId]: projectConfig.splitsProviderFilePath,
     },
+    styleTokensProvider: {
+      [projectConfig.projectId]: projectConfig.styleTokensProviderFilePath,
+    },
+    projectModule: {
+      [projectConfig.projectId]: projectConfig.projectModuleFilePath,
+    },
   } as const;
 }
 
@@ -60,6 +66,8 @@ export function getChecksums(
       projectCssChecksum: "",
       globalContextsChecksum: "",
       splitsProviderChecksum: "",
+      styleTokensProviderChecksum: "",
+      projectModuleChecksum: "",
     };
   }
 
@@ -161,6 +169,33 @@ export function getChecksums(
       ? globalContextsChecksums[0].checksum
       : "";
 
+  const styleTokensProviderChecksums = fileLocks
+    .filter(
+      (fileLock) =>
+        fileLock.type === "styleTokensProvider" &&
+        fileLock.assetId === projectId
+    )
+    .filter((fileLock) =>
+      checkFile(fileLocations.styleTokensProvider[fileLock.assetId])
+    );
+  assert(styleTokensProviderChecksums.length < 2);
+  const styleTokensProviderChecksum =
+    styleTokensProviderChecksums.length > 0
+      ? styleTokensProviderChecksums[0].checksum
+      : "";
+
+  const projectModuleChecksums = fileLocks
+    .filter(
+      (fileLock) =>
+        fileLock.type === "projectModule" && fileLock.assetId === projectId
+    )
+    .filter((fileLock) =>
+      checkFile(fileLocations.projectModule[fileLock.assetId])
+    );
+  assert(projectModuleChecksums.length < 2);
+  const projectModuleChecksum =
+    projectModuleChecksums.length > 0 ? projectModuleChecksums[0].checksum : "";
+
   const splitsProviderChecksums = fileLocks
     .filter(
       (fileLock) =>
@@ -184,5 +219,7 @@ export function getChecksums(
     projectCssChecksum,
     globalContextsChecksum,
     splitsProviderChecksum,
+    styleTokensProviderChecksum,
+    projectModuleChecksum,
   };
 }

package/src/utils/code-utils.ts

@@ -13,7 +13,9 @@ import {
   fixComponentCssReferences,
   fixComponentImagesReferences,
 } from "../actions/sync-images";
+import { getProjectModuleResourcePath } from "../actions/sync-project-module";
 import { getSplitsProviderResourcePath } from "../actions/sync-splits-provider";
+import { getStyleTokensProviderResourcePath } from "../actions/sync-style-tokens-provider";
 import { logger } from "../deps";
 import { GLOBAL_SETTINGS } from "../globals";
 import { HandledError } from "../utils/error";
@@ -173,6 +175,8 @@ type PlasmicImportType =
   | "globalContext"
   | "customFunction"
   | "splitsProvider"
+  | "styleTokensProvider"
+  | "projectModule"
   | "rscClient"
   | "rscServer"
   | undefined;
@@ -203,7 +207,7 @@ function tryParsePlasmicImportSpec(node: ImportDeclaration) {
         "plasmic-import:\\s+([",
         ...validJsIdentifierChars,
         "\\.",
-        "]+)(?:\\/(component|css|render|globalVariant|projectcss|defaultcss|icon|picture|jsBundle|codeComponent|globalContext|customFunction|splitsProvider|rscClient|rscServer))?",
+        "]+)(?:\\/(component|css|render|globalVariant|projectcss|defaultcss|icon|picture|jsBundle|codeComponent|globalContext|customFunction|splitsProvider|styleTokensProvider|projectModule|rscClient|rscServer))?",
       ].join("")
     )
   );
@@ -441,6 +445,30 @@ export function replaceImports(
         true
       );
       stmt.source.value = realPath;
+    } else if (type === "styleTokensProvider") {
+      const projectConfig = fixImportContext.projects[uuid];
+      if (!projectConfig) {
+        throwMissingReference(context, "project", uuid, fromPath);
+      }
+      const realPath = makeImportPath(
+        context,
+        fromPath,
+        projectConfig.styleTokensProviderFilePath,
+        true
+      );
+      stmt.source.value = realPath;
+    } else if (type === "projectModule") {
+      const projectConfig = fixImportContext.projects[uuid];
+      if (!projectConfig) {
+        throwMissingReference(context, "project", uuid, fromPath);
+      }
+      const realPath = makeImportPath(
+        context,
+        fromPath,
+        projectConfig.projectModuleFilePath,
+        true
+      );
+      stmt.source.value = realPath;
     } else if (type === "rscClient") {
       const compConfig = fixImportContext.components[uuid];
       if (!compConfig) {
@@ -668,7 +696,13 @@ export async function fixAllImportStatements(
   }
 
   try {
-    fixSplitsProviderImportStatements(context, fixImportContext, baseDir);
+    fixImportStatements(
+      context,
+      fixImportContext,
+      baseDir,
+      "splitsProviderFilePath",
+      getSplitsProviderResourcePath
+    );
   } catch (err) {
     logger.error(
       `Error encountered while fixing imports for splits provider: ${err}`
@@ -676,6 +710,36 @@ export async function fixAllImportStatements(
     lastError = err;
   }
 
+  try {
+    fixImportStatements(
+      context,
+      fixImportContext,
+      baseDir,
+      "projectModuleFilePath",
+      getProjectModuleResourcePath
+    );
+  } catch (err) {
+    logger.error(
+      `Error encountered while fixing imports for project module bundle: ${err}`
+    );
+    lastError = err;
+  }
+
+  try {
+    fixImportStatements(
+      context,
+      fixImportContext,
+      baseDir,
+      "styleTokensProviderFilePath",
+      getStyleTokensProviderResourcePath
+    );
+  } catch (err) {
+    logger.error(
+      `Error encountered while fixing imports for style tokens provider: ${err}`
+    );
+    lastError = err;
+  }
+
   if (lastError) {
     throw lastError;
   }
@@ -901,14 +965,17 @@ async function fixGlobalContextImportStatements(
   }
 }
 
-async function fixSplitsProviderImportStatements(
+async function fixImportStatements(
   context: PlasmicContext,
   fixImportContext: FixImportContext,
-  baseDir: string
+  baseDir: string,
+  configKey: keyof ProjectConfig,
+  getResourcePath: (context: PlasmicContext, project: ProjectConfig) => string
 ) {
   for (const project of context.config.projects) {
-    if (!project.splitsProviderFilePath) continue;
-    const resourcePath = getSplitsProviderResourcePath(context, project);
+    if (!project[configKey]) continue;
+
+    const resourcePath = getResourcePath(context, project);
 
     let prevContent: string;
     try {

package/src/utils/config-utils.ts

@@ -191,6 +191,10 @@ export interface ProjectConfig {
   globalContextsFilePath: string;
   /** File location for the project-wide splits provider. Relative to srcDir */
   splitsProviderFilePath: string;
+  /** File location for the project-wide style tokens provider. Relative to srcDir */
+  styleTokensProviderFilePath: string;
+  /** File location for the project-wide plasmic.ts file. Relative to srcDir */
+  projectModuleFilePath: string;
 
   // Code-component-related fields can be treated as optional not to be shown
   // to the users nor appear to be missing in the documentation.
@@ -234,6 +238,8 @@ export function createProjectConfig(base: {
     indirect: base.indirect,
     globalContextsFilePath: "",
     splitsProviderFilePath: "",
+    styleTokensProviderFilePath: "",
+    projectModuleFilePath: "",
   };
 }
 
@@ -361,7 +367,9 @@ export interface FileLock {
     | "projectCss"
     | "globalVariant"
     | "globalContexts"
-    | "splitsProvider";
+    | "splitsProvider"
+    | "styleTokensProvider"
+    | "projectModule";
   // The checksum value for the file
   checksum: string;
   // The component id, or the image asset id
@@ -611,6 +619,8 @@ export function getOrAddProjectConfig(
           indirect: false,
           globalContextsFilePath: "",
           splitsProviderFilePath: "",
+          styleTokensProviderFilePath: "",
+          projectModuleFilePath: "",
         };
     context.config.projects.push(project);
   }

package/src/utils/get-context.ts

@@ -101,6 +101,10 @@ function removeMissingFilesFromLock(
             return knownProjects[project.projectId].globalContextsFilePath;
           case "splitsProvider":
             return knownProjects[project.projectId].splitsProviderFilePath;
+          case "projectModule":
+            return knownProjects[project.projectId].projectModuleFilePath;
+          case "styleTokensProvider":
+            return knownProjects[project.projectId].styleTokensProviderFilePath;
         }
       });
 
@@ -243,6 +247,30 @@ async function resolveMissingFilesInConfig(
         baseNameToFiles
       )) || project.splitsProviderFilePath;
 
+    if (!project.styleTokensProviderFilePath) {
+      project.styleTokensProviderFilePath = "";
+    }
+
+    // Try to find the file, otherwise recreate at either the specified path or default path (if both are falsey)
+    project.styleTokensProviderFilePath =
+      (await attemptToRestoreFilePath(
+        context,
+        project.styleTokensProviderFilePath,
+        baseNameToFiles
+      )) || project.styleTokensProviderFilePath;
+
+    if (!project.projectModuleFilePath) {
+      project.projectModuleFilePath = "";
+    }
+
+    // Try to find the file, otherwise recreate at either the specified path or default path (if both are falsey)
+    project.projectModuleFilePath =
+      (await attemptToRestoreFilePath(
+        context,
+        project.projectModuleFilePath,
+        baseNameToFiles
+      )) || project.projectModuleFilePath;
+
     project.images = await filterFiles(project.images, "filePath");
     project.icons = await filterFiles(project.icons, "moduleFilePath");
 

package/src/utils/test-utils.ts

@@ -2,8 +2,8 @@ import fs from "fs";
 import * as path from "path";
 import * as tmp from "tmp";
 import {
-  AuthConfig,
   AUTH_FILE_NAME,
+  AuthConfig,
   CONFIG_FILE_NAME,
   PlasmicConfig,
 } from "../utils/config-utils";