orchid-orm-schema-to-zod 0.5.7 → 0.6.0

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { ParseColumn, EncodeColumn, AsTypeArg, ColumnTypeBase, ErrorMessage, NullableColumn, StringTypeData, ColumnSchemaGetterTableClass, ErrorMessages, ColumnSchemaGetterColumns, Code } from 'orchid-core';
-import { EnumColumn, ArrayColumnValue, DateBaseColumn, ColumnType, OperatorsJson, ColumnData, ArrayColumn } from 'pqb';
+import { ParseColumn, EncodeColumn, AsTypeArg, ColumnTypeBase, NullableColumn, ColumnSchemaGetterTableClass, ErrorMessages, ColumnSchemaGetterColumns, Code, ErrorMessage, StringTypeData } from 'orchid-core';
+import { EnumColumn, ArrayColumnValue, DateBaseColumn, ColumnType, OperatorsJson, ColumnData, ArrayColumn, SmallIntColumn, IntegerColumn, RealColumn, SmallSerialColumn, SerialColumn, BigIntColumn, DecimalColumn, DoublePrecisionColumn, BigSerialColumn, MoneyColumn, VarCharColumn, CharColumn, TextColumn, StringColumn, CitextColumn, DateColumn, TimestampColumn, TimestampTZColumn } from 'pqb';
 import { ZodTypeAny, ZodEnum, ZodNullable, ZodUnknown, ZodBoolean, ZodType, ZodNever, ZodString, ZodNumber, ZodDate, ZodObject, ZodOptional, ZodArray } from 'zod';
 
 type ParseDateToNumber = ParseColumn<DateBaseColumn<ZodSchemaConfig>, ZodNumber, number>;
@@ -11,17 +11,127 @@ declare class ZodJSONColumn<ZodSchema extends ZodTypeAny> extends ColumnType<Zod
     constructor(schema: ZodSchema);
     toCode(t: string): Code;
 }
-type ArrayMethods<Value> = {
+interface ArrayMethods<Value> {
     min<T extends ColumnTypeBase>(this: T, value: Value, params?: ErrorMessage): T;
     max<T extends ColumnTypeBase>(this: T, value: Value, params?: ErrorMessage): T;
     length<T extends ColumnTypeBase>(this: T, value: Value, params?: ErrorMessage): T;
     nonEmpty<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-};
+}
 interface ZodArrayColumn<Item extends ArrayColumnValue> extends ArrayColumn<ZodSchemaConfig, Item, ZodArray<Item['inputSchema']>, ZodArray<Item['outputSchema']>, ZodArray<Item['querySchema']>>, ArrayMethods<number> {
 }
 declare class ZodArrayColumn<Item extends ArrayColumnValue> extends ArrayColumn<ZodSchemaConfig, Item, ZodArray<Item['inputSchema']>, ZodArray<Item['outputSchema']>, ZodArray<Item['querySchema']>> {
     constructor(item: Item);
 }
