@lcap/nasl 2.18.0-beta.7 → 2.20.0-beta.1

package/src/server/translator.ts

@@ -47,6 +47,8 @@ import {
     AnonymousFunction,
     MatchCase,
     OqlQueryComponent,
+    NewMap,
+    NewList,
 } from '../concepts';
 import { SourceMapItem } from '../translator';
 import { Diagnostic } from '../manager/diagnostic';
@@ -234,6 +236,10 @@ const TS_RULES: Array<{
         re: /Cannot find name '__(?:IDENTIFIER|LEFT|RIGHT)__'/,
         result: '表达式不能为空。',
     },
+    {
+        re: /Cannot find name '__(?:FRONTENDVARIABLES)__'/,
+        result: '前端全局变量：不可在非页面下使用。',
+    },
     {
         re: /Cannot find name '__(?:QueryFieldExpression)__'/,
         result: '数据查询：实体属性不能为空。',
@@ -369,6 +375,11 @@ const TS_RULES: Array<{
         re: /'__destinationEmpty__' is declared but its value is never read./,
         result: '任务未关联页面',
     },
+    {
+        re: /Variable '(.+?)' implicitly has an 'any' type./,
+        result: '$1推断不出类型！请连线或手动设置',
+        transforms: [transformType],
+    },
 ];
 
 const POST_RULES: Array<{
@@ -480,11 +491,13 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
             }
         }
 
-        if (node instanceof ProcessElement && (node.type === 'ExclusiveGateway' || node.type === 'ParallelGateway')) {
+        if (node instanceof ProcessElement && (['ExclusiveGateway', 'ParallelGateway', 'InclusiveGateway'].includes(node.type))) {
             const reg = /Expected (.+?) arguments, but got (.+?)./.exec(text);
             let u = '排他网关';
             if (node.type === 'ParallelGateway') {
                 u = '并行网关';
+            } else if (node.type === 'InclusiveGateway') {
+                u = '包容网关';
             }
             if (reg[2] === '0') {
                 tsErrorDetail.message = `${u}出口顺序流和入口顺序流个数不能等于0`;
@@ -610,6 +623,14 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
             tsErrorDetail.message = identifierToString(node);
         }
     }
+
+    if (/'__UpdateNoProperty__' is declared but its value is never read./.exec(text)) {
+        tsErrorDetail.message = '局部更新：未选择任何属性';
+        const callLogic = node.parentNode.parentNode.parentNode as CallLogic;
+        const bodyArgument = callLogic.arguments.find(item => item.keyword === 'body');
+        node = bodyArgument.expression;
+    }
+
     // 左右类型不一致的，把上级信息带上
     if (/^Type '(.+?)' is not assignable to type '(.+?)'\./.exec(text) || /^This condition will always return '(.+?)' since the types '(.+?)' and '(.+?)' have no overlap./.exec(text)) {
         let str = tsErrorDetail.message;
@@ -621,6 +642,8 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
             tsErrorDetail.message = tsErrorDetail.message.replace('左右参数', '返回值')
                 .replace('左边类型', '接收类型')
                 .replace('右边类型', '传入类型');
+        } else if (text === `Type 'void' is not assignable to type 'never'.`) {
+            tsErrorDetail.message = `${node.name}推断不出类型！请连线或手动设置`;
         }
     }
     // 参数类型不一致！
@@ -650,6 +673,15 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
             node.isSmpty = true;
         }
     }
