orchid-orm 1.5.9 → 1.5.10

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # orchid-orm
 
+## 1.5.10
+
+### Patch Changes
+
+- ee1961e: Make columnTypes optional in configs
+- Updated dependencies [ee1961e]
+  - pqb@0.9.8
+
 ## 1.5.9
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,4 +1,6 @@
+import * as pqb from 'pqb';
 import { BelongsToRelation, HasManyRelation, HasOneRelation, Db, Adapter, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, HasAndBelongsToManyRelation, Query, defaultsKey, EmptyObject, BaseRelation, RelationQuery, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsAll, ColumnTypesBase, ColumnsShape, ColumnShapeOutput, WhereResult, MergeQuery, SetQueryReturns, QueryReturnType } from 'pqb';
+export { columnTypes } from 'pqb';
 import { AppCodeUpdater } from 'rake-db';
 
 interface BelongsTo extends RelationThunkBase {
@@ -139,18 +141,214 @@ declare type Table = {
     columnTypes: ColumnTypesBase;
     noPrimaryKey?: boolean;
 };
-declare const createBaseTable: <CT extends ColumnTypesBase>(options: {
-    columnTypes: CT;
+declare const createBaseTable: <CT extends ColumnTypesBase>(options?: {
+    columnTypes?: CT | undefined;
 }) => {
     new (): {
         table: string;
         columns: TableConfig;
         schema?: string | undefined;
-        columnTypes: CT;
+        columnTypes: ColumnTypesBase extends CT ? {
+            smallint: () => pqb.SmallIntColumn;
+            integer: () => pqb.IntegerColumn;
+            bigint: () => pqb.BigIntColumn;
+            numeric: <Precision extends number | undefined = undefined, Scale extends number | undefined = undefined>(precision?: Precision | undefined, scale?: Scale | undefined) => pqb.DecimalColumn<Precision, Scale>;
+            decimal: <Precision_1 extends number | undefined = undefined, Scale_1 extends number | undefined = undefined>(precision?: Precision_1 | undefined, scale?: Scale_1 | undefined) => pqb.DecimalColumn<Precision_1, Scale_1>;
+            real: () => pqb.RealColumn;
+            doublePrecision: () => pqb.DoublePrecisionColumn;
+            smallSerial: () => pqb.SmallSerialColumn;
+            serial: () => pqb.SerialColumn;
+            bigSerial: () => pqb.BigSerialColumn;
+            money: () => pqb.MoneyColumn;
+            varchar: <Limit extends number | undefined = undefined>(limit?: Limit | undefined) => pqb.VarCharColumn<Limit>;
+            char: <Limit_1 extends number | undefined = undefined>(limit?: Limit_1 | undefined) => pqb.CharColumn<Limit_1>;
+            text: (min: number, max: number) => pqb.TextColumn;
+            string: (min: number, max: number) => pqb.TextColumn;
+            bytea: () => pqb.ByteaColumn;
+            date: () => pqb.DateColumn;
+            timestamp: <Precision_2 extends number | undefined = undefined>(precision?: Precision_2 | undefined) => pqb.TimestampColumn<Precision_2>;
+            timestampWithTimeZone: <Precision_3 extends number | undefined = undefined>(precision?: Precision_3 | undefined) => pqb.TimestampWithTimeZoneColumn<Precision_3>;
+            time: <Precision_4 extends number | undefined = undefined>(precision?: Precision_4 | undefined) => pqb.TimeColumn<Precision_4>;
+            timeWithTimeZone: <Precision_5 extends number | undefined = undefined>(precision?: Precision_5 | undefined) => pqb.TimeWithTimeZoneColumn<Precision_5>;
+            interval: <Fields extends string | undefined = undefined, Precision_6 extends number | undefined = undefined>(fields?: Fields | undefined, precision?: Precision_6 | undefined) => pqb.IntervalColumn<Fields, Precision_6>;
+            boolean: () => pqb.BooleanColumn;
+            enum: <U extends string, T extends [U, ...U[]]>(dataType: string, type: T) => pqb.EnumColumn<U, T>;
+            point: () => pqb.PointColumn;
+            line: () => pqb.LineColumn;
+            lseg: () => pqb.LsegColumn;
+            box: () => pqb.BoxColumn;
+            path: () => pqb.PathColumn;
+            polygon: () => pqb.PolygonColumn;
+            circle: () => pqb.CircleColumn;
+            cidr: () => pqb.CidrColumn;
+            inet: () => pqb.InetColumn;
+            macaddr: () => pqb.MacAddrColumn;
+            macaddr8: () => pqb.MacAddr8Column;
+            bit: <Length extends number>(length: Length) => pqb.BitColumn<Length>;
+            bitVarying: <Length_1 extends number | undefined = undefined>(length?: Length_1 | undefined) => pqb.BitVaryingColumn<Length_1>;
+            tsvector: () => pqb.TsVectorColumn;
+            tsquery: () => pqb.TsQueryColumn;
+            uuid: () => pqb.UUIDColumn;
+            xml: () => pqb.XMLColumn;
+            json: <Type extends pqb.JSONTypeAny>(schemaOrFn: Type | ((j: {
+                set: <Value extends pqb.JSONTypeAny>(valueType: Value) => pqb.JSONSet<Value>;
+                tuple: <T_1 extends pqb.JSONTupleItems | [], Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest) => pqb.JSONTuple<T_1, Rest>;
+                union: <T_2 extends [pqb.JSONTypeAny, pqb.JSONTypeAny, ...pqb.JSONTypeAny[]]>(types: T_2) => pqb.JSONUnion<T_2>;
+                any: () => pqb.JSONAny;
+                bigint: () => pqb.JSONBigInt;
+                boolean: () => pqb.JSONBoolean;
+                date: () => pqb.JSONDate;
+                nan: () => pqb.JSONNaN;
+                never: () => pqb.JSONNever;
+                null: () => pqb.JSONNull;
+                number: () => pqb.JSONNumber;
+                string: () => pqb.JSONString;
+                undefined: () => pqb.JSONUndefined;
+                unknown: () => pqb.JSONUnknown;
+                void: () => pqb.JSONVoid;
+                array: <Type_1 extends pqb.JSONTypeAny>(element: Type_1) => pqb.JSONArray<Type_1, "many">;
+                discriminatedUnion: <Discriminator extends string, DiscriminatorValue extends pqb.Primitive, Types extends [pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, ...pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>[]]>(discriminator: Discriminator, options: Types) => pqb.JSONDiscriminatedUnion<Discriminator, DiscriminatorValue, Types[number]>;
+                enum: <U_1 extends string, T_3 extends [U_1, ...U_1[]]>(options: T_3) => pqb.JSONEnum<U_1, T_3>;
+                instanceOf: <T_4 extends new (...args: any[]) => any>(cls: T_4) => pqb.JSONInstanceOf<T_4>;
+                intersection: <Left extends pqb.JSONTypeAny, Right extends pqb.JSONTypeAny>(left: Left, right: Right) => pqb.JSONIntersection<Left, Right>;
+                lazy: <T_5 extends pqb.JSONTypeAny>(fn: () => T_5) => pqb.JSONLazy<T_5>;
+                literal: <T_6 extends pqb.Primitive>(value: T_6) => pqb.JSONLiteral<T_6>;
+                map: <Key extends pqb.JSONTypeAny, Value_1 extends pqb.JSONTypeAny>(keyType: Key, valueType: Value_1) => pqb.JSONMap<Key, Value_1>;
+                nativeEnum: <T_7 extends pqb.EnumLike>(givenEnum: T_7) => pqb.JSONNativeEnum<T_7>;
+                nullable: <T_8 extends pqb.JSONTypeAny>(type: T_8) => pqb.JSONNullable<T_8>;
+                nullish: <T_9 extends pqb.JSONTypeAny>(type: T_9) => pqb.JSONNullish<T_9>;
+                object: <T_10 extends pqb.JSONObjectShape, UnknownKeys extends pqb.UnknownKeysParam = "strip", Catchall extends pqb.JSONTypeAny = pqb.JSONTypeAny>(shape: T_10) => pqb.JSONObject<T_10, UnknownKeys, Catchall, pqb.JSONTypeAny extends Catchall ? pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never : (pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
+                    [k: string]: Catchall["type"];
+                } extends infer T_12 extends object ? { [k_2 in keyof T_12]: ((pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
+                    [k: string]: Catchall["type"];
+                })[k_2]; } : never>;
+                optional: <T_13 extends pqb.JSONTypeAny>(type: T_13) => pqb.JSONOptional<T_13>;
+                record: typeof pqb.record;
+            }) => Type)) => pqb.JSONColumn<Type>;
+            jsonText: () => pqb.JSONTextColumn;
+            array: <Item extends pqb.ColumnType<unknown, pqb.Operators, unknown>>(item: Item) => pqb.ArrayColumn<Item>;
+            timestamps: <T_14 extends pqb.ColumnType<unknown, pqb.Operators, unknown>>(this: {
+                timestamp(): T_14;
+            }) => {
+                createdAt: T_14 & {
+                    hasDefault: true;
+                };
+                updatedAt: T_14 & {
+                    hasDefault: true;
+                };
+            };
+            primaryKey(columns: string[], options?: {
+                name?: string | undefined;
+            } | undefined): {};
+            index(columns: pqb.MaybeArray<string | pqb.IndexColumnOptions>, options?: pqb.IndexOptions): {};
+            unique(columns: pqb.MaybeArray<string | pqb.IndexColumnOptions>, options?: pqb.IndexOptions): {};
+            foreignKey: {
+                <Table_1 extends pqb.ForeignKeyTableWithColumns, Columns extends [Exclude<keyof InstanceType<Table_1>["columns"]["shape"], number | symbol>, ...Exclude<keyof InstanceType<Table_1>["columns"]["shape"], number | symbol>[]]>(columns: string[], fn: () => Table_1, foreignColumns: Columns, options?: pqb.ForeignKeyOptions | undefined): {};
+                <Table_2 extends string, Columns_1 extends [string, ...string[]]>(columns: string[], table: Table_2, foreignColumns: Columns_1, options?: pqb.ForeignKeyOptions | undefined): {};
+            };
+        } : CT;
         noPrimaryKey?: boolean | undefined;
-        setColumns: <T extends ColumnsShape>(fn: (t: CT) => T) => {
-            shape: T;
-            type: ColumnShapeOutput<T>;
+        setColumns: <T_15 extends ColumnsShape>(fn: (t: ColumnTypesBase extends CT ? {
+            smallint: () => pqb.SmallIntColumn;
+            integer: () => pqb.IntegerColumn;
+            bigint: () => pqb.BigIntColumn;
+            numeric: <Precision extends number | undefined = undefined, Scale extends number | undefined = undefined>(precision?: Precision | undefined, scale?: Scale | undefined) => pqb.DecimalColumn<Precision, Scale>;
+            decimal: <Precision_1 extends number | undefined = undefined, Scale_1 extends number | undefined = undefined>(precision?: Precision_1 | undefined, scale?: Scale_1 | undefined) => pqb.DecimalColumn<Precision_1, Scale_1>;
+            real: () => pqb.RealColumn;
+            doublePrecision: () => pqb.DoublePrecisionColumn;
+            smallSerial: () => pqb.SmallSerialColumn;
+            serial: () => pqb.SerialColumn;
+            bigSerial: () => pqb.BigSerialColumn;
+            money: () => pqb.MoneyColumn;
+            varchar: <Limit extends number | undefined = undefined>(limit?: Limit | undefined) => pqb.VarCharColumn<Limit>;
+            char: <Limit_1 extends number | undefined = undefined>(limit?: Limit_1 | undefined) => pqb.CharColumn<Limit_1>;
+            text: (min: number, max: number) => pqb.TextColumn;
+            string: (min: number, max: number) => pqb.TextColumn;
+            bytea: () => pqb.ByteaColumn;
+            date: () => pqb.DateColumn;
+            timestamp: <Precision_2 extends number | undefined = undefined>(precision?: Precision_2 | undefined) => pqb.TimestampColumn<Precision_2>;
+            timestampWithTimeZone: <Precision_3 extends number | undefined = undefined>(precision?: Precision_3 | undefined) => pqb.TimestampWithTimeZoneColumn<Precision_3>;
+            time: <Precision_4 extends number | undefined = undefined>(precision?: Precision_4 | undefined) => pqb.TimeColumn<Precision_4>;
+            timeWithTimeZone: <Precision_5 extends number | undefined = undefined>(precision?: Precision_5 | undefined) => pqb.TimeWithTimeZoneColumn<Precision_5>;
+            interval: <Fields extends string | undefined = undefined, Precision_6 extends number | undefined = undefined>(fields?: Fields | undefined, precision?: Precision_6 | undefined) => pqb.IntervalColumn<Fields, Precision_6>;
+            boolean: () => pqb.BooleanColumn;
+            enum: <U extends string, T extends [U, ...U[]]>(dataType: string, type: T) => pqb.EnumColumn<U, T>;
+            point: () => pqb.PointColumn;
+            line: () => pqb.LineColumn;
+            lseg: () => pqb.LsegColumn;
+            box: () => pqb.BoxColumn;
+            path: () => pqb.PathColumn;
+            polygon: () => pqb.PolygonColumn;
+            circle: () => pqb.CircleColumn;
+            cidr: () => pqb.CidrColumn;
+            inet: () => pqb.InetColumn;
+            macaddr: () => pqb.MacAddrColumn;
+            macaddr8: () => pqb.MacAddr8Column;
+            bit: <Length extends number>(length: Length) => pqb.BitColumn<Length>;
+            bitVarying: <Length_1 extends number | undefined = undefined>(length?: Length_1 | undefined) => pqb.BitVaryingColumn<Length_1>;
+            tsvector: () => pqb.TsVectorColumn;
+            tsquery: () => pqb.TsQueryColumn;
+            uuid: () => pqb.UUIDColumn;
+            xml: () => pqb.XMLColumn;
+            json: <Type extends pqb.JSONTypeAny>(schemaOrFn: Type | ((j: {
+                set: <Value extends pqb.JSONTypeAny>(valueType: Value) => pqb.JSONSet<Value>;
+                tuple: <T_1 extends pqb.JSONTupleItems | [], Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest) => pqb.JSONTuple<T_1, Rest>;
+                union: <T_2 extends [pqb.JSONTypeAny, pqb.JSONTypeAny, ...pqb.JSONTypeAny[]]>(types: T_2) => pqb.JSONUnion<T_2>;
+                any: () => pqb.JSONAny;
+                bigint: () => pqb.JSONBigInt;
+                boolean: () => pqb.JSONBoolean;
+                date: () => pqb.JSONDate;
+                nan: () => pqb.JSONNaN;
+                never: () => pqb.JSONNever;
+                null: () => pqb.JSONNull;
+                number: () => pqb.JSONNumber;
+                string: () => pqb.JSONString;
+                undefined: () => pqb.JSONUndefined;
+                unknown: () => pqb.JSONUnknown;
+                void: () => pqb.JSONVoid;
+                array: <Type_1 extends pqb.JSONTypeAny>(element: Type_1) => pqb.JSONArray<Type_1, "many">;
+                discriminatedUnion: <Discriminator extends string, DiscriminatorValue extends pqb.Primitive, Types extends [pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, ...pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>[]]>(discriminator: Discriminator, options: Types) => pqb.JSONDiscriminatedUnion<Discriminator, DiscriminatorValue, Types[number]>;
+                enum: <U_1 extends string, T_3 extends [U_1, ...U_1[]]>(options: T_3) => pqb.JSONEnum<U_1, T_3>;
+                instanceOf: <T_4 extends new (...args: any[]) => any>(cls: T_4) => pqb.JSONInstanceOf<T_4>;
+                intersection: <Left extends pqb.JSONTypeAny, Right extends pqb.JSONTypeAny>(left: Left, right: Right) => pqb.JSONIntersection<Left, Right>;
+                lazy: <T_5 extends pqb.JSONTypeAny>(fn: () => T_5) => pqb.JSONLazy<T_5>;
+                literal: <T_6 extends pqb.Primitive>(value: T_6) => pqb.JSONLiteral<T_6>;
+                map: <Key extends pqb.JSONTypeAny, Value_1 extends pqb.JSONTypeAny>(keyType: Key, valueType: Value_1) => pqb.JSONMap<Key, Value_1>;
+                nativeEnum: <T_7 extends pqb.EnumLike>(givenEnum: T_7) => pqb.JSONNativeEnum<T_7>;
+                nullable: <T_8 extends pqb.JSONTypeAny>(type: T_8) => pqb.JSONNullable<T_8>;
+                nullish: <T_9 extends pqb.JSONTypeAny>(type: T_9) => pqb.JSONNullish<T_9>;
+                object: <T_10 extends pqb.JSONObjectShape, UnknownKeys extends pqb.UnknownKeysParam = "strip", Catchall extends pqb.JSONTypeAny = pqb.JSONTypeAny>(shape: T_10) => pqb.JSONObject<T_10, UnknownKeys, Catchall, pqb.JSONTypeAny extends Catchall ? pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never : (pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
+                    [k: string]: Catchall["type"];
+                } extends infer T_12 extends object ? { [k_2 in keyof T_12]: ((pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
+                    [k: string]: Catchall["type"];
+                })[k_2]; } : never>;
+                optional: <T_13 extends pqb.JSONTypeAny>(type: T_13) => pqb.JSONOptional<T_13>;
+                record: typeof pqb.record;
+            }) => Type)) => pqb.JSONColumn<Type>;
+            jsonText: () => pqb.JSONTextColumn;
+            array: <Item extends pqb.ColumnType<unknown, pqb.Operators, unknown>>(item: Item) => pqb.ArrayColumn<Item>;
+            timestamps: <T_14 extends pqb.ColumnType<unknown, pqb.Operators, unknown>>(this: {
+                timestamp(): T_14;
+            }) => {
+                createdAt: T_14 & {
+                    hasDefault: true;
+                };
+                updatedAt: T_14 & {
+                    hasDefault: true;
+                };
+            };
+            primaryKey(columns: string[], options?: {
+                name?: string | undefined;
+            } | undefined): {};
+            index(columns: pqb.MaybeArray<string | pqb.IndexColumnOptions>, options?: pqb.IndexOptions): {};
+            unique(columns: pqb.MaybeArray<string | pqb.IndexColumnOptions>, options?: pqb.IndexOptions): {};
+            foreignKey: {
+                <Table_1 extends pqb.ForeignKeyTableWithColumns, Columns extends [Exclude<keyof InstanceType<Table_1>["columns"]["shape"], number | symbol>, ...Exclude<keyof InstanceType<Table_1>["columns"]["shape"], number | symbol>[]]>(columns: string[], fn: () => Table_1, foreignColumns: Columns, options?: pqb.ForeignKeyOptions | undefined): {};
+                <Table_2 extends string, Columns_1 extends [string, ...string[]]>(columns: string[], table: Table_2, foreignColumns: Columns_1, options?: pqb.ForeignKeyOptions | undefined): {};
+            };
+        } : CT) => T_15) => {
+            shape: T_15;
+            type: ColumnShapeOutput<T_15>;
         };
         belongsTo<Self extends any, Related extends TableClass<Table>, Scope extends Query, Options extends {
             primaryKey: keyof InstanceType<Related>["columns"]["shape"];

package/dist/index.js

@@ -32,48 +32,53 @@ var path__namespace = /*#__PURE__*/_interopNamespace(path);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var typescript__default = /*#__PURE__*/_interopDefaultLegacy(typescript);
 
-const createBaseTable = (options) => {
+const createBaseTable = (options = { columnTypes: pqb.columnTypes }) => {
+  return create(
+    options.columnTypes
+  );
+};
+const create = (columnTypes2) => {
   return class BaseTable {
     constructor() {
       this.setColumns = (fn) => {
-        const shape = pqb.getColumnTypes(options.columnTypes, fn);
+        const shape = pqb.getColumnTypes(columnTypes2, fn);
         return {
           shape,
           type: void 0
         };
       };
-      this.columnTypes = options.columnTypes;
+      this.columnTypes = columnTypes2;
     }
-    belongsTo(fn, options2) {
+    belongsTo(fn, options) {
       return {
         type: "belongsTo",
         returns: "one",
         fn,
-        options: options2
+        options
       };
     }
-    hasOne(fn, options2) {
+    hasOne(fn, options) {
       return {
         type: "hasOne",
         returns: "one",
         fn,
-        options: options2
+        options
       };
     }
-    hasMany(fn, options2) {
+    hasMany(fn, options) {
       return {
         type: "hasMany",
         returns: "many",
         fn,
-        options: options2
+        options
       };
     }
-    hasAndBelongsToMany(fn, options2) {
+    hasAndBelongsToMany(fn, options) {
       return {
         type: "hasAndBelongsToMany",
         returns: "many",
         fn,
-        options: options2
+        options
       };
     }
   };
@@ -2292,13 +2297,8 @@ const createBaseTableFile = async ({
   await fs__default["default"].writeFile(
     baseTablePath,
     `import { createBaseTable } from 'orchid-orm';
-import { columnTypes } from 'pqb';
 
-export const ${baseTableName} = createBaseTable({
-  columnTypes: {
-    ...columnTypes,
-  },
-});
+export const ${baseTableName} = createBaseTable();
 `,
     {
       flag: "wx"
@@ -2353,6 +2353,10 @@ const appCodeUpdater = (config) => {
   };
 };
 
+Object.defineProperty(exports, 'columnTypes', {
+  enumerable: true,
+  get: function () { return pqb.columnTypes; }
+});
 exports.AppCodeUpdaterError = AppCodeUpdaterError;
 exports.appCodeUpdater = appCodeUpdater;
 exports.createBaseTable = createBaseTable;