@plasmicapp/cli 0.1.167 → 0.1.168

package/dist/__mocks__/api.js

@@ -276,6 +276,12 @@ class PlasmicApi {
             throw new Error("Unimplemented");
         });
     }
+    latestCodegenVersion() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return "0.0.1";
+        });
+    }
+    ;
     requiredPackages() {
         return __awaiter(this, void 0, void 0, function* () {
             return {

package/dist/actions/sync.js

@@ -257,6 +257,12 @@ function sync(opts, metadataDefaults) {
                 const config = Object.assign(Object.assign({}, loaderConfig), { projects: lodash_1.default.sortBy(lodash_1.default.uniqBy([...freshIdsAndTokens, ...((_b = loaderConfig === null || loaderConfig === void 0 ? void 0 : loaderConfig.projects) !== null && _b !== void 0 ? _b : [])], (p) => p.projectId), (p) => p.projectId) });
                 writeLoaderConfig(opts, config);
             }
+            const codegenVersion = yield context.api.latestCodegenVersion();
+            context.lock.projects.forEach(p => {
+                if (projectsToSync.some(syncedProject => syncedProject.projectId === p.projectId)) {
+                    p.codegenVersion = codegenVersion;
+                }
+            });
             // Write the new ComponentConfigs to disk
             yield config_utils_1.updateConfig(context, context.config, baseDir);
         }));

package/dist/api.d.ts

@@ -127,6 +127,7 @@ export interface ProjectIdAndToken {
 }
 export declare class PlasmicApi {
     private auth;
+    private codegenVersion?;
     constructor(auth: AuthConfig);
     genStyleConfig(styleOpts?: StyleConfig): Promise<StyleConfigResponse>;
     /**
@@ -146,6 +147,7 @@ export declare class PlasmicApi {
     }[], recursive?: boolean): Promise<VersionResolution>;
     getCurrentUser(): Promise<import("axios").AxiosResponse<any>>;
     requiredPackages(): Promise<RequiredPackages>;
+    latestCodegenVersion(): Promise<string>;
     /**
      * Code-gen endpoint.
      * This will fetch components at an exact specified version.

package/dist/api.js

@@ -66,6 +66,15 @@ class PlasmicApi {
             return Object.assign({}, resp.data);
         });
     }
+    latestCodegenVersion() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.codegenVersion) {
+                const resp = yield this.post(`${this.codegenHost}/api/v1/code/latest-codegen-version`);
+                this.codegenVersion = resp.data;
+            }
+            return this.codegenVersion;
+        });
+    }
     /**
      * Code-gen endpoint.
      * This will fetch components at an exact specified version.

package/dist/utils/config-utils.d.ts

@@ -225,6 +225,7 @@ export interface ProjectLock {
     };
     lang: "ts" | "js";
     fileLocks: FileLock[];
+    codegenVersion?: string;
 }
 export interface PlasmicLock {
     projects: ProjectLock[];

package/dist/utils/resolve-utils.js

@@ -75,6 +75,15 @@ function checkProjectMeta(meta, root, context, opts) {
         const projectName = meta.projectName;
         const newVersion = meta.version;
         const indirect = meta.indirect;
+        // 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())) {
+                return false;
+            }
+            return true;
+        });
+        const isOnDiskCodeInvalid = yield checkCodegenVersion();
         // Checks newVersion against plasmic.lock
         const checkVersionLock = () => __awaiter(this, void 0, void 0, function* () {
             const projectLock = context.lock.projects.find((p) => p.projectId === projectId);
@@ -88,7 +97,9 @@ function checkProjectMeta(meta, root, context, opts) {
                 meta !== root) {
                 // If this is a dependency (not root), and we're dealing with latest dep version
                 // just skip, it's confusing
-                deps_1.logger.warn(`'${root.projectName}' depends on ${projectName}@${newVersion}. To update this project, explicitly specify this project for sync. Skipping...`);
+                if (!isOnDiskCodeInvalid) {
+                    deps_1.logger.warn(`'${root.projectName}' depends on ${projectName}@${newVersion}. To update this project, explicitly specify this project for sync. Skipping...`);
+                }
                 return false;
             }
             if (semver.isLatest(newVersion)) {
@@ -106,7 +117,9 @@ function checkProjectMeta(meta, root, context, opts) {
                     return true;
                 }
                 else {
-                    deps_1.logger.info(`Project '${projectName}'@${newVersion} is already up to date; skipping. (To force an update, run again with "--force")`);
+                    if (!isOnDiskCodeInvalid) {
+                        deps_1.logger.info(`Project '${projectName}'@${newVersion} is already up to date; skipping. (To force an update, run again with "--force")`);
+                    }
                     return false;
                 }
             }
@@ -164,9 +177,24 @@ function checkProjectMeta(meta, root, context, opts) {
             // we should always sync it, even if nothing has changed
             return true;
         }
-        return ((yield checkVersionLock()) &&
+        const checkedVersion = (yield checkVersionLock()) &&
             (yield checkVersionRange()) &&
-            (yield checkIndirect()));
+            (yield checkIndirect());
+        if (!checkedVersion && isOnDiskCodeInvalid) {
+            // sync, but try to keep the current version on disk
+            const projectLock = context.lock.projects.find((p) => p.projectId === projectId);
+            const versionOnDisk = projectLock === null || projectLock === void 0 ? void 0 : projectLock.version;
+            deps_1.logger.warn(`Project '${projectName}' was synced by an incompatible version of Plasmic Codegen. Syncing again on the same version ${projectName}@${versionOnDisk}`);
+            meta.version = versionOnDisk !== null && versionOnDisk !== void 0 ? versionOnDisk : meta.version;
+            return true;
+        }
+        else if (checkedVersion) {
+            // sync and upgrade the version
+            return true;
+        }
+        else {
+            return false;
+        }
     });
 }
 /**

package/package.json

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

package/src/__mocks__/api.ts

@@ -372,6 +372,10 @@ class PlasmicApi {
     throw new Error("Unimplemented");
   }
 
+  async latestCodegenVersion(): Promise<string> {
+    return "0.0.1";
+  };
+
   async requiredPackages(): Promise<RequiredPackages> {
     return {
       "@plasmicapp/loader": "0.0.1",

package/src/actions/sync.ts

@@ -416,6 +416,12 @@ export async function sync(
       writeLoaderConfig(opts, config);
     }
 
+    const codegenVersion = await context.api.latestCodegenVersion();
+    context.lock.projects.forEach(p => {
+      if (projectsToSync.some(syncedProject => syncedProject.projectId === p.projectId)) {
+        p.codegenVersion = codegenVersion;
+      }
+    })
     // Write the new ComponentConfigs to disk
     await updateConfig(context, context.config, baseDir);
   });

package/src/api.ts

@@ -161,6 +161,7 @@ export interface ProjectIdAndToken {
 }
 
 export class PlasmicApi {
+  private codegenVersion?: string;
   constructor(private auth: AuthConfig) {}
 
   async genStyleConfig(styleOpts?: StyleConfig): Promise<StyleConfigResponse> {
@@ -213,6 +214,16 @@ export class PlasmicApi {
     return { ...resp.data } as RequiredPackages;
   }
 
+  async latestCodegenVersion(): Promise<string> {
+    if (!this.codegenVersion) {
+      const resp = await this.post(
+        `${this.codegenHost}/api/v1/code/latest-codegen-version`
+      );
+      this.codegenVersion = resp.data as string;
+    }
+    return this.codegenVersion;
+  }
+
   /**
    * Code-gen endpoint.
    * This will fetch components at an exact specified version.

package/src/utils/config-utils.ts

@@ -318,6 +318,8 @@ export interface ProjectLock {
   lang: "ts" | "js";
   // One for each file whose checksum is computed
   fileLocks: FileLock[];
+  // The version of Codegen when this project was written
+  codegenVersion?: string;
 }
 
 export interface PlasmicLock {

package/src/utils/resolve-utils.ts

@@ -68,6 +68,21 @@ async function checkProjectMeta(
   const newVersion = meta.version;
   const indirect = meta.indirect;
 
+  // If the codegen version on-disk is invalid, we will sync again the project.
+  const checkCodegenVersion = async (): Promise<boolean> => {
+    const projectLock = context.lock.projects.find(
+      (p) => p.projectId === projectId
+    );
+
+    if (!!projectLock?.codegenVersion && semver.gte(projectLock.codegenVersion, await context.api.latestCodegenVersion())) {
+      return false;
+    }
+
+    return true;
+  };
+
+  const isOnDiskCodeInvalid = await checkCodegenVersion();
+
   // Checks newVersion against plasmic.lock
   const checkVersionLock = async (): Promise<boolean> => {
     const projectLock = context.lock.projects.find(
@@ -87,9 +102,11 @@ async function checkProjectMeta(
     ) {
       // If this is a dependency (not root), and we're dealing with latest dep version
       // just skip, it's confusing
-      logger.warn(
-        `'${root.projectName}' depends on ${projectName}@${newVersion}. To update this project, explicitly specify this project for sync. Skipping...`
-      );
+      if (!isOnDiskCodeInvalid) {
+        logger.warn(
+          `'${root.projectName}' depends on ${projectName}@${newVersion}. To update this project, explicitly specify this project for sync. Skipping...`
+        );
+      }
       return false;
     }
 
@@ -111,9 +128,11 @@ async function checkProjectMeta(
         );
         return true;
       } else {
-        logger.info(
-          `Project '${projectName}'@${newVersion} is already up to date; skipping. (To force an update, run again with "--force")`
-        );
+        if (!isOnDiskCodeInvalid) { 
+          logger.info(
+            `Project '${projectName}'@${newVersion} is already up to date; skipping. (To force an update, run again with "--force")`
+          );
+        }
         return false;
       }
     }
@@ -211,12 +230,29 @@ async function checkProjectMeta(
     // we should always sync it, even if nothing has changed
     return true;
   }
-
-  return (
+  const checkedVersion = 
     (await checkVersionLock()) &&
     (await checkVersionRange()) &&
-    (await checkIndirect())
-  );
+    (await checkIndirect());
+
+ if(!checkedVersion && isOnDiskCodeInvalid) {
+    // sync, but try to keep the current version on disk
+    const projectLock = context.lock.projects.find(
+      (p) => p.projectId === projectId
+    );
+    const versionOnDisk = projectLock?.version;
+    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) {
+    // sync and upgrade the version
+    return true;
+  } else {
+    return false;
+  }
 }
 
 /**