@aiot-toolkit/aiotpack 2.0.2-beta.18 → 2.0.2-beta.19

package/README.md

@@ -1,46 +1,46 @@
-# `aiotpack`
-
-最终打包工具，包含各类语言、各类平台的打包配置
-
-## 目录结构
-
-| 目录     | 描述                                                                            |
-| -------- | ------------------------------------------------------------------------------- |
-| config   | FileLane 配置，基于此配置，可完成“源码项目-->目标代码项目-->应用程序”的完整流程 |
-| compiler | 目标语言-->应用程序编译器                                                       |
-| loader   | 源码语言-->目标代码语言                                                         |
-| utils    | 语言、项目无关的辅助工具                                                        |
-
-## config
-
-通过在 FileLane 中配置各项参数，可完成“**源码项目-->目标代码项目-->应用程序**”的完整流程
-
-## compiler
-
-#### 概述
-
-源码已生成目标代码项目，此时需要生成**最终产物--应用程序**。compiler 目录中的代码即为完成此项工作而生。
-
-#### 子目录
-
-compiler 下的每个子目录，对应一种目标语言；每种目标语言在不同平台又可能有不同的生成方式。
-
-因此结构为：`compiler/目标语言/目标平台`，例如：
-
-- `compiler/javascript/vela`--javascript 语言在 vela 平台的生成
-
-#### 添加编译器
-
-1. 按上述目录结构，添加目录
-2. 创建编译器`class XCompiler`, 建议实现实现`ICompiler` 接口，以便以后实现统一的用户端接口
-3. 在需要的位置调用
-
-```js
-new XCompiler().compile({
-  projectPath: '',
-  mode: 'development',
-  platform: 'native'
-})
-```
-
-## loader--各类语言的转换器
+# `aiotpack`
+
+最终打包工具，包含各类语言、各类平台的打包配置
+
+## 目录结构
+
+| 目录     | 描述                                                                            |
+| -------- | ------------------------------------------------------------------------------- |
+| config   | FileLane 配置，基于此配置，可完成“源码项目-->目标代码项目-->应用程序”的完整流程 |
+| compiler | 目标语言-->应用程序编译器                                                       |
+| loader   | 源码语言-->目标代码语言                                                         |
+| utils    | 语言、项目无关的辅助工具                                                        |
+
+## config
+
+通过在 FileLane 中配置各项参数，可完成“**源码项目-->目标代码项目-->应用程序**”的完整流程
+
+## compiler
+
+#### 概述
+
+源码已生成目标代码项目，此时需要生成**最终产物--应用程序**。compiler 目录中的代码即为完成此项工作而生。
+
+#### 子目录
+
+compiler 下的每个子目录，对应一种目标语言；每种目标语言在不同平台又可能有不同的生成方式。
+
+因此结构为：`compiler/目标语言/目标平台`，例如：
+
+- `compiler/javascript/vela`--javascript 语言在 vela 平台的生成
+
+#### 添加编译器
+
+1. 按上述目录结构，添加目录
+2. 创建编译器`class XCompiler`, 建议实现实现`ICompiler` 接口，以便以后实现统一的用户端接口
+3. 在需要的位置调用
+
+```js
+new XCompiler().compile({
+  projectPath: '',
+  mode: 'development',
+  platform: 'native'
+})
+```
+
+## loader--各类语言的转换器

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -135,7 +135,7 @@ UxAfterCompile.copyResource = (params) => __awaiter(void 0, void 0, void 0, func
             'DS_Store',
             'map'
         ];
-        const excludeReg = `\.(${excludeExtList.join('|')})$`;
+        const excludeReg = `\\.(${excludeExtList.join('|')})$`;
         shared_utils_1.FileUtil.copyFiles(path_1.default.join(projectPath, sourceRoot), path_1.default.join(projectPath, outputPath), new RegExp(excludeReg));
         shared_utils_1.FileUtil.copyFiles(path_1.default.join(projectPath, sourceRoot), path_1.default.join(projectPath, outputPath), undefined, includeList);
     };

package/lib/afterCompile/xts/entryTemplate.js