+    if (/Variable '(.+?)' implicitly has an 'any' type./.exec(text)) {
+        if (node.parentNode instanceof NewMap || node.parentNode instanceof NewList)
+            return;
+        // if (node.parentNode instanceof NewMap) {
+        //     tsErrorDetail.message = 'newMap未设置类型，右侧属性' + tsErrorDetail.message.split('请连线或手动设置')[0];
+        // } else if (node.parentNode instanceof NewList) {
+        //     tsErrorDetail.message = 'newList未设置类型，属性' + tsErrorDetail.message.split('请连线或手动设置')[0];
+        // }
+    }
     for (const rule of POST_RULES) {
         if (rule.re.test(tsErrorDetail.message))
             tsErrorDetail.message = tsErrorDetail.message.replace(rule.re, rule.result);

package/src/service/creator/add.configs.js

@@ -9,6 +9,10 @@ function httpCode(response, params, requestInfo) {
     if ((data.code === undefined) || (data.code + '').startsWith('2')) {
         return response;
     }
+    if (data.code === 401339 && data.msg === '租户已过期或禁用') {
+        location.href = '/dashboard/exception/tenantExpired';
+        return
+    }
     if (typeof window !== 'undefined' && new RegExp('^/designer').test(window.location.pathname)) {
         if (data.code === 401) {
             window.location.href = '/login';

package/src/service/datasource/api.js

@@ -0,0 +1,11 @@
+export default {
+    pingDatabase: {
+        config: {
+            noErrorTip: true,
+        },
+        url: {
+            method: 'post',
+            path: '/api/v1/app/config/database/ping',
+        },
+    },
+};

package/src/service/datasource/index.js

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

package/src/service/storage/init.ts

@@ -436,6 +436,18 @@ export async function loadApp(appId?: string) {
             },
         });
         // const data = res?.data?.result;
+        // // mock数据，需要删除
+        // data[0].frontends = [];
+        // data?.[0].frontends.push({
+        //     id: '111',
+        //     concept: 'Frontend',
+        //     name: 'pcFrontend1',
+        //     title: 'pc端',
+        //     type: 'pc',
+        //     views: data?.[0].views,
+        //     variables: data?.[0].frontendVariables,
+        //     componentDependencies: data?.[0].componentDependencies,
+        // });
         app = new App(Object.assign(data?.[0], { id: appId }));
     } else if (config.storage.protocol === 'mock') {
         app = new App({

package/src/service/video/VideoTranscribe.js

@@ -95,6 +95,7 @@ class VideoTranscribe {
         a.href = this.videoUrl;
         document.body.appendChild(a);
         a.click();
+        document.body.removeChild(a);
     }
 }
 

package/src/templator/genEditTableBlock.ts

@@ -1,14 +1,10 @@
 import * as utils from '../utils';
-import { App, Module, Namespace, Entity, EntityProperty, DataSource } from '../concepts';
+import { Entity, EntityProperty, DataSource } from '../concepts';
 import {
-    getExpression, filterProperty, NameGroup,
-    getFirstDisplayedProperty, getParamFromLogic, genCallComponentLogic,
-    genMemberExpression, genLogicParam,
+    filterProperty, NameGroup, getFirstDisplayedProperty, getParamFromLogic,
+    genCallComponentLogic, genMemberExpression, genLogicParam,
 } from '.';
-import {
-    NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslCollectionTypeAnnotation,
-    NaslTypeAnnotation, NaslLogicItem, NaslNode,
-} from './utils';
+import { NaslUITypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 
 /**
  * 根据实体属性生成表格列模板
@@ -19,20 +15,16 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
     const lowerEntityName = utils.firstLowerCase(entity.name);
     const valueExpression = `current.item.${lowerEntityName}.${property.name}`;
     const title = property.label || property.name;
-
-    const expression = getExpression(property, `current.item.${lowerEntityName}.${property.name}`);
-
     const canEditable = (property: EntityProperty) => !property.readonly;
-
     const getText = (property: EntityProperty) => {
         const propertyTypeName = property.typeAnnotation.typeName;
         if (propertyTypeName === 'Boolean') {
             return `
-            <u-text v-if="${expression}" text="是"></u-text>
-            <u-text v-if="!${expression}" text="否"></u-text>
+            <u-text v-if="${valueExpression}" text="是"></u-text>
+            <u-text v-if="!${valueExpression}" text="否"></u-text>
             `;
         } else {
-            return `<u-text :text="${expression}"></u-text>`;
+            return `<u-text :text="${valueExpression}"></u-text>`;
         }
     };
 
@@ -120,7 +112,7 @@ export function genEditTableTemplate(entity: Entity, nameGroup: NameGroup, selec
     return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
         :pageable="true" :remote-paging="true" :show-sizer="true" :default-column-width="300" editable>
-    <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template></u-table-view-column>
+    <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template><template #cell="current"></template></u-table-view-column>
 
     ${properties.map((property) => genEditTableColumnTemplate(entity, property, nameGroup, selectNameGroupMap) + '\n').join('')}
 

package/src/templator/genGetBlock.ts

@@ -2,7 +2,7 @@ import { config } from '../config';
 import * as utils from '../utils';
 import { Entity, Logic, View, ViewElement } from '../concepts';
 import { NaslCoreTypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
-import { NameGroup, filterProperty, getExpression, genLogicParam } from '.';
+import { NameGroup, filterProperty, genLogicParam } from '.';
 
 export function genGetTemplate(entity: Entity, nameGroup: NameGroup) {
     const properties = entity.properties.filter(filterProperty('inDetail'));
@@ -11,15 +11,14 @@ export function genGetTemplate(entity: Entity, nameGroup: NameGroup) {
     <u-info-list-group>
     <template #title><u-text text="基本信息"></u-text></template>
     ${properties
-        .map((property) => {
-            let formItem = `            <u-info-list-item><template #label><u-text text="${property.label || property.name}"></u-text></template>`;
-
-            formItem += '<u-text :text="' + getExpression(property, `${nameGroup.viewVariableEntity}.${property.name}`) + '"></u-text>';
-
-            formItem += `            </u-info-list-item>\n`;
-            return formItem;
-        })
-        .join('')}
+            .map((property) => {
+                const valueExpression = `${nameGroup.viewVariableEntity}.${property.name}`;
+                let formItem = `            <u-info-list-item><template #label><u-text text="${property.label || property.name}"></u-text></template>`;
+                formItem += `<u-text :text="'${valueExpression}'"></u-text>`;
+                formItem += `            </u-info-list-item>\n`;
+                return formItem;
+            })
+            .join('')}
     </u-info-list-group>
 </u-info-list>`;
 }
@@ -55,16 +54,16 @@ export function genH5GetTemplate(entity: Entity, nameGroup: NameGroup) {
 
     return `<van-cell-group>
     ${properties
-        .map((property) => {
-            const temptitle = property.label || property.name;
-            let formItem = `            <van-cell isLink`;
+            .map((property) => {
+                const temptitle = property.label || property.name;
+                let formItem = `            <van-cell isLink`;
 
-            formItem += ' :value="' + getExpression(property, `${nameGroup.viewVariableEntity}.${property.name}`) + '">';
-            formItem += `<template  #title>${temptitle}</template>`;
-            formItem += `<template>{{ ${getExpression(property, `${nameGroup.viewVariableEntity}.${property.name}`)} }}</template>            </van-cell>\n`;
-            return formItem;
-        })
-        .join('')}
+                formItem += ' :value="' + `${nameGroup.viewVariableEntity}.${property.name}` + '">';
+                formItem += `<template  #title>${temptitle}</template>`;
+                formItem += `<template>{{ ${`${nameGroup.viewVariableEntity}.${property.name}`} }}</template>            </van-cell>\n`;
+                return formItem;
+            })
+            .join('')}
 </van-cell-group>`;
 }
 

package/src/templator/genGridViewBlock.ts

@@ -1,8 +1,7 @@
 import { config } from '../config';
 import * as utils from '../utils';
-import { App, Module, Namespace, Entity, EntityProperty, View, DataSource, ViewElement } from '../concepts';
+import { App, Module, Namespace, Entity, EntityProperty, DataSource, ViewElement } from '../concepts';
 import {
-    getExpression,
     filterProperty,
     NameGroup,
     genUniqueQueryNameGroup,
@@ -12,7 +11,7 @@ import {
     genCallComponentLogic,
     genQueryLogic,
 } from '.';
-import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslCollectionTypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
+import {  NaslUITypeAnnotation,  NaslLogicItem, NaslNode } from './utils';
 
 /**
  * 根据实体属性生成表格列模板
@@ -23,7 +22,7 @@ export function genGridViewCardTemplate(property: EntityProperty, nameGroup: Nam
     const dataSource = entity.parentNode as DataSource;
     const lowerEntityName = utils.firstLowerCase(entity.name);
     const currentName = nameGroup.currentName || 'current';
-    let expression = `${currentName}.item.${lowerEntityName}.${property.name}`;
+    let valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
     const title = property.label || property.name;
 
     if (property.relationEntity) {
@@ -33,23 +32,24 @@ export function genGridViewCardTemplate(property: EntityProperty, nameGroup: Nam
             const displayedProperty = getFirstDisplayedProperty(relationEntity);
             if (displayedProperty) {
                 const relationLowerEntityName = utils.firstLowerCase(relationEntity.name);
-                expression = getExpression(property, `${currentName}.item.${relationLowerEntityName}.${displayedProperty.name}`);
+                valueExpression = `${currentName}.item.${relationLowerEntityName}.${displayedProperty.name}`;
             } else
                 return '';
         } else
             return '';
-    } else
-        expression = getExpression(property, `${currentName}.item.${lowerEntityName}.${property.name}`);
+    } else {
+        valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
 
+    }
     const getText = (property: EntityProperty) => {
         const propertyTypeName = property.typeAnnotation.typeName;
         if (propertyTypeName === 'Boolean') {
             return `
-                <u-text v-if="${expression}" text="是"></u-text>
-                <u-text v-if="!${expression}" text="否"></u-text>
+                <u-text v-if="${valueExpression}" text="是"></u-text>
+                <u-text v-if="!${valueExpression}" text="否"></u-text>
                 `;
         } else {
-            return `<u-text :text="${expression}"></u-text>`;
+            return `<u-text :text="${valueExpression}"></u-text>`;
         }
     };
 
@@ -64,7 +64,7 @@ export function genH5GridViewCardTemplate(property: EntityProperty, nameGroup?:
     const lowerEntityName = utils.firstLowerCase(entity.name);
 
     const currentName = nameGroup.currentName || 'current';
-    let expression = `${currentName}.item.${lowerEntityName}.${property.name}`;
+    let valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
 
     if (property.relationEntity) {
         // 有外键关联
@@ -73,23 +73,23 @@ export function genH5GridViewCardTemplate(property: EntityProperty, nameGroup?:
             const displayedProperty = getFirstDisplayedProperty(relationEntity);
             if (displayedProperty) {
                 const relationLowerEntityName = utils.firstLowerCase(relationEntity.name);
-                expression = getExpression(property, `${currentName}.item.${relationLowerEntityName}.${displayedProperty.name}`);
+                valueExpression = `${currentName}.item.${relationLowerEntityName}.${displayedProperty.name}`;
             } else
                 return '';
         } else
             return '';
-    } else
-        expression = getExpression(property, `${currentName}.item.${lowerEntityName}.${property.name}`);
-
+    } else {
+        valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
+    }
     const getText = (property: EntityProperty) => {
         const propertyTypeName = property.typeAnnotation.typeName;
         if (propertyTypeName === 'Boolean') {
             return `
-                <van-text v-if="${expression}" text="是" display="block"></van-text>
-                <van-text v-if="!${expression}" text="否" display="block"></van-text>
+                <van-text v-if="${valueExpression}" text="是" display="block"></van-text>
+                <van-text v-if="!${valueExpression}" text="否" display="block"></van-text>
                 `;
         } else {
-            return `<van-text :text="${expression}" display="block"></van-text>`;
+            return `<van-text :text="${valueExpression}" display="block"></van-text>`;
         }
     };
     return `${getText(property)}`;

package/src/templator/genListViewBlock.ts

@@ -1,24 +1,22 @@
 import { config } from '../config';
 import * as utils from '../utils';
-import { App, Module, Namespace, Entity, EntityProperty, View, DataSource, ViewElement } from '../concepts';
-import { getExpression, genUniqueQueryNameGroup, getFirstDisplayedProperty, genQueryLogic, genQueryStructure, genLogicParam } from '.';
+import { App, Module, Namespace, Entity, EntityProperty,  DataSource, ViewElement } from '../concepts';
+import { genUniqueQueryNameGroup, getFirstDisplayedProperty, genQueryLogic, genLogicParam } from '.';
 import {
-    NameGroup, NaslUITypeAnnotation, NaslCollectionTypeAnnotation,
-    NaslTypeAnnotation, NaslLogicItem, NaslNode,
+    NameGroup, NaslUITypeAnnotation,  NaslLogicItem, NaslNode,
 } from './utils';
 
 export function genListViewTemplate(property: EntityProperty, nameGroup: NameGroup) {
     const entity = property.entity;
     const lowerEntityName = utils.firstLowerCase(entity.name);
     const currentName = nameGroup.currentName || 'current';
-
-    const expression = getExpression(property, `${currentName}.item.${lowerEntityName}.${property.name}`);
+    const valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
     return `<u-list-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
     text-field="${nameGroup.viewVariableEntity}.${property.name}"
     value-field="${nameGroup.viewVariableEntity}.id" :pageable="true" :remote-paging="true">
     <template #item="current">
         <u-linear-layout>
-            <u-text :text="${expression}"></u-text>
+            <u-text :text="${valueExpression}"></u-text>
         </u-linear-layout>
     </template>
 </u-list-view>`;
@@ -28,14 +26,13 @@ export function genH5ListViewTemplate(property: EntityProperty, nameGroup: NameG
     const entity = property.entity;
     const lowerEntityName = utils.firstLowerCase(entity.name);
     const currentName = nameGroup.currentName || 'current';
-
-    const expression = getExpression(property, `${currentName}.item.${lowerEntityName}.${property.name}`);
+    const valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
     return `<van-list-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
     text-field="${nameGroup.viewVariableEntity}.${property.name}"
     value-field="${nameGroup.viewVariableEntity}.id" pageable="auto-more" :remote-paging="true">
     <template #item="current">
-        <van-cell :value="${expression}" isLink>
-            <template #title>{{ ${expression} }}</template>
+        <van-cell :value="${valueExpression}" isLink>
+            <template #title>{{ ${valueExpression} }}</template>
         </van-cell>
     </template>
 </van-list-view>`;

package/src/templator/genTableBlock.ts

@@ -1,7 +1,6 @@
 import * as utils from '../utils';
 import { App, Module, Namespace, Entity, EntityProperty, View, DataSource, ViewElement } from '../concepts';
 import {
-    getExpression,
     filterProperty,
     NameGroup,
     genUniqueQueryNameGroup,
@@ -22,27 +21,24 @@ export function genTableColumnTemplate(property: EntityProperty, currentName: st
 
     const dataSource = entity.parentNode as DataSource;
     const lowerEntityName = utils.firstLowerCase(entity.name);
-    let expression = `${currentName}.item.${lowerEntityName}.${property.name}`;
+    let valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
     const title = property.label || property.name;
 
     if (property.relationEntity) {
         const relationLowerEntityName = utils.firstLowerCase(property.relationEntity);
         const relationEntity = dataSource?.findEntityByName(property.relationEntity);
         const displayedProperty = getFirstDisplayedProperty(relationEntity);
-        // 有外键关联
-        expression = getExpression(property, `${currentName}.item.${relationLowerEntityName}.${displayedProperty?.name || property.relationProperty}`);
-    } else {
-        expression = getExpression(property, `${currentName}.item.${lowerEntityName}.${property.name}`);
+        valueExpression = `${currentName}.item.${relationLowerEntityName}.${displayedProperty?.name || property.relationProperty}`; 
     }
 
     const getText = (property: EntityProperty) => {
         if (property.typeAnnotation.typeName === 'Boolean') {
             return `
-            <u-text v-if="${expression}" text="是"></u-text>
-            <u-text v-if="!${expression}" text="否"></u-text>
+            <u-text v-if="${valueExpression}" text="是"></u-text>
+            <u-text v-if="!${valueExpression}" text="否"></u-text>
             `;
         } else {
-            return `<u-text :text="${expression}"></u-text>`;
+            return `<u-text :text="${valueExpression}"></u-text>`;
         }
     };
 
@@ -68,7 +64,7 @@ export function genTableTemplate(entity: Entity, nameGroup: NameGroup, modifyabl
     return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
         :pageable="true" :remote-paging="true" :show-sizer="true">
-    <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template></u-table-view-column>
+    <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template><template #cell="current"></template></u-table-view-column>
 
     ${properties.map((property) => genTableColumnTemplate(property, currentName) + '\n').join('')}
 

package/ts-worker/lib/tsserver.js

@@ -176736,7 +176736,7 @@ var ts;
 
             function analyzeTypeNode(typeNode) {
                 const typeInfo = {};
-                const { typeName, typeArguments, members } = typeNode || {};
+                const { typeName, typeArguments, members, types } = typeNode || {};
                 if (typeName) {
                     const { left, right } = typeName || {};
                     if (right) {
@@ -176745,6 +176745,8 @@ var ts;
                     if (left) {
                         typeInfo.typeNamespace = analyzeTypeNameSpace(left);
                     }
+                } else if(Array.isArray(types)) {
+                    typeInfo.typeName = 'Union';
                 } else {
                     typeInfo.typeKind = 'anonymousStructure';
                 }
@@ -176753,6 +176755,11 @@ var ts;
                         return analyzeTypeNode(typeArg);
                     });
                 }
+                if (Array.isArray(types)) {
+                    typeInfo.typeArguments = types.map((typeArg) => {
+                        return analyzeTypeNode(typeArg);
+                    });
+                }
                 if (Array.isArray(members)) {
                     const properties = members.map((member) => {
                         const { name, type } = member || {};