js-bao 0.4.0 → 0.4.1

package/dist/node.d.cts

@@ -40,6 +40,13 @@ interface UniqueConstraintConfig {
 }
 interface ModelOptions {
     name: string;
+    /**
+     * Optional PascalCase class name. Used by the v2 codegen to drive
+     * generated TypeScript class names (and relationship method names that
+     * derive from a target's class name). When absent, the v2 codegen
+     * falls back to suffix-based singularization of `name`.
+     */
+    className?: string;
     uniqueConstraints?: UniqueConstraintConfig[];
     relationships?: Record<string, RelationshipConfig>;
 }
@@ -974,15 +981,27 @@ declare function schemaToToml(schema: DiscoveredSchema): string;
  *  - Compound unique constraints are [[models.*.unique_constraints]]
  */
 
+interface LoadSchemaOptions {
+    /**
+     * When true (default), throw on unknown keys at the model, field,
+     * relationship, and unique-constraint level. When false, unknown
+     * keys are silently ignored (legacy behavior).
+     */
+    strict?: boolean;
+}
 /**
  * Parse a TOML string and return an array of DefinedModelSchema objects.
+ *
+ * By default operates in strict mode: unknown keys at the model, field,
+ * relationship, or unique-constraint level cause an error. Pass
+ * `{ strict: false }` to silently ignore unknown keys (legacy behavior).
  */
-declare function loadSchemaFromTomlString(tomlString: string): DefinedModelSchema[];
+declare function loadSchemaFromTomlString(tomlString: string, options?: LoadSchemaOptions): DefinedModelSchema[];
 /**
  * Read a TOML file from disk and return an array of DefinedModelSchema objects.
  * Only available in Node.js environments.
  */
-declare function loadSchemaFromToml(filePath: string): Promise<DefinedModelSchema[]>;
+declare function loadSchemaFromToml(filePath: string, options?: LoadSchemaOptions): Promise<DefinedModelSchema[]>;
 
 /**
  * Meta Sync — writes _meta_* YMaps into a YDoc.

package/dist/node.d.ts

@@ -40,6 +40,13 @@ interface UniqueConstraintConfig {
 }
 interface ModelOptions {
     name: string;
+    /**
+     * Optional PascalCase class name. Used by the v2 codegen to drive
+     * generated TypeScript class names (and relationship method names that
+     * derive from a target's class name). When absent, the v2 codegen
+     * falls back to suffix-based singularization of `name`.
+     */
+    className?: string;
     uniqueConstraints?: UniqueConstraintConfig[];
     relationships?: Record<string, RelationshipConfig>;
 }
@@ -974,15 +981,27 @@ declare function schemaToToml(schema: DiscoveredSchema): string;
  *  - Compound unique constraints are [[models.*.unique_constraints]]
  */
 
+interface LoadSchemaOptions {
+    /**
+     * When true (default), throw on unknown keys at the model, field,
+     * relationship, and unique-constraint level. When false, unknown
+     * keys are silently ignored (legacy behavior).
+     */
+    strict?: boolean;
+}
 /**
  * Parse a TOML string and return an array of DefinedModelSchema objects.
+ *
+ * By default operates in strict mode: unknown keys at the model, field,
+ * relationship, or unique-constraint level cause an error. Pass
+ * `{ strict: false }` to silently ignore unknown keys (legacy behavior).
  */
-declare function loadSchemaFromTomlString(tomlString: string): DefinedModelSchema[];
+declare function loadSchemaFromTomlString(tomlString: string, options?: LoadSchemaOptions): DefinedModelSchema[];
 /**
  * Read a TOML file from disk and return an array of DefinedModelSchema objects.
  * Only available in Node.js environments.
  */
