@tstdl/base 0.93.21 → 0.93.23

package/application/application.js

@@ -29,7 +29,7 @@ let Application = Application_1 = class Application {
     #shutdownPromise = new DeferredPromise();
     #shutdownToken = inject(CancellationSignal, undefined, { optional: true })?.createChild() ?? new CancellationToken();
     static create(name, providers = []) {
-        const injector = new Injector(`${name}Injector`);
+        const injector = new Injector(`${name}ApplicationInjector`);
         injector.register(APPLICATION_INSTANCE_ID, { useValue: crypto.randomUUID() });
         injector.register(APPLICATION_NAME, { useValue: name });
         for (const providersItem of providers.flat()) {
@@ -110,7 +110,7 @@ let Application = Application_1 = class Application {
     async runModules(modules) {
         const promises = modules.map(async (module) => {
             try {
-                this.#logger.info(`Starting module ${module.name}`);
+                this.#logger.info(`Starting module ${module.name}.`);
                 await runInInjectionContext(this.#injector, async () => await module.run());
                 this.#logger.info(`Module ${module.name} stopped.`);
             }
@@ -126,7 +126,7 @@ let Application = Application_1 = class Application {
             if (module.state == ModuleState.Stopped) {
                 return;
             }
-            this.#logger.info(`Stopping module ${module.name}`);
+            this.#logger.info(`Stopping module ${module.name}.`);
             try {
                 await module.stop();
             }

package/authentication/server/module.d.ts

@@ -15,7 +15,7 @@ export declare class AuthenticationModuleConfig {
     /**
      * Options for {@link AuthenticationService}.
      */
-    serviceOptions?: AuthenticationServiceOptions | Provider<AuthenticationServiceOptions>;
+    serviceOptions: AuthenticationServiceOptions | Provider<AuthenticationServiceOptions>;
     /**
      * Override default {@link AuthenticationService}.
      */

package/authentication/server/module.js

@@ -33,12 +33,7 @@ export class AuthenticationModuleConfig {
  */
 export function configureAuthenticationServer(config) {
     Injector.register(AuthenticationModuleConfig, { useValue: config });
-    if (isDefined(config.serviceOptions)) {
-        Injector.register(AuthenticationServiceOptions, isProvider(config.serviceOptions) ? config.serviceOptions : { useValue: config.serviceOptions });
-    }
-    else {
-        throw new Error('Either serviceOptions or serviceOptionsToken must be provided.');
-    }
+    Injector.register(AuthenticationServiceOptions, isProvider(config.serviceOptions) ? config.serviceOptions : { useValue: config.serviceOptions });
     if (isDefined(config.authenticationService)) {
         Injector.registerSingleton(AuthenticationService, { useToken: config.authenticationService });
     }

package/document-management/api/document-management.api.d.ts

@@ -179,7 +179,6 @@ export declare const documentManagementApiDefinition: {
             parameters: import("../../schema/index.js").ObjectSchema<{
                 id: import("../../orm/types.js").IsPrimaryKey<import("../../orm/types.js").HasDefault<import("../../orm/types.js").Uuid>>;
                 description?: string | null | undefined;
-                readonly __entityMeta__?: import("../../orm/entity.js").EntityMeta | undefined;
                 tenantId?: string | null | undefined;
                 label?: string | undefined;
                 metadata?: Partial<{
@@ -233,7 +232,6 @@ export declare const documentManagementApiDefinition: {
             method: "PATCH";
             parameters: import("../../schema/index.js").ObjectSchema<{
                 id: import("../../orm/types.js").IsPrimaryKey<import("../../orm/types.js").HasDefault<import("../../orm/types.js").Uuid>>;
-                readonly __entityMeta__?: import("../../orm/entity.js").EntityMeta | undefined;
                 tenantId?: string | null | undefined;
                 typeId?: import("../../orm/types.js").Uuid | undefined;
                 comment?: string | null | undefined;
@@ -581,7 +579,6 @@ declare const _DocumentManagementApi: import("../../api/client/index.js").ApiCli
             parameters: import("../../schema/index.js").ObjectSchema<{
                 id: import("../../orm/types.js").IsPrimaryKey<import("../../orm/types.js").HasDefault<import("../../orm/types.js").Uuid>>;
                 description?: string | null | undefined;
-                readonly __entityMeta__?: import("../../orm/entity.js").EntityMeta | undefined;
                 tenantId?: string | null | undefined;
                 label?: string | undefined;
                 metadata?: Partial<{
@@ -635,7 +632,6 @@ declare const _DocumentManagementApi: import("../../api/client/index.js").ApiCli
             method: "PATCH";
             parameters: import("../../schema/index.js").ObjectSchema<{
                 id: import("../../orm/types.js").IsPrimaryKey<import("../../orm/types.js").HasDefault<import("../../orm/types.js").Uuid>>;
-                readonly __entityMeta__?: import("../../orm/entity.js").EntityMeta | undefined;
                 tenantId?: string | null | undefined;
                 typeId?: import("../../orm/types.js").Uuid | undefined;
                 comment?: string | null | undefined;

package/document-management/service-models/document.service-model.d.ts

@@ -97,7 +97,6 @@ export declare const createDocumentRequestsTemplateParametersSchema: import("../
 export declare const updateDocumentRequestsTemplateParametersSchema: import("../../schema/index.js").ObjectSchema<{
     id: import("../../orm/index.js").IsPrimaryKey<import("../../orm/index.js").HasDefault<import("../../orm/index.js").Uuid>>;
     description?: string | null | undefined;
-    readonly __entityMeta__?: import("../../orm/index.js").EntityMeta | undefined;
     tenantId?: string | null | undefined;
     label?: string | undefined;
     metadata?: Partial<{
@@ -127,7 +126,6 @@ export declare const createDocumentRequestTemplateParametersSchema: import("../.
 }>;
 export declare const updateDocumentRequestTemplateParametersSchema: import("../../schema/index.js").ObjectSchema<{
     id: import("../../orm/index.js").IsPrimaryKey<import("../../orm/index.js").HasDefault<import("../../orm/index.js").Uuid>>;
-    readonly __entityMeta__?: import("../../orm/index.js").EntityMeta | undefined;
     tenantId?: string | null | undefined;
     typeId?: import("../../orm/index.js").Uuid | undefined;
     comment?: string | null | undefined;

package/injector/injector.js

@@ -171,7 +171,7 @@ export class Injector {
     }
     resolve(token, argument, options = {}) {
         const context = newInternalResolveContext();
-        const value = this._resolve(token, argument, options, context, ResolveChain.startWith(token));
+        const value = this._resolve(token, argument, options, context, ResolveChain.startWith(this, token));
         try {
             postProcess(context);
             context.$done.resolve();
@@ -187,7 +187,7 @@ export class Injector {
     }
     resolveAll(token, argument, options = {}) {
         const context = newInternalResolveContext();
-        const values = this._resolveAll(token, argument, options, context, ResolveChain.startWith(token));
+        const values = this._resolveAll(token, argument, options, context, ResolveChain.startWith(this, token));
         try {
             postProcess(context);
             context.$done.resolve();
@@ -218,7 +218,7 @@ export class Injector {
     }
     async resolveAsync(token, argument, options = {}) {
         const context = newInternalResolveContext();
-        const value = this._resolve(token, argument, options, context, ResolveChain.startWith(token));
+        const value = this._resolve(token, argument, options, context, ResolveChain.startWith(this, token));
         try {
             await postProcessAsync(context);
             context.$done.resolve();
@@ -234,7 +234,7 @@ export class Injector {
     }
     async resolveAllAsync(token, argument, options = {}) {
         const context = newInternalResolveContext();
-        const values = this._resolveAll(token, argument, options, context, ResolveChain.startWith(token));
+        const values = this._resolveAll(token, argument, options, context, ResolveChain.startWith(this, token));
         try {
             await postProcessAsync(context);
             context.$done.resolve();
@@ -265,8 +265,8 @@ export class Injector {
     }
     _resolveManyTokens(tokens, context) {
         return tokens.map((token) => (isArray(token)
-            ? this._resolve(token[0], token[1], token[2] ?? {}, context, ResolveChain.startWith(token[0]))
-            : this._resolve(token, undefined, {}, context, ResolveChain.startWith(token))));
+            ? this._resolve(token[0], token[1], token[2] ?? {}, context, ResolveChain.startWith(this, token[0]))
+            : this._resolve(token, undefined, {}, context, ResolveChain.startWith(this, token))));
     }
     _resolve(token, argument, options, context, chain) {
         this.assertNotDisposed();
@@ -287,13 +287,13 @@ export class Injector {
         if (isUndefined(token)) {
             throw new ResolveError('Token is undefined. This might be due to a circular dependency. Consider using an alias or forwardRef.', chain);
         }
-        const ownRegistration = this.tryGetRegistration(token, { ...options, skipSelf: false, onlySelf: true });
-        if (isDefined(ownRegistration)) {
-            const singleRegistration = isArray(ownRegistration) ? ownRegistration[0] : ownRegistration;
+        const registration = this.tryGetRegistration(token, options);
+        if (isDefined(registration)) {
+            const singleRegistration = isArray(registration) ? registration[0] : registration;
             return this._resolveRegistration(singleRegistration, argument, options, context, chain);
         }
         if ((options.onlySelf != true) && isNotNull(this.#parent)) {
-            return this.#parent._resolve(token, argument, { ...options, skipSelf: false }, context, chain);
+            return this.#parent._resolve(token, argument, options, context, chain);
         }
         if (options.optional == true) {
             return undefined;
@@ -320,14 +320,14 @@ export class Injector {
         }
         const ownValues = [];
         const parentValues = [];
-        const ownRegistration = this.tryGetRegistration(token, { ...options, skipSelf: false, onlySelf: true });
-        if (isDefined(ownRegistration)) {
-            const registrations = isArray(ownRegistration) ? ownRegistration : [ownRegistration];
+        const registration = this.tryGetRegistration(token, options);
+        if (isDefined(registration)) {
+            const registrations = isArray(registration) ? registration : [registration];
             const resolved = registrations.map((reg) => this._resolveRegistration(reg, argument, options, context, chain));
             ownValues.push(...resolved);
         }
         if ((options.onlySelf != true) && isNotNull(this.#parent)) {
-            parentValues.push(...this.#parent._resolveAll(token, argument, { ...options, skipSelf: false }, context, chain));
+            parentValues.push(...this.#parent._resolveAll(token, argument, options, context, chain));
         }
         const allValues = [...ownValues, ...parentValues];
         if ((allValues.length == 0) && (options.optional != true)) {
@@ -358,7 +358,7 @@ export class Injector {
         }
         // A new scope is only needed if we are instantiating a class, running a factory, or if the registration explicitly defines scoped providers.
         const needsNewScope = isClassProvider(provider) || isFactoryProvider(provider) || (providers.length > 0);
-        const injector = needsNewScope ? this.fork('ResolutionInjector') : this;
+        const injector = needsNewScope ? this.fork(`[${getTokenName(token)}]ResolutionInjector`) : this;
         for (const nestedProvider of providers) {
             injector.registerSingleton(nestedProvider.provide, nestedProvider, { multi: nestedProvider.multi });
         }
@@ -416,9 +416,9 @@ export class Injector {
                 const arg = resolveArgument ?? provider.defaultArgument ?? provider.defaultArgumentProvider?.();
                 injectionContext.argument = arg;
                 if (provider.resolveAll == true) {
-                    return this._resolveAll(innerToken, arg, options, context, chain.addToken(innerToken));
+                    return this._resolveAll(innerToken, arg, options, context, chain.addToken(this, innerToken));
                 }
-                result = { value: this._resolve(innerToken, arg, options, context, chain.addToken(innerToken)) };
+                result = { value: this._resolve(innerToken, arg, options, context, chain.addToken(this, innerToken)) };
             }
             else if (isFactoryProvider(provider)) {
                 const arg = resolveArgument ?? provider.defaultArgument ?? provider.defaultArgumentProvider?.();
@@ -440,7 +440,7 @@ export class Injector {
         }
     }
     resolveClassInjection(resolutionTag, context, constructor, metadata, resolveArgument, chain) {
-        const getChain = (injectToken) => chain.addParameter(constructor, metadata.index, injectToken);
+        const getChain = (injectToken) => chain.addParameter(this, constructor, metadata.index, injectToken);
         const injectMetadata = metadata.data.tryGet(injectMetadataSymbol) ?? {};
         const injectToken = (injectMetadata.injectToken ?? metadata.type);
         if (isDefined(injectMetadata.injectArgumentMapper) && (!this.hasRegistration(injectToken) || isDefined(resolveArgument) || isUndefined(injectToken))) {
@@ -460,7 +460,7 @@ export class Injector {
         return resolved;
     }
     resolveInjection(token, argument, options, context, injectIndex, chain) {
-        return this._resolve(token, argument, options, context, chain.addInject(token, injectIndex));
+        return this._resolve(token, argument, options, context, chain.addInject(this, token, injectIndex));
     }
     async resolveInjectionAsync(token, argument, options, context, injectIndex, chain) {
         const value = this.resolveInjection(token, argument, options, context, injectIndex, chain);
@@ -468,7 +468,7 @@ export class Injector {
         return value;
     }
     resolveInjectionAll(token, argument, options, context, injectIndex, chain) {
-        return this._resolveAll(token, argument, options, context, chain.addInject(token, injectIndex));
+        return this._resolveAll(token, argument, options, context, chain.addInject(this, token, injectIndex));
     }
     async resolveInjectionAllAsync(token, argument, options, context, injectIndex, chain) {
         const values = this.resolveInjectionAll(token, argument, options, context, injectIndex, chain);
@@ -477,8 +477,8 @@ export class Injector {
     }
     getResolveContext(resolutionTag, resolveContext, chain) {
         return {
-            resolve: (token, argument, options) => this._resolve(token, argument, options ?? {}, resolveContext, chain.addToken(token)),
-            resolveAll: (token, argument, options) => this._resolveAll(token, argument, options ?? {}, resolveContext, chain.addToken(token)),
+            resolve: (token, argument, options) => this._resolve(token, argument, options ?? {}, resolveContext, chain.addToken(this, token)),
+            resolveAll: (token, argument, options) => this._resolveAll(token, argument, options ?? {}, resolveContext, chain.addToken(this, token)),
             cancellationSignal: this.#disposeToken,
             addDisposeHandler: this.#addDisposeHandler,
             get data() {

package/injector/resolve-chain.d.ts

@@ -1,6 +1,8 @@
 import type { AbstractConstructor } from '../types/index.js';
+import type { Injector } from './injector.js';
 import type { InjectionToken } from './token.js';
 export type ResolveChainNodeBase<Type extends string> = {
+    injector: Injector;
     type: Type;
     forwardRef?: true;
 };
@@ -23,11 +25,11 @@ export declare class ResolveChain {
     get length(): number;
     /** @deprecated for internal use only */
     constructor(nodes: ResolveChainNode[]);
-    static startWith(token: InjectionToken): ResolveChain;
-    addToken(token: InjectionToken): ResolveChain;
-    addInject(token: InjectionToken, index: number): ResolveChain;
-    addParameter(constructor: AbstractConstructor, index: number, token: InjectionToken): ResolveChain;
-    addProperty(constructor: AbstractConstructor, property: PropertyKey, token: InjectionToken): ResolveChain;
+    static startWith(injector: Injector, token: InjectionToken): ResolveChain;
+    addToken(injector: Injector, token: InjectionToken): ResolveChain;
+    addInject(injector: Injector, token: InjectionToken, index: number): ResolveChain;
+    addParameter(injector: Injector, constructor: AbstractConstructor, index: number, token: InjectionToken): ResolveChain;
+    addProperty(injector: Injector, constructor: AbstractConstructor, property: PropertyKey, token: InjectionToken): ResolveChain;
     markAsForwardRef(forwardToken: InjectionToken): ResolveChain;
     format(truncate?: number): string;
     truncate(tokenCount: number): ResolveChain;

package/injector/resolve-chain.js

@@ -10,24 +10,24 @@ export class ResolveChain {
     constructor(nodes) {
         this.nodes = nodes;
     }
-    static startWith(token) {
+    static startWith(injector, token) {
         const chain = new ResolveChain([]);
-        return chain.addToken(token);
+        return chain.addToken(injector, token);
     }
-    addToken(token) {
-        const node = { type: 'token', token };
+    addToken(injector, token) {
+        const node = { injector, type: 'token', token };
         return new ResolveChain([...this.nodes, node]);
     }
-    addInject(token, index) {
-        const node = { type: 'inject', token, index };
+    addInject(injector, token, index) {
+        const node = { injector, type: 'inject', token, index };
         return new ResolveChain([...this.nodes, node]);
     }
-    addParameter(constructor, index, token) {
-        const node = { type: 'parameter', constructor, index, token };
+    addParameter(injector, constructor, index, token) {
+        const node = { injector, type: 'parameter', constructor, index, token };
         return new ResolveChain([...this.nodes, node]);
     }
-    addProperty(constructor, property, token) {
-        const node = { type: 'property', constructor, property, token };
+    addProperty(injector, constructor, property, token) {
+        const node = { injector, type: 'property', constructor, property, token };
         return new ResolveChain([...this.nodes, node]);
     }
     markAsForwardRef(forwardToken) {
@@ -41,16 +41,18 @@ export class ResolveChain {
         if (chain.length < this.length) {
             chainString += '\n       [...]';
         }
+        const longestInjectorName = Math.max(...chain.nodes.map((node) => node.injector.name.length));
         for (const node of chain.nodes) {
+            const paddedInjectorName = node.injector.name.padStart(longestInjectorName);
             const tokenName = getTokenName(node.token);
             const forwardRefPrefix = node.forwardRef ? 'ForwardRef::' : '';
             switch (node.type) {
                 case 'token':
-                    chainString += `\n    -> ${forwardRefPrefix}${tokenName}`;
+                    chainString += `\n    ${paddedInjectorName} -> ${forwardRefPrefix}${tokenName}`;
                     break;
                 case 'inject':
                     chainString += ` => inject(${forwardRefPrefix}${tokenName}) [${node.index + 1}]`;
-                    chainString += `\n    -> ${tokenName}`;
+                    chainString += `\n    ${paddedInjectorName} -> ${tokenName}`;
                     break;
                 case 'parameter':
                     const metadata = reflectionRegistry.getMetadata(node.constructor);
@@ -58,12 +60,12 @@ export class ResolveChain {
                     const suffix = ', _'.repeat(assertDefinedPass(metadata?.parameters, `missing parameters metadata for ${node.constructor.name}`).length - node.index - 1);
                     chainString += `(${prefix}${forwardRefPrefix}${tokenName}${suffix})`;
                     // chainString += `\n       ${' '.repeat(1 + node.constructor.name.length + forwardRefPrefix.length + prefix.length + (tokenName.length / 2))}↓`;
-                    chainString += `\n    -> ${tokenName}`;
+                    chainString += `\n    ${paddedInjectorName} -> ${tokenName}`;
                     break;
                 case 'property':
                     const constructorName = getTokenName(node.constructor);
                     const key = getPropertyKeyString(node.property);
-                    chainString += `\n    -> ${constructorName}[${key}]: ${forwardRefPrefix}${tokenName}`;
+                    chainString += `\n    ${paddedInjectorName} -> ${constructorName}[${key}]: ${forwardRefPrefix}${tokenName}`;
                     break;
                 default:
                     throw new Error(`unknown chain node type ${node.type}`);

package/logger/manager.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { Singleton } from '../injector/decorators.js';
 import { inject, injectAll } from '../injector/inject.js';
-import { isDefined } from '../utils/type-guards.js';
+import { isArray, isDefined } from '../utils/type-guards.js';
 import { LogLevel } from './level.js';
 import { DEFAULT_LOG_LEVEL } from './tokens.js';
 import { LogTransport } from './transport.js';
@@ -41,7 +41,7 @@ let LogManager = class LogManager {
      * @param level The log level to set
      */
     setModuleLevel(module, level) {
-        const moduleString = Array.isArray(module) ? module.join('.') : module;
+        const moduleString = isArray(module) ? module.join('.') : module;
         if (this.#moduleLevelRules.get(moduleString) === level) {
             return;
         }
@@ -58,7 +58,7 @@ let LogManager = class LogManager {
         if (!isDefined(module) || (module.length == 0)) {
             return this.#defaultLevel;
         }
-        const path = Array.isArray(module) ? module.join('.') : module;
+        const path = isArray(module) ? module.join('.') : module;
         const cachedLevel = this.#moduleLevelCache.get(path);
         if (isDefined(cachedLevel)) {
             return cachedLevel;

package/orm/data-types/bytea.d.ts

@@ -1,18 +1,8 @@
-/**
- * @module
- * Defines a custom Drizzle type for handling PostgreSQL `bytea` columns.
- */
-import { type ConvertCustomConfig, type PgCustomColumnBuilder } from 'drizzle-orm/pg-core';
-type Config = {
-    data: Uint8Array;
-    driverData: Uint8Array;
-};
 /**
  * Custom Drizzle type for PostgreSQL `bytea` columns.
  * Maps between `Uint8Array` in JavaScript and `bytea` in the database.
  */
-export declare const bytea: {
-    (): PgCustomColumnBuilder<ConvertCustomConfig<"", Config>>;
-    <TName extends string>(dbName: TName): PgCustomColumnBuilder<ConvertCustomConfig<TName, Config>>;
-};
-export {};
+export declare const bytea: import("./common.js").CustomTypeBuilder<{
+    data: Uint8Array;
+    driverData: Uint8Array;
+}>;

package/orm/data-types/bytea.js

@@ -2,12 +2,12 @@
  * @module
  * Defines a custom Drizzle type for handling PostgreSQL `bytea` columns.
  */
-import { customType } from 'drizzle-orm/pg-core';
+import { createCustomType } from './common.js';
 /**
  * Custom Drizzle type for PostgreSQL `bytea` columns.
  * Maps between `Uint8Array` in JavaScript and `bytea` in the database.
  */
-export const bytea = customType({
+export const bytea = createCustomType({
     dataType() {
         return 'bytea';
     },

package/orm/data-types/common.d.ts

@@ -0,0 +1,18 @@
+import { type ConvertCustomConfig, type CustomTypeParams, type CustomTypeValues, type PgCustomColumnBuilder } from 'drizzle-orm/pg-core';
+/**
+ * A generic type for a custom Drizzle column builder function.
+ * This provides the overloads for creating a column with or without a specific database name.
+ * @template TConfig The configuration object for the custom type, containing `data` and `driverData` types.
+ */
+export type CustomTypeBuilder<TConfig extends Partial<CustomTypeValues>> = {
+    (): PgCustomColumnBuilder<ConvertCustomConfig<'', TConfig>>;
+    <TName extends string>(dbName: TName): PgCustomColumnBuilder<ConvertCustomConfig<TName, TConfig>>;
+};
+/**
+ * Factory function to create a custom Drizzle type with the standard builder overloads.
+ * This reduces boilerplate by wrapping `drizzle-orm/pg-core#customType` and applying a common type cast.
+ * @template TConfig The configuration object for the custom type.
+ * @param params The parameters for the custom type, including `dataType`, `toDriver`, and `fromDriver`.
+ * @returns A custom type builder function.
+ */
+export declare function createCustomType<TConfig extends CustomTypeValues>(params: CustomTypeParams<TConfig>): CustomTypeBuilder<TConfig>;

package/orm/data-types/common.js

@@ -0,0 +1,11 @@
+import { customType, } from 'drizzle-orm/pg-core';
+/**
+ * Factory function to create a custom Drizzle type with the standard builder overloads.
+ * This reduces boilerplate by wrapping `drizzle-orm/pg-core#customType` and applying a common type cast.
+ * @template TConfig The configuration object for the custom type.
+ * @param params The parameters for the custom type, including `dataType`, `toDriver`, and `fromDriver`.
+ * @returns A custom type builder function.
+ */
+export function createCustomType(params) {
+    return customType(params);
+}

package/orm/data-types/index.d.ts

@@ -3,6 +3,7 @@
  * Exports custom Drizzle data types for PostgreSQL.
  */
 export * from './bytea.js';
+export * from './common.js';
 export * from './numeric-date.js';
 export * from './timestamp.js';
 export * from './tsvector.js';

package/orm/data-types/index.js

@@ -3,6 +3,7 @@
  * Exports custom Drizzle data types for PostgreSQL.
  */
 export * from './bytea.js';
+export * from './common.js';
 export * from './numeric-date.js';
 export * from './timestamp.js';
 export * from './tsvector.js';

package/orm/data-types/numeric-date.d.ts

@@ -1,19 +1,8 @@
-/**
- * @module
- * Defines a custom Drizzle type for handling PostgreSQL `date` columns
- * using numeric representation (YYYYMMDD).
- */
-import { type ConvertCustomConfig, type PgCustomColumnBuilder } from 'drizzle-orm/pg-core';
-type Config = {
-    data: number;
-    driverData: string;
-};
 /**
  * Custom Drizzle type for PostgreSQL `date` columns, storing dates as numeric values (YYYYMMDD).
  * Converts between JavaScript `number` (YYYYMMDD) and database `date` (ISO string).
  */
-export declare const numericDate: {
-    (): PgCustomColumnBuilder<ConvertCustomConfig<"", Config>>;
-    <TName extends string>(dbName: TName): PgCustomColumnBuilder<ConvertCustomConfig<TName, Config>>;
-};
-export {};
+export declare const numericDate: import("./common.js").CustomTypeBuilder<{
+    data: number;
+    driverData: string;
+}>;

package/orm/data-types/numeric-date.js

@@ -3,13 +3,13 @@
  * Defines a custom Drizzle type for handling PostgreSQL `date` columns
  * using numeric representation (YYYYMMDD).
  */
-import { customType } from 'drizzle-orm/pg-core';
 import { dateToNumericDate, numericDateToDateObject } from '../../utils/date-time.js';
+import { createCustomType } from './common.js';
 /**
  * Custom Drizzle type for PostgreSQL `date` columns, storing dates as numeric values (YYYYMMDD).
  * Converts between JavaScript `number` (YYYYMMDD) and database `date` (ISO string).
  */
-export const numericDate = customType({
+export const numericDate = createCustomType({
     dataType() {
         return 'date';
     },

package/orm/data-types/timestamp.d.ts

@@ -1,19 +1,8 @@
-/**
- * @module
- * Defines a custom Drizzle type for handling PostgreSQL `timestamp with time zone` columns
- * using numeric representation (Unix timestamp in milliseconds).
- */
-import { type ConvertCustomConfig, type PgCustomColumnBuilder } from 'drizzle-orm/pg-core';
-type Config = {
-    data: number;
-    driverData: string;
-};
 /**
  * Custom Drizzle type for PostgreSQL `timestamp with time zone` columns, storing timestamps as numeric values (Unix timestamp in milliseconds).
  * Converts between JavaScript `number` (milliseconds since epoch) and database `timestamp with time zone` (ISO string).
  */
-export declare const timestamp: {
-    (): PgCustomColumnBuilder<ConvertCustomConfig<"", Config>>;
-    <TName extends string>(dbName: TName): PgCustomColumnBuilder<ConvertCustomConfig<TName, Config>>;
-};
-export {};
+export declare const timestamp: import("./common.js").CustomTypeBuilder<{
+    data: number;
+    driverData: string;
+}>;

package/orm/data-types/timestamp.js

@@ -3,12 +3,12 @@
  * Defines a custom Drizzle type for handling PostgreSQL `timestamp with time zone` columns
  * using numeric representation (Unix timestamp in milliseconds).
  */
-import { customType } from 'drizzle-orm/pg-core';
+import { createCustomType } from './common.js';
 /**
  * Custom Drizzle type for PostgreSQL `timestamp with time zone` columns, storing timestamps as numeric values (Unix timestamp in milliseconds).
  * Converts between JavaScript `number` (milliseconds since epoch) and database `timestamp with time zone` (ISO string).
  */
-export const timestamp = customType({
+export const timestamp = createCustomType({
     dataType() {
         return 'timestamp with time zone';
     },

package/orm/data-types/tsvector.d.ts

@@ -1,16 +1,6 @@
-/**
- * @module
- * Defines a custom Drizzle type for handling PostgreSQL `tsvector` columns.
- */
-import { type ConvertCustomConfig, type PgCustomColumnBuilder } from 'drizzle-orm/pg-core';
-type Config = {
-    data: unknown;
-};
 /**
  * Custom Drizzle type for PostgreSQL `tsvector` columns.
  */
-export declare const tsvector: {
-    (): PgCustomColumnBuilder<ConvertCustomConfig<"", Config>>;
-    <TName extends string>(dbName: TName): PgCustomColumnBuilder<ConvertCustomConfig<TName, Config>>;
-};
-export {};
+export declare const tsvector: import("./common.js").CustomTypeBuilder<{
+    data: unknown;
+}>;

package/orm/data-types/tsvector.js

@@ -2,11 +2,11 @@
  * @module
  * Defines a custom Drizzle type for handling PostgreSQL `tsvector` columns.
  */
-import { customType } from 'drizzle-orm/pg-core';
+import { createCustomType } from './common.js';
 /**
  * Custom Drizzle type for PostgreSQL `tsvector` columns.
  */
-export const tsvector = customType({
+export const tsvector = createCustomType({
     dataType() {
         return 'tsvector';
     },