@plasmicapp/cli 0.1.177 → 0.1.180

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/sync.js

@@ -269,10 +269,10 @@ function sync(opts, metadataDefaults) {
         }));
         yield checkExternalPkgs(context, baseDir, opts, Array.from(externalNpmPackages.keys()));
         if (!opts.quiet && externalCssImports.size > 0) {
-            deps_1.logger.info(`This project uses external packages and styles. Make sure to import the following global CSS: ` +
+            deps_1.logger.info(chalk_1.default.cyanBright.bold(`IMPORTANT: This project uses external packages and styles. Make sure to import the following global CSS: ` +
                 Array.from(externalCssImports.keys())
                     .map((stmt) => `"${stmt}"`)
-                    .join(", "));
+                    .join(", ")));
         }
         // Post-sync commands
         if (!opts.ignorePostSync) {

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/package.json

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

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/sync.ts

@@ -440,10 +440,12 @@ export async function sync(
 
   if (!opts.quiet && externalCssImports.size > 0) {
     logger.info(
-      `This project uses external packages and styles. Make sure to import the following global CSS: ` +
-        Array.from(externalCssImports.keys())
-          .map((stmt) => `"${stmt}"`)
-          .join(", ")
+      chalk.cyanBright.bold(
+        `IMPORTANT: This project uses external packages and styles. Make sure to import the following global CSS: ` +
+          Array.from(externalCssImports.keys())
+            .map((stmt) => `"${stmt}"`)
+            .join(", ")
+      )
     );
   }
 

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 };
+      }
+    });
+  };
+}