@plasmicapp/cli 0.1.301 → 0.1.302

package/dist/actions/sync.d.ts

@@ -13,6 +13,7 @@ export interface SyncArgs extends CommonArgs {
     allFiles?: boolean;
     loaderConfig?: string;
     skipFormatting?: boolean;
+    skipBuffering?: boolean;
 }
 /**
  * Sync will always try to sync down a set of components that are version-consistent among specified projects.

package/dist/index.js

@@ -735439,6 +735439,7 @@ async function fixAllImportStatements(context, baseDir, summary) {
   logger.info("Fixing import statements...");
   const config = context.config;
   const fixImportContext = mkFixImportContext(config);
+  let lastError = void 0;
   for (const project of config.projects) {
     for (const compConfig of project.components) {
       const compSummary = summary == null ? void 0 : summary.get(compConfig.id);
@@ -735447,17 +735448,34 @@ async function fixAllImportStatements(context, baseDir, summary) {
       }
       const fixSkeletonModule = compSummary ? compSummary.skeletonModuleModified : true;
       if (!summary || compSummary) {
-        await fixComponentImportStatements(
-          context,
-          compConfig,
-          fixImportContext,
-          fixSkeletonModule,
-          baseDir
-        );
+        try {
+          await fixComponentImportStatements(
+            context,
+            compConfig,
+            fixImportContext,
+            fixSkeletonModule,
+            baseDir
+          );
+        } catch (err) {
+          logger.error(
+            `Error encountered while fixing imports for ${compConfig.name}: ${err}`
+          );
+          lastError = err;
+        }
       }
     }
   }
-  fixGlobalContextImportStatements(context, fixImportContext, baseDir);
+  try {
+    fixGlobalContextImportStatements(context, fixImportContext, baseDir);
+  } catch (err) {
+    logger.error(
+      `Error encountered while fixing imports for global contexts: ${err}`
+    );
+    lastError = err;
+  }
+  if (lastError) {
+    throw lastError;
+  }
 }
 async function fixComponentImportStatements(context, compConfig, fixImportContext, fixSkeletonModule, baseDir) {
   if (compConfig.type !== "mapped" && isLocalModulePath(compConfig.importSpec.modulePath) && fixSkeletonModule) {
@@ -738943,7 +738961,7 @@ async function sync(opts, metadataDefaults) {
   context.api.attachProjectIdsAndTokens(projectIdsAndTokens);
   const externalNpmPackages = /* @__PURE__ */ new Set();
   const externalCssImports = /* @__PURE__ */ new Set();
