@aiot-toolkit/aiotpack 2.0.2-beta.1 → 2.0.2-beta.2

package/lib/compiler/javascript/JavascriptCompiler.js

@@ -108,6 +108,17 @@ class JavascriptCompiler {
                 Array.isArray(readyRules) && readyRules.length > 0
                     ? [...configuratorRules, ...readyRules]
                     : configuratorRules;
+            // 判断devtool类型 inline-source-map时，添加第0列关系映射
+            if (devtool === 'inline-source-map') {
+                result.module.rules.unshift({
+                    test: /\.js$/,
+                    use: [
+                        {
+                            loader: path_1.default.join(__dirname, '../javascript/vela/utils/webpackLoader/addColSourceMap.js')
+                        }
+                    ]
+                });
+            }
         }
         if (configurator.createPlugins) {
             result.plugins = configurator.createPlugins();

package/lib/compiler/javascript/vela/utils/webpackLoader/addColSourceMap.d.ts

@@ -0,0 +1,3 @@
+import { LoaderContext } from "webpack";
+declare function addColSourceMap(this: LoaderContext<any>, source: string, map: any): Promise<void>;
+export default addColSourceMap;

package/lib/compiler/javascript/vela/utils/webpackLoader/addColSourceMap.js

@@ -0,0 +1,58 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const SourceMapUtil_1 = __importDefault(require("@aiot-toolkit/parser/lib/ux/translate/vela/utils/SourceMapUtil"));
+function addColSourceMap(source, map) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const callback = this.async();
+        if (!map) {
+            callback(null, source, map);
+        }
+        let { consumer, tempGenerator } = yield SourceMapUtil_1.default.createConsumerAndGenerator(JSON.stringify(map));
+        let recordLine = -1;
+        consumer.eachMapping(mapping => {
+            if (mapping.source === consumer.sources[consumer.sources.length - 1]) {
+                if (recordLine < mapping.generatedLine && (mapping.generatedColumn !== 0 || mapping.originalColumn !== 0)) {
+                    tempGenerator.addMapping({
+                        generated: {
+                            line: mapping.generatedLine,
+                            column: 0
+                        },
+                        original: {
+                            line: mapping.originalLine,
+                            column: 0
+                        },
+                        source: mapping.source,
+                        name: ''
+                    });
+                }
+                recordLine = mapping.generatedLine;
+            }
+            tempGenerator.addMapping({
+                generated: {
+                    line: mapping.generatedLine,
+                    column: mapping.generatedColumn
+                },
+                original: {
+                    line: mapping.originalLine,
+                    column: mapping.originalColumn
+                },
+                source: mapping.source,
+                name: mapping.name
+            });
+        });
+        callback(null, source, JSON.parse(tempGenerator.toString()));
+    });
+}
+exports.default = addColSourceMap;

package/lib/config/UxConfig.d.ts

@@ -24,7 +24,10 @@ declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
         })[];
     };
     preWorks: import("file-lane/lib/interface/IFileLaneConfig").PreWork<IJavascriptCompileOption>[];
-    followWorks: import("file-lane/lib/interface/IFileLaneConfig").FollowWork<IJavascriptCompileOption>[];
+    followWorks: {
+        worker: import("file-lane/lib/interface/IFileLaneConfig").FollowWork<IJavascriptCompileOption>;
+        workerDescribe: string;
+    }[];
     watchIgnores: RegExp[];
 }
 export default UxConfig;

package/lib/config/UxConfig.js

@@ -9,8 +9,8 @@ const JsLoader_1 = __importDefault(require("../loader/ux/JsLoader"));
 const PngLoader_1 = __importDefault(require("../loader/ux/PngLoader"));
 const UxLoader_1 = __importDefault(require("../loader/ux/UxLoader"));
 const PreWorkUtils_1 = __importDefault(require("../utils/PreWorkUtils"));
-const UxFollowWorks_1 = __importDefault(require("../utils/ux/UxFollowWorks"));
-const UxPreWorks_1 = __importDefault(require("../utils/ux/UxPreWorks"));
+const UxFollowWorks_1 = __importDefault(require("../followWorks/ux/UxFollowWorks"));
+const UxPreWorks_1 = __importDefault(require("../preWorks/ux/UxPreWorks"));
 class UxConfig {
     constructor(projectPath) {
         this.projectPath = projectPath;
@@ -44,13 +44,34 @@ class UxConfig {
             PreWorkUtils_1.default.getGlobalVar
         ];
         this.followWorks = [
-            UxFollowWorks_1.default.symlinkNodeModule,
-            UxFollowWorks_1.default.webpack,
-            UxFollowWorks_1.default.copyResource,
-            UxFollowWorks_1.default.jsc,
-            UxFollowWorks_1.default.toRpk,
-            UxFollowWorks_1.default.moveBackResult,
-            UxFollowWorks_1.default.protobuf
+            {
+                worker: UxFollowWorks_1.default.symlinkNodeModule,
+                workerDescribe: 'Create a soft link to the node_modules folder'
+            },
+            {
+                worker: UxFollowWorks_1.default.webpack,
+                workerDescribe: 'Compile the project using webpack'
+            },
+            {
+                worker: UxFollowWorks_1.default.copyResource,
+                workerDescribe: 'Copy resource files'
+            },
+            {
+                worker: UxFollowWorks_1.default.jsc,
+                workerDescribe: 'Generate jsc bytecode'
+            },
+            {
+                worker: UxFollowWorks_1.default.protobuf,
+                workerDescribe: 'Generate protobuf json'
+            },
+            {
+                worker: UxFollowWorks_1.default.toRpk,
+                workerDescribe: 'Package the project into an RPK file'
+            },
+            {
+                worker: UxFollowWorks_1.default.moveBackResult,
+                workerDescribe: 'Migrate temporary project'
+            }
         ];
         this.watchIgnores = [/node_modules/];
     }

package/lib/config/XtsConfig.d.ts

@@ -13,6 +13,8 @@ declare class XtsConfig implements IFileLaneConfig {
         }[];
     };
     preWorks: import("file-lane/lib/interface/IFileLaneConfig").PreWork<import("../interface/ICompileOptions").IXtsCompileOptions>[];
