alepha 0.7.2 → 0.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "alepha",
-	"version": "0.7.2",
+	"version": "0.7.3",
 	"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.",
@@ -12,26 +12,26 @@
 	"main": "./core.js",
 	"types": "./core.d.ts",
 	"dependencies": {
-		"@alepha/cache": "0.7.2",
-		"@alepha/core": "0.7.2",
-		"@alepha/datetime": "0.7.2",
-		"@alepha/lock": "0.7.2",
-		"@alepha/postgres": "0.7.2",
-		"@alepha/queue": "0.7.2",
-		"@alepha/react": "0.7.2",
-		"@alepha/react-auth": "0.7.2",
-		"@alepha/redis": "0.7.2",
-		"@alepha/retry": "0.7.2",
-		"@alepha/scheduler": "0.7.2",
-		"@alepha/security": "0.7.2",
-		"@alepha/server": "0.7.2",
-		"@alepha/server-cookies": "0.7.2",
-		"@alepha/server-metrics": "0.7.2",
-		"@alepha/server-static": "0.7.2",
-		"@alepha/server-swagger": "0.7.2",
-		"@alepha/testing": "0.7.2",
-		"@alepha/topic": "0.7.2",
-		"@alepha/vite": "0.7.2"
+		"@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",
@@ -141,11 +141,6 @@
 			"require": "./server/cookies.cjs",
 			"types": "./server/cookies.d.ts"
 		},
-		"./server/metrics": {
-			"import": "./server/metrics.js",
-			"require": "./server/metrics.cjs",
-			"types": "./server/metrics.d.ts"
-		},
 		"./server/static": {
 			"import": "./server/static.js",
 			"require": "./server/static.cjs",
@@ -156,6 +151,11 @@
 			"require": "./server/swagger.cjs",
 			"types": "./server/swagger.d.ts"
 		},
