@aiot-toolkit/aiotpack 2.0.2-dev.8 → 2.0.2

package/lib/utils/ux/android/AndroidUx.js

@@ -0,0 +1,98 @@
+"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 parser_1 = require("@aiot-toolkit/parser");
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const UxToTypescript_1 = __importDefault(require("@aiot-toolkit/parser/lib/ux/translate/android/UxToTypescript"));
+const generator_1 = require("@aiot-toolkit/generator");
+const path_1 = __importDefault(require("path"));
+/**
+ * AndroidUx
+ */
+class AndroidUx {
+    /**
+     *
+     * 编译 ux 文件
+     * 1. 获取文件类型：app  page  普通ux
+     * 2. 使用`UxParse`解析
+     * 3. 使用`UxToTypeScript`转换
+     * 4. 使用`TypeScriptGenerator`生成
+     * @param params
+     */
+    compileUx(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { context, file, compilerOption } = params;
+            const { path: filePath, content } = file;
+            const { projectPath } = context;
+            const fileType = this.getFileType(filePath, context);
+            // 无内容的文件，添加空内容警告
+            if (!content) {
+                return {
+                    files: [],
+                    logs: [
+                        {
+                            level: shared_utils_1.Loglevel.WARN,
+                            message: `${filePath} is empty`,
+                            filePath
+                        }
+                    ]
+                };
+            }
+            const logs = [];
+            const option = {
+                filePath,
+                projectPath,
+                projectType: shared_utils_1.ProjectType.ANDDROID_UX,
+                fileType,
+                onLog: function (log) {
+                    logs.push(log);
+                },
+                content: content.toString()
+            };
+            const uxAst = yield new parser_1.UxParser(option, compilerOption, {}, (path) => path).parser();
+            const tsAst = yield new UxToTypescript_1.default(option, compilerOption, context).translate(uxAst.ast, uxAst.offsetList || []);
+            const filePathParse = path_1.default.parse(filePath);
+            const code = new generator_1.TypescriptGenerator().generate({
+                sourceFilePath: filePathParse.base,
+                targetFilePath: `${filePathParse.name}.js`,
+                ast: tsAst.targetTree,
+                mapList: tsAst.mapList
+            });
+            return {
+                files: [
+                    {
+                        path: filePath,
+                        content: code.code
+                    },
+                    {
+                        path: `${filePathParse.dir}/${filePathParse.base}.map`,
+                        content: code.sourcemap
+                    }
+                    // resource todo
+                ],
+                logs
+            };
+        });
+    }
+    getFileType(filePath, context) {
+        const { entries } = context;
+        if (path_1.default.basename(filePath) === 'app.ux') {
+            return 'app';
+        }
+        else if (entries.includes(filePath)) {
+            return 'page';
+        }
+    }
+}
+exports.default = AndroidUx;

package/lib/utils/xts/XtsFileLaneUtils.d.ts

@@ -0,0 +1,10 @@
+declare class XtsFileLaneUtils {
+    /**
+     * 将buildPath文件夹的内容压缩成zip包，放置于targetPath路径下
+     * @param buildPath
+     * @param targetPath
+     * @param zipRootDirNames 可自定义压缩包内最外层目录的名称
+     */
+    static zipProject(buildPath: string[], targetFile: string, zipRootDirNames?: string[]): Promise<void>;
+}
+export default XtsFileLaneUtils;

package/lib/utils/xts/XtsFileLaneUtils.js

@@ -0,0 +1,68 @@
+"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 shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const archiver_1 = __importDefault(require("archiver"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+class XtsFileLaneUtils {
+    /**
+     * 将buildPath文件夹的内容压缩成zip包，放置于targetPath路径下
+     * @param buildPath
+     * @param targetPath
+     * @param zipRootDirNames 可自定义压缩包内最外层目录的名称
+     */
+    static zipProject(buildPath, targetFile, zipRootDirNames) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                const output = fs_extra_1.default.createWriteStream(targetFile);
+                const archive = archiver_1.default.create('zip', {
+                    zlib: { level: 9 }
+                });
+                // 监听错误
+                archive.on('error', (err) => {
+                    shared_utils_1.ColorConsole.throw(`${err.message}`);
+                    output.close();
+                    reject();
+                });
+                // 监听写入流打开的事件
+                output.on('open', () => {
+                    shared_utils_1.ColorConsole.info(`Write stream is open`);
+                });
+                output.on('close', () => {
+                    shared_utils_1.ColorConsole.info(`Write stream is closed`);
+                    resolve();
+                });
+                // 将压缩文件导入到输出流中
+                archive.pipe(output);
+                // 指定压缩目录
+                buildPath.forEach((folder, index) => {
+                    const folderName = path_1.default.basename(folder); // 获取文件夹名
+                    if (zipRootDirNames && zipRootDirNames[index]) {
+                        archive.directory(folder, zipRootDirNames[index]);
+                    }
+                    else {
+                        archive.directory(folder, folderName);
+                    }
+                });
+                archive.on('finish', () => {
+                    shared_utils_1.ColorConsole.info('finish');
+                });
+                // 完成压缩，关闭输出流
+                archive.finalize();
+            });
+        });
+    }
+}
+exports.default = XtsFileLaneUtils;

