js-bao 0.5.0 → 0.5.2

package/dist/codegen-v2.cjs

@@ -80,35 +80,85 @@ 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/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 Y, KNOWN_FUNCTION_DEFAULTS;
+var Y3, KNOWN_FUNCTION_DEFAULTS;
 var init_metaSync = __esm({
   "src/models/metaSync.ts"() {
     "use strict";
-    Y = __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 Y2, import_ulid;
+var Y5, import_ulid2;
 var init_BaseModel = __esm({
   "src/models/BaseModel.ts"() {
     "use strict";
-    Y2 = __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");
   }
 });
@@ -144,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 = {
@@ -186,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]
       });
     }
@@ -231,10 +282,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 +330,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 +561,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,7 +620,7 @@ 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 tsType = tsTypeForFieldOptions(opts);
     const isRequired = opts.required === true || opts.autoAssign === true && fieldName === "id";
     const optional = isRequired ? "" : "?";
     lines.push(`  ${fieldName}${optional}: ${tsType};`);
@@ -568,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);
@@ -596,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";`);
   }
@@ -649,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) {
@@ -685,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];
@@ -707,7 +800,7 @@ async function generate(options) {
     barrelPath,
     renderBarrel({
       fingerprint,
-      tomlFilename,
+      tomlImportPath,
       entries
     })
   );
@@ -804,6 +897,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",
@@ -844,11 +938,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)}`);
       }
@@ -1108,6 +1208,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;
@@ -1488,7 +1593,7 @@ var Logger2 = class _Logger {
 // package.json
 var package_default = {
   name: "js-bao",
-  version: "0.5.0",
+  version: "0.5.2",
   description: "A library providing data modeling capabilities which support live updates and queries.",
   types: "dist/index.d.ts",
   type: "module",
@@ -1544,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",
@@ -1626,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)",
@@ -1666,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({
@@ -1675,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

@@ -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.5.0",
+  version: "0.5.2",
   description: "A library providing data modeling capabilities which support live updates and queries.",
   types: "dist/index.d.ts",
   type: "module",
@@ -1237,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",