create-aiot 2.0.2-dev.8 → 2.0.3-beta.1

package/lib/bin.js

@@ -21,9 +21,6 @@ function main() {
                 choices: [
                     {
                         value: 'ux'
-                    },
-                    {
-                        value: 'xts'
                     }
                 ]
             });

package/lib/index.js

@@ -12,11 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCrerateXtsCommand = exports.getUxCreateCommand = void 0;
+exports.getUxCreateCommand = getUxCreateCommand;
+exports.getCrerateXtsCommand = getCrerateXtsCommand;
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const TemplateUtil_1 = __importDefault(require("./utils/TemplateUtil"));
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 function createAction(options, projectType) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -51,7 +52,7 @@ function createAction(options, projectType) {
             }
         }
         catch (error) {
-            ColorConsole_1.default.error(`Create project error: ${error}`);
+            shared_utils_1.ColorConsole.error(`Create project error: ${error}`);
             process.exit();
         }
     });
@@ -92,7 +93,6 @@ function getUxCreateCommand() {
         };
     });
 }
-exports.getUxCreateCommand = getUxCreateCommand;
 function getCrerateXtsCommand() {
     return __awaiter(this, void 0, void 0, function* () {
         const templateList = yield TemplateUtil_1.default.requestTemplateList('xts');
@@ -143,4 +143,3 @@ function getCrerateXtsCommand() {
         };
     });
 }
-exports.getCrerateXtsCommand = getCrerateXtsCommand;

package/lib/interface/IProjectParam.d.ts

@@ -3,11 +3,20 @@ import ITemplate from './ITemplate';
  * IProjectParam
  */
 export default interface IProjectParam {
+    /**
+     * 项目名
+     */
     name: string;
+    /**
+     * 模型对象，一般从 template.json 中获取
+     */
     template: ITemplate;
     tools: {
         eslint: boolean;
     };
     aspect?: string;
+    /**
+     * 包名
+     */
     packageName?: string;
 }

package/lib/template/template.json

@@ -4,8 +4,13 @@
     "demoList": [
       {
         "name": "vela-demo",
-        "path": "./vela-demo",
+        "path": "./ux/vela-demo",
         "description": "vela demo template"
+      },
+      {
+        "name": "android-demo",
+        "path": "./ux/android-demo",
+        "description": "android demo template"
       }
     ]
   },

package/lib/template/ux/android-demo/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "{{ appName }}",
+  "version": "1.0.0",
+  "description": "",
+  "engines": {
+    "node": ">=8.10"
+  },
+  "scripts": {
+    "start": "aiot start",
+    "build": "aiot build",
+    "release": "aiot release",
+    "lint": "eslint --format codeframe --fix --ext .ux,.js src/"
+  },
+  "devDependencies": {
+    "aiot-toolkit": "^{{ toolkitVersion }}"
+  }
+}

package/lib/template/ux/android-demo/src/CardDemo/index.ux

@@ -0,0 +1,24 @@
+<template>
+  <!-- template里只能有一个根节点 -->
+  <div class="demo-page">
+    <text>{{text}}</text>
+    <text>{{des}}</text>
+  </div>
+</template>
+
+<script>
+export default {
+  private: {
+    text: '欢迎使用快应用卡片',
+    des: '卡片是一种轻量级的快应用，快应用卡片使快应用能够在其他app和系统里提供可扩展的app功能'
+  }
+}
+</script>
+
+<style>
+  .demo-page {
+    flex: 1;
+    flex-direction: column;
+    align-items: center;
+  }
+</style>

package/lib/template/ux/android-demo/src/Demo/index.ux

