@lcap/nasl 3.3.0-beta.0 → 3.3.0-beta.2

package/src/concepts/StructureProperty__.ts

@@ -1,5 +1,5 @@
 import { dataTypesMap } from './basics/types';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -257,7 +257,7 @@ export class StructureProperty extends BaseNode {
   isLeaf: boolean = true;
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = this.name;
     if (this.typeAnnotation) {
       code += ': ';
@@ -270,6 +270,16 @@ export class StructureProperty extends BaseNode {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = this.name;
+    if (this.typeAnnotation) {
+      code += ': ';
+      code += this.typeAnnotation.toNaturalTS(shiftState(state, code, { inline: true }));
+    }
+    return code;
+  }
+
   /**
    * 设置数据类型
    * @param typeAnnotation 类型标注对象
@@ -312,11 +322,18 @@ export class StructureProperty extends BaseNode {
     };
   }
 
+  /**
+   * 是否为连接器，连接器不允许编辑
+   */
+  get isConnector() {
+    return !!this.getAncestor('Connector');
+  }
+
   /**
    * 是否可编辑
    * */
   get readonly() {
-    return !!this.module || (this.parentNode as Structure).origin === 'CallQueryComponent';
+    return !!this.module || (this.parentNode as Structure).origin === 'CallQueryComponent' || this.isConnector;
   }
 
   //================================================================================

package/src/concepts/Structure__.ts

@@ -535,11 +535,18 @@ export class Structure extends BaseNode {
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
 
+  /**
+   * 是否为连接器，连接器不允许编辑
+   */
+  get isConnector() {
+    return !!this.getAncestor('Connector');
+  }
+
   /**
    * 是否可编辑
    * */
   get readonly() {
-    return !!this.module || this.origin === 'CallQueryComponent';
+    return !!this.module || this.origin === 'CallQueryComponent' || this.isConnector;
   }
 
   /* 删除空数据模块 */
@@ -551,7 +558,7 @@ export class Structure extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = `export class ${this.tsName} {\n`;
     code += indent((state?.tabSize || 0) + 1);
     code += `__name: '${this.getTsNamespace()}.${this.tsName}';\n`;
@@ -565,6 +572,19 @@ export class Structure extends BaseNode {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = `class ${this.name} {\n`;
+    // code += `${indent(state.tabSize + 1)}__name: '${this.getNamespace()}.${this.name}';\n`;
+    this.properties.forEach((property) => {
+      code += indent((state?.tabSize || 0) + 1);
+      code += property.toNaturalTS(shiftState(state, code, { tabSize: 0 }));
+      code += ';\n';
+    });
+    code += `${indent(state?.tabSize || 0)}}\n`;
+    return code;
+  }
+
   getNamespace() {
     // 针对 Connector 下的 Interface 需要做额外的兼容处理
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成

package/src/concepts/SwitchCase__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -313,7 +313,40 @@ export class SwitchCase extends LogicItem {
     return code;
   }
 
-  //================================================================================
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState(), isLast?: boolean, isFirst?: boolean): string {
+    let code = '\n';
+    if (!isLast) {
+      code += indent(state.tabSize + 2);
+      code += isFirst ? '' : 'else ';
+      code += 'if (';
+      code += this.test ? this.test.toNaturalTS(shiftState(state, code, { inline: true })) : '__IDENTIFIER__';
+      code += ') {\n';
+      if (Array.isArray(this.consequent)) {
+        this.consequent.forEach((logicItem) => {
+          code += indent(state.tabSize + 3);
+          code += `${logicItem.toNaturalTS(shiftState(state, code, { inline: true }))}\n`;
+        });
+      }
+      code += indent(state.tabSize + 2);
+      code += '}';
+    } else {
+      code += indent(state.tabSize + 2);
+      code += 'else {\n';
+      if (Array.isArray(this.consequent)) {
+        this.consequent.forEach((logicItem) => {
+          code += indent(state.tabSize + 2);
+          code += `${logicItem.toNaturalTS(shiftState(state, code, { inline: true }))}\n`;
+        });
+      }
+      code += indent(state.tabSize + 2);
+      code += '}';
+    }
+
+    return code;
+  }
+
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================

package/src/concepts/SwitchStatement__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -221,7 +221,7 @@ export class SwitchStatement extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     //  最后一项是else
     this.cases.forEach((item, index) => {
@@ -234,7 +234,24 @@ export class SwitchStatement extends LogicItem {
     });
     return code;
   }
-  //================================================================================
+
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+      let code = '';
+      // 最后一项是else
+      this.cases.forEach((item, index) => {
+          // 如果是最后一项
+          if (index === this.cases.length - 1) {
+              code += item.toNaturalTS(shiftState(state, code, { inline: true }), true);
+          } else {
+              code += item.toNaturalTS(shiftState(state, code, { inline: true }), false, index === 0);
+          }
+      });
+      code += '\n';
+      return code;
+  }
+
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================

package/src/concepts/TriggerLauncher__.ts

@@ -152,7 +152,7 @@ export class TriggerLauncher extends BaseNode {
   //================================================================================
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     code += `export function ${this.name} () {\n`;
     try {

package/src/concepts/TypeAnnotation__.ts

@@ -1,6 +1,6 @@
 import App from './App__';
 import Structure from './Structure__';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import { genHash } from '../generator';
 import { firstUpperCase } from '../utils/string';
 
@@ -925,7 +925,7 @@ export class TypeAnnotation extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     if (this.typeKind === 'primitive' || this.typeKind === 'reference') {
       if (this.typeKind === 'reference' && this.typeNamespace && this.typeNamespace.endsWith('enums')) {
         return `${this.tsCalleeNamespace}.${this.typeName}`;
@@ -973,6 +973,51 @@ export class TypeAnnotation extends BaseNode {
     }
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    if (this.typeKind === 'primitive' || this.typeKind === 'reference') {
+      if (this.typeKind === 'reference' && this.typeNamespace && this.typeNamespace.endsWith('enums')) {
+        return this.tsCalleeNamespace.startsWith('nasl.ui') ? `${this.tsCalleeNamespace}.${this.typeName}` : `${this.typeName}`;
+      }
+      return this.tsCalleeNamespace.startsWith('nasl.ui') ? `${this.tsCalleeNamespace}.${this.typeName}` : `${this.typeName}`;
+    }
+    if (this.typeKind === 'generic') {
+      let code = `${this.typeName}<`;
+      (this.typeArguments || []).forEach((arg, index) => {
+        code += arg.toNaturalTS(shiftState(state, code, { inline: true }));
+        if (index !== this.typeArguments.length - 1)
+          code += ', ';
+      });
+      code += '>';
+      return code;
+    }
+    if (this.typeKind === 'union') {
+      let code = '';
+      (this.typeArguments || []).forEach((arg, index) => {
+        code += arg.toNaturalTS(shiftState(state, code, { inline: true }));
+        if (index !== this.typeArguments.length - 1)
+          code += ' | ';
+      });
+      return code;
+    }
+    if (this.typeKind === 'anonymousStructure') {
+      let code = `{ `;
+      (this.properties || []).forEach((property, i) => {
+        code += `${property.name}: `;
+        code += `${property.typeAnnotation.toNaturalTS(shiftState(state, code, { inline: true, tabSize: state.tabSize + 1 }))}`;
+        code += i < this.properties?.length - 1 ? ', ' : ' }';
+      });
+      return code;
+    }
+    if (this.tsCalleeNamespace && this.typeName) {
+      return `${this.typeName}`;
+    }
+    if (this.typeName) {
+      return this.typeName;
+    }
+    return '__IDENTIFIER__';
+  }
+
   /**
    * 用于标准化数据结构，便于计算 anonymousStructure 的 __name
    */

package/src/concepts/TypeParam__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, withSourceMap } from '../translator';
+import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -59,7 +59,13 @@ export class TypeParam extends BaseNode {
   toEmbeddedTS(state?: TranslatorState, prefix?: string): string {
     return this.name;
   }
-  //================================================================================
+
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState(), prefix?: string): string {
+    return this.name;
+  }
+
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================

package/src/concepts/UnaryExpression__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 
 //================================================================================
@@ -154,7 +154,7 @@ export class UnaryExpression extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     if (this.operator === 'isNull') {
       const fnName = this.operator.toUpperCase();
       let code = '';
@@ -172,7 +172,26 @@ export class UnaryExpression extends LogicItem {
       return code;
     }
   }
-  //================================================================================
+
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    if (this.operator === 'isNull') {
+      let code = '((';
+      code += this.argument?.toNaturalTS ? this.argument.toNaturalTS(shiftState(state, '', { inline: true })) : '__IDENTIFIER__';
+      code += ') === null';
+      code += ')';
+      return code;
+    }
+
+    if (this.operator === '!') {
+      let code = '!(';
+      code += this.argument?.toNaturalTS ? this.argument.toNaturalTS(shiftState(state, '', { inline: true })) : '__IDENTIFIER__';
+      code += ')';
+      return code;
+    }
+  }
+
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================

package/src/concepts/Unparsed__.ts

@@ -86,7 +86,11 @@ export class Unparsed extends LogicItem {
     return 'nasl.core.universalVariable';
   }
 
-  //================================================================================
+  @withSourceMap()
+  toNaturalTS(): string {
+    return ``;
+  }
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================

package/src/concepts/ValidationRule__.ts

@@ -1,4 +1,5 @@
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { v4 as uuidv4 } from 'uuid';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import Function from './Function__';
 import { ElementToVueOptions } from './ViewElement__';
 import { getValidationInFunction } from '../server/getFunctions';
@@ -13,7 +14,6 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
-import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import Argument from './Argument__';
 import LogicItem from './LogicItem__';

package/src/concepts/Variable__.ts

@@ -1,5 +1,5 @@
 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__';
@@ -307,7 +307,7 @@ export class Variable extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = this.name;
     if (this.typeAnnotation) {
       code += ': ';
@@ -324,6 +324,24 @@ export class Variable extends BaseNode {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = this.name;
+    if (this.typeAnnotation) {
+      code += ': ';
+      code += this.typeAnnotation.toNaturalTS(shiftState(state, code));
+      // toTS暂时只需要翻译引用数据类型的，因为值都是字符串
+      // 就不在这里赋值了，这里单纯就为了快速查找
+      // 并且屏蔽了一些异常的错误
+      if (this.typeAnnotation?.typeKind !== 'primitive' && this.defaultValue) {
+        if (this.isEnum()) {
+          code += `= ${this.typeAnnotation.typeKey}['${this.defaultValue}']`;
+        }
+      }
+    }
+    return code;
+  }
+
   isEnum() {
     return this.typeAnnotation?.typeNamespace?.endsWith('.enums');
   }

package/src/concepts/ViewElement__.ts

@@ -1,5 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
-
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import { stdlibNamespace, CallLogic } from '../concepts';
 
 import * as babelParser from '@babel/parser';
@@ -13,6 +12,7 @@ import MemberExpression from './MemberExpression__';
 import Identifier from './Identifier__';
 import { PAGE_COMPONENT_INCLUDE_TAG_MAP } from './View__';
 
+import { kebab2Camel } from '../utils';
 export interface ParseContext {
   [key: string]: any;
 }
@@ -1929,6 +1929,74 @@ export class ViewElement extends BaseNode {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState(), parentLevel?: number): string {
+    let code = '';
+    const levelIndex = parentLevel || 0;
+    if (Array.isArray(this.bindEvents)) {
+      this.bindEvents.forEach((event) => {
+        code += event.toNaturalTS(shiftState(state, code, {
+          tabSize: state.tabSize,
+        }));
+        // code += '\n';
+      });
+    }
+
+    if (Array.isArray(this.children)) {
+      if (this.children.find((item) => item.tag === 'template' && item.slotTarget)) {
+        // code += indent(state.tabSize + 2);
+        const defaultArr: ViewElement[] = [];
+        // 先把插槽翻译了
+        this.children.forEach((element) => {
+          if (element.tag === 'template') {
+            code += element.toNaturalTS(shiftState(state, code, {
+              tabSize: state.tabSize,
+            }), levelIndex);
+          } else {
+            defaultArr.push(element);
+          }
+        });
+        // 翻译其余的子集
+        if (defaultArr.length) {
+          defaultArr.forEach((element) => {
+            code += element.toNaturalTS(shiftState(state, code, {
+              tabSize: state.tabSize,
+            }), levelIndex);
+          });
+        }
+      } else {
+        this.children.forEach((element) => {
+          code += element.toNaturalTS(shiftState(state, code, {
+            tabSize: state.tabSize,
+          }), levelIndex);
+        });
+      }
+    }
+
+    return code;
+  }
+
+  toNaturalTSDefinition(state?: TranslatorState): string {
+    let code = '';
+
+    if (['u-button', 'u-form', 'u-modal', 'u-table-view', 'u-select', 'u-input', 'u-number-input'].includes(this.tag)) {
+      code += indent(state.tabSize + 1);
+      // 登录组件不翻译
+      // if (this.toHump(this.tag) === 'lcapLogin' || this.staticClass === 'login-form') {
+      //     code += `${this.name}: nasl.ui.div;\n`;
+      // } else {
+      code += `${this.name}: nasl.ui.${kebab2Camel(this.tag.replace(/^\w-/, ''))},\n`;
+      // }
+    }
+
+    if (Array.isArray(this.children)) {
+      this.children.forEach((element) => {
+        code += element.toNaturalTSDefinition(shiftState(state, code));
+      });
+    }
+    return code;
+  }
+
   _duplicate() {
     const element = ViewElement.from(this.toTemplateJSON());
     const nameMap = element.deepRenameElements(this);
@@ -2790,7 +2858,8 @@ export class ViewElement extends BaseNode {
     );
   }
   parseStyleToObject(styleStr: string = '') {
-    const styleObj = styleStr.split(/;/gim).reduce((obj: Record<string, string | number>, item) => {
+    const [styleStr1, styleStr2] = styleStr.split('--custom-start: auto;')
+    const styleObj = styleStr1.split(/;/gim).reduce((obj: Record<string, string | number>, item) => {
       // background-image:url(http://www...)
       item = item.trim();
       const pos = item.indexOf(':');
@@ -2801,16 +2870,20 @@ export class ViewElement extends BaseNode {
       }
       return obj;
     }, {});
+    styleObj['customStyle'] = styleStr2;
     return styleObj;
   }
   stringifyStyleAttr(styleObj: Record<string, string | number>) {
-    return (
+    const customStyle = styleObj['customStyle'] || '';
+    delete styleObj['customStyle'];
+    const styleStr = (
       Object.keys(styleObj)
         // 空字符串是允许的，因为有时候想要覆盖之前的样式。undefined 则不允许
         .filter((key) => styleObj[key] !== undefined)
         .map((key) => `${key}:${String(styleObj[key]).trim()};`)
         .join('')
     );
+    return styleStr + '--custom-start: auto;' + customStyle;
   }
   // 批量更新绑定属性
   batchUpdateBindAttrs(attrOptions: Record<string, any>[]) {