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

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

@@ -45,8 +45,6 @@ class WrapPlugin {
             var $app_require$ = global.$app_require$ || org_app_require
 
             ${enableE2e ? `globalThis = undefined; \n global = typeof window === "undefined" ? global.__proto__  : window;` : ''}
-            // 转换动态 style 的函数
-            ${isApp ? this.translateStyleFunc() : ''}
             var ${createFuncnName} = function() {
               return `, source, `
             }

package/lib/loader/ux/JsLoader.d.ts

@@ -6,6 +6,6 @@ import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavas
 declare class JsLoader implements ILoader {
     context: IFileLaneContext;
     compilerOption: IJavascriptCompileOption;
-    parser(files: IFileParam<any>[]): IFileParam<any>[] | Promise<IFileParam<any>[]>;
+    parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
 }
 export default JsLoader;

package/lib/loader/ux/JsLoader.js

@@ -10,29 +10,32 @@ var _sharedUtils = require("@aiot-toolkit/shared-utils");
  * JsLoader
  */
 class JsLoader {
-  parser(files) {
+  async parser(files) {
     const onLog = () => {};
-    return files.map(item => {
+    const result = [];
+    for (const item of files) {
       if (!item.content) {
-        return {
+        result.push({
           path: item.path,
           content: item.content
+        });
+      } else {
+        const options = {
+          filePath: item.path,
+          projectPath: this.context.projectPath,
+          content: item.content.toString(),
+          projectType: _sharedUtils.ProjectType.getProjectType(this.context.projectPath),
+          onLog
         };
+        result.push({
+          path: item.path,
+          content: (await new _parser.ScriptToTypescript(options, this.compilerOption, this.context).translate({
+            content: new _parser.ScriptParser(options).parser(item.content.toString()).ast.content
+          }, [])).targetTree.getFullText()
+        });
       }
-      const options = {
-        filePath: item.path,
-        projectPath: this.context.projectPath,
-        content: item.content.toString(),
-        projectType: _sharedUtils.ProjectType.getProjectType(this.context.projectPath),
-        onLog
-      };
-      return {
-        path: item.path,
-        content: new _parser.ScriptToTypescript(options, this.compilerOption, this.context).translate({
-          content: new _parser.ScriptParser(options).parser(item.content.toString()).ast.content
-        }, []).targetTree.getFullText()
-      };
-    });
+    }
+    return result;
   }
 }
 var _default = exports.default = JsLoader;

package/lib/utils/ux/UxLoaderUtils.js

@@ -115,11 +115,38 @@ class UxLoaderUtils {
     // 区分app.ux和一般ux
     // app.ux解析结果中加上manifest.json的内容
     const manifestJson = `require('./manifest.json')`;
+    function 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$
+  `;
+    }
     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(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$;`, `}`];
+      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}`, translateStyleFunc()] : [`${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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.5-beta.1",
+  "version": "2.0.5-beta.10",
   "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-beta.1",
-    "@aiot-toolkit/parser": "2.0.5-beta.1",
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.1",
+    "@aiot-toolkit/generator": "2.0.5-beta.10",
+    "@aiot-toolkit/parser": "2.0.5-beta.10",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.10",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.1.8",
-    "aiot-parse5": "^1.0.0",
+    "aiot-parse5": "^1.0.2",
     "archiver": "^7.0.1",
     "babel-loader": "^9.1.3",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.5-beta.1",
+    "file-lane": "2.0.5-beta.10",
     "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": "44f8c6ee763bc01bd53c655b93e09c698057fc3e"
+  "gitHead": "b2403dbd071d5a6ae33b27f49c6f47ba95861477"
 }