@@ -0,0 +1,48 @@
+<template>
+  <!-- template里只能有一个根节点 -->
+  <div class="demo-page">
+    <text class="title">欢迎打开{{title}}</text>
+    <!-- 点击跳转详情页 -->
+    <input class="btn" type="button" value="跳转到详情页" onclick="routeDetail" />
+  </div>
+</template>
+
+<script>
+import router from '@system.router'
+
+export default {
+  // 页面级组件的数据模型，影响传入数据的覆盖机制：private内定义的属性不允许被覆盖
+  private: {
+    title: '示例页面'
+  },
+  routeDetail () {
+    // 跳转到应用内的某个页面，router用法详见：文档->接口->页面路由
+    router.push ({
+      uri: '/DemoDetail'
+    })
+  }
+}
+</script>
+
+<style>
+  .demo-page {
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .title {
+    font-size: 40px;
+    text-align: center;
+  }
+
+  .btn {
+    width: 550px;
+    height: 86px;
+    margin-top: 75px;
+    border-radius: 43px;
+    background-color: #09ba07;
+    font-size: 30px;
+    color: #ffffff;
+  }
+</style>

package/lib/template/ux/android-demo/src/DemoDetail/index.ux

@@ -0,0 +1,27 @@
+<template>
+  <!-- template里只能有一个根节点 -->
+  <div class="demo-page">
+    <text class="title">{{text}}</text>
+  </div>
+</template>
+
+<script>
+export default {
+  private: {
+    text: '欢迎打开详情页'
+  }
+}
+</script>
+
+<style>
+  .demo-page {
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .title {
+    font-size: 40px;
+    text-align: center;
+  }
+</style>

package/lib/template/ux/android-demo/src/app.ux

@@ -0,0 +1,14 @@
+<script>
+/**
+ * @file 应用级别的配置，供所有页面公用
+ * 可在app.ux导出公用变量
+ * 其他src目录下的ux文件使用this.$app.$def.<paramName>即可调用此处导出的变量
+ * 文档地址： https://doc.quickapp.cn/framework/source-file.html#appux
+ */
+
+// 引入全局函数定义文件global.js
+import './global'
+
+export default {}
+
+</script>

package/lib/template/ux/android-demo/src/global.js

@@ -0,0 +1,34 @@
+/**
+ * @file 全局能力的配置与获取
+ * 文档地址：https://doc.quickapp.cn/tutorial/framework/optimization-skills.html#%E4%BD%BF%E7%94%A8-globaljs
+ */
+
+function getGlobalRef() {
+  return Object.getPrototypeOf(global) || global
+}
+
+const quickappGlobal = getGlobalRef()
+
+/**
+ * 设置全局(被APP与Page共享)数据；
+ * @param key {string}
+ * @param val {*}
+ */
+function setGlobalData(key, val) {
+  quickappGlobal[key] = val
+}
+
+/**
+ * 获取全局(被APP与Page共享)数据；
+ * @param key {string}
+ * @return {*}
+ */
+function getGlobalData(key) {
+  return quickappGlobal[key]
+}
+
+// 两个方法默认定义在全局
+setGlobalData('setGlobalData', setGlobalData)
+setGlobalData('getGlobalData', getGlobalData)
+
+export { setGlobalData, getGlobalData }

package/lib/template/ux/android-demo/src/manifest.json

@@ -0,0 +1,56 @@
+{
+  "package": "com.application.demo",
+  "name": "{{appName}}",
+  "versionName": "1.0.0",
+  "versionCode": 1,
+  "minPlatformVersion": 1070,
+  "icon": "/Common/logo.png",
+  "deviceTypeList": ["phone"],
+  "features": [
+    { "name": "system.prompt" },
+    { "name": "system.router" },
+    { "name": "system.shortcut" }
+  ],
+  "permissions": [
+    { "origin": "*" }
+  ],
+  "config": {
+    "logLevel": "log"
+  },
+  "router": {
+    "entry": "Demo",
+    "pages": {
+      "Demo": {
+        "component": "index"
+      },
+      "DemoDetail": {
+        "component": "index"
+      }
+    },
+    "widgets": {
+      "CardDemo": {
+        "name": "CardDemo",
+        "description": "快应用卡片展示",
+        "component": "index",
+        "path": "/CardDemo",
+        "features": []
+      }
+    }
+  },
+  "display": {
+    "titleBarBackgroundColor": "#f2f2f2",
+    "titleBarTextColor": "#414141",
+    "menu": false,
+    "menuBarData": {
+      "menuBar": true
+    },
+    "pages": {
+      "Demo": {
+        "titleBarText": "示例页"
+      },
+      "DemoDetail": {
+        "titleBarText": "详情页"
+      }
+    }
+  }
+}

package/lib/template/ux/android-demo/src/sitemap.json

@@ -0,0 +1,4 @@
+{
+  "doc": "https://doc.quickapp.cn/framework/sitemap.html",
+  "rules": [{ "rule": "enable", "page": "*" }]
+}

package/lib/template/ux/vela-demo/README.md

@@ -0,0 +1,25 @@
+## 快速上手
+
+### 1. 开发
+
+```
+npm install
+npm run start
+```
+
+### 2. 构建
+
+```
+npm run build
+npm run release
+```
+
+### 3. 调试
+
+```
+npm run watch
+```
+
+## 了解更多
+
+你可以通过我们的[官方文档](https://iot.mi.com/vela/quickapp)熟悉和了解快应用。

package/lib/template/ux/vela-demo/_gitignore

@@ -0,0 +1,5 @@
+/.nyc_output
+/coverage
+/node_modules
+/dist
+/build

package/lib/template/{vela-demo → ux/vela-demo}/package.json

@@ -12,11 +12,7 @@
     "lint": "eslint --format codeframe --fix --ext .ux,.js src/"
   },
   "devDependencies": {
-    "@aiot-toolkit/velasim": "^0.1.23",
     "@aiot-toolkit/jsc": "^1.0.3",
-    "aiot-toolkit": "^{{ toolkitVersion }}",
-    "babel-eslint": "^10.0.1",
-    "eslint": "^6.8.0",
-    "eslint-plugin-ux": "^0.0.4"
+    "aiot-toolkit": "^{{ toolkitVersion }}"
   }
 }

package/lib/utils/Common.d.ts

@@ -0,0 +1,12 @@
+declare class Common {
+    /**
+     * 遍历项目文件，替换词语
+     * @param keywords
+     * @param projectAbsolutePath
+     */
+    static performReplace(keywords: {
+        data: Record<string, string>;
+        includes?: (path: string) => boolean;
+    }, projectAbsolutePath: string): void;
+}
+export default Common;

package/lib/utils/Common.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+class Common {
+    /**
+     * 遍历项目文件，替换词语
+     * @param keywords
+     * @param projectAbsolutePath
+     */
+    static performReplace(keywords, projectAbsolutePath) {
+        const { data, includes } = keywords;
+        const files = shared_utils_1.FileUtil.readAlldirSync(projectAbsolutePath, includes);
+        if (files && files.length) {
+            files.forEach((item) => {
+                shared_utils_1.FileUtil.replaceFileContent(item, data);
+            });
+        }
+    }
+}
+exports.default = Common;

package/lib/utils/TemplateUtil.d.ts

@@ -11,26 +11,33 @@ declare class TemplateUtil {
      * @returns
      */
     static validateProjectName(value: string): boolean | string;
-    static createXtsProject(): Promise<void>;
-    static createProject(param: IProjectParam, keywords?: {
-        data: Record<string, string>;
-        includes?: (path: string) => boolean;
-    }, plugins?: ((projectPath: string, param: IProjectParam) => Promise<void>)[]): Promise<void>;
     /**
-     * 遍历项目文件，替换词语
+     * 创建项目
+     * @param param
      * @param keywords
-     * @param projectAbsolutePath
+     * @param plugins
+     * @param cwd
+     */
+    static createProject(param: IProjectParam, 
+    /**
+     * 要替换的词语
      */
-    static performReplace(keywords: {
+    keywords?: {
+        /**
+         * [原词]:新词
+         */
         data: Record<string, string>;
+        /**
+         * 是否对 path文件 执行替换操作
+         * @param path
+         * @returns
+         */
         includes?: (path: string) => boolean;
-    }, projectAbsolutePath: string): void;
+    }, plugins?: ((projectPath: string, param: IProjectParam) => Promise<void>)[], 
     /**
-     * xts项目-处理aspect内容
-     * @param projectAbsolutePath
-     * @param aspect
+     * 项目根目录，默认为 process.cwd()
      */
-    static createAspect(projectAbsolutePath: string, aspect: string): void;
+    cwd?: string): Promise<void>;
     /**
      * 修改_gitignore为.gitignore
      */

package/lib/utils/TemplateUtil.js

@@ -13,12 +13,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const FileUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/FileUtil"));
-const NetworkUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/NetworkUtil"));
 const prompts_1 = require("@inquirer/prompts");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
+const Common_1 = __importDefault(require("./Common"));
+const XtsTemplateUtil_1 = __importDefault(require("./xts/XtsTemplateUtil"));
 const json = require('../template/template.json');
 /**
  * TemplateUtil
@@ -28,7 +27,7 @@ class TemplateUtil {
         return __awaiter(this, void 0, void 0, function* () {
             const item = json.find((item) => item.type === type);
             if (!item || !item.demoList) {
-                ColorConsole_1.default.throw(`no`, { word: type, style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Throw) }, `template`);
+                shared_utils_1.ColorConsole.throw(`no`, { word: type, style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.THROW) }, `template`);
                 return [];
             }
             return item.demoList;
@@ -49,31 +48,44 @@ class TemplateUtil {
         }
         return true;
     }
-    static createXtsProject() {
-        return __awaiter(this, void 0, void 0, function* () { });
-    }
-    static createProject(param, keywords, plugins) {
+    /**
+     * 创建项目
+     * @param param
+     * @param keywords
+     * @param plugins
+     * @param cwd
+     */
+    static createProject(param, 
+    /**
+     * 要替换的词语
+     */
+    keywords, plugins, 
+    /**
+     * 项目根目录，默认为 process.cwd()
+     */
+    cwd) {
         return __awaiter(this, void 0, void 0, function* () {
             const { name, template, aspect } = param;
+            const usedCwd = cwd || process.cwd();
             // 获取项目名称和绝对路径，如果存在，则再次输入
             let projectName = name;
-            let projectAbsolutePath = path_1.default.join(process.cwd(), projectName);
+            let projectAbsolutePath = path_1.default.join(usedCwd, projectName);
             while (fs_extra_1.default.existsSync(projectAbsolutePath)) {
-                ColorConsole_1.default.warn(`${projectAbsolutePath} exists. `);
+                shared_utils_1.ColorConsole.warn(`${projectAbsolutePath} exists. `);
                 projectName = yield (0, prompts_1.input)({
                     message: 'please new project name',
                     validate: this.validateProjectName
                 });
-                projectAbsolutePath = path_1.default.join(process.cwd(), projectName);
+                projectAbsolutePath = path_1.default.join(usedCwd, projectName);
             }
             fs_extra_1.default.mkdirSync(projectAbsolutePath);
             // 复制模板
             if (template) {
-                ColorConsole_1.default.info('Create project start ...');
+                shared_utils_1.ColorConsole.info('Create project start ...');
                 const { path } = template;
                 // 远程
                 if (['http', 'git'].find((item) => path.startsWith(item))) {
-                    yield NetworkUtil_1.default.gitClone(path, projectAbsolutePath);
+                    yield shared_utils_1.NetworkUtil.gitClone(path, projectAbsolutePath);
                 }
                 //本地
                 else {
@@ -87,59 +99,17 @@ class TemplateUtil {
             if (keywords && keywords.data) {
                 // ux项目,添加toolkitVersion
                 keywords['data']['toolkitVersion'] = require('../../package.json').version;
-                TemplateUtil.performReplace(keywords, projectAbsolutePath);
+                Common_1.default.performReplace(keywords, projectAbsolutePath);
             }
             // xts项目-处理aspect内容
-            aspect && TemplateUtil.createAspect(projectAbsolutePath, aspect);
+            aspect && XtsTemplateUtil_1.default.createAspect(projectAbsolutePath, aspect);
             // 执行插件
             if (plugins) {
                 for (let item of plugins) {
                     yield item(projectAbsolutePath, param);
                 }
             }
-            ColorConsole_1.default.success(`Create project finish. project path: ${projectAbsolutePath}`);
-        });
-    }
-    /**
-     * 遍历项目文件，替换词语
-     * @param keywords
-     * @param projectAbsolutePath
-     */
-    static performReplace(keywords, projectAbsolutePath) {
-        const { data, includes } = keywords;
-        const files = FileUtil_1.default.readAlldirSync(projectAbsolutePath, includes);
-        if (files && files.length) {
-            files.forEach((item) => {
-                FileUtil_1.default.replaceFileContent(item, data);
-            });
-        }
-    }
-    /**
-     * xts项目-处理aspect内容
-     * @param projectAbsolutePath
-     * @param aspect
-     */
-    static createAspect(projectAbsolutePath, aspect) {
-        // 按照逗号分割字符串，且去掉空格
-        const aspects = aspect.replace(' ', '').split(',');
-        const aspectAbsolutePath = path_1.default.join(__dirname, '../template', 'xts', 'aspect1');
-        // 循环生成自定义aspect
-        aspects.map((aspectItem) => {
-            const targetAspectPath = path_1.default.join(projectAbsolutePath, aspectItem);
-            fs_extra_1.default.copySync(aspectAbsolutePath, targetAspectPath);
-            // 替换关键字
-            TemplateUtil.performReplace({
-                data: { aspectName: aspectItem },
-                includes: (path) => {
-                    const stats = fs_extra_1.default.statSync(path);
-                    if (stats.isDirectory()) {
-                        return ['src'].includes(path_1.default.basename(path));
-                    }
-                    else {
-                        return ['.json', '.ux'].includes(path_1.default.extname(path));
-                    }
-                }
-            }, targetAspectPath);
+            shared_utils_1.ColorConsole.success(`Create project finish. project path: ${projectAbsolutePath}`);
         });
     }
     /**

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

@@ -0,0 +1,9 @@
+declare class XtsTemplateUtil {
+    /**
+     * xts项目-处理aspect内容
+     * @param projectAbsolutePath
+     * @param aspect
+     */
+    static createAspect(projectAbsolutePath: string, aspect: string): void;
+}
+export default XtsTemplateUtil;

package/lib/utils/xts/XtsTemplateUtil.js

@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const Common_1 = __importDefault(require("../Common"));
+class XtsTemplateUtil {
+    /**
+     * xts项目-处理aspect内容
+     * @param projectAbsolutePath
+     * @param aspect
+     */
+    static createAspect(projectAbsolutePath, aspect) {
+        // 按照逗号分割字符串，且去掉空格
+        const aspects = aspect.replace(' ', '').split(',');
+        const aspectAbsolutePath = path_1.default.join(__dirname, '../../template', 'xts', 'aspect1');
+        // 循环生成自定义aspect
+        aspects.map((aspectItem) => {
+            const targetAspectPath = path_1.default.join(projectAbsolutePath, aspectItem);
+            fs_extra_1.default.copySync(aspectAbsolutePath, targetAspectPath);
+            // 替换关键字
+            Common_1.default.performReplace({
+                data: { aspectName: aspectItem },
+                includes: (path) => {
+                    const stats = fs_extra_1.default.statSync(path);
+                    if (stats.isDirectory()) {
+                        return ['src'].includes(path_1.default.basename(path));
+                    }
+                    else {
+                        return ['.json', '.ux'].includes(path_1.default.extname(path));
+                    }
+                }
+            }, targetAspectPath);
+        });
+    }
+}
+exports.default = XtsTemplateUtil;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-aiot",
-  "version": "2.0.2-dev.8",
+  "version": "2.0.3-beta.1",
   "description": "An easy way to start aiot project",
   "main": "lib/index.js",
   "keywords": [
@@ -23,14 +23,13 @@
     "test": "node ./__tests__/create-aiot.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/commander": "2.0.2-dev.8",
+    "@aiot-toolkit/commander": "2.0.3-beta.1",
+    "@aiot-toolkit/shared-utils": "2.0.3-beta.1",
     "@inquirer/prompts": "^3.0.3",
-    "ansi-colors": "^4.1.3",
-    "cli-progress": "^3.12.0",
-    "simple-git": "^3.19.1"
+    "fs-extra": "^11.2.0"
   },
   "devDependencies": {
-    "@types/cli-progress": "^3.11.0"
+    "@types/fs-extra": "^11.0.4"
   },
-  "gitHead": "831575362ba47778c9441f95cec41ddded36cffc"
+  "gitHead": "77b1b0aab9b5c227b5cc355b585a7c93761cc9a3"
 }

package/lib/template/ux/project.config.json

@@ -1,5 +0,0 @@
-{
-  "name": "{{appName}}",
-  "version": "{{version}}",
-  "projectType": "ux"
-}

package/lib/template/ux/src/app.ux

@@ -1,3 +0,0 @@
-<template>
-   appname is {{appName}}
-</template>