aiot-toolkit 2.0.5-beta.11 → 2.0.5-beta.14

package/lib/bin.js

@@ -7,10 +7,8 @@ var _aiotpack = require("@aiot-toolkit/aiotpack");
 var _commander = require("@aiot-toolkit/commander");
 var _AndroidUxBuilder = _interopRequireDefault(require("./builder/AndroidUxBuilder"));
 var _VelaUxBuilder = _interopRequireDefault(require("./builder/VelaUxBuilder"));
-var _XtsBuilder = _interopRequireDefault(require("./builder/XtsBuilder"));
 var _AndroidUxStart = _interopRequireDefault(require("./starter/AndroidUxStart"));
 var _VelaUxStarter = _interopRequireDefault(require("./starter/VelaUxStarter"));
-var _XtsStarter = _interopRequireDefault(require("./starter/XtsStarter"));
 var _DeviceUtil = _interopRequireDefault(require("./utils/DeviceUtil"));
 var _VelaAvdUtils = _interopRequireDefault(require("./utils/VelaAvdUtils"));
 var _ZipUtil = _interopRequireDefault(require("@aiot-toolkit/aiotpack/lib/compiler/javascript/vela/utils/ZipUtil"));
@@ -38,10 +36,6 @@ const projectMapper = {
     builder: _VelaUxBuilder.default,
     starter: _VelaUxStarter.default
   },
