alepha 0.13.0 → 0.13.2

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

@@ -1,8 +1,8 @@
 import {
-  createDescriptor,
-  Descriptor,
+  createPrimitive,
   type InstantiableClass,
   KIND,
+  Primitive,
 } from "alepha";
 import type { EmailSendOptions } from "../providers/EmailProvider.ts";
 import { EmailProvider } from "../providers/EmailProvider.ts";
@@ -10,12 +10,12 @@ import { MemoryEmailProvider } from "../providers/MemoryEmailProvider.ts";
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export const $email = (options: EmailDescriptorOptions = {}) =>
-  createDescriptor(EmailDescriptor, options);
+export const $email = (options: EmailPrimitiveOptions = {}) =>
+  createPrimitive(EmailPrimitive, options);
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export interface EmailDescriptorOptions {
+export interface EmailPrimitiveOptions {
   name?: string;
   provider?: InstantiableClass<EmailProvider> | "memory";
 }
@@ -23,7 +23,7 @@ export interface EmailDescriptorOptions {
 // ---------------------------------------------------------------------------------------------------------------------
 
 /**
- * Email descriptor for sending emails through various providers.
+ * Email primitive for sending emails through various providers.
  *
  * Usage:
  * ```typescript
@@ -40,7 +40,7 @@ export interface EmailDescriptorOptions {
  * }
  * ```
  */
-export class EmailDescriptor extends Descriptor<EmailDescriptorOptions> {
+export class EmailPrimitive extends Primitive<EmailPrimitiveOptions> {
   protected readonly provider = this.$provider();
 
   public get name() {
@@ -83,4 +83,4 @@ export class EmailDescriptor extends Descriptor<EmailDescriptorOptions> {
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-$email[KIND] = EmailDescriptor;
+$email[KIND] = EmailPrimitive;

package/src/file/index.ts

@@ -24,7 +24,7 @@ export * from "./services/FileDetector.ts";
  */
 export const AlephaFile = $module({
   name: "alepha.file",
-  descriptors: [],
+  primitives: [],
   services: [FileDetector, FileSystemProvider, NodeFileSystemProvider],
   register: (alepha) =>
     alepha.with({

package/src/lock/index.ts

@@ -1,13 +1,13 @@
 import { $module } from "alepha";
 import { MemoryTopicProvider } from "alepha/topic";
-import { $lock } from "./descriptors/$lock.ts";
+import { $lock } from "./primitives/$lock.ts";
 import { LockProvider } from "./providers/LockProvider.ts";
 import { LockTopicProvider } from "./providers/LockTopicProvider.ts";
 import { MemoryLockProvider } from "./providers/MemoryLockProvider.ts";
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export * from "./descriptors/$lock.ts";
+export * from "./primitives/$lock.ts";
 export * from "./providers/LockProvider.ts";
 export * from "./providers/LockTopicProvider.ts";
 export * from "./providers/MemoryLockProvider.ts";
@@ -25,7 +25,7 @@ export * from "./providers/MemoryLockProvider.ts";
  */
 export const AlephaLock = $module({
   name: "alepha.lock",
-  descriptors: [$lock],
+  primitives: [$lock],
   services: [LockProvider, MemoryLockProvider, LockTopicProvider],
   register: (alepha) =>
     alepha

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

@@ -2,9 +2,9 @@ import {
   $env,
   $inject,
   type AsyncFn,
-  createDescriptor,
-  Descriptor,
+  createPrimitive,
   KIND,
+  Primitive,
   type Static,
   t,
 } from "alepha";
@@ -19,7 +19,7 @@ import { LockProvider } from "../providers/LockProvider.ts";
 import { LockTopicProvider } from "../providers/LockTopicProvider.ts";
 
 /**
- * Creates a distributed lock descriptor for ensuring single-instance execution across processes.
+ * Creates a distributed lock primitive for ensuring single-instance execution across processes.
  *
  * Prevents multiple instances of the same operation from running simultaneously, essential for
  * maintaining data consistency and preventing race conditions in distributed applications.
@@ -68,14 +68,14 @@ import { LockTopicProvider } from "../providers/LockTopicProvider.ts";
  * ```
  */
 export const $lock = <TFunc extends AsyncFn>(
-  options: LockDescriptorOptions<TFunc>,
-): LockDescriptor<TFunc> => {
-  return createDescriptor(LockDescriptor<TFunc>, options);
+  options: LockPrimitiveOptions<TFunc>,
+): LockPrimitive<TFunc> => {
+  return createPrimitive(LockPrimitive<TFunc>, options);
 };
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export interface LockDescriptorOptions<TFunc extends AsyncFn> {
+export interface LockPrimitiveOptions<TFunc extends AsyncFn> {
   /**
    * The function to execute when the lock is successfully acquired.
    *
@@ -295,8 +295,8 @@ declare module "alepha" {
   interface Env extends Partial<Static<typeof envSchema>> {}
 }
 
-export class LockDescriptor<TFunc extends AsyncFn> extends Descriptor<
-  LockDescriptorOptions<TFunc>
+export class LockPrimitive<TFunc extends AsyncFn> extends Primitive<
+  LockPrimitiveOptions<TFunc>
 > {
   protected readonly log = $logger();
   protected readonly provider = $inject(LockProvider);
@@ -439,7 +439,7 @@ export class LockDescriptor<TFunc extends AsyncFn> extends Descriptor<
   }
 }
 
-$lock[KIND] = LockDescriptor;
+$lock[KIND] = LockPrimitive;
 
 export interface LockResult {
   id: string;

package/src/logger/index.ts

@@ -1,5 +1,5 @@
 import { $module, type Static, t } from "alepha";
-import { $logger } from "./descriptors/$logger.ts";
+import { $logger } from "./primitives/$logger.ts";
 import { ConsoleDestinationProvider } from "./providers/ConsoleDestinationProvider.ts";
 import { JsonFormatterProvider } from "./providers/JsonFormatterProvider.ts";
 import { LogDestinationProvider } from "./providers/LogDestinationProvider.ts";
@@ -12,7 +12,7 @@ import { Logger } from "./services/Logger.ts";
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export * from "./descriptors/$logger.ts";
+export * from "./primitives/$logger.ts";
 export * from "./providers/ConsoleColorProvider.ts";
 export * from "./providers/ConsoleDestinationProvider.ts";
 export * from "./providers/JsonFormatterProvider.ts";
@@ -28,7 +28,7 @@ export * from "./services/Logger.ts";
 /**
  * Minimalist logger module for Alepha.
  *
- * It offers a global logger interface (info, warn, ...) via the `$logger` descriptor.
+ * It offers a global logger interface (info, warn, ...) via the `$logger` primitive.
  *
  * ```ts
  * import { $logger } from "alepha/logger";
@@ -95,7 +95,7 @@ export * from "./services/Logger.ts";
  */
 export const AlephaLogger = $module({
   name: "alepha.logger",
-  descriptors: [$logger],
+  primitives: [$logger],
   services: [
     Logger,
     ConsoleDestinationProvider,
@@ -121,8 +121,8 @@ export const AlephaLogger = $module({
         };
 
         try {
-          alepha.state.get("alepha.test.afterEach")?.(printOnError);
-          alepha.state.get("alepha.test.onTestFinished")?.(printOnError);
+          alepha.store.get("alepha.test.afterEach")?.(printOnError);
+          alepha.store.get("alepha.test.onTestFinished")?.(printOnError);
         } catch {
           // ignore
         }
@@ -163,7 +163,7 @@ export const AlephaLogger = $module({
       use: getLogFormatterProvider(),
     });
 
-    alepha.state.set(
+    alepha.store.set(
       "alepha.logger",
       alepha.inject(Logger, {
         lifetime: "transient",
@@ -171,7 +171,7 @@ export const AlephaLogger = $module({
       }),
     );
 
-    alepha.state.set(
+    alepha.store.set(
       "alepha.logger.level",
       env.LOG_LEVEL ?? (alepha.isTest() ? "trace" : "info"),
     );

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

@@ -20,7 +20,7 @@ import { Logger } from "../services/Logger.ts";
  * }
  * ```
  */
-export const $logger = (options: LoggerDescriptorOptions = {}): Logger => {
+export const $logger = (options: LoggerPrimitiveOptions = {}): Logger => {
   const { alepha, service, module } = $context();
 
   return $inject(Logger, {
@@ -32,7 +32,7 @@ export const $logger = (options: LoggerDescriptorOptions = {}): Logger => {
   });
 };
 
-export interface LoggerDescriptorOptions {
+export interface LoggerPrimitiveOptions {
   name?: string;
 }
 

package/src/logger/services/Logger.ts

@@ -43,7 +43,7 @@ export class Logger implements LoggerInterface {
   }
 
   public get level(): string {
-    const stateLogLevel = this.alepha.state.get("alepha.logger.level");
+    const stateLogLevel = this.alepha.store.get("alepha.logger.level");
     if (stateLogLevel && stateLogLevel !== this.appLogLevel) {
       this.appLogLevel = stateLogLevel;
       this.logLevel = this.parseLevel(this.appLogLevel, this.module);

package/src/orm/constants/PG_SYMBOLS.ts

@@ -2,7 +2,7 @@ import type {
   PgSequenceOptions,
   UpdateDeleteAction,
 } from "drizzle-orm/pg-core";
-import type { EntityDescriptor } from "../descriptors/$entity.ts";
+import type { EntityPrimitive } from "../primitives/$entity.ts";
 
 export const PG_DEFAULT = Symbol.for("Alepha.Postgres.Default");
 export const PG_PRIMARY_KEY = Symbol.for("Alepha.Postgres.PrimaryKey");
@@ -56,7 +56,7 @@ export interface PgEnumOptions {
 export interface PgRefOptions {
   ref: () => {
     name: string;
-    entity: EntityDescriptor;
+    entity: EntityPrimitive;
   };
   actions?: {
     onUpdate?: UpdateDeleteAction;

package/src/orm/index.browser.ts

@@ -9,13 +9,13 @@ export {
   pageQuerySchema,
   pageSchema,
 } from "alepha";
-export * from "./descriptors/$entity.ts";
 export * from "./errors/DbEntityNotFoundError.ts";
 export * from "./helpers/parseQueryString.ts";
 export * from "./helpers/pgAttr.ts";
 export * from "./interfaces/FilterOperators.ts";
 export * from "./interfaces/PgQuery.ts";
 export * from "./interfaces/PgQueryWhere.ts";
+export * from "./primitives/$entity.ts";
 export * from "./providers/PostgresTypeProvider.ts";
 export * from "./schemas/legacyIdSchema.ts";
 
@@ -23,6 +23,6 @@ export * from "./schemas/legacyIdSchema.ts";
 
 export const AlephaPostgres = $module({
   name: "alepha.postgres",
-  descriptors: [],
+  primitives: [],
   services: [AlephaDateTime],
 });

package/src/orm/index.ts

@@ -1,9 +1,9 @@
 import { $module, type Alepha, t } from "alepha";
 import { AlephaDateTime } from "alepha/datetime";
 import * as drizzle from "drizzle-orm";
-import { $entity } from "./descriptors/$entity.ts";
-import { $repository } from "./descriptors/$repository.ts";
-import { $sequence } from "./descriptors/$sequence.ts";
+import { $entity } from "./primitives/$entity.ts";
+import { $repository } from "./primitives/$repository.ts";
+import { $sequence } from "./primitives/$sequence.ts";
 import { DrizzleKitProvider } from "./providers/DrizzleKitProvider.ts";
 import { DatabaseProvider } from "./providers/drivers/DatabaseProvider.ts";
 import { NodePostgresProvider } from "./providers/drivers/NodePostgresProvider.ts";
@@ -95,10 +95,6 @@ export {
 export { sql } from "drizzle-orm";
 export * from "drizzle-orm/pg-core";
 export * from "./constants/PG_SYMBOLS.ts";
-export * from "./descriptors/$entity.ts";
-export * from "./descriptors/$repository.ts";
-export * from "./descriptors/$sequence.ts";
-export * from "./descriptors/$transaction.ts";
 export * from "./errors/DbConflictError.ts";
 export * from "./errors/DbEntityNotFoundError.ts";
 export * from "./errors/DbError.ts";
@@ -109,6 +105,10 @@ export * from "./helpers/pgAttr.ts";
 export * from "./interfaces/FilterOperators.ts";
 export * from "./interfaces/PgQuery.ts";
 export * from "./interfaces/PgQueryWhere.ts";
+export * from "./primitives/$entity.ts";
+export * from "./primitives/$repository.ts";
+export * from "./primitives/$sequence.ts";
+export * from "./primitives/$transaction.ts";
 export * from "./providers/DrizzleKitProvider.ts";
 export * from "./providers/drivers/DatabaseProvider.ts";
 export * from "./providers/drivers/NodePostgresProvider.ts";
@@ -164,7 +164,7 @@ export * from "./types/schema.ts";
  */
 export const AlephaPostgres = $module({
   name: "alepha.postgres",
-  descriptors: [$sequence, $entity],
+  primitives: [$sequence, $entity],
   services: [
     AlephaDateTime,
     DatabaseProvider,

package/src/orm/{descriptors → primitives}/$entity.ts

@@ -9,7 +9,7 @@ import { insertSchema, type TObjectInsert } from "../schemas/insertSchema.ts";
 import { type TObjectUpdate, updateSchema } from "../schemas/updateSchema.ts";
 
 /**
- * Creates a database entity descriptor that defines table structure using TypeBox schemas.
+ * Creates a database entity primitive that defines table structure using TypeBox schemas.
  *
  * @example
  * ```ts
@@ -27,14 +27,14 @@ import { type TObjectUpdate, updateSchema } from "../schemas/updateSchema.ts";
  * ```
  */
 export const $entity = <TSchema extends TObject>(
-  options: EntityDescriptorOptions<TSchema>,
-): EntityDescriptor<TSchema> => {
-  return new EntityDescriptor<TSchema>(options);
+  options: EntityPrimitiveOptions<TSchema>,
+): EntityPrimitive<TSchema> => {
+  return new EntityPrimitive<TSchema>(options);
 };
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export interface EntityDescriptorOptions<
+export interface EntityPrimitiveOptions<
   T extends TObject,
   Keys = keyof Static<T>,
 > {
@@ -163,15 +163,15 @@ export interface EntityDescriptorOptions<
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export class EntityDescriptor<T extends TObject = TObject> {
-  public readonly options: EntityDescriptorOptions<T>;
+export class EntityPrimitive<T extends TObject = TObject> {
+  public readonly options: EntityPrimitiveOptions<T>;
 
-  constructor(options: EntityDescriptorOptions<T>) {
+  constructor(options: EntityPrimitiveOptions<T>) {
     this.options = options;
   }
 
   alias(alias: string): this {
-    const aliased = new EntityDescriptor<T>(this.options);
+    const aliased = new EntityPrimitive<T>(this.options);
     return new Proxy(aliased, {
       get(target, prop, receiver) {
         if (prop === "$alias") {
@@ -213,7 +213,7 @@ export class EntityDescriptor<T extends TObject = TObject> {
   }
 }
 
-$entity[KIND] = EntityDescriptor;
+$entity[KIND] = EntityPrimitive;
 
 // ---------------------------------------------------------------------------------------------------------------------
 
@@ -235,7 +235,7 @@ export type SchemaToTableConfig<T extends TObject> = {
 
 export type EntityColumn<T extends TObject> = {
   name: string;
-  entity: EntityDescriptor<T>;
+  entity: EntityPrimitive<T>;
 };
 
 export type EntityColumns<T extends TObject> = {

package/src/orm/{descriptors → primitives}/$repository.ts

@@ -1,13 +1,13 @@
 import { $context, $inject, type TObject } from "alepha";
 import { RepositoryProvider } from "../providers/RepositoryProvider.ts";
 import type { Repository } from "../services/Repository.ts";
-import type { EntityDescriptor } from "./$entity.ts";
+import type { EntityPrimitive } from "./$entity.ts";
 
 /**
  * Get the repository for the given entity.
  */
 export const $repository = <T extends TObject>(
-  entity: EntityDescriptor<T>,
+  entity: EntityPrimitive<T>,
 ): Repository<T> => {
   const { alepha } = $context();
   const repositoryProvider = alepha.inject(RepositoryProvider);

package/src/orm/{descriptors → primitives}/$sequence.ts

@@ -1,20 +1,20 @@
-import { createDescriptor, Descriptor, KIND } from "alepha";
+import { createPrimitive, KIND, Primitive } from "alepha";
 import { sql } from "drizzle-orm";
 import type { PgSequenceOptions } from "drizzle-orm/pg-core";
 import { DatabaseProvider } from "../providers/drivers/DatabaseProvider.ts";
 
 /**
- * Creates a PostgreSQL sequence descriptor for generating unique numeric values.
+ * Creates a PostgreSQL sequence primitive for generating unique numeric values.
  */
 export const $sequence = (
-  options: SequenceDescriptorOptions = {},
-): SequenceDescriptor => {
-  return createDescriptor(SequenceDescriptor, options);
+  options: SequencePrimitiveOptions = {},
+): SequencePrimitive => {
+  return createPrimitive(SequencePrimitive, options);
 };
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export interface SequenceDescriptorOptions extends PgSequenceOptions {
+export interface SequencePrimitiveOptions extends PgSequenceOptions {
   /**
    * The name of the sequence. If not provided, the property key will be used.
    */
@@ -25,7 +25,7 @@ export interface SequenceDescriptorOptions extends PgSequenceOptions {
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export class SequenceDescriptor extends Descriptor<SequenceDescriptorOptions> {
+export class SequencePrimitive extends Primitive<SequencePrimitiveOptions> {
   public readonly provider = this.$provider();
 
   public onInit() {
@@ -57,4 +57,4 @@ export class SequenceDescriptor extends Descriptor<SequenceDescriptorOptions> {
   }
 }
 
-$sequence[KIND] = SequenceDescriptor;
+$sequence[KIND] = SequencePrimitive;

package/src/orm/{descriptors → primitives}/$transaction.ts

@@ -6,9 +6,9 @@ import { DbVersionMismatchError } from "../errors/DbVersionMismatchError.ts";
 import { DatabaseProvider } from "../providers/drivers/DatabaseProvider.ts";
 
 /**
- * Creates a transaction descriptor for database operations requiring atomicity and consistency.
+ * Creates a transaction primitive for database operations requiring atomicity and consistency.
  *
- * This descriptor provides a convenient way to wrap database operations in PostgreSQL
+ * This primitive provides a convenient way to wrap database operations in PostgreSQL
  * transactions, ensuring ACID properties and automatic retry logic for version conflicts.
  * It integrates seamlessly with the repository pattern and provides built-in handling
  * for optimistic locking scenarios with automatic retry on version mismatches.
@@ -21,7 +21,7 @@ import { DatabaseProvider } from "../providers/drivers/DatabaseProvider.ts";
  * - Use appropriate isolation levels based on your consistency requirements
  */
 export const $transaction = <T extends any[], R>(
-  opts: TransactionDescriptorOptions<T, R>,
+  opts: TransactionPrimitiveOptions<T, R>,
 ) => {
   const { alepha } = $context();
   const provider = alepha.inject(DatabaseProvider);
@@ -38,7 +38,7 @@ export const $transaction = <T extends any[], R>(
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-export interface TransactionDescriptorOptions<T extends any[], R> {
+export interface TransactionPrimitiveOptions<T extends any[], R> {
   /**
    * Transaction handler function that contains all database operations to be executed atomically.
    *

package/src/orm/providers/DrizzleKitProvider.ts

@@ -297,7 +297,7 @@ export class DrizzleKitProvider {
    * Try to load the official Drizzle Kit API.
    * If not available, fallback to the local kit import.
    */
-  protected importDrizzleKit(): typeof DrizzleKit {
+  public importDrizzleKit(): typeof DrizzleKit {
     try {
       return createRequire(import.meta.url)("drizzle-kit/api");
     } catch (_) {

package/src/orm/providers/PostgresTypeProvider.ts

@@ -159,9 +159,9 @@ export class PostgresTypeProvider {
    *
    * This is used to track the version of a row in the database.
    *
-   * You can use it for optimistic concurrency control (OCC) with {@link RepositoryDescriptor#save}.
+   * You can use it for optimistic concurrency control (OCC) with {@link RepositoryPrimitive#save}.
    *
-   * @see {@link RepositoryDescriptor#save}
+   * @see {@link RepositoryPrimitive#save}
    * @see {@link PgVersionMismatchError}
    */
   public readonly version = (options: TNumberOptions = {}) =>
@@ -239,7 +239,7 @@ export class PostgresTypeProvider {
 
   /**
    * Creates a page schema for a given object schema.
-   * It's used by {@link RepositoryDescriptor#paginate} method.
+   * It's used by {@link RepositoryPrimitive#paginate} method.
    */
   public readonly page = <T extends TObject>(
     resource: T,

package/src/orm/providers/RepositoryProvider.ts

@@ -1,12 +1,12 @@
 import { $inject, Alepha, type Service, type TObject } from "alepha";
-import type { EntityDescriptor } from "../descriptors/$entity.ts";
+import type { EntityPrimitive } from "../primitives/$entity.ts";
 import { Repository } from "../services/Repository.ts";
 import type { DatabaseProvider } from "./drivers/DatabaseProvider.ts";
 
 export class RepositoryProvider {
   protected readonly alepha = $inject(Alepha);
   protected readonly registry = new Map<
-    EntityDescriptor<any>,
+    EntityPrimitive<any>,
     Service<Repository<any>>
   >();
 
@@ -21,14 +21,14 @@ export class RepositoryProvider {
   }
 
   public getRepository<T extends TObject>(
-    entity: EntityDescriptor<T>,
+    entity: EntityPrimitive<T>,
   ): Repository<T> {
     const RepositoryClass = this.createClassRepository(entity);
     return this.alepha.inject(RepositoryClass);
   }
 
   public createClassRepository<T extends TObject>(
-    entity: EntityDescriptor<T>,
+    entity: EntityPrimitive<T>,
   ): Service<Repository<T>> {
     let name = entity.name.charAt(0).toUpperCase() + entity.name.slice(1);
     if (name.endsWith("s")) {

package/src/orm/providers/drivers/DatabaseProvider.ts

@@ -13,12 +13,12 @@ import {
   type PgDatabase,
   type PgTableWithColumns,
 } from "drizzle-orm/pg-core";
+import { DbError } from "../../errors/DbError.ts";
 import type {
-  EntityDescriptor,
+  EntityPrimitive,
   SchemaToTableConfig,
-} from "../../descriptors/$entity.ts";
-import type { SequenceDescriptor } from "../../descriptors/$sequence.ts";
-import { DbError } from "../../errors/DbError.ts";
+} from "../../primitives/$entity.ts";
+import type { SequencePrimitive } from "../../primitives/$sequence.ts";
 import type { ModelBuilder } from "../../services/ModelBuilder.ts";
 import type { DrizzleKitProvider } from "../DrizzleKitProvider.ts";
 
@@ -46,7 +46,7 @@ export abstract class DatabaseProvider {
   }
 
   public table<T extends TObject>(
-    entity: EntityDescriptor<T>,
+    entity: EntityPrimitive<T>,
   ): PgTableWithColumns<SchemaToTableConfig<T>> {
     const table = this.tables.get(entity.name);
     if (!table) {
@@ -65,11 +65,11 @@ export abstract class DatabaseProvider {
     return table as PgTableWithColumns<SchemaToTableConfig<T>>;
   }
 
-  public registerEntity(entity: EntityDescriptor) {
+  public registerEntity(entity: EntityPrimitive) {
     this.builder.buildTable(entity, this);
   }
 
-  public registerSequence(sequence: SequenceDescriptor) {
+  public registerSequence(sequence: SequencePrimitive) {
     this.builder.buildSequence(sequence, this);
   }
 

package/src/orm/services/ModelBuilder.ts

@@ -1,6 +1,6 @@
 import type { SQL } from "drizzle-orm";
-import type { EntityDescriptor } from "../descriptors/$entity.ts";
-import type { SequenceDescriptor } from "../descriptors/$sequence.ts";
+import type { EntityPrimitive } from "../primitives/$entity.ts";
+import type { SequencePrimitive } from "../primitives/$sequence.ts";
 
 /**
  * Database-specific table configuration functions
@@ -24,15 +24,15 @@ export interface TableConfigBuilders<TConfig> {
 }
 
 /**
- * Abstract base class for transforming Alepha Descriptors (Entity, Sequence, etc...)
+ * Abstract base class for transforming Alepha Primitives (Entity, Sequence, etc...)
  * into drizzle models (tables, enums, sequences, etc...).
  */
 export abstract class ModelBuilder {
   /**
-   * Build a table from an entity descriptor.
+   * Build a table from an entity primitive.
    */
   abstract buildTable(
-    entity: EntityDescriptor,
+    entity: EntityPrimitive,
     options: {
       tables: Map<string, unknown>;
       enums: Map<string, unknown>;
@@ -41,10 +41,10 @@ export abstract class ModelBuilder {
   ): void;
 
   /**
-   * Build a sequence from a sequence descriptor.
+   * Build a sequence from a sequence primitive.
    */
   abstract buildSequence(
-    sequence: SequenceDescriptor,
+    sequence: SequencePrimitive,
     options: {
       sequences: Map<string, unknown>;
       schema: string;
@@ -65,13 +65,13 @@ export abstract class ModelBuilder {
    * Build the table configuration function for any database.
    * This includes indexes, foreign keys, constraints, and custom config.
    *
-   * @param entity - The entity descriptor
+   * @param entity - The entity primitive
    * @param builders - Database-specific builder functions
    * @param tableResolver - Function to resolve entity references to table columns
    * @param customConfigHandler - Optional handler for custom config
    */
   protected buildTableConfig<TConfig, TSelf>(
-    entity: EntityDescriptor,
+    entity: EntityPrimitive,
     builders: TableConfigBuilders<TConfig>,
     tableResolver?: (entityName: string) => any,
     customConfigHandler?: (config: any, self: TSelf) => TConfig[],

package/src/orm/services/PgRelationManager.ts

@@ -2,8 +2,8 @@ import { type TObject, TypeBoxValue, t } from "alepha";
 import { getTableName, type SQL, sql } from "drizzle-orm";
 import type { PgSelectBase, PgTableWithColumns } from "drizzle-orm/pg-core";
 import { isSQLWrapper } from "drizzle-orm/sql/sql";
-import type { EntityDescriptor } from "../descriptors/$entity.ts";
 import type { PgRelationMap } from "../interfaces/PgQuery.ts";
+import type { EntityPrimitive } from "../primitives/$entity.ts";
 import type { DatabaseProvider } from "../providers/drivers/DatabaseProvider.ts";
 import type { PgJoin } from "./QueryManager.ts";
 
@@ -20,7 +20,7 @@ export class PgRelationManager {
     parentKey?: string,
   ) {
     for (const [key, join] of Object.entries(withRelations)) {
-      const from = provider.table(join.join as EntityDescriptor);
+      const from = provider.table(join.join as EntityPrimitive);
       const on = isSQLWrapper(join.on)
         ? (join.on as SQL)
         : sql`${table[join.on[0] as string]} = ${from[join.on[1].name]}`;