@kanjijs/store 0.2.0-beta.14 → 0.2.0-beta.15

package/dist/contracts/src/index.d.ts

@@ -0,0 +1,27 @@
+export type SchemaLike = unknown;
+export interface ContractRequestSpec<T = SchemaLike> {
+    params?: T;
+    query?: T;
+    headers?: T;
+    cookies?: T;
+    body?: T;
+}
+export interface ContractResponseSpec<T = SchemaLike> {
+    [status: number]: T;
+}
+export interface ContractSpec<T = SchemaLike> {
+    request?: ContractRequestSpec<T>;
+    response?: ContractResponseSpec<T>;
+}
+export interface ValidatorAdapter<S = SchemaLike> {
+    parse<O = unknown>(schema: S, data: unknown): Promise<{
+        success: true;
+        data: O;
+    } | {
+        success: false;
+        issues: unknown[];
+    }>;
+}
+export declare class Contract {
+    static json<T = SchemaLike>(spec: ContractRequestSpec<T>): ContractSpec<T>;
+}

package/dist/core/src/context.d.ts

@@ -0,0 +1,7 @@
+import { AsyncLocalStorage } from "node:async_hooks";
+export interface RequestContext {
+    requestId: string;
+    [key: string]: any;
+}
+export declare const kanjijsContext: AsyncLocalStorage<RequestContext>;
+export declare function getRequestId(): string | undefined;

package/dist/core/src/decorators.d.ts

@@ -0,0 +1,34 @@
+import type { ContractSpec } from "@kanjijs/contracts";
+import { type ModuleMetadata, type Token } from "./metadata";
+/**
+ * @Module({ controllers: [...] })
+ */
+export declare function Module(metadata: ModuleMetadata): ClassDecorator;
+/**
+ * @Contract({ ... })
+ */
+export declare function Contract(spec: ContractSpec): MethodDecorator;
+/**
+ * @Controller('/users')
+ */
+export declare function Controller(prefix?: string): ClassDecorator;
+export declare function Injectable(): ClassDecorator;
+export declare const Get: (path?: string) => MethodDecorator;
+export declare const Post: (path?: string) => MethodDecorator;
+export declare const Put: (path?: string) => MethodDecorator;
+export declare const Delete: (path?: string) => MethodDecorator;
+export declare const Patch: (path?: string) => MethodDecorator;
+/**
+ * @Inject("DATABASE_CLIENT")
+ */
+export declare function Inject(token: Token<unknown>): ParameterDecorator;
+/**
+ * @Use(middleware1, middleware2)
+ * Attaches middlewares to a controller or method.
+ */
+export declare function Use(...middlewares: unknown[]): MethodDecorator & ClassDecorator;
+export declare const Body: (data?: string) => ParameterDecorator;
+export declare const Query: (data?: string) => ParameterDecorator;
+export declare const Param: (data?: string) => ParameterDecorator;
+export declare const Headers: (data?: string) => ParameterDecorator;
+export declare const Ctx: (data?: string) => ParameterDecorator;

package/dist/core/src/di/container.d.ts

@@ -0,0 +1,26 @@
+import { type Constructor, type Token } from "../metadata";
+import "reflect-metadata";
+export declare class KanjijsIoC {
+    private static providers;
+    static register<T>(target: Constructor<T>): void;
+    static register<T>(token: Token<T>, provider: {
+        useValue?: T;
+        useClass?: Constructor<T>;
+    }): void;
+    static resolve<T>(target: Token<T>): T;
+    static clear(): void;
+}
+/**
+ * V2 STRICT CONTAINER
+ * Instance-based, no auto-registration, explicit visibility.
+ */
+export declare class Container {
+    private providers;
+    register<T>(token: Token<T>, provider: {
+        useValue?: T;
+        useClass?: Constructor<T>;
+        useFactory?: (...args: unknown[]) => T;
+        inject?: Array<Token<unknown>>;
+    }): void;
+    resolve<T>(token: Token<T>): T;
+}

package/dist/core/src/di/module-compiler.d.ts

