alepha 0.15.1 → 0.15.2

package/src/cli/commands/db.ts

@@ -1,12 +1,13 @@
 import { $inject, AlephaError, t } from "alepha";
 import { $command } from "alepha/command";
-import { FileSystemProvider } from "alepha/file";
 import { $logger } from "alepha/logger";
 import type {
   DatabaseProvider,
   DrizzleKitProvider,
   RepositoryProvider,
 } from "alepha/orm";
+import { FileSystemProvider } from "alepha/system";
+import { AppEntryProvider } from "../providers/AppEntryProvider.ts";
 import { AlephaCliUtils } from "../services/AlephaCliUtils.ts";
 
 const drizzleCommandFlags = t.object({
@@ -28,6 +29,7 @@ export class DbCommand {
   protected readonly log = $logger();
   protected readonly fs = $inject(FileSystemProvider);
   protected readonly utils = $inject(AlephaCliUtils);
+  protected readonly entryProvider = $inject(AppEntryProvider);
 
   /**
    * Check if database migrations are up to date.
@@ -46,10 +48,11 @@ export class DbCommand {
       const rootDir = root;
       this.log.debug(`Using project root: ${rootDir}`);
 
-      const { alepha } = await this.utils.loadAlephaFromServerEntryFile(
-        rootDir,
-        args,
-      );
+      const entry = await this.entryProvider.getAppEntry(root);
+      const alepha = await this.utils.loadAlephaFromServerEntryFile({
+        mode: "development",
+        entry,
+      });
 
       const repositoryProvider =
         alepha.inject<RepositoryProvider>("RepositoryProvider");
@@ -276,10 +279,11 @@ export class DbCommand {
 
     this.log.debug(`Using project root: ${rootDir}`);
 
-    const { alepha, entry } = await this.utils.loadAlephaFromServerEntryFile(
-      rootDir,
-      options.args,
-    );
+    const entry = await this.entryProvider.getAppEntry(rootDir);
+    const alepha = await this.utils.loadAlephaFromServerEntryFile({
+      mode: "development",
+      entry,
+    });
 
     const drizzleKitProvider =
       alepha.inject<DrizzleKitProvider>("DrizzleKitProvider");
@@ -319,7 +323,7 @@ export class DbCommand {
         providerUrl: provider.url,
         providerDriver: provider.driver,
         dialect,
-        entry,
+        entry: this.fs.join(rootDir, entry.server),
         rootDir,
       });
 
@@ -328,7 +332,9 @@ export class DbCommand {
         `drizzle-kit ${options.command} --config=${drizzleConfigJsPath}${flags}`,
         {
           env: {
-            NODE_OPTIONS: "--import tsx",
+            NODE_OPTIONS: [process.env.NODE_OPTIONS, "--import tsx"]
+              .filter(Boolean)
+              .join(" "),
           },
         },
       );

package/src/cli/commands/deploy.ts

@@ -1,7 +1,7 @@
 import { $inject, AlephaError, t } from "alepha";
 import { $command } from "alepha/command";
-import { FileSystemProvider } from "alepha/file";
 import { $logger } from "alepha/logger";
+import { FileSystemProvider } from "alepha/system";
 import { AlephaCliUtils } from "../services/AlephaCliUtils.ts";
 import { PackageManagerUtils } from "../services/PackageManagerUtils.ts";
 

package/src/cli/commands/dev.ts

@@ -1,7 +1,7 @@
 import { $inject, Alepha } from "alepha";
 import { $command } from "alepha/command";
-import { FileSystemProvider } from "alepha/file";
 import { $logger } from "alepha/logger";
+import { FileSystemProvider } from "alepha/system";
 import { AppEntryProvider } from "../providers/AppEntryProvider.ts";
 import { ViteDevServerProvider } from "../providers/ViteDevServerProvider.ts";
 import { AlephaCliUtils } from "../services/AlephaCliUtils.ts";
@@ -20,39 +20,20 @@ export class DevCommand {
 
   /**
    * Will run the project in watch mode.
-   *
-   * - If an index.html file is found in the project root, it will run Vite in dev mode.
-   * - Otherwise, it will look for a server entry file and run it with tsx in watch mode.
    */
   public readonly dev = $command({
     name: "dev",
     description: "Run the project in development mode",
     handler: async ({ root }) => {
-      const [expo, react] = await Promise.all([
-        this.pm.hasExpo(root),
-        this.pm.hasReact(root),
-      ]);
-
       await this.scaffolder.ensureConfig(root, {
         tsconfigJson: true,
       });
 
-      if (expo) {
-        await this.utils.exec("expo start");
-        return;
-      }
-
       const entry = await this.boot.getAppEntry(root);
       this.log.debug("Entry file found", { entry });
 
       // -> here, we assume we use Vite as runner (api or fullstack)
       // but it's planned to support Bun runner in the future as well
-
-      // Ensure vite is installed before running
-      await this.pm.ensureDependency(root, "vite", {
-        exec: (cmd, opts) => this.utils.exec(cmd, opts),
-      });
-
       await this.viteDevServer.init({ root, entry });
       await this.viteDevServer.start();
     },

package/src/cli/commands/gen/env.ts

@@ -1,7 +1,7 @@
 import { $inject, t } from "alepha";
 import { $command } from "alepha/command";
-import { FileSystemProvider } from "alepha/file";
 import { $logger } from "alepha/logger";
+import { FileSystemProvider } from "alepha/system";
 import { AlephaCliUtils } from "../../services/AlephaCliUtils.ts";
 
 export class GenEnvCommand {
@@ -21,7 +21,10 @@ export class GenEnvCommand {
       ),
     }),
     handler: async ({ root, flags }) => {
-      const { alepha } = await this.utils.loadAlephaFromServerEntryFile(root);
+      const alepha = await this.utils.loadAlephaFromServerEntryFile({
+        root,
+        mode: "development",
+      });
 
       try {
         const { env } = alepha.dump();

package/src/cli/commands/gen/openapi.ts

@@ -1,8 +1,8 @@
 import { $inject, t } from "alepha";
 import { $command } from "alepha/command";
-import { FileSystemProvider } from "alepha/file";
 import { $logger } from "alepha/logger";
 import { ServerSwaggerProvider } from "alepha/server/swagger";
+import { FileSystemProvider } from "alepha/system";
 import { AlephaCliUtils } from "../../services/AlephaCliUtils.ts";
 
 export class OpenApiCommand {
@@ -22,7 +22,10 @@ export class OpenApiCommand {
       ),
     }),
     handler: async ({ root, flags }) => {
-      const { alepha } = await this.utils.loadAlephaFromServerEntryFile(root);
+      const alepha = await this.utils.loadAlephaFromServerEntryFile({
+        root,
+        mode: "development",
+      });
 
       try {
         const openapiProvider = alepha.inject(