@lcap/nasl 3.3.0-alpha.1 → 3.3.0-alpha.3

package/src/bak/translator.js

@@ -1,3 +1,5 @@
+import { PAGE_COMPONENT_INCLUDE_TAG_MAP } from '..'
+
 function safeCodeAsKey(name) {
   return `['${name}']`;
 }
@@ -66,6 +68,50 @@ export default function (definition) {
     }
     viewVariablesData.push(code);
   });
+  /**
+   * 页面的 computed
+   * 包含 页面组件属性依赖
+   */
+  const viewComputedData = []
+  const viewMethodData = []
+  definition.elements.forEach(element => {
+      element.bindAttrs.filter((attr) => PAGE_COMPONENT_INCLUDE_TAG_MAP[element.tag]?.[attr.name]).forEach(attr => {
+          let variable = ''
+          if (attr.expression) {
+              variable += `${attr.expression.toJS()}`
+              // attrsData.push(code)
+          } else if (attr.type === 'static') {
+              variable = `${attr.value}`
+              // attrsData.push(code)
+          }
+          if (attr.name === 'data-source' && attr.expression && variable.includes('await')) {
+              const code = `async '__${element.name}_${attr.name}'() {
+                  const params = {}
+                  return ${variable}
+              }`
+              viewMethodData.push(code)
+          } else {
+              const code = `['__${element.name}_${attr.name}']() {
+                  return ${variable}
+              }`
+              viewComputedData.push(code)
+          }
+      })
+      if (['u-select', 'van-pickerson'].includes(element.tag)) {
+          viewVariablesData.push(`['__${element.name}_params']: {}`);
+          const code = `['__${element.name}_page-number']() {
+              return this['__${element.name}_params']?.number ?? 1
+          }`
+          viewComputedData.push(code)
+      } else if (['u-list-view', 'u-grid-view', 'u-table-view', 'van-list-view', 'van-grid-view'].includes(element.tag) && element.bindAttrs?.findIndex((attr) => attr.name === 'sorting') === -1) {
+          viewComputedData.push(`['__${element.name}_sorting']() {
+              return {
+                  field: undefined,
+                  order: undefined
+              }
+          }`)
+      }
+  })
 
   let viewExpressionMethods;
   if (hasViewExpressions) {
@@ -111,6 +157,9 @@ export default function (definition) {
                 ${viewVariablesData.join(',\n').trim()}
             };
         },
