alepha 0.13.1 → 0.13.2

package/src/cli/services/ProjectUtils.ts

@@ -429,6 +429,16 @@ ${models.map((it: string) => `export const ${it} = models["${it}"];`).join("\n")
       },
     };
 
+    if (options.dialect === "sqlite") {
+      let url = options.providerUrl;
+      url = url.replace("sqlite://", "").replace("file://", "");
+      url = join(options.rootDir, url);
+
+      config.dbCredentials = {
+        url,
+      };
+    }
+
     if (options.providerName === "pglite") {
       config.driver = "pglite";
     }
@@ -442,6 +452,24 @@ ${models.map((it: string) => `export const ${it} = models["${it}"];`).join("\n")
     );
   }
 
+  public async loadEnvFile(root: string): Promise<void> {
+    const envPath = join(root, ".env");
+    try {
+      const envContent = await readFile(envPath, "utf8");
+      const lines = envContent.split("\n");
+      for (const line of lines) {
+        const [key, ...rest] = line.split("=");
+        if (key) {
+          const value = rest.join("=");
+          process.env[key.trim()] = value.trim();
+        }
+      }
+      this.log.debug(`Loaded environment variables from ${envPath}`);
+    } catch {
+      this.log.debug(`No .env file found at ${envPath}, skipping load.`);
+    }
+  }
+
   /**
    * Run a drizzle-kit command for all database providers in an Alepha instance.
    *
@@ -459,6 +487,9 @@ ${models.map((it: string) => `export const ${it} = models["${it}"];`).join("\n")
     logMessage: (providerName: string, dialect: string) => string;
   }): Promise<void> {
     const rootDir = options.root;
+
+    await this.loadEnvFile(rootDir);
+
     this.log.debug(`Using project root: ${rootDir}`);
 
     const { alepha, entry } = await this.loadAlephaFromServerEntryFile(
@@ -472,8 +503,8 @@ ${models.map((it: string) => `export const ${it} = models["${it}"];`).join("\n")
       alepha.inject<RepositoryProvider>("RepositoryProvider");
     const accepted = new Set<string>([]);
 
-    for (const descriptor of repositoryProvider.getRepositories()) {
-      const provider = descriptor.provider;
+    for (const primitive of repositoryProvider.getRepositories()) {
+      const provider = primitive.provider;
       const providerName = provider.name;
       const dialect = provider.dialect;
 
@@ -550,7 +581,7 @@ ${models.map((it: string) => `export const ${it} = models["${it}"];`).join("\n")
     }
   }
 
-  public async hasDir(root: string, dirName: string): Promise<boolean> {
+  public async exists(root: string, dirName: string): Promise<boolean> {
     return this.fs.exists(join(root, dirName));
   }
 

package/src/command/index.ts

@@ -1,33 +1,33 @@
 import { $module } from "alepha";
-import { $command } from "./descriptors/$command.ts";
 import { Asker } from "./helpers/Asker.ts";
 import { PrettyPrint } from "./helpers/PrettyPrint.ts";
 import { Runner } from "./helpers/Runner.ts";
+import { $command } from "./primitives/$command.ts";
 import { CliProvider } from "./providers/CliProvider.ts";
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export * from "./descriptors/$command.ts";
 export * from "./errors/CommandError.ts";
 export * from "./helpers/Asker.ts";
 export * from "./helpers/PrettyPrint.ts";
 export * from "./helpers/Runner.ts";
+export * from "./primitives/$command.ts";
 export * from "./providers/CliProvider.ts";
 
 // ---------------------------------------------------------------------------------------------------------------------
 
 /**
  * This module provides a powerful way to build command-line interfaces
- * directly within your Alepha application, using declarative descriptors.
+ * directly within your Alepha application, using declarative primitives.
  *
- * It allows you to define commands using the `$command` descriptor.
+ * It allows you to define commands using the `$command` primitive.
  *
  * @see {@link $command}
  * @module alepha.command
  */
 export const AlephaCommand = $module({
   name: "alepha.command",
-  descriptors: [$command],
+  primitives: [$command],
   services: [CliProvider, Runner, Asker, PrettyPrint],
 });
 

