@devbro/pashmak 0.1.43 → 0.1.44

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

@@ -1,8 +1,11 @@
+import * as clipanion from 'clipanion';
 import { Command } from 'clipanion';
 
 declare class GenerateApiDocsCommand extends Command {
     static paths: string[][];
-    execute(): Promise<void>;
+    static usage: clipanion.Usage;
+    help: boolean;
+    execute(): Promise<0 | undefined>;
     private extractParameters;
 }
 

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

@@ -1,9 +1,11 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import { cli, router } from "../../../facades.mjs";
-import { Command } from "clipanion";
+import { Command, Option } from "clipanion";
 import path from "path";
 import * as fs from "fs/promises";
+import { config } from "../../../config.mjs";
+import { Arr } from "@devbro/neko-helper";
 class GenerateApiDocsCommand extends Command {
   static {
     __name(this, "GenerateApiDocsCommand");
@@ -12,7 +14,44 @@ class GenerateApiDocsCommand extends Command {
     [`make`, `apidocs`],
     [`generate`, `apidocs`]
   ];
+  static usage = Command.Usage({
+    category: `Generate`,
+    description: `Generate OpenAPI documentation from routes`,
+    details: `
+      This command 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.
+
+      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'),
+      }
+    `,
+    examples: [[`Generate API documentation`, `$0 generate apidocs`]]
+  });
+  help = Option.Boolean(`--help,-h`, false, {
+    description: `Show help message for this command`
+  });
   async execute() {
+    if (this.help) {
+      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...
 `);
@@ -77,9 +116,8 @@ class GenerateApiDocsCommand extends Command {
         }
       }
     }
-    const publicDir = path.join(rootDir, "public");
-    await fs.mkdir(publicDir, { recursive: true });
-    const outputPath = path.join(publicDir, "openapi.json");
+    await fs.mkdir(config.get("private_path"), { recursive: true });
+    const outputPath = path.join(config.get("private_path"), "openapi.json");
     await fs.writeFile(
       outputPath,
       JSON.stringify(openApiSpec, null, 2),
@@ -91,6 +129,20 @@ class GenerateApiDocsCommand extends Command {
     );
     this.context.stdout.write(`Total routes documented: ${routes.length}
 `);
+    let files_to_merge = config.get("api_docs.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"));
+      Arr.deepMerge(final_api_docs, file_json);
+    }
+    await fs.writeFile(
+      config.get("api_docs.output"),
+      JSON.stringify(final_api_docs, null, 2)
+    );
+    this.context.stdout.write(
+      `wrote final open api document to : ${config.get("api_docs.output")}
+`
+    );
   }
   extractParameters(routePath) {
     const paramRegex = /:([a-zA-Z0-9_]+)/g;

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 } from \"clipanion\";\nimport path from \"path\";\nimport * as fs from \"fs/promises\";\n\nexport class GenerateApiDocsCommand extends Command {\n  static paths = [\n    [`make`, `apidocs`],\n    [`generate`, `apidocs`],\n  ];\n\n  async execute() {\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    const publicDir = path.join(rootDir, \"public\");\n    await fs.mkdir(publicDir, { recursive: true });\n\n    // Write the OpenAPI spec to public/openapi.json\n    const outputPath = path.join(publicDir, \"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\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":["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      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":[]}

package/dist/app/console/project/CreateProjectCommand.mjs

@@ -7,6 +7,7 @@ import * as fs from "fs/promises";
 import { fileURLToPath } from "url";
 import handlebars from "handlebars";
 import { execSync } from "child_process";
+import { select, Separator } from "@inquirer/prompts";
 class CreateProjectCommand extends Command {
   static {
     __name(this, "CreateProjectCommand");
@@ -53,6 +54,27 @@ class CreateProjectCommand extends Command {
       return 1;
     } catch {
     }
+    const validation_library = await select({
+      message: "Select a package you want for validation",
+      choices: [
+        {
+          name: "Yup",
+          value: "yup",
+          description: "https://github.com/jquense/yup"
+        },
+        {
+          name: "Zod",
+          value: "zod",
+          description: "https://zod.dev/"
+        },
+        new Separator(),
+        {
+          name: "None",
+          value: "none",
+          disabled: false
+        }
+      ]
+    });
     await fs.mkdir(projectPath, { recursive: true });
     console.log(`Created project directory at: ${projectPath}`);
     const dirname = typeof __dirname === "undefined" ? path.dirname(fileURLToPath(import.meta.url)) : __dirname;
@@ -62,7 +84,9 @@ class CreateProjectCommand extends Command {
     }
     console.log(`Using base project path: ${basePath}`);
     const baseProjectPath = basePath;
-    await this.processTplFolder(baseProjectPath, projectPath, {});
+    await this.processTplFolder(baseProjectPath, projectPath, {
+      validation_library
+    });
     console.log(`Copied base project files to: ${projectPath}`);
     const packageJsonPath = path.join(projectPath, `package.json`);
     const packageJson = JSON.parse(await fs.readFile(packageJsonPath, `utf-8`));
@@ -92,7 +116,7 @@ class CreateProjectCommand extends Command {
         await fs.mkdir(destPath, { recursive: true });
         await this.processTplFolder(srcPath, destPath, data);
       } else if (file.name.endsWith(".tpl")) {
-        await this.processTplFile(srcPath, destPath, {});
+        await this.processTplFile(srcPath, destPath, data);
       } else {
         throw new Error(
           "unexpected non tpl file: " + srcPath + " " + file.name
@@ -101,6 +125,7 @@ class CreateProjectCommand extends Command {
     }
   }
   async processTplFile(src, dest, data = {}) {
+    handlebars.registerHelper("eq", (a, b) => a === b);
     const compiledTemplate = handlebars.compile(
       (await fs.readFile(src)).toString()
     );

package/dist/app/console/project/CreateProjectCommand.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/app/console/project/CreateProjectCommand.mts"],"sourcesContent":["import { Command, Option } from \"clipanion\";\nimport { Case } from \"change-case-all\";\nimport path from \"path\";\nimport * as fs from \"fs/promises\";\nimport { fileURLToPath } from \"url\";\nimport handlebars from \"handlebars\";\nimport { execSync } from \"child_process\";\n\nexport class CreateProjectCommand extends Command {\n  static paths = [[`create`, `project`]];\n\n  static usage = Command.Usage({\n    category: `Project`,\n    description: `Create a new project`,\n    details: `\n      This command creates a new project with the specified name at the given path.\n      If no path is provided, the project will be created in the current directory.\n    `,\n    examples: [\n      [\n        `Create a new project in specified directory`,\n        `create project --path /path/to/my-project --git`,\n      ],\n      [\n        `Create a new project at a specific path with git initialized`,\n        `create project --path /path/to/my-project --git`,\n      ],\n    ],\n  });\n\n  projectPath = Option.String(\"--path\", { required: true });\n\n  git = Option.Boolean(`--git`, false, {\n    description: `Initialize a git repository in the new project`,\n  });\n\n  async folderExists(folderPath: string): Promise<boolean> {\n    try {\n      const stats = await fs.stat(folderPath);\n      return stats.isDirectory();\n    } catch (error: any) {\n      if (error.code === \"ENOENT\") {\n        return false; // Folder does not exist\n      }\n      throw error; // Other errors (e.g., permission issues)\n    }\n  }\n\n  async execute() {\n    // Create the project directory path by joining the specified path and project name\n    const projectPath = path.join(this.projectPath);\n    // Check if directory already exists\n    try {\n      await fs.access(projectPath);\n      console.error(`Error: Directory ${projectPath} already exists.`);\n      return 1;\n    } catch {\n      // Directory doesn't exist, we can proceed\n    }\n\n    await fs.mkdir(projectPath, { recursive: true });\n    console.log(`Created project directory at: ${projectPath}`);\n\n    const dirname =\n      typeof __dirname === \"undefined\"\n        ? path.dirname(fileURLToPath(import.meta.url))\n        : __dirname;\n\n    let basePath = path.join(dirname, `./base_project`);\n    if ((await this.folderExists(basePath)) === false) {\n      // we are running a compiled code that was bundled and the code is running from ./dist/bin/ folder.\n      basePath = path.join(dirname, `../app/console/project/base_project`);\n    }\n\n    console.log(`Using base project path: ${basePath}`);\n    //copy content of ./base_project to the new project directory\n    const baseProjectPath = basePath;\n\n    await this.processTplFolder(baseProjectPath, projectPath, {});\n    console.log(`Copied base project files to: ${projectPath}`);\n\n    //modify package.json with foldername\n    const packageJsonPath = path.join(projectPath, `package.json`);\n    const packageJson = JSON.parse(await fs.readFile(packageJsonPath, `utf-8`));\n    packageJson.name = Case.snake(path.basename(projectPath));\n    await fs.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2));\n    console.log(`Updated package.json with project name: ${packageJson.name}`);\n\n    if (this.git) {\n      try {\n        execSync(\n          'git init; git add --all; git commit --allow-empty -m \"chore: first commit for pashmak\"',\n          {\n            cwd: projectPath,\n          },\n        );\n      } catch (error) {\n        console.error(`Failed to create project.`, error);\n        return 1;\n      }\n    }\n  }\n\n  async processTplFolder(src: string, dest: string, data: any = {}) {\n    const files = await fs.readdir(src, { withFileTypes: true });\n    for (const file of files) {\n      const srcPath = path.join(src, file.name);\n      const destPath =\n        file.isFile() && file.name.endsWith(\".tpl\")\n          ? path.join(dest, file.name.substring(0, file.name.length - 4))\n          : path.join(dest, file.name);\n\n      if (file.isDirectory()) {\n        await fs.mkdir(destPath, { recursive: true });\n        await this.processTplFolder(srcPath, destPath, data);\n      } else if (file.name.endsWith(\".tpl\")) {\n        await this.processTplFile(srcPath, destPath, {});\n      } else {\n        throw new Error(\n          \"unexpected non tpl file: \" + srcPath + \" \" + file.name,\n        );\n      }\n    }\n  }\n\n  async processTplFile(src: string, dest: string, data: any = {}) {\n    const compiledTemplate = handlebars.compile(\n      (await fs.readFile(src)).toString(),\n    );\n    const template = await compiledTemplate(data);\n    await fs.writeFile(dest, template);\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../../src/app/console/project/CreateProjectCommand.mts"],"sourcesContent":["import { Command, Option } from \"clipanion\";\nimport { Case } from \"change-case-all\";\nimport path from \"path\";\nimport * as fs from \"fs/promises\";\nimport { fileURLToPath } from \"url\";\nimport handlebars from \"handlebars\";\nimport { execSync } from \"child_process\";\nimport { select, Separator } from \"@inquirer/prompts\";\n\nexport class CreateProjectCommand extends Command {\n  static paths = [[`create`, `project`]];\n\n  static usage = Command.Usage({\n    category: `Project`,\n    description: `Create a new project`,\n    details: `\n      This command creates a new project with the specified name at the given path.\n      If no path is provided, the project will be created in the current directory.\n    `,\n    examples: [\n      [\n        `Create a new project in specified directory`,\n        `create project --path /path/to/my-project --git`,\n      ],\n      [\n        `Create a new project at a specific path with git initialized`,\n        `create project --path /path/to/my-project --git`,\n      ],\n    ],\n  });\n\n  projectPath = Option.String(\"--path\", { required: true });\n\n  git = Option.Boolean(`--git`, false, {\n    description: `Initialize a git repository in the new project`,\n  });\n\n  async folderExists(folderPath: string): Promise<boolean> {\n    try {\n      const stats = await fs.stat(folderPath);\n      return stats.isDirectory();\n    } catch (error: any) {\n      if (error.code === \"ENOENT\") {\n        return false; // Folder does not exist\n      }\n      throw error; // Other errors (e.g., permission issues)\n    }\n  }\n\n  async execute() {\n    // Create the project directory path by joining the specified path and project name\n    const projectPath = path.join(this.projectPath);\n    // Check if directory already exists\n    try {\n      await fs.access(projectPath);\n      console.error(`Error: Directory ${projectPath} already exists.`);\n      return 1;\n    } catch {\n      // Directory doesn't exist, we can proceed\n    }\n\n    // ask what library to use for validation: yup or zod or none\n    const validation_library = await select({\n      message: \"Select a package you want for validation\",\n      choices: [\n        {\n          name: \"Yup\",\n          value: \"yup\",\n          description: \"https://github.com/jquense/yup\",\n        },\n        {\n          name: \"Zod\",\n          value: \"zod\",\n          description: \"https://zod.dev/\",\n        },\n        new Separator(),\n        {\n          name: \"None\",\n          value: \"none\",\n          disabled: false,\n        },\n      ],\n    });\n\n    await fs.mkdir(projectPath, { recursive: true });\n    console.log(`Created project directory at: ${projectPath}`);\n\n    const dirname =\n      typeof __dirname === \"undefined\"\n        ? path.dirname(fileURLToPath(import.meta.url))\n        : __dirname;\n\n    let basePath = path.join(dirname, `./base_project`);\n    if ((await this.folderExists(basePath)) === false) {\n      // we are running a compiled code that was bundled and the code is running from ./dist/bin/ folder.\n      basePath = path.join(dirname, `../app/console/project/base_project`);\n    }\n\n    console.log(`Using base project path: ${basePath}`);\n    //copy content of ./base_project to the new project directory\n    const baseProjectPath = basePath;\n\n    await this.processTplFolder(baseProjectPath, projectPath, {\n      validation_library,\n    });\n    console.log(`Copied base project files to: ${projectPath}`);\n\n    //modify package.json with foldername\n    const packageJsonPath = path.join(projectPath, `package.json`);\n    const packageJson = JSON.parse(await fs.readFile(packageJsonPath, `utf-8`));\n    packageJson.name = Case.snake(path.basename(projectPath));\n    await fs.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2));\n    console.log(`Updated package.json with project name: ${packageJson.name}`);\n\n    if (this.git) {\n      try {\n        execSync(\n          'git init; git add --all; git commit --allow-empty -m \"chore: first commit for pashmak\"',\n          {\n            cwd: projectPath,\n          },\n        );\n      } catch (error) {\n        console.error(`Failed to create project.`, error);\n        return 1;\n      }\n    }\n  }\n\n  async processTplFolder(src: string, dest: string, data: any = {}) {\n    const files = await fs.readdir(src, { withFileTypes: true });\n    for (const file of files) {\n      const srcPath = path.join(src, file.name);\n      const destPath =\n        file.isFile() && file.name.endsWith(\".tpl\")\n          ? path.join(dest, file.name.substring(0, file.name.length - 4))\n          : path.join(dest, file.name);\n\n      if (file.isDirectory()) {\n        await fs.mkdir(destPath, { recursive: true });\n        await this.processTplFolder(srcPath, destPath, data);\n      } else if (file.name.endsWith(\".tpl\")) {\n        await this.processTplFile(srcPath, destPath, data);\n      } else {\n        throw new Error(\n          \"unexpected non tpl file: \" + srcPath + \" \" + file.name,\n        );\n      }\n    }\n  }\n\n  async processTplFile(src: string, dest: string, data: any = {}) {\n    handlebars.registerHelper(\"eq\", (a, b) => a === b);\n\n    const compiledTemplate = handlebars.compile(\n      (await fs.readFile(src)).toString(),\n    );\n    const template = await compiledTemplate(data);\n    await fs.writeFile(dest, template);\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/app/console/project/base_project/package.json.tpl

@@ -42,10 +42,15 @@
     "@devbro/pashmak": "0.1.*",
     "bcryptjs": "^3.0.2",
     "clipanion": "^4.0.0-rc.4",
-    "dotenv": "^16.5.0",
     "jsonwebtoken": "^9.0.0",
     "tsconfig-paths": "^4.2.0",
-    "yup": "^1.6.1"
+    {{#if (eq validation_library "yup")}}
+    "yup": "^1.6.1",
+    {{/if}}
+    {{#if (eq validation_library "zod")}}
+    "zod": "^4.1.12",
+    {{/if}}
+    "dotenv": "^16.5.0"
   },
   "directories": {
     "doc": "docs",

package/dist/app/console/project/base_project/src/app/queues/index.ts.tpl

@@ -0,0 +1,9 @@
+import { queue } from '@devbro/pashmak/facades';
+
+export function startQueueListeners() {
+  let rc: any = {};
+//   rc.channel_name_1 = queue().listen('channel_name_1', MessageClass1);
+//   rc.channel_name_2 = queue().listen('channel_name_2', MessageClass2);
+
+  return rc;
+}

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

@@ -1,7 +1,5 @@
 export default {
-  caches: {
-    default: {
-      type: 'disabled',
-    },
+  default: {
+    type: 'disabled',
   },
 };

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

@@ -1,12 +1,10 @@
 export default {
-  databases: {
-    default: {
-      host: process.env.DB_HOST,
-      database: process.env.DB_NAME || 'test_db',
-      user: process.env.DB_USER,
-      password: process.env.DB_PASSWORD,
-      port: parseInt(process.env.DB_PORT || '5432'),
-      name: 'db',
-    },
+  default: {
+    host: process.env.DB_HOST,
+    database: process.env.DB_NAME || 'test_db',
+    user: process.env.DB_USER,
+    password: process.env.DB_PASSWORD,
+    port: parseInt(process.env.DB_PORT || '5432'),
+    name: 'db',
   },
 };

package/dist/app/console/project/base_project/src/config/default.mts.tpl

@@ -3,14 +3,19 @@ import os from 'os';
 import { getEnv } from '@devbro/pashmak/helper';
 import { dirname } from 'path';
 import { fileURLToPath } from 'url';
+import { loadConfig } from '@devbro/pashmak/config';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-const extends_list = ['databases', 'storages', 'mailer', 'loggers', 'queues', 'caches'];
-
 export default {
-  extends: [...extends_list.map((i) => `./${i}.js`), ...extends_list.map((i) => `./${i}.ts`)],
+  databases: await loadConfig('./databases'),
+  storages: await loadConfig('./storages'),
+  mailer: await loadConfig('./mailer'),
+  loggers: await loadConfig('./loggers'),
+  queues: await loadConfig('./queues'),
+  caches: await loadConfig('./caches'),
+  base_url: getEnv('BASE_URL', 'http://localhost:' + getEnv('PORT', '3000')),
   port: getEnv('PORT', 3000),
   file_upload_path: path.join(os.tmpdir(), ''),
   migration: {
@@ -33,3 +38,12 @@ export default {
   public_path: path.join(__dirname, '../..', 'public'),
   debug_mode: getEnv('APP_DEBUG', false),
 };
+
+export const $test = {
+  // Test environment overrides
+};
+
+export const $prod = {
+  port: getEnv('PORT', 80),
+  debug_mode: false,
+};

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

@@ -2,14 +2,12 @@ import { ctxSafe } from '@devbro/pashmak/context';
 import { LogMessage } from '@devbro/pashmak/logger';
 
 export default {
-  loggers: {
-    default: {
-      level: process.env.NODE_ENV === 'test' ? 'silent' : 'info',
-      extrasFunction: (message: LogMessage) => {
-        let requestId = ctxSafe()?.get('requestId');
-        requestId && (message.requestId = requestId);
-        return message;
-      },
+  default: {
+    level: process.env.NODE_ENV === 'test' ? 'silent' : 'info',
+    extrasFunction: (message: LogMessage) => {
+      let requestId = ctxSafe()?.get('requestId');
+      requestId && (message.requestId = requestId);
+      return message;
     },
   },
 };

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

@@ -1,23 +1,22 @@
 export default {
-  mailer: {
-    default: {
-      provider: 'MEMORY',
+  default: {
+    provider: 'memory',
+    config: {
       default_from: 'no-reply@devbro.com',
     },
   },
-  $prod: {
-    mailer: {
-      default: {
-        provider: 'SES',
-        // credentials are loaded as env vars
-      },
-    },
+};
+
+export const $prod = {
+  default: {
+    provider: 'ses',
+    // credentials are loaded as env vars
   },
-  $test: {
-    mailer: {
-      default: {
-        provider: 'MEMORY',
-      },
-    },
+};
+
+export const $test = {
+  default: {
+    provider: 'memory',
+    // credentials are loaded as env vars
   },
 };

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

@@ -1,7 +1,5 @@
 export default {
-  queues: {
-    default: {
-      type: 'database',
-    },
+  default: {
+    provider: 'memory',
   },
 };

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

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

package/dist/app/console/project/base_project/src/helpers/QueryKit.ts.tpl

@@ -0,0 +1,175 @@
+import { logger } from '@devbro/pashmak/facades';
+import { JSONValue, Num } from '@devbro/pashmak/helper';
+import { Query } from '@devbro/pashmak/sql';
+import { cacheQuery } from '@devbro/pashmak/cache';
+
+type orderByDirection = 'asc' | 'desc';
+export class QueryKit {
+  private query: Query;
+  private pagination: { min: number; max: number; sort: '' } = { min: 10, max: 1000, sort: '' };
+  private parameters: Record<string, any> = {};
+  private sorts: Record<string, CustomSort> = {};
+  private filters: Record<string, QueryFilter> = {};
+  private defaultSortKey: string = '';
+  private _cache_results: boolean = false;
+
+  get cacheResults(): boolean {
+    return this._cache_results;
+  }
+
+  set cacheResults(value: boolean) {
+    this._cache_results = value;
+  }
+
+  constructor(query: Query) {
+    this.query = query;
+  }
+
+  setParameters(parameters: Record<string, any>) {
+    this.parameters = parameters;
+  }
+
+  addSort(fields: (string | { key: string; field: string })[]) {
+    for (const field of fields) {
+      if (typeof field === 'string') {
+        this.sorts[field] = {
+          apply: (query: Query, sort_key: string, direction: orderByDirection) => {
+            query.orderBy(sort_key, direction);
+          },
+        };
+        continue;
+      }
+      if (typeof field === 'object' && field.key && field.field) {
+        this.sorts[field.key] = {
+          apply: (query: Query, sort_key: string, direction: orderByDirection) => {
+            query.orderBy(field.field, direction);
+          },
+        };
+      }
+    }
+  }
+
+  addCustomSort(
+    sort_key: string,
+    callback: (query: Query, sort_key: string, direction: orderByDirection) => undefined
+  ) {
+    this.sorts[sort_key] = {
+      apply: callback,
+    };
+  }
+
+  setDefaultSort(sort_key: string) {
+    this.defaultSortKey = sort_key;
+  }
+
+  addFilter(filter: QueryFilter) {
+    this.filters[filter.getKey()] = filter;
+  }
+
+  setPagination(min_pagination: number, max_pagination: number) {
+    this.pagination.min = min_pagination;
+    this.pagination.max = max_pagination;
+  }
+
+  async get() {
+    // Apply filters
+    for (const key in this.parameters.filter) {
+      if (this.filters[key] && this.parameters.filter[key]) {
+        this.filters[key].apply(this.query, key, this.parameters.filter[key]);
+      }
+    }
+
+    let total_rows = await this.query.count();
+
+    // apply sorting
+    let sort_key = this.parameters.sort || this.defaultSortKey;
+    let sort_direction: orderByDirection = 'asc';
+    if (sort_key && sort_key.charAt(0) === '-') {
+      sort_key = sort_key.substring(1);
+      sort_direction = 'desc';
+    }
+    if (this.sorts[sort_key]) {
+      this.sorts[sort_key].apply(this.query, sort_key, sort_direction);
+    }
+
+    // Apply pagination
+    let per_page = this?.parameters?.page?.per_page || this.pagination.max;
+    per_page = Num.clamp(per_page, this.pagination.min, this.pagination.max);
+
+    this.query.limit(per_page);
+
+    // Apply offset if page is provided
+    const page_number: number = this?.parameters?.page?.number || 1;
+    const offset = (page_number - 1) * per_page;
+    this.query.offset(offset);
+
+    // logger().info({ msg: 'Fetching list', query: this.query.toSql() });
+
+    let rows = [];
+    if (this.cacheResults) {
+      rows = await cacheQuery(this.query);
+    } else {
+      rows = await this.query.get();
+    }
+
+    return {
+      data: rows,
+      meta: {
+        first_page: 1,
+        current_page: page_number,
+        last_page: Math.ceil(total_rows / per_page),
+        total: total_rows,
+        per_page: per_page,
+        per_this_page: rows.length,
+        from: offset + 1,
+        to: Math.min(offset + rows.length, total_rows),
+      },
+    };
+  }
+}
+
+interface QueryFilter {
+  getKey(): string;
+  apply(query: Query, key: String, value: any): undefined;
+}
+
+interface CustomSort {
+  apply(query: Query, sort_key: string, direction: orderByDirection): undefined;
+}
+
+export class QueryFilterFactory {
+  static exact(key: string, field: string | undefined = undefined): QueryFilter {
+    return {
+      getKey() {
+        return key;
+      },
+      apply(query: Query, field_name: string, value: any) {
+        query.whereOp(field ?? field_name, '=', value);
+      },
+    };
+  }
+
+  static startsWith(key: string, field: string | undefined = undefined): QueryFilter {
+    return {
+      getKey() {
+        return key;
+      },
+      apply(query: Query, field_name: string, value: any) {
+        query.whereOp(field ?? field_name, 'ILIKE', `${value}%`);
+      },
+    };
+  }
+
+  static custom(field: string, callback: (query: Query, field_name: string, value: any) => Query): QueryFilter {
+    return {
+      getKey() {
+        return field;
+      },
+      apply(query: Query, field_name: string, value: any) {
+        query.whereNested((q) => {
+          callback(q, field_name, value);
+        });
+      },
+    };
+  }
+}