@giteeteam/apps-cli 0.3.2 → 0.4.0

package/dist/index.js

@@ -3,12 +3,19 @@
 
 require('dotenv/config');
 var commander = require('commander');
-var appsBundler = require('@giteeteam/apps-bundler');
 var fse = require('fs-extra');
 var path = require('path');
 var archiver = require('archiver');
+var rollup = require('rollup');
+var fs = require('fs');
+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 inquirer = require('inquirer');
 var simpleGit = require('simple-git');
 var chalk = require('chalk');
@@ -22,7 +29,11 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var fse__default = /*#__PURE__*/_interopDefaultLegacy(fse);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 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);
@@ -30,7 +41,7 @@ var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
 var child_process__default = /*#__PURE__*/_interopDefaultLegacy(child_process);
 var chokidar__default = /*#__PURE__*/_interopDefaultLegacy(chokidar);
 
-var version = "0.3.2";
+var version = "0.4.0";
 
 const packageApp = async ({ outputDir, manifest, copyFiles }) => {
     const { resources } = manifest;
@@ -89,11 +100,98 @@ const archiveApp = async (archiveDir, pkgName) => {
     });
 };
 
+const defaultOptions = {
+    treeShaking: true,
+    format: 'esm',
+    loader: 'tsx',
+};
+function esbuild(options) {
+    options = { ...defaultOptions, ...options };
+    return {
+        name: 'esbuild',
+        resolveId(source, importer, opts) {
+            // console.log('resolveId:');
+            // console.dir({ source, importer, opts }, { depth: null });
+            if (!importer || ['.ts', '.tsx', '.js', '.jsx'].some(ext => source.endsWith(ext))) {
+                return source;
+            }
+            const dirPath = path.dirname(importer);
+            let path$1;
+            if (fs.existsSync((path$1 = path.resolve(dirPath, source, 'index.ts')))) {
+                return path$1;
+            }
+            else if (fs.existsSync((path$1 = path.resolve(dirPath, source, 'index.tsx')))) {
+                return path$1;
+            }
+            else if (fs.existsSync((path$1 = path.resolve(dirPath, source + '.ts')))) {
+                return path$1;
+            }
+            else if (fs.existsSync((path$1 = path.resolve(dirPath, source + '.tsx')))) {
+                return path$1;
+            }
+            else {
+                console.error({ source, importer, options: opts });
+                path$1 = path.relative('.', path.resolve(importer, source));
+                throw new Error(`ENOENT: ${path$1.replace(/\\/g, '/')}`);
+            }
+        },
+        async transform(src, id) {
+            options.sourcefile = id;
+            const { code, map } = await esbuild$1.transform(src, options);
+            if (!map)
+                return code;
+            return { code, map };
+        },
+    };
+}
+
+var MODE;
+(function (MODE) {
+    MODE["DEV"] = "development";
+    MODE["PROD"] = "production";
+})(MODE || (MODE = {}));
+function getRollupOptions(input, outputFile, mode = MODE.DEV) {
+    const plugins = [pluginNodeResolve.nodeResolve(), commonjs__default["default"]()];
+    plugins.push(esbuild({
+        sourcemap: mode === MODE.DEV,
+        minify: mode !== MODE.DEV,
+        target: 'es2018',
+        jsx: 'transform',
+        jsxFactory: 'AppsUI.createElement',
+        jsxFragment: 'AppsUI.Fragment',
+    }));
+    const inputOptions = {
+        input,
+        plugins,
+    };
+    const outputOptions = {
+        file: outputFile,
+        format: 'es',
+        sourcemap: mode === MODE.DEV,
+    };
+    return { inputOptions, outputOptions };
+}
+async function bundle(opts) {
+    const { fileName, inputDir, outputDir, mode = MODE.DEV } = opts;
+    const input = path__default["default"].join(inputDir, `${fileName}.ts`);
+    try {
+        await fs__default["default"].promises.access(input);
+    }
+    catch (e) {
+        console.error(`${input} is not exist`);
+        return;
+    }
+    const outputFile = path__default["default"].join(outputDir, `${fileName}.js`);
+    const { inputOptions, outputOptions } = getRollupOptions(input, outputFile, mode);
+    const build = await rollup.rollup(inputOptions);
+    await build.write(outputOptions);
+}
+
 const bundleApp = async (opts) => {
     const { manifest, mode, outputDir, inputDir } = opts;
     const functionFiles = manifest.getFunctionFiles();
     const bundlePromise = functionFiles.map(async (fileName) => {
-        await appsBundler.bundle({
+        await bundle({
             inputDir,
             fileName,
             outputDir,
@@ -116,6 +214,635 @@ 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);
@@ -216,6 +943,13 @@ class Manifest {
         });
         return [...fileNames];
     }
+    /**
+     * 校验manifest
+     * @returns
+     */
+    validate() {
+        return validateAll(this.getManifest());
+    }
 }
 
 const getManifest = async () => {
@@ -242,7 +976,7 @@ var run$2 = async ({ outputDir, inputDir, prod, copyFiles, zip }) => {
         start: 'start bundle',
         error: 'bundle failed',
         succeed: 'bundle success',
-    }, () => bundleApp({ outputDir, inputDir, manifest, mode: prod ? appsBundler.MODE.PROD : appsBundler.MODE.DEV }));
+    }, () => bundleApp({ outputDir, inputDir, manifest, mode: prod ? MODE.PROD : MODE.DEV }));
     // package
     await execActionWithSpinner({
         start: 'start package',
@@ -495,11 +1229,11 @@ class DockerService {
 
 const build = (functionFiles, inputDir, outputDir) => {
     for (const fileName of functionFiles) {
-        appsBundler.bundle({
+        bundle({
             inputDir,
             outputDir,
             fileName,
-            mode: appsBundler.MODE.DEV,
+            mode: MODE.DEV,
         });
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giteeteam/apps-cli",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "Giteeteam Apps cli",
   "keywords": [
     "typescript",
@@ -27,6 +27,7 @@
     "dev": "tsc -w",
     "build": "rm -rf dist && rollup -c",
     "prepublish": "pnpm build",
+    "prepack": "pnpm build",
     "unlink": "yarn unlink",
     "link": "chmod +x ./dist/index.js && yarn link && yarn link '@giteeteam/apps-cli' -g",
     "build-link": "pnpm build && yarn run link"
@@ -37,25 +38,29 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@giteeteam/apps-bundler": "^0.2.3",
     "@giteeteam/apps-manifest": "^0.2.1",
+    "@rollup/plugin-commonjs": "^22.0.0",
+    "@rollup/plugin-node-resolve": "^15.0.1",
     "archiver": "^5.3.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
     "commander": "^9.3.0",
     "dotenv": "^16.0.2",
+    "esbuild": "^0.16.11",
     "execa": "^5.1.1",
     "fs-extra": "^10.1.0",
     "inquirer": "^8.2.4",
     "ora": "^5.4.1",
+    "rollup": "^2.79.0",
     "simple-git": "^3.7.1",
     "yaml": "^2.1.1"
   },
   "devDependencies": {
+    "@rollup/plugin-json": "^6.0.0",
     "@types/archiver": "^5.3.1",
     "@types/fs-extra": "^9.0.13",
     "@types/inquirer": "^8.2.1",
-    "@types/uuid": "^8.3.4"
-  },
-  "gitHead": "d93f769e76519925ce83d4bc71defcfdd3eee085"
+    "@types/uuid": "^8.3.4",
+    "rollup-plugin-typescript2": "^0.31.2"
+  }
 }