@bingtsingw/orchid-helper 0.3.0 → 0.4.0

package/dist/index.d.ts

@@ -1,9 +1,84 @@
-import * as orchid_core from 'orchid-core';
 import * as orchid_orm from 'orchid-orm';
 import { DefaultSchemaConfig } from 'orchid-orm';
+import * as orchid_core from 'orchid-core';
 
 declare const BaseTable: orchid_orm.BaseTableClass<DefaultSchemaConfig, {
-    xEnum: <T extends Record<any, any>>(_: T) => orchid_core.ParseColumn<orchid_core.EncodeColumn<orchid_orm.StringColumn<DefaultSchemaConfig>, unknown, T[keyof T]>, unknown, T[keyof T]>;
+    xEnum: <T extends Record<any, any>>(_: T) => {
+        toCode: (ctx: orchid_core.ColumnToCodeCtx, key: string) => orchid_core.Code;
+        dataType: "varchar";
+        data: orchid_orm.TextColumnData & {
+            maxChars?: number;
+        };
+        toSQL: () => string;
+        operators: orchid_orm.OperatorsText;
+        primaryKey: <T_1 extends orchid_core.PickColumnBaseData, Name extends string>(this: T_1, name?: Name) => orchid_core.PrimaryKeyColumn<T_1, Name>;
+        foreignKey: {
+            <T_1, Table extends orchid_core.ForeignKeyTable, Column extends orchid_core.ColumnNameOfTable<Table>>(this: T_1, fn: () => Table, column: Column, options?: orchid_orm.TableData.References.Options): T_1;
+            <T_1, Table_1 extends string, Column_1 extends string>(this: T_1, table: Table_1, column: Column_1, options?: orchid_orm.TableData.References.Options): T_1;
+        };
+        index: <T_1 extends orchid_orm.PickColumnData>(this: T_1, ...args: [options?: orchid_orm.TableData.Index.ColumnArg] | [name: string, options?: orchid_orm.TableData.Index.ColumnArg]) => T_1;
+        searchIndex: <T_1 extends {
+            data: orchid_orm.ColumnType["data"];
+            dataType: string;
+        }>(this: T_1, ...args: [options?: orchid_orm.TableData.Index.TsVectorColumnArg] | [name: string, options?: orchid_orm.TableData.Index.TsVectorColumnArg]) => T_1;
+        unique: <T_1 extends orchid_orm.PickColumnData, Name_1 extends string>(this: T_1, ...args: [options?: orchid_orm.TableData.Index.UniqueColumnArg] | [name: Name_1, options?: orchid_orm.TableData.Index.UniqueColumnArg]) => orchid_core.UniqueColumn<T_1, Name_1>;
+        comment: <T_1 extends orchid_orm.PickColumnData>(this: T_1, comment: string) => T_1;
+        compression: <T_1 extends orchid_orm.PickColumnData>(this: T_1, compression: string) => T_1;
+        collate: <T_1 extends orchid_orm.PickColumnData>(this: T_1, collate: string) => T_1;
+        modifyQuery: <T_1 extends orchid_orm.PickColumnData>(this: T_1, cb: (q: orchid_orm.Query) => void) => T_1;
+        generated: <T_1 extends orchid_orm.PickColumnData>(this: T_1, ...args: orchid_core.StaticSQLArgs) => T_1;
+        inputSchema: unknown;
+        outputSchema: unknown;
+        querySchema: unknown;
+        type: T[keyof T];
+        inputType: T[keyof T];
+        outputType: T[keyof T];
+        queryType: T[keyof T];
+        error: unknown;
+        encodeFn?: ((input: any) => unknown) | undefined;
+        parseFn?: ((input: unknown) => unknown) | undefined;
+        parseItem?: ((input: string) => unknown) | undefined;
+        default: <T_1 extends Pick<orchid_core.ColumnTypeBase, "type" | "inputType" | "data">, Value extends T_1["type"] | null | orchid_core.RawSQLBase | (() => T_1["inputType"])>(this: T_1, value: Value) => orchid_core.ColumnWithDefault<T_1, Value>;
+        hasDefault: <T_1 extends orchid_core.PickColumnBaseData>(this: T_1) => orchid_core.ColumnWithDefault<T_1, orchid_core.RawSQLBase>;
+        check: <T_1 extends orchid_core.PickColumnBaseData>(this: T_1, sql: orchid_core.RawSQLBase, name?: string) => T_1;
+        nullable: <T_1 extends orchid_core.ColumnTypeBase>(this: T_1) => orchid_core.NullableColumn<T_1, unknown, unknown, unknown>;
+        encode: <T_1 extends {
+            type: unknown;
+        }, Input>(this: T_1, fn: (input: Input) => unknown) => orchid_core.EncodeColumn<T_1, unknown, Input>;
+        parse: <T_1 extends {
+            type: unknown;
+        }, Output>(this: T_1, fn: (input: T_1["type"]) => Output) => orchid_core.ParseColumn<T_1, unknown, Output>;
+        as: <T_1 extends {
+            inputType: unknown;
+            outputType: unknown;
+            data: orchid_core.ColumnDataBase;
+        }, C extends Omit<orchid_core.ColumnTypeBase, "inputType" | "outputType"> & {
+            inputType: T_1["inputType"];
+            outputType: T_1["outputType"];
+        }>(this: T_1, column: C) => C;
+        asType: <T_1, Types extends {
+            type: unknown;
+            inputType: unknown;
+            outputType: unknown;
+            queryType: unknown;
+        }>(this: T_1, _fn: (type: <Type, Input_1 = Type, Output_1 = Type, Query = Type>() => {
+            type: Type;
+            inputType: Input_1;
+            outputType: Output_1;
+            queryType: Query;
+        }) => Types) => { [K in keyof T_1]: K extends keyof Types ? Types[K] : T_1[K]; };
+        input: <T_1 extends {
+            inputSchema: unknown;
+        }, InputSchema extends unknown>(this: T_1, fn: (schema: T_1["inputSchema"]) => InputSchema) => { [K in keyof T_1]: K extends "inputSchema" ? InputSchema : T_1[K]; };
+        output: <T_1 extends {
+            outputSchema: unknown;
+        }, OutputSchema extends unknown>(this: T_1, fn: (schema: T_1["outputSchema"]) => OutputSchema) => { [K in keyof T_1]: K extends "outputSchema" ? OutputSchema : T_1[K]; };
+        query: <T_1 extends {
+            querySchema: unknown;
+        }, QuerySchema extends unknown>(this: T_1, fn: (schema: T_1["querySchema"]) => QuerySchema) => { [K in keyof T_1]: K extends "querySchema" ? QuerySchema : T_1[K]; };
+        name: <T_1 extends orchid_core.PickColumnBaseData>(this: T_1, name: string) => T_1;
+        hidden: <T_1 extends orchid_core.PickColumnBaseData>(this: T_1) => orchid_core.HiddenColumn<T_1>;
+    };
     xJsonText: () => orchid_core.EncodeColumn<orchid_orm.JSONTextColumn<DefaultSchemaConfig>, unknown, any[] | Record<string, any>>;
     xTimestamp: () => orchid_core.ParseColumn<orchid_orm.TimestampColumn<DefaultSchemaConfig>, unknown, Date>;
     createdAt: () => orchid_core.ParseColumn<orchid_core.ColumnWithDefault<orchid_core.ColumnWithDefault<orchid_orm.TimestampColumn<DefaultSchemaConfig>, orchid_core.RawSQLBase<orchid_core.QueryColumn<unknown, any>, unknown>>, () => string>, unknown, Date>;

package/dist/index.js

@@ -1 +1 @@
-import{createId as m}from"@paralleldrive/cuid2";import{createBaseTable as u}from"orchid-orm";var o=e=>()=>e.string(36).primaryKey().default(()=>m()),n=e=>()=>e.timestampsNoTZ().createdAt.default(()=>new Date().toISOString()).asDate(),s=e=>()=>e.timestampsNoTZ().updatedAt.default(()=>new Date().toISOString()).asDate(),r=e=>()=>e.timestampNoTZ().asDate().nullable(),f=u({snakeCase:!0,nowSQL:"now()::timestamptz(3) AT TIME ZONE 'UTC'",columnTypes:e=>({...e,xEnum:t=>e.string().encode(a=>a).parse(a=>a),xJsonText:()=>e.jsonText().encode(t=>{if(typeof t!="object")throw new Error("Invalid value for JSON column");return JSON.stringify(t)}),xTimestamp:()=>e.timestampNoTZ().asDate(),createdAt:n(e),updatedAt:s(e),deletedAt:r(e),cuid:o(e),baseColumns:()=>({id:o(e)(),createdAt:n(e)(),updatedAt:s(e)(),deletedAt:r(e)()})})});export{f as BaseTable};
+import{createId as m}from"@paralleldrive/cuid2";import{createBaseTable as u}from"orchid-orm";var a=e=>()=>e.string(36).primaryKey().default(()=>m()),o=e=>()=>e.timestampsNoTZ().createdAt.default(()=>new Date().toISOString()).asDate(),n=e=>()=>e.timestampsNoTZ().updatedAt.default(()=>new Date().toISOString()).asDate(),r=e=>()=>e.timestampNoTZ().asDate().nullable(),i=u({snakeCase:!0,nowSQL:"now()::timestamptz(3) AT TIME ZONE 'UTC'",columnTypes:e=>({...e,xEnum:t=>e.string().asType(s=>s()),xJsonText:()=>e.jsonText().encode(t=>{if(typeof t!="object")throw new Error("Invalid value for JSON column");return JSON.stringify(t)}),xTimestamp:()=>e.timestampNoTZ().asDate(),createdAt:o(e),updatedAt:n(e),deletedAt:r(e),cuid:a(e),baseColumns:()=>({id:a(e)(),createdAt:o(e)(),updatedAt:n(e)(),deletedAt:r(e)()})})});export{i as BaseTable};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bingtsingw/orchid-helper",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",

package/src/base-table.ts

@@ -30,11 +30,7 @@ export const BaseTable = createBaseTable({
     ...t,
 
     // Extend built-in methods
-    xEnum: <T extends Record<any, any>>(_: T) =>
-      t
-        .string()
-        .encode((v: T[keyof T]) => v)
-        .parse((v) => v as unknown as T[keyof T]),
+    xEnum: <T extends Record<any, any>>(_: T) => t.string().asType((t) => t<T[keyof T]>()),
     xJsonText: () =>
       t.jsonText().encode((v: Record<string, any> | any[]) => {
         if (typeof v !== 'object') throw new Error('Invalid value for JSON column');