@lcap/nasl 3.4.0-alpha.2 → 3.4.0-beta.2

package/src/concepts/StringInterpolation__.ts

@@ -32,7 +32,10 @@ export class StringInterpolation extends LogicItem {
   /**
    * 插值表达式
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+    isArray: true,
+  })
   expressions: Array<LogicItem> = [];
 
   /**

package/src/concepts/StructureProperty__.ts

@@ -56,7 +56,9 @@ export class StructureProperty extends BaseNode {
   /**
    * 类型
    */
-  @property('TypeAnnotation')
+  @property({
+    objectRef: 'TypeAnnotation',
+  })
   // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 

package/src/concepts/Structure__.ts

@@ -55,13 +55,19 @@ export class Structure extends BaseNode {
   /**
    * 类型参数列表
    */
-  @property('TypeParam')
+  @property({
+    objectRef: 'TypeParam',
+    isArray: true,
+  })
   typeParams: Array<TypeParam> = null;
 
   /**
    * 数据结构属性列表
    */
-  @property('StructureProperty')
+  @property({
+    objectRef: 'StructureProperty',
+    isArray: true,
+  })
   properties: Array<StructureProperty> = [];
 
   /**

package/src/concepts/SwitchCase__.ts

@@ -30,14 +30,19 @@ export class SwitchCase extends LogicItem {
   /**
    * 条件表达式
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   test!: LogicItem;
 
   /**
    * then
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+    isArray: true,
+  })
   consequent: Array<LogicItem> = [];
 
   /**

package/src/concepts/SwitchStatement__.ts

@@ -32,7 +32,10 @@ export class SwitchStatement extends LogicItem {
   /**
    * 选择分支情况列表
    */
-  @property('SwitchCase')
+  @property({
+    objectRef: 'SwitchCase',
+    isArray: true,
+  })
   cases: Array<SwitchCase> = [];
 
   /**

package/src/concepts/TriggerEvent__.ts

@@ -36,7 +36,10 @@ export class TriggerEvent extends BaseNode {
   /**
    * 类型标注列表
    */
-  @property('TypeAnnotation')
+  @property({
+    objectRef: 'TypeAnnotation',
+    isArray: true,
+  })
   callBackLogic: Array<TypeAnnotation> = [];
 
   /**

package/src/concepts/TypeAnnotation__.ts

@@ -139,13 +139,19 @@ export class TypeAnnotation extends BaseNode {
   /**
    * 类型参数
    */
-  @property('TypeAnnotation')
+  @property({
+    objectRef: 'TypeAnnotation',
+    isArray: true,
+  })
   typeArguments?: Array<TypeAnnotation> = null;
 
   /**
    * 返回类型
    */
-  @property('TypeAnnotation')
+  @property({
+    objectRef: 'TypeAnnotation',
+    isArray: true,
+  })
   returnType?: Array<TypeAnnotation> = null;
 
   /**
@@ -158,7 +164,10 @@ export class TypeAnnotation extends BaseNode {
   /**
    * 匿名数据结构属性
    */
-  @property('StructureProperty')
+  @property({
+    objectRef: 'StructureProperty',
+    isArray: true,
+  })
   properties?: Array<StructureProperty> = null;
 
   /**
@@ -1163,7 +1172,7 @@ export class TypeAnnotation extends BaseNode {
 
   // 是否是系统类型
   isSystemType() {
-    return ['nasl.ui', 'nasl.auth', 'nasl.http', 'nasl.process'].includes(this.typeNamespace)
+    return ['nasl.ui', 'nasl.auth', 'nasl.http', 'nasl.process'].includes(this.typeNamespace);
   }
 
   // 是否包含系统类型

package/src/concepts/UnaryExpression__.ts

@@ -32,7 +32,9 @@ export class UnaryExpression extends LogicItem {
   /**
    * 参数
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   argument!: LogicItem;
 

package/src/concepts/ValidationRule__.ts

@@ -57,20 +57,27 @@ export class ValidationRule extends LogicItem {
   /**
    * 实际参数
    */
-  @property('Argument')
+  @property({
+    objectRef: 'Argument',
+    isArray: true,
+  })
   arguments: Array<Argument> = [];
 
   /**
    * 错误信息
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   errorMessage!: LogicItem;
 
   /**
    * 验证对象
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   target!: LogicItem;
 

package/src/concepts/Variable__.ts

@@ -72,7 +72,9 @@ export class Variable extends BaseNode {
   /**
    * 类型
    */
-  @property('TypeAnnotation')
+  @property({
+    objectRef: 'TypeAnnotation',
+  })
   // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 

package/src/concepts/ViewComponent__.ts

@@ -63,37 +63,55 @@ export class ViewComponent extends BaseNode {
   /**
    * 组件属性列表
    */
-  @property('Attribute')
+  @property({
+    objectRef: 'Attribute',
+    isArray: true,
+  })
   attrs: Array<Attribute> = [];
 
   /**
    * 组件事件列表
    */
-  @property('Event')
+  @property({
+    objectRef: 'Event',
+    isArray: true,
+  })
   events: Array<Event> = [];
 
   /**
    * 插槽列表
    */
-  @property('Slot')
+  @property({
+    objectRef: 'Slot',
+    isArray: true,
+  })
   slots: Array<Slot> = [];
 
   /**
    * 逻辑列表
    */
-  @property('Logic')
+  @property({
+    objectRef: 'Logic',
+    isArray: true,
+  })
   methods: Array<Logic> = [];
 
   /**
    * 页面组件列表
    */
-  @property('ViewComponent')
+  @property({
+    objectRef: 'ViewComponent',
+    isArray: true,
+  })
   children: Array<ViewComponent> = [];
 
   /**
    * 页面代码块列表
    */
-  @property('ViewBlock')
+  @property({
+    objectRef: 'ViewBlock',
+    isArray: true,
+  })
   blocks: Array<ViewBlock> = [];
 
   /**

package/src/concepts/ViewElement__.ts

@@ -325,37 +325,54 @@ export class ViewElement extends BaseNode {
   /**
    * 元素绑定属性列表
    */
-  @property('BindAttribute')
+  @property({
+    objectRef: 'BindAttribute',
+    isArray: true,
+  })
   bindAttrs: Array<BindAttribute> = [];
 
   /**
    * 元素绑定事件列表
    */
-  @property('BindEvent')
+  @property({
+    objectRef: 'BindEvent',
+    isArray: true,
+  })
   bindEvents: Array<BindEvent> = [];
 
   /**
    * 元素指令列表
    */
-  @property('BindDirective')
+  @property({
+    objectRef: 'BindDirective',
+    isArray: true,
+  })
   bindDirectives: Array<BindDirective> = [];
 
   /**
    * 绑定的角色
    */
-  @property()
+  @property({
+    isArray: true,
+  })
   bindRoles: Array<string> = [];
 
   /**
    * 元素绑定样式列表
    */
-  @property('BindStyle')
+  @property({
+    objectRef: 'BindStyle',
+    isArray: true,
+  })
   bindStyles: Array<BindStyle> = [];
 
   /**
    * 子元素列表
    */
-  @property('ViewElement')
+  @property({
+    objectRef: 'ViewElement',
+    isArray: true,
+  })
   children: Array<ViewElement> = [];
 
   /**
@@ -1586,76 +1603,79 @@ export class ViewElement extends BaseNode {
 
   toEmbeddedTSVariableFunctionDefinition(state?: TranslatorState, parentLevel?: number): string {
     let code = '';
-      code += indent((state?.tabSize || 0) + 2);
-      let levelIndex = parentLevel || 0;
-      code += `${this.name}: () => {\n`;
-      if (this.tag === 'template' && this.haveScope() && this.parentNode instanceof ViewElement) {
-        const currentType = this.parentNode.tag === 'u-table-view-column-dynamic' ? 'CurrentDynamic' : 'Current'
-        const _this = this.parentNode
-        let genericity = '';
-        if (_this.tag === 'u-table-view-column-dynamic') {
-          genericity += `<${(_this.parentNode as any).__tsVariableDataSourceTypeName}, ${(_this as any).__tsVariableDataSourceTypeName}>`;
-        } else {
-          let targetNode: any = _this
-          while (!targetNode.__tsVariableDataSourceTypeName && targetNode?.parentNode instanceof ViewElement) {
-            targetNode = targetNode.parentNode
-          }
-          genericity += `<${(targetNode as any).__tsVariableDataSourceTypeName ?? 'any'}>`;
-        }
-        code += indent((state?.tabSize || 0) + 3);
-        code += `let current${levelIndex === 0 ? '' : levelIndex}: nasl.ui.${currentType}${genericity}\n`
-        levelIndex++;
-      }
-      const attr = this.bindAttrs?.find((item) => item.name === 'data-source')
-      if (attr && attr.expression) {
-        const datasourceName = `datasourceName${this.name}`;
-        (this as any).__tsVariableDataSourceTypeName = datasourceName;
-        if (
-          attr.expression instanceof MemberExpression ||
-          attr.expression instanceof Identifier ||
-          attr.expression instanceof CallLogic
-        ) {
-          const extraParams = {
-            tabSize: 4,
-            inline: true,
-            noNeedParams: true,
-          };
-          let value = attr.expression.toEmbeddedTS(
-            shiftState(state, code, attr.expression.concept === 'CallLogic' ? extraParams : {}),
-          );
-          code += indent((state?.tabSize || 0) + 3);
-          code += `type ${datasourceName} = nasl.ui.GetItemTypeFromDataSource<typeof ${value}>;\n`;
-          // code += `let current${levelIndex === 0 ? '' : levelIndex}: nasl.ui.${currentType}<nasl.ui.GetItemTypeFromDataSource<typeof ${value}>>;\n`;
-        } else {
-          code += indent((state?.tabSize || 0) + 3);
-          code += `const __funcName = () => { return `;
-          code += attr.expression.toEmbeddedTS(shiftState(state, code));
-          code += '};\n';
-          code += indent((state?.tabSize || 0) + 3);
-          code += `type ${datasourceName} = nasl.ui.GetItemTypeFromDataSource<ReturnType<typeof __funcName>>;\n`;
-          // code += `let current${levelIndex === 0 ? '' : levelIndex}: nasl.ui.${currentType}<nasl.ui.GetItemTypeFromDataSource<ReturnType<typeof __funcName>>>;\n`;
+    code += indent((state?.tabSize || 0) + 2);
+    let levelIndex = parentLevel || 0;
+    code += `${this.name}: () => {\n`;
+    if (this.tag === 'template' && this.haveScope() && this.parentNode instanceof ViewElement) {
+      const currentType = this.parentNode.tag === 'u-table-view-column-dynamic' ? 'CurrentDynamic' : 'Current';
+      const _this = this.parentNode;
+      let genericity = '';
+      if (_this.tag === 'u-table-view-column-dynamic') {
+        genericity += `<${(_this.parentNode as any).__tsVariableDataSourceTypeName}, ${
+          (_this as any).__tsVariableDataSourceTypeName
+        }>`;
+      } else {
+        let targetNode: any = _this;
+        while (!targetNode.__tsVariableDataSourceTypeName && targetNode?.parentNode instanceof ViewElement) {
+          targetNode = targetNode.parentNode;
         }
+        genericity += `<${(targetNode as any).__tsVariableDataSourceTypeName ?? 'any'}>`;
       }
       code += indent((state?.tabSize || 0) + 3);
-      code += `return {\n`;
-      if (Array.isArray(this.bindAttrs)) {
-        this.bindAttrs
-          .filter((attr) => PAGE_COMPONENT_INCLUDE_TAG_MAP[this.tag]?.[attr.name])
-          .forEach((attr) => {
-            code += attr.toEmbeddedTSVariableFunctionDefinition(
-              shiftState(state, code, { inline: true }),
-            );
-          });
+      code += `let current${levelIndex === 0 ? '' : levelIndex}: nasl.ui.${currentType}${genericity}\n`;
+      levelIndex++;
+    }
+    const attr = this.bindAttrs?.find((item) => item.name === 'data-source');
+    if (attr && attr.expression) {
+      const datasourceName = `datasourceName${this.name}`;
+      (this as any).__tsVariableDataSourceTypeName = datasourceName;
+      if (
+        attr.expression instanceof MemberExpression ||
+        attr.expression instanceof Identifier ||
+        attr.expression instanceof CallLogic
+      ) {
+        const extraParams = {
+          tabSize: 4,
+          inline: true,
+          noNeedParams: true,
+        };
+        let value = attr.expression.toEmbeddedTS(
+          shiftState(state, code, attr.expression.concept === 'CallLogic' ? extraParams : {}),
+        );
+        code += indent((state?.tabSize || 0) + 3);
+        code += `type ${datasourceName} = nasl.ui.GetItemTypeFromDataSource<typeof ${value}>;\n`;
+        // code += `let current${levelIndex === 0 ? '' : levelIndex}: nasl.ui.${currentType}<nasl.ui.GetItemTypeFromDataSource<typeof ${value}>>;\n`;
+      } else {
+        code += indent((state?.tabSize || 0) + 3);
+        code += `const __funcName = () => { return `;
+        code += attr.expression.toEmbeddedTS(shiftState(state, code));
+        code += '};\n';
+        code += indent((state?.tabSize || 0) + 3);
+        code += `type ${datasourceName} = nasl.ui.GetItemTypeFromDataSource<ReturnType<typeof __funcName>>;\n`;
+        // code += `let current${levelIndex === 0 ? '' : levelIndex}: nasl.ui.${currentType}<nasl.ui.GetItemTypeFromDataSource<ReturnType<typeof __funcName>>>;\n`;
       }
-      if (Array.isArray(this.children)) {
-        this.children.forEach((element) => {
-          code += element.toEmbeddedTSVariableFunctionDefinition(shiftState({...state, tabSize: state.tabSize + 2}, code), levelIndex);
+    }
+    code += indent((state?.tabSize || 0) + 3);
+    code += `return {\n`;
+    if (Array.isArray(this.bindAttrs)) {
+      this.bindAttrs
+        .filter((attr) => PAGE_COMPONENT_INCLUDE_TAG_MAP[this.tag]?.[attr.name])
+        .forEach((attr) => {
+          code += attr.toEmbeddedTSVariableFunctionDefinition(shiftState(state, code, { inline: true }));
         });
-      }
-      code += indent((state?.tabSize || 0) + 3);
-      code += `}\n`;
-      code += indent((state?.tabSize || 0) + 2);
-      code += `},\n`;
+    }
+    if (Array.isArray(this.children)) {
+      this.children.forEach((element) => {
+        code += element.toEmbeddedTSVariableFunctionDefinition(
+          shiftState({ ...state, tabSize: state.tabSize + 2 }, code),
+          levelIndex,
+        );
+      });
+    }
+    code += indent((state?.tabSize || 0) + 3);
+    code += `}\n`;
+    code += indent((state?.tabSize || 0) + 2);
+    code += `},\n`;
     return code;
   }
 
@@ -2520,7 +2540,7 @@ export class ViewElement extends BaseNode {
 
   get keyName() {
     // 是否配置了v-if
-    const isDefineIf = this.bindDirectives.some((directive) => (directive.name === 'if' && directive.expression));
+    const isDefineIf = this.bindDirectives.some((directive) => directive.name === 'if' && directive.expression);
     if (isDefineIf) {
       let key = this.name;
       const list = this.getCurrentList();

package/src/concepts/View__.ts

@@ -126,43 +126,63 @@ export class View extends BaseNode {
   /**
    * 页面元素列表
    */
-  @property('ViewElement')
+  @property({
+    objectRef: 'ViewElement',
+    isArray: true,
+  })
   elements: Array<ViewElement> = [];
 
   /**
    * 输入参数列表
    */
-  @property('Param')
+  @property({
+    objectRef: 'Param',
+    isArray: true,
+  })
   params: Array<Param> = [];
 
   /**
    * 变量列表
    */
-  @property('Variable')
+  @property({
+    objectRef: 'Variable',
+    isArray: true,
+  })
   variables: Array<Variable> = [];
 
   /**
    * 逻辑列表
    */
-  @property('Logic')
+  @property({
+    objectRef: 'Logic',
+    isArray: true,
+  })
   logics: Array<Logic> = [];
 
   /**
    * 元素绑定事件列表
    */
-  @property('BindEvent')
+  @property({
+    objectRef: 'BindEvent',
+    isArray: true,
+  })
   bindEvents: Array<BindEvent> = [];
 
   /**
    * 绑定的角色
    */
-  @property()
+  @property({
+    isArray: true,
+  })
   bindRoles: Array<string> = [];
 
   /**
    * 页面列表
    */
-  @property('View')
+  @property({
+    objectRef: 'View',
+    isArray: true,
+  })
   children: Array<View> = [];
 
   /**

package/src/concepts/WhileStatement__.ts

@@ -30,14 +30,19 @@ export class WhileStatement extends LogicItem {
   /**
    * 条件表达式
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   test!: LogicItem;
 
   /**
    * 循环体
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+    isArray: true,
+  })
   body: Array<LogicItem> = [];
 
   /**

package/src/concepts/types__.ts

@@ -37,7 +37,6 @@ import type { Variable } from './Variable__';
 import type { BackendVariable } from './BackendVariable__';
 import type { FrontendVariable } from './FrontendVariable__';
 import type { Constant } from './Constant__';
-import type { LogicItem } from './LogicItem__';
 import type { Function } from './Function__';
 import type { AnonymousFunction } from './AnonymousFunction__';
 import type { Interface } from './Interface__';
@@ -121,7 +120,7 @@ import type { Connector } from './Connector__';
 import type { CallConnector } from './CallConnector__';
 import type { Connection } from './Connection__';
 
-export type SynatxNode =
+export type SyntaxNode =
     | App
     | Module
     | Namespace
@@ -161,7 +160,6 @@ export type SynatxNode =
     | BackendVariable
     | FrontendVariable
     | Constant
-    | LogicItem
     | Function
     | AnonymousFunction
     | Interface
@@ -245,4 +243,4 @@ export type SynatxNode =
     | CallConnector
     | Connection;
 
-export type SynatxNodeConcept = SynatxNode['concept'];
+export type SyntaxNodeConcept = SyntaxNode['concept'];

package/src/decorators/index.ts

@@ -1,5 +1,5 @@
 import BaseNode from '../common/BaseNode';
-import type { SynatxNode, SynatxNodeConcept } from '../concepts';
+import type { SyntaxNode, SyntaxNodeConcept } from '../concepts';
 
 export * from './promise';
 
@@ -72,8 +72,9 @@ export function concept(nodeTitle: string) {
   };
 }
 
-export function property(objectRef?: string) {
-  return function handle(target: SynatxNode | BaseNode, key: string) {
+export function property(params?: any) {
+  const { objectRef, isArray } = params || {};
+  return function handle(target: SyntaxNode | BaseNode, key: string) {
     const metaMap = getConceptPropertyMap(target.concept ?? target.constructor.name);
     const prototypeTarget = Object.getPrototypeOf(target);
     const prototypeConstructor = prototypeTarget.constructor;
@@ -86,14 +87,15 @@ export function property(objectRef?: string) {
     metaMap.set(key, {
       key,
       objectRef,
+      isArray,
     });
   };
 }
 
-export function ancestor(concept: SynatxNodeConcept) {
+export function ancestor(concept: SyntaxNodeConcept) {
   return function handle(target: any, key: string, descriptor: PropertyDescriptor) {
     descriptor.get = function () {
-      return (this as SynatxNode).getAncestor(concept);
+      return (this as SyntaxNode).getAncestor(concept);
     };
   };
 }

package/src/natural/genNaturalTS.ts

@@ -84,7 +84,7 @@ export function genNaturalTSContext(app: App, currentNode?: BaseNode) {
     console.log("lemon ~ genNaturalTSContext ~ view:", view)
     code += view?.toNaturalTS(undefined, currentNode);
   } else if (logic) { // 为全局逻辑
-    code += logic?.toNaturalTS(undefined);
+    code += logic?.toNaturalTS(undefined, undefined, undefined, currentNode);
   }
   code += `\n\`\`\`\n`;
   return code;

package/src/natural/transformTSCode.ts

@@ -223,6 +223,10 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
     return node;
   }
 
+  function isPageLogic(logicName: string) {
+    return logicName.includes('on_') || logicName.includes('viewLogic_')
+  }
+
   function transformLogicNode(node: babelTypes.Node, typeAnnotation?: naslTypes.TypeAnnotation): naslTypes.LogicItem {
     fixLogicNode(node);
     // console.log('lemon ~~~ node--1:', node);
@@ -276,13 +280,15 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
         });
       }
       if (calleeName === 'nasl.oql.query') {
-        return new naslTypes.OqlQueryComponent({
-          dataSource: 'app.dataSources.defaultDS',
-          code: generate(node.arguments[0] as any).code.trim().slice(1, -1),
-        });
+        if (!isPageLogic(contextLogicName)) {
+          return new naslTypes.OqlQueryComponent({
+            dataSource: 'app.dataSources.defaultDS',
+            code: generate(node.arguments[0] as any).code.trim().slice(1, -1),
+          });
+        }
       }
       if (calleeName === 'nasl.util.consoleLog' || calleeName === 'console.log') {
-        if (contextLogicName.includes('on_') || contextLogicName.includes('viewLogic_')) {
+        if (!isPageLogic(contextLogicName)) {
           return new naslTypes.CallLogic({
             calleeNamespace: 'nasl.util',
             calleeName: 'consoleLog',