@lcap/nasl 2.22.0-beta.0 → 2.22.0-beta.1

package/src/server/translator.ts

@@ -70,7 +70,7 @@ function transformType(tsType: string): string {
     else if (tsType === 'Decimal')
         return '小数';
     else if (tsType === 'Long')
-        return '长整数';
+        return '整数';
     else if (tsType === 'DateTime')
         return '日期时间';
     else if (tsType === 'Date')
@@ -177,6 +177,11 @@ const TS_RULES: Array<{
     result: string;
     transforms?: Array<(str: string) => string>;
 }> = [
+    {
+        re: /Property '(FrontEnd|BackEnd)(.+?)' is private and only accessible within/,
+        result: '找不到配置参数$2',
+        transforms: [transformType, transformType],
+    },
     {
         re: /Object literal may only specify known properties, and '(.+?)' does not exist in type/,
         result: '当前参数$1，不可用。',
@@ -394,6 +399,11 @@ const TS_RULES: Array<{
         result: '$1推导不出类型！请连线或手动设置',
         transforms: [transformType],
     },
+    {
+        re: /'(.+?)' refers to a value, but is being used as a type here. Did you mean 'typeof (.+?)'?/,
+        result: '$1未初始化！请连线',
+        transforms: [transformType],
+    },
 ];
 
 const POST_RULES: Array<{
@@ -411,7 +421,7 @@ const POST_RULES: Array<{
     },
     {
         re: /Long|"Long"/g,
-        result: '长整数',
+        result: '整数',
     },
     {
         re: /Double|"Double"/g,
@@ -419,7 +429,7 @@ const POST_RULES: Array<{
     },
     {
         re: /Decimal|"Decimal"/g,
-        result: '精确小数',
+        result: '小数',
     },
     {
         re: /String|"String"/g,
@@ -462,8 +472,8 @@ export function translateDiagnosticMessage(message: string) {
  * @returns
  */
 export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diagnostic) {
-    const text = tsErrorDetail.originalDiagnostic.text;
-    let node = minRange.node;
+    const text = tsErrorDetail?.originalDiagnostic?.text;
+    let node = minRange?.node;
     // 有一些节点报错信息不向外暴露,缺失一些原生标签等等的展示
     if (node instanceof View || node instanceof ViewElement) {
         if (text.startsWith(`'nasl.ui' has no exported member named `)) {
@@ -551,7 +561,7 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
         } else if (node.parentNode instanceof NewMap) {
             if (text.includes(`is not assignable to parameter of type 'None'`)) {
                 const cap = /Argument of type '(.+?)' is not assignable to parameter of type '(.+?)'/.exec(text);
-                tsErrorDetail.message = tsErrorDetail.message = `参数类型不一致！传入类型：${transformType(cap[1])}，接收类型：字符串 或 整数 或 布尔值 或 长整数 或 精确小数`;
+                tsErrorDetail.message = tsErrorDetail.message = `参数类型不一致！传入类型：${transformType(cap[1])}，接收类型：字符串  或 布尔值 或 整数 或 小数`;
             } else if (text.includes(`parameter of type 'never'`)) {
                 tsErrorDetail.message = '自动推导不出类型！newMap中有未知类型';
             }
@@ -693,6 +703,12 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
             }
         }
     }
+    if (/Property '(.+?)' is missing in type '(.+?)' but required in type '(.+?)'/.exec(text)) {
+        if (node.parentNode instanceof NewComposite) {
+            tsErrorDetail.message = tsErrorDetail.message.replace('类型不一致', '接收与传入类型不一致').replace('左边类型', '左边接收类型').replace('右边类型', '右边传入类型');
+            tsErrorDetail.message = node.name + tsErrorDetail.message;
+        }
+    }
     // 参数类型不一致！
     if (/^Type '(.+?)' does not satisfy the constraint '(.+?)'\./.exec(text)) {
         // match
@@ -749,7 +765,9 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
             });
         }
     }
-    node.tsErrorDetail = tsErrorDetail;
+    if (node && tsErrorDetail) {
+        node.tsErrorDetail = tsErrorDetail;
+    }
 
     return {
         node,

package/src/service/storage/init.ts

@@ -4,6 +4,7 @@ import { config } from '../../config';
 import Vue from 'vue';
 import storageService from './service';
 import { v4 as uuidv4 } from 'uuid';
+import stepRecorder from '../../manager/stepRecorder';
 /// #if !process.env.NODE_ENV || process.env.BUILD_TARGET === 'node'
 import * as fs from 'fs-extra';
 import * as jsoner from './jsoner';
@@ -303,6 +304,7 @@ async function doAction(app: any, actionItem: any) {
         Vue.prototype.$toast.info(msg);
         app._historying = false;
     }
+    stepRecorder.initialized && stepRecorder.record(actionMsg, actionItem, actionList);
 }
 
 type Instruct = {
@@ -618,6 +620,7 @@ export function handleApp(app: any) {
 export async function loadApp(appId?: string) {
     let app: App;
     if (config.storage.protocol === 'http') {
+        console.time('batchQuery');
         // 请求
         const res = await storageService.batchQuery({
             body: [
@@ -635,10 +638,14 @@ export async function loadApp(appId?: string) {
                 shortResponse: false,
             },
         });
+        console.timeEnd('batchQuery');
 
         tabTimestamp = res?.headers?.tabtimestamp;
         const data = res?.data?.result;
+
+        console.time('new App');
         app = new App(Object.assign(data?.[0], { id: appId }));
+        console.timeEnd('new App');
         if (!app.id) {
             app.id = appId;
         }

package/src/templator/genCreateBlock.ts

@@ -57,7 +57,12 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                 } else
                     return '';
             } else if (propertyTypeName === 'Boolean') {
-                formItem += `<u-checkbox v-model="${vModel}"></u-checkbox>`;
+                formItem += `
+                <u-select clearable v-model="${vModel}" placeholder="请输入${label}">
+                    <u-select-item :value="true" text="是">是</u-select-item>
+                    <u-select-item :value="false" text="否">否</u-select-item>
+                </u-select>
+            `;
             } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
                 formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Double') {

package/src/templator/genQueryComponent.ts

@@ -1,5 +1,5 @@
 import * as utils from '../utils';
-import { App, Module, Namespace, Entity, Structure, QueryJoinExpression, CallQueryComponent, StructureProperty, DataSource, TypeAnnotation } from '../concepts';
+import { App, Module, Namespace, Entity, Structure, QueryJoinExpression, QueryAggregateExpression, QueryFieldExpression, CallQueryComponent, StructureProperty, DataSource, TypeAnnotation } from '../concepts';
 import { NameGroup, NaslCoreTypeAnnotation, NaslCollectionTypeAnnotation, NaslTypeAnnotation, NaslQueryExpression, NaslLogicItem, NaslNode } from './utils';
 
 export function genQueryStructure(allEntities: Array<Entity>, nameGroup: NameGroup) {
@@ -97,6 +97,23 @@ export function genQueryAssignment(allEntities: Array<Entity>, nameGroup: NameGr
             });
         }),
     });
+    const selectElements: Array<QueryAggregateExpression | QueryFieldExpression> = [];
+    selectElements.push(QueryFieldExpression.from({
+        entityAsName: entity.name,
+        isDotStar: true,
+    }));
+    from.joinParts.forEach((joinPart) => {
+        selectElements.push(QueryFieldExpression.from({
+            entityAsName: joinPart.entityName,
+            isDotStar: true,
+        }));
+    });
+    const select = NaslQueryExpression.QuerySelectExpression({
+        label: '查询组件Select子句',
+        distinct: false,
+        star: true,
+        selectElements,
+    });
     const where: any = supportFilter ? genWhereExpression(entity) : undefined;
     const aStructureProperties = [NaslNode.StructureProperty({
         name: utils.firstLowerCase(entity.name),
@@ -117,14 +134,11 @@ export function genQueryAssignment(allEntities: Array<Entity>, nameGroup: NameGr
         }),
         right: NaslQueryExpression.CallQueryComponent({
             label: '数据查询',
-            ideVersion: '2.11', // 2.11版本新创建的数据查询组件，返回类型将自动推断
+            // 2.11版本的数据查询，返回类型将自动推断
+            // 2.22版本的数据查询，实体支持列筛选，(select.selectElements 会初始化实体对应的 QueryFieldExpression 节点)
+            ideVersion: '2.11', // 回滚功能
             typeAnnotation: NaslTypeAnnotation.AnonymousStructure(aStructureProperties),
-            select: NaslQueryExpression.QuerySelectExpression({
-                label: '查询组件Select子句',
-                distinct: false,
-                star: true,
-                selectElements: [],
-            }),
+            select,
             from,
             where,
             groupBy: [],

package/src/templator/genUpdateBlock.ts

@@ -57,7 +57,12 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                 } else
                     return '';
             } else if (propertyTypeName === 'Boolean') {
-                formItem += `<u-checkbox v-model="${vModel}"></u-checkbox>`;
+                formItem += `
+                <u-select clearable v-model="${vModel}" placeholder="请输入${label}">
+                    <u-select-item :value="true" text="是">是</u-select-item>
+                    <u-select-item :value="false" text="否">否</u-select-item>
+                </u-select>
+            `;
             } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
                 formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Double') {
@@ -260,6 +265,7 @@ function genLoadLogic(getLogic: Logic, nameGroup: NameGroup) {
     });
 }
 
+// 生成修改区块
 export function genUpdateBlock(entity: Entity, oldNode: ViewElement) {
     const view = oldNode.view;
     const dataSource = entity.parentNode as DataSource;

package/src/templator/utils.ts

@@ -228,6 +228,8 @@ export const NaslUITypeAnnotation = {
     PoiInfo: genNaslUITypeAnnotation('PoiInfo'),
     File: genNaslUITypeAnnotation('File'),
     Current: genNaslUIGenericTypeAnnotation('Current'),
+    DragAndDropEvent: genNaslUIGenericTypeAnnotation('DragAndDropEvent'),
+    ExpandEvent: genNaslUIGenericTypeAnnotation('ExpandEvent'),
 };
 
 export const NaslTypeAnnotation = {

package/ts-worker/src/index.js

@@ -237,8 +237,7 @@ const context = {
     publishDiagnostics(remain) {
         webHost.diagnosticRecords = [];
         try {
-            const chunk = Math.min(500, remain);
-            for (let i = 0; i < chunk; i++) {
+            for (let i = 0; i < remain; i++) {
                 this.system.checkTimeoutQueueLengthAndRun(1);
                 this.system.runQueuedImmediateCallbacks(1);
                 this.system.runQueuedImmediateCallbacks(1);
@@ -247,8 +246,6 @@ const context = {
                 event: 'publishDiagnostics',
                 records: webHost.diagnosticRecords,
             });
-            remain -= chunk;
-            remain && setTimeout(() => this.publishDiagnostics(remain), 0);
         } catch (e) {
             if (e.operator === 'strictEqual')
                 console.error(e);