@aiot-toolkit/aiotpack 2.0.6-beta.6 → 2.0.6-beta.8

package/lib/compiler/javascript/vela/interface/IManifest.d.ts

@@ -31,6 +31,7 @@ export default interface IManifest {
             component?: string;
         }>;
     };
+    services: IService[] | Record<string, IService>;
     minAPILevel?: number;
     packageInfo?: Dictionary<string | number>;
     icon: string;
@@ -38,4 +39,9 @@ export default interface IManifest {
 export interface IFeatures {
     name: string;
 }
+export interface IService {
+    name: string;
+    autoStart?: boolean;
+    path: string;
+}
 export {};

package/lib/utils/BeforeCompileUtils.js

@@ -40,8 +40,12 @@ class BeforeCompileUtils {
     let entryList = [];
     // 存储轻卡路由
     let liteCardList = [];
+
+    // services 路由
+    let serviceList = [];
     const {
-      router
+      router,
+      services
     } = manifestContent;
     if (router) {
       const {
@@ -84,9 +88,13 @@ class BeforeCompileUtils {
       // 没有router配置
       _sharedUtils.ColorConsole.throw(`### manifest ### No router configuration`);
     }
+    if (services) {
+      serviceList = Array.isArray(services) ? services : Object.values(services);
+    }
     if (compilation) {
       compilation['entries'] = entryList;
       compilation['liteCards'] = liteCardList;
+      compilation['services'] = serviceList;
     }
     return Promise.resolve();
   };

package/lib/utils/ux/UxLoaderUtils.js

@@ -12,6 +12,7 @@ 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");
+var _StyleUtil = _interopRequireDefault(require("@aiot-toolkit/parser/lib/ux/utils/StyleUtil"));
 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 }; }
@@ -143,10 +144,29 @@ class UxLoaderUtils {
   `;
     }
     const integrateFunction = (appImport, appStyleTree, appTemplateTree, appScriptTree) => {
+      const services = compilation['services'];
       const scriptCode = appScriptTree.getText();
       const hasScript = Boolean(scriptCode) && scriptCode !== '""';
+      const relativeFilePath = _path.default.relative(_path.default.join(context.projectPath, compilerOption.sourceRoot), filePath).replace(/\\/g, _path.default.posix.sep);
+      const isService = services?.some(service => relativeFilePath.startsWith(service.path));
+
       // 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}`, 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 createAppWrapper = () => {
+        return [`${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()];
+      };
+      const createComponentWrapper = () => {
+        return [`${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 createServiceWrapper = () => {
+        return ['', '', `var $app_script$ = ${UxLoaderUtils.wrapScript(isPageUx, appScriptTree)}`, `$app_script$({}, $app_exports$, $app_require$);`, `module.exports = $app_exports$.default;`];
+      };
+      if (isAppUx) {
+        return createAppWrapper();
+      } else if (isService) {
+        return createServiceWrapper();
+      } else {
+        return createComponentWrapper();
+      }
     };
     const {
       targetTree,
@@ -334,7 +354,19 @@ class UxLoaderUtils {
     return result;
   }
   static wrapStyle(styleNodes, file, compilerOption) {
-    const code = JSON.stringify(styleNodes);
+    // 排序，媒体查询放到最后
+    const sortedNodes = [...styleNodes];
+    sortedNodes.sort((a, b) => {
+      const conditionA = _StyleUtil.default.isConditionStyleItem(a[0]);
+      const conditionB = _StyleUtil.default.isConditionStyleItem(b[0]);
+      if (conditionA && !conditionB) {
+        return 1;
+      } else if (!conditionA && conditionB) {
+        return -1;
+      }
+      return 0;
+    });
+    const code = JSON.stringify(sortedNodes);
     if (compilerOption.enableProtobuf) {
       if (styleNodes?.length) {
         const result = BinaryPlugin.addStyle(file.path, file.path, code);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.6-beta.6",
+  "version": "2.0.6-beta.8",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,14 +19,14 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.6-beta.6",
-    "@aiot-toolkit/parser": "2.0.6-beta.6",
-    "@aiot-toolkit/shared-utils": "2.0.6-beta.6",
+    "@aiot-toolkit/generator": "2.0.6-beta.8",
+    "@aiot-toolkit/parser": "2.0.6-beta.8",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.8",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.3.9",
     "aiot-parse5": "^1.0.2",
     "babel-loader": "^9.1.3",
-    "file-lane": "2.0.6-beta.6",
+    "file-lane": "2.0.6-beta.8",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",
@@ -42,5 +42,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "71dfc780e74e71df4d731300e7c0d6ea9e494358"
+  "gitHead": "b9380b1c748324938f84da01d035345116f8d0ba"
 }