@devbro/pashmak 0.1.55 → 0.1.57

package/dist/cjs/middlewares.js

@@ -32,6 +32,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/middlewares.mts
 var middlewares_exports = {};
 __export(middlewares_exports, {
+  DatabaseProviderMiddleware: () => DatabaseProviderMiddleware,
   RateLimiterMiddleware: () => RateLimiterMiddleware,
   cors: () => cors,
   dbTransaction: () => dbTransaction
@@ -555,8 +556,8 @@ var DatabaseTransport = class {
       }
     });
   }, "processMessage");
-  constructor(config2 = {}) {
-    this.config = { ...this.config, ...config2 };
+  constructor(config3 = {}) {
+    this.config = { ...this.config, ...config3 };
     this.repeater = (0, import_neko_helper2.createRepeater)(
       this.processMessage,
       this.config.listen_interval * 1e3
@@ -594,6 +595,51 @@ var DatabaseTransport = class {
 // src/factories.mts
 var import_neko_cache = require("@devbro/neko-cache");
 var import_neko_storage = require("@devbro/neko-storage");
+
+// src/cache/MultiCache.mts
+var MultiCache = class {
+  constructor(caches) {
+    this.caches = caches;
+  }
+  static {
+    __name(this, "MultiCache");
+  }
+  async get(key) {
+    for (const cache2 of this.caches) {
+      const value = await cache2.get(key);
+      if (value !== void 0) {
+        return value;
+      }
+    }
+    return void 0;
+  }
+  async put(key, value, ttl) {
+    await Promise.all(this.caches.map((cache2) => cache2.put(key, value, ttl)));
+  }
+  async delete(key) {
+    await Promise.all(this.caches.map((cache2) => cache2.delete(key)));
+  }
+  async has(key) {
+    for (const cache2 of this.caches) {
+      if (await cache2.has(key)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  async increment(key, amount) {
+    let rc = void 0;
+    for (const cache2 of this.caches) {
+      let rc2 = await cache2.increment(key, amount);
+      if (rc === void 0) {
+        rc = rc2;
+      }
+    }
+    return rc;
+  }
+};
+
+// src/factories.mts
 var FlexibleFactory = class {
   static {
     __name(this, "FlexibleFactory");
@@ -664,6 +710,13 @@ CacheProviderFactory.register("redis", (opt) => {
 CacheProviderFactory.register("file", (opt) => {
   return new import_neko_cache.FileCacheProvider(opt);
 });
+CacheProviderFactory.register("multi", (opt) => {
+  const caches = [];
+  for (const c of opt.caches) {
+    caches.push(cache(c));
+  }
+  return new MultiCache(caches);
+});
 CacheProviderFactory.register("disabled", (opt) => {
   return new import_neko_cache.DisabledCacheProvider();
 });
@@ -806,6 +859,14 @@ var cache = wrapSingletonWithAccessors(
 
 // src/middlewares.mts
 var import_neko_http2 = require("@devbro/neko-http");
+var import_neko_config2 = require("@devbro/neko-config");
+
+// src/context.mts
+var context_exports = {};
+__reExport(context_exports, require("@devbro/neko-context"));
+
+// src/middlewares.mts
+var import_neko_sql = require("@devbro/neko-sql");
 function cors(options = {}) {
   return async (req, res, next) => {
     const allowedOrigins = options.allowedOrigins || ["*"];
@@ -894,8 +955,57 @@ var RateLimiterMiddleware = class _RateLimiterMiddleware extends Middleware {
     return;
   }
 };
+var DatabaseProviderMiddleware = class _DatabaseProviderMiddleware extends Middleware {
+  static {
+    __name(this, "DatabaseProviderMiddleware");
+  }
+  async call(req, res, next) {
+    const db_configs = import_neko_config2.config.get("databases");
+    const conns = [];
+    try {
+      for (const [name, db_config] of Object.entries(db_configs)) {
+        if ((0, context_exports.ctx)().get(["database", name])) {
+          return;
+        }
+        const conn = await this.getConnection(db_config);
+        (0, context_exports.ctx)().set(["database", name], conn);
+        conns.push(conn);
+      }
+      await next();
+    } finally {
+      for (const conn of conns) {
+        await conn.disconnect();
+      }
+    }
+  }
+  static instance;
+  async register() {
+  }
+  static getInstance() {
+    if (!_DatabaseProviderMiddleware.instance) {
+      _DatabaseProviderMiddleware.instance = new _DatabaseProviderMiddleware();
+    }
+    return _DatabaseProviderMiddleware.instance;
+  }
+  getConnection(db_config) {
+    if (db_config.provider === "postgresql") {
+      const conn = new import_neko_sql.PostgresqlConnection(db_config.config);
+      return conn;
+    }
+    if (db_config.provider === "sqlite") {
+      const conn = new import_neko_sql.SqliteConnection(db_config.config);
+      return conn;
+    }
+    if (db_config.provider === "mysql") {
+      const conn = new import_neko_sql.MysqlConnection(db_config.config);
+      return conn;
+    }
+    throw new Error(`Unsupported database provider: ${db_config.provider}`);
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  DatabaseProviderMiddleware,
   RateLimiterMiddleware,
   cors,
   dbTransaction

package/dist/cjs/queue.js

@@ -490,6 +490,51 @@ var import_neko_mailer = require("@devbro/neko-mailer");
 var import_neko_queue = require("@devbro/neko-queue");
 var import_neko_cache = require("@devbro/neko-cache");
 var import_neko_storage = require("@devbro/neko-storage");
+
+// src/cache/MultiCache.mts
+var MultiCache = class {
+  constructor(caches) {
+    this.caches = caches;
+  }
+  static {
+    __name(this, "MultiCache");
+  }
+  async get(key) {
+    for (const cache2 of this.caches) {
+      const value = await cache2.get(key);
+      if (value !== void 0) {
+        return value;
+      }
+    }
+    return void 0;
+  }
+  async put(key, value, ttl) {
+    await Promise.all(this.caches.map((cache2) => cache2.put(key, value, ttl)));
+  }
+  async delete(key) {
+    await Promise.all(this.caches.map((cache2) => cache2.delete(key)));
+  }
+  async has(key) {
+    for (const cache2 of this.caches) {
+      if (await cache2.has(key)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  async increment(key, amount) {
+    let rc = void 0;
+    for (const cache2 of this.caches) {
+      let rc2 = await cache2.increment(key, amount);
+      if (rc === void 0) {
+        rc = rc2;
+      }
+    }
+    return rc;
+  }
+};
+
+// src/factories.mts
 var FlexibleFactory = class {
   static {
     __name(this, "FlexibleFactory");
@@ -560,6 +605,13 @@ CacheProviderFactory.register("redis", (opt) => {
 CacheProviderFactory.register("file", (opt) => {
   return new import_neko_cache.FileCacheProvider(opt);
 });
+CacheProviderFactory.register("multi", (opt) => {
+  const caches = [];
+  for (const c of opt.caches) {
+    caches.push(cache(c));
+  }
+  return new MultiCache(caches);
+});
 CacheProviderFactory.register("disabled", (opt) => {
   return new import_neko_cache.DisabledCacheProvider();
 });

package/dist/esm/app/console/project/CreateProjectCommand.d.mts

@@ -5,11 +5,24 @@ declare class CreateProjectCommand extends Command {
     static paths: string[][];
     static usage: clipanion.Usage;
     projectPath: string;
-    git: boolean;
+    executor: string;
+    packageManager: string;
+    linter: string;
+    validation_library: string;
+    database_type: string;
     folderExists(folderPath: string): Promise<boolean>;
-    execute(): Promise<1 | undefined>;
+    execute(): Promise<void>;
     processTplFolder(src: string, dest: string, data?: any): Promise<void>;
     processTplFile(src: string, dest: string, data?: any): Promise<void>;
+    setupProjectPath(): Promise<void>;
+    setupExecutorAndPackageManager(): Promise<void>;
+    setupLinter(): Promise<void>;
+    setupGeneralPackages(): Promise<void>;
+    setupBaseProject(): Promise<void>;
+    addPackage(packageName: string, dev?: boolean): Promise<void>;
+    installPackages(): Promise<void>;
+    setupGit(): Promise<void>;
+    catch(error: unknown): Promise<void>;
 }
 
 export { CreateProjectCommand };

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

@@ -1,13 +1,13 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-import { Command, Option } from "clipanion";
+import { Command } from "clipanion";
 import { Case } from "change-case-all";
 import path from "path";
 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";
+import { select, Separator, input } from "@inquirer/prompts";
 class CreateProjectCommand extends Command {
   static {
     __name(this, "CreateProjectCommand");
@@ -17,24 +17,17 @@ class CreateProjectCommand extends Command {
     category: `Project`,
     description: `Create a new project`,
     details: `
-      This command creates a new project with the specified name at the given path.
-      If no path is provided, the project will be created in the current directory.
+      This command creates a new project interactively.
+      You will be prompted for the project path and other configuration options.
     `,
-    examples: [
-      [
-        `Create a new project in specified directory`,
-        `create project --path /path/to/my-project --git`
-      ],
-      [
-        `Create a new project at a specific path with git initialized`,
-        `create project --path /path/to/my-project --git`
-      ]
-    ]
-  });
-  projectPath = Option.String("--path", { required: true });
-  git = Option.Boolean(`--git`, false, {
-    description: `Initialize a git repository in the new project`
+    examples: [[`Create a new project`, `create project`]]
   });
+  projectPath = "";
+  executor = "";
+  packageManager = "";
+  linter = "";
+  validation_library = "";
+  database_type = "";
   async folderExists(folderPath) {
     try {
       const stats = await fs.stat(folderPath);
@@ -47,14 +40,148 @@ class CreateProjectCommand extends Command {
     }
   }
   async execute() {
-    const projectPath = path.join(this.projectPath);
-    try {
-      await fs.access(projectPath);
-      console.error(`Error: Directory ${projectPath} already exists.`);
-      return 1;
-    } catch {
+    await this.setupProjectPath();
+    await this.setupGit();
+    await this.setupExecutorAndPackageManager();
+    await this.setupLinter();
+    await this.setupGeneralPackages();
+    await this.setupBaseProject();
+    await this.installPackages();
+  }
+  async processTplFolder(src, dest, data = {}) {
+    const files = await fs.readdir(src, { withFileTypes: true });
+    for (const file of files) {
+      const srcPath = path.join(src, file.name);
+      const destPath = file.isFile() && file.name.endsWith(".tpl") ? path.join(dest, file.name.substring(0, file.name.length - 4)) : path.join(dest, file.name);
+      if (file.isDirectory()) {
+        await fs.mkdir(destPath, { recursive: true });
+        await this.processTplFolder(srcPath, destPath, data);
+      } else if (file.name.endsWith(".tpl")) {
+        await this.processTplFile(srcPath, destPath, data);
+      } else {
+        throw new Error(
+          "unexpected non tpl file: " + srcPath + " " + file.name
+        );
+      }
+    }
+  }
+  async processTplFile(src, dest, data = {}) {
+    handlebars.registerHelper("eq", (a, b) => a === b);
+    const compiledTemplate = handlebars.compile(
+      (await fs.readFile(src)).toString()
+    );
+    const template = await compiledTemplate(data);
+    await fs.writeFile(dest, template);
+  }
+  async setupProjectPath() {
+    const pathInput = await input({
+      message: "Enter project path (leave empty to use current directory):",
+      default: ""
+    });
+    this.projectPath = pathInput.trim() ? path.resolve(pathInput.trim()) : process.cwd();
+    await fs.mkdir(this.projectPath, { recursive: true });
+    const files = await fs.readdir(this.projectPath);
+    if (files.length > 0) {
+      throw new Error(
+        `Directory ${this.projectPath} is not empty. Please use an empty directory.`
+      );
+    }
+  }
+  async setupExecutorAndPackageManager() {
+    this.executor = await select({
+      message: "Select a TypeScript executor",
+      choices: [
+        {
+          name: "Bun",
+          value: "bun",
+          description: "Fast all-in-one JavaScript runtime"
+        },
+        {
+          name: "TSX",
+          value: "tsx",
+          description: "TypeScript execute (tsx) - Node.js enhanced with esbuild"
+        }
+      ]
+    });
+    this.packageManager = this.executor === "bun" ? "bun" : await select({
+      message: "Select a package manager",
+      choices: [
+        {
+          name: "Yarn",
+          value: "yarn",
+          description: "Fast, reliable, and secure dependency management"
+        },
+        {
+          name: "npm",
+          value: "npm",
+          description: "Node package manager (default)"
+        },
+        {
+          name: "Bun",
+          value: "bun",
+          description: "Ultra-fast package manager built into Bun"
+        }
+      ],
+      default: "yarn"
+    });
+    execSync(`${this.packageManager} init -y`, {
+      stdio: "inherit",
+      cwd: this.projectPath
+    });
+    const packageJsonPath = path.join(this.projectPath, `package.json`);
+    let packageJson = JSON.parse(await fs.readFile(packageJsonPath, `utf-8`));
+    packageJson.type = "module";
+    packageJson.scripts = packageJson.scripts || {};
+    packageJson.scripts.prepare = "husky init";
+    packageJson.scripts.clean = "rm -rf dist";
+    if (this.executor === "bun") {
+      packageJson.scripts.dev = "bun run dev";
+      packageJson.scripts.start = "bun run pdev";
+      packageJson.scripts.build = "bun run build";
+      packageJson.scripts.test = "vitest";
+      packageJson.scripts["test:watch"] = "vitest --watch";
+      packageJson.scripts["test:coverage"] = "vitest run --coverage";
+    } else if (this.executor === "tsx") {
+      packageJson.scripts.dev = "tsx --watch -r tsconfig-paths/register src/index.ts start --all | npx pino-pretty";
+      packageJson.scripts.start = "tsx dist/index.js";
+      packageJson.scripts.build = "tsc";
+      packageJson.scripts.test = "vitest";
+      packageJson.scripts["test:watch"] = "vitest --watch";
+      packageJson.scripts["test:coverage"] = "vitest run --coverage";
+    }
+    await fs.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2));
+  }
+  async setupLinter() {
+    this.linter = await select({
+      message: "Select a linter",
+      choices: [
+        {
+          name: "Biome",
+          value: "biome",
+          description: "Fast formatter and linter for JavaScript, TypeScript, and more"
+        },
+        {
+          name: "ESLint",
+          value: "eslint",
+          description: "Find and fix problems in your JavaScript code"
+        }
+      ]
+    });
+    const packageJsonPath = path.join(this.projectPath, `package.json`);
+    let packageJson = JSON.parse(await fs.readFile(packageJsonPath, `utf-8`));
+    if (this.linter === "biome") {
+      packageJson.scripts.lint = "biome check . --ext .ts,.tsx";
+      packageJson.scripts.format = "biome format . --ext .ts,.tsx --write";
+      this.addPackage("@biomejs/biome", true);
+    } else if (this.linter === "eslint") {
+      packageJson.scripts.lint = "eslint . --ext .ts,.tsx";
+      packageJson.scripts.format = "eslint . --ext .ts,.tsx --fix";
+      this.addPackage("eslint", true);
     }
-    const validation_library = await select({
+    await fs.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2));
+  }
+  async setupGeneralPackages() {
+    this.validation_library = await select({
       message: "Select a package you want for validation",
       choices: [
         {
@@ -75,8 +202,42 @@ class CreateProjectCommand extends Command {
         }
       ]
     });
-    await fs.mkdir(projectPath, { recursive: true });
-    console.log(`Created project directory at: ${projectPath}`);
+    this.validation_library === "none" || await this.addPackage(this.validation_library);
+    this.database_type = await select({
+      message: "Select a database type (you can add more databases later)",
+      choices: [
+        {
+          name: "PostgreSQL",
+          value: "postgresql",
+          description: "A powerful, open source object-relational database system"
+        },
+        {
+          name: "MySQL",
+          value: "mysql",
+          description: "The world's most popular open source database"
+        },
+        {
+          name: "SQLite",
+          value: "sqlite",
+          description: "A C library that provides a lightweight disk-based database"
+        }
+      ]
+    });
+    if (this.database_type === "postgresql") {
+      await this.addPackage("pg pg-cursor");
+    } else if (this.database_type === "mysql") {
+      await this.addPackage("mysql2");
+    } else if (this.database_type === "sqlite") {
+      await this.addPackage("sqlite3");
+    }
+    await this.addPackage("@devbro/pashmak tsconfig-paths dotenv ");
+    await this.addPackage(
+      "husky vitest supertest @types/supertest pino-pretty typescript tsx",
+      true
+    );
+  }
+  async setupBaseProject() {
+    console.log(`Using project directory: ${this.projectPath}`);
     const dirname = typeof __dirname === "undefined" ? path.dirname(fileURLToPath(import.meta.url)) : __dirname;
     let basePath = path.join(dirname, `./base_project`);
     if (await this.folderExists(basePath) === false) {
@@ -84,53 +245,90 @@ class CreateProjectCommand extends Command {
     }
     console.log(`Using base project path: ${basePath}`);
     const baseProjectPath = basePath;
-    await this.processTplFolder(baseProjectPath, projectPath, {
-      validation_library
+    await this.processTplFolder(baseProjectPath, this.projectPath, {
+      validation_library: this.validation_library,
+      executor: this.executor,
+      package_manager: this.packageManager,
+      linter: this.linter,
+      database_type: this.database_type
     });
-    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`));
-    packageJson.name = Case.snake(path.basename(projectPath));
+    console.log(`Copied base project files to: ${this.projectPath}`);
+    const packageJsonPath = path.join(this.projectPath, "package.json");
+    let packageJson = JSON.parse(await fs.readFile(packageJsonPath, `utf-8`));
+    packageJson.name = Case.snake(path.basename(this.projectPath));
     await fs.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2));
     console.log(`Updated package.json with project name: ${packageJson.name}`);
-    if (this.git) {
-      try {
-        execSync(
-          'git init; git add --all; git commit --allow-empty -m "chore: first commit for pashmak"',
-          {
-            cwd: projectPath
-          }
-        );
-      } catch (error) {
-        console.error(`Failed to create project.`, error);
-        return 1;
-      }
+  }
+  async addPackage(packageName, dev = false) {
+    let install_command = "";
+    switch (this.packageManager) {
+      case "bun":
+        install_command = `bun add ${packageName}${dev ? " -d" : ""}`;
+        break;
+      case "yarn":
+        install_command = `yarn add ${packageName}${dev ? " -D" : ""} --no-install`;
+        break;
+      case "npm":
+        install_command = `npm install ${packageName}${dev ? " --save-dev" : ""} --package-lock-only`;
+        break;
     }
+    execSync(install_command, {
+      stdio: "inherit",
+      cwd: this.projectPath
+    });
   }
-  async processTplFolder(src, dest, data = {}) {
-    const files = await fs.readdir(src, { withFileTypes: true });
-    for (const file of files) {
-      const srcPath = path.join(src, file.name);
-      const destPath = file.isFile() && file.name.endsWith(".tpl") ? path.join(dest, file.name.substring(0, file.name.length - 4)) : path.join(dest, file.name);
-      if (file.isDirectory()) {
-        await fs.mkdir(destPath, { recursive: true });
-        await this.processTplFolder(srcPath, destPath, data);
-      } else if (file.name.endsWith(".tpl")) {
-        await this.processTplFile(srcPath, destPath, data);
-      } else {
-        throw new Error(
-          "unexpected non tpl file: " + srcPath + " " + file.name
-        );
-      }
+  async installPackages() {
+    const install_command = this.packageManager === "bun" ? `bun install` : this.packageManager === "yarn" ? `yarn` : `npm install`;
+    execSync(install_command, {
+      stdio: "inherit",
+      cwd: this.projectPath
+    });
+  }
+  async setupGit() {
+    const initGit = await select({
+      message: "Initialize a git repository?",
+      choices: [
+        {
+          name: "Yes",
+          value: true,
+          description: "Initialize git and create first commit"
+        },
+        {
+          name: "No",
+          value: false,
+          description: "Skip git initialization"
+        }
+      ]
+    });
+    if (initGit) {
+      const gitignoreContent = [
+        "node_modules/",
+        "dist/",
+        ".env",
+        ".env.*",
+        "!.env.example",
+        "*.log",
+        "coverage/",
+        ".DS_Store"
+      ].join("\n") + "\n";
+      await fs.writeFile(
+        path.join(this.projectPath, ".gitignore"),
+        gitignoreContent
+      );
+      execSync(
+        `git init; git add --all; git commit --allow-empty -m "chore: first commit"`,
+        {
+          cwd: this.projectPath
+        }
+      );
     }
   }
-  async processTplFile(src, dest, data = {}) {
-    handlebars.registerHelper("eq", (a, b) => a === b);
-    const compiledTemplate = handlebars.compile(
-      (await fs.readFile(src)).toString()
-    );
-    const template = await compiledTemplate(data);
-    await fs.writeFile(dest, template);
+  async catch(error) {
+    if (Error.isError(error)) {
+      console.error(error.message);
+    } else {
+      console.error(error);
+    }
   }
 }
 export {