@@ -0,0 +1,11 @@
+import { type Constructor } from "../metadata";
+import { Container } from "./container";
+export declare class ModuleCompiler {
+    private nodes;
+    private globalExportedTokens;
+    compile(rootModule: Constructor): Container;
+    private scan;
+    private processProviders;
+    private validate;
+    private checkDependencies;
+}

package/dist/core/src/exceptions/exception.filter.d.ts

@@ -0,0 +1,3 @@
+export interface ExceptionFilter<T = any, C = any> {
+    catch(exception: T, context: C): void | Promise<void> | any;
+}

package/dist/core/src/exceptions/http.exception.d.ts

@@ -0,0 +1,7 @@
+export declare class HttpException extends Error {
+    readonly response: string | object;
+    readonly status: number;
+    constructor(response: string | object, status: number);
+    getResponse(): string | object;
+    getStatus(): number;
+}

package/dist/core/src/index.d.ts

@@ -0,0 +1,9 @@
+export type { ContractRequestSpec, ContractResponseSpec, ContractSpec, SchemaLike, ValidatorAdapter, } from "@kanjijs/contracts";
+export * from "./context";
+export * from "./decorators";
+export * from "./di/container";
+export * from "./di/module-compiler";
+export * from "./exceptions/exception.filter";
+export * from "./exceptions/http.exception";
+export * from "./metadata";
+export declare const GLOBAL_MIDDLEWARE_TOKEN: unique symbol;

package/dist/core/src/metadata.d.ts

@@ -0,0 +1,64 @@
+import type { ContractSpec } from "@kanjijs/contracts";
+import "reflect-metadata";
+export type Constructor<T = unknown> = new (...args: unknown[]) => T;
+export type HttpMethod = "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
+export type RouteParamType = "BODY" | "QUERY" | "PARAM" | "HEADERS" | "CONTEXT";
+export interface RouteParamMetadata {
+    index: number;
+    type: RouteParamType;
+    data?: string;
+}
+export interface RouteMetadata {
+    method: HttpMethod;
+    path: string;
+    contract?: ContractSpec;
+    middlewares?: unknown[];
+    params?: RouteParamMetadata[];
+}
+export interface ControllerMetadata {
+    prefix: string;
+    middlewares?: unknown[];
+}
+export type Token<T = unknown> = string | symbol | Constructor<T>;
+export type Provider<T = unknown> = Constructor<T> | {
+    provide: Token<T>;
+    useValue: T;
+} | {
+    provide: Token<T>;
+    useClass: Constructor<T>;
+} | {
+    provide: Token<T>;
+    useFactory: (...args: unknown[]) => T | Promise<T>;
+    inject?: Token[];
+};
+export interface DynamicModule {
+    module: Constructor;
+    providers?: Provider[];
+    imports?: Array<Constructor | DynamicModule>;
+    exports?: Token[];
+    global?: boolean;
+}
+export interface ModuleMetadata {
+    controllers?: Constructor[];
+    providers?: Provider[];
+    imports?: Array<Constructor | DynamicModule>;
+    exports?: Token[];
+    global?: boolean;
+}
+export interface IMetadataStorage {
+    addRoute(target: object, methodName: string, meta: RouteMetadata): void;
+    addContract(target: object, methodName: string, contract: ContractSpec): void;
+    addMiddleware(target: object, middleware: unknown, methodName?: string): void;
+    getRoutes(target: object): Map<string, RouteMetadata> | undefined;
+    setController(target: object, meta: ControllerMetadata): void;
+    getController(target: object): ControllerMetadata | undefined;
+    defineModule(target: object, meta: ModuleMetadata): void;
+    getModule(target: object): ModuleMetadata | undefined;
+    addInjection(target: object, index: number, token: Token<unknown>): void;
+    getInjections(target: object): Map<number, Token<unknown>> | undefined;
+    addRouteParam(target: object, methodName: string, param: RouteParamMetadata): void;
+}
+declare global {
+    var KANJI_METADATA_STORAGE: IMetadataStorage | undefined;
+}
+export declare const MetadataStorage: IMetadataStorage;

