@aiot-toolkit/aiotpack 2.0.1-alpha.3 → 2.0.1-alpha.5

package/lib/config/XtsConfig.d.ts

@@ -1,5 +1,4 @@
 import { IFileLaneConfig } from 'file-lane';
-import { generateEntryFile } from '../followWorks/xts/entryTemplate';
 import XtsLoader from '../loader/xts/XtsLoader';
 /**
  * XtsConfig
@@ -13,6 +12,7 @@ declare class XtsConfig implements IFileLaneConfig {
             loader: (typeof XtsLoader)[];
         }[];
     };
-    followWorks: (typeof generateEntryFile)[];
+    preWorks: import("file-lane/lib/interface/IFileLaneConfig").PreWork[];
+    followWorks: import("file-lane/lib/interface/IFileLaneConfig").FollowWork[];
 }
 export default XtsConfig;

package/lib/config/XtsConfig.js

@@ -4,13 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const entryTemplate_1 = require("../followWorks/xts/entryTemplate");
+const generateRpk_1 = require("../followWorks/xts/generateRpk");
+const ts2wasm_1 = require("../followWorks/xts/ts2wasm");
 const XtsLoader_1 = __importDefault(require("../loader/xts/XtsLoader"));
+const preInstall_1 = require("../preWorks/xts/preInstall");
 /**
  * XtsConfig
  */
 class XtsConfig {
     constructor() {
-        this.exclude = [/node_modules/, /dist/, /build/];
+        this.exclude = [/node_modules/, /dist/, /build/, /wasmUnpacked/];
         this.output = 'build';
         this.module = {
             rules: [
@@ -20,7 +23,8 @@ class XtsConfig {
                 }
             ]
         };
-        this.followWorks = [entryTemplate_1.generateEntryFile];
+        this.preWorks = [preInstall_1.preInstall];
+        this.followWorks = [entryTemplate_1.generateEntryFile, ts2wasm_1.ts2wasm, generateRpk_1.generateRpk];
     }
 }
 exports.default = XtsConfig;

package/lib/config/XtsConfig.js.map

@@ -1 +1 @@
-{"version":3,"sources":["config/XtsConfig.ts"],"names":[],"mappings":";;;;;AACA,oEAAoE;AACpE,wEAA+C;AAE/C;;GAEG;AACH,MAAM,SAAS;IAAf;QACE,YAAO,GAAG,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAC3C,WAAM,GAAG,OAAO,CAAA;QAChB,WAAM,GAAG;YACP,KAAK,EAAE;gBACL;oBACE,IAAI,EAAE,CAAC,QAAQ,CAAC;oBAChB,MAAM,EAAE,CAAC,mBAAS,CAAC;iBACpB;aACF;SACF,CAAA;QACD,gBAAW,GAAG,CAAC,iCAAiB,CAAC,CAAA;IACnC,CAAC;CAAA;AAED,kBAAe,SAAS,CAAA","file":"XtsConfig.js","sourcesContent":["import { IFileLaneConfig } from 'file-lane'\nimport { generateEntryFile } from '../followWorks/xts/entryTemplate'\nimport XtsLoader from '../loader/xts/XtsLoader'\n\n/**\n * XtsConfig\n */\nclass XtsConfig implements IFileLaneConfig {\n  exclude = [/node_modules/, /dist/, /build/]\n  output = 'build'\n  module = {\n    rules: [\n      {\n        test: [/\\.xts$/],\n        loader: [XtsLoader]\n      }\n    ]\n  }\n  followWorks = [generateEntryFile]\n}\n\nexport default XtsConfig\n"],"sourceRoot":"../../src"}
+{"version":3,"sources":["config/XtsConfig.ts"],"names":[],"mappings":";;;;;AACA,oEAAoE;AACpE,gEAA4D;AAC5D,wDAAoD;AACpD,wEAA+C;AAC/C,2DAAuD;AAEvD;;GAEG;AACH,MAAM,SAAS;IAAf;QACE,YAAO,GAAG,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAA;QAC3D,WAAM,GAAG,OAAO,CAAA;QAChB,WAAM,GAAG;YACP,KAAK,EAAE;gBACL;oBACE,IAAI,EAAE,CAAC,QAAQ,CAAC;oBAChB,MAAM,EAAE,CAAC,mBAAS,CAAC;iBACpB;aACF;SACF,CAAA;QACD,aAAQ,GAAG,CAAC,uBAAU,CAAC,CAAA;QACvB,gBAAW,GAAG,CAAC,iCAAiB,EAAE,iBAAO,EAAE,yBAAW,CAAC,CAAA;IACzD,CAAC;CAAA;AAED,kBAAe,SAAS,CAAA","file":"XtsConfig.js","sourcesContent":["import { IFileLaneConfig } from 'file-lane'\nimport { generateEntryFile } from '../followWorks/xts/entryTemplate'\nimport { generateRpk } from '../followWorks/xts/generateRpk'\nimport { ts2wasm } from '../followWorks/xts/ts2wasm'\nimport XtsLoader from '../loader/xts/XtsLoader'\nimport { preInstall } from '../preWorks/xts/preInstall'\n\n/**\n * XtsConfig\n */\nclass XtsConfig implements IFileLaneConfig {\n  exclude = [/node_modules/, /dist/, /build/, /wasmUnpacked/]\n  output = 'build'\n  module = {\n    rules: [\n      {\n        test: [/\\.xts$/],\n        loader: [XtsLoader]\n      }\n    ]\n  }\n  preWorks = [preInstall]\n  followWorks = [generateEntryFile, ts2wasm, generateRpk]\n}\n\nexport default XtsConfig\n"],"sourceRoot":"../../src"}

package/lib/followWorks/xts/entryTemplate.js

@@ -121,7 +121,7 @@ function generateEntryFile(context) {
         const { projectPath, output } = context;
         ColorConsole_1.default.log({
             level: shared_utils_1.LOG_LEVEL.Info,
-            message: `generating entry file`
+            message: `Generating entry file`
         });
         const dist = path_1.default.resolve(projectPath, output);
         const manifests = yield (0, fast_glob_1.default)(`${dist}/**/manifest.json`);
@@ -157,7 +157,7 @@ function generateEntryFile(context) {
         fs_extra_1.default.writeFileSync(path_1.default.join(projectPath, output, exports.XtsEntryFileName), template);
         ColorConsole_1.default.log({
             level: shared_utils_1.LOG_LEVEL.Info,
-            message: `entry file built`
+            message: `Entry file built`
         });
     });
 }

package/lib/followWorks/xts/entryTemplate.js.map

