@flowgram.ai/variable-core 0.5.7 → 1.0.1

package/dist/index.js

@@ -88,7 +88,7 @@ module.exports = __toCommonJS(index_exports);
 var import_inversify8 = require("inversify");
 
 // src/variable-engine.ts
-var import_rxjs6 = require("rxjs");
+var import_rxjs7 = require("rxjs");
 var import_inversify6 = require("inversify");
 var import_utils8 = require("@flowgram.ai/utils");
 var import_utils9 = require("@flowgram.ai/utils");
@@ -352,7 +352,7 @@ var ASTKind = /* @__PURE__ */ ((ASTKind2) => {
 })(ASTKind || {});
 
 // src/ast/ast-registers.ts
-var import_lodash_es3 = require("lodash-es");
+var import_lodash_es4 = require("lodash-es");
 var import_inversify3 = require("inversify");
 
 // src/ast/utils/inversify.ts
@@ -461,6 +461,7 @@ function isMatchAST(node, targetType) {
 // src/ast/ast-node.ts
 var import_rxjs2 = require("rxjs");
 var import_nanoid = require("nanoid");
+var import_lodash_es = require("lodash-es");
 var import_fast_equals = require("fast-equals");
 var import_utils4 = require("@flowgram.ai/utils");
 var ASTNode = class _ASTNode {
@@ -519,6 +520,16 @@ var ASTNode = class _ASTNode {
     this.opts = opts;
     this.key = key || (0, import_nanoid.nanoid)();
     this.fromJSON = this.withBatchUpdate(this.fromJSON.bind(this));
+    const rawToJSON = this.toJSON?.bind(this);
+    this.toJSON = () => (0, import_lodash_es.omitBy)(
+      {
+        // always include kind
+        kind: this.kind,
+        ...rawToJSON?.() || {}
+      },
+      // remove undefined fields
+      import_lodash_es.isNil
+    );
   }
   /**
    * The type of the ASTNode.
@@ -535,16 +546,6 @@ var ASTNode = class _ASTNode {
   get children() {
     return Array.from(this._children);
   }
-  /**
-   * Serializes the current ASTNode to ASTNodeJSON.
-   * @returns
-   */
-  toJSON() {
-    console.warn("[VariableEngine] Please Implement toJSON method for " + this.kind);
-    return {
-      kind: this.kind
-    };
-  }
   /**
    * Creates a child ASTNode.
    * @param json The AST JSON of the child ASTNode.
@@ -711,15 +712,6 @@ var BaseType = class extends ASTNode {
   getByKeyPath(keyPath = []) {
     throw new Error(`Get By Key Path is not implemented for Type: ${this.kind}`);
   }
-  /**
-   * Serialize the node to a JSON object.
-   * @returns The JSON representation of the node.
-   */
-  toJSON() {
-    return {
-      kind: this.kind
-    };
-  }
 };
 
 // src/ast/type/array.ts
@@ -814,6 +806,15 @@ var StringType = class extends BaseType {
       this.fireChange();
     }
   }
+  /**
+   * Serialize the `StringType` to `StringJSON`.
+   * @returns The JSON representation of `StringType`.
+   */
+  toJSON() {
+    return {
+      format: this._format
+    };
+  }
 };
 StringType.kind = "String" /* String */;
 
@@ -829,6 +830,9 @@ var IntegerType = class extends BaseType {
    */
   fromJSON() {
   }
+  toJSON() {
+    return {};
+  }
 };
 IntegerType.kind = "Integer" /* Integer */;
 
@@ -840,6 +844,9 @@ var BooleanType = class extends BaseType {
    */
   fromJSON() {
   }
+  toJSON() {
+    return {};
+  }
 };
 BooleanType.kind = "Boolean" /* Boolean */;
 
@@ -851,6 +858,9 @@ var NumberType = class extends BaseType {
    */
   fromJSON() {
   }
+  toJSON() {
+    return {};
+  }
 };
 NumberType.kind = "Number" /* Number */;
 
