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

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

@@ -1,11 +1,13 @@
 import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
 import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavascriptCompileOption';
+import FileLaneCompilation from 'file-lane/lib/FileLaneCompilation';
 /**
  * JsLoader
  */
 declare class JsLoader implements ILoader {
     context: IFileLaneContext;
     compilerOption: IJavascriptCompileOption;
+    compilation: FileLaneCompilation;
     parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
 }
 export default JsLoader;

package/lib/loader/ux/JsLoader.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _parser = require("@aiot-toolkit/parser");
 var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _UxLoaderUtils = _interopRequireDefault(require("../../utils/ux/UxLoaderUtils"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * JsLoader
  */
@@ -27,11 +29,18 @@ class JsLoader {
           projectType: _sharedUtils.ProjectType.getProjectType(this.context.projectPath),
           onLog
         };
+        const scriptTree = await new _parser.ScriptToTypescript(options, this.compilerOption, this.context).translate({
+          content: new _parser.ScriptParser(options).parser(item.content.toString()).ast.content
+        }, []);
+        const isService = _UxLoaderUtils.default.isServiceFile(item.path, {
+          compilation: this.compilation,
+          compilerOption: this.compilerOption,
+          context: this.context
+        });
+        const content = isService ? _UxLoaderUtils.default.createServiceWrapper(scriptTree.targetTree).filter(Boolean).join('\n') : scriptTree.targetTree.getFullText();
         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()
+          content
         });
       }
     }

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

@@ -65,5 +65,11 @@ declare class UxLoaderUtils {
      */
     static wrapScript(isPageUx: boolean, appScriptTree: SourceFile): string;
     static getReturnType(isPageUx: boolean): "$app_exports$['entry'] =" | "module.exports = ";
+    static createServiceWrapper(appScriptTree: SourceFile): string[];
+    static isServiceFile(filePath: string, option: {
+        compilation: FileLaneCompilation;
+        context: IFileLaneContext;
+        compilerOption: IJavascriptCompileOption;
+    }): boolean;
 }
 export default UxLoaderUtils;

package/lib/utils/ux/UxLoaderUtils.js

@@ -144,11 +144,13 @@ 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));
+      const isService = UxLoaderUtils.isServiceFile(filePath, {
+        compilation,
+        context,
+        compilerOption
+      });
 
       // script代码放在第三个位置不能变化，影响更新source map
       const createAppWrapper = () => {
@@ -157,13 +159,10 @@ class UxLoaderUtils {
       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();
+        return UxLoaderUtils.createServiceWrapper(appScriptTree);
       } else {
         return createComponentWrapper();
       }
@@ -392,5 +391,13 @@ class UxLoaderUtils {
   static getReturnType(isPageUx) {
     return isPageUx ? `$app_exports$['entry'] =` : 'module.exports = ';
   }
+  static createServiceWrapper(appScriptTree) {
+    return ['', '', `var $app_script$ = ${UxLoaderUtils.wrapScript(false, appScriptTree)}`, `$app_script$({}, $app_exports$, $app_require$);`, `module.exports = $app_exports$.default;`];
+  }
+  static isServiceFile(filePath, option) {
+    const services = option.compilation['services'];
+    const relativeFilePath = _path.default.relative(_path.default.join(option.context.projectPath, option.compilerOption.sourceRoot), filePath).replace(/\\/g, _path.default.posix.sep);
+    return services?.some(service => relativeFilePath.startsWith(service.path));
+  }
 }
 var _default = exports.default = UxLoaderUtils;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.6-beta.8",
+  "version": "2.0.6-beta.9",
   "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.8",
-    "@aiot-toolkit/parser": "2.0.6-beta.8",
-    "@aiot-toolkit/shared-utils": "2.0.6-beta.8",
+    "@aiot-toolkit/generator": "2.0.6-beta.9",
+    "@aiot-toolkit/parser": "2.0.6-beta.9",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.9",
     "@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.8",
+    "file-lane": "2.0.6-beta.9",
     "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": "b9380b1c748324938f84da01d035345116f8d0ba"
+  "gitHead": "18718f09f1ee7f1d7361022c5fb7858c87cee2bd"
 }