@@ -39,76 +39,76 @@ const entryTemplate = (options) => {
         for (let i = 0; i < aspects.length; i++) {
             const aspect = aspects[i];
             const { routes = [] } = aspect;
-            res += `
-  const aspectName_${i + 1} = '${aspect.name}'
+            res += `
+  const aspectName_${i + 1} = '${aspect.name}'
   const pathPages_${i + 1} = new Map()`;
             for (let r = 0; r < routes.length; r++) {
                 const route = routes[r];
-                res += `
-  pathPages_${i + 1}.set('${route.route}', function (params?: ${parser_1.HomeState.interface}${i + 1}_${r + 1}_): Page {
-    return new Page${i + 1}_${r + 1}(params)
-  })
+                res += `
+  pathPages_${i + 1}.set('${route.route}', function (params?: ${parser_1.HomeState.interface}${i + 1}_${r + 1}_): Page {
+    return new Page${i + 1}_${r + 1}(params)
+  })
         `;
             }
-            res += `
-  const aspectDef_${i + 1}: AspectDefinition = {
-    newFn: (): ViewAspect => new AspectClass${i + 1}(),
-    pathPages: pathPages_${i + 1}
-  } 
-  aspectDefs.set(aspectName_${i + 1}, aspectDef_${i + 1})
+            res += `
+  const aspectDef_${i + 1}: AspectDefinition = {
+    newFn: (): ViewAspect => new AspectClass${i + 1}(),
+    pathPages: pathPages_${i + 1}
+  } 
+  aspectDefs.set(aspectName_${i + 1}, aspectDef_${i + 1})
       `;
         }
         return res;
     }
-    return `import {
-  // class
-  App,
-  AppDefinition,
-  AppContainer,
-  AspectDefinition,
-  ViewAspect,
-  Page,
-  Route,
-  RouteInfo,
-  // framework
-  context,
-  getInfoFromRoute,
-
-  // export function
-  on
-} from '../node_modules/${parser_1.tsFrameWork.name}/index'
-
-// import app
-import AppClass from './${options.appPath}'
-${generatImportAspects()}
-console.log('startApp-start timeEnd:', Date.now())
-
-function getAspectDefs() {
-  const aspectDefs = new Map()
-  ${generateDefs()}
-  return aspectDefs
-}
-
-function entry(path: string): void {
-  console.log('~~~~~~~~~entry path', path)
-  const route: Route = { uri: path }
-  const routeInfo: RouteInfo = getInfoFromRoute(route)
-  // app
-  let appName: string = ''
-  if (routeInfo?.appName) appName = routeInfo.appName
-  let app = context.getApp(appName)
-  if (app === null) {
-    const appDef: AppDefinition = {
-      newFn: (): App => new AppClass()
-    }
-    const aspectDefs = getAspectDefs()
-    app = new AppContainer(appDef, aspectDefs)
-  }
-  context.openApp(app, routeInfo)
-}
-
-// export api to native
-export { entry, on }
+    return `import {
+  // class
+  App,
+  AppDefinition,
+  AppContainer,
+  AspectDefinition,
+  ViewAspect,
+  Page,
+  Route,
+  RouteInfo,
+  // framework
+  context,
+  getInfoFromRoute,
+
+  // export function
+  on
+} from '../node_modules/${parser_1.tsFrameWork.name}/index'
+
+// import app
+import AppClass from './${options.appPath}'
+${generatImportAspects()}
+console.log('startApp-start timeEnd:', Date.now())
+
+function getAspectDefs() {
+  const aspectDefs = new Map()
+  ${generateDefs()}
+  return aspectDefs
+}
+
+function entry(path: string): void {
+  console.log('~~~~~~~~~entry path', path)
+  const route: Route = { uri: path }
+  const routeInfo: RouteInfo = getInfoFromRoute(route)
+  // app
+  let appName: string = ''
+  if (routeInfo?.appName) appName = routeInfo.appName
+  let app = context.getApp(appName)
+  if (app === null) {
+    const appDef: AppDefinition = {
+      newFn: (): App => new AppClass()
+    }
+    const aspectDefs = getAspectDefs()
+    app = new AppContainer(appDef, aspectDefs)
+  }
+  context.openApp(app, routeInfo)
+}
+
+// export api to native
+export { entry, on }
 `;
 };
 exports.entryTemplate = entryTemplate;

package/lib/beforeCompile/ux/UxBeforeCompile.js

