@aeriajs/server 0.0.273 → 0.0.275

package/dist/constants.d.ts

@@ -3,6 +3,12 @@ export declare const DEFAULT_API_CONFIG: {
     defaultPaginationLimit: number;
     server: {
         port: number;
+        cors: {
+            allowOrigin: string[];
+            allowMethods: string[];
+            allowHeaders: string[];
+            maxAge: string;
+        };
     };
     security: {
         tokenExpiration: number;

package/dist/constants.js

@@ -6,6 +6,22 @@ exports.DEFAULT_API_CONFIG = {
     defaultPaginationLimit: 10,
     server: {
         port: 3000,
+        cors: {
+            allowOrigin: ['*'],
+            allowMethods: ['*'],
+            allowHeaders: [
+                'Accept',
+                'Accept-Version',
+                'Authorization',
+                'Content-Length',
+                'Content-MD5',
+                'Content-Type',
+                'Date',
+                'X-Api-Version',
+                'X-Stream-Request',
+            ],
+            maxAge: '2592000',
+        },
     },
     security: {
         tokenExpiration: 36000,

package/dist/constants.mjs

@@ -3,7 +3,23 @@ export const DEFAULT_API_CONFIG = {
   baseUrl: "/",
   defaultPaginationLimit: 10,
   server: {
-    port: 3e3
+    port: 3e3,
+    cors: {
+      allowOrigin: ["*"],
+      allowMethods: ["*"],
+      allowHeaders: [
+        "Accept",
+        "Accept-Version",
+        "Authorization",
+        "Content-Length",
+        "Content-MD5",
+        "Content-Type",
+        "Date",
+        "X-Api-Version",
+        "X-Stream-Request"
+      ],
+      maxAge: "2592000"
+    }
   },
   security: {
     tokenExpiration: 36e3,

package/dist/init.d.ts

@@ -1,7 +1,7 @@
 import type { RouteContext, Collection, GenericRequest, ApiConfig, AuthenticatedToken, NonCircularJsonSchema } from '@aeriajs/types';
 import { type createRouter } from '@aeriajs/http';
 import { DEFAULT_API_CONFIG } from './constants.js';
-type DeepPartial<T> = T extends object ? {
+type DeepPartial<T> = T extends Record<string, unknown> ? {
     [P in keyof T]?: DeepPartial<T[P]>;
 } : T;
 export type InitApiConfig = Omit<ApiConfig, keyof typeof DEFAULT_API_CONFIG> & DeepPartial<Pick<ApiConfig, keyof typeof DEFAULT_API_CONFIG>>;

package/dist/init.js

@@ -67,26 +67,28 @@ const init = (_options = {}) => {
     const options = Object.assign({
         config: {},
     }, _options);
-    Object.assign(options.config, (0, common_1.deepMerge)(constants_js_1.DEFAULT_API_CONFIG, options.config));
+    const config = Object.assign(options.config, (0, common_1.deepMerge)(constants_js_1.DEFAULT_API_CONFIG, options.config));
     return {
         options,
         listen: async () => {
-            if (!options.config.server) {
+            if (!config.server) {
                 throw new Error;
             }
             const parentContext = await (0, core_1.createContext)({
-                config: options.config,
+                config,
             });
             if (options.setup) {
                 await options.setup(parentContext);
             }
-            if (!options.config.server.noWarmup) {
+            if (!config.server.noWarmup) {
                 await (0, warmup_js_1.warmup)();
             }
             const apiRouter = (0, routes_js_1.registerRoutes)();
-            const server = (0, node_http_1.registerServer)(options.config.server, async (request, response) => {
-                if ((0, http_1.cors)(request, response) === null) {
-                    return;
+            const server = (0, node_http_1.registerServer)(config.server, async (request, response) => {
+                if (config.server && config.server.cors) {
+                    if ((0, http_1.cors)(request, response, config.server.cors) === null) {
+                        return;
+                    }
                 }
                 await (0, http_1.wrapRouteExecution)(response, async () => {
                     const { error, result: token } = await (0, exports.getToken)(request, parentContext);
@@ -114,7 +116,7 @@ const init = (_options = {}) => {
                     return apiRouter.handle(request, response, context);
                 });
             });
-            if (!options.config.database?.noDatabase) {
+            if (!config.database?.noDatabase) {
                 await (0, core_1.getDatabase)();
             }
             server.listen();

package/dist/init.mjs

@@ -61,26 +61,28 @@ export const init = (_options = {}) => {
   const options = Object.assign({
     config: {}
   }, _options);
-  Object.assign(options.config, deepMerge(DEFAULT_API_CONFIG, options.config));
+  const config = Object.assign(options.config, deepMerge(DEFAULT_API_CONFIG, options.config));
   return {
     options,
     listen: async () => {
-      if (!options.config.server) {
+      if (!config.server) {
         throw new Error();
       }
       const parentContext = await createContext({
-        config: options.config
+        config
       });
       if (options.setup) {
         await options.setup(parentContext);
       }
-      if (!options.config.server.noWarmup) {
+      if (!config.server.noWarmup) {
         await warmup();
       }
       const apiRouter = registerRoutes();
-      const server = registerServer(options.config.server, async (request, response) => {
-        if (cors(request, response) === null) {
-          return;
+      const server = registerServer(config.server, async (request, response) => {
+        if (config.server && config.server.cors) {
+          if (cors(request, response, config.server.cors) === null) {
+            return;
+          }
         }
         await wrapRouteExecution(response, async () => {
           const { error, result: token } = await getToken(request, parentContext);
@@ -108,7 +110,7 @@ export const init = (_options = {}) => {
           return apiRouter.handle(request, response, context);
         });
       });
-      if (!options.config.database?.noDatabase) {
+      if (!config.database?.noDatabase) {
         await getDatabase();
       }
       server.listen();

package/dist/routes.d.ts

@@ -6,10 +6,10 @@ export declare const registerRoutes: () => import("@aeriajs/http").ProxiedRouter
         request: Omit<import("@aeriajs/types").GenericRequest, "payload" | "query"> & {
             payload: TContractWithRoles extends {
                 payload: infer Payload;
-            } ? import("@aeriajs/types").PackReferences<import("@aeriajs/types").InferProperties<Payload>> : Record<string, unknown>;
+            } ? import("@aeriajs/types").PackReferences<import("@aeriajs/types").InferProperties<Payload, {}>> : Record<string, unknown>;
             query: TContractWithRoles extends {
                 query: infer Query;
-            } ? import("@aeriajs/types").PackReferences<import("@aeriajs/types").InferProperties<Query>> : Record<string, unknown>;
+            } ? import("@aeriajs/types").PackReferences<import("@aeriajs/types").InferProperties<Query, {}>> : Record<string, unknown>;
         };
     }) => Response : never>(method: import("@aeriajs/types").RequestMethod | import("@aeriajs/types").RequestMethod[], exp: import("@aeriajs/types").RouteUri, cb: TCallback, contract?: TContractWithRoles) => void;
     routes: ((_: unknown, context: RouteContext, groupOptions?: import("@aeriajs/http").RouteGroupOptions) => unknown)[];

package/dist/warmup.js

@@ -10,7 +10,7 @@ const colorizedRoute = async (method, endpointUri, endpoint) => {
     const color = method in types_1.METHOD_COLORS
         ? types_1.METHOD_COLORS[method]
         : 'white';
-    let rolesLine = '', hasContractLine = (0, node_util_1.styleText)('yellow', 'x');
+    let rolesLine = '', hasContractLine = (0, node_util_1.styleText)(['yellow'], 'x');
     if (endpoint) {
         if ('roles' in endpoint) {
             const roles = await (async () => {
@@ -25,10 +25,10 @@ const colorizedRoute = async (method, endpointUri, endpoint) => {
                 }
                 return endpoint.roles;
             })();
-            rolesLine = ` ${(0, node_util_1.styleText)('grey', `[${roles.join('|')}]`)}`;
+            rolesLine = ` ${(0, node_util_1.styleText)(['grey'], `[${roles.join('|')}]`)}`;
         }
         if ('response' in endpoint || endpoint.builtin) {
-            hasContractLine = (0, node_util_1.styleText)('green', '✓');
+            hasContractLine = (0, node_util_1.styleText)(['green'], '✓');
         }
     }
     let line = (0, node_util_1.styleText)([
@@ -36,10 +36,10 @@ const colorizedRoute = async (method, endpointUri, endpoint) => {
         color,
     ], method) + '\t';
     line += hasContractLine;
-    line += (0, node_util_1.styleText)('grey', ` ${config.baseUrl === '/'
+    line += (0, node_util_1.styleText)(['grey'], ` ${config.baseUrl === '/'
         ? ''
         : config.baseUrl}`);
-    line += (0, node_util_1.styleText)('bold', endpointUri);
+    line += (0, node_util_1.styleText)(['bold'], endpointUri);
     line += rolesLine;
     return line;
 };

package/dist/warmup.mjs

@@ -6,7 +6,7 @@ import { styleText } from "node:util";
 const colorizedRoute = async (method, endpointUri, endpoint) => {
   const config = await getConfig();
   const color = method in METHOD_COLORS ? METHOD_COLORS[method] : "white";
-  let rolesLine = "", hasContractLine = styleText("yellow", "x");
+  let rolesLine = "", hasContractLine = styleText(["yellow"], "x");
   if (endpoint) {
     if ("roles" in endpoint) {
       const roles = await (async () => {
@@ -24,10 +24,10 @@ const colorizedRoute = async (method, endpointUri, endpoint) => {
         }
         return endpoint.roles;
       })();
-      rolesLine = ` ${styleText("grey", `[${roles.join("|")}]`)}`;
+      rolesLine = ` ${styleText(["grey"], `[${roles.join("|")}]`)}`;
     }
     if ("response" in endpoint || endpoint.builtin) {
-      hasContractLine = styleText("green", "\u2713");
+      hasContractLine = styleText(["green"], "\u2713");
     }
   }
   let line = styleText([
@@ -35,8 +35,8 @@ const colorizedRoute = async (method, endpointUri, endpoint) => {
     color
   ], method) + "	";
   line += hasContractLine;
-  line += styleText("grey", ` ${config.baseUrl === "/" ? "" : config.baseUrl}`);
-  line += styleText("bold", endpointUri);
+  line += styleText(["grey"], ` ${config.baseUrl === "/" ? "" : config.baseUrl}`);
+  line += styleText(["bold"], endpointUri);
   line += rolesLine;
   return line;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/server",
-  "version": "0.0.273",
+  "version": "0.0.275",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -33,14 +33,14 @@
     "mongodb": "^6.17.0"
   },
   "peerDependencies": {
-    "@aeriajs/core": "^0.0.271",
-    "@aeriajs/builtins": "^0.0.271",
-    "@aeriajs/common": "^0.0.153",
-    "@aeriajs/entrypoint": "^0.0.159",
-    "@aeriajs/http": "^0.0.187",
-    "@aeriajs/node-http": "^0.0.187",
-    "@aeriajs/server": "^0.0.273",
-    "@aeriajs/types": "^0.0.131",
+    "@aeriajs/core": "^0.0.273",
+    "@aeriajs/builtins": "^0.0.273",
+    "@aeriajs/common": "^0.0.155",
+    "@aeriajs/entrypoint": "^0.0.161",
+    "@aeriajs/http": "^0.0.189",
+    "@aeriajs/node-http": "^0.0.189",
+    "@aeriajs/server": "^0.0.275",
+    "@aeriajs/types": "^0.0.133",
     "mongodb": "^6.17.0"
   },
   "scripts": {