@lcap/nasl 3.5.0-beta.4 → 3.6.0-alpha.2

package/src/templator/genGetBlock.ts

@@ -69,6 +69,7 @@ export function genH5GetTemplate(entity: Entity, nameGroup: NameGroup) {
 
 export function genGetBlock(entity: Entity, oldNode: ViewElement) {
   const likeComponent = oldNode?.likeComponent;
+  const isBusinessComponent = likeComponent.concept === 'BusinessComponent';
   const { ns } = entity;
   const getLogic = ns?.logics?.find((logic) => logic.name === `get`);
 
@@ -85,7 +86,7 @@ export function genGetBlock(entity: Entity, oldNode: ViewElement) {
 {
     "viewParams": [
         {
-            "concept": "Param",
+            "concept": "${isBusinessComponent ? 'ParamWithGroup' : 'Param'}",
             "name": "${nameGroup.viewParamId}",
             "typeAnnotation": ${JSON.stringify(NaslCoreTypeAnnotation.Long)}
         }

package/src/templator/genTableBlock.ts

@@ -62,7 +62,7 @@ export function genTableColumnTemplate(property: EntityProperty, currentName: st
  * @param entity 实体
  * @param nameGroup 命名组
  */
-export function genTableTemplate(entity: Entity, nameGroup: NameGroup,newLogic: any, modifyable?: boolean, entryFromCall?: string) {
+export function genTableTemplate(entity: Entity, nameGroup: NameGroup, newLogic: any, modifyable?: boolean, entryFromCall?: string) {
   const currentName = nameGroup.currentName || 'current';
   const properties = entity.properties.filter(filterProperty('inTable'));
   let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order)`;
@@ -277,7 +277,9 @@ export function genTableColumnBlock(property: EntityProperty, oldNode: ViewEleme
   let dataSourceValue = `(params) => ${entityLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order)`;
   return `
 <template>
-    <u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" :pagination="true" :page-size="20" :page-number="1" :show-sizer="true" data-schema="${nameGroup.structure}">
+    <u-table-view ref="${
+      nameGroup.viewElementMainView
+    }" :data-source="${dataSourceValue}" :pagination="true" :page-size="20" :page-number="1" :show-sizer="true" data-schema="${nameGroup.structure}">
         ${properties.map((property) => `${genTableColumnTemplate(property)}\n`).join('')}
     </u-table-view>
 </template>
@@ -294,3 +296,126 @@ export function genTableColumnBlock(property: EntityProperty, oldNode: ViewEleme
 }
 
 export default genTableBlock;
+
+export function genTableTemplateTableDesigner(
+  entity: Entity,
+  nameGroup: NameGroup,
+  newLogic: any,
+  modifyable?: boolean,
+  entryFromCall?: string,
+  optionsMap?: any
+) {
+  const currentName = nameGroup.currentName || 'current';
+  const properties = entity.properties.filter(filterProperty('inTable'));
+  let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order)`;
+  if (['genCurdMultipleKeyBlock'].includes(entryFromCall)) {
+    dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order,${nameGroup.viewVariableFilter})`;
+  }
+  return `
+    <u-linear-layout style="background: #fff; padding: 15px" >
+      <u-button color="primary" @click="${nameGroup.viewLogicCreate}" style="margin-right: 5px" icon="add">新 增</u-button>
+      <u-uploader
+        style="--custom-start: auto;margin-right: 5px"
+        display="inline"
+        url="/api/${entity.name.toLowerCase()}/import"
+        url-field="filePath"
+        :limit="999"
+        max-size="50MB"
+        converter="json"
+        :file-icon-switcher="false"
+        :download-icon-switcher="false"
+        :file-size="false"
+        :show-file-list="false"
+        name="file"
+        accept=""
+        @success="${nameGroup.viewLogicReload}"
+      >
+        <template #file-list>
+          <i-ico
+            style="margin: 0px 8px 0px 0px"
+            flag="file-icon"
+            name="file-default"
+            icotype="only"
+          ></i-ico>
+          <u-text
+            style="
+              margin: 0px 8px 0px 0px;
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              display: inherit;
+            "
+            flag="file-name"
+            text="文件名称"
+          ></u-text>
+          <u-text style="margin: 0px 8px 0px 0px" flag="file-size" text="文件大小"></u-text>
+          <i-ico
+            style="margin: 0px 8px 0px 0px"
+            flag="download-icon"
+            name="download"
+            icotype="only"
+          ></i-ico>
+        </template>
+        <u-button color="default" icon="upload" text="上传"></u-button
+      ></u-uploader>
+      <u-button style="margin-right: 5px" icon="download" @click="${nameGroup.viewLogicExportData}">导 出</u-button>
+      <u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
+      value-field="${nameGroup.viewVariableEntity}.id"
+      :pagination="true" :show-sizer="true" :page-size="20" :page-number="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)}\n`).join('')}
+        <u-table-view-column title="操作">
+            <template #title><u-text text="操作"></u-text></template>
+            <template #cell="current">
+              <u-link style="margin-right:5px;" @click="${nameGroup.viewLogicPreview}">详情</u-link>
+              <u-link ${modifyable ? `@click="${nameGroup.viewLogicModify || 'modify'}"` : ''} style="margin-right:5px;">编辑</u-link>
+              <u-link style="margin-right:5px;" @click="${nameGroup.viewLogicOpenDelModal}">删除</u-link>
+            </template>
+        </u-table-view-column>
+      </u-table-view>
+    </u-linear-layout>
+
+`;
+}
+
+export const genTableColumnTemplateTableDesigner = (property: EntityProperty, currentName: string = 'current', optionsMap?: any) => {
+  const { entity } = property;
+  const hasOptions = optionsMap?.[property.name];
+
+  const dataSource = entity.parentNode as DataSource;
+  const lowerEntityName = utils.firstLowerCase(entity.name);
+  let valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
+  const title = (property.label || property.name).replace(/"/g, '&quot;');
+  const multiple = property?.typeAnnotation?.typeName === 'List';
+
+  if (property.relationEntity) {
+    const relationLowerEntityName = utils.firstLowerCase(property.relationEntity);
+    const relationEntity = dataSource?.findEntityByName(property.relationEntity);
+    const displayedProperty = getFirstDisplayedProperty(relationEntity);
+    valueExpression = `${currentName}.item.${relationLowerEntityName}.${displayedProperty?.name || property.relationProperty}`;
+  }
+
+  const getText = (property: EntityProperty) => {
+    if (hasOptions) {
+      const options = optionsMap[property.name];
+      return `
+      <u-select :preview="true" :value="${valueExpression}" placeholder="--" ${multiple ? 'multiple' : ''}>
+                    ${options.map((option: any) => `<u-select-item value="${option.value}" text="${option.label}">${option.label}</u-select-item>`)}
+                  </u-select>
+      `;
+    } else if (property.typeAnnotation.typeName === 'Boolean') {
+      return `
+            <u-text v-if="${valueExpression}" text="是"></u-text>
+            <u-text v-if="!${valueExpression}" text="否"></u-text>
+            `;
+    }
+    return `<u-text :text="${valueExpression}"></u-text>`;
+  };
+
+  return `<u-table-view-column field="${lowerEntityName}.${property.name}">
+    <template #title><u-text text="${title}"></u-text></template>
+    <template #cell="current">
+      ${getText(property)}
+    </template>
+</u-table-view-column>`;
+};

package/src/templator/genUpdateBlock.ts

@@ -308,6 +308,7 @@ function genLoadLogic(getLogic: Logic, nameGroup: NameGroup) {
 // 生成修改区块
 export function genUpdateBlock(entity: Entity, oldNode: ViewElement) {
   const likeComponent = oldNode?.likeComponent;
+  const isBusinessComponent = likeComponent.concept === 'BusinessComponent';
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
   const { ns } = entity;
@@ -357,7 +358,7 @@ export function genUpdateBlock(entity: Entity, oldNode: ViewElement) {
 {
     "viewParams": [
         {
-            "concept": "Param",
+            "concept": "${isBusinessComponent ? 'ParamWithGroup' : 'Param'}",
             "name": "${nameGroup.viewParamId}",
             "typeAnnotation": ${JSON.stringify(NaslCoreTypeAnnotation.Long)}
         }

package/src/translator/utils.ts

@@ -58,6 +58,22 @@ export function isSameRange(rangeA: Range, rangeB : Range) {
   return rangeA.start.offset === rangeB.start.offset && rangeA.end.offset === rangeB.end.offset;
 }
 
+const statementMap = [
+  "Assignment",
+  "BatchAssignment",
+  "IfStatement",
+  "ForEachStatement",
+  "SwitchStatement",
+  "WhileStatement",
+  "Match",
+  "Comment",
+  "CallLogic",
+  "CallInterface",
+  "Destination",
+  "JSBlock",
+  'JavaLogic'
+];
+
 /**
  * 翻译方法修饰器
  *
@@ -115,6 +131,10 @@ export function withSourceMap() {
           end: shiftPosition(state.position, code),
         });
 
+        if (isNatural && statementMap?.includes(this.concept) && code) {
+          before += `// nodePath: '${this.nodePath}' \n`;
+        }
+
         return before + code;
     };
 
@@ -160,8 +180,19 @@ export function withSourceMapGenerator(target: any, key: string, descriptor: Pro
     const code = yield* oldMethod.call(this, state, ...args);
     yield;
 
+    const start = {
+      ...state.position
+    };
+    if (this.concept === 'BusinessComponent') {
+      const lines: string[] = code.split('\n');
+      const lineOffset = lines.findIndex((item) => item.startsWith('export class '));
+      if (lineOffset) {
+        start.line = start.line + lineOffset + 1;
+        start.offset = 13;
+      }
+    }
     state.sourceMap?.set(this, {
-      start: state.position,
+      start,
       end: shiftPosition(state.position, code),
     });
 

package/src/utils/index.ts

@@ -1,5 +1,8 @@
 import { compare } from 'compare-versions';
-import { BaseNode, LogicItem } from '..';
+import { BaseNode, LogicItem, AnonymousFunction, Param } from '..';
+import type { ForEachStatement, Logic, View } from '..';
+import * as types from '../concepts/utils/types';
+import { getConceptPropertyMap } from '../decorators/index';
 import { traverse } from './traverse';
 // import TypeAnnotation from '../concepts/TypeAnnotation__';
 // import App from '../concepts/App__';
@@ -202,3 +205,210 @@ export function attrConvertCamelCase(str: string) {
   });
   return strList.join('');
 }