@@ -1 +1 @@
-{"version":3,"sources":["followWorks/xts/entryTemplate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2EAAoF;AACpF,6DAAsD;AACtD,+FAAsE;AACtE,0DAAgC;AAEhC,wDAAyB;AACzB,gDAAuB;AAgBhB,MAAM,aAAa,GAAG,CAAC,OAA4B,EAAE,EAAE;IAC5D,MAAM,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,OAAO,CAAA;IAEhC,SAAS,oBAAoB;QAC3B,IAAI,CAAC,OAAO;YAAE,OAAO,EAAE,CAAA;QACvB,IAAI,OAAO,GAAG,qBAAqB,CAAA;QACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACvC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;YACzB,OAAO,IAAI,qBAAqB,CAAC,GAAG,CAAC,YAAY,MAAM,CAAC,IAAI,KAAK,CAAA;YACjE,MAAM,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,MAAM,CAAA;YAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAA,EAAE,CAAC,EAAE,EAAE;gBACvC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;gBACvB,OAAO,IAAI,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,qBAAS,CAAC,SAAS,OAC/D,qBAAS,CAAC,SACZ,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,KAAK,CAAC,UAAU,KAAK,CAAA;aACtD;SACF;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,SAAS,YAAY;QACnB,IAAI,GAAG,GAAG,cAAc,CAAA;QACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACvC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;YACzB,MAAM,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,MAAM,CAAA;YAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACtC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;gBACvB,GAAG,IAAI;mBACI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;aACpB,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,KAAK,CAAC,KAAK,wBAAwB,qBAAS,CAAC,SAAS,GACtF,CAAC,GAAG,CACN,IAAI,CAAC,GAAG,CAAC;qBACU,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;;qBAEd,CAAC,GAAG,CAAC,OAAO,MAAM,CAAC,IAAI;oBACxB,CAAC,GAAG,CAAC;8CACqB,CAAC,GAAG,CAAC;0BACzB,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;;8BAEV,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAA;aACnD;SACF;QAED,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,OAAO;;;;;;;;;;;;;;;;0BAgBiB,uBAAW,CAAC,IAAI;;;0BAGhB,OAAO,CAAC,OAAO;EACvC,oBAAoB,EAAE;;;;;IAKpB,YAAY,EAAE;;;;;;;;;;;;;;;;;;;;;;;;CAwBjB,CAAA;AACD,CAAC,CAAA;AAhGY,QAAA,aAAa,iBAgGzB;AAEY,QAAA,gBAAgB,GAAG,cAAc,CAAA;AAC9C;;;GAGG;AACH,SAAsB,iBAAiB,CAAC,OAAyB;;;QAC/D,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;QACvC,sBAAY,CAAC,GAAG,CAAC;YACf,KAAK,EAAE,wBAAS,CAAC,IAAI;YACrB,OAAO,EAAE,uBAAuB;SACjC,CAAC,CAAA;QACF,MAAM,IAAI,GAAG,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;QAC9C,MAAM,SAAS,GAAG,MAAM,IAAA,mBAAQ,EAAC,GAAG,IAAI,mBAAmB,CAAC,CAAA;QAE5D,SAAS,YAAY,CAAC,GAAW;YAC/B,OAAO,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,cAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QACxE,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,IAAA,mBAAQ,EAAC,GAAG,IAAI,YAAY,CAAC,CAAA;QACjD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,sBAAY,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,wBAAS,CAAC,KAAK,EAAE,OAAO,EAAE,2BAA2B,EAAE,CAAC,CAAA;SACnF;QACD,IAAI,GAAG,GAAwB;YAC7B,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAClD,OAAO,EAAE,EAAE;SACZ,CAAA;QAED,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,MAAM,OAAO,GAAG,kBAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;YAClD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAChC,IAAI,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,0CAAE,KAAK,EAAE;gBACvB,MAAA,GAAG,CAAC,OAAO,0CAAE,IAAI,CAAC;oBAChB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,IAAI,EAAE,YAAY,CAAC,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;oBAClE,MAAM,EAAE,MAAM,CAAC,OAAO,CAAmB,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,0CAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;wBAC3E,OAAO;4BACL,UAAU,EAAE,YAAY,CAAC,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;4BACtE,IAAI,EAAE,CAAC;4BACP,KAAK,EAAE,CAAC,CAAC,IAAI;yBACd,CAAA;oBACH,CAAC,CAAC;iBACH,CAAC,CAAA;aACH;SACF;QAED,MAAM,QAAQ,GAAG,IAAA,qBAAa,EAAC,GAAG,CAAC,CAAA;QACnC,kBAAE,CAAC,aAAa,CAAC,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,wBAAgB,CAAC,EAAE,QAAQ,CAAC,CAAA;QAC5E,sBAAY,CAAC,GAAG,CAAC;YACf,KAAK,EAAE,wBAAS,CAAC,IAAI;YACrB,OAAO,EAAE,kBAAkB;SAC5B,CAAC,CAAA;;CACH;AA9CD,8CA8CC","file":"entryTemplate.js","sourcesContent":["import { HomeState, tsFrameWork } from '@aiot-toolkit/parser/lib/xts/enum/Framework'\nimport { LOG_LEVEL } from '@aiot-toolkit/shared-utils'\nimport ColorConsole from '@aiot-toolkit/shared-utils/lib/ColorConsole'\nimport FastGlob from 'fast-glob'\nimport { IFileLaneContext } from 'file-lane'\nimport Fs from 'fs-extra'\nimport Path from 'path'\nexport interface Aspects {\n  path: string\n  name: string\n  routes?: {\n    importPath: string\n    name: string\n    route: string\n  }[]\n}\n\nexport interface GenerateEntryParams {\n  appPath: string\n  aspects?: Aspects[]\n}\n\nexport const entryTemplate = (options: GenerateEntryParams) => {\n  const { aspects = [] } = options\n\n  function generatImportAspects() {\n    if (!aspects) return ''\n    let imports = '// import aspects\\n'\n    for (let i = 0; i < aspects.length; i++) {\n      const aspect = aspects[i]\n      imports += `import AspectClass${i + 1} from './${aspect.path}'\\n`\n      const { routes = [] } = aspect\n      for (let r = 0; r < routes?.length; r++) {\n        const route = routes[r]\n        imports += `import Page${i + 1}_${r + 1}, { ${HomeState.interface} as ${\n          HomeState.interface\n        }${i + 1}_${r + 1}_ } from './${route.importPath}'\\n`\n      }\n    }\n    return imports\n  }\n\n  function generateDefs() {\n    let res = '// aspects\\n'\n    for (let i = 0; i < aspects.length; i++) {\n      const aspect = aspects[i]\n      const { routes = [] } = aspect\n      for (let r = 0; r < routes.length; r++) {\n        const route = routes[r]\n        res += `\n  const pathPages${i + 1}_${r + 1} = new Map()\n  pathPages${i + 1}_${r + 1}.set('${route.route}', function (params: ${HomeState.interface}${\n    i + 1\n  }_${r + 1}_): Page {\n    return new Page${i + 1}_${r + 1}(params)\n  })\n  const aspectName_${i + 1} = '${aspect.name}'\n  const aspectDef_${i + 1}: AspectDefinition = {\n    newFn: (): ViewAspect => new AspectClass${i + 1}(),\n    pathPages: pathPages${i + 1}_${r + 1}\n  } \n  aspectDefs.set(aspectName_${i + 1}, aspectDef_${i + 1})`\n      }\n    }\n\n    return res\n  }\n\n  return `import {\n  // class\n  App,\n  AppDefinition,\n  AppContainer,\n  AspectDefinition,\n  ViewAspect,\n  Page,\n  Route,\n  RouteInfo,\n  // framework\n  context,\n  getInfoFromRoute,\n\n  // export function\n  on\n} from '../node_modules/${tsFrameWork.name}/index'\n\n// import app\nimport AppClass from './${options.appPath}'\n${generatImportAspects()}\nconsole.log('startApp-start timeEnd:', Date.now())\n\nfunction getAspectDefs() {\n  const aspectDefs = new Map()\n  ${generateDefs()}\n  return aspectDefs\n}\n\nfunction entry(path: string): void {\n  console.log('~~~~~~~~~entry path', path)\n  const route: Route = { uri: path }\n  const routeInfo: RouteInfo = getInfoFromRoute(route)\n  // app\n  let appName: string = ''\n  if (routeInfo?.appName) appName = routeInfo.appName\n  let app = context.getApp(appName)\n  if (app === null) {\n    const appDef: AppDefinition = {\n      newFn: (): App => new AppClass()\n    }\n    const aspectDefs = getAspectDefs()\n    app = new AppContainer(appDef, aspectDefs)\n  }\n  context.openApp(app, routeInfo)\n}\n\n// export api to native\nexport { entry, on }\n`\n}\n\nexport const XtsEntryFileName = '__entry__.ts'\n/**\n * 生成 __entry__.ts 文件\n * @param context\n */\nexport async function generateEntryFile(context: IFileLaneContext) {\n  const { projectPath, output } = context\n  ColorConsole.log({\n    level: LOG_LEVEL.Info,\n    message: `generating entry file`\n  })\n  const dist = Path.resolve(projectPath, output)\n  const manifests = await FastGlob(`${dist}/**/manifest.json`)\n\n  function relativeDist(tar: string) {\n    return Path.join('.', Path.relative(dist, tar)).replace(Path.sep, '/')\n  }\n\n  const appTs = await FastGlob(`${dist}/**/app.ts`)\n  if (appTs.length !== 1) {\n    ColorConsole.log({ level: LOG_LEVEL.Error, message: 'app.ts can only have one！' })\n  }\n  let opt: GenerateEntryParams = {\n    appPath: relativeDist(appTs[0].replace('.ts', '')),\n    aspects: []\n  }\n\n  for (const manifest of manifests) {\n    const content = Fs.readFileSync(manifest, 'utf-8')\n    const data = JSON.parse(content)\n    if (data?.router?.pages) {\n      opt.aspects?.push({\n        name: data.name,\n        path: relativeDist(Path.resolve(Path.dirname(manifest), 'aspect')),\n        routes: Object.entries<{ path: string }>(data?.router?.pages).map(([k, v]) => {\n          return {\n            importPath: relativeDist(Path.resolve(Path.dirname(manifest), v.path)),\n            name: k,\n            route: v.path\n          }\n        })\n      })\n    }\n  }\n\n  const template = entryTemplate(opt)\n  Fs.writeFileSync(Path.join(projectPath, output, XtsEntryFileName), template)\n  ColorConsole.log({\n    level: LOG_LEVEL.Info,\n    message: `entry file built`\n  })\n}\n"],"sourceRoot":"../../../src"}
+{"version":3,"sources":["followWorks/xts/entryTemplate.ts"],"names":[],"mappings":"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","file":"entryTemplate.js","sourcesContent":["import { HomeState, tsFrameWork } from '@aiot-toolkit/parser/lib/xts/enum/Framework'\nimport { LOG_LEVEL } from '@aiot-toolkit/shared-utils'\nimport ColorConsole from '@aiot-toolkit/shared-utils/lib/ColorConsole'\nimport FastGlob from 'fast-glob'\nimport { IFileLaneContext } from 'file-lane'\nimport Fs from 'fs-extra'\nimport Path from 'path'\nexport interface Aspects {\n  path: string\n  name: string\n  routes?: {\n    importPath: string\n    name: string\n    route: string\n  }[]\n}\n\nexport interface GenerateEntryParams {\n  appPath: string\n  aspects?: Aspects[]\n}\n\nexport const entryTemplate = (options: GenerateEntryParams) => {\n  const { aspects = [] } = options\n\n  function generatImportAspects() {\n    if (!aspects) return ''\n    let imports = '// import aspects\\n'\n    for (let i = 0; i < aspects.length; i++) {\n      const aspect = aspects[i]\n      imports += `import AspectClass${i + 1} from './${aspect.path}'\\n`\n      const { routes = [] } = aspect\n      for (let r = 0; r < routes?.length; r++) {\n        const route = routes[r]\n        imports += `import Page${i + 1}_${r + 1}, { ${HomeState.interface} as ${\n          HomeState.interface\n        }${i + 1}_${r + 1}_ } from './${route.importPath}'\\n`\n      }\n    }\n    return imports\n  }\n\n  function generateDefs() {\n    let res = '// aspects\\n'\n    for (let i = 0; i < aspects.length; i++) {\n      const aspect = aspects[i]\n      const { routes = [] } = aspect\n      for (let r = 0; r < routes.length; r++) {\n        const route = routes[r]\n        res += `\n  const pathPages${i + 1}_${r + 1} = new Map()\n  pathPages${i + 1}_${r + 1}.set('${route.route}', function (params: ${HomeState.interface}${\n    i + 1\n  }_${r + 1}_): Page {\n    return new Page${i + 1}_${r + 1}(params)\n  })\n  const aspectName_${i + 1} = '${aspect.name}'\n  const aspectDef_${i + 1}: AspectDefinition = {\n    newFn: (): ViewAspect => new AspectClass${i + 1}(),\n    pathPages: pathPages${i + 1}_${r + 1}\n  } \n  aspectDefs.set(aspectName_${i + 1}, aspectDef_${i + 1})`\n      }\n    }\n\n    return res\n  }\n\n  return `import {\n  // class\n  App,\n  AppDefinition,\n  AppContainer,\n  AspectDefinition,\n  ViewAspect,\n  Page,\n  Route,\n  RouteInfo,\n  // framework\n  context,\n  getInfoFromRoute,\n\n  // export function\n  on\n} from '../node_modules/${tsFrameWork.name}/index'\n\n// import app\nimport AppClass from './${options.appPath}'\n${generatImportAspects()}\nconsole.log('startApp-start timeEnd:', Date.now())\n\nfunction getAspectDefs() {\n  const aspectDefs = new Map()\n  ${generateDefs()}\n  return aspectDefs\n}\n\nfunction entry(path: string): void {\n  console.log('~~~~~~~~~entry path', path)\n  const route: Route = { uri: path }\n  const routeInfo: RouteInfo = getInfoFromRoute(route)\n  // app\n  let appName: string = ''\n  if (routeInfo?.appName) appName = routeInfo.appName\n  let app = context.getApp(appName)\n  if (app === null) {\n    const appDef: AppDefinition = {\n      newFn: (): App => new AppClass()\n    }\n    const aspectDefs = getAspectDefs()\n    app = new AppContainer(appDef, aspectDefs)\n  }\n  context.openApp(app, routeInfo)\n}\n\n// export api to native\nexport { entry, on }\n`\n}\n\nexport const XtsEntryFileName = '__entry__.ts'\n/**\n * 生成 __entry__.ts 文件\n * @param context\n */\nexport async function generateEntryFile(context: IFileLaneContext) {\n  const { projectPath, output } = context\n  ColorConsole.log({\n    level: LOG_LEVEL.Info,\n    message: `Generating entry file`\n  })\n  const dist = Path.resolve(projectPath, output)\n  const manifests = await FastGlob(`${dist}/**/manifest.json`)\n\n  function relativeDist(tar: string) {\n    return Path.join('.', Path.relative(dist, tar)).replace(Path.sep, '/')\n  }\n\n  const appTs = await FastGlob(`${dist}/**/app.ts`)\n  if (appTs.length !== 1) {\n    ColorConsole.log({ level: LOG_LEVEL.Error, message: 'app.ts can only have one！' })\n  }\n  let opt: GenerateEntryParams = {\n    appPath: relativeDist(appTs[0].replace('.ts', '')),\n    aspects: []\n  }\n\n  for (const manifest of manifests) {\n    const content = Fs.readFileSync(manifest, 'utf-8')\n    const data = JSON.parse(content)\n    if (data?.router?.pages) {\n      opt.aspects?.push({\n        name: data.name,\n        path: relativeDist(Path.resolve(Path.dirname(manifest), 'aspect')),\n        routes: Object.entries<{ path: string }>(data?.router?.pages).map(([k, v]) => {\n          return {\n            importPath: relativeDist(Path.resolve(Path.dirname(manifest), v.path)),\n            name: k,\n            route: v.path\n          }\n        })\n      })\n    }\n  }\n\n  const template = entryTemplate(opt)\n  Fs.writeFileSync(Path.join(projectPath, output, XtsEntryFileName), template)\n  ColorConsole.log({\n    level: LOG_LEVEL.Info,\n    message: `Entry file built`\n  })\n}\n"],"sourceRoot":"../../../src"}

package/lib/followWorks/xts/generateRpk.d.ts

@@ -0,0 +1,2 @@
+import { FollowWork } from 'file-lane/lib/interface/IFileLaneConfig';
+export declare const generateRpk: FollowWork;

package/lib/followWorks/xts/generateRpk.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateRpk = void 0;
+const XtsFollowWorks_1 = __importDefault(require("../../utils/xts/XtsFollowWorks"));
+const ts2wasm_1 = require("./ts2wasm");
+const generateRpk = (context) => {
+    return XtsFollowWorks_1.default.defaultZipProject(context, { tarDir: ts2wasm_1.wasmPackageName });
+};
+exports.generateRpk = generateRpk;
+
+//# sourceMappingURL=generateRpk.js.map

package/lib/followWorks/xts/generateRpk.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["followWorks/xts/generateRpk.ts"],"names":[],"mappings":";;;;;;AACA,oFAA2D;AAE3D,uCAA2C;AAEpC,MAAM,WAAW,GAAe,CAAC,OAAO,EAAE,EAAE;IACjD,OAAO,wBAAc,CAAC,iBAAiB,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,yBAAe,EAAE,CAAC,CAAA;AAC/E,CAAC,CAAA;AAFY,QAAA,WAAW,eAEvB","file":"generateRpk.js","sourcesContent":["import { FollowWork } from 'file-lane/lib/interface/IFileLaneConfig'\nimport XtsFollowWorks from '../../utils/xts/XtsFollowWorks'\n\nimport { wasmPackageName } from './ts2wasm'\n\nexport const generateRpk: FollowWork = (context) => {\n  return XtsFollowWorks.defaultZipProject(context, { tarDir: wasmPackageName })\n}\n"],"sourceRoot":"../../../src"}

