@aiot-toolkit/aiotpack 2.0.3-beta.9 → 2.0.4-beta.1

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -14,8 +14,8 @@ var _JavascriptDefaultCompileOption = _interopRequireDefault(require("../../comp
 var _Jsc = _interopRequireDefault(require("../../compiler/javascript/vela/utils/Jsc"));
 var _ZipUtil = _interopRequireDefault(require("../../compiler/javascript/vela/utils/ZipUtil"));
 var _UxFileUtils = _interopRequireDefault(require("../../utils/ux/UxFileUtils"));
-var _archiver = _interopRequireDefault(require("archiver"));
 var _FileLaneTriggerType = _interopRequireDefault(require("file-lane/lib/enum/FileLaneTriggerType"));
+var _ZipFileUtil = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib/utils/ZipFileUtil"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
 
@@ -172,13 +172,48 @@ class UxAfterCompile {
       if (!content.packageInfo) {
         content.packageInfo = _ZipUtil.default.createComment(compilerOption);
       }
-      if (completeFeature && translateCache?.featureCache.size) {
+
+      // feature
+      if (translateCache?.featureCache.size) {
+        // 消息提示
+        // 1. 获取未手动配置的 feature
+        // 2. 如果开启自动填充，则 info；否则 warn
         const featureSet = new Set([...Array.from(translateCache.featureCache), ...(content.features || []).map(item => item.name)]);
-        content.features = Array.from(featureSet).map(item => {
-          return {
-            name: item
+        const usedList = Array.from(featureSet).filter(Boolean);
+        const unSetList = usedList.filter(featureItem => !content.features?.find(item => item.name === featureItem));
+        if (unSetList?.length) {
+          const featureMessage = {
+            word: `\n${JSON.stringify(unSetList.map(item => ({
+              name: item
+            })), undefined, 2)}`,
+            style: _sharedUtils.ColorConsole.getStyle(_sharedUtils.Loglevel.INFO)
           };
-        });
+          if (completeFeature) {
+            _sharedUtils.ColorConsole.logger({
+              level: _sharedUtils.Loglevel.WARN,
+              message: [`missing feature (will auto set in rpk):`, featureMessage, {
+                word: '\n\nplease copy to `src/manifest.json`'
+              }]
+            });
+          } else {
+            _sharedUtils.ColorConsole.logger({
+              level: _sharedUtils.Loglevel.THROW,
+              message: [`missing feature:`, featureMessage, `\n\nthere are tow ways to set`, {
+                word: ['copy to `src/manifest.json`', 'add build option `--complete-feature`'].map((item, index) => `\n${index + 1}. ${item}`).join('')
+              }]
+            });
+            throw new Error(`missing feature`);
+          }
+        }
+
+        // 填充feature
+        if (completeFeature) {
+          content.features = usedList.map(item => {
+            return {
+              name: item
+            };
+          });
+        }
       }
       _fsExtra.default.writeJSONSync(_path.default.join(projectPath, outputPath, _UxFileUtils.default.CONFIG_FILE_NAME), content, {
         spaces: 2
@@ -250,22 +285,10 @@ class UxAfterCompile {
       const distFold = _path.default.join(compilerOption.projectPath, compilerOption.releasePath);
       const diffFileName = `.diff.rpk`;
       const diffPath = _path.default.join(distFold, diffFileName);
-      const diffStream = _fsExtra.default.createWriteStream(diffPath);
-      const archiver = (0, _archiver.default)('zip', {
-        zlib: {
-          level: 9
-        }
-      });
-      archiver.pipe(diffStream);
-      diffList.forEach(item => {
-        const filePath = _path.default.join(buildFold, item);
-        archiver.append(_fsExtra.default.createReadStream(filePath), {
-          name: item
-        });
-      });
-      await archiver.finalize();
-      diffStream.close();
-      diffStream.destroy();
+      await _ZipFileUtil.default.createZipFile(diffPath, diffList.map(item => ({
+        filePath: _path.default.join(buildFold, item),
+        zipFilePath: item
+      })));
       compalition.info.diffList = diffList;
       compalition.info.diffFile = _path.default.join(config.projectPath, compilerOption.releasePath, diffFileName);
     }
@@ -326,7 +349,7 @@ class UxAfterCompile {
       return;
     }
     try {
-      const foldList = ['node_modules'];
+      const foldList = ['node_modules', '.git'];
       foldList.forEach(item => {
         const sourcePath = _path.default.join(context.projectPath, item);
         const targetPath = _path.default.join(compilerOption.projectPath, item);

package/lib/compiler/javascript/JavascriptCompiler.js

@@ -127,7 +127,13 @@ class JavascriptCompiler {
     if (configurator.hook) {
       configurator.hook(result);
     }
-    return _lodash.default.merge({}, result, quickAppConfig?.webpack);
+
+    // 数组，则全部数组(默认合并数组中相同序号的项)
+    return _lodash.default.mergeWith({}, result, quickAppConfig?.webpack, (source, target) => {
+      if (Array.isArray(target) && Array.isArray(source)) {
+        return [...target, ...source];
+      }
+    });
   }
   getConfigurator(param) {
     const {

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

@@ -1,3 +1,4 @@
+import { IStyleNode } from '@aiot-toolkit/parser';
 import { ILog } from '@aiot-toolkit/shared-utils';
 import { IFileLaneContext, IFileParam } from 'file-lane';
 import { SourceFile } from 'ts-morph';
@@ -54,7 +55,7 @@ declare class UxLoaderUtils {
      * @returns
      */
     static wrapTempalte(templateTree: SourceFile, file: IFileParam, compilerOption: IJavascriptCompileOption): string;
-    static wrapStyle(code: string, file: IFileParam, compilerOption: IJavascriptCompileOption): string;
+    static wrapStyle(styleNodes: IStyleNode[], file: IFileParam, compilerOption: IJavascriptCompileOption): string;
     /**
      * 给script增加外层包裹内容
      * @param isPageUx

package/lib/utils/ux/UxLoaderUtils.js

@@ -11,6 +11,7 @@ var _sharedUtils = require("@aiot-toolkit/shared-utils");
 var parse5 = _interopRequireWildcard(require("aiot-parse5"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _path = _interopRequireDefault(require("path"));
+var _QuickAppDocHelp = require("@aiot-toolkit/shared-utils/lib/utils/QuickAppDocHelp");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -86,7 +87,8 @@ class UxLoaderUtils {
       content: content.toString(),
       onLog: log => {
         logs.push(log);
-      }
+      },
+      docHelp: new _QuickAppDocHelp.VelaAppDocHelp()
     };
     // 收集图片资源
     const ImageResources = [];
@@ -114,8 +116,10 @@ class UxLoaderUtils {
     // app.ux解析结果中加上manifest.json的内容
     const manifestJson = `require('./manifest.json')`;
     const integrateFunction = (appImport, appStyleTree, appTemplateTree, appScriptTree) => {
+      const scriptCode = appScriptTree.getText();
+      const hasScript = Boolean(scriptCode) && scriptCode !== '""';
       // script代码放在第三个位置不能变化，影响更新source map
-      return isAppUx ? [`${appImport.join('\n')}`, `var $app_style$ = ${UxLoaderUtils.wrapStyle(JSON.stringify(appStyleTree), file, compilerOption)}`, `var $app_script$ = ${UxLoaderUtils.wrapScript(false, appScriptTree)}`, `$app_script$({}, $app_exports$, $app_require$);`, `$app_exports$.default.style = $app_style$;`, `$app_exports$.default.manifest = ${manifestJson}`] : [`${appImport.join('\n')}`, `var $app_style$ = ${UxLoaderUtils.wrapStyle(JSON.stringify(appStyleTree), file, compilerOption)}`, `var $app_script$ = ${UxLoaderUtils.wrapScript(isPageUx, appScriptTree)}`, `var $app_template$ = ${UxLoaderUtils.wrapTempalte(appTemplateTree, file, compilerOption)}`, `${UxLoaderUtils.getReturnType(isPageUx)} function ($app_exports$) {`, `$app_script$({}, $app_exports$, $app_require$);`, `$app_exports$.default.template = $app_template$;`, `$app_exports$.default.style = $app_style$;`, `}`];
+      return isAppUx ? [`${appImport.join('\n')}`, `var $app_style$ = ${UxLoaderUtils.wrapStyle(appStyleTree, file, compilerOption)}`, hasScript ? `var $app_script$ = ${UxLoaderUtils.wrapScript(false, appScriptTree)}` : '', hasScript ? `$app_script$({}, $app_exports$, $app_require$);` : `$app_exports$.default = {}`, `$app_exports$.default.style = $app_style$;`, `$app_exports$.default.manifest = ${manifestJson}`] : [`${appImport.join('\n')}`, `var $app_style$ = ${UxLoaderUtils.wrapStyle(appStyleTree, file, compilerOption)}`, hasScript ? `var $app_script$ = ${UxLoaderUtils.wrapScript(isPageUx, appScriptTree)}` : '', `var $app_template$ = ${UxLoaderUtils.wrapTempalte(appTemplateTree, file, compilerOption)}`, `${UxLoaderUtils.getReturnType(isPageUx)} function ($app_exports$) {`, hasScript ? `$app_script$({}, $app_exports$, $app_require$);` : `$app_exports$.default = {}`, `$app_exports$.default.template = $app_template$;`, `$app_exports$.default.style = $app_style$;`, `}`];
     };
     const {
       targetTree,
@@ -302,10 +306,13 @@ class UxLoaderUtils {
     }
     return result;
   }
-  static wrapStyle(code, file, compilerOption) {
+  static wrapStyle(styleNodes, file, compilerOption) {
+    const code = JSON.stringify(styleNodes);
     if (compilerOption.enableProtobuf) {
-      const result = BinaryPlugin.addStyle(file.path, file.path, code);
-      return `['${result.name}', ${result.index}]`;
+      if (styleNodes?.length) {
+        const result = BinaryPlugin.addStyle(file.path, file.path, code);
+        return `['${result.name}', ${result.index}]`;
+      }
     }
     return code;
   }

package/lib/utils/ux/android/AndroidUx.js

@@ -9,6 +9,7 @@ var _sharedUtils = require("@aiot-toolkit/shared-utils");
 var _UxToTypescript = _interopRequireDefault(require("@aiot-toolkit/parser/lib/ux/translate/android/UxToTypescript"));
 var _generator = require("@aiot-toolkit/generator");
 var _path = _interopRequireDefault(require("path"));
+var _QuickAppDocHelp = require("@aiot-toolkit/shared-utils/lib/utils/QuickAppDocHelp");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * AndroidUx
@@ -58,7 +59,8 @@ class AndroidUx {
       onLog: function (log) {
         logs.push(log);
       },
-      content: content.toString()
+      content: content.toString(),
+      docHelp: new _QuickAppDocHelp.QuickAppDocHelper()
     };
     const uxAst = await new _parser.UxParser(option, compilerOption, {}, path => path).parser();
     const tsAst = await new _UxToTypescript.default(option, compilerOption, context).translate(uxAst.ast, uxAst.offsetList || []);
@@ -75,7 +77,7 @@ class AndroidUx {
         content: code.code
       }, {
         path: `${filePathParse.dir}/${filePathParse.base}.map`,
-        content: code.sourcemap
+        content: tsAst.sourceMap.toString()
       }
       // resource todo
       ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.3-beta.9",
+  "version": "2.0.4-beta.1",
   "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.3-beta.9",
-    "@aiot-toolkit/parser": "2.0.3-beta.9",
-    "@aiot-toolkit/shared-utils": "2.0.3-beta.9",
+    "@aiot-toolkit/generator": "2.0.4-beta.1",
+    "@aiot-toolkit/parser": "2.0.4-beta.1",
+    "@aiot-toolkit/shared-utils": "2.0.4-beta.1",
     "@hap-toolkit/aaptjs": "^2.0.0",
-    "@rspack/core": "^1.0.0",
+    "@rspack/core": "^1.1.8",
     "aiot-parse5": "^1.0.0",
     "archiver": "^7.0.1",
     "babel-loader": "^9.1.3",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.3-beta.9",
+    "file-lane": "2.0.4-beta.1",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",
@@ -36,6 +36,7 @@
     "lodash": "^4.17.21",
     "ts-morph": "^19.0.0",
     "url-loader": "^4.1.1",
+    "webpack": "^5.97.1",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-sources": "^3.2.3"
   },
@@ -45,5 +46,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "d51c01beb50c17548d9ab5be522790d295b4c18d"
+  "gitHead": "85c4287c7b9468c83d468cfc39b147f4975f8285"
 }