+
+export class AnonymousFnNode {
+  node: types.SyntaxNode;
+  descendants: AnonymousFnNode[];
+}
+
+/**
+ * 收集匿名函数
+ * @param param0
+ * @returns
+ */
+function collectAnonymousFn({
+  anonymousFnNode,
+  cb
+}: {
+  anonymousFnNode: AnonymousFnNode;
+  cb: (anonymousFnNode: AnonymousFnNode) => void
+}) {
+  const descendantsAnonyList: any = cb(anonymousFnNode);
+  const { node } = anonymousFnNode;
+  const propertyMap = getConceptPropertyMap(node?.concept);
+  if (!propertyMap) {
+    return;
+  }
+  for (const property of propertyMap.keys()) {
+    const child = node[property as keyof BaseNode];
+    if (!child) {
+      continue;
+    } else if (Array.isArray(child)) {
+      child.forEach((node: types.SyntaxNode) => collectAnonymousFn({
+        anonymousFnNode: {
+          node,
+          descendants: descendantsAnonyList
+        },
+        cb
+      }));
+    } else {
+      collectAnonymousFn({
+        anonymousFnNode: {
+          node: child,
+          descendants: descendantsAnonyList
+        },
+        cb
+      });
+    }
+  }
+}
+
+function getAnonymousFnNodes(node: types.SyntaxNode) {
+  const anonymousFnNodes: AnonymousFnNode[] = [];
+  // 1.匿名函数可能在里层，如：ListDistinctBy
+  // 2.存在多级匿名数据结构
+  collectAnonymousFn({
+    anonymousFnNode: {
+      node,
+      descendants: anonymousFnNodes
+    },
+    cb: (anonymousFnNode) => {
+      const { node, descendants } = anonymousFnNode;
+      if (node?.concept === 'AnonymousFunction') {
+        const newAnonymousNode: any = {
+          node,
+          descendants: [],
+        };
+        descendants?.push(newAnonymousNode);
+        return newAnonymousNode.descendants;
+      }
+      return descendants;
+    }
+  });
+  return anonymousFnNodes;
+}
+
+/**
+ * 父链上存在的参数名字
+ * @returns
+ */
+function getAncestorExistingParamNames(baseNode: types.SyntaxNode) {
+  let node: BaseNode = baseNode;
+  const names: Set<string> = new Set();
+  while (node) {
+    node = node.parentNode;
+    switch (node?.concept) {
+      case 'AnonymousFunction':
+        (node as AnonymousFunction).params.forEach((param: Param) => {
+          names.add(param.name);
+        });
+        break;
+      case 'ForEachStatement':
+        names.add((node as ForEachStatement).item?.name);
+        names.add((node as ForEachStatement).index?.name);
+        break;
+      case 'Logic':
+      case 'View':
+        const varList = [
+          ...((node as Logic | View).params || []),
+          ...((node as Logic).returns || []),
+          ...((node as Logic | View).variables || [])
+        ];
+        varList?.forEach((variable) => {
+          names.add(variable?.name);
+        });
+        break;
+    }
+  }
+  return names;
+}
+
+/**
+ * 确保匿名函数的参数名称都是不重复的，且更新内部的引用关系
+ * @param param0
+ */
+function ensureAnonymousFnsParamName({
+  ancestorParamNames,
+  anonymousFnNodes,
+}: {
+  ancestorParamNames: Set<string>;
+  anonymousFnNodes: AnonymousFnNode[];
+}) {
+  const paramInfoMapList: Map<string, any>[] = [];
+  anonymousFnNodes.forEach((anonymousFnNode) => {
+    const { node: anonymousFn, descendants } = anonymousFnNode || {};
+    const tempParamInfoMap = (anonymousFn as AnonymousFunction)?.ensureParamName(ancestorParamNames);
+    paramInfoMapList.push(tempParamInfoMap);
+    if (Array.isArray(descendants)) {
+      const paramNames = new Set([...ancestorParamNames]);
+      tempParamInfoMap.forEach((value) => {
+        paramNames.add(value.newName);
+      });
+      const descendantTempParamInfoMap = ensureAnonymousFnsParamName({
+        ancestorParamNames: paramNames,
+        anonymousFnNodes: descendants,
+      });
+      paramInfoMapList.push(...descendantTempParamInfoMap);
+    }
+  });
+  return paramInfoMapList;
+}
+
+/**
+ * 校验匿名函数的局部变量是否重名
+ */
+export function checkParamNameOfAnonymousFunction(node: types.SyntaxNode) {
+  const anonymousFnNodes: any = getAnonymousFnNodes(node);
+  // 从外到里计算更改的name
+  const paramInfoMapList = ensureAnonymousFnsParamName({
+    ancestorParamNames: getAncestorExistingParamNames(node),
+    anonymousFnNodes
+  });
+  paramInfoMapList?.forEach((paramInfoMap: Map<string, any>) => {
+    paramInfoMap.forEach((paramInfo) => {
+      const { newName, param, identifiers } = paramInfo || {};
+      param?.update({
+        name: newName,
+      });
+      if (Array.isArray(identifiers)) {
+        identifiers.forEach((identifier) => {
+          identifier?.update({
+            name: newName,
+          });
+        });
+      }
+    });
+  });
+}
+
+// 获取内部匿名函数的局部变量
+function collectAnonymousFnNodesParams(node: types.SyntaxNode) {
+  const paramNames: Set<string> = new Set();
+  const anonymousFnNodes = getAnonymousFnNodes(node);
+  if (Array.isArray(anonymousFnNodes)) {
+    anonymousFnNodes.forEach((anonymousFnNode) => {
+      const { node: anonymousFn, descendants } = anonymousFnNode || {};
+      (anonymousFn as AnonymousFunction).params.forEach((param: Param) => {
+        paramNames.add(param.name);
+      });
+      if (Array.isArray(descendants)) {
+        descendants.forEach(({
+          node: descendantNode
+        }) => {
+          const descendantParamNames = collectAnonymousFnNodesParams(descendantNode);
+          descendantParamNames.forEach((descendantParamName) => {
+            paramNames.add(descendantParamName);
+          });
+        });
+      }
+    });
+  }
+  return paramNames;
+}
+
+/**
+ * 新的参数名是否存在同名
+ * @param param0
+ */
+export function hasParamNameOfAnonymousFunction({
+  node,
+  newName,
+}: {
+  node: types.SyntaxNode,
+  newName: string
+}) {
+  const ancestorParamNames = getAncestorExistingParamNames(node);
+  const anonymousFnNodesParams = collectAnonymousFnNodesParams(node);
+  const paramNames = new Set([...ancestorParamNames.values(), ...anonymousFnNodesParams.values()]);
+  return paramNames.has(newName);
+}

package/ts-worker/src/index.js

@@ -370,6 +370,7 @@ const context = {
                 = item.sortText === '11'
                 && item.name !== 'arguments'
                 && item.kind !== 'function'
+                && item.kind !== 'local function'
                 && item.kind !== 'module'
                 && item.kind !== 'method'
                 && item.kind !== 'class'