@lcap/nasl 3.7.0-beta.4 → 3.7.0-beta.5

package/src/concepts/LogicItem__.ts

@@ -21,6 +21,7 @@ import Logic from './Logic__';
 import Connector from './Connector__';
 import AuthLogic from './AuthLogic__';
 import AuthLogicForCallInterface from './AuthLogicForCallInterface__';
+import type ConnectorLogic from './ConnectorLogic__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -272,6 +273,12 @@ export abstract class LogicItem extends BaseNode {
   get AuthLogicForCallInterface() {
     return this.getAncestor('AuthLogicForCallInterface') as AuthLogicForCallInterface;
   }
+  /**
+   * 祖先 ConnectorLogic
+   */
+  get ConnectorLogic() {
+    return this.getAncestor('ConnectorLogic') as ConnectorLogic;
+  }
 
   get completeName() {
     return this.name;

package/src/concepts/Logic__.ts

@@ -83,7 +83,7 @@ export class Logic extends BaseNode {
    */
   @property('concept')
   // @ts-ignore
-  readonly concept!: 'Logic' | 'AuthLogic' | 'AuthLogicForCallInterface' | 'BusinessLogic';
+  readonly concept!: 'Logic' | 'AuthLogic' | 'AuthLogicForCallInterface' | 'BusinessLogic' | 'ConnectorLogic';
   /**
    * 逻辑名称
    */
@@ -1690,6 +1690,7 @@ export class Logic extends BaseNode {
         }
       }
     });
