@trops/dash-core 0.1.823 → 0.1.824

package/dist/electron/index.js

@@ -4004,7 +4004,15 @@ function findWidgetsDir$2(widgetPath) {
  *   package's listed libraries, never the app's (registry rebuilds)
  * @returns {Promise<string|null>} Path to the compiled bundle, or null if nothing to compile
  */
-async function compileWidget$1(widgetPath, { ownLibrariesOnly = false } = {}) {
+/**
+ * outDir: where the build goes (default <widgetPath>/dist). A folder the
+ * user loaded in place is built into Dash's own folder instead, so nothing
+ * is written into theirs — the build's entry file goes there too.
+ */
+async function compileWidget$1(
+  widgetPath,
+  { ownLibrariesOnly = false, outDir = null } = {},
+) {
   const widgetsDir = findWidgetsDir$2(widgetPath);
 
   if (!widgetsDir) {
@@ -4028,8 +4036,10 @@ async function compileWidget$1(widgetPath, { ownLibrariesOnly = false } = {}) {
   // Build a synthetic entry point that pairs each component with its config.
   // Compute relative path from the entry file (in widgetPath) to widgetsDir,
   // since widgetsDir may be nested (e.g., ./weather-widget/widgets/).
-  const relWidgetsDir =
-    "./" + path$n.relative(widgetPath, widgetsDir).split(path$n.sep).join("/");
+  // Built elsewhere (outDir), the entry imports the sources by full path.
+  const relWidgetsDir = outDir
+    ? path$n.resolve(widgetsDir).split(path$n.sep).join("/")
+    : "./" + path$n.relative(widgetPath, widgetsDir).split(path$n.sep).join("/");
   const imports = [];
   const exportParts = [];
 
@@ -4041,7 +4051,7 @@ async function compileWidget$1(widgetPath, { ownLibrariesOnly = false } = {}) {
 
     // Import the config (always)
     imports.push(
-      `import ${componentName}Config from "${relWidgetsDir}/${dashFile}";`,
+      `import ${componentName}Config from ${JSON.stringify(`${relWidgetsDir}/${dashFile}`)};`,
     );
 
     if (hasComponent) {
@@ -4050,7 +4060,7 @@ async function compileWidget$1(widgetPath, { ownLibrariesOnly = false } = {}) {
       //   export default function Foo → _Mod.default
       //   export const Foo = ...      → _Mod.Foo
       imports.push(
-        `import * as ${componentName}_Mod from "${relWidgetsDir}/${componentFile}";`,
+        `import * as ${componentName}_Mod from ${JSON.stringify(`${relWidgetsDir}/${componentFile}`)};`,
       );
       imports.push(
         `const ${componentName}Comp = ${componentName}_Mod.default || ${componentName}_Mod.${componentName} || Object.values(${componentName}_Mod).find(v => typeof v === 'function');`,
@@ -4068,9 +4078,9 @@ async function compileWidget$1(widgetPath, { ownLibrariesOnly = false } = {}) {
 
   const entryContent = [...imports, "", ...exportParts, ""].join("\n");
 
-  // Write temporary entry file in the widget root
-  const entryPath = path$n.join(widgetPath, "__compile_entry.js");
-  const distDir = path$n.join(widgetPath, "dist");
+  // Write temporary entry file in the widget root (or beside the build)
+  const distDir = outDir || path$n.join(widgetPath, "dist");
+  const entryPath = path$n.join(outDir || widgetPath, "__compile_entry.js");
   const outPath = path$n.join(distDir, "index.cjs.js");
   // The package's own libraries (package.json dependencies), downloaded
   // into a temp folder for this build (consolidation Phase 1a-3).
@@ -16070,10 +16080,15 @@ var schedulerController_1 = schedulerController$2;
 	 * → [problem] or null.
 	 */
 	function botCallProblems(dir) {
-	  const res = requireScanWidgetBotCalls().scanWidgetBotCalls(dir);
-	  if (res.ok) return null;
+	  const { scanWidgetBotCalls } = requireScanWidgetBotCalls();
+	  // Dash's build of a folder loaded in place is the code that runs too.
+	  const built = buildDirFor(dir);
+	  const files = [dir, ...(built && fs.existsSync(built) ? [built] : [])]
+	    .map((d) => scanWidgetBotCalls(d))
+	    .flatMap((res) => (res.ok ? [] : res.files));
+	  if (!files.length) return null;
 	  return [
-	    `It starts your bots directly (${res.files.slice(0, 3).join(", ")}). Widgets may only send events that you wire a bot to, under the bot's "Run on events".`,
+	    `It starts your bots directly (${files.slice(0, 3).join(", ")}). Widgets may only send events that you wire a bot to, under the bot's "Run on events".`,
 	  ];
 	}
 
@@ -16098,11 +16113,45 @@ var schedulerController_1 = schedulerController$2;
 	  };
 	}
 
-	// Marks a build Dash made (dist/.dash-build): it's rebuilt from the
-	// current source each time, unlike a developer's own build.
+	/**
+	 * Where Dash builds a package. In its own widgets folder: the package's
+	 * dist/. A folder the user loaded in place: Dash's widget-builds/ (one
+	 * folder per path) — never a dist/ written into the user's folder.
+	 * → the build folder, or null for the package's own dist/.
+	 */
+	function buildDirFor(dir) {
+	  if (!WIDGETS_CACHE_DIR || !dir || isInsideWidgetsDir(dir)) return null;
+	  const key = require$$0$4
+	    .createHash("sha256")
+	    .update(path.resolve(dir))
+	    .digest("hex")
+	    .slice(0, 16);
+	  return path.join(path.dirname(WIDGETS_CACHE_DIR), "widget-builds", key);
+	}
+
+	// Marks a build Dash made (.dash-build beside it): it's rebuilt from the
+	// current source each time, unlike a developer's own build. An older Dash
+	// built in-place folders into their dist/ — that one counts too.
 	const DASH_BUILD_MARK = ".dash-build";
+
+	/** The developer's own build in the package folder (unmarked), or null. */
+	function developerBundle(dir) {
+	  const bundle = folderBundle(dir);
+	  if (!bundle) return null;
+	  return fs.existsSync(path.join(dir, "dist", DASH_BUILD_MARK)) ? null : bundle;
+	}
+
 	function builtByDash(dir) {
-	  return fs.existsSync(path.join(dir, "dist", DASH_BUILD_MARK));
+	  // A build the developer made since wins: it's kept, not rebuilt.
+	  if (developerBundle(dir)) return false;
+	  // Everything in widget-builds/ is Dash's.
+	  const built = buildDirFor(dir);
+	  return (
+	    (built &&
+	      (fs.existsSync(path.join(built, "index.cjs.js")) ||
+	        fs.existsSync(path.join(built, DASH_BUILD_MARK)))) ||
+	    fs.existsSync(path.join(dir, "dist", DASH_BUILD_MARK))
+	  );
 	}
 
 	/**
@@ -16181,15 +16230,17 @@ var schedulerController_1 = schedulerController$2;
 	  let rebuildError = null;
 	  const markDashBuild = () => {
 	    try {
-	      fs.mkdirSync(path.join(dir, "dist"), { recursive: true });
-	      fs.writeFileSync(path.join(dir, "dist", DASH_BUILD_MARK), "");
+	      const out = buildDirFor(dir) || path.join(dir, "dist");
+	      fs.mkdirSync(out, { recursive: true });
+	      fs.writeFileSync(path.join(out, DASH_BUILD_MARK), "");
 	    } catch (_e) {
 	      // unmarked: it's kept like a developer's build next time
 	    }
 	  };
 	  if (!findBundlePath(dir) || builtByDash(dir)) {
+	    let compiled;
 	    try {
-	      await compileWidget(dir);
+	      compiled = await compileWidget(dir, { outDir: buildDirFor(dir) });
 	    } catch (e) {
 	      throw checksFailed(
 	        widgetName,
@@ -16197,7 +16248,7 @@ var schedulerController_1 = schedulerController$2;
 	        done,
 	      );
 	    }
-	    markDashBuild();
+	    if (compiled) markDashBuild();
 	    build = "dash";
 	  } else if (rebuild) {
 	    // Only with the libraries it lists, never the app's copies: a
@@ -16210,7 +16261,12 @@ var schedulerController_1 = schedulerController$2;
 	      rebuildError = `It doesn't list the libraries it uses (${imports.join(", ")}).`;
 	    } else {
 	      try {
-	        if (await compileWidget(dir, { ownLibrariesOnly: true })) {
+	        if (
+	          await compileWidget(dir, {
+	            ownLibrariesOnly: true,
+	            outDir: buildDirFor(dir),
+	          })
+	        ) {
 	          markDashBuild();
 	          build = "dash";
 	        }
@@ -17510,7 +17566,9 @@ var schedulerController_1 = schedulerController$2;
 	      // Auto-compile widget source to CJS bundle if none exists
 	      if (!findBundlePath(widgetPath)) {
 	        try {
-	          await compileWidget(widgetPath);
+	          await compileWidget(widgetPath, {
+	            outDir: buildDirFor(widgetPath),
+	          });
 	          console.log(`[WidgetRegistry] Auto-compiled ${widgetName}`);
 	        } catch (compileError) {
 	          console.warn(
@@ -17646,11 +17704,18 @@ var schedulerController_1 = schedulerController$2;
 	    }
 
 	    try {
+	      // Dash's build of a folder loaded in place (worked out while the
+	      // path is still there to check).
+	      const built = widget.path ? buildDirFor(widget.path) : null;
 	      // A folder of widgets loads in place, so its path is the user's own
 	      // folder: forget the widget, never delete files outside Dash's own.
 	      if (fs.existsSync(widget.path) && isInsideWidgetsDir(widget.path)) {
 	        fs.rmSync(widget.path, { recursive: true });
 	      }
+	      // Its build goes; the folder stays.
+	      if (built && fs.existsSync(built)) {
+	        fs.rmSync(built, { recursive: true, force: true });
+	      }
 
 	      // Clean up empty scope directory (e.g. widgets/@trops/ after removing @trops/slack)
 	      const { scope } = parsePackageId(widgetName);
@@ -17874,6 +17939,19 @@ var schedulerController_1 = schedulerController$2;
 	 * @returns {string|null} Absolute path to the bundle, or null if not found
 	 */
 	function findBundlePath(widgetPath) {
+	  // The developer's own build first; then Dash's build of a folder loaded
+	  // in place; then a build an older Dash left in the folder's dist/.
+	  const own = developerBundle(widgetPath);
+	  if (own) return own;
+	  const built = buildDirFor(widgetPath);
+	  if (built && fs.existsSync(path.join(built, "index.cjs.js"))) {
+	    return path.join(built, "index.cjs.js");
+	  }
+	  return folderBundle(widgetPath);
+	}
+
+	/** A bundle in the package folder itself (dist/ or its root), or null. */
+	function folderBundle(widgetPath) {
 	  const candidates = [
 	    path.join(widgetPath, "dist", "index.cjs.js"),
 	    path.join(widgetPath, "index.cjs.js"),
@@ -18134,7 +18212,9 @@ var schedulerController_1 = schedulerController$2;
 	      let compileError = null;
 	      if (!bundlePath) {
 	        try {
-	          const compiled = await compileWidget(widget.path);
+	          const compiled = await compileWidget(widget.path, {
+	            outDir: buildDirFor(widget.path),
+	          });
 	          if (compiled) {
 	            bundlePath = compiled;
 	          }
@@ -18186,7 +18266,9 @@ var schedulerController_1 = schedulerController$2;
 	        // Auto-compile if no bundle exists
 	        if (!bundlePath) {
 	          try {
-	            const compiled = await compileWidget(widgetPath);
+	            const compiled = await compileWidget(widgetPath, {
+	              outDir: buildDirFor(widgetPath),
+	            });
 	            if (compiled) {
 	              bundlePath = compiled;
 	            }
@@ -18251,6 +18333,7 @@ var schedulerController_1 = schedulerController$2;
 	module.exports.validateZipEntries = validateZipEntries;
 	module.exports.setInstallGate = setInstallGate;
 	module.exports.checkPackage = checkPackage;
+	module.exports.findBundlePath = findBundlePath;
 	module.exports.isInsideWidgetsDir = isInsideWidgetsDir;
 	module.exports.scopedLocalId = scopedLocalId;
 	module.exports.localPackageName = localPackageName;