rajt 0.0.26 → 0.0.27

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rajt",
   "description": "A serverless bundler layer, fully typed for AWS Lambda (Node.js and LLRT) and Cloudflare Workers.",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

package/src/dynamodb/repository.ts

@@ -1,21 +1,27 @@
-import { ZodTypeAny } from 'zod'
+import { z, ZodTypeAny } from 'zod'
 import { Dynamodb } from './client'
 import { Schema } from './schema'
 import { _model } from './decorators'
 import type { ModelOpts } from './types'
 
-export function Repository<M extends object, S extends ZodTypeAny>(
+export function Repository<
+  S extends ZodTypeAny,
+  B extends new (...args: any[]) => any
+>(
   schema: S,
-  model: new (...args: any[]) => M,
+  base?: B | ModelOpts,
   opts?: ModelOpts
 ) {
-  const BaseSchemaClass = Schema(schema, model)
-  _model(BaseSchemaClass, opts)
+  const isClass = typeof base === 'function'
+  type M = z.infer<S>
 
-  return class extends BaseSchemaClass {
-    static model = Dynamodb.model<M>(BaseSchemaClass as unknown as new (...args: any[]) => M)
-  } as unknown as (typeof BaseSchemaClass) & {
+  const Repo = Schema(schema, isClass ? base : undefined)
+  _model(Repo, isClass ? opts : base)
+
+  return class extends Repo {
+    static model = Dynamodb.model<M>(Repo as any)
+  } as unknown as (typeof Repo) & {
+    new (...args: any[]): InstanceType<typeof Repo>
     model: ReturnType<typeof Dynamodb.model<M>>
-    new (...args: any[]): InstanceType<typeof BaseSchemaClass>
   }
 }