js-bao 0.5.1 → 0.5.2

package/dist/cloudflare.js

@@ -72,8 +72,203 @@ var init_yjsValues = __esm({
   }
 });
 
-// src/models/metaSync.ts
+// src/models/writeLifecycle.ts
 import * as Y2 from "yjs";
+import { ulid } from "ulid";
+function assertNever(x) {
+  throw new Error(`Unhandled field type: ${String(x)}`);
+}
+function fieldWriteKind(type) {
+  switch (type) {
+    case "string":
+    case "number":
+    case "boolean":
+    case "date":
+    case "id":
+      return "scalar";
+    case "stringset":
+      return "stringset";
+    default:
+      return assertNever(type);
+  }
+}
+function isKnownFieldType(type) {
+  return KNOWN_FIELD_TYPES.has(type);
+}
+function ensureStringSetYMap(rm, fieldName) {
+  const nested = rm.get(fieldName);
+  if (nested instanceof Y2.Map) return nested;
+  const fresh = new Y2.Map();
+  if (nested && typeof nested === "object") {
+    for (const [member, marker] of Object.entries(
+      nested
+    )) {
+      if (Boolean(marker)) fresh.set(member, true);
+    }
+  }
+  rm.set(fieldName, fresh);
+  return fresh;
+}
+function applyStringSetDelta(target, delta) {
+  if (delta.clear) {
+    for (const member of Array.from(target.keys())) target.delete(member);
+  }
+  if (delta.remove) {
+    for (const member of delta.remove) target.delete(String(member));
+  }
+  if (delta.add) {
+    for (const member of delta.add) {
+      const key = String(member);
+      if (target.get(key) !== true) target.set(key, true);
+    }
+  }
+}
+function replaceStringSet(rm, fieldName, members) {
+  const target = ensureStringSetYMap(rm, fieldName);
+  const desired = /* @__PURE__ */ new Set();
+  for (const member of members) desired.add(String(member));
+  for (const existing of Array.from(target.keys())) {
+    if (!desired.has(existing)) target.delete(existing);
+  }
+  for (const member of desired) {
+    if (target.get(member) !== true) target.set(member, true);
+  }
+}
+function applyStringSetChange(recordYMap, fieldName, change) {
+  const target = ensureStringSetYMap(recordYMap, fieldName);
+  applyStringSetDelta(target, {
+    add: change.additions,
+    remove: change.removals
+  });
+}
+function parseStringSetOp(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value) || value instanceof Y2.AbstractType) {
+    return null;
+  }
+  const keys = Object.keys(value);
+  const opKeys = keys.filter((k) => k.startsWith("$"));
+  if (opKeys.length === 0) return null;
+  const known = /* @__PURE__ */ new Set(["$add", "$remove", "$clear"]);
+  const unknown = keys.filter((k) => !known.has(k));
+  if (unknown.length > 0) {
+    throw new Error(
+      `Invalid stringset op: unexpected key(s) [${unknown.join(", ")}]. Only $add, $remove and $clear are supported.`
+    );
+  }
+  const obj = value;
+  const toMembers = (raw, opName) => {
+    if (raw === void 0) return [];
+    if (!Array.isArray(raw)) {
+      throw new Error(`Invalid stringset op: ${opName} must be an array.`);
+    }
+    return raw.map((m) => String(m));
+  };
+  return {
+    add: toMembers(obj.$add, "$add"),
+    remove: toMembers(obj.$remove, "$remove"),
+    clear: obj.$clear === true
+  };
+}
+function writeField(rm, declaredType, key, value, modelName) {
+  const kind = declaredType && isKnownFieldType(declaredType) ? fieldWriteKind(declaredType) : "scalar";
+  if (Array.isArray(value)) {
+    if (kind !== "stringset") {
+      throw new Error(
+        `Cannot write array value to field "${key}" on model "${modelName}": its declared type could not be resolved to a collection (stringset). Collection fields require schema metadata in the document (_meta_${modelName}); the model must be saved by a client at least once before a workflow writes one of its collection fields.`
+      );
+    }
+    replaceStringSet(rm, key, value);
+    return;
+  }
+  const op = parseStringSetOp(value);
+  if (op) {
+    if (kind !== "stringset") {
+      throw new Error(
+        `Cannot apply a stringset op ({ $add/$remove/$clear }) to field "${key}" on model "${modelName}": its declared type is ${declaredType ? `"${declaredType}"` : "unresolved"}, not a collection (stringset). Op-objects are only valid for stringset / refersToMany fields with schema metadata (_meta_${modelName}).`
+      );
+    }
+    applyStringSetDelta(ensureStringSetYMap(rm, key), op);
+    return;
+  }
+  if (kind === "stringset") {
+    throw new Error(
+      `Field "${key}" on model "${modelName}" is a stringset and requires an array (replace) or { $add/$remove/$clear } (delta) value; received ${value === null ? "null" : typeof value}.`
+    );
+  }
+  rm.set(key, value);
+}
+function registerFunctionDefaultGenerator(name, fn) {
+  FUNCTION_DEFAULT_GENERATORS.set(name, fn);
+}
+function decodeFunctionDefault(name) {
+  return FUNCTION_DEFAULT_GENERATORS.get(name);
+}
+function resolveDefaultValue(rawDefault, opts = {}) {
+  if (typeof rawDefault === "function") return rawDefault();
+  if (typeof rawDefault === "string" && rawDefault.startsWith("$")) {
+    if (rawDefault.startsWith("$$")) return rawDefault.slice(1);
+    const name = rawDefault.slice(1);
+    const gen = opts.decode?.(name) ?? decodeFunctionDefault(name);
+    if (!gen) {
+      throw new Error(
+        `Unknown function default "${rawDefault}" for field "${opts.fieldName ?? "?"}"${opts.modelName ? ` on model "${opts.modelName}"` : ""}: no generator is registered for "${name}". Register it via registerFunctionDefaultGenerator("${name}", fn) so the server can populate the field the same way the client does.`
+      );
+    }
+    return gen();
+  }
+  return rawDefault;
+}
+function applyDefaultsFromSchema(fields, data, opts = {}) {
+  for (const [fieldName, field] of Object.entries(fields)) {
+    if (fieldName === "id") continue;
+    if (!field || field.default === void 0) continue;
+    if (field.default === UNKNOWN_FUNCTION_DEFAULT) {
+      continue;
+    }
+    if (Object.prototype.hasOwnProperty.call(data, fieldName) && data[fieldName] !== void 0) {
+      continue;
+    }
+    data[fieldName] = resolveDefaultValue(field.default, {
+      fieldName,
+      modelName: opts.modelName,
+      decode: opts.decodeFunctionDefault
+    });
+  }
+  return data;
+}
+function applyAutoStampsFromSchema(fields, data, opts) {
+  const { isNew, now } = opts;
+  for (const [fieldName, field] of Object.entries(fields)) {
+    const stamp = field?.autoStamp;
+    if (!stamp) continue;
+    const explicit = Object.prototype.hasOwnProperty.call(data, fieldName) && data[fieldName] !== null && data[fieldName] !== void 0;
+    if (explicit) continue;
+    if (stamp === "create" && !isNew) continue;
+    data[fieldName] = now;
+  }
+  return data;
+}
+var KNOWN_FIELD_TYPE_MAP, KNOWN_FIELD_TYPES, FUNCTION_DEFAULT_GENERATORS, UNKNOWN_FUNCTION_DEFAULT;
+var init_writeLifecycle = __esm({
+  "src/models/writeLifecycle.ts"() {
+    "use strict";
+    KNOWN_FIELD_TYPE_MAP = {
+      string: true,
+      number: true,
+      boolean: true,
+      date: true,
+      id: true,
+      stringset: true
+    };
+    KNOWN_FIELD_TYPES = new Set(Object.keys(KNOWN_FIELD_TYPE_MAP));
+    FUNCTION_DEFAULT_GENERATORS = /* @__PURE__ */ new Map();
+    registerFunctionDefaultGenerator("generate_ulid", () => ulid());
+    UNKNOWN_FUNCTION_DEFAULT = "$unknown_function";
+  }
+});
+
+// src/models/metaSync.ts
+import * as Y3 from "yjs";
 function inferFieldType(value) {
   if (isStringSetYMap(value)) return "stringset";
   switch (typeof value) {
@@ -94,7 +289,10 @@ 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 name ? `$${name}` : UNKNOWN_FUNCTION_DEFAULT;
+  }
+  if (typeof value === "string" && value.startsWith("$")) {
+    return `$${value}`;
   }
   return value;
 }
