@devbro/pashmak 0.1.47 → 0.1.49

package/dist/DatabaseServiceProvider.d.mts

@@ -7,7 +7,10 @@ declare class DatabaseServiceProvider extends Middleware {
     private static instance;
     register(): Promise<void>;
     static getInstance(): DatabaseServiceProvider;
-    getConnection(db_config: PoolConfig): Connection;
+    getConnection(db_config: {
+        provider: string;
+        config: PoolConfig;
+    }): Connection;
 }
 
 export { DatabaseServiceProvider };

package/dist/DatabaseServiceProvider.mjs

@@ -49,8 +49,11 @@ class DatabaseServiceProvider extends Middleware {
     return DatabaseServiceProvider.instance;
   }
   getConnection(db_config) {
-    const conn = new PostgresqlConnection(db_config);
-    return conn;
+    if (db_config.provider === "postgresql") {
+      const conn = new PostgresqlConnection(db_config.config);
+      return conn;
+    }
+    throw new Error(`Unsupported database provider: ${db_config.provider}`);
   }
 }
 export {

package/dist/DatabaseServiceProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/DatabaseServiceProvider.mts"],"sourcesContent":["import { Middleware } from \"@devbro/neko-router\";\nimport { Request, Response } from \"@devbro/neko-router\";\nimport { PostgresqlConnection } from \"@devbro/neko-sql\";\nimport { PoolConfig } from \"pg\";\nimport { Connection } from \"@devbro/neko-sql\";\nimport { BaseModel } from \"@devbro/neko-orm\";\nimport { ctx } from \"@devbro/neko-context\";\nimport { config } from \"@devbro/neko-config\";\nimport { Global } from \"./global.mjs\";\n\nexport class DatabaseServiceProvider extends Middleware {\n  async call(\n    req: Request,\n    res: Response,\n    next: () => Promise<void>,\n  ): Promise<void> {\n    const db_configs: Record<string, PoolConfig & { name: string }> =\n      config.get(\"databases\");\n\n    const conns = [];\n    try {\n      for (const [name, db_config] of Object.entries(db_configs)) {\n        const conn = await this.getConnection(db_config);\n        ctx().set([\"database\", name], conn);\n        conns.push(conn);\n      }\n      BaseModel.setConnection(() => {\n        const key = [\"database\", \"default\"];\n        let rc: Connection | undefined;\n\n        if (ctx.isActive()) {\n          rc = ctx().get<Connection>(key);\n        } else if (Global.has(key)) {\n          rc = Global.get<Connection>(key);\n        } else {\n          rc = this.getConnection(db_configs[\"default\"]);\n          Global.set(key, rc);\n        }\n\n        return rc!;\n      });\n      await next();\n    } finally {\n      for (const conn of conns) {\n        await conn.disconnect();\n      }\n    }\n  }\n\n  private static instance: DatabaseServiceProvider;\n\n  async register(): Promise<void> {}\n\n  static getInstance(): DatabaseServiceProvider {\n    if (!DatabaseServiceProvider.instance) {\n      DatabaseServiceProvider.instance = new DatabaseServiceProvider();\n    }\n    return DatabaseServiceProvider.instance;\n  }\n\n  getConnection(db_config: PoolConfig): Connection {\n    const conn = new PostgresqlConnection(db_config);\n    return conn;\n  }\n}\n"],"mappings":";;AAAA,SAAS,kBAAkB;AAE3B,SAAS,4BAA4B;AAGrC,SAAS,iBAAiB;AAC1B,SAAS,WAAW;AACpB,SAAS,cAAc;AACvB,SAAS,cAAc;AAEhB,MAAM,gCAAgC,WAAW;AAAA,EAVxD,OAUwD;AAAA;AAAA;AAAA,EACtD,MAAM,KACJ,KACA,KACA,MACe;AACf,UAAM,aACJ,OAAO,IAAI,WAAW;AAExB,UAAM,QAAQ,CAAC;AACf,QAAI;AACF,iBAAW,CAAC,MAAM,SAAS,KAAK,OAAO,QAAQ,UAAU,GAAG;AAC1D,cAAM,OAAO,MAAM,KAAK,cAAc,SAAS;AAC/C,YAAI,EAAE,IAAI,CAAC,YAAY,IAAI,GAAG,IAAI;AAClC,cAAM,KAAK,IAAI;AAAA,MACjB;AACA,gBAAU,cAAc,MAAM;AAC5B,cAAM,MAAM,CAAC,YAAY,SAAS;AAClC,YAAI;AAEJ,YAAI,IAAI,SAAS,GAAG;AAClB,eAAK,IAAI,EAAE,IAAgB,GAAG;AAAA,QAChC,WAAW,OAAO,IAAI,GAAG,GAAG;AAC1B,eAAK,OAAO,IAAgB,GAAG;AAAA,QACjC,OAAO;AACL,eAAK,KAAK,cAAc,WAAW,SAAS,CAAC;AAC7C,iBAAO,IAAI,KAAK,EAAE;AAAA,QACpB;AAEA,eAAO;AAAA,MACT,CAAC;AACD,YAAM,KAAK;AAAA,IACb,UAAE;AACA,iBAAW,QAAQ,OAAO;AACxB,cAAM,KAAK,WAAW;AAAA,MACxB;AAAA,IACF;AAAA,EACF;AAAA,EAEA,OAAe;AAAA,EAEf,MAAM,WAA0B;AAAA,EAAC;AAAA,EAEjC,OAAO,cAAuC;AAC5C,QAAI,CAAC,wBAAwB,UAAU;AACrC,8BAAwB,WAAW,IAAI,wBAAwB;AAAA,IACjE;AACA,WAAO,wBAAwB;AAAA,EACjC;AAAA,EAEA,cAAc,WAAmC;AAC/C,UAAM,OAAO,IAAI,qBAAqB,SAAS;AAC/C,WAAO;AAAA,EACT;AACF;","names":[]}
+{"version":3,"sources":["../src/DatabaseServiceProvider.mts"],"sourcesContent":["import { Middleware } from \"@devbro/neko-router\";\nimport { Request, Response } from \"@devbro/neko-router\";\nimport { PostgresqlConnection } from \"@devbro/neko-sql\";\nimport { PoolConfig } from \"pg\";\nimport { Connection } from \"@devbro/neko-sql\";\nimport { BaseModel } from \"@devbro/neko-orm\";\nimport { ctx } from \"@devbro/neko-context\";\nimport { config } from \"@devbro/neko-config\";\nimport { Global } from \"./global.mjs\";\n\nexport class DatabaseServiceProvider extends Middleware {\n  async call(\n    req: Request,\n    res: Response,\n    next: () => Promise<void>,\n  ): Promise<void> {\n    const db_configs: Record<string, { provider: string; config: PoolConfig }> =\n      config.get(\"databases\");\n\n    const conns = [];\n    try {\n      for (const [name, db_config] of Object.entries(db_configs)) {\n        const conn = await this.getConnection(db_config);\n        ctx().set([\"database\", name], conn);\n        conns.push(conn);\n      }\n      BaseModel.setConnection(() => {\n        const key = [\"database\", \"default\"];\n        let rc: Connection | undefined;\n\n        if (ctx.isActive()) {\n          rc = ctx().get<Connection>(key);\n        } else if (Global.has(key)) {\n          rc = Global.get<Connection>(key);\n        } else {\n          rc = this.getConnection(db_configs[\"default\"]);\n          Global.set(key, rc);\n        }\n\n        return rc!;\n      });\n      await next();\n    } finally {\n      for (const conn of conns) {\n        await conn.disconnect();\n      }\n    }\n  }\n\n  private static instance: DatabaseServiceProvider;\n\n  async register(): Promise<void> {}\n\n  static getInstance(): DatabaseServiceProvider {\n    if (!DatabaseServiceProvider.instance) {\n      DatabaseServiceProvider.instance = new DatabaseServiceProvider();\n    }\n    return DatabaseServiceProvider.instance;\n  }\n\n  getConnection(db_config: {\n    provider: string;\n    config: PoolConfig;\n  }): Connection {\n    if (db_config.provider === \"postgresql\") {\n      const conn = new PostgresqlConnection(db_config.config);\n      return conn;\n    }\n\n    throw new Error(`Unsupported database provider: ${db_config.provider}`);\n  }\n}\n"],"mappings":";;AAAA,SAAS,kBAAkB;AAE3B,SAAS,4BAA4B;AAGrC,SAAS,iBAAiB;AAC1B,SAAS,WAAW;AACpB,SAAS,cAAc;AACvB,SAAS,cAAc;AAEhB,MAAM,gCAAgC,WAAW;AAAA,EAVxD,OAUwD;AAAA;AAAA;AAAA,EACtD,MAAM,KACJ,KACA,KACA,MACe;AACf,UAAM,aACJ,OAAO,IAAI,WAAW;AAExB,UAAM,QAAQ,CAAC;AACf,QAAI;AACF,iBAAW,CAAC,MAAM,SAAS,KAAK,OAAO,QAAQ,UAAU,GAAG;AAC1D,cAAM,OAAO,MAAM,KAAK,cAAc,SAAS;AAC/C,YAAI,EAAE,IAAI,CAAC,YAAY,IAAI,GAAG,IAAI;AAClC,cAAM,KAAK,IAAI;AAAA,MACjB;AACA,gBAAU,cAAc,MAAM;AAC5B,cAAM,MAAM,CAAC,YAAY,SAAS;AAClC,YAAI;AAEJ,YAAI,IAAI,SAAS,GAAG;AAClB,eAAK,IAAI,EAAE,IAAgB,GAAG;AAAA,QAChC,WAAW,OAAO,IAAI,GAAG,GAAG;AAC1B,eAAK,OAAO,IAAgB,GAAG;AAAA,QACjC,OAAO;AACL,eAAK,KAAK,cAAc,WAAW,SAAS,CAAC;AAC7C,iBAAO,IAAI,KAAK,EAAE;AAAA,QACpB;AAEA,eAAO;AAAA,MACT,CAAC;AACD,YAAM,KAAK;AAAA,IACb,UAAE;AACA,iBAAW,QAAQ,OAAO;AACxB,cAAM,KAAK,WAAW;AAAA,MACxB;AAAA,IACF;AAAA,EACF;AAAA,EAEA,OAAe;AAAA,EAEf,MAAM,WAA0B;AAAA,EAAC;AAAA,EAEjC,OAAO,cAAuC;AAC5C,QAAI,CAAC,wBAAwB,UAAU;AACrC,8BAAwB,WAAW,IAAI,wBAAwB;AAAA,IACjE;AACA,WAAO,wBAAwB;AAAA,EACjC;AAAA,EAEA,cAAc,WAGC;AACb,QAAI,UAAU,aAAa,cAAc;AACvC,YAAM,OAAO,IAAI,qBAAqB,UAAU,MAAM;AACtD,aAAO;AAAA,IACT;AAEA,UAAM,IAAI,MAAM,kCAAkC,UAAU,QAAQ,EAAE;AAAA,EACxE;AACF;","names":[]}

