@lcap/nasl 3.7.2-beta.4 → 3.7.3-beta.2

package/src/templator/genSelectBlock.ts

@@ -180,14 +180,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({
@@ -213,57 +213,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，需要转换下，否则问题处会报错
@@ -285,7 +279,7 @@ export function genSelectItemAddLogic(entity: Entity, nameGroup: NameGroup, view
         }),
       })
     );
-  } else {
+  } else if (entity && entity.getNamespace) {
     callLogics.push(
       NaslLogicItem.Assignment({
         left: itemExpression.expression,
@@ -341,6 +335,10 @@ export function genSelectItemAddLogic(entity: Entity, nameGroup: NameGroup, view
                 {
                   concept: 'StructureProperty',
                   name: nameGroup.prefixField,
+                  typeAnnotation: NaslTypeAnnotation.Reference({
+                    typeNamespace: entity.getNamespace(),
+                    typeName: entity.name,
+                  })
                 },
               ],
             },
@@ -390,6 +388,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: [],
@@ -398,14 +432,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/utils/index.ts

@@ -224,7 +224,7 @@ function collectAnonymousFn({
   cb
 }: {
   anonymousFnNode: AnonymousFnNode;
-  cb: (anonymousFnNode: AnonymousFnNode) => void
+  cb: (anonymousFnNode: AnonymousFnNode) => void;
 }) {
   const descendantsAnonyList: any = cb(anonymousFnNode);
   const { node } = anonymousFnNode;
@@ -442,7 +442,7 @@ export function hasParamNameOfAnonymousFunction({
   newName,
 }: {
   node: types.SyntaxNode,
-  newName: string
+  newName: string;
 }) {
   const ancestorParamNames = getAncestorExistingVarNames(node);
   const anonymousFnNodesParams = collectAnonymousFnNodesParams(node);
@@ -484,3 +484,38 @@ export function isSameInType(source: TypeAnnotation[], target: TypeAnnotation[])
   });
   return flag;
 }
+
+/**
+ * 获取节点对应的注释
+ */
+export function getDescription(title: string, description: string) {
+  let desc = '';
+  if (title || description) {
+    desc += '// ';
+    desc += title ? `${title}` : '';
+    desc += (title && description) ? ': ' : '';
+    desc += description ? `${description}` : '';
+  }
+  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}`);
+}