@flowgram.ai/variable-core 0.1.31 → 0.2.1

package/dist/index.d.mts

@@ -360,7 +360,7 @@ declare enum ASTKind {
      */
     KeyPathExpression = "KeyPathExpression",
     EnumerateExpression = "EnumerateExpression",
-    ExpressionList = "ExpressionList",
+    WrapArrayExpression = "WrapArrayExpression",
     /**
      * 通用 AST 节点
      */
@@ -497,7 +497,7 @@ declare class MapNode extends ASTNode<MapNodeJSON> {
 declare abstract class BaseType<JSON extends ASTNodeJSON = any, InjectOpts = any> extends ASTNode<JSON, InjectOpts> {
     flags: number;
     /**
-     * 类型是否一致，节点有额外信息判断，请参考 extraTypeInfoEqual
+     * 类型是否一致
      * @param targetTypeJSON
      */
     isTypeEqual(targetTypeJSONOrKind?: ASTNodeJSONOrKind): boolean;
@@ -506,6 +506,10 @@ declare abstract class BaseType<JSON extends ASTNodeJSON = any, InjectOpts = any
      * @param keyPath
      */
     getByKeyPath(keyPath?: string[]): BaseVariableField | undefined;
+    /**
+     * Get AST JSON for current base type
+     * @returns
+     */
     toJSON(): ASTNodeJSON;
 }
 
@@ -662,16 +666,6 @@ declare abstract class BaseExpression<JSON extends ASTNodeJSON = any, InjectOpts
     constructor(params: CreateASTParams, opts?: InjectOpts);
 }
 
-interface ExpressionListJSON {
-    expressions: ASTNodeJSON[];
-}
-declare class ExpressionList extends ASTNode<ExpressionListJSON> {
-    static kind: string;
-    expressions: ASTNode[];
-    fromJSON({ expressions }: ExpressionListJSON): void;
-    toJSON(): ASTNodeJSON;
-}
-
 interface KeyPathExpressionJSON$1 {
     keyPath: string[];
 }
@@ -738,6 +732,25 @@ declare class KeyPathExpressionV2<CustomPathJSON extends ASTNodeJSON = KeyPathEx
     toJSON(): ASTNodeJSON;
 }
 
+interface WrapArrayExpressionJSON {
+    wrapFor: ASTNodeJSON;
+}
+/**
+ * 遍历表达式，对列表进行遍历，获取遍历后的变量类型
+ */
+declare class WrapArrayExpression extends BaseExpression<WrapArrayExpressionJSON> {
+    static kind: string;
+    protected _wrapFor: BaseExpression | undefined;
+    protected _returnType: BaseType | undefined;
+    get wrapFor(): BaseExpression<any, any> | undefined;
+    get returnType(): BaseType | undefined;
+    refreshReturnType(): void;
+    getRefFields(): [];
+    fromJSON({ wrapFor: expression }: WrapArrayExpressionJSON): void;
+    toJSON(): ASTNodeJSON;
+    protected init(): void;
+}
+
 /**
  * 声明类 AST 节点
  */
@@ -897,6 +910,10 @@ declare namespace ASTFactory {
         keyPath: string[];
         kind: ASTKind;
     };
+    const createWrapArrayExpression: (json: WrapArrayExpressionJSON) => {
+        wrapFor: ASTNodeJSON;
+        kind: ASTKind;
+    };
     /**
      * 通过 AST Class 创建
      */
@@ -1044,4 +1061,4 @@ declare class VariableFieldKeyRenameService {
     dispose(): void;
 }
 