package/dist/app/console/StartCommand.d.mts

@@ -2,6 +2,7 @@ import { Command } from 'clipanion';
 
 declare class StartCommand extends Command {
     scheduler: boolean;
+    cron: boolean;
     http: boolean;
     queue: boolean;
     all: boolean;

package/dist/app/console/StartCommand.mjs

@@ -9,12 +9,15 @@ class StartCommand extends Command {
     __name(this, "StartCommand");
   }
   scheduler = Option.Boolean(`--scheduler`, false);
+  cron = Option.Boolean(`--cron`, false);
   http = Option.Boolean(`--http`, false);
   queue = Option.Boolean(`--queue`, false);
   all = Option.Boolean("--all", false);
   static paths = [[`start`]];
   async execute() {
-    if ([this.all, this.http, this.scheduler, this.queue].filter((x) => x).length == 0) {
+    if ([this.all, this.http, this.scheduler || this.cron, this.queue].filter(
+      (x) => x
+    ).length == 0) {
       this.context.stdout.write(
         `No service was selected. please check -h for details
 `
@@ -24,7 +27,7 @@ class StartCommand extends Command {
     logger().info(`Starting Server
 `);
     PostgresqlConnection.defaults.idleTimeoutMillis = 1e4;
-    if (this.scheduler || this.all) {
+    if (this.scheduler || this.cron || this.all) {
       logger().info(`starting scheduler
 `);
       scheduler().start();

package/dist/app/console/StartCommand.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/app/console/StartCommand.mts"],"sourcesContent":["import { Command, Option } from \"clipanion\";\nimport { config } from \"@devbro/neko-config\";\n\nimport { cli, httpServer, logger, scheduler, queue } from \"../../facades.mjs\";\nimport { PostgresqlConnection } from \"@devbro/neko-sql\";\n\nexport class StartCommand extends Command {\n  scheduler = Option.Boolean(`--scheduler`, false);\n  http = Option.Boolean(`--http`, false);\n  queue = Option.Boolean(`--queue`, false);\n  all = Option.Boolean(\"--all\", false);\n  static paths = [[`start`]];\n\n  async execute() {\n    if (\n      [this.all, this.http, this.scheduler, this.queue].filter((x) => x)\n        .length == 0\n    ) {\n      this.context.stdout.write(\n        `No service was selected. please check -h for details\\n`,\n      );\n      return;\n    }\n\n    logger().info(`Starting Server\\n`);\n\n    PostgresqlConnection.defaults.idleTimeoutMillis = 10000;\n\n    if (this.scheduler || this.all) {\n      logger().info(`starting scheduler\\n`);\n      scheduler().start();\n    }\n\n    if (this.queue || this.all) {\n      const config_queues = config.get(\"queues\");\n      for (const [name, conf] of Object.entries(config_queues)) {\n        queue(name).start();\n      }\n    }\n\n    if (this.http || this.all) {\n      const server = httpServer();\n      await server.listen(config.get(\"port\"), () => {\n        logger().info(\n          \"Server is running on http://localhost:\" + config.get(\"port\"),\n        );\n      });\n    }\n  }\n}\n\ncli().register(StartCommand);\n"],"mappings":";;AAAA,SAAS,SAAS,cAAc;AAChC,SAAS,cAAc;AAEvB,SAAS,KAAK,YAAY,QAAQ,WAAW,aAAa;AAC1D,SAAS,4BAA4B;AAE9B,MAAM,qBAAqB,QAAQ;AAAA,EAN1C,OAM0C;AAAA;AAAA;AAAA,EACxC,YAAY,OAAO,QAAQ,eAAe,KAAK;AAAA,EAC/C,OAAO,OAAO,QAAQ,UAAU,KAAK;AAAA,EACrC,QAAQ,OAAO,QAAQ,WAAW,KAAK;AAAA,EACvC,MAAM,OAAO,QAAQ,SAAS,KAAK;AAAA,EACnC,OAAO,QAAQ,CAAC,CAAC,OAAO,CAAC;AAAA,EAEzB,MAAM,UAAU;AACd,QACE,CAAC,KAAK,KAAK,KAAK,MAAM,KAAK,WAAW,KAAK,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,EAC9D,UAAU,GACb;AACA,WAAK,QAAQ,OAAO;AAAA,QAClB;AAAA;AAAA,MACF;AACA;AAAA,IACF;AAEA,WAAO,EAAE,KAAK;AAAA,CAAmB;AAEjC,yBAAqB,SAAS,oBAAoB;AAElD,QAAI,KAAK,aAAa,KAAK,KAAK;AAC9B,aAAO,EAAE,KAAK;AAAA,CAAsB;AACpC,gBAAU,EAAE,MAAM;AAAA,IACpB;AAEA,QAAI,KAAK,SAAS,KAAK,KAAK;AAC1B,YAAM,gBAAgB,OAAO,IAAI,QAAQ;AACzC,iBAAW,CAAC,MAAM,IAAI,KAAK,OAAO,QAAQ,aAAa,GAAG;AACxD,cAAM,IAAI,EAAE,MAAM;AAAA,MACpB;AAAA,IACF;AAEA,QAAI,KAAK,QAAQ,KAAK,KAAK;AACzB,YAAM,SAAS,WAAW;AAC1B,YAAM,OAAO,OAAO,OAAO,IAAI,MAAM,GAAG,MAAM;AAC5C,eAAO,EAAE;AAAA,UACP,2CAA2C,OAAO,IAAI,MAAM;AAAA,QAC9D;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AACF;AAEA,IAAI,EAAE,SAAS,YAAY;","names":[]}
+{"version":3,"sources":["../../../src/app/console/StartCommand.mts"],"sourcesContent":["import { Command, Option } from \"clipanion\";\nimport { config } from \"@devbro/neko-config\";\n\nimport { cli, httpServer, logger, scheduler, queue } from \"../../facades.mjs\";\nimport { PostgresqlConnection } from \"@devbro/neko-sql\";\n\nexport class StartCommand extends Command {\n  scheduler = Option.Boolean(`--scheduler`, false);\n  cron = Option.Boolean(`--cron`, false);\n  http = Option.Boolean(`--http`, false);\n  queue = Option.Boolean(`--queue`, false);\n  all = Option.Boolean(\"--all\", false);\n  static paths = [[`start`]];\n\n  async execute() {\n    if (\n      [this.all, this.http, this.scheduler || this.cron, this.queue].filter(\n        (x) => x,\n      ).length == 0\n    ) {\n      this.context.stdout.write(\n        `No service was selected. please check -h for details\\n`,\n      );\n      return;\n    }\n\n    logger().info(`Starting Server\\n`);\n\n    PostgresqlConnection.defaults.idleTimeoutMillis = 10000;\n\n    if (this.scheduler || this.cron || this.all) {\n      logger().info(`starting scheduler\\n`);\n      scheduler().start();\n    }\n\n    if (this.queue || this.all) {\n      const config_queues = config.get(\"queues\");\n      for (const [name, conf] of Object.entries(config_queues)) {\n        queue(name).start();\n      }\n    }\n\n    if (this.http || this.all) {\n      const server = httpServer();\n      await server.listen(config.get(\"port\"), () => {\n        logger().info(\n          \"Server is running on http://localhost:\" + config.get(\"port\"),\n        );\n      });\n    }\n  }\n}\n\ncli().register(StartCommand);\n"],"mappings":";;AAAA,SAAS,SAAS,cAAc;AAChC,SAAS,cAAc;AAEvB,SAAS,KAAK,YAAY,QAAQ,WAAW,aAAa;AAC1D,SAAS,4BAA4B;AAE9B,MAAM,qBAAqB,QAAQ;AAAA,EAN1C,OAM0C;AAAA;AAAA;AAAA,EACxC,YAAY,OAAO,QAAQ,eAAe,KAAK;AAAA,EAC/C,OAAO,OAAO,QAAQ,UAAU,KAAK;AAAA,EACrC,OAAO,OAAO,QAAQ,UAAU,KAAK;AAAA,EACrC,QAAQ,OAAO,QAAQ,WAAW,KAAK;AAAA,EACvC,MAAM,OAAO,QAAQ,SAAS,KAAK;AAAA,EACnC,OAAO,QAAQ,CAAC,CAAC,OAAO,CAAC;AAAA,EAEzB,MAAM,UAAU;AACd,QACE,CAAC,KAAK,KAAK,KAAK,MAAM,KAAK,aAAa,KAAK,MAAM,KAAK,KAAK,EAAE;AAAA,MAC7D,CAAC,MAAM;AAAA,IACT,EAAE,UAAU,GACZ;AACA,WAAK,QAAQ,OAAO;AAAA,QAClB;AAAA;AAAA,MACF;AACA;AAAA,IACF;AAEA,WAAO,EAAE,KAAK;AAAA,CAAmB;AAEjC,yBAAqB,SAAS,oBAAoB;AAElD,QAAI,KAAK,aAAa,KAAK,QAAQ,KAAK,KAAK;AAC3C,aAAO,EAAE,KAAK;AAAA,CAAsB;AACpC,gBAAU,EAAE,MAAM;AAAA,IACpB;AAEA,QAAI,KAAK,SAAS,KAAK,KAAK;AAC1B,YAAM,gBAAgB,OAAO,IAAI,QAAQ;AACzC,iBAAW,CAAC,MAAM,IAAI,KAAK,OAAO,QAAQ,aAAa,GAAG;AACxD,cAAM,IAAI,EAAE,MAAM;AAAA,MACpB;AAAA,IACF;AAEA,QAAI,KAAK,QAAQ,KAAK,KAAK;AACzB,YAAM,SAAS,WAAW;AAC1B,YAAM,OAAO,OAAO,OAAO,IAAI,MAAM,GAAG,MAAM;AAC5C,eAAO,EAAE;AAAA,UACP,2CAA2C,OAAO,IAAI,MAAM;AAAA,QAC9D;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AACF;AAEA,IAAI,EAAE,SAAS,YAAY;","names":[]}

package/dist/app/console/generate/GenerateApiDocsCommand.d.mts

@@ -4,9 +4,41 @@ import { Command } from 'clipanion';
 declare class GenerateApiDocsCommand extends Command {
     static paths: string[][];
     static usage: clipanion.Usage;
-    help: boolean;
-    execute(): Promise<0 | undefined>;
+    subcommand: string | undefined;
+    output: string | undefined;
+    config: string | undefined;
+    execute(): Promise<number>;
+    private executeGenerateFromRoutes;
+    private executeGenerateBase;
+    private executeMergeFiles;
     private extractParameters;
+    private generateFromRoutes;
+    getBaseOpenApiSpec(): {
+        openapi: string;
+        info: {
+            title: string;
+            version: string;
+            description: string;
+        };
+        servers: {
+            url: string;
+            description: string;
+        }[];
+        components: {
+            securitySchemes: {
+                bearerAuth: {
+                    type: string;
+                    scheme: string;
+                    bearerFormat: string;
+                    description: string;
+                };
+            };
+        };
+        security: {
+            bearerAuth: never[];
+        }[];
+        paths: Record<string, any>;
+    };
 }
 
 export { GenerateApiDocsCommand };

package/dist/app/console/generate/GenerateApiDocsCommand.mjs

@@ -10,139 +10,150 @@ class GenerateApiDocsCommand extends Command {
   static {
     __name(this, "GenerateApiDocsCommand");
   }
-  static paths = [
-    [`make`, `apidocs`],
-    [`generate`, `apidocs`]
-  ];
+  static paths = [[`generate`, `apidocsv2`]];
   static usage = Command.Usage({
     category: `Generate`,
     description: `Generate OpenAPI documentation from routes`,
     details: `
-      This command generates OpenAPI 3.0 specification documentation by analyzing
+      This command utility generates OpenAPI 3.0 specification documentation by analyzing
       your application's routes and merging with example files.
       
-      The generated documentation includes:
-      - All registered routes with their HTTP methods
-      - Path parameters extracted from route definitions
-      - Request body schemas for POST, PUT, and PATCH methods
-      - Response schemas
-      
-      The command will merge files specified in config.api_docs.merge_files
-      and output the final documentation to config.api_docs.output.
+      Subcommands:
+      - generate-from-routes: Generate OpenAPI spec from registered routes
+      - generate-base: Generate base OpenAPI specification structure
+      - merge-files: Merge multiple OpenAPI files into final documentation
 
+      
       This command depends on config data. make sure your default config contains the following:
-      api_docs: {
-        merge_files: [
-          path.join(__dirname, '../..', 'private', 'openapi_examples.json'),
-          path.join(__dirname, '../..', 'private', 'openapi_base.json'),
-          path.join(__dirname, '../..', 'private', 'openapi_user_changes.json'),
-        ],
-        output: path.join(__dirname, '../..', 'private', 'openapi.json'),
-      }
+
+\`\`\`
+api_docs: {
+
+  merge_files: [
+
+    path.join(__dirname, '../..', 'private', 'openapi_base.json'),
+
+    path.join(__dirname, '../..', 'private', 'openapi_from_routes.json'),
+
+    path.join(__dirname, '../..', 'private', 'openapi_from_tests.json'),
+
+    path.join(__dirname, '../..', 'private', 'openapi_other_user_changes.json'),
+
+  ],
+
+  output: path.join(__dirname, '../..', 'public', 'openapi.json'),
+
+}
+
+\`\`\`
     `,
-    examples: [[`Generate API documentation`, `$0 generate apidocs`]]
+    examples: [
+      [
+        `Generate from routes`,
+        `$0 generate apidocsv2 generate-from-routes --output path/to/output.json`
+      ],
+      [
+        `Generate base spec`,
+        `$0 generate apidocsv2 generate-base --output path/to/output.json`
+      ],
+      [`Merge files`, `$0 generate apidocsv2 merge-files`],
+      [`Show help`, `$0 generate apidocsv2 --help`]
+    ]
   });
-  help = Option.Boolean(`--help,-h`, false, {
-    description: `Show help message for this command`
+  subcommand = Option.String({ required: false });
+  output = Option.String(`--output,-o`, {
+    description: `Output file path for generated documentation`
+  });
+  config = Option.String(`--config,-c`, {
+    description: `Path in config to get details from (default: api_docs)`,
+    required: false
   });
   async execute() {
-    if (this.help) {
+    if (!this.subcommand) {
       this.context.stdout.write(
         this.constructor.usage?.toString() || "No help available\n"
       );
       return 0;
     }
-    const rootDir = process.cwd();
-    this.context.stdout.write(`Generating OpenAPI documentation...
+    switch (this.subcommand) {
+      case "generate-from-routes":
+        return await this.executeGenerateFromRoutes();
+      case "generate-base":
+        return await this.executeGenerateBase();
+      case "merge-files":
+        return await this.executeMergeFiles();
+      default:
+        this.context.stderr.write(`Unknown subcommand: ${this.subcommand}
 `);
-    const routes = router().routes;
-    const openApiSpec = {
-      openapi: "3.0.0",
-      info: {
-        title: "API Documentation",
-        version: "1.0.0",
-        description: "Auto-generated API documentation"
-      },
-      servers: [
-        {
-          url: "/",
-          description: "Local server"
-        }
-      ],
-      paths: {}
-    };
-    for (const route of routes) {
-      const routePath = route.path;
-      const openApiPath = routePath.replace(/:([a-zA-Z0-9_]+)/g, "{$1}");
-      if (!openApiSpec.paths[openApiPath]) {
-        openApiSpec.paths[openApiPath] = {};
-      }
-      for (const method of route.methods) {
-        const lowerMethod = method.toLowerCase();
-        if (lowerMethod === "head") {
-          continue;
-        }
-        openApiSpec.paths[openApiPath][lowerMethod] = {
-          summary: `${method} ${routePath}`,
-          description: `Endpoint for ${method} ${routePath}`,
-          parameters: this.extractParameters(routePath),
-          responses: {
-            "200": {
-              description: "Successful response",
-              content: {
-                "application/json": {
-                  schema: {
-                    type: "object"
-                  }
-                }
-              }
-            },
-            "500": {
-              description: "Internal server error"
-            }
-          }
-        };
-        if (["post", "put", "patch"].includes(lowerMethod)) {
-          openApiSpec.paths[openApiPath][lowerMethod].requestBody = {
-            required: true,
-            content: {
-              "application/json": {
-                schema: {
-                  type: "object"
-                }
-              }
-            }
-          };
-        }
-      }
+        this.context.stdout.write(
+          this.constructor.usage?.toString() || "No help available\n"
+        );
+        return 1;
     }
-    await fs.mkdir(config.get("private_path"), { recursive: true });
-    const outputPath = path.join(config.get("private_path"), "openapi.json");
+  }
+  async executeGenerateFromRoutes() {
+    this.context.stdout.write(
+      `Generating OpenAPI documentation from routes...
+`
+    );
+    const openApiSpec = this.generateFromRoutes();
+    const outputPath = this.output || path.join(config.get("private_path"), "openapi_from_routes.json");
+    await fs.mkdir(path.dirname(outputPath), { recursive: true });
     await fs.writeFile(
       outputPath,
       JSON.stringify(openApiSpec, null, 2),
       "utf-8"
     );
     this.context.stdout.write(
-      `OpenAPI documentation generated at: ${outputPath}
+      `OpenAPI routes documentation generated at: ${outputPath}
 `
     );
-    this.context.stdout.write(`Total routes documented: ${routes.length}
+    this.context.stdout.write(
+      `Total routes documented: ${Object.keys(openApiSpec.paths).length}
+`
+    );
+    return 0;
+  }
+  async executeGenerateBase() {
+    this.context.stdout.write(`Generating base OpenAPI specification...
 `);
-    let files_to_merge = config.get("api_docs.merge_files");
+    const baseSpec = this.getBaseOpenApiSpec();
+    const outputPath = this.output || path.join(config.get("private_path"), "openapi_base.json");
+    await fs.mkdir(path.dirname(outputPath), { recursive: true });
+    await fs.writeFile(outputPath, JSON.stringify(baseSpec, null, 2), "utf-8");
+    this.context.stdout.write(
+      `Base OpenAPI specification generated at: ${outputPath}
+`
+    );
+    return 0;
+  }
+  async executeMergeFiles() {
+    this.context.stdout.write(`Merging OpenAPI files...
+`);
+    let configPath = this.config || "api_docs";
+    const files_to_merge = config.get(`${configPath}.merge_files`);
     let final_api_docs = {};
-    for (let file_path of files_to_merge) {
-      let file_json = JSON.parse(await fs.readFile(file_path, "utf8"));
-      final_api_docs = Arr.deepMerge(final_api_docs, file_json);
+    for (const file_path of files_to_merge) {
+      try {
+        const file_json = JSON.parse(await fs.readFile(file_path, "utf8"));
+        final_api_docs = Arr.deepMerge(final_api_docs, file_json);
+        this.context.stdout.write(`  Merged: ${file_path}
+`);
+      } catch (error) {
+        this.context.stderr.write(
+          `  Warning: Could not read ${file_path}: ${error.message}
+`
+        );
+      }
     }
-    await fs.writeFile(
-      config.get("api_docs.output"),
-      JSON.stringify(final_api_docs, null, 2)
-    );
+    const outputPath = this.output || config.get(`${configPath}.output`);
+    await fs.mkdir(path.dirname(outputPath), { recursive: true });
+    await fs.writeFile(outputPath, JSON.stringify(final_api_docs, null, 2));
     this.context.stdout.write(
-      `wrote final open api document to : ${config.get("api_docs.output")}
+      `Final OpenAPI document written to: ${outputPath}
 `
     );
+    return 0;
   }
   extractParameters(routePath) {
     const paramRegex = /:([a-zA-Z0-9_]+)/g;
@@ -161,6 +172,78 @@ class GenerateApiDocsCommand extends Command {
     }
     return parameters;
   }
+  generateFromRoutes() {
+    const openApiSpec = {
+      paths: {}
+    };
+    const routes = router().routes;
+    for (const route of routes) {
+      const routePath = route.path;
+      const openApiPath = routePath.replace(/\/$/g, "");
+      if (!openApiSpec.paths[openApiPath]) {
+        openApiSpec.paths[openApiPath] = {};
+      }
+      for (const method of route.methods) {
+        const lowerMethod = method.toLowerCase();
+        if (lowerMethod === "head") {
+          continue;
+        }
+        openApiSpec.paths[openApiPath][lowerMethod] = {
+          summary: `${routePath}`,
+          description: `Endpoint for ${method} ${routePath}`,
+          security: [],
+          parameters: this.extractParameters(routePath),
+          responses: {}
+        };
+        if (["post", "put", "patch"].includes(lowerMethod)) {
+          openApiSpec.paths[openApiPath][lowerMethod].requestBody = {
+            required: true,
+            content: {
+              "application/json": {
+                schema: {
+                  type: "object"
+                }
+              }
+            }
+          };
+        }
+      }
+    }
+    return openApiSpec;
+  }
+  getBaseOpenApiSpec() {
+    const openApiSpec = {
+      openapi: "3.0.0",
+      info: {
+        title: "API Documentation",
+        version: "1.0.0",
+        description: "Auto-generated API documentation"
+      },
+      servers: [
+        {
+          url: "/",
+          description: "Local server"
+        }
+      ],
+      components: {
+        securitySchemes: {
+          bearerAuth: {
+            type: "http",
+            scheme: "bearer",
+            bearerFormat: "JWT",
+            description: "JWT token authentication"
+          }
+        }
+      },
+      security: [
+        {
+          bearerAuth: []
+        }
+      ],
+      paths: {}
+    };
+    return openApiSpec;
+  }
 }
 cli().register(GenerateApiDocsCommand);
 export {

package/dist/app/console/generate/GenerateApiDocsCommand.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/app/console/generate/GenerateApiDocsCommand.mts"],"sourcesContent":["import { cli, router } from \"../../../facades.mjs\";\nimport { Command, Option } from \"clipanion\";\nimport path from \"path\";\nimport * as fs from \"fs/promises\";\nimport { config } from \"../../../config.mjs\";\nimport { Arr } from \"@devbro/neko-helper\";\n\nexport class GenerateApiDocsCommand extends Command {\n  static paths = [\n    [`make`, `apidocs`],\n    [`generate`, `apidocs`],\n  ];\n\n  static usage = Command.Usage({\n    category: `Generate`,\n    description: `Generate OpenAPI documentation from routes`,\n    details: `\n      This command generates OpenAPI 3.0 specification documentation by analyzing\n      your application's routes and merging with example files.\n      \n      The generated documentation includes:\n      - All registered routes with their HTTP methods\n      - Path parameters extracted from route definitions\n      - Request body schemas for POST, PUT, and PATCH methods\n      - Response schemas\n      \n      The command will merge files specified in config.api_docs.merge_files\n      and output the final documentation to config.api_docs.output.\n\n      This command depends on config data. make sure your default config contains the following:\n      api_docs: {\n        merge_files: [\n          path.join(__dirname, '../..', 'private', 'openapi_examples.json'),\n          path.join(__dirname, '../..', 'private', 'openapi_base.json'),\n          path.join(__dirname, '../..', 'private', 'openapi_user_changes.json'),\n        ],\n        output: path.join(__dirname, '../..', 'private', 'openapi.json'),\n      }\n    `,\n    examples: [[`Generate API documentation`, `$0 generate apidocs`]],\n  });\n\n  help = Option.Boolean(`--help,-h`, false, {\n    description: `Show help message for this command`,\n  });\n\n  async execute() {\n    if (this.help) {\n      this.context.stdout.write(\n        this.constructor.usage?.toString() || \"No help available\\n\",\n      );\n      return 0;\n    }\n\n    const rootDir = process.cwd();\n\n    this.context.stdout.write(`Generating OpenAPI documentation...\\n`);\n\n    // Get all routes from the router\n    const routes = router().routes;\n\n    // Generate OpenAPI 3.0 specification\n    const openApiSpec = {\n      openapi: \"3.0.0\",\n      info: {\n        title: \"API Documentation\",\n        version: \"1.0.0\",\n        description: \"Auto-generated API documentation\",\n      },\n      servers: [\n        {\n          url: \"/\",\n          description: \"Local server\",\n        },\n      ],\n      paths: {} as Record<string, any>,\n    };\n\n    // Process each route\n    for (const route of routes) {\n      const routePath = route.path;\n      // Convert route path to OpenAPI format (e.g., /api/:id -> /api/{id})\n      const openApiPath = routePath.replace(/:([a-zA-Z0-9_]+)/g, \"{$1}\");\n\n      if (!openApiSpec.paths[openApiPath]) {\n        openApiSpec.paths[openApiPath] = {};\n      }\n\n      // Add each HTTP method for this route\n      for (const method of route.methods) {\n        const lowerMethod = method.toLowerCase();\n\n        // Skip HEAD as it's usually auto-generated\n        if (lowerMethod === \"head\") {\n          continue;\n        }\n\n        openApiSpec.paths[openApiPath][lowerMethod] = {\n          summary: `${method} ${routePath}`,\n          description: `Endpoint for ${method} ${routePath}`,\n          parameters: this.extractParameters(routePath),\n          responses: {\n            \"200\": {\n              description: \"Successful response\",\n              content: {\n                \"application/json\": {\n                  schema: {\n                    type: \"object\",\n                  },\n                },\n              },\n            },\n            \"500\": {\n              description: \"Internal server error\",\n            },\n          },\n        };\n\n        // Add request body for POST, PUT, PATCH\n        if ([\"post\", \"put\", \"patch\"].includes(lowerMethod)) {\n          openApiSpec.paths[openApiPath][lowerMethod].requestBody = {\n            required: true,\n            content: {\n              \"application/json\": {\n                schema: {\n                  type: \"object\",\n                },\n              },\n            },\n          };\n        }\n      }\n    }\n\n    // Ensure public directory exists\n    await fs.mkdir(config.get(\"private_path\"), { recursive: true });\n\n    // Write the OpenAPI spec to public/openapi.json\n    const outputPath = path.join(config.get(\"private_path\"), \"openapi.json\");\n    await fs.writeFile(\n      outputPath,\n      JSON.stringify(openApiSpec, null, 2),\n      \"utf-8\",\n    );\n\n    this.context.stdout.write(\n      `OpenAPI documentation generated at: ${outputPath}\\n`,\n    );\n    this.context.stdout.write(`Total routes documented: ${routes.length}\\n`);\n\n    let files_to_merge: string[] = config.get(\"api_docs.merge_files\");\n    let final_api_docs = {};\n    for (let file_path of files_to_merge) {\n      let file_json = JSON.parse(await fs.readFile(file_path, \"utf8\"));\n      final_api_docs = Arr.deepMerge(final_api_docs, file_json);\n    }\n\n    await fs.writeFile(\n      config.get(\"api_docs.output\"),\n      JSON.stringify(final_api_docs, null, 2),\n    );\n\n    this.context.stdout.write(\n      `wrote final open api document to : ${config.get(\"api_docs.output\")}\\n`,\n    );\n  }\n\n  private extractParameters(routePath: string): any[] {\n    const paramRegex = /:([a-zA-Z0-9_]+)/g;\n    const parameters: any[] = [];\n    let match;\n\n    while ((match = paramRegex.exec(routePath)) !== null) {\n      parameters.push({\n        name: match[1],\n        in: \"path\",\n        required: true,\n        schema: {\n          type: \"string\",\n        },\n        description: `Path parameter ${match[1]}`,\n      });\n    }\n\n    return parameters;\n  }\n}\n\ncli().register(GenerateApiDocsCommand);\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../../src/app/console/generate/GenerateApiDocsCommand.mts"],"sourcesContent":["/*\nhow this command should work:\n<command> generate-from-routes --output path/to/output.json\n<command> generate-base --output path/to/output.json\n<command> merge-files # file lists/details are in config\n<command> # will show help\n*/\nimport { cli, router } from \"../../../facades.mjs\";\nimport { Command, Option } from \"clipanion\";\nimport path from \"path\";\nimport * as fs from \"fs/promises\";\nimport { config } from \"../../../config.mjs\";\nimport { Arr } from \"@devbro/neko-helper\";\n\nexport class GenerateApiDocsCommand extends Command {\n  static paths = [[`generate`, `apidocsv2`]];\n\n  static usage = Command.Usage({\n    category: `Generate`,\n    description: `Generate OpenAPI documentation from routes`,\n    details: `\n      This command utility generates OpenAPI 3.0 specification documentation by analyzing\n      your application's routes and merging with example files.\n      \n      Subcommands:\n      - generate-from-routes: Generate OpenAPI spec from registered routes\n      - generate-base: Generate base OpenAPI specification structure\n      - merge-files: Merge multiple OpenAPI files into final documentation\n\n      \n      This command depends on config data. make sure your default config contains the following:\n\n\\`\\`\\`\napi_docs: {\n\n  merge_files: [\n\n    path.join(__dirname, '../..', 'private', 'openapi_base.json'),\n\n    path.join(__dirname, '../..', 'private', 'openapi_from_routes.json'),\n\n    path.join(__dirname, '../..', 'private', 'openapi_from_tests.json'),\n\n    path.join(__dirname, '../..', 'private', 'openapi_other_user_changes.json'),\n\n  ],\n\n  output: path.join(__dirname, '../..', 'public', 'openapi.json'),\n\n}\n\n\\`\\`\\`\n    `,\n    examples: [\n      [\n        `Generate from routes`,\n        `$0 generate apidocsv2 generate-from-routes --output path/to/output.json`,\n      ],\n      [\n        `Generate base spec`,\n        `$0 generate apidocsv2 generate-base --output path/to/output.json`,\n      ],\n      [`Merge files`, `$0 generate apidocsv2 merge-files`],\n      [`Show help`, `$0 generate apidocsv2 --help`],\n    ],\n  });\n\n  subcommand = Option.String({ required: false });\n\n  output = Option.String(`--output,-o`, {\n    description: `Output file path for generated documentation`,\n  });\n\n  config = Option.String(`--config,-c`, {\n    description: `Path in config to get details from (default: api_docs)`,\n    required: false,\n  });\n\n  async execute() {\n    if (!this.subcommand) {\n      this.context.stdout.write(\n        this.constructor.usage?.toString() || \"No help available\\n\",\n      );\n      return 0;\n    }\n\n    switch (this.subcommand) {\n      case \"generate-from-routes\":\n        return await this.executeGenerateFromRoutes();\n      case \"generate-base\":\n        return await this.executeGenerateBase();\n      case \"merge-files\":\n        return await this.executeMergeFiles();\n      default:\n        this.context.stderr.write(`Unknown subcommand: ${this.subcommand}\\n`);\n        this.context.stdout.write(\n          this.constructor.usage?.toString() || \"No help available\\n\",\n        );\n        return 1;\n    }\n  }\n\n  private async executeGenerateFromRoutes() {\n    this.context.stdout.write(\n      `Generating OpenAPI documentation from routes...\\n`,\n    );\n\n    const openApiSpec = this.generateFromRoutes();\n    const outputPath =\n      this.output ||\n      path.join(config.get(\"private_path\"), \"openapi_from_routes.json\");\n\n    // Ensure directory exists\n    await fs.mkdir(path.dirname(outputPath), { recursive: true });\n\n    await fs.writeFile(\n      outputPath,\n      JSON.stringify(openApiSpec, null, 2),\n      \"utf-8\",\n    );\n\n    this.context.stdout.write(\n      `OpenAPI routes documentation generated at: ${outputPath}\\n`,\n    );\n    this.context.stdout.write(\n      `Total routes documented: ${Object.keys(openApiSpec.paths).length}\\n`,\n    );\n    return 0;\n  }\n\n  private async executeGenerateBase() {\n    this.context.stdout.write(`Generating base OpenAPI specification...\\n`);\n\n    const baseSpec = this.getBaseOpenApiSpec();\n    const outputPath =\n      this.output || path.join(config.get(\"private_path\"), \"openapi_base.json\");\n\n    // Ensure directory exists\n    await fs.mkdir(path.dirname(outputPath), { recursive: true });\n\n    await fs.writeFile(outputPath, JSON.stringify(baseSpec, null, 2), \"utf-8\");\n\n    this.context.stdout.write(\n      `Base OpenAPI specification generated at: ${outputPath}\\n`,\n    );\n    return 0;\n  }\n\n  private async executeMergeFiles() {\n    this.context.stdout.write(`Merging OpenAPI files...\\n`);\n    let configPath = this.config || \"api_docs\";\n\n    const files_to_merge: string[] = config.get(`${configPath}.merge_files`);\n    let final_api_docs = {};\n\n    for (const file_path of files_to_merge) {\n      try {\n        const file_json = JSON.parse(await fs.readFile(file_path, \"utf8\"));\n        final_api_docs = Arr.deepMerge(final_api_docs, file_json);\n        this.context.stdout.write(`  Merged: ${file_path}\\n`);\n      } catch (error) {\n        this.context.stderr.write(\n          `  Warning: Could not read ${file_path}: ${(error as Error).message}\\n`,\n        );\n      }\n    }\n\n    const outputPath = this.output || config.get(`${configPath}.output`);\n\n    // Ensure directory exists\n    await fs.mkdir(path.dirname(outputPath), { recursive: true });\n\n    await fs.writeFile(outputPath, JSON.stringify(final_api_docs, null, 2));\n\n    this.context.stdout.write(\n      `Final OpenAPI document written to: ${outputPath}\\n`,\n    );\n    return 0;\n  }\n\n  private extractParameters(routePath: string): any[] {\n    const paramRegex = /:([a-zA-Z0-9_]+)/g;\n    const parameters: any[] = [];\n    let match;\n\n    while ((match = paramRegex.exec(routePath)) !== null) {\n      parameters.push({\n        name: match[1],\n        in: \"path\",\n        required: true,\n        schema: {\n          type: \"string\",\n        },\n        description: `Path parameter ${match[1]}`,\n      });\n    }\n\n    return parameters;\n  }\n\n  private generateFromRoutes() {\n    const openApiSpec = {\n      paths: {} as any,\n    };\n    const routes = router().routes;\n\n    // Process each route\n    for (const route of routes) {\n      const routePath = route.path;\n      // Convert route path to OpenAPI format (e.g., /api/:id -> /api/{id})\n      const openApiPath = routePath.replace(/\\/$/g, \"\"); //.replace(/:([a-zA-Z0-9_]+)/g, \"{$1}\");\n\n      if (!openApiSpec.paths[openApiPath]) {\n        openApiSpec.paths[openApiPath] = {};\n      }\n\n      // Add each HTTP method for this route\n      for (const method of route.methods) {\n        const lowerMethod = method.toLowerCase();\n\n        // Skip HEAD as it's usually auto-generated\n        if (lowerMethod === \"head\") {\n          continue;\n        }\n\n        openApiSpec.paths[openApiPath][lowerMethod] = {\n          summary: `${routePath}`,\n          description: `Endpoint for ${method} ${routePath}`,\n          security: [],\n          parameters: this.extractParameters(routePath),\n          responses: {},\n        };\n\n        // Add request body for POST, PUT, PATCH\n        if ([\"post\", \"put\", \"patch\"].includes(lowerMethod)) {\n          openApiSpec.paths[openApiPath][lowerMethod].requestBody = {\n            required: true,\n            content: {\n              \"application/json\": {\n                schema: {\n                  type: \"object\",\n                },\n              },\n            },\n          };\n        }\n      }\n    }\n\n    return openApiSpec;\n  }\n\n  getBaseOpenApiSpec() {\n    // Generate OpenAPI 3.0 specification\n    const openApiSpec = {\n      openapi: \"3.0.0\",\n      info: {\n        title: \"API Documentation\",\n        version: \"1.0.0\",\n        description: \"Auto-generated API documentation\",\n      },\n      servers: [\n        {\n          url: \"/\",\n          description: \"Local server\",\n        },\n      ],\n      components: {\n        securitySchemes: {\n          bearerAuth: {\n            type: \"http\",\n            scheme: \"bearer\",\n            bearerFormat: \"JWT\",\n            description: \"JWT token authentication\",\n          },\n        },\n      },\n      security: [\n        {\n          bearerAuth: [],\n        },\n      ],\n      paths: {} as Record<string, any>,\n    };\n\n    return openApiSpec;\n  }\n}\n\ncli().register(GenerateApiDocsCommand);\n"],"mappings":"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","names":[]}

package/dist/app/console/project/base_project/src/config/storages.ts.tpl

@@ -1,4 +1,4 @@
-import { LocalStorageConfig } from '@devbro/pashmak/storage';
+import { LocalStorageProviderConfig } from '@devbro/pashmak/storage';
 import path from 'path';
 import os from 'os';
 
@@ -7,6 +7,6 @@ export default {
     provider: 'local',
     config: {
       basePath: path.join(os.tmpdir(), '/app-storage/'),
-    } as LocalStorageConfig,
+    } as LocalStorageProviderConfig,
   },
 };

package/dist/bin/DatabaseServiceProvider.cjs

@@ -37,6 +37,9 @@ var Middleware = class {
   }
 };
 
+// ../neko-router/dist/CompiledRoute.mjs
+var import_neko_helper = require("@devbro/neko-helper");
+
 // src/DatabaseServiceProvider.mts
 var import_neko_sql = require("@devbro/neko-sql");
 var import_neko_orm = require("@devbro/neko-orm");
@@ -128,8 +131,11 @@ var DatabaseServiceProvider = class _DatabaseServiceProvider extends Middleware
     return _DatabaseServiceProvider.instance;
   }
   getConnection(db_config) {
-    const conn = new import_neko_sql.PostgresqlConnection(db_config);
-    return conn;
+    if (db_config.provider === "postgresql") {
+      const conn = new import_neko_sql.PostgresqlConnection(db_config.config);
+      return conn;
+    }
+    throw new Error(`Unsupported database provider: ${db_config.provider}`);
   }
 };
 // Annotate the CommonJS export names for ESM import in node: