@giteeteam/apps-cli 0.4.0 → 0.4.2

package/dist/index.js

@@ -12,10 +12,7 @@ var esbuild$1 = require('esbuild');
 var pluginNodeResolve = require('@rollup/plugin-node-resolve');
 var commonjs = require('@rollup/plugin-commonjs');
 var ora = require('ora');
-var yaml = require('yaml');
-var Ajv = require('ajv');
-var AjvKeywords = require('ajv-keywords');
-var lodash = require('lodash');
+var appsManifest = require('@giteeteam/apps-manifest');
 var inquirer = require('inquirer');
 var simpleGit = require('simple-git');
 var chalk = require('chalk');
@@ -32,8 +29,6 @@ var archiver__default = /*#__PURE__*/_interopDefaultLegacy(archiver);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var commonjs__default = /*#__PURE__*/_interopDefaultLegacy(commonjs);
 var ora__default = /*#__PURE__*/_interopDefaultLegacy(ora);
-var Ajv__default = /*#__PURE__*/_interopDefaultLegacy(Ajv);
-var AjvKeywords__default = /*#__PURE__*/_interopDefaultLegacy(AjvKeywords);
 var inquirer__default = /*#__PURE__*/_interopDefaultLegacy(inquirer);
 var simpleGit__default = /*#__PURE__*/_interopDefaultLegacy(simpleGit);
 var readline__default = /*#__PURE__*/_interopDefaultLegacy(readline);
@@ -41,7 +36,7 @@ var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
 var child_process__default = /*#__PURE__*/_interopDefaultLegacy(child_process);
 var chokidar__default = /*#__PURE__*/_interopDefaultLegacy(chokidar);
 
