@devbro/pashmak 0.1.42 → 0.1.44

package/dist/bin/app/console/index.cjs

@@ -1636,7 +1636,6 @@ var http_exports = {};
 __reExport(http_exports, require("@devbro/neko-http"));
 
 // src/facades.mts
-var yup = __toESM(require("yup"), 1);
 var import_neko_logger = require("@devbro/neko-logger");
 
 // src/factories.mts
@@ -1708,8 +1707,8 @@ var DatabaseTransport = class {
       }
     });
   }, "processMessage");
-  constructor(config9 = {}) {
-    this.config = { ...this.config, ...config9 };
+  constructor(config10 = {}) {
+    this.config = { ...this.config, ...config10 };
     this.repeater = (0, import_neko_helper.createRepeater)(
       this.processMessage,
       this.config.listen_interval * 1e3
@@ -1849,24 +1848,6 @@ var httpServer = (0, import_neko_helper2.createSingleton)(() => {
       res.end(JSON.stringify({ message: err.message, error: err.code }));
       logger().warn({ msg: "HttpError: " + err.message, err });
       return;
-    } else if (err instanceof yup.ValidationError) {
-      res.writeHead(422, { "Content-Type": "application/json" });
-      const errs = {};
-      err.inner.forEach((e) => {
-        const sanitizedParams = { ...e.params };
-        if (/passw/i.test(e.path)) {
-          sanitizedParams.value = "******";
-          sanitizedParams.originalValue = "******";
-        }
-        errs[e.path] = {
-          type: e.type,
-          message: e.message,
-          params: sanitizedParams
-        };
-      });
-      res.end(JSON.stringify({ message: "validation error", errors: errs }));
-      logger().warn({ msg: "ValidationError: " + err.message, err });
-      return;
     } else {
       logger().error({ msg: "Error: " + err.message, err });
     }
@@ -2338,6 +2319,13 @@ cli().register(GenerateControllerCommand);
 var import_clipanion9 = require("clipanion");
 var import_path7 = __toESM(require("path"), 1);
 var fs6 = __toESM(require("fs/promises"), 1);
+
+// src/config.mts
+var config_exports = {};
+__reExport(config_exports, require("@devbro/neko-config"));
+
+// src/app/console/generate/GenerateApiDocsCommand.mts
+var import_neko_helper3 = require("@devbro/neko-helper");
 var GenerateApiDocsCommand = class extends import_clipanion9.Command {
   static {
     __name(this, "GenerateApiDocsCommand");
@@ -2346,7 +2334,44 @@ var GenerateApiDocsCommand = class extends import_clipanion9.Command {
     [`make`, `apidocs`],
     [`generate`, `apidocs`]
   ];
+  static usage = import_clipanion9.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 = import_clipanion9.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...
 `);
@@ -2411,9 +2436,8 @@ var GenerateApiDocsCommand = class extends import_clipanion9.Command {
         }
       }
     }
-    const publicDir = import_path7.default.join(rootDir, "public");
-    await fs6.mkdir(publicDir, { recursive: true });
-    const outputPath = import_path7.default.join(publicDir, "openapi.json");
+    await fs6.mkdir(config_exports.config.get("private_path"), { recursive: true });
+    const outputPath = import_path7.default.join(config_exports.config.get("private_path"), "openapi.json");
     await fs6.writeFile(
       outputPath,
       JSON.stringify(openApiSpec, null, 2),
@@ -2425,6 +2449,20 @@ var GenerateApiDocsCommand = class extends import_clipanion9.Command {
     );
     this.context.stdout.write(`Total routes documented: ${routes.length}
 `);
+    let files_to_merge = config_exports.config.get("api_docs.merge_files");
+    let final_api_docs = {};
+    for (let file_path of files_to_merge) {
+      let file_json = JSON.parse(await fs6.readFile(file_path, "utf8"));
+      import_neko_helper3.Arr.deepMerge(final_api_docs, file_json);
+    }
+    await fs6.writeFile(
+      config_exports.config.get("api_docs.output"),
+      JSON.stringify(final_api_docs, null, 2)
+    );
+    this.context.stdout.write(
+      `wrote final open api document to : ${config_exports.config.get("api_docs.output")}
+`
+    );
   }
   extractParameters(routePath) {
     const paramRegex = /:([a-zA-Z0-9_]+)/g;
@@ -2454,6 +2492,7 @@ var fs7 = __toESM(require("fs/promises"), 1);
 var import_url3 = require("url");
 var import_handlebars3 = __toESM(require("handlebars"), 1);
 var import_child_process = require("child_process");
+var import_prompts = require("@inquirer/prompts");
 var import_meta3 = {};
 var CreateProjectCommand = class extends import_clipanion10.Command {
   static {
@@ -2501,6 +2540,27 @@ var CreateProjectCommand = class extends import_clipanion10.Command {
       return 1;
     } catch {
     }
+    const validation_library = await (0, import_prompts.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 import_prompts.Separator(),
+        {
+          name: "None",
+          value: "none",
+          disabled: false
+        }
+      ]
+    });
     await fs7.mkdir(projectPath, { recursive: true });
     console.log(`Created project directory at: ${projectPath}`);
     const dirname = typeof __dirname === "undefined" ? import_path8.default.dirname((0, import_url3.fileURLToPath)(import_meta3.url)) : __dirname;
@@ -2510,7 +2570,9 @@ var CreateProjectCommand = class extends import_clipanion10.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 = import_path8.default.join(projectPath, `package.json`);
     const packageJson = JSON.parse(await fs7.readFile(packageJsonPath, `utf-8`));
@@ -2540,7 +2602,7 @@ var CreateProjectCommand = class extends import_clipanion10.Command {
         await fs7.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
@@ -2549,6 +2611,7 @@ var CreateProjectCommand = class extends import_clipanion10.Command {
     }
   }
   async processTplFile(src, dest, data = {}) {
+    import_handlebars3.default.registerHelper("eq", (a, b) => a === b);
     const compiledTemplate = import_handlebars3.default.compile(
       (await fs7.readFile(src)).toString()
     );

package/dist/bin/app/console/migrate/GenerateMigrateCommand.cjs

@@ -472,7 +472,6 @@ var http_exports = {};
 __reExport(http_exports, require("@devbro/neko-http"));
 
 // src/facades.mts
-var yup = __toESM(require("yup"), 1);
 var import_neko_logger = require("@devbro/neko-logger");
 
 // src/factories.mts
@@ -685,24 +684,6 @@ var httpServer = (0, import_neko_helper2.createSingleton)(() => {
       res.end(JSON.stringify({ message: err.message, error: err.code }));
       logger().warn({ msg: "HttpError: " + err.message, err });
       return;
-    } else if (err instanceof yup.ValidationError) {
-      res.writeHead(422, { "Content-Type": "application/json" });
-      const errs = {};
-      err.inner.forEach((e) => {
-        const sanitizedParams = { ...e.params };
-        if (/passw/i.test(e.path)) {
-          sanitizedParams.value = "******";
-          sanitizedParams.originalValue = "******";
-        }
-        errs[e.path] = {
-          type: e.type,
-          message: e.message,
-          params: sanitizedParams
-        };
-      });
-      res.end(JSON.stringify({ message: "validation error", errors: errs }));
-      logger().warn({ msg: "ValidationError: " + err.message, err });
-      return;
     } else {
       logger().error({ msg: "Error: " + err.message, err });
     }

package/dist/bin/app/console/migrate/MigrateCommand.cjs

@@ -472,7 +472,6 @@ var http_exports = {};
 __reExport(http_exports, require("@devbro/neko-http"));
 
 // src/facades.mts
-var yup = __toESM(require("yup"), 1);
 var import_neko_logger = require("@devbro/neko-logger");
 
 // src/factories.mts
@@ -685,24 +684,6 @@ var httpServer = (0, import_neko_helper2.createSingleton)(() => {
       res.end(JSON.stringify({ message: err.message, error: err.code }));
       logger().warn({ msg: "HttpError: " + err.message, err });
       return;
-    } else if (err instanceof yup.ValidationError) {
-      res.writeHead(422, { "Content-Type": "application/json" });
-      const errs = {};
-      err.inner.forEach((e) => {
-        const sanitizedParams = { ...e.params };
-        if (/passw/i.test(e.path)) {
-          sanitizedParams.value = "******";
-          sanitizedParams.originalValue = "******";
-        }
-        errs[e.path] = {
-          type: e.type,
-          message: e.message,
-          params: sanitizedParams
-        };
-      });
-      res.end(JSON.stringify({ message: "validation error", errors: errs }));
-      logger().warn({ msg: "ValidationError: " + err.message, err });
-      return;
     } else {
       logger().error({ msg: "Error: " + err.message, err });
     }

package/dist/bin/app/console/migrate/MigrateRollbackCommand.cjs

@@ -1627,7 +1627,6 @@ var http_exports = {};
 __reExport(http_exports, require("@devbro/neko-http"));
 
 // src/facades.mts
-var yup = __toESM(require("yup"), 1);
 var import_neko_logger = require("@devbro/neko-logger");
 
 // src/factories.mts
@@ -1840,24 +1839,6 @@ var httpServer = (0, import_neko_helper2.createSingleton)(() => {
       res.end(JSON.stringify({ message: err.message, error: err.code }));
       logger().warn({ msg: "HttpError: " + err.message, err });
       return;
-    } else if (err instanceof yup.ValidationError) {
-      res.writeHead(422, { "Content-Type": "application/json" });
-      const errs = {};
-      err.inner.forEach((e) => {
-        const sanitizedParams = { ...e.params };
-        if (/passw/i.test(e.path)) {
-          sanitizedParams.value = "******";
-          sanitizedParams.originalValue = "******";
-        }
-        errs[e.path] = {
-          type: e.type,
-          message: e.message,
-          params: sanitizedParams
-        };
-      });
-      res.end(JSON.stringify({ message: "validation error", errors: errs }));
-      logger().warn({ msg: "ValidationError: " + err.message, err });
-      return;
     } else {
       logger().error({ msg: "Error: " + err.message, err });
     }

package/dist/bin/app/console/migrate/index.cjs

@@ -1629,7 +1629,6 @@ var http_exports = {};
 __reExport(http_exports, require("@devbro/neko-http"));
 
 // src/facades.mts
-var yup = __toESM(require("yup"), 1);
 var import_neko_logger = require("@devbro/neko-logger");
 
 // src/factories.mts
@@ -1842,24 +1841,6 @@ var httpServer = (0, import_neko_helper2.createSingleton)(() => {
       res.end(JSON.stringify({ message: err.message, error: err.code }));
       logger().warn({ msg: "HttpError: " + err.message, err });
       return;
-    } else if (err instanceof yup.ValidationError) {
-      res.writeHead(422, { "Content-Type": "application/json" });
-      const errs = {};
-      err.inner.forEach((e) => {
-        const sanitizedParams = { ...e.params };
-        if (/passw/i.test(e.path)) {
-          sanitizedParams.value = "******";
-          sanitizedParams.originalValue = "******";
-        }
-        errs[e.path] = {
-          type: e.type,
-          message: e.message,
-          params: sanitizedParams
-        };
-      });
-      res.end(JSON.stringify({ message: "validation error", errors: errs }));
-      logger().warn({ msg: "ValidationError: " + err.message, err });
-      return;
     } else {
       logger().error({ msg: "Error: " + err.message, err });
     }

package/dist/bin/app/console/project/CreateProjectCommand.cjs

@@ -41,6 +41,7 @@ var fs = __toESM(require("fs/promises"), 1);
 var import_url = require("url");
 var import_handlebars = __toESM(require("handlebars"), 1);
 var import_child_process = require("child_process");
+var import_prompts = require("@inquirer/prompts");
 var import_meta = {};
 var CreateProjectCommand = class extends import_clipanion.Command {
   static {
@@ -88,6 +89,27 @@ var CreateProjectCommand = class extends import_clipanion.Command {
       return 1;
     } catch {
     }
+    const validation_library = await (0, import_prompts.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 import_prompts.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" ? import_path.default.dirname((0, import_url.fileURLToPath)(import_meta.url)) : __dirname;
@@ -97,7 +119,9 @@ var CreateProjectCommand = class extends import_clipanion.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 = import_path.default.join(projectPath, `package.json`);
     const packageJson = JSON.parse(await fs.readFile(packageJsonPath, `utf-8`));
@@ -127,7 +151,7 @@ var CreateProjectCommand = class extends import_clipanion.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
@@ -136,6 +160,7 @@ var CreateProjectCommand = class extends import_clipanion.Command {
     }
   }
   async processTplFile(src, dest, data = {}) {
+    import_handlebars.default.registerHelper("eq", (a, b) => a === b);
     const compiledTemplate = import_handlebars.default.compile(
       (await fs.readFile(src)).toString()
     );

package/dist/bin/app/console/queue/GenerateQueueMigrateCommand.cjs

@@ -472,7 +472,6 @@ var http_exports = {};
 __reExport(http_exports, require("@devbro/neko-http"));
 
 // src/facades.mts
-var yup = __toESM(require("yup"), 1);
 var import_neko_logger = require("@devbro/neko-logger");
 
 // src/factories.mts
@@ -685,24 +684,6 @@ var httpServer = (0, import_neko_helper2.createSingleton)(() => {
       res.end(JSON.stringify({ message: err.message, error: err.code }));
       logger().warn({ msg: "HttpError: " + err.message, err });
       return;
-    } else if (err instanceof yup.ValidationError) {
-      res.writeHead(422, { "Content-Type": "application/json" });
-      const errs = {};
-      err.inner.forEach((e) => {
-        const sanitizedParams = { ...e.params };
-        if (/passw/i.test(e.path)) {
-          sanitizedParams.value = "******";
-          sanitizedParams.originalValue = "******";
-        }
-        errs[e.path] = {
-          type: e.type,
-          message: e.message,
-          params: sanitizedParams
-        };
-      });
-      res.end(JSON.stringify({ message: "validation error", errors: errs }));
-      logger().warn({ msg: "ValidationError: " + err.message, err });
-      return;
     } else {
       logger().error({ msg: "Error: " + err.message, err });
     }

package/dist/bin/bin/pashmak_cli.cjs

@@ -35,6 +35,7 @@ var fs = __toESM(require("fs/promises"), 1);
 var import_url = require("url");
 var import_handlebars = __toESM(require("handlebars"), 1);
 var import_child_process = require("child_process");
+var import_prompts = require("@inquirer/prompts");
 var import_meta = {};
 var CreateProjectCommand = class extends import_clipanion.Command {
   static {
@@ -82,6 +83,27 @@ var CreateProjectCommand = class extends import_clipanion.Command {
       return 1;
     } catch {
     }
+    const validation_library = await (0, import_prompts.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 import_prompts.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" ? import_path.default.dirname((0, import_url.fileURLToPath)(import_meta.url)) : __dirname;
@@ -91,7 +113,9 @@ var CreateProjectCommand = class extends import_clipanion.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 = import_path.default.join(projectPath, `package.json`);
     const packageJson = JSON.parse(await fs.readFile(packageJsonPath, `utf-8`));
@@ -121,7 +145,7 @@ var CreateProjectCommand = class extends import_clipanion.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
@@ -130,6 +154,7 @@ var CreateProjectCommand = class extends import_clipanion.Command {
     }
   }
   async processTplFile(src, dest, data = {}) {
+    import_handlebars.default.registerHelper("eq", (a, b) => a === b);
     const compiledTemplate = import_handlebars.default.compile(
       (await fs.readFile(src)).toString()
     );

package/dist/bin/cache.cjs

@@ -473,7 +473,6 @@ var http_exports = {};
 __reExport(http_exports, require("@devbro/neko-http"));
 
 // src/facades.mts
-var yup = __toESM(require("yup"), 1);
 var import_neko_logger = require("@devbro/neko-logger");
 
 // src/factories.mts
@@ -686,24 +685,6 @@ var httpServer = (0, import_neko_helper2.createSingleton)(() => {
       res.end(JSON.stringify({ message: err.message, error: err.code }));
       logger().warn({ msg: "HttpError: " + err.message, err });
       return;
-    } else if (err instanceof yup.ValidationError) {
-      res.writeHead(422, { "Content-Type": "application/json" });
-      const errs = {};
-      err.inner.forEach((e) => {
-        const sanitizedParams = { ...e.params };
-        if (/passw/i.test(e.path)) {
-          sanitizedParams.value = "******";
-          sanitizedParams.originalValue = "******";
-        }
-        errs[e.path] = {
-          type: e.type,
-          message: e.message,
-          params: sanitizedParams
-        };
-      });
-      res.end(JSON.stringify({ message: "validation error", errors: errs }));
-      logger().warn({ msg: "ValidationError: " + err.message, err });
-      return;
     } else {
       logger().error({ msg: "Error: " + err.message, err });
     }

package/dist/bin/facades.cjs

@@ -481,7 +481,6 @@ var http_exports = {};
 __reExport(http_exports, require("@devbro/neko-http"));
 
 // src/facades.mts
-var yup = __toESM(require("yup"), 1);
 var import_neko_logger = require("@devbro/neko-logger");
 
 // src/factories.mts
@@ -694,24 +693,6 @@ var httpServer = (0, import_neko_helper2.createSingleton)(() => {
       res.end(JSON.stringify({ message: err.message, error: err.code }));
       logger().warn({ msg: "HttpError: " + err.message, err });
       return;
-    } else if (err instanceof yup.ValidationError) {
-      res.writeHead(422, { "Content-Type": "application/json" });
-      const errs = {};
-      err.inner.forEach((e) => {
-        const sanitizedParams = { ...e.params };
-        if (/passw/i.test(e.path)) {
-          sanitizedParams.value = "******";
-          sanitizedParams.originalValue = "******";
-        }
-        errs[e.path] = {
-          type: e.type,
-          message: e.message,
-          params: sanitizedParams
-        };
-      });
-      res.end(JSON.stringify({ message: "validation error", errors: errs }));
-      logger().warn({ msg: "ValidationError: " + err.message, err });
-      return;
     } else {
       logger().error({ msg: "Error: " + err.message, err });
     }

package/dist/bin/factories.cjs

@@ -482,7 +482,6 @@ var http_exports = {};
 __reExport(http_exports, require("@devbro/neko-http"));
 
 // src/facades.mts
-var yup = __toESM(require("yup"), 1);
 var import_neko_logger = require("@devbro/neko-logger");
 var import_neko_cache = require("@devbro/neko-cache");
 var import_neko_queue = require("@devbro/neko-queue");
@@ -523,24 +522,6 @@ var httpServer = (0, import_neko_helper.createSingleton)(() => {
       res.end(JSON.stringify({ message: err.message, error: err.code }));
       logger().warn({ msg: "HttpError: " + err.message, err });
       return;
-    } else if (err instanceof yup.ValidationError) {
-      res.writeHead(422, { "Content-Type": "application/json" });
-      const errs = {};
-      err.inner.forEach((e) => {
-        const sanitizedParams = { ...e.params };
-        if (/passw/i.test(e.path)) {
-          sanitizedParams.value = "******";
-          sanitizedParams.originalValue = "******";
-        }
-        errs[e.path] = {
-          type: e.type,
-          message: e.message,
-          params: sanitizedParams
-        };
-      });
-      res.end(JSON.stringify({ message: "validation error", errors: errs }));
-      logger().warn({ msg: "ValidationError: " + err.message, err });
-      return;
     } else {
       logger().error({ msg: "Error: " + err.message, err });
     }