aiot-toolkit 1.1.0 → 1.1.1-aspect-beta.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+#### [1.1.1] - 2024-05-09
+
+- 支持 `internal` 绝对文件路径
+- 增加 `process` 的属性 type 值
+- 优化 `style` 的 class 动态值
+
 #### [1.1.0] - 2024-01-10
 
 - 支持 `enable-e2e` 在 server 模式下

package/README.md

@@ -41,6 +41,12 @@ npm run release
 
 ### 版本日志(详情请在 node_modules 中查看 CHANGELOG)
 
+#### [1.1.1] - 2024-05-09
+
+- 支持 `internal` 绝对文件路径
+- 增加 `process` 的属性 type 值
+- 优化 `style` 的 class 动态值
+
 #### [1.1.0] - 2024-01-10
 
 - 支持 `enable-e2e` 在 server 模式下

package/bin/index.js

@@ -42,9 +42,10 @@ program
     '-t --templateType <templateType>',
     'init project by specific template eg: maml; you should use this with -d'
   )
+  .option('-s --slience', 'Enable silent mode for xapp application creation')
   .description('create a new project.')
   .action((name, options) => {
-    const generate = require('../lib/commands/init')
+    const { generate } = require('../lib/commands/init')
     generate(name, options)
   })
 
@@ -90,6 +91,11 @@ program
     'custom output rpk file name',
     validateBuildNameFormat
   )
+  .option(
+    '--deploy',
+    'compress the device package and manifest.json file in the build into a zip package'
+  )
+  .option('--output <value>', 'specify the aspect output format')
   .option('--enable-protobuf', 'use protobuf gen binary.bin file')
   .action(options => {
     // 必备参数：当开发者不传递该参数时，要解析为默认
@@ -418,6 +424,14 @@ program
       colorconsole.error(error.message)
     }
   })
