@lcap/nasl 0.3.12-beta.1 → 0.3.12-beta.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "0.3.12-beta.1",
+  "version": "0.3.12-beta.4",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "dev": "tsc -watch -p ./",
@@ -38,6 +38,7 @@
     "module-alias": "^2.2.2",
     "qs": "^6.10.1",
     "request-pre": "^0.4.3",
+    "socket.io-client": "^2.4.0",
     "uuid": "^8.3.2",
     "vue-template-compiler": "^2.6.10"
   },

package/src/service/logic/checktypeSocket.js

@@ -0,0 +1,49 @@
+import io from 'socket.io-client';
+export const checkTypeClient = {
+    client: null,
+    connect: false,
+};
+
+export function createLogicSocketClient(appId) {
+    const client = io('/socket/ide/checktype', {
+        reconnectionDelayMax: 10000,
+        // reconnectionAttempts: 0,
+        path: '/socket/ide/checktype',
+        // query: {
+        //     id: appId,
+        //     type: 'app',
+        // },
+        transports: ['websocket'],
+        upgrade: true,
+        reconnection: true,
+        rejectUnauthorized: false,
+    });
+    let timeout;
+    return new Promise((resolve, reject) => {
+        client.on('connect', () => {
+            console.log('connect');
+            if (timeout) {
+                clearTimeout(timeout);
+            }
+            checkTypeClient.client = client;
+            checkTypeClient.connect = true;
+            resolve(client);
+        });
+        client.on('connect_error', (err) => {
+            console.log(err);
+            if (timeout) {
+                clearTimeout(timeout);
+            }
+            checkTypeClient.client = null;
+            checkTypeClient.connect = false;
+            reject();
+        });
+        timeout = setTimeout(() => {
+            console.log('timeout');
+            checkTypeClient.client = null;
+            checkTypeClient.connect = false;
+            reject();
+        }, 1000 * 10);
+    });
+}
+

package/src/service/logic/index.js

@@ -1,6 +1,7 @@
 import { createService } from '../create';
 import logicApi from './logic';
 import paramApi from './param';
+import { createLogicSocketClient, checkTypeClient } from './checktypeSocket';
 
 const logicService = createService(logicApi);
 const paramService = createService(paramApi);
@@ -8,4 +9,6 @@ const paramService = createService(paramApi);
 export {
     logicService,
     paramService,
+    createLogicSocketClient,
+    checkTypeClient,
 };

package/src/service/modules/api.js

@@ -0,0 +1,20 @@
+export default {
+    loadList: {
+        url: {
+            method: 'get',
+            path: '/api/v1/module/list',
+        },
+    },
+    add: {
+        url: {
+            method: 'post',
+            path: '/api/v1/module/add',
+        },
+    },
+    delete: {
+        url: {
+            method: 'delete',
+            path: '/api/v1/module/delete',
+        },
+    },
+};

package/src/service/modules/index.js

@@ -0,0 +1,6 @@
+import { createService } from '../create';
+import api from './api';
+
+const service = createService(api);
+
+export default service;

package/src/types/app/App.ts

@@ -1,5 +1,5 @@
 import { excludedInJSON, immutable } from '../decorators';
