@innet/server 2.0.0-beta.1 → 2.0.0-beta.3

package/README.md

@@ -1396,6 +1396,28 @@ export default (
 )
 ```
 
+#### operationId
+
+`operationId` is an optional unique string used to identify an operation.
+If provided, these IDs must be unique among all operations described in your API.
+
+Tools and libraries MAY use the operationId to uniquely identify an operation, therefore, it is recommended to follow common programming naming conventions.
+
+*src/app.tsx*
+```typescript jsx
+export default (
+  <server>
+    <api>
+      <endpoint
+        method='get'
+        path='/users'
+        operationId='getUsers'
+      />
+    </api>
+  </server>
+)
+```
+
 ### \<tag>
 
 [← back](#endpoints)

package/handler/handler.d.ts

@@ -1,4 +1,4 @@
-import { context, type ContextProps, type JSXElement, slot, type SlotProps, slots, type SlotsProps } from '@innet/jsx';
+import { type JSXElement } from '@innet/jsx';
 import { arraySync, async } from '@innet/utils';
 import { type AnyProps, type ApiProps, type ArrayProps, type BinaryProps, blacklist, type BlacklistProps, type BodyProps, type BooleanProps, cms, type CmsProps, type ContactProps, type CookieProps, type DateProps, type DtsProps, type EndpointProps, type EnvProps, type ErrorProps, type FieldProps, file, type FileProps, type HeaderProps, type HostProps, type IntegerProps, type LicenseProps, type NullProps, type NumberProps, type ObjectProps, type ParamProps, preset, type PresetProps, protection, type ProtectionProps, type ProxyProps, type RedirectProps, type ResponseProps, type ReturnProps, type ServerProps, type StringProps, type SuccessProps, type SwaggerProps, type TagProps, type TupleProps, type UuidProps, type VariableProps, whitelist, type WhitelistProps } from '../plugins';
 export declare const arrayPlugins: (typeof arraySync)[];
@@ -12,7 +12,6 @@ export declare const JSXPlugins: {
     boolean: import("innet").HandlerPlugin;
     cms: typeof cms;
     contact: import("innet").HandlerPlugin;
-    context: typeof context;
     cookie: import("innet").HandlerPlugin;
     date: import("innet").HandlerPlugin;
     dts: import("innet").HandlerPlugin;
@@ -36,8 +35,6 @@ export declare const JSXPlugins: {
     response: import("innet").HandlerPlugin;
     return: import("innet").HandlerPlugin;
     server: import("innet").HandlerPlugin;
-    slot: typeof slot;
-    slots: typeof slots;
     string: import("innet").HandlerPlugin;
     success: import("innet").HandlerPlugin;
     swagger: import("innet").HandlerPlugin;
@@ -70,7 +67,6 @@ declare global {
             boolean: BooleanProps;
             cms: CmsProps;
             contact: ContactProps;
-            context: ContextProps;
             cookie: CookieProps;
             date: DateProps;
             dts: DtsProps;
@@ -94,8 +90,6 @@ declare global {
             response: ResponseProps;
             return: ReturnProps;
             server: ServerProps;
-            slot: SlotProps;
-            slots: SlotsProps;
             string: StringProps;
             success: SuccessProps;
             swagger: SwaggerProps;

package/handler/handler.es6.js

@@ -1,5 +1,5 @@
 import { createHandler } from 'innet';
-import { context, slot, slots, jsxPlugins, jsxComponent } from '@innet/jsx';
+import { jsxPlugins, jsxComponent } from '@innet/jsx';
 import { arraySync, async, promise, array as array$1, nullish, object as object$1, fn } from '@innet/utils';
 import '../plugins/index.es6.js';
 import { any } from '../plugins/schema/any/any.es6.js';
@@ -57,7 +57,6 @@ const JSXPlugins = {
     boolean,
     cms,
     contact,
-    context,
     cookie,
     date,
     dts,
@@ -81,8 +80,6 @@ const JSXPlugins = {
     response,
     return: returnPlugin,
     server,
-    slot,
-    slots,
     string,
     success,
     swagger,

package/handler/handler.js

@@ -61,7 +61,6 @@ const JSXPlugins = {
     boolean: boolean.boolean,
     cms: cms.cms,
     contact: contact.contact,
-    context: jsx.context,
     cookie: cookie.cookie,
     date: date.date,
     dts: dts.dts,
@@ -85,8 +84,6 @@ const JSXPlugins = {
     response: response.response,
     return: _return.returnPlugin,
     server: server.server,
-    slot: jsx.slot,
-    slots: jsx.slots,
     string: string.string,
     success: success.success,
     swagger: swagger.swagger,

package/hooks/useHeaders/useHeaders.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" />
 import { type IncomingHttpHeaders } from 'http';
 export declare function useHeaders<D extends IncomingHttpHeaders>(): D;

package/hooks/useNewSchema/useNewSchema.es6.js

@@ -15,7 +15,7 @@ function useNewSchema(schema = Object.create(null)) {
         parentSchema.oneOf.push(schema);
     }
     else if (parentSchema.type || '$ref' in parentSchema) {
-        const oldSchema = Object.assign({}, parentSchema);
+        const oldSchema = { ...parentSchema };
         for (const key in parentSchema) {
             // @ts-expect-error: FIXME
             delete parentSchema[key];

package/hooks/useNewSchema/useNewSchema.js

@@ -19,7 +19,7 @@ function useNewSchema(schema = Object.create(null)) {
         parentSchema.oneOf.push(schema);
     }
     else if (parentSchema.type || '$ref' in parentSchema) {
-        const oldSchema = Object.assign({}, parentSchema);
+        const oldSchema = { ...parentSchema };
         for (const key in parentSchema) {
             // @ts-expect-error: FIXME
             delete parentSchema[key];

package/hooks/useRequest/useRequest.d.ts

@@ -1,2 +1 @@
-/// <reference types="node" />
 export declare function useRequest(): import("http").IncomingMessage;

package/hooks/useResponse/useResponse.d.ts

@@ -1,2 +1 @@
-/// <reference types="node" />
 export declare function useResponse(): import("http").ServerResponse<import("http").IncomingMessage>;

package/hooks/useSchemaType/useSchemaType.es6.js

@@ -1,12 +1,10 @@
-import { __rest } from 'tslib';
 import '../useApi/index.es6.js';
 import '../useNewSchema/index.es6.js';
 import { useApi } from '../useApi/useApi.es6.js';
 import { useNewSchema } from '../useNewSchema/useNewSchema.es6.js';
 
-function useSchemaType(type, _a = {}) {
-    var _b;
-    var { example, examples, ref, values } = _a, options = __rest(_a, ["example", "examples", "ref", "values"]);
+function useSchemaType(type, { example, examples, ref, values, ...options } = {}) {
+    var _a;
     if (ref) {
         const { docs } = useApi();
         if (!docs.components) {
@@ -18,14 +16,24 @@ function useSchemaType(type, _a = {}) {
         useNewSchema({
             $ref: `#/components/schemas/${ref}`,
         });