-    followWorks: import("file-lane/lib/interface/IFileLaneConfig").FollowWork<import("../interface/ICompileOptions").IXtsCompileOptions>[];
+    followWorks: {
+        worker: import("file-lane/lib/interface/IFileLaneConfig").FollowWork<import("../interface/ICompileOptions").IXtsCompileOptions>;
+    }[];
 }
 export default XtsConfig;

package/lib/config/XtsConfig.js

@@ -24,7 +24,17 @@ class XtsConfig {
             ]
         };
         this.preWorks = [preInstall_1.preInstall];
-        this.followWorks = [entryTemplate_1.generateEntryFile, ts2wasm_1.ts2wasm, generateRpk_1.generateRpk];
+        this.followWorks = [
+            {
+                worker: entryTemplate_1.generateEntryFile
+            },
+            {
+                worker: ts2wasm_1.ts2wasm
+            },
+            {
+                worker: generateRpk_1.generateRpk
+            }
+        ];
     }
 }
 exports.default = XtsConfig;

package/lib/{utils → followWorks}/ux/UxFollowWorks.js

@@ -26,7 +26,7 @@ const JavascriptCompiler_1 = __importDefault(require("../../compiler/javascript/
 const JavascriptDefaultCompileOption_1 = __importDefault(require("../../compiler/javascript/JavascriptDefaultCompileOption"));
 const Jsc_1 = __importDefault(require("../../compiler/javascript/vela/utils/Jsc"));
 const ZipUtil_1 = __importDefault(require("../../compiler/javascript/vela/utils/ZipUtil"));
-const UxFileUtils_1 = __importDefault(require("./UxFileUtils"));
+const UxFileUtils_1 = __importDefault(require("../../utils/ux/UxFileUtils"));
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
 /**
  * UxFollowWorks
@@ -242,12 +242,17 @@ UxFollowWorks.symlinkNodeModule = (context, config, compilerOption) => __awaiter
     if (!compilerOption) {
         return;
     }
-    const foldList = ['node_modules'];
-    foldList.forEach((item) => {
-        const sourcePath = path_1.default.join(context.projectPath, item);
-        if (fs_extra_1.default.existsSync(sourcePath)) {
-            fs_extra_1.default.symlinkSync(sourcePath, path_1.default.join(compilerOption.projectPath, item), 'junction');
-        }
-    });
+    try {
+        const foldList = ['node_modules'];
+        foldList.forEach((item) => {
+            const sourcePath = path_1.default.join(context.projectPath, item);
+            if (fs_extra_1.default.existsSync(sourcePath)) {
+                fs_extra_1.default.symlinkSync(sourcePath, path_1.default.join(compilerOption.projectPath, item), 'junction');
+            }
+        });
+    }
+    catch (error) {
+        throw new Error(`${(error === null || error === void 0 ? void 0 : error.toString()) || 'unknown error'}. Please check whether the file system of the current disk supports the creation of soft links.`);
+    }
 });
 exports.default = UxFollowWorks;

package/lib/{utils → preWorks}/ux/UxPreWorks.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-const UxFileUtils_1 = __importDefault(require("./UxFileUtils"));
+const UxFileUtils_1 = __importDefault(require("../../utils/ux/UxFileUtils"));
 /**
  * UxPreWorks
  */

package/lib/utils/PreWorkUtils.js

@@ -99,6 +99,7 @@ PreWorkUtils.clean = (context, _, config, compileOption) => __awaiter(void 0, vo
     BinaryPlugin.reset();
     BinaryPlugin.config = {
         projectPath: context.projectPath,
+        outputProjectPath: path_1.default.join(context.projectPath, context.output),
         source: compileOption === null || compileOption === void 0 ? void 0 : compileOption.sourceRoot,
         output: compileOption === null || compileOption === void 0 ? void 0 : compileOption.outputPath
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.2-beta.1",
+  "version": "2.0.2-beta.2",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,17 +19,18 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.2-beta.1",
-    "@aiot-toolkit/parser": "2.0.2-beta.1",
+    "@aiot-toolkit/generator": "2.0.2-beta.2",
+    "@aiot-toolkit/parser": "2.0.2-beta.2",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "babel-loader": "^9.1.3",
     "del": "^4.1.0",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2-beta.1",
+    "file-lane": "2.0.2-beta.2",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^7.2.2",
     "jszip": "^3.10.1",
+    "source-map": "^0.7.4",
     "url-loader": "^4.1.1",
     "webpack": "^5.89.0",
     "webpack-sources": "^3.2.3"
@@ -38,5 +39,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "9244af36e617295ea4ff11a2f4f07f0e4f9f5f59"
+  "gitHead": "5226bdb0ba61daef207531c2eaaf3d034e04c50f"
 }