+		"./server/cache": {
+			"import": "./server/cache.js",
+			"require": "./server/cache.cjs",
+			"types": "./server/cache.d.ts"
+		},
 		"./topic": {
 			"import": "./topic.js",
 			"require": "./topic.cjs",

package/scheduler.d.ts

@@ -2,7 +2,7 @@ import * as _alepha_core from '@alepha/core';
 import { Async, KIND, OPTIONS, Static, Alepha } from '@alepha/core';
 import { DurationLike, DateTimeProvider, Interval } from '@alepha/datetime';
 import * as _alepha_lock from '@alepha/lock';
-import { CronJob } from 'cron';
+import { ScheduledTask } from 'node-cron';
 
 declare const KEY = "SCHEDULER";
 type SchedulerDescriptorOptions = {
@@ -173,7 +173,7 @@ interface Scheduler {
     name: string;
     options: SchedulerDescriptorOptions;
     trigger: () => Promise<void>;
-    cronJob?: CronJob;
+    cron?: ScheduledTask;
     interval?: Interval;
 }
 

package/server/{metrics.cjs → cache.cjs}

@@ -1,12 +1,12 @@
 'use strict';
 
-var serverMetrics = require('@alepha/server-metrics');
+var serverCache = require('@alepha/server-cache');
 
 
 
-Object.keys(serverMetrics).forEach(function (k) {
+Object.keys(serverCache).forEach(function (k) {
 	if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
 		enumerable: true,
-		get: function () { return serverMetrics[k]; }
+		get: function () { return serverCache[k]; }
 	});
 });

package/server/cache.d.ts

@@ -0,0 +1,51 @@
+import * as _alepha_core from '@alepha/core';
+import { Alepha, OPTIONS } from '@alepha/core';
+import { CacheDescriptorOptions, CacheDescriptorProvider, Cache } from '@alepha/cache';
+import { DurationLike, DateTimeProvider } from '@alepha/datetime';
+import { ServerHandler, ServerRequestConfig } from '@alepha/server';
+
+declare module "alepha/server" {
+    interface ServerRoute {
+        cache?: ServiceRouteCache;
+    }
+    interface ActionDescriptor {
+        invalidate: () => Promise<void>;
+    }
+}
+declare class ServerCacheProvider {
+    protected readonly log: _alepha_core.Logger;
+    protected readonly alepha: Alepha;
+    protected readonly cacheProvider: CacheDescriptorProvider;
+    protected readonly time: DateTimeProvider;
+    protected readonly caches: Map<ServerHandler, RouteCache>;
+    readonly onConfigure: _alepha_core.HookDescriptor<"configure">;
+    readonly onRoute: _alepha_core.HookDescriptor<"server:onRoute">;
+    readonly onRequest: _alepha_core.HookDescriptor<"server:onRequest">;
+    readonly onSend: _alepha_core.HookDescriptor<"server:onResponse">;
+    generateETag(content: string): string;
+    invalidate(route: RouteLike): Promise<void>;
+    protected getCacheByRoute(route: RouteLike): RouteCache | undefined;
+    protected createCacheKey(args: ServerRequestConfig): string;
+}
+type ServiceRouteCache = boolean | DurationLike | Omit<CacheDescriptorOptions<any>, "handler" | "key">;
+type RouteCache = Cache<{
+    contentType?: string;
+    body: string;
+    status?: number;
+    lastModified: string;
+    hash: string;
+}>;
+type RouteLike = {
+    [OPTIONS]: {
+        handler?: ServerHandler;
+    };
+} | {
+    handler?: ServerHandler;
+};
+
+declare class ServerCacheModule {
+    protected readonly alepha: Alepha;
+    constructor();
+}
+
+export { ServerCacheModule, ServerCacheProvider, type ServiceRouteCache };

package/server/cache.js

@@ -0,0 +1 @@
+export * from '@alepha/server-cache';

package/server.d.ts

@@ -1,14 +1,13 @@
 import * as _alepha_core from '@alepha/core';
 import { Static as Static$1, TObject as TObject$1, TSchema as TSchema$2, Async, StreamLike, Alepha, FileLike, OPTIONS, KIND, Service } from '@alepha/core';
 export { KIND } from '@alepha/core';
-import * as _alepha_cache from '@alepha/cache';
-import { CacheDescriptorOptions } from '@alepha/cache';
-import { DurationLike, DateTimeProvider } from '@alepha/datetime';
 import { UserAccountToken, Permission, ServiceAccountDescriptor as ServiceAccountDescriptor$1, SecurityProvider, JwtProvider } from '@alepha/security';
 import { IncomingMessage, ServerResponse as ServerResponse$1 } from 'node:http';
 import { Readable } from 'node:stream';
 import { ReadableStream } from 'node:stream/web';
 import { Route, RouterProvider } from '@alepha/router';
+import * as _alepha_cache from '@alepha/cache';
+import { DurationLike, DateTimeProvider } from '@alepha/datetime';
 import * as _alepha_retry from '@alepha/retry';
 import { BusboyConfig } from '@fastify/busboy';
 import * as http from 'http';
@@ -210,8 +209,6 @@ interface TSchema$1 extends TKind$1, SchemaOptions$1 {
 declare const routeMethods: readonly ["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS", "CONNECT", "TRACE"];
 type RouteMethod = (typeof routeMethods)[number];
 
-type ServiceRouteCache = boolean | DurationLike | Omit<CacheDescriptorOptions<any>, "handler" | "key">;
-
 declare const envSchema$4: TObject$1<{
     SERVER_ALS_ENABLED: TBoolean;
 }>;
@@ -289,10 +286,6 @@ interface ServerRoute<TConfig extends RequestConfigSchema = RequestConfigSchema>
      * @see ServerSecurityProvider
      */
     secure?: ServerRouteSecure;
-    /**
-     * @see ServerCacheProvider
-     */
-    cache?: ServiceRouteCache;
 }
 type ServerResponseBody<TConfig extends RequestConfigSchema = RequestConfigSchema> = TConfig["response"] extends TSchema$2 ? Static$1<TConfig["response"]> : ResponseBodyType;
 type ResponseType = "json" | "text" | "void" | "file" | "any";
@@ -537,11 +530,6 @@ interface ActionDescriptorOptions<TConfig extends RequestConfigSchema = RequestC
      * Main route handler. This is where the route logic is implemented.
      */
     handler?: ServerHandler<TConfig>;
-    /**
-     * If true, the route will be cached.
-     * - Number as seconds or boolean to enable cache.
-     */
-    cache?: boolean | DurationLike | Omit<CacheDescriptorOptions<any>, "handler" | "key">;
 }
 interface ActionDescriptor<TConfig extends RequestConfigSchema = RequestConfigSchema> {
     [KIND]: typeof KEY$2;
@@ -558,11 +546,6 @@ interface ActionDescriptor<TConfig extends RequestConfigSchema = RequestConfigSc
      * Name of the permission required to access this route.
      */
     permission: () => string;
-    /**
-     * Invalidate the cache for this action.
-     * This is only available if the action has cache enabled.
-     */
-    invalidate: () => Promise<void>;
 }
 declare const $action: {
     <TConfig extends RequestConfigSchema>(options: ActionDescriptorOptions<TConfig>): ActionDescriptor<TConfig>;
@@ -982,8 +965,8 @@ declare class RemoteDescriptorProvider {
     }) => Promise<{
         prefix?: string | undefined;
         links: {
-            group?: string | undefined;
             method?: string | undefined;
+            group?: string | undefined;
             requestBodyType?: string | undefined;
             service?: string | undefined;
             path: string;

package/src/server/cache.ts

@@ -0,0 +1 @@
+export * from "@alepha/server-cache";

package/vite.d.ts

@@ -1,14 +1,18 @@
 import { Alepha } from '@alepha/core';
-import { UserConfig, Plugin } from 'vite';
+import { Plugin } from 'vite';
 import { BrotliOptions, ZlibOptions } from 'node:zlib';
 
 interface ViteAlephaBuildOptions {
     /**
-     * The entry point for the application. This is the file that will be executed when the application is run.
-     *
-     * @default 'src/index.server.ts'
+     * Path to the entry file for the server build.
+     * If empty, SSR build will be skipped.
      */
-    entry?: string;
+    serverEntry?: string;
+    /**
+     * Set false to skip the client build.
+     * This is useful if you only want to build the server-side application.
+     */
+    client?: false;
     /**
      * If true, the build will be optimized for Vercel deployment.
      *
@@ -17,25 +21,15 @@ interface ViteAlephaBuildOptions {
      * @default false
      */
     vercel?: boolean;
-    /**
-     * Vite server options to override the default server configuration.
-     */
-    server?: false | UserConfig;
-    client?: false;
-    /**
-     * If true, all compatible pages will be pre-rendered.
-     */
-    prerender?: boolean;
 }
 declare function viteAlephaBuild(options?: ViteAlephaBuildOptions): Promise<Plugin>;
 
 interface ViteAlephaDevOptions {
     /**
-     * The entry point for the application. This is the file that will be executed when the application is run.
-     *
-     * @default 'src/index.server.ts'
+     * Path to the entry file for the server build.
+     * If empty, plugin will be disabled.
      */
-    entry?: string;
+    serverEntry?: string;
     /**
      * Enable or disable debug mode
      *
@@ -44,7 +38,7 @@ interface ViteAlephaDevOptions {
     debug?: boolean;
 }
 /**
- *
+ * Plug Alepha into Vite development server.
  */
 declare function viteAlephaDev(options?: ViteAlephaDevOptions): Promise<Plugin>;
 

package/server/metrics.d.ts

@@ -1,14 +0,0 @@
-import * as _alepha_server from '@alepha/server';
-
-declare class ServerMetricsProvider {
-    private readonly register;
-    private cpuUsage;
-    private memoryUsage;
-    private gcDuration;
-    private heapUsage;
-    readonly metrics: _alepha_server.ActionDescriptor<_alepha_server.RequestConfigSchema>;
-    constructor();
-    private collectMetrics;
-}
-
-export { ServerMetricsProvider };

package/server/metrics.js

@@ -1 +0,0 @@
-export * from '@alepha/server-metrics';

package/src/server/metrics.ts

@@ -1 +0,0 @@
-export * from "@alepha/server-metrics";