-import { LEVEL_ENUM, Vertex, Service, WebService, MicroService, SERVICE_TYPE, utils, History, updateGenericTypeList, vertexsMap, Entity, Structure, Enum, dataTypesMap, BaseVariable, variablesMap, updateDataTypeList } from '..';
+import { LEVEL_ENUM, Vertex, Service, WebService, MicroService, SERVICE_TYPE, utils, History, updateGenericTypeList, vertexsMap, Entity, Structure, Enum, dataTypesMap, BaseVariable, variablesMap, updateDataTypeList, Module } from '..';
 import appService from '../../service/app';
 
 interface AppLoadAllOptions {
@@ -112,6 +112,8 @@ export class App extends Vertex {
      */
     @immutable()
     public readonly firstMicroService: MicroService = undefined;
+    @immutable()
+    public modules: Module[] = [];
     /**
      * 历史记录
      * 用于处理撤销重做
@@ -174,6 +176,10 @@ export class App extends Vertex {
                 id: this.id,
             },
         });
+        const { status } = result || {};
+        if (['PULLING', 'PUSHING'].includes(status)) {
+            this.emit('updateIdeStatus', status);
+        }
         await this.loadEnvList(result);
         this.loadWebConfig(result);
         delete result.services;
@@ -266,7 +272,7 @@ export class App extends Vertex {
         asyncLoadServicesDetail: false,
         asyncLoadViewsDetail: false,
     }) {
-        await this.load();  // 请求其它接口前，需要先查询到 app 上的 baseVersion
+        await this.load(); // 请求其它接口前，需要先查询到 app 上的 baseVersion
         await Promise.all([
             this.loadServices(),
             updateGenericTypeList(),
@@ -319,6 +325,15 @@ export class App extends Vertex {
         });
         updateDataTypeList();
     }
+    getModule(moduleName: string) {
+        const { modules } = this;
+        let module = modules.find((m) => m.name === moduleName);
+        if(module) return module;
+
+        module = new Module({ name: moduleName });
+        modules.push(module);
+        return module;
+    }
 }
 
 export default App;

package/src/types/app/Service.ts

@@ -109,10 +109,16 @@ export class Service extends Vertex {
                 id: this.id,
             },
         });
+
         const structures: Array<Structure> = [];
         structuresOrigin.forEach((item) => {
             const structureNode = Structure.from(item, this);
-            if (structureNode.serviceType === 'external' && structureNode.category) {
+            if (structureNode.moduleName) {
+                const module = this.app.getModule(structureNode.moduleName);
+                const isHave = module.structures.some((it:any) => it.id === item.id);
+                if (!isHave)
+                    module.structures.push(structureNode);
+            } else if (structureNode.serviceType === 'external' && structureNode.category) {
                 this.globalLogic.addCategoryStructure(structureNode);
             } else {
                 structures.push(structureNode);
@@ -685,7 +691,18 @@ export class MicroService extends Service {
 
         updateDataTypeList();
 
-        this.data.assign({ enums });
+        const globalEnums: Enum[] = [];
+        for (const e of enums) {
+            if (e.moduleName) {
+                const module = this.app.getModule(e.moduleName);
+                module.enums.push(e);
+            } else
+                globalEnums.push(e);
+        }
+
+        this.data.assign({
+            enums: globalEnums,
+        });
         return enums;
     }
     /**
@@ -804,7 +821,6 @@ export class MicroService extends Service {
                 IdeVersion: 2.3,
             },
         });
-
         interfaces = interfaces.map((item) => {
             if (logicMap.has(item.id)) {
                 item.logic = logicMap.get(item.id);
@@ -827,6 +843,7 @@ export class MicroService extends Service {
         this.assign({ interfaces });
         this.mountResolverOnEntity();
         this.mountResolverOnInterface();
+        this.mountOnModule();
         // this.generateLogics();
         return interfaces;
     }
@@ -839,7 +856,8 @@ export class MicroService extends Service {
                     const entity = Entity.getVertexByRef(item.logic.entityId) as Entity;
                     if (entity)
                         entity.assign({ resolvers: entity.resolvers || [] });
-                    const resolverName = RESOLVER_NAMES.find((name) => item.name.startsWith(name));
+                    // Bug-34673: 兼容实体名称包含 All/Delete/Create/Update 导致 RESOLVER_NAMES 误判情况
+                    const resolverName = RESOLVER_NAMES.find((name) => item.name === `${name}${entity.name}` || item.name === `${name}${entity.name}s`);
                     if (entity) {
                         const exist = entity.resolvers.find((r) => r.name === resolverName);
                         if (exist) {
@@ -874,6 +892,9 @@ export class MicroService extends Service {
         // const categoryInterfaceMap = {};
         // const categoryProccessMap = {};
         this.interfaces.forEach((item) => {
+            if (item.logic?.moduleName)
+                return;
+
             if (item.serviceType === 'micro') {
                 globalLogics.push(item);
             } else if (item.serviceType === 'external') {
@@ -914,6 +935,20 @@ export class MicroService extends Service {
         this.globalLogic.assign({ globalLogics, interfaces });
     }
 
+    mountOnModule() {
+        const { interfaces } = this;
+
+        for (const item of interfaces) {
+            const logic = item.logic;
+            if (logic.moduleName) {
+                const module = this.app.getModule(logic.moduleName);
+                const isHave = module.globalLogics.some((it:any) => it.id === item.id);
+                if (!isHave)
+                    module.globalLogics.push(item);
+            }
+        }
+    }
+
     private _onDataTypesChange() {
         config.webFileCache && generator.saveDataTypesCache(this.app);
     }

package/src/types/data/Entity.ts

@@ -334,16 +334,27 @@ export class Entity extends Vertex implements ObjectSchema {
         this.dataNode.service.emit('vertexIdToNameChange', this.id, this.name);
     }
     /**
-     * 设置实体描述
-     * @param description 描述
+     * 设置实体表名
+     * @param tableName 表名
      */
-    @action('设置实体描述')
-    async setDescription(description: string) {
-        this.assign({ description });
+     @action('设置实体表名')
+    async setTableName(tableName: string) {
+        this.assign({ tableName });
         await this.update(undefined, {
-            actionDesc: `设置实体"${this.name}"的描述为"${description}"`,
+            actionDesc: `设置实体"${this.name}"的表名为"${tableName}"`,
         });
     }
+    /**
+     * 设置实体描述
+     * @param description 描述
+     */
+    @action('设置实体描述')
+     async setDescription(description: string) {
+         this.assign({ description });
+         await this.update(undefined, {
+             actionDesc: `设置实体"${this.name}"的描述为"${description}"`,
+         });
+     }
     /**
      * 同步interfaces
      * interface、logic、params、returns、variabes采用plainAssign

package/src/types/data/Enum.ts

@@ -80,6 +80,11 @@ export class Enum extends Vertex {
 
     @excludedInJSON()
     public existingNames: Array<string> = [];
+    /**
+     * 归属的模块
+     */
+        @immutable()
+        public readonly moduleName: string = undefined;
     /**
      * @param source 需要合并的部分参数
      */

package/src/types/data/Module.ts

@@ -0,0 +1,51 @@
+import { immutable, circular } from '../decorators';
+import {
+    LEVEL_ENUM, Vertex,
+    Interface, Structure, Enum, App,
+} from '..';
+
+export interface Category {
+    level: LEVEL_ENUM.category;
+    name: string;
+    categoryInterfaces: Array<Interface>;
+    categoryStructures: Array<Structure>;
+    isLeaf: false;
+    structureExpanded: false;
+    interfaceExpanded: false;
+}
+/**
+ * 数据分类
+ */
+export class Module extends Vertex {
+    /**
+     * 模块名
+     */
+    @immutable()
+    public readonly name: string = '';
+    @immutable()
+    public readonly level: LEVEL_ENUM = LEVEL_ENUM.module;
+
+    @immutable()
+    public globalLogics: Array<Interface> = [];
+    public structures: Array<Structure> = [];
+    public enums: Array<Enum> = [];
+
+    public structureExpanded: Boolean = false;
+    public enumExpanded: Boolean = false;
+    public globalLogicExpanded: Boolean = false;
+    public structureHidden: Boolean = false;
+    public enumHidden: Boolean = false;
+
+    @circular()
+    @immutable()
+    public readonly app: App = undefined;
+    /**
+     * @param source 需要合并的部分参数
+     */
+    constructor(source?: Partial<Module>) {
+        super();
+        source && this.assign(source);
+    }
+}
+
+export default Module;

package/src/types/data/Structure.ts

@@ -86,6 +86,11 @@ export class Structure extends Vertex implements ObjectSchema {
      */
     @excludedInJSON()
     public existingNames: Array<string> = [];
+    /**
+     * 归属的模块
+     */
+    @immutable()
+    public readonly moduleName: string = undefined;
     /**
      * 周边存在的名称
      */

package/src/types/data/dataTypes.ts

@@ -20,12 +20,32 @@ export const dataTypesMap: { [name: string]: Schema } = {
 };
 
 export function updateDataTypeList() {
-    dataTypeList[1].children = Object.keys(dataTypesMap)
+    const typeMap: any = {};
+    Object.keys(dataTypesMap)
         .filter((key) => !key.includes('#/basicTypes') && !key.includes('#/systemTypes') && !key.includes('#/genericTypes'))
-        .map((key) => {
-            const dataType = dataTypesMap[key];
-            return { kind: (dataType as any).level, text: dataType.name, value: key };
+        .forEach((key) => {
+            const { level, name, createdTime }: any = dataTypesMap[key];
+            // 数据分类
+            if (!typeMap[level]) {
+                typeMap[level] = [];
+            }
+
+            typeMap[level].push({ kind: level, text: name, value: key, createdTime });
+        });
+
+    // 实体按创建时间排序
+    if (typeMap.entity) {
+        typeMap.entity.sort((a: any, b: any) => {
+            // 刚创建的实体createdTime没有值。。。
+            if (!a.createdTime) {
+                return -1;
+            }
+            return b.createdTime - a.createdTime;
         });
+    }
+
+    const children = Object.keys(typeMap).reduce((result, type) => result.concat(typeMap[type]), []);
+    dataTypeList[1].children = children;
 }
 
 export function properties2PropertyList(definition: any) {

package/src/types/data/genBlock/index.ts

@@ -10,11 +10,9 @@ export * from './genGetBlock';
 export * from './genCreateBlock';
 export * from './genUpdateBlock';
 export * from './genSelectBlock';
-export * from './genCurdBlock';
 export * from './genListViewBlock';
 export * from './genGridViewBlock';
 export * from './genEditTableBlock';
-export * from './genCurdEditTableBlock';
 export * from './genCurdMultipleKeyBlock';
 export * from './genCurdEditMultipleKeyBlock';
 

package/src/types/data/systemTypes.ts

@@ -24,6 +24,7 @@ export const systemTypeList = [
     { kind: 'systemType', text: 'UploadErrorEvent', value: '#/systemTypes/UploadErrorEvent' },
     { kind: 'systemType', text: 'SortEvent', value: '#/systemTypes/SortEvent' },
     { kind: 'systemType', text: 'PoiInfo', value: '#/systemTypes/PoiInfo' },
+    { kind: 'systemType', text: 'File', value: '#/systemTypes/File' },
 ];
 
 export const systemTypeMap: { [name: string]: ObjectSchema } = {
@@ -417,6 +418,27 @@ export const systemTypeMap: { [name: string]: ObjectSchema } = {
                 description: '选择项相关对象',
                 isLeaf: true,
             },
+            {
+                type: 'genericType',
+                typeKey: '#/genericTypes/List',
+                typeInstantiation: {
+                    typeName: 'List',
+                    typeParams: [
+                        {
+                            type: 'typeParam',
+                            typeParamName: 'T',
+                            typeParamValue: {
+                                typeKey: '#/basicTypes/String',
+                                type: 'string',
+                                format: '',
+                            },
+                        },
+                    ],
+                },
+                name: 'items',
+                description: '所有选中项相关对象的数组',
+                isLeaf: true,
+            },
             {
                 typeKey: '#/basicTypes/String',
                 type: 'string',
@@ -1311,6 +1333,27 @@ export const systemTypeMap: { [name: string]: ObjectSchema } = {
                 description: '选择项相关对象',
                 isLeaf: true,
             },
+            {
+                type: 'genericType',
+                typeKey: '#/genericTypes/List',
+                typeInstantiation: {
+                    typeName: 'List',
+                    typeParams: [
+                        {
+                            type: 'typeParam',
+                            typeParamName: 'T',
+                            typeParamValue: {
+                                typeKey: '#/basicTypes/String',
+                                type: 'string',
+                                format: '',
+                            },
+                        },
+                    ],
+                },
+                name: 'items',
+                description: '所有选中项相关对象的数组',
+                isLeaf: true,
+            },
         ],
     },
     '#/systemTypes/UploadEvent': {
@@ -1559,4 +1602,34 @@ export const systemTypeMap: { [name: string]: ObjectSchema } = {
             },
         ],
     },
+    '#/systemTypes/File': {
+        name: 'File',
+        type: 'object',
+        propertyList: [
+            {
+                typeKey: '#/basicTypes/String',
+                type: 'string',
+                format: '',
+                name: 'name',
+                description: '文件名称',
+                isLeaf: true,
+            },
+            {
+                typeKey: '#/basicTypes/Integer',
+                type: 'integer',
+                format: 'int',
+                name: 'size',
+                description: '文件大小',
+                isLeaf: true,
+            },
+            {
+                typeKey: '#/basicTypes/String',
+                type: 'string',
+                format: '',
+                name: 'type',
+                description: '文件类型',
+                isLeaf: true,
+            },
+        ],
+    },
 };

package/src/types/index.ts

@@ -9,6 +9,7 @@ export { Service, WebService, MicroService, SERVICE_TYPE } from './app/Service';
 
 export { DataNode } from './data/DataNode';
 export { GlobalLogicNode } from './data/GlobalLogicNode';
+export { Module } from './data/Module';
 export { Entity, systemProperty } from './data/Entity';
 export { EntityProperty } from './data/EntityProperty';
 export { EntityIndex } from './data/EntityIndex';
@@ -84,6 +85,7 @@ export enum LEVEL_ENUM {
     dataNode = 'dataNode',
     gloablLogicNode = 'gloablLogicNode',
     category = 'category',
+    module = 'module',
     entity = 'entity',
     structure = 'structure',
     enum = 'enum',

package/src/types/logic/Logic.ts

@@ -144,6 +144,11 @@ export class Logic extends Vertex {
      */
     @immutable()
     public readonly moreChildrenFields: Array<string> = ['params', 'returns', 'variables'];
+    /**
+     * 归属的模块
+     */
+    @immutable()
+    public readonly moduleName: string = undefined;
     /**
      * @param source 需要合并的部分参数
      */

package/src/types/logic/LogicItem.ts

@@ -1,6 +1,6 @@
 import { immutable, excludedInJSON, action } from '../decorators';
 import { config, typeCheck, utils, Vertex, LEVEL_ENUM, Logic, Schema, ActionOptions, ACTION_MODE } from '..';
-import { logicService } from '../../service/logic';
+import { logicService, checkTypeClient } from '../../service/logic';
 import { traverse } from '../utils';
 import { vertexsMap } from '../cacheData';
 import { getSchemaOfExpressionNode } from './tools';
@@ -1051,20 +1051,28 @@ export class LogicItem extends Vertex {
     }
 
     private async _checkType(node: LogicItem) {
-        const res = await logicService.checkType({
-            query: {
+        if (checkTypeClient.connect) { 
+            checkTypeClient.client.emit('checktype', {
+                id: node.id,
+                type: 'logicItem',
                 logicId: this.logic && this.logic.id,
-                loItemId: node.id,
-            },
-        });
-        if (res) {
-            res.logicId = this.logic && this.logic.id;
-            typeCheck.pushAll([res]);
-
-            LogicItem.assignTypeCheckResult(node, res);
+                appId: config.defaultApp?.id,
+            });
         }
-
-        return res;
+        // const res = await logicService.checkType({
+        //     query: {
+        //         logicId: this.logic && this.logic.id,
+        //         loItemId: node.id,
+        //     },
+        // });
+        // if (res) {
+        //     res.logicId = this.logic && this.logic.id;
+        //     typeCheck.pushAll([res]);
+
+        //     LogicItem.assignTypeCheckResult(node, res);
+        // }
+
+        // return res;
     }
 
     static assignTypeCheckResult(logicItem: LogicItem | LogicItem[], typeCheckResult: any) {

package/src/types/logic/Param.ts

@@ -96,7 +96,7 @@ export class Param extends BaseVariable {
         config.defaultApp?.emit('saved');
 
         // 更新所有调用此Logic的LogicItem
-        // await this.logic.callLogicUpdate();
+        await this.logic.callLogicUpdate();
         return this;
     }
     /**