-declare function loadSchemaFromToml(filePath: string): Promise<DefinedModelSchema[]>;
+declare function loadSchemaFromToml(filePath: string, options?: LoadSchemaOptions): Promise<DefinedModelSchema[]>;
 
 /**
  * Meta Sync — writes _meta_* YMaps into a YDoc.

package/dist/node.js

@@ -6902,6 +6902,7 @@ function defineModelSchema(input) {
   const { name, fields } = input;
   const options = {
     name,
+    className: input.options?.className,
     uniqueConstraints: input.options?.uniqueConstraints ? [...input.options.uniqueConstraints] : void 0,
     relationships: input.options?.relationships
   };
@@ -7001,18 +7002,13 @@ function resolveUniqueConstraints(modelName, fields, customConstraints) {
 function attachSchemaToClass(modelClass, schema) {
   modelClass.schema = schema;
   modelClass.modelName = schema.options.name;
-  if (!modelClass.getSchema) {
-    Object.defineProperty(modelClass, "getSchema", {
-      value: function() {
-        return schema.buildRuntimeShape(modelClass);
-      },
-      writable: false
-    });
-  } else {
-    modelClass.getSchema = function() {
+  Object.defineProperty(modelClass, "getSchema", {
+    value: function() {
       return schema.buildRuntimeShape(modelClass);
-    };
-  }
+    },
+    writable: false,
+    configurable: true
+  });
   const runtimeShape = schema.buildRuntimeShape(modelClass);
   BaseModel2.attachFieldAccessors(modelClass, runtimeShape.fields);
   return runtimeShape;
@@ -7245,12 +7241,52 @@ var VALID_FIELD_TYPES = /* @__PURE__ */ new Set([
   "id",
   "stringset"
 ]);