package/dist/index.js

@@ -1,17 +1,4 @@
 // @bun
-var __legacyDecorateClassTS = function(decorators, target, key, desc) {
-  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
-    r = Reflect.decorate(decorators, target, key, desc);
-  else
-    for (var i = decorators.length - 1;i >= 0; i--)
-      if (d = decorators[i])
-        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-
-// ../core/dist/index.js
-import { AsyncLocalStorage } from "async_hooks";
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
@@ -29,21 +16,33 @@ var __toESM = (mod, isNodeMode, target) => {
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __legacyDecorateClassTS = function(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1;i >= 0; i--)
+      if (d = decorators[i])
+        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+
+// ../../node_modules/.bun/reflect-metadata@0.2.2/node_modules/reflect-metadata/Reflect.js
 var require_Reflect = __commonJS(() => {
   /*! *****************************************************************************
-    Copyright (C) Microsoft. All rights reserved.
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-    this file except in compliance with the License. You may obtain a copy of the
-    License at http://www.apache.org/licenses/LICENSE-2.0
-    
-    THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-    WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-    MERCHANTABLITY OR NON-INFRINGEMENT.
-    
-    See the Apache Version 2.0 License for specific language governing permissions
-    and limitations under the License.
-    ***************************************************************************** */
+  Copyright (C) Microsoft. All rights reserved.
+  Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+  this file except in compliance with the License. You may obtain a copy of the
+  License at http://www.apache.org/licenses/LICENSE-2.0
+  
+  THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+  WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+  MERCHANTABLITY OR NON-INFRINGEMENT.
+  
+  See the Apache Version 2.0 License for specific language governing permissions
+  and limitations under the License.
+  ***************************************************************************** */
   var Reflect2;
   (function(Reflect3) {
     (function(factory) {
@@ -1023,6 +1022,11 @@ var require_Reflect = __commonJS(() => {
     });
   })(Reflect2 || (Reflect2 = {}));
 });
+
+// ../core/src/context.ts
+import { AsyncLocalStorage } from "async_hooks";
+var kanjijsContext = new AsyncLocalStorage;
+// ../core/src/metadata.ts
 var import_reflect_metadata = __toESM(require_Reflect(), 1);
 var methodMetadataStore = new WeakMap;
 var controllerMetadataStore = new WeakMap;
@@ -1050,6 +1054,16 @@ if (!globalStore.KANJI_METADATA_STORAGE) {
       existing.contract = contract;
       methods.set(methodName, existing);
     },
+    addRouteParam(target, methodName, param) {
+      let methods = methodMetadataStore.get(target);
+      if (!methods) {
+        methods = new Map;
+        methodMetadataStore.set(target, methods);
+      }
+      const existing = methods.get(methodName) || {};
+      existing.params = [...existing.params || [], param];
+      methods.set(methodName, existing);
+    },
     addMiddleware(target, middleware, methodName) {
       if (methodName) {
         let methods = methodMetadataStore.get(target);
@@ -1095,6 +1109,8 @@ if (!globalStore.KANJI_METADATA_STORAGE) {
   };
 }
 var MetadataStorage = globalStore.KANJI_METADATA_STORAGE;
+
+// ../core/src/decorators.ts
 function Module(metadata) {
   return (target) => {
     MetadataStorage.defineModule(target, metadata);
@@ -1116,10 +1132,29 @@ var Put = createMethodDecorator("PUT");
 var Delete = createMethodDecorator("DELETE");
 var Patch = createMethodDecorator("PATCH");
 function Inject(token) {
-  return (target, propertyKey, parameterIndex) => {
+  return (target, _propertyKey, parameterIndex) => {
     MetadataStorage.addInjection(target, parameterIndex, token);
   };
 }
+function createParamDecorator(type) {
+  return (data) => {
+    return (target, propertyKey, parameterIndex) => {
+      if (propertyKey) {
+        MetadataStorage.addRouteParam(target, propertyKey, {
+          index: parameterIndex,
+          type,
+          data
+        });
+      }
+    };
+  };
+}
+var Body = createParamDecorator("BODY");
+var Query = createParamDecorator("QUERY");
+var Param = createParamDecorator("PARAM");
+var Headers = createParamDecorator("HEADERS");
+var Ctx = createParamDecorator("CONTEXT");
+// ../core/src/di/container.ts
 var import_reflect_metadata2 = __toESM(require_Reflect(), 1);
 
 class KanjijsIoC {
@@ -1127,43 +1162,46 @@ class KanjijsIoC {
   static register(tokenOrTarget, provider) {
     if (provider) {
       if ("useValue" in provider) {
-        this.providers.set(tokenOrTarget, { useValue: provider.useValue });
+        KanjijsIoC.providers.set(tokenOrTarget, { useValue: provider.useValue });
       } else if ("useClass" in provider) {
-        this.providers.set(tokenOrTarget, { useClass: provider.useClass });
+        KanjijsIoC.providers.set(tokenOrTarget, { useClass: provider.useClass });
       }
     } else {
-      this.providers.set(tokenOrTarget, { useClass: tokenOrTarget });
+      KanjijsIoC.providers.set(tokenOrTarget, {
+        useClass: tokenOrTarget
+      });
     }
   }
   static resolve(target) {
-    let provider = this.providers.get(target);
+    let provider = KanjijsIoC.providers.get(target);
     if (!provider && typeof target === "function") {
       provider = { useClass: target };
-      this.providers.set(target, provider);
+      KanjijsIoC.providers.set(target, provider);
     }
     if (!provider) {
-      throw new Error(`Provider not found for token: ${target?.name || target}`);
+      throw new Error(`Provider not found for token: ${typeof target === "function" ? target.name : String(target)}`);
     }
     if (provider.instance) {
       return provider.instance;
     }
-    console.log(`[DI] Creating NEW instance for ${target?.name || String(target)}`);
+    console.log(`[DI] Creating NEW instance for ${typeof target === "function" ? target.name : String(target)}`);
     if (provider.useValue !== undefined) {
       provider.instance = provider.useValue;
     } else if (provider.useClass) {
       const ConcreteClass = provider.useClass;
       const paramTypes = Reflect.getMetadata("design:paramtypes", ConcreteClass) || [];
       const injectionTokens = MetadataStorage.getInjections(ConcreteClass) || new Map;
-      const injections = paramTypes.map((token, index) => {
+      const injections = paramTypes.map((paramToken, index) => {
         const overrideToken = injectionTokens.get(index);
-        return KanjijsIoC.resolve(overrideToken || token);
+        const resolvedToken = overrideToken || paramToken;
+        return KanjijsIoC.resolve(resolvedToken);
       });
       provider.instance = new ConcreteClass(...injections);
     }
     return provider.instance;
   }
   static clear() {
-    this.providers.clear();
+    KanjijsIoC.providers.clear();
   }
 }
 
@@ -1175,7 +1213,7 @@ class Container {
   resolve(token) {
     const provider = this.providers.get(token);
     if (!provider) {
-      throw new Error(`[DI] Provider not found for token: ${token?.name || String(token)}`);
+      throw new Error(`[DI] Provider not found for token: ${typeof token === "function" ? token.name : String(token)}`);
     }
     if (provider.instance) {
       return provider.instance;
@@ -1188,7 +1226,8 @@ class Container {
       const injectionTokens = MetadataStorage.getInjections(ConcreteClass) || new Map;
       const injections = paramTypes.map((paramToken, index) => {
         const overrideToken = injectionTokens.get(index);
-        return this.resolve(overrideToken || paramToken);
+        const resolvedToken = overrideToken || paramToken;
+        return this.resolve(resolvedToken);
       });
       provider.instance = new ConcreteClass(...injections);
     } else if (provider.useFactory) {
@@ -1198,7 +1237,7 @@ class Container {
     return provider.instance;
   }
 }
-var kanjijsContext = new AsyncLocalStorage;
+// ../core/src/di/module-compiler.ts
 class ModuleCompiler {
   nodes = new Map;
   globalExportedTokens = new Set;
@@ -1208,7 +1247,8 @@ class ModuleCompiler {
     const container = new Container;
     for (const node of this.nodes.values()) {
       for (const [token, provider] of node.providers) {
-        container.register(token, provider);
+        const { provide: _provide, ...definition } = provider;
+        container.register(token, definition);
       }
     }
     return container;
@@ -1227,20 +1267,20 @@ class ModuleCompiler {
     };
     this.nodes.set(moduleClass, node);
     const meta = MetadataStorage.getModule(moduleClass) || {};
-    const dynamicMeta = "module" in target ? target : {};
-    const allProviders = [...meta.providers || [], ...dynamicMeta.providers || []];
+    const dynamicMeta = "module" in target ? target : undefined;
+    const allProviders = [...meta.providers || [], ...dynamicMeta?.providers || []];
     this.processProviders(node, allProviders);
-    const allExports = [...meta.exports || [], ...dynamicMeta.exports || []];
+    const allExports = [...meta.exports || [], ...dynamicMeta?.exports || []];
     for (const token of allExports) {
       node.exports.add(token);
     }
-    if (meta.global || dynamicMeta.global) {
+    if (meta.global || dynamicMeta?.global) {
       node.isGlobal = true;
       for (const token of node.exports) {
         this.globalExportedTokens.add(token);
       }
     }
-    const allImports = [...meta.imports || [], ...dynamicMeta.imports || []];
+    const allImports = [...meta.imports || [], ...dynamicMeta?.imports || []];
     for (const imp of allImports) {
       const importedNode = this.scan(imp);
       node.imports.add(importedNode);
@@ -1279,7 +1319,7 @@ class ModuleCompiler {
       for (const globalToken of this.globalExportedTokens) {
         visibleTokens.add(globalToken);
       }
-      for (const [token, provider] of node.providers) {
+      for (const [_token, provider] of node.providers) {
         this.checkDependencies(provider, visibleTokens, node.module.name);
       }
     }
@@ -1292,19 +1332,24 @@ class ModuleCompiler {
       targetName = clazz.name;
       const paramTypes = Reflect.getMetadata("design:paramtypes", clazz) || [];
       const injectionTokens = MetadataStorage.getInjections(clazz) || new Map;
-      dependencies = paramTypes.map((t, i) => injectionTokens.get(i) || t);
+      dependencies = paramTypes.map((paramType, index) => {
+        const overrideToken = injectionTokens.get(index);
+        return overrideToken || paramType;
+      });
     } else if ("useFactory" in provider) {
-      targetName = provider.provide?.name || String(provider.provide);
+      targetName = typeof provider.provide === "function" ? provider.provide.name : String(provider.provide);
       dependencies = provider.inject || [];
     }
     for (const dep of dependencies) {
       if (!visibleTokens.has(dep)) {
-        const depName = dep?.name || String(dep);
+        const depName = typeof dep === "function" ? dep.name : String(dep);
         throw new Error(`[Kanjijs] strict-di-error: Provider '${targetName}' in Module '${moduleName}' ` + `depends on '${depName}', but it is not visible. ` + `Make sure it is imported and exported by the source module.`);
       }
     }
   }
 }
+
+// ../core/src/index.ts
 var GLOBAL_MIDDLEWARE_TOKEN = Symbol("GLOBAL_MIDDLEWARE_TOKEN");
 
 // ../../node_modules/.bun/drizzle-orm@0.30.10+45912b99425c1f32/node_modules/drizzle-orm/entity.js
@@ -1680,7 +1725,7 @@ class SQL {
           params: []
         };
       }
-      if (is(chunk, Param)) {
+      if (is(chunk, Param2)) {
         const mappedValue = chunk.value === null ? null : chunk.encoder.mapToDriverValue(chunk.value);
         if (is(mappedValue, SQL)) {
           return this.buildQueryFromSourceParams([mappedValue], config);
@@ -1795,7 +1840,7 @@ var noopMapper = {
   ...noopEncoder
 };
 
-class Param {
+class Param2 {
   constructor(value, encoder = noopEncoder) {
     this.value = value;
     this.encoder = encoder;
@@ -1849,7 +1894,7 @@ function sql(strings, ...params) {
   }
   sql2.placeholder = placeholder2;
   function param2(value, encoder) {
-    return new Param(value, encoder);
+    return new Param2(value, encoder);
   }
   sql2.param = param2;
 })(sql || (sql = {}));
@@ -1998,7 +2043,7 @@ function mapUpdateSet(table, values) {
     if (is(value, SQL)) {
       return [key, value];
     } else {
-      return [key, new Param(value, table[Table.Symbol.Columns][key])];
+      return [key, new Param2(value, table[Table.Symbol.Columns][key])];
     }
   });
   if (entries.length === 0) {
@@ -2084,7 +2129,7 @@ class PgInsertBuilder {
       const cols = this.table[Table.Symbol.Columns];
       for (const colKey of Object.keys(entry)) {
         const colValue = entry[colKey];
-        result[colKey] = is(colValue, SQL) ? colValue : new Param(colValue, cols[colKey]);
+        result[colKey] = is(colValue, SQL) ? colValue : new Param2(colValue, cols[colKey]);
       }
       return result;
     });
@@ -2429,8 +2474,8 @@ class PrimaryKey {
 
 // ../../node_modules/.bun/drizzle-orm@0.30.10+45912b99425c1f32/node_modules/drizzle-orm/sql/expressions/conditions.js
 function bindIfParam(value, column) {
-  if (isDriverValueEncoder(column) && !isSQLWrapper(value) && !is(value, Param) && !is(value, Placeholder) && !is(value, Column) && !is(value, Table) && !is(value, View)) {
-    return new Param(value, column);
+  if (isDriverValueEncoder(column) && !isSQLWrapper(value) && !is(value, Param2) && !is(value, Placeholder) && !is(value, Column) && !is(value, Table) && !is(value, View)) {
+    return new Param2(value, column);
   }
   return value;
 }
@@ -3027,7 +3072,7 @@ class PgDialect {
       const valueList = [];
       for (const [fieldName, col] of colEntries) {
         const colValue = value[fieldName];
-        if (colValue === undefined || is(colValue, Param) && colValue.value === undefined) {
+        if (colValue === undefined || is(colValue, Param2) && colValue.value === undefined) {
           if (col.defaultFn !== undefined) {
             const defaultFnResult = col.defaultFn();
             const defaultValue = is(defaultFnResult, SQL) ? defaultFnResult : sql.param(defaultFnResult, col);
@@ -4233,7 +4278,7 @@ var originStackCache = new Map;
 var originError = Symbol("OriginError");
 var CLOSE = {};
 
-class Query extends Promise {
+class Query2 extends Promise {
   constructor(strings, args, handler, canceller, options = {}) {
     let resolve, reject;
     super((a, b) => {
@@ -4504,7 +4549,7 @@ function stringify(q, string, value, parameters, types2, options) {
   return string;
 }
 function stringifyValue(string, value, parameters, types2, o) {
-  return value instanceof Builder ? value.build(string, parameters, types2, o) : value instanceof Query ? fragment(value, parameters, types2, o) : value instanceof Identifier ? value.value : value && value[0] instanceof Query ? value.reduce((acc, x) => acc + " " + fragment(x, parameters, types2, o), "") : handleValue(value, parameters, types2, o);
+  return value instanceof Builder ? value.build(string, parameters, types2, o) : value instanceof Query2 ? fragment(value, parameters, types2, o) : value instanceof Identifier ? value.value : value && value[0] instanceof Query2 ? value.reduce((acc, x) => acc + " " + fragment(x, parameters, types2, o), "") : handleValue(value, parameters, types2, o);
 }
 function fragment(q, parameters, types2, options) {
   q.fragment = true;
@@ -4526,7 +4571,7 @@ function select(first, rest, parameters, types2, options) {
   const columns = rest.length ? rest.flat() : Object.keys(first);
   return columns.map((x) => {
     value = first[x];
-    return (value instanceof Query ? fragment(value, parameters, types2, options) : value instanceof Identifier ? value.value : handleValue(value, parameters, types2, options)) + " as " + escapeIdentifier(options.transform.column.to ? options.transform.column.to(x) : x);
+    return (value instanceof Query2 ? fragment(value, parameters, types2, options) : value instanceof Identifier ? value.value : handleValue(value, parameters, types2, options)) + " as " + escapeIdentifier(options.transform.column.to ? options.transform.column.to(x) : x);
   }).join(",");
 }
 var builders = Object.entries({
@@ -5308,7 +5353,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
   }
   async function fetchArrayTypes() {
     needsTypes = false;
-    const types2 = await new Query([`
+    const types2 = await new Query2([`
       select b.oid, b.typarray
       from pg_catalog.pg_type a
       left join pg_catalog.pg_type b on b.oid = a.typelem
@@ -5331,7 +5376,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     return x === "read-write" && xs.default_transaction_read_only === "on" || x === "read-only" && xs.default_transaction_read_only === "off" || x === "primary" && xs.in_hot_standby === "on" || x === "standby" && xs.in_hot_standby === "off" || x === "prefer-standby" && xs.in_hot_standby === "off" && options.host[retries];
   }
   function fetchState() {
-    const query2 = new Query([`
+    const query2 = new Query2([`
       show transaction_read_only;
       select pg_catalog.pg_is_in_recovery()
     `], [], execute, null, { simple: true });
@@ -5861,12 +5906,12 @@ function Postgres(a, b2) {
       return new Parameter(value, type);
     }
     function sql3(strings, ...args) {
-      const query = strings && Array.isArray(strings.raw) ? new Query(strings, args, handler2, cancel) : typeof strings === "string" && !args.length ? new Identifier(options.transform.column.to ? options.transform.column.to(strings) : strings) : new Builder(strings, args);
+      const query = strings && Array.isArray(strings.raw) ? new Query2(strings, args, handler2, cancel) : typeof strings === "string" && !args.length ? new Identifier(options.transform.column.to ? options.transform.column.to(strings) : strings) : new Builder(strings, args);
       return query;
     }
     function unsafe(string, args = [], options2 = {}) {
       arguments.length === 2 && !Array.isArray(args) && (options2 = args, args = []);
-      const query = new Query([string], args, handler2, cancel, {
+      const query = new Query2([string], args, handler2, cancel, {
         prepare: false,
         ...options2,
         simple: "simple" in options2 ? options2.simple : args.length === 0
@@ -5875,7 +5920,7 @@ function Postgres(a, b2) {
     }
     function file(path, args = [], options2 = {}) {
       arguments.length === 2 && !Array.isArray(args) && (options2 = args, args = []);
-      const query = new Query([], args, (query2) => {
+      const query = new Query2([], args, (query2) => {
         fs.readFile(path, "utf8", (err, string) => {
           if (err)
             return query2.reject(err);

package/dist/store/src/index.d.ts

@@ -0,0 +1,12 @@
+import { type DynamicModule } from "@kanjijs/core";
+import { drizzle } from "drizzle-orm/postgres-js";
+export declare const DATABASE_CLIENT: unique symbol;
+export interface StoreModuleOptions {
+    url: string;
+    schema?: Record<string, unknown>;
+}
+export declare const InjectDb: () => ParameterDecorator;
+export type DrizzleDb = ReturnType<typeof drizzle>;
+export declare class StoreModule {
+    static forRoot(options: StoreModuleOptions): DynamicModule;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kanjijs/store",
-  "version": "0.2.0-beta.14",
+  "version": "0.2.0-beta.15",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -17,9 +17,9 @@
     "postgres": "^3.4.3"
   },
   "peerDependencies": {
-    "@kanjijs/core": "^0.2.0-beta.14"
+    "@kanjijs/core": "^0.2.0-beta.15"
   },
   "devDependencies": {
     "bun-types": "latest"
   }
-}
+}