@bingtsingw/orchid-helper 0.5.0 → 1.0.1

package/dist/index.d.ts

@@ -1,58 +1,41 @@
 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) => {
-        toCode: (ctx: orchid_core.ColumnToCodeCtx, key: string) => orchid_core.Code;
+        toCode: (ctx: orchid_orm.ColumnToCodeCtx, key: string) => orchid_orm.Code;
         dataType: "varchar";
         data: orchid_orm.TextColumnData & {
             maxChars?: number;
         };
+        operators: orchid_orm.OperatorsOrdinalText;
         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];
+        type: string;
         inputType: T[keyof T];
         outputType: T[keyof T];
         queryType: T[keyof T];
+        nullType: unknown;
+        nullSchema: unknown;
+        isNullable: boolean;
         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>;
+        _parse?: ((input: unknown) => unknown) | undefined;
+        default: <T_1 extends orchid_orm.Column.Pick.DataAndInputType, Value extends orchid_orm.RawSqlBase | T_1["inputType"] | (() => T_1["inputType"]) | null>(this: T_1, value: Value) => orchid_orm.Column.Modifiers.Default<T_1, Value>;
+        hasDefault: <T_1 extends orchid_orm.Column.Pick.Data>(this: T_1) => orchid_orm.Column.Modifiers.Default<T_1, orchid_orm.RawSqlBase>;
+        check: <T_1 extends orchid_orm.Column.Pick.Data>(this: T_1, sql: orchid_orm.RawSqlBase, name?: string) => T_1;
+        nullable: <T_1 extends orchid_orm.Column.Pick.ForNullable>(this: T_1) => orchid_orm.Column.Modifiers.Nullable<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>;
+        }, Input>(this: T_1, fn: (input: Input) => unknown) => orchid_orm.Column.Modifiers.Encode<T_1, unknown, Input>;
+        parse: <T_1 extends orchid_orm.Column.Pick.ForParse, Output>(this: T_1, fn: (input: T_1["type"]) => Output) => orchid_orm.Column.Modifiers.Parse<T_1, unknown, Output>;
+        parseNull: <T_1 extends orchid_orm.Column.Pick.ForParseNull, Output_1>(this: T_1, fn: () => Output_1) => orchid_orm.Column.Modifiers.ParseNull<T_1, unknown, Output_1>;
         as: <T_1 extends {
             inputType: unknown;
             outputType: unknown;
-            data: orchid_core.ColumnDataBase;
-        }, C extends Omit<orchid_core.ColumnTypeBase, "inputType" | "outputType"> & {
+            data: orchid_orm.Column.Data;
+        }, C extends {
             inputType: T_1["inputType"];
             outputType: T_1["outputType"];
         }>(this: T_1, column: C) => C;