package/lib/utils/xts/XtsFollowWorks.js

@@ -12,11 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const FileLaneUtil_1 = __importDefault(require("file-lane/lib/utils/FileLaneUtil"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const UxFileUtils_1 = __importDefault(require("./../ux/UxFileUtils"));
+const XtsFileLaneUtils_1 = __importDefault(require("../../utils/xts/XtsFileLaneUtils"));
 /**
  * XtsFollowWorks
  */
@@ -33,7 +33,7 @@ class XtsFollowWorks {
             const zipPath = path_1.default.join(projectPath, 'dist');
             // buildPath必须是真实文件夹路径
             if (!fs_extra_1.default.existsSync(buildPath)) {
-                ColorConsole_1.default.throw(`buildPath: '${buildPath}' not exist`);
+                shared_utils_1.ColorConsole.throw(`buildPath: '${buildPath}' not exist`);
             }
             try {
                 // 确认文件夹是否存在，不存在则创建
@@ -41,10 +41,10 @@ class XtsFollowWorks {
                 // 清空dist文件夹
                 fs_extra_1.default.emptyDirSync(zipPath);
                 const filePath = XtsFollowWorks.getFilePath(projectPath, 'dist', options.packageName, 'rpk');
-                yield FileLaneUtil_1.default.zipProject([buildPath], filePath, [options.packageName]);
+                yield XtsFileLaneUtils_1.default.zipProject([buildPath], filePath, [options.packageName]);
             }
             catch (err) {
-                ColorConsole_1.default.throw(`${err.message}`);
+                shared_utils_1.ColorConsole.throw(`${err.message}`);
             }
         });
     }
@@ -57,8 +57,8 @@ class XtsFollowWorks {
      * @param context
      */
     static zipDistributedQuickApp(context) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const deviceList = [
                 {
                     device: 'phone',
@@ -115,13 +115,13 @@ class XtsFollowWorks {
                     const buildPaths = item.aspectList.map((name) => path_1.default.join(projectPath, output, name));
                     const filePath = XtsFollowWorks.getFilePath(projectPath, 'dist', item.device);
                     try {
-                        yield FileLaneUtil_1.default.zipProject(buildPaths, filePath);
+                        yield XtsFileLaneUtils_1.default.zipProject(buildPaths, filePath);
                     }
                     catch (error) { }
                 }
             }
             else {
-                ColorConsole_1.default.throw('not find manifest.json');
+                shared_utils_1.ColorConsole.throw('not find manifest.json');
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.2-dev.8",
+  "version": "2.0.2",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,24 +19,31 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.2-dev.8",
-    "@aiot-toolkit/parser": "2.0.2-dev.8",
+    "@aiot-toolkit/generator": "2.0.2",
+    "@aiot-toolkit/parser": "2.0.2",
+    "@aiot-toolkit/shared-utils": "2.0.2",
     "@hap-toolkit/aaptjs": "^2.0.0",
+    "@rspack/core": "^1.0.0",
+    "aiot-parse5": "^1.0.0",
+    "archiver": "^7.0.1",
     "babel-loader": "^9.1.3",
-    "del": "^4.1.0",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2-dev.8",
+    "file-lane": "2.0.2",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
-    "jsrsasign": "^7.2.2",
+    "jsrsasign": "^11.1.0",
     "jszip": "^3.10.1",
+    "lodash": "^4.17.21",
+    "ts-morph": "^19.0.0",
     "url-loader": "^4.1.1",
-    "webpack": "^5.89.0",
+    "webpack-bundle-analyzer": "^4.10.2",
     "webpack-sources": "^3.2.3"
   },
   "devDependencies": {
+    "@types/archiver": "^6.0.2",
+    "@types/fs-extra": "^11.0.4",
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "831575362ba47778c9441f95cec41ddded36cffc"
+  "gitHead": "8ca4bf2ed7bcf11911e5c514696951bdba4fc12d"
 }

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

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

package/lib/utils/PreWorkUtils.d.ts

@@ -1,22 +0,0 @@
-import { IFileLaneContext } from 'file-lane';
-import { PreWork } from 'file-lane/lib/interface/IFileLaneConfig';
-import IJavascriptCompileOption from '../compiler/javascript/interface/IJavascriptCompileOption';
-/**
- * PreWorkUtils
- */
-declare class PreWorkUtils {
-    /**
-     * 获取ux项目的路由入口
-     * @param context
-     * @param fileList
-     * @returns
-     */
-    static getEntries(context: IFileLaneContext): Promise<void>;
-    static clean: PreWork<IJavascriptCompileOption>;
-    /**
-     * 获取项目的全局样式变量配置
-     * @param context
-     */
-    static getGlobalVar(context: IFileLaneContext): Promise<void>;
-}
-export default PreWorkUtils;

package/lib/utils/PreWorkUtils.js

@@ -1,106 +0,0 @@
-"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 };
-};
-var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const del_1 = __importDefault(require("del"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const TranslateCache_1 = __importDefault(require("../../../parser/lib/ux/translate/vela/TranslateCache"));
-const UxFileUtils_1 = __importDefault(require("./ux/UxFileUtils"));
-const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
-/**
- * PreWorkUtils
- */
-class PreWorkUtils {
-    /**
-     * 获取ux项目的路由入口
-     * @param context
-     * @param fileList
-     * @returns
-     */
-    static getEntries(context) {
-        const { projectPath } = context;
-        const srcPath = path_1.default.join(projectPath, 'src');
-        // 判断路径是否真实存在
-        const manifestContent = UxFileUtils_1.default.getMainfestInfo(projectPath);
-        // 存储entries
-        let entryList = [];
-        if (manifestContent) {
-            const { router } = manifestContent;
-            if (!router) {
-                // 没有router配置
-                ColorConsole_1.default.throw(`### manifest ### No router configuration`);
-            }
-            const { pages } = router;
-            if (!pages) {
-                // 没有pages配置
-                ColorConsole_1.default.throw(`### manifest ### No pages configuration`);
-            }
-            Object.keys(pages).map((page) => {
-                const pageContent = pages[page];
-                const entryDir = path_1.default.join(srcPath, page);
-                const entryPage = path_1.default.join(entryDir, `${pageContent.component}.ux`);
-                if (fs_extra_1.default.existsSync(entryPage)) {
-                    entryList.push(entryPage);
-                }
-                else {
-                    // 路径不存在
-                    ColorConsole_1.default.throw(`### manifest ### path '${entryPage}' does not exist`);
-                }
-            });
-            context['entries'] = entryList;
-            return Promise.resolve();
-        }
-        else {
-            // manifest.json文件无有效内容
-            ColorConsole_1.default.error(`### manifest ### File has no valid content`);
-            return Promise.reject();
-        }
-    }
-    /**
-     * 获取项目的全局样式变量配置
-     * @param context
-     */
-    static getGlobalVar(context) {
-        const { projectPath } = context;
-        const filePath = path_1.default.join(projectPath, 'src', 'globalVar.json');
-        let globalVar = {};
-        // 判断文件是否存在
-        if (fs_extra_1.default.existsSync(filePath)) {
-            // 存在则取内容，否则内容为空
-            globalVar = fs_extra_1.default.readJSONSync(filePath);
-        }
-        context.globalVar = globalVar;
-        return Promise.resolve();
-    }
-}
-_a = PreWorkUtils;
-PreWorkUtils.clean = (context, _, config, compileOption) => __awaiter(void 0, void 0, void 0, function* () {
-    yield (0, del_1.default)(path_1.default.join(context.projectPath, context.output));
-    if (compileOption) {
-        yield (0, del_1.default)(path_1.default.join(compileOption.projectPath, compileOption.outputPath));
-        yield (0, del_1.default)(path_1.default.join(compileOption.projectPath, compileOption.releasePath));
-        yield (0, del_1.default)(path_1.default.join(context.projectPath, compileOption.outputPath));
-        yield (0, del_1.default)(path_1.default.join(context.projectPath, compileOption.releasePath));
-    }
-    TranslateCache_1.default.featureCache.clear();
-    BinaryPlugin.reset();
-    BinaryPlugin.config = {
-        projectPath: context.projectPath,
-        source: compileOption === null || compileOption === void 0 ? void 0 : compileOption.sourceRoot,
-        output: compileOption === null || compileOption === void 0 ? void 0 : compileOption.outputPath
-    };
-});
-exports.default = PreWorkUtils;