package/lib/followWorks/xts/ts2wasm.d.ts

@@ -1,6 +1,7 @@
-import { IFileLaneContext } from 'file-lane';
+import { FollowWork } from 'file-lane/lib/interface/IFileLaneConfig';
+export declare const wasmPackageName = "wasmUnpacked";
 /**
  * 将 __entry__.ts 文件打包成 warm 文件
  * @param context
  */
-export declare function ts2wasm(context: IFileLaneContext): Promise<void>;
+export declare const ts2wasm: FollowWork;

package/lib/followWorks/xts/ts2wasm.js

@@ -12,20 +12,56 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ts2wasm = void 0;
+exports.ts2wasm = exports.wasmPackageName = void 0;
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const child_process_1 = require("child_process");
+const fast_glob_1 = __importDefault(require("fast-glob"));
+const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const entryTemplate_1 = require("./entryTemplate");
+exports.wasmPackageName = 'wasmUnpacked';
 /**
  * 将 __entry__.ts 文件打包成 warm 文件
  * @param context
  */
-function ts2wasm(context) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { projectPath, output } = context;
-        const buildDir = path_1.default.resolve(projectPath, output);
-        const entryFile = path_1.default.resolve(buildDir, entryTemplate_1.XtsEntryFileName);
+const ts2wasm = (context) => __awaiter(void 0, void 0, void 0, function* () {
+    ColorConsole_1.default.log({
+        level: shared_utils_1.LOG_LEVEL.Info,
+        message: 'Waiting for generating app.wasm file.'
     });
-}
+    /** 1. 生成 app.wasm 文件 */
+    const { projectPath, output } = context;
+    const buildDir = path_1.default.resolve(projectPath, output);
+    const entryFile = path_1.default.resolve(buildDir, entryTemplate_1.XtsEntryFileName);
+    const wasmDir = path_1.default.resolve(projectPath, exports.wasmPackageName);
+    fs_1.default.mkdirSync(wasmDir, {
+        recursive: true
+    });
+    // TODO: 后续修改为 @mi
+    const ts2wasmpath = path_1.default.resolve(projectPath, 'node_modules', 'mi/wasmnizer-ts');
+    const res = (0, child_process_1.execSync)(`node ${ts2wasmpath}/build/cli/ts2wasm.js  ${entryFile} -o ${wasmDir}/app.wasm`, {
+        encoding: 'utf-8'
+    });
+    ColorConsole_1.default.log({
+        level: shared_utils_1.LOG_LEVEL.Info,
+        message: res
+    });
+    /** 2. 拷贝静态资源 */
+    // TODO: ignore 数组待优化
+    const files = fast_glob_1.default.sync(`${fast_glob_1.default.convertPathToPattern(projectPath)}/${output}/**/*`, {
+        absolute: true,
+        ignore: ['**/*.ts', '**/*.xts', '**/package.json', '**/package-lock.json', '**/*.wasm'],
+        onlyFiles: true
+    });
+    for (const from of files) {
+        const to = from.replace('/src', '').replace(`/${output}`, `/${exports.wasmPackageName}`);
+        fs_1.default.mkdirSync(path_1.default.dirname(to), {
+            recursive: true
+        });
+        fs_1.default.copyFileSync(from, to);
+    }
+});
 exports.ts2wasm = ts2wasm;
 
 //# sourceMappingURL=ts2wasm.js.map

