@aiot-toolkit/aiotpack 2.0.5-widget-provider-beta.1 → 2.0.5-widget-provider-beta.2

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文件对应的数据结构
  */
@@ -33,6 +37,7 @@ export default interface IManifest {
     };
     minAPILevel?: number;
     packageInfo?: Dictionary<string | number>;
+    widgetProvider?: IWidgetProvider[];
     icon: string;
 }
 export interface IFeatures {

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

@@ -6,6 +6,11 @@ import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavas
 declare class JsLoader implements ILoader {
     context: IFileLaneContext;
     compilerOption: IJavascriptCompileOption;
+    /**
+     * 解析文件内容
+     * @param files files 待处理的文件数组
+     * @returns 处理后的文件数组
+     */
     parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
 }
 export default JsLoader;

package/lib/loader/ux/JsLoader.js

@@ -6,13 +6,27 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _parser = require("@aiot-toolkit/parser");
 var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * JsLoader
  */
 class JsLoader {
+  /**
+   * 解析文件内容
+   * @param files files 待处理的文件数组
+   * @returns 处理后的文件数组
+   */
   async parser(files) {
     const onLog = () => {};
     const result = [];
+    const {
+      projectPath,
+      widgetProvider
+    } = this.context;
+    const {
+      sourceRoot
+    } = this.compilerOption;
     for (const item of files) {
       if (!item.content) {
         result.push({
@@ -22,16 +36,28 @@ class JsLoader {
       } else {
         const options = {
           filePath: item.path,
-          projectPath: this.context.projectPath,
+          projectPath,
           content: item.content.toString(),
-          projectType: _sharedUtils.ProjectType.getProjectType(this.context.projectPath),
+          projectType: _sharedUtils.ProjectType.getProjectType(projectPath),
           onLog
         };
+        const JSTree = (await new _parser.ScriptToTypescript(options, this.compilerOption, this.context).translate({
+          content: new _parser.ScriptParser(options).parser(item.content.toString()).ast.content
+        }, [])).targetTree;
+        // 切割script中的转换结果和source map
+        const spliteResult = _parser.SourceMapUtil.splitSourceMap(JSTree);
+        let JSContent = spliteResult.newScriptTree.getFullText();
+        // 若为widgetProvider.js文件，则给内容添加包裹
+        if (widgetProvider) {
+          const a = _path.default.relative(_path.default.join(projectPath, sourceRoot), item.path).replace(/\\/g, '/');
+          const isWidgetProvider = widgetProvider.includes(a);
+          if (isWidgetProvider) {
+            JSContent += `$app_exports$.default = exports["default"]`;
+          }
+        }
         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: _parser.SourceMapUtil.concatSourceMap(JSContent, spliteResult.scriptSourceMap)
         });
       }
     }

package/lib/utils/BeforeCompileUtils.js

@@ -41,8 +41,11 @@ class BeforeCompileUtils {
     let entryList = [];
     // 存储轻卡路由
     let liteCardList = [];
+    // 存储widgetProvider
+    let widgetProviderList = [];
     const {
-      router
+      router,
+      widgetProvider
     } = manifestContent;
     if (router) {
       const {
@@ -85,8 +88,24 @@ class BeforeCompileUtils {
       // 没有router配置
       _sharedUtils.ColorConsole.throw(`### manifest ### No router configuration`);
     }
+    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 {
+          // 报错
+          _sharedUtils.ColorConsole.throw(`### manifest ### widgetProvider path '${itemPath}' does not exist`);
+        }
+      }
+    }
     context['entries'] = entryList;
     context['liteCards'] = liteCardList;
+    context['widgetProvider'] = widgetProviderList;
     return Promise.resolve();
   };
   static clean = async params => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.5-widget-provider-beta.1",
+  "version": "2.0.5-widget-provider-beta.2",
   "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.5-widget-provider-beta.1",
-    "@aiot-toolkit/parser": "2.0.5-widget-provider-beta.1",
-    "@aiot-toolkit/shared-utils": "2.0.5-widget-provider-beta.1",
+    "@aiot-toolkit/generator": "2.0.5-widget-provider-beta.2",
+    "@aiot-toolkit/parser": "2.0.5-widget-provider-beta.2",
+    "@aiot-toolkit/shared-utils": "2.0.5-widget-provider-beta.2",
     "@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.5-widget-provider-beta.1",
+    "file-lane": "2.0.5-widget-provider-beta.2",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "hap-toolkit": "^2.0.0",
@@ -43,5 +43,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "64842a2c374b8b3b344cef377d9c032eaf1a99a7"
+  "gitHead": "4a8894bc66a9c78cd835ed6c1af74d054300e064"
 }