-export { ASTFactory, ASTKind, ASTMatch, ASTNode, ASTNodeFlags, type ASTNodeJSON, type ASTNodeRegistry, ASTRegisters, ArrayType, BaseExpression, BaseType, BaseVariableField, BooleanType, type CreateASTParams, CustomType, type CustomTypeJSON, DataNode, EnumerateExpression, type EnumerateExpressionJSON, ExpressionList, type ExpressionListJSON, type GetKindJSON, type GetKindJSONOrKind, type GlobalEventActionType, type IVariableTable, IntegerType, KeyPathExpression, type KeyPathExpressionJSON$1 as KeyPathExpressionJSON, KeyPathExpressionV2, ListNode, type ListNodeJSON, MapNode, type MapNodeJSON, MapType, NumberType, type ObjectJSON, type ObjectPropertiesChangeAction, ObjectType, Property, type PropertyJSON, Scope, ScopeChain, ScopeOutputData, ScopeProvider, StringType, type UnionJSON, VariableContainerModule, VariableDeclaration, type VariableDeclarationJSON, VariableDeclarationList, type VariableDeclarationListChangeAction, type VariableDeclarationListJSON, VariableEngine, VariableEngineProvider, VariableFieldKeyRenameService, injectToAST, isMatchAST, postConstructAST, useAvailableVariables, useCurrentScope, useScopeAvailable, useScopeContext };
+export { ASTFactory, ASTKind, ASTMatch, ASTNode, ASTNodeFlags, type ASTNodeJSON, type ASTNodeRegistry, ASTRegisters, ArrayType, BaseExpression, BaseType, BaseVariableField, BooleanType, type CreateASTParams, CustomType, type CustomTypeJSON, DataNode, EnumerateExpression, type EnumerateExpressionJSON, type GetKindJSON, type GetKindJSONOrKind, type GlobalEventActionType, type IVariableTable, IntegerType, KeyPathExpression, type KeyPathExpressionJSON$1 as KeyPathExpressionJSON, KeyPathExpressionV2, ListNode, type ListNodeJSON, MapNode, type MapNodeJSON, MapType, NumberType, type ObjectJSON, type ObjectPropertiesChangeAction, ObjectType, Property, type PropertyJSON, Scope, ScopeChain, ScopeOutputData, ScopeProvider, StringType, type UnionJSON, VariableContainerModule, VariableDeclaration, type VariableDeclarationJSON, VariableDeclarationList, type VariableDeclarationListChangeAction, type VariableDeclarationListJSON, VariableEngine, VariableEngineProvider, VariableFieldKeyRenameService, WrapArrayExpression, type WrapArrayExpressionJSON, injectToAST, isMatchAST, postConstructAST, useAvailableVariables, useCurrentScope, useScopeAvailable, useScopeContext };

package/dist/index.d.ts

@@ -360,7 +360,7 @@ declare enum ASTKind {
      */
     KeyPathExpression = "KeyPathExpression",
     EnumerateExpression = "EnumerateExpression",
-    ExpressionList = "ExpressionList",
+    WrapArrayExpression = "WrapArrayExpression",
     /**
      * 通用 AST 节点
      */
@@ -497,7 +497,7 @@ declare class MapNode extends ASTNode<MapNodeJSON> {
 declare abstract class BaseType<JSON extends ASTNodeJSON = any, InjectOpts = any> extends ASTNode<JSON, InjectOpts> {
     flags: number;
     /**
-     * 类型是否一致，节点有额外信息判断，请参考 extraTypeInfoEqual
+     * 类型是否一致
      * @param targetTypeJSON
      */
     isTypeEqual(targetTypeJSONOrKind?: ASTNodeJSONOrKind): boolean;
@@ -506,6 +506,10 @@ declare abstract class BaseType<JSON extends ASTNodeJSON = any, InjectOpts = any
      * @param keyPath
      */
     getByKeyPath(keyPath?: string[]): BaseVariableField | undefined;
+    /**
+     * Get AST JSON for current base type
+     * @returns
+     */
     toJSON(): ASTNodeJSON;
 }
 
@@ -662,16 +666,6 @@ declare abstract class BaseExpression<JSON extends ASTNodeJSON = any, InjectOpts
     constructor(params: CreateASTParams, opts?: InjectOpts);
 }
 
-interface ExpressionListJSON {
-    expressions: ASTNodeJSON[];
-}
-declare class ExpressionList extends ASTNode<ExpressionListJSON> {
-    static kind: string;
-    expressions: ASTNode[];
-    fromJSON({ expressions }: ExpressionListJSON): void;
-    toJSON(): ASTNodeJSON;
-}
-
 interface KeyPathExpressionJSON$1 {
     keyPath: string[];
 }
@@ -738,6 +732,25 @@ declare class KeyPathExpressionV2<CustomPathJSON extends ASTNodeJSON = KeyPathEx
     toJSON(): ASTNodeJSON;
 }
 
+interface WrapArrayExpressionJSON {
+    wrapFor: ASTNodeJSON;
+}
+/**
+ * 遍历表达式，对列表进行遍历，获取遍历后的变量类型
+ */
+declare class WrapArrayExpression extends BaseExpression<WrapArrayExpressionJSON> {
+    static kind: string;
+    protected _wrapFor: BaseExpression | undefined;
+    protected _returnType: BaseType | undefined;
+    get wrapFor(): BaseExpression<any, any> | undefined;
+    get returnType(): BaseType | undefined;
+    refreshReturnType(): void;
+    getRefFields(): [];
+    fromJSON({ wrapFor: expression }: WrapArrayExpressionJSON): void;
+    toJSON(): ASTNodeJSON;
+    protected init(): void;
+}
+
 /**
  * 声明类 AST 节点
  */
