alepha 0.7.3 → 0.7.5

package/lock.d.ts

@@ -3,7 +3,46 @@ import { AsyncFn, KIND, OPTIONS, Static, Alepha } from '@alepha/core';
 import { DurationLike, DateTimeProvider, DateTime, Timeout } from '@alepha/datetime';
 import * as _alepha_topic from '@alepha/topic';
 import { TopicProvider } from '@alepha/topic';
-import { RedisProvider, RedisClient } from '@alepha/redis';
+
+declare const KEY = "LOCK";
+interface LockDescriptorOptions<TFunc extends AsyncFn> {
+    /**
+     * Function executed when the lock is acquired.
+     */
+    handler: TFunc;
+    /**
+     * If true, the handler will wait for the lock to be released.
+     *
+     * @default false
+     */
+    wait?: boolean;
+    key?: string | ((...args: Parameters<TFunc>) => string);
+    maxDuration?: DurationLike;
+    gracePeriod?: (...args: Parameters<TFunc>) => DurationLike | undefined;
+}
+interface LockDescriptor<TFunc extends AsyncFn> {
+    [KIND]: typeof KEY;
+    [OPTIONS]: LockDescriptorOptions<TFunc>;
+    /**
+     * Apply the lock.
+     *
+     * @param args
+     */
+    (...args: Parameters<TFunc>): Promise<void>;
+}
+/**
+ * Lock descriptor
+ *
+ * Make sure that only one instance of the handler is running at a time.
+ *
+ * When connected to a remote store, the lock is shared across all processes.
+ *
+ * @param options
+ */
+declare const $lock: {
+    <TFunc extends AsyncFn>(options: LockDescriptorOptions<TFunc>): LockDescriptor<TFunc>;
+    [KIND]: string;
+};
 
 /** Symbol key applied to readonly types */
 declare const ReadonlyKind: unique symbol;
@@ -14,11 +53,6 @@ declare const Hint: unique symbol;
 /** Symbol key applied to types */
 declare const Kind: unique symbol;
 