@@ -22,7 +22,10 @@ class UxBeforeCompile {
 _a = UxBeforeCompile;
 UxBeforeCompile.validateManifest = (_b) => __awaiter(void 0, [_b], void 0, function* ({ context }) {
     const { projectPath } = context;
-    return UxFileUtils_1.default.validateManifest(projectPath);
+    const errors = yield UxFileUtils_1.default.validateManifest(projectPath);
+    if (errors === null || errors === void 0 ? void 0 : errors.length) {
+        return Promise.reject(errors);
+    }
 });
 UxBeforeCompile.validateSitemap = (_b) => __awaiter(void 0, [_b], void 0, function* ({ context }) {
     const { projectPath } = context;

package/lib/compiler/javascript/android/plugin/WrapPlugin.js

@@ -43,48 +43,48 @@ class WrapPlugin {
         });
     }
     wrapPage(source) {
-        return new webpack_sources_1.ConcatSource(`
-(function () {
-  var createPageHandler = function () {
-  // 转换动态 style 的函数
-  var $translateStyle$ = function (value) {
-    if (typeof value === 'string') {
-      return Object.fromEntries(value.split(';').filter(item => Boolean(item && item.trim())).map(
-        item => {
-          const matchs = item.match(/([^:]+):(.*)/)
-          if (matchs && matchs.lenth> 2) {
-            return [matchs[1].trim().replace(/-([a-z])/g, (_, match) => match.toUpperCase()), matchs[2].trim()]
-          }
-          return []
-        }))}
-    return value
-  }
-  return`, source, `;
-  };
-  if (typeof window === "undefined") {
-    return createPageHandler();
-  } else {
-    window.createPageHandler = createPageHandler;
-  }
+        return new webpack_sources_1.ConcatSource(`
+(function () {
+  var createPageHandler = function () {
+  // 转换动态 style 的函数
+  var $translateStyle$ = function (value) {
+    if (typeof value === 'string') {
+      return Object.fromEntries(value.split(';').filter(item => Boolean(item && item.trim())).map(
+        item => {
+          const matchs = item.match(/([^:]+):(.*)/)
+          if (matchs && matchs.lenth> 2) {
+            return [matchs[1].trim().replace(/-([a-z])/g, (_, match) => match.toUpperCase()), matchs[2].trim()]
+          }
+          return []
+        }))}
+    return value
+  }
+  return`, source, `;
+  };
+  if (typeof window === "undefined") {
+    return createPageHandler();
+  } else {
+    window.createPageHandler = createPageHandler;
+  }
 })();`);
     }
     wrapApp(source) {
         const { projectPath, sourceRoot } = this.param;
-        return new webpack_sources_1.ConcatSource(`
-(function () {
-  var $app_define_wrap$ = $app_define_wrap$ || function () {};
-  var manifestJson =${JSON.stringify(UxFileUtils_1.default.getMainfestInfo(projectPath, sourceRoot))}
-  var createAppHandler = function () {
-      `, source, `
-  }
-    if (typeof window === "undefined") {
-    return createAppHandler();
-  } else {
-    window.createAppHandler = createAppHandler;
-    // H5注入manifest以获取features
-    global.manifest = manifestJson;
-  }
-})();
+        return new webpack_sources_1.ConcatSource(`
+(function () {
+  var $app_define_wrap$ = $app_define_wrap$ || function () {};
+  var manifestJson =${JSON.stringify(UxFileUtils_1.default.getMainfestInfo(projectPath, sourceRoot))}
+  var createAppHandler = function () {
+      `, source, `
+  }
+    if (typeof window === "undefined") {
+    return createAppHandler();
+  } else {
+    window.createAppHandler = createAppHandler;
+    // H5注入manifest以获取features
+    global.manifest = manifestJson;
+  }
+})();
 `);
     }
 }

package/lib/compiler/javascript/vela/plugin/WrapPlugin.js

@@ -21,37 +21,37 @@ class WrapPlugin {
         entrys.forEach((entry) => {
             if (compilation.assets[entry]) {
                 const source = compilation.assets[entry];
-                compilation.assets[entry] = new webpack_sources_1.ConcatSource(`
-        export default function(global, globalThis, window, $app_exports$, $app_evaluate$){
-          var org_app_require = $app_require$;
-        
-          (function(global, globalThis, window, $app_exports$, $app_evaluate$){
-            var setTimeout = global.setTimeout;
-            var setInterval = global.setInterval;
-            var clearTimeout = global.clearTimeout;
-            var clearInterval = global.clearInterval;
-            var $app_require$ = global.$app_require$ || org_app_require
-
-            // 转换动态 style 的函数
-            var $translateStyle$ = function (value) {
-              if (typeof value === 'string') {
-                return Object.fromEntries(value.split(';').filter(item => Boolean(item && item.trim())).map(
-                  item => {
-                    const matchs = item.match(/([^:]+):(.*)/)
-                    if (matchs && matchs.lenth> 2) {
-                      return [matchs[1].trim().replace(/-([a-z])/g, (_, match) => match.toUpperCase()), matchs[2].trim()]
-                    }
-                    return []
-                  }))}
-              return value
-            }
-        
-            var createPageHandler = function() {
-              return `, source, `
-            }
-        
-            return createPageHandler();
-          })(global, globalThis, window, $app_exports$, $app_evaluate$)
+                compilation.assets[entry] = new webpack_sources_1.ConcatSource(`
+        export default function(global, globalThis, window, $app_exports$, $app_evaluate$){
+          var org_app_require = $app_require$;
+        
+          (function(global, globalThis, window, $app_exports$, $app_evaluate$){
+            var setTimeout = global.setTimeout;
+            var setInterval = global.setInterval;
+            var clearTimeout = global.clearTimeout;
+            var clearInterval = global.clearInterval;
+            var $app_require$ = global.$app_require$ || org_app_require
+
+            // 转换动态 style 的函数
+            var $translateStyle$ = function (value) {
+              if (typeof value === 'string') {
+                return Object.fromEntries(value.split(';').filter(item => Boolean(item && item.trim())).map(
+                  item => {
+                    const matchs = item.match(/([^:]+):(.*)/)
+                    if (matchs && matchs.lenth> 2) {
+                      return [matchs[1].trim().replace(/-([a-z])/g, (_, match) => match.toUpperCase()), matchs[2].trim()]
+                    }
+                    return []
+                  }))}
+              return value
+            }
+        
+            var createPageHandler = function() {
+              return `, source, `
+            }
+        
+            return createPageHandler();
+          })(global, globalThis, window, $app_exports$, $app_evaluate$)
         }`);
             }
         });

package/lib/compiler/javascript/vela/utils/Jsc.d.ts

@@ -5,6 +5,6 @@ declare class Jsc {
     readonly projectPath: string;
     readonly buildPath: string;
     constructor(projectPath: string, buildPath: string);
-    jsc(): Promise<boolean | void>;
+    jsc(): Promise<boolean>;
 }
 export default Jsc;

package/lib/compiler/javascript/vela/utils/Jsc.js

@@ -32,6 +32,7 @@ class Jsc {
         })
             .catch((error) => {
             shared_utils_1.ColorConsole.throw(error.message);
+            return Promise.reject(error);
         });
     }
 }

package/lib/compiler/javascript/vela/utils/UxCompileUtil.js

@@ -18,7 +18,7 @@ class UxCompileUtil {
                     fs_extra_1.default.unlinkSync(item);
                 }
                 else {
-                    fs_extra_1.default.rmdirSync(item, { recursive: true });
+                    fs_extra_1.default.rmSync(item, { recursive: true, force: true });
                 }
             }
         });

package/lib/compiler/javascript/vela/utils/signature/pem/certificate.pem

@@ -1,27 +1,27 @@
------BEGIN CERTIFICATE-----
-MIIEpDCCAowCCQC0eMZYkbPqvzANBgkqhkiG9w0BAQsFADAUMRIwEAYDVQQDDAls
-b2NhbGhvc3QwHhcNMjEwNDA3MDc0MTI2WhcNMzEwNDA1MDc0MTI2WjAUMRIwEAYD
-VQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDR
-fEK1e8OxPAmtBc/bkz+Vy1T0EcRgHjA+UzYNj1kzBFb7CW9V7DIesXJ5mAwR1HOm
-D32Ijou2oSDaHKunnM576PgSCeoRUJkycUSXS0mK2+opuqXTywayTVmcNoqUuE+T
-/XjUJZ+MXsl0zxC5pv0HyMG2sInpIuahj2QrRim7u8IEJugSQLCdw53EVrAQ51s9
-AsSyL/IvdqtYK5kNAz+cIVdn4Vx88YOteqbeMSIg1ICqDc3IgD0sCjQesqIpsJBV
-LJZfWQsRMFt0tUyZQCqjYOSdy0tbrIOL2QjtwSXOPB8bUptvScxevrHAML3qNDz+
-oPdJRMCLK3DOaRorfGPqA0mjlxE6cVXKnkvQlM6Kf8QItYlLMspvv+TFx3VdakbI
-SzP058PEyf2A7IWSzWvFlpigtGuBCtrq8liyFXAsTxMwIB/TwF/G0A1AANg8aK6Z
-td/gHWqcOEbGDwEDCmTn4ockpKWbkrM3kqt75fl8yjeaDz1qN15cz/5YKz8aZnuC
-3Pe4VT+QbCeflcIjLJbmKBCJ7sbbDQJOWPiq2QLjqrvG3rUTXF2xlUa3piWpxyHF
-VICuCaojUgl80eb/9kfVUXdDVB8oJIJE/hLEnt90lXUIo7roz4hwFKPuqVhw8368
-FOQvrQW/ogILoSFuPrCSrRbaBOqlefoHiaDZsSpwvwIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQAYb0jECnfZxdIbbCQyRaIMHitZctUlhM48edNX8Jhj+3fMX4rgaua7
-+QMlEhWSaXRZzN5VPA1ifFWaDjndde72iihYgtoTXRaHWquUKw1DkRizdzg7zH9k
-6pi9QNBSDJ1+Pbpf+2ZDcIfTf+YsqmRDNgtmGEQmvad87eIW415ggvRnb0i2fm7v
-0nCqMHSjTkkp9XHBXQ1jnz4zWNr1s+pEEIjy4+oOr7vjuBe/JTUKiQxyqQXWb4MQ
-KhKvPaHsyMpa733/3BVaPrIYM9Y+cR6hVD5DdYsmhFA7oTk7oBpysDREAoXlTuDf
-X+lCVRwek7jDIi1JgOjCroTFRF003V7pul67coGKj2mBTESb+B5FwXuDDDgkti1f
-62FXQQFaBslY8N+tq3YQiZ4CZzREsZVDuRTJWC7nV6+wnOorgeGtmFBjCB11CvuR
-av6rT4TA9Cp30EfWNYSJhmHNRHTSoFAUfbMpjUJ/ZoUfYN0QukFxBmDhy6sg5ZFg
-RibPbqnSXmq9O2n+eHhJsIzrufkt9SSrs2VE2Xzzjfyshqajp92/UJYvyPVFCNKk
-ja34I+m9g7BsgJ83CDcVIZG6QEBGvXHVNuN/5AmH4ZbVAjhcVLUB2FWKxnQJzI8g
-lfWndbecBeyMfWktqudmF/RH/PpRSscmSFEYBt4Y38HI53xfIp74zQ==
+-----BEGIN CERTIFICATE-----
+MIIEpDCCAowCCQC0eMZYkbPqvzANBgkqhkiG9w0BAQsFADAUMRIwEAYDVQQDDAls
+b2NhbGhvc3QwHhcNMjEwNDA3MDc0MTI2WhcNMzEwNDA1MDc0MTI2WjAUMRIwEAYD
+VQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDR
+fEK1e8OxPAmtBc/bkz+Vy1T0EcRgHjA+UzYNj1kzBFb7CW9V7DIesXJ5mAwR1HOm
+D32Ijou2oSDaHKunnM576PgSCeoRUJkycUSXS0mK2+opuqXTywayTVmcNoqUuE+T
+/XjUJZ+MXsl0zxC5pv0HyMG2sInpIuahj2QrRim7u8IEJugSQLCdw53EVrAQ51s9
+AsSyL/IvdqtYK5kNAz+cIVdn4Vx88YOteqbeMSIg1ICqDc3IgD0sCjQesqIpsJBV
+LJZfWQsRMFt0tUyZQCqjYOSdy0tbrIOL2QjtwSXOPB8bUptvScxevrHAML3qNDz+
+oPdJRMCLK3DOaRorfGPqA0mjlxE6cVXKnkvQlM6Kf8QItYlLMspvv+TFx3VdakbI
+SzP058PEyf2A7IWSzWvFlpigtGuBCtrq8liyFXAsTxMwIB/TwF/G0A1AANg8aK6Z
+td/gHWqcOEbGDwEDCmTn4ockpKWbkrM3kqt75fl8yjeaDz1qN15cz/5YKz8aZnuC
+3Pe4VT+QbCeflcIjLJbmKBCJ7sbbDQJOWPiq2QLjqrvG3rUTXF2xlUa3piWpxyHF
+VICuCaojUgl80eb/9kfVUXdDVB8oJIJE/hLEnt90lXUIo7roz4hwFKPuqVhw8368
+FOQvrQW/ogILoSFuPrCSrRbaBOqlefoHiaDZsSpwvwIDAQABMA0GCSqGSIb3DQEB
+CwUAA4ICAQAYb0jECnfZxdIbbCQyRaIMHitZctUlhM48edNX8Jhj+3fMX4rgaua7
++QMlEhWSaXRZzN5VPA1ifFWaDjndde72iihYgtoTXRaHWquUKw1DkRizdzg7zH9k
+6pi9QNBSDJ1+Pbpf+2ZDcIfTf+YsqmRDNgtmGEQmvad87eIW415ggvRnb0i2fm7v
+0nCqMHSjTkkp9XHBXQ1jnz4zWNr1s+pEEIjy4+oOr7vjuBe/JTUKiQxyqQXWb4MQ
+KhKvPaHsyMpa733/3BVaPrIYM9Y+cR6hVD5DdYsmhFA7oTk7oBpysDREAoXlTuDf
+X+lCVRwek7jDIi1JgOjCroTFRF003V7pul67coGKj2mBTESb+B5FwXuDDDgkti1f
+62FXQQFaBslY8N+tq3YQiZ4CZzREsZVDuRTJWC7nV6+wnOorgeGtmFBjCB11CvuR
+av6rT4TA9Cp30EfWNYSJhmHNRHTSoFAUfbMpjUJ/ZoUfYN0QukFxBmDhy6sg5ZFg
+RibPbqnSXmq9O2n+eHhJsIzrufkt9SSrs2VE2Xzzjfyshqajp92/UJYvyPVFCNKk
+ja34I+m9g7BsgJ83CDcVIZG6QEBGvXHVNuN/5AmH4ZbVAjhcVLUB2FWKxnQJzI8g
+lfWndbecBeyMfWktqudmF/RH/PpRSscmSFEYBt4Y38HI53xfIp74zQ==
 -----END CERTIFICATE-----

package/lib/compiler/javascript/vela/utils/signature/pem/private.pem

@@ -1,51 +1,51 @@
------BEGIN RSA PRIVATE KEY-----
-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
+-----BEGIN RSA PRIVATE KEY-----
+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
 -----END RSA PRIVATE KEY-----

package/lib/config/UxConfig.d.ts

@@ -22,12 +22,12 @@ declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
      * @returns
      */
     collectFile: (entryFileList?: IChangedFile[]) => string[];
-    exclude: (RegExp | ((filePath: string) => boolean))[];
+    exclude: (string | ((filePath: string) => boolean))[];
     get output(): string;
     beforeWorks: (typeof UxBeforeWorks.cleanOutput)[];
-    beforeCompile: import("file-lane").PreWork<IJavascriptCompileOption>[];
+    beforeCompile: import("../../../file-lane/lib").PreWork<IJavascriptCompileOption>[];
     afterCompile: {
-        worker: import("file-lane").FollowWork<IJavascriptCompileOption>;
+        worker: import("../../../file-lane/lib").FollowWork<IJavascriptCompileOption>;
         workerDescribe: string;
     }[];
     afterWorks: (typeof UxAfterWorks.cleanOutput)[];

package/lib/config/UxConfig.js

@@ -52,9 +52,10 @@ class UxConfig {
             return getProjectFiles();
         };
         this.exclude = [
-            /node_modules/,
-            /dist/,
-            /build/,
+            '**/node_modules{,/**}',
+            '**/dist{,/**}',
+            '**/build{,/**}',
+            '**/.git{,/**}',
             (filePath) => {
                 // 如果 是 script， style文件，且同路径下存在同名 hml，则忽略
                 const { ext, name } = path_1.default.parse(filePath);

package/lib/config/XtsConfig.d.ts

@@ -4,7 +4,7 @@ import XtsLoader from '../loader/xts/XtsLoader';
  * XtsConfig
  */
 declare class XtsConfig implements IFileLaneConfig {
-    exclude: RegExp[];
+    exclude: string[];
     output: string;
     module: {
         rules: {
@@ -14,7 +14,7 @@ declare class XtsConfig implements IFileLaneConfig {
     };
     beforeCompile: PreWork[];
     afterCompile: {
-        worker: import("file-lane").FollowWork<import("..").IXtsCompileOptions>;
+        worker: import("../../../file-lane/lib").FollowWork<import("..").IXtsCompileOptions>;
     }[];
 }
 export default XtsConfig;

package/lib/config/XtsConfig.js

@@ -12,7 +12,13 @@ const XtsLoader_1 = __importDefault(require("../loader/xts/XtsLoader"));
  */
 class XtsConfig {
     constructor() {
-        this.exclude = [/node_modules/, /dist/, /build/, /wasmUnpacked/];
+        this.exclude = [
+            '**/node_modules{,/**}',
+            '**/dist{,/**}',
+            '**/build{,/**}',
+            '**/.git{,/**}',
+            '**/.wasmUnpacked{,/**}'
+        ];
         this.output = 'build';
         this.module = {
             rules: [

package/lib/utils/BeforeCompileUtils.js

@@ -54,7 +54,7 @@ BeforeCompileUtils.getEntries = (params) => {
                 }
                 else {
                     // 路径不存在
-                    shared_utils_1.ColorConsole.throw(`### manifest ### path '${entryDir}/${entryPages.join(' | ')}' does not exist`);
+                    shared_utils_1.ColorConsole.throw(`### manifest ### path '${path_1.default.join(entryDir, entryPages.join(' | '))}' does not exist`);
                 }
             });
         }

package/lib/utils/ux/UxFileUtils.d.ts

@@ -1,5 +1,5 @@
-import IManifest from '../../compiler/javascript/vela/interface/IManifest';
 import FileLaneCompilation from 'file-lane/lib/FileLaneCompilation';
+import IManifest from '../../compiler/javascript/vela/interface/IManifest';
 export declare class UxFileUtils {
     static readonly CONFIG_FILE_NAME = "manifest.json";
     /**
@@ -19,9 +19,10 @@ export declare class UxFileUtils {
     /**
      * 检查 manifest文件，并显示错误信息
      *
-     * 1. TypeError，使用Error 样式
-     * 2. 其它错误，使用 Warn 样式
-     * 3. 如果存在TypeError，则终止程序
+     * 1. 使用ManifestSchema 校验
+     *    1. TypeError: Error
+     *    2. 其它: Warn
+     * 2. 检查 router.entry 是否存在于 router.pages
      *
      * @param projectPath 项目路径
      * @param sourceRoot 源码路径--相对项目根目录

package/lib/utils/ux/UxFileUtils.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UxFileUtils = void 0;
 const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const CommonUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/CommonUtil"));
 const ILog_1 = require("@aiot-toolkit/shared-utils/lib/interface/ILog");
+const CommonUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/CommonUtil"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const ManifestSchema_1 = __importDefault(require("./ManifestSchema"));
@@ -32,9 +32,10 @@ class UxFileUtils {
     /**
      * 检查 manifest文件，并显示错误信息
      *
-     * 1. TypeError，使用Error 样式
-     * 2. 其它错误，使用 Warn 样式
-     * 3. 如果存在TypeError，则终止程序
+     * 1. 使用ManifestSchema 校验
+     *    1. TypeError: Error
+     *    2. 其它: Warn
+     * 2. 检查 router.entry 是否存在于 router.pages
      *
      * @param projectPath 项目路径
      * @param sourceRoot 源码路径--相对项目根目录
@@ -48,27 +49,26 @@ class UxFileUtils {
                 style: ColorConsole_1.default.getStyle(ILog_1.Loglevel.THROW)
             });
         }
+        // 1
         const jsonData = this.getMainfestInfo(projectPath, sourceRoot);
         const schema = ManifestSchema_1.default;
-        const errors = CommonUtil_1.default.validateJson(jsonData, schema);
-        if (errors) {
+        const errors = CommonUtil_1.default.validateJson(jsonData, schema) || [];
+        // 2
+        const { entry, pages } = jsonData.router;
+        if (!pages[entry]) {
+            errors.push(new TypeError(`router.entry content:  ${entry}, is missing in router.pages`));
+        }
+        if (errors === null || errors === void 0 ? void 0 : errors.length) {
             ColorConsole_1.default.warn(`Manefest.json error: `, ...errors.map((item, index) => {
                 return {
-                    word: `\r\n${index + 1}.${item.message}`,
+                    word: `\r\n${index + 1}. ${item.message}`,
                     style: item instanceof TypeError
                         ? ColorConsole_1.default.getStyle(ILog_1.Loglevel.ERROR)
                         : ColorConsole_1.default.getStyle(ILog_1.Loglevel.WARN)
                 };
             }));
-            const stop = Boolean(errors.find((item) => item instanceof TypeError));
-            if (stop) {
-                ColorConsole_1.default.throw({
-                    word: `missing required content, program stoped`,
-                    style: ColorConsole_1.default.getStyle(ILog_1.Loglevel.THROW)
-                });
-            }
         }
-        return errors;
+        return errors.length ? errors : undefined;
     }
     /**
      * 检查 sitemap.json 文件，并显示错误信息

package/lib/utils/ux/UxLoaderUtils.js

@@ -219,19 +219,19 @@ class UxLoaderUtils {
             // 如果aiotfor存在，需要把函数体替换为aiotfor.funcArr
             if (aiotfor) {
                 const { funcArr = [], key, value } = aiotfor;
-                const forFun = `function(${key || '$idx'}, ${value || '$item'}) {
-          return [
-            ${funcArr.map((item) => funToString(item)).join(',\r\n')}
-          ]
+                const forFun = `function(${key || '$idx'}, ${value || '$item'}) {
+          return [
+            ${funcArr.map((item) => funToString(item)).join(',\r\n')}
+          ]
         }`;
                 return forFun;
             }
             if (aiotcb) {
                 const { funcArr = [] } = aiotcb;
-                const cbFun = `function($data){
-          return [
-            ${funcArr.map((item) => funToString(item)).join(',\r\n')}
-          ]
+                const cbFun = `function($data){
+          return [
+            ${funcArr.map((item) => funToString(item)).join(',\r\n')}
+          ]
         }`;
                 return cbFun;
             }
@@ -252,8 +252,8 @@ class UxLoaderUtils {
             const entries = Object.entries(obj).map(([key, value]) => {
                 return `"${key}": ${processValue(value)}`;
             });
-            return `{
-        ${entries.join(',\r\n ')}
+            return `{
+        ${entries.join(',\r\n ')}
       }`;
         };
         const { path } = file;
@@ -261,21 +261,21 @@ class UxLoaderUtils {
         const { funcArr = [], optArr } = aiot;
         const templateResult = BinaryPlugin.addTemplate(path, path, code);
         BinaryPlugin.addTagName(path, path);
-        const result = `function (vm) {
-      const _vm_ = vm || this
-      return aiot.__cv__(
-        "${templateResult.name}",
-        ${templateResult.index},
-        {
-          __vm__:_vm_,
-          __func__:[
-            ${funcArr.map((item) => funToString(item)).join(',\r\n')}
-          ],
-          __optsArr__:[
-            ${optArr.map((item) => stringifyObjectWithFunctions(item))},
-          ]
-        }
-      )
+        const result = `function (vm) {
+      const _vm_ = vm || this
+      return aiot.__cv__(
+        "${templateResult.name}",
+        ${templateResult.index},
+        {
+          __vm__:_vm_,
+          __func__:[
+            ${funcArr.map((item) => funToString(item)).join(',\r\n')}
+          ],
+          __optsArr__:[
+            ${optArr.map((item) => stringifyObjectWithFunctions(item))},
+          ]
+        }
+      )
     }`;
         return result;
     }
@@ -285,9 +285,9 @@ class UxLoaderUtils {
      * @returns
      */
     static wrapTempalte(templateTree, file, compilerOption) {
-        const result = `function (vm) {
-      const _vm_ = vm || this
-      return ${templateTree.getFullText()}
+        const result = `function (vm) {
+      const _vm_ = vm || this
+      return ${templateTree.getFullText()}
     }`;
         if (compilerOption.enableProtobuf) {
             return this.addTemplateProtobuf(file, result);
@@ -319,27 +319,27 @@ class UxLoaderUtils {
     }
 }
 // 页面组件需要添加ViewModel数据校验和处理代码
-UxLoaderUtils.contenAccess = `\n
-  const moduleOwn = exports.default || module.exports
-  const accessors = ['public', 'protected', 'private']
-
-  if (moduleOwn.data && accessors.some(function (acc) { return moduleOwn[acc] })) {
-    throw new Error('页面VM对象中的属性data不可与"' + accessors.join(',') + '"同时存在，请使用private替换data名称')
-  }
-  else if (!moduleOwn.data) {
-    moduleOwn.data = {}
-    moduleOwn._descriptor = {}
-    accessors.forEach(function (acc) {
-      const accType = typeof moduleOwn[acc]
-      if (accType === 'object') {
-        moduleOwn.data = Object.assign(moduleOwn.data, moduleOwn[acc])
-        for (const name in moduleOwn[acc]) {
-          moduleOwn._descriptor[name] = { access: acc }
-        }
-      }
-      else if (accType === 'function') {
-        console.warn('页面VM对象中的属性' + acc + '的值不能是函数，请使用对象')
-      }
-    })
+UxLoaderUtils.contenAccess = `\n
+  const moduleOwn = exports.default || module.exports
+  const accessors = ['public', 'protected', 'private']
+
+  if (moduleOwn.data && accessors.some(function (acc) { return moduleOwn[acc] })) {
+    throw new Error('页面VM对象中的属性data不可与"' + accessors.join(',') + '"同时存在，请使用private替换data名称')
+  }
+  else if (!moduleOwn.data) {
+    moduleOwn.data = {}
+    moduleOwn._descriptor = {}
+    accessors.forEach(function (acc) {
+      const accType = typeof moduleOwn[acc]
+      if (accType === 'object') {
+        moduleOwn.data = Object.assign(moduleOwn.data, moduleOwn[acc])
+        for (const name in moduleOwn[acc]) {
+          moduleOwn._descriptor[name] = { access: acc }
+        }
+      }
+      else if (accType === 'function') {
+        console.warn('页面VM对象中的属性' + acc + '的值不能是函数，请使用对象')
+      }
+    })
   }`;
 exports.default = UxLoaderUtils;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.2-beta.18",
+  "version": "2.0.2-beta.19",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,16 +19,16 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.2-beta.18",
-    "@aiot-toolkit/parser": "2.0.2-beta.18",
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.18",
+    "@aiot-toolkit/generator": "2.0.2-beta.19",
+    "@aiot-toolkit/parser": "2.0.2-beta.19",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.19",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.0.0",
     "aiot-parse5": "^1.0.0",
     "archiver": "^7.0.1",
     "babel-loader": "^9.1.3",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2-beta.18",
+    "file-lane": "2.0.2-beta.19",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",
@@ -45,5 +45,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "b73a79ef04edac808f316bf8b8fb1718422daa1c"
+  "gitHead": "7c6ed600fe84ee9de9b00c6e95dfabf3bfb3ad65"
 }