@revisium/schema-toolkit 0.21.3 → 0.21.5

package/dist/{chunk-AWFMSOHM.js → chunk-2GZ3M3RV.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) {
@@ -1215,6 +1197,9 @@ function arePrimitivesEqual(current, base, context) {
   if (current.foreignKey() !== base.foreignKey()) {
     return false;
   }
+  if (current.contentMediaType() !== base.contentMediaType()) {
+    return false;
+  }
   const currentFormula = current.formula();
   const baseFormula = base.formula();
   if (currentFormula === void 0 && baseFormula === void 0) {

package/dist/{chunk-IOUYEEGB.cjs → chunk-DN2C3T5D.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkRCCBUOGY_cjs = require('./chunk-RCCBUOGY.cjs');
+var chunkPJ5OFCLO_cjs = require('./chunk-PJ5OFCLO.cjs');
 var chunk2PIMJSWJ_cjs = require('./chunk-2PIMJSWJ.cjs');
 var nanoid = require('nanoid');
 var formula = require('@revisium/formula');
@@ -69,7 +69,7 @@ var FormulaPath = class {
   resolveRootPath(rootPath) {
     const path = rootPath.startsWith("/") ? rootPath.slice(1) : rootPath;
     if (!path) {
-      return chunkRCCBUOGY_cjs.EMPTY_PATH;
+      return chunkPJ5OFCLO_cjs.EMPTY_PATH;
     }
     try {
       return this.parseFormulaPath(path);
@@ -79,7 +79,7 @@ var FormulaPath = class {
   }
   parseFormulaPath(formulaPath) {
     const parts = formulaPath.split(".");
-    let result = chunkRCCBUOGY_cjs.EMPTY_PATH;
+    let result = chunkPJ5OFCLO_cjs.EMPTY_PATH;
     for (const part of parts) {
       if (!part) {
         throw new Error(`Invalid path: empty segment`);
@@ -107,7 +107,7 @@ var ParsedFormula = class {
     this.astNode = parseResult.ast;
     const formulaPath = tree.pathOf(formulaNodeId);
     if (formulaPath.isEmpty() && tree.root().id() !== formulaNodeId) {
-      throw new chunkRCCBUOGY_cjs.FormulaError("Formula node not found in tree", formulaNodeId);
+      throw new chunkPJ5OFCLO_cjs.FormulaError("Formula node not found in tree", formulaNodeId);
     }
     const deps = [];
     const astPathToNodeId = /* @__PURE__ */ new Map();
@@ -118,20 +118,20 @@ var ParsedFormula = class {
         depPath
       );
       if (!targetNodeId) {
-        throw new chunkRCCBUOGY_cjs.FormulaError(
+        throw new chunkPJ5OFCLO_cjs.FormulaError(
           `Cannot resolve formula dependency: ${depPath}`,
           formulaNodeId,
           "Path not found in schema"
         );
       }
       if (targetNodeId === formulaNodeId) {
-        throw new chunkRCCBUOGY_cjs.FormulaError(
+        throw new chunkPJ5OFCLO_cjs.FormulaError(
           "Formula cannot reference itself",
           formulaNodeId,
           "Self-reference detected"
         );
       }
-      deps.push(new chunkRCCBUOGY_cjs.ResolvedDependency(targetNodeId));
+      deps.push(new chunkPJ5OFCLO_cjs.ResolvedDependency(targetNodeId));
       astPathToNodeId.set(depPath, targetNodeId);
     }
     this.deps = deps;
@@ -295,7 +295,7 @@ var FormulaChangeDetector = class {
   }
   getSerializedExpression(formula, tree, nodeId) {
     try {
-      const xFormula = chunkRCCBUOGY_cjs.FormulaSerializer.toXFormula(tree, nodeId, formula);
+      const xFormula = chunkPJ5OFCLO_cjs.FormulaSerializer.toXFormula(tree, nodeId, formula);
       return xFormula.expression;
     } catch {
       return null;
@@ -308,10 +308,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) {
@@ -340,9 +347,15 @@ 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 chunkPJ5OFCLO_cjs.createRefNode(nanoid.nanoid(), name, refValue, this.extractMetadata(schema));
+        }
+        this._resolvingRefs.add(refValue);
+        const node = this.parseNode(resolvedSchema, name, refValue);
+        this._resolvingRefs.delete(refValue);
+        return node;
       }
-      return chunkRCCBUOGY_cjs.createRefNode(nanoid.nanoid(), name, refValue, this.extractMetadata(schema));
+      return chunkPJ5OFCLO_cjs.createRefNode(nanoid.nanoid(), name, refValue, this.extractMetadata(schema));
     }
     const schemaWithType = schema;
     switch (schemaWithType.type) {
@@ -368,14 +381,14 @@ var SchemaParser = class {
         children.push(this.parseNode(propSchema, propName));
       }
     }
-    return chunkRCCBUOGY_cjs.createObjectNode(nanoid.nanoid(), name, children, {
+    return chunkPJ5OFCLO_cjs.createObjectNode(nanoid.nanoid(), name, children, {
       metadata: this.extractMetadata(schema),
       ref: ref2
     });
   }
   parseArray(schema, name, ref2) {
     const items = this.parseNode(schema.items, "items");
-    return chunkRCCBUOGY_cjs.createArrayNode(nanoid.nanoid(), name, items, {
+    return chunkPJ5OFCLO_cjs.createArrayNode(nanoid.nanoid(), name, items, {
       metadata: this.extractMetadata(schema),
       ref: ref2
     });
@@ -383,9 +396,10 @@ var SchemaParser = class {
   parseString(schema, name, ref2) {
     const nodeId = nanoid.nanoid();
     this.collectFormula(nodeId, schema["x-formula"]);
-    return chunkRCCBUOGY_cjs.createStringNode(nodeId, name, {
+    return chunkPJ5OFCLO_cjs.createStringNode(nodeId, name, {
       defaultValue: schema.default,
       foreignKey: schema.foreignKey,
+      contentMediaType: schema.contentMediaType,
       metadata: this.extractMetadata(schema),
       ref: ref2
     });
@@ -393,7 +407,7 @@ var SchemaParser = class {
   parseNumber(schema, name, ref2) {
     const nodeId = nanoid.nanoid();
     this.collectFormula(nodeId, schema["x-formula"]);
-    return chunkRCCBUOGY_cjs.createNumberNode(nodeId, name, {
+    return chunkPJ5OFCLO_cjs.createNumberNode(nodeId, name, {
       defaultValue: schema.default,
       metadata: this.extractMetadata(schema),
       ref: ref2
@@ -402,7 +416,7 @@ var SchemaParser = class {
   parseBoolean(schema, name, ref2) {
     const nodeId = nanoid.nanoid();
     this.collectFormula(nodeId, schema["x-formula"]);
-    return chunkRCCBUOGY_cjs.createBooleanNode(nodeId, name, {
+    return chunkPJ5OFCLO_cjs.createBooleanNode(nodeId, name, {
       defaultValue: schema.default,
       metadata: this.extractMetadata(schema),
       ref: ref2
@@ -435,13 +449,13 @@ var NodeFactory = class {
   createNode(name, type) {
     switch (type) {
       case "string":
-        return chunkRCCBUOGY_cjs.createStringNode(nanoid.nanoid(), name, { defaultValue: "" });
+        return chunkPJ5OFCLO_cjs.createStringNode(nanoid.nanoid(), name, { defaultValue: "" });
       case "number":
-        return chunkRCCBUOGY_cjs.createNumberNode(nanoid.nanoid(), name, { defaultValue: 0 });
+        return chunkPJ5OFCLO_cjs.createNumberNode(nanoid.nanoid(), name, { defaultValue: 0 });
       case "boolean":
-        return chunkRCCBUOGY_cjs.createBooleanNode(nanoid.nanoid(), name, { defaultValue: false });
+        return chunkPJ5OFCLO_cjs.createBooleanNode(nanoid.nanoid(), name, { defaultValue: false });
       case "object":
-        return chunkRCCBUOGY_cjs.createObjectNode(nanoid.nanoid(), name, []);
+        return chunkPJ5OFCLO_cjs.createObjectNode(nanoid.nanoid(), name, []);
       case "array":
         return this.createArrayNodeInternal(name);
       default:
@@ -449,11 +463,11 @@ var NodeFactory = class {
     }
   }
   createArrayNodeInternal(name) {
-    const items = chunkRCCBUOGY_cjs.createStringNode(nanoid.nanoid(), "items", { defaultValue: "" });
-    return chunkRCCBUOGY_cjs.createArrayNode(nanoid.nanoid(), name, items);
+    const items = chunkPJ5OFCLO_cjs.createStringNode(nanoid.nanoid(), "items", { defaultValue: "" });
+    return chunkPJ5OFCLO_cjs.createArrayNode(nanoid.nanoid(), name, items);
   }
   createArrayNodeWithItems(name, items) {
-    return chunkRCCBUOGY_cjs.createArrayNode(nanoid.nanoid(), name, items);
+    return chunkPJ5OFCLO_cjs.createArrayNode(nanoid.nanoid(), name, items);
   }
 };
 
@@ -552,7 +566,7 @@ var PrimitiveToArrayTransformer = class {
     const { sourceNode } = ctx;
     const itemsNode = sourceNode.cloneWithId(nanoid.nanoid());
     itemsNode.setName("items");
-    const arrayNode = chunkRCCBUOGY_cjs.createArrayNode(sourceNode.id(), sourceNode.name(), itemsNode);
+    const arrayNode = chunkPJ5OFCLO_cjs.createArrayNode(sourceNode.id(), sourceNode.name(), itemsNode);
     return { node: arrayNode };
   }
 };
@@ -565,7 +579,7 @@ var ObjectToArrayTransformer = class {
     const { sourceNode } = ctx;
     const itemsNode = sourceNode.cloneWithId(nanoid.nanoid());
     itemsNode.setName("items");
-    const arrayNode = chunkRCCBUOGY_cjs.createArrayNode(sourceNode.id(), sourceNode.name(), itemsNode);
+    const arrayNode = chunkPJ5OFCLO_cjs.createArrayNode(sourceNode.id(), sourceNode.name(), itemsNode);
     return { node: arrayNode };
   }
 };
@@ -615,7 +629,7 @@ var RefTransformer = class {
       return { node: newNode };
     }
     const metadata = this.extractMetadata(targetSpec);
-    const node = chunkRCCBUOGY_cjs.createRefNode(sourceNode.id(), sourceNode.name(), refUri, metadata);
+    const node = chunkPJ5OFCLO_cjs.createRefNode(sourceNode.id(), sourceNode.name(), refUri, metadata);
     return { node };
   }
   extractMetadata(spec) {
@@ -650,23 +664,23 @@ var DefaultTransformer = class {
   createNode(id, name, type, spec, metadata) {
     switch (type) {
       case "string":
-        return chunkRCCBUOGY_cjs.createStringNode(id, name, {
+        return chunkPJ5OFCLO_cjs.createStringNode(id, name, {
           defaultValue: spec.default ?? "",
           foreignKey: spec.foreignKey,
           metadata
         });
       case "number":
-        return chunkRCCBUOGY_cjs.createNumberNode(id, name, {
+        return chunkPJ5OFCLO_cjs.createNumberNode(id, name, {
           defaultValue: spec.default ?? 0,
           metadata
         });
       case "boolean":
-        return chunkRCCBUOGY_cjs.createBooleanNode(id, name, {
+        return chunkPJ5OFCLO_cjs.createBooleanNode(id, name, {
           defaultValue: spec.default ?? false,
           metadata
         });
       case "object":
-        return chunkRCCBUOGY_cjs.createObjectNode(id, name, [], { metadata });
+        return chunkPJ5OFCLO_cjs.createObjectNode(id, name, [], { metadata });
       case "array":
         return this.createArrayNode(id, name, metadata);
       default:
@@ -674,8 +688,8 @@ var DefaultTransformer = class {
     }
   }
   createArrayNode(id, name, metadata) {
-    const items = chunkRCCBUOGY_cjs.createStringNode(nanoid.nanoid(), "items", { defaultValue: "" });
-    return chunkRCCBUOGY_cjs.createArrayNode(id, name, items, { metadata });
+    const items = chunkPJ5OFCLO_cjs.createStringNode(nanoid.nanoid(), "items", { defaultValue: "" });
+    return chunkPJ5OFCLO_cjs.createArrayNode(id, name, items, { metadata });
   }
   extractMetadata(spec) {
     const meta = {};
@@ -739,8 +753,8 @@ function createTypeTransformChain(options) {
 var SchemaModelImpl = class {
   _baseTree;
   _currentTree;
-  _patchBuilder = new chunkRCCBUOGY_cjs.PatchBuilder();
-  _serializer = new chunkRCCBUOGY_cjs.SchemaSerializer();
+  _patchBuilder = new chunkPJ5OFCLO_cjs.PatchBuilder();
+  _serializer = new chunkPJ5OFCLO_cjs.SchemaSerializer();
   _nodeFactory = new NodeFactory();
   _formulaIndex = new FormulaDependencyIndex();
   _transformChain;
@@ -754,12 +768,12 @@ var SchemaModelImpl = class {
     });
     const parser = new SchemaParser();
     const rootNode = parser.parse(schema, this._refSchemas);
-    this._currentTree = chunkRCCBUOGY_cjs.createSchemaTree(rootNode);
+    this._currentTree = chunkPJ5OFCLO_cjs.createSchemaTree(rootNode);
     parser.parseFormulas(this._currentTree);
     this._formulaParseErrors = parser.parseErrors;
     this._buildFormulaIndex();
     this._baseTree = this._currentTree.clone();
-    chunkRCCBUOGY_cjs.makeAutoObservable(this, {
+    chunkPJ5OFCLO_cjs.makeAutoObservable(this, {
       _patchBuilder: false,
       _serializer: false,
       _nodeFactory: false,
@@ -788,10 +802,10 @@ var SchemaModelImpl = class {
   insertFieldAt(parentId, index, name, type) {
     const parent = this._currentTree.nodeById(parentId);
     if (parent.isNull() || !parent.isObject()) {
-      return chunkRCCBUOGY_cjs.NULL_NODE;
+      return chunkPJ5OFCLO_cjs.NULL_NODE;
     }
     if (index < 0 || index > parent.properties().length) {
-      return chunkRCCBUOGY_cjs.NULL_NODE;
+      return chunkPJ5OFCLO_cjs.NULL_NODE;
     }
     const node = this._nodeFactory.createNode(name, type);
     this._currentTree.insertChildAt(parentId, index, node);
@@ -1016,7 +1030,7 @@ var SchemaModelImpl = class {
       return "";
     }
     try {
-      return chunkRCCBUOGY_cjs.FormulaSerializer.serializeExpression(
+      return chunkPJ5OFCLO_cjs.FormulaSerializer.serializeExpression(
         this._currentTree,
         nodeId,
         formula,
@@ -1027,10 +1041,10 @@ var SchemaModelImpl = class {
     }
   }
   get validationErrors() {
-    return chunkRCCBUOGY_cjs.validateSchema(this._currentTree.root());
+    return chunkPJ5OFCLO_cjs.validateSchema(this._currentTree.root());
   }
   get formulaErrors() {
-    return [...this._formulaParseErrors, ...chunkRCCBUOGY_cjs.validateFormulas(this._currentTree)];
+    return [...this._formulaParseErrors, ...chunkPJ5OFCLO_cjs.validateFormulas(this._currentTree)];
   }
   get isDirty() {
     return this.patches.length > 0;
@@ -1542,7 +1556,7 @@ var FormulaEngine = class {
     this.setupReactions();
   }
   evaluateAll() {
-    chunkRCCBUOGY_cjs.runInAction(() => {
+    chunkPJ5OFCLO_cjs.runInAction(() => {
       for (const field of this.evaluationOrder) {
         this.evaluator.evaluate(field);
       }
@@ -1555,7 +1569,7 @@ var FormulaEngine = class {
         continue;
       }
       watchedNodes.add(depNode);
-      const disposer = chunkRCCBUOGY_cjs.reaction(
+      const disposer = chunkPJ5OFCLO_cjs.reaction(
         () => depNode.value,
         () => this.handleDependencyChange(depNode)
       );
@@ -1565,7 +1579,7 @@ var FormulaEngine = class {
   }
   setupArrayReactions(node) {
     if (node.isArray()) {
-      const disposer = chunkRCCBUOGY_cjs.reaction(
+      const disposer = chunkPJ5OFCLO_cjs.reaction(
         () => node.length,
         () => this.handleStructureChange()
       );
@@ -1585,7 +1599,7 @@ var FormulaEngine = class {
       this.dependencyMap,
       this.evaluationOrder
     );
-    chunkRCCBUOGY_cjs.runInAction(() => {
+    chunkPJ5OFCLO_cjs.runInAction(() => {
       for (const field of affected) {
         this.evaluator.evaluate(field);
       }
@@ -1685,7 +1699,7 @@ var ArrayValueNode = class extends BaseValueNode {
   _nodeFactory = null;
   constructor(id, name, schema, items) {
     super(id, name, schema);
-    this._items = chunkRCCBUOGY_cjs.observable.array();
+    this._items = chunkPJ5OFCLO_cjs.observable.array();
     this._baseItems = [];
     if (items) {
       for (const item of items) {
@@ -1694,7 +1708,7 @@ var ArrayValueNode = class extends BaseValueNode {
       }
     }
     this._baseItems = [...this._items];
-    chunkRCCBUOGY_cjs.makeObservable(this, {
+    chunkPJ5OFCLO_cjs.makeObservable(this, {
       _items: "observable",
       _baseItems: "observable",
       value: "computed",
@@ -1881,7 +1895,7 @@ var ArrayValueNode = class extends BaseValueNode {
     for (const item of this._items) {
       item.parent = null;
     }
-    this._items = chunkRCCBUOGY_cjs.observable.array();
+    this._items = chunkPJ5OFCLO_cjs.observable.array();
     for (const baseItem of this._baseItems) {
       this._items.push(baseItem);
     }
@@ -1924,7 +1938,7 @@ var BasePrimitiveValueNode = class extends BaseValueNode {
     this._baseValue = initialValue;
   }
   initObservable() {
-    chunkRCCBUOGY_cjs.makeObservable(this, {
+    chunkPJ5OFCLO_cjs.makeObservable(this, {
       _value: "observable",
       _baseValue: "observable",
       _formulaWarning: "observable",
@@ -2283,7 +2297,7 @@ var ObjectValueNode = class extends BaseValueNode {
   _baseChildren;
   constructor(id, name, schema, children) {
     super(id, name, schema);
-    this._children = chunkRCCBUOGY_cjs.observable.map();
+    this._children = chunkPJ5OFCLO_cjs.observable.map();
     this._baseChildren = /* @__PURE__ */ new Map();
     if (children) {
       for (const child of children) {
@@ -2292,7 +2306,7 @@ var ObjectValueNode = class extends BaseValueNode {
       }
     }
     this._baseChildren = new Map(this._children);
-    chunkRCCBUOGY_cjs.makeObservable(this, {
+    chunkPJ5OFCLO_cjs.makeObservable(this, {
       _children: "observable",
       _baseChildren: "observable",
       value: "computed",
@@ -2386,7 +2400,7 @@ var ObjectValueNode = class extends BaseValueNode {
     for (const child of this._children.values()) {
       child.parent = null;
     }
-    this._children = chunkRCCBUOGY_cjs.observable.map();
+    this._children = chunkPJ5OFCLO_cjs.observable.map();
     for (const [key, value] of this._baseChildren) {
       this._children.set(key, value);
     }
@@ -2600,7 +2614,7 @@ var IndexSegment = class {
 };
 
 // src/core/value-path/ValuePath.ts
-var ValuePathImpl = class _ValuePathImpl extends chunkRCCBUOGY_cjs.AbstractBasePath {
+var ValuePathImpl = class _ValuePathImpl extends chunkPJ5OFCLO_cjs.AbstractBasePath {
   asString() {
     const parts = [];
     for (const seg of this.segs) {
@@ -2705,7 +2719,7 @@ function parseValuePath(path) {
 var ChangeTracker = class {
   _changes = [];
   constructor() {
-    chunkRCCBUOGY_cjs.makeAutoObservable(this);
+    chunkPJ5OFCLO_cjs.makeAutoObservable(this);
   }
   get changes() {
     return this._changes;
@@ -2871,7 +2885,7 @@ var ValueTree = class {
     this.changeTracker = new ChangeTracker();
     this._nodeChangeListener = (event) => this.handleNodeChange(event);
     this.subscribe(this._root);
-    chunkRCCBUOGY_cjs.makeAutoObservable(this, {
+    chunkPJ5OFCLO_cjs.makeAutoObservable(this, {
       _root: false,
       index: false,
       _nodeChangeListener: false,
@@ -3128,7 +3142,7 @@ var RowModelImpl = class {
   constructor(_rowId, _tree) {
     this._rowId = _rowId;
     this._tree = _tree;
-    chunkRCCBUOGY_cjs.makeAutoObservable(this, {
+    chunkPJ5OFCLO_cjs.makeAutoObservable(this, {
       _rowId: false,
       _tree: false,
       _tableModel: "observable.ref"
@@ -3239,13 +3253,13 @@ var TableModelImpl = class {
     this._schema = createSchemaModel(options.schema, { refSchemas: options.refSchemas });
     this._fkResolver = options.fkResolver;
     this._refSchemas = options.refSchemas;
-    this._rows = chunkRCCBUOGY_cjs.observable.array();
+    this._rows = chunkPJ5OFCLO_cjs.observable.array();
     if (options.rows) {
       for (const row of options.rows) {
         this._rows.push(this.createRow(row.rowId, row.data));
       }
     }
-    chunkRCCBUOGY_cjs.makeAutoObservable(this, {
+    chunkPJ5OFCLO_cjs.makeAutoObservable(this, {
       _schema: false,
       _rows: false,
       _jsonSchema: false,
@@ -3376,13 +3390,13 @@ var ForeignKeyResolverImpl = class {
   constructor(options) {
     this.loader = options?.loader;
     this._prefetchEnabled = options?.prefetch ?? false;
-    this._schemaCache = chunkRCCBUOGY_cjs.observable.map();
-    this._tableCache = chunkRCCBUOGY_cjs.observable.map();
+    this._schemaCache = chunkPJ5OFCLO_cjs.observable.map();
+    this._tableCache = chunkPJ5OFCLO_cjs.observable.map();
     this._loadingTables = /* @__PURE__ */ new Set();
     this._loadingRows = /* @__PURE__ */ new Map();
     this._pendingTableLoads = /* @__PURE__ */ new Map();
     this._pendingRowLoads = /* @__PURE__ */ new Map();
-    chunkRCCBUOGY_cjs.makeAutoObservable(this, {
+    chunkPJ5OFCLO_cjs.makeAutoObservable(this, {
       _schemaCache: false,
       _tableCache: false,
       _loadingTables: false,
@@ -3420,7 +3434,7 @@ var ForeignKeyResolverImpl = class {
     if (this._disposed) {
       return;
     }
-    chunkRCCBUOGY_cjs.runInAction(() => {
+    chunkPJ5OFCLO_cjs.runInAction(() => {
       this._schemaCache.set(tableId, schema);
     });
   }
@@ -3428,12 +3442,12 @@ var ForeignKeyResolverImpl = class {
     if (this._disposed) {
       return;
     }
-    const rowMap = chunkRCCBUOGY_cjs.observable.map();
+    const rowMap = chunkPJ5OFCLO_cjs.observable.map();
     for (const row of rows) {
       rowMap.set(row.rowId, row);
     }
     const cache = { schema, rows: rowMap };
-    chunkRCCBUOGY_cjs.runInAction(() => {
+    chunkPJ5OFCLO_cjs.runInAction(() => {
       this._tableCache.set(tableId, cache);
       this._schemaCache.set(tableId, schema);
     });
@@ -3448,7 +3462,7 @@ var ForeignKeyResolverImpl = class {
     const table = this._tableCache.get(tableId);
     if (table) {
       const rowData = { rowId, data };
-      chunkRCCBUOGY_cjs.runInAction(() => {
+      chunkPJ5OFCLO_cjs.runInAction(() => {
         table.rows.set(rowId, rowData);
       });
       if (this._prefetchEnabled) {
@@ -3462,7 +3476,7 @@ var ForeignKeyResolverImpl = class {
     }
     const schema = this._schemaCache.get(oldTableId);
     const tableCache = this._tableCache.get(oldTableId);
-    chunkRCCBUOGY_cjs.runInAction(() => {
+    chunkPJ5OFCLO_cjs.runInAction(() => {
       if (schema) {
         this._schemaCache.delete(oldTableId);
         this._schemaCache.set(newTableId, schema);
@@ -3564,9 +3578,9 @@ var ForeignKeyResolverImpl = class {
   }
   ensureTableCache(tableId, schema) {
     if (!this._tableCache.has(tableId)) {
-      const rowMap = chunkRCCBUOGY_cjs.observable.map();
+      const rowMap = chunkPJ5OFCLO_cjs.observable.map();
       const cache = { schema, rows: rowMap };
-      chunkRCCBUOGY_cjs.runInAction(() => {
+      chunkPJ5OFCLO_cjs.runInAction(() => {
         this._tableCache.set(tableId, cache);
       });
     }
@@ -3666,7 +3680,7 @@ var DataModelImpl = class {
   _fk;
   _ownsFkResolver;
   constructor(options) {
-    this._tables = chunkRCCBUOGY_cjs.observable.map();
+    this._tables = chunkPJ5OFCLO_cjs.observable.map();
     if (options?.fkResolver) {
       this._fk = options.fkResolver;
       this._ownsFkResolver = false;
@@ -3674,7 +3688,7 @@ var DataModelImpl = class {
       this._fk = createForeignKeyResolver();
       this._ownsFkResolver = true;
     }
-    chunkRCCBUOGY_cjs.makeAutoObservable(this, {
+    chunkPJ5OFCLO_cjs.makeAutoObservable(this, {
       _tables: false,
       _fk: false,
       _ownsFkResolver: false

package/dist/{chunk-RCCBUOGY.cjs → chunk-PJ5OFCLO.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) {
@@ -1217,6 +1199,9 @@ function arePrimitivesEqual(current, base, context) {
   if (current.foreignKey() !== base.foreignKey()) {
     return false;
   }
+  if (current.contentMediaType() !== base.contentMediaType()) {
+    return false;
+  }
   const currentFormula = current.formula();
   const baseFormula = base.formula();
   if (currentFormula === void 0 && baseFormula === void 0) {