-  [_sharedUtils.ProjectType.VELA_XTS]: {
-    builder: _XtsBuilder.default,
-    starter: _XtsStarter.default
-  },
   [_sharedUtils.ProjectType.ANDDROID_UX]: {
     builder: _AndroidUxBuilder.default,
     starter: _AndroidUxStart.default
@@ -64,6 +58,11 @@ function build(command, description) {
         option.mode = command === 'release' ? _aiotpack.CompileMode.PRODUCTION : _aiotpack.CompileMode.DEVELOPMENT;
         const projectPath = process.cwd();
         await builder.build(projectPath, option);
+        if (process.env.TERM_PROGRAM !== 'aiot-ide') {
+          _sharedUtils.ColorConsole.warn('please use', {
+            word: 'AIoT-IDE: https://iot.mi.com/vela/quickapp/zh/guide/start/use-ide.html'
+          });
+        }
       } catch (error) {
         _sharedUtils.ColorConsole.error('Build Error:', {
           word: error?.toString() || 'unknown error'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiot-toolkit",
-  "version": "2.0.5-beta.11",
+  "version": "2.0.5-beta.14",
   "description": "Tools for creating, developing, and packaging aiot applications.",
   "keywords": [
     "aiot"
@@ -22,14 +22,14 @@
     "test": "node ./__tests__/aiot-toolkit.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.5-beta.11",
-    "@aiot-toolkit/commander": "2.0.5-beta.11",
-    "@aiot-toolkit/emulator": "2.0.5-beta.11",
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.11",
+    "@aiot-toolkit/aiotpack": "2.0.5-beta.14",
+    "@aiot-toolkit/commander": "2.0.5-beta.14",
+    "@aiot-toolkit/emulator": "2.0.5-beta.14",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.14",
     "@inquirer/prompts": "^5.3.0",
     "@miwt/adb": "^0.9.0",
     "axios": "^1.7.4",
-    "file-lane": "2.0.5-beta.11",
+    "file-lane": "2.0.5-beta.14",
     "fs-extra": "^11.2.0",
     "koa-router": "^13.0.1",
     "lodash": "^4.17.21",
@@ -43,5 +43,5 @@
     "@types/qr-image": "^3.2.9",
     "@types/semver": "^7.5.8"
   },
-  "gitHead": "3572914b1508d19f4a7c566cec23f0be70273e59"
+  "gitHead": "63c6564afe9bedd9c034f03e8e457b6cfa6960ae"
 }

package/lib/builder/XtsBuilder.d.ts

@@ -1,18 +0,0 @@
-import { IParam } from '@aiot-toolkit/commander';
-import IBuilder from './IBuilder';
-export interface IBuilderOption {
-    watch?: boolean;
-    skip?: string;
-}
-/**
- * XtsBuilder
- */
-declare class XtsBuilder implements IBuilder<IBuilderOption> {
-    static readonly PROJECT_TYPE = "xts quick app";
-    private fileLane?;
-    match(projectPath: string): boolean;
-    build(projectPath: string, options: IBuilderOption): Promise<void>;
-    dispose(): Promise<void>;
-    readonly params: IParam[];
-}
-export default XtsBuilder;

package/lib/builder/XtsBuilder.js

@@ -1,94 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _aiotpack = require("@aiot-toolkit/aiotpack");
-var _sharedUtils = require("@aiot-toolkit/shared-utils");
-var _fileLane = require("file-lane");
-var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/**
- * XtsBuilder
- */
-class XtsBuilder {
-  static PROJECT_TYPE = 'xts quick app';
-  match(projectPath) {
-    // app/app.xts 存在视为xts项目
-    return _fs.default.existsSync(_path.default.resolve(projectPath, 'app/app.xts'));
-  }
-  async build(projectPath, options) {
-    if (this.fileLane) {
-      // 已经在运行中，请先停止
-      throw new Error('already running, please stop first: builder.stop()');
-    }
-    const watch = options.watch || false;
-    _sharedUtils.ColorConsole.success('Start build...\n', {
-      word: 'ProjectPath: ',
-      style: _sharedUtils.ColorConsole.getStyle(_sharedUtils.Loglevel.SUCCESS)
-    }, projectPath, '\n', {
-      word: 'buildOptions: ',
-      style: _sharedUtils.ColorConsole.getStyle(_sharedUtils.Loglevel.SUCCESS)
-    }, JSON.stringify(options));
-    const compilerOptions = {
-      skip: _sharedUtils.StringUtil.string2arrayByComma(options.skip)
-    };
-    const config = new _aiotpack.XtsConfig(projectPath);
-    if (compilerOptions.skip?.includes('xts2ts')) {
-      _sharedUtils.ColorConsole.info("### skip compile xts to ts due to --skip ${compilerOptions?.skip.join(',')}");
-      const context = _fileLane.FileLaneUtil.createContext(config.output, projectPath);
-      const preWorks = config.beforeCompile || [];
-      for (let item of preWorks) {
-        try {
-          await item({
-            context,
-            config,
-            compilerOption: compilerOptions
-          });
-        } catch (error) {
-          // 报错 prework的item error
-        }
-      }
-      const follWorks = config.afterCompile || [];
-      for (let item of follWorks) {
-        try {
-          await item.worker({
-            context,
-            config,
-            compilerOption: compilerOptions
-          });
-        } catch (error) {
-          // 报错 prework的item error
-        }
-      }
-    } else {
-      this.fileLane = new _fileLane.FileLane(config, projectPath, compilerOptions);
-      this.fileLane.start({
-        watch
-      });
-    }
-  }
-  async dispose() {
-    await this.fileLane?.dispose();
-    this.fileLane = undefined;
-  }
-  params = (() => [{
-    name: 'skip',
-    type: 'string',
-    description: `Can configure skip steps, comma separated, optional values: ${_aiotpack.skipList.join(',')}`,
-    validate(value) {
-      // TODO: validate 不起作用
-      const res = _sharedUtils.StringUtil.string2arrayByComma(value);
-      const unValid = res.find(r => {
-        return !_aiotpack.skipList.includes(r);
-      });
-      if (unValid) {
-        return `${unValid} is unvalidate,  validate value are ${_aiotpack.skipList.join(',')}, Multiple values separated by commas`;
-      }
-      return true;
-    }
-  }])();
-}
-var _default = exports.default = XtsBuilder;

package/lib/starter/XtsStarter.d.ts

@@ -1,9 +0,0 @@
-import { IParam } from '@aiot-toolkit/commander';
-import XtsBuilder from '../builder/XtsBuilder';
-import IStarter from './IStarter';
-declare class XtsStarter extends IStarter {
-    builder: XtsBuilder;
-    params: IParam[];
-    start(projectPath: string, options: any): void;
-}
-export default XtsStarter;

package/lib/starter/XtsStarter.js

@@ -1,18 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _XtsBuilder = _interopRequireDefault(require("../builder/XtsBuilder"));
-var _IStarter = _interopRequireDefault(require("./IStarter"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-class XtsStarter extends _IStarter.default {
-  builder = (() => new _XtsBuilder.default())();
-  params = [];
-  start(projectPath, options) {
-    console.log(projectPath, options);
-    throw new Error('Method not implemented.');
-  }
-}
-var _default = exports.default = XtsStarter;