@lcap/nasl 3.4.0-beta.6 → 3.5.0-alpha.1

package/src/concepts/Event__.ts

@@ -3,28 +3,28 @@
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import Param from './Param__';
-import ViewComponent from './ViewComponent__';
-import Module from './Module__';
-import App from './App__';
+import type Param from './Param__';
+import type ViewComponent from './ViewComponent__';
+import type Module from './Module__';
+import type App from './App__';
 
 /**
  * 组件事件
  */
-@className
 @concept('组件事件')
-// @ts-ignore
 export class Event extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Event';
+  static readonly ConceptName: string = 'Event';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -37,35 +37,30 @@ export class Event extends BaseNode {
    * 组件事件名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 组件事件分组
    */
   @property()
-  // @ts-ignore
   group!: string;
 
   /**
    * 组件事件标题
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
    * 组件事件描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
    * 是否为高级功能，不在低代码中显示
    */
   @property()
-  // @ts-ignore
   advanced!: boolean;
 
   /**
@@ -154,6 +149,7 @@ export class Event extends BaseNode {
   _insertParamAt(options: string | Partial<Param> | Param, index: number) {
     const paramOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'params' };
+    const Param = getConceptConstructor('Param');
     let param: Param;
     if (!options) {
       param = Param.from(
@@ -173,7 +169,7 @@ export class Event extends BaseNode {
         this,
         'params',
       );
-    } else if (options instanceof Param) {
+    } else if (asserts.isParam(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       param = options;
       Object.assign(param, relationOptions);

package/src/concepts/ExternalDestination__.ts

@@ -9,7 +9,7 @@ import {
   createCompilerState,
 } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
-import StringLiteral from './StringLiteral__';
+import type StringLiteral from './StringLiteral__';
 import { BindAttribute, ViewElement, Param } from '..';
 
 //================================================================================
@@ -17,26 +17,25 @@ import { BindAttribute, ViewElement, Param } from '..';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
-import BaseNode from '../common/BaseNode';
 import LogicItem from './LogicItem__';
-import Anchor from './Anchor__';
+import type Anchor from './Anchor__';
 
 /**
  * 跳转到外部链接
  */
-@className
 @concept('跳转到外部链接')
-// @ts-ignore
 export class ExternalDestination extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'ExternalDestination';
+  static readonly ConceptName: string = 'ExternalDestination';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -51,7 +50,6 @@ export class ExternalDestination extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   link!: LogicItem;
 
   /**
@@ -66,7 +64,6 @@ export class ExternalDestination extends LogicItem {
   @property({
     objectRef: 'Anchor',
   })
-  // @ts-ignore
   anchor!: Anchor;
 
   /**
@@ -274,7 +271,7 @@ export class ExternalDestination extends LogicItem {
     let url = '';
     if (this.link) {
       url += 'this.$link(`${';
-      url += `${this.link.toJS()}`;
+      url += `${this.link.toJS(state)}`;
       url += '}';
       if (this.anchor) {
         const anchor = this.anchor.toJS(shiftState(state, url));
@@ -302,9 +299,9 @@ export class ExternalDestination extends LogicItem {
 
   changeParentTarget() {
     const { target } = this;
-    if (this.parentNode instanceof BindAttribute) {
+    if (asserts.isBindAttribute(this.parentNode)) {
       const grandParent = this.parentNode?.parentNode;
-      if (grandParent instanceof ViewElement) {
+      if (asserts.isViewElement(grandParent)) {
         const targetNode = grandParent?.bindAttrs?.find((x) => x.name === 'target');
         if (targetNode) {
           targetNode.setValue(target);
@@ -314,9 +311,9 @@ export class ExternalDestination extends LogicItem {
   }
 
   inheritTargetFromGrandPa() {
-    if (this.parentNode instanceof BindAttribute) {
+    if (asserts.isBindAttribute(this.parentNode)) {
       const grandParent = this.parentNode?.parentNode;
-      if (grandParent instanceof ViewElement) {
+      if (asserts.isViewElement(grandParent)) {
         const targetNode = grandParent?.bindAttrs?.find((x) => x.name === 'target');
         if (targetNode && targetNode.value !== this.target) {
           this.target = targetNode.value;

package/src/concepts/ForEachStatement__.ts

@@ -9,35 +9,33 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import TypeAnnotation from './TypeAnnotation__';
-import Identifier from './Identifier__';
-import MemberExpression from './MemberExpression__';
+import type TypeAnnotation from './TypeAnnotation__';
+import type Identifier from './Identifier__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
-import BaseNode from '../common/BaseNode';
 import LogicItem from './LogicItem__';
-import Param from './Param__';
+import type Param from './Param__';
 
 /**
  * ForEach 循环分支
  */
-@className
 @concept('ForEach 循环分支')
-// @ts-ignore
 export class ForEachStatement extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'ForEachStatement';
+  static readonly ConceptName: string = 'ForEachStatement';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -52,7 +50,6 @@ export class ForEachStatement extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   each!: LogicItem;
 
   /**
@@ -61,7 +58,6 @@ export class ForEachStatement extends LogicItem {
   @property({
     objectRef: 'Param',
   })
-  // @ts-ignore
   item!: Param;
 
   /**
@@ -70,7 +66,6 @@ export class ForEachStatement extends LogicItem {
   @property({
     objectRef: 'Param',
   })
-  // @ts-ignore
   index!: Param;
 
   /**
@@ -79,7 +74,6 @@ export class ForEachStatement extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   start!: LogicItem;
 
   /**
@@ -88,7 +82,6 @@ export class ForEachStatement extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   end!: LogicItem;
 
   /**
@@ -206,8 +199,9 @@ export class ForEachStatement extends LogicItem {
   _insertItemAt(options: Partial<LogicItem> | LogicItem, index: number) {
     const logicItemOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'body' };
+    const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
-    if (options instanceof LogicItem) {
+    if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);
@@ -497,7 +491,7 @@ export class ForEachStatement extends LogicItem {
     const idxNames = [];
     let n = this.parentNode;
     while (n && n.concept !== 'Logic') {
-      if (n instanceof ForEachStatement) {
+      if (asserts.isForEachStatement(n)) {
         itemNames.push(n.item.name);
         idxNames.push(n.index.name);
       }
@@ -549,12 +543,14 @@ export class ForEachStatement extends LogicItem {
     const eachCode = `$forEachListVariable${number}`;
     let endValue = '';
     if (this.end) {
-      endValue = this.end.toJS();
+      endValue = this.end.toJS(state);
     } else if (this.each) {
       endValue = `(${eachCode} || {}).length`;
     }
     code += `var ${eachCode} = ${list};\n`;
-    code += `var $forEachStartVariable${number} = ${this.start && this.start.toJS() ? this.start.toJS() : ''};\n`;
+    code += `var $forEachStartVariable${number} = ${
+      this.start && this.start.toJS(state) ? this.start.toJS(state) : ''
+    };\n`;
     code += `var $forEachEndVariable${number} = ${endValue};\n`;
     code += `if(Array.isArray($forEachListVariable${number})) {\n`;
     code += `for (let ${this.index.name} = $forEachStartVariable${number}; `;
@@ -610,43 +606,34 @@ export class ForEachStatement extends LogicItem {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    let code = '';
+    let code = 'ForEach(';
     code += this.each
-      ? this.each.toNaturalTS(
+      ? this.each?.toNaturalTS(
           shiftState(state, code, {
             tabSize: 0,
           }),
         )
       : '__IDENTIFIER__';
-    if (['NewList', 'NewMap'].includes(this.each?.concept)) code += '\n';
-    code += '.__slice(';
-    code += this.start ? this.start.toNaturalTS(shiftState(state, code)) : '__IDENTIFIER__';
     code += ', ';
-    let virtualEnd: LogicItem = this.end;
-    if (!virtualEnd && this.each) {
-      // if (['List', 'String', 'Email', 'Text', 'Map'].includes(this.each.__TypeAnnotation?.typeName)) {
-      virtualEnd = new MemberExpression({
-        object: BaseNode.from({ ...this.each.toJSON(), name: this.each.name }) as LogicItem,
-        property: new Identifier({ name: 'length' }),
-      });
-      // }
-    }
-    code += virtualEnd ? virtualEnd.toNaturalTS(shiftState(state, code)) : '__IDENTIFIER__';
-    code += ').__forEach((';
-    code += this.item ? this.item.toNaturalTS(shiftState(state, code), true) : '__IDENTIFIER__';
+    code += this.start ? this.start?.toNaturalTS(shiftState(state, code, { tabSize: 0 })) : '__IDENTIFIER__';
     code += ', ';
-    code += this.index ? this.index.toNaturalTS(shiftState(state, code), true) : '__IDENTIFIER__';
-    code += ') => {\n';
+    code += this.end ? this.end?.toNaturalTS(shiftState(state, code, { tabSize: 0 })) : '__IDENTIFIER__';
+    code += ', (';
+    code += this.item ? this.item?.toNaturalTS(shiftState(state, code, { tabSize: 0 }), true) : '__IDENTIFIER__';
+    code += ', ';
+    code += this.index ? this.index?.toNaturalTS(shiftState(state, code, { tabSize: 0 }), true) : '__IDENTIFIER__';
+    code += ') => {\n ';
+
     if (Array.isArray(this.body)) {
       this.body.forEach((logicItem) => {
-        code += `${logicItem.toNaturalTS(
+        code += `${logicItem?.toNaturalTS(
           shiftState(state, code, {
             tabSize: (state?.tabSize || 0) + 1,
           }),
         )};\n`;
       });
-      if (state.focusedNodePath === `${this.nodePath}.body[${this.body.length}]`)
-        code += `${indent(state.tabSize + 1)}// 当前位置\n`;
+      if (state?.focusedNodePath === `${this?.nodePath}.body[${this.body?.length}]`)
+        code += `${indent((state?.tabSize || 0) + 1)}// 当前位置\n`;
     }
     code += `${indent(state?.tabSize || 0)}})\n`;
 

package/src/concepts/FrontendLibrary__.ts

@@ -1,32 +1,32 @@
-import Namespace from './Namespace__';
+import type Namespace from './Namespace__';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import Logic from './Logic__';
-import ViewComponent from './ViewComponent__';
-import Module from './Module__';
-import App from './App__';
+import type Logic from './Logic__';
+import type ViewComponent from './ViewComponent__';
+import type Module from './Module__';
+import type App from './App__';
 
 /**
  * 前端库
  */
-@className
 @concept('前端库')
-// @ts-ignore
 export class FrontendLibrary extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'FrontendLibrary';
+  static readonly ConceptName: string = 'FrontendLibrary';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -39,14 +39,12 @@ export class FrontendLibrary extends BaseNode {
    * 名称与type保持一致
    */
   @property()
-  // @ts-ignore
   name!: 'pc' | 'h5';
 
   /**
    * PC/H5 端
    */
   @property()
-  // @ts-ignore
   type!: 'pc' | 'h5';
 
   /**
@@ -139,6 +137,7 @@ export class FrontendLibrary extends BaseNode {
   _insertLogicAt(options: string | Partial<Logic> | Logic, index: number) {
     const logicOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'logics' };
+    const Logic = getConceptConstructor('Logic');
     let logic: Logic;
     if (!options) {
       logic = Logic.from(
@@ -158,7 +157,7 @@ export class FrontendLibrary extends BaseNode {
         this,
         'logics',
       );
-    } else if (options instanceof Logic) {
+    } else if (asserts.isLogic(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logic = options;
       Object.assign(logic, relationOptions);
@@ -294,6 +293,7 @@ export class FrontendLibrary extends BaseNode {
   _insertViewComponentAt(options: string | Partial<ViewComponent> | ViewComponent, index: number) {
     const viewComponentOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'viewComponents' };
+    const ViewComponent = getConceptConstructor('ViewComponent');
     let viewComponent: ViewComponent;
     if (!options) {
       viewComponent = ViewComponent.from(
@@ -313,7 +313,7 @@ export class FrontendLibrary extends BaseNode {
         this,
         'viewComponents',
       );
-    } else if (options instanceof ViewComponent) {
+    } else if (asserts.isViewComponent(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       viewComponent = options;
       Object.assign(viewComponent, relationOptions);

package/src/concepts/FrontendVariable__.ts

@@ -1,27 +1,37 @@
+interface defaultCode {
+  code?: string;
+  executeCode?: boolean;
+}
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
-import BaseNode from '../common/BaseNode';
 import Variable from './Variable__';
 
 /**
  * 前端全局变量
  */
-@className
 @concept('前端全局变量')
-// @ts-ignore
 export class FrontendVariable extends Variable {
   /** 类名 */
-  static readonly ConceptName = 'FrontendVariable';
+  static readonly ConceptName: string = 'FrontendVariable';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['Variable', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['Variable', 'BaseNode'];
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'FrontendVariable';
 
   /**
    * 是否开启本地缓存
@@ -59,6 +69,12 @@ export class FrontendVariable extends Variable {
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
 
+  /**
+   * 默认值toJS的结果
+   */
+  @property()
+  defaultCode: defaultCode = {};
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