js-bao 0.3.0-alpha.4 → 0.3.0

package/dist/browser.js

@@ -1161,6 +1161,108 @@ var init_DocumentQueryTranslator = __esm({
   }
 });
 
+// src/models/metaSync.ts
+import * as Y from "yjs";
+function registerFunctionDefault(fn, name) {
+  KNOWN_FUNCTION_DEFAULTS.set(fn, name);
+}
+function encodeDefault(value) {
+  if (value === void 0 || value === null) return void 0;
+  if (typeof value === "function") {
+    const name = KNOWN_FUNCTION_DEFAULTS.get(value);
+    return name ? `$${name}` : "$unknown_function";
+  }
+  return value;
+}
+function syncModelMeta(yDoc, modelName, schema) {
+  let synced = _syncedCache.get(yDoc);
+  if (synced?.has(modelName)) return;
+  if (!synced) {
+    synced = /* @__PURE__ */ new Set();
+    _syncedCache.set(yDoc, synced);
+  }
+  const meta = yDoc.getMap(`_meta_${modelName}`);
+  for (const [fieldName, fieldOpts] of schema.fields.entries()) {
+    syncFieldMeta(meta, fieldName, fieldOpts);
+  }
+  const compoundConstraints = schema.resolvedUniqueConstraints.filter(
+    (c) => c.fields.length > 1
+  );
+  if (compoundConstraints.length > 0) {
+    let constraints = meta.get("_constraints");
+    if (!constraints) {
+      constraints = new Y.Map();
+      meta.set("_constraints", constraints);
+    }
+    for (const constraint of compoundConstraints) {
+      syncConstraintMeta(constraints, constraint);
+    }
+  }
+  const relationships = schema.options.relationships;
+  if (relationships && Object.keys(relationships).length > 0) {
+    let rels = meta.get("_relationships");
+    if (!rels) {
+      rels = new Y.Map();
+      meta.set("_relationships", rels);
+    }
+    for (const [relName, relConfig] of Object.entries(relationships)) {
+      syncRelationshipMeta(rels, relName, relConfig);
+    }
+  }
+  synced.add(modelName);
+}
+function syncFieldMeta(metaMap, fieldName, fieldOpts) {
+  let fieldMeta = metaMap.get(fieldName);
+  if (!fieldMeta) {
+    fieldMeta = new Y.Map();
+    metaMap.set(fieldName, fieldMeta);
+  }
+  setIfChanged(fieldMeta, "type", fieldOpts.type);
+  if (fieldOpts.indexed) setIfChanged(fieldMeta, "indexed", true);
+  if (fieldOpts.unique) setIfChanged(fieldMeta, "unique", true);
+  if (fieldOpts.required) setIfChanged(fieldMeta, "required", true);
+  if (fieldOpts.autoAssign) setIfChanged(fieldMeta, "autoAssign", true);
+  if (fieldOpts.maxLength !== void 0) setIfChanged(fieldMeta, "maxLength", fieldOpts.maxLength);
+  if (fieldOpts.maxCount !== void 0) setIfChanged(fieldMeta, "maxCount", fieldOpts.maxCount);
+  const encoded = encodeDefault(fieldOpts.default);
+  if (encoded !== void 0) setIfChanged(fieldMeta, "default", encoded);
+}
+function syncConstraintMeta(constraintsMap, constraint) {
+  let cMeta = constraintsMap.get(constraint.name);
+  if (!cMeta) {
+    cMeta = new Y.Map();
+    constraintsMap.set(constraint.name, cMeta);
+  }
+  setIfChanged(cMeta, "type", "unique");
+  const fieldsJson = JSON.stringify(constraint.fields);
+  setIfChanged(cMeta, "fields", fieldsJson);
+}
+function syncRelationshipMeta(relsMap, relName, relConfig) {
+  let relMeta = relsMap.get(relName);
+  if (!relMeta) {
+    relMeta = new Y.Map();
+    relsMap.set(relName, relMeta);
+  }
+  for (const [key, value] of Object.entries(relConfig)) {
+    if (value !== void 0) {
+      setIfChanged(relMeta, key, value);
+    }
+  }
+}
+function setIfChanged(map, key, value) {
+  if (map.get(key) !== value) {
+    map.set(key, value);
+  }
+}
+var KNOWN_FUNCTION_DEFAULTS, _syncedCache;
+var init_metaSync = __esm({
+  "src/models/metaSync.ts"() {
+    "use strict";
+    KNOWN_FUNCTION_DEFAULTS = /* @__PURE__ */ new WeakMap();
+    _syncedCache = /* @__PURE__ */ new WeakMap();
+  }
+});
+
 // src/models/relationshipManager.ts
 function generateRefersToMethod(_sourceModelClass, config, targetModelClass) {
   return async function() {
@@ -2271,7 +2373,7 @@ __export(BaseModel_exports, {
   UniqueConstraintViolationError: () => UniqueConstraintViolationError,
   generateULID: () => generateULID
 });
-import * as Y from "yjs";
+import * as Y2 from "yjs";
 import { ulid } from "ulid";
 function generateULID() {
   return ulid();
@@ -2285,6 +2387,7 @@ var init_BaseModel = __esm({
     init_DocumentQueryTranslator();
     init_CursorManager();
     init_sql();
+    init_metaSync();
     LogLevel = /* @__PURE__ */ ((LogLevel2) => {
       LogLevel2[LogLevel2["SILENT"] = 0] = "SILENT";
       LogLevel2[LogLevel2["ERROR"] = 1] = "ERROR";
@@ -2388,6 +2491,7 @@ var init_BaseModel = __esm({
         Object.setPrototypeOf(this, _RecordNotFoundError.prototype);
       }
     };
+    registerFunctionDefault(generateULID, "generate_ulid");
     SCHEMA_ACCESSORS_KEY = /* @__PURE__ */ Symbol("jsBaoSchemaAccessors");
     BaseModel2 = class _BaseModel {
       static modelName;
@@ -2418,6 +2522,9 @@ var init_BaseModel = __esm({
       // Flag to distinguish loading vs user changes
       // StringSet field caching
       _stringSetFields = /* @__PURE__ */ new Map();
+      // upsertOn: track what the caller explicitly provided in the constructor
+      _constructorProvidedId = false;
+      _constructorProvidedFields = /* @__PURE__ */ new Set();
       // Multi-document instance metadata
       _metaDocId = null;
       _metaPermissionHint = null;
@@ -2579,6 +2686,7 @@ var init_BaseModel = __esm({
         const idFieldOptions = schema.fields.get("id");
         if (data.id) {
           this.id = data.id;
+          this._constructorProvidedId = true;
         } else if (idFieldOptions?.autoAssign) {
           this.id = generateULID();
         } else if (idFieldOptions?.default) {
@@ -2659,6 +2767,7 @@ var init_BaseModel = __esm({
             if (fieldKey === "id") continue;
             if (data.hasOwnProperty(fieldKey)) {
               this.setValue(fieldKey, data[fieldKey]);
+              this._constructorProvidedFields.add(fieldKey);
             } else if (fieldOptions.default !== void 0) {
               const defaultValue = typeof fieldOptions.default === "function" ? fieldOptions.default() : fieldOptions.default;
               this.setValue(fieldKey, defaultValue);
@@ -3038,7 +3147,7 @@ var init_BaseModel = __esm({
         }
         const extractStringSetValues = (value) => {
           if (!value) return [];
-          if (value instanceof Y.Map) {
+          if (value instanceof Y2.Map) {
             return Array.from(value.entries()).filter(([, isMember]) => Boolean(isMember)).map(([key]) => key);
           }
           if (Array.isArray(value)) {
@@ -3055,7 +3164,7 @@ var init_BaseModel = __esm({
             if (!recordId) continue;
             let itemData;
             const stringSetValuesByField = {};
-            if (recordData instanceof Y.Map) {
+            if (recordData instanceof Y2.Map) {
               itemData = {};
               const unknownFields = [];
               for (const [fieldKey, value] of recordData.entries()) {
@@ -3174,7 +3283,7 @@ var init_BaseModel = __esm({
         const buildUniqueKey = (recordData, fields) => {
           const keyParts = [];
           for (const field of fields) {
-            const value = recordData instanceof Y.Map ? recordData.get(field) : recordData[field];
+            const value = recordData instanceof Y2.Map ? recordData.get(field) : recordData[field];
             if (value === null || value === void 0) {
               return null;
             }
@@ -3184,7 +3293,7 @@ var init_BaseModel = __esm({
         };
         const extractItemData = (key, recordData) => {
           let itemData;
-          if (recordData instanceof Y.Map) {
+          if (recordData instanceof Y2.Map) {
             itemData = {};
             const unknownFields = [];
             for (const [fieldKey, value] of recordData.entries()) {
@@ -3300,7 +3409,7 @@ var init_BaseModel = __esm({
               if (!recordData || !key) continue;
               const itemData = extractItemData(key, recordData);
               if (!itemData) continue;
-              if (change.action === "add" && recordData instanceof Y.Map) {
+              if (change.action === "add" && recordData instanceof Y2.Map) {
                 Logger.verbose(
                   `[${this.name}] Setting up observer on newly added nested YMap for record ${key} in document ${docId}`
                 );
@@ -3445,7 +3554,7 @@ var init_BaseModel = __esm({
           `[${this.name}] Setting up observers on existing nested YMaps for ${modelName}/${docId}...`
         );
         for (const [recordId, recordData] of documentYMap.entries()) {
-          if (recordData instanceof Y.Map) {
+          if (recordData instanceof Y2.Map) {
             Logger.verbose(
               `[${this.name}] Setting up observer on existing nested YMap for record ${recordId} in document ${docId}`
             );
@@ -3793,6 +3902,39 @@ var init_BaseModel = __esm({
           );
         }
         const yDoc = targetYDoc;
+        let upsertOnConstraint = null;
+        let upsertOnKey = null;
+        if (options?.upsertOn) {
+          const upsertField = options.upsertOn;
+          assertValidIdentifier(upsertField, "upsertOn field");
+          const upsertValue = this[upsertField];
+          if (upsertValue === null || upsertValue === void 0 || upsertValue === "") {
+            throw new Error(
+              `[${modelName}] upsertOn field '${upsertField}' must be present in data and not null/empty`
+            );
+          }
+          const constraint = schema.resolvedUniqueConstraints.find(
+            (c) => c.fields.length === 1 && c.fields[0] === upsertField
+          );
+          if (!constraint) {
+            throw new Error(
+              `[${modelName}] upsertOn field '${upsertField}' does not have a registered unique index`
+            );
+          }
+          const uniqueKey = modelConstructor._buildKeyFromValues(
+            constraint.fields,
+            [upsertValue],
+            modelName,
+            constraint.name
+          );
+          if (uniqueKey === null) {
+            throw new Error(
+              `[${modelName}] upsertOn: unable to build unique key for field '${upsertField}'`
+            );
+          }
+          upsertOnConstraint = constraint;
+          upsertOnKey = uniqueKey;
+        }
         if (!this.id) {
           Logger.error(
             "[BaseModel.save()] ID is undefined before saving! Instance dump:",
@@ -3810,6 +3952,28 @@ var init_BaseModel = __esm({
           dataToSave
         );
         await yDoc.transact(async () => {
+          if (upsertOnConstraint && upsertOnKey) {
+            const constraintMapName = `_uniqueIdx_${modelName}_${upsertOnConstraint.name}`;
+            const constraintMap = yDoc.getMap(constraintMapName);
+            const existingId = constraintMap.get(upsertOnKey);
+            if (existingId) {
+              if (this._constructorProvidedId && this.id !== existingId) {
+                throw new Error(
+                  `[${modelName}] upsertOn conflict: caller id '${this.id}' does not match existing record '${existingId}'`
+                );
+              }
+              this.id = existingId;
+              this._metaDocId = targetDocId;
+              this._metaPermissionHint = permissionHint;
+              if (this._localChanges) {
+                for (const key of Object.keys(this._localChanges)) {
+                  if (!this._constructorProvidedFields.has(key)) {
+                    delete this._localChanges[key];
+                  }
+                }
+              }
+            }
+          }
           if (!targetYMap) {
             throw new Error(
               `[${modelName}] Target YMap not found for save operation`
@@ -3820,7 +3984,7 @@ var init_BaseModel = __esm({
           Logger.debug(`[${modelName}.save] isUpdate: ${isUpdate}`);
           Logger.debug(`[${modelName}.save] recordYMap exists: ${!!recordYMap}`);
           if (!recordYMap) {
-            recordYMap = new Y.Map();
+            recordYMap = new Y2.Map();
             Logger.verbose(
               `[${modelName}] Creating new nested YMap for record ${this.id} in document ${targetDocId || "legacy"}`
             );
@@ -3992,6 +4156,7 @@ var init_BaseModel = __esm({
             }
           }
           Logger.verbose(`[${modelName}] Save completed for ${this.id}`);
+          syncModelMeta(yDoc, modelName, schema);
           if (_BaseModel.dbInstance) {
             Logger.verbose(
               `[${modelName}] Syncing StringSet changes to database for ${this.id}`
@@ -4836,7 +5001,7 @@ var init_BaseModel = __esm({
                 );
               }
               for (const [recordId, recordYMap] of documentYMap.entries()) {
-                if (recordYMap instanceof Y.Map) {
+                if (recordYMap instanceof Y2.Map) {
                   const instance = new this({ id: recordId });
                   instance._metaDocId = docId;
                   const connectedDoc = modelConstructor.connectedDocuments.get(docId);
@@ -4907,7 +5072,7 @@ var init_BaseModel = __esm({
               const documentYMap = modelConstructor.documentYMaps.get(documentYMapKey);
               if (documentYMap) {
                 const recordYMap2 = documentYMap.get(recordId2);
-                if (recordYMap2 && recordYMap2 instanceof Y.Map) {
+                if (recordYMap2 && recordYMap2 instanceof Y2.Map) {
                   const instance = new modelConstructor({
                     id: recordId2
                   });
@@ -4944,7 +5109,7 @@ var init_BaseModel = __esm({
         if (!recordYMap) {
           return null;
         }
-        if (recordYMap instanceof Y.Map) {
+        if (recordYMap instanceof Y2.Map) {
           const instance = new modelConstructor({
             id: recordId
           });
@@ -5499,9 +5664,12 @@ var TransactionalSQLJSOperations = class {
     const quotedColumns = columns.map((column) => quoteIdentifier(column));
     const placeholders = columns.map(() => "?").join(", ");
     const values = Object.values(data);
-    const insertSQL = `INSERT OR REPLACE INTO ${quotedTableName} (${quotedColumns.join(
+    const nonIdColumns = columns.filter((c) => c !== "id");
+    const quotedNonIdColumns = nonIdColumns.map((c) => quoteIdentifier(c));
+    const updateClause = nonIdColumns.length > 0 ? `ON CONFLICT(${quoteIdentifier("id")}) DO UPDATE SET ${quotedNonIdColumns.map((c) => `${c}=excluded.${c}`).join(", ")}` : `ON CONFLICT(${quoteIdentifier("id")}) DO NOTHING`;
+    const insertSQL = `INSERT INTO ${quotedTableName} (${quotedColumns.join(
       ", "
-    )}) VALUES (${placeholders});`;
+    )}) VALUES (${placeholders}) ${updateClause};`;
     this.db.run(insertSQL, values);
   }
   async delete(modelName, id) {
@@ -5712,9 +5880,12 @@ var SqljsEngine = class _SqljsEngine {
     const quotedColumns = columns.map((column) => quoteIdentifier(column));
     const placeholders = columns.map(() => "?").join(", ");
     const values = Object.values(data);
-    const insertSQL = `INSERT OR REPLACE INTO ${quotedTableName} (${quotedColumns.join(
+    const nonIdColumns = columns.filter((c) => c !== "id");
+    const quotedNonIdColumns = nonIdColumns.map((c) => quoteIdentifier(c));
+    const updateClause = nonIdColumns.length > 0 ? `ON CONFLICT(${quoteIdentifier("id")}) DO UPDATE SET ${quotedNonIdColumns.map((c) => `${c}=excluded.${c}`).join(", ")}` : `ON CONFLICT(${quoteIdentifier("id")}) DO NOTHING`;
+    const insertSQL = `INSERT INTO ${quotedTableName} (${quotedColumns.join(
       ", "
-    )}) VALUES (${placeholders});`;
+    )}) VALUES (${placeholders}) ${updateClause};`;
     this.db.run(insertSQL, values);
   }
   async delete(modelName, id) {

package/dist/client.cjs

@@ -84,18 +84,35 @@ var init_DocumentQueryTranslator = __esm({
   }
 });
 
+// src/models/metaSync.ts
+function registerFunctionDefault(fn, name) {
+  KNOWN_FUNCTION_DEFAULTS.set(fn, name);
+}
+var Y, KNOWN_FUNCTION_DEFAULTS;
+var init_metaSync = __esm({
+  "src/models/metaSync.ts"() {
+    "use strict";
+    Y = __toESM(require("yjs"), 1);
+    KNOWN_FUNCTION_DEFAULTS = /* @__PURE__ */ new WeakMap();
+  }
+});
+
 // src/models/BaseModel.ts
-var Y, import_ulid, Logger;
+function generateULID() {
+  return (0, import_ulid.ulid)();
+}
+var Y2, import_ulid, Logger;
 var init_BaseModel = __esm({
   "src/models/BaseModel.ts"() {
     "use strict";
-    Y = __toESM(require("yjs"), 1);
+    Y2 = __toESM(require("yjs"), 1);
     import_ulid = require("ulid");
     init_StringSet();
     init_documentTypes();
     init_DocumentQueryTranslator();
     init_CursorManager();
     init_sql();
+    init_metaSync();
     Logger = class {
       static _logLevel = 1 /* ERROR */;
       static _logCallback = null;
@@ -164,6 +181,7 @@ var init_BaseModel = __esm({
         }
       }
     };
+    registerFunctionDefault(generateULID, "generate_ulid");
   }
 });
 

package/dist/client.d.cts

@@ -110,6 +110,7 @@ type DocumentPermissionHint = "read" | "read-write";
 interface SaveOptions$1 {
     targetDocument?: string;
     forceWrite?: boolean;
+    upsertOn?: string;
 }
 
 interface ComparisonOperators<T = any> {
@@ -349,6 +350,8 @@ declare class BaseModel implements StringSetChangeTracker {
     private _isDirty;
     private _isLoadingFromYjs;
     private _stringSetFields;
+    protected _constructorProvidedId: boolean;
+    protected _constructorProvidedFields: Set<string>;
     private _metaDocId;
     private _metaPermissionHint;
     /**
@@ -641,11 +644,12 @@ interface QueryRequest {
 }
 interface SaveRequest {
     modelName: string;
-    id: string;
+    id?: string;
     data: Record<string, any>;
     stringSets?: Record<string, string[]>;
     ifNotExists?: boolean;
     condition?: DocumentFilter;
+    upsertOn?: string;
 }
 interface DeleteRequest {
     modelName: string;
@@ -717,12 +721,13 @@ interface PatchResponse {
 interface BatchOperation {
     op: "save" | "patch" | "delete" | "increment" | "addToSet" | "removeFromSet";
     modelName: string;
-    id: string;
+    id?: string;
     data?: Record<string, any>;
     stringSets?: Record<string, string[]>;
     fields?: Record<string, number>;
     ifNotExists?: boolean;
     condition?: DocumentFilter;
+    upsertOn?: string;
 }
 interface BatchRequest {
     operations: BatchOperation[];

package/dist/client.d.ts

@@ -110,6 +110,7 @@ type DocumentPermissionHint = "read" | "read-write";
 interface SaveOptions$1 {
     targetDocument?: string;
     forceWrite?: boolean;
+    upsertOn?: string;
 }
 
 interface ComparisonOperators<T = any> {
@@ -349,6 +350,8 @@ declare class BaseModel implements StringSetChangeTracker {
     private _isDirty;
     private _isLoadingFromYjs;
     private _stringSetFields;
+    protected _constructorProvidedId: boolean;
+    protected _constructorProvidedFields: Set<string>;
     private _metaDocId;
     private _metaPermissionHint;
     /**
@@ -641,11 +644,12 @@ interface QueryRequest {
 }
 interface SaveRequest {
     modelName: string;
-    id: string;
+    id?: string;
     data: Record<string, any>;
     stringSets?: Record<string, string[]>;
     ifNotExists?: boolean;
     condition?: DocumentFilter;
+    upsertOn?: string;
 }
 interface DeleteRequest {
     modelName: string;
@@ -717,12 +721,13 @@ interface PatchResponse {
 interface BatchOperation {
     op: "save" | "patch" | "delete" | "increment" | "addToSet" | "removeFromSet";
     modelName: string;
-    id: string;
+    id?: string;
     data?: Record<string, any>;
     stringSets?: Record<string, string[]>;
     fields?: Record<string, number>;
     ifNotExists?: boolean;
     condition?: DocumentFilter;
+    upsertOn?: string;
 }
 interface BatchRequest {
     operations: BatchOperation[];

package/dist/client.js

@@ -57,9 +57,25 @@ var init_DocumentQueryTranslator = __esm({
   }
 });
 
-// src/models/BaseModel.ts
+// src/models/metaSync.ts
 import * as Y from "yjs";
+function registerFunctionDefault(fn, name) {
+  KNOWN_FUNCTION_DEFAULTS.set(fn, name);
+}
+var KNOWN_FUNCTION_DEFAULTS;
+var init_metaSync = __esm({
+  "src/models/metaSync.ts"() {
+    "use strict";
+    KNOWN_FUNCTION_DEFAULTS = /* @__PURE__ */ new WeakMap();
+  }
+});
+
+// src/models/BaseModel.ts
+import * as Y2 from "yjs";
 import { ulid } from "ulid";
+function generateULID() {
+  return ulid();
+}
 var Logger;
 var init_BaseModel = __esm({
   "src/models/BaseModel.ts"() {
@@ -69,6 +85,7 @@ var init_BaseModel = __esm({
     init_DocumentQueryTranslator();
     init_CursorManager();
     init_sql();
+    init_metaSync();
     Logger = class {
       static _logLevel = 1 /* ERROR */;
       static _logCallback = null;
@@ -137,6 +154,7 @@ var init_BaseModel = __esm({
         }
       }
     };
+    registerFunctionDefault(generateULID, "generate_ulid");
   }
 });