aiot-toolkit 1.0.18-aspect-beta.21 → 1.0.18-aspect-beta.23

package/bin/index.js

@@ -95,6 +95,7 @@ program
     '--deploy',
     'compress the device package and manifest.json file in the build into a zip package'
   )
+  .option('--output <value>', 'specify the aspect output format')
   .action(options => {
     // 必备参数：当开发者不传递该参数时，要解析为默认
     const signModeTmp = options.disableSign && compileOptionsMeta.signModeEnum.NULL

package/lib/commands/compile.js

@@ -1,2 +1,389 @@
-"use strict";var _ziputil=require("@aiot-toolkit/packager/lib/common/ziputil"),_config=_interopRequireDefault(require("@aiot-toolkit/shared-utils/config"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const webpack=require("webpack"),{setCustomConfig:setCustomConfig,colorconsole:colorconsole,getProjectJson:getProjectJson,getManifest:getManifest,readJson:readJson}=require("@aiot-toolkit/shared-utils"),genWebpackConf=require("../../gen-webpack-conf"),{summaryErrors:summaryErrors,summaryWarnings:summaryWarnings,getAspectEntries:getAspectEntries,cleanOrCreateDir:cleanOrCreateDir,copyFiles:copyFiles,getProductionTypes:getProductionTypes,isMirtosDevice:isMirtosDevice,deleteCompressedFiles:deleteCompressedFiles,getAndCopyDeviceAspectResource:getAndCopyDeviceAspectResource}=require("./utils"),{validateConfigJson:validateConfigJson}=require("../../gen-webpack-conf/validate"),path=require("path"),fs=require("fs");let appName,watching=null;function showVersion(){const e=require("../../package.json").version,t=require("@babel/core/package.json").version,o=require("webpack/package.json").version;colorconsole.info(`aiot-toolkit: ${e}; babel: ${t}; webpack: ${o};`)}async function aspectProjectCompiler(e,t,o,a={}){let s=getManifest();appName=s.package||"demo";const{entries:i,deviceAspects:r,routerObj:c}=getAspectEntries(_config.default.aspectTemplate.projectPath,s);validateConfigJson(i);const n=_config.default.aspectTemplate.distPath,p=_config.default.aspectTemplate.outputPath;cleanOrCreateDir(p),cleanOrCreateDir(n),_config.default.aspectTemplate.outputPath=path.join(p,appName);const l=_config.default.aspectTemplate.outputPath,f=[];try{for(let s of i){_config.default.sourceRoot="./src",_config.default.aspectTemplate.isApp=!1,a.cwd=path.join(_config.default.aspectTemplate.projectPath,s),_config.default.aspectTemplate.packToVela=!1;let i=path.resolve(a.cwd,_config.default.sourceRoot,"manifest.json");if(!fs.existsSync(i))throw new Error(`the file ${i} cannot be found.`);const r=readJson(i),{deviceTypeList:c}=r;if(c&&Array.isArray(c)){const i=getProductionTypes(c);for(const r of Object.keys(i))if(i[r]){_config.default.aspectTemplate.packToVela="enableMirtos"===r;const i=_config.default.aspectTemplate.packToVela?s+".lite":s;f.push(i),await singleCompiler(e,t,o,a)}}else f.push(s),await singleCompiler(e,t,o,a)}c.all=s.router.aspects,r.all=f;const p=path.join(_config.default.aspectTemplate.projectPath,"app"),u=path.join(p,"manifest.json");let g=JSON.parse(JSON.stringify(s));const{deviceTypeList:m}=s,d=getProductionTypes(m),h=path.join(p,".manifest.json");fs.writeFileSync(h,JSON.stringify(s));for(let s of Object.keys(r)){const i=isMirtosDevice(s);let m="all"===s,h=m?appName:appName+"."+s.trim().replace(" ",".");if(g.router.aspects=c[s],fs.writeFileSync(u,JSON.stringify(g,null,2)),_config.default.sourceRoot="",_config.default.aspectTemplate.isApp=!0,a.cwd=p,m){for(const s of Object.keys(d))if(d[s]){_config.default.aspectTemplate.packToVela="enableMirtos"===s;const i=_config.default.aspectTemplate.packToVela?"app.lite":"app";f.push(i),await singleCompiler(e,t,o,a)}}else _config.default.aspectTemplate.packToVela=i,await singleCompiler(e,t,o,a);let w=[];if(m)for(const e of r[s]){const t="app"===e||"app.lite"===e?e+".base":e+".aspc";w.push({name:e,targetFile:t,otherName:t})}else r[s].unshift("app"),w=getAndCopyDeviceAspectResource(r[s],l,h,i);const y=path.join(n,h+".app");await(0,_ziputil.packFolderToApp)(y,w,l),m&&deleteCompressedFiles(l)}if(fs.unlinkSync(h),a.deploy){fs.copyFileSync(u,path.join(n,"manifest.json"));const e=path.join(n,path.basename(_config.default.aspectTemplate.projectPath)+".zip"),t=fs.readdirSync(n).map((e=>({name:e,targetFile:e,otherName:e})));await(0,_ziputil.packFolderToApp)(e,t,n)}return Promise.resolve()}catch(e){console.log(`Distributed project compiler error ${e}`)}}function singleCompiler(e,t,o,a={}){const s=a.onerror;return new Promise(((i,r)=>{function c(e,t){if(e&&(s&&s(e),colorconsole.error(e)),t){if(t.hasErrors()||t.hasWarnings()){const e=summaryErrors(t),o=summaryWarnings(t);s&&s(e),colorconsole.error(e),colorconsole.warn(o)}t.hasErrors()&&(process.exitCode=1)}}colorconsole.attach(a.log),setCustomConfig(a.cwd),process.env.NODE_PLATFORM=e,process.env.NODE_PHASE=t;const n="prod"===t?"production":"development";try{const e=genWebpackConf(a,n);if(o){const t=webpack(e);watching=t.watch({aggregateTimeout:300},((e,t)=>{c(e,t),i({compileError:e,stats:t,watching:watching})}))}else webpack(e,((e,t)=>{c(e,t),i({compileError:e,stats:t})}))}catch(e){console.log(`singleCompiler error ${e}`)}}))}showVersion(),module.exports.compile=async function(e,t,o,a={}){var s;let i;return"distributed"===(null===(s=getProjectJson())||void 0===s?void 0:s.projectType)?(_config.default.aspectTemplate.isAspect=!0,i=await aspectProjectCompiler(e,t,o,a)):i=await singleCompiler(e,t,o,a),i},module.exports.stopWatch=function(){return new Promise((e=>{watching?watching.close((()=>{watching=null,e({stopWatchError:null})})):e({stopWatchError:"no watching"})}))};
+"use strict";
+
+var _ziputil = require("@aiot-toolkit/packager/lib/common/ziputil");
+
+var _config = _interopRequireDefault(require("@aiot-toolkit/shared-utils/config"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/*
+ * Copyright (C) 2017, hapjs.org. All rights reserved.
+ */
+const webpack = require('webpack');
+
+const {
+  setCustomConfig,
+  colorconsole,
+  getProjectJson,
+  getManifest,
+  readJson
+} = require('@aiot-toolkit/shared-utils');
+
+const genWebpackConf = require('../../gen-webpack-conf');
+
+const {
+  summaryErrors,
+  summaryWarnings,
+  getAspectEntries,
+  cleanOrCreateDir,
+  copyFiles,
+  getProductionTypes,
+  isMirtosDevice,
+  deleteCompressedFiles,
+  getAndCopyDeviceAspectResource
+} = require('./utils');
+
+const {
+  validateConfigJson
+} = require('../../gen-webpack-conf/validate');
+
+const path = require('path');
+
+const fs = require('fs'); // webpack watch 模式返回的watching实例
+
+
+let watching = null; // 打包多aspect项目的rpk名字
+
+let appName;
+
+function showVersion() {
+  const toolkitVer = require('../../package.json').version;
+
+  const babelVer = require('@babel/core/package.json').version;
+
+  const webpackVer = require('webpack/package.json').version;
+
+  colorconsole.info(`aiot-toolkit: ${toolkitVer}; babel: ${babelVer}; webpack: ${webpackVer};`);
+}
+
+showVersion();
+/**
+ * 调用 webpack 进行编译
+ *
+ * @module compile
+ * @param {String} platform - 目标平台: native
+ * @param {dev|prod} mode - 编译模式: dev、prod
+ * @param {Boolean} watch - 是否监听
+ * @param {Object} [options={}] - 动态生成 webpack 配置项的参数对象
+ * @param {String} [options.cwd] - 工作目录
+ * @param {Writable} [options.log] - 日志输出流
+ * @param {String} [options.originType] - 打包来源，ide|cmd
+ * @param {Function} [options.onerror] - 错误回调函数
+ * @param {String} [options.setPreviewPkgPath] - 预览包保存路径，由IDE传入
+ * @returns {Promise} - 返回 项目 成功与否的信息
+ */
+
+module.exports.compile = async function compile(platform, mode, watch, options = {}) {
+  var _getProjectJson;
+
+  // 检查.project.json文件，获取projectType
+  let projectType = (_getProjectJson = getProjectJson()) === null || _getProjectJson === void 0 ? void 0 : _getProjectJson.projectType;
+  let res; // 是否为aspect项目
+
+  if (projectType === 'distributed') {
+    _config.default.aspectTemplate.isAspect = true; // 对多aspect项目进行打包
+
+    res = await aspectProjectCompiler(platform, mode, watch, options);
+  } else {
+    res = await singleCompiler(platform, mode, watch, options);
+  }
+
+  return res;
+};
+/**
+ *
+ * @param {*} platform - 目标平台: native
+ * @param {*} mode - 编译模式: dev、prod
+ * @param {*} watch - 是否监听
+ * @param {*} options - 动态生成 webpack 配置项的参数对象
+ * @returns {Promise} - 返回 打包列表 成功与否的信息
+ */
+
+
+async function aspectProjectCompiler(platform, mode, watch, options = {}) {
+  // 检查app/manifest.json文件
+  let app_manifest = getManifest(); // 打包rpk时使用的package值
+
+  appName = app_manifest.package || 'demo'; // 获取 app/manifest.json下的项目入口
+
+  const {
+    entries,
+    deviceAspects,
+    routerObj
+  } = getAspectEntries(_config.default.aspectTemplate.projectPath, app_manifest); // 校验config.js的内容
+
+  validateConfigJson(entries); // 清空DIST、BUILD文件夹
+
+  const DIST = _config.default.aspectTemplate.distPath;
+  const BUILD = _config.default.aspectTemplate.outputPath;
+  cleanOrCreateDir(BUILD);
+  cleanOrCreateDir(DIST);
+  const APPBUILD = path.join(BUILD, appName);
+  const allEntries = [];
+
+  async function compilerApp(isAllPkg, velaProduction, appPath, app_devices) {
+    _config.default.aspectTemplate.outputPath = APPBUILD;
+    _config.default.sourceRoot = '';
+    _config.default.aspectTemplate.isApp = true;
+    options.cwd = appPath;
+    const appProductionTypes = getProductionTypes(app_devices);
+
+    if (isAllPkg) {
+      // 分产物类型打包
+      for (const key of Object.keys(appProductionTypes)) {
+        if (appProductionTypes[key]) {
+          _config.default.aspectTemplate.packToVela = key === 'enableMirtos';
+          const entryName = _config.default.aspectTemplate.packToVela ? 'app.lite' : 'app';
+          allEntries.push(entryName);
+          await singleCompiler(platform, mode, watch, options);
+        }
+      }
+    } else {
+      _config.default.aspectTemplate.packToVela = velaProduction;
+      await singleCompiler(platform, mode, watch, options);
+    }
+  }
+
+  async function compilerAspect(entries, allEntries, isPkgToRpk) {
+    for (let entry of entries) {
+      _config.default.aspectTemplate.outputPath = isPkgToRpk ? BUILD : APPBUILD;
+      _config.default.sourceRoot = './src';
+      _config.default.aspectTemplate.isApp = false;
+      options.cwd = path.join(_config.default.aspectTemplate.projectPath, entry);
+      _config.default.aspectTemplate.packToVela = false; // 读取deviceTypeList
+
+      let aspect_manifestFile = path.resolve(options.cwd, _config.default.sourceRoot, 'manifest.json');
+
+      if (!fs.existsSync(aspect_manifestFile)) {
+        // 报错，文件不存在
+        throw new Error(`the file ${aspect_manifestFile} cannot be found.`);
+      }
+
+      const aspect_manifest = readJson(aspect_manifestFile);
+      const {
+        deviceTypeList
+      } = aspect_manifest;
+
+      if (deviceTypeList && Array.isArray(deviceTypeList)) {
+        // 根据配置打包成多种产物
+        const productionTypes = getProductionTypes(deviceTypeList);
+
+        for (const key of Object.keys(productionTypes)) {
+          if (productionTypes[key]) {
+            _config.default.aspectTemplate.packToVela = key === 'enableMirtos';
+            const entryName = _config.default.aspectTemplate.packToVela ? entry + '.lite' : entry;
+            allEntries.push(entryName);
+            await singleCompiler(platform, mode, watch, options);
+          }
+        }
+      } else {
+        allEntries.push(entry);
+        await singleCompiler(platform, mode, watch, options);
+      }
+    }
+  }
+
+  try {
+    // 记录是否打包为rpk后缀
+    const isPkgToRpk = options.output === 'rpk';
+    await compilerAspect(entries, allEntries, isPkgToRpk); // 按照当前理解的意思是，到目前为止，已完成打包         
+
+    if (isPkgToRpk) {
+      // 1. 将build下的子aspc移到dist目录下
+      // 2. 修改aspc的后缀为rpk
+      deleteCompressedFiles(BUILD, true, DIST); // 3. deploy参数存在时，再打一个打的总包
+
+      if (options.deploy) {
+        await deployAll('', DIST, _config.default.aspectTemplate.projectPath);
+      }
+
+      return Promise.resolve();
+    } // 记录原始的manifest.json
+
+
+    routerObj['all'] = app_manifest.router.aspects;
+    deviceAspects['all'] = allEntries; // 分设备打包
+
+    const appPath = path.join(_config.default.aspectTemplate.projectPath, 'app');
+    const manifestPath = path.join(appPath, 'manifest.json');
+    let device_manifest = JSON.parse(JSON.stringify(app_manifest)); // 获取总包all中app文件夹的设备列表
+
+    const {
+      deviceTypeList: app_devices
+    } = app_manifest; // 复制一份临时文件.manifest.json
+
+    const tempManifestPath = path.join(appPath, '.manifest.json');
+    fs.writeFileSync(tempManifestPath, JSON.stringify(app_manifest));
+
+    for (let deviceName of Object.keys(deviceAspects)) {
+      // 判断设备包是否需要vela产物
+      const velaProduction = isMirtosDevice(deviceName); // 记录是否为总包
+
+      let isAllPkg = deviceName === 'all'; // 分设备打包 设备包名: packageName-设备名-rule（屏幕规则：圆形、方形）
+
+      let name = isAllPkg ? appName : appName + '.' + deviceName.trim().replace(' ', '.'); // 更新app/manifest.json中的路由
+
+      device_manifest.router.aspects = routerObj[deviceName]; // 更新app/manifest.json中的包名
+      // device_manifest.package = name
+
+      fs.writeFileSync(manifestPath, JSON.stringify(device_manifest, null, 2)); // 打包app.base
+
+      await compilerApp(isAllPkg, velaProduction, appPath, app_devices); // 打设备包
+
+      let deviceAspectsArr = [];
+
+      if (isAllPkg) {
+        for (const item of deviceAspects[deviceName]) {
+          const aspectName = item === 'app' || item === 'app.lite' ? item + '.base' : item + '.aspc';
+          deviceAspectsArr.push({
+            name: item,
+            targetFile: aspectName,
+            otherName: aspectName
+          });
+        }
+      } else {
+        !isPkgToRpk && deviceAspects[deviceName].unshift('app');
+        deviceAspectsArr = getAndCopyDeviceAspectResource(deviceAspects[deviceName], APPBUILD, name, velaProduction);
+      }
+
+      const suffixName = '.app';
+      const destPath = path.join(DIST, name + suffixName);
+      await (0, _ziputil.packFolderToApp)(destPath, deviceAspectsArr, APPBUILD);
+    } // 打包完成后 删除build下的子rpk
+
+
+    deleteCompressedFiles(APPBUILD); // 打包完成，删除临时文件.mainifest.json
+
+    fs.unlinkSync(tempManifestPath); // deploy参数存在时，再打一个打的总包
+
+    if (options.deploy) {
+      await deployAll(manifestPath, DIST, _config.default.aspectTemplate.projectPath);
+    }
+
+    return Promise.resolve();
+  } catch (error) {
+    console.log(`Distributed project compiler error ${error}`);
+  }
+}
+/**
+ *
+ * @param {*} platform - 目标平台: native
+ * @param {*} mode - 编译模式: dev、prod
+ * @param {*} watch - 是否监听
+ * @param {*} options - 动态生成 webpack 配置项的参数对象
+ * @returns {Promise} - 返回 打包 成功与否的信息
+ */
+
+
+function singleCompiler(platform, mode, watch, options = {}) {
+  const errCb = options.onerror;
+  return new Promise((resolve, reject) => {
+    colorconsole.attach(options.log);
+    setCustomConfig(options.cwd); // IMPORTANT: set env variables before generating webpack config
+
+    process.env.NODE_PLATFORM = platform;
+    process.env.NODE_PHASE = mode;
+
+    function compilationCallback(err, stats) {
+      if (err) {
+        errCb && errCb(err);
+        colorconsole.error(err);
+      }
+
+      if (stats) {
+        if (stats.hasErrors() || stats.hasWarnings()) {
+          const message = summaryErrors(stats);
+          const warningMsg = summaryWarnings(stats);
+          errCb && errCb(message);
+          colorconsole.error(message);
+          colorconsole.warn(warningMsg);
+        }
+
+        if (stats.hasErrors()) {
+          process.exitCode = 1;
+        }
+      }
+    }
+
+    const webpackMode = mode === 'prod' ? 'production' : 'development';
+
+    try {
+      const webpackConfig = genWebpackConf(options, webpackMode);
+
+      if (_config.default.aspectTemplate.isAspect && options.output === 'rpk') {
+        webpackConfig.output.filename = pathData => {
+          return pathData.chunk.name === 'aspect' ? 'app.js' : '[name].js';
+        };
+      }
+
+      if (watch) {
+        const compiler = webpack(webpackConfig);
+        watching = compiler.watch({
+          aggregateTimeout: 300
+        }, (err, stats) => {
+          compilationCallback(err, stats);
+          resolve({
+            compileError: err,
+            stats,
+            watching
+          });
+        });
+      } else {
+        webpack(webpackConfig, (err, stats) => {
+          compilationCallback(err, stats);
+          resolve({
+            compileError: err,
+            stats
+          });
+        });
+      }
+    } catch (err) {
+      console.log(`singleCompiler error ${err}`);
+    }
+  });
+}
+
+async function deployAll(manifestPath, DIST, projectPath) {
+  // 复制app/manifest.json到build文件夹下
+  if (manifestPath) {
+    fs.copyFileSync(manifestPath, path.join(DIST, 'manifest.json'));
+  } // 开始打包
+
+
+  const destPath = path.join(DIST, path.basename(projectPath) + '.zip');
+  const files = fs.readdirSync(DIST);
+  const fileArr = files.map(file => {
+    return {
+      name: file,
+      targetFile: file,
+      otherName: file
+    };
+  });
+  await (0, _ziputil.packFolderToApp)(destPath, fileArr, DIST);
+}
+/**
+ * 停止 webpack watch监听
+ *
+ * @module stopWatch
+ * @returns {Promise} - 返回成功与否的信息
+ */
+
+
+module.exports.stopWatch = function () {
+  return new Promise(resolve => {
+    if (watching) {
+      watching.close(() => {
+        watching = null;
+        resolve({
+          stopWatchError: null
+        });
+      });
+      return;
+    }
+
+    resolve({
+      stopWatchError: 'no watching'
+    });
+  });
+};
 //# sourceMappingURL=compile.js.map