@kanjijs/openapi 0.2.0-beta.14 → 0.2.0-beta.16

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,12 @@
+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;
+    private registerProviders;
+}

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,6 +1,4 @@
 // @bun
-// ../core/dist/index.js
-import { AsyncLocalStorage } from "async_hooks";
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
@@ -18,21 +16,23 @@ var __toESM = (mod, isNodeMode, target) => {
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+
+// ../../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) {
@@ -1012,6 +1012,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;
@@ -1039,6 +1044,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);
@@ -1084,6 +1099,8 @@ if (!globalStore.KANJI_METADATA_STORAGE) {
   };
 }
 var MetadataStorage = globalStore.KANJI_METADATA_STORAGE;
+
+// ../core/src/decorators.ts
 function createMethodDecorator(method) {
   return (path = "/") => {
     return (target, propertyKey) => {
@@ -1099,6 +1116,25 @@ var Post = createMethodDecorator("POST");
 var Put = createMethodDecorator("PUT");
 var Delete = createMethodDecorator("DELETE");
 var Patch = createMethodDecorator("PATCH");
+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 {
@@ -1106,43 +1142,48 @@ 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}`);
+      const targetName2 = typeof target === "function" ? target.name ?? "anonymous" : String(target);
+      throw new Error(`Provider not found for token: ${targetName2}`);
     }
     if (provider.instance) {
       return provider.instance;
     }
-    console.log(`[DI] Creating NEW instance for ${target?.name || String(target)}`);
+    const targetName = typeof target === "function" ? target.name ?? "anonymous" : String(target);
+    console.log(`[DI] Creating NEW instance for ${targetName}`);
     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();
   }
 }
 
@@ -1154,7 +1195,8 @@ 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)}`);
+      const tokenName = typeof token === "function" ? token.name ?? "anonymous" : String(token);
+      throw new Error(`[DI] Provider not found for token: ${tokenName}`);
     }
     if (provider.instance) {
       return provider.instance;
@@ -1167,7 +1209,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) {
@@ -1177,7 +1220,7 @@ class Container {
     return provider.instance;
   }
 }
-var kanjijsContext = new AsyncLocalStorage;
+// ../core/src/di/module-compiler.ts
 class ModuleCompiler {
   nodes = new Map;
   globalExportedTokens = new Set;
@@ -1185,11 +1228,11 @@ class ModuleCompiler {
     this.scan(rootModule);
     this.validate();
     const container = new Container;
-    for (const node of this.nodes.values()) {
-      for (const [token, provider] of node.providers) {
-        container.register(token, provider);
-      }
+    const rootNode = this.nodes.get(rootModule);
+    if (!rootNode) {
+      return container;
     }
+    this.registerProviders(rootNode, container, new Set);
     return container;
   }
   scan(target) {
@@ -1206,20 +1249,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);
@@ -1258,7 +1301,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);
       }
     }
@@ -1271,19 +1314,36 @@ 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 ?? "anonymous" : 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 ?? "anonymous" : 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.`);
       }
     }
   }
+  registerProviders(node, container, visited) {
+    if (visited.has(node))
+      return;
+    visited.add(node);
+    for (const imp of node.imports) {
+      this.registerProviders(imp, container, visited);
+    }
+    for (const [token, provider] of node.providers) {
+      const { provide: _provide, ...definition } = provider;
+      container.register(token, definition);
+    }
+  }
 }
+
+// ../core/src/index.ts
 var GLOBAL_MIDDLEWARE_TOKEN = Symbol("GLOBAL_MIDDLEWARE_TOKEN");
 
 // ../../node_modules/.bun/zod-to-json-schema@3.25.1+27912429049419a2/node_modules/zod-to-json-schema/dist/esm/Options.js
@@ -6337,11 +6397,10 @@ var zodToJsonSchema = (schema, options) => {
 class OpenApiGenerator {
   static generate(rootModule) {
     const paths = {};
-    const schemas = {};
     const rootMeta = MetadataStorage.getModule(rootModule);
     if (!rootMeta)
       throw new Error("Root module metadata not found.");
-    const controllers = this.getAllControllers(rootMeta);
+    const controllers = OpenApiGenerator.getAllControllers(rootMeta);
     for (const ControllerClass of controllers) {
       const ctrlMeta = MetadataStorage.getController(ControllerClass);
       if (!ctrlMeta)
@@ -6351,7 +6410,7 @@ class OpenApiGenerator {
       if (!routesMap)
         continue;
       for (const [methodName, route] of routesMap) {
-        const path = this.normalizePath(prefix + route.path);
+        const path = OpenApiGenerator.normalizePath(prefix + route.path);
         if (!paths[path])
           paths[path] = {};
         const method = route.method.toLowerCase();
@@ -6362,7 +6421,7 @@ class OpenApiGenerator {
           responses: {
             "200": { description: "Success" }
           },
-          ...this.buildParameters(contract)
+          ...OpenApiGenerator.buildParameters(contract)
         };
       }
     }
@@ -6381,7 +6440,7 @@ class OpenApiGenerator {
       for (const imp of meta.imports) {
         const impMeta = MetadataStorage.getModule(imp);
         if (impMeta) {
-          controllers = [...controllers, ...this.getAllControllers(impMeta)];
+          controllers = [...controllers, ...OpenApiGenerator.getAllControllers(impMeta)];
         }
       }
     }

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

@@ -0,0 +1,14 @@
+import { type Constructor } from "@kanjijs/core";
+export declare class OpenApiGenerator {
+    static generate(rootModule: Constructor): {
+        openapi: string;
+        info: {
+            title: string;
+            version: string;
+        };
+        paths: Record<string, Record<string, unknown>>;
+    };
+    private static getAllControllers;
+    private static normalizePath;
+    private static buildParameters;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kanjijs/openapi",
-  "version": "0.2.0-beta.14",
+  "version": "0.2.0-beta.16",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -13,7 +13,7 @@
     "build": "bun build src/index.ts --outdir dist --target bun && tsc --emitDeclarationOnly --declaration --outDir dist"
   },
   "dependencies": {
-    "@kanjijs/core": "^0.2.0-beta.14",
+    "@kanjijs/core": "^0.2.0-beta.16",
     "zod-to-json-schema": "^3.22.0",
     "zod": "^3.0.0",
     "reflect-metadata": "^0.2.0"