contentbase 0.4.3 → 0.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentbase",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "repository": "https://github.com/soederpop/contentbase",
   "website": "https://contentbase.soederpop.com",
   "type": "module",
@@ -21,7 +21,7 @@
     "release": "./scripts/release.sh"
   },
   "dependencies": {
-    "luca": ">= 3.0.2",
+    "luca": ">= 3.3.0",
     "gray-matter": "^4.0.3",
     "js-yaml": "^4.1.0",
     "mdast-util-gfm": "^3.1.0",

package/src/collection.ts

@@ -7,6 +7,8 @@ import { createModelInstance } from "./model-instance";
 import { pluralize } from "./utils/inflect";
 import { Base } from "./base-model";
 import { NodeStorageAdapter } from "./adapters/node-fs";
+import { defineModel, type DefineModelConfig } from "./define-model";
+import type { z } from "zod";
 import type {
   ModelDefinition,
   CollectionItem,
@@ -14,6 +16,7 @@ import type {
   InferModelInstance,
   HasManyDefinition,
   RelationshipDefinition,
+  SectionDefinition,
   StorageAdapter,
 } from "./types";
 
@@ -147,6 +150,34 @@ export class Collection {
     return this;
   }
 
+  /**
+   * Define a model and register it with this collection in one call.
+   * Returns the ModelDefinition (with full type inference), not the collection.
+   */
+  defineModel<
+    TName extends string,
+    TMeta extends z.ZodType = z.ZodObject<{}, z.core.$loose>,
+    TSections extends Record<string, SectionDefinition<any>> = Record<
+      string,
+      never
+    >,
+    TRelationships extends Record<
+      string,
+      RelationshipDefinition<any>
+    > = Record<string, never>,
+    TComputed extends Record<string, (self: any) => any> = Record<
+      string,
+      never
+    >,
+  >(
+    name: TName,
+    config?: DefineModelConfig<TMeta, TSections, TRelationships, TComputed>
+  ): ModelDefinition<TName, TMeta, TSections, TRelationships, TComputed> {
+    const definition = defineModel(name, config);
+    this.register(definition);
+    return definition;
+  }
+
   /** Get a model definition by name */
   getModelDefinition(
     name: string