@lcap/nasl 3.5.0-beta.1 → 3.5.0-beta.3

package/src/concepts/View__.ts

@@ -41,8 +41,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import type StaticString from './StaticString__';
@@ -59,13 +59,12 @@ import type App from './App__';
  * 页面
  */
 @concept('页面')
-// @ts-ignore
 export class View extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'View';
+  static readonly ConceptName: string = 'View';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -78,28 +77,24 @@ export class View extends BaseNode {
    * 页面模板 Id
    */
   @property()
-  // @ts-ignore
   pageTemplateId!: string;
 
   /**
    * 页面名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 唯一标识
    */
   @property()
-  // @ts-ignore
   uuid!: string;
 
   /**
    * 页面标题
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
@@ -108,49 +103,42 @@ export class View extends BaseNode {
   @property({
     objectRef: 'StaticString',
   })
-  // @ts-ignore
   crumb!: StaticString;
 
   /**
    * 权限控制
    */
   @property()
-  // @ts-ignore
   auth!: boolean;
 
   /**
    * 权限资源描述
    */
   @property()
-  // @ts-ignore
   authDescription!: string;
 
   /**
    * 是否是默认跳转的页面
    */
   @property()
-  // @ts-ignore
   isIndex!: boolean;
 
   /**
    * 未解析的模板代码
    */
   @property()
-  // @ts-ignore
   template!: string;
 
   /**
    * 未解析的逻辑代码
    */
   @property()
-  // @ts-ignore
   script!: string;
 
   /**
    * 未解析的样式代码
    */
   @property()
-  // @ts-ignore
   style!: string;
 
   /**
@@ -385,7 +373,7 @@ export class View extends BaseNode {
         this,
         'elements',
       );
-    } else if (Assert.isViewElement(options)) {
+    } else if (asserts.isViewElement(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       viewElement = options;
       Object.assign(viewElement, relationOptions);
@@ -535,7 +523,7 @@ export class View extends BaseNode {
         this,
         'params',
       );
-    } else if (Assert.isParam(options)) {
+    } else if (asserts.isParam(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       param = options;
       Object.assign(param, relationOptions);
@@ -685,7 +673,7 @@ export class View extends BaseNode {
         this,
         'variables',
       );
-    } else if (Assert.isVariable(options)) {
+    } else if (asserts.isVariable(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       variable = options;
       Object.assign(variable, relationOptions);
@@ -835,7 +823,7 @@ export class View extends BaseNode {
         this,
         'logics',
       );
-    } else if (Assert.isLogic(options)) {
+    } else if (asserts.isLogic(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logic = options;
       Object.assign(logic, relationOptions);
@@ -989,7 +977,7 @@ export class View extends BaseNode {
         this,
         'bindEvents',
       );
-    } else if (Assert.isBindEvent(options)) {
+    } else if (asserts.isBindEvent(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       bindEvent = options;
       Object.assign(bindEvent, relationOptions);
@@ -1143,7 +1131,7 @@ export class View extends BaseNode {
         this,
         'children',
       );
-    } else if (Assert.isView(options)) {
+    } else if (asserts.isView(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       view = options;
       Object.assign(view, relationOptions);
@@ -1702,7 +1690,7 @@ export class View extends BaseNode {
       newName = name.replace(/\d*$/, (m) => `_${BranchCopyUniCode}_${m}`);
     }
     // 主分支无 BranchCopyUniCode
-    if (!BranchCopyUniCode && prefix.at(-1) !== '_') {
+    if (!BranchCopyUniCode && prefix?.at(-1) !== '_') {
       newName = name.replace(/\d*$/, (m) => `_${m}`);
     }
     const newPrefix = newName.replace(/\d*$/, '');
@@ -1879,7 +1867,7 @@ export class View extends BaseNode {
               logics: [newLogic],
             },
             this,
-            'events',
+            'bindEvents',
           );
           this.addBindEvent(event);
         } else {
@@ -2002,7 +1990,7 @@ export class View extends BaseNode {
                       .join('\n')}
                 }
             }
-        };`;
+        };\n`;
     code += keyboardEventMixinCode;
     if (this.script) {
       mixin = this.script.trim().replace(/export default |module\.exports +=/, 'const mixin = ');
@@ -2076,12 +2064,14 @@ export class View extends BaseNode {
     let pathName = name;
     let parent = this.parentNode;
     if (parent) {
-      while (parent && Assert.isView(parent)) {
+      while (parent && asserts.isView(parent)) {
         pathName = `${parent.name}/${pathName}`;
         parent = parent.parentNode;
       }
     }
-    return `/embedded/${this.app.name}/frontends/${this.frontend.name}/views/${pathName}.ts`;
+    return `/embedded/${this.getAncestor('App')?.name}/frontendTypes/${
+      this.getAncestor('FrontendType')?.name
+    }/frontends/${this.getAncestor('Frontend')?.name}/views/${pathName}.ts`;
   }
 
   getNamespace(): string {
@@ -2182,17 +2172,17 @@ export class View extends BaseNode {
     // 需要类型推导的局部变量/返回值需要调整申明顺序
     const advanceMap: Map<Variable, Assignment | BatchAssignment> = new Map();
     yield* self.traverseChildrenGenerator(function* traverseChildrenGenerator(el) {
-      if (el && (Assert.isBatchAssignment(el) || (Assert.isAssignment(el) && el.left?.name))) {
+      if (el && (asserts.isBatchAssignment(el) || (asserts.isAssignment(el) && el.left?.name))) {
         // 子页面内部逻辑过滤
         if (el.view !== self) return;
-        if (Assert.isAssignment(el)) {
+        if (asserts.isAssignment(el)) {
           const advanceVar = self.variables?.find(
             (variable) => !variable.typeAnnotation && el.left?.name === variable.name,
           );
           if (advanceVar && !advanceMap.get(advanceVar)) {
             advanceMap.set(advanceVar, el);
           }
-        } else if (Assert.isBatchAssignment(el)) {
+        } else if (asserts.isBatchAssignment(el)) {
           yield* wrapForEach(el.assignmentLines, function* warpForEachGenerator({ leftIndex }) {
             const leftCode =
               leftIndex.length === 1
@@ -2244,7 +2234,7 @@ export class View extends BaseNode {
       code += `${indent((state?.tabSize || 0) + 1)}let `;
       code += yield* variable.toEmbeddedTS(shiftState(state, code, { inline: true }));
       code += ' = ';
-      if (Assert.isBatchAssignment(assignment)) {
+      if (asserts.isBatchAssignment(assignment)) {
         yield* wrapForEach(assignment.assignmentLines, function* warpForEachGenerator({ leftIndex, rightIndex }) {
           const leftCode =
             leftIndex.length === 1
@@ -2266,7 +2256,7 @@ export class View extends BaseNode {
         // 因为右侧枚举要赋值就得new 一下；
         if (
           assignment.right &&
-          Assert.isIdentifier(assignment.right) &&
+          asserts.isIdentifier(assignment.right) &&
           assignment.right.namespace &&
           assignment.right.namespace.endsWith('enums')
         ) {
@@ -2435,7 +2425,7 @@ ${indent(state.tabSize)} */
 ${indent(state.tabSize)}export function ${this.tsName}_view`;
     const advanceMap: Map<Variable, Assignment | BatchAssignment> = new Map();
     this.traverseChildren((el) => {
-      if (el && (Assert.isBatchAssignment(el) || (Assert.isAssignment(el) && el.left?.name))) {
+      if (el && (asserts.isBatchAssignment(el) || (asserts.isAssignment(el) && el.left?.name))) {
         // 子页面内部逻辑过滤
         if (el.view !== this) return;
         const jsCode = el.toJS();
@@ -2802,7 +2792,7 @@ ${indent(state.tabSize)}export function ${this.tsName}_view`;
     const logic = assignment.logic;
     const logicRtn = logic?.returns[0];
     // 调用接口，参数替换成 null
-    if (Assert.isCallInterface(rightNode)) {
+    if (asserts.isCallInterface(rightNode)) {
       const { _interface } = rightNode.getModuleInterface();
       return _interface
         ? `${rightNode.tsCalleeKey}(${(_interface as Interface).params.map(() => 'null').join(',')})`
@@ -2810,7 +2800,7 @@ ${indent(state.tabSize)}export function ${this.tsName}_view`;
     }
 
     // 调用服务端逻辑，参数替换成 null
-    if (Assert.isCallLogic(rightNode) && rightNode.calleeNamespace === 'app.logics') {
+    if (asserts.isCallLogic(rightNode) && rightNode.calleeNamespace === 'app.logics') {
       const calleeName = rightNode?.calleeName;
       const calleeLogic = this.app.logics.find((l) => l.name === calleeName);
       return calleeLogic ? `app.logics.${calleeName}(${calleeLogic.params.map(() => 'null').join(',')})` : null;
@@ -2862,7 +2852,7 @@ ${indent(state.tabSize)}export function ${this.tsName}_view`;
   }
 
   getAncestorViewElementsWithDataSource(logic: Logic): ViewElement[] {
-    let element: Type.SyntaxNode = logic;
+    let element: types.SyntaxNode = logic;
     const viewElements: ViewElement[] = [];
     while (element) {
       if (
@@ -2909,7 +2899,7 @@ ${indent(state.tabSize)}export function ${this.tsName}_view`;
   getViewCallLogics(): string[] {
     const callbackLogics: string[] = [];
     this.traverseChildren((el) => {
-      if (Assert.isIdentifier(el) && el.namespace?.endsWith('logics')) {
+      if (asserts.isIdentifier(el) && el.namespace?.endsWith('logics')) {
         callbackLogics.push(el.namespace + '.' + el.name);
       }
     });

package/src/concepts/WhileStatement__.ts

@@ -17,8 +17,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import LogicItem from './LogicItem__';
 
@@ -26,13 +26,12 @@ import LogicItem from './LogicItem__';
  * While 循环分支
  */
 @concept('While 循环分支')
-// @ts-ignore
 export class WhileStatement extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'WhileStatement';
+  static readonly ConceptName: string = 'WhileStatement';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -47,7 +46,6 @@ export class WhileStatement extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   test!: LogicItem;
 
   /**
@@ -107,7 +105,7 @@ export class WhileStatement extends LogicItem {
     const relationOptions = { parentNode: this, parentKey: 'body' };
     const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
-    if (Assert.isLogicItem(options)) {
+    if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);

package/src/concepts/basics/stdlib/nasl.util.ts

@@ -1845,36 +1845,36 @@ export function initialize() {
         }),
       ],
     }),
-    // new Function({
-    //   name: 'SliceToListPage',
-    //   description: '将列表按照规则切片，返回切片后的列表分页',
-    //   params: [
-    //     new Param({
-    //       name: 'list',
-    //       description: '指定列表',
-    //       typeAnnotation: TypeAnnotation.createGeneric('List', {
-    //         typeArguments: [TypeAnnotation.createTypeParam('T')],
-    //       }),
-    //     }),
-    //     new Param({
-    //       name: 'page',
-    //       description: '页数，integer类型，从1开始',
-    //       typeAnnotation: TypeAnnotation.createPrimitive('Long'),
-    //     }),
-    //     new Param({
-    //       name: 'size',
-    //       description: '每页的大小，integer类型',
-    //       typeAnnotation: TypeAnnotation.createPrimitive('Long'),
-    //     }),
-    //   ],
-    //   returns: [
-    //     new Return({
-    //       typeAnnotation: TypeAnnotation.createGeneric('PageOf', {
-    //         typeArguments: [TypeAnnotation.createTypeParam('T')],
-    //       }),
-    //     }),
-    //   ],
-    // }),
+    new Function({
+      name: 'SliceToListPage',
+      description: '将列表按照规则切片，返回切片后的列表分页',
+      params: [
+        new Param({
+          name: 'list',
+          description: '指定列表',
+          typeAnnotation: TypeAnnotation.createGeneric('List', {
+            typeArguments: [TypeAnnotation.createTypeParam('T')],
+          }),
+        }),
+        new Param({
+          name: 'page',
+          description: '页数，integer类型，从1开始',
+          typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+        }),
+        new Param({
+          name: 'size',
+          description: '每页的大小，integer类型',
+          typeAnnotation: TypeAnnotation.createPrimitive('Long'),
+        }),
+      ],
+      returns: [
+        new Return({
+          typeAnnotation: TypeAnnotation.createGeneric('PageOf', {
+            typeArguments: [TypeAnnotation.createTypeParam('T')],
+          }),
+        }),
+      ],
+    }),
     new Function({
       name: 'New',
       description: '根据参数选择的类型，返回该参数的实例化对象',

package/src/concepts/basics/stdlib/reference2TypeAnnotationList.ts

@@ -1,13 +1,13 @@
 import type Entity from '../../Entity__';
 import type Structure from '../../Structure__';
 import type Enum from '../../Enum__';
-import * as Assert from '../../utils/asserts';
+import * as asserts from '../../utils/asserts';
 import { getConceptConstructor } from '../../../decorators';
 
 export function reference2TypeAnnotationList(list: Array<Entity | Structure | Enum> = [], namespace: string) {
   const TypeAnnotation = getConceptConstructor('TypeAnnotation');
   return list.map((item) => {
-    if (Assert.isStructure(item) && item.typeParams?.length > 0) {
+    if (asserts.isStructure(item) && item.typeParams?.length > 0) {
       return TypeAnnotation.createReference(item.name, {
         typeKind: 'generic',
         typeNamespace: namespace,

package/src/concepts/index.ts

@@ -2,8 +2,8 @@ import { initialize } from './basics/stdlib';
 
 export { BaseNode } from '../common/BaseNode';
 
-export * as Assert from './utils/asserts';
-export * as Type from './utils/types';
+export * as asserts from './utils/asserts';
+export * as types from './utils/types';
 
 export * from './index__';
 export * from './basics/types/coreTypeList';

package/src/concepts/index__.ts

@@ -1,6 +1,7 @@
 export * from './App__';
 export * from './Module__';
 export * from './Namespace__';
+export * from './FrontendType__';
 export * from './Frontend__';
 export * from './Backend__';
 export * from './Integration__';
@@ -24,6 +25,7 @@ export * from './BindDirective__';
 export * from './BindEvent__';
 export * from './BindStyle__';
 export * from './ViewComponent__';
+export * from './BusinessComponent__';
 export * from './Attribute__';
 export * from './Event__';
 export * from './Slot__';
@@ -31,10 +33,12 @@ export * from './Theme__';
 export * from './StaticString__';
 export * from './Logic__';
 export * from './AuthLogic__';
+export * from './BusinessLogic__';
 export * from './AuthLogicForCallInterface__';
 export * from './OverriddenLogic__';
 export * from './AbstractInterface__';
 export * from './Param__';
+export * from './ParamWithGroup__';
 export * from './Return__';
 export * from './Variable__';
 export * from './BackendVariable__';
@@ -60,6 +64,7 @@ export * from './Assignment__';
 export * from './BatchAssignment__';
 export * from './Comment__';
 export * from './CallLogic__';
+export * from './CallEvent__';
 export * from './CallFunction__';
 export * from './CallInterface__';
 export * from './Destination__';
@@ -86,7 +91,6 @@ export * from './New__';
 export * from './NewComposite__';
 export * from './NewList__';
 export * from './NewMap__';
-export * from './Paginate__';
 export * from './CallQueryComponent__';
 export * from './QueryFromExpression__';
 export * from './QueryJoinExpression__';