@@ -120,7 +318,7 @@ function syncModelMeta(yDoc, modelName, schema) {
   if (compoundConstraints.length > 0) {
     let constraints = meta.get("_constraints");
     if (!constraints) {
-      constraints = new Y2.Map();
+      constraints = new Y3.Map();
       meta.set("_constraints", constraints);
     }
     for (const constraint of compoundConstraints) {
@@ -131,7 +329,7 @@ function syncModelMeta(yDoc, modelName, schema) {
   if (relationships && Object.keys(relationships).length > 0) {
     let rels = meta.get("_relationships");
     if (!rels) {
-      rels = new Y2.Map();
+      rels = new Y3.Map();
       meta.set("_relationships", rels);
     }
     for (const [relName, relConfig] of Object.entries(relationships)) {
@@ -143,7 +341,7 @@ function syncModelMeta(yDoc, modelName, schema) {
 function syncFieldMeta(metaMap, fieldName, fieldOpts) {
   let fieldMeta = metaMap.get(fieldName);
   if (!fieldMeta) {
-    fieldMeta = new Y2.Map();
+    fieldMeta = new Y3.Map();
     metaMap.set(fieldName, fieldMeta);
   }
   setIfChanged(fieldMeta, "type", fieldOpts.type);
@@ -160,7 +358,7 @@ function syncFieldMeta(metaMap, fieldName, fieldOpts) {
 function syncConstraintMeta(constraintsMap, constraint) {
   let cMeta = constraintsMap.get(constraint.name);
   if (!cMeta) {
-    cMeta = new Y2.Map();
+    cMeta = new Y3.Map();
     constraintsMap.set(constraint.name, cMeta);
   }
   setIfChanged(cMeta, "type", "unique");
@@ -170,7 +368,7 @@ function syncConstraintMeta(constraintsMap, constraint) {
 function syncRelationshipMeta(relsMap, relName, relConfig) {
   let relMeta = relsMap.get(relName);
   if (!relMeta) {
-    relMeta = new Y2.Map();
+    relMeta = new Y3.Map();
     relsMap.set(relName, relMeta);
   }
   for (const [key, value] of Object.entries(relConfig)) {
@@ -185,7 +383,7 @@ function syncInferredMeta(yDoc, modelName, recordData) {
     if (fieldName.startsWith("_")) continue;
     let fieldMeta = meta.get(fieldName);
     if (!fieldMeta) {
-      fieldMeta = new Y2.Map();
+      fieldMeta = new Y3.Map();
       meta.set(fieldName, fieldMeta);
     }
     if (!fieldMeta.has("type")) {
@@ -206,16 +404,42 @@ var init_metaSync = __esm({
   "src/models/metaSync.ts"() {
     "use strict";
     init_yjsValues();
+    init_writeLifecycle();
     KNOWN_FUNCTION_DEFAULTS = /* @__PURE__ */ new WeakMap();
     _syncedCache = /* @__PURE__ */ new WeakMap();
   }
 });
 
+// src/utils/uniqueIndex.ts
+import * as Y4 from "yjs";
+function buildUniqueKey(recordData, fields) {
+  const keyParts = [];
+  for (const field of fields) {
+    const value = recordData instanceof Y4.Map ? recordData.get(field) : recordData[field];
+    if (value === null || value === void 0) {
+      return null;
+    }
+    keyParts.push(String(value));
+  }
+  return keyParts.join("|");
+}
+function uniqueIndexMapName(modelName, constraintName) {
+  return `_uniqueIdx_${modelName}_${constraintName}`;
+}
+function fieldUniqueConstraintName(modelName, fieldName) {
+  return `${modelName}_${fieldName}_unique`;
+}
+var init_uniqueIndex = __esm({
+  "src/utils/uniqueIndex.ts"() {
+    "use strict";
+  }
+});
+
 // src/models/BaseModel.ts
-import * as Y3 from "yjs";
-import { ulid } from "ulid";
+import * as Y5 from "yjs";
+import { ulid as ulid2 } from "ulid";
 function generateULID() {
-  return ulid();
+  return ulid2();
 }
 var Logger;
 var init_BaseModel = __esm({
@@ -227,7 +451,9 @@ var init_BaseModel = __esm({
     init_CursorManager();
     init_sql();
     init_metaSync();
+    init_writeLifecycle();
     init_yjsValues();
+    init_uniqueIndex();
     Logger = class {
       static _logLevel = 1 /* ERROR */;
       static _logCallback = null;
@@ -1195,7 +1421,7 @@ function connectDoDb(options) {
 
 // src/utils/yDocSchema.ts
 init_yjsValues();
-import * as Y4 from "yjs";
+import * as Y6 from "yjs";
 function discoverSchema(yDoc) {
   const models = {};
   const metaNames = /* @__PURE__ */ new Set();
@@ -1229,7 +1455,7 @@ function discoverModelNames(yDoc) {
 function materializeMap(yDoc, key) {
   try {
     const map = yDoc.getMap(key);
-    return map instanceof Y4.Map ? map : null;
+    return map instanceof Y6.Map ? map : null;
   } catch {
     return null;
   }
@@ -1239,11 +1465,11 @@ function readModelMeta(metaMap) {
   let constraints;
   let relationships;
   for (const [key, value] of metaMap.entries()) {
-    if (key === "_constraints" && value instanceof Y4.Map) {
+    if (key === "_constraints" && value instanceof Y6.Map) {
       constraints = readConstraints(value);
-    } else if (key === "_relationships" && value instanceof Y4.Map) {
+    } else if (key === "_relationships" && value instanceof Y6.Map) {
       relationships = readRelationships(value);
-    } else if (value instanceof Y4.Map) {
+    } else if (value instanceof Y6.Map) {
       fields[key] = readFieldMeta(value);
     }
   }
@@ -1278,7 +1504,7 @@ function inferModelFromData(dataMap) {
   const fields = {};
   let sampled = 0;
   for (const [_recordId, recordValue] of dataMap.entries()) {
-    if (!(recordValue instanceof Y4.Map)) continue;
+    if (!(recordValue instanceof Y6.Map)) continue;
     if (++sampled > 5) break;
     for (const [fieldName, value] of recordValue.entries()) {
       if (fieldName.startsWith("_")) continue;
@@ -1306,7 +1532,7 @@ function inferTypeFromValue(value) {
 function readConstraints(constraintsMap) {
   const out = {};
   for (const [name, value] of constraintsMap.entries()) {
-    if (!(value instanceof Y4.Map)) continue;
+    if (!(value instanceof Y6.Map)) continue;
     let fields = [];
     const rawFields = value.get("fields");
     if (typeof rawFields === "string") {
@@ -1325,7 +1551,7 @@ function readConstraints(constraintsMap) {
 function readRelationships(relsMap) {
   const out = {};
   for (const [name, value] of relsMap.entries()) {
-    if (!(value instanceof Y4.Map)) continue;
+    if (!(value instanceof Y6.Map)) continue;
     const rel = {};
     for (const [k, v] of value.entries()) {
       rel[k] = v;
@@ -1404,6 +1630,7 @@ import { parse as parseToml } from "smol-toml";
 // src/models/schema.ts
 init_BaseModel();
 init_ModelRegistry();
+init_uniqueIndex();
 function defineModelSchema(input) {
   const { name, fields } = input;
   const options = {
@@ -1446,7 +1673,7 @@ function resolveUniqueConstraints(modelName, fields, customConstraints) {
   for (const [fieldName, options] of fields.entries()) {
     if (options.unique) {
       resolved.push({
-        name: `${modelName}_${fieldName}_unique`,
+        name: fieldUniqueConstraintName(modelName, fieldName),
         fields: [fieldName]
       });
     }
@@ -1692,20 +1919,39 @@ function loadSchemaFromTomlString(tomlString, options = {}) {
 }
 
 // src/cloudflare.ts
+init_uniqueIndex();
 init_metaSync();
+init_writeLifecycle();
 export {
   DOClientEngine,
+  applyAutoStampsFromSchema,
+  applyDefaultsFromSchema,
+  applyStringSetChange,
+  applyStringSetDelta,
+  assertNever,
+  buildUniqueKey,
   clearMetaSyncCache,
   connectDoDb,
+  decodeFunctionDefault,
   discoverModelNames,
   discoverSchema,
+  ensureStringSetYMap,
+  fieldUniqueConstraintName,
+  fieldWriteKind,
   getActiveDOEngine,
   inferFieldType,
   initJsBaoDO,
+  isKnownFieldType,
   loadSchemaFromTomlString,
+  parseStringSetOp,
   registerFunctionDefault,
+  registerFunctionDefaultGenerator,
+  replaceStringSet,
   resetJsBaoDO,
+  resolveDefaultValue,
   schemaToToml,
   syncInferredMeta,
-  syncModelMeta
+  syncModelMeta,
+  uniqueIndexMapName,
+  writeField
 };

package/dist/codegen-v2.cjs

@@ -89,37 +89,76 @@ var init_yjsValues = __esm({
   }
 });
 
+// src/models/writeLifecycle.ts
+function registerFunctionDefaultGenerator(name, fn) {
+  FUNCTION_DEFAULT_GENERATORS.set(name, fn);
+}
+var Y2, import_ulid, KNOWN_FIELD_TYPE_MAP, KNOWN_FIELD_TYPES, FUNCTION_DEFAULT_GENERATORS;
+var init_writeLifecycle = __esm({
+  "src/models/writeLifecycle.ts"() {
+    "use strict";
+    Y2 = __toESM(require("yjs"), 1);
+    import_ulid = require("ulid");
+    KNOWN_FIELD_TYPE_MAP = {
+      string: true,
+      number: true,
+      boolean: true,
+      date: true,
+      id: true,
+      stringset: true
+    };
+    KNOWN_FIELD_TYPES = new Set(Object.keys(KNOWN_FIELD_TYPE_MAP));
+    FUNCTION_DEFAULT_GENERATORS = /* @__PURE__ */ new Map();
+    registerFunctionDefaultGenerator("generate_ulid", () => (0, import_ulid.ulid)());
+  }
+});
+
 // src/models/metaSync.ts
 function registerFunctionDefault(fn, name) {
   KNOWN_FUNCTION_DEFAULTS.set(fn, name);
 }
-var Y2, KNOWN_FUNCTION_DEFAULTS;
+var Y3, KNOWN_FUNCTION_DEFAULTS;
 var init_metaSync = __esm({
   "src/models/metaSync.ts"() {
     "use strict";
-    Y2 = __toESM(require("yjs"), 1);
+    Y3 = __toESM(require("yjs"), 1);
     init_yjsValues();
+    init_writeLifecycle();
     KNOWN_FUNCTION_DEFAULTS = /* @__PURE__ */ new WeakMap();
   }
 });
 
+// src/utils/uniqueIndex.ts
+function fieldUniqueConstraintName(modelName, fieldName) {
+  return `${modelName}_${fieldName}_unique`;
+}
+var Y4;
+var init_uniqueIndex = __esm({
+  "src/utils/uniqueIndex.ts"() {
+    "use strict";
+    Y4 = __toESM(require("yjs"), 1);
+  }
+});
+
 // src/models/BaseModel.ts
 function generateULID() {
-  return (0, import_ulid.ulid)();
+  return (0, import_ulid2.ulid)();
 }
-var Y3, import_ulid;
+var Y5, import_ulid2;
 var init_BaseModel = __esm({
   "src/models/BaseModel.ts"() {
     "use strict";
-    Y3 = __toESM(require("yjs"), 1);
-    import_ulid = require("ulid");
+    Y5 = __toESM(require("yjs"), 1);
+    import_ulid2 = require("ulid");
     init_StringSet();
     init_documentTypes();
     init_DocumentQueryTranslator();
     init_CursorManager();
     init_sql();
     init_metaSync();
+    init_writeLifecycle();
     init_yjsValues();
+    init_uniqueIndex();
     registerFunctionDefault(generateULID, "generate_ulid");
   }
 });
@@ -155,6 +194,7 @@ var import_smol_toml = require("smol-toml");
 // src/models/schema.ts
 init_BaseModel();
 init_ModelRegistry();
+init_uniqueIndex();
 function defineModelSchema(input) {
   const { name, fields } = input;
   const options = {
@@ -197,7 +237,7 @@ function resolveUniqueConstraints(modelName, fields, customConstraints) {
   for (const [fieldName, options] of fields.entries()) {
     if (options.unique) {
       resolved.push({
-        name: `${modelName}_${fieldName}_unique`,
+        name: fieldUniqueConstraintName(modelName, fieldName),
         fields: [fieldName]
       });
     }
@@ -616,14 +656,12 @@ function renderModelFile(input) {
   lines.push("");
   lines.push(`export class ${className} extends BaseModelImpl {}`);
   lines.push("");
-  lines.push(
-    `export const ${className}_modelName: "${escapeStringLiteral(modelName)}" = ${JSON.stringify(modelName)};`
-  );
+  lines.push(`export const ${className}_modelName = ${JSON.stringify(modelName)} as const;`);
   lines.push("");
   return lines.join("\n");
 }
 function renderBarrel(input) {
-  const { fingerprint, tomlFilename, entries } = input;
+  const { fingerprint, tomlImportPath, entries } = input;
   const lines = [];
   lines.push(HEADER_BANNER);
   lines.push(REGEN_INSTRUCTION);
@@ -644,7 +682,7 @@ function renderBarrel(input) {
   lines.push(
     `import { attachAndRegisterModel, loadSchemaFromTomlString } from "js-bao";`
   );
-  lines.push(`import modelsToml from "./${tomlFilename}?raw";`);
+  lines.push(`import modelsToml from ${JSON.stringify(`${tomlImportPath}?raw`)};`);
   for (const { className } of entries) {
     lines.push(`import { ${className} } from "./${className}.generated";`);
   }
@@ -697,11 +735,18 @@ function renderBarrel(input) {
   lines.push("");
   return lines.join("\n");
 }
-function escapeStringLiteral(s) {
-  return s.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
-}
 
 // src/cli/v2/generator.ts
+function computeSchemaImportSpecifier(outputDirAbs, inputTomlAbs, pathImpl = path) {
+  const relative2 = pathImpl.relative(outputDirAbs, inputTomlAbs);
+  if (pathImpl.isAbsolute(relative2)) {
+    throw new Error(
+      `Cannot build a relative import from the output directory ${outputDirAbs} to the schema ${inputTomlAbs} \u2014 they share no common root. Pass --schema-import <specifier> to name the runtime schema path explicitly.`
+    );
+  }
+  const posix = relative2.split(pathImpl.sep).join("/");
+  return posix.startsWith("./") || posix.startsWith("../") ? posix : `./${posix}`;
+}
 var GENERATED_FILE_SUFFIX = ".generated.ts";
 var BARREL_FILENAME = "index.ts";
 async function generate(options) {
@@ -733,7 +778,7 @@ async function generate(options) {
     modelName: s.name,
     className: classNamesByModelName[s.name]
   })).sort((a, b) => a.className.localeCompare(b.className));
-  const tomlFilename = path.basename(inputAbs);
+  const tomlImportPath = options.schemaImportPath !== void 0 && options.schemaImportPath.trim() !== "" ? options.schemaImportPath : computeSchemaImportSpecifier(outAbs, inputAbs);
   const filesToWrite = /* @__PURE__ */ new Map();
   for (const schema of schemas) {
     const className = classNamesByModelName[schema.name];
@@ -755,7 +800,7 @@ async function generate(options) {
     barrelPath,
     renderBarrel({
       fingerprint,
-      tomlFilename,
+      tomlImportPath,
       entries
     })
   );
@@ -1548,7 +1593,7 @@ var Logger2 = class _Logger {
 // package.json
 var package_default = {
   name: "js-bao",
-  version: "0.5.1",
+  version: "0.5.2",
   description: "A library providing data modeling capabilities which support live updates and queries.",
   types: "dist/index.d.ts",
   type: "module",
@@ -1604,6 +1649,7 @@ var package_default = {
     "jsbao-codegen-v2": "./dist/codegen-v2.cjs"
   },
   scripts: {
+    typecheck: "tsc --noEmit -p tsconfig.json",
     build: "pnpm build:cli && pnpm build:cli-v2 && pnpm codegen && rm -f dist/index.* dist/node.* dist/browser.* dist/cloudflare.* dist/cloudflare-do.* dist/client.* && pnpm build:main",
     "build:main": "pnpm build:browser && pnpm build:node && pnpm build:universal && pnpm build:cloudflare && pnpm build:cloudflare-do && pnpm build:client",
     "build:browser": "tsup src/browser.ts --format esm,cjs --dts --platform browser --external better-sqlite3 --external sql.js --external async-mutex --external ulid --external yjs --external fs --no-splitting",
@@ -1686,6 +1732,9 @@ var CodegenV2CLI = class {
     ).requiredOption("-i, --input <file>", "Path to models.toml").requiredOption(
       "-o, --output <dir>",
       "Output directory for *.generated.ts and index.ts"
+    ).option(
+      "--schema-import <specifier>",
+      "Import specifier for the schema in the generated barrel (default: path from --output to --input, e.g. ./models.toml)"
     ).option(
       "--check",
       "Exit non-zero if generated output would change (CI-friendly)",
@@ -1726,6 +1775,14 @@ var CodegenV2CLI = class {
     const outputAbs = path3.resolve(options.output);
     Logger2.verbose(`Input:  ${inputAbs}`, "js-bao-codegen-v2");
     Logger2.verbose(`Output: ${outputAbs}`, "js-bao-codegen-v2");
+    if (options.schemaImport !== void 0 && options.schemaImport.trim() === "") {
+      Logger2.error(
+        "--schema-import was empty. Pass a module specifier (e.g. @shared/models.toml), or omit the flag to import the schema relative to --output.",
+        "js-bao-codegen-v2"
+      );
+      process.exit(1);
+      return;
+    }
     let result;
     try {
       result = await generate({
@@ -1735,7 +1792,8 @@ var CodegenV2CLI = class {
         // commander turns `--no-strict` into `strict: false`; otherwise
         // `options.strict` is `true` by default (its negation-flag
         // behavior — see the option declaration above).
-        strict: options.strict !== false
+        strict: options.strict !== false,
+        schemaImportPath: options.schemaImport
       });
     } catch (err) {
       Logger2.error(String(err instanceof Error ? err.message : err), "js-bao-codegen-v2");

package/dist/codegen.cjs

@@ -1186,7 +1186,7 @@ var SchemaExtractor = class {
 // package.json
 var package_default = {
   name: "js-bao",
-  version: "0.5.1",
+  version: "0.5.2",
   description: "A library providing data modeling capabilities which support live updates and queries.",
   types: "dist/index.d.ts",
   type: "module",
@@ -1242,6 +1242,7 @@ var package_default = {
     "jsbao-codegen-v2": "./dist/codegen-v2.cjs"
   },
   scripts: {
+    typecheck: "tsc --noEmit -p tsconfig.json",
     build: "pnpm build:cli && pnpm build:cli-v2 && pnpm codegen && rm -f dist/index.* dist/node.* dist/browser.* dist/cloudflare.* dist/cloudflare-do.* dist/client.* && pnpm build:main",
     "build:main": "pnpm build:browser && pnpm build:node && pnpm build:universal && pnpm build:cloudflare && pnpm build:cloudflare-do && pnpm build:client",
     "build:browser": "tsup src/browser.ts --format esm,cjs --dts --platform browser --external better-sqlite3 --external sql.js --external async-mutex --external ulid --external yjs --external fs --no-splitting",