@tstdl/base 0.71.25 → 0.71.28

package/api/server/middlewares/cors.middleware.js

@@ -1,39 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.corsMiddleware = void 0;
+const types_1 = require("../../types");
 const type_guards_1 = require("../../../utils/type-guards");
 // eslint-disable-next-line max-statements
 async function corsMiddleware(request, next, context) {
-    var _a;
+    var _a, _b;
     const response = await next(request);
-    const corses = [...context.api.endpoints.values()]
-        .map((endpoint) => endpoint.definition.cors)
-        .filter(type_guards_1.isDefined);
-    if (corses.length == 0) {
+    const requestMethod = request.headers.tryGetSingle('Access-Control-Request-Method');
+    const cors = (_a = context.api.endpoints.get(requestMethod)) === null || _a === void 0 ? void 0 : _a.definition.cors;
+    if ((0, type_guards_1.isUndefined)(cors)) {
         return response;
     }
-    if (corses.length > 1) {
-        throw new Error('cors can only be defined once per resource');
-    }
-    const cors = corses[0];
     if (request.method == 'OPTIONS') {
-        const allowMethods = [...context.api.endpoints.keys()].join(', ');
-        response.headers.setIfMissing('Access-Control-Allow-Methods', (_a = cors.accessControlAllowMethods) !== null && _a !== void 0 ? _a : allowMethods);
-        if (cors.accessControlAllowCredentials == true) {
+        const allowMethods = (_b = (await (0, types_1.resolveApiEndpointDataProvider)(request, context, cors.accessControlAllowMethods))) !== null && _b !== void 0 ? _b : [...context.api.endpoints.keys()].join(', ');
+        const allowCredentials = (0, type_guards_1.isDefined)(cors.accessControlAllowCredentials) && (await (0, types_1.resolveApiEndpointDataProvider)(request, context, cors.accessControlAllowCredentials));
+        response.headers.setIfMissing('Access-Control-Allow-Methods', allowMethods);
+        if (allowCredentials) {
             response.headers.setIfMissing('Access-Control-Allow-Credentials', 'true');
         }
         if ((0, type_guards_1.isDefined)(cors.accessControlAllowHeaders)) {
-            response.headers.setIfMissing('Access-Control-Allow-Headers', cors.accessControlAllowHeaders);
+            const value = await (0, types_1.resolveApiEndpointDataProvider)(request, context, cors.accessControlAllowHeaders);
+            response.headers.setIfMissing('Access-Control-Allow-Headers', value);
         }
         if ((0, type_guards_1.isDefined)(cors.accessControlExposeHeaders)) {
-            response.headers.setIfMissing('Access-Control-Expose-Headers', cors.accessControlExposeHeaders);
+            const value = await (0, types_1.resolveApiEndpointDataProvider)(request, context, cors.accessControlExposeHeaders);
+            response.headers.setIfMissing('Access-Control-Expose-Headers', value);
         }
         if ((0, type_guards_1.isDefined)(cors.accessControlMaxAge)) {
-            response.headers.setIfMissing('Access-Control-Max-Age', cors.accessControlMaxAge);
+            const value = await (0, types_1.resolveApiEndpointDataProvider)(request, context, cors.accessControlMaxAge);
+            response.headers.setIfMissing('Access-Control-Max-Age', value);
         }
     }
     if ((0, type_guards_1.isDefined)(cors.accessControlAllowOrigin)) {
-        response.headers.setIfMissing('Access-Control-Allow-Origin', cors.accessControlAllowOrigin);
+        const value = await (0, types_1.resolveApiEndpointDataProvider)(request, context, cors.accessControlAllowOrigin);
+        response.headers.setIfMissing('Access-Control-Allow-Origin', value);
     }
     return response;
 }

package/api/server/middlewares/cors.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"cors.middleware.js","sourceRoot":"","sources":["../../../../source/api/server/middlewares/cors.middleware.ts"],"names":[],"mappings":";;;AAEA,4DAAgD;AAGhD,0CAA0C;AACnC,KAAK,UAAU,cAAc,CAAC,OAA0B,EAAE,IAAgE,EAAE,OAAoC;;IACrK,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;IAErC,MAAM,MAAM,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;SAC/C,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC;SAC3C,MAAM,CAAC,uBAAS,CAAC,CAAC;IAErB,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;QACtB,OAAO,QAAQ,CAAC;KACjB;IAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;KAC/D;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC;IAExB,IAAI,OAAO,CAAC,MAAM,IAAI,SAAS,EAAE;QAC/B,MAAM,YAAY,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClE,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,8BAA8B,EAAE,MAAA,IAAI,CAAC,yBAAyB,mCAAI,YAAY,CAAC,CAAC;QAE9G,IAAI,IAAI,CAAC,6BAA6B,IAAI,IAAI,EAAE;YAC9C,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,kCAAkC,EAAE,MAAM,CAAC,CAAC;SAC3E;QAED,IAAI,IAAA,uBAAS,EAAC,IAAI,CAAC,yBAAyB,CAAC,EAAE;YAC7C,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,8BAA8B,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAC;SAC/F;QAED,IAAI,IAAA,uBAAS,EAAC,IAAI,CAAC,0BAA0B,CAAC,EAAE;YAC9C,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,+BAA+B,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;SACjG;QAED,IAAI,IAAA,uBAAS,EAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE;YACvC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,wBAAwB,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;SACnF;KACF;IAED,IAAI,IAAA,uBAAS,EAAC,IAAI,CAAC,wBAAwB,CAAC,EAAE;QAC5C,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,6BAA6B,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;KAC7F;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AA3CD,wCA2CC"}
+{"version":3,"file":"cors.middleware.js","sourceRoot":"","sources":["../../../../source/api/server/middlewares/cors.middleware.ts"],"names":[],"mappings":";;;AACA,uCAA6D;AAG7D,4DAA6D;AAG7D,0CAA0C;AACnC,KAAK,UAAU,cAAc,CAAC,OAA0B,EAAE,IAAgE,EAAE,OAAoC;;IACrK,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;IAErC,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,+BAA+B,CAAC,CAAC;IACpF,MAAM,IAAI,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,aAAkC,CAAC,0CAAE,UAAU,CAAC,IAAI,CAAC;IAE5F,IAAI,IAAA,yBAAW,EAAC,IAAI,CAAC,EAAE;QACrB,OAAO,QAAQ,CAAC;KACjB;IAED,IAAI,OAAO,CAAC,MAAM,IAAI,SAAS,EAAE;QAC/B,MAAM,YAAY,GAAG,MAAA,CAAC,MAAM,IAAA,sCAA8B,EAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAC,mCAAI,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9J,MAAM,gBAAgB,GAAG,IAAA,uBAAS,EAAC,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,MAAM,IAAA,sCAA8B,EAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,6BAA6B,CAAC,CAAC,CAAC;QAEvK,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,8BAA8B,EAAE,YAAY,CAAC,CAAC;QAE5E,IAAI,gBAAgB,EAAE;YACpB,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,kCAAkC,EAAE,MAAM,CAAC,CAAC;SAC3E;QAED,IAAI,IAAA,uBAAS,EAAC,IAAI,CAAC,yBAAyB,CAAC,EAAE;YAC7C,MAAM,KAAK,GAAG,MAAM,IAAA,sCAA8B,EAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAC;YACrG,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;SACtE;QAED,IAAI,IAAA,uBAAS,EAAC,IAAI,CAAC,0BAA0B,CAAC,EAAE;YAC9C,MAAM,KAAK,GAAG,MAAM,IAAA,sCAA8B,EAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACtG,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;SACvE;QAED,IAAI,IAAA,uBAAS,EAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE;YACvC,MAAM,KAAK,GAAG,MAAM,IAAA,sCAA8B,EAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAC/F,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;SAChE;KACF;IAED,IAAI,IAAA,uBAAS,EAAC,IAAI,CAAC,wBAAwB,CAAC,EAAE;QAC5C,MAAM,KAAK,GAAG,MAAM,IAAA,sCAA8B,EAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACpG,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;KACrE;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AA1CD,wCA0CC"}

package/api/types.d.ts

@@ -2,6 +2,7 @@ import type { HttpServerRequest, HttpServerResponse } from "../http/server";
 import type { HttpMethod } from "../http/types";
 import type { ObjectSchemaValidator, SchemaInput, SchemaOutput, SchemaValidator, StringSchemaValidator, Uint8ArraySchemaValidator } from "../schema";
 import type { NonUndefinable, OneOrMany, Record } from "../types";
+import type { ApiGatewayMiddlewareContext } from './server';
 export declare const rootResource = "$";
 export declare type ApiRegistrationOptions = {
     name?: string;
@@ -20,13 +21,14 @@ export declare type EndpointRegistrationOptions = {
 export declare type ApiEndpointMethod = HttpMethod;
 export declare type ApiEndpointDefinitionBody = StringSchemaValidator | ObjectSchemaValidator<any> | Uint8ArraySchemaValidator;
 export declare type ApiEndpointDefinitionResult = SchemaValidator;
+export declare type ApiEndpointDataProvider<T> = T | ((request: HttpServerRequest, context: ApiGatewayMiddlewareContext) => T | Promise<T>);
 export declare type ApiEndpointDefinitionCors = {
-    accessControlAllowCredentials?: boolean;
-    accessControlAllowHeaders?: OneOrMany<string>;
-    accessControlAllowMethods?: OneOrMany<HttpMethod>;
-    accessControlAllowOrigin?: string;
-    accessControlExposeHeaders?: OneOrMany<string>;
-    accessControlMaxAge?: number;
+    accessControlAllowCredentials?: ApiEndpointDataProvider<boolean>;
+    accessControlAllowHeaders?: ApiEndpointDataProvider<OneOrMany<string>>;
+    accessControlAllowMethods?: ApiEndpointDataProvider<OneOrMany<HttpMethod>>;
+    accessControlAllowOrigin?: ApiEndpointDataProvider<string>;
+    accessControlExposeHeaders?: ApiEndpointDataProvider<OneOrMany<string>>;
+    accessControlMaxAge?: ApiEndpointDataProvider<number>;
 };
 export declare type ApiEndpointDefinition = {
     method?: OneOrMany<ApiEndpointMethod>;
@@ -68,3 +70,4 @@ export declare type ApiClientImplementation<T extends ApiDefinition = any> = {
     [P in ApiEndpointKeys<T>]: ApiEndpointClientImplementation<T, P>;
 };
 export declare function defineApi<T extends ApiDefinition>(definition: T): T;
+export declare function resolveApiEndpointDataProvider<T>(request: HttpServerRequest, context: ApiGatewayMiddlewareContext, provider: ApiEndpointDataProvider<T>): Promise<T>;

package/api/types.js

@@ -1,9 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineApi = exports.rootResource = void 0;
+exports.resolveApiEndpointDataProvider = exports.defineApi = exports.rootResource = void 0;
+const type_guards_1 = require("../utils/type-guards");
 exports.rootResource = '$';
 function defineApi(definition) {
     return definition;
 }
 exports.defineApi = defineApi;
+async function resolveApiEndpointDataProvider(request, context, provider) {
+    if ((0, type_guards_1.isFunction)(provider)) {
+        return provider(request, context);
+    }
+    return provider;
+}
+exports.resolveApiEndpointDataProvider = resolveApiEndpointDataProvider;
 //# sourceMappingURL=types.js.map

package/api/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../source/api/types.ts"],"names":[],"mappings":";;;AAKa,QAAA,YAAY,GAAG,GAAG,CAAC;AA2FhC,SAAgB,SAAS,CAA0B,UAAa;IAC9D,OAAO,UAAU,CAAC;AACpB,CAAC;AAFD,8BAEC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../source/api/types.ts"],"names":[],"mappings":";;;AAIA,sDAAiD;AAGpC,QAAA,YAAY,GAAG,GAAG,CAAC;AA6FhC,SAAgB,SAAS,CAA0B,UAAa;IAC9D,OAAO,UAAU,CAAC;AACpB,CAAC;AAFD,8BAEC;AAEM,KAAK,UAAU,8BAA8B,CAAI,OAA0B,EAAE,OAAoC,EAAE,QAAoC;IAC5J,IAAI,IAAA,wBAAU,EAAC,QAAQ,CAAC,EAAE;QACxB,OAAO,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;KACnC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAND,wEAMC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.71.25",
+  "version": "0.71.28",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -26,8 +26,8 @@
     "@types/node": ">=16",
     "@types/nodemailer": "^6.4.4",
     "@types/yup": "0.29",
-    "@typescript-eslint/eslint-plugin": "5.23",
-    "@typescript-eslint/parser": "5.23",
+    "@typescript-eslint/eslint-plugin": "5.24",
+    "@typescript-eslint/parser": "5.24",
     "eslint": "8.15",
     "ttypescript": "1.5",
     "typedoc": "0.22",
@@ -35,7 +35,7 @@
     "typescript-transform-paths": "3.3"
   },
   "peerDependencies": {
-    "@elastic/elasticsearch": "^8.2",
+    "@elastic/elasticsearch": "^8.2.0-patch.1",
     "@koa/router": "^10.1",
     "@tstdl/angular": "^0.10",
     "chroma-js": "^2.4",