-        if ((_b = docs.components.schemas) === null || _b === void 0 ? void 0 : _b[ref]) {
+        if ((_a = docs.components.schemas) === null || _a === void 0 ? void 0 : _a[ref]) {
             return;
         }
-        return (docs.components.schemas[ref] = Object.assign(Object.assign({}, options), { enum: values, example,
-            examples, type: type === 'any' ? undefined : type }));
+        return (docs.components.schemas[ref] = {
+            ...options,
+            enum: values,
+            example,
+            examples,
+            type: type === 'any' ? undefined : type,
+        });
     }
-    return useNewSchema(Object.assign(Object.assign({}, options), { enum: values, example,
-        examples, type: type === 'any' ? undefined : type }));
+    return useNewSchema({
+        ...options,
+        enum: values,
+        example,
+        examples,
+        type: type === 'any' ? undefined : type,
+    });
 }
 
 export { useSchemaType };

package/hooks/useSchemaType/useSchemaType.js

@@ -2,15 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 require('../useApi/index.js');
 require('../useNewSchema/index.js');
 var useApi = require('../useApi/useApi.js');
 var useNewSchema = require('../useNewSchema/useNewSchema.js');
 
-function useSchemaType(type, _a = {}) {
-    var _b;
-    var { example, examples, ref, values } = _a, options = tslib.__rest(_a, ["example", "examples", "ref", "values"]);
+function useSchemaType(type, { example, examples, ref, values, ...options } = {}) {
+    var _a;
     if (ref) {
         const { docs } = useApi.useApi();
         if (!docs.components) {
@@ -22,14 +20,24 @@ function useSchemaType(type, _a = {}) {
         useNewSchema.useNewSchema({
             $ref: `#/components/schemas/${ref}`,
         });
-        if ((_b = docs.components.schemas) === null || _b === void 0 ? void 0 : _b[ref]) {
+        if ((_a = docs.components.schemas) === null || _a === void 0 ? void 0 : _a[ref]) {
             return;
         }
-        return (docs.components.schemas[ref] = Object.assign(Object.assign({}, options), { enum: values, example,
-            examples, type: type === 'any' ? undefined : type }));
+        return (docs.components.schemas[ref] = {
+            ...options,
+            enum: values,
+            example,
+            examples,
+            type: type === 'any' ? undefined : type,
+        });
     }
-    return useNewSchema.useNewSchema(Object.assign(Object.assign({}, options), { enum: values, example,
-        examples, type: type === 'any' ? undefined : type }));
+    return useNewSchema.useNewSchema({
+        ...options,
+        enum: values,
+        example,
+        examples,
+        type: type === 'any' ? undefined : type,
+    });
 }
 
 exports.useSchemaType = useSchemaType;

package/hooks/useServer/useServer.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { Context } from '@innet/jsx';
 import { type Server as HttpServer } from 'http';
 import { type Server as HttpsServer } from 'https';

package/index.es6.js

@@ -1,4 +1,3 @@
-import './_virtual/_rollup-plugin-process-env.es6.js';
 import './handler/index.es6.js';
 import './plugins/index.es6.js';
 import './utils/index.es6.js';

package/index.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('./_virtual/_rollup-plugin-process-env.js');
 require('./handler/index.js');
 require('./plugins/index.js');
 require('./utils/index.js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.3",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",
@@ -21,7 +21,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/d8corp/innet-server.git"
+    "url": "git+https://github.com/d8corp/innet-server.git"
   },
   "keywords": [
     "innet",
@@ -35,23 +35,23 @@
   },
   "homepage": "https://github.com/d8corp/innet-server",
   "dependencies": {
-    "@cantinc/utils": "^1.4.2",
-    "@innet/jsx": "^2.0.0-beta.2",
-    "@innet/utils": "^2.0.0-alpha.1",
-    "@types/cookie": "^0.5.1",
-    "@types/multiparty": "^0.0.33",
-    "@types/qs": "^6.9.7",
-    "cookie": "^0.5.0",
+    "@cantinc/utils": "^1.4.4",
+    "@innet/jsx": "2.0.0-beta.4",
+    "@innet/utils": "2.0.0-alpha.1",
+    "@types/cookie": "^1.0.0",
+    "@types/multiparty": "^4.2.1",
+    "@types/qs": "^6.15.0",
+    "cookie": "^1.1.1",
     "http-proxy": "^1.18.1",
-    "innet": "^2.0.0-alpha.3",
-    "mime": "^3.0.0",
+    "innet": "2.0.0-alpha.3",
+    "mime": "^4.1.0",
     "multiparty": "^4.2.3",
     "openapi-types": "^12.1.3",
-    "qs": "^6.11.2",
+    "qs": "^6.15.0",
     "request-ip": "^3.3.0",
     "string_decoder": "^1.3.0",
-    "tslib": "^2.6.1",
-    "uuid": "^9.0.0",
-    "watch-state": "^3.5.0-alpha.3"
+    "tslib": "^2.8.1",
+    "uuid": "^13.0.0",
+    "watch-state": "^3.6.2"
   }
 }

package/plugins/handler/serverFn/serverFn.es6.js

@@ -5,7 +5,7 @@ const serverFn = () => {
     return () => {
         const handler = useHandler();
         const fn = useApp();
-        new Watch(update => {
+        new Watch((update) => {
             innet(fn(update), handler);
         });
     };

package/plugins/handler/serverFn/serverFn.js

@@ -13,7 +13,7 @@ const serverFn = () => {
     return () => {
         const handler = innet.useHandler();
         const fn = innet.useApp();
-        new watchState.Watch(update => {
+        new watchState.Watch((update) => {
             innet__default["default"](fn(update), handler);
         });
     };

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

@@ -1,4 +1,3 @@
-import { __rest, __awaiter } from 'tslib';
 import innet, { useNewHandler } from 'innet';
 import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
@@ -15,8 +14,8 @@ import { paramsContext } from '../../../hooks/useParams/useParams.es6.js';
 const api = () => {
     const handler = useNewHandler();
     const props = useProps();
-    const { children, exclude, include, prefix = process.env.INNET_API_PREFIX || '', title = '', version = process.env.INNET_API_VERSION || '0.0.0' } = props, rest = __rest(props, ["children", "exclude", "include", "prefix", "title", "version"]);
-    const info = Object.assign(Object.assign({}, rest), { title, version });
+    const { children, exclude, include, prefix = process.env.INNET_API_PREFIX || '', title = '', version = process.env.INNET_API_VERSION || '0.0.0', ...rest } = props;
+    const info = { ...rest, title, version };
     const endpoints = {};
     const docs = {
         info,
@@ -38,7 +37,7 @@ const api = () => {
     };
     serverPlugins.set(handler, plugins);
     apiContext.set(handler, context);
-    useServerPlugin(() => __awaiter(void 0, void 0, void 0, function* () {
+    useServerPlugin(async () => {
         var _a, _b, _c, _d, _e, _f;
         const action = useAction();
         if (!condition(action))
@@ -62,91 +61,92 @@ const api = () => {
             const [deep, currentEndpoint, params] = endpointQueue.shift();
             const key = splitPath[deep];
             if (deep + 1 === splitPath.length) {
-                function run(runEndpoint, params) {
+                async function run(runEndpoint, params) {
                     var _a, _b, _c, _d, _e;
-                    return __awaiter(this, void 0, void 0, function* () {
-                        const pathRules = (_a = runEndpoint.rules) === null || _a === void 0 ? void 0 : _a.path;
-                        const headerRules = (_b = runEndpoint.rules) === null || _b === void 0 ? void 0 : _b.header;
-                        const cookieRules = (_c = runEndpoint.rules) === null || _c === void 0 ? void 0 : _c.cookie;
-                        const searchRules = (_d = runEndpoint.rules) === null || _d === void 0 ? void 0 : _d.search;
-                        const bodyRules = (_e = runEndpoint.rules) === null || _e === void 0 ? void 0 : _e.body;
-                        if (pathRules) {
-                            try {
-                                Object.assign(params, pathRules(params, { in: 'path' }));
-                            }
-                            catch (_f) {
-                                return false;
-                            }
+                    const pathRules = (_a = runEndpoint.rules) === null || _a === void 0 ? void 0 : _a.path;
+                    const headerRules = (_b = runEndpoint.rules) === null || _b === void 0 ? void 0 : _b.header;
+                    const cookieRules = (_c = runEndpoint.rules) === null || _c === void 0 ? void 0 : _c.cookie;
+                    const searchRules = (_d = runEndpoint.rules) === null || _d === void 0 ? void 0 : _d.search;
+                    const bodyRules = (_e = runEndpoint.rules) === null || _e === void 0 ? void 0 : _e.body;
+                    if (pathRules) {
+                        try {
+                            Object.assign(params, pathRules(params, { in: 'path' }));
                         }
-                        function checkActionRules(rules, key = 'search') {
-                            if (rules) {
-                                try {
-                                    action[key] = rules(action[key]);
-                                }
-                                catch (e) {
-                                    res.setHeader('Content-Type', 'application/json');
-                                    if (e instanceof RulesError) {
-                                        res.statusCode = 400;
-                                        res.write(JSONString({
-                                            data: Object.assign(Object.assign({}, e.data), { in: key }),
-                                            error: 'requestValidation',
-                                        }));
-                                        res.end();
-                                    }
-                                    else {
-                                        console.error(e);
-                                        res.statusCode = 500;
-                                        res.write(JSONString({
-                                            data: { in: key },
-                                            error: 'unknown',
-                                        }));
-                                        res.end();
-                                    }
-                                    return true;
-                                }
-                            }
+                        catch (_f) {
                             return false;
                         }
-                        if (checkActionRules(headerRules, 'headers'))
-                            return true;
-                        if (checkActionRules(cookieRules, 'cookies'))
-                            return true;
-                        if (checkActionRules(searchRules, 'search'))
-                            return true;
-                        if (bodyRules) {
-                            yield action.parseBody();
-                            if (!action.body) {
-                                res.statusCode = 400;
+                    }
+                    function checkActionRules(rules, key = 'search') {
+                        if (rules) {
+                            try {
+                                action[key] = rules(action[key]);
+                            }
+                            catch (e) {
                                 res.setHeader('Content-Type', 'application/json');
-                                res.write(JSONString({
-                                    error: 'requestBodyContentType',
-                                }));
-                                res.end();
+                                if (e instanceof RulesError) {
+                                    res.statusCode = 400;
+                                    res.write(JSONString({
+                                        data: {
+                                            ...e.data,
+                                            in: key,
+                                        },
+                                        error: 'requestValidation',
+                                    }));
+                                    res.end();
+                                }
+                                else {
+                                    console.error(e);
+                                    res.statusCode = 500;
+                                    res.write(JSONString({
+                                        data: { in: key },
+                                        error: 'unknown',
+                                    }));
+                                    res.end();
+                                }
                                 return true;
                             }
-                            if (checkActionRules(bodyRules, 'body'))
-                                return true;
                         }
-                        paramsContext.set(actionHandler, params);
-                        for (const plugin of runEndpoint.plugins) {
-                            const result = yield plugin();
-                            if (result === undefined)
-                                continue;
-                            innet(result, actionHandler);
+                        return false;
+                    }
+                    if (checkActionRules(headerRules, 'headers'))
+                        return true;
+                    if (checkActionRules(cookieRules, 'cookies'))
+                        return true;
+                    if (checkActionRules(searchRules, 'search'))
+                        return true;
+                    if (bodyRules) {
+                        await action.parseBody();
+                        if (!action.body) {
+                            res.statusCode = 400;
+                            res.setHeader('Content-Type', 'application/json');
+                            res.write(JSONString({
+                                error: 'requestBodyContentType',
+                            }));
+                            res.end();
                             return true;
                         }
+                        if (checkActionRules(bodyRules, 'body'))
+                            return true;
+                    }
+                    paramsContext.set(actionHandler, params);
+                    for (const plugin of runEndpoint.plugins) {
+                        const result = await plugin();
+                        if (result === undefined)
+                            continue;
+                        innet(result, actionHandler);
                         return true;
-                    });
+                    }
+                    return true;
                 }
                 if ((_d = (_c = currentEndpoint.static) === null || _c === void 0 ? void 0 : _c[key]) === null || _d === void 0 ? void 0 : _d.plugins) {
-                    if (!(yield run((_e = currentEndpoint.static) === null || _e === void 0 ? void 0 : _e[key], params)))
+                    if (!await run((_e = currentEndpoint.static) === null || _e === void 0 ? void 0 : _e[key], params))
                         continue;
                     return null;
                 }
                 if (currentEndpoint.dynamic) {
                     for (const dynamicEndpoint of currentEndpoint.dynamic) {
                         if (dynamicEndpoint.plugins) {
-                            if (!(yield run(dynamicEndpoint, Object.assign(Object.assign({}, params), { [dynamicEndpoint.key.slice(1, -1)]: key }))))
+                            if (!await run(dynamicEndpoint, { ...params, [dynamicEndpoint.key.slice(1, -1)]: key }))
                                 continue;
                             return null;
                         }
@@ -159,12 +159,12 @@ const api = () => {
             }
             if (currentEndpoint.dynamic) {
                 for (const dynamicEndpoint of currentEndpoint.dynamic) {
-                    endpointQueue.push([deep + 1, dynamicEndpoint, Object.assign(Object.assign({}, params), { [dynamicEndpoint.key.slice(1, -1)]: key })]);
+                    endpointQueue.push([deep + 1, dynamicEndpoint, { ...params, [dynamicEndpoint.key.slice(1, -1)]: key }]);
                 }
             }
         }
         for (const plugin of plugins) {
-            const result = yield plugin();
+            const result = await plugin();
             if (result === undefined)
                 continue;
             const newHandler = Object.create(handler);
@@ -172,7 +172,7 @@ const api = () => {
             innet(result, newHandler);
             return null;
         }
-    }));
+    });
     innet(children, handler);
 };