-interface TUnsafe<T> extends TSchema {
-    [Kind]: string;
-    static: T;
-}
-
 type StringFormatOption = 'date-time' | 'time' | 'date' | 'email' | 'idn-email' | 'hostname' | 'idn-hostname' | 'ipv4' | 'ipv6' | 'uri' | 'uri-reference' | 'iri' | 'uuid' | 'iri-reference' | 'uri-template' | 'json-pointer' | 'relative-json-pointer' | 'regex' | ({} & string);
 type StringContentEncodingOption = '7bit' | '8bit' | 'binary' | 'quoted-printable' | 'base64' | ({} & string);
 interface StringOptions extends SchemaOptions {
@@ -70,51 +104,10 @@ interface TSchema extends TKind, SchemaOptions {
     static: unknown;
 }
 
-declare const KEY = "LOCK";
-interface LockDescriptorOptions<TFunc extends AsyncFn> {
-    /**
-     * Function executed when the lock is acquired.
-     */
-    handler: TFunc;
-    /**
-     * If true, the handler will wait for the lock to be released.
-     *
-     * @default false
-     */
-    wait?: boolean;
-    key?: string | ((...args: Parameters<TFunc>) => string);
-    maxDuration?: DurationLike;
-    gracePeriod?: (...args: Parameters<TFunc>) => DurationLike | undefined;
-}
-interface LockDescriptor<TFunc extends AsyncFn> {
-    [KIND]: typeof KEY;
-    [OPTIONS]: LockDescriptorOptions<TFunc>;
-    /**
-     * Apply the lock.
-     *
-     * @param args
-     */
-    (...args: Parameters<TFunc>): Promise<void>;
-}
-/**
- * Lock descriptor
- *
- * Make sure that only one instance of the handler is running at a time.
- *
- * When connected to a remote store, the lock is shared across all processes.
- *
- * @param options
- */
-declare const $lock: {
-    <TFunc extends AsyncFn>(options: LockDescriptorOptions<TFunc>): LockDescriptor<TFunc>;
-    [KIND]: string;
-};
-
 /**
  * Store Provider Interface
  */
-declare class LockProvider {
-    constructor();
+declare abstract class LockProvider {
     /**
      * Set the string value of a key.
      *
@@ -123,23 +116,23 @@ declare class LockProvider {
      * @param nx If set to true, the key will only be set if it does not already exist.
      * @param px Set the specified expire time, in milliseconds.
      */
-    set(_key: string, _value: string, _nx?: boolean, _px?: number): Promise<string>;
+    abstract set(key: string, value: string, nx?: boolean, px?: number): Promise<string>;
     /**
      * Remove the specified keys.
      *
      * @param keys The keys to delete.
      */
-    del(..._keys: string[]): Promise<void>;
+    abstract del(...keys: string[]): Promise<void>;
 }
 
 declare class LockTopicProvider extends TopicProvider {
 }
 
-declare const envSchema$1: _alepha_core.TObject<{
+declare const envSchema: _alepha_core.TObject<{
     LOCK_PREFIX_KEY: TString;
 }>;
 declare module "alepha" {
-    interface Env extends Partial<Static<typeof envSchema$1>> {
+    interface Env extends Partial<Static<typeof envSchema>> {
     }
 }
 declare class LockDescriptorProvider {
@@ -203,68 +196,25 @@ declare class MemoryLockProvider implements LockProvider {
      * Timeouts used to expire keys.
      */
     protected storeTimeout: Record<string, Timeout>;
-    /**
-     * Set the string value of a key.
-     *
-     * @param key The key of the value to set.
-     * @param value The value to set.
-     * @param nx If set to true, the key will only be set if it does not already exist.
-     * @param px Set the specified expire time, in milliseconds.
-     */
     set(key: string, value: string, nx?: boolean, px?: number): Promise<string>;
-    /**
-     * Remove the specified keys.
-     *
-     * @param keys The keys to delete.
-     */
     del(...keys: string[]): Promise<void>;
-    /**
-     * Set a timeout for a key.
-     *
-     * @param key The key to set the timeout for.
-     * @param ms The number of milliseconds to wait before deleting the key.
-     */
     private ttl;
 }
 
 /**
- * A store provider that uses Redis.
+ * Alepha Lock Module
+ *
+ * Lock a resource for a certain period of time.
+ *
+ * This module provides a memory implementation of the lock provider.
+ * You probably want to use an implementation like RedisLockProvider for distributed systems.
+ *
+ * @see {@link $lock}
+ * @module alepha.lock
  */
-declare class RedisLockProvider implements LockProvider {
-    protected readonly log: _alepha_core.Logger;
-    protected readonly redisProvider: RedisProvider;
-    /**
-     * Get the Redis publisher.
-     */
-    protected get publisher(): RedisClient;
-    /**
-     * Set the string value of a key.
-     *
-     * @param key The key of the value to set.
-     * @param value The value to set.
-     * @param nx If set to true, the key will only be set if it does not already exist.
-     * @param px Set the specified expire time, in milliseconds.
-     */
-    set(key: string, value: string, nx?: boolean, px?: number): Promise<string>;
-    /**
-     * Remove the specified keys.
-     */
-    del(...keys: string[]): Promise<void>;
-}
-
-declare const envSchema: _alepha_core.TObject<{
-    LOCK_PROVIDER: TUnsafe<"memory" | "redis">;
-}>;
-declare module "alepha/core" {
-    interface Env extends Partial<Static<typeof envSchema>> {
-    }
-}
-declare class LockModule {
-    protected readonly alepha: Alepha;
-    protected readonly env: {
-        LOCK_PROVIDER: "memory" | "redis";
-    };
-    constructor();
+declare class AlephaLock {
+    readonly name = "alepha.lock";
+    readonly $services: (alepha: Alepha) => Alepha;
 }
 
-export { $lock, type LockDescriptor, type LockDescriptorOptions, LockDescriptorProvider, type LockDescriptorValue, LockModule, type LockObject, LockProvider, LockTopicProvider, MemoryLockProvider, RedisLockProvider };
+export { $lock, AlephaLock, type LockDescriptor, type LockDescriptorOptions, LockDescriptorProvider, type LockDescriptorValue, type LockObject, LockProvider, LockTopicProvider, MemoryLockProvider };

package/package.json

@@ -1,9 +1,9 @@
 {
 	"name": "alepha",
-	"version": "0.7.3",
+	"version": "0.7.5",
 	"type": "module",
 	"license": "MIT",
-	"description": "TypeScript framework for building full-stack apps with strict conventions, custom schemas, and React-based SPA or SSR without filesystem-based routing.",
+	"description": "TypeScript framework for building full-stack apps with strict conventions, and React-based SPA or SSR without filesystem-based routing.",
 	"homepage": "https://github.com/feunard/alepha",
 	"repository": {
 		"type": "git",
@@ -12,42 +12,30 @@
 	"main": "./core.js",
 	"types": "./core.d.ts",
 	"dependencies": {
-		"@alepha/cache": "0.7.3",
-		"@alepha/core": "0.7.3",
-		"@alepha/datetime": "0.7.3",
-		"@alepha/lock": "0.7.3",
-		"@alepha/postgres": "0.7.3",
-		"@alepha/queue": "0.7.3",
-		"@alepha/react": "0.7.3",
-		"@alepha/react-auth": "0.7.3",
-		"@alepha/redis": "0.7.3",
-		"@alepha/retry": "0.7.3",
-		"@alepha/scheduler": "0.7.3",
-		"@alepha/security": "0.7.3",
-		"@alepha/server": "0.7.3",
-		"@alepha/server-cache": "0.7.3",
-		"@alepha/server-cookies": "0.7.3",
-		"@alepha/server-static": "0.7.3",
-		"@alepha/server-swagger": "0.7.3",
-		"@alepha/testing": "0.7.3",
-		"@alepha/topic": "0.7.3",
-		"@alepha/vite": "0.7.3"
-	},
-	"peerDependencies": {
-		"@types/react": "^19",
-		"react": "^19",
-		"vite": "^6"
-	},
-	"peerDependenciesMeta": {
-		"@types/react": {
-			"optional": true
-		},
-		"react": {
-			"optional": true
-		},
-		"vite": {
-			"optional": true
-		}
+		"@alepha/cache": "0.7.5",
+		"@alepha/cache-redis": "0.7.5",
+		"@alepha/core": "0.7.5",
+		"@alepha/datetime": "0.7.5",
+		"@alepha/lock": "0.7.5",
+		"@alepha/postgres": "0.7.5",
+		"@alepha/queue": "0.7.5",
+		"@alepha/react": "0.7.5",
+		"@alepha/react-auth": "0.7.5",
+		"@alepha/redis": "0.7.5",
+		"@alepha/retry": "0.7.5",
+		"@alepha/scheduler": "0.7.5",
+		"@alepha/security": "0.7.5",
+		"@alepha/server": "0.7.5",
+		"@alepha/server-cache": "0.7.5",
+		"@alepha/server-cookies": "0.7.5",
+		"@alepha/server-static": "0.7.5",
+		"@alepha/server-swagger": "0.7.5",
+		"@alepha/testing": "0.7.5",
+		"@alepha/topic": "0.7.5",
+		"@alepha/topic-redis": "0.7.5",
+		"@alepha/vite": "0.7.5",
+		"@types/react": "^19.1.8",
+		"react": "^19.1.0"
 	},
 	"devDependencies": {
 		"@types/react": "^19.1.8",
@@ -59,7 +47,6 @@
 	},
 	"files": [
 		"src",
-		"assets",
 		"**/*.js",
 		"**/*.cjs",
 		"**/*.d.ts",
@@ -76,6 +63,11 @@
 			"require": "./cache.cjs",
 			"types": "./cache.d.ts"
 		},
+		"./cache/redis": {
+			"import": "./cache/redis.js",
+			"require": "./cache/redis.cjs",
+			"types": "./cache/redis.d.ts"
+		},
 		"./core": {
 			"import": "./core.js",
 			"require": "./core.cjs",
@@ -91,6 +83,11 @@
 			"require": "./lock.cjs",
 			"types": "./lock.d.ts"
 		},
+		"./lock/redis": {
+			"import": "./lock/redis.js",
+			"require": "./lock/redis.cjs",
+			"types": "./lock/redis.d.ts"
+		},
 		"./postgres": {
 			"import": "./postgres.js",
 			"require": "./postgres.cjs",

package/postgres.d.ts

@@ -1,27 +1,27 @@
 import * as _alepha_core from '@alepha/core';
-import { TObject as TObject$1, Static as Static$1, Alepha, KIND, OPTIONS } from '@alepha/core';
-import * as _sinclair_typebox from '@sinclair/typebox';
-import { TObject, TSchema, ObjectOptions, Kind, TProperties, Evaluate, TReadonly, TOptional, Static, TAdditionalProperties, OptionalKind, TArray, TIntersect, TRecord, TBoolean, TInteger, TOptionalWithFlag, IntegerOptions, NumberOptions, StringOptions } from '@sinclair/typebox';
+import { TObject as TObject$1, Static as Static$1, Alepha, KIND, OPTIONS, Module } from '@alepha/core';
 import * as drizzle_orm from 'drizzle-orm';
 import { TableConfig, BuildColumns, BuildExtraConfigColumns as BuildExtraConfigColumns$1, SQLWrapper, SQL } from 'drizzle-orm';
 export { sql } from 'drizzle-orm';
 import * as drizzle_orm_pg_core from 'drizzle-orm/pg-core';
 import { PgSequenceOptions, AnyPgTable, AnyPgColumn, UpdateDeleteAction, PgTableWithColumns, PgColumnBuilderBase, PgTableExtraConfigValue, PgDatabase, TableConfig as TableConfig$1, PgColumn, PgTransaction, PgTransactionConfig, LockStrength, LockConfig, PgInsertValue, PgSelectJoinFn } from 'drizzle-orm/pg-core';
 export * from 'drizzle-orm/pg-core';
+import * as _sinclair_typebox from '@sinclair/typebox';
+import { TObject, TSchema, ObjectOptions, Kind, TProperties, Evaluate, TReadonly, TOptional, Static, TAdditionalProperties, OptionalKind, TArray, TPick, TIntersect, TRecord, TBoolean, TInteger, TOptionalWithFlag, IntegerOptions, NumberOptions, StringOptions } from '@sinclair/typebox';
 import { BuildExtraConfigColumns } from 'drizzle-orm/column-builder';
-import * as _alepha_retry from '@alepha/retry';
-import { PgTransactionConfig as PgTransactionConfig$1 } from 'drizzle-orm/pg-core/session';
+import * as _alepha_lock from '@alepha/lock';
+import { MigrationConfig } from 'drizzle-orm/migrator';
+import { PostgresJsDatabase } from 'drizzle-orm/postgres-js';
+import postgres from 'postgres';
 import { LibSQLDatabase } from 'drizzle-orm/libsql';
 import { MySql2Database } from 'drizzle-orm/mysql2';
 import { SingleStoreDriverDatabase } from 'drizzle-orm/singlestore';
 import { ConnectionOptions } from 'tls';
 import * as zod from 'zod';
 import { TypeOf } from 'zod';
-import * as _alepha_lock from '@alepha/lock';
-import { MigrationConfig } from 'drizzle-orm/migrator';
-import { PostgresJsDatabase } from 'drizzle-orm/postgres-js';
-import postgres from 'postgres';
 import { UpdateDeleteAction as UpdateDeleteAction$1 } from 'drizzle-orm/pg-core/foreign-keys';
+import * as _alepha_retry from '@alepha/retry';
+import { PgTransactionConfig as PgTransactionConfig$1 } from 'drizzle-orm/pg-core/session';
 
 /**
  *
@@ -680,15 +680,19 @@ type PgQueryWhere<T extends object> = {
     exists?: SQLWrapper;
 };
 
-interface PgQuery<T extends TObject> {
+interface PgQuery<T extends TObject, Select extends (keyof Static<T>)[] = []> {
+    columns?: Select;
+    distinct?: boolean;
     where?: PgQueryWhereWithMany<T> | SQLWrapper;
     limit?: number;
     offset?: number;
     sort?: {
         [key in keyof Static<T>]?: "asc" | "desc";
     };
+    groupBy?: (keyof Static<T>)[];
     relations?: PgQueryWithMap<T>;
 }
+type PgQueryResult<T extends TObject, Select extends (keyof Static<T>)[]> = TPick<T, Select>;
 type PgQueryWhereWithMany<T extends TObject> = PgQueryWhere<Static<RemoveManyRelations<T>>> & ExtractManyRelations<T>;
 type ExtractManyRelations<T extends TObject> = {
     [K in keyof T["properties"] as T["properties"][K] extends {
@@ -879,7 +883,7 @@ declare class Repository<TTable extends PgTableWithColumns<TableConfig$1>, TTabl
      * @param opts The statement options.
      * @returns The found entities.
      */
-    find(query?: PgQuery<TTableSchema>, opts?: StatementOptions): Promise<Static<TTableSchema>[]>;
+    find<Select extends (keyof Static<TTableSchema>)[]>(query?: PgQuery<TTableSchema, Select>, opts?: StatementOptions): Promise<Static<PgQueryResult<TTableSchema, Select>>[]>;
     /**
      * Find a single entity.
      *
@@ -4349,22 +4353,16 @@ declare class DrizzleKitProvider {
 }
 
 declare module "alepha" {
-    interface Env extends Partial<Static$1<typeof envSchema$1>> {
+    interface Env extends Partial<Static$1<typeof envSchema>> {
     }
 }
-declare const envSchema$1: _alepha_core.TObject<{
+declare const envSchema: _alepha_core.TObject<{
     PG_HOST: _sinclair_typebox.TOptional<_sinclair_typebox.TString>;
     PG_USERNAME: _sinclair_typebox.TOptional<_sinclair_typebox.TString>;
     PG_DATABASE: _sinclair_typebox.TOptional<_sinclair_typebox.TString>;
     PG_PASSWORD: _sinclair_typebox.TOptional<_sinclair_typebox.TString>;
     PG_PORT: _sinclair_typebox.TOptional<_sinclair_typebox.TNumber>;
-    /**
-     *
-     */
-    DATABASE_URL: _sinclair_typebox.TString;
-    /**
-     *
-     */
+    DATABASE_URL: _sinclair_typebox.TOptional<_sinclair_typebox.TString>;
     DATABASE_MIGRATIONS_FOLDER: _sinclair_typebox.TString;
     /**
      * The schema to use.
@@ -4404,10 +4402,10 @@ declare class NodePostgresProvider implements PostgresProvider {
         PG_DATABASE?: string | undefined;
         PG_PASSWORD?: string | undefined;
         PG_PORT?: number | undefined;
+        DATABASE_URL?: string | undefined;
         POSTGRES_SCHEMA?: string | undefined;
         POSTGRES_SYNCHRONIZE?: boolean | undefined;
         POSTGRES_PUSH_SCHEMA?: boolean | undefined;
-        DATABASE_URL: string;
         DATABASE_MIGRATIONS_FOLDER: string;
         POSTGRES_REJECT_UNAUTHORIZED: boolean;
     };
@@ -4585,20 +4583,9 @@ declare const schema: <TDocument extends TSchema>(name: string, document: TDocum
     params: [];
 })["static"]>;
 
-declare const envSchema: _alepha_core.TObject<{
-    POSTGRES_PROVIDER: _sinclair_typebox.TOptional<_sinclair_typebox.TUnsafe<"pg">>;
-}>;
-declare module "@alepha/core" {
-    interface Env extends Partial<Static$1<typeof envSchema>> {
-    }
-}
-declare class PostgresModule {
-    protected readonly alepha: Alepha;
-    protected readonly env: {
-        POSTGRES_PROVIDER?: "pg" | undefined;
-    };
-    constructor();
-    protected getDefaultProviderName(): "pg";
+declare class AlephaPostgres implements Module {
+    readonly name = "alepha.postgres";
+    readonly $services: (alepha: Alepha) => Alepha;
 }
 
-export { $entity, $repository, $sequence, $transaction, type BaseEntity, type BaseEntityKeys, DrizzleKitProvider, type Entity, type EntityDescriptorOptions, EntityNotFoundError, type ExtractManyRelations, type FilterOperators, type FromSchema, NodePostgresProvider, type NodePostgresProviderState, type NullToUndefined, type NullifyIfOptional, PG_CREATED_AT, PG_DEFAULT, PG_IDENTITY, PG_MANY, PG_ONE, PG_PRIMARY_KEY, PG_REF, PG_SCHEMA, PG_SERIAL, PG_UPDATED_AT, PG_VERSION, type Page, type PageQuery, type PgAttrField, type PgDefault, type PgIdentityOptions, type PgMany, type PgManyOptions, type PgPrimaryKey, type PgQuery, type PgQueryWhere, type PgQueryWhereWithMany, type PgQueryWith, type PgQueryWithMap, type PgRef, type PgRefOptions, type PgSymbolKeys, type PgSymbols, type PgTableConfig, type PgTableWithColumnsAndSchema, PostgresModule, PostgresProvider, PostgresTypeProvider, type RemoveManyRelations, Repository, type RepositoryDescriptorOptions, RepositoryDescriptorProvider, type SQLLike, type SequenceDescriptor, type SequenceDescriptorOptions, type StatementOptions, type TEntity, type TInsertObject, type TPage, type TransactionContext, type TransactionDescriptorOptions, entityKeys, entitySchema, nullToUndefined, pageQuerySchema, pageSchema, pg, pgTableSchema, schema, schemaToColumns };
+export { $entity, $repository, $sequence, $transaction, AlephaPostgres, type BaseEntity, type BaseEntityKeys, DrizzleKitProvider, type Entity, type EntityDescriptorOptions, EntityNotFoundError, type ExtractManyRelations, type FilterOperators, type FromSchema, NodePostgresProvider, type NodePostgresProviderState, type NullToUndefined, type NullifyIfOptional, PG_CREATED_AT, PG_DEFAULT, PG_IDENTITY, PG_MANY, PG_ONE, PG_PRIMARY_KEY, PG_REF, PG_SCHEMA, PG_SERIAL, PG_UPDATED_AT, PG_VERSION, type Page, type PageQuery, type PgAttrField, type PgDefault, type PgIdentityOptions, type PgMany, type PgManyOptions, type PgPrimaryKey, type PgQuery, type PgQueryResult, type PgQueryWhere, type PgQueryWhereWithMany, type PgQueryWith, type PgQueryWithMap, type PgRef, type PgRefOptions, type PgSymbolKeys, type PgSymbols, type PgTableConfig, type PgTableWithColumnsAndSchema, PostgresProvider, PostgresTypeProvider, type RemoveManyRelations, Repository, type RepositoryDescriptorOptions, RepositoryDescriptorProvider, type SQLLike, type SequenceDescriptor, type SequenceDescriptorOptions, type StatementOptions, type TEntity, type TInsertObject, type TPage, type TransactionContext, type TransactionDescriptorOptions, entityKeys, entitySchema, nullToUndefined, pageQuerySchema, pageSchema, pg, pgTableSchema, schema, schemaToColumns };