package/src/command/{descriptors → primitives}/$command.ts

@@ -2,9 +2,9 @@ import type * as fs from "node:fs/promises";
 import type { glob } from "node:fs/promises";
 import {
   type Async,
-  createDescriptor,
-  Descriptor,
+  createPrimitive,
   KIND,
+  Primitive,
   type Static,
   type TObject,
   type TSchema,
@@ -16,19 +16,16 @@ import type { RunnerMethod } from "../helpers/Runner.ts";
 /**
  * Declares a CLI command.
  *
- * This descriptor allows you to define a command, its flags, and its handler
+ * This primitive allows you to define a command, its flags, and its handler
  * within your Alepha application structure.
  */
 export const $command = <T extends TObject, A extends TSchema>(
-  options: CommandDescriptorOptions<T, A>,
-) => createDescriptor(CommandDescriptor<T, A>, options);
+  options: CommandPrimitiveOptions<T, A>,
+) => createPrimitive(CommandPrimitive<T, A>, options);
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export interface CommandDescriptorOptions<
-  T extends TObject,
-  A extends TSchema,
-> {
+export interface CommandPrimitiveOptions<T extends TObject, A extends TSchema> {
   /**
    * The handler function to execute when the command is matched.
    */
@@ -89,10 +86,10 @@ export interface CommandDescriptorOptions<
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export class CommandDescriptor<
+export class CommandPrimitive<
   T extends TObject = TObject,
   A extends TSchema = TSchema,
-> extends Descriptor<CommandDescriptorOptions<T, A>> {
+> extends Primitive<CommandPrimitiveOptions<T, A>> {
   public readonly flags = this.options.flags ?? t.object({});
   public readonly aliases = this.options.aliases ?? [];
 
@@ -104,7 +101,7 @@ export class CommandDescriptor<
   }
 }
 
-$command[KIND] = CommandDescriptor;
+$command[KIND] = CommandPrimitive;
 
 // ---------------------------------------------------------------------------------------------------------------------
 

package/src/command/providers/CliProvider.ts

@@ -14,14 +14,14 @@ import {
   t,
 } from "alepha";
 import { $logger } from "alepha/logger";
-import {
-  $command,
-  type CommandDescriptor,
-  type CommandHandlerArgs,
-} from "../descriptors/$command.ts";
 import { CommandError } from "../errors/CommandError.ts";
 import { Asker } from "../helpers/Asker.ts";
 import { Runner } from "../helpers/Runner.ts";
+import {
+  $command,
+  type CommandHandlerArgs,
+  type CommandPrimitive,
+} from "../primitives/$command.ts";
 
 // ---------------------------------------------------------------------------------------------------------------------
 
@@ -176,11 +176,11 @@ export class CliProvider {
     },
   });
 