package/lib/followWorks/xts/ts2wasm.js.map

@@ -1 +1 @@
-{"version":3,"sources":["followWorks/xts/ts2wasm.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,gDAAuB;AACvB,mDAAkD;AAClD;;;GAGG;AACH,SAAsB,OAAO,CAAC,OAAyB;;QACrD,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;QAEvC,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;QAClD,MAAM,SAAS,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,gCAAgB,CAAC,CAAA;IAC5D,CAAC;CAAA;AALD,0BAKC","file":"ts2wasm.js","sourcesContent":["import { IFileLaneContext } from 'file-lane'\nimport path from 'path'\nimport { XtsEntryFileName } from './entryTemplate'\n/**\n * 将 __entry__.ts 文件打包成 warm 文件\n * @param context\n */\nexport async function ts2wasm(context: IFileLaneContext) {\n  const { projectPath, output } = context\n\n  const buildDir = path.resolve(projectPath, output)\n  const entryFile = path.resolve(buildDir, XtsEntryFileName)\n}\n"],"sourceRoot":"../../../src"}
+{"version":3,"sources":["followWorks/xts/ts2wasm.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAAsD;AACtD,+FAAsE;AACtE,iDAAwC;AACxC,0DAA0B;AAE1B,4CAAmB;AACnB,gDAAuB;AACvB,mDAAkD;AAErC,QAAA,eAAe,GAAG,cAAc,CAAA;AAE7C;;;GAGG;AACI,MAAM,OAAO,GAAe,CAAO,OAAO,EAAE,EAAE;IACnD,sBAAY,CAAC,GAAG,CAAC;QACf,KAAK,EAAE,wBAAS,CAAC,IAAI;QACrB,OAAO,EAAE,uCAAuC;KACjD,CAAC,CAAA;IACF,wBAAwB;IACxB,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAEvC,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;IAClD,MAAM,SAAS,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,gCAAgB,CAAC,CAAA;IAC1D,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,uBAAe,CAAC,CAAA;IAC1D,YAAE,CAAC,SAAS,CAAC,OAAO,EAAE;QACpB,SAAS,EAAE,IAAI;KAChB,CAAC,CAAA;IACF,kBAAkB;IAClB,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAA;IAChF,MAAM,GAAG,GAAG,IAAA,wBAAQ,EAClB,QAAQ,WAAW,0BAA0B,SAAS,OAAO,OAAO,WAAW,EAC/E;QACE,QAAQ,EAAE,OAAO;KAClB,CACF,CAAA;IACD,sBAAY,CAAC,GAAG,CAAC;QACf,KAAK,EAAE,wBAAS,CAAC,IAAI;QACrB,OAAO,EAAE,GAAG;KACb,CAAC,CAAA;IACF,gBAAgB;IAChB,qBAAqB;IACrB,MAAM,KAAK,GAAG,mBAAE,CAAC,IAAI,CAAC,GAAG,mBAAE,CAAC,oBAAoB,CAAC,WAAW,CAAC,IAAI,MAAM,OAAO,EAAE;QAC9E,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,WAAW,CAAC;QACvF,SAAS,EAAE,IAAI;KAChB,CAAC,CAAA;IAEF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,MAAM,EAAE,EAAE,IAAI,uBAAe,EAAE,CAAC,CAAA;QAChF,YAAE,CAAC,SAAS,CAAC,cAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;YAC7B,SAAS,EAAE,IAAI;SAChB,CAAC,CAAA;QACF,YAAE,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;KAC1B;AACH,CAAC,CAAA,CAAA;AAzCY,QAAA,OAAO,WAyCnB","file":"ts2wasm.js","sourcesContent":["import { LOG_LEVEL } from '@aiot-toolkit/shared-utils'\nimport ColorConsole from '@aiot-toolkit/shared-utils/lib/ColorConsole'\nimport { execSync } from 'child_process'\nimport fg from 'fast-glob'\nimport { FollowWork } from 'file-lane/lib/interface/IFileLaneConfig'\nimport fs from 'fs'\nimport path from 'path'\nimport { XtsEntryFileName } from './entryTemplate'\n\nexport const wasmPackageName = 'wasmUnpacked'\n\n/**\n * 将 __entry__.ts 文件打包成 warm 文件\n * @param context\n */\nexport const ts2wasm: FollowWork = async (context) => {\n  ColorConsole.log({\n    level: LOG_LEVEL.Info,\n    message: 'Waiting for generating app.wasm file.'\n  })\n  /** 1. 生成 app.wasm 文件 */\n  const { projectPath, output } = context\n\n  const buildDir = path.resolve(projectPath, output)\n  const entryFile = path.resolve(buildDir, XtsEntryFileName)\n  const wasmDir = path.resolve(projectPath, wasmPackageName)\n  fs.mkdirSync(wasmDir, {\n    recursive: true\n  })\n  // TODO: 后续修改为 @mi\n  const ts2wasmpath = path.resolve(projectPath, 'node_modules', 'mi/wasmnizer-ts')\n  const res = execSync(\n    `node ${ts2wasmpath}/build/cli/ts2wasm.js  ${entryFile} -o ${wasmDir}/app.wasm`,\n    {\n      encoding: 'utf-8'\n    }\n  )\n  ColorConsole.log({\n    level: LOG_LEVEL.Info,\n    message: res\n  })\n  /** 2. 拷贝静态资源 */\n  // TODO: ignore 数组待优化\n  const files = fg.sync(`${fg.convertPathToPattern(projectPath)}/${output}/**/*`, {\n    absolute: true,\n    ignore: ['**/*.ts', '**/*.xts', '**/package.json', '**/package-lock.json', '**/*.wasm'],\n    onlyFiles: true\n  })\n\n  for (const from of files) {\n    const to = from.replace('/src', '').replace(`/${output}`, `/${wasmPackageName}`)\n    fs.mkdirSync(path.dirname(to), {\n      recursive: true\n    })\n    fs.copyFileSync(from, to)\n  }\n}\n"],"sourceRoot":"../../../src"}

package/lib/preWorks/xts/preInstall.d.ts

@@ -0,0 +1,2 @@
+import { PreWork } from 'file-lane/lib/interface/IFileLaneConfig';
+export declare const preInstall: PreWork;

package/lib/preWorks/xts/preInstall.js

@@ -0,0 +1,52 @@
+"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 });
+exports.preInstall = void 0;
+const child_process_1 = require("child_process");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const preInstall = (context) => __awaiter(void 0, void 0, void 0, function* () {
+    const { projectPath } = context;
+    const packagePath = path_1.default.resolve(projectPath, 'package.json');
+    const preContent = {
+        dependencies: {
+            '@mi/ts-framework': 'https://pkgs.d.xiaomi.net:443/artifactory/api/npm/mi-npm/@mi/ts-framework/-/@mi/ts-framework-1.0.5.tgz',
+            '@mi/wasmnizer-ts': 'https://pkgs.d.xiaomi.net:443/artifactory/api/npm/mi-npm/@mi/wasmnizer-ts/-/@mi/wasmnizer-ts-0.0.9.tgz'
+        }
+    };
+    if (!fs_1.default.existsSync(packagePath)) {
+        /** 如果没有 package.json 则创建 */
+        fs_1.default.writeFileSync(packagePath, JSON.stringify(preContent), {
+            encoding: 'utf-8'
+        });
+    }
+    else {
+        const pckageContent = require(packagePath);
+        if (!pckageContent.dependencies['@mi/ts-framework'] ||
+            !pckageContent.dependencies['@mi/wasmnizer-ts']) {
+            Object.assign(pckageContent, preContent);
+            fs_1.default.writeFileSync(packagePath, JSON.stringify(pckageContent), {
+                encoding: 'utf-8'
+            });
+        }
+    }
+    (0, child_process_1.execSync)('npm install', {
+        cwd: projectPath
+    });
+    // 目前ts2wasm不支持@符号
+    fs_1.default.renameSync(path_1.default.resolve(projectPath, 'node_modules/@mi'), path_1.default.resolve(projectPath, 'node_modules/mi'));
+});
+exports.preInstall = preInstall;
+
+//# sourceMappingURL=preInstall.js.map

package/lib/preWorks/xts/preInstall.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["preWorks/xts/preInstall.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAAwC;AAExC,4CAAmB;AACnB,gDAAuB;AAChB,MAAM,UAAU,GAAY,CAAO,OAAO,EAAE,EAAE;IACnD,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAA;IAC/B,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAA;IAC7D,MAAM,UAAU,GAAG;QACjB,YAAY,EAAE;YACZ,kBAAkB,EAChB,wGAAwG;YAC1G,kBAAkB,EAChB,wGAAwG;SAC3G;KACF,CAAA;IAED,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;QAC/B,4BAA4B;QAC5B,YAAE,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE;YACxD,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAA;KACH;SAAM;QACL,MAAM,aAAa,GAAwB,OAAO,CAAC,WAAW,CAAC,CAAA;QAC/D,IACE,CAAC,aAAa,CAAC,YAAY,CAAC,kBAAkB,CAAC;YAC/C,CAAC,aAAa,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAC/C;YACA,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA;YACxC,YAAE,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE;gBAC3D,QAAQ,EAAE,OAAO;aAClB,CAAC,CAAA;SACH;KACF;IAED,IAAA,wBAAQ,EAAC,aAAa,EAAE;QACtB,GAAG,EAAE,WAAW;KACjB,CAAC,CAAA;IACF,kBAAkB;IAClB,YAAE,CAAC,UAAU,CACX,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,kBAAkB,CAAC,EAC7C,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAC7C,CAAA;AACH,CAAC,CAAA,CAAA;AAtCY,QAAA,UAAU,cAsCtB","file":"preInstall.js","sourcesContent":["import { execSync } from 'child_process'\nimport { PreWork } from 'file-lane/lib/interface/IFileLaneConfig'\nimport fs from 'fs'\nimport path from 'path'\nexport const preInstall: PreWork = async (context) => {\n  const { projectPath } = context\n  const packagePath = path.resolve(projectPath, 'package.json')\n  const preContent = {\n    dependencies: {\n      '@mi/ts-framework':\n        'https://pkgs.d.xiaomi.net:443/artifactory/api/npm/mi-npm/@mi/ts-framework/-/@mi/ts-framework-1.0.5.tgz',\n      '@mi/wasmnizer-ts':\n        'https://pkgs.d.xiaomi.net:443/artifactory/api/npm/mi-npm/@mi/wasmnizer-ts/-/@mi/wasmnizer-ts-0.0.9.tgz'\n    }\n  }\n\n  if (!fs.existsSync(packagePath)) {\n    /** 如果没有 package.json 则创建 */\n    fs.writeFileSync(packagePath, JSON.stringify(preContent), {\n      encoding: 'utf-8'\n    })\n  } else {\n    const pckageContent: Record<string, any> = require(packagePath)\n    if (\n      !pckageContent.dependencies['@mi/ts-framework'] ||\n      !pckageContent.dependencies['@mi/wasmnizer-ts']\n    ) {\n      Object.assign(pckageContent, preContent)\n      fs.writeFileSync(packagePath, JSON.stringify(pckageContent), {\n        encoding: 'utf-8'\n      })\n    }\n  }\n\n  execSync('npm install', {\n    cwd: projectPath\n  })\n  // 目前ts2wasm不支持@符号\n  fs.renameSync(\n    path.resolve(projectPath, 'node_modules/@mi'),\n    path.resolve(projectPath, 'node_modules/mi')\n  )\n}\n"],"sourceRoot":"../../../src"}

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

@@ -1,4 +1,8 @@
 import { IFileLaneContext } from 'file-lane';
+export interface DefaultZipProjectOptions {
+    tarDir?: string;
+    ext?: string;
+}
 /**
  * XtsFollowWorks
  */
@@ -7,7 +11,7 @@ declare class XtsFollowWorks {
      * 将项目中build文件夹的内容压缩成zip包，并将压缩产物放到dist文件夹下
      * @param context
      */
-    static defaultZipProject(context: IFileLaneContext): Promise<void>;
+    static defaultZipProject(context: IFileLaneContext, options: DefaultZipProjectOptions): Promise<void>;
     /**
      * 将分布式项目按照manifest.json中的配置打包，思路如下：
      * 1. 获取manifest中aspect的路由配置
@@ -24,6 +28,6 @@ declare class XtsFollowWorks {
      * @param zipName
      * @returns
      */
-    static getFilePath(projectPath: string, outputDir?: string, zipName?: string): string;
+    static getFilePath(projectPath: string, outputDir?: string, zipName?: string, ext?: string): string;
 }
 export default XtsFollowWorks;

package/lib/utils/xts/XtsFollowWorks.js

@@ -26,9 +26,10 @@ class XtsFollowWorks {
      * 将项目中build文件夹的内容压缩成zip包，并将压缩产物放到dist文件夹下
      * @param context
      */
-    static defaultZipProject(context) {
+    static defaultZipProject(context, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { output, projectPath } = context;
+            const { projectPath } = context;
+            const output = options.tarDir || context.output;
             const buildPath = path_1.default.join(projectPath, output);
             const zipPath = path_1.default.join(projectPath, 'dist');
             // buildPath必须是真实文件夹路径
@@ -43,7 +44,7 @@ class XtsFollowWorks {
                 fs_extra_1.default.ensureDirSync(zipPath);
                 // 清空dist文件夹
                 fs_extra_1.default.emptyDirSync(zipPath);
-                const filePath = XtsFollowWorks.getFilePath(projectPath);
+                const filePath = XtsFollowWorks.getFilePath(projectPath, 'dist', undefined, 'rpk');
                 yield FileLaneUtil_1.default.zipProject([buildPath], filePath);
             }
             catch (err) {
@@ -138,8 +139,8 @@ class XtsFollowWorks {
      * @param zipName
      * @returns
      */
-    static getFilePath(projectPath, outputDir = 'dist', zipName) {
-        zipName = zipName ? `${zipName}.zip` : `${path_1.default.basename(projectPath)}.zip`;
+    static getFilePath(projectPath, outputDir = 'dist', zipName, ext = 'zip') {
+        zipName = zipName ? `${zipName}.${ext}` : `${path_1.default.basename(projectPath)}.${ext}`;
         const zipPath = path_1.default.join(projectPath, outputDir);
         return path_1.default.join(zipPath, zipName);
     }

package/lib/utils/xts/XtsFollowWorks.js.map

@@ -1 +1 @@
-{"version":3,"sources":["utils/xts/XtsFollowWorks.ts"],"names":[],"mappings":"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","file":"XtsFollowWorks.js","sourcesContent":["import { LOG_LEVEL } from '@aiot-toolkit/shared-utils'\nimport ColorConsole from '@aiot-toolkit/shared-utils/lib/ColorConsole'\nimport { IFileLaneContext } from 'file-lane'\nimport FileLaneUtil from 'file-lane/lib/utils/FileLaneUtil'\nimport Fs from 'fs-extra'\nimport Path from 'path'\nimport IDeviceList from '../../interface/IDeviceList'\nimport UxFileUtils from './../ux/UxFileUtils'\n/**\n * XtsFollowWorks\n */\nclass XtsFollowWorks {\n  /**\n   * 将项目中build文件夹的内容压缩成zip包，并将压缩产物放到dist文件夹下\n   * @param context\n   */\n  static async defaultZipProject(context: IFileLaneContext) {\n    const { output, projectPath } = context\n    const buildPath = Path.join(projectPath, output)\n    const zipPath = Path.join(projectPath, 'dist')\n    // buildPath必须是真实文件夹路径\n    if (!Fs.existsSync(buildPath)) {\n      ColorConsole.log({\n        level: LOG_LEVEL.Error,\n        message: `XtsConfig follwWorkers zip build error, buildPath not exist`\n      })\n    }\n    try {\n      // 确认文件夹是否存在，不存在则创建\n      Fs.ensureDirSync(zipPath)\n      // 清空dist文件夹\n      Fs.emptyDirSync(zipPath)\n      const filePath = XtsFollowWorks.getFilePath(projectPath)\n      await FileLaneUtil.zipProject([buildPath], filePath)\n    } catch (err) {\n      ColorConsole.log({ level: LOG_LEVEL.Error, message: (err as Error).message })\n    }\n  }\n  /**\n   * 将分布式项目按照manifest.json中的配置打包，思路如下：\n   * 1. 获取manifest中aspect的路由配置\n   * 2. 对aspects中的所有路由信息进行遍历\n   * 3. 按照设备（设备+rule）对aspect分类\n   * 4. 按照设备列表分别进行打包\n   * @param context\n   */\n  static async zipDistributedQuickApp(context: IFileLaneContext) {\n    const deviceList: IDeviceList[] = [\n      {\n        device: 'phone',\n        aspectList: []\n      }\n    ]\n    const { projectPath, output } = context\n    const manifestPath = UxFileUtils.getManifestFilePath(projectPath, 'app')\n    if (Fs.existsSync(manifestPath)) {\n      //获取manifest.json内容\n      const aspectsRule = Fs.readJSONSync(manifestPath)?.router?.aspects\n      if (aspectsRule) {\n        Object.keys(aspectsRule).forEach((aspectRule) => {\n          // 分别处理每个aspectRule数组\n          for (let item of aspectsRule[aspectRule]) {\n            const { devices, rule, path } = item\n            // 如果存在设备列表\n            if (devices && Array.isArray(devices) && devices.length > 0) {\n              for (let device of devices) {\n                // 设备名与rule组合为一个设备\n                if (rule) {\n                  device = `${device}.${rule}`\n                }\n                // 查找设备是否已存在于设备列表中\n                const index =\n                  device === 'phone' ? 0 : deviceList.findIndex((item) => item.device === device)\n                if (index === -1) {\n                  // 新设备\n                  deviceList.push({\n                    device,\n                    aspectList: [path]\n                  })\n                } else {\n                  // 已存在的设备信息时，仅需添加aspect路由\n                  deviceList[index].aspectList.push(path)\n                }\n              }\n            } else {\n              // 设备值默认值为phone\n              deviceList[0].aspectList.push(path)\n            }\n          }\n        })\n      }\n      const zipPath = Path.join(projectPath, 'dist')\n\n      Fs.ensureDirSync(zipPath)\n      Fs.emptyDirSync(zipPath)\n      // 根据deviceList进行打包\n      for (const item of deviceList) {\n        // 所有zip包都需要app信息\n        item.aspectList.push('app')\n        // 将路由转为真实路径\n        const buildPaths = item.aspectList.map((name) => Path.join(projectPath, output, name))\n        const filePath = XtsFollowWorks.getFilePath(projectPath, 'dist', item.device)\n        try {\n          await FileLaneUtil.zipProject(buildPaths, filePath)\n        } catch (error) {}\n      }\n    } else {\n      ColorConsole.log({\n        level: LOG_LEVEL.Error,\n        message: 'zip DistributedQuickApp not find manifest.json'\n      })\n    }\n  }\n  /**\n   * 根据项目路径，打包文件夹名和传入的压缩包名，生成压缩文件zip路径\n   * @param projectPath\n   * @param outputDir\n   * @param zipName\n   * @returns\n   */\n  static getFilePath(projectPath: string, outputDir: string = 'dist', zipName?: string) {\n    zipName = zipName ? `${zipName}.zip` : `${Path.basename(projectPath)}.zip`\n    const zipPath = Path.join(projectPath, outputDir)\n    return Path.join(zipPath, zipName)\n  }\n}\nexport default XtsFollowWorks\n"],"sourceRoot":"../../../src"}
+{"version":3,"sources":["utils/xts/XtsFollowWorks.ts"],"names":[],"mappings":"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","file":"XtsFollowWorks.js","sourcesContent":["import { LOG_LEVEL } from '@aiot-toolkit/shared-utils'\nimport ColorConsole from '@aiot-toolkit/shared-utils/lib/ColorConsole'\nimport { IFileLaneContext } from 'file-lane'\nimport FileLaneUtil from 'file-lane/lib/utils/FileLaneUtil'\nimport Fs from 'fs-extra'\nimport Path from 'path'\nimport IDeviceList from '../../interface/IDeviceList'\nimport UxFileUtils from './../ux/UxFileUtils'\n\nexport interface DefaultZipProjectOptions {\n  tarDir?: string\n  ext?: string\n}\n\n/**\n * XtsFollowWorks\n */\nclass XtsFollowWorks {\n  /**\n   * 将项目中build文件夹的内容压缩成zip包，并将压缩产物放到dist文件夹下\n   * @param context\n   */\n  static async defaultZipProject(context: IFileLaneContext, options: DefaultZipProjectOptions) {\n    const { projectPath } = context\n    const output = options.tarDir || context.output\n    const buildPath = Path.join(projectPath, output)\n    const zipPath = Path.join(projectPath, 'dist')\n    // buildPath必须是真实文件夹路径\n    if (!Fs.existsSync(buildPath)) {\n      ColorConsole.log({\n        level: LOG_LEVEL.Error,\n        message: `XtsConfig follwWorkers zip build error, buildPath not exist`\n      })\n    }\n    try {\n      // 确认文件夹是否存在，不存在则创建\n      Fs.ensureDirSync(zipPath)\n      // 清空dist文件夹\n      Fs.emptyDirSync(zipPath)\n      const filePath = XtsFollowWorks.getFilePath(projectPath, 'dist', undefined, 'rpk')\n      await FileLaneUtil.zipProject([buildPath], filePath)\n    } catch (err) {\n      ColorConsole.log({ level: LOG_LEVEL.Error, message: (err as Error).message })\n    }\n  }\n  /**\n   * 将分布式项目按照manifest.json中的配置打包，思路如下：\n   * 1. 获取manifest中aspect的路由配置\n   * 2. 对aspects中的所有路由信息进行遍历\n   * 3. 按照设备（设备+rule）对aspect分类\n   * 4. 按照设备列表分别进行打包\n   * @param context\n   */\n  static async zipDistributedQuickApp(context: IFileLaneContext) {\n    const deviceList: IDeviceList[] = [\n      {\n        device: 'phone',\n        aspectList: []\n      }\n    ]\n    const { projectPath, output } = context\n    const manifestPath = UxFileUtils.getManifestFilePath(projectPath, 'app')\n    if (Fs.existsSync(manifestPath)) {\n      //获取manifest.json内容\n      const aspectsRule = Fs.readJSONSync(manifestPath)?.router?.aspects\n      if (aspectsRule) {\n        Object.keys(aspectsRule).forEach((aspectRule) => {\n          // 分别处理每个aspectRule数组\n          for (let item of aspectsRule[aspectRule]) {\n            const { devices, rule, path } = item\n            // 如果存在设备列表\n            if (devices && Array.isArray(devices) && devices.length > 0) {\n              for (let device of devices) {\n                // 设备名与rule组合为一个设备\n                if (rule) {\n                  device = `${device}.${rule}`\n                }\n                // 查找设备是否已存在于设备列表中\n                const index =\n                  device === 'phone' ? 0 : deviceList.findIndex((item) => item.device === device)\n                if (index === -1) {\n                  // 新设备\n                  deviceList.push({\n                    device,\n                    aspectList: [path]\n                  })\n                } else {\n                  // 已存在的设备信息时，仅需添加aspect路由\n                  deviceList[index].aspectList.push(path)\n                }\n              }\n            } else {\n              // 设备值默认值为phone\n              deviceList[0].aspectList.push(path)\n            }\n          }\n        })\n      }\n      const zipPath = Path.join(projectPath, 'dist')\n\n      Fs.ensureDirSync(zipPath)\n      Fs.emptyDirSync(zipPath)\n      // 根据deviceList进行打包\n      for (const item of deviceList) {\n        // 所有zip包都需要app信息\n        item.aspectList.push('app')\n        // 将路由转为真实路径\n        const buildPaths = item.aspectList.map((name) => Path.join(projectPath, output, name))\n        const filePath = XtsFollowWorks.getFilePath(projectPath, 'dist', item.device)\n        try {\n          await FileLaneUtil.zipProject(buildPaths, filePath)\n        } catch (error) {}\n      }\n    } else {\n      ColorConsole.log({\n        level: LOG_LEVEL.Error,\n        message: 'zip DistributedQuickApp not find manifest.json'\n      })\n    }\n  }\n  /**\n   * 根据项目路径，打包文件夹名和传入的压缩包名，生成压缩文件zip路径\n   * @param projectPath\n   * @param outputDir\n   * @param zipName\n   * @returns\n   */\n  static getFilePath(\n    projectPath: string,\n    outputDir: string = 'dist',\n    zipName?: string,\n    ext = 'zip'\n  ) {\n    zipName = zipName ? `${zipName}.${ext}` : `${Path.basename(projectPath)}.${ext}`\n    const zipPath = Path.join(projectPath, outputDir)\n    return Path.join(zipPath, zipName)\n  }\n}\nexport default XtsFollowWorks\n"],"sourceRoot":"../../../src"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.5",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -24,13 +24,13 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.1-alpha.3",
-    "@aiot-toolkit/parser": "2.0.1-alpha.3",
+    "@aiot-toolkit/generator": "2.0.1-alpha.5",
+    "@aiot-toolkit/parser": "2.0.1-alpha.5",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "babel-loader": "^9.1.3",
     "del": "^4.1.0",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.1-alpha.3",
+    "file-lane": "2.0.1-alpha.5",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^7.2.2",
@@ -43,5 +43,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "e70a328cefcd241419131f58a31ca36975c63ab3"
+  "gitHead": "d3273faeee08de84d6554bb2a74874dc44d30090"
 }