@opentapd/tplugin-cli 0.51.1-alpha.0 → 0.52.1-alpha.0

package/lib/lint.js

@@ -11,6 +11,117 @@ const yaml = require('js-yaml');
 const spinner = require('../util/spinner');
 const tapdsdk = require('../util/tapd');
 const checkPluginYaml = require('../util/checkPluginYaml');
+const Joi = require('joi');
+
+const schema = Joi.object({
+  app: {
+    code: Joi.string(),
+    desc: Joi.string(),
+    name: Joi.string(),
+    resources: Joi.array(),
+    scopes: Joi.array().items(Joi.string()),
+    tag: Joi.array().items({ name: Joi.string() }),
+    modules: {
+      autotasks: Joi.array().items({
+        code: Joi.string().required(),
+        conditions: Joi.array().items({
+          code: Joi.string().required(),
+          data: {
+            handler: Joi.string().required(),
+          },
+          icon: Joi.string().required(),
+          name: Joi.string().required(),
+          option: {
+            handler: Joi.string().required(),
+          },
+          related: Joi.array().items(Joi.string()),
+          type: Joi.string(),
+          desc: Joi.string(),
+        })
+          .unique('code'),
+        executors: {
+          actions: Joi.array().items({
+            code: Joi.string(),
+            desc: Joi.string(),
+            exec: {
+              handler: Joi.string(),
+            },
+            icon: Joi.string(),
+            name: Joi.string(),
+            option: {
+              handler: Joi.string(),
+            },
+            related: Joi.array().items(Joi.string()),
+          }),
+        },
+        icon: Joi.string(),
+        name: Joi.string(),
+        search: {
+          handler: Joi.string(),
+        },
+        trigger: {
+          events: Joi.array().items({
+            code: Joi.string(),
+            desc: Joi.string(),
+            event_change: {
+              handler: Joi.string(),
+            },
+            icon: Joi.string(),
+            name: Joi.string(),
+            option: {
+              handler: Joi.string(),
+            },
+            related: Joi.array().items(Joi.string()),
+          }),
+        },
+      })
+        .unique('code'),
+      object: Joi.array().items({
+        code: Joi.string().required(),
+        fields: {
+          handler: Joi.string().required(),
+        },
+        getter: {
+          handler: Joi.string().required(),
+        },
+        name: Joi.string().required(),
+        relations: Joi.array().items({
+          code: Joi.string().required(),
+          handler: Joi.string().required(),
+          related: Joi.string(),
+          type: Joi.string(),
+        })
+          .unique('code'),
+      })
+        .unique('code'),
+    },
+    fields: Joi.array().items({
+      code: Joi.string().required(),
+      name: Joi.string(),
+      desc: Joi.string(),
+      option: Joi.array().items({
+        value: Joi.string().required(),
+        name: Joi.string().required(),
+      })
+        .unique('value'),
+      related: Joi.array().items(Joi.string()
+        .valid('story', 'bug', 'task')),
+      type: Joi.string().valid(
+        'text',
+        'multi_select',
+        'select',
+        'checkbox',
+        'radio',
+        'textarea',
+        'cascade_radio',
+        'cascade_checkbox',
+      )
+        .required(),
+      validate: Joi.string(),
+    })
+      .unique('code'),
+  },
+});
 
 // 检查插件格式
 module.exports = async () => {
@@ -20,9 +131,18 @@ module.exports = async () => {
   spinner.start('开始校验plugin.yaml...');
   const yamlPath = `${process.cwd()}/plugin.yaml`;
 
-  const docObj = yaml.load(fs.readFileSync(yamlPath, 'utf8'));
+  const yamlFile = fs.readFileSync(yamlPath, 'utf8');
+  const docObj = yaml.load(yamlFile);
   const doc = yaml.dump(docObj);
 
+  const yamlInJSON = yaml.load(yamlFile, { json: true });
+
+  const { error } = schema.validate(yamlInJSON);
+  if (error) {
+    error.title = 'plugin.yaml校验不通过';
+    throw error;
+  }
+
   // 发起lint，远程校验文件配置内容
   const res = await lint(doc);
 

package/lib/resources.js

@@ -178,6 +178,12 @@ function filterResourcesConfigs(docObj, entranceTmpl) {
   let resourcesConfigs = docObj.app.resources || [];
   const resourcesKey = []; const tagKey = {};
 
+  const notSupportedMultiEntrance = {
+    app_for_setting: true,
+    app_for_project: true,
+    app_for_devops_setting: true,
+  };
+
   // 合并添加的配置信息
   resourcesConfigs = resourcesConfigs.concat(entranceTmpl.resourcesConfigs);
   resourcesConfigs = resourcesConfigs.filter((resources) => {
@@ -191,8 +197,11 @@ function filterResourcesConfigs(docObj, entranceTmpl) {
       return true;
     }
 
-    // 存在重复时，直接过滤
-    return false;
+    if (notSupportedMultiEntrance[resources.key]) {
+      return false;
+    }
+
+    return true;
   });
 
   return resourcesConfigs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentapd/tplugin-cli",
-  "version": "0.51.1-alpha.0",
+  "version": "0.52.1-alpha.0",
   "description": "tplugin-cli",
   "bin": {
     "tplugin-cli": "index.js"
@@ -26,7 +26,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@opentapd/tplugin-core": "^1.34.0",
+    "@opentapd/tplugin-core": "^1.34.1-alpha.0",
     "address": "^1.2.2",
     "archiver": "^5.3.1",
     "axios": "^0.21.1",
@@ -39,6 +39,7 @@
     "fs-extra": "^10.0.0",
     "get-port": "^5.1.1",
     "inquirer": "^8.1.2",
+    "joi": "^17.13.3",
     "js-base64": "^3.6.1",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.0",
@@ -78,5 +79,5 @@
     "node": ">=14.13.0"
   },
   "main": "index.js",
-  "gitHead": "90dd370b45c1d1c15f0a268e2e51dc35c4ed82b9"
+  "gitHead": "db777408d9ddd4efb4802b19a623b81327f1340c"
 }