@revisium/schema-toolkit 0.21.2 → 0.21.4

package/dist/{chunk-REVQG2NY.js → chunk-3MXYXTNF.js}

@@ -1,4 +1,4 @@
-import { AbstractBasePath, EMPTY_PATH, FormulaError, ResolvedDependency, FormulaSerializer, createRefNode, createObjectNode, createArrayNode, createStringNode, createNumberNode, createBooleanNode, observable, makeObservable, makeAutoObservable, runInAction, PatchBuilder, SchemaSerializer, createSchemaTree, NULL_NODE, validateSchema, validateFormulas, reaction } from './chunk-AWFMSOHM.js';
+import { AbstractBasePath, EMPTY_PATH, FormulaError, ResolvedDependency, FormulaSerializer, createRefNode, createObjectNode, createArrayNode, createStringNode, createNumberNode, createBooleanNode, observable, makeObservable, makeAutoObservable, runInAction, PatchBuilder, SchemaSerializer, createSchemaTree, NULL_NODE, validateSchema, validateFormulas, reaction } from './chunk-MXEQ5CBK.js';
 import { obj, ref } from './chunk-IZMBM36H.js';
 import { nanoid } from 'nanoid';
 import { parseFormula, parseExpression, evaluateWithContext } from '@revisium/formula';
@@ -306,10 +306,17 @@ var SchemaParser = class {
   pendingFormulas = [];
   _parseErrors = [];
   _refSchemas = {};
+  _resolvingRefs = /* @__PURE__ */ new Set();
   parse(schema, refSchemas) {
     this.pendingFormulas = [];
     this._parseErrors = [];
     this._refSchemas = refSchemas ?? {};
+    this._resolvingRefs = /* @__PURE__ */ new Set();
+    for (const [refKey, refSchema] of Object.entries(this._refSchemas)) {
+      if (refSchema === schema) {
+        this._resolvingRefs.add(refKey);
+      }
+    }
     return this.parseNode(schema, "root");
   }
   parseFormulas(tree) {
@@ -338,7 +345,13 @@ var SchemaParser = class {
       const refValue = schema.$ref;
       const resolvedSchema = this._refSchemas[refValue];
       if (resolvedSchema) {
-        return this.parseNode(resolvedSchema, name, refValue);
+        if (this._resolvingRefs.has(refValue)) {
+          return createRefNode(nanoid(), name, refValue, this.extractMetadata(schema));
+        }
+        this._resolvingRefs.add(refValue);
+        const node = this.parseNode(resolvedSchema, name, refValue);
+        this._resolvingRefs.delete(refValue);
+        return node;
       }
       return createRefNode(nanoid(), name, refValue, this.extractMetadata(schema));
     }
@@ -1972,8 +1985,12 @@ var BasePrimitiveValueNode = class extends BaseValueNode {
     if (this.isReadOnly && !options?.internal) {
       throw new Error(`Cannot set value on read-only field: ${this.name}`);
     }
+    const coercedValue = this.coerceValue(value);
+    if (coercedValue === this._value) {
+      return;
+    }
     const oldValue = this._value;
-    this._value = this.coerceValue(value);
+    this._value = coercedValue;
     if (!options?.internal) {
       this.emit({ type: "setValue", node: this, value: this._value, oldValue });
     }

package/dist/{chunk-AWFMSOHM.js → chunk-MXEQ5CBK.js}

@@ -1159,28 +1159,10 @@ var FormulaSerializer = class _FormulaSerializer {
 
 // src/core/schema-diff/SchemaComparator.ts
 function areNodesEqual(current, base, context) {
-  if (current.nodeType() !== base.nodeType()) {
-    return false;
-  }
   if (current.name() !== base.name()) {
     return false;
   }
-  if (!areMetadataEqual(current, base)) {
-    return false;
-  }
-  if (current.isPrimitive()) {
-    return arePrimitivesEqual(current, base, context);
-  }
-  if (current.isObject()) {
-    return areObjectsEqual(current, base, context);
-  }
-  if (current.isArray()) {
-    return areArraysEqual(current, base, context);
-  }
-  if (current.isRef()) {
-    return current.ref() === base.ref();
-  }
-  return current.isNull() && base.isNull();
+  return areNodesContentEqual(current, base, context);
 }
 function areNodesContentEqual(current, base, context) {
   if (current.nodeType() !== base.nodeType()) {
@@ -1192,15 +1174,15 @@ function areNodesContentEqual(current, base, context) {
   if (current.isPrimitive()) {
     return arePrimitivesEqual(current, base, context);
   }
+  if (current.isRef()) {
+    return current.ref() === base.ref();
+  }
   if (current.isObject()) {
     return areObjectsEqual(current, base, context);
   }
   if (current.isArray()) {
     return areArraysEqual(current, base, context);
   }
-  if (current.isRef()) {
-    return current.ref() === base.ref();
-  }
   return current.isNull() && base.isNull();
 }
 function areMetadataEqual(current, base) {

package/dist/{chunk-RCCBUOGY.cjs → chunk-T46TZYJL.cjs}

@@ -1161,28 +1161,10 @@ var FormulaSerializer = class _FormulaSerializer {
 
 // src/core/schema-diff/SchemaComparator.ts
 function areNodesEqual(current, base, context) {
-  if (current.nodeType() !== base.nodeType()) {
-    return false;
-  }
   if (current.name() !== base.name()) {
     return false;
   }
-  if (!areMetadataEqual(current, base)) {
-    return false;
-  }
-  if (current.isPrimitive()) {
-    return arePrimitivesEqual(current, base, context);
-  }
-  if (current.isObject()) {
-    return areObjectsEqual(current, base, context);
-  }
-  if (current.isArray()) {
-    return areArraysEqual(current, base, context);
-  }
-  if (current.isRef()) {
-    return current.ref() === base.ref();
-  }
-  return current.isNull() && base.isNull();
+  return areNodesContentEqual(current, base, context);
 }
 function areNodesContentEqual(current, base, context) {
   if (current.nodeType() !== base.nodeType()) {
@@ -1194,15 +1176,15 @@ function areNodesContentEqual(current, base, context) {
   if (current.isPrimitive()) {
     return arePrimitivesEqual(current, base, context);
   }
+  if (current.isRef()) {
+    return current.ref() === base.ref();
+  }
   if (current.isObject()) {
     return areObjectsEqual(current, base, context);
   }
   if (current.isArray()) {
     return areArraysEqual(current, base, context);
   }
-  if (current.isRef()) {
-    return current.ref() === base.ref();
-  }
   return current.isNull() && base.isNull();
 }
 function areMetadataEqual(current, base) {