@kanjijs/cli 0.2.0-beta.15 → 0.2.0-beta.16

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

@@ -8,4 +8,5 @@ export declare class ModuleCompiler {
     private processProviders;
     private validate;
     private checkDependencies;
+    private registerProviders;
 }

package/dist/index.js

@@ -14418,7 +14418,8 @@ class Container {
   resolve(token) {
     const provider = this.providers.get(token);
     if (!provider) {
-      throw new Error(`[DI] Provider not found for token: ${typeof token === "function" ? 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;
@@ -14468,12 +14469,14 @@ var init_container = __esm(() => {
         KanjijsIoC.providers.set(target, provider);
       }
       if (!provider) {
-        throw new Error(`Provider not found for token: ${typeof target === "function" ? target.name : String(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 ${typeof target === "function" ? 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) {
@@ -14503,12 +14506,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) {
-        const { provide: _provide, ...definition } = provider;
-        container.register(token, definition);
-      }
+    const rootNode = this.nodes.get(rootModule);
+    if (!rootNode) {
+      return container;
     }
+    this.registerProviders(rootNode, container, new Set);
     return container;
   }
   scan(target) {
@@ -14595,16 +14597,28 @@ class ModuleCompiler {
         return overrideToken || paramType;
       });
     } else if ("useFactory" in provider) {
-      targetName = typeof provider.provide === "function" ? 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 = typeof dep === "function" ? 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);
+    }
+  }
 }
 var init_module_compiler = __esm(() => {
   init_metadata();
@@ -19990,7 +20004,7 @@ var import_picocolors2 = __toESM(require_picocolors(), 1);
 import path2 from "path";
 class GenerateCommand extends Command2 {
   load(program2) {
-    program2.command("g <type> <name>").description("Generate a new resource (e.g. 'kanjijs g resource users')").alias("generate").action(async (type, name) => {
+    program2.command("g <type> <name>").description("Generate a new resource (e.g. 'kanjijs g resource users')").alias("generate").option("-r, --repository", "Generate with Repository pattern").action(async (type, name, options) => {
       if (type !== "resource") {
         console.error(import_picocolors2.default.red(`Unknown type: ${type}. Only 'resource' is supported.`));
         process.exit(1);
@@ -19998,22 +20012,133 @@ class GenerateCommand extends Command2 {
       const capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1);
       const className = capitalize(name);
       const lowerName = name.toLowerCase();
-      const targetDir = path2.join(process.cwd(), "src", "modules", lowerName);
+      const modulesDir = path2.join(process.cwd(), "src", "modules");
+      const targetDir = path2.join(modulesDir, lowerName);
       await import_fs_extra.default.ensureDir(targetDir);
-      const serviceTpl = `import { Injectable } from "@kanjijs/core";
+      try {
+        let repositoryClass = "";
+        let serviceImports = "";
+        let serviceConstructor = `constructor(private readonly logger: Logger) {}`;
+        let serviceMethods = `  findAll() {
+    this.logger.info("Finding all ${lowerName}");
+    return "This action returns all ${lowerName}";
+  }`;
+        if (options.repository) {
+          const commonDir = path2.join(process.cwd(), "src", "common");
+          const baseRepoPath = path2.join(commonDir, "base.repository.ts");
+          if (!await import_fs_extra.default.pathExists(baseRepoPath)) {
+            await import_fs_extra.default.ensureDir(commonDir);
+            const baseRepoTpl = `import { type DrizzleDb } from "@kanjijs/store";
+import { eq } from "drizzle-orm";
+import { type PgTableWithColumns } from "drizzle-orm/pg-core";
+
+/**
+ * Base Repository for generic CRUD operations.
+ * Table-First: Infers types from Drizzle schema.
+ */
+export abstract class BaseRepository<
+  TTable extends PgTableWithColumns<any>,
+  TEntity = TTable["$inferSelect"],
+  TCreate = TTable["$inferInsert"],
+  TUpdate = Partial<TTable["$inferInsert"]>
+> {
+  constructor(
+    protected readonly db: DrizzleDb,
+    protected readonly table: TTable,
+    protected readonly idColumn: any
+  ) {}
+
+  async findAll(): Promise<TEntity[]> {
+    return this.db.select().from(this.table) as unknown as Promise<TEntity[]>;
+  }
+
+  async findById(id: number | string): Promise<TEntity | undefined> {
+    const result = await this.db
+      .select()
+      .from(this.table)
+      .where(eq(this.idColumn, id));
+    
+    // @ts-ignore
+    return result[0];
+  }
+
+  async create(data: TCreate): Promise<TEntity> {
+    // @ts-ignore
+    const result = await this.db.insert(this.table).values(data).returning();
+    // @ts-ignore
+    return result[0];
+  }
+
+  async update(id: number | string, data: TUpdate): Promise<TEntity | undefined> {
+    const result = await this.db
+      .update(this.table)
+      // @ts-ignore
+      .set(data)
+      .where(eq(this.idColumn, id))
+      .returning();
+
+    // @ts-ignore
+    return result[0];
+  }
+
+  async delete(id: number | string): Promise<TEntity | undefined> {
+    const result = await this.db
+      .delete(this.table)
+      .where(eq(this.idColumn, id))
+      .returning();
+    
+    // @ts-ignore
+    return result[0];
+  }
+}
+`;
+            await import_fs_extra.default.writeFile(baseRepoPath, baseRepoTpl);
+            console.log(import_picocolors2.default.green(`CREATED src/common/base.repository.ts (First time setup)`));
+          }
+          repositoryClass = `${className}Repository`;
+          const repoPath = path2.join(targetDir, `${lowerName}.repository.ts`);
+          const repoTpl = `import { Injectable, Inject } from "@kanjijs/core";
+import { DATABASE_CLIENT, type DrizzleDb } from "@kanjijs/store";
+import { BaseRepository } from "../../common/base.repository";
+// import { ${lowerName} } from "../../db/schema"; // TODO: Import your Drizzle table
+
+@Injectable()
+export class ${repositoryClass} extends BaseRepository<any> { // TODO: Replace 'any' with 'typeof ${lowerName}'
+  constructor(@Inject(DATABASE_CLIENT) db: DrizzleDb) {
+    super(db, {} as any, "id"); // TODO: Pass real table and ID column
+  }
+}
+`;
+          await import_fs_extra.default.writeFile(repoPath, repoTpl);
+          console.log(import_picocolors2.default.white(`CREATE ${lowerName}.repository.ts`));
+          serviceImports = `import { ${repositoryClass} } from "./${lowerName}.repository";`;
+          serviceConstructor = `constructor(
+    private readonly logger: Logger,
+    private readonly repo: ${repositoryClass}
+  ) {}`;
+          serviceMethods = `  async findAll() {
+    this.logger.info("Finding all ${lowerName}");
+    return this.repo.findAll();
+  }
+
+  async create(data: any) {
+    return this.repo.create(data);
+  }`;
+        }
+        const serviceTpl = `import { Injectable } from "@kanjijs/core";
 import { Logger } from "@kanjijs/logger";
+${serviceImports}
 
 @Injectable()
 export class ${className}Service {
-  constructor(private readonly logger: Logger) {}
+  ${serviceConstructor}
 
-  findAll() {
-    this.logger.info("Finding all ${lowerName}");
-    return "This action returns all ${lowerName}";
-  }
+${serviceMethods}
 }
 `;
-      const controllerTpl = `import { Controller, Get, Post, Body } from "@kanjijs/core";
+        await import_fs_extra.default.writeFile(path2.join(targetDir, `${lowerName}.service.ts`), serviceTpl);
+        console.log(import_picocolors2.default.white(`CREATE ${lowerName}.service.ts`));
+        const controllerTpl = `import { Controller, Get, Post, Body } from "@kanjijs/core";
 import { type Context } from "hono";
 import { ${className}Service } from "./${lowerName}.service";
 import { Contract } from "@kanjijs/contracts";
@@ -20035,46 +20160,49 @@ export class ${className}Controller {
   }
 
   @Post("/", { contract: Create${className}Contract })
-  create(@Body() body: typeof Create${className}Contract.body) {
-    return { success: true, data: body };
+  create(c: Context) {
+    // Infer keys from contract (Contract-first)
+    const body = c.get("kanji.validated.body");
+    return c.json(this.service.create(body));
   }
 }
 `;
-      const moduleTpl = `import { Module } from "@kanjijs/core";
-import { ${className}Controller } from "./${lowerName}.controller";
-import { ${className}Service } from "./${lowerName}.service";
+        await import_fs_extra.default.writeFile(path2.join(targetDir, `${lowerName}.controller.ts`), controllerTpl);
+        console.log(import_picocolors2.default.white(`CREATE ${lowerName}.controller.ts`));
+        let moduleProviders = `[${className}Service]`;
+        let moduleImports = `import { ${className}Controller } from "./${lowerName}.controller";
+import { ${className}Service } from "./${lowerName}.service";`;
+        if (options.repository) {
+          moduleProviders = `[${className}Service, ${repositoryClass}]`;
+          moduleImports += `
+import { ${repositoryClass} } from "./${lowerName}.repository";`;
+        }
+        const moduleTpl = `import { Module } from "@kanjijs/core";
 import { LoggerModule } from "@kanjijs/logger";
+${moduleImports}
 
 @Module({
   imports: [LoggerModule],
   controllers: [${className}Controller],
-  providers: [${className}Service]
+  providers: ${moduleProviders}
 })
 export class ${className}Module {}
 `;
-      try {
-        await import_fs_extra.default.writeFile(path2.join(targetDir, `${lowerName}.service.ts`), serviceTpl);
-        await import_fs_extra.default.writeFile(path2.join(targetDir, `${lowerName}.controller.ts`), controllerTpl);
         await import_fs_extra.default.writeFile(path2.join(targetDir, `${lowerName}.module.ts`), moduleTpl);
-        console.log(import_picocolors2.default.green(`
-Generated resource ${lowerName} in src/modules/${lowerName}`));
-        console.log(import_picocolors2.default.white(`CREATE ${lowerName}.service.ts`));
-        console.log(import_picocolors2.default.white(`CREATE ${lowerName}.controller.ts`));
         console.log(import_picocolors2.default.white(`CREATE ${lowerName}.module.ts`));
         const appModulePath = path2.join(process.cwd(), "src", "app.module.ts");
         if (await import_fs_extra.default.pathExists(appModulePath)) {
           let content = await import_fs_extra.default.readFile(appModulePath, "utf-8");
           const moduleName = `${className}Module`;
-          const alreadyIncluded = content.includes(moduleName);
-          const importStatement = `import { ${className}Module } from "./modules/${lowerName}/${lowerName}.module";`;
-          if (!content.includes(importStatement)) {
-            const lastImportIndex = content.lastIndexOf("import ");
-            const endOfLastImport = content.indexOf(`
+          if (!content.includes(moduleName)) {
+            const importStatement = `import { ${className}Module } from "./modules/${lowerName}/${lowerName}.module";`;
+            if (!content.includes(importStatement)) {
+              const lastImportIndex = content.lastIndexOf("import ");
+              const endOfLastImport = content.indexOf(`
 `, lastImportIndex) + 1;
-            content = content.slice(0, endOfLastImport) + importStatement + `
-` + content.slice(endOfLastImport);
-          }
-          if (!alreadyIncluded) {
+              content = `${content.slice(0, endOfLastImport)}${importStatement}
+${content.slice(endOfLastImport)}`;
+            }
             if (content.includes("imports: [")) {
               content = content.replace("imports: [", `imports: [${moduleName}, `);
             } else {
@@ -20086,9 +20214,9 @@ Generated resource ${lowerName} in src/modules/${lowerName}`));
           } else {
             console.log(import_picocolors2.default.dim(`WARN: ${moduleName} already in AppModule`));
           }
-        } else {
-          console.error(import_picocolors2.default.yellow(`WARN: AppModule not found at ${appModulePath}`));
         }
+        console.log(import_picocolors2.default.green(`
+Success! Generated resource ${lowerName}.`));
       } catch (err) {
         console.error(import_picocolors2.default.red("Error generating resource:"), err);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kanjijs/cli",
-  "version": "0.2.0-beta.15",
+  "version": "0.2.0-beta.16",
   "type": "module",
   "bin": {
     "kanji": "./dist/index.js"
@@ -21,7 +21,7 @@
     "fs-extra": "^11.3.3",
     "picocolors": "^1.1.1",
     "openapi-typescript-codegen": "^0.25.0",
-    "@kanjijs/openapi": "^0.2.0-beta.15"
+    "@kanjijs/openapi": "^0.2.0-beta.16"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4"