+        computed: {
+            ${viewComputedData.join(',\n').trim()}
+        },
 meta: {
     title: ${JSON.stringify(definition.title)},
     crumb: ${JSON.stringify(definition.crumb)},
@@ -118,7 +167,7 @@ meta: {
     auth: ${JSON.stringify(definition.auth)},
 },
 methods: {
-    ${[...(methods || []), ...(eventLogic || []), ...(viewExpressionMethods || [])].join(',\n\n')}
+    ${[...(methods || []), ...(eventLogic || []), ...(viewExpressionMethods || []), ...(viewMethodData || [])].join(',\n\n')}
 },
         ${events.join(',\n\n')}
 `;

package/src/breakpoint/shared/utils.ts

@@ -84,8 +84,6 @@ export const getRealNode = (node: BaseNode): BaseNode => {
 const unbrakableAncestors = [
   'Process',
   'BindAttribute',
-  'OverriddenLogic',
-  'CallAuthInterface',
 ] as const;
 
 const isBreakableByAncestors = (node: BaseNode): Boolean => {

package/src/common/Command.ts

@@ -57,6 +57,14 @@ export function invokeCommand(command: string, ...args: any[]) {
   });
 }
 
+export function invokeOnlyCommand(command: string, ...args: any[]) {
+  const cmds = _commands.get(command);
+  if (!cmds?.length) {
+    console.warn(`Command ${command} not found!`);
+  }
+  return cmds[0]?.execute(...args);
+}
+
 export function hasCommand(command: string) {
   return _commands.has(command);
 }

package/src/concepts/Abort__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, indent } from '../translator';
+import { TranslatorState, indent, createCompilerState } from '../translator';
 //= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -60,7 +60,7 @@ export class Abort extends LogicItem {
     return code;
   }
 
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     // 中止放入表达式中，处理翻译就跳过
     // 别的就增加一个 return;

package/src/concepts/Anchor__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import StringLiteral from './StringLiteral__';
 //= ===============================================================================
@@ -161,7 +161,7 @@ export class Anchor extends LogicItem {
   }
 
   @withSourceMap()
-  toNaturalTS(state?: TranslatorState, isHaveKeyWord?: boolean): string {
+  toNaturalTS(state = createCompilerState(), isHaveKeyWord?: boolean): string {
       let code = '';
       if (isHaveKeyWord) {
           code += `_anchor: `;

package/src/concepts/AnonymousFunction__.ts

@@ -1,6 +1,6 @@
 import { v4 as uuidv4 } from 'uuid';
 import Namespace from './Namespace__';
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import ForEachStatement from './ForEachStatement__';
 import NewList from './NewList__';
@@ -491,7 +491,7 @@ export class AnonymousFunction extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let updateNoPropertyCode = '';
     const grandParent = this.parentNode?.parentNode;
     if (
@@ -540,7 +540,7 @@ export class AnonymousFunction extends LogicItem {
   }
 
   @withSourceMap()
-  toNaturalTS(state?: TranslatorState): string {
+  toNaturalTS(state = createCompilerState()): string {
     let code = '';
     if (this.body) {
       code += `(`;

package/src/concepts/Argument__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import StringLiteral from './StringLiteral__';
 import TypeAnnotation from './TypeAnnotation__';
@@ -252,7 +252,7 @@ export class Argument extends LogicItem {
   }
 
   @withSourceMap()
-  toNaturalTS(state?: TranslatorState, isRequired: boolean = true, isHaveKeyWord?: boolean): string {
+  toNaturalTS(state = createCompilerState(), isRequired: boolean = true, isHaveKeyWord?: boolean): string {
     let code = this.spread ? '...' : '';
     if (isHaveKeyWord) {
       code += `${this.tsKeyword}:`;

package/src/concepts/Assignee__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import { ProcessElement, Process } from '..';
 import Namespace from './Namespace__';
 //= ===============================================================================

package/src/concepts/AssignmentLine__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 //= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -93,7 +93,7 @@ export class AssignmentLine extends BaseNode {
   // 自动生成的代码已结束。下面可以手动编写。
   //= ===============================================================================
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const code = '';
     return code;
   }

package/src/concepts/Assignment__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import Identifier from './Identifier__';
 import { ElementToVueOptions } from './ViewElement__';
 import BatchAssignment from './BatchAssignment__';
@@ -292,7 +292,7 @@ export class Assignment extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = 'nasl.core.assign(';
 
     code += this.left ? this.left.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__LEFT__';
@@ -307,7 +307,7 @@ export class Assignment extends LogicItem {
   }
 
   @withSourceMap()
-  toNaturalTS(state?: TranslatorState): string {
+  toNaturalTS(state = createCompilerState()): string {
     let code = '';
 
     code += this.left ? this.left.toNaturalTS(shiftState(state, code, { inline: true })) : '__LEFT__';

package/src/concepts/BackendVariable__.ts

@@ -1,6 +1,6 @@
 import { v4 as uuidv4 } from 'uuid';
 import { dataTypesMap } from './basics/types';
-import { TranslatorState, shiftState, withSourceMap, createCompilerState, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import EntityProperty from './EntityProperty__';
 import StructureProperty from './StructureProperty__';
@@ -290,7 +290,7 @@ export class BackendVariable extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = this.name;
     if (this.typeAnnotation) {
       code += ': ';

package/src/concepts/Backend__.ts

@@ -316,7 +316,7 @@ export class Backend extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = `export namespace ${this.name} {\n`;
     code += 'const name = ';
     code += `"${this.name}";\n`;

package/src/concepts/BatchAssignment__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import MemberExpression from './MemberExpression__';
 import Assignment from './Assignment__';
@@ -973,7 +973,7 @@ export class BatchAssignment extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '// 以下是批量赋值的翻译代码\n';
     // 提供sourcemap，获取类型标注和上下文可选变量
     code += this.left.expression ? `${this.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))}` : '';
@@ -1016,7 +1016,7 @@ export class BatchAssignment extends LogicItem {
   }
 
   @withSourceMap()
-  toNaturalTS(state?: TranslatorState): string {
+  toNaturalTS(state = createCompilerState()): string {
     let code = '';
     // 根据连线状态，拆分成多个单赋值
     this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {

package/src/concepts/BinaryExpression__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 
 //= ===============================================================================
@@ -319,7 +319,7 @@ export class BinaryExpression extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     if (['startwith', 'endwith', 'like', 'in'].includes(this.operator)) {
       const fnName = this.operator.toUpperCase();
       let code = '';
@@ -363,7 +363,7 @@ export class BinaryExpression extends LogicItem {
   }
 
   @withSourceMap()
-  toNaturalTS(state?: TranslatorState): string {
+  toNaturalTS(state = createCompilerState()): string {
     if (['startwith', 'endwith', 'like', 'in'].includes(this.operator)) {
       const fnName = this.operator.toUpperCase();
       let code = '';

package/src/concepts/BindAttribute__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, indent, shiftState, withSourceMap, createCompilerState } from '../translator';
 import ViewElement, { ElementToVueOptions } from './ViewElement__';
 import Namespace from './Namespace__';
 import MemberExpression from './MemberExpression__';
@@ -947,6 +947,8 @@ export class BindAttribute extends BaseNode {
         value = `[${ruleStrs.join(' , ')}]`;
       } else if (['destination', 'externalDestination'].includes(this.name)) {
         value = (this as any)?.[this.name]?.toVue(options) || '';
+      } else if ('ArrowFunctionExpression'.includes(this.expression?.concept)) {
+        value = this.value;
       } else {
         value = this.expression?.toVue(options) || '';
       }
@@ -1019,10 +1021,15 @@ export class BindAttribute extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const { name, type, value, rules, expression, playground } = this;
 
-    let code = '() => {';
+    let code = ''
+    if (this?.name === 'data-source' && this?.expression?.concept === 'CallLogic') {
+      code = `(params: nasl.ui.DataSourceParams) => {`;
+    } else {
+      code = '() => {';
+    }
 
     if (['destination', 'externalDestination'].includes(name) && type === 'dynamic') {
       code += (this as any)[name].toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
@@ -1071,8 +1078,54 @@ export class BindAttribute extends BaseNode {
     return code;
   }
 
+  toEmbeddedTSVariableDefinition(state?: TranslatorState, attrList?: string[], elementName?: string): string {
+      let code = '';
+      let arrCode = '';
+      code += indent((state?.tabSize || 0) + 3);
+      code += `${attrConvertCamelCase(this.name)}: `
+      if (this.expression) {
+          if (this.name === 'data-source') {
+              if (this?.expression?.concept === 'CallLogic') {
+                  arrCode += `(params: nasl.ui.DataSourceParams) => `;
+              }
+              if (['CallLogic', 'CallFunction'].includes(this.expression?.concept)) {
+                  code += `nasl.ui.GetItemTypeFromDataSource<typeof __elements_stashFunctionVariable.${elementName}_${attrConvertCamelCase(this.name)}>`
+                  arrCode += `${this.expression.toEmbeddedTS()}`
+              } else {
+                  code += `nasl.ui.GetItemTypeFromDataSource<typeof ${this.expression.toEmbeddedTS()}>`
+              }
+          } else {
+              if (['CallLogic', 'CallFunction'].includes(this.expression?.concept)) {
+                  code += `typeof __elements_stashFunctionVariable.${elementName}_${attrConvertCamelCase(this.name)}`
+                  arrCode += `${this.expression.toEmbeddedTS()}`
+              } else {
+                  code += `typeof ${this.expression.toEmbeddedTS()}`
+              }
+          }
+      } else if (this.name === 'sorting') {
+          code += `{
+              field: nasl.core.String
+              order: nasl.core.String
+          }`
+      } else if (this.type === 'static') {
+          let type = 'nasl.core.String'
+          if (typeof this.value === 'number') {
+              type = `${this.value}`.includes('.') ? 'nasl.core.Decimal' : 'nasl.core.Long';
+          } else if (typeof this.value === 'boolean') {
+              type = 'nasl.core.Boolean'
+          }
+          code += `${type}`
+      } else {
+          code += 'undefined'
+      }
+      code += `\n`
+      if (arrCode.length > 0) {
+          attrList.push(`${elementName}_${attrConvertCamelCase(this.name)}: ${arrCode},\n`)
+      }
+      return code
+  }
   @withSourceMap()
-  toNaturalTS(state?: TranslatorState): string {
+  toNaturalTS(state = createCompilerState()): string {
     const { name, type, value, rules, expression, playground } = this;
     let code = '() => {';
 
@@ -1143,3 +1196,15 @@ export default BindAttribute;
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
 //= ===============================================================================
+
+export function attrConvertCamelCase(str: string) {
+  let strList: string[] = str.split('-')
+  strList = strList.map((strItem, index) => {
+      if (index === 0) {
+          return strItem
+      } else {
+          return `${strItem.slice(0, 1).toUpperCase()}${strItem.slice(1)}`;
+      }
+  })
+  return strList.join('')
+}

package/src/concepts/BindDirective__.ts

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import ViewElement, { ElementToVueOptions } from './ViewElement__';
 import MemberExpression from './MemberExpression__';
 //= ===============================================================================
@@ -578,7 +578,7 @@ export class BindDirective extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '()=>{';
     if (this.expression) {
       code += this.expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));