@@ -897,6 +910,10 @@ declare namespace ASTFactory {
         keyPath: string[];
         kind: ASTKind;
     };
+    const createWrapArrayExpression: (json: WrapArrayExpressionJSON) => {
+        wrapFor: ASTNodeJSON;
+        kind: ASTKind;
+    };
     /**
      * 通过 AST Class 创建
      */
@@ -1044,4 +1061,4 @@ declare class VariableFieldKeyRenameService {
     dispose(): void;
 }
 
-export { ASTFactory, ASTKind, ASTMatch, ASTNode, ASTNodeFlags, type ASTNodeJSON, type ASTNodeRegistry, ASTRegisters, ArrayType, BaseExpression, BaseType, BaseVariableField, BooleanType, type CreateASTParams, CustomType, type CustomTypeJSON, DataNode, EnumerateExpression, type EnumerateExpressionJSON, ExpressionList, type ExpressionListJSON, type GetKindJSON, type GetKindJSONOrKind, type GlobalEventActionType, type IVariableTable, IntegerType, KeyPathExpression, type KeyPathExpressionJSON$1 as KeyPathExpressionJSON, KeyPathExpressionV2, ListNode, type ListNodeJSON, MapNode, type MapNodeJSON, MapType, NumberType, type ObjectJSON, type ObjectPropertiesChangeAction, ObjectType, Property, type PropertyJSON, Scope, ScopeChain, ScopeOutputData, ScopeProvider, StringType, type UnionJSON, VariableContainerModule, VariableDeclaration, type VariableDeclarationJSON, VariableDeclarationList, type VariableDeclarationListChangeAction, type VariableDeclarationListJSON, VariableEngine, VariableEngineProvider, VariableFieldKeyRenameService, injectToAST, isMatchAST, postConstructAST, useAvailableVariables, useCurrentScope, useScopeAvailable, useScopeContext };
+export { ASTFactory, ASTKind, ASTMatch, ASTNode, ASTNodeFlags, type ASTNodeJSON, type ASTNodeRegistry, ASTRegisters, ArrayType, BaseExpression, BaseType, BaseVariableField, BooleanType, type CreateASTParams, CustomType, type CustomTypeJSON, DataNode, EnumerateExpression, type EnumerateExpressionJSON, type GetKindJSON, type GetKindJSONOrKind, type GlobalEventActionType, type IVariableTable, IntegerType, KeyPathExpression, type KeyPathExpressionJSON$1 as KeyPathExpressionJSON, KeyPathExpressionV2, ListNode, type ListNodeJSON, MapNode, type MapNodeJSON, MapType, NumberType, type ObjectJSON, type ObjectPropertiesChangeAction, ObjectType, Property, type PropertyJSON, Scope, ScopeChain, ScopeOutputData, ScopeProvider, StringType, type UnionJSON, VariableContainerModule, VariableDeclaration, type VariableDeclarationJSON, VariableDeclarationList, type VariableDeclarationListChangeAction, type VariableDeclarationListJSON, VariableEngine, VariableEngineProvider, VariableFieldKeyRenameService, WrapArrayExpression, type WrapArrayExpressionJSON, injectToAST, isMatchAST, postConstructAST, useAvailableVariables, useCurrentScope, useScopeAvailable, useScopeContext };

package/dist/index.js

