@lcap/nasl 1.0.0-alpha.2 → 1.0.0-alpha.5

package/src/server/translator.ts

@@ -1,3 +1,4 @@
+import naslServer from "./naslServer";
 export function transformType(tsType: string): string {
     if (tsType === 'string' || tsType === 'String')
         return '字符串';
@@ -7,10 +8,23 @@ export function transformType(tsType: string): string {
         return '小数';
     else if (tsType === 'Long')
         return '长整数';
+    else if (tsType === 'DateTime')
+        return '日期时间';
+    else if (tsType === 'Date')
+        return '时间';
+    else if (tsType === 'Time')
+        return '日期';
     else if (tsType === 'boolean' || tsType === 'Boolean')
         return '布尔值';
     else if (tsType.endsWith('[]')) {
         return `List<${transformType(tsType.slice(0, -2))}>`;
+    } else if (tsType.startsWith('<T extends ') && tsType.endsWith('>() => T')) {
+        const types = naslServer.getDisplayString2Type(tsType);
+        let tsStr = '';
+        types.forEach((item, index) => {
+            tsStr += index === 0 ? transformType(item) : ' | ' + transformType(item);
+        });
+        return tsStr;
     } else {
         return tsType;
     }
@@ -40,103 +54,113 @@ export function translateDiagnosticMessage(message: string) {
         result: string,
         transforms?: Array<(str: string) => string>,
     }> = [
-        {
-            re: /^Type '(.+?)' is not assignable to type '(.+?)'\./,
-            result: '左右参数类型不一致！左边类型：$2，右边类型：$1。',
-            transforms: [transformType, transformType],
-        },
-        {
-            re: /^Argument of type '(.+?)' is not assignable to parameter of type '(.+?)'\./,
-            result: '参数类型不一致！传入类型：$1，接收类型：$2。',
-            transforms: [transformType, transformType],
-        },
-        {
-            re: /^This condition will always return 'false' since the types '(.+?)' and '(.+?)' have no overlap\.$/,
-            result: '参数类型不匹配！左边类型：$1，右边类型：$2。',
-            transforms: [transformType, transformType],
-        },
-        {
-            re: /^Type '(.+?)' is missing the following properties from type '(.+?)'/,
-            result: '类型不匹配！左边类型：$1，右边类型：$2。',
-            transforms: [transformType, transformType],
-        },
-        {
-            re: /^Expression expected\.$/,
-            result: '表达式不能为空。',
-        },
-        {
-            re: /^Cannot find name '__(?:IDENTIFIER|LEFT|RIGHT)__'\.$/,
-            result: '表达式不能为空。',
-        },
-        {
-            re: /^Cannot find name '__(?:QueryFieldExpression)__'\.$/,
-            result: '实体字段不能为空。',
-        },
-        {
-            re: /^Cannot find name '__(?:WHERE_MULTIPLE_CONDITION)__'\.$/,
-            result: '筛选条件不能有多个表达式。',
-        },
-        {
-            re: /^Cannot find name '__(?:HAVING_MULTIPLE_CONDITION)__'\.$/,
-            result: '聚合属性过滤不能有多个表达式。',
-        },
-        {
-            re: /^Cannot find name '__(?:EMPTY_AGGREGATE_NAME)__'\.$/,
-            result: '聚合函数名称不能为空。',
-        },
-        {
-            re: /^Cannot find name '__(?:EMPTY_AGGREGATE_ALIAS)__'\.$/,
-            result: '聚合函数别名不能为空。',
-        },
-        {
-            re: /^'(.+?)' is declared but its value is never read\.$/,
-            result: "已添加'$1'，但从来没有使用过。",
-            transforms: [transformType, transformType],
-        },
-        {
-            re: /'(.+?)' has no exported member(?: named)? '(.+?)'/,
-            result: "找不到数据结构 '$2'。",
-            transforms: [transformType, transformNamespace],
-        },
-        {
-            re: /^Unreachable code detected\.$/,
-            result: '逻辑中有未使用的。',
-        },
-        {
-            re: /Property '(.+?)' does not exist on type 'typeof (.+?)'./,
-            result: '$2上找不到$1',
-            transforms: [transformMethod, transformType],
-        },
-        {
-            re: /Property '(.+?)' does not exist on type '(.+?)'./,
-            result: '$2上找不到$1',
-            transforms: [transformMethod, transformType],
-        },
-        {
-            re: /Cannot find name '(.+?)'. Did you mean '(.+?)'\?/,
-            result: '没有$1,您可以换成$2',
-            transforms: [outOriginalvalue, outOriginalvalue],
-        },
-        {
-            re: /Expected (.+?) arguments, but got (.+?)./,
-            result: '预期$1个参数,但得到$2个',
-            transforms: [outOriginalvalue, outOriginalvalue],
-        },
-        {
-            re: /The (.+?)-hand side of an arithmetic operation must be of type (.+?). type./,
-            result: '表达式错误',
-            transforms: [outOriginalvalue, outOriginalvalue],
-        },
-        {
-            re: /Operator '(.+?)' cannot be applied to types '(.+?)' and '(.+?)'./,
-            result: '符号$1左右类型不同,左侧$2,右侧$3',
-            transforms: [outOriginalvalue, transformType, transformType],
-        },
-        {
-            re: /Object is possibly 'undefined'./,
-            result: '所选择的内容未定义',
-        },
-    ];
+            {
+                re: /^Type '(.+?)' is not assignable to type '(.+?)'\./,
+                result: '左右参数类型不一致！左边类型：$2，右边类型：$1。',
+                transforms: [transformType, transformType],
+            },
+            {
+                re: /^Argument of type '(.+?)' is not assignable to parameter of type '(.+?)'\./,
+                result: '参数类型不一致！传入类型：$1，接收类型：$2。',
+                transforms: [transformType, transformType],
+            },
+            {
+                re: /^This condition will always return 'false' since the types '(.+?)' and '(.+?)' have no overlap\.$/,
+                result: '参数类型不匹配！左边类型：$1，右边类型：$2。',
+                transforms: [transformType, transformType],
+            },
+            {
+                re: /^Type '(.+?)' is missing the following properties from type '(.+?)'/,
+                result: '类型不匹配！左边类型：$1，右边类型：$2。',
+                transforms: [transformType, transformType],
+            },
+            {
+                re: /^Expression expected\.$/,
+                result: '表达式不能为空。',
+            },
+            {
+                re: /^Cannot find name '__(?:IDENTIFIER|LEFT|RIGHT)__'\.$/,
+                result: '表达式不能为空。',
+            },
+            {
+                re: /^Cannot find name '__(?:QueryFieldExpression)__'\.$/,
+                result: '实体字段不能为空。',
+            },
+            {
+                re: /^Cannot find name '__(?:WHERE_MULTIPLE_CONDITION)__'\.$/,
+                result: '筛选条件不能有多个表达式。',
+            },
+            {
+                re: /^Cannot find name '__(?:HAVING_MULTIPLE_CONDITION)__'\.$/,
+                result: '聚合属性过滤不能有多个表达式。',
+            },
+            {
+                re: /^Cannot find name '__(?:EMPTY_AGGREGATE_NAME)__'\.$/,
+                result: '聚合函数名称不能为空。',
+            },
+            {
+                re: /^Cannot find name '__(?:EMPTY_AGGREGATE_ALIAS)__'\.$/,
+                result: '聚合函数别名不能为空。',
+            },
+            {
+                re: /^'(.+?)' is declared but its value is never read\.$/,
+                result: "已添加'$1'，但从来没有使用过。",
+                transforms: [transformType, transformType],
+            },
+            {
+                re: /'(.+?)' has no exported member(?: named)? '(.+?)'/,
+                result: "找不到数据结构 '$2'。",
+                transforms: [transformType, transformNamespace],
+            },
+            {
+                re: /^Unreachable code detected\.$/,
+                result: '逻辑中有未使用的。',
+            },
+            {
+                re: /Property '__slice' does not exist on type '(.+?)'./,
+                result: 'For Each：循环列表：参数类型不匹配！所需类型：基础类型>字符串、数组、集合等，提供类型：$1',
+                transforms: [transformType],
+            },
+            {
+                re: /Property '(.+?)' does not exist on type 'typeof logics'./,
+                result: '当前逻辑$1未找到',
+                transforms: [outOriginalvalue],
+            },
+            {
+                re: /Property '(.+?)' does not exist on type 'typeof (.+?)'./,
+                result: '$2上找不到$1',
+                transforms: [transformMethod, transformType],
+            },
+            {
+                re: /Property '(.+?)' does not exist on type '(.+?)'./,
+                result: '$2上找不到$1',
+                transforms: [transformMethod, transformType],
+            },
+            {
+                re: /Cannot find name '(.+?)'. Did you mean '(.+?)'\?/,
+                result: '没有$1,您可以换成$2',
+                transforms: [outOriginalvalue, outOriginalvalue],
+            },
+            {
+                re: /Expected (.+?) arguments, but got (.+?)./,
+                result: '预期$1个参数,但得到$2个',
+                transforms: [outOriginalvalue, outOriginalvalue],
+            },
+            {
+                re: /The (.+?)-hand side of an arithmetic operation must be of type (.+?). type./,
+                result: '表达式错误',
+                transforms: [outOriginalvalue, outOriginalvalue],
+            },
+            {
+                re: /Operator '(.+?)' cannot be applied to types '(.+?)' and '(.+?)'./,
+                result: '符号$1左右类型不同,左侧$2,右侧$3',
+                transforms: [outOriginalvalue, transformType, transformType],
+            },
+            {
+                re: /Object is possibly 'undefined'./,
+                result: '所选择的内容未定义',
+            },
+        ];
 
     for (const rule of translateRules) {
         const cap = rule.re.exec(message);

package/src/service/config/api.js

@@ -0,0 +1,32 @@
+export default {
+    loadList: {
+        url: {
+            method: 'get',
+            path: '/api/v1/property/list/{serviceId}',
+        },
+    },
+    add: {
+        url: {
+            method: 'post',
+            path: '/api/v1/property',
+        },
+    },
+    delete: {
+        url: {
+            method: 'delete',
+            path: '/api/v1/property/{serviceId}/{propertyId}',
+        },
+    },
+    update: {
+        url: {
+            method: 'put',
+            path: '/api/v1/property',
+        },
+    },
+    check: {
+        url: {
+            method: 'get',
+            path: '/api/v1/property/fetch/{serviceId}/{key}',
+        },
+    },
+};

package/src/service/config/index.js

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

package/src/service/creator/index.js

@@ -27,7 +27,7 @@ const requester = function (requestInfo) {
             headers.Cookie = aslConfig.cookie;
     }
 
-    headers['request-lcpAppId'] = aslConfig.defaultApp?.id;
+    headers['request-lcpAppId'] = headers['request-lcpAppId'] || aslConfig.defaultApp?.id;
     if (aslConfig.defaultApp?.baseVersion)
         headers['request-appBaseVersion'] = aslConfig.defaultApp.baseVersion;
     if (aslConfig.defaultApp?.versionChangedTime)
@@ -54,7 +54,7 @@ const requester = function (requestInfo) {
         withCredentials: !baseURL,
     };
 
-    if (aslConfig.debugRequest && requestOptions.method !== 'GET') {
+    if (aslConfig.debugRequestAll || (aslConfig.debugRequest && requestOptions.method !== 'GET')) {
         console.debug('[Request Debug]', requestOptions);
     }
     const req = axios(requestOptions);

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/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/service/storage/init.ts

@@ -68,59 +68,7 @@ async function doAction(app: any, list: any[]) {
     }
 }
 
-/**
- * 加载 app
- * @param appId 如果是从文件读，就不需要传
- * @returns app 对象
- */
-export async function loadApp(appId?: string) {
-    let app: any;
-    if (config.storage.protocol === 'http') {
-        // 请求
-        const res = await axios.post('/api/storage/batchQuery', [
-            {
-                path: 'app',
-                excludes: ['views'],
-            },
-        ], {
-            headers: {
-                appId,
-            },
-        });
-        const data = res?.data?.result;
-        app = new App(data?.[0]);
-    } else if (config.storage.protocol === 'mock') {
-        app = new App({
-            id: appId,
-            concept: 'App',
-            name: 'devapp',
-            title: '开发应用',
-            scope: 'pc',
-            envs: 'dev,online',
-            hasAuth: true,
-            entities: [],
-            structures: [],
-            enums: [],
-            logics: [],
-            interfaces: [],
-            views: [],
-            processes: [],
-            roles: [],
-            dependencies: [],
-            interfaceDependencies: [],
-            componentDependencies: [],
-        });
-    } else {
-        const json = await fs.readJSON(config.storage.basePath);
-        // const result = jsoner.batchQuery(json, [
-        //     {
-        //         path: 'app',
-        //         excludes: ['views'],
-        //     },
-        // ]);
-        app = new App(json);
-    }
-
+function handleApp(app: any) {
     app._isCollecting = false;
     app._collectingList = [];
     app._historyList = [];
@@ -161,13 +109,73 @@ export async function loadApp(appId?: string) {
         // 是否正在收集
         if (!app._isCollecting) {
             embeddedTSEmitter.emit('change', {
-                value: [event.originEvent],
+                value: [event],
             });
             doAction(app, [event]);
         } else {
             app._collectingList.push(event);
         }
     });
+}
 
+/**
+ * 加载 app
+ * @param appId 如果是从文件读，就不需要传
+ * @returns app 对象
+ */
+export async function loadApp(appId?: string) {
+    let app: App;
+    if (config.storage.protocol === 'http') {
+        // 请求
+        const res = await axios.post('/api/storage/batchQuery', [
+            {
+                path: 'app',
+                excludes: ['views'],
+            },
+        ], {
+            headers: {
+                appId,
+            },
+        });
+        const data = res?.data?.result;
+        app = new App(Object.assign(data?.[0], { id: appId }));
+    } else if (config.storage.protocol === 'mock') {
+        app = new App({
+            id: appId,
+            concept: 'App',
+            name: 'devapp',
+            title: '开发应用',
+            scope: 'pc',
+            envs: 'dev,online',
+            hasAuth: true,
+            entities: [],
+            structures: [],
+            enums: [],
+            logics: [],
+            interfaces: [],
+            views: [],
+            processes: [],
+            roles: [],
+            dependencies: [],
+            interfaceDependencies: [],
+            componentDependencies: [],
+        });
+    } else {
+        const json = await fs.readJSON(config.storage.basePath);
+        app = new App(Object.assign(json, { id: appId }));
+    }
+
+    handleApp(app);
     return app as App;
 }
+
+/**
+ * 加载 app
+ * @returns app 对象
+ */
+export function loadAppSync() {
+    const json = fs.readJSONSync(config.storage.basePath);
+    const app = new App(json);
+    handleApp(app);
+    return app;
+}

package/src/templator/genCallComponentLogic.ts

@@ -8,8 +8,8 @@ import { NaslLogicItem } from './utils';
  */
 export function genCallComponentLogic(componentName: string, componentMethod: string, params: Array<string> = []) {
     return NaslLogicItem.CallLogic({
-        calleeNamespace: '',
-        calleeName: `$refs.${componentName}.${componentMethod}`,
+        calleeNamespace: `elements.${componentName}.logics`,
+        calleeName: componentMethod,
         arguments: params.map((param) => {
             if (typeof param === 'string')
                 return NaslLogicItem.Argument({

package/src/templator/genCreateBlock.ts

@@ -1,18 +1,22 @@
 import { config } from '../config';
 import * as utils from '../utils';
 import { App, Namespace, Entity, Logic, View, Enum } from '../concepts';
+import { NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 import {
-    NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem,
-    NaslNode,
-} from './utils';
-import {
-    NameGroup, genUniqueQueryNameGroup, filterProperty, genLogicParam,
-    getFirstDisplayedProperty, genCallComponentLogic, genEnumSelectBlock,
-    genLoadSelectLogic, genQueryStructure, genQueryLogic,
+    NameGroup,
+    genUniqueQueryNameGroup,
+    filterProperty,
+    genLogicParam,
+    getFirstDisplayedProperty,
+    genCallComponentLogic,
+    genEnumSelectBlock,
+    genLoadSelectLogic,
+    genQueryStructure,
+    genQueryLogic,
 } from '.';
 
 export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) {
-    const parentNode = (entity.parentNode as App | Namespace);
+    const parentNode = entity.parentNode as App | Namespace;
     const properties = entity.properties.filter(filterProperty('inForm'));
 
     return `<u-form ref="${nameGroup.viewElementMainView}">
@@ -32,16 +36,13 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
             let formItem = `            <u-form-item label="${label}"${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
 
             const { typeAnnotation } = property || {};
-            const {
-                typeName: propertyTypeName,
-                typeNamespace: propertyTypeNamespace,
-            } = typeAnnotation || {};
+            const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inForm');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -107,16 +108,13 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
 
             let formItem = `            <van-field drole="other" label="${property.label || property.name}"${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
             const { typeAnnotation } = property || {};
-            const {
-                typeName: propertyTypeName,
-                typeNamespace: propertyTypeNamespace,
-            } = typeAnnotation || {};
+            const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inForm');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -142,9 +140,7 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
             } else if (propertyTypeName === 'Date') {
                 formItem += `<template #input><van-calendar v-model="${vModel}" title="请输入${property.label || property.name}"></van-calendar></template>`;
             } else if (propertyTypeName === 'Time') {
-                formItem += `<template #input><van-datetime-picker type="time" v-model="${vModel}" title="请选择${
-                    property.label || property.name
-                }" label-field=""></van-datetime-picker></template>`;
+                formItem += `<template #input><van-datetime-picker type="time" v-model="${vModel}" title="请选择${property.label || property.name}" label-field=""></van-datetime-picker></template>`;
             } else if (propertyTypeName === 'DateTime') {
                 formItem += `<template #input><van-datetime-picker type="datetime" v-model="${vModel}" title="请选择${
                     property.label || property.name
@@ -173,9 +169,7 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
 }
 
 function genSubmitLogic(createLogic: Logic, nameGroup: NameGroup) {
-    const params = [
-        genLogicParam(`${createLogic.params[0].name}`, nameGroup.viewVariableEntity),
-    ];
+    const params = [genLogicParam(`${createLogic.params[0].name}`, nameGroup.viewVariableEntity)];
     return NaslNode.Logic({
         name: nameGroup.viewLogicSubmit,
         params: [],
@@ -212,7 +206,7 @@ function genSubmitLogic(createLogic: Logic, nameGroup: NameGroup) {
                     NaslLogicItem.CallLogic({
                         label: '弹出消息',
                         shortcut: true,
-                        calleeNamespace: 'nasl.ui.logics',
+                        calleeNamespace: 'nasl.ui',
                         calleeName: 'showMessage',
                         arguments: [
                             NaslLogicItem.Argument({

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -38,7 +38,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inFilter');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -136,7 +136,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inForm');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -439,7 +439,7 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.View_${view.name}.logics",
+            "calleeNamespace": "${view.getNamespace()}.views.${view.name}.logics",
             "calleeName": "${nameGroup.viewLogicInit}"
         }
     ],