@dimina-kit/compiler 0.0.1 → 0.0.2-dev.20260711062001

package/dist/pool.node-chunks/{view-compiler-KAYOMOXO.js → view-compiler-HOFFL63K.js}

@@ -1,6 +1,6 @@
 import {
   checkTemplateCompatibility
-} from "./chunk-FVCSERCO.js";
+} from "./chunk-C7GEIDCP.js";
 import {
   isMainThread,
   parentPort
@@ -12,11 +12,14 @@ import {
   getComponent,
   getContentByPath,
   getTargetPath,
+  getTemplateExts,
+  getViewScriptExts,
+  getViewScriptTags,
   getWorkPath,
   resetStoreInfo,
   tagWhiteList,
   transformRpx
-} from "./chunk-UYQ7D5I5.js";
+} from "./chunk-7FGOYOXU.js";
 
 // ../../dimina/fe/packages/compiler/src/core/view-compiler.js
 import fs from "node:fs";
@@ -152,7 +155,13 @@ function parseBindings(bindings) {
 }
 
 // ../../dimina/fe/packages/compiler/src/core/view-compiler.js
-var fileType = [".wxml", ".ddml"];
+function buildExtStripRegex(exts) {
+  const alt = exts.map((e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
+  return new RegExp(`(${alt})$`);
+}
+function stripViewScriptExt(p) {
+  return p.replace(buildExtStripRegex(getViewScriptExts()), "");
+}
 function parseJs(code, filename = "view-compiler.js", sourceType = "module") {
   return parseSync2(filename, code, {
     sourceType,
@@ -358,8 +367,8 @@ function scanWxsFiles(dir, workPath) {
       const stat = fs.statSync(fullPath);
       if (stat.isDirectory()) {
         scanWxsFiles(fullPath, workPath);
-      } else if (stat.isFile() && item.endsWith(".wxs")) {
-        const relativePath = fullPath.replace(workPath, "").replace(/\.wxs$/, "");
+      } else if (stat.isFile() && getViewScriptExts().some((ext) => item.endsWith(ext))) {
+        const relativePath = stripViewScriptExt(fullPath.replace(workPath, ""));
         const moduleName = relativePath.replace(/[\/\\@\-]/g, "_").replace(/^_/, "");
         wxsFilePathMap.set(moduleName, fullPath);
       }
@@ -589,7 +598,7 @@ function processWxsContent(wxsContent, wxsFilePath, scriptModule, workPath, file
             if (filePath && filePath.includes("/miniprogram_npm/")) {
               const currentWxsDir = path.dirname(wxsFilePath);
               resolvedWxsPath = path.resolve(currentWxsDir, requirePath);
-              const relativePath = resolvedWxsPath.replace(workPath, "").replace(/\.wxs$/, "");
+              const relativePath = stripViewScriptExt(resolvedWxsPath.replace(workPath, ""));
               const moduleName = relativePath.replace(/[\/\\@\-]/g, "_").replace(/^_/, "");
               processWxsDependency(resolvedWxsPath, moduleName, scriptModule, workPath, filePath);
               replacements.push({
@@ -600,7 +609,7 @@ function processWxsContent(wxsContent, wxsFilePath, scriptModule, workPath, file
             } else {
               const currentWxsDir = path.dirname(wxsFilePath);
               resolvedWxsPath = path.resolve(currentWxsDir, requirePath);
-              const relativePath = resolvedWxsPath.replace(workPath, "").replace(/\.wxs$/, "");
+              const relativePath = stripViewScriptExt(resolvedWxsPath.replace(workPath, ""));
               const depModuleName = relativePath.replace(/[\/\\@\-]/g, "_").replace(/^_/, "");
               processWxsDependency(resolvedWxsPath, depModuleName, scriptModule, workPath, filePath);
               replacements.push({
@@ -816,7 +825,7 @@ function toCompileTemplate(isComponent, path2, components, componentPlaceholder,
     const src = $(elem).attr("src");
     if (src) {
       const includeFullPath = getAbsolutePath(workPath, path2, src);
-      let includePath = includeFullPath.replace(workPath, "").replace(/\.(wxml|ddml)$/, "");
+      let includePath = includeFullPath.replace(workPath, "").replace(buildExtStripRegex(getTemplateExts()), "");
       const includeDiagnosticSource = includeFullPath.startsWith(workPath) ? includeFullPath.slice(workPath.length) : includePath;
       if (!includePath.startsWith("/")) {
         includePath = "/" + includePath;
@@ -842,8 +851,7 @@ function toCompileTemplate(isComponent, path2, components, componentPlaceholder,
         );
         processIncludedFileWxsDependencies(includeContent, includePath, scriptModule, components, processedPaths);
         $includeContent("template").remove();
-        $includeContent("wxs").remove();
-        $includeContent("dds").remove();
+        $includeContent(getViewScriptTags().join(",")).remove();
         const processedContent = processIncludeConditionalAttrs($, elem, $includeContent.html());
         $(elem).replaceWith(processedContent);
       } else {
@@ -860,7 +868,7 @@ function toCompileTemplate(isComponent, path2, components, componentPlaceholder,
     const src = $(elem).attr("src");
     if (src) {
       const importFullPath = getAbsolutePath(workPath, path2, src);
-      let importPath = importFullPath.replace(workPath, "").replace(/\.(wxml|ddml)$/, "");
+      let importPath = importFullPath.replace(workPath, "").replace(buildExtStripRegex(getTemplateExts()), "");
       const importDiagnosticSource = importFullPath.startsWith(workPath) ? importFullPath.slice(workPath.length) : importPath;
       if (!importPath.startsWith("/")) {
         importPath = "/" + importPath;
@@ -907,8 +915,7 @@ function transTagTemplate($, templateModule, path2, components, componentPlaceho
     const templateContent = $(elem);
     templateContent.find("import").remove();
     templateContent.find("include").remove();
-    templateContent.find("wxs").remove();
-    templateContent.find("dds").remove();
+    templateContent.find(getViewScriptTags().join(",")).remove();
     transAsses($, templateContent.find("image"), path2);
     const res = [];
     transHtmlTag(templateContent.html(), res, components, componentPlaceholder);
@@ -1215,7 +1222,7 @@ function parseKeyExpression(exp, itemName = "item", indexName = "index") {
 }
 function getViewPath(workPath, src) {
   const aSrc = src.startsWith("/") ? src : `/${src}`;
-  for (const mlType of fileType) {
+  for (const mlType of getTemplateExts()) {
     const mlFullPath = `${workPath}${aSrc}${mlType}`;
     if (fs.existsSync(mlFullPath)) {
       return mlFullPath;
@@ -1324,10 +1331,7 @@ function parseTemplateDataExp(exp) {
   return `{${parseBraceExp(exp)}}`;
 }
 function transTagWxs($, scriptModule, filePath) {
-  let wxsNodes = $("wxs");
-  if (wxsNodes.length === 0) {
-    wxsNodes = $("dds");
-  }
+  const wxsNodes = $(getViewScriptTags().join(","));
   wxsNodes.each((_, elem) => {
     const smName = $(elem).attr("module");
     if (smName) {
@@ -1346,7 +1350,7 @@ function transTagWxs($, scriptModule, filePath) {
           wxsFilePath = getAbsolutePath(workPath, filePath, src);
         }
         if (wxsFilePath) {
-          const relativePath = wxsFilePath.replace(workPath, "").replace(/\.wxs$/, "");
+          const relativePath = stripViewScriptExt(wxsFilePath.replace(workPath, ""));
           uniqueModuleName = relativePath.replace(/[\/\\@\-]/g, "_").replace(/^_/, "");
           cacheKey = wxsFilePath;
         }
@@ -1419,12 +1423,8 @@ function collectAllWxsModules(scriptRes, collectedPaths = /* @__PURE__ */ new Se
   return allWxsModules;
 }
 function loadWxsModule(modulePath, workPath, scriptModule) {
-  if (!modulePath.startsWith("miniprogram_npm__") || !modulePath.includes("_wxs_")) {
-    return null;
-  }
   const wxsFilePath = wxsFilePathMap.get(modulePath);
   if (!wxsFilePath) {
-    console.warn(`[view] \u65E0\u6CD5\u627E\u5230 wxs \u6A21\u5757\u6587\u4EF6: ${modulePath}`);
     return null;
   }
   try {
@@ -1516,6 +1516,8 @@ export {
   compileML,
   generateSlotDirective,
   generateVModelTemplate,
+  initWxsFilePathMap,
+  loadWxsModule,
   parseBraceExp,
   parseClassRules,
   parseKeyExpression,

package/dist/pool.node.js

@@ -3,12 +3,12 @@ import {
   publishToDist,
   resetCompilerState,
   setupCompile
-} from "./pool.node-chunks/chunk-MHOA4NGC.js";
+} from "./pool.node-chunks/chunk-PDHO4Y56.js";
 import {
   getAppConfigInfo,
   getAppId,
   getAppName
-} from "./pool.node-chunks/chunk-UYQ7D5I5.js";
+} from "./pool.node-chunks/chunk-7FGOYOXU.js";
 
 // src/pool-node.js
 import { createRequire } from "node:module";
@@ -177,7 +177,10 @@ function createWorkerSlot({ name, spawnTransport, onEvent }) {
 // src/pool-node.js
 var { Worker } = createRequire(import.meta.url)("node:worker_threads");
 var DEFAULT_SEND_TIMEOUT_MS = 12e4;
-var WORKER_DEATH_CODES = /* @__PURE__ */ new Set(["compiler-worker-timeout", "compiler-worker-crashed", "compiler-worker-dead"]);
+var WORKER_DEATH_CODES = /* @__PURE__ */ new Set(["compiler-worker-timeout", "compiler-worker-crashed", "compiler-worker-dead", "compiler-toolchain-dead"]);
+function isDeadToolchainServiceError(message) {
+  return /The service (was stopped|is no longer running)/.test(String(message));
+}
 var DEFAULT_IDLE_SHRINK_MS = 3e5;
 var chain = Promise.resolve();
 function createNodeCompilerPool({
@@ -245,16 +248,25 @@ function createNodeCompilerPool({
       if (err && err.code && !err.stage) err.stage = x.stage;
       throw err;
     })));
-    for (const r of results) {
-      if (!r || r.type === "error") {
-        const info = r && r.error;
-        const err = new Error(`[compiler] stage "${r && r.stage}" failed: ${info && info.message || "unknown error"}`);
-        if (info && info.stack) err.stack = info.stack;
-        err.stage = r && r.stage;
+    let firstErr = null;
+    for (let i = 0; i < results.length; i++) {
+      const r = results[i];
+      if (r && r.type !== "error") continue;
+      const info = r && r.error;
+      const cause = info && info.message || "unknown error";
+      const hint = oxcNativeBindingHint(cause) || esbuildAsarSpawnHint(cause);
+      const err = new Error(`[compiler] stage "${r && r.stage}" failed: ${cause}${hint ? ` \u2014 ${hint}` : ""}`);
+      if (info && info.stack) err.stack = info.stack;
+      err.stage = r && r.stage;
+      if (isDeadToolchainServiceError(cause)) {
+        err.code = "compiler-toolchain-dead";
+        workers[i].slot.shrink();
+      } else {
         err.code = "compiler-stage-error";
-        throw err;
       }
+      if (!firstErr) firstErr = err;
     }
+    if (firstErr) throw firstErr;
     publishToDist(outputDir, useAppIdDir);
     return {
       appId: getAppId(),
@@ -297,6 +309,15 @@ function createNodeCompilerPool({
   return { build: build2, dispose, stages, _slots: workers };
 }
 var STAGE_TITLES = { logic: "\u7F16\u8BD1\u9875\u9762\u903B\u8F91", view: "\u7F16\u8BD1\u9875\u9762\u6587\u4EF6", style: "\u7F16\u8BD1\u6837\u5F0F\u6587\u4EF6" };
+function esbuildAsarSpawnHint(message) {
+  const msg = String(message);
+  if (!/app\.asar/.test(msg) || !/esbuild/i.test(msg) || !/ENOENT/.test(msg)) return null;
+  return "esbuild \u7684\u539F\u751F\u4E8C\u8FDB\u5236\u65E0\u6CD5\u4ECE app.asar \u5185 spawn\uFF08Electron \u53EA\u4E3A execFile \u6253 asar \u8865\u4E01\uFF09\uFF1A\u6253\u5305\u914D\u7F6E\u9700 asarUnpack '**/node_modules/esbuild/**' \u4E0E '**/node_modules/@esbuild/**'\uFF0C\u5E76\u786E\u4FDD ESBUILD_BINARY_PATH \u6307\u5411 app.asar.unpacked \u4E0B\u7684\u771F\u5B9E\u4E8C\u8FDB\u5236\uFF08@dimina-kit/devkit \u5728 asar \u5185\u8FD0\u884C\u65F6\u4F1A\u81EA\u52A8\u8BBE\u7F6E\uFF09";
+}
+function oxcNativeBindingHint(message) {
+  if (!/Cannot find native binding/i.test(String(message))) return null;
+  return `oxc-parser \u7684\u8FD0\u884C\u65F6\u7ED1\u5B9A\u6CA1\u6709\u88AB\u6253\u8FDB\u5BBF\u4E3B\u5E94\u7528\uFF1A@dimina-kit/compiler \u7684 Node \u7F16\u8BD1\u8DEF\u5F84\u9700\u8981 @oxc-parser/binding-${process.platform}-${process.arch}\uFF08\u5E73\u53F0\u539F\u751F\u7ED1\u5B9A\uFF09\u6216 @oxc-parser/binding-wasm32-wasi\uFF08wasm \u515C\u5E95\uFF09\u4E8C\u8005\u4E4B\u4E00\u5B9E\u9645\u5B58\u5728\u4E8E\u5305\u5185\u3002\u6253\u5305\u5206\u53D1\uFF08\u5982 electron-builder\uFF09\u65F6\u8BF7\u628A\u5176\u4E2D\u4E00\u4E2A\u663E\u5F0F\u58F0\u660E\u4E3A\u5BBF\u4E3B\u4F9D\u8D56\uFF0C\u907F\u514D\u4F9D\u8D56\u6536\u96C6\u65F6\u88AB\u4E22\u5F03`;
+}
 var singleton = null;
 async function build(outputDir, workPath, useAppIdDir = true, options = {}) {
   if (!singleton) singleton = createNodeCompilerPool();
@@ -307,7 +328,7 @@ async function build(outputDir, workPath, useAppIdDir = true, options = {}) {
   } catch (e) {
     if (e && e.stage) console.error(`\u2716 ${STAGE_TITLES[e.stage] || e.stage}`);
     console.error(`${workPath} \u7F16\u8BD1\u51FA\u9519: ${e && e.message}`);
-    return void 0;
+    throw e;
   }
 }
 async function warmDefaultPool() {
@@ -325,5 +346,7 @@ export {
   createNodeCompilerPool,
   build as default,
   disposeDefaultPool,
+  esbuildAsarSpawnHint,
+  oxcNativeBindingHint,
   warmDefaultPool
 };