@@ -43,7 +43,6 @@ __export(src_exports, {
   CustomType: () => CustomType,
   DataNode: () => DataNode,
   EnumerateExpression: () => EnumerateExpression,
-  ExpressionList: () => ExpressionList,
   IntegerType: () => IntegerType,
   KeyPathExpression: () => KeyPathExpression,
   KeyPathExpressionV2: () => KeyPathExpressionV2,
@@ -64,6 +63,7 @@ __export(src_exports, {
   VariableEngine: () => VariableEngine,
   VariableEngineProvider: () => VariableEngineProvider,
   VariableFieldKeyRenameService: () => VariableFieldKeyRenameService,
+  WrapArrayExpression: () => WrapArrayExpression,
   injectToAST: () => injectToAST,
   isMatchAST: () => isMatchAST,
   postConstructAST: () => postConstructAST,
@@ -75,11 +75,11 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/variable-container-module.ts
-var import_inversify7 = require("inversify");
+var import_inversify8 = require("inversify");
 
 // src/variable-engine.ts
 var import_rxjs6 = require("rxjs");
-var import_inversify5 = require("inversify");
+var import_inversify6 = require("inversify");
 var import_utils8 = require("@flowgram.ai/utils");
 var import_utils9 = require("@flowgram.ai/utils");
 
@@ -281,7 +281,7 @@ var ASTKind = /* @__PURE__ */ ((ASTKind2) => {
   ASTKind2["VariableDeclarationList"] = "VariableDeclarationList";
   ASTKind2["KeyPathExpression"] = "KeyPathExpression";
   ASTKind2["EnumerateExpression"] = "EnumerateExpression";
-  ASTKind2["ExpressionList"] = "ExpressionList";
+  ASTKind2["WrapArrayExpression"] = "WrapArrayExpression";
   ASTKind2["ListNode"] = "ListNode";
   ASTKind2["DataNode"] = "DataNode";
   ASTKind2["MapNode"] = "MapNode";
@@ -290,7 +290,7 @@ var ASTKind = /* @__PURE__ */ ((ASTKind2) => {
 
 // src/ast/ast-registers.ts
 var import_lodash3 = require("lodash");
-var import_inversify2 = require("inversify");
+var import_inversify3 = require("inversify");
 
 // src/ast/utils/inversify.ts
 var injectToAST = (serviceIdentifier) => function(target, propertyKey) {
@@ -615,7 +615,7 @@ var BaseType = class extends ASTNode {
     this.flags = 8 /* BasicType */;
   }
   /**
-   * 类型是否一致，节点有额外信息判断，请参考 extraTypeInfoEqual
+   * 类型是否一致
    * @param targetTypeJSON
    */
   isTypeEqual(targetTypeJSONOrKind) {
@@ -634,6 +634,10 @@ var BaseType = class extends ASTNode {
   getByKeyPath(keyPath = []) {
     throw new Error(`Get By Key Path is not implemented for Type: ${this.kind}`);
   }
+  /**
+   * Get AST JSON for current base type
+   * @returns
+   */
   toJSON() {
     return {
       kind: this.kind
@@ -961,29 +965,6 @@ var BaseExpression = class extends ASTNode {
   }
 };
 
-// src/ast/expression/expression-list.ts
-var ExpressionList = class extends ASTNode {
-  fromJSON({ expressions }) {
-    this.expressions = expressions.map((_expression, idx) => {
-      const prevExpression = this.expressions[idx];
-      if (prevExpression.kind !== _expression.kind) {
-        prevExpression.dispose();
-        this.fireChange();
-        return this.createChildNode(_expression);
-      }
-      prevExpression.fromJSON(_expression);
-      return prevExpression;
-    });
-  }
-  toJSON() {
-    return {
-      kind: "ExpressionList" /* ExpressionList */,
-      properties: this.expressions.map((_expression) => _expression.toJSON())
-    };
-  }
-};
-ExpressionList.kind = "ExpressionList" /* ExpressionList */;
-
 // src/ast/expression/keypath-expression.ts
 var import_fast_equals3 = require("fast-equals");
 var KeyPathExpression = class extends BaseExpression {
@@ -1165,6 +1146,46 @@ var KeyPathExpressionV2 = class extends BaseExpression {
 };
 KeyPathExpressionV2.kind = "KeyPathExpression" /* KeyPathExpression */;
 
+// src/ast/expression/wrap-array-expression.ts
+var WrapArrayExpression = class extends BaseExpression {
+  get wrapFor() {
+    return this._wrapFor;
+  }
+  get returnType() {
+    return this._returnType;
+  }
+  refreshReturnType() {
+    const childReturnTypeJSON = this.wrapFor?.returnType?.toJSON();
+    this.updateChildNodeByKey("_returnType", {
+      kind: "Array" /* Array */,
+      items: childReturnTypeJSON
+    });
+  }
+  getRefFields() {
+    return [];
+  }
+  fromJSON({ wrapFor: expression }) {
+    this.updateChildNodeByKey("_wrapFor", expression);
+  }
+  toJSON() {
+    return {
+      kind: "WrapArrayExpression" /* WrapArrayExpression */,
+      wrapFor: this.wrapFor?.toJSON()
+    };
+  }
+  init() {
+    this.toDispose.push(
+      this.subscribe(this.refreshReturnType, {
+        selector: (curr) => curr.wrapFor?.returnType
+      })
+    );
+  }
+};
+WrapArrayExpression.kind = "WrapArrayExpression" /* WrapArrayExpression */;
+__decorateClass([
+  postConstructAST()
+], WrapArrayExpression.prototype, "init", 1);
+
 // src/ast/declaration/base-variable-field.ts
 var import_fast_equals5 = require("fast-equals");
 var BaseVariableField = class extends ASTNode {
@@ -1471,7 +1492,7 @@ var ASTRegisters = class {
     this.registerAST(VariableDeclarationList);
     this.registerAST(KeyPathExpression);
     this.registerAST(EnumerateExpression);
-    this.registerAST(ExpressionList);
+    this.registerAST(WrapArrayExpression);
     this.registerAST(MapNode);
     this.registerAST(DataNode);
   }
@@ -1524,7 +1545,7 @@ var ASTRegisters = class {
   }
 };
 ASTRegisters = __decorateClass([
-  (0, import_inversify2.injectable)()
+  (0, import_inversify3.injectable)()
 ], ASTRegisters);
 
 // src/ast/factory.ts
@@ -1574,6 +1595,10 @@ var ASTFactory;
     kind: "KeyPathExpression" /* KeyPathExpression */,
     ...json
   });
+  ASTFactory2.createWrapArrayExpression = (json) => ({
+    kind: "WrapArrayExpression" /* WrapArrayExpression */,
+    ...json
+  });
   ASTFactory2.create = (targetType, json) => ({ kind: targetType.kind, ...json });
 })(ASTFactory || (ASTFactory = {}));
 
@@ -1946,20 +1971,20 @@ var VariableEngine = class {
   }
 };
 __decorateClass([
-  (0, import_inversify5.inject)(ContainerProvider)
+  (0, import_inversify6.inject)(ContainerProvider)
 ], VariableEngine.prototype, "containerProvider", 2);
 __decorateClass([
-  (0, import_inversify5.preDestroy)()
+  (0, import_inversify6.preDestroy)()
 ], VariableEngine.prototype, "dispose", 1);
 VariableEngine = __decorateClass([
-  (0, import_inversify5.injectable)(),
-  __decorateParam(0, (0, import_inversify5.inject)(ScopeChain)),
-  __decorateParam(1, (0, import_inversify5.inject)(ASTRegisters))
+  (0, import_inversify6.injectable)(),
+  __decorateParam(0, (0, import_inversify6.inject)(ScopeChain)),
+  __decorateParam(1, (0, import_inversify6.inject)(ASTRegisters))
 ], VariableEngine);
 
 // src/services/variable-field-key-rename-service.ts
 var import_lodash5 = require("lodash");
-var import_inversify6 = require("inversify");
+var import_inversify7 = require("inversify");
 var import_utils10 = require("@flowgram.ai/utils");
 var VariableFieldKeyRenameService = class {
   constructor() {
@@ -2025,20 +2050,20 @@ var VariableFieldKeyRenameService = class {
   }
 };
 __decorateClass([
-  (0, import_inversify6.inject)(VariableEngine)
+  (0, import_inversify7.inject)(VariableEngine)
 ], VariableFieldKeyRenameService.prototype, "variableEngine", 2);
 __decorateClass([
-  (0, import_inversify6.postConstruct)()
+  (0, import_inversify7.postConstruct)()
 ], VariableFieldKeyRenameService.prototype, "init", 1);
 __decorateClass([
-  (0, import_inversify6.preDestroy)()
+  (0, import_inversify7.preDestroy)()
 ], VariableFieldKeyRenameService.prototype, "dispose", 1);
 VariableFieldKeyRenameService = __decorateClass([
-  (0, import_inversify6.injectable)()
+  (0, import_inversify7.injectable)()
 ], VariableFieldKeyRenameService);
 
 // src/variable-container-module.ts
-var VariableContainerModule = new import_inversify7.ContainerModule((bind) => {
+var VariableContainerModule = new import_inversify8.ContainerModule((bind) => {
   bind(VariableEngine).toSelf().inSingletonScope();
   bind(ASTRegisters).toSelf().inSingletonScope();
   bind(VariableFieldKeyRenameService).toSelf().inSingletonScope();
@@ -2105,7 +2130,6 @@ function useAvailableVariables() {
   CustomType,
   DataNode,
   EnumerateExpression,
-  ExpressionList,
   IntegerType,
   KeyPathExpression,
   KeyPathExpressionV2,
@@ -2126,6 +2150,7 @@ function useAvailableVariables() {
   VariableEngine,
   VariableEngineProvider,
   VariableFieldKeyRenameService,
+  WrapArrayExpression,
   injectToAST,
   isMatchAST,
   postConstructAST,