alepha 0.12.1 → 0.13.1

package/package.json

@@ -2,7 +2,7 @@
   "name": "alepha",
   "description": "Easy-to-use modern TypeScript framework for building many kind of applications.",
   "author": "Nicolas Foures",
-  "version": "0.12.1",
+  "version": "0.13.1",
   "type": "module",
   "engines": {
     "node": ">=22.0.0"
@@ -70,268 +70,217 @@
   "exports": {
     "./api/files": {
       "types": "./dist/api-files/index.js",
-      "import": "./dist/api-files/index.js",
-      "require": "./dist/api-files/index.js"
+      "import": "./dist/api-files/index.js"
     },
     "./api/jobs": {
       "types": "./dist/api-jobs/index.js",
-      "import": "./dist/api-jobs/index.js",
-      "require": "./dist/api-jobs/index.js"
+      "import": "./dist/api-jobs/index.js"
     },
     "./api/notifications": {
       "types": "./dist/api-notifications/index.js",
-      "import": "./dist/api-notifications/index.js",
-      "require": "./dist/api-notifications/index.js"
+      "import": "./dist/api-notifications/index.js"
     },
     "./api/parameters": {
       "types": "./dist/api-parameters/index.js",
-      "import": "./dist/api-parameters/index.js",
-      "require": "./dist/api-parameters/index.js"
+      "import": "./dist/api-parameters/index.js"
     },
     "./api/users": {
       "types": "./dist/api-users/index.js",
       "browser": "./dist/api-users/index.browser.js",
-      "import": "./dist/api-users/index.js",
-      "require": "./dist/api-users/index.js"
+      "import": "./dist/api-users/index.js"
     },
     "./api/verifications": {
       "types": "./dist/api-verifications/index.js",
-      "import": "./dist/api-verifications/index.js",
-      "require": "./dist/api-verifications/index.js"
+      "import": "./dist/api-verifications/index.js"
     },
     "./batch": {
       "types": "./dist/batch/index.js",
-      "import": "./dist/batch/index.js",
-      "require": "./dist/batch/index.js"
+      "import": "./dist/batch/index.js"
     },
     "./bin": {
       "types": "./dist/bin/index.js",
-      "import": "./dist/bin/index.js",
-      "require": "./dist/bin/index.js"
+      "import": "./dist/bin/index.js"
     },
     "./bucket": {
       "types": "./dist/bucket/index.js",
-      "import": "./dist/bucket/index.js",
-      "require": "./dist/bucket/index.js"
+      "import": "./dist/bucket/index.js"
     },
     "./cache": {
       "types": "./dist/cache/index.js",
-      "import": "./dist/cache/index.js",
-      "require": "./dist/cache/index.js"
+      "import": "./dist/cache/index.js"
     },
     "./cache/redis": {
       "types": "./dist/cache-redis/index.js",
-      "import": "./dist/cache-redis/index.js",
-      "require": "./dist/cache-redis/index.js"
+      "import": "./dist/cache-redis/index.js"
     },
     "./cli": {
       "types": "./dist/cli/index.js",
-      "import": "./dist/cli/index.js",
-      "require": "./dist/cli/index.js"
+      "import": "./dist/cli/index.js"
     },
     "./command": {
       "types": "./dist/command/index.js",
-      "import": "./dist/command/index.js",
-      "require": "./dist/command/index.js"
+      "import": "./dist/command/index.js"
     },
     ".": {
       "types": "./dist/core/index.js",
       "browser": "./dist/core/index.browser.js",
-      "import": "./dist/core/index.js",
-      "require": "./dist/core/index.js"
+      "import": "./dist/core/index.js"
     },
     "./datetime": {
       "types": "./dist/datetime/index.js",
-      "import": "./dist/datetime/index.js",
-      "require": "./dist/datetime/index.js"
+      "import": "./dist/datetime/index.js"
     },
     "./email": {
       "types": "./dist/email/index.js",
-      "import": "./dist/email/index.js",
-      "require": "./dist/email/index.js"
+      "import": "./dist/email/index.js"
     },
     "./fake": {
       "types": "./dist/fake/index.js",
-      "import": "./dist/fake/index.js",
-      "require": "./dist/fake/index.js"
+      "import": "./dist/fake/index.js"
     },
     "./file": {
       "types": "./dist/file/index.js",
-      "import": "./dist/file/index.js",
-      "require": "./dist/file/index.js"
+      "import": "./dist/file/index.js"
     },
     "./lock": {
       "types": "./dist/lock/index.js",
-      "import": "./dist/lock/index.js",
-      "require": "./dist/lock/index.js"
+      "import": "./dist/lock/index.js"
     },
     "./lock/redis": {
       "types": "./dist/lock-redis/index.js",
-      "import": "./dist/lock-redis/index.js",
-      "require": "./dist/lock-redis/index.js"
+      "import": "./dist/lock-redis/index.js"
     },
     "./logger": {
       "types": "./dist/logger/index.js",
-      "import": "./dist/logger/index.js",
-      "require": "./dist/logger/index.js"
+      "import": "./dist/logger/index.js"
     },
     "./orm": {
       "types": "./dist/orm/index.js",
       "browser": "./dist/orm/index.browser.js",
-      "import": "./dist/orm/index.js",
-      "require": "./dist/orm/index.js"
+      "import": "./dist/orm/index.js"
     },
     "./queue": {
       "types": "./dist/queue/index.js",
-      "import": "./dist/queue/index.js",
-      "require": "./dist/queue/index.js"
+      "import": "./dist/queue/index.js"
     },
     "./queue/redis": {
       "types": "./dist/queue-redis/index.js",
-      "import": "./dist/queue-redis/index.js",
-      "require": "./dist/queue-redis/index.js"
+      "import": "./dist/queue-redis/index.js"
     },
     "./redis": {
       "types": "./dist/redis/index.js",
-      "import": "./dist/redis/index.js",
-      "require": "./dist/redis/index.js"
+      "import": "./dist/redis/index.js"
     },
     "./retry": {
       "types": "./dist/retry/index.js",
-      "import": "./dist/retry/index.js",
-      "require": "./dist/retry/index.js"
+      "import": "./dist/retry/index.js"
     },
     "./router": {
       "types": "./dist/router/index.js",
-      "import": "./dist/router/index.js",
-      "require": "./dist/router/index.js"
+      "import": "./dist/router/index.js"
     },
     "./scheduler": {
       "types": "./dist/scheduler/index.js",
-      "import": "./dist/scheduler/index.js",
-      "require": "./dist/scheduler/index.js"
+      "import": "./dist/scheduler/index.js"
     },
     "./security": {
       "types": "./dist/security/index.js",
       "browser": "./dist/security/index.browser.js",
-      "import": "./dist/security/index.js",
-      "require": "./dist/security/index.js"
+      "import": "./dist/security/index.js"
     },
     "./server": {
       "types": "./dist/server/index.js",
       "browser": "./dist/server/index.browser.js",
-      "import": "./dist/server/index.js",
-      "require": "./dist/server/index.js"
+      "import": "./dist/server/index.js"
     },
     "./server/auth": {
       "types": "./dist/server-auth/index.js",
       "browser": "./dist/server-auth/index.browser.js",
-      "import": "./dist/server-auth/index.js",
-      "require": "./dist/server-auth/index.js"
+      "import": "./dist/server-auth/index.js"
     },
     "./server/cache": {
       "types": "./dist/server-cache/index.js",
-      "import": "./dist/server-cache/index.js",
-      "require": "./dist/server-cache/index.js"
+      "import": "./dist/server-cache/index.js"
     },
     "./server/compress": {
       "types": "./dist/server-compress/index.js",
-      "import": "./dist/server-compress/index.js",
-      "require": "./dist/server-compress/index.js"
+      "import": "./dist/server-compress/index.js"
     },
     "./server/cookies": {
       "types": "./dist/server-cookies/index.js",
       "browser": "./dist/server-cookies/index.browser.js",
-      "import": "./dist/server-cookies/index.js",
-      "require": "./dist/server-cookies/index.js"
+      "import": "./dist/server-cookies/index.js"
     },
     "./server/cors": {
       "types": "./dist/server-cors/index.js",
-      "import": "./dist/server-cors/index.js",
-      "require": "./dist/server-cors/index.js"
+      "import": "./dist/server-cors/index.js"
     },
     "./server/health": {
       "types": "./dist/server-health/index.js",
-      "import": "./dist/server-health/index.js",
-      "require": "./dist/server-health/index.js"
+      "import": "./dist/server-health/index.js"
     },
     "./server/helmet": {
       "types": "./dist/server-helmet/index.js",
-      "import": "./dist/server-helmet/index.js",
-      "require": "./dist/server-helmet/index.js"
+      "import": "./dist/server-helmet/index.js"
     },
     "./server/links": {
       "types": "./dist/server-links/index.js",
       "browser": "./dist/server-links/index.browser.js",
-      "import": "./dist/server-links/index.js",
-      "require": "./dist/server-links/index.js"
+      "import": "./dist/server-links/index.js"
     },
     "./server/metrics": {
       "types": "./dist/server-metrics/index.js",
-      "import": "./dist/server-metrics/index.js",
-      "require": "./dist/server-metrics/index.js"
+      "import": "./dist/server-metrics/index.js"
     },
     "./server/multipart": {
       "types": "./dist/server-multipart/index.js",
-      "import": "./dist/server-multipart/index.js",
-      "require": "./dist/server-multipart/index.js"
+      "import": "./dist/server-multipart/index.js"
     },
     "./server/proxy": {
       "types": "./dist/server-proxy/index.js",
-      "import": "./dist/server-proxy/index.js",
-      "require": "./dist/server-proxy/index.js"
+      "import": "./dist/server-proxy/index.js"
     },
     "./server/rate-limit": {
       "types": "./dist/server-rate-limit/index.js",
-      "import": "./dist/server-rate-limit/index.js",
-      "require": "./dist/server-rate-limit/index.js"
+      "import": "./dist/server-rate-limit/index.js"
     },
     "./server/security": {
       "types": "./dist/server-security/index.js",
       "browser": "./dist/server-security/index.browser.js",
-      "import": "./dist/server-security/index.js",
-      "require": "./dist/server-security/index.js"
+      "import": "./dist/server-security/index.js"
     },
     "./server/static": {
       "types": "./dist/server-static/index.js",
-      "import": "./dist/server-static/index.js",
-      "require": "./dist/server-static/index.js"
+      "import": "./dist/server-static/index.js"
     },
     "./server/swagger": {
       "types": "./dist/server-swagger/index.js",
-      "import": "./dist/server-swagger/index.js",
-      "require": "./dist/server-swagger/index.js"
+      "import": "./dist/server-swagger/index.js"
     },
     "./sms": {
       "types": "./dist/sms/index.js",
-      "import": "./dist/sms/index.js",
-      "require": "./dist/sms/index.js"
+      "import": "./dist/sms/index.js"
     },
     "./thread": {
       "types": "./dist/thread/index.js",
-      "import": "./dist/thread/index.js",
-      "require": "./dist/thread/index.js"
+      "import": "./dist/thread/index.js"
     },
     "./topic": {
       "types": "./dist/topic/index.js",
-      "import": "./dist/topic/index.js",
-      "require": "./dist/topic/index.js"
+      "import": "./dist/topic/index.js"
     },
     "./topic/redis": {
       "types": "./dist/topic-redis/index.js",
-      "import": "./dist/topic-redis/index.js",
-      "require": "./dist/topic-redis/index.js"
+      "import": "./dist/topic-redis/index.js"
     },
     "./vite": {
       "types": "./dist/vite/index.js",
-      "import": "./dist/vite/index.js",
-      "require": "./dist/vite/index.js"
+      "import": "./dist/vite/index.js"
     },
     "./websocket": {
       "types": "./dist/websocket/index.js",
       "browser": "./dist/websocket/index.browser.js",
-      "import": "./dist/websocket/index.js",
-      "require": "./dist/websocket/index.js"
+      "import": "./dist/websocket/index.js"
     },
     "./tsconfig.base": "./tsconfig.base.json",
     "./package.json": "./package.json"

package/src/cli/apps/AlephaPackageBuilderCli.ts

@@ -34,6 +34,7 @@ export class AlephaPackageBuilderCli {
       });
 
       pkgData.exports = {};
+
       for (const item of modules) {
         const path =
           item.name === "core" ? "." : `./${item.name.replace("-", "/")}`;
@@ -46,13 +47,16 @@ export class AlephaPackageBuilderCli {
         pkgData.exports[path].import = `./src/${item.name}/index.ts`;
         pkgData.exports[path].require = `./src/${item.name}/index.ts`;
       }
+
       if (packageName === "alepha") {
         pkgData.exports["./tsconfig.base"] = "./tsconfig.base.json";
         pkgData.exports["./package.json"] = "./package.json";
       }
+
       if (packageName === "@alepha/ui") {
         pkgData.exports["./styles"] = "./styles.css";
       }
+
       await this.fs.writeFile("package.json", JSON.stringify(pkgData, null, 2));
 
       const tmpDir = join(root, "node_modules/.alepha");
@@ -65,7 +69,8 @@ export class AlephaPackageBuilderCli {
 
       const external = [
         "alepha",
-        ...modules.map((item) => `alepha/${item.name}`),
+        packageName,
+        ...modules.map((item) => `${packageName}/${item.name}`),
       ];
 
       await run.rm(this.dist);
@@ -78,7 +83,7 @@ export class AlephaPackageBuilderCli {
         entries.push({
           entry: join(src, "index.ts"),
           outDir: dest,
-          format: ["esm", "cjs"],
+          format: ["esm"],
           sourcemap: true,
           fixedExtension: false,
           platform: "node", // TODO: node must be enabled only if index.node.ts exists

package/src/cli/assets/appRouterTs.ts

@@ -0,0 +1,9 @@
+export const appRouterTs = () => `
+import { $page } from "@alepha/react";
+
+export class AppRouter {
+  home = $page({
+    component: () => "Hello World",
+  });
+}
+`.trim()

package/src/cli/assets/indexHtml.ts

@@ -1,5 +1,5 @@
 export const indexHtml = (
-  browserEntry: string = "/src/main.tsx",
+  browserEntry: string,
 ) => `
 <!DOCTYPE html>
 <html lang="en">
@@ -8,6 +8,7 @@ export const indexHtml = (
   <title>App</title>
 </head>
 <body>
+<div id="root"></div>
 <script type="module" src="${browserEntry}"></script>
 </body>
 </html>

package/src/cli/assets/mainBrowserTs.ts

@@ -0,0 +1,10 @@
+export const mainBrowserTs = () => `
+import { Alepha, run } from "alepha";
+import { AppRouter } from "./AppRouter.ts";
+
+const alepha = Alepha.create();
+
+alepha.with(AppRouter);
+
+run(alepha);
+`.trim()

package/src/cli/commands/CoreCommands.ts

@@ -57,15 +57,13 @@ export class CoreCommands {
       // }),
       // choose package manager
       yarn: t.optional(t.boolean({ description: "Use Yarn package manager" })),
+      pnpm: t.optional(t.boolean({ description: "Use pnpm package manager" })),
       // choose which dependencies to add
-      api: t.optional(
-        t.boolean({ description: "Include Alepha Server dependencies" }),
-      ),
       react: t.optional(
         t.boolean({ description: "Include Alepha React dependencies" }),
       ),
-      orm: t.optional(
-        t.boolean({ description: "Include Alepha ORM dependencies" }),
+      admin: t.optional(
+        t.boolean({ description: "Include Alepha admin panel dependencies" }),
       ),
     }),
     handler: async ({ run, flags, root }) => {
@@ -75,6 +73,8 @@ export class CoreCommands {
           await this.utils.ensureConfig(root, {
             tsconfigJson: true,
             packageJson: flags,
+            biomeJson: true,
+            viteConfigTs: true,
             indexHtml: !!flags.react,
           });
         },
@@ -86,6 +86,7 @@ export class CoreCommands {
 
       if (flags.yarn || guessedPm === "yarn") {
         await this.utils.ensureYarn(root);
+        await run("yarn set version stable");
         await run("yarn install", {
           alias: "Installing dependencies with Yarn",
         });

package/src/cli/commands/DrizzleCommands.ts

@@ -1,9 +1,9 @@
 import { readFile } from "node:fs/promises";
-import { createRequire } from "node:module";
 import { join } from "node:path";
 import { $inject, AlephaError, t } from "alepha";
 import { $command } from "alepha/command";
 import { $logger } from "alepha/logger";
+import type { DrizzleKitProvider, RepositoryProvider } from "alepha/orm";
 import { ProcessRunner } from "../services/ProcessRunner.ts";
 import { ProjectUtils } from "../services/ProjectUtils.ts";
 
@@ -25,7 +25,7 @@ export class DrizzleCommands {
    * Check if database migrations are up to date.
    */
   check = $command({
-    name: "db:migrate:check",
+    name: "db:check-migrations",
     description: "Check if database migration files are up to date",
     args: t.optional(
       t.text({
@@ -34,81 +34,89 @@ export class DrizzleCommands {
       }),
     ),
     flags: drizzleCommandFlags,
-    handler: async ({ args, flags, root }) => {
+    handler: async ({ args, root }) => {
       const rootDir = root;
       this.log.debug(`Using project root: ${rootDir}`);
+
       const { alepha } = await this.utils.loadAlephaFromServerEntryFile(
         rootDir,
         args,
       );
 
-      const models: any[] = [];
-      const repositories = alepha.descriptors("repository") as any[];
-      const kit = createRequire(import.meta.url)("drizzle-kit/api");
-      const migrationDir = join(rootDir, "migrations");
+      const repositoryProvider =
+        alepha.inject<RepositoryProvider>("RepositoryProvider");
+      const drizzleKitProvider =
+        alepha.inject<DrizzleKitProvider>("DrizzleKitProvider");
+      const accepted = new Set<string>([]);
 
-      const journalFile = await readFile(
-        `${migrationDir}/meta/_journal.json`,
-        "utf-8",
-      ).catch(() => null);
-
-      if (!journalFile) {
-        this.log.info(`No migration journal found.`);
-        return;
-      }
+      for (const descriptor of repositoryProvider.getRepositories()) {
+        const provider = descriptor.provider;
+        const providerName = provider.name;
+        if (accepted.has(providerName)) {
+          continue;
+        }
 
-      const journal = JSON.parse(journalFile);
+        accepted.add(providerName);
 
-      const lastMigration = journal.entries[journal.entries.length - 1];
+        const migrationDir = join(rootDir, "migrations", providerName);
 
-      const lastSnapshot = JSON.parse(
-        await readFile(
-          `${migrationDir}/meta/${String(lastMigration.idx).padStart(4, "0")}_snapshot.json`,
+        const journalFile = await readFile(
+          `${migrationDir}/meta/_journal.json`,
           "utf-8",
-        ),
-      );
+        ).catch(() => null);
 
-      for (const repository of repositories) {
-        if (!models.includes(repository.table)) {
-          models.push(repository.table);
+        if (!journalFile) {
+          this.log.info(`No migration journal found.`);
+          return;
         }
-      }
 
-      const now = kit.generateDrizzleJson(models, lastSnapshot.id);
+        const journal = JSON.parse(journalFile);
+        const lastMigration = journal.entries[journal.entries.length - 1];
+        const lastSnapshot = JSON.parse(
+          await readFile(
+            `${migrationDir}/meta/${String(lastMigration.idx).padStart(4, "0")}_snapshot.json`,
+            "utf-8",
+          ),
+        );
 
-      const migrationStatements = await new Promise<Array<any>>((resolve) => {
-        (async () => {
-          const timer = setTimeout(() => {
-            resolve([{ message: "Migration generation timed out." }]);
-          }, 5000);
-          const statements = await kit.generateMigration(lastSnapshot, now);
-          clearTimeout(timer);
-          resolve(statements);
-        })();
-      });
+        const models = drizzleKitProvider.getModels(provider);
+        const kit = drizzleKitProvider.importDrizzleKit();
+        const now = kit.generateDrizzleJson(models, lastSnapshot.id);
 
-      if (migrationStatements.length === 0) {
-        this.log.info("No changes detected.");
-        return;
-      }
+        const migrationStatements = await new Promise<Array<any>>((resolve) => {
+          (async () => {
+            const timer = setTimeout(() => {
+              resolve([{ message: "Migration generation timed out." }]);
+            }, 5000);
+            const statements = await kit.generateMigration(lastSnapshot, now);
+            clearTimeout(timer);
+            resolve(statements);
+          })();
+        });
 
-      this.log.info("");
-      this.log.info("Detected migration statements:");
-      this.log.info("");
-      for (const stmt of migrationStatements) {
-        this.log.info(stmt);
-      }
-      this.log.info("");
+        if (migrationStatements.length === 0) {
+          this.log.info("No changes detected.");
+          return;
+        }
 
-      this.log.info(
-        `At least ${migrationStatements.length} change(s) detected.`,
-      );
-      this.log.info(
-        "Please, run 'alepha db:generate' to update the migration files.",
-      );
-      this.log.info("");
+        this.log.info("");
+        this.log.info("Detected migration statements:");
+        this.log.info("");
+        for (const stmt of migrationStatements) {
+          this.log.info(stmt);
+        }
+        this.log.info("");
 
-      throw new AlephaError("Database migrations are not up to date.");
+        this.log.info(
+          `At least ${migrationStatements.length} change(s) detected.`,
+        );
+        this.log.info(
+          "Please, run 'alepha db:generate' to update the migration files.",
+        );
+        this.log.info("");
+
+        throw new AlephaError("Database migrations are not up to date.");
+      }
     },
   });
 

package/src/cli/commands/VerifyCommands.ts

@@ -36,7 +36,7 @@ export class VerifyCommands {
       }
 
       if (await this.utils.hasDir(root, "migrations")) {
-        await run("alepha db:migrate:check");
+        await run("alepha db:check-migrations");
       }
 
       await run("alepha build");