js-bao 0.4.2 → 0.5.1

package/dist/cloudflare.js

@@ -57,10 +57,25 @@ var init_DocumentQueryTranslator = __esm({
   }
 });
 
-// src/models/metaSync.ts
+// src/utils/yjsValues.ts
 import * as Y from "yjs";
+function isStringSetYMap(value) {
+  if (!(value instanceof Y.Map)) return false;
+  for (const v of value.values()) {
+    if (v !== true) return false;
+  }
+  return true;
+}
+var init_yjsValues = __esm({
+  "src/utils/yjsValues.ts"() {
+    "use strict";
+  }
+});
+
+// src/models/metaSync.ts
+import * as Y2 from "yjs";
 function inferFieldType(value) {
-  if (value instanceof Y.Map) return "stringset";
+  if (isStringSetYMap(value)) return "stringset";
   switch (typeof value) {
     case "string":
       return "string";
@@ -105,7 +120,7 @@ function syncModelMeta(yDoc, modelName, schema) {
   if (compoundConstraints.length > 0) {
     let constraints = meta.get("_constraints");
     if (!constraints) {
-      constraints = new Y.Map();
+      constraints = new Y2.Map();
       meta.set("_constraints", constraints);
     }
     for (const constraint of compoundConstraints) {
@@ -116,7 +131,7 @@ function syncModelMeta(yDoc, modelName, schema) {
   if (relationships && Object.keys(relationships).length > 0) {
     let rels = meta.get("_relationships");
     if (!rels) {
-      rels = new Y.Map();
+      rels = new Y2.Map();
       meta.set("_relationships", rels);
     }
     for (const [relName, relConfig] of Object.entries(relationships)) {
@@ -128,7 +143,7 @@ function syncModelMeta(yDoc, modelName, schema) {
 function syncFieldMeta(metaMap, fieldName, fieldOpts) {
   let fieldMeta = metaMap.get(fieldName);
   if (!fieldMeta) {
-    fieldMeta = new Y.Map();
+    fieldMeta = new Y2.Map();
     metaMap.set(fieldName, fieldMeta);
   }
   setIfChanged(fieldMeta, "type", fieldOpts.type);
@@ -136,6 +151,7 @@ function syncFieldMeta(metaMap, fieldName, fieldOpts) {
   if (fieldOpts.unique) setIfChanged(fieldMeta, "unique", true);
   if (fieldOpts.required) setIfChanged(fieldMeta, "required", true);
   if (fieldOpts.autoAssign) setIfChanged(fieldMeta, "autoAssign", true);
+  if (fieldOpts.autoStamp) setIfChanged(fieldMeta, "autoStamp", fieldOpts.autoStamp);
   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);
@@ -144,7 +160,7 @@ function syncFieldMeta(metaMap, fieldName, fieldOpts) {
 function syncConstraintMeta(constraintsMap, constraint) {
   let cMeta = constraintsMap.get(constraint.name);
   if (!cMeta) {
-    cMeta = new Y.Map();
+    cMeta = new Y2.Map();
     constraintsMap.set(constraint.name, cMeta);
   }
   setIfChanged(cMeta, "type", "unique");
@@ -154,7 +170,7 @@ function syncConstraintMeta(constraintsMap, constraint) {
 function syncRelationshipMeta(relsMap, relName, relConfig) {
   let relMeta = relsMap.get(relName);
   if (!relMeta) {
-    relMeta = new Y.Map();
+    relMeta = new Y2.Map();
     relsMap.set(relName, relMeta);
   }
   for (const [key, value] of Object.entries(relConfig)) {
@@ -169,7 +185,7 @@ function syncInferredMeta(yDoc, modelName, recordData) {
     if (fieldName.startsWith("_")) continue;
     let fieldMeta = meta.get(fieldName);
     if (!fieldMeta) {
-      fieldMeta = new Y.Map();
+      fieldMeta = new Y2.Map();
       meta.set(fieldName, fieldMeta);
     }
     if (!fieldMeta.has("type")) {
@@ -189,13 +205,14 @@ var KNOWN_FUNCTION_DEFAULTS, _syncedCache;
 var init_metaSync = __esm({
   "src/models/metaSync.ts"() {
     "use strict";
+    init_yjsValues();
     KNOWN_FUNCTION_DEFAULTS = /* @__PURE__ */ new WeakMap();
     _syncedCache = /* @__PURE__ */ new WeakMap();
   }
 });
 
 // src/models/BaseModel.ts
-import * as Y2 from "yjs";
+import * as Y3 from "yjs";
 import { ulid } from "ulid";
 function generateULID() {
   return ulid();
@@ -210,6 +227,7 @@ var init_BaseModel = __esm({
     init_CursorManager();
     init_sql();
     init_metaSync();
+    init_yjsValues();
     Logger = class {
       static _logLevel = 1 /* ERROR */;
       static _logCallback = null;
@@ -1176,7 +1194,8 @@ function connectDoDb(options) {
 }
 
 // src/utils/yDocSchema.ts
-import * as Y3 from "yjs";
+init_yjsValues();
+import * as Y4 from "yjs";
 function discoverSchema(yDoc) {
   const models = {};
   const metaNames = /* @__PURE__ */ new Set();
@@ -1210,7 +1229,7 @@ function discoverModelNames(yDoc) {
 function materializeMap(yDoc, key) {
   try {
     const map = yDoc.getMap(key);
-    return map instanceof Y3.Map ? map : null;
+    return map instanceof Y4.Map ? map : null;
   } catch {
     return null;
   }
@@ -1220,11 +1239,11 @@ function readModelMeta(metaMap) {
   let constraints;
   let relationships;
   for (const [key, value] of metaMap.entries()) {
-    if (key === "_constraints" && value instanceof Y3.Map) {
+    if (key === "_constraints" && value instanceof Y4.Map) {
       constraints = readConstraints(value);
-    } else if (key === "_relationships" && value instanceof Y3.Map) {
+    } else if (key === "_relationships" && value instanceof Y4.Map) {
       relationships = readRelationships(value);
-    } else if (value instanceof Y3.Map) {
+    } else if (value instanceof Y4.Map) {
       fields[key] = readFieldMeta(value);
     }
   }
@@ -1243,6 +1262,10 @@ function readFieldMeta(fieldMap) {
   if (fieldMap.get("unique") === true) field.unique = true;
   if (fieldMap.get("required") === true) field.required = true;
   if (fieldMap.get("autoAssign") === true) field.autoAssign = true;
+  const autoStamp = fieldMap.get("autoStamp");
+  if (typeof autoStamp === "string" && (autoStamp === "create" || autoStamp === "update" || autoStamp === "both")) {
+    field.autoStamp = autoStamp;
+  }
   const def = fieldMap.get("default");
   if (def !== void 0) field.default = def;
   const maxLength = fieldMap.get("maxLength");
@@ -1255,7 +1278,7 @@ function inferModelFromData(dataMap) {
   const fields = {};
   let sampled = 0;
   for (const [_recordId, recordValue] of dataMap.entries()) {
-    if (!(recordValue instanceof Y3.Map)) continue;
+    if (!(recordValue instanceof Y4.Map)) continue;
     if (++sampled > 5) break;
     for (const [fieldName, value] of recordValue.entries()) {
       if (fieldName.startsWith("_")) continue;
@@ -1268,7 +1291,7 @@ function inferModelFromData(dataMap) {
   return { fields };
 }
 function inferTypeFromValue(value) {
-  if (value instanceof Y3.Map) return "stringset";
+  if (isStringSetYMap(value)) return "stringset";
   switch (typeof value) {
     case "string":
       return "string";
@@ -1283,7 +1306,7 @@ function inferTypeFromValue(value) {
 function readConstraints(constraintsMap) {
   const out = {};
   for (const [name, value] of constraintsMap.entries()) {
-    if (!(value instanceof Y3.Map)) continue;
+    if (!(value instanceof Y4.Map)) continue;
     let fields = [];
     const rawFields = value.get("fields");
     if (typeof rawFields === "string") {
@@ -1302,7 +1325,7 @@ function readConstraints(constraintsMap) {
 function readRelationships(relsMap) {
   const out = {};
   for (const [name, value] of relsMap.entries()) {
-    if (!(value instanceof Y3.Map)) continue;
+    if (!(value instanceof Y4.Map)) continue;
     const rel = {};
     for (const [k, v] of value.entries()) {
       rel[k] = v;
@@ -1313,6 +1336,7 @@ function readRelationships(relsMap) {
 }
 var CAMEL_TO_SNAKE = {
   autoAssign: "auto_assign",
+  autoStamp: "auto_stamp",
   maxLength: "max_length",
   maxCount: "max_count",
   relatedIdField: "related_id_field",
@@ -1343,6 +1367,7 @@ function schemaToToml(schema) {
       lines.push(`[models.${modelName}.fields.${fieldName}]`);
       lines.push(`type = ${tomlValue(field.type)}`);
       if (field.autoAssign) lines.push("auto_assign = true");
+      if (field.autoStamp) lines.push(`auto_stamp = ${tomlValue(field.autoStamp)}`);
       if (field.indexed) lines.push("indexed = true");
       if (field.unique) lines.push("unique = true");
       if (field.required) lines.push("required = true");
@@ -1466,10 +1491,13 @@ var KNOWN_FIELD_KEYS = /* @__PURE__ */ new Set([
   "unique",
   "required",
   "auto_assign",
+  "auto_stamp",
   "max_length",
   "max_count",
-  "default"
+  "default",
+  "enum"
 ]);
+var VALID_AUTO_STAMP_VALUES = /* @__PURE__ */ new Set(["create", "update", "both"]);
 var KNOWN_MODEL_KEYS = /* @__PURE__ */ new Set([
   "fields",
   "relationships",
@@ -1511,9 +1539,37 @@ function parseFieldOptions(raw, context, strict) {
   if (raw.unique === true) opts.unique = true;
   if (raw.required === true) opts.required = true;
   if (raw.auto_assign === true) opts.autoAssign = true;
+  if (raw.auto_stamp !== void 0) {
+    if (typeof raw.auto_stamp !== "string" || !VALID_AUTO_STAMP_VALUES.has(raw.auto_stamp)) {
+      throw new Error(
+        `${context}: invalid auto_stamp value "${raw.auto_stamp}". Must be one of: ${[
+          ...VALID_AUTO_STAMP_VALUES
+        ].join(", ")}`
+      );
+    }
+    opts.autoStamp = raw.auto_stamp;
+  }
   if (raw.max_length !== void 0) opts.maxLength = raw.max_length;
   if (raw.max_count !== void 0) opts.maxCount = raw.max_count;
   if (raw.default !== void 0) opts.default = raw.default;
+  if (raw.enum !== void 0) {
+    if (raw.type !== "string") {
+      throw new Error(
+        `${context}: \`enum\` is only valid on a "string" field, not "${raw.type}".`
+      );
+    }
+    if (!Array.isArray(raw.enum) || raw.enum.length === 0) {
+      throw new Error(
+        `${context}: \`enum\` must be a non-empty array of strings.`
+      );
+    }
+    if (!raw.enum.every((v) => typeof v === "string")) {
+      throw new Error(
+        `${context}: \`enum\` values must all be strings.`
+      );
+    }
+    opts.enum = [...raw.enum];
+  }
   return opts;
 }
 function requireField(raw, field, context) {

package/dist/codegen-v2.cjs

@@ -80,15 +80,25 @@ var init_DocumentQueryTranslator = __esm({
   }
 });
 
+// src/utils/yjsValues.ts
+var Y;
+var init_yjsValues = __esm({
+  "src/utils/yjsValues.ts"() {
+    "use strict";
+    Y = __toESM(require("yjs"), 1);
+  }
+});
+
 // src/models/metaSync.ts
 function registerFunctionDefault(fn, name) {
   KNOWN_FUNCTION_DEFAULTS.set(fn, name);
 }
-var Y, KNOWN_FUNCTION_DEFAULTS;
+var Y2, KNOWN_FUNCTION_DEFAULTS;
 var init_metaSync = __esm({
   "src/models/metaSync.ts"() {
     "use strict";
-    Y = __toESM(require("yjs"), 1);
+    Y2 = __toESM(require("yjs"), 1);
+    init_yjsValues();
     KNOWN_FUNCTION_DEFAULTS = /* @__PURE__ */ new WeakMap();
   }
 });
@@ -97,11 +107,11 @@ var init_metaSync = __esm({
 function generateULID() {
   return (0, import_ulid.ulid)();
 }
-var Y2, import_ulid;
+var Y3, import_ulid;
 var init_BaseModel = __esm({
   "src/models/BaseModel.ts"() {
     "use strict";
-    Y2 = __toESM(require("yjs"), 1);
+    Y3 = __toESM(require("yjs"), 1);
     import_ulid = require("ulid");
     init_StringSet();
     init_documentTypes();
@@ -109,6 +119,7 @@ var init_BaseModel = __esm({
     init_CursorManager();
     init_sql();
     init_metaSync();
+    init_yjsValues();
     registerFunctionDefault(generateULID, "generate_ulid");
   }
 });
@@ -231,10 +242,13 @@ var KNOWN_FIELD_KEYS = /* @__PURE__ */ new Set([
   "unique",
   "required",
   "auto_assign",
+  "auto_stamp",
   "max_length",
   "max_count",
-  "default"
+  "default",
+  "enum"
 ]);
+var VALID_AUTO_STAMP_VALUES = /* @__PURE__ */ new Set(["create", "update", "both"]);
 var KNOWN_MODEL_KEYS = /* @__PURE__ */ new Set([
   "fields",
   "relationships",
@@ -276,9 +290,37 @@ function parseFieldOptions(raw, context, strict) {
   if (raw.unique === true) opts.unique = true;
   if (raw.required === true) opts.required = true;
   if (raw.auto_assign === true) opts.autoAssign = true;
+  if (raw.auto_stamp !== void 0) {
+    if (typeof raw.auto_stamp !== "string" || !VALID_AUTO_STAMP_VALUES.has(raw.auto_stamp)) {
+      throw new Error(
+        `${context}: invalid auto_stamp value "${raw.auto_stamp}". Must be one of: ${[
+          ...VALID_AUTO_STAMP_VALUES
+        ].join(", ")}`
+      );
+    }
+    opts.autoStamp = raw.auto_stamp;
+  }
   if (raw.max_length !== void 0) opts.maxLength = raw.max_length;
   if (raw.max_count !== void 0) opts.maxCount = raw.max_count;
   if (raw.default !== void 0) opts.default = raw.default;
+  if (raw.enum !== void 0) {
+    if (raw.type !== "string") {
+      throw new Error(
+        `${context}: \`enum\` is only valid on a "string" field, not "${raw.type}".`
+      );
+    }
+    if (!Array.isArray(raw.enum) || raw.enum.length === 0) {
+      throw new Error(
+        `${context}: \`enum\` must be a non-empty array of strings.`
+      );
+    }
+    if (!raw.enum.every((v) => typeof v === "string")) {
+      throw new Error(
+        `${context}: \`enum\` values must all be strings.`
+      );
+    }
+    opts.enum = [...raw.enum];
+  }
   return opts;
 }
 function requireField(raw, field, context) {
@@ -479,6 +521,12 @@ function tsTypeForFieldType(fieldType) {
     }
   }
 }
+function tsTypeForFieldOptions(opts) {
+  if (opts.type === "string" && Array.isArray(opts.enum) && opts.enum.length > 0) {
+    return opts.enum.map((v) => JSON.stringify(v)).join(" | ");
+  }
+  return tsTypeForFieldType(opts.type);
+}
 
 // src/cli/v2/templates.ts
 var HEADER_BANNER = "// AUTO-GENERATED FROM models.toml \u2014 DO NOT EDIT.";
@@ -532,8 +580,9 @@ function renderModelFile(input) {
   lines.push("");
   lines.push(`export interface ${className}Attrs {`);
   for (const [fieldName, opts] of Object.entries(fields)) {
-    const tsType = tsTypeForFieldType(opts.type);
-    const optional = opts.required === true ? "" : "?";
+    const tsType = tsTypeForFieldOptions(opts);
+    const isRequired = opts.required === true || opts.autoAssign === true && fieldName === "id";
+    const optional = isRequired ? "" : "?";
     lines.push(`  ${fieldName}${optional}: ${tsType};`);
   }
   lines.push(`}`);
@@ -642,7 +691,9 @@ function renderBarrel(input) {
   lines.push(`  }`);
   lines.push(`}`);
   lines.push("");
-  lines.push(`export const allModels: unknown[] = _modelPairs.map((m) => m.class);`);
+  lines.push(
+    `export const allModels: Array<typeof BaseModel> = _modelPairs.map((m) => m.class);`
+  );
   lines.push("");
   return lines.join("\n");
 }
@@ -801,6 +852,7 @@ var ts = __toESM(require("typescript"), 1);
 // src/cli/v2/toml-writer.ts
 var CAMEL_TO_SNAKE = {
   autoAssign: "auto_assign",
+  autoStamp: "auto_stamp",
   maxLength: "max_length",
   maxCount: "max_count",
   relatedIdField: "related_id_field",
@@ -841,11 +893,17 @@ function renderModelsToml(models) {
       lines.push(`[models.${model.name}.fields.${fieldName}]`);
       lines.push(`type = ${tomlValue(opts.type)}`);
       if (opts.autoAssign === true) lines.push("auto_assign = true");
+      if (opts.autoStamp !== void 0) {
+        lines.push(`auto_stamp = ${tomlValue(opts.autoStamp)}`);
+      }
       if (opts.indexed === true) lines.push("indexed = true");
       if (opts.unique === true) lines.push("unique = true");
       if (opts.required === true) lines.push("required = true");
       if (opts.maxLength !== void 0) lines.push(`max_length = ${opts.maxLength}`);
       if (opts.maxCount !== void 0) lines.push(`max_count = ${opts.maxCount}`);
+      if (opts.enum !== void 0) {
+        lines.push(`enum = [${opts.enum.map((v) => tomlValue(v)).join(", ")}]`);
+      }
       if (opts.default !== void 0) {
         lines.push(`default = ${tomlValue(opts.default)}`);
       }
@@ -1062,10 +1120,18 @@ function parseDefineModelSchemaArg(obj, sf) {
     if (opts && opts.type === "id") {
       fd.severity = "info";
       opts.autoAssign = true;
+      if (fd.field === "id") {
+        opts.required = true;
+      }
     } else {
       fd.severity = "warn";
     }
   }
+  for (const [fieldName, opts] of Object.entries(fields)) {
+    if (fieldName === "id" && opts.autoAssign === true && opts.required !== false) {
+      opts.required = true;
+    }
+  }
   return { modelName, fields, relationships, uniqueConstraints, functionDefaults };
 }
 function parseFields(obj, sf) {
@@ -1097,6 +1163,11 @@ function parseFields(obj, sf) {
         case "autoAssign":
           if (typeof value === "boolean") opts.autoAssign = value;
           break;
+        case "autoStamp":
+          if (value === "create" || value === "update" || value === "both") {
+            opts.autoStamp = value;
+          }
+          break;
         case "maxLength":
           if (typeof value === "number") opts.maxLength = value;
           break;
@@ -1477,7 +1548,7 @@ var Logger2 = class _Logger {
 // package.json
 var package_default = {
   name: "js-bao",
-  version: "0.4.2",
+  version: "0.5.1",
   description: "A library providing data modeling capabilities which support live updates and queries.",
   types: "dist/index.d.ts",
   type: "module",

package/dist/codegen.cjs

@@ -1136,6 +1136,11 @@ var SchemaExtractor = class {
               fieldDef.autoAssign = value;
             }
             break;
+          case "autoStamp":
+            if (value === "create" || value === "update" || value === "both") {
+              fieldDef.autoStamp = value;
+            }
+            break;
           case "primaryKey":
             if (typeof value === "boolean") {
               fieldDef.primaryKey = value;
@@ -1181,7 +1186,7 @@ var SchemaExtractor = class {
 // package.json
 var package_default = {
   name: "js-bao",
-  version: "0.4.2",
+  version: "0.5.1",
   description: "A library providing data modeling capabilities which support live updates and queries.",
   types: "dist/index.d.ts",
   type: "module",