@azure-net/kit 5.0.0-3 → 5.0.0

package/dist/delivery/injectable-dependencies/AsyncHelpers.d.ts

@@ -10,6 +10,7 @@ export interface AsyncHelperRetry {
     call?: () => Promise<Error | void>;
 }
 type Action<Res> = () => Promise<Res>;
+type ErrorParser<ErrorResult extends object> = ReturnType<typeof createErrorHandler<ErrorResult>>;
 export interface AsyncActionSettings<Res = never, Req = never, ErrorResult = AppError<Error>> {
     beforeSend?: (actions: {
         next: () => void;
@@ -24,11 +25,10 @@ export interface AsyncResourceSettings<Res = never, Req = never, ErrorResult = A
 }
 export declare class AsyncHelperError extends Error {
 }
-export declare const createAsyncHelpers: <ErrorResult extends object>(opts?: {
-    handler?: ReturnType<typeof createErrorHandler<ErrorResult>>;
-}) => {
+export declare const createAsyncHelpers: <ErrorResult extends object>() => {
     createAsyncAction: <Res = never, Req = never>(action: Action<Res>, args?: AsyncActionSettings<Res, Req, ErrorResult>) => Promise<AsyncActionResponse<Res, Req, ErrorResult>>;
     createAsyncResource: <Res = never, Req_1 = never>(action: Action<Res>, args?: AsyncResourceSettings<Res, Req_1, ErrorResult>) => Promise<Res>;
     errorParser: <T = unknown>(error: Error, asyncHelperRetry?: AsyncHelperRetry) => Promise<IAppError<T> & ErrorResult>;
+    useHandler: (parser: ErrorParser<ErrorResult>) => void;
 };
 export {};

package/dist/delivery/injectable-dependencies/AsyncHelpers.js

@@ -1,9 +1,31 @@
 import { createErrorHandler } from './ErrorHandler.js';
 import {} from '../../shared/app-error/AppError.js';
+import { BROWSER } from '../../external/tools/index.js';
+import { RequestContext } from '../../external/edges/ServerContext.js';
+const HANDLER_CONTEXT_KEY = '__azureNetAsyncHelperErrorParser__';
 export class AsyncHelperError extends Error {
 }
-export const createAsyncHelpers = (opts) => {
-    const errorParser = opts?.handler ?? createErrorHandler();
+export const createAsyncHelpers = () => {
+    const defaultErrorParser = createErrorHandler();
+    let clientErrorParser;
+    const getErrorParser = () => {
+        if (BROWSER)
+            return clientErrorParser ?? defaultErrorParser;
+        try {
+            return RequestContext.current().data[HANDLER_CONTEXT_KEY] ?? defaultErrorParser;
+        }
+        catch {
+            return defaultErrorParser;
+        }
+    };
+    const errorParser = async (error, asyncHelperRetry) => await getErrorParser()(error, asyncHelperRetry);
+    const useHandler = (parser) => {
+        if (BROWSER) {
+            clientErrorParser = parser;
+            return;
+        }
+        RequestContext.current().data[HANDLER_CONTEXT_KEY] = parser;
+    };
     const normalizeError = (err) => (err instanceof Error ? err : new Error(String(err)));
     const prepareErrors = async (error, retry) => {
         let retryResult = undefined;
@@ -101,6 +123,7 @@ export const createAsyncHelpers = (opts) => {
     return {
         createAsyncAction,
         createAsyncResource,
-        errorParser
+        errorParser,
+        useHandler
     };
 };

package/dist/shared/app/index.d.ts

@@ -1,4 +1,4 @@
 export { createApp, type AppClientErrorCallback, type AppClientErrorContext, type AppClientInitLifecycleCallback, type AppClientInitLifecycleContext, type AppClientLifecycleCallback, type AppClientLifecycleContext, type AppContainer, type AppRegistrar, type AppServerErrorCallback, type AppServerErrorContext, type AppServerInitLifecycleCallback, type AppServerInitLifecycleContext, type AppServerLifecycleCallback, type AppServerLifecycleContext, type AppUniversalLifecycleCallback, type AppUniversalLifecycleContext, type CreateAppInstance } from './App.js';
 export type { IClientMiddleware } from './middleware/ClientMiddleware.js';
 export type { IServerMiddleware } from './middleware/ServerMiddleware.js';
-export type { RedirectStatus } from './middleware/Shared.js';
+export type { EnsureRoute, EnsureRouteSource, EnsureRouteTarget, RedirectStatus } from './middleware/Shared.js';

package/dist/shared/app/middleware/ClientMiddleware.d.ts

@@ -1,8 +1,9 @@
 import { type BeforeNavigate } from '@sveltejs/kit';
-import type { RedirectStatus } from './Shared.js';
+import { type EnsureRoute, type RedirectStatus } from './Shared.js';
 export type IClientMiddleware = (middlewareData: {
     to: URL;
     from?: URL;
     next: (location?: string | URL, status?: RedirectStatus) => void;
+    ensureRoute: EnsureRoute;
 }) => Promise<void> | void;
 export declare const executeClientMiddlewares: (middlewares: IClientMiddleware[], navigation?: BeforeNavigate) => Promise<void>;

package/dist/shared/app/middleware/ClientMiddleware.js

@@ -1,4 +1,5 @@
 import {} from '@sveltejs/kit';
+import { ensureRoute } from './Shared.js';
 import { page } from '$app/state';
 import { goto } from '$app/navigation';
 export const executeClientMiddlewares = async (middlewares, navigation) => {
@@ -18,7 +19,8 @@ export const executeClientMiddlewares = async (middlewares, navigation) => {
         await middleware({
             to,
             from,
-            next
+            next,
+            ensureRoute
         });
         if (!shouldContinue) {
             navigation?.cancel();

package/dist/shared/app/middleware/ServerMiddleware.d.ts

@@ -1,9 +1,10 @@
 import { type RequestEvent } from '@sveltejs/kit';
-import type { RedirectStatus } from './Shared.js';
+import { type EnsureRoute, type RedirectStatus } from './Shared.js';
 export type IServerMiddleware = (middlewareData: {
     to: RequestEvent['url'];
     from?: RequestEvent['url'];
     next: (location?: string | URL, status?: RedirectStatus) => void;
     event?: RequestEvent;
+    ensureRoute: EnsureRoute;
 }) => Promise<void> | void;
 export declare const executeServerMiddlewares: (middlewares: IServerMiddleware[]) => Promise<void>;

package/dist/shared/app/middleware/ServerMiddleware.js

@@ -1,4 +1,5 @@
 import { error, redirect } from '@sveltejs/kit';
+import { ensureRoute } from './Shared.js';
 import { BROWSER } from '../../../external/tools/index.js';
 import { RequestContext } from '../../../external/edges/ServerContext.js';
 export const executeServerMiddlewares = async (middlewares) => {
@@ -20,7 +21,8 @@ export const executeServerMiddlewares = async (middlewares) => {
                     event,
                     to,
                     from,
-                    next
+                    next,
+                    ensureRoute
                 });
                 if (!shouldContinue) {
                     error(403, 'Navigation blocked: middleware chain stopped (next() not called).');

package/dist/shared/app/middleware/Shared.d.ts

@@ -1 +1,5 @@
 export type RedirectStatus = 300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308;
+export type EnsureRouteSource = string | readonly string[];
+export type EnsureRouteTarget = string | URL;
+export type EnsureRoute = (route: EnsureRouteSource, target: EnsureRouteTarget) => boolean;
+export declare const ensureRoute: EnsureRoute;

package/dist/shared/app/middleware/Shared.js

@@ -1 +1,31 @@
-export {};
+const trimSlashes = (value) => value.replace(/^\/+|\/+$/g, '');
+const normalizePathname = (value) => {
+    const pathname = value instanceof URL ? value.pathname : value;
+    const normalized = `/${trimSlashes(pathname.split('?')[0] ?? '/')}`;
+    return normalized === '//' ? '/' : normalized;
+};
+const escapeRegex = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+const routeToRegex = (route) => {
+    const normalizedRoute = normalizePathname(route);
+    if (normalizedRoute === '/')
+        return /^\/$/;
+    const segments = trimSlashes(normalizedRoute).split('/');
+    const pattern = segments
+        .map((segment) => {
+        if (/^\{[^/{}]+\}$/.test(segment)) {
+            return '[^/]+';
+        }
+        return escapeRegex(segment).replace(/\\\{[^/{}]+\\\}/g, '[^/]+');
+    })
+        .join('\\/');
+    return new RegExp(`^\\/${pattern}$`);
+};
+export const ensureRoute = (route, target) => {
+    const pathname = normalizePathname(target);
+    const routes = Array.isArray(route) ? route : [route];
+    for (const item of routes) {
+        if (routeToRegex(item).test(pathname))
+            return true;
+    }
+    return false;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-net/kit",
-  "version": "5.0.0-3",
+  "version": "5.0.0",
   "license": "MIT",
   "author": "Pixel1917",
   "description": "Universal toolkit and library collection, developed as part of the Azure-net ecosystem",
@@ -88,6 +88,7 @@
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/svelte": "^5.3.1",
     "commitizen": "^4.3.1",
+    "env-cmd": "^11.0.0",
     "eslint": "^10.2.1",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-svelte": "^3.17.0",