@@ -903,7 +913,7 @@ var MapType = class extends BaseType {
 MapType.kind = "Map" /* Map */;
 
 // src/ast/type/object.ts
-var import_lodash_es = require("lodash-es");
+var import_lodash_es2 = require("lodash-es");
 var ObjectType = class extends BaseType {
   constructor() {
     super(...arguments);
@@ -956,7 +966,6 @@ var ObjectType = class extends BaseType {
    */
   toJSON() {
     return {
-      kind: "Object" /* Object */,
       properties: this.properties.map((_property) => _property.toJSON())
     };
   }
@@ -999,7 +1008,7 @@ var ObjectType = class extends BaseType {
     const targetProperties = targetTypeJSON.properties || [];
     const sourcePropertyKeys = Array.from(this.propertyTable.keys());
     const targetPropertyKeys = targetProperties.map((_target) => _target.key);
-    const isKeyStrongEqual = !(0, import_lodash_es.xor)(sourcePropertyKeys, targetPropertyKeys).length;
+    const isKeyStrongEqual = !(0, import_lodash_es2.xor)(sourcePropertyKeys, targetPropertyKeys).length;
     return isKeyStrongEqual && targetProperties.every((targetProperty) => {
       const sourceProperty = this.propertyTable.get(targetProperty.key);
       return sourceProperty && sourceProperty.key === targetProperty.key && sourceProperty.type?.isTypeEqual(targetProperty?.type);
@@ -1040,6 +1049,11 @@ var CustomType = class extends BaseType {
     }
     return targetTypeJSON?.kind === this.kind && targetTypeJSON?.typeName === this.typeName;
   }
+  toJSON() {
+    return {
+      typeName: this.typeName
+    };
+  }
 };
 CustomType.kind = "CustomType" /* CustomType */;
 
@@ -1166,15 +1180,16 @@ var EnumerateExpression = class extends BaseExpression {
 EnumerateExpression.kind = "EnumerateExpression" /* EnumerateExpression */;
 
 // src/ast/expression/keypath-expression.ts
+var import_rxjs4 = require("rxjs");
 var import_fast_equals3 = require("fast-equals");
 
 // src/ast/utils/expression.ts
-var import_lodash_es2 = require("lodash-es");
+var import_lodash_es3 = require("lodash-es");
 function getAllRefs(ast) {
   return getAllChildren(ast).filter((_child) => _child.flags & 4 /* Expression */).map((_child) => _child.refs).flat().filter(Boolean);
 }
 function checkRefCycle(curr, refNodes) {
-  if ((0, import_lodash_es2.intersection)(curr.scope.coverScopes, refNodes.map((_ref) => _ref?.scope).filter(Boolean)).length === 0) {
+  if ((0, import_lodash_es3.intersection)(curr.scope.coverScopes, refNodes.map((_ref) => _ref?.scope).filter(Boolean)).length === 0) {
     return false;
   }
   const visited = /* @__PURE__ */ new Set();
@@ -1186,7 +1201,7 @@ function checkRefCycle(curr, refNodes) {
       queue.push(ref);
     }
   }
-  return (0, import_lodash_es2.intersection)(Array.from(visited), getParentFields(curr)).length > 0;
+  return (0, import_lodash_es3.intersection)(Array.from(visited), getParentFields(curr)).length > 0;
 }
 
 // src/ast/expression/keypath-expression.ts
@@ -1206,12 +1221,14 @@ var KeyPathExpression = class extends BaseExpression {
         }
       }),
       subsToDisposable(
-        this.refs$.subscribe((_type) => {
+        this.refs$.pipe(
+          (0, import_rxjs4.distinctUntilChanged)(
+            (prev, next) => prev === next,
+            (_refs) => _refs?.[0]?.type?.hash
+          )
+        ).subscribe((_type) => {
           const [ref] = this._refs;
-          if (this.prevRefTypeHash !== ref?.type?.hash) {
-            this.prevRefTypeHash = ref?.type?.hash;
-            this.updateChildNodeByKey("_returnType", this.getReturnTypeJSONByRef(ref));
-          }
+          this.updateChildNodeByKey("_returnType", this.getReturnTypeJSONByRef(ref));
         })
       )
     ]);
@@ -1261,6 +1278,7 @@ var KeyPathExpression = class extends BaseExpression {
     const keyPath = this.parseToKeyPath(json);
     if (!(0, import_fast_equals3.shallowEqual)(keyPath, this._keyPath)) {
       this._keyPath = keyPath;
+      this._rawPathJson = json;
       this.refreshRefs();
     }
   }
@@ -1277,10 +1295,7 @@ var KeyPathExpression = class extends BaseExpression {
    * @returns The JSON representation of `KeyPathExpression`.
    */
   toJSON() {
-    return {
-      kind: "KeyPathExpression" /* KeyPathExpression */,
-      keyPath: this._keyPath
-    };
+    return this._rawPathJson;
   }
 };
 KeyPathExpression.kind = "KeyPathExpression" /* KeyPathExpression */;
@@ -1346,6 +1361,7 @@ var LegacyKeyPathExpression = class extends BaseExpression {
     const keyPath = this.parseToKeyPath(json);
     if (!(0, import_fast_equals4.shallowEqual)(keyPath, this._keyPath)) {
       this._keyPath = keyPath;
+      this._rawPathJson = json;
       this.refreshRefs();
     }
   }
@@ -1354,10 +1370,7 @@ var LegacyKeyPathExpression = class extends BaseExpression {
    * @returns The JSON representation of `KeyPathExpression`.
    */
   toJSON() {
-    return {
-      kind: "KeyPathExpression" /* KeyPathExpression */,
-      keyPath: this._keyPath
-    };
+    return this._rawPathJson;
   }
 };
 LegacyKeyPathExpression.kind = "KeyPathExpression" /* KeyPathExpression */;
@@ -1533,7 +1546,6 @@ var BaseVariableField = class extends ASTNode {
    */
   toJSON() {
     return {
-      kind: this.kind,
       key: this.key,
       type: this.type?.toJSON(),
       initializer: this.initializer?.toJSON(),
@@ -1574,6 +1586,16 @@ var VariableDeclaration = class extends BaseVariableField {
       this.fireChange();
     }
   }
+  /**
+   * Serialize the `VariableDeclaration` to `VariableDeclarationJSON`.
+   * @returns The JSON representation of `VariableDeclaration`.
+   */
+  toJSON() {
+    return {
+      ...super.toJSON(),
+      order: this.order
+    };
+  }
 };
 VariableDeclaration.kind = "VariableDeclaration" /* VariableDeclaration */;
 
@@ -1807,6 +1829,9 @@ var ASTRegisters = class {
    * Core AST node registration.
    */
   constructor() {
+    /**
+     * @deprecated Please use `@injectToAst(XXXService) declare xxxService: XXXService` to achieve external dependency injection.
+     */
     this.injectors = /* @__PURE__ */ new Map();
     this.astMap = /* @__PURE__ */ new Map();
     this.registerAST(StringType);
@@ -1846,7 +1871,7 @@ var ASTRegisters = class {
       injector?.() || {}
     );
     node.changeLocked = true;
-    node.fromJSON((0, import_lodash_es3.omit)(json, ["key", "kind"]));
+    node.fromJSON((0, import_lodash_es4.omit)(json, ["key", "kind"]));
     node.changeLocked = false;
     node.dispatchGlobalEvent({ type: "NewAST" });
     if (Reflect.hasMetadata(POST_CONSTRUCT_AST_SYMBOL, node)) {
@@ -1866,7 +1891,6 @@ var ASTRegisters = class {
   /**
    * Registers an AST node.
    * @param ASTNode
-   * @param injector
    */
   registerAST(ASTNode2, injector) {
     this.astMap.set(ASTNode2.kind, ASTNode2);
@@ -2054,8 +2078,8 @@ var ScopeOutputData = class {
 };
 
 // src/scope/datas/scope-available-data.ts
-var import_rxjs4 = require("rxjs");
-var import_lodash_es4 = require("lodash-es");
+var import_rxjs5 = require("rxjs");
+var import_lodash_es5 = require("lodash-es");
 var import_fast_equals7 = require("fast-equals");
 var import_utils5 = require("@flowgram.ai/utils");
 var import_utils6 = require("@flowgram.ai/utils");
@@ -2064,33 +2088,33 @@ var ScopeAvailableData = class {
     this.scope = scope;
     this.memo = createMemo();
     this._version = 0;
-    this.refresh$ = new import_rxjs4.Subject();
+    this.refresh$ = new import_rxjs5.Subject();
     this._variables = [];
     /**
      * An observable that emits when the list of available variables changes.
      */
     this.variables$ = this.refresh$.pipe(
       // Map to the flattened list of variables from all dependency scopes.
-      (0, import_rxjs4.map)(() => (0, import_lodash_es4.flatten)(this.depScopes.map((scope) => scope.output.variables || []))),
+      (0, import_rxjs5.map)(() => (0, import_lodash_es5.flatten)(this.depScopes.map((scope) => scope.output.variables || []))),
       // Use shallow equality to check if the variable list has changed.
-      (0, import_rxjs4.distinctUntilChanged)(import_fast_equals7.shallowEqual),
-      (0, import_rxjs4.share)()
+      (0, import_rxjs5.distinctUntilChanged)(import_fast_equals7.shallowEqual),
+      (0, import_rxjs5.share)()
     );
     /**
      * An observable that emits when any variable in the available list changes its value.
      */
     this.anyVariableChange$ = this.variables$.pipe(
-      (0, import_rxjs4.switchMap)(
-        (_variables) => (0, import_rxjs4.merge)(
+      (0, import_rxjs5.switchMap)(
+        (_variables) => (0, import_rxjs5.merge)(
           ..._variables.map(
             (_v) => _v.value$.pipe(
               // Skip the initial value of the BehaviorSubject.
-              (0, import_rxjs4.skip)(1)
+              (0, import_rxjs5.skip)(1)
             )
           )
         )
       ),
-      (0, import_rxjs4.share)()
+      (0, import_rxjs5.share)()
     );
     /**
      * @deprecated
@@ -2208,13 +2232,13 @@ var ScopeAvailableData = class {
   trackByKeyPath(keyPath = [], cb, opts) {
     const { triggerOnInit = true, debounceAnimation, selector } = opts || {};
     return subsToDisposable(
-      (0, import_rxjs4.merge)(this.anyVariableChange$, this.variables$).pipe(
-        triggerOnInit ? (0, import_rxjs4.startWith)() : (0, import_rxjs4.tap)(() => null),
-        (0, import_rxjs4.map)(() => {
+      (0, import_rxjs5.merge)(this.anyVariableChange$, this.variables$).pipe(
+        triggerOnInit ? (0, import_rxjs5.startWith)() : (0, import_rxjs5.tap)(() => null),
+        (0, import_rxjs5.map)(() => {
           const v = this.getByKeyPath(keyPath);
           return selector ? selector(v) : v;
         }),
-        (0, import_rxjs4.distinctUntilChanged)(
+        (0, import_rxjs5.distinctUntilChanged)(
           (a, b) => (0, import_fast_equals7.shallowEqual)(a, b),
           (value) => {
             if (value instanceof ASTNode) {
@@ -2224,18 +2248,18 @@ var ScopeAvailableData = class {
           }
         ),
         // Debounce updates to a single emission per animation frame.
-        debounceAnimation ? (0, import_rxjs4.debounceTime)(0, import_rxjs4.animationFrameScheduler) : (0, import_rxjs4.tap)(() => null)
+        debounceAnimation ? (0, import_rxjs5.debounceTime)(0, import_rxjs5.animationFrameScheduler) : (0, import_rxjs5.tap)(() => null)
       ).subscribe(cb)
     );
   }
 };
 
 // src/scope/datas/scope-event-data.ts
-var import_rxjs5 = require("rxjs");
+var import_rxjs6 = require("rxjs");
 var ScopeEventData = class {
   constructor(scope) {
     this.scope = scope;
-    this.event$ = new import_rxjs5.Subject();
+    this.event$ = new import_rxjs6.Subject();
     scope.toDispose.pushAll([
       this.subscribe((_action) => {
         scope.variableEngine.fireGlobalEvent(_action);
@@ -2268,7 +2292,7 @@ var ScopeEventData = class {
    */
   on(type, observer) {
     return subsToDisposable(
-      this.event$.pipe((0, import_rxjs5.filter)((_action) => _action.type === type)).subscribe(observer)
+      this.event$.pipe((0, import_rxjs6.filter)((_action) => _action.type === type)).subscribe(observer)
     );
   }
 };
@@ -2381,7 +2405,7 @@ var VariableEngine = class {
     /**
      * A rxjs subject that emits global events occurring within the variable engine.
      */
-    this.globalEvent$ = new import_rxjs6.Subject();
+    this.globalEvent$ = new import_rxjs7.Subject();
     this.onScopeChangeEmitter = new import_utils9.Emitter();
     /**
      * A table containing all global variables.
@@ -2508,7 +2532,7 @@ VariableEngine = __decorateClass([
 ], VariableEngine);
 
 // src/services/variable-field-key-rename-service.ts
-var import_lodash_es5 = require("lodash-es");
+var import_lodash_es6 = require("lodash-es");
 var import_inversify7 = require("inversify");
 var import_utils10 = require("@flowgram.ai/utils");
 var VariableFieldKeyRenameService = class {
@@ -2571,7 +2595,7 @@ var VariableFieldKeyRenameService = class {
    * @param next The list of fields after the change.
    */
   notifyFieldsDispose(prev, next) {
-    const removedFields = (0, import_lodash_es5.difference)(prev || [], next || []);
+    const removedFields = (0, import_lodash_es6.difference)(prev || [], next || []);
     removedFields.forEach((_field) => this.disposeInListEmitter.fire(_field));
   }
   init() {