-function parseFieldOptions(raw) {
+var KNOWN_FIELD_KEYS = /* @__PURE__ */ new Set([
+  "type",
+  "indexed",
+  "unique",
+  "required",
+  "auto_assign",
+  "max_length",
+  "max_count",
+  "default"
+]);
+var KNOWN_MODEL_KEYS = /* @__PURE__ */ new Set([
+  "fields",
+  "relationships",
+  "unique_constraints",
+  "class_name"
+]);
+var KNOWN_RELATIONSHIP_KEYS = /* @__PURE__ */ new Set([
+  "type",
+  "model",
+  "related_id_field",
+  "join_model",
+  "join_model_local_field",
+  "join_model_related_field",
+  "order_by_field",
+  "order_direction",
+  "join_model_order_by_field",
+  "join_model_order_direction"
+]);
+var KNOWN_UNIQUE_CONSTRAINT_KEYS = /* @__PURE__ */ new Set(["name", "fields"]);
+function checkUnknownKeys(raw, known, context, strict) {
+  if (!strict) return;
+  for (const key of Object.keys(raw)) {
+    if (!known.has(key)) {
+      throw new Error(
+        `${context}: unknown key "${key}". Allowed: ${[...known].join(", ")}`
+      );
+    }
+  }
+}
+function parseFieldOptions(raw, context, strict) {
   if (!raw.type || !VALID_FIELD_TYPES.has(raw.type)) {
     throw new Error(
       `Invalid field type "${raw.type}". Must be one of: ${[...VALID_FIELD_TYPES].join(", ")}`
     );
   }
+  checkUnknownKeys(raw, KNOWN_FIELD_KEYS, context, strict);
   const opts = { type: raw.type };
   if (raw.indexed === true) opts.indexed = true;
   if (raw.unique === true) opts.unique = true;
@@ -7266,8 +7302,9 @@ function requireField(raw, field, context) {
     throw new Error(`Relationship ${context}: missing required field "${field}"`);
   }
 }
-function parseRelationship(raw) {
+function parseRelationship(raw, context, strict) {
   const type = raw.type;
+  checkUnknownKeys(raw, KNOWN_RELATIONSHIP_KEYS, context, strict);
   if (type === "refersTo") {
     requireField(raw, "model", "refersTo");
     requireField(raw, "related_id_field", "refersTo");
@@ -7309,7 +7346,8 @@ function parseRelationship(raw) {
   }
   throw new Error(`Unknown relationship type: ${type}`);
 }
-function loadSchemaFromTomlString(tomlString) {
+function loadSchemaFromTomlString(tomlString, options = {}) {
+  const strict = options.strict !== false;
   const parsed = parseToml(tomlString);
   const models = parsed.models;
   if (!models || typeof models !== "object") {
@@ -7317,10 +7355,20 @@ function loadSchemaFromTomlString(tomlString) {
   }
   const schemas = [];
   for (const [modelName, modelDef] of Object.entries(models)) {
+    checkUnknownKeys(
+      modelDef,
+      KNOWN_MODEL_KEYS,
+      `[models.${modelName}]`,
+      strict
+    );
     const fields = {};
     if (modelDef.fields) {
       for (const [fieldName, fieldDef] of Object.entries(modelDef.fields)) {
-        fields[fieldName] = parseFieldOptions(fieldDef);
+        fields[fieldName] = parseFieldOptions(
+          fieldDef,
+          `[models.${modelName}.fields.${fieldName}]`,
+          strict
+        );
       }
     }
     let relationships;
@@ -7329,24 +7377,36 @@ function loadSchemaFromTomlString(tomlString) {
       for (const [relName, relDef] of Object.entries(
         modelDef.relationships
       )) {
-        relationships[relName] = parseRelationship(relDef);
+        relationships[relName] = parseRelationship(
+          relDef,
+          `[models.${modelName}.relationships.${relName}]`,
+          strict
+        );
       }
     }
     let uniqueConstraints;
     if (modelDef.unique_constraints) {
       uniqueConstraints = [];
       for (const raw of modelDef.unique_constraints) {
+        checkUnknownKeys(
+          raw,
+          KNOWN_UNIQUE_CONSTRAINT_KEYS,
+          `[[models.${modelName}.unique_constraints]]`,
+          strict
+        );
         uniqueConstraints.push({
           name: raw.name,
           fields: [...raw.fields]
         });
       }
     }
+    const className = typeof modelDef.class_name === "string" ? modelDef.class_name : void 0;
     schemas.push(
       defineModelSchema({
         name: modelName,
         fields,
         options: {
+          className,
           uniqueConstraints,
           relationships
         }
@@ -7355,10 +7415,10 @@ function loadSchemaFromTomlString(tomlString) {
   }
   return schemas;
 }
-async function loadSchemaFromToml(filePath) {
+async function loadSchemaFromToml(filePath, options = {}) {
   const { readFile } = await import("fs/promises");
   const content = await readFile(filePath, "utf-8");
-  return loadSchemaFromTomlString(content);
+  return loadSchemaFromTomlString(content, options);
 }
 
 // src/node.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-bao",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "A library providing data modeling capabilities which support live updates and queries.",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -51,10 +51,12 @@
   },
   "bin": {
     "js-bao-codegen": "./dist/codegen.cjs",
-    "jsbao-codegen": "./dist/codegen.cjs"
+    "jsbao-codegen": "./dist/codegen.cjs",
+    "js-bao-codegen-v2": "./dist/codegen-v2.cjs",
+    "jsbao-codegen-v2": "./dist/codegen-v2.cjs"
   },
   "scripts": {
-    "build": "pnpm build:cli && pnpm codegen && rm -f dist/index.* dist/node.* dist/browser.* dist/cloudflare.* dist/cloudflare-do.* dist/client.* && pnpm build:main",
+    "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",
     "build:node": "tsup src/node.ts --format esm,cjs --dts --platform node --external better-sqlite3 --external sql.js --external async-mutex --external ulid --external yjs --no-splitting",
@@ -63,6 +65,7 @@
     "build:cloudflare-do": "tsup src/cloudflare-do.ts --format esm,cjs --dts --platform neutral --external better-sqlite3 --external sql.js --external async-mutex --external ulid --external yjs --external fs --no-splitting",
     "build:client": "tsup src/client.ts --format esm,cjs --dts --platform browser --external better-sqlite3 --external sql.js --external async-mutex --external ulid --external yjs --external fs --no-splitting",
     "build:cli": "tsup src/cli/codegen.ts --format cjs --dts --platform node --target node18 --external commander --external typescript --external fs --external path --external util --no-splitting",
+    "build:cli-v2": "tsup src/cli/codegen-v2.ts --format cjs --dts --platform node --target node18 --external commander --external typescript --external fs --external path --external util --no-splitting",
     "dev": "pnpm build:cli && concurrently \"pnpm codegen:watch\" \"pnpm dev:main\"",
     "dev:main": "concurrently \"pnpm build:browser:dev --watch\" \"pnpm build:node:dev --watch\" \"pnpm build:universal:dev --watch\"",
     "dev:simple": "pnpm build:cli && pnpm codegen && pnpm build:main --watch",
@@ -116,11 +119,5 @@
     "workers"
   ],
   "author": "Primitive LLC",
-  "license": "UNLICENSED",
-  "pnpm": {
-    "onlyBuiltDependencies": [
-      "better-sqlite3",
-      "esbuild"
-    ]
-  }
+  "license": "UNLICENSED"
 }