@innet/server 2.0.0-beta.11 → 2.0.0-beta.13

package/hooks/useApi/useApi.d.ts

@@ -1,10 +1,12 @@
 import { Context } from '@innet/jsx';
+import { type ApiProps } from '../../plugins';
 import { type Document, type Endpoints } from '../../types';
 import { type Rule } from '../../utils';
 export interface ApiContext {
     docs: Document;
     endpoints: Endpoints;
     prefix: string;
+    props: ApiProps;
     refRules: Record<string, Rule>;
 }
 export declare const apiContext: Context<ApiContext, ApiContext | undefined>;

package/hooks/useSchemaType/useSchemaType.es6.js

@@ -30,9 +30,7 @@ function useSchemaType(type, { example, examples, ref, values, ...options } = {}
     const arrayValues = values ? Array.isArray(values) ? values : Object.keys(values) : values;
     const enumDescription = values && !Array.isArray(values)
         ? {
-            'x-enum-descriptions': values,
-            'x-enumDescriptions': values,
-            'x-enumNames': values,
+            [process.env.INNET_API_ENUM_DESCRIPTION_KEY || 'x-enumNames']: values,
         }
         : {};
     return useNewSchema({

package/hooks/useSchemaType/useSchemaType.js

@@ -34,9 +34,7 @@ function useSchemaType(type, { example, examples, ref, values, ...options } = {}
     const arrayValues = values ? Array.isArray(values) ? values : Object.keys(values) : values;
     const enumDescription = values && !Array.isArray(values)
         ? {
-            'x-enum-descriptions': values,
-            'x-enumDescriptions': values,
-            'x-enumNames': values,
+            [process.env.INNET_API_ENUM_DESCRIPTION_KEY || 'x-enumNames']: values,
         }
         : {};
     return useNewSchema.useNewSchema({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "2.0.0-beta.11",
+  "version": "2.0.0-beta.13",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",
@@ -44,7 +44,7 @@
     "@types/qs": "^6.15.0",
     "cookie": "^1.1.1",
     "http-proxy": "^1.18.1",
-    "innet": "^2.1.0",
+    "innet": "^2.1.1",
     "mime": "^4.1.0",
     "multiparty": "^4.2.3",
     "openapi-types": "^12.1.3",

package/plugins/main/api/api.es6.js

@@ -1,4 +1,4 @@
-import { useNewHandler, innet } from 'innet';
+import { useNewHandler, useApp, innet, net } from 'innet';
 import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
@@ -23,7 +23,7 @@ const api = () => {
         paths: {},
     };
     const plugins = new Set();
-    const context = { docs, endpoints, prefix, refRules: {} };
+    const context = { docs, endpoints, prefix, props, refRules: {} };
     const condition = (action) => {
         const path = action.parsedUrl.path;
         const url = path.endsWith('/') ? path.slice(0, -1) : path;
@@ -39,6 +39,7 @@ const api = () => {
     apiContext.set(handler, context);
     useServerPlugin(async () => {
         var _a, _b, _c, _d, _e, _f;
+        const app = useApp();
         const action = useAction();
         if (!condition(action))
             return;
@@ -164,11 +165,11 @@ const api = () => {
             }
         }
         for (const plugin of plugins) {
-            const result = await plugin();
-            if (result === undefined)
-                continue;
             const newHandler = Object.create(handler);
             actionContext.set(newHandler, action);
+            const result = await net(plugin, app, newHandler);
+            if (result === undefined)
+                continue;
             innet(result, newHandler);
             return null;
         }

package/plugins/main/api/api.js

@@ -27,7 +27,7 @@ const api = () => {
         paths: {},
     };
     const plugins = new Set();
-    const context = { docs, endpoints, prefix, refRules: {} };
+    const context = { docs, endpoints, prefix, props, refRules: {} };
     const condition = (action) => {
         const path = action.parsedUrl.path;
         const url = path.endsWith('/') ? path.slice(0, -1) : path;
@@ -43,6 +43,7 @@ const api = () => {
     useApi.apiContext.set(handler, context);
     useServerPlugin.useServerPlugin(async () => {
         var _a, _b, _c, _d, _e, _f;
+        const app = innet.useApp();
         const action = useAction.useAction();
         if (!condition(action))
             return;
@@ -168,11 +169,11 @@ const api = () => {
             }
         }
         for (const plugin of plugins) {
-            const result = await plugin();
-            if (result === undefined)
-                continue;
             const newHandler = Object.create(handler);
             useAction.actionContext.set(newHandler, action);
+            const result = await innet.net(plugin, app, newHandler);
+            if (result === undefined)
+                continue;
             innet.innet(result, newHandler);
             return null;
         }

package/plugins/main/server/server.es6.js

@@ -1,4 +1,4 @@
-import { useNewHandler, innet } from 'innet';
+import { useNewHandler, useApp, useHandler, net, innet } from 'innet';
 import { useProps } from '@innet/jsx';
 import fs from 'node:fs';
 import http from 'node:http';
@@ -56,8 +56,10 @@ const server = () => {
         actionContext.set(requestHandler, action);
         requestHandlerContext.set(requestHandler, requestHandler);
         async function server() {
+            const app = useApp();
+            const handler = useHandler();
             for (const plugin of plugins) {
-                const result = await plugin();
+                const result = await net(plugin, app, handler);
                 if (result !== undefined) {
                     return result;
                 }

package/plugins/main/server/server.js

@@ -66,8 +66,10 @@ const server = () => {
         useAction.actionContext.set(requestHandler, action);
         useRequestHandler.requestHandlerContext.set(requestHandler, requestHandler);
         async function server() {
+            const app = innet.useApp();
+            const handler = innet.useHandler();
             for (const plugin of plugins) {
-                const result = await plugin();
+                const result = await innet.net(plugin, app, handler);
                 if (result !== undefined) {
                     return result;
                 }