@aiot-toolkit/aiotpack 2.0.6-beta.23 → 2.0.6-beta.25

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

@@ -8,6 +8,10 @@ interface IWidget {
     sizes: string[];
     type?: string;
 }
+interface IWidgetProvider {
+    name: string;
+    path: string;
+}
 /**
  * vela manifest文件对应的数据结构
  */
@@ -36,16 +40,13 @@ export default interface IManifest {
     services: IService[] | Record<string, IService>;
     minAPILevel?: number;
     packageInfo?: Dictionary<string | number>;
+    widgetProvider?: IWidgetProvider[];
     icon: string;
     workers?: {
         entries: {
             file: string;
         }[];
     };
-    widgetProvider?: {
-        name: string;
-        path: string;
-    }[];
 }
 export interface IFeatures {
     name: string;

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

@@ -10,6 +10,11 @@ declare class JsLoader implements ILoader {
     compilerOption: IJavascriptCompileOption;
     compilation: FileLaneCompilation;
     logs: ILog[];
+    /**
+     * 解析文件内容
+     * @param files files 待处理的文件数组
+     * @returns 处理后的文件数组
+     */
     parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
 }
 export default JsLoader;

package/lib/loader/ux/JsLoader.js

@@ -7,14 +7,27 @@ exports.default = void 0;
 var _parser = require("@aiot-toolkit/parser");
 var _sharedUtils = require("@aiot-toolkit/shared-utils");
 var _UxLoaderUtils = _interopRequireDefault(require("../../utils/ux/UxLoaderUtils"));
+var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * JsLoader
  */
 class JsLoader {
   logs = [];
+  /**
+   * 解析文件内容
+   * @param files files 待处理的文件数组
+   * @returns 处理后的文件数组
+   */
   async parser(files) {
     const result = [];
+    const {
+      projectPath,
+      widgetProvider
+    } = this.context;
+    const {
+      sourceRoot
+    } = this.compilerOption;
     for (const item of files) {
       if (!item.content) {
         result.push({
@@ -24,7 +37,7 @@ class JsLoader {
       } else {
         const options = {
           filePath: item.path,
-          projectPath: this.context.projectPath,
+          projectPath,
           content: item.content.toString(),
           projectType: _sharedUtils.ProjectType.getProjectType(this.context.projectPath),
           onLog: log => {
@@ -39,11 +52,26 @@ class JsLoader {
           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
-        });
+        if (isService) {
+          result.push({
+            path: item.path,
+            content: _UxLoaderUtils.default.createServiceWrapper(scriptTree.targetTree).filter(Boolean).join('\n')
+          });
+        } else {
+          const isWidgetProvider = widgetProvider?.includes(_path.default.relative(_path.default.join(projectPath, sourceRoot), item.path).replace(/\\/g, '/'));
+          let content = scriptTree.targetTree.getFullText();
+          if (isWidgetProvider) {
+            const {
+              newScriptTree,
+              scriptSourceMap
+            } = _parser.SourceMapUtil.splitSourceMap(scriptTree.targetTree);
+            content = _parser.SourceMapUtil.concatSourceMap(`${newScriptTree.getFullText()}\n$app_exports$.default = exports["default"]\n`, scriptSourceMap);
+          }
+          result.push({
+            path: item.path,
+            content: content
+          });
+        }
       }
     }
     return result;

package/lib/utils/BeforeCompileUtils.js

@@ -29,7 +29,8 @@ class BeforeCompileUtils {
     const {
       context,
       compilerOption,
-      compilation
+      compilation,
+      onLog
     } = params;
     const {
       projectPath
@@ -46,8 +47,11 @@ class BeforeCompileUtils {
     let serviceList = [];
     const {
       router,
-      services
+      services,
+      widgetProvider
     } = manifestContent;
+    // 存储widgetProvider
+    let widgetProviderList = [];
     if (router) {
       const {
         pages,
@@ -63,7 +67,12 @@ class BeforeCompileUtils {
             entryList.push(_path.default.join(entryDir, entry));
           } else {
             // 路径不存在
-            _sharedUtils.ColorConsole.throw(`### manifest ### path '${_path.default.join(entryDir, entryPages.join(' | '))}' does not exist`);
+            onLog?.([{
+              level: _sharedUtils.Loglevel.THROW,
+              message: ['### manifest ### path', {
+                word: _path.default.join(entryDir, entryPages.join(' | '))
+              }, 'does not exist']
+            }]);
           }
         });
       }
@@ -76,15 +85,22 @@ class BeforeCompileUtils {
             if (_fsExtra.default.existsSync(cardPath)) {
               liteCardList.push(card + _path.default.posix.sep + cardContent.component);
             } else {
-              // 报错
-              _sharedUtils.ColorConsole.throw(`### manifest ### lite card path '${cardPath}' does not exist`);
+              onLog?.([{
+                level: _sharedUtils.Loglevel.THROW,
+                message: [`### manifest ### lite card path`, {
+                  word: cardPath
+                }, `does not exist`]
+              }]);
             }
           }
         });
       }
     } else {
       // 没有router配置
-      _sharedUtils.ColorConsole.throw(`### manifest ### No router configuration`);
+      onLog?.([{
+        level: _sharedUtils.Loglevel.THROW,
+        message: ['### manifest ### No router configuration']
+      }]);
     }
 
     // e2e测试入口
@@ -98,10 +114,30 @@ class BeforeCompileUtils {
     if (services) {
       serviceList = Array.isArray(services) ? services : Object.values(services);
     }
+    if (widgetProvider) {
+      const EXTENSION_JS = '.js';
+      for (const providerItem of widgetProvider) {
+        const {
+          path
+        } = providerItem;
+        const itemPath = _path.default.join(srcPath, path + EXTENSION_JS);
+        if (_fsExtra.default.existsSync(itemPath)) {
+          widgetProviderList.push(path + EXTENSION_JS);
+        } else {
+          onLog?.([{
+            level: _sharedUtils.Loglevel.THROW,
+            message: ['### manifest ### widgetProvider path', {
+              word: itemPath
+            }, 'does not exist']
+          }]);
+        }
+      }
+    }
     if (compilation) {
       compilation['entries'] = entryList;
       compilation['liteCards'] = liteCardList;
       compilation['services'] = serviceList;
+      context['widgetProvider'] = widgetProviderList;
     }
     return Promise.resolve();
   };

package/package.json

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