@lcap/nasl 3.8.0-beta.3 → 3.8.0-beta.5

package/src/templator/genGetBlock.ts

@@ -56,9 +56,7 @@ export function genH5GetTemplate(entity: Entity, nameGroup: NameGroup) {
     ${properties
       .map((property) => {
         const temptitle = property.label || property.name;
-        let formItem = `            <van-cell isLink`;
-
-                formItem += ' :value="' + `${nameGroup.viewVariableEntity}.${property.name}` + '">';
+        let formItem = `            <van-cell isLink>`;
                 formItem += `<template  #title>${temptitle}</template>`;
                 formItem += `{{ ${`${nameGroup.viewVariableEntity}.${property.name}`} }}            </van-cell>\n`;
                 return formItem;
@@ -67,7 +65,7 @@ export function genH5GetTemplate(entity: Entity, nameGroup: NameGroup) {
 </van-cell-group>`;
 }
 
-export function genGetBlock(entity: Entity, oldNode: ViewElement, 
+export function genGetBlock(entity: Entity, oldNode: ViewElement,
   getGetTemplate: (entity: Entity, nameGroup: NameGroup) => string) {
   const likeComponent = oldNode?.likeComponent;
   const isBusinessComponent = likeComponent.concept === 'BusinessComponent';

package/src/templator/genListViewBlock.ts

@@ -13,8 +13,9 @@ export function genListViewTemplate(property: EntityProperty, nameGroup: NameGro
   return `<u-list-view ref="${nameGroup.viewElementMainView}" :dataSource="${dataSourceValue}" dataSchema="${nameGroup.structure}"
   :pageSize="50"
   :pageNumber="1"
-    textField="${nameGroup.viewVariableEntity}.${property.name}"
-    valueField="${lowerEntityName}.id" :pageable="true" :remotePaging="true">
+    textField="${lowerEntityName}.${property.name}"
+    valueField="${lowerEntityName}.${entity.properties.find((p) => p.primaryKey)?.name || 'id'}"
+    :pageable="true" :remotePaging="true">
     <template #item="current">
         <u-linear-layout>
             <u-text :text="${valueExpression}"></u-text>
@@ -32,8 +33,9 @@ export function genH5ListViewTemplate(property: EntityProperty, nameGroup: NameG
   return `<van-list-view ref="${nameGroup.viewElementMainView}" :dataSource="${dataSourceValue}" dataSchema="${nameGroup.structure}"
   :pageSize="50"
   :pageNumber="1"
-    textField="${nameGroup.viewVariableEntity}.${property.name}"
-    valueField="${lowerEntityName}.id" pageable="auto-more" :remotePaging="true">
+    textField="${lowerEntityName}.${property.name}"
+    valueField="${lowerEntityName}.${entity.properties.find((p) => p.primaryKey)?.name || 'id'}"
+    pageable="auto-more" :remotePaging="true">
     <template #item="current">
         <van-cell :value="${valueExpression}" isLink>
             <template #title>{{ ${valueExpression} }}</template>

package/src/templator/genSelectBlock.ts

@@ -182,14 +182,14 @@ export function genSelectItemAddLogic(entity: Entity, nameGroup: NameGroup, view
   const callLogics = [];
   const variableName = view.getVariableUniqueName('itemVariable1');
   const itemVariable1Snapshot = view.getVariableUniqueName(`${variableName}Snapshot`);
-  const variables = [
+  let variables = [
     NaslNode.Variable({
       name: variableName,
       typeAnnotation: null,
     }),
   ];
   const itemExpression = genLogicParam(`item`, `${variableName}.${nameGroup.textField}`);
-  if (entity && entity.getNamespace) {
+  if (entity && entity.getNamespace) { // item是实体或者数据结构
     callLogics.push(
       NaslLogicItem.Assignment({
         left: NaslLogicItem.Identifier({
@@ -215,57 +215,51 @@ export function genSelectItemAddLogic(entity: Entity, nameGroup: NameGroup, view
       })
     );
   } else {
-    callLogics.push(
-      NaslLogicItem.Assignment({
-        left: NaslLogicItem.Identifier({
-          name: variableName,
-        }),
-        right: {
-          concept: 'NewComposite',
-          name: '',
-          typeAnnotation: {
-            concept: 'TypeAnnotation',
-            name: '',
-            typeKind: 'anonymousStructure',
-            properties: [
-              {
-                concept: 'StructureProperty',
-                name: nameGroup.textField,
-              },
+    // item是基本类型
+    if(nameGroup.schemaRef === 'nasl.core.String'){
+      callLogics.push(
+        NaslLogicItem.Assignment({
+          left: NaslLogicItem.Identifier({
+            name: variableName,
+          }),
+          right: NaslLogicItem.Identifier({
+            name: nameGroup.itemInputVariableName,
+          }),
+        })
+      );
+    } else if (['nasl.core.Long', 'nasl.core.Decimal'].includes(nameGroup.schemaRef)) {
+      const typeAnnotation ={
+          concept: 'TypeAnnotation',
+          typeKind: 'primitive',
+          typeNamespace: 'nasl.core',
+          typeName: nameGroup.schemaRef.replace('nasl.core.', ''),
+      };
+      callLogics.push(
+        NaslLogicItem.Assignment({
+          left: NaslLogicItem.Identifier({
+            name: variableName,
+          }),
+          right: NaslLogicItem.CallFunction({
+            calleeName: 'Convert',
+            typeArguments: [typeAnnotation],
+            arguments: [
+              NaslLogicItem.Argument({
+                keyword: 'value',
+                expression: NaslLogicItem.Identifier({
+                  name: nameGroup.itemInputVariableName,
+                }),
+              }),
             ],
-          },
-          properties: [
-            {
-              concept: 'Identifier',
-              name: nameGroup.textField,
-            },
-          ],
-          rights: [
-            {
-              concept: 'SelectMembers',
-              name: '',
-              expression: {
-                concept: 'StringLiteral',
-                name: '',
-                value: '',
-              },
-              members: [],
-            },
-          ],
-          assignmentLines: [
-            {
-              concept: 'AssignmentLine',
-              name: '',
-              leftIndex: [0, 0],
-              rightIndex: [0],
-            },
-          ],
-          hideProperties: false,
-          hideDefaults: false,
-          autoConnection: true,
-        },
-      })
-    );
+          }),
+        })
+      );
+    } else {
+      callLogics.push({
+        concept: 'Comment',
+        name: '',
+        value: '存储输入框的值做处理',
+      });
+    }
   }
 
   // 该属性可能不是String类型，如Integer，需要转换下，否则问题处会报错
@@ -287,7 +281,7 @@ export function genSelectItemAddLogic(entity: Entity, nameGroup: NameGroup, view
         }),
       })
     );
-  } else {
+  } else if (entity && entity.getNamespace) {
     callLogics.push(
       NaslLogicItem.Assignment({
         left: itemExpression.expression,
@@ -343,6 +337,10 @@ export function genSelectItemAddLogic(entity: Entity, nameGroup: NameGroup, view
                 {
                   concept: 'StructureProperty',
                   name: nameGroup.prefixField,
+                  typeAnnotation: NaslTypeAnnotation.Reference({
+                    typeNamespace: entity.getNamespace(),
+                    typeName: entity.name,
+                  })
                 },
               ],
             },
@@ -392,6 +390,42 @@ export function genSelectItemAddLogic(entity: Entity, nameGroup: NameGroup, view
       value: '调用后端接口保存数据',
     });
   }
+  const argumentsTemp = [];
+  if(variables.length >= 2) { // 实体
+    argumentsTemp.push(
+      NaslLogicItem.Argument({
+        keyword: 'item',
+        expression: NaslLogicItem.Identifier({
+          name: itemVariable1Snapshot,
+        }),
+      })
+    );
+  } else {
+    if(entity && entity.getNamespace || ['nasl.core.String', 'nasl.core.Long', 'nasl.core.Decimal'].includes(nameGroup.schemaRef)) {
+      argumentsTemp.push(
+        NaslLogicItem.Argument({
+          keyword: 'item',
+          expression: NaslLogicItem.Identifier({
+            name: variableName,
+          }),
+        })
+      );
+    } else {
+      // 其他类型就置空
+      variables = [];
+      callLogics.push({
+        concept: 'Comment',
+        name: '',
+        value: '如下调用addItem将数据添加到下拉框里，item参数填上值',
+      });
+      argumentsTemp.push(
+        NaslLogicItem.Argument({
+          keyword: 'item',
+          expression: null,
+        })
+      );
+    }
+  }
   return NaslNode.Logic({
     name: nameGroup.viewLogicAddItem,
     params: [],
@@ -400,14 +434,7 @@ export function genSelectItemAddLogic(entity: Entity, nameGroup: NameGroup, view
     body: [
       NaslLogicItem.Start,
       ...callLogics,
-      genCallComponentLogic(nameGroup.viewElementMainView, 'addItem', [
-        NaslLogicItem.Argument({
-          keyword: 'item',
-          expression: NaslLogicItem.Identifier({
-            name: variables.length >= 2 ? itemVariable1Snapshot : variableName,
-          }),
-        }),
-      ]),
+      genCallComponentLogic(nameGroup.viewElementMainView, 'addItem', argumentsTemp),
       NaslLogicItem.End,
     ],
     playground: [] as Array<any>,

package/src/templator/genTableBlock.ts

@@ -89,7 +89,7 @@ export function genTableTemplate(entity: Entity, nameGroup: NameGroup, newLogic:
 
     ${properties.map((property) => `${genTableColumnTemplate(property, currentName)}\n`).join('')}
 
-    <u-table-view-column title="操作">
+    <u-table-view-column>
         <template #title><u-text text="操作"></u-text></template>
         <template #cell="current">
             <u-linear-layout gap="small">
@@ -380,7 +380,7 @@ export function genTableTemplateTableDesigner(
       :pagination="true" :showSizer="true" :pageSize="20" :pageNumber="1" style="margin-top: 12px">
       <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) => `${genTableColumnTemplateTableDesigner(property, currentName, optionsMap, dataSourcesMap)}\n`).join('')}
-        <u-table-view-column title="操作">
+        <u-table-view-column>
             <template #title><u-text text="操作"></u-text></template>
             <template #cell="current">
               <u-link style="margin-right:5px;" @click="${nameGroup.viewLogicPreview}">详情</u-link>
@@ -416,7 +416,7 @@ export const genTableColumnTemplateTableDesigner = (property: EntityProperty, cu
     if (hasOptions) {
       const options = optionsMap[property.name];
       return `
-      <u-select style="height: auto;" :preview="true" :value="${valueExpression}" placeholder="--" ${multiple ? 'multiple  tags-overflow="visible" ' : ''}>
+      <u-select style="height: auto;" :preview="true" :value="${valueExpression}" placeholder="--" ${multiple ? ':multiple="true"  tags-overflow="visible" ' : ''}>
                     ${options.map((option: any) => `<u-select-item value="${option.value}"><u-text text="${option.label}"></u-text></u-select-item>`)}
                   </u-select>
       `;
@@ -429,7 +429,7 @@ export const genTableColumnTemplateTableDesigner = (property: EntityProperty, cu
       const { dataSource, multiple, textField, valueField } = dataSourcesMap[property.name];
       return `
       <u-select :preview="true" :value.sync="${valueExpression}" placeholder="--" ${
-        multiple ? 'multiple  tags-overflow="visible" ' : ''
+        multiple ? ':multiple="true"  tags-overflow="visible" ' : ''
       } :dataSource="(params)=>${dataSource?.calleeName}(params)" :textField="${textField}" :valueField="${valueField}"></u-select>`;
     }
     return `<u-text :text="${valueExpression}"></u-text>`;

package/src/templator/genUpdateBlock.ts

@@ -230,25 +230,12 @@ function genSubmitLogic(updateLogic: Logic, nameGroup: NameGroup) {
     name: nameGroup.viewLogicSubmit,
     params: [] as any,
     returns: [] as any,
-    variables: [
-      NaslNode.Variable({
-        name: 'validateResult',
-        typeAnnotation: NaslUITypeAnnotation.ValidateEvent,
-      }),
-    ],
+    variables: [],
     body: [
       NaslLogicItem.Start,
-      NaslLogicItem.Assignment({
-        left: NaslLogicItem.Identifier({
-          name: 'validateResult',
-        }),
-        right: genCallComponentLogic(nameGroup.viewElementMainView, 'validate'),
-      }),
       NaslLogicItem.IfStatement({
         test: NaslLogicItem.MemberExpression({
-          object: NaslLogicItem.Identifier({
-            name: 'validateResult',
-          }),
+          object: genCallComponentLogic(nameGroup.viewElementMainView, 'validate'),
           property: NaslLogicItem.Identifier({
             name: 'valid',
           }),

package/src/templator/utils.ts

@@ -217,7 +217,7 @@ export const NaslUITypeAnnotation = {
   SliderEvent: genNaslUITypeAnnotation('SliderEvent'),
   DateEvent: genNaslUITypeAnnotation('DateEvent'),
   OperatorItemEvent: genNaslUITypeAnnotation('OperatorItemEvent'),
-  ValidateEvent: genNaslUITypeAnnotation('ValidateEvent'),
+  ValidateResult: genNaslUITypeAnnotation('ValidateResult'),
   PaginationEvent: genNaslUITypeAnnotation('PaginationEvent'),
   DurationEvent: genNaslUITypeAnnotation('DurationEvent'),
   TransferEvent: genNaslUITypeAnnotation('TransferEvent'),

package/src/translator/types.ts

@@ -61,6 +61,10 @@ export interface TranslatorState {
    * @description 修改逻辑节点
    */
   nodePathComment?: boolean;
+  /**
+   * 生成时带上 label 和 description 的 comment
+   */
+  descriptionComment?: boolean;
   /**
    * 只生成对应节点的声明信息
    */

package/src/translator/utils.ts

@@ -255,6 +255,12 @@ export function transfromUnionTypeAnnotation(expTypeAnnotation: TypeAnnotation,
   }
 }
 
+export function createDescriptionComment<T extends BaseNode>(state: TranslatorState, node: T, properties: Array<keyof T>) {
+  const content = properties.map((prop) => node[prop]).filter((value) => !!value).join(' ');
+
+  return content.trim() ? `/** ${content} */\n${indent(state.tabSize)}` : '';
+}
+
 export function createDecoratorCode<T extends BaseNode>(state: TranslatorState, node: T, properties: Array<keyof T>, options?: {
   '@'?: boolean;
   concept?: boolean;

package/src/utils/env.ts

@@ -2,8 +2,9 @@
 export const isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined';
 /** Node 环境 */
 export const isNode = process.env.BUILD_TARGET === 'node' || !globalThis.window;
+/** 本地模式 */
+export const isLocalMode = isBrowser && location.hostname.includes('localhost');
+/** 调试模式 */
+export const isDebugMode = isBrowser && (/[?&]debug=true/.test(location.search) || isLocalMode);
 /** 是否是浏览器测试环境 */
-export const isTestBrowser = isBrowser && (
-  /codewave-(test|dev)\.163yun\.com$/.test(location.hostname) ||
-  location.hostname.includes('localhost')
-);
+export const isTestBrowser = isBrowser && (/codewave-(test|dev)\.163yun\.com$/.test(location.hostname) || isLocalMode);

package/src/utils/index.ts

@@ -1,5 +1,5 @@
 import { compare } from 'compare-versions';
-import { BaseNode, LogicItem, AnonymousFunction, Param } from '..';
+import { BaseNode, LogicItem, AnonymousFunction, Param, SubLogic } from '..';
 import type { ForEachStatement, Logic, TypeAnnotation, View, ViewElement } from '..';
 import * as types from '../concepts/utils/types';
 import { getConceptPropertyMap } from '../decorators/index';
@@ -16,6 +16,8 @@ export * from './env';
 export * from './file';
 export * from './time-slicing';
 
+export * as LsCache from './language-cache';
+
 // 查找最近的模块
 export function findClosestModule(node: BaseNode) {
   let moduleNode = node;
@@ -298,8 +300,10 @@ export function getAncestorExistingParamNames(baseNode: types.SyntaxNode) {
         names.add((node as ForEachStatement).item?.name);
         names.add((node as ForEachStatement).index?.name);
         break;
+      case 'Interface':
       case 'Logic':
       case 'View':
+      case 'SubLogic':
         const varList = [
           ...((node as Logic | View).params || []),
         ];
@@ -312,6 +316,30 @@ export function getAncestorExistingParamNames(baseNode: types.SyntaxNode) {
   return names;
 }
 
+/**
+ * 父链上存在的返回值名字
+ * @returns
+ */
+export function getAncestorExistingReturnNames(baseNode: types.SyntaxNode) {
+  let node: BaseNode = baseNode;
+  const names: Set<string> = new Set();
+  while (node) {
+    node = node.parentNode;
+    switch (node?.concept) {
+      case 'Logic':
+      case 'SubLogic':
+        const varList = [
+          ...((node as Logic | SubLogic).returns || []),
+        ];
+        varList?.forEach((variable) => {
+          names.add(variable?.name);
+        });
+        break;
+    }
+  }
+  return names;
+}
+
 
 /**
  * 父链上存在的变量名字
@@ -510,3 +538,24 @@ export function getDescription(title: string, description: string) {
   }
   return desc;
 }
+
+/**
+ * 将url转换为正则的
+ * @param url
+ * @returns
+ */
+export function transAssetsToRegx(assets: any[], key: string) {
+  return new RegExp(assets.map((asset) => {
+    return `(https?:)?` + asset[key]?.replace(/^(?:https?:)?/i, '')?.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+  }).join('|'), 'g');
+}
+
+/**
+ * 获取Asset
+ * @param assetsMap
+ * @param url
+ * @returns
+ */
+export function getAssetFromAssetsMap(assetsMap: Map<string, any>, url: string) {
+  return assetsMap?.get(url) || assetsMap?.get(`http:${url}`) || assetsMap?.get(`https:${url}`);
+}

package/src/utils/language-cache/constant.ts

@@ -0,0 +1,37 @@
+import { isBrowser } from '../env';
+
+/** 数据库名称 */
+export const DbName = 'language-cache';
+
+/**
+ * 缓存时长
+ *
+ * @description 3 天时间
+ */
+export const NaslCacheLimit = 3 * 24 * 60 * 60 * 1000;
+
+/** 数据库储存表 */
+export enum StoreName {
+  Nasl = 'Nasl',
+}
+
+/**
+ * 标签页 ID
+ *
+ * @description 应用初始化时通过 sessionStorage 获取，Tab 页刷新时不会变化，tab 页关闭后消失
+ */
+export const tabId = (() => {
+  if (!isBrowser) {
+    return 0;
+  }
+
+  const tabId = sessionStorage.getItem('tabId');
+
+  if (tabId) {
+    return Number(tabId);
+  }
+
+  const newId = Date.now();
+  sessionStorage.setItem('tabId', String(newId));
+  return newId;
+})();

package/src/utils/language-cache/index.ts

@@ -0,0 +1,2 @@
+export * from './nasl';
+export * from './types';

package/src/utils/language-cache/nasl.ts

@@ -0,0 +1,83 @@
+import { isNode } from '../env';
+import { StoreName, DbName, NaslCacheLimit, tabId } from './constant';
+import { LanguageDatabase, NaslCacheData, NaslCacheUpdateData } from './types';
+
+/** 缓存数据库 */
+const database = isNode
+  ? undefined
+  : import('idb').then((idb) => idb.openDB<LanguageDatabase>(DbName, 1, {
+      upgrade(db) {
+        db.createObjectStore(StoreName.Nasl);
+      },
+      blocked(currentVersion, blockedVersion, event) {
+        // TODO: 超出容量限制
+      },
+    }));
+
+export async function canUseNaslCache(appId: string, globalChangedTime: number) {
+  const data = await getNaslCacheWithoutCheck(appId);
+  const now = Date.now();
+
+  if (!data || data.forceUpdate || ((now - data.createdTime) > NaslCacheLimit)) {
+    return false;
+  }
+
+  // 缓存等于服务端，则表示可以使用缓存
+  return data.updatedTime === globalChangedTime;
+}
+
+/**
+ * 取出缓存
+ *
+ * @description 只是取出缓存，并不校验缓存的有效性
+ */
+export async function getNaslCacheWithoutCheck(appId: string) {
+  if (isNode) {
+    return;
+  }
+
+  const db = await database;
+  const data = await db.get(StoreName.Nasl, appId);
+  return data;
+}
+
+export async function clearCache(appId: string) {
+  if (isNode) {
+    return;
+  }
+
+  const db = await database;
+  await db.delete(StoreName.Nasl, appId);
+}
+
+export async function updateNaslCache(appId: string, data: NaslCacheUpdateData) {
+  if (isNode) {
+    return;
+  }
+
+  const db = await database;
+  const cache = await db.get(StoreName.Nasl, appId);
+
+  // 数据库中数据为新的，不更新缓存
+  if (cache && (data.globalChangedTime <= cache.updatedTime)) {
+    return;
+  }
+
+  const newData: NaslCacheData = {
+    id: appId,
+    tabId: tabId,
+    data: data.getData(),
+    updatedTime: data.globalChangedTime,
+    forceUpdate: cache
+      ? (
+        cache.forceUpdate ||
+        data.preGlobalChangedTime !== cache.updatedTime ||
+        tabId !== cache.tabId
+      )
+      : false,
+    createdTime: cache?.createdTime ?? Date.now(),
+  };
+
+  // await db.delete(StoreName.Nasl, appId);
+  await db.put(StoreName.Nasl, newData, appId);
+}

package/src/utils/language-cache/types.ts

@@ -0,0 +1,48 @@
+import { DBSchema } from 'idb';
+import { StoreName } from './constant';
+
+export type NaslData = object;
+
+export interface NaslCacheData {
+  /** 应用编号 appId */
+  id: string;
+  /** 开始缓存的时间 */
+  createdTime: number;
+  /**
+   * 变更时间
+   *
+   * @description 后端为空时，默认为当前时间
+   */
+  updatedTime: number;
+  /**
+   * 强制弃用缓存标志位
+   *
+   * 在某些特殊情况下，比如 A、B 两个人，A 先改了页面 PageA，然后 B 改了页面 PageB，再然后 A 又修改了页面 PageA。
+   * 此时 A 的电脑上标志位是最新的，所以他刷新页面是会走缓存，而不会走后端。
+   * 此时两个后端的 Nasl 已经不同，但是因为两个人改的是不同的页面，所以继续走缓存也没关系。
+   * 当 A 进入 B 页面的时候，后端会判定产生互锁，让 A 强制刷新页面，此时 A 的标志位是最新的，所以 A 即便刷新页面也会走缓存，
+   * 所以这里就需要另外的标志位来让 A 强制不走缓存。
+   */
+  forceUpdate: boolean;
+  /**
+   * 当前标签页编号
+   */
+  tabId: number;
+  /** 应用 Nasl 数据 */
+  data: NaslData;
+}
+
+export interface NaslCacheUpdateData {
+  preGlobalChangedTime: number;
+  globalChangedTime: number;
+  getData: () => NaslData;
+}
+
+export interface LanguageDatabase extends DBSchema {
+  /** Nasl 缓存数据库 */
+  [StoreName.Nasl]: {
+    /** AppId 为键名 */
+    key: string;
+    value: NaslCacheData;
+  };
+}

package/src/utils/time-slicing/controller.ts

@@ -16,7 +16,6 @@ import {
   NextState,
   TheoreticalLimitCalculationCoefficient as Coefficient,
 } from './constant';
-import { delayInWorker } from '../delay';
 
 /** 时间分片控制器 */
 export class TimeSlicingController {

package/src/utils/types.ts

@@ -15,3 +15,23 @@ export interface FileNode extends BaseNode {
 }
 
 export type EmbeddedTSFileGenerator = Generator<void, EmbeddedTSFileResult, string>;
+
+export interface FullResponse<D> {
+  headers: Record<string, string>;
+  data: {
+    code: number;
+    msg: string;
+    success: boolean;
+    result: D[];
+  };
+}
+
+export interface BreakpointStatus {
+  path: string;
+  breakpointStatus: null | 'ENABLED' | 'DISABLED'
+}
+
+export interface BatchInstructResult {
+  globalChangedTime: number;
+  preGlobalChangedTime: number;
+}