@aiot-toolkit/aiotpack 2.0.5-alpha.1 → 2.0.5-beta.1

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -164,7 +164,7 @@ class UxAfterCompile {
         outputPath,
         completeFeature
       } = compilerOption;
-      const content = _UxFileUtils.default.getMainfestInfo(projectPath, sourceRoot);
+      const content = _UxFileUtils.default.getManifestInfo(projectPath, sourceRoot);
       const translateCache = context.translateCache;
       if (!content.minAPILevel) {
         content.minAPILevel = 1;
@@ -232,7 +232,7 @@ class UxAfterCompile {
       const content = Object.keys(comment).map(key => `${key}=${comment[key]}`).join('\n');
       _fsExtra.default.outputFileSync(_path.default.join(outputAbsPath, _ZipUtil.default.BUILD_FILE_PATH), content);
       // cert
-      const files = _ZipUtil.default.getSortedFiles(outputAbsPath, compilerOption, _UxFileUtils.default.getMainfestInfo(projectPath, sourceRoot));
+      const files = _ZipUtil.default.getSortedFiles(outputAbsPath, compilerOption, _UxFileUtils.default.getManifestInfo(projectPath, sourceRoot));
       const digestDic = Object.fromEntries(files.map(item => [item, _sharedUtils.CommonUtil.calcDataDigest(_fsExtra.default.readFileSync(_path.default.join(outputAbsPath, item))).toString('hex')]));
       const hashJson = [{
         path: _ZipUtil.default.DIGEST_HASH_JSON,

package/lib/compiler/javascript/JavascriptCompiler.js

@@ -16,31 +16,37 @@ class JavascriptCompiler {
   QUICKAPP_CONFIG = 'quickapp.config.js';
   async compile(param) {
     return new Promise(async (resolve, reject) => {
-      await this.clean(param);
-      const config = this.createWebpackConfig(param);
-      (0, _core.rspack)(config, (error, stats) => {
-        if (error) {
-          reject({
-            errors: [error]
-          });
-        } else {
-          const statsObj = stats?.toJson({});
-          if (statsObj) {
-            const {
-              errors,
-              warnings
-            } = statsObj;
-            if (errors?.length || warnings?.length) {
-              reject({
+      try {
+        await this.clean(param);
+        const config = this.createWebpackConfig(param);
+        (0, _core.rspack)(config, (error, stats) => {
+          if (error) {
+            reject({
+              errors: [error]
+            });
+          } else {
+            const statsObj = stats?.toJson({});
+            if (statsObj) {
+              const {
                 errors,
                 warnings
-              });
-            } else {
-              resolve();
+              } = statsObj;
+              if (errors?.length || warnings?.length) {
+                reject({
+                  errors,
+                  warnings
+                });
+              } else {
+                resolve();
+              }
             }
           }
-        }
-      });
+        });
+      } catch (error) {
+        reject({
+          errors: [error]
+        });
+      }
     });
   }
   createWebpackConfig(param) {
@@ -62,7 +68,7 @@ class JavascriptCompiler {
     } = param;
     const buildPath = _path.default.resolve(projectPath, outputPath);
     const quickAppConfig = _sharedUtils.CommonUtil.requireModule(_path.default.join(param.projectPath, this.QUICKAPP_CONFIG));
-    const result = {
+    let result = {
       context: projectPath,
       mode,
       devtool: devtool,
@@ -128,12 +134,19 @@ class JavascriptCompiler {
       configurator.hook(result);
     }
 
-    // 数组，则全部数组(默认合并数组中相同序号的项)
-    return _lodash.default.mergeWith({}, result, quickAppConfig?.webpack, (source, target) => {
+    // 合并用户自定义的webpack配置
+    // 数组，则合并数组(默认合并数组中相同序号的项)
+    result = _lodash.default.mergeWith({}, result, quickAppConfig?.webpack, (source, target) => {
       if (Array.isArray(target) && Array.isArray(source)) {
         return [...target, ...source];
       }
     });
+
+    // 触发用户配置的posthook
+    if (quickAppConfig?.postHook) {
+      quickAppConfig.postHook(result);
+    }
+    return result;
   }
   getConfigurator(param) {
     const {

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

@@ -77,7 +77,7 @@ class WrapPlugin {
     return new _webpackSources.ConcatSource(`
 (function () {
   var $app_define_wrap$ = $app_define_wrap$ || function () {};
-  var manifestJson =${JSON.stringify(_UxFileUtils.default.getMainfestInfo(projectPath, sourceRoot))}
+  var manifestJson =${JSON.stringify(_UxFileUtils.default.getManifestInfo(projectPath, sourceRoot))}
   var createAppHandler = function () {
       `, source, `
   }

package/lib/compiler/javascript/interface/IJavascriptCompileOption.d.ts

@@ -56,4 +56,17 @@ export default interface IJavascriptCompileOption extends ICompileParam {
      * 是否自动补全 manifest.json 中的 features 配置
      */
     completeFeature?: boolean;
+    /**
+     * 获取远程证书
+     */
+    signRequest?: () => Promise<{
+        /**
+         * 证书私钥
+         */
+        privatekey: Buffer;
+        /**
+         * 证书
+         */
+        certificate: Buffer;
+    }>;
 }

package/lib/compiler/javascript/vela/plugin/WrapPlugin.d.ts

@@ -5,5 +5,6 @@ declare class WrapPlugin {
     constructor(compilerOption: IJavascriptCompileOption);
     apply(compiler: Compiler): void;
     private wrap;
+    private translateStyleFunc;
 }
 export default WrapPlugin;

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

@@ -31,6 +31,8 @@ class WrapPlugin {
     entrys.forEach(entry => {
       if (compilation.assets[entry]) {
         const source = compilation.assets[entry];
+        const isApp = entry === 'app.js';
+        const createFuncnName = isApp ? 'createAppHandler' : 'createPageHandler';
         compilation.assets[entry] = new _webpackSources.ConcatSource(`
         export default function(global, globalThis, window, $app_exports$, $app_evaluate$){
           var org_app_require = $app_require$;
@@ -43,30 +45,44 @@ class WrapPlugin {
             var $app_require$ = global.$app_require$ || org_app_require
 
             ${enableE2e ? `globalThis = undefined; \n global = typeof window === "undefined" ? global.__proto__  : window;` : ''}
-
             // 转换动态 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.length> 2) {
-                      return [matchs[1].trim().replace(/-([a-z])/g, (_, match) => match.toUpperCase()), matchs[2].trim()]
-                    }
-                    return []
-                  }))}
-              return value
-            }
-        
-            var createPageHandler = function() {
+            ${isApp ? this.translateStyleFunc() : ''}
+            var ${createFuncnName} = function() {
               return `, source, `
             }
         
-            return createPageHandler();
+            return ${createFuncnName}();
           })(global, globalThis, window, $app_exports$, $app_evaluate$)
         }`);
       }
     });
   }
+  translateStyleFunc() {
+    return `
+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.length > 2) {
+            return [
+              matchs[1]
+                .trim()
+                .replace(/-([a-z])/g, (_, match) => match.toUpperCase()),
+              matchs[2].trim(),
+            ];
+          }
+          return [];
+        })
+    );
+  }
+  return value;
+};
+global.$translateStyle$ = $translateStyle$
+`;
+  }
 }
 var _default = exports.default = WrapPlugin;

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

@@ -72,9 +72,10 @@ declare class ZipUtil {
      *
      * @param dist 打包后的文件目录的绝对路径
      * @param param 打包参数
+     * @param manifest manifest.json内容的json对象
      * @returns
      */
-    static getSortedFiles(dist: string, param: IJavascriptCompileOption, config: IManifest): string[];
+    static getSortedFiles(dist: string, param: IJavascriptCompileOption, manifest: IManifest): string[];
     /**
      * 根据 **固定规则**、**manifest.json入口配置**，获取压缩文件时使用的排序规则
      *

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

@@ -58,7 +58,7 @@ class ZipUtil {
    * @returns 生成的 rpk 文件名
    */
   static async createRpk(dist, param) {
-    const config = _UxFileUtils.default.getMainfestInfo(param.projectPath, param.sourceRoot);
+    const config = _UxFileUtils.default.getManifestInfo(param.projectPath, param.sourceRoot);
 
     // 1
     const files = this.getSortedFiles(dist, param, config);
@@ -73,7 +73,7 @@ class ZipUtil {
     } = await this.createPackagesDefinition(param, config, files);
 
     // 生产出带签名的rpk文件buffer
-    const signConfig = _SignUtil.default.getProjectSignConfig(param);
+    const signConfig = await _SignUtil.default.getProjectSignConfig(param);
     const rpkBuffer = await ZipUtil.buildProjectAndOutput(fullPackage, signConfig);
     // 3
     return this.generateDistFile(rpkBuffer, param, this.getFileName(param, config, 'rpk'));
@@ -117,7 +117,7 @@ class ZipUtil {
     } = param;
     const filePath = _path.default.join(projectPath, releasePath, fileName);
     _fsExtra.default.outputFileSync(filePath, buffer);
-    _sharedUtils.ColorConsole.success(`Project build and generate files：${fileName}`);
+    _sharedUtils.ColorConsole.success(`Project build and generate files：${filePath}`);
     return fileName;
   }
 
@@ -196,10 +196,11 @@ class ZipUtil {
    *
    * @param dist 打包后的文件目录的绝对路径
    * @param param 打包参数
+   * @param manifest manifest.json内容的json对象
    * @returns
    */
-  static getSortedFiles(dist, param, config) {
-    const priorities = this.getPriorities(config);
+  static getSortedFiles(dist, param, manifest) {
+    const priorities = this.getPriorities(manifest);
     const getFileIndex = file => {
       const result = priorities.findIndex(item => {
         if (typeof item === 'string') {
@@ -234,11 +235,11 @@ class ZipUtil {
    * @param param
    * @returns
    */
-  static getPriorities(config) {
+  static getPriorities(manifest) {
     const entrySkFiles = []; // todo
     const {
       entry
-    } = config.router;
+    } = manifest.router;
     const result = ['META-INF/CERT',
     // 多语言配置文件要在 manifest 之前
     /^i18n\/.+\.json$/i,

package/lib/compiler/javascript/vela/utils/signature/SignUtil.d.ts

@@ -9,10 +9,10 @@ declare class SignUtil {
      * @param param IJavascriptCompileOption参数中获取签名目录等内容
      * @returns
      */
-    static getProjectSignConfig(param: IJavascriptCompileOption): {
+    static getProjectSignConfig(param: IJavascriptCompileOption): Promise<{
         privatekey: Buffer;
         certificate: Buffer;
-    };
+    }>;
     /**
      * 对二进制zipBuffer签名
      *

package/lib/compiler/javascript/vela/utils/signature/SignUtil.js

@@ -25,12 +25,16 @@ class SignUtil {
    * @param param IJavascriptCompileOption参数中获取签名目录等内容
    * @returns
    */
-  static getProjectSignConfig(param) {
+  static async getProjectSignConfig(param) {
     const {
       mode,
       projectPath,
-      signRoot
+      signRoot,
+      signRequest
     } = param;
+    if (signRequest) {
+      return signRequest();
+    }
     const signPathFolder = _path.default.join(projectPath, signRoot || 'sign');
     const signPathConfig = {
       debug: {
@@ -55,7 +59,6 @@ class SignUtil {
     // release模式 优先sign/release/证书 其次sign/证书
     const releaseSignConfig = [signPathConfig.oldRelease, signPathConfig.sign];
     let modeSignConfig = [];
-    let signConfig;
     switch (mode) {
       case _CompileMode.default.DEVELOPMENT:
         modeSignConfig = developmentSignConfig;
@@ -87,7 +90,7 @@ class SignUtil {
         word: certificatePath
       });
       // 读取证书内容
-      signConfig = {
+      return {
         privatekey: _fsExtra.default.readFileSync(privatekeyPath),
         certificate: _fsExtra.default.readFileSync(certificatePath)
       };
@@ -95,7 +98,6 @@ class SignUtil {
       // 抛出错误,在指定模式下未找到证书
       throw new Error(`The current mode is ${mode}, and there is a problem with the certification path`);
     }
-    return signConfig;
   }
 
   /**

package/lib/loader/ux/android/UxLoader.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _path = _interopRequireDefault(require("path"));
 var _AndroidUx = _interopRequireDefault(require("../../../utils/ux/android/AndroidUx"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
@@ -13,9 +12,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 class UxLoader {
   async parser(files) {
     const result = [];
-    const {
-      projectPath
-    } = this.context;
     for (let item of files) {
       const {
         files,
@@ -25,10 +21,7 @@ class UxLoader {
         file: item,
         compilerOption: this.compilerOption
       });
-      this.logs = logs.map(item => ({
-        ...item,
-        filePath: item.filePath ? _path.default.relative(projectPath, item.filePath) : ''
-      }));
+      this.logs = logs;
       result.push(...files);
     }
     return result;

package/lib/loader/ux/vela/AppUxLoader.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _path = _interopRequireDefault(require("path"));
 var _UxLoaderUtils = _interopRequireDefault(require("../../../utils/ux/UxLoaderUtils"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
@@ -13,17 +12,11 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  */
 class AppUxLoader {
   async parser(files) {
-    const {
-      projectPath
-    } = this.context;
     const {
       files: resultFiles,
       logs
     } = await _UxLoaderUtils.default.compileAppUxToJavascript(files[0], this.context, this.compilerOption);
-    this.logs = logs.map(item => ({
-      ...item,
-      filePath: item.filePath ? _path.default.relative(projectPath, item.filePath) : ''
-    }));
+    this.logs = logs;
     return resultFiles;
   }
 }

package/lib/loader/ux/vela/UxLoader.js

@@ -4,15 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _path = _interopRequireDefault(require("path"));
 var _UxLoaderUtils = _interopRequireDefault(require("../../../utils/ux/UxLoaderUtils"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class UxLoader {
   async parser(files) {
     const resultFiles = [];
-    const {
-      projectPath
-    } = this.context;
     for (const file of files) {
       // 转换每个文件
       const {
@@ -22,7 +18,7 @@ class UxLoader {
       this.logs = logs.map(item => {
         return {
           ...item,
-          filePath: item.position?.source ? item.position.source : item.filePath ? _path.default.relative(projectPath, item.filePath) : ''
+          filePath: item.position?.source || item.filePath
         };
       });
       resultFiles.push(...compiledFiles);

package/lib/utils/BeforeCompileUtils.js

@@ -33,7 +33,7 @@ class BeforeCompileUtils {
     } = context;
     const srcPath = _path.default.join(projectPath, compilerOption.sourceRoot);
     // 判断路径是否真实存在
-    const manifestContent = _UxFileUtils.default.getMainfestInfo(projectPath);
+    const manifestContent = _UxFileUtils.default.getManifestInfo(projectPath);
     // 存储entries
     let entryList = [];
     const {

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

@@ -15,7 +15,7 @@ export declare class UxFileUtils {
      * @param sourceRoot
      * @returns
      */
-    static getMainfestInfo(projectPath: string, sourceRoot?: string): IManifest;
+    static getManifestInfo(projectPath: string, sourceRoot?: string): IManifest;
     /**
      * 检查 manifest文件，并显示错误信息
      *

package/lib/utils/ux/UxFileUtils.js

@@ -30,7 +30,7 @@ class UxFileUtils {
    * @param sourceRoot
    * @returns
    */
-  static getMainfestInfo(projectPath) {
+  static getManifestInfo(projectPath) {
     let sourceRoot = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'src';
     return _fsExtra.default.readJSONSync(UxFileUtils.getManifestFilePath(projectPath, sourceRoot));
   }
@@ -55,7 +55,7 @@ class UxFileUtils {
     }
 
     // 1
-    const jsonData = this.getMainfestInfo(projectPath, sourceRoot);
+    const jsonData = this.getManifestInfo(projectPath, sourceRoot);
     const schema = _ManifestSchema.default;
     const errors = _CommonUtil.default.validateJson(jsonData, schema) || [];
 
@@ -87,7 +87,7 @@ class UxFileUtils {
     const sitemapPath = _path.default.join(projectPath, sourceRoot, 'sitemap.json');
     if (_fsExtra.default.existsSync(sitemapPath)) {
       const rules = _fsExtra.default.readJSONSync(sitemapPath).rules;
-      const manifest = this.getMainfestInfo(projectPath, sourceRoot);
+      const manifest = this.getManifestInfo(projectPath, sourceRoot);
       const pages = Object.keys(manifest.router.pages || {});
       const errorList = [];
       rules.forEach((item, index) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.5-alpha.1",
+  "version": "2.0.5-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.5-alpha.1",
-    "@aiot-toolkit/parser": "2.0.5-alpha.1",
-    "@aiot-toolkit/shared-utils": "2.0.5-alpha.1",
+    "@aiot-toolkit/generator": "2.0.5-beta.1",
+    "@aiot-toolkit/parser": "2.0.5-beta.1",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.1",
     "@hap-toolkit/aaptjs": "^2.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.5-alpha.1",
+    "file-lane": "2.0.5-beta.1",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",
@@ -46,5 +46,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "8c8033a7a52e7cdb83606298ed8c4d6a585ba3ec"
+  "gitHead": "44f8c6ee763bc01bd53c655b93e09c698057fc3e"
 }