@flowgram.ai/variable-core 0.5.7 → 1.0.1

package/dist/esm/index.js

@@ -395,6 +395,7 @@ import {
   tap
 } from "rxjs";
 import { nanoid } from "nanoid";
+import { isNil, omitBy } from "lodash-es";
 import { shallowEqual } from "fast-equals";
 import { Disposable as Disposable2, DisposableCollection as DisposableCollection3 } from "@flowgram.ai/utils";
 var ASTNode = class _ASTNode {
@@ -453,6 +454,16 @@ var ASTNode = class _ASTNode {
     this.opts = opts;
     this.key = key || nanoid();
     this.fromJSON = this.withBatchUpdate(this.fromJSON.bind(this));
+    const rawToJSON = this.toJSON?.bind(this);
+    this.toJSON = () => omitBy(
+      {
+        // always include kind
+        kind: this.kind,
+        ...rawToJSON?.() || {}
+      },
+      // remove undefined fields
+      isNil
+    );
   }
   /**
    * The type of the ASTNode.
@@ -469,16 +480,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.
@@ -645,15 +646,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
@@ -748,6 +740,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 */;
 
@@ -763,6 +764,9 @@ var IntegerType = class extends BaseType {
    */
   fromJSON() {
   }
+  toJSON() {
+    return {};
+  }
 };
 IntegerType.kind = "Integer" /* Integer */;
 
@@ -774,6 +778,9 @@ var BooleanType = class extends BaseType {
    */
   fromJSON() {
   }
+  toJSON() {
+    return {};
+  }
 };
 BooleanType.kind = "Boolean" /* Boolean */;
 
@@ -785,6 +792,9 @@ var NumberType = class extends BaseType {
    */
   fromJSON() {
   }
+  toJSON() {
+    return {};
+  }
 };
 NumberType.kind = "Number" /* Number */;
 
@@ -890,7 +900,6 @@ var ObjectType = class extends BaseType {
    */
   toJSON() {
     return {
-      kind: "Object" /* Object */,
       properties: this.properties.map((_property) => _property.toJSON())
     };
   }
@@ -974,6 +983,11 @@ var CustomType = class extends BaseType {
     }
     return targetTypeJSON?.kind === this.kind && targetTypeJSON?.typeName === this.typeName;
   }
+  toJSON() {
+    return {
+      typeName: this.typeName
+    };
+  }
 };
 CustomType.kind = "CustomType" /* CustomType */;
 
@@ -1108,6 +1122,7 @@ var EnumerateExpression = class extends BaseExpression {
 EnumerateExpression.kind = "EnumerateExpression" /* EnumerateExpression */;
 
 // src/ast/expression/keypath-expression.ts
+import { distinctUntilChanged as distinctUntilChanged3 } from "rxjs";
 import { shallowEqual as shallowEqual3 } from "fast-equals";
 
 // src/ast/utils/expression.ts
@@ -1148,12 +1163,14 @@ var KeyPathExpression = class extends BaseExpression {
         }
       }),
       subsToDisposable(
-        this.refs$.subscribe((_type) => {
+        this.refs$.pipe(
+          distinctUntilChanged3(
+            (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));
         })
       )
     ]);
@@ -1203,6 +1220,7 @@ var KeyPathExpression = class extends BaseExpression {
     const keyPath = this.parseToKeyPath(json);
     if (!shallowEqual3(keyPath, this._keyPath)) {
       this._keyPath = keyPath;
+      this._rawPathJson = json;
       this.refreshRefs();
     }
   }
@@ -1219,10 +1237,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 */;
@@ -1288,6 +1303,7 @@ var LegacyKeyPathExpression = class extends BaseExpression {
     const keyPath = this.parseToKeyPath(json);
     if (!shallowEqual4(keyPath, this._keyPath)) {
       this._keyPath = keyPath;
+      this._rawPathJson = json;
       this.refreshRefs();
     }
   }
@@ -1296,10 +1312,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 */;
@@ -1475,7 +1488,6 @@ var BaseVariableField = class extends ASTNode {
    */
   toJSON() {
     return {
-      kind: this.kind,
       key: this.key,
       type: this.type?.toJSON(),
       initializer: this.initializer?.toJSON(),
@@ -1516,6 +1528,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 */;
 
@@ -1749,6 +1771,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);
@@ -1808,7 +1833,6 @@ var ASTRegisters = class {
   /**
    * Registers an AST node.
    * @param ASTNode
-   * @param injector
    */
   registerAST(ASTNode2, injector) {
     this.astMap.set(ASTNode2.kind, ASTNode2);
@@ -2000,7 +2024,7 @@ import {
   Subject as Subject3,
   animationFrameScheduler as animationFrameScheduler2,
   debounceTime as debounceTime2,
-  distinctUntilChanged as distinctUntilChanged3,
+  distinctUntilChanged as distinctUntilChanged4,
   map as map3,
   merge as merge2,
   share as share3,
@@ -2027,7 +2051,7 @@ var ScopeAvailableData = class {
       // Map to the flattened list of variables from all dependency scopes.
       map3(() => flatten(this.depScopes.map((scope) => scope.output.variables || []))),
       // Use shallow equality to check if the variable list has changed.
-      distinctUntilChanged3(shallowEqual7),
+      distinctUntilChanged4(shallowEqual7),
       share3()
     );
     /**
@@ -2168,7 +2192,7 @@ var ScopeAvailableData = class {
           const v = this.getByKeyPath(keyPath);
           return selector ? selector(v) : v;
         }),
-        distinctUntilChanged3(
+        distinctUntilChanged4(
           (a, b) => shallowEqual7(a, b),
           (value) => {
             if (value instanceof ASTNode) {