+// 转换项目类型
+program
+  .command('transform [projectPath]')
+  .option('-I --import <value>', 'import quickapp as aspect project')
+  .action(async (projectPath, options) => {
+    const { transformProject } = require('../lib/commands/transform')
+    await transformProject(projectPath, options)
+  })
 
 program.on('--help', () => {
   console.log()

package/gen-webpack-conf/helpers.js

@@ -45,14 +45,16 @@ exports.cleanup = function cleanup(BUILD_DIR, DIST_DIR) {
  * 使用 node 原生模块给予警告
  */
 exports.checkBuiltinModules = function checkBuiltinModules({ request }, callback) {
-  const packageJson = require(path.join(globalConfig.projectPath, 'package.json'))
   // 提取 package.json 中的依赖
   let projectDependencies = []
-  if (packageJson.devDependencies) {
-    projectDependencies = Object.keys(packageJson.devDependencies)
-  }
-  if (packageJson.dependencies) {
-    projectDependencies = projectDependencies.concat(Object.keys(packageJson.dependencies))
+  if (!globalConfig.aspectTemplate.isAspect) {
+    const packageJson = require(path.join(globalConfig.projectPath, 'package.json'))
+    if (packageJson.devDependencies) {
+      projectDependencies = Object.keys(packageJson.devDependencies)
+    }
+    if (packageJson.dependencies) {
+      projectDependencies = projectDependencies.concat(Object.keys(packageJson.dependencies))
+    }
   }
 
   // 枚举 node 原生模块
@@ -107,7 +109,12 @@ exports.checkBuiltinModules = function checkBuiltinModules({ request }, callback
  * @param {boolean} disableScriptV8V65
  */
 exports.setAdaptForV8Version = function setAdaptForV8Version(disableScriptV8V65, manifest, cwd) {
-  const packageJsonFile = path.resolve(cwd, 'package.json')
+  let packageJsonFile
+  if (globalConfig.aspectTemplate.isAspect) {
+    packageJsonFile = path.resolve(globalConfig.aspectTemplate.projectPath, 'package.json')
+  } else {
+    packageJsonFile = path.resolve(cwd, 'package.json')
+  }
   const packageJson = readJson(packageJsonFile)
   const minPlatformVersion = parseInt(manifest.minPlatformVersion)
   if (fs.existsSync(packageJsonFile)) {

package/gen-webpack-conf/index.js

@@ -100,7 +100,7 @@ module.exports = function genWebpackConf(launchOptions, mode) {
   // 是否需要设置全局的打包模式为mina-h5
   const manifestFileTemp = path.resolve(cwd, 'manifest.json')
   let isMinaH5 = false
-  if (fs.existsSync(manifestFileTemp)) {
+  if (fs.existsSync(manifestFileTemp) && !globalConfig.aspectTemplate.isAspect) {
     const manifestTemp = readJson(manifestFileTemp)
     const { deviceTypeList } = manifestTemp
     const minaH5Type = ['tv', 'tv-h5']
@@ -116,9 +116,25 @@ module.exports = function genWebpackConf(launchOptions, mode) {
   // 签名文件目录
   const SIGN_FOLDER = globalConfig.signRoot
   // 编译文件的目录
-  const BUILD_DIR = path.resolve(cwd, globalConfig.outputPath)
+  let BUILD_DIR
   // 最终发布目录：setPreviewPkgPathDir为ide传入的路径，用来保存构建的临时预览包
-  const DIST_DIR = launchOptions.setPreviewPkgPath || path.resolve(cwd, globalConfig.releasePath)
+  let DIST_DIR
+  if (globalConfig.aspectTemplate.isAspect) {
+    BUILD_DIR = path.resolve(globalConfig.aspectTemplate.outputPath, path.basename(cwd))
+    DIST_DIR = path.resolve(globalConfig.aspectTemplate.outputPath, '')
+    // 打包vela产物时，文件夹名称+.lite
+    if (globalConfig.aspectTemplate.packToVela) {
+      BUILD_DIR = path.resolve(globalConfig.aspectTemplate.outputPath, `${path.basename(cwd)}.lite`)
+    }
+    // 清理 BUILD_DIR
+    cleanup(BUILD_DIR)
+  } else {
+    BUILD_DIR = path.resolve(cwd, globalConfig.outputPath)
+    DIST_DIR = launchOptions.setPreviewPkgPath || path.resolve(cwd, globalConfig.releasePath)
+    // 清理 BUILD_DIR DIST_DIR
+    cleanup(BUILD_DIR, DIST_DIR)
+  }
+
   // 打包配置文件
   const manifestFile = path.resolve(SRC_DIR, 'manifest.json')
 
@@ -131,7 +147,20 @@ module.exports = function genWebpackConf(launchOptions, mode) {
   validateProject(manifestFile, SRC_DIR)
 
   // 清理 BUILD_DIR DIST_DIR
-  cleanup(BUILD_DIR, DIST_DIR)
+  // cleanup(BUILD_DIR, DIST_DIR)
+
+  // 将aspect文件夹的config.json文件复制到build文件夹
+  if (globalConfig.aspectTemplate.isAspect && !globalConfig.aspectTemplate.isApp) {
+    const configJSON = path.join(cwd, 'config.json')
+    if (fs.existsSync(configJSON)) {
+      const sourceStream = fs.createReadStream(configJSON)
+      const targetStream = fs.createWriteStream(path.join(BUILD_DIR, path.basename(configJSON)))
+
+      sourceStream.pipe(targetStream)
+    } else {
+      colorconsole.log(`The path of project ,${configJSON} not exist`)
+    }
+  }
 
   let manifest
   try {
@@ -139,17 +168,28 @@ module.exports = function genWebpackConf(launchOptions, mode) {
   } catch (e) {
     throw new KnownError('manifest.json parsing failed！')
   }
+  if (!globalConfig.aspectTemplate.isApp) {
+    validateManifest(SRC_DIR, manifest, compileOptionsObject)
 
-  validateManifest(SRC_DIR, manifest, compileOptionsObject)
-
-  valiedateSitemap(SRC_DIR, manifest)
+    valiedateSitemap(SRC_DIR, manifest)
 
-  valiedateSkeleton(SRC_DIR, manifest)
-
-  // 是否需要设置全局的打包模式为Mirtos
-  const { deviceTypeList } = manifest
-  if (deviceTypeList && deviceTypeList.includes('watch')) {
-    initCompileOptionsObject({ enableMirtos: true })
+    valiedateSkeleton(SRC_DIR, manifest)
+  }
+  // 是否需要设置全局的打包模式为Mirtos，先初始化为false
+  initCompileOptionsObject({ enableMirtos: false })
+  if (globalConfig.aspectTemplate.isAspect) {
+    // 避免tv, tv-h5设备干扰打包
+    initCompileOptionsObject({ enableMinaH5: false })
+    // aspect分布式打包根据参数来判断打包模式
+    if (globalConfig.aspectTemplate.packToVela) {
+      initCompileOptionsObject({ enableMirtos: true })
+    }
+  } else {
+    // 一般情况下的配置
+    const { deviceTypeList } = manifest
+    if (deviceTypeList && deviceTypeList.includes('watch')) {
+      initCompileOptionsObject({ enableMirtos: true })
+    }
   }
 
   // 设置合适的v8版本
@@ -381,15 +421,11 @@ module.exports = function genWebpackConf(launchOptions, mode) {
       path: pathMap[dslName]
     })
 
-    const {
-      package: appPackageName,
-      icon: appIcon,
-      versionName,
-      versionCode,
-      subpackages,
-      workers,
-      banner = ''
-    } = manifest
+    const { icon: appIcon, versionName, versionCode, subpackages, workers, banner = '' } = manifest
+    let appPackageName = manifest.package
+    if (globalConfig.aspectTemplate.isAspect) {
+      appPackageName = path.basename(BUILD_DIR)
+    }
     for (let i = 0, len = moduleList.length; i < len; i++) {
       const fileConf = moduleList[i].path
       if (fs.existsSync(fileConf)) {

package/gen-webpack-conf/validate.js

@@ -3,9 +3,10 @@ const path = require('path')
 const Ajv = require('ajv')
 const AjvErrors = require('ajv-errors')
 const manifestSchema = require('./manifest-schema')
-const { colorconsole, KnownError } = require('@aiot-toolkit/shared-utils')
+const { colorconsole, KnownError, readJson } = require('@aiot-toolkit/shared-utils')
 const { compileOptionsMeta } = require('@aiot-toolkit/shared-utils/compilation-config')
 const { getSkeletonConfig } = require('@aiot-toolkit/packager/lib/common/info')
+const globalConfig = require('@aiot-toolkit/shared-utils/config')
 
 // 主包保留名
 const MAIN_PKG_NAME = compileOptionsMeta.MAIN_PKG_NAME
@@ -282,3 +283,31 @@ exports.valiedateSkeleton = function valiedateSkeleton(src, manifest) {
     })
   }
 }
+/**
+ * 校验aspect项目config.json
+ * @param {string} dirs 文件夹列表
+ */
+exports.validateConfigJson = function(dirs) {
+  dirs.forEach(async dir => {
+    const configPath = path.join(globalConfig.aspectTemplate.projectPath, dir, 'config.json')
+    if (dir !== 'app') {
+      const isExistConfig = fs.existsSync(configPath)
+      if (isExistConfig) {
+        const configJson = await readJson(configPath)
+        if (!configJson.name) {
+          colorconsole.error(`Configure file ${configPath} error: name is not exist, please check`)
+        }
+        if (!configJson.type) {
+          colorconsole.error(`Configure file ${configPath} error: type is not exist, please check`)
+        }
+        if (!configJson.virtualMachine) {
+          colorconsole.error(
+            `Configure file ${configPath} error: virtualMachine is not exist, please check`
+          )
+        }
+      } else {
+        colorconsole.error(`Configure file error: ${configPath} is not exist, please check`)
+      }
+    }
+  })
+}

package/lib/commands/compile.js

@@ -1,2 +1,2 @@
-"use strict";const webpack=require("webpack"),{setCustomConfig:setCustomConfig,colorconsole:colorconsole}=require("@aiot-toolkit/shared-utils"),genWebpackConf=require("../../gen-webpack-conf"),{summaryErrors:summaryErrors,summaryWarnings:summaryWarnings}=require("./utils");let watching=null;function showVersion(){const o=require("../../package.json").version,r=require("@babel/core/package.json").version,e=require("webpack/package.json").version;colorconsole.info(`aiot-toolkit: ${o}; babel: ${r}; webpack: ${e};`)}showVersion(),module.exports.compile=function(o,r,e,s={}){const n=s.onerror;return new Promise(((c,t)=>{function a(o,r){if(o&&(n&&n(o),colorconsole.error(o)),r){if(r.hasErrors()||r.hasWarnings()){const o=summaryErrors(r),e=summaryWarnings(r);n&&n(o),colorconsole.error(o),colorconsole.warn(e)}r.hasErrors()&&(process.exitCode=1)}}colorconsole.attach(s.log),setCustomConfig(s.cwd),process.env.NODE_PLATFORM=o,process.env.NODE_PHASE=r;const i="prod"===r?"production":"development";try{const o=genWebpackConf(s,i);if(e){const r=webpack(o);watching=r.watch({aggregateTimeout:300},((o,r)=>{a(o,r),c({compileError:o,stats:r,watching:watching})}))}else webpack(o,((o,r)=>{a(o,r),c({compileError:o,stats:r})}))}catch(o){t(o)}}))},module.exports.stopWatch=function(){return new Promise((o=>{watching?watching.close((()=>{watching=null,o({stopWatchError:null})})):o({stopWatchError:"no watching"})}))};
+"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);const l=path.join(p,appName),u=[];async function f(s,i,r,c){_config.default.aspectTemplate.outputPath=l,_config.default.sourceRoot="",_config.default.aspectTemplate.isApp=!0,a.cwd=r;const n=getProductionTypes(c);if(s){for(const s of Object.keys(n))if(n[s]){_config.default.aspectTemplate.packToVela="enableMirtos"===s;const i=_config.default.aspectTemplate.packToVela?"app.lite":"app";u.push(i),await singleCompiler(e,t,o,a)}}else _config.default.aspectTemplate.packToVela=i,await singleCompiler(e,t,o,a)}try{const g="rpk"===a.output;if(await async function(s,i,r){for(let c of s){_config.default.aspectTemplate.outputPath=r?p:l,_config.default.sourceRoot="./src",_config.default.aspectTemplate.isApp=!1,a.cwd=path.join(_config.default.aspectTemplate.projectPath,c),_config.default.aspectTemplate.packToVela=!1;let s=path.resolve(a.cwd,_config.default.sourceRoot,"manifest.json");if(!fs.existsSync(s))throw new Error(`the file ${s} cannot be found.`);const n=readJson(s),{deviceTypeList:u}=n;if(u&&Array.isArray(u)){const s=getProductionTypes(u);for(const r of Object.keys(s))if(s[r]){_config.default.aspectTemplate.packToVela="enableMirtos"===r;const s=_config.default.aspectTemplate.packToVela?c+".lite":c;i.push(s),await singleCompiler(e,t,o,a)}}else i.push(c),await singleCompiler(e,t,o,a)}}(i,u,g),g)return deleteCompressedFiles(p,!0,n),a.deploy&&await deployAll("",n,_config.default.aspectTemplate.projectPath),Promise.resolve();c.all=s.router.aspects,r.all=u;const m=path.join(_config.default.aspectTemplate.projectPath,"app"),d=path.join(m,"manifest.json");let h=JSON.parse(JSON.stringify(s));const{deviceTypeList:y}=s,w=path.join(m,".manifest.json");fs.writeFileSync(w,JSON.stringify(s));for(let e of Object.keys(r)){const t=isMirtosDevice(e);let o="all"===e,a=o?appName:appName+"."+e.trim().replace(" ",".");h.router.aspects=c[e],fs.writeFileSync(d,JSON.stringify(h,null,2)),await f(o,t,m,y);let s=[];if(o)for(const t of r[e]){const e="app"===t||"app.lite"===t?t+".base":t+".aspc";s.push({name:t,targetFile:e,otherName:e})}else!g&&r[e].unshift("app"),s=getAndCopyDeviceAspectResource(r[e],l,a,t);const i=".app",p=path.join(n,a+i);await(0,_ziputil.packFolderToApp)(p,s,l)}return deleteCompressedFiles(l),fs.unlinkSync(w),a.deploy&&await deployAll(d,n,_config.default.aspectTemplate.projectPath),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(_config.default.aspectTemplate.isAspect&&"rpk"===a.output&&(e.output.filename=e=>"aspect"===e.chunk.name?"app.js":"[name].js"),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}`)}}))}async function deployAll(e,t,o){e&&fs.copyFileSync(e,path.join(t,"manifest.json"));const a=path.join(t,path.basename(o)+".zip"),s=fs.readdirSync(t).map((e=>({name:e,targetFile:e,otherName:e})));await(0,_ziputil.packFolderToApp)(a,s,t)}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"})}))};
 //# sourceMappingURL=compile.js.map

package/lib/commands/init.js

@@ -1,2 +1,2 @@
-"use strict";var _path=_interopRequireDefault(require("path")),_fsExtra=_interopRequireDefault(require("fs-extra")),_glob=_interopRequireDefault(require("glob")),_inquirer=_interopRequireDefault(require("inquirer")),_chalk=_interopRequireDefault(require("chalk")),_sharedUtils=require("@aiot-toolkit/shared-utils"),_template=_interopRequireDefault(require("@aiot-toolkit/dsl-xvm/lib/template")),_template2=_interopRequireDefault(require("@aiot-toolkit/dsl-vue/lib/template")),_utils=require("@aiot-toolkit/compiler/lib/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const allSupportedDeviceArray=["phone","tv","car","watch","tv-h5"],allSupportedDevicesString=allSupportedDeviceArray.join(",");async function generate(e,t){""===e&&(e="HelloWorld");const a=await _inquirer.default.prompt([{type:"input",name:"name",message:"Init your project",default:e}]),r=_path.default.join(process.cwd(),a.name);try{await createProject(a.name,r,t)}catch(a){_sharedUtils.colorconsole.error(a.message),a.message.match(/Please pick a new name/)&&await generate(e,t)}}async function createProject(e,t,a={}){if(_fsExtra.default.existsSync(t))throw new Error(`"${t}" exists! Please pick a new name.`);if(!(0,_sharedUtils.mkdirsSync)(t))throw new Error('failed to created folder "'+t+'"!.');const{dsl:r,deviceType:l,templateType:i,web:o,minaH5:n,minaTv:s}=a;let p="";if(i&&!l)throw new Error("there is no deviceType specified");p=(0,_utils.hyphenedToCamelCase)(`${l}-${i}`);let u=["phone"];if(s&&(u=["tv-quickapp"]),n&&(u=["tv-h5"]),l&&l.length>0){const e=l.split(",");let t=new Set,a=new Set;e.map((e=>{e=e.toLowerCase();allSupportedDeviceArray.includes(e)||a.add(e),t.add(e)})),u=Array.from(t),a.size>0&&(_sharedUtils.colorconsole.warn(`These device types have not been officially supported by Quickapp: "${Array.from(a).join(",")}"`),_sharedUtils.colorconsole.warn(`Now Quickapp officially supports device types: "${allSupportedDevicesString}"`))}let c=null,d=null;switch(r){case"vue":c=_template2.default.app.demo,d=_template2.default.app.deviceJsonTemplate;break;default:c=o?_template.default.app.webDemo:n?_template.default.app.minaH5Demo:s?_template.default.app.minaTvDemo:p&&_template.default.app[p]?_template.default.app[p]:u.includes("watch")?_template.default.app.velaDemo:_template.default.app.demo,d=_template.default.app.deviceJsonTemplate}const f=_path.default.resolve(__dirname,c);await copyFiles(t,f,{_gitignore:".gitignore"});const _={appName:e,toolkitVersion:require("../../package.json").version};(n?["package.json","manifest.json"]:["src/manifest.json","package.json"]).map((e=>_path.default.join(t,e))).forEach((e=>{let t=_fsExtra.default.readFileSync(e,"utf-8");if(t=(0,_sharedUtils.renderString)(t,_),e.includes("manifest.json")){let e=JSON.parse(t.toString());e.deviceTypeList=u,e.minAPILevel=1,t=JSON.stringify(e,null,2)}_fsExtra.default.writeFileSync(e,t)})),n||u.map((a=>{const r=`config-${a}.json`,l=_path.default.join(d,r);let i="{}";_fsExtra.default.existsSync(l)&&(i=_fsExtra.default.readFileSync(l,"utf-8")),console.log(`${e}/src/${r} created`),_fsExtra.default.writeFileSync(_path.default.join(t,`src/config-${a}.json`),i)}))}function copyFiles(e,t,a){const r=_path.default.join(t,"**/{*,.*}"),l=_glob.default.sync(r,{nodir:!0,dot:!0}).map((r=>new Promise((l=>{const i=_path.default.relative(t,r),o=_path.default.join(e,a[i]||i);_fsExtra.default.existsSync(o)?l(_chalk.default.yellow(`${(0,_sharedUtils.relateCwd)(o)} already existed.`)):(l(`${(0,_sharedUtils.relateCwd)(o)} created.`),_fsExtra.default.copySync(r,o))}))));return Promise.all(l).then((e=>{console.log(e.join("\n"))}))}module.exports=generate;
+"use strict";var _path=_interopRequireDefault(require("path")),_fsExtra=_interopRequireDefault(require("fs-extra")),_glob=_interopRequireDefault(require("glob")),_inquirer=_interopRequireDefault(require("inquirer")),_chalk=_interopRequireDefault(require("chalk")),_sharedUtils=require("@aiot-toolkit/shared-utils"),_template=_interopRequireDefault(require("@aiot-toolkit/dsl-xvm/lib/template")),_template2=_interopRequireDefault(require("@aiot-toolkit/dsl-vue/lib/template")),_utils=require("@aiot-toolkit/compiler/lib/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const multiDeviceType="xapp",multiDeviceDemoArray=["xappXapp","xappAspect","xappMultiScreen"],allSupportedDeviceArray=["phone","tv","car","watch","tv-h5","xapp"],allSupportedDevicesString=allSupportedDeviceArray.join(",");async function generate(e,t){""===e&&(e="HelloWorld");const a=!0===t.slience&&"xapp"===t.deviceType,i=a?{name:e}:await _inquirer.default.prompt([{type:"input",name:"name",message:"Init your project",default:e}]),r=_path.default.join(process.cwd(),i.name);try{await createProject(i.name,r,t)}catch(i){_sharedUtils.colorconsole.error(i.message),i.message.match(/Please pick a new name/)&&(a?process.exit():await generate(e,t))}}async function createProject(e,t,a={}){if(_fsExtra.default.existsSync(t))throw new Error(`"${t}" exists! Please pick a new name.`);if(!(0,_sharedUtils.mkdirsSync)(t))throw new Error('failed to created folder "'+t+'"!.');const{dsl:i,deviceType:r,templateType:l,web:o,minaH5:p,minaTv:n}=a;let s="",c="";if(l&&!r)throw new Error("there is no deviceType specified");s=(0,_utils.hyphenedToCamelCase)(`${r}-${l}`),c=multiDeviceDemoArray.find((e=>e===s))||"";let u=["phone"];if(n&&(u=["tv-quickapp"]),p&&(u=["tv-h5"]),r&&r.length>0){const e=r.split(",");let t=new Set,a=new Set;e.map((e=>{e=e.toLowerCase();allSupportedDeviceArray.includes(e)||a.add(e),t.add(e)})),u=Array.from(t),a.size>0&&(_sharedUtils.colorconsole.warn(`These device types have not been officially supported by Quickapp: "${Array.from(a).join(",")}"`),_sharedUtils.colorconsole.warn(`Now Quickapp officially supports device types: "${allSupportedDevicesString}"`))}let d=null,f=null;switch(i){case"vue":d=_template2.default.app.demo,f=_template2.default.app.deviceJsonTemplate;break;default:d=o?_template.default.app.webDemo:p?_template.default.app.minaH5Demo:n?_template.default.app.minaTvDemo:s&&_template.default.app[s]?_template.default.app[s]:u.includes("watch")?_template.default.app.velaDemo:_template.default.app.demo,f=_template.default.app.deviceJsonTemplate}const m=_path.default.resolve(__dirname,d);await copyFiles(t,m,{_gitignore:".gitignore"});const _={appName:e,toolkitVersion:require("../../package.json").version},h={minaH5Demo:["manifest.json","package.json"],xappXapp:["app/manifest.json","package.json",".project.json"],xappAspect:["src/manifest.json","config.json"],xappMultiScreen:["app/manifest.json","package.json",".project.json"],default:["src/manifest.json","package.json"]};(p?h.minaH5Demo:c?h[c]:h.default).map((e=>_path.default.join(t,e))).forEach((e=>{let t=_fsExtra.default.readFileSync(e,"utf-8");if(t=(0,_sharedUtils.renderString)(t,_),e.includes("manifest.json")&&!c){let e=JSON.parse(t.toString());e.deviceTypeList=u,e.minAPILevel=1,t=JSON.stringify(e,null,2)}_fsExtra.default.writeFileSync(e,t)})),p||c||u.map((a=>{const i=`config-${a}.json`,r=_path.default.join(f,i);let l="{}";_fsExtra.default.existsSync(r)&&(l=_fsExtra.default.readFileSync(r,"utf-8")),console.log(`${e}/src/${i} created`),_fsExtra.default.writeFileSync(_path.default.join(t,`src/config-${a}.json`),l)}))}function copyFiles(e,t,a){const i=_path.default.join(t,"**/{*,.*}"),r=_glob.default.sync(i,{nodir:!0,dot:!0}).map((i=>new Promise((r=>{const l=_path.default.relative(t,i),o=_path.default.join(e,a[l]||l);_fsExtra.default.existsSync(o)?r(_chalk.default.yellow(`${(0,_sharedUtils.relateCwd)(o)} already existed.`)):(r(`${(0,_sharedUtils.relateCwd)(o)} created.`),_fsExtra.default.copySync(i,o))}))));return Promise.all(r).then((e=>{console.log(e.join("\n"))}))}module.exports={generate:generate,copyFiles:copyFiles};
 //# sourceMappingURL=init.js.map

package/lib/commands/transform.js

@@ -0,0 +1,2 @@
+"use strict";var _path=_interopRequireDefault(require("path")),_fsExtra=_interopRequireDefault(require("fs-extra")),_init=require("../../lib/commands/init"),_template=_interopRequireDefault(require("@aiot-toolkit/dsl-xvm/lib/template")),_sharedUtils=require("@aiot-toolkit/shared-utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function validateProjectPath(e,t){const a=_path.default.join(e,t);if(!_fsExtra.default.existsSync(a))throw new Error(`Path: ${a} is not exist！`);return a}function readName(e){const t=_path.default.join(e,"src","manifest.json"),a=_fsExtra.default.readJsonSync(t,{encoding:"utf-8"});if(a.name&&a.package)return{projectName:a.name,projectPackageName:a.package};throw new Error("The name and package name fields do not exist in the manifest.json!")}async function transformToNewProject(e){e=validateProjectPath(process.cwd(),e);const t=_path.default.join(_path.default.dirname(e),`xapp-${_path.default.basename(e)}`),{projectName:a,projectPackageName:r}=readName(e);await createNewXappProject(_template.default.app.xappMultiScreenTemplate,t),renderFilesData(t,a,r);const o=_path.default.join(e,"src"),n=_path.default.join(t,"main","src");await(0,_init.copyFiles)(n,o,{"app.ux":"aspect.ux"}),_sharedUtils.colorconsole.info(`transform success! new project path is ${t}`)}async function createNewXappProject(e,t){if(_fsExtra.default.existsSync(t))throw new Error(`Create error: Folfer ${_path.default.basename(t)} already exists in path ${_path.default.dirname(t)}`);_fsExtra.default.mkdirSync(t),await(0,_init.copyFiles)(t,e,{_gitignore:".gitignore"})}function renderFilesData(e,t,a){const r={appName:t,packageName:a,toolkitVersion:require("../../package.json").version,dirName:_path.default.basename(e)};["package.json","app/manifest.json",".project.json","README.md"].map((t=>_path.default.join(e,t))).forEach((e=>{let t=_fsExtra.default.readFileSync(e,"utf-8");t=(0,_sharedUtils.renderString)(t,r),_fsExtra.default.writeFileSync(e,t)}))}async function projectToAspect(e){const t=e.import,a=process.cwd(),r=validateProjectPath(a,t),{projectName:o,projectPackageName:n}=readName(r),i=_path.default.join(a,n);await createNewXappProject(_template.default.app.xappAspect,i);const s={appName:o},c=_path.default.join(i,"config.json");let p=_fsExtra.default.readFileSync(c,"utf-8");p=(0,_sharedUtils.renderString)(p,s),_fsExtra.default.writeFileSync(c,p);const f=_path.default.join(r,"src"),l=_path.default.join(i,"src");_fsExtra.default.emptyDirSync(l),await(0,_init.copyFiles)(l,f,{"app.ux":"aspect.ux"}),updateAppManifest(a,n),_sharedUtils.colorconsole.info(`import success! new aspect name is ${n}`)}function updateAppManifest(e,t){const a=_path.default.join(e,"app","manifest.json"),r=_fsExtra.default.readJSONSync(a,{encoding:"utf-8"}),o={path:`${t}`,devices:["watch"],autoStart:!0};if(!(r&&r.router&&r.router.aspects&&r.router.aspects instanceof Object))throw new Error("router.aspects does not exist or is in the wrong format");r.router.aspects[`${t}`]=[o],_fsExtra.default.writeJSONSync(a,r,{spaces:2})}module.exports.transformProject=async function(e,t){try{t&&t.import?await projectToAspect(t):e?await transformToNewProject(e):_sharedUtils.colorconsole.log("transform stop: No valid information entered！")}catch(e){throw new Error(`transform failed! ${e}`)}};
+//# sourceMappingURL=transform.js.map

package/lib/commands/utils.js

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.formatDate=formatDate,exports.summaryErrors=summaryErrors,exports.summaryWarnings=summaryWarnings,exports.getQuickappDebuggerUrl=getQuickappDebuggerUrl,exports.getQuickappPreviewUrl=getQuickappPreviewUrl,exports.downloadFile=downloadFile,exports.sendReq=sendReq,exports.getClients=getClients,exports.checkQuickappDir=checkQuickappDir,exports.getCardContent=getCardContent;var _fsExtra=_interopRequireDefault(require("fs-extra")),_path=_interopRequireDefault(require("path")),_request=_interopRequireDefault(require("request")),_http=_interopRequireDefault(require("http")),_recordClient=require("@aiot-toolkit/shared-utils/lib/record-client"),_config=require("@aiot-toolkit/shared-utils/config"),_sharedUtils=require("@aiot-toolkit/shared-utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function formatDate(e,t){let r,o,s,n,i,a,l=e;return(e.indexOf("yyyy")>=0||e.indexOf("YYYYY")>=0)&&(r=t.getFullYear(),l=l.replace(/[yY]{4}/g,r)),e.indexOf("MM")>=0&&(o=t.getMonth()+1,l=l.replace(/MM/g,String(o).length<2?"0"+o:o)),e.indexOf("dd")>=0&&(s=t.getDate(),l=l.replace(/dd/g,String(s).length<2?"0"+s:s)),(e.indexOf("hh")>=0||e.indexOf("HH")>=0)&&(n=t.getHours(),l=l.replace(/[hH]{2}/g,String(n).length<2?"0"+n:n)),e.indexOf("mm")>=0&&(i=t.getMinutes(),l=l.replace(/mm/g,String(i).length<2?"0"+i:i)),(e.indexOf("ss")>=0||e.indexOf("SS")>=0)&&(a=t.getSeconds(),l=l.replace(/[sS]{2}/g,String(a).length<2?"0"+a:a)),l}function summaryErrors(e){const t=[];return e.compilation.errors.forEach((e=>{const r=e.message,o=/Can't resolve '(sass-loader|less-loader|stylus-loader)'/.exec(r);if("ModuleNotFoundError"===e.name&&o){let t=o[1];"less-loader"===t?t=`less ${t}`:"sass-loader"===t?t=`sass ${t}`:"stylus-loader"===t&&(t=`stylus ${t}`),e.message=` Missing dependency: ${t}, Please execute npm install -D ${t} to install the corresponding dependencies `}const s=e.module?e.module.resource:"";t.push(`${s}\r\n${e.message}`)})),t.join("\n\n")}function summaryWarnings(e){return e.compilation.warnings.map((e=>e.message)).join("\n\n")}const quickapp_url="https://statres.quickapp.cn/quickapp/quickapptool/release/platform/";function getQuickappDebuggerUrl(e){let t=e||"v1080";return _sharedUtils.colorconsole.log(`The version of the Quickapp debugger that started to download is： ${t}`),`${quickapp_url}quickapp_debugger_${t}.apk`}function getQuickappPreviewUrl(e){let t=e||"v1080";return _sharedUtils.colorconsole.log(`The version of the Quickapp debugger that started to download is： ${t}`),`${quickapp_url}quickapp_platform_preview_release_${t}.apk`}function downloadFile(e,t){return _sharedUtils.colorconsole.log(`Start downloading file：${t}, address：${e}`),new Promise((function(r,o){(0,_request.default)(e,(function(s,n,i){if(s||200!==n.statusCode)o(s||new Error(`Download failed, status code：${n.statusCode}`));else{const s=_path.default.join(__dirname,"./apk");_fsExtra.default.ensureDirSync(s);let n=_fsExtra.default.createWriteStream(_path.default.join(s,t));(0,_request.default)(e).pipe(n).on("close",(e=>{e?o(e):r(`Download file ${t} successfully`)}))}}))}))}async function sendReq(e,t,r){return new Promise((o=>{const s=`http://${e.ip}:${e.port}${t}`;let n={host:e.ip,port:e.port,path:t,timeout:3e3};r&&(n=Object.assign({},n,{headers:r}));const i=_http.default.request(n,(e=>{e.on("data",(e=>{_sharedUtils.colorconsole.log(`### App Server ### Request ${s} succeeded`),o(e.toString())}))})).on("error",(e=>{_sharedUtils.colorconsole.error(`### App Server ### Request ${s} error message: ${e.message}`)})).on("timeout",(function(){_sharedUtils.colorconsole.log(`### App Server ### Request ${s} timed out, please try again`),i.abort()}));i.end()}))}async function getClients(){return new Promise((e=>{if(_fsExtra.default.existsSync(_config.clientRecordPath)){const t=(0,_recordClient.getRecords)(_config.clientRecordPath),r=(0,_recordClient.getProjectClients)(t);r.length>0&&e(r)}e(null)}))}function checkQuickappDir(e,t="src"){const r=_path.default.join(e,t,"manifest.json");_fsExtra.default.existsSync(r)||(_sharedUtils.colorconsole.error("Please execute this command under the Quickapp project"),process.exit())}function getCardContent(e){const t=_path.default.join(e,"src","manifest.json"),r=(0,_sharedUtils.readJson)(t).router.widgets||null;return r||_sharedUtils.colorconsole.error("No card configuration in manifest.json"),r}
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.formatDate=formatDate,exports.summaryErrors=summaryErrors,exports.summaryWarnings=summaryWarnings,exports.getQuickappDebuggerUrl=getQuickappDebuggerUrl,exports.getQuickappPreviewUrl=getQuickappPreviewUrl,exports.downloadFile=downloadFile,exports.sendReq=sendReq,exports.getClients=getClients,exports.checkQuickappDir=checkQuickappDir,exports.getCardContent=getCardContent,exports.cleanOrCreateDir=cleanOrCreateDir,exports.getAspectEntries=getAspectEntries,exports.copyFiles=copyFiles,exports.getProductionTypes=getProductionTypes,exports.isMirtosDevice=isMirtosDevice,exports.deleteCompressedFiles=deleteCompressedFiles,exports.getAndCopyDeviceAspectResource=getAndCopyDeviceAspectResource;var _fsExtra=_interopRequireDefault(require("fs-extra")),_path=_interopRequireDefault(require("path")),_request=_interopRequireDefault(require("request")),_http=_interopRequireDefault(require("http")),_recordClient=require("@aiot-toolkit/shared-utils/lib/record-client"),_config=require("@aiot-toolkit/shared-utils/config"),_sharedUtils=require("@aiot-toolkit/shared-utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function ownKeys(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,o)}return r}function _objectSpread(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?ownKeys(Object(r),!0).forEach((function(t){_defineProperty(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):ownKeys(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}function _defineProperty(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}const fsExtra=require("fs-extra");function formatDate(e,t){let r,o,s,n,i,a,c=e;return(e.indexOf("yyyy")>=0||e.indexOf("YYYYY")>=0)&&(r=t.getFullYear(),c=c.replace(/[yY]{4}/g,r)),e.indexOf("MM")>=0&&(o=t.getMonth()+1,c=c.replace(/MM/g,String(o).length<2?"0"+o:o)),e.indexOf("dd")>=0&&(s=t.getDate(),c=c.replace(/dd/g,String(s).length<2?"0"+s:s)),(e.indexOf("hh")>=0||e.indexOf("HH")>=0)&&(n=t.getHours(),c=c.replace(/[hH]{2}/g,String(n).length<2?"0"+n:n)),e.indexOf("mm")>=0&&(i=t.getMinutes(),c=c.replace(/mm/g,String(i).length<2?"0"+i:i)),(e.indexOf("ss")>=0||e.indexOf("SS")>=0)&&(a=t.getSeconds(),c=c.replace(/[sS]{2}/g,String(a).length<2?"0"+a:a)),c}function summaryErrors(e){const t=[];return e.compilation.errors.forEach((e=>{const r=e.message,o=/Can't resolve '(sass-loader|less-loader|stylus-loader)'/.exec(r);if("ModuleNotFoundError"===e.name&&o){let t=o[1];"less-loader"===t?t=`less ${t}`:"sass-loader"===t?t=`sass ${t}`:"stylus-loader"===t&&(t=`stylus ${t}`),e.message=` Missing dependency: ${t}, Please execute npm install -D ${t} to install the corresponding dependencies `}const s=e.module?e.module.resource:"";t.push(`${s}\r\n${e.message}`)})),t.join("\n\n")}function summaryWarnings(e){return e.compilation.warnings.map((e=>e.message)).join("\n\n")}const quickapp_url="https://statres.quickapp.cn/quickapp/quickapptool/release/platform/";function getQuickappDebuggerUrl(e){let t=e||"v1080";return _sharedUtils.colorconsole.log(`The version of the Quickapp debugger that started to download is： ${t}`),`${quickapp_url}quickapp_debugger_${t}.apk`}function getQuickappPreviewUrl(e){let t=e||"v1080";return _sharedUtils.colorconsole.log(`The version of the Quickapp debugger that started to download is： ${t}`),`${quickapp_url}quickapp_platform_preview_release_${t}.apk`}function downloadFile(e,t){return _sharedUtils.colorconsole.log(`Start downloading file：${t}, address：${e}`),new Promise((function(r,o){(0,_request.default)(e,(function(s,n,i){if(s||200!==n.statusCode)o(s||new Error(`Download failed, status code：${n.statusCode}`));else{const s=_path.default.join(__dirname,"./apk");_fsExtra.default.ensureDirSync(s);let n=_fsExtra.default.createWriteStream(_path.default.join(s,t));(0,_request.default)(e).pipe(n).on("close",(e=>{e?o(e):r(`Download file ${t} successfully`)}))}}))}))}async function sendReq(e,t,r){return new Promise((o=>{const s=`http://${e.ip}:${e.port}${t}`;let n={host:e.ip,port:e.port,path:t,timeout:3e3};r&&(n=Object.assign({},n,{headers:r}));const i=_http.default.request(n,(e=>{e.on("data",(e=>{_sharedUtils.colorconsole.log(`### App Server ### Request ${s} succeeded`),o(e.toString())}))})).on("error",(e=>{_sharedUtils.colorconsole.error(`### App Server ### Request ${s} error message: ${e.message}`)})).on("timeout",(function(){_sharedUtils.colorconsole.log(`### App Server ### Request ${s} timed out, please try again`),i.abort()}));i.end()}))}async function getClients(){return new Promise((e=>{if(_fsExtra.default.existsSync(_config.clientRecordPath)){const t=(0,_recordClient.getRecords)(_config.clientRecordPath),r=(0,_recordClient.getProjectClients)(t);r.length>0&&e(r)}e(null)}))}function checkQuickappDir(e,t="src"){const r=_path.default.join(e,t,"manifest.json");_fsExtra.default.existsSync(r)||(_sharedUtils.colorconsole.error("Please execute this command under the Quickapp project"),process.exit())}function getCardContent(e){const t=_path.default.join(e,"src","manifest.json"),r=(0,_sharedUtils.readJson)(t).router.widgets||null;return r||_sharedUtils.colorconsole.error("No card configuration in manifest.json"),r}function cleanOrCreateDir(e){try{_fsExtra.default.accessSync(e,_fsExtra.default.constants.F_OK),fsExtra.emptyDirSync(e)}catch(t){_fsExtra.default.mkdirSync(e,{recursive:!0})}}function getAspectEntries(e,t){let r=[],o={},s={},n=_fsExtra.default.readdirSync(e,{encoding:"utf8"});const i=_path.default.join(e,"app","manifest.json"),a=t.router.aspects||null,c=Object.keys(a);return t.router||_sharedUtils.colorconsole.error(`Configuration file ${i} error: router is not exsist, please check`),a||_sharedUtils.colorconsole.error(`Configuration file ${i} error: router.aspect is not exist, please check`),c.forEach((e=>{const t=a[e];let c=[];t.forEach((t=>{n.includes(t.path)&&!r.includes(t.path)?r.push(t.path):_sharedUtils.colorconsole.throw(`Configuration file ${i} error: ${t.path} is not exist in root directory`);let a=t.devices?t.devices:["phone"];for(let r=0;r<a.length;r++){let n=[a[r],t.rule?t.rule:""].join(" ");c.includes(n)?_sharedUtils.colorconsole.throw(`Configuration file ${i} error, devices or devices rule: ${n} is repeat in router ${e}`):c.push(n),s[n]=_objectSpread(_objectSpread({},s[n]),{},{[e]:t}),Object.keys(o).includes(n)?o[n].push(t.path):o[n]=[t.path]}}))})),{entries:r,deviceAspects:o,routerObj:s}}function copyFiles(e,t){_fsExtra.default.existsSync(e)||_sharedUtils.colorconsole.throw(`Resource copy error, the path ${e} not exist.`),_fsExtra.default.existsSync(t)||_fsExtra.default.mkdirSync(t,{recursive:!0});_fsExtra.default.readdirSync(e).forEach((r=>{const o=_path.default.join(e,r),s=_path.default.join(t,r);_fsExtra.default.statSync(o).isDirectory()?copyFiles(o,s):_fsExtra.default.copyFileSync(o,s)}))}const mirtosDeviceConfig=["watch"],androidDeviceConfig=[""];function getProductionTypes(e){const t={enableMirtos:!1,enableAndroid:!1};return 0===e.length?t.enableAndroid=!0:e.map((e=>{mirtosDeviceConfig.indexOf(e)>-1?t.enableMirtos=!0:t.enableAndroid=!0})),t}function isMirtosDevice(e){return mirtosDeviceConfig.some((t=>e.includes(t)))}function deleteCompressedFiles(e,t=!1,r=""){const o=[".base",".aspc"];_fsExtra.default.readdirSync(e).forEach((s=>{const{name:n,ext:i}=_path.default.parse(s),a=_path.default.join(e,s);if(_fsExtra.default.statSync(a).isFile()&&o.includes(i.toLowerCase()))if(t){const e=_path.default.join(r,`${n}.rpk`);_fsExtra.default.renameSync(a,e)}else _fsExtra.default.unlinkSync(a)}))}function getAndCopyDeviceAspectResource(e,t,r,o){const s=_path.default.dirname(t);return e.map((e=>{let n=o?`${e}.lite`:e;return copyFiles(_path.default.join(t,n),_path.default.join(s,r,e)),{name:e,targetFile:"app"===e?n+".base":n+".aspc",otherName:"app"===e?e+".base":e+".aspc"}}))}
 //# sourceMappingURL=utils.js.map

package/lib/utils.js

@@ -1,2 +1,2 @@
-"use strict";const path=require("path"),{colorconsole:colorconsole}=require("@aiot-toolkit/shared-utils"),{ENTRY_TYPE:ENTRY_TYPE}=require("@aiot-toolkit/packager/lib/common/utils"),{resolveFile:resolveFile}=require("@aiot-toolkit/packager/lib/common/info"),{isEmptyObject:isEmptyObject}=require("@aiot-toolkit/compiler/lib/utils");exports.resolveEntries=function(e,o,t){if(!e.router)throw Error("No routing configured in manifest.json！");const r={},i=e.router.pages||{},s=e.router.widgets||{},n=[{confs:e.router.floatingWindows||{},type:ENTRY_TYPE.FLOAT},{confs:s,type:ENTRY_TYPE.CARD}];n.unshift({confs:i,type:ENTRY_TYPE.PAGE});const c=resolveFile(path.join(o,"app"));c||(colorconsole.error("app file does not exist"),process.exit(1)),r.app="./"+path.relative(t,c)+`?uxType=${ENTRY_TYPE.APP}`,n.forEach((({confs:e,type:i})=>{Object.keys(e).forEach((s=>{const n=e[s],c=path.join(s,n.component),a=resolveFile(path.join(o,c));a||colorconsole.throw(`Compilation failed: please confirm that the file path ${c} configured in manifest.json exists`),/^\//.test(s)&&colorconsole.throw(`Compilation failed: please confirm that '${s}' configured by router.pages in manifest.json is the directory name`);let l=path.relative(t,a);l="./"+l+`?uxType=${i}`,l=l.replace(/\\/g,"/"),r[c]=l}))}));const a=e.workers;a&&a.entries&&a.entries instanceof Array&&a.entries.filter((e=>e.file)).forEach((e=>{r[e.file.replace(/\.js$/,"")]="./src/"+e.file}));const l=e.services;if(!isEmptyObject(l))if(Array.isArray(l))l.forEach((e=>{const{name:o,path:t}=e;o&&t&&(r["services/"+o]="./src/"+t+`?uxType=${ENTRY_TYPE.APP}`)}));else for(const e in l)Object.hasOwnProperty.call(l,e)&&(r["services/"+e]="./src/"+l[e].path+`?uxType=${ENTRY_TYPE.APP}`);return r};
+"use strict";const path=require("path"),{colorconsole:colorconsole}=require("@aiot-toolkit/shared-utils"),{ENTRY_TYPE:ENTRY_TYPE}=require("@aiot-toolkit/packager/lib/common/utils"),{resolveFile:resolveFile}=require("@aiot-toolkit/packager/lib/common/info"),{isEmptyObject:isEmptyObject}=require("@aiot-toolkit/compiler/lib/utils"),globalConfig=require("@aiot-toolkit/shared-utils/config");exports.resolveEntries=function(e,o,t){if(!e.router)throw Error("No routing configured in manifest.json！");const i={},r=e.router.pages||{},s=e.router.widgets||{},l=[{confs:e.router.floatingWindows||{},type:ENTRY_TYPE.FLOAT},{confs:s,type:ENTRY_TYPE.CARD}];l.unshift({confs:r,type:ENTRY_TYPE.PAGE});let n="app";globalConfig.aspectTemplate.isAspect&&!globalConfig.aspectTemplate.isApp&&(n="aspect");const c=resolveFile(path.join(o,n));c||(colorconsole.error(`${n} file does not exist`),process.exit(1)),i[n]="./"+path.relative(t,c)+`?uxType=${ENTRY_TYPE.APP}`,l.forEach((({confs:e,type:r})=>{Object.keys(e).forEach((s=>{const l=e[s],n=path.join(s,l.component);let c=resolveFile(path.join(o,n));c||colorconsole.throw(`Compilation failed: please confirm that the file path ${n} configured in manifest.json exists`),/^\//.test(s)&&colorconsole.throw(`Compilation failed: please confirm that '${s}' configured by router.pages in manifest.json is the directory name`);let a=path.relative(t,c);a="./"+a+`?uxType=${r}`,a=a.replace(/\\/g,"/"),i[n]=a}))}));const a=e.workers;a&&a.entries&&a.entries instanceof Array&&a.entries.filter((e=>e.file)).forEach((e=>{i[e.file.replace(/\.js$/,"")]="./src/"+e.file}));const p=e.services;if(!isEmptyObject(p))if(Array.isArray(p))p.forEach((e=>{const{name:o,path:t}=e;o&&t&&(i["services/"+o]="./src/"+t+`?uxType=${ENTRY_TYPE.APP}`)}));else for(const e in p)Object.hasOwnProperty.call(p,e)&&(i["services/"+e]="./src/"+p[e].path+`?uxType=${ENTRY_TYPE.APP}`);return i};
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "aiot-toolkit",
-  "version": "1.1.0",
+  "version": "1.1.1-aspect-beta.2",
   "description": "A command line toolkit for developing Aiot Quick Apps.",
   "engines": {
     "node": ">=8.0.0"
   },
   "dependencies": {
-    "@aiot-toolkit/compiler": "1.1.0",
-    "@aiot-toolkit/debugger": "1.1.0",
-    "@aiot-toolkit/dsl-vue": "1.1.0",
-    "@aiot-toolkit/dsl-xvm": "1.1.0",
-    "@aiot-toolkit/packager": "1.1.0",
-    "@aiot-toolkit/server": "1.1.0",
-    "@aiot-toolkit/shared-utils": "1.1.0",
+    "@aiot-toolkit/compiler": "1.1.1-aspect-beta.2",
+    "@aiot-toolkit/debugger": "1.1.1-aspect-beta.2",
+    "@aiot-toolkit/dsl-vue": "1.1.1-aspect-beta.2",
+    "@aiot-toolkit/dsl-xvm": "1.1.1-aspect-beta.2",
+    "@aiot-toolkit/packager": "1.1.1-aspect-beta.2",
+    "@aiot-toolkit/server": "1.1.1-aspect-beta.2",
+    "@aiot-toolkit/shared-utils": "1.1.1-aspect-beta.2",
     "@babel/core": "^7.9.6",
     "@babel/plugin-syntax-jsx": "^7.8.3",
     "@babel/preset-env": "^7.9.6",
@@ -52,5 +52,5 @@
     "supertest": "^3.3.0",
     "webpack-cli": "^4.3.0"
   },
-  "gitHead": "86f3819e1955fabb17c0c3834e20648f8a96b780"
+  "gitHead": "4be7e5e770c9e17b64ac8b39cf656991c20ad922"
 }