alien-middleware 0.8.2 → 0.8.3

package/dist/{index-Bpx2B6hx.d.ts → index-BbUg2fQl.d.ts}

@@ -1,6 +1,22 @@
 import { Any, noop } from 'radashi';
 import { AdapterRequestContext, HattipHandler } from '@hattip/core';
 
+type Eval<T> = {} & {
+    [K in keyof T]: T[K];
+};
+type Keys<T> = T extends any ? keyof T : never;
+type IsOptional<T, K> = K extends keyof T ? T[K] extends Required<T>[K] ? false : true : true;
+type PossiblyUndefined<T, K extends keyof T> = undefined extends Required<T>[K] ? true : false;
+type MergeProperty<TSource, TOverrides, K> = (K extends keyof TOverrides ? PossiblyUndefined<TOverrides, K> extends true ? TOverrides[K] : Exclude<TOverrides[K], undefined> : never) | (IsOptional<TOverrides, K> extends true ? K extends keyof TSource ? TSource[K] : undefined : never) extends infer TProperty ? TProperty : never;
+/**
+ * Merge a union of object types (possibly undefined) into a single object type.
+ *
+ * **FIXME:** Optional properties resolve as `foo: Foo | undefined` instead of `foo?: Foo`.
+ */
+type Merge<TSource extends object, TOverrides extends object | undefined> = {} & Eval<Omit<TSource, Keys<TOverrides>> & {
+    [K in Keys<TOverrides>]: TOverrides extends any ? MergeProperty<TSource, TOverrides, K> : never;
+}>;
+
 type RequestEnvPlugin = {
     /**
      * Add type-safe environment variables. These are accessed with the `env()`
@@ -72,16 +88,18 @@ type Middleware<TEnv extends object = any, TProperties extends object = any, TPl
  * Extract a `Middleware` type from a `MiddlewareChain` type.
  */
 type ExtractMiddleware<T extends MiddlewareChain> = Middleware<Env<T>, Properties<T>, Platform<T>>;
-type Merge<TSource extends object, TOverrides extends object | undefined> = {} & (TOverrides extends object ? {
-    [K in keyof TSource | keyof TOverrides]: K extends keyof TOverrides ? TOverrides[K] : K extends keyof TSource ? TSource[K] : never;
-} : TSource);
-type ApplyRequestPlugin<TParent extends MiddlewareChain, TPlugin extends RequestPlugin> = {} & MiddlewareTypes<Merge<Env<TParent>, TPlugin['env']>, Merge<Properties<TParent>, Omit<TPlugin, keyof RequestEnvPlugin>>>;
+/**
+ * Merge a request plugin into a middleware chain.
+ */
+type ApplyMiddlewareResult<TParent extends MiddlewareChain, TResult> = {} & MiddlewareTypes<Merge<Env<TParent>, TResult extends {
+    env: infer TEnv extends object | undefined;
+} ? TEnv : undefined>, Merge<Properties<TParent>, TResult extends RequestPlugin ? Omit<TResult, keyof RequestEnvPlugin> : undefined>>;
 /**
  * This applies a middleware to a chain. If the type `TMiddleware` is itself a
  * chain, it's treated as a nested chain, which won't leak its plugins into the
  * parent chain.
  */
-type ApplyMiddleware<TFirst extends MiddlewareChain, TSecond extends Middleware<Env<TFirst>, Properties<TFirst>, Platform<TFirst>>> = RequestHandler<Inputs<TFirst>, TSecond extends MiddlewareChain ? MiddlewareTypes<Merge<Env<TFirst>, Env<TSecond>>, Merge<Properties<TFirst>, Properties<TSecond>>> : TSecond extends (...args: any[]) => Awaitable<infer TResult> ? TResult extends RequestPlugin ? ApplyRequestPlugin<TFirst, TResult> : Current<TFirst> : Current<TFirst>, Platform<TFirst>>;
+type ApplyMiddleware<TFirst extends MiddlewareChain, TSecond extends Middleware<Env<TFirst>, Properties<TFirst>, Platform<TFirst>>> = RequestHandler<Inputs<TFirst>, TSecond extends MiddlewareChain ? MiddlewareTypes<Merge<Env<TFirst>, Env<TSecond>>, Merge<Properties<TFirst>, Properties<TSecond>>> : TSecond extends (...args: any[]) => Awaitable<infer TResult> ? ApplyMiddlewareResult<TFirst, TResult> : Current<TFirst>, Platform<TFirst>>;
 type EmptyMiddlewareChain = MiddlewareChain<MiddlewareTypes<{}, {}>, MiddlewareTypes<{}, {}>, unknown>;
 type ApplyFirstMiddleware<T extends Middleware> = T extends MiddlewareChain ? T : ApplyMiddleware<EmptyMiddlewareChain, T>;
 type RouteMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS' | 'HEAD';

package/dist/index.d.ts

@@ -1,3 +1,3 @@
 import 'radashi';
-export { A as ApplyMiddleware, e as ExtractMiddleware, f as Middleware, M as MiddlewareChain, a as MiddlewareContext, g as RequestContext, h as RequestHandler, i as RequestMiddleware, j as RequestPlugin, k as ResponseMiddleware, d as chain } from './index-Bpx2B6hx.js';
+export { A as ApplyMiddleware, e as ExtractMiddleware, f as Middleware, M as MiddlewareChain, a as MiddlewareContext, g as RequestContext, h as RequestHandler, i as RequestMiddleware, j as RequestPlugin, k as ResponseMiddleware, d as chain } from './index-BbUg2fQl.js';
 import '@hattip/core';

package/dist/router.d.ts

@@ -1,6 +1,6 @@
 import { InferParams } from 'pathic';
-import { M as MiddlewareChain, E as EmptyMiddlewareChain, a as MiddlewareContext, R as RouteHandler, b as RouteMethod } from './index-Bpx2B6hx.js';
-export { c as RouterContext } from './index-Bpx2B6hx.js';
+import { M as MiddlewareChain, E as EmptyMiddlewareChain, a as MiddlewareContext, R as RouteHandler, b as RouteMethod } from './index-BbUg2fQl.js';
+export { c as RouterContext } from './index-BbUg2fQl.js';
 import 'radashi';
 import '@hattip/core';
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "alien-middleware",
   "type": "module",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",