@@ -61,12 +44,26 @@ declare const BaseTable: orchid_orm.BaseTableClass<DefaultSchemaConfig, {
             inputType: unknown;
             outputType: unknown;
             queryType: unknown;
-        }>(this: T_1, _fn: (type: <Type, Input_1 = Type, Output_1 = Type, Query = Type>() => {
+        }>(this: T_1, _fn: (type: <Type, Input_1 = Type, Output_2 = Type, Query = Type>() => {
             type: Type;
             inputType: Input_1;
-            outputType: Output_1;
+            outputType: Output_2;
             queryType: Query;
         }) => Types) => { [K in keyof T_1]: K extends keyof Types ? Types[K] : T_1[K]; };
+        narrowType: <T_1 extends orchid_orm.Column.InputOutputQueryTypes, Types_1 extends orchid_orm.Column.InputOutputQueryTypes>(this: T_1, _fn: (type: <Type extends T_1["inputType"] extends T_1["outputType"] & T_1["queryType"] ? T_1["outputType"] & T_1["queryType"] : T_1["inputType"] & T_1["outputType"] & T_1["queryType"]>() => {
+            inputType: T_1["inputType"] extends never ? never : Type;
+            outputType: Type;
+            queryType: Type;
+        }) => Types_1) => { [K in keyof T_1]: K extends keyof Types_1 ? Types_1[K] : T_1[K]; };
+        narrowAllTypes: <T_1 extends orchid_orm.Column.InputOutputQueryTypes, Types_2 extends orchid_orm.Column.InputOutputQueryTypes>(this: T_1, _fn: (type: <Types_3 extends {
+            input?: T_1["inputType"];
+            output?: T_1["outputType"];
+            query?: T_1["queryType"];
+        }>() => {
+            inputType: undefined extends Types_3["input"] ? T_1["inputType"] : Types_3["input"];
+            outputType: undefined extends Types_3["output"] ? T_1["outputType"] : Types_3["output"];
+            queryType: undefined extends Types_3["query"] ? T_1["queryType"] : Types_3["query"];
+        }) => Types_2) => { [K in keyof T_1]: K extends keyof Types_2 ? Types_2[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]; };
@@ -76,23 +73,50 @@ declare const BaseTable: orchid_orm.BaseTableClass<DefaultSchemaConfig, {
         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>;
+        name: <T_1 extends orchid_orm.Column.Pick.Data>(this: T_1, name: string) => T_1;
+        select: <T_1 extends orchid_orm.Column.Pick.Data, Value_1 extends boolean>(this: T_1, value: Value_1) => orchid_orm.Column.Modifiers.DefaultSelect<T_1, Value_1>;
+        readOnly: <T_1>(this: T_1) => T_1 & orchid_orm.Column.Modifiers.IsAppReadOnly;
+        setOnCreate: <T_1 extends orchid_orm.Column.Pick.QueryInit>(this: T_1, fn: (arg: orchid_orm.QueryHookUtils<orchid_orm.PickQueryInputType>) => void | T_1["inputType"]) => T_1;
+        setOnUpdate: <T_1 extends orchid_orm.Column.Pick.QueryInit>(this: T_1, fn: (arg: orchid_orm.QueryHookUtils<orchid_orm.PickQueryInputType>) => void | T_1["inputType"]) => T_1;
+        setOnSave: <T_1 extends orchid_orm.Column.Pick.QueryInit>(this: T_1, fn: (arg: orchid_orm.QueryHookUtils<orchid_orm.PickQueryInputType>) => void | T_1["inputType"]) => T_1;
+        primaryKey: <T_1 extends orchid_orm.Column.Pick.Data, Name extends string>(this: T_1, name?: Name | undefined) => T_1 & orchid_orm.Column.Modifiers.IsPrimaryKey<Name>;
+        foreignKey: {
+            <T_1, Shape>(this: T_1, fn: () => new () => {
+                columns: {
+                    shape: Shape;
+                };
+            }, column: keyof Shape, options?: orchid_orm.TableData.References.Options): T_1;
+            <T_1, Table extends string, Column extends string>(this: T_1, table: Table, column: Column, options?: orchid_orm.TableData.References.Options): T_1;
+        };
+        index: <T_1 extends orchid_orm.Column.Pick.Data>(this: T_1, options?: orchid_orm.TableData.Index.ColumnArg | undefined) => T_1;
+        searchIndex: <T_1 extends {
+            data: orchid_orm.Column["data"];
+            dataType: string;
+        }>(this: T_1, options?: orchid_orm.TableData.Index.TsVectorColumnArg | undefined) => T_1;
+        unique: <T_1 extends orchid_orm.Column.Pick.Data, const Options extends orchid_orm.TableData.Index.ColumnArg>(this: T_1, options?: Options | undefined) => T_1 & orchid_orm.Column.Modifiers.IsUnique<Options["name"] & string>;
+        exclude: <T_1 extends orchid_orm.Column.Pick.Data>(this: T_1, op: string, options?: orchid_orm.TableData.Exclude.ColumnArg | undefined) => T_1;
+        comment: <T_1 extends orchid_orm.Column.Pick.Data>(this: T_1, comment: string) => T_1;
+        compression: <T_1 extends orchid_orm.Column.Pick.Data>(this: T_1, compression: string) => T_1;
+        collate: <T_1 extends orchid_orm.Column.Pick.Data>(this: T_1, collate: string) => T_1;
+        modifyQuery: <T_1 extends orchid_orm.Column.Pick.Data>(this: T_1, cb: (q: orchid_orm.Query) => void) => T_1;
+        generated: <T_1 extends orchid_orm.Column.Pick.Data>(this: T_1, ...args: orchid_orm.StaticSQLArgs) => orchid_orm.Column.Modifiers.Generated<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>;
-    updatedAt: () => 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>;
-    deletedAt: () => orchid_core.NullableColumn<orchid_core.ParseColumn<orchid_orm.TimestampColumn<DefaultSchemaConfig>, unknown, Date>, unknown, unknown, unknown>;
-    cuid: () => orchid_core.ColumnWithDefault<orchid_core.PrimaryKeyColumn<orchid_orm.StringColumn<DefaultSchemaConfig>, string>, () => string>;
-    baseColumns: () => {
-        id: orchid_core.ColumnWithDefault<orchid_core.PrimaryKeyColumn<orchid_orm.StringColumn<DefaultSchemaConfig>, string>, () => string>;
-        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>;
-        updatedAt: 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>;
-        deletedAt: orchid_core.NullableColumn<orchid_core.ParseColumn<orchid_orm.TimestampColumn<DefaultSchemaConfig>, unknown, Date>, unknown, unknown, unknown>;
+    xJsonText: () => orchid_orm.Column.Modifiers.Encode<orchid_orm.JSONTextColumn<DefaultSchemaConfig>, unknown, any[] | Record<string, any>>;
+    xTimestamp: () => orchid_orm.Column.Modifiers.Parse<orchid_orm.TimestampColumn<DefaultSchemaConfig>, unknown, Date>;
+    createdAt: () => orchid_orm.Column.Modifiers.Parse<orchid_orm.Column.Modifiers.Default<orchid_orm.Column.Modifiers.Default<orchid_orm.TimestampColumn<DefaultSchemaConfig>, orchid_orm.RawSqlBase>, () => string>, unknown, Date>;
+    updatedAt: () => orchid_orm.Column.Modifiers.Parse<orchid_orm.Column.Modifiers.Default<orchid_orm.Column.Modifiers.Default<orchid_orm.TimestampColumn<DefaultSchemaConfig>, orchid_orm.RawSqlBase>, () => string>, unknown, Date>;
+    deletedAt: () => orchid_orm.Column.Modifiers.Nullable<orchid_orm.Column.Modifiers.Parse<orchid_orm.TimestampColumn<DefaultSchemaConfig>, unknown, Date>, unknown, unknown, unknown>;
+    cuid: () => orchid_orm.Column.Modifiers.Default<orchid_orm.StringColumn<DefaultSchemaConfig> & orchid_orm.Column.Modifiers.IsPrimaryKey<string>, () => string>;
+    baseColumns: (option?: {
+        strategy: "uuid25" | "cuid2" | "shortid";
+    }) => {
+        id: orchid_orm.Column.Modifiers.Default<orchid_orm.StringColumn<DefaultSchemaConfig> & orchid_orm.Column.Modifiers.IsPrimaryKey<string>, () => string>;
+        createdAt: orchid_orm.Column.Modifiers.Parse<orchid_orm.Column.Modifiers.Default<orchid_orm.Column.Modifiers.Default<orchid_orm.TimestampColumn<DefaultSchemaConfig>, orchid_orm.RawSqlBase>, () => string>, unknown, Date>;
+        updatedAt: orchid_orm.Column.Modifiers.Parse<orchid_orm.Column.Modifiers.Default<orchid_orm.Column.Modifiers.Default<orchid_orm.TimestampColumn<DefaultSchemaConfig>, orchid_orm.RawSqlBase>, () => string>, unknown, Date>;
+        deletedAt: orchid_orm.Column.Modifiers.Nullable<orchid_orm.Column.Modifiers.Parse<orchid_orm.TimestampColumn<DefaultSchemaConfig>, unknown, Date>, unknown, unknown, unknown>;
     };
     schema: DefaultSchemaConfig;
-    enum: <U extends string, T extends readonly [U, ...U[]]>(dataType: string, type: T) => orchid_orm.EnumColumn<DefaultSchemaConfig, unknown, U, T>;
+    enum: <const T extends readonly [string, ...string[]]>(dataType: string, type: T) => orchid_orm.EnumColumn<DefaultSchemaConfig, unknown, T>;
     array: <Item extends orchid_orm.ArrayColumnValue>(item: Item) => orchid_orm.ArrayColumn<DefaultSchemaConfig, Item, unknown, unknown, unknown>;
     name<T>(this: T, name: string): T;
     sql: orchid_orm.SqlFn;
@@ -103,7 +127,7 @@ declare const BaseTable: orchid_orm.BaseTableClass<DefaultSchemaConfig, {
     decimal: (precision?: number, scale?: number) => orchid_orm.DecimalColumn<DefaultSchemaConfig>;
     real: () => orchid_orm.RealColumn<DefaultSchemaConfig>;
     doublePrecision: () => orchid_orm.DoublePrecisionColumn<DefaultSchemaConfig>;
-    identity(options?: orchid_orm.TableData.Identity): orchid_core.ColumnWithDefault<orchid_orm.IntegerColumn<DefaultSchemaConfig>, orchid_core.Expression<orchid_core.QueryColumn<unknown, any>>>;
+    identity(options?: orchid_orm.TableData.Identity): orchid_orm.Column.Modifiers.Default<orchid_orm.IntegerColumn<DefaultSchemaConfig>, orchid_orm.Expression<orchid_orm.Column.Pick.QueryColumn>>;
     smallSerial: () => orchid_orm.SmallSerialColumn<DefaultSchemaConfig>;
     serial: () => orchid_orm.SerialColumn<DefaultSchemaConfig>;
     bigSerial: () => orchid_orm.BigSerialColumn<DefaultSchemaConfig>;
@@ -136,16 +160,19 @@ declare const BaseTable: orchid_orm.BaseTableClass<DefaultSchemaConfig, {
     tsquery(): orchid_orm.TsQueryColumn<DefaultSchemaConfig>;
     uuid(): orchid_orm.UUIDColumn<DefaultSchemaConfig>;
     xml(): orchid_orm.XMLColumn<DefaultSchemaConfig>;
-    json: <T>() => orchid_orm.JSONColumn<unknown extends T ? orchid_core.MaybeArray<string | number | boolean | orchid_core.RecordUnknown> : T, DefaultSchemaConfig>;
+    json: <T>() => orchid_orm.JSONColumn<unknown extends T ? orchid_orm.MaybeArray<string | number | boolean | object> : T, DefaultSchemaConfig>;
     jsonText(): orchid_orm.JSONTextColumn<DefaultSchemaConfig>;
     type(dataType: string): orchid_orm.CustomTypeColumn<DefaultSchemaConfig>;
     domain(dataType: string): orchid_orm.DomainColumn<DefaultSchemaConfig>;
-    timestamps<T extends orchid_core.ColumnTypeBase>(this: {
+    geography: {
+        point(): orchid_orm.PostgisGeographyPointColumn<DefaultSchemaConfig>;
+    };
+    timestamps<T extends orchid_orm.Column.Pick.Data>(this: {
         timestamp(): T;
-    }): orchid_core.Timestamps<T>;
-    timestampsNoTZ<T extends orchid_core.ColumnTypeBase>(this: {
+    }): orchid_orm.Timestamps<T>;
+    timestampsNoTZ<T extends orchid_orm.Column.Pick.Data>(this: {
         timestampNoTZ(): T;
-    }): orchid_core.Timestamps<T>;
+    }): orchid_orm.Timestamps<T>;
 }>;
 
 export { BaseTable };

package/dist/index.js

@@ -1 +1 @@
-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};
+import{cuid2 as s}from"@xstools/utility/cuid2";import{uuid25encode as i}from"@xstools/utility/string";import{createBaseTable as m}from"orchid-orm";import{v7 as d}from"uuid";var o=e=>()=>e.string(36).primaryKey().default(()=>s()),l=e=>()=>e.string(36).primaryKey().default(()=>{let t="";return typeof Bun<"u"?t=Bun.randomUUIDv7():t=d(),i(t)}),f=e=>()=>e.string(36).primaryKey().default(()=>s(6)),n=e=>()=>e.timestampsNoTZ().createdAt.default(()=>new Date().toISOString()).asDate(),r=e=>()=>e.timestampsNoTZ().updatedAt.default(()=>new Date().toISOString()).asDate(),u=e=>()=>e.timestampNoTZ().asDate().nullable(),D=m({snakeCase:!0,nowSQL:"clock_timestamp()::timestamptz(3) AT TIME ZONE 'UTC'",columnTypes:e=>({...e,xEnum:t=>e.string().narrowType(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:r(e),deletedAt:u(e),cuid:o(e),baseColumns:t=>({id:t?.strategy==="cuid2"?o(e)():t?.strategy==="shortid"?f(e)():l(e)(),createdAt:n(e)(),updatedAt:r(e)(),deletedAt:u(e)()})})});export{D as BaseTable};

package/package.json

@@ -1,6 +1,11 @@
 {
   "name": "@bingtsingw/orchid-helper",
-  "version": "0.5.0",
+  "version": "1.0.1",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/bingtsingw/orchid-helper.git",
+    "directory": "packages/helper"
+  },
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -12,13 +17,15 @@
   "eslintConfig": {
     "extends": "@xstools-dev/eslint-config/base"
   },
+  "dependencies": {
+    "@xstools/utility": "^0.20.2",
+    "uuid": "^13.0.0"
+  },
   "devDependencies": {
-    "@paralleldrive/cuid2": "^2.2.2",
-    "orchid-orm": "^1.35.0"
+    "orchid-orm": "1.62.1"
   },
   "peerDependencies": {
-    "@paralleldrive/cuid2": "^2.2.2",
-    "orchid-orm": "^1.34.5"
+    "orchid-orm": "^1.62.1"
   },
   "publishConfig": {
     "access": "public",

package/src/base-table.ts

@@ -1,12 +1,34 @@
-import { createId } from '@paralleldrive/cuid2';
+import { cuid2 } from '@xstools/utility/cuid2';
+import { uuid25encode } from '@xstools/utility/string';
 import type { DefaultColumnTypes, DefaultSchemaConfig } from 'orchid-orm';
 import { createBaseTable } from 'orchid-orm';
+import { v7 } from 'uuid';
 
 const cuid = (t: DefaultColumnTypes<DefaultSchemaConfig>) => () =>
   t
     .string(36)
     .primaryKey()
-    .default(() => createId());
+    .default(() => cuid2());
+
+const uuid25 = (t: DefaultColumnTypes<DefaultSchemaConfig>) => () =>
+  t
+    .string(36)
+    .primaryKey()
+    .default(() => {
+      let uuid = '';
+      if (typeof Bun !== 'undefined') {
+        uuid = Bun.randomUUIDv7();
+      } else {
+        uuid = v7();
+      }
+      return uuid25encode(uuid);
+    });
+
+const shortid = (t: DefaultColumnTypes<DefaultSchemaConfig>) => () =>
+  t
+    .string(36)
+    .primaryKey()
+    .default(() => cuid2(6));
 
 const createdAt = (t: DefaultColumnTypes<DefaultSchemaConfig>) => () =>
   t
@@ -24,13 +46,13 @@ const deletedAt = (t: DefaultColumnTypes<DefaultSchemaConfig>) => () => t.timest
 
 export const BaseTable = createBaseTable({
   snakeCase: true,
-  nowSQL: `now()::timestamptz(3) AT TIME ZONE 'UTC'`,
+  nowSQL: `clock_timestamp()::timestamptz(3) AT TIME ZONE 'UTC'`,
 
   columnTypes: (t) => ({
     ...t,
 
     // Extend built-in methods
-    xEnum: <T extends Record<any, any>>(_: T) => t.string().asType((t) => t<T[keyof T]>()),
+    xEnum: <T extends Record<any, any>>(_: T) => t.string().narrowType((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');
@@ -45,9 +67,12 @@ export const BaseTable = createBaseTable({
     deletedAt: deletedAt(t),
     cuid: cuid(t),
 
-    baseColumns: () => {
+    // default to uuid25
+    baseColumns: (option?: { strategy: 'uuid25' | 'cuid2' | 'shortid' }) => {
+      const id = option?.strategy === 'cuid2' ? cuid(t)() : option?.strategy === 'shortid' ? shortid(t)() : uuid25(t)();
+
       return {
-        id: cuid(t)(),
+        id,
         createdAt: createdAt(t)(),
         updatedAt: updatedAt(t)(),
         deletedAt: deletedAt(t)(),