@tmsfe/tmskit 0.0.69 → 0.0.71

package/dist/index.cjs.js

@@ -1548,18 +1548,40 @@ function mergeSubPackages(existingPackages, newPackages) {
   return resultPackages;
 }
 
+/**
+ * 收集当前 appJson 中所有有效的页面路径和分包标识
+ */
+function collectValidPaths(appJson) {
+  const subpackages = appJson.subpackages || [];
+  const pages = new Set(appJson.pages || []);
+  const roots = new Set();
+  const names = new Set();
+  subpackages.forEach(sub => {
+    if (sub.root) roots.add(sub.root);
+    if (sub.name) names.add(sub.name);
+    (sub.pages || []).forEach(page => {
+      pages.add(`${sub.root}/${page}`);
+    });
+  });
+  return {
+    pages,
+    roots,
+    names
+  };
+}
+
 /**
  * 清理 preloadRule 中引用了不存在分包的条目
  */
-function cleanPreloadRule(appJson) {
+function cleanPreloadRule(appJson, {
+  roots,
+  names
+}) {
   if (!appJson.preloadRule) return;
-  const subpackages = appJson.subpackages || [];
-  const existingSubpackageNames = new Set(subpackages.map(sub => sub.name).filter(Boolean));
-  const existingSubpackageRoots = new Set(subpackages.map(sub => sub.root).filter(Boolean));
   Object.keys(appJson.preloadRule).forEach(pageKey => {
     const rule = appJson.preloadRule[pageKey];
     if (rule.packages) {
-      rule.packages = rule.packages.filter(pkg => existingSubpackageNames.has(pkg) || existingSubpackageRoots.has(pkg));
+      rule.packages = rule.packages.filter(pkg => names.has(pkg) || roots.has(pkg));
       if (rule.packages.length === 0) {
         delete appJson.preloadRule[pageKey];
       }
@@ -1573,19 +1595,14 @@ function cleanPreloadRule(appJson) {
 /**
  * 清理 entranceDeclare 中引用了不存在页面的条目
  */
-function cleanEntranceDeclare(appJson) {
-  // 收集所有有效页面路径（主包 pages + 分包 pages）
-  const allValidPages = new Set(appJson.pages || []);
-  (appJson.subpackages || []).forEach(sub => {
-    (sub.pages || []).forEach(page => {
-      allValidPages.add(`${sub.root}/${page}`);
-    });
-  });
+function cleanEntranceDeclare(appJson, {
+  pages
+}) {
   if (!appJson.entranceDeclare) return;
   Object.keys(appJson.entranceDeclare).forEach(key => {
     const entry = appJson.entranceDeclare[key];
-    if (entry && entry.path && !allValidPages.has(entry.path)) {
-      info$g(`[devStrictModulesInclude] 移除 entranceDeclare.${key}，页面 ${entry.path} 不存在`);
+    if (entry && entry.path && !pages.has(entry.path)) {
+      info$g(`[buildAppJson] 移除 entranceDeclare.${key}，页面 ${entry.path} 不存在`);
       delete appJson.entranceDeclare[key];
     }
   });
@@ -1596,19 +1613,19 @@ function cleanEntranceDeclare(appJson) {
 
 /**
  * 清理 agent.skills 中引用了不存在分包路径的技能
+ * skill.path 必须以某个有效分包 root 为前缀才保留
  */
-function cleanAgentConfig(appJson) {
-  if (!appJson.agent || !appJson.agent.skills) return;
-  const subpackages = appJson.subpackages || [];
-  const allValidRoots = new Set(subpackages.map(sub => sub.root).filter(Boolean));
+function cleanAgentConfig(appJson, {
+  roots
+}) {
+  if (!appJson.agent || !Array.isArray(appJson.agent.skills)) return;
   appJson.agent.skills = appJson.agent.skills.filter(skill => {
     if (!skill.path) return true;
-    // skill.path 格式如 "modules/wechat-skills/skills/takecar"，取分包 root 前缀
-    const parts = skill.path.split('/');
-    const root = `${parts[0]}/${parts[1]}`; // e.g. "modules/wechat-skills"
-    if (allValidRoots.has(root)) return true;
-    info$g(`[devStrictModulesInclude] 移除 agent.skills "${skill.name}"，分包 ${root} 不存在`);
-    return false;
+    const isValid = Array.from(roots).some(root => skill.path === root || skill.path.startsWith(`${root}/`));
+    if (!isValid) {
+      info$g(`[buildAppJson] 移除 agent.skills "${skill.name}"，路径 ${skill.path} 对应的分包不存在`);
+    }
+    return isValid;
   });
   if (appJson.agent.skills.length === 0) {
     delete appJson.agent;
@@ -1641,12 +1658,11 @@ async function buildOutputAppJson$3(tmsConfig, modules) {
     // 更新主包，需在subpackages处理完成后执行， pages/
     updateMainPackages(appJson, tmsConfig.mainPackages);
 
-    // devStrictModulesInclude 模式下，清理无效引用
-    if (tmsConfig.devStrictModulesInclude) {
-      cleanPreloadRule(appJson);
-      cleanEntranceDeclare(appJson);
-      cleanAgentConfig(appJson);
-    }
+    // 清理引用了不存在分包/页面的无效配置
+    const validPaths = collectValidPaths(appJson);
+    cleanPreloadRule(appJson, validPaths);
+    cleanEntranceDeclare(appJson, validPaths);
+    cleanAgentConfig(appJson, validPaths);
 
     // 模板渲染：先将 app.json 转为字符串，然后通过 preprocess 渲染
     const appJsonStr = JSON.stringify(appJson, null, 2);
@@ -4483,7 +4499,7 @@ var entry = [{
 
 var require$$12 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.69",
+	version: "0.0.71",
 	description: "tmskit",
 	main: "dist/index.cjs",
 	bin: {
@@ -4542,7 +4558,7 @@ var require$$12 = {
 		lodash: "^4.17.21",
 		metalsmith: "^2.3.0",
 		minimatch: "^5.1.0",
-		"miniprogram-ci": "2.1.40",
+		"miniprogram-ci": "2.1.41",
 		moment: "^2.29.2",
 		"object-assign": "^4.0.1",
 		ora: "^5.4.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.69",
+  "version": "0.0.71",
   "description": "tmskit",
   "main": "dist/index.cjs",
   "bin": {
@@ -59,7 +59,7 @@
     "lodash": "^4.17.21",
     "metalsmith": "^2.3.0",
     "minimatch": "^5.1.0",
-    "miniprogram-ci": "2.1.40",
+    "miniprogram-ci": "2.1.41",
     "moment": "^2.29.2",
     "object-assign": "^4.0.1",
     "ora": "^5.4.1",

package/src/core/buildAppJson.js

@@ -168,20 +168,36 @@ function mergeSubPackages(existingPackages, newPackages) {
   return resultPackages;
 }
 
+/**
+ * 收集当前 appJson 中所有有效的页面路径和分包标识
+ */
+function collectValidPaths(appJson) {
+  const subpackages = appJson.subpackages || [];
+  const pages = new Set(appJson.pages || []);
+  const roots = new Set();
+  const names = new Set();
+
+  subpackages.forEach((sub) => {
+    if (sub.root) roots.add(sub.root);
+    if (sub.name) names.add(sub.name);
+    (sub.pages || []).forEach((page) => {
+      pages.add(`${sub.root}/${page}`);
+    });
+  });
+
+  return { pages, roots, names };
+}
+
 /**
  * 清理 preloadRule 中引用了不存在分包的条目
  */
-function cleanPreloadRule(appJson) {
+function cleanPreloadRule(appJson, { roots, names }) {
   if (!appJson.preloadRule) return;
 
-  const subpackages = appJson.subpackages || [];
-  const existingSubpackageNames = new Set(subpackages.map(sub => sub.name).filter(Boolean));
-  const existingSubpackageRoots = new Set(subpackages.map(sub => sub.root).filter(Boolean));
-
   Object.keys(appJson.preloadRule).forEach((pageKey) => {
     const rule = appJson.preloadRule[pageKey];
     if (rule.packages) {
-      rule.packages = rule.packages.filter(pkg => existingSubpackageNames.has(pkg) || existingSubpackageRoots.has(pkg));
+      rule.packages = rule.packages.filter(pkg => names.has(pkg) || roots.has(pkg));
       if (rule.packages.length === 0) {
         delete appJson.preloadRule[pageKey];
       }
@@ -193,25 +209,16 @@ function cleanPreloadRule(appJson) {
   }
 }
 
-
 /**
  * 清理 entranceDeclare 中引用了不存在页面的条目
  */
-function cleanEntranceDeclare(appJson) {
-  // 收集所有有效页面路径（主包 pages + 分包 pages）
-  const allValidPages = new Set(appJson.pages || []);
-  (appJson.subpackages || []).forEach((sub) => {
-    (sub.pages || []).forEach((page) => {
-      allValidPages.add(`${sub.root}/${page}`);
-    });
-  });
-
+function cleanEntranceDeclare(appJson, { pages }) {
   if (!appJson.entranceDeclare) return;
 
   Object.keys(appJson.entranceDeclare).forEach((key) => {
     const entry = appJson.entranceDeclare[key];
-    if (entry && entry.path && !allValidPages.has(entry.path)) {
-      info(`[devStrictModulesInclude] 移除 entranceDeclare.${key}，页面 ${entry.path} 不存在`);
+    if (entry && entry.path && !pages.has(entry.path)) {
+      info(`[buildAppJson] 移除 entranceDeclare.${key}，页面 ${entry.path} 不存在`);
       delete appJson.entranceDeclare[key];
     }
   });
@@ -223,21 +230,18 @@ function cleanEntranceDeclare(appJson) {
 
 /**
  * 清理 agent.skills 中引用了不存在分包路径的技能
+ * skill.path 必须以某个有效分包 root 为前缀才保留
  */
-function cleanAgentConfig(appJson) {
-  if (!appJson.agent || !appJson.agent.skills) return;
-
-  const subpackages = appJson.subpackages || [];
-  const allValidRoots = new Set(subpackages.map(sub => sub.root).filter(Boolean));
+function cleanAgentConfig(appJson, { roots }) {
+  if (!appJson.agent || !Array.isArray(appJson.agent.skills)) return;
 
   appJson.agent.skills = appJson.agent.skills.filter((skill) => {
     if (!skill.path) return true;
-    // skill.path 格式如 "modules/wechat-skills/skills/takecar"，取分包 root 前缀
-    const parts = skill.path.split('/');
-    const root = `${parts[0]}/${parts[1]}`; // e.g. "modules/wechat-skills"
-    if (allValidRoots.has(root)) return true;
-    info(`[devStrictModulesInclude] 移除 agent.skills "${skill.name}"，分包 ${root} 不存在`);
-    return false;
+    const isValid = Array.from(roots).some(root => skill.path === root || skill.path.startsWith(`${root}/`));
+    if (!isValid) {
+      info(`[buildAppJson] 移除 agent.skills "${skill.name}"，路径 ${skill.path} 对应的分包不存在`);
+    }
+    return isValid;
   });
 
   if (appJson.agent.skills.length === 0) {
@@ -270,12 +274,11 @@ async function buildOutputAppJson(tmsConfig, modules) {
     // 更新主包，需在subpackages处理完成后执行， pages/
     updateMainPackages(appJson, tmsConfig.mainPackages);
 
-    // devStrictModulesInclude 模式下，清理无效引用
-    if (tmsConfig.devStrictModulesInclude) {
-      cleanPreloadRule(appJson);
-      cleanEntranceDeclare(appJson);
-      cleanAgentConfig(appJson);
-    }
+    // 清理引用了不存在分包/页面的无效配置
+    const validPaths = collectValidPaths(appJson);
+    cleanPreloadRule(appJson, validPaths);
+    cleanEntranceDeclare(appJson, validPaths);
+    cleanAgentConfig(appJson, validPaths);
 
     // 模板渲染：先将 app.json 转为字符串，然后通过 preprocess 渲染
     const appJsonStr = JSON.stringify(appJson, null, 2);