@rakun-kit/core 1.1.1 → 1.3.0

package/dist/esm/lib/fields/List.d.ts

@@ -1,40 +1,11 @@
-import z from "zod";
-import type { EncodedField } from "./Field.js";
-import { Field } from "./Field.js";
-import type { FieldHKT, getRequiredType } from "../types/index.js";
-export type Entry = {
-    name: string;
-    field: Field<any, any, any, any, any, any>;
+import { type AnyFieldLike, type DefaultFieldState, type EncodedField, type EncodedFieldUnknown, type FieldLike, type FieldState, type FieldWithModifiers, type InferDb, type InferOutput } from "./Field";
+export type Entry<Name extends string = string, F extends AnyFieldLike = AnyFieldLike> = {
+    name: Name;
+    field: F;
 };
-export interface ListFieldHKT<F extends Entry[], S extends z.ZodArray<z.ZodObject<{
-    name: z.ZodString;
-    value: z.ZodUnion<readonly [ReturnType<F[number]["field"]["getSchema"]>]>;
-}, z.core.$strip>>, Sout extends z.ZodArray<z.ZodObject<{
-    name: z.ZodString;
-    value: z.ZodUnion<readonly [ReturnType<F[number]["field"]["getOutputSchema"]>]>;
-}, z.core.$strip>>> extends FieldHKT {
-    type: ListField<F, S, Sout, this["args"][1], this["args"][2], this["args"][3]>;
-}
-export declare class ListField<F extends Entry[] = [], S extends z.ZodArray<z.ZodObject<{
-    name: z.ZodString;
-    value: z.ZodUnion<readonly [ReturnType<F[number]["field"]["getSchema"]>]>;
-}, z.core.$strip>> = z.ZodArray<z.ZodObject<{
-    name: z.ZodString;
-    value: z.ZodUnion<readonly [ReturnType<F[number]["field"]["getSchema"]>]>;
-}, z.core.$strip>>, Sout extends z.ZodArray<z.ZodObject<{
-    name: z.ZodString;
-    value: z.ZodUnion<readonly [ReturnType<F[number]["field"]["getOutputSchema"]>]>;
-}, z.core.$strip>> = z.ZodArray<z.ZodObject<{
-    name: z.ZodString;
-    value: z.ZodUnion<readonly [ReturnType<F[number]["field"]["getOutputSchema"]>]>;
-}, z.core.$strip>>, TRequired extends boolean = false, TTranslatable extends boolean = false, TVisibility extends "api" | "manager" | "all" = "all", THKT extends FieldHKT = ListFieldHKT<F, S, Sout>> extends Field<THKT, S, Sout, TRequired, TTranslatable, TVisibility> {
-    fields: F;
-    constructor(fields: F);
-    protected getBaseOutputSchema(): getRequiredType<Sout, TRequired>;
-}
 export type EncodedListFieldItem = {
     name: string;
-    field: EncodedField;
+    field: EncodedFieldUnknown;
 };
 export type EncodedListField = EncodedField & {
     fields: EncodedListFieldItem[];
@@ -43,4 +14,33 @@ export type ListFieldValueItem<S> = {
     name: string;
     value: S;
 };
+type ListInputValue<Entries extends readonly Entry[]> = Array<{
+    name: Entries[number]["name"];
+    value: InferDb<Entries[number]["field"]>;
+}>;
+type ListOutputValue<Entries extends readonly Entry[]> = Array<{
+    name: Entries[number]["name"];
+    value: InferOutput<Entries[number]["field"]>;
+}>;
+export type ListMeta<Entries extends readonly Entry[] = readonly Entry[]> = {
+    type: "List";
+    ui: "List" | "Iterator";
+    fields: {
+        [K in keyof Entries]: Entries[K] extends Entry<infer Name, infer F> ? {
+            name: Name;
+            field: F["meta"];
+        } : never;
+    };
+};
+type ListOptions<Entries extends readonly Entry[]> = {
+    fields: Entries;
+    ui: "List" | "Iterator";
+};
+export type ListField<Entries extends readonly Entry[] = readonly Entry[], State extends FieldState = DefaultFieldState> = FieldWithModifiers<ListFieldCore<Entries, State>>;
+type ListFieldCore<Entries extends readonly Entry[], State extends FieldState> = FieldLike<ListInputValue<Entries>, ListInputValue<Entries>, ListOutputValue<Entries>, ListMeta<Entries>, State> & {
+    fields: Entries;
+};
+export declare function listField<const Entries extends readonly Entry[]>(fields: Entries): ListField<Entries>;
+export declare function makeListField<Entries extends readonly Entry[], State extends FieldState>(options: ListOptions<Entries>, state: State): ListField<Entries, State>;
+export {};
 //# sourceMappingURL=List.d.ts.map

package/dist/esm/lib/fields/List.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"List.d.ts","sourceRoot":"","sources":["../../../../src/lib/fields/List.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"List.d.ts","sourceRoot":"","sources":["../../../../src/lib/fields/List.ts"],"names":[],"mappings":"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"}

package/dist/esm/lib/fields/List.js

@@ -1,21 +1,52 @@
 import z from "zod";
-import { Field } from "./Field.js";
-export class ListField extends Field {
-    constructor(fields) {
-        super({
-            config: { ui: "List", type: "List" },
-            schema: z.array(z.object({
-                name: z.string(),
-                value: z.union(fields.map((f) => f.field.getSchema())),
+import { createField, defaultFieldState, withFieldModifiers, } from "./Field";
+export function listField(fields) {
+    return makeListField({ fields, ui: "List" }, defaultFieldState);
+}
+export function makeListField(options, state) {
+    const field = createField({
+        meta: {
+            type: "List",
+            ui: options.ui,
+            fields: options.fields.map((entry) => ({
+                name: entry.name,
+                field: entry.field.meta,
             })),
-        });
-        this.fields = fields;
+        },
+        state,
+        schemas: {
+            input: () => buildListDbSchema(options.fields),
+            db: () => buildListDbSchema(options.fields),
+            output: () => buildListOutputSchema(options.fields),
+        },
+    });
+    field.fields = options.fields;
+    return withFieldModifiers({
+        field,
+        rebuild: (nextState) => makeListField(options, nextState),
+    });
+}
+function buildListDbSchema(fields) {
+    const valueSchemas = fields.map((entry) => entry.field.getSchema());
+    return z.array(z.object({
+        name: z.string(),
+        value: unionSchemas(valueSchemas),
+    }));
+}
+function buildListOutputSchema(fields) {
+    const valueSchemas = fields.map((entry) => entry.field.getOutputSchema());
+    return z.array(z.object({
+        name: z.string(),
+        value: unionSchemas(valueSchemas),
+    }));
+}
+function unionSchemas(schemas) {
+    if (schemas.length === 0) {
+        return z.never();
     }
-    getBaseOutputSchema() {
-        return z.array(z.object({
-            name: z.string(),
-            value: z.union(this.fields.map((f) => f.field.getOutputSchema())),
-        }));
+    if (schemas.length === 1) {
+        return schemas[0];
     }
+    return z.union(schemas);
 }
 //# sourceMappingURL=List.js.map

package/dist/esm/lib/fields/List.js.map

@@ -1 +1 @@
-{"version":3,"file":"List.js","sourceRoot":"","sources":["../../../../src/lib/fields/List.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAGpB,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AA2ChC,MAAM,OAAO,SAgDX,SAAQ,KAA2D;IAGnE,YAAY,MAAS;QACnB,KAAK,CAAC;YACJ,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE;YACpC,MAAM,EAAE,CAAC,CAAC,KAAK,CACb,CAAC,CAAC,MAAM,CAAC;gBACP,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;gBAChB,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;aACvD,CAAC,CACa;SAClB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAEkB,mBAAmB;QACpC,OAAO,CAAC,CAAC,KAAK,CACZ,CAAC,CAAC,MAAM,CAAC;YACP,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;YAChB,KAAK,EAAE,CAAC,CAAC,KAAK,CACZ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,EAAE,CAE/C,CACF;SACF,CAAC,CAC4C,CAAC;IACnD,CAAC;CACF"}
+{"version":3,"file":"List.js","sourceRoot":"","sources":["../../../../src/lib/fields/List.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,OAAO,EACL,WAAW,EACX,iBAAiB,EAWjB,kBAAkB,GACnB,MAAM,SAAS,CAAC;AAmEjB,MAAM,UAAU,SAAS,CACvB,MAAe;IAEf,OAAO,aAAa,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,iBAAiB,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,aAAa,CAG3B,OAA6B,EAAE,KAAY;IAC3C,MAAM,KAAK,GAAkC,WAAW,CAAC;QACvD,IAAI,EAAE;YACJ,IAAI,EAAE,MAAM;YACZ,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACrC,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI;aACxB,CAAC,CAAgC;SACnC;QACD,KAAK;QACL,OAAO,EAAE;YACP,KAAK,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC;YAC9C,EAAE,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC;YAC3C,MAAM,EAAE,GAAG,EAAE,CAAC,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC;SACpD;KACF,CAAkC,CAAC;IAEpC,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAE9B,OAAO,kBAAkB,CAAC;QACxB,KAAK;QACL,OAAO,EAAE,CAA+B,SAAoB,EAAE,EAAE,CAC9D,aAAa,CAAC,OAAO,EAAE,SAAS,CAG/B;KACJ,CAAC,CAAC;AACL,CAAC;AAED,SAAS,iBAAiB,CAAmC,MAAe;IAC1E,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACxC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,CACxB,CAAC;IAEF,OAAO,CAAC,CAAC,KAAK,CACZ,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC;KAClC,CAAC,CACmC,CAAC;AAC1C,CAAC;AAED,SAAS,qBAAqB,CAC5B,MAAe;IAEf,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC;IAE1E,OAAO,CAAC,CAAC,KAAK,CACZ,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC;KAClC,CAAC,CACoC,CAAC;AAC3C,CAAC;AAED,SAAS,YAAY,CAAC,OAAuB;IAC3C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;IACnB,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,CAAC,KAAK,CAAC,OAA0D,CAAC,CAAC;AAC7E,CAAC"}

package/dist/esm/lib/fields/Number.d.ts

@@ -1,20 +1,20 @@
-import z from "zod";
-import type { EncodedField } from "./Field.js";
-import { Field } from "./Field.js";
-import type { FieldHKT } from "../types/index.js";
-interface NumberFieldHKT extends FieldHKT {
-    type: NumberField<this["args"][1], this["args"][2], this["args"][3]>;
-}
-export declare class NumberField<TRequired extends boolean = false, TTranslatable extends boolean = false, TVisibility extends "api" | "manager" | "all" = "all"> extends Field<NumberFieldHKT, z.ZodNumber, z.ZodNumber, TRequired, TTranslatable, TVisibility> {
+import { type EncodedField, type DefaultFieldState, type FieldLike, type FieldState, type FieldStateOf, type FieldWithModifiers } from "./Field";
+export type NumberMeta = {
+    type: "Number";
+    ui: "Number";
     minValue?: number;
     maxValue?: number;
-    constructor();
-    min(value: number, message?: string): this;
-    max(value: number, message?: string): this;
-}
+};
 export type EncodedNumberField = EncodedField & {
     minValue?: number;
     maxValue?: number;
 };
+export type NumberField<State extends FieldState = DefaultFieldState> = FieldWithModifiers<NumberFieldCore<State>>;
+type NumberFieldCore<State extends FieldState> = NumberFieldBase<State> & {
+    min: <TThis extends NumberFieldBase<FieldState>>(this: TThis, value: number, message?: string) => NumberField<FieldStateOf<TThis>>;
+    max: <TThis extends NumberFieldBase<FieldState>>(this: TThis, value: number, message?: string) => NumberField<FieldStateOf<TThis>>;
+};
+type NumberFieldBase<State extends FieldState> = FieldLike<number, number, number, NumberMeta, State>;
+export declare function numberField(): NumberField;
 export {};
 //# sourceMappingURL=Number.d.ts.map

package/dist/esm/lib/fields/Number.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Number.d.ts","sourceRoot":"","sources":["../../../../src/lib/fields/Number.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzC,UAAU,cAAe,SAAQ,QAAQ;IACvC,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACtE;AAED,qBAAa,WAAW,CACtB,SAAS,SAAS,OAAO,GAAG,KAAK,EACjC,aAAa,SAAS,OAAO,GAAG,KAAK,EACrC,WAAW,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,KAAK,CACrD,SAAQ,KAAK,CACb,cAAc,EACd,CAAC,CAAC,SAAS,EACX,CAAC,CAAC,SAAS,EACX,SAAS,EACT,aAAa,EACb,WAAW,CACZ;IACC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;;IAQlB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAMnC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;CAKpC;AAED,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC"}
+{"version":3,"file":"Number.d.ts","sourceRoot":"","sources":["../../../../src/lib/fields/Number.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,YAAY,EAEjB,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACd,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,kBAAkB,EAGxB,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,QAAQ,CAAC;IACf,EAAE,EAAE,QAAQ,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AASF,MAAM,MAAM,WAAW,CACrB,KAAK,SAAS,UAAU,GAAG,iBAAiB,IAC1C,kBAAkB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;AAE/C,KAAK,eAAe,CAAC,KAAK,SAAS,UAAU,IAAI,eAAe,CAAC,KAAK,CAAC,GAAG;IACxE,GAAG,EAAE,CAAC,KAAK,SAAS,eAAe,CAAC,UAAU,CAAC,EAC7C,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,MAAM,KACb,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;IACtC,GAAG,EAAE,CAAC,KAAK,SAAS,eAAe,CAAC,UAAU,CAAC,EAC7C,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,MAAM,KACb,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;CACvC,CAAC;AAEF,KAAK,eAAe,CAAC,KAAK,SAAS,UAAU,IAAI,SAAS,CACxD,MAAM,EACN,MAAM,EACN,MAAM,EACN,UAAU,EACV,KAAK,CACN,CAAC;AAEF,wBAAgB,WAAW,IAAI,WAAW,CAEzC"}

package/dist/esm/lib/fields/Number.js

@@ -1,21 +1,40 @@
 import z from "zod";
-import { Field } from "./Field.js";
-export class NumberField extends Field {
-    constructor() {
-        super({
-            config: { ui: "Number", type: "Number" },
-            schema: z.number(),
-        });
-    }
-    min(value, message) {
-        this.minValue = value;
-        this.schema = this.schema.min(value, message);
-        return this;
+import { createField, defaultFieldState, sameSchemas, withFieldModifiers, } from "./Field";
+export function numberField() {
+    return makeNumberField({}, defaultFieldState);
+}
+function makeNumberField(options, state) {
+    const field = {
+        ...createField({
+            meta: {
+                type: "Number",
+                ui: "Number",
+                minValue: options.minValue,
+                maxValue: options.maxValue,
+            },
+            state,
+            schemas: sameSchemas(() => buildNumberSchema(options)),
+        }),
+        min: function (value, message) {
+            return makeNumberField({ ...options, minValue: value, minMessage: message }, this.state);
+        },
+        max: function (value, message) {
+            return makeNumberField({ ...options, maxValue: value, maxMessage: message }, this.state);
+        },
+    };
+    return withFieldModifiers({
+        field,
+        rebuild: (nextState) => makeNumberField(options, nextState),
+    });
+}
+function buildNumberSchema(options) {
+    let schema = z.number();
+    if (options.minValue !== undefined) {
+        schema = schema.min(options.minValue, options.minMessage);
     }
-    max(value, message) {
-        this.maxValue = value;
-        this.schema = this.schema.max(value, message);
-        return this;
+    if (options.maxValue !== undefined) {
+        schema = schema.max(options.maxValue, options.maxMessage);
     }
+    return schema;
 }
 //# sourceMappingURL=Number.js.map

package/dist/esm/lib/fields/Number.js.map

@@ -1 +1 @@
-{"version":3,"file":"Number.js","sourceRoot":"","sources":["../../../../src/lib/fields/Number.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAGpB,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAOhC,MAAM,OAAO,WAIX,SAAQ,KAOT;IAGC;QACE,KAAK,CAAC;YACJ,MAAM,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;SACnB,CAAC,CAAC;IACL,CAAC;IAED,GAAG,CAAC,KAAa,EAAE,OAAgB;QACjC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,GAAG,CAAC,KAAa,EAAE,OAAgB;QACjC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
+{"version":3,"file":"Number.js","sourceRoot":"","sources":["../../../../src/lib/fields/Number.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,WAAW,EAOX,kBAAkB,GACnB,MAAM,SAAS,CAAC;AA8CjB,MAAM,UAAU,WAAW;IACzB,OAAO,eAAe,CAAC,EAAE,EAAE,iBAAiB,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,eAAe,CACtB,OAAsB,EACtB,KAAY;IAEZ,MAAM,KAAK,GAA2B;QACpC,GAAG,WAAW,CAAC;YACb,IAAI,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,EAAE,EAAE,QAAQ;gBACZ,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;aAC3B;YACD,KAAK;YACL,OAAO,EAAE,WAAW,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;SACvD,CAAC;QACF,GAAG,EAAE,UAEH,KAAa,EACb,OAAgB;YAEhB,OAAO,eAAe,CACpB,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,EACpD,IAAI,CAAC,KAA4B,CAClC,CAAC;QACJ,CAAC;QACD,GAAG,EAAE,UAEH,KAAa,EACb,OAAgB;YAEhB,OAAO,eAAe,CACpB,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,EACpD,IAAI,CAAC,KAA4B,CAClC,CAAC;QACJ,CAAC;KACF,CAAC;IAEF,OAAO,kBAAkB,CAAC;QACxB,KAAK;QACL,OAAO,EAAE,CAA+B,SAAoB,EAAE,EAAE,CAC9D,eAAe,CAAC,OAAO,EAAE,SAAS,CAGjC;KACJ,CAAC,CAAC;AACL,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAsB;IAC/C,IAAI,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;IAExB,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QACnC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QACnC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/esm/lib/fields/Relation.d.ts

@@ -1,48 +1,54 @@
 import z from "zod";
-import type { EncodedField } from "./Field.js";
-import { Field } from "./Field.js";
-import { SimpleListField } from "./SimpleList.js";
-import type ContentType from "../ContentType.js";
-import type { FieldHKT, If, getInputTypeWithModifiers, getTypeWithModifiers, getOutputTypeWithModifiers } from "../types/index.js";
-import type { EncodedContentType } from "../ContentType.js";
+import { type EncodedField, type DefaultFieldState, type FieldLike, type FieldState, type FieldStateOf, type FieldWithModifiers, type PopulatableFieldLike, type SetRequired } from "./Field";
+import type { EncodedContentType } from "../ContentType";
+import { type SimpleListField } from "./SimpleList";
 export type OnlyType = "existing" | "new" | undefined;
-type isNew<X extends OnlyType> = X extends "new" ? true : false;
-interface RelationFieldHKT<CT extends ContentType, X extends OnlyType, S extends ReturnType<CT["getInputSchema"]>, Sout extends ReturnType<CT["getOutputSchema"]>> extends FieldHKT {
-    type: RelationField<CT, X, S, Sout, this["args"][1], this["args"][2], this["args"][3]>;
-}
-type NewType<S extends z.ZodTypeAny> = z.ZodObject<{
-    type: z.ZodLiteral<"new">;
-    data: S;
-}, z.core.$strip>;
-type ExistingType = z.ZodObject<{
-    type: z.ZodLiteral<"existing">;
-    _id: z.ZodString;
-    contentType: z.ZodLiteral<string>;
-}, z.core.$strip>;
-type SchemaType<X extends OnlyType, S extends z.ZodTypeAny> = If<isNew<X>, NewType<S>, ExistingType>;
-export declare class RelationField<CT extends ContentType = ContentType, X extends OnlyType = OnlyType, S extends ReturnType<CT["getInputSchema"]> = ReturnType<CT["getInputSchema"]>, Sout extends ReturnType<CT["getOutputSchemaWithoutIterators"]> = ReturnType<CT["getOutputSchemaWithoutIterators"]>, TRequired extends boolean = false, TTranslatable extends boolean = false, TVisibility extends "api" | "manager" | "all" = "all"> extends Field<RelationFieldHKT<CT, X, S, Sout>, SchemaType<X, S>, Sout, TRequired, TTranslatable, TVisibility> {
-    contentType: CT;
-    private only?;
-    constructor(contentType: CT, only?: X);
-    setSelfRelateds(): void;
-    private getSchemaType;
-    protected getBaseInputSchema(): getInputTypeWithModifiers<SchemaType<X, S>, TRequired, TTranslatable>;
-    protected getBaseSchema(): getTypeWithModifiers<SchemaType<X, S>, TRequired, TTranslatable>;
-    protected getBaseOutputSchema(): getOutputTypeWithModifiers<Sout, TRequired>;
-    getPopulatedSchema(): getOutputTypeWithModifiers<Sout, TRequired>;
-    multiple(): SimpleListField<RelationField<CT, X, ReturnType<CT["getInputSchema"]>, ReturnType<CT["getOutputSchemaWithoutIterators"]>, true, false, "all">, z.ZodArray<If<isNew<X>, NewType<ReturnType<CT["getInputSchema"]>>, ExistingType>>, z.ZodArray<ReturnType<RelationField<CT, X, ReturnType<CT["getInputSchema"]>, ReturnType<CT["getOutputSchemaWithoutIterators"]>, true, false, "all"> extends infer T ? T extends RelationField<CT, X, ReturnType<CT["getInputSchema"]>, ReturnType<CT["getOutputSchemaWithoutIterators"]>, true, false, "all"> ? T extends {
-        getPopulatedSchema: () => z.ZodTypeAny;
-    } ? T["getPopulatedSchema"] : T["getSchema"] : never : never>>, false, false, "all">;
-}
+export type ContentTypeLike<Name extends string = string> = {
+    name: Name;
+    getInputSchema: () => z.ZodTypeAny;
+    getOutputSchema: () => z.ZodTypeAny;
+    getOutputSchemaWithoutIterators?: () => z.ZodTypeAny;
+    getPopulatedSchema?: () => z.ZodTypeAny;
+};
+type ContentTypeInput<CT extends ContentTypeLike> = z.infer<ReturnType<CT["getInputSchema"]>>;
+type ContentTypeOutputSchema<CT extends ContentTypeLike> = CT extends {
+    getOutputSchemaWithoutIterators: () => infer Schema extends z.ZodTypeAny;
+} ? Schema : ReturnType<CT["getOutputSchema"]>;
+type ContentTypePopulatedSchema<CT extends ContentTypeLike> = CT extends {
+    getPopulatedSchema: () => infer Schema extends z.ZodTypeAny;
+} ? Schema : ContentTypeOutputSchema<CT>;
+type ContentTypeOutput<CT extends ContentTypeLike> = z.infer<ContentTypeOutputSchema<CT>>;
+type ContentTypePopulated<CT extends ContentTypeLike> = z.infer<ContentTypePopulatedSchema<CT>>;
+export type RelationExisting<Name extends string = string> = {
+    type: "existing";
+    _id: string;
+    contentType: Name;
+};
+export type RelationNew<Data = unknown> = {
+    type: "new";
+    data: Data;
+};
+export type RelationFieldValue = RelationExisting | RelationNew<unknown>;
+export type RelationExistingDefaltData = RelationExisting;
+export type RelationNewDefaultData<S> = RelationNew<S>;
+type RelationValue<CT extends ContentTypeLike, Only extends OnlyType> = Only extends "new" ? RelationNew<ContentTypeInput<CT>> : RelationExisting<CT["name"]>;
+export type RelationMeta<Name extends string = string, Only extends OnlyType = OnlyType> = {
+    type: "Relation";
+    ui: "ContentType";
+    contentType: Name;
+    only?: Only;
+};
 export type EncodedRelationField = EncodedField & {
     contentType: EncodedContentType;
     only?: OnlyType;
 };
-export type RelationFieldValue = z.infer<ExistingType | NewType<z.ZodTypeAny>>;
-export type RelationExistingDefaltData = z.infer<ExistingType>;
-export type RelationNewDefaultData<S> = {
-    type: "new";
-    data: S;
+export type RelationField<CT extends ContentTypeLike = ContentTypeLike, Only extends OnlyType = undefined, State extends FieldState = DefaultFieldState> = FieldWithModifiers<RelationFieldCore<CT, Only, State>>;
+type RelationFieldCore<CT extends ContentTypeLike, Only extends OnlyType, State extends FieldState> = RelationFieldBase<CT, Only, State> & PopulatableFieldLike<ContentTypePopulated<CT>, State> & {
+    contentType: CT;
+    only?: Only;
+    multiple: <TThis extends RelationFieldBase<CT, Only, FieldState>>(this: TThis) => SimpleListField<RelationField<CT, Only, SetRequired<DefaultFieldState>>, FieldStateOf<TThis>>;
 };
+type RelationFieldBase<CT extends ContentTypeLike, Only extends OnlyType, State extends FieldState> = FieldLike<RelationValue<CT, Only>, RelationValue<CT, Only>, ContentTypeOutput<CT>, RelationMeta<CT["name"], Only>, State>;
+export declare function relationField<CT extends ContentTypeLike, const Only extends OnlyType = undefined>(contentType: CT, only?: Only): RelationField<CT, Only>;
 export {};
 //# sourceMappingURL=Relation.d.ts.map

package/dist/esm/lib/fields/Relation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Relation.d.ts","sourceRoot":"","sources":["../../../../src/lib/fields/Relation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Relation.d.ts","sourceRoot":"","sources":["../../../../src/lib/fields/Relation.ts"],"names":[],"mappings":"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"}

package/dist/esm/lib/fields/Relation.js

@@ -1,73 +1,81 @@
 import z from "zod";
-import { Field } from "./Field.js";
-import { SimpleListField } from "./SimpleList.js";
-import { SelfRelationField } from "./SelfRelation.js";
-import { getDefaultInputSchema, getDefaultOutputSchema, getDefaultSchema, } from "../utils/getSchemas.js";
-import { Id } from "../utils/id.js";
-export class RelationField extends Field {
-    constructor(contentType, only) {
-        super({
-            config: { ui: "ContentType", type: "Relation" },
-            schema: contentType.getInputSchema(),
-        });
-        this.contentType = contentType;
-        this.only = only;
-    }
-    setSelfRelateds() {
-        Object.values(this.contentType.fields).forEach((field) => {
-            if (field instanceof SelfRelationField) {
-                field.setContentType(this.contentType);
+import { createField, defaultFieldState, withFieldModifiers, } from "./Field";
+import { simpleListField } from "./SimpleList";
+import { Id } from "../utils/id";
+export function relationField(contentType, only) {
+    return makeRelationField({ contentType, only }, defaultFieldState);
+}
+function makeRelationField(options, state) {
+    const field = {
+        ...createField({
+            meta: {
+                type: "Relation",
+                ui: "ContentType",
+                contentType: options.contentType.name,
+                only: options.only,
+            },
+            state,
+            schemas: {
+                input: () => buildRelationSchema(options),
+                db: () => buildRelationSchema(options),
+                output: () => getContentTypeOutputSchema(options.contentType),
+            },
+        }),
+        getPopulatedSchema: () => applyRelationOutputPresence(getContentTypePopulatedSchema(options.contentType), state),
+        contentType: options.contentType,
+        only: options.only,
+        multiple: function () {
+            const relation = makeRelationField(options, defaultFieldState).required();
+            let list = simpleListField(relation);
+            if (this.state.required) {
+                list = list.required();
             }
-        });
-    }
-    getSchemaType() {
-        const newSchema = z.object({
-            type: z.literal("new"),
-            data: this.schema,
-        });
-        const existingSchema = z.object({
-            type: z.literal("existing"),
-            _id: Id,
-            contentType: z.literal(this.contentType.name),
-        });
-        const bothSchema = z.discriminatedUnion("type", [
-            newSchema,
-            existingSchema,
-        ]);
-        return (this.only === "new"
-            ? newSchema
-            : this.only === "existing"
-                ? existingSchema
-                : bothSchema);
-    }
-    getBaseInputSchema() {
-        return getDefaultInputSchema(this.getSchemaType(), this.isRequired, this.isTranslatable);
-    }
-    getBaseSchema() {
-        return getDefaultSchema(this.getSchemaType(), this.isRequired, this.isTranslatable);
-    }
-    getBaseOutputSchema() {
-        return getDefaultOutputSchema(this.contentType.getOutputSchemaWithoutIterators(), this.isRequired);
-    }
-    getPopulatedSchema() {
-        return getDefaultOutputSchema(this.schema, this.isRequired);
+            if (this.state.translatable) {
+                list = list.translatable();
+            }
+            if (this.state.visibility === "api") {
+                list = list.apiOnly();
+            }
+            if (this.state.visibility === "manager") {
+                list = list.managerOnly();
+            }
+            return list;
+        },
+    };
+    return withFieldModifiers({
+        field,
+        rebuild: (nextState) => makeRelationField(options, nextState),
+    });
+}
+function buildRelationSchema(options) {
+    const newSchema = z.object({
+        type: z.literal("new"),
+        data: options.contentType.getInputSchema(),
+    });
+    const existingSchema = z.object({
+        type: z.literal("existing"),
+        _id: Id,
+        contentType: z.literal(options.contentType.name),
+    });
+    if (options.only === "new") {
+        return newSchema;
     }
-    multiple() {
-        const relation = new RelationField(this.contentType, this.only).required();
-        const list = new SimpleListField(relation);
-        if (this.isRequired) {
-            list.required();
-        }
-        if (this.isTranslatable) {
-            list.translatable();
-        }
-        if (this.visibility === "api") {
-            list.apiOnly();
-        }
-        if (this.visibility === "manager") {
-            list.managerOnly();
-        }
-        return list;
+    if (options.only === "existing") {
+        return existingSchema;
     }
+    return z.discriminatedUnion("type", [
+        newSchema,
+        existingSchema,
+    ]);
+}
+function getContentTypeOutputSchema(contentType) {
+    return (contentType.getOutputSchemaWithoutIterators?.() ??
+        contentType.getOutputSchema());
+}
+function getContentTypePopulatedSchema(contentType) {
+    return (contentType.getPopulatedSchema?.() ?? getContentTypeOutputSchema(contentType));
+}
+function applyRelationOutputPresence(schema, state) {
+    return state.required ? schema : schema.optional();
 }
 //# sourceMappingURL=Relation.js.map

package/dist/esm/lib/fields/Relation.js.map

@@ -1 +1 @@
-{"version":3,"file":"Relation.js","sourceRoot":"","sources":["../../../../src/lib/fields/Relation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Relation.js","sourceRoot":"","sources":["../../../../src/lib/fields/Relation.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,OAAO,EACL,WAAW,EACX,iBAAiB,EAWjB,kBAAkB,GACnB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,eAAe,EAAwB,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAkHjC,MAAM,UAAU,aAAa,CAG3B,WAAe,EAAE,IAAW;IAC5B,OAAO,iBAAiB,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,iBAAiB,CAAC,CAAC;AACrE,CAAC;AAED,SAAS,iBAAiB,CAKxB,OAAkC,EAClC,KAAY;IAEZ,MAAM,KAAK,GAAuC;QAChD,GAAG,WAAW,CAMZ;YACA,IAAI,EAAE;gBACJ,IAAI,EAAE,UAAU;gBAChB,EAAE,EAAE,aAAa;gBACjB,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,IAAI;gBACrC,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB;YACD,KAAK;YACL,OAAO,EAAE;gBACP,KAAK,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC;gBACzC,EAAE,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC;gBACtC,MAAM,EAAE,GAAG,EAAE,CACX,0BAA0B,CAAC,OAAO,CAAC,WAAW,CAE7C;aACJ;SACF,CAAC;QACF,kBAAkB,EAAE,GAAG,EAAE,CACvB,2BAA2B,CACzB,6BAA6B,CAAC,OAAO,CAAC,WAAW,CAAC,EAClD,KAAK,CACqD;QAC9D,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,QAAQ,EAAE;YAGR,MAAM,QAAQ,GAAG,iBAAiB,CAChC,OAAO,EACP,iBAAiB,CAClB,CAAC,QAAQ,EAAE,CAAC;YACb,IAAI,IAAI,GAAY,eAAe,CAAC,QAAQ,CAAC,CAAC;YAE9C,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACxB,IAAI,GAAI,IAAwB,CAAC,QAAQ,EAAE,CAAC;YAC9C,CAAC;YAED,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;gBAC5B,IAAI,GAAI,IAAwB,CAAC,YAAY,EAAE,CAAC;YAClD,CAAC;YAED,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBACpC,IAAI,GAAI,IAAwB,CAAC,OAAO,EAAE,CAAC;YAC7C,CAAC;YAED,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;gBACxC,IAAI,GAAI,IAAwB,CAAC,WAAW,EAAE,CAAC;YACjD,CAAC;YAED,OAAO,IAGN,CAAC;QACJ,CAAC;KACF,CAAC;IAEF,OAAO,kBAAkB,CAAC;QACxB,KAAK;QACL,OAAO,EAAE,CAA+B,SAAoB,EAAE,EAAE,CAC9D,iBAAiB,CAAC,OAAO,EAAE,SAAS,CAGnC;KACJ,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAG1B,OAAkC;IAClC,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC;QACzB,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;QACtB,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,cAAc,EAAE;KAC3C,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;QAC9B,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;QAC3B,GAAG,EAAE,EAAE;QACP,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC;KACjD,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QAC3B,OAAO,SAA0D,CAAC;IACpE,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAChC,OAAO,cAA+D,CAAC;IACzE,CAAC;IAED,OAAO,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE;QAClC,SAAS;QACT,cAAc;KACf,CAAkD,CAAC;AACtD,CAAC;AAED,SAAS,0BAA0B,CACjC,WAAe;IAEf,OAAO,CACL,WAAW,CAAC,+BAA+B,EAAE,EAAE;QAC/C,WAAW,CAAC,eAAe,EAAE,CACC,CAAC;AACnC,CAAC;AAED,SAAS,6BAA6B,CACpC,WAAe;IAEf,OAAO,CACL,WAAW,CAAC,kBAAkB,EAAE,EAAE,IAAI,0BAA0B,CAAC,WAAW,CAAC,CAC5C,CAAC;AACtC,CAAC;AAED,SAAS,2BAA2B,CAClC,MAAwB,EACxB,KAAY;IAEZ,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;AACrD,CAAC"}