+interface NumberMethods {
+    lt<T extends ColumnTypeBase>(this: T, value: number, params?: ErrorMessage): T;
+    lte<T extends ColumnTypeBase>(this: T, value: number, params?: ErrorMessage): T;
+    max<T extends ColumnTypeBase>(this: T, value: number, params?: ErrorMessage): T;
+    gt<T extends ColumnTypeBase>(this: T, value: number, params?: ErrorMessage): T;
+    gte<T extends ColumnTypeBase>(this: T, value: number, params?: ErrorMessage): T;
+    min<T extends ColumnTypeBase>(this: T, value: number, params?: ErrorMessage): T;
+    positive<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
+    nonNegative<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
+    negative<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
+    nonPositive<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
+    step<T extends ColumnTypeBase>(this: T, value: number, params?: ErrorMessage): T;
+    int<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
+    finite<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
+    safe<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
+}
+interface SmallIntColumnZod extends SmallIntColumn<ZodSchemaConfig>, NumberMethods {
+}
+declare class SmallIntColumnZod extends SmallIntColumn<ZodSchemaConfig> {
+}
+interface IntegerColumnZod extends IntegerColumn<ZodSchemaConfig>, NumberMethods {
+}
+declare class IntegerColumnZod extends IntegerColumn<ZodSchemaConfig> {
+}
+interface RealColumnZod extends RealColumn<ZodSchemaConfig>, NumberMethods {
+}
+declare class RealColumnZod extends RealColumn<ZodSchemaConfig> {
+}
+interface SmallSerialColumnZod extends SmallSerialColumn<ZodSchemaConfig>, NumberMethods {
+}
+declare class SmallSerialColumnZod extends SmallSerialColumn<ZodSchemaConfig> {
+}
+interface SerialColumnZod extends SerialColumn<ZodSchemaConfig>, NumberMethods {
+}
+declare class SerialColumnZod extends SerialColumn<ZodSchemaConfig> {
+}
+interface StringMethods extends ArrayMethods<number> {
+    email<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
+    url<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
+    emoji<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
+    uuid<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
+    cuid<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
+    cuid2<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
+    ulid<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
+    regex<T extends ColumnTypeBase>(this: T, value: RegExp, params?: ErrorMessage): T;
+    includes<T extends ColumnTypeBase, Value extends string>(this: T, value: Value, params?: ErrorMessage): T;
+    startsWith<T extends ColumnTypeBase, Value extends string>(this: T, value: Value, params?: ErrorMessage): T;
+    endsWith<T extends ColumnTypeBase, Value extends string>(this: T, value: Value, params?: ErrorMessage): T;
+    datetime<T extends ColumnTypeBase>(this: T, params?: StringTypeData['datetime'] & Exclude<ErrorMessage, string>): T;
+    ip<T extends ColumnTypeBase>(this: T, params?: StringTypeData['ip'] & Exclude<ErrorMessage, string>): T;
+    trim<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
+    toLowerCase<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
+    toUpperCase<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
+}
+interface BigIntColumnZod extends BigIntColumn<ZodSchemaConfig>, StringMethods {
+}
+declare class BigIntColumnZod extends BigIntColumn<ZodSchemaConfig> {
+}
+interface DecimalColumnZod extends DecimalColumn<ZodSchemaConfig>, StringMethods {
+}
+declare class DecimalColumnZod extends DecimalColumn<ZodSchemaConfig> {
+}
+interface DoublePrecisionColumnZod extends DoublePrecisionColumn<ZodSchemaConfig>, StringMethods {
+}
+declare class DoublePrecisionColumnZod extends DoublePrecisionColumn<ZodSchemaConfig> {
+}
+interface BigSerialColumnZod extends BigSerialColumn<ZodSchemaConfig>, StringMethods {
+}
+declare class BigSerialColumnZod extends BigSerialColumn<ZodSchemaConfig> {
+}
+interface MoneyColumnZod extends MoneyColumn<ZodSchemaConfig>, StringMethods {
+}
+declare class MoneyColumnZod extends MoneyColumn<ZodSchemaConfig> {
+}
+interface VarCharColumnZod extends VarCharColumn<ZodSchemaConfig>, StringMethods {
+}
+declare class VarCharColumnZod extends VarCharColumn<ZodSchemaConfig> {
+}
+interface CharColumnZod extends CharColumn<ZodSchemaConfig>, StringMethods {
+}
+declare class CharColumnZod extends CharColumn<ZodSchemaConfig> {
+}
+interface TextColumnZod extends TextColumn<ZodSchemaConfig>, StringMethods {
+}
+declare class TextColumnZod extends TextColumn<ZodSchemaConfig> {
+}
+interface StringColumnZod extends StringColumn<ZodSchemaConfig>, StringMethods {
+}
+declare class StringColumnZod extends StringColumn<ZodSchemaConfig> {
+}
+interface CitextColumnZod extends CitextColumn<ZodSchemaConfig>, StringMethods {
+}
+declare class CitextColumnZod extends CitextColumn<ZodSchemaConfig> {
+}
+interface DateMethods {
+    min<T extends ColumnTypeBase>(this: T, value: Date, params?: ErrorMessage): T;
+    max<T extends ColumnTypeBase>(this: T, value: Date, params?: ErrorMessage): T;
+}
+interface DateColumnZod extends DateColumn<ZodSchemaConfig>, DateMethods {
+}
+declare class DateColumnZod extends DateColumn<ZodSchemaConfig> {
+}
+interface TimestampNoTzColumnZod extends TimestampColumn<ZodSchemaConfig>, DateMethods {
+}
+declare class TimestampNoTzColumnZod extends TimestampColumn<ZodSchemaConfig> {
+}
+interface TimestampColumnZod extends TimestampTZColumn<ZodSchemaConfig>, DateMethods {
+}
+declare class TimestampColumnZod extends TimestampTZColumn<ZodSchemaConfig> {
+}
 type ZodSchemaConfig = {
     type: ZodTypeAny;
     parse<T extends {
@@ -32,21 +142,11 @@ type ZodSchemaConfig = {
     }, InputSchema extends ZodTypeAny, Input = InputSchema['_output']>(this: T, _schema: InputSchema, fn: (input: Input) => unknown): EncodeColumn<T, InputSchema, Input>;
     asType<T, Types extends AsTypeArg<ZodTypeAny>, TypeSchema extends ZodTypeAny = Types extends {
         type: ZodTypeAny;
-    } ? Types['type'] : never, Type = TypeSchema['_output']>(this: T, types: Types): Omit<T, 'type' | 'inputType' | 'inputSchema' | 'outputType' | 'outputSchema' | 'queryType' | 'querySchema'> & {
-        type: Type;
-        inputType: Types['input'] extends ZodTypeAny ? Types['input']['_output'] : Type;
-        inputSchema: Types['input'] extends ZodTypeAny ? Types['input'] : TypeSchema;
-        outputType: Types['output'] extends ZodTypeAny ? Types['output']['_output'] : Type;
-        outputSchema: Types['output'] extends ZodTypeAny ? Types['output'] : TypeSchema;
-        queryType: Types['query'] extends ZodTypeAny ? Types['query']['_output'] : Type;
-        querySchema: Types['query'] extends ZodTypeAny ? Types['query'] : TypeSchema;
+    } ? Types['type'] : never, Type = TypeSchema['_output']>(this: T, types: Types): {
+        [K in keyof T]: K extends 'type' ? Type : K extends 'inputType' ? Types['input'] extends ZodTypeAny ? Types['input']['_output'] : Type : K extends 'inputSchema' ? Types['input'] extends ZodTypeAny ? Types['input'] : TypeSchema : K extends 'outputType' ? Types['output'] extends ZodTypeAny ? Types['output']['_output'] : Type : K extends 'outputSchema' ? Types['output'] extends ZodTypeAny ? Types['output'] : TypeSchema : K extends 'queryType' ? Types['query'] extends ZodTypeAny ? Types['query']['_output'] : Type : K extends 'querySchema' ? Types['query'] extends ZodTypeAny ? Types['query'] : TypeSchema : T[K];
     };
     dateAsNumber(): ParseDateToNumber;
     dateAsDate(): ParseDateToDate;
-    dateMethods: {
-        min<T extends ColumnTypeBase>(this: T, value: Date, params?: ErrorMessage): T;
-        max<T extends ColumnTypeBase>(this: T, value: Date, params?: ErrorMessage): T;
-    };
     enum<U extends string, T extends [U, ...U[]]>(dataType: string, type: T): EnumColumn<ZodSchemaConfig, ZodEnum<T>, U, T>;
     array<Item extends ArrayColumnValue>(item: Item): ZodArrayColumn<Item>;
     nullable<T extends ColumnTypeBase>(this: T): NullableColumn<T, ZodNullable<T['inputSchema']>, ZodNullable<T['outputSchema']>, ZodNullable<T['querySchema']>>;
@@ -55,45 +155,11 @@ type ZodSchemaConfig = {
     buffer: ZodType<Buffer>;
     unknown: ZodUnknown;
     never: ZodNever;
-    string: ZodString;
+    stringSchema: ZodString;
     stringMin(max: number): ZodString;
     stringMax(max: number): ZodString;
     stringMinMax(min: number, max: number): ZodString;
-    stringMethods: ArrayMethods<number> & {
-        email<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-        url<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-        emoji<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-        uuid<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-        cuid<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-        cuid2<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-        ulid<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-        regex<T extends ColumnTypeBase>(this: T, value: RegExp, params?: ErrorMessage): T;
-        includes<T extends ColumnTypeBase, Value extends string>(this: T, value: Value, params?: ErrorMessage): T;
-        startsWith<T extends ColumnTypeBase, Value extends string>(this: T, value: Value, params?: ErrorMessage): T;
-        endsWith<T extends ColumnTypeBase, Value extends string>(this: T, value: Value, params?: ErrorMessage): T;
-        datetime<T extends ColumnTypeBase>(this: T, params?: StringTypeData['datetime'] & Exclude<ErrorMessage, string>): T;
-        ip<T extends ColumnTypeBase>(this: T, params?: StringTypeData['ip'] & Exclude<ErrorMessage, string>): T;
-        trim<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-        toLowerCase<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-        toUpperCase<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-    };
     number: ZodNumber;
-    numberMethods: {
-        lt<T extends ColumnTypeBase>(this: T, value: number, params?: ErrorMessage): T;
-        lte<T extends ColumnTypeBase>(this: T, value: number, params?: ErrorMessage): T;
-        max<T extends ColumnTypeBase>(this: T, value: number, params?: ErrorMessage): T;
-        gt<T extends ColumnTypeBase>(this: T, value: number, params?: ErrorMessage): T;
-        gte<T extends ColumnTypeBase>(this: T, value: number, params?: ErrorMessage): T;
-        min<T extends ColumnTypeBase>(this: T, value: number, params?: ErrorMessage): T;
-        positive<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-        nonNegative<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-        negative<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-        nonPositive<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-        step<T extends ColumnTypeBase>(this: T, value: number, params?: ErrorMessage): T;
-        int<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-        finite<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-        safe<T extends ColumnTypeBase>(this: T, params?: ErrorMessage): T;
-    };
     int: ZodNumber;
     stringNumberDate: ZodDate;
     timeInterval: ZodObject<{
@@ -112,6 +178,24 @@ type ZodSchemaConfig = {
     updateSchema<T extends ColumnSchemaGetterTableClass>(this: T): UpdateSchema<T>;
     pkeySchema<T extends ColumnSchemaGetterTableClass>(this: T): PkeySchema<T>;
     errors<T extends ColumnTypeBase>(this: T, errors: ErrorMessages): T;
+    smallint(): SmallIntColumnZod;
+    integer(): IntegerColumnZod;
+    real(): RealColumnZod;
+    smallSerial(): SmallSerialColumnZod;
+    serial(): SerialColumnZod;
+    bigint(): BigIntColumnZod;
+    decimal(precision?: number, scale?: number): DecimalColumnZod;
+    doublePrecision(): DoublePrecisionColumnZod;
+    bigSerial(): BigSerialColumnZod;
+    money(): MoneyColumnZod;
+    varchar(limit?: number): VarCharColumnZod;
+    char(limit?: number): CharColumnZod;
+    text(min: number, max: number): TextColumnZod;
+    string(limit?: number): StringColumnZod;
+    citext(min: number, max: number): CitextColumnZod;
+    date(): DateColumnZod;
+    timestampNoTZ(precision?: number): TimestampNoTzColumnZod;
+    timestamp(precision?: number): TimestampColumnZod;
 };
 declare const zodSchemaConfig: ZodSchemaConfig;
 type MapSchema<T extends ColumnSchemaGetterTableClass, Key extends 'inputSchema' | 'outputSchema' | 'querySchema'> = ZodObject<{

package/dist/index.js

@@ -73,6 +73,176 @@ class ZodArrayColumn extends pqb.ArrayColumn {
   }
 }
 Object.assign(ZodArrayColumn.prototype, arrayMethods);
+const numberMethods = {
+  // Require a value to be lower than a given number
+  lt(value, params) {
+    return applyMethod(this, "lt", value, params);
+  },
+  // Require a value to be lower than or equal to a given number (the same as `max`)
+  lte(value, params) {
+    return applyMethod(this, "lte", value, params);
+  },
+  // Require a value to be lower than or equal to a given number
+  max(value, params) {
+    return applyMethod(this, "lte", value, params);
+  },
+  // Require a value to be greater than a given number
+  gt(value, params) {
+    return applyMethod(this, "gt", value, params);
+  },
+  // Require a value to be greater than or equal to a given number (the same as `min`)
+  gte(value, params) {
+    return applyMethod(this, "gte", value, params);
+  },
+  // Require a value to be greater than or equal to a given number
+  min(value, params) {
+    return applyMethod(this, "gte", value, params);
+  },
+  // Require a value to be greater than 0
+  positive(params) {
+    return applyMethod(this, "gt", 0, params);
+  },
+  // Require a value to be greater than or equal to 0
+  nonNegative(params) {
+    return applyMethod(this, "gte", 0, params);
+  },
+  // Require a value to be lower than 0
+  negative(params) {
+    return applyMethod(this, "lt", 0, params);
+  },
+  // Require a value to be lower than or equal to 0
+  nonPositive(params) {
+    return applyMethod(this, "lte", 0, params);
+  },
+  // Require a value to be a multiple of a given number
+  step(value, params) {
+    return applyMethod(this, "step", value, params);
+  },
+  // Require a value to be an integer
+  int(params) {
+    return applySimpleMethod(this, "int", params);
+  },
+  // Exclude `Infinity` from being a valid value
+  finite(params) {
+    return applySimpleMethod(this, "finite", params);
+  },
+  // Require the value to be less than or equal to Number.MAX_SAFE_INTEGER
+  safe(params) {
+    return applySimpleMethod(this, "safe", params);
+  }
+};
+class SmallIntColumnZod extends pqb.SmallIntColumn {
+}
+Object.assign(SmallIntColumnZod.prototype, numberMethods);
+class IntegerColumnZod extends pqb.IntegerColumn {
+}
+Object.assign(IntegerColumnZod.prototype, numberMethods);
+class RealColumnZod extends pqb.RealColumn {
+}
+Object.assign(RealColumnZod.prototype, numberMethods);
+class SmallSerialColumnZod extends pqb.SmallSerialColumn {
+}
+Object.assign(SmallSerialColumnZod.prototype, numberMethods);
+class SerialColumnZod extends pqb.SerialColumn {
+}
+Object.assign(SerialColumnZod.prototype, numberMethods);
+const stringMethods = __spreadProps(__spreadValues({}, arrayMethods), {
+  email(params) {
+    return applySimpleMethod(this, "email", params);
+  },
+  url(params) {
+    return applySimpleMethod(this, "url", params);
+  },
+  emoji(params) {
+    return applySimpleMethod(this, "emoji", params);
+  },
+  uuid(params) {
+    return applySimpleMethod(this, "uuid", params);
+  },
+  cuid(params) {
+    return applySimpleMethod(this, "cuid", params);
+  },
+  cuid2(params) {
+    return applySimpleMethod(this, "cuid2", params);
+  },
+  ulid(params) {
+    return applySimpleMethod(this, "ulid", params);
+  },
+  regex(value, params) {
+    return applyMethod(this, "regex", value, params);
+  },
+  includes(value, params) {
+    return applyMethod(this, "includes", value, params);
+  },
+  startsWith(value, params) {
+    return applyMethod(this, "startsWith", value, params);
+  },
+  endsWith(value, params) {
+    return applyMethod(this, "endsWith", value, params);
+  },
+  datetime(params = {}) {
+    return applyMethod(this, "datetime", params, params);
+  },
+  ip(params = {}) {
+    return applyMethod(this, "ip", params, params);
+  },
+  trim(params) {
+    return applySimpleMethod(this, "trim", params);
+  },
+  toLowerCase(params) {
+    return applySimpleMethod(this, "toLowerCase", params);
+  },
+  toUpperCase(params) {
+    return applySimpleMethod(this, "toUpperCase", params);
+  }
+});
+class BigIntColumnZod extends pqb.BigIntColumn {
+}
+Object.assign(BigIntColumnZod.prototype, stringMethods);
+class DecimalColumnZod extends pqb.DecimalColumn {
+}
+Object.assign(DecimalColumnZod.prototype, stringMethods);
+class DoublePrecisionColumnZod extends pqb.DoublePrecisionColumn {
+}
+Object.assign(DoublePrecisionColumnZod.prototype, stringMethods);
+class BigSerialColumnZod extends pqb.BigSerialColumn {
+}
+Object.assign(BigSerialColumnZod.prototype, stringMethods);
+class MoneyColumnZod extends pqb.MoneyColumn {
+}
+Object.assign(MoneyColumnZod.prototype, stringMethods);
+class VarCharColumnZod extends pqb.VarCharColumn {
+}
+Object.assign(VarCharColumnZod.prototype, stringMethods);
+class CharColumnZod extends pqb.CharColumn {
+}
+Object.assign(CharColumnZod.prototype, stringMethods);
+class TextColumnZod extends pqb.TextColumn {
+}
+Object.assign(TextColumnZod.prototype, stringMethods);
+class StringColumnZod extends pqb.StringColumn {
+}
+Object.assign(StringColumnZod.prototype, stringMethods);
+class CitextColumnZod extends pqb.CitextColumn {
+}
+Object.assign(CitextColumnZod.prototype, stringMethods);
+const dateMethods = {
+  min(value, params) {
+    return applyMethod(this, "min", value, params);
+  },
+  max(value, params) {
+    return applyMethod(this, "max", value, params);
+  }
+};
+class DateColumnZod extends pqb.DateColumn {
+}
+Object.assign(DateColumnZod.prototype, dateMethods);
+class TimestampNoTzColumnZod extends pqb.TimestampColumn {
+}
+Object.assign(TimestampNoTzColumnZod.prototype, dateMethods);
+class TimestampColumnZod extends pqb.TimestampTZColumn {
+}
+Object.assign(TimestampColumnZod.prototype, dateMethods);
 const parseDateToNumber = (value) => value ? Date.parse(value) : value;
 const parseDateToDate = (value) => value ? new Date(value) : value;
 const zodSchemaConfig = {
@@ -105,14 +275,6 @@ const zodSchemaConfig = {
       parseDateToDate
     );
   },
-  dateMethods: {
-    min(value, params) {
-      return applyMethod(this, "min", value, params);
-    },
-    max(value, params) {
-      return applyMethod(this, "max", value, params);
-    }
-  },
   enum(dataType, type) {
     return new pqb.EnumColumn(zodSchemaConfig, dataType, type, zod.z.enum(type));
   },
@@ -134,7 +296,7 @@ const zodSchemaConfig = {
   buffer: zod.z.instanceof(Buffer),
   unknown: zod.z.unknown(),
   never: zod.z.never(),
-  string: zod.z.string(),
+  stringSchema: zod.z.string(),
   stringMin(min) {
     return zod.z.string().min(min);
   },
@@ -144,116 +306,8 @@ const zodSchemaConfig = {
   stringMinMax(min, max) {
     return zod.z.string().min(min).max(max);
   },
-  stringMethods: __spreadProps(__spreadValues({}, arrayMethods), {
-    email(params) {
-      return applySimpleMethod(this, "email", params);
-    },
-    url(params) {
-      return applySimpleMethod(this, "url", params);
-    },
-    emoji(params) {
-      return applySimpleMethod(this, "emoji", params);
-    },
-    uuid(params) {
-      return applySimpleMethod(this, "uuid", params);
-    },
-    cuid(params) {
-      return applySimpleMethod(this, "cuid", params);
-    },
-    cuid2(params) {
-      return applySimpleMethod(this, "cuid2", params);
-    },
-    ulid(params) {
-      return applySimpleMethod(this, "ulid", params);
-    },
-    regex(value, params) {
-      return applyMethod(this, "regex", value, params);
-    },
-    includes(value, params) {
-      return applyMethod(this, "includes", value, params);
-    },
-    startsWith(value, params) {
-      return applyMethod(this, "startsWith", value, params);
-    },
-    endsWith(value, params) {
-      return applyMethod(this, "endsWith", value, params);
-    },
-    datetime(params = {}) {
-      return applyMethod(this, "datetime", params, params);
-    },
-    ip(params = {}) {
-      return applyMethod(this, "ip", params, params);
-    },
-    trim(params) {
-      return applySimpleMethod(this, "trim", params);
-    },
-    toLowerCase(params) {
-      return applySimpleMethod(this, "toLowerCase", params);
-    },
-    toUpperCase(params) {
-      return applySimpleMethod(this, "toUpperCase", params);
-    }
-  }),
   number: zod.z.number(),
   int: zod.z.number().int(),
-  numberMethods: {
-    // Require a value to be lower than a given number
-    lt(value, params) {
-      return applyMethod(this, "lt", value, params);
-    },
-    // Require a value to be lower than or equal to a given number (the same as `max`)
-    lte(value, params) {
-      return applyMethod(this, "lte", value, params);
-    },
-    // Require a value to be lower than or equal to a given number
-    max(value, params) {
-      return applyMethod(this, "lte", value, params);
-    },
-    // Require a value to be greater than a given number
-    gt(value, params) {
-      return applyMethod(this, "gt", value, params);
-    },
-    // Require a value to be greater than or equal to a given number (the same as `min`)
-    gte(value, params) {
-      return applyMethod(this, "gte", value, params);
-    },
-    // Require a value to be greater than or equal to a given number
-    min(value, params) {
-      return applyMethod(this, "gte", value, params);
-    },
-    // Require a value to be greater than 0
-    positive(params) {
-      return applyMethod(this, "gt", 0, params);
-    },
-    // Require a value to be greater than or equal to 0
-    nonNegative(params) {
-      return applyMethod(this, "gte", 0, params);
-    },
-    // Require a value to be lower than 0
-    negative(params) {
-      return applyMethod(this, "lt", 0, params);
-    },
-    // Require a value to be lower than or equal to 0
-    nonPositive(params) {
-      return applyMethod(this, "lte", 0, params);
-    },
-    // Require a value to be a multiple of a given number
-    step(value, params) {
-      return applyMethod(this, "step", value, params);
-    },
-    // Require a value to be an integer
-    int(params) {
-      return applySimpleMethod(this, "int", params);
-    },
-    // Exclude `Infinity` from being a valid value
-    finite(params) {
-      return applySimpleMethod(this, "finite", params);
-    },
-    // Require the value to be less than or equal to Number.MAX_SAFE_INTEGER
-    safe(params) {
-      return applySimpleMethod(this, "safe", params);
-    }
-  },
   stringNumberDate: zod.z.coerce.date(),
   timeInterval: zod.z.object({
     years: zod.z.number().optional(),
@@ -366,7 +420,25 @@ const zodSchemaConfig = {
     };
     this.inputSchema._def.errorMap = this.outputSchema._def.errorMap = this.querySchema._def.errorMap = errorMap;
     return orchidCore.setColumnData(this, "errors", newErrors);
-  }
+  },
+  smallint: () => new SmallIntColumnZod(zodSchemaConfig),
+  integer: () => new IntegerColumnZod(zodSchemaConfig),
+  real: () => new RealColumnZod(zodSchemaConfig),
+  smallSerial: () => new SmallSerialColumnZod(zodSchemaConfig),
+  serial: () => new SerialColumnZod(zodSchemaConfig),
+  bigint: () => new BigIntColumnZod(zodSchemaConfig),
+  decimal: (precision, scale) => new DecimalColumnZod(zodSchemaConfig, precision, scale),
+  doublePrecision: () => new DoublePrecisionColumnZod(zodSchemaConfig),
+  bigSerial: () => new BigSerialColumnZod(zodSchemaConfig),
+  money: () => new MoneyColumnZod(zodSchemaConfig),
+  varchar: (limit) => new VarCharColumnZod(zodSchemaConfig, limit),
+  char: (limit) => new CharColumnZod(zodSchemaConfig, limit),
+  text: (min, max) => new TextColumnZod(zodSchemaConfig, min, max),
+  string: (limit) => new StringColumnZod(zodSchemaConfig, limit),
+  citext: (min, max) => new CitextColumnZod(zodSchemaConfig, min, max),
+  date: () => new DateColumnZod(zodSchemaConfig),
+  timestampNoTZ: (precision) => new TimestampNoTzColumnZod(zodSchemaConfig, precision),
+  timestamp: (precision) => new TimestampColumnZod(zodSchemaConfig, precision)
 };
 function mapSchema(klass, schemaKey) {
   const shape = {};