-  await withBufferedFs(async () => {
+  const doSync = async () => {
     var _a2;
     for (const projectMeta of projectsToSync) {
       await syncProject(
@@ -739012,7 +739030,12 @@ async function sync(opts, metadataDefaults) {
       }
     });
     await updateConfig(context, context.config, baseDir);
-  });
+  };
+  if (opts.skipBuffering) {
+    await doSync();
+  } else {
+    await withBufferedFs(doSync);
+  }
   await checkExternalPkgs(
     context,
     baseDir,
@@ -739778,6 +739801,10 @@ function configureSyncArgs(yags, includeQuietOption = true) {
     type: "boolean",
     describe: "Disables formatting on generated code",
     default: false
+  }).option("skip-buffering", {
+    type: "boolean",
+    describe: "Write files directly to disk, instead of buffering and only writing if sync completes successfully",
+    default: false
   }).option("all-files", {
     type: "boolean",
     describe: "Sync all files, including those that haven't changed since last sync",

package/dist/lib.js

@@ -730779,6 +730779,7 @@ async function fixAllImportStatements(context, baseDir, summary) {
   logger.info("Fixing import statements...");
   const config = context.config;
   const fixImportContext = mkFixImportContext(config);
+  let lastError = void 0;
   for (const project of config.projects) {
     for (const compConfig of project.components) {
       const compSummary = summary == null ? void 0 : summary.get(compConfig.id);
@@ -730787,17 +730788,34 @@ async function fixAllImportStatements(context, baseDir, summary) {
       }
       const fixSkeletonModule = compSummary ? compSummary.skeletonModuleModified : true;
       if (!summary || compSummary) {
-        await fixComponentImportStatements(
-          context,
-          compConfig,
-          fixImportContext,
-          fixSkeletonModule,
-          baseDir
-        );
+        try {
+          await fixComponentImportStatements(
+            context,
+            compConfig,
+            fixImportContext,
+            fixSkeletonModule,
+            baseDir
+          );
+        } catch (err) {
+          logger.error(
+            `Error encountered while fixing imports for ${compConfig.name}: ${err}`
+          );
+          lastError = err;
+        }
       }
     }
   }
-  fixGlobalContextImportStatements(context, fixImportContext, baseDir);
+  try {
+    fixGlobalContextImportStatements(context, fixImportContext, baseDir);
+  } catch (err) {
+    logger.error(
+      `Error encountered while fixing imports for global contexts: ${err}`
+    );
+    lastError = err;
+  }
+  if (lastError) {
+    throw lastError;
+  }
 }
 async function fixComponentImportStatements(context, compConfig, fixImportContext, fixSkeletonModule, baseDir) {
   if (compConfig.type !== "mapped" && isLocalModulePath(compConfig.importSpec.modulePath) && fixSkeletonModule) {
@@ -734239,7 +734257,7 @@ async function sync(opts, metadataDefaults) {
   context.api.attachProjectIdsAndTokens(projectIdsAndTokens);
   const externalNpmPackages = /* @__PURE__ */ new Set();
   const externalCssImports = /* @__PURE__ */ new Set();
-  await withBufferedFs(async () => {
+  const doSync = async () => {
     var _a2;
     for (const projectMeta of projectsToSync) {
       await syncProject(
@@ -734308,7 +734326,12 @@ async function sync(opts, metadataDefaults) {
       }
     });
     await updateConfig(context, context.config, baseDir);
-  });
+  };
+  if (opts.skipBuffering) {
+    await doSync();
+  } else {
+    await withBufferedFs(doSync);
+  }
   await checkExternalPkgs(
     context,
     baseDir,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/cli",
-  "version": "0.1.301",
+  "version": "0.1.302",
   "description": "plasmic cli for syncing local code with Plasmic designs",
   "engines": {
     "node": ">=12"
@@ -78,5 +78,5 @@
     "wrap-ansi": "^7.0.0",
     "yargs": "^15.4.1"
   },
-  "gitHead": "eb28b8015d98fcffb97ed126463f35476a2ecf13"
+  "gitHead": "98f55a13c36ec563fe7e8f286167d0c3f241fee8"
 }

package/src/actions/sync.ts

@@ -75,6 +75,7 @@ export interface SyncArgs extends CommonArgs {
   allFiles?: boolean;
   loaderConfig?: string;
   skipFormatting?: boolean;
+  skipBuffering?: boolean;
 }
 
 async function ensureRequiredPackages(
@@ -319,8 +320,7 @@ export async function sync(
   const externalNpmPackages = new Set<string>();
   const externalCssImports = new Set<string>();
 
-  // Perform the actual sync
-  await withBufferedFs(async () => {
+  const doSync = async () => {
     // Sync in sequence (no parallelism)
     // going in reverse to get leaves of the dependency tree first
     for (const projectMeta of projectsToSync) {
@@ -408,7 +408,14 @@ export async function sync(
     });
     // Write the new ComponentConfigs to disk
     await updateConfig(context, context.config, baseDir);
-  });
+  };
+
+  // Perform the actual sync
+  if (opts.skipBuffering) {
+    await doSync();
+  } else {
+    await withBufferedFs(doSync);
+  }
 
   await checkExternalPkgs(
     context,

package/src/index.ts

@@ -366,6 +366,12 @@ function configureSyncArgs(
       describe: "Disables formatting on generated code",
       default: false,
     })
+    .option("skip-buffering", {
+      type: "boolean",
+      describe:
+        "Write files directly to disk, instead of buffering and only writing if sync completes successfully",
+      default: false,
+    })
     .option("all-files", {
       type: "boolean",
       describe:

package/src/utils/code-utils.ts

@@ -504,6 +504,7 @@ export async function fixAllImportStatements(
   logger.info("Fixing import statements...");
   const config = context.config;
   const fixImportContext = mkFixImportContext(config);
+  let lastError: any = undefined;
   for (const project of config.projects) {
     for (const compConfig of project.components) {
       const compSummary = summary?.get(compConfig.id);
@@ -514,17 +515,36 @@ export async function fixAllImportStatements(
         ? compSummary.skeletonModuleModified
         : true;
       if (!summary || compSummary) {
-        await fixComponentImportStatements(
-          context,
-          compConfig,
-          fixImportContext,
-          fixSkeletonModule,
-          baseDir
-        );
+        try {
+          await fixComponentImportStatements(
+            context,
+            compConfig,
+            fixImportContext,
+            fixSkeletonModule,
+            baseDir
+          );
+        } catch (err) {
+          logger.error(
+            `Error encountered while fixing imports for ${compConfig.name}: ${err}`
+          );
+          lastError = err;
+        }
       }
     }
   }
-  fixGlobalContextImportStatements(context, fixImportContext, baseDir);
+
+  try {
+    fixGlobalContextImportStatements(context, fixImportContext, baseDir);
+  } catch (err) {
+    logger.error(
+      `Error encountered while fixing imports for global contexts: ${err}`
+    );
+    lastError = err;
+  }
+
+  if (lastError) {
+    throw lastError;
+  }
 }
 
 async function fixComponentImportStatements(