@open-wxa/wxa-runner-core 0.5.0 → 0.6.0

package/dist/index.mjs

@@ -190,8 +190,10 @@ var AppBuilder = class {
       ]);
       this.wxmlCache = wxml;
       this.wxssCache = wxss;
-      const workersDir = typeof app.workers === "string" ? app.workers : app.workers?.path;
-      const modules = this.project.listFiles([".js"], workersDir ? [workersDir] : []);
+      const workersDir = this.project.workersDir(app);
+      const inWorkers = (file) => workersDir !== null && file.startsWith(workersDir + "/");
+      const scripts = this.project.listFiles([".js"]);
+      const modules = scripts.filter((file) => !inWorkers(file));
       const serviceTemplates = this.createTemplates(app, units, unitJson, wxml.cut);
       const pageTemplates = this.createTemplates(app, units, unitJson, wxml.full);
       const pageStyles = createStyles(units, wxss);
@@ -205,6 +207,7 @@ var AppBuilder = class {
           subPackages: this.project.subPackages(app)
         }),
         modules,
+        workerModules: scripts.filter(inWorkers),
         serviceTemplates,
         serviceBootstrap: this.createServiceBootstrap(serviceTemplates, units, modules),
         pageFrame: `${pageTemplates}
@@ -226,7 +229,7 @@ ${pageStyles}`,
     const files = this.project.listFiles([".wxml", ".wxs"]).map((f) => "./" + f);
     const components = units.filter((id) => this.project.exists(id + ".wxml")).map((id) => {
       const json = unitJson.get(id);
-      return { path: id, tags: Object.keys({ ...json.usingComponents, ...json.componentGenerics || {} }) };
+      return { path: id, tags: Object.keys({ ...json.usingComponents, ...json.componentGenerics }) };
     });
     const cwd = this.project.root;
     const [full, cut] = await Promise.all([
@@ -319,6 +322,11 @@ var MiniProgram = class {
   subPackages(app) {
     return app.subPackages || app.subpackages || [];
   }
+  /** Worker 代码所在目录，不带首尾的 /；没有配置 workers 时为 null */
+  workersDir(app) {
+    const dir = typeof app.workers === "string" ? app.workers : app.workers?.path;
+    return dir ? path.posix.normalize(dir).replace(/^\/+|\/+$/g, "") : null;
+  }
   /** 主包页面 + 分包页面（带 root 前缀） */
   allPages(app) {
     const pages = [...app.pages];
@@ -332,8 +340,8 @@ var MiniProgram = class {
   }
   /** 读取并预处理页面/组件 json，id 不带扩展名 */
   readUnitJson(id, app) {
-    const json = { ...readJsonFile(path.join(this.root, id + ".json")) || {} };
-    json.usingComponents = { ...json.usingComponents || {} };
+    const json = { ...readJsonFile(path.join(this.root, id + ".json")) };
+    json.usingComponents = { ...json.usingComponents };
     if (!id.startsWith("miniprogram_npm/") && !this.isInIndependentSubPackage(id, app)) {
       for (const [tag, ref] of Object.entries(app.usingComponents || {})) {
         if (json.usingComponents[tag]) continue;
@@ -400,15 +408,14 @@ var MiniProgram = class {
     return { pages, components };
   }
   /** 列出代码根目录下指定扩展名的文件，返回 posix 风格的相对路径 */
-  listFiles(extensions, excludeDirs = []) {
+  listFiles(extensions) {
     const result = [];
-    const excluded = new Set(excludeDirs.map((dir) => dir.replace(/^\/|\/$/g, "")));
     const walk = (dir, rel) => {
       for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
         if (entry.name.startsWith(".") || IGNORED_DIRS.has(entry.name)) continue;
         const childRel = rel ? `${rel}/${entry.name}` : entry.name;
         if (entry.isDirectory()) {
-          if (!excluded.has(childRel)) walk(path.join(dir, entry.name), childRel);
+          walk(path.join(dir, entry.name), childRel);
         } else if (extensions.some((ext) => entry.name.endsWith(ext))) {
           if (!rel && PROJECT_FILES.has(entry.name)) continue;
           result.push(childRel);
@@ -556,6 +563,22 @@ ${window.disableScroll ? "<style>body{overflow-y:hidden}</style>" : ""}
 </body>
 </html>`;
 }
+function workerScript(build2, baseLib) {
+  const modules = build2.workerModules.map((id) => `/__wxa__/module/${encodeURI(id)}?v=${build2.version}`);
+  const prelude = `var __wxConfig = ${toJs(build2.wxConfig)};
+importScripts('/__wxa__/runtime/worker.js');
+`;
+  if (!baseLib.hasWorker) {
+    const message = `[wxa-runner] \u57FA\u7840\u5E93 ${baseLib.version} \u91CC\u6CA1\u6709 WAWorker.js\uFF0CWorker \u4E0D\u80FD\u8FD0\u884C\u3002\u6362\u7528\u5F00\u53D1\u8005\u5DE5\u5177\u4E0B\u8F7D\u7684\u57FA\u7840\u5E93\uFF0C\u6216\u5347\u7EA7 wxa-runner \u5E26\u4E0A\u65B0\u7684\u5185\u7F6E\u57FA\u7840\u5E93`;
+    return `${prelude}throw new Error(${toJs(message)});
+`;
+  }
+  return `${prelude}var __wxaConsole = self.console;
+importScripts('/__baselib__/WAWorker.js');
+self.console = __wxaConsole;
+importScripts(${modules.map((url) => toJs(url)).join(", ")});
+`;
+}
 function escapeHtml(text) {
   return text.replace(/[&<>"]/g, (ch) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;" })[ch]);
 }
@@ -1097,12 +1120,16 @@ ${error.message}`);
     }));
     app.get(/^\/__wxa__\/module\/(.+\.js)$/, this.withBuild((build2, req, res) => {
       const id = decodeURIComponent(req.params[0]);
-      if (!build2.modules.includes(id)) {
+      if (!build2.modules.includes(id) && !build2.workerModules.includes(id)) {
         res.status(404).type("js").send(`console.error(${JSON.stringify(`[wxa-runner] \u6A21\u5757 ${id} \u4E0D\u5B58\u5728`)})`);
         return;
       }
       res.type("js").send(this.builder.getModuleScript(id));
     }));
+    app.get("/__wxa__/worker.js", this.withBuild((build2, _req, res) => {
+      const hasWorker = fs4.existsSync(path4.join(this.baseLib.dir, "WAWorker.js"));
+      res.type("js").send(workerScript(build2, { version: this.baseLib.version, hasWorker }));
+    }));
     app.get("/__wxa__/service-bootstrap.js", this.withBuild((build2, _req, res) => {
       res.type("js").send(build2.serviceBootstrap);
     }));