+
     // 兼容 return 没有类型情况
     if (self.returns.length && self.returns[0].typeAnnotation) {
       code += ': ';

package/src/concepts/MatchCase__.ts

@@ -223,6 +223,7 @@ export class MatchCase extends LogicItem {
   getLogicItemUniqueName(name = 'logicItem1') {
     return utils.unique(name, this.getLogicItemExistingNames(), undefined, false);
   }
+
   /**
    * 插入逻辑项
    * @internal

package/src/concepts/Module__.ts

@@ -3,8 +3,9 @@ const moduleNameSpace = {
   dependencies: 'extensions',
   interfaceDependencies: 'apis',
   componentDependencies: 'components',
+  connectorDependencies: 'connector',
 };
-type ModuleKeyType = 'dependencies' | 'interfaceDependencies' | 'componentDependencies';
+type ModuleKeyType = 'dependencies' | 'interfaceDependencies' | 'componentDependencies' | 'connectorDependencies';
 import type { AuthInterface } from './AuthInterface__';
 import type ConfigProperty from './ConfigProperty__';
 import type Interface from './Interface__';

package/src/concepts/MsgTriggerLauncher__.ts

@@ -12,13 +12,13 @@ import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 
 import Argument from './Argument__';
-import TriggerLauncher from './TriggerLauncher__';
+import ConnectorTriggerLauncher from './ConnectorTriggerLauncher__';
 
 /**
  * 触发器启动器消息
  */
 @concept('触发器启动器消息')
-export class MsgTriggerLauncher extends TriggerLauncher {
+export class MsgTriggerLauncher extends ConnectorTriggerLauncher {
   /** 类名 */
   static readonly ConceptName: string = 'MsgTriggerLauncher';
   /**
@@ -27,7 +27,7 @@ export class MsgTriggerLauncher extends TriggerLauncher {
    */
   static isAbstract: boolean = false;
   /** 继承链 */
-  static readonly inheritanceChain: string[] = ['TriggerLauncher', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['ConnectorTriggerLauncher', 'TriggerLauncher', 'BaseNode'];
 
   /**
    * 产品概念
@@ -45,14 +45,6 @@ export class MsgTriggerLauncher extends TriggerLauncher {
   })
   properties: Array<Argument> = [];
 
-  /**
-   * calleeConnectionName
-   */
-  @property({
-    objectRef: '',
-  })
-  calleeConnectionName: string;
-
   /**
    * @param source 需要合并的部分参数
    */
@@ -78,18 +70,6 @@ export class MsgTriggerLauncher extends TriggerLauncher {
     });
   }
 
-  /**
-   * 设置calleeConnectionName
-   */
-  setCalleeConnectionName(calleeConnectionName: string) {
-    const object = {
-      calleeConnectionName,
-    };
-    this.update({
-      ...object,
-    });
-  }
-
   getArgumentExistingNames(excludedList: Array<Argument> = []) {
     const excludedSet = new Set(excludedList);
     return ((this.properties as Argument[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -280,6 +260,10 @@ export class MsgTriggerLauncher extends TriggerLauncher {
     return this.getAncestor('Module') as Module;
   }
 
+  get connection() {
+    return this.rootNode?.connections?.find((item) => item.name === this.calleeConnectionName);
+  }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/OqlQueryComponent__.ts

@@ -316,23 +316,24 @@ export class OqlQueryComponent extends LogicItem {
         };
       }
 
-      return http.post('/api/v1/querydebug/generate/typescript', {
-        appId: 'myAppId',
-        oqlIdentifier: 'myoqlIdentifier',
-        dataSourceName: this.dataSource,
-        oql: this.code,
-        ideVersion: this.app.ideVersion,
-        dataSourceNasl,
-        typeScriptStartLine: 1,
-        typeScriptStartLineColumn: 1,
-      })
-      .then(({ data }: any) => {
-        this.codeSourceMap = data.result ?? { typescript: '', lexicalErrorCode: 1001 };
-      })
-      .catch((err) => {
-        logger.error('Oql 请求失败', err.toString());
-        this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
-      });
+      return http
+        .post('/api/v1/querydebug/generate/typescript', {
+          appId: 'myAppId',
+          oqlIdentifier: 'myoqlIdentifier',
+          dataSourceName: this.dataSource,
+          oql: this.code,
+          ideVersion: this.app.ideVersion,
+          dataSourceNasl,
+          typeScriptStartLine: 1,
+          typeScriptStartLineColumn: 1,
+        })
+        .then(({ data }: any) => {
+          this.codeSourceMap = data.result ?? { typescript: '', lexicalErrorCode: 1001 };
+        })
+        .catch((err) => {
+          logger.error('Oql 请求失败', err.toString());
+          this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
+        });
     }
     this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
   }

package/src/concepts/Structure__.ts

@@ -609,8 +609,8 @@ export class Structure extends BaseNode {
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
     // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里需要强行改成 extensions
     if (this.parentNode?.concept === 'Connector') {
-      // return `connector.${this.parentNode.name}.structures`;
-      return `extensions.${this.parentNode.name}.structures`;
+      return `connector.${this.parentNode.name}.structures`;
+      // return `extensions.${this.parentNode.name}.structures`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getNamespace();
@@ -629,8 +629,8 @@ export class Structure extends BaseNode {
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
     // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里需要强行改成 extensions
     if (this.parentNode?.concept === 'Connector') {
-      // return `connector.${this.parentNode.tsName}.structures`;
-      return `extensions.${this.parentNode.tsName}.structures`;
+      return `connector.${this.parentNode.tsName}.structures`;
+      // return `extensions.${this.parentNode.tsName}.structures`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getTsNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getTsNamespace();

package/src/concepts/TriggerEvent__.ts

@@ -16,14 +16,14 @@ import TypeAnnotation from './TypeAnnotation__';
  * 触发器事件
  */
 @concept('触发器事件')
-export class TriggerEvent extends BaseNode {
+export abstract class TriggerEvent extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'TriggerEvent';
   /**
    * 是否为抽象类
    * 抽象类不能产生 concept: string
    */
-  static isAbstract: boolean = false;
+  static isAbstract: boolean = true;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -32,7 +32,7 @@ export class TriggerEvent extends BaseNode {
    */
   @property('concept')
   // @ts-ignore
-  readonly concept!: 'TriggerEvent' | 'MsgTriggerEvent';
+  readonly concept!: 'MsgTriggerEvent' | 'InterfaceTriggerEvent';
   /**
    * 触发器事件名称
    */

package/src/concepts/TriggerLauncher__.ts

@@ -26,6 +26,7 @@ import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 import BaseNode from '../common/BaseNode';
 import Identifier from './Identifier__';
+import ConnectorTriggerLauncher from './ConnectorTriggerLauncher__';
 
 /**
  * 触发器启动器
@@ -47,7 +48,7 @@ export class TriggerLauncher extends BaseNode {
    */
   @property('concept')
   // @ts-ignore
-  readonly concept!: 'TriggerLauncher' | 'MsgTriggerLauncher';
+  readonly concept!: 'TriggerLauncher' | 'ConnectorTriggerLauncher' | 'MsgTriggerLauncher';
   /**
    * 触发器启动器名称
    */
@@ -162,8 +163,24 @@ export class TriggerLauncher extends BaseNode {
     let code = '';
     code += `export function ${self.name} () {\n`;
     try {
+      // console.log('test', self.connectorTrigger?.triggerEvent.callBackLogic.typeArguments[0])
       // 仅仅作引用查找不需要入参校验
-      code += `${self.callBackLogicKey}`;
+      if (self.concept === 'ConnectorTriggerLauncher') {
+        const connectorTrigger = (self as unknown as ConnectorTriggerLauncher).connectorTrigger
+        let stashParams = ''
+        if (connectorTrigger?.triggerEvent?.callBackLogic?.typeArguments?.[0]) {
+          stashParams = 'params'
+          code += `let params:`
+          code +=  `${yield* connectorTrigger?.triggerEvent?.callBackLogic?.typeArguments?.[0]?.toEmbeddedTS?.(shiftState(state, code))}\n`
+        }
+        code += `let result`;
+        if (connectorTrigger?.triggerEvent?.callBackLogic?.returnType?.[0]) {
+          code += `:${yield* connectorTrigger?.triggerEvent?.callBackLogic?.returnType?.[0]?.toEmbeddedTS?.(shiftState(state, code))}`
+        }
+        code += ` = ${self.callBackLogicKey}(${stashParams})`;
+      } else {
+        code += `${self.callBackLogicKey}`;
+      }
       code += ';\n';
       code += '}\n';
     } catch (error) {

package/src/concepts/ViewElement__.ts

@@ -1417,6 +1417,7 @@ export class ViewElement extends BaseNode {
     return this.view || (this?.getAncestor('BusinessComponent') as BusinessComponent);
   }
 
+
   /* 主页面有没有权限 */
   get parentAuth() {
     const _nameSpace = this.view.getNamespace();
@@ -3179,7 +3180,16 @@ export class ViewElement extends BaseNode {
       { node: this },
     );
   }
-
+  // 查找element下有没有某个类型的元素，有就返回
+  findElementItem(conceptName: string): ViewElement {
+    return utils.traverse(
+      (current) => {
+        if (current.node.concept === conceptName) return current.node;
+      },
+      { node: this },
+      { mode: 'anyObject', excludedKeySet: this.JSON_EXCLUDED_KEYS },
+    );
+  }
   @excludedInJSON()
   computedStyle: object = {};
   getCurrentName() {

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

@@ -61,6 +61,7 @@ export function initialize() {
     }),
     new Logic({
       name: 'getWeChatOpenid',
+      description: '获取微信openid',
       params: [],
       body: [],
       returns: [
@@ -72,6 +73,7 @@ export function initialize() {
     }),
     new Logic({
       name: 'getWeChatNickName',
+      description: '获取微信昵称',
       params: [],
       body: [],
       returns: [
@@ -83,6 +85,7 @@ export function initialize() {
     }),
     new Logic({
       name: 'getWeChatPhone',
+      description: '获取微信手机号',
       params: [],
       body: [],
       returns: [
@@ -94,6 +97,31 @@ export function initialize() {
     }),
     new Logic({
       name: 'getWeChatHeadImg',
+      description: '获取微信头像',
+      params: [],
+      body: [],
+      returns: [
+        new Return({
+          name: 'result',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+    }),
+    new Logic({
+      name: 'getWeChatLocation',
+      description: '获取微信定位',
+      params: [],
+      body: [],
+      returns: [
+        new Return({
+          name: 'result',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+    }),
+    new Logic({
+      name: 'getWeChatScanCode',
+      description: '获取微信二维码内容',
       params: [],
       body: [],
       returns: [
@@ -105,11 +133,25 @@ export function initialize() {
     }),
     new Logic({
       name: 'navigateToUserInfo',
+      description: '跳转到微信昵称头像获取页面',
       params: [],
       body: [],
     }),
     new Logic({
       name: 'navigateToUserPhone',
+      description: '跳转到微信手机号获取页面',
+      params: [],
+      body: [],
+    }),
+    new Logic({
+      name: 'navigateToScanCode',
+      description: '跳转到微信扫一扫页面',
+      params: [],
+      body: [],
+    }),
+    new Logic({
+      name: 'navigateToLocation',
+      description: '跳转到微信定位页面',
       params: [],
       body: [],
     }),

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

@@ -75,6 +75,14 @@ export function initialize() {
     Enum.from(
       {
         name: 'I18nEnum',
+        label: '国际化多语言枚举',
+        description: '国际化多语言功能涉及的所有可选语言',
+        valueType: {
+          concept: 'TypeAnnotation',
+          typeKind: 'primitive',
+          typeNamespace: 'nasl.core',
+          typeName: 'String',
+        },
         enumItems: languageList.map((item) => {
           return new EnumItem({
             label: new StaticString({

package/src/concepts/index__.ts

@@ -145,9 +145,12 @@ export * from './AuthInterface__';
 export * from './CallAuthInterface__';
 export * from './TriggerEvent__';
 export * from './MsgTriggerEvent__';
+export * from './InterfaceTriggerEvent__';
 export * from './ConnectorTrigger__';
 export * from './TriggerLauncher__';
+export * from './ConnectorTriggerLauncher__';
 export * from './MsgTriggerLauncher__';
 export * from './Connector__';
 export * from './CallConnector__';
 export * from './Connection__';
+export * from './ConnectorLogic__';