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

package/src/concepts/BindAttribute__.ts

@@ -1080,20 +1080,15 @@ export class BindAttribute extends BaseNode {
     return str;
   }
 
-
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
     const { name, type, value, rules, expression, playground } = self;
     let code = '';
-    // 业务组件
-    const isBusinessComponent = self.viewElement?.isCorrespondingBusinessComponent;
-    if (isBusinessComponent) {
-      code += `${name}: `;
-    } else if (self?.name === 'data-source' && self?.expression?.concept === 'CallLogic') {
-      code += `() => {\n`;
+    if (self?.name === 'data-source' && self?.expression?.concept === 'CallLogic') {
+      code = `() => {`;
     } else {
-      code += '() => {\n';
+      code = '() => {';
     }
     if (['destination', 'externalDestination'].includes(name) && type === 'dynamic') {
       code += yield* (self as any)[name].toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
@@ -1105,7 +1100,7 @@ export class BindAttribute extends BaseNode {
       });
     } else if (expression) {
       code += yield* expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
-      code += '\n';
+      code += ';\n';
     } else if (name === 'url' && value) {
       /**
        * ls定制化处理
@@ -1131,15 +1126,13 @@ export class BindAttribute extends BaseNode {
         code += ';\n';
       }
     }
-    if (type === 'dynamic' && !isBusinessComponent) {
+    if (type === 'dynamic') {
       yield* wrapForEach(playground, function* warpForEachGenerator(item, index) {
         code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
         code += ';\n';
       });
     }
-    if (!isBusinessComponent) {
-      code += '\n}';
-    }
+    code += '}';
     return code;
   }
 
@@ -1175,8 +1168,6 @@ export class BindAttribute extends BaseNode {
         type = `${self.value}`.includes('.') ? 'nasl.core.Decimal' : 'nasl.core.Long';
       } else if (typeof self.value === 'boolean') {
         type = 'nasl.core.Boolean';
-      } else if (['page-size', 'page-number'].includes(self.name) && self.value === null) {
-        type = 'nasl.core.Long'
       }
       code += `${type}`;
     } else {

package/src/concepts/BindDirective__.ts

@@ -629,36 +629,21 @@ export class BindDirective extends BaseNode {
     return str;
   }
 
-  get viewElement() {
-    return this.getAncestor('ViewElement') as ViewElement;
-  }
-
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
-    // 业务组件
-    const isBusinessComponent = self.viewElement?.correspondingBusinessComponent;
-    let code = '';
-    if (!isBusinessComponent) {
-      code += '()=>{';
-    }
+    let code = '()=>{';
     if (self.expression) {
       code += yield* self.expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
-      code += '\n';
+      code += ';\n';
     }
     if (self.type === 'dynamic') {
       yield* wrapForEach(self.playground, function* warpForEachGenerator(item, index) {
         code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
-        if (index !== self.playground.length - 1) code += '\n';
+        if (index !== self.playground.length - 1) code += ';\n';
       });
     }
-    if (isBusinessComponent) {
-      if (code) {
-        code = `${self.name === 'if' ? '__NASLIF' : self.name}: ${code}`;
-      }
-    } else {
-      code += '}';
-    }
+    code += '}';
     return code;
   }
 

package/src/concepts/BindEvent__.ts

@@ -16,7 +16,6 @@ import { elementsEventsMap } from '../server/createUiTs';
 import type Param from './Param__';
 import type TypeAnnotation from './TypeAnnotation__';
 import type Process from './Process__';
-import type BusinessComponent from './BusinessComponent__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -607,7 +606,7 @@ export class BindEvent extends BaseNode {
     if (isPageCycle) {
       if (['keydown', 'keyup'].includes(self.name)) {
         code = `const ${self.toHump(self.name) || '__IDENTIFIER__'} = (event: `;
-        code += yield* self.getEventTypeString(state);
+        code += self.getEventTypeString();
         code += ') => [\n';
         yield* wrapForEach(self.logics, function* warpForEachGenerator(logic) {
           // 一些默认的逻辑不翻译 排除掉
@@ -646,7 +645,7 @@ export class BindEvent extends BaseNode {
       } else {
         yield* wrapForEach(self.logics, function* warpForEachGenerator(logic, index) {
           const logicName = logic.name;
-          logic.name = logic.likeComponent.name + logic.name + index;
+          logic.name = logic.view.name + logic.name + index;
           code += yield* logic.toEmbeddedTS(
             shiftState(state, code, {
               tabSize: (state?.tabSize || 0) + 2,
@@ -662,7 +661,7 @@ export class BindEvent extends BaseNode {
     }
     code = `${self.toHump(self.name) || '__IDENTIFIER__'}: (event: `;
     // event的类型
-    code += yield* self.getEventTypeString(state);
+    code += self.getEventTypeString();
     code += ') => [\n';
     yield* wrapForEach(self.logics, function* warpForEachGenerator(logic) {
       // 一些默认的逻辑不翻译 排除掉
@@ -697,7 +696,7 @@ export class BindEvent extends BaseNode {
       code += indent(state?.tabSize || 0);
       code += ',\n';
     });
-    if (self.view || self.getAncestor('BusinessComponent')) code += '],\n';
+    if (self.view) code += '],\n';
     else code += ']\n';
     return code;
   }
@@ -770,11 +769,9 @@ export class BindEvent extends BaseNode {
     return code;
   }
 
-  *getEventTypeString(state = createCompilerState()) {
+  getEventTypeString() {
     let code = '';
     if (!Object.keys(elementsEventsMap).length) return;
-    // 业务组件
-    const businessComponent = this.element.correspondingBusinessComponent;
     // 已有的点击事件，已知类型的，就直接取值
     if (
       [
@@ -795,20 +792,6 @@ export class BindEvent extends BaseNode {
       const ref = eventInfo.params[0].schema.$ref;
       const type = ref.replace('#/systemTypes/', 'nasl.ui.');
       code = `${type}`;
-    } else if (businessComponent) {
-      code = '{\n';
-      // 目标事件
-      const targetEvent = businessComponent.events?.find((event) => {
-        return event.name === this.name;
-      });
-      if (Array.isArray(targetEvent?.params)) {
-        yield* wrapForEach(targetEvent.params, function* warpForEachGenerator(param, index) {
-          code += `${param.name}?: `;
-          code += yield* param.typeAnnotation.toEmbeddedTS(shiftState(state, code));
-          code += ',\n';
-        });
-      }
-      code += '\n}';
     } else {
       code = 'nasl.ui.BaseEvent';
     }
@@ -865,13 +848,8 @@ export class BindEvent extends BaseNode {
     });
   }
 
-  get likeComponent(): View | BusinessComponent {
-    return this.view || (this?.getAncestor('BusinessComponent') as BusinessComponent);
-  }
-
   getNamespace(ns: string) {
-    if (this.likeComponent)
-      return `${this.likeComponent.getNamespace()}.${this.likeComponent.name}.bindEvents.${this.name}.logics`;
+    if (this.view) return `${this.view.getNamespace()}.${this.view.name}.bindEvents.${this.name}.logics`;
     if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getNamespace();
       const parentName = this.parentNode.name;
@@ -983,21 +961,16 @@ export class BindEvent extends BaseNode {
   getPageViewEventChineseName() {
     const parent = this.parentNode;
     const suffixRE = /时|前|后$/;
-    if (asserts.isView(parent) || asserts.isBusinessComponent(parent)) {
-      const conceptTitleMap = {
-        View: '页面',
-        BusinessComponent: '业务组件',
-      };
-      const conceptTitle = conceptTitleMap[parent.concept];
+    if (asserts.isView(parent)) {
       const event = elementsEventsMap[this.name];
 
       if (['keydown', 'keyup'].includes(event.name)) {
-        return `“${parent.title || parent.name}”${conceptTitle}${event.title}`;
+        return `“${parent.title || parent.name}”页面${event.title}`;
       }
 
       const cap = suffixRE.exec(event?.title);
-      if (cap) return `${event.title.replace(suffixRE, '')}“${parent.title || parent.name}”${conceptTitle}${cap[0]}`;
-      else return `${event.title}“${parent.title || parent.name}”${conceptTitle}`;
+      if (cap) return `${event.title.replace(suffixRE, '')}“${parent.title || parent.name}”页面${cap[0]}`;
+      else return `${event.title}“${parent.title || parent.name}”页面`;
     } else if (asserts.isViewElement(parent)) {
       const eventName = `${parent.tag}-${this.name}`;
       if (elementsEventsMap[eventName]) {
@@ -1093,7 +1066,7 @@ export class BindEvent extends BaseNode {
     if (asserts.isViewElement(parentNode)) {
       return `${parentNode.name}_${newName}`;
     } else if (asserts.isView(parentNode)) {
-      return `${this.likeComponent.name}_${newName}`;
+      return `${this.view.name}_${newName}`;
     } else {
       // 这里编译成这个名字了 后续pctemplate 里也得按这个调用？
       // 或者说因为会编译在不同的端里  直接 name好了
@@ -1162,8 +1135,7 @@ export class BindEvent extends BaseNode {
         parent = parent.parentNode;
       }
     }
-    return `/embedded/${this.getAncestor('App')?.name}/frontends/${this.getAncestor('FrontendType')?.name
-      }/bindEvents/${pathName}.ts`;
+    return `/embedded/${this.app.name}/frontends/${this.frontend.name}/bindEvents/${pathName}.ts`;
   }
 
   //================================================================================

package/src/concepts/CallFunction__.ts

@@ -527,18 +527,10 @@ export class CallFunction extends LogicItem {
 
     code += ')';
     const tyAnno = (this as any).typeAnnotation || this.__TypeAnnotation;
-    let { sortedTypeKey, typeKind, typeName, typeNamespace } = tyAnno || {};
-    if (typeNamespace?.endsWith('.metadataTypes')) {
-      const referenceNode = this.app.findNodeByCompleteName(typeNamespace + '.' + typeName) || {};
-      const typeAn = referenceNode.typeAnnotation || {};
-      sortedTypeKey = `${typeAn.typeNamespace}.${typeAn.typeName}`;
-      typeKind = typeAn.typeKind;
-      typeName = typeAn.typeName;
-    }
     const needGenInitFromSchema =
-      tyAnno && (!['primitive', 'union'].includes(typeKind) || typeName === 'DateTime');
+      tyAnno && (!['primitive', 'union'].includes(tyAnno.typeKind) || tyAnno.typeName === 'DateTime');
     if (needGenInitFromSchema) {
-      code = `this.$genInitFromSchema('${sortedTypeKey}', ${code})`;
+      code = `this.$genInitFromSchema('${tyAnno?.sortedTypeKey}', ${code})`;
     }
     return code;
   }

package/src/concepts/CallLogic__.ts

@@ -591,7 +591,7 @@ export class CallLogic extends LogicItem {
   _setCallee(logic: Logic) {
     const BaseNode = getBaseNode();
     this.calleeNamespace = logic.getNamespace();
-    if (asserts.isView(logic.parentNode) || asserts.isBusinessComponent(logic.parentNode)) {
+    if (asserts.isView(logic.parentNode)) {
       this.calleeNamespace = '';
     }
     this.calleeName = logic.name;
@@ -615,7 +615,7 @@ export class CallLogic extends LogicItem {
 
   setCallee(logic: Logic) {
     let calleeNamespace = logic?.getNamespace() || '';
-    if (asserts.isView(logic.parentNode) || asserts.isBusinessComponent(logic.parentNode)) {
+    if (asserts.isView(logic.parentNode)) {
       calleeNamespace = '';
     }
     const calleeName = logic.name;
@@ -773,23 +773,23 @@ export class CallLogic extends LogicItem {
           code += calleeName;
         }
         return code;
-      }
-      if (calleeName === 'jsonSerialize') {
-        if (
-          this.arguments[0]?.expression?.__TypeAnnotation?.typeName === 'String' &&
-          this.arguments[0]?.expression?.__TypeAnnotation?.typeNamespace === 'nasl.core'
-        ) {
-          code += options?.finalCode === false ? 'JSON 序列化' : 'JSON.stringify';
-        } else {
-          code += options?.finalCode === false ? 'JSON 序列化' : `$utils['JsonSerialize']`;
+      } else if (bindAttr?.name === 'text') {
+        if (calleeName === 'jsonSerialize') {
+          if (
+            this.arguments[0]?.expression?.__TypeAnnotation?.typeName === 'String' &&
+            this.arguments[0]?.expression?.__TypeAnnotation?.typeNamespace === 'nasl.core'
+          ) {
+            code += options?.finalCode === false ? 'JSON 序列化' : 'JSON.stringify';
+          } else {
+            code += options?.finalCode === false ? 'JSON 序列化' : `$utils['JsonSerialize']`;
+          }
+          setArguments();
+          return code;
+        } else if (calleeName === 'jsonDeserialize') {
+          code += options?.finalCode === false ? 'JSON 反序列化' : 'JSON.parse';
+          setArguments();
+          return code;
         }
-        setArguments();
-        return code;
-      }
-      if (calleeName === 'jsonDeserialize') {
-        code += options?.finalCode === false ? 'JSON 反序列化' : 'JSON.parse';
-        setArguments();
-        return code;
       }
     }
 
@@ -815,11 +815,12 @@ export class CallLogic extends LogicItem {
 
       if (bindAttr?.name === 'data-source') {
         return this.calleeName;
-      }
-      if (calleeName === 'jsonSerialize') {
-        return 'JSON 序列化';
-      } if (calleeName === 'jsonDeserialize') {
-        return 'JSON 反序列化';
+      } else if (bindAttr?.name === 'text') {
+        if (calleeName === 'jsonSerialize') {
+          return 'JSON 序列化';
+        } else if (calleeName === 'jsonDeserialize') {
+          return 'JSON 反序列化';
+        }
       }
     }
 
@@ -906,8 +907,9 @@ export class CallLogic extends LogicItem {
       const args = logic?.params || [];
       const keywordEntitiesIndex = findConceptKeyWordIndexFromNamespace(this.calleeNamespace, 'entities');
 
-      code += `this.$logics['${this.calleeNamespace ? `${this.calleeNamespace}.${this.calleeName}` : this.calleeName
-        }']`;
+      code += `this.$logics['${
+        this.calleeNamespace ? `${this.calleeNamespace}.${this.calleeName}` : this.calleeName
+      }']`;
       code += `({
                 config: {
                     download: false,
@@ -1191,17 +1193,11 @@ export class CallLogic extends LogicItem {
       };
     }
     const typeAnnotation = (this as any).typeAnnotation || this.__TypeAnnotation;
-    let { sortedTypeKey, typeKind, typeName, typeNamespace } = typeAnnotation || {};
-    if (typeNamespace?.endsWith('.metadataTypes')) {
-      const referenceNode = this.app.findNodeByCompleteName(typeNamespace + '.' + typeName) || {};
-      const typeAn = referenceNode.typeAnnotation || {};
-      sortedTypeKey = `${typeAn.typeNamespace}.${typeAn.typeName}`;
-      typeKind = typeAn.typeKind;
-      typeName = typeAn.typeName;
-    }
-    const needGenInitFromSchema = typeAnnotation && (!['primitive', 'union'].includes(typeKind) || typeName === 'DateTime');
+    const needGenInitFromSchema =
+      typeAnnotation &&
+      (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
     if (needGenInitFromSchema) {
-      code = `this.$genInitFromSchema('${sortedTypeKey}', ${code})`;
+      code = `this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', ${code})`;
     }
     code += ')';
     return code;
@@ -1221,10 +1217,6 @@ export class CallLogic extends LogicItem {
     return Boolean(this.handleError || this.useValidation);
   }
 
-  get businessComponent() {
-    return this.getAncestor('BusinessComponent');
-  }
-
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
@@ -1359,11 +1351,6 @@ export class CallLogic extends LogicItem {
       yield* setInputParam();
       code += ';\n})()';
     } else {
-      // 属于业务组件
-      const belongBusinessComponent = !!this.businessComponent;
-      if (belongBusinessComponent && !self.calleeNamespace) {
-        code += `(this as ${this.businessComponent.name}).`;
-      }
       code += calleeKey;
       yield* setTypeArguments();
       yield* setInputParam();
@@ -1521,7 +1508,7 @@ export class CallLogic extends LogicItem {
             state: Array.isArray(t) ? 2 : 1,
           };
         });
-      } catch (err) { }
+      } catch (err) {}
     }
     return node;
   }

package/src/concepts/Constant__.ts

@@ -347,13 +347,15 @@ export class Constant extends BaseNode {
     }
     if (this.typeAnnotation) {
       code += `: `;
-      if (this.defaultValue?.expression) {
-        if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(this.typeAnnotation.typeKey)) {
+      if (
+        this.defaultValue?.expression &&
+        !(this.typeAnnotation && ['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(typeKey))
+      ) {
+        code += `${yield* this.defaultValue.toEmbeddedTS(shiftState(state, code))}`;
+      } else {
+        if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(typeKey)) {
           code += yield* this.defaultValue.toEmbeddedTS(shiftState(state, code), true);
-        } else {
-          code += `${yield* this.defaultValue.toEmbeddedTS(shiftState(state, code))}`;
         }
-      } else {
         code += 'undefined';
       }
       code += ' as ';

package/src/concepts/Destination__.ts

@@ -367,7 +367,7 @@ export class Destination extends LogicItem {
     let code = '';
     const viewArr = this.genViewArr();
     if (Array.isArray(viewArr) && viewArr.length) {
-      code += `let url = '${this.viewNode?.frontend?.prefixPath ? this.viewNode.frontend.prefixPath : ''}/${viewArr.join(
+      code += `let url = '${this.viewNode.frontend.prefixPath ? this.viewNode.frontend.prefixPath : ''}/${viewArr.join(
         '/',
       )}';\n`;
       const { completeArguments } = this;
@@ -691,21 +691,19 @@ export class Destination extends LogicItem {
       });
     }
     if (this.viewNode) {
-      return `${this.viewNode?.frontend?.prefixPath}/${viewNameAttr.join('/')}`;
+      return `${this.viewNode.frontend.prefixPath}/${viewNameAttr.join('/')}`;
     }
     return `/${viewNameAttr.join('/')}`;
   }
 
   @withSourceMapGenerator
-  *toEmbeddedTSInProcess(state = createCompilerState(), prevCode: string): TranslatorGenerator {
+  *toEmbeddedTSInProcess(state = createCompilerState(), prependCode: string): TranslatorGenerator {
     const self = this;
     // const tab = indent((state?.tabSize || 0));
     if (self.tsCalleeNamespace && self.tsName) {
       const destinationName = self.parentNode.name.replace('-', '_');
-      // 跳转页面拿不到自己任务下的输出参数，所以不需要__ProcessIdentification__标注
-      prevCode = prevCode.replace('__ProcessIdentification__', '');
       let code = `${destinationName}: function() {\n`;
-      code += prevCode;
+      code += prependCode;
       code += '\n';
       if (self.tsCalleeNamespace && self.viewName) {
         code += `${self.tsCalleeNamespace}.${self.viewName}.$destination({`;

package/src/concepts/End__.ts

@@ -99,7 +99,6 @@ export class End extends LogicItem {
         // 旧逻辑默认走这里，
         // 期望后期可以直接走完整的case， default 直接抛出异常好更明确定位错误
         logic =
-          self.getAncestor('BusinessLogic') ||
           self.parentNode.getAncestor('Logic') ||
           self.parentNode.getAncestor('AuthLogic') ||
           self.parentNode.getAncestor('AuthLogicForCallInterface') ||

package/src/concepts/Entity__.ts

@@ -77,7 +77,7 @@ export class Entity extends BaseNode {
    * 实体来源
    */
   @property()
-  origin: 'ide' | 'sql' | 'table' | 'excel' = 'ide';
+  origin: 'ide' | 'sql' | 'table' | 'excel' | 'form' = 'ide';
 
   /**
    * 实体属性列表
@@ -951,6 +951,8 @@ export class Entity extends BaseNode {
     ns.path = this.getNamespace();
     return ns;
   }
+  // @excludedInJSON()
+  // nslogic: Namespace;
 
   get logics() {
     return this.ns.logics;

package/src/concepts/Event__.ts

@@ -1,20 +1,3 @@
-import {
-  wrapForEachToGenerator as wrapForEach,
-  wrapIteratorToGenerator as wrapIterator,
-  runGeneratorSync as runSync,
-  returnOrigin,
-} from '../utils/time-slicing';
-import {
-  TranslatorState,
-  shiftState,
-  withSourceMap,
-  indent,
-  createCompilerState,
-  embeddedTSEmitter,
-  withSourceMapGenerator,
-  withGenerator,
-  TranslatorGenerator,
-} from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -133,30 +116,6 @@ export class Event extends BaseNode {
     }
     return params;
   }
-  /**
-   * 设置组件事件名称
-   */
-  setName(name: string) {
-    const object = {
-      name,
-    };
-    this.update({
-      ...object,
-      field: 'name',
-    });
-  }
-
-  /**
-   * 设置组件事件描述
-   */
-  setDescription(description: string) {
-    const object = {
-      description,
-    };
-    this.update({
-      ...object,
-    });
-  }
 
   getParamExistingNames(excludedList: Array<Param> = []) {
     const excludedSet = new Set(excludedList);
@@ -372,36 +331,7 @@ export class Event extends BaseNode {
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
-  static getDefaultOptions() {
-    return {
-      description: '自定义事件',
-    };
-  }
 
-  getVarExistingNames(excludedList: Array<Param> = []) {
-    const excludedSet = new Set(excludedList);
-    return (this.params || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
-  }
-
-  @withSourceMapGenerator
-  *toEmbeddedTS(state = createCompilerState(), prefix?: string, hideDefaultValue?: boolean): TranslatorGenerator {
-    const self = this;
-    let code = `${self.name}`;
-    // 有参数长度
-    if (self.params.length) {
-      code += '(';
-      yield* wrapForEach(self.params, function* warpForEachGenerator(param, index) {
-        code += yield* param.toEmbeddedTS(shiftState(state, code));
-        if (index !== self.params.length - 1) code += ', ';
-      });
-      code += ')';
-    } else {
-      // 没有参数的
-      code += '()';
-    }
-    code += '{};\n';
-    return code;
-  }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