-  public get commands(): CommandDescriptor<any>[] {
-    return this.alepha.descriptors($command);
+  public get commands(): CommandPrimitive<any>[] {
+    return this.alepha.primitives($command);
   }
 
-  protected findCommand(name: string): CommandDescriptor<TObject> | undefined {
+  protected findCommand(name: string): CommandPrimitive<TObject> | undefined {
     return this.commands.find(
       (command) => command.name === name || command.aliases.includes(name),
     );
@@ -408,7 +408,7 @@ export class CliProvider {
     return "";
   }
 
-  public printHelp(command?: CommandDescriptor<any>): void {
+  public printHelp(command?: CommandPrimitive<any>): void {
     const cliName = this.name || "cli";
     this.log.info(""); // Newline
 
@@ -485,7 +485,7 @@ export class CliProvider {
     this.log.info(""); // Newline
   }
 
-  private getMaxCmdLength(commands: CommandDescriptor[]): number {
+  private getMaxCmdLength(commands: CommandPrimitive[]): number {
     return Math.max(
       ...commands.map((c) => {
         const cmdStr = [c.name, ...c.aliases].join(", ");

package/src/core/Alepha.ts

@@ -2,13 +2,11 @@ import type { Static, TObject } from "typebox";
 import { KIND } from "./constants/KIND.ts";
 import { MODULE } from "./constants/MODULE.ts";
 import { OPTIONS } from "./constants/OPTIONS.ts";
-import type { InjectOptions } from "./descriptors/$inject.ts";
-import { Module, type WithModule } from "./descriptors/$module.ts";
 import { AlephaError } from "./errors/AlephaError.ts";
 import { CircularDependencyError } from "./errors/CircularDependencyError.ts";
 import { ContainerLockedError } from "./errors/ContainerLockedError.ts";
 import { TooLateSubstitutionError } from "./errors/TooLateSubstitutionError.ts";
-import { Descriptor } from "./helpers/descriptor.ts";
+import { Primitive } from "./helpers/primitive.ts";
 import { __alephaRef } from "./helpers/ref.ts";
 import type { Async } from "./interfaces/Async.ts";
 import type { LoggerInterface } from "./interfaces/LoggerInterface.ts";
@@ -19,6 +17,8 @@ import {
   type Service,
   type ServiceEntry,
 } from "./interfaces/Service.ts";
+import type { InjectOptions } from "./primitives/$inject.ts";
+import { Module, type WithModule } from "./primitives/$module.ts";
 import { AlsProvider } from "./providers/AlsProvider.ts";
 import { CodecManager } from "./providers/CodecManager.ts";
 import { EventManager } from "./providers/EventManager.ts";
@@ -82,7 +82,7 @@ import type { TSchema } from "./providers/TypeProvider.ts";
  * // You can access the environment variables using alepha.env
  * console.log(alepha.env.MY_VAR); // "value"
  *
- * // But you should use $env() descriptor to get typed values from the environment.
+ * // But you should use $env() primitive to get typed values from the environment.
  * class App {
  *   env = $env(
  *     t.object({
@@ -95,7 +95,7 @@ import type { TSchema } from "./providers/TypeProvider.ts";
  * ### Modules
  *
  * Modules are a way to group services together.
- * You can register a module using the `$module` descriptor.
+ * You can register a module using the `$module` primitive.
  *
  * ```ts
  * import { $module } from "alepha";
@@ -113,7 +113,7 @@ import type { TSchema } from "./providers/TypeProvider.ts";
  * ### Hooks
  *
  * Hooks are a way to run async functions from all registered providers/services.
- * You can register a hook using the `$hook` descriptor.
+ * You can register a hook using the `$hook` primitive.
  *
  * ```ts
  * import { $hook } from "alepha";
@@ -187,7 +187,7 @@ export class Alepha {
         // ignore
       }
 
-      alepha.state
+      alepha.store
         .set("alepha.test.beforeAll", beforeAll)
         .set("alepha.test.afterAll", afterAll)
         .set("alepha.test.afterEach", afterEach)
@@ -257,12 +257,9 @@ export class Alepha {
   protected substitutions = new Map<Service, { use: Service }>();
 
   /**
-   * Registry of descriptors.
+   * Registry of primitives.
    */
-  protected descriptorRegistry = new Map<
-    Service<Descriptor>,
-    Array<Descriptor>
-  >();
+  protected primitiveRegistry = new Map<Service<Primitive>, Array<Primitive>>();
 
   /**
    *  List of all services + how they are provided.
@@ -294,7 +291,7 @@ export class Alepha {
   /**
    * State manager to store arbitrary values.
    */
-  public get state(): StateManager<State> {
+  public get store(): StateManager<State> {
     this.events; // ensure events is initialized first (TODO: move this to constructor?)
     return this.inject(StateManager, {
       args: [this.init],
@@ -314,14 +311,14 @@ export class Alepha {
    * Get logger instance.
    */
   public get log(): LoggerInterface | undefined {
-    return this.state.get("alepha.logger");
+    return this.store.get("alepha.logger");
   }
 
   /**
    * The environment variables for the App.
    */
   public get env(): Readonly<Env> {
-    return this.state.get("env") ?? {};
+    return this.store.get("env") ?? {};
   }
 
   constructor(init: Partial<State> = {}) {
@@ -442,7 +439,7 @@ export class Alepha {
    * Starts the App.
    *
    * - Lock any further changes to the container.
-   * - Run "configure" hook for all services. Descriptors will be processed.
+   * - Run "configure" hook for all services. Primitives will be processed.
    * - Run "start" hook for all services. Providers will connect/listen/...
    * - Run "ready" hook for all services. This is the point where the App is ready to serve requests.
    *
@@ -472,10 +469,10 @@ export class Alepha {
       this.inject(key);
     }
 
-    const target = this.state.get("alepha.target");
+    const target = this.store.get("alepha.target");
     if (target) {
       this.registry = new Map();
-      this.descriptorRegistry = new Map();
+      this.primitiveRegistry = new Map();
       this.with(target);
     }
 
@@ -878,28 +875,28 @@ export class Alepha {
   }
 
   /**
-   * Get all descriptors of the specified type.
+   * Get all primitives of the specified type.
    */
-  public descriptors<TDescriptor extends Descriptor>(
+  public primitives<TPrimitive extends Primitive>(
     factory:
       | {
-          [KIND]: InstantiableClass<TDescriptor>;
+          [KIND]: InstantiableClass<TPrimitive>;
         }
       | string,
-  ): Array<TDescriptor> {
+  ): Array<TPrimitive> {
     if (typeof factory === "string") {
       const key1 = factory.toLowerCase().replace("$", "");
-      const key2 = `${key1}descriptor`;
-      for (const [key, value] of this.descriptorRegistry.entries()) {
+      const key2 = `${key1}primitive`;
+      for (const [key, value] of this.primitiveRegistry.entries()) {
         const name = key.name.toLowerCase();
         if (name === key1 || name === key2) {
-          return value as Array<TDescriptor>;
+          return value as Array<TPrimitive>;
         }
       }
       return [];
     }
-    return (this.descriptorRegistry.get(factory[KIND]) ??
-      []) as Array<TDescriptor>;
+    return (this.primitiveRegistry.get(factory[KIND]) ??
+      []) as Array<TPrimitive>;
   }
 
   // -------------------------------------------------------------------------------------------------------------------
@@ -922,8 +919,8 @@ export class Alepha {
 
     const obj = instance as unknown as Record<string, any>;
     for (const [key, value] of Object.entries(obj)) {
-      if (value instanceof Descriptor) {
-        this.processDescriptor(value, key);
+      if (value instanceof Primitive) {
+        this.processPrimitive(value, key);
       }
       if (
         typeof value === "object" &&
@@ -933,7 +930,7 @@ export class Alepha {
       ) {
         const getter = value[OPTIONS].getter as keyof State;
         Object.defineProperty(obj, key, {
-          get: () => this.state.get(getter),
+          get: () => this.store.get(getter),
         });
       }
     }
@@ -951,13 +948,13 @@ export class Alepha {
     return instance;
   }
 
-  protected processDescriptor(value: Descriptor, propertyKey = "") {
+  protected processPrimitive(value: Primitive, propertyKey = "") {
     value.config.propertyKey = propertyKey;
     (value as any).onInit();
 
     const kind = value.constructor as Service;
-    const list = this.descriptorRegistry.get(kind) ?? [];
-    this.descriptorRegistry.set(kind, [...list, value]);
+    const list = this.primitiveRegistry.get(kind) ?? [];
+    this.primitiveRegistry.set(kind, [...list, value]);
   }
 }
 

package/src/core/constants/KIND.ts

@@ -1,5 +1,5 @@
 /**
- * Used for identifying descriptors.
+ * Used for identifying primitives.
  *
  * @internal
  */

package/src/core/constants/OPTIONS.ts

@@ -1,5 +1,5 @@
 /**
- * Used for descriptors options.
+ * Used for primitives options.
  *
  * @internal
  */

package/src/core/helpers/{descriptor.ts → primitive.ts}

@@ -1,31 +1,31 @@
 import { Alepha } from "../Alepha.ts";
 import { KIND } from "../constants/KIND.ts";
 import { MODULE } from "../constants/MODULE.ts";
-import { $context } from "../descriptors/$context.ts";
 import type { InstantiableClass, Service } from "../interfaces/Service.ts";
+import { $context } from "../primitives/$context.ts";
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export interface DescriptorArgs<T extends object = {}> {
+export interface PrimitiveArgs<T extends object = {}> {
   options: T;
   alepha: Alepha;
   service: InstantiableClass<Service>;
   module?: Service;
 }
 
-export interface DescriptorConfig {
+export interface PrimitiveConfig {
   propertyKey: string;
   service: InstantiableClass<Service>;
   module?: Service;
 }
 
-export abstract class Descriptor<T extends object = {}> {
+export abstract class Primitive<T extends object = {}> {
   protected readonly alepha: Alepha;
 
   public readonly options: T;
-  public readonly config: DescriptorConfig;
+  public readonly config: PrimitiveConfig;
 
-  constructor(args: DescriptorArgs<T>) {
+  constructor(args: PrimitiveArgs<T>) {
     this.alepha = args.alepha;
     this.options = args.options;
     this.config = {
@@ -36,7 +36,7 @@ export abstract class Descriptor<T extends object = {}> {
   }
 
   /**
-   * Called automatically by Alepha after the descriptor is created.
+   * Called automatically by Alepha after the primitive is created.
    */
   protected onInit(): void {
     // this method can be overridden by subclasses to perform initialization logic.
@@ -47,27 +47,27 @@ export abstract class Descriptor<T extends object = {}> {
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export type DescriptorFactory<TDescriptor extends Descriptor = Descriptor> = {
-  (options: TDescriptor["options"]): TDescriptor;
-  [KIND]: InstantiableClass<TDescriptor>;
+export type PrimitiveFactory<TPrimitive extends Primitive = Primitive> = {
+  (options: TPrimitive["options"]): TPrimitive;
+  [KIND]: InstantiableClass<TPrimitive>;
 };
 
-export type DescriptorFactoryLike<T extends object = any> = {
+export type PrimitiveFactoryLike<T extends object = any> = {
   (options: T): any;
   [KIND]: any;
 };
 
-export const createDescriptor = <TDescriptor extends Descriptor>(
-  descriptor: InstantiableClass<TDescriptor> & { [MODULE]?: Service },
-  options: TDescriptor["options"],
-): TDescriptor => {
+export const createPrimitive = <TPrimitive extends Primitive>(
+  primitive: InstantiableClass<TPrimitive> & { [MODULE]?: Service },
+  options: TPrimitive["options"],
+): TPrimitive => {
   const { alepha, service } = $context();
 
-  if (MODULE in descriptor && descriptor[MODULE]) {
-    alepha.with(descriptor[MODULE]);
+  if (MODULE in primitive && primitive[MODULE]) {
+    alepha.with(primitive[MODULE]);
   }
 
-  return alepha.inject(descriptor, {
+  return alepha.inject(primitive, {
     lifetime: "transient",
     args: [
       {

package/src/core/helpers/ref.ts

@@ -18,7 +18,7 @@ export const __alephaRef: {
 /**
  * Note:
  *
- * This file is used to share context between $descriptors and the Alepha core during the injection phase.
+ * This file is used to share context between $primitives and the Alepha core during the injection phase.
  *
  * There is no side effect as long as Alepha is not used concurrently in multiple contexts (which is not the case).
  *

package/src/core/index.shared.ts

@@ -3,13 +3,6 @@
 export * from "./Alepha.ts";
 export * from "./constants/KIND.ts";
 export * from "./constants/OPTIONS.ts";
-export * from "./descriptors/$atom.ts";
-export * from "./descriptors/$context.ts";
-export * from "./descriptors/$env.ts";
-export * from "./descriptors/$hook.ts";
-export * from "./descriptors/$inject.ts";
-export * from "./descriptors/$module.ts";
-export * from "./descriptors/$use.ts";
 export * from "./errors/AlephaError.ts";
 export * from "./errors/AppNotStartedError.ts";
 export * from "./errors/CircularDependencyError.ts";
@@ -17,12 +10,19 @@ export * from "./errors/ContainerLockedError.ts";
 export * from "./errors/TooLateSubstitutionError.ts";
 export * from "./errors/TypeBoxError.ts";
 export * from "./helpers/createPagination.ts";
-export * from "./helpers/descriptor.ts";
 export * from "./helpers/FileLike.ts";
+export * from "./helpers/primitive.ts";
 export * from "./interfaces/Async.ts";
 export * from "./interfaces/LoggerInterface.ts";
 export * from "./interfaces/Pagination.ts";
 export * from "./interfaces/Service.ts";
+export * from "./primitives/$atom.ts";
+export * from "./primitives/$context.ts";
+export * from "./primitives/$env.ts";
+export * from "./primitives/$hook.ts";
+export * from "./primitives/$inject.ts";
+export * from "./primitives/$module.ts";
+export * from "./primitives/$use.ts";
 export * from "./providers/AlsProvider.ts";
 export * from "./providers/CodecManager.ts";
 export * from "./providers/EventManager.ts";

package/src/core/{descriptors → primitives}/$context.ts

@@ -7,7 +7,7 @@ import type { Service } from "../interfaces/Service.ts";
 /**
  * Get Alepha instance and current service from the current context.
  *
- * It can only be used inside $descriptor functions.
+ * It can only be used inside $primitive functions.
  *
  * ```ts
  * import { $context } from "alepha";
@@ -16,7 +16,7 @@ import type { Service } from "../interfaces/Service.ts";
  *   const { alepha, service, module } = $context();
  *
  *   // alepha - alepha instance
- *   // service - class which is creating this descriptor, this is NOT the instance but the service definition
+ *   // service - class which is creating this primitive, this is NOT the instance but the service definition
  *   // module - module definition, if any
  *
  *   return {};
@@ -31,7 +31,7 @@ import type { Service } from "../interfaces/Service.ts";
  *
  * @internal
  */
-export const $context = (): ContextDescriptor => {
+export const $context = (): ContextPrimitive => {
   if (!__alephaRef.alepha) {
     throw new MissingContextError();
   }
@@ -45,13 +45,13 @@ export const $context = (): ContextDescriptor => {
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export interface ContextDescriptor {
+export interface ContextPrimitive {
   /**
    * Alepha instance.
    */
   alepha: Alepha;
   /**
-   * Service definition which is creating this descriptor.
+   * Service definition which is creating this primitive.
    * This is NOT the instance but the service definition.
    */
   service?: Service;

package/src/core/{descriptors → primitives}/$hook.ts

@@ -1,6 +1,6 @@
 import type { Hooks } from "../Alepha.ts";
 import { KIND } from "../constants/KIND.ts";
-import { createDescriptor, Descriptor } from "../helpers/descriptor.ts";
+import { createPrimitive, Primitive } from "../helpers/primitive.ts";
 import type { Async } from "../interfaces/Async.ts";
 
 /**
@@ -43,7 +43,7 @@ import type { Async } from "../interfaces/Async.ts";
  *
  */
 export const $hook = <T extends keyof Hooks>(options: HookOptions<T>) =>
-  createDescriptor(HookDescriptor<T>, options);
+  createPrimitive(HookPrimitive<T>, options);
 
 // ---------------------------------------------------------------------------------------------------------------------
 
@@ -76,7 +76,7 @@ export interface HookOptions<T extends keyof Hooks> {
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export class HookDescriptor<T extends keyof Hooks> extends Descriptor<
+export class HookPrimitive<T extends keyof Hooks> extends Primitive<
   HookOptions<T>
 > {
   public called = 0;
@@ -93,4 +93,4 @@ export class HookDescriptor<T extends keyof Hooks> extends Descriptor<
   }
 }
 
-$hook[KIND] = HookDescriptor;
+$hook[KIND] = HookPrimitive;

package/src/core/{descriptors → primitives}/$inject.ts

@@ -1,4 +1,4 @@
-import { Descriptor } from "../helpers/descriptor.ts";
+import { Primitive } from "../helpers/primitive.ts";
 import type { InstantiableClass, Service } from "../interfaces/Service.ts";
 import { $context } from "./$context.ts";
 
@@ -30,7 +30,7 @@ export const $inject = <T extends object>(
   });
 };
 
-export class InjectDescriptor extends Descriptor {}
+export class InjectPrimitive extends Primitive {}
 
 export interface InjectOptions<T extends object = any> {
   /**