-var version = "0.4.0";
+var version = "0.4.2";
 
 const packageApp = async ({ outputDir, manifest, copyFiles }) => {
     const { resources } = manifest;
@@ -214,748 +209,10 @@ const execActionWithSpinner = async (message, action) => {
     spinner.succeed(message.succeed);
 };
 
-var $id$b = "http://proxima.com/schemas/all.json";
-var type$b = "object";
-var properties$7 = {
-	app: {
-		$ref: "app.json"
-	},
-	modules: {
-		$ref: "modules/index.json"
-	},
-	resources: {
-		$ref: "resources.json"
-	},
-	tables: {
-		$ref: "tables.json"
-	},
-	locales: {
-		$ref: "locales.json"
-	}
-};
-var required$7 = [
-	"app"
-];
-var additionalProperties$4 = false;
-var allSchema = {
-	$id: $id$b,
-	type: type$b,
-	properties: properties$7,
-	required: required$7,
-	additionalProperties: additionalProperties$4
-};
-
-var $id$a = "http://proxima.com/schemas/app.json";
-var type$a = "object";
-var required$6 = [
-	"name",
-	"key",
-	"version"
-];
-var properties$6 = {
-	key: {
-		type: "string",
-		regexp: "/^[a-z][a-z0-9_]*$/gi"
-	},
-	name: {
-		type: "string"
-	},
-	version: {
-		type: "string"
-	}
-};
-var appSchema = {
-	$id: $id$a,
-	type: type$a,
-	required: required$6,
-	properties: properties$6
-};
-
-var $id$9 = "http://proxima.com/schemas/modules/index.json";
-var type$9 = "object";
-var patternProperties$1 = {
-	"^(adminPage|itemPanel|itemActivity|appPage|viewAction)$": {
-		type: "array",
-		uniqueItems: true,
-		uniqueItemProperties: [
-			"key"
-		],
-		minItems: 1,
-		additionalItems: true,
-		items: [
-			{
-				$ref: "frontend/base.json"
-			}
-		]
-	},
-	"^(webtrigger)$": {
-		type: "array",
-		uniqueItems: true,
-		uniqueItemProperties: [
-			"key"
-		],
-		minItems: 1,
-		additionalItems: true,
-		items: [
-			{
-				$ref: "trigger/webtrigger.json"
-			}
-		]
-	},
-	"^(trigger)$": {
-		type: "array",
-		uniqueItems: true,
-		uniqueItemProperties: [
-			"key"
-		],
-		minItems: 1,
-		additionalItems: true,
-		items: [
-			{
-				$ref: "trigger/base.json"
-			}
-		]
-	},
-	"^(function)$": {
-		type: "array",
-		uniqueItems: true,
-		uniqueItemProperties: [
-			"key"
-		],
-		minItems: 1,
-		additionalItems: true,
-		items: [
-			{
-				$ref: "function/base.json"
-			}
-		]
-	},
-	"^(customFieldType)$": {
-		type: "array",
-		uniqueItems: true,
-		uniqueItemProperties: [
-			"key"
-		],
-		minItems: 1,
-		additionalItems: true,
-		items: [
-			{
-				$ref: "custom-field/type.json"
-			}
-		]
-	},
-	"^(customField)$": {
-		type: "array",
-		uniqueItems: true,
-		uniqueItemProperties: [
-			"key"
-		],
-		minItems: 1,
-		additionalItems: true,
-		items: [
-			{
-				$ref: "custom-field/field.json"
-			}
-		]
-	}
-};
-var additionalProperties$3 = true;
-var minProperties$1 = 1;
-var modulesSchema = {
-	$id: $id$9,
-	type: type$9,
-	patternProperties: patternProperties$1,
-	additionalProperties: additionalProperties$3,
-	minProperties: minProperties$1
-};
-
-var type$8 = "object";
-var $id$8 = "http://proxima.com/schemas/modules/frontend/base.json";
-var additionalProperties$2 = true;
-var properties$5 = {
-	key: {
-		type: "string"
-	},
-	resource: {
-		type: "string"
-	},
-	title: {
-		type: "string"
-	},
-	loadType: {
-		type: "string"
-	},
-	route: {
-		type: "string"
-	}
-};
-var required$5 = [
-	"key",
-	"resource",
-	"title"
-];
-var frontendBaseSchema = {
-	type: type$8,
-	$id: $id$8,
-	additionalProperties: additionalProperties$2,
-	properties: properties$5,
-	required: required$5
-};
-
-var type$7 = "object";
-var $id$7 = "http://proxima.com/schemas/modules/trigger/base.json";
-var properties$4 = {
-	key: {
-		type: "string"
-	},
-	events: {
-		type: "array",
-		uniqueItems: true,
-		minItems: 1,
-		additionalItems: true,
-		items: [
-			{
-				type: "string"
-			}
-		]
-	},
-	"function": {
-		type: "string"
-	}
-};
-var required$4 = [
-	"key",
-	"events",
-	"function"
-];
-var triggerSchema = {
-	type: type$7,
-	$id: $id$7,
-	properties: properties$4,
-	required: required$4
-};
-
-var type$6 = "object";
-var $id$6 = "http://proxima.com/schemas/modules/trigger/webtrigger.json";
-var properties$3 = {
-	key: {
-		type: "string"
-	},
-	"function": {
-		type: "string"
-	}
-};
-var required$3 = [
-	"key",
-	"function"
-];
-var webtriggerSchema = {
-	type: type$6,
-	$id: $id$6,
-	properties: properties$3,
-	required: required$3
-};
-
-var type$5 = "object";
-var $id$5 = "http://proxima.com/schemas/modules/function/base.json";
-var properties$2 = {
-	key: {
-		type: "string"
-	},
-	handler: {
-		type: "string"
-	}
-};
-var required$2 = [
-	"key",
-	"handler"
-];
-var functionSchema = {
-	type: type$5,
-	$id: $id$5,
-	properties: properties$2,
-	required: required$2
-};
-
-var type$4 = "object";
-var $id$4 = "http://proxima.com/schemas/modules/custom-field/field.json";
-var additionalProperties$1 = true;
-var properties$1 = {
-	key: {
-		type: "string"
-	},
-	name: {
-		type: "string"
-	},
-	type: {
-		type: "string"
-	}
-};
-var required$1 = [
-	"key",
-	"name",
-	"type"
-];
-var customFieldSchema = {
-	type: type$4,
-	$id: $id$4,
-	additionalProperties: additionalProperties$1,
-	properties: properties$1,
-	required: required$1
-};
-
-var type$3 = "object";
-var $id$3 = "http://proxima.com/schemas/modules/custom-field/type.json";
-var properties = {
-	key: {
-		type: "string"
-	},
-	name: {
-		type: "string"
-	},
-	resource: {
-		type: "string"
-	}
-};
-var required = [
-	"key",
-	"name"
-];
-var customFieldTypeSchema = {
-	type: type$3,
-	$id: $id$3,
-	properties: properties,
-	required: required
-};
-
-var $id$2 = "http://proxima.com/schemas/resources.json";
-var type$2 = "array";
-var minItems$1 = 1;
-var uniqueItems$1 = true;
-var uniqueItemProperties$1 = [
-	"key"
-];
-var items$1 = {
-	type: "object",
-	properties: {
-		key: {
-			type: "string"
-		},
-		path: {
-			type: "string"
-		}
-	},
-	required: [
-		"key",
-		"path"
-	]
-};
-var resourcesSchema = {
-	$id: $id$2,
-	type: type$2,
-	minItems: minItems$1,
-	uniqueItems: uniqueItems$1,
-	uniqueItemProperties: uniqueItemProperties$1,
-	items: items$1
-};
-
-var $id$1 = "http://proxima.com/schemas/tables.json";
-var type$1 = "array";
-var minItems = 1;
-var uniqueItems = true;
-var uniqueItemProperties = [
-	"className"
-];
-var items = {
-	type: "object",
-	properties: {
-		className: {
-			type: "string",
-			regexp: {
-				pattern: "(^_([a-zA-Z0-9]_?)*$)|(^[a-zA-Z](_?[a-zA-Z0-9])*_?$)",
-				flags: "i"
-			}
-		},
-		fields: {
-			type: "object",
-			patternProperties: {
-				"(^_([a-zA-Z0-9]_?)*$)|(^[a-zA-Z](_?[a-zA-Z0-9])*_?$)": {
-					type: "object",
-					anyOf: [
-						{
-							type: "object",
-							properties: {
-								type: {
-									type: "string",
-									"enum": [
-										"Pointer",
-										"Relation"
-									]
-								},
-								targetClass: {
-									type: "string",
-									regexp: {
-										pattern: "(^_([a-zA-Z0-9]_?)*$)|(^[a-zA-Z](_?[a-zA-Z0-9])*_?$)",
-										flags: "i"
-									}
-								},
-								isAppClass: {
-									type: "boolean",
-									"default": false
-								}
-							},
-							required: [
-								"type",
-								"targetClass"
-							]
-						},
-						{
-							type: "object",
-							properties: {
-								type: {
-									type: "string",
-									"const": "String"
-								},
-								defaultValue: {
-									type: "string"
-								}
-							},
-							required: [
-								"type"
-							]
-						},
-						{
-							type: "object",
-							properties: {
-								type: {
-									type: "string",
-									"const": "Boolean"
-								},
-								defaultValue: {
-									type: "boolean"
-								}
-							},
-							required: [
-								"type"
-							]
-						},
-						{
-							type: "object",
-							properties: {
-								type: {
-									type: "string",
-									"const": "Number"
-								},
-								defaultValue: {
-									type: "number"
-								}
-							},
-							required: [
-								"type"
-							]
-						},
-						{
-							type: "object",
-							properties: {
-								type: {
-									type: "string",
-									"const": "Object"
-								},
-								defaultValue: {
-									type: "object"
-								}
-							},
-							required: [
-								"type"
-							]
-						},
-						{
-							type: "object",
-							properties: {
-								type: {
-									type: "string",
-									"const": "Array"
-								},
-								defaultValue: {
-									type: "array"
-								}
-							},
-							required: [
-								"type"
-							]
-						},
-						{
-							type: "object",
-							properties: {
-								type: {
-									type: "string",
-									"enum": [
-										"Date",
-										"File"
-									]
-								}
-							},
-							required: [
-								"type"
-							]
-						}
-					]
-				}
-			},
-			additionalProperties: false
-		}
-	},
-	required: [
-		"className",
-		"fields"
-	]
-};
-var tablesSchema = {
-	$id: $id$1,
-	type: type$1,
-	minItems: minItems,
-	uniqueItems: uniqueItems,
-	uniqueItemProperties: uniqueItemProperties,
-	items: items
-};
-
-var $id = "http://proxima.com/schemas/locales.json";
-var type = "object";
-var patternProperties = {
-	"^(en-US|zh-CN)$": {
-		type: "object",
-		additionalProperties: true
-	}
-};
-var additionalProperties = true;
-var minProperties = 1;
-var localesSchema = {
-	$id: $id,
-	type: type,
-	patternProperties: patternProperties,
-	additionalProperties: additionalProperties,
-	minProperties: minProperties
-};
-
-const validateResource = (json) => {
-    const errors = [];
-    const frontendModules = ['adminPage', 'itemPanel', 'itemActivity', 'appPage'];
-    const modules = lodash.get(json, 'modules') || {};
-    const resourcesEntries = lodash.keyBy(lodash.get(json, 'resources'), 'key');
-    const functionEntries = lodash.keyBy(lodash.get(json, 'modules.function'), 'key');
-    const customFieldTypeEntries = lodash.keyBy(lodash.get(json, 'modules.customFieldType'), 'key');
-    const moduleKeys = {};
-    Object.keys(modules).forEach(moduleKey => {
-        const module = lodash.get(modules, moduleKey);
-        if (!module)
-            return;
-        const isFrontendModule = frontendModules.indexOf(moduleKey) > -1;
-        Array.from(module).forEach(({ resource, function: functionRef, type, key }, index) => {
-            const path = `/modules/${moduleKey}/${index}`;
-            if (moduleKeys[key]) {
-                errors.push({
-                    path,
-                    message: `Key '${key}' has already exits! `,
-                });
-            }
-            else {
-                moduleKeys[key] = true;
-            }
-            if (isFrontendModule) {
-                if (resource && !lodash.get(resourcesEntries, resource)) {
-                    errors.push({
-                        path,
-                        message: `Resource '${resource}' not found! `,
-                    });
-                }
-            }
-            else if (moduleKey === 'trigger' || moduleKey === 'webtrigger') {
-                if (functionRef && !lodash.get(functionEntries, functionRef)) {
-                    errors.push({
-                        path,
-                        message: `Function '${functionRef}' not found! `,
-                    });
-                }
-            }
-            else if (moduleKey === 'customField' && lodash.startsWith(type, '_self:')) {
-                const fieldTypeRef = type === null || type === void 0 ? void 0 : type.slice(6);
-                if (fieldTypeRef && !lodash.get(customFieldTypeEntries, fieldTypeRef)) {
-                    errors.push({
-                        path,
-                        message: `FieldType '${fieldTypeRef}' not found! `,
-                    });
-                }
-            }
-        });
-    });
-    return {
-        pass: errors.length === 0,
-        errors,
-    };
-};
-const validateFactory = (schema) => {
-    const ajv = new Ajv__default["default"]({
-        // https://github.com/ajv-validator/ajv/issues/1417
-        strictTuples: false,
-        allowMatchingProperties: false,
-        schemas: [
-            allSchema,
-            appSchema,
-            modulesSchema,
-            frontendBaseSchema,
-            triggerSchema,
-            webtriggerSchema,
-            functionSchema,
-            customFieldSchema,
-            customFieldTypeSchema,
-            resourcesSchema,
-            tablesSchema,
-            localesSchema,
-        ],
-    });
-    AjvKeywords__default["default"](ajv);
-    return (json) => {
-        const validate = ajv.getSchema(schema);
-        const pass = validate === null || validate === void 0 ? void 0 : validate(json);
-        const errors = validate === null || validate === void 0 ? void 0 : validate.errors;
-        return {
-            pass,
-            errors: errors
-                ? lodash.map(errors, error => ({
-                    path: error.instancePath,
-                    message: error.message,
-                }))
-                : null,
-        };
-    };
-};
-const validateAll = (json) => {
-    const { pass: schemaPass, errors } = validateFactory('http://proxima.com/schemas/all.json')(json);
-    if (!schemaPass) {
-        return { pass: schemaPass, errors };
-    }
-    // 校验一下需要的引用是否存在
-    return validateResource(json);
-};
-validateFactory('http://proxima.com/schemas/app.json');
-validateFactory('http://proxima.com/schemas/modules/index.json');
-validateFactory('http://proxima.com/schemas/resources.json');
-validateFactory('http://proxima.com/schemas/tables.json');
-validateFactory('http://proxima.com/schemas/locales.json');
-
-class Manifest {
-    constructor(manifestString) {
-        this.manifest = yaml.parse(manifestString);
-        this.manifestString = manifestString;
-    }
-    get resources() {
-        return this.manifest.resources;
-    }
-    get app() {
-        return this.manifest.app;
-    }
-    get tables() {
-        return this.manifest.tables;
-    }
-    getManifest() {
-        return this.manifest;
-    }
-    getManifestString() {
-        return this.manifestString;
-    }
-    /**
-     * 获取所有自定义事项类型
-     */
-    getCustomItemType() {
-        const { modules } = this.manifest;
-        return modules.customItemType || [];
-    }
-    /**
-     * 获取所有自定义字段类型
-     */
-    getCustomFieldType() {
-        const { modules } = this.manifest;
-        return modules.customFieldType || [];
-    }
-    /**
-     * 获取所有自定义字段
-     */
-    getCustomField() {
-        const { modules } = this.manifest;
-        return modules.customField || [];
-    }
-    /**
-     * 根据key获取执行的function
-     * @param key
-     * @returns
-     */
-    getFunctionByKey(key) {
-        const functionKey = this.getFunctionKeyByKey(key);
-        if (functionKey) {
-            return this.getFunctionByFunctionKey(functionKey);
-        }
-    }
-    /**
-     * 根据functionKey获取执行的function
-     * @param functionKey
-     * @returns
-     */
-    getFunctionByFunctionKey(functionKey) {
-        var _a, _b;
-        return (_b = (_a = this.manifest.modules) === null || _a === void 0 ? void 0 : _a.function) === null || _b === void 0 ? void 0 : _b.find(f => f.key === functionKey);
-    }
-    /**
-     * 根据key获取执行的functionKey
-     * @param key
-     * @returns
-     */
-    getFunctionKeyByKey(key) {
-        var _a, _b, _c;
-        const { modules } = this.manifest;
-        for (const k in modules) {
-            if (k === 'function') {
-                continue;
-            }
-            else if (k === 'importer') {
-                // importer扩展点需要判断function和validate
-                if (key === ((_a = modules[k]) === null || _a === void 0 ? void 0 : _a.function) || key === ((_b = modules[k]) === null || _b === void 0 ? void 0 : _b.validate)) {
-                    return key;
-                }
-            }
-            else if (Array.isArray(modules[k])) {
-                const targetModule = (_c = modules[k]) === null || _c === void 0 ? void 0 : _c.find(v => v.key === key);
-                if (targetModule) {
-                    return targetModule.function;
-                }
-            }
-        }
-    }
-    /**
-     * 获取function下的文件列表
-     * @returns
-     */
-    getFunctionFiles() {
-        var _a, _b;
-        const fileNames = new Set();
-        (_b = (_a = this.manifest.modules) === null || _a === void 0 ? void 0 : _a.function) === null || _b === void 0 ? void 0 : _b.forEach(({ handler }) => {
-            const filename = handler.split('.')[0];
-            fileNames.add(filename);
-        });
-        return [...fileNames];
-    }
-    /**
-     * 校验manifest
-     * @returns
-     */
-    validate() {
-        return validateAll(this.getManifest());
-    }
-}
-
 const getManifest = async () => {
     const manifestFile = path__default["default"].resolve('manifest.yml');
     const strBuffer = await fse__default["default"].readFile(manifestFile);
-    return new Manifest(strBuffer.toString());
+    return new appsManifest.Manifest(strBuffer.toString());
 };
 
 var run$2 = async ({ outputDir, inputDir, prod, copyFiles, zip }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giteeteam/apps-cli",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Giteeteam Apps cli",
   "keywords": [
     "typescript",
@@ -38,9 +38,9 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@giteeteam/apps-manifest": "^0.2.1",
+    "@giteeteam/apps-manifest": "^0.3.0",
     "@rollup/plugin-commonjs": "^22.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-node-resolve": "13.3.0",
     "archiver": "^5.3.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",