@grandlinex/kernel 1.1.1 → 1.2.1

package/dist/cjs/actions/ApiAuthTestAction.js

@@ -8,7 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 const swagger_mate_1 = require("@grandlinex/swagger-mate");
 const index_js_1 = require("../classes/index.js");
-const index_js_2 = require("../annotation/index.js");
 let ApiAuthTestAction = class ApiAuthTestAction extends index_js_1.RouteApiAction {
     async handler({ data, res }) {
         this.debug(data.userid);
@@ -16,16 +15,11 @@ let ApiAuthTestAction = class ApiAuthTestAction extends index_js_1.RouteApiActio
     }
 };
 ApiAuthTestAction = __decorate([
-    (0, swagger_mate_1.SPath)({
-        '/test/auth': {
-            get: {
-                operationId: 'testAuth',
-                summary: 'Test user auth',
-                tags: ['kernel'],
-                responses: swagger_mate_1.SPathUtil.defaultResponse('200', '403'),
-            },
-        },
-    }),
-    (0, index_js_2.Route)('GET', '/test/auth')
+    (0, swagger_mate_1.Route)('GET', '/test/auth', {
+        operationId: 'testAuth',
+        summary: 'Test user auth',
+        tags: ['kernel'],
+        responseCodes: ['200', '403'],
+    })
 ], ApiAuthTestAction);
 exports.default = ApiAuthTestAction;

package/dist/cjs/actions/ApiVersionAction.js

@@ -8,7 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 const swagger_mate_1 = require("@grandlinex/swagger-mate");
 const index_js_1 = require("../classes/index.js");
-const index_js_2 = require("../annotation/index.js");
 let ApiVersionAction = class ApiVersionAction extends index_js_1.RouteApiAction {
     async handler({ res, extension }) {
         extension.done();
@@ -16,24 +15,21 @@ let ApiVersionAction = class ApiVersionAction extends index_js_1.RouteApiAction
     }
 };
 ApiVersionAction = __decorate([
-    (0, swagger_mate_1.SPath)({
-        '/version': {
-            get: {
-                operationId: 'getVersion',
-                summary: 'Get API version',
-                tags: ['kernel'],
-                responses: swagger_mate_1.SPathUtil.jsonResponse('200', {
-                    type: 'object',
-                    properties: {
-                        api: {
-                            type: 'number',
-                        },
-                    },
-                    required: ['api'],
-                }, false, '403'),
+    (0, swagger_mate_1.Route)('GET', '/version', {
+        mode: swagger_mate_1.ActionMode.DMZ,
+        operationId: 'getVersion',
+        summary: 'Get API version',
+        tags: ['kernel'],
+        responseSchema: {
+            type: 'object',
+            properties: {
+                api: {
+                    type: 'number',
+                },
             },
+            required: ['api'],
         },
-    }),
-    (0, index_js_2.Route)('GET', '/version', index_js_1.ActionMode.DMZ)
+        responseCodes: ['200', '403'],
+    })
 ], ApiVersionAction);
 exports.default = ApiVersionAction;

package/dist/cjs/actions/GetTokenAction.js

@@ -8,19 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 const swagger_mate_1 = require("@grandlinex/swagger-mate");
 const index_js_1 = require("../classes/index.js");
-const index_js_2 = require("../annotation/index.js");
-const schema = {
-    type: 'object',
-    properties: {
-        username: {
-            type: 'string',
-        },
-        token: {
-            type: 'string',
-        },
-    },
-    required: ['username', 'token'],
-};
 let GetTokenAction = class GetTokenAction extends index_js_1.RouteApiAction {
     async handler({ req, res, extension, body, }) {
         const cc = this.getKernel().getCryptoClient();
@@ -40,25 +27,33 @@ let GetTokenAction = class GetTokenAction extends index_js_1.RouteApiAction {
     }
 };
 GetTokenAction = __decorate([
-    (0, swagger_mate_1.SPath)({
-        '/token': {
-            post: {
-                operationId: 'getToken',
-                summary: 'Get API token',
-                tags: ['kernel'],
-                requestBody: swagger_mate_1.SPathUtil.jsonBody(schema),
-                responses: swagger_mate_1.SPathUtil.jsonResponse('200', {
-                    type: 'object',
-                    properties: {
-                        token: {
-                            type: 'string',
-                        },
-                    },
-                    required: ['token'],
-                }, false, '403'),
+    (0, swagger_mate_1.Route)('POST', '/token', {
+        mode: swagger_mate_1.ActionMode.DMZ,
+        operationId: 'getToken',
+        summary: 'Get API token',
+        tags: ['kernel'],
+        requestSchema: {
+            type: 'object',
+            properties: {
+                username: {
+                    type: 'string',
+                },
+                token: {
+                    type: 'string',
+                },
+            },
+            required: ['username', 'token'],
+        },
+        responseSchema: {
+            type: 'object',
+            properties: {
+                token: {
+                    type: 'string',
+                },
             },
+            required: ['token'],
         },
-    }),
-    (0, index_js_2.Route)('POST', '/token', index_js_1.ActionMode.DMZ, schema)
+        responseCodes: ['200', '403'],
+    })
 ], GetTokenAction);
 exports.default = GetTokenAction;

package/dist/cjs/classes/BaseAction.d.ts

@@ -1,16 +1,11 @@
 import { CoreAction, IDataBase } from '@grandlinex/core';
-import { ErrorType, SSchemaEl } from '@grandlinex/swagger-mate';
+import { ActionMode, ErrorType, SSchemaEl } from '@grandlinex/swagger-mate';
 import { IBaseAction, IBaseCache, IBaseClient, IBaseKernelModule, IBasePresenter, IKernel } from '../lib/index.js';
 import { XActionEvent, XRequest, XResponse } from '../lib/express.js';
-export declare enum ActionMode {
-    'DEFAULT' = 0,
-    'DMZ' = 1,
-    'DMZ_WITH_USER' = 2
-}
 export default abstract class BaseAction<K extends IKernel = IKernel, T extends IDataBase<any, any> | null = any, P extends IBaseClient | null = any, C extends IBaseCache | null = any, E extends IBasePresenter | null = any> extends CoreAction<K, T, P, C, E> implements IBaseAction<K, T, P, C, E> {
     mode: ActionMode;
     forceDebug: boolean;
-    schema: SSchemaEl | null;
+    requestSchema: SSchemaEl | null;
     constructor(chanel: string, module: IBaseKernelModule<K, T, P, C, E>);
     abstract handler(event: XActionEvent): Promise<void>;
     static validateSchema(error: ErrorType, schema: SSchemaEl, key: string, field: any, required?: boolean): void;

package/dist/cjs/classes/BaseAction.js

@@ -1,23 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActionMode = void 0;
 const core_1 = require("@grandlinex/core");
 const swagger_mate_1 = require("@grandlinex/swagger-mate");
 const index_js_1 = require("./timing/index.js");
 const BaseUserAgent_js_1 = require("./BaseUserAgent.js");
-var ActionMode;
-(function (ActionMode) {
-    ActionMode[ActionMode["DEFAULT"] = 0] = "DEFAULT";
-    ActionMode[ActionMode["DMZ"] = 1] = "DMZ";
-    ActionMode[ActionMode["DMZ_WITH_USER"] = 2] = "DMZ_WITH_USER";
-})(ActionMode || (exports.ActionMode = ActionMode = {}));
 class BaseAction extends core_1.CoreAction {
     constructor(chanel, module) {
         super(chanel, module);
         this.secureHandler = this.secureHandler.bind(this);
-        this.mode = ActionMode.DEFAULT;
+        this.mode = swagger_mate_1.ActionMode.DEFAULT;
         this.forceDebug = false;
-        this.schema = null;
+        this.requestSchema = null;
     }
     static validateSchema(error, schema, key, field, required = true) {
         if ((0, swagger_mate_1.isSwaggerRef)(schema)) {
@@ -91,7 +84,7 @@ class BaseAction extends core_1.CoreAction {
         }
     }
     bodyValidation(req) {
-        if (!this.schema) {
+        if (!this.requestSchema) {
             return null;
         }
         if (!req.body) {
@@ -102,7 +95,7 @@ class BaseAction extends core_1.CoreAction {
             global: [],
             field: [],
         };
-        BaseAction.validateSchema(error, this.schema, 'body', req.body);
+        BaseAction.validateSchema(error, this.requestSchema, 'body', req.body);
         if (error.field.length > 0 || error.global.length > 0) {
             return error;
         }
@@ -128,18 +121,18 @@ class BaseAction extends core_1.CoreAction {
             res.status(504).send('internal server error');
             return;
         }
-        if (this.mode === ActionMode.DMZ) {
+        if (this.mode === swagger_mate_1.ActionMode.DMZ) {
             auth.stop();
             try {
                 let body = null;
-                if (this.schema) {
+                if (this.requestSchema) {
                     body = this.bodyValidation(req);
                 }
                 if ((0, swagger_mate_1.isErrorType)(body)) {
                     res.status(400).send(body);
                     return;
                 }
-                if (this.schema && body === null) {
+                if (this.requestSchema && body === null) {
                     res.sendStatus(400);
                     return;
                 }
@@ -168,14 +161,14 @@ class BaseAction extends core_1.CoreAction {
         if (dat && typeof dat !== 'number') {
             try {
                 let body = null;
-                if (this.schema) {
+                if (this.requestSchema) {
                     body = this.bodyValidation(req);
                 }
                 if ((0, swagger_mate_1.isErrorType)(body)) {
                     res.status(400).send(body);
                     return;
                 }
-                if (this.schema && body === null) {
+                if (this.requestSchema && body === null) {
                     res.sendStatus(400);
                     return;
                 }
@@ -198,17 +191,17 @@ class BaseAction extends core_1.CoreAction {
                 }
             }
         }
-        else if (this.mode === ActionMode.DMZ_WITH_USER) {
+        else if (this.mode === swagger_mate_1.ActionMode.DMZ_WITH_USER) {
             try {
                 let body = null;
-                if (this.schema) {
+                if (this.requestSchema) {
                     body = this.bodyValidation(req);
                 }
                 if ((0, swagger_mate_1.isErrorType)(body)) {
                     res.status(400).send(body);
                     return;
                 }
-                if (this.schema && body === null) {
+                if (this.requestSchema && body === null) {
                     res.sendStatus(400);
                     return;
                 }

package/dist/cjs/classes/BaseApiAction.d.ts

@@ -1,5 +1,6 @@
 import { IDataBase } from '@grandlinex/core';
-import { ActionTypes, IBaseAction, IBaseCache, IBaseClient, IBaseKernelModule, IBasePresenter, IKernel } from '../lib/index.js';
+import { ActionTypes } from '@grandlinex/swagger-mate';
+import { IBaseAction, IBaseCache, IBaseClient, IBaseKernelModule, IBasePresenter, IKernel } from '../lib/index.js';
 import BaseAction from './BaseAction.js';
 export default abstract class BaseApiAction<K extends IKernel = IKernel, T extends IDataBase<any, any> | null = any, P extends IBaseClient | null = any, C extends IBaseCache | null = any, E extends IBasePresenter | null = any> extends BaseAction<K, T, P, C, E> implements IBaseAction<K, T, P, C, E> {
     exmod: undefined | IBaseKernelModule<K>;

package/dist/cjs/classes/RouteApiAction.js

@@ -3,23 +3,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const index_js_1 = require("../annotation/index.js");
+const swagger_mate_1 = require("@grandlinex/swagger-mate");
 const BaseApiAction_js_1 = __importDefault(require("./BaseApiAction.js"));
 class RouteApiAction extends BaseApiAction_js_1.default {
     constructor(module, extMod) {
         super('GET', 'action', module, extMod);
         this.exmod = extMod;
-        const meta = (0, index_js_1.getRouteMeta)(this);
-        if (!meta) {
+        const route = (0, swagger_mate_1.getRouteMeta)(this);
+        if (!route) {
             throw this.lError('No route meta found for action');
         }
-        const { type, path, mode, schema } = meta;
+        const { type, path, meta } = route;
         this.type = type;
         this.channel = path;
-        if (mode) {
-            this.setMode(mode);
+        if (meta?.mode) {
+            this.setMode(meta.mode);
         }
-        this.schema = schema ?? null;
+        this.requestSchema = meta?.requestSchema ?? null;
     }
 }
 exports.default = RouteApiAction;

package/dist/cjs/classes/index.d.ts

@@ -1,5 +1,5 @@
 import { CoreBridge as BaseBridge, CoreCache as BaseCache, CoreClient as BaseClient, CoreElement as BaseElement, CoreLoopService as BaseLoopService, CoreService as BaseService } from '@grandlinex/core';
-import BaseAction, { ActionMode } from './BaseAction.js';
+import BaseAction from './BaseAction.js';
 import BaseEndpoint, { keepRawBody } from './BaseEndpoint.js';
 import BaseKernelModule from './BaseKernelModule.js';
 import BaseApiAction from './BaseApiAction.js';
@@ -9,4 +9,4 @@ export * from './BaseAction.js';
 export * from './BaseUserAgent.js';
 export * from './BaseAuthProvider.js';
 export * from './timing/index.js';
-export { BaseLoopService, BaseAuthProvider, BaseKernelModule, BaseService, BaseApiAction, BaseEndpoint, BaseElement, RouteApiAction, BaseCache, BaseAction, BaseClient, BaseBridge, keepRawBody, ActionMode, };
+export { BaseLoopService, BaseAuthProvider, BaseKernelModule, BaseService, BaseApiAction, BaseEndpoint, BaseElement, RouteApiAction, BaseCache, BaseAction, BaseClient, BaseBridge, keepRawBody, };

package/dist/cjs/classes/index.js

@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActionMode = exports.keepRawBody = exports.BaseBridge = exports.BaseClient = exports.BaseAction = exports.BaseCache = exports.RouteApiAction = exports.BaseElement = exports.BaseEndpoint = exports.BaseApiAction = exports.BaseService = exports.BaseKernelModule = exports.BaseAuthProvider = exports.BaseLoopService = void 0;
+exports.keepRawBody = exports.BaseBridge = exports.BaseClient = exports.BaseAction = exports.BaseCache = exports.RouteApiAction = exports.BaseElement = exports.BaseEndpoint = exports.BaseApiAction = exports.BaseService = exports.BaseKernelModule = exports.BaseAuthProvider = exports.BaseLoopService = void 0;
 const core_1 = require("@grandlinex/core");
 Object.defineProperty(exports, "BaseBridge", { enumerable: true, get: function () { return core_1.CoreBridge; } });
 Object.defineProperty(exports, "BaseCache", { enumerable: true, get: function () { return core_1.CoreCache; } });
@@ -47,9 +47,8 @@ Object.defineProperty(exports, "BaseClient", { enumerable: true, get: function (
 Object.defineProperty(exports, "BaseElement", { enumerable: true, get: function () { return core_1.CoreElement; } });
 Object.defineProperty(exports, "BaseLoopService", { enumerable: true, get: function () { return core_1.CoreLoopService; } });
 Object.defineProperty(exports, "BaseService", { enumerable: true, get: function () { return core_1.CoreService; } });
-const BaseAction_js_1 = __importStar(require("./BaseAction.js"));
+const BaseAction_js_1 = __importDefault(require("./BaseAction.js"));
 exports.BaseAction = BaseAction_js_1.default;
-Object.defineProperty(exports, "ActionMode", { enumerable: true, get: function () { return BaseAction_js_1.ActionMode; } });
 const BaseEndpoint_js_1 = __importStar(require("./BaseEndpoint.js"));
 exports.BaseEndpoint = BaseEndpoint_js_1.default;
 Object.defineProperty(exports, "keepRawBody", { enumerable: true, get: function () { return BaseEndpoint_js_1.keepRawBody; } });

package/dist/cjs/index.d.ts

@@ -6,7 +6,6 @@ import Kernel from './Kernel.js';
 import KernelModule from './KernelModule.js';
 export * from './actions/index.js';
 export * from './api/index.js';
-export * from './annotation/index.js';
 export * from './classes/index.js';
 export * from './modules/crypto/index.js';
 export * from './lib/index.js';

package/dist/cjs/index.js

@@ -28,7 +28,6 @@ const KernelModule_js_1 = __importDefault(require("./KernelModule.js"));
 exports.KernelModule = KernelModule_js_1.default;
 __exportStar(require("./actions/index.js"), exports);
 __exportStar(require("./api/index.js"), exports);
-__exportStar(require("./annotation/index.js"), exports);
 __exportStar(require("./classes/index.js"), exports);
 __exportStar(require("./modules/crypto/index.js"), exports);
 __exportStar(require("./lib/index.js"), exports);

package/dist/cjs/lib/index.d.ts

@@ -5,7 +5,6 @@ import { IAuthProvider, JwtExtend, JwtToken } from '../classes/index.js';
 import EntitySchemaExtender from './EntitySchemaExtender.js';
 import { XActionEvent, XRequest } from './express.js';
 export { EntitySchemaExtender };
-export type ActionTypes = 'POST' | 'GET' | 'USE' | 'PATCH' | 'DELETE';
 export interface ICClient<T extends JwtExtend = JwtExtend> extends ICoreCClient {
     setAuthProvider(provider: IAuthProvider<T>): boolean;
     jwtVerifyAccessToken(token: string): Promise<JwtToken<T> | number>;

package/dist/mjs/actions/ApiAuthTestAction.js

@@ -4,9 +4,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { SPath, SPathUtil } from '@grandlinex/swagger-mate';
+import { Route } from '@grandlinex/swagger-mate';
 import { RouteApiAction } from '../classes/index.js';
-import { Route } from '../annotation/index.js';
 let ApiAuthTestAction = class ApiAuthTestAction extends RouteApiAction {
     async handler({ data, res }) {
         this.debug(data.userid);
@@ -14,16 +13,11 @@ let ApiAuthTestAction = class ApiAuthTestAction extends RouteApiAction {
     }
 };
 ApiAuthTestAction = __decorate([
-    SPath({
-        '/test/auth': {
-            get: {
-                operationId: 'testAuth',
-                summary: 'Test user auth',
-                tags: ['kernel'],
-                responses: SPathUtil.defaultResponse('200', '403'),
-            },
-        },
-    }),
-    Route('GET', '/test/auth')
+    Route('GET', '/test/auth', {
+        operationId: 'testAuth',
+        summary: 'Test user auth',
+        tags: ['kernel'],
+        responseCodes: ['200', '403'],
+    })
 ], ApiAuthTestAction);
 export default ApiAuthTestAction;

package/dist/mjs/actions/ApiVersionAction.js

@@ -4,9 +4,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { SPath, SPathUtil } from '@grandlinex/swagger-mate';
-import { ActionMode, RouteApiAction } from '../classes/index.js';
-import { Route } from '../annotation/index.js';
+import { ActionMode, Route } from '@grandlinex/swagger-mate';
+import { RouteApiAction } from '../classes/index.js';
 let ApiVersionAction = class ApiVersionAction extends RouteApiAction {
     async handler({ res, extension }) {
         extension.done();
@@ -14,24 +13,21 @@ let ApiVersionAction = class ApiVersionAction extends RouteApiAction {
     }
 };
 ApiVersionAction = __decorate([
-    SPath({
-        '/version': {
-            get: {
-                operationId: 'getVersion',
-                summary: 'Get API version',
-                tags: ['kernel'],
-                responses: SPathUtil.jsonResponse('200', {
-                    type: 'object',
-                    properties: {
-                        api: {
-                            type: 'number',
-                        },
-                    },
-                    required: ['api'],
-                }, false, '403'),
+    Route('GET', '/version', {
+        mode: ActionMode.DMZ,
+        operationId: 'getVersion',
+        summary: 'Get API version',
+        tags: ['kernel'],
+        responseSchema: {
+            type: 'object',
+            properties: {
+                api: {
+                    type: 'number',
+                },
             },
+            required: ['api'],
         },
-    }),
-    Route('GET', '/version', ActionMode.DMZ)
+        responseCodes: ['200', '403'],
+    })
 ], ApiVersionAction);
 export default ApiVersionAction;

package/dist/mjs/actions/GetTokenAction.js

@@ -4,21 +4,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { SPath, SPathUtil } from '@grandlinex/swagger-mate';
-import { ActionMode, RouteApiAction } from '../classes/index.js';
-import { Route } from '../annotation/index.js';
-const schema = {
-    type: 'object',
-    properties: {
-        username: {
-            type: 'string',
-        },
-        token: {
-            type: 'string',
-        },
-    },
-    required: ['username', 'token'],
-};
+import { ActionMode, Route } from '@grandlinex/swagger-mate';
+import { RouteApiAction } from '../classes/index.js';
 let GetTokenAction = class GetTokenAction extends RouteApiAction {
     async handler({ req, res, extension, body, }) {
         const cc = this.getKernel().getCryptoClient();
@@ -38,25 +25,33 @@ let GetTokenAction = class GetTokenAction extends RouteApiAction {
     }
 };
 GetTokenAction = __decorate([
-    SPath({
-        '/token': {
-            post: {
-                operationId: 'getToken',
-                summary: 'Get API token',
-                tags: ['kernel'],
-                requestBody: SPathUtil.jsonBody(schema),
-                responses: SPathUtil.jsonResponse('200', {
-                    type: 'object',
-                    properties: {
-                        token: {
-                            type: 'string',
-                        },
-                    },
-                    required: ['token'],
-                }, false, '403'),
+    Route('POST', '/token', {
+        mode: ActionMode.DMZ,
+        operationId: 'getToken',
+        summary: 'Get API token',
+        tags: ['kernel'],
+        requestSchema: {
+            type: 'object',
+            properties: {
+                username: {
+                    type: 'string',
+                },
+                token: {
+                    type: 'string',
+                },
+            },
+            required: ['username', 'token'],
+        },
+        responseSchema: {
+            type: 'object',
+            properties: {
+                token: {
+                    type: 'string',
+                },
             },
+            required: ['token'],
         },
-    }),
-    Route('POST', '/token', ActionMode.DMZ, schema)
+        responseCodes: ['200', '403'],
+    })
 ], GetTokenAction);
 export default GetTokenAction;

package/dist/mjs/classes/BaseAction.d.ts

@@ -1,16 +1,11 @@
 import { CoreAction, IDataBase } from '@grandlinex/core';
-import { ErrorType, SSchemaEl } from '@grandlinex/swagger-mate';
+import { ActionMode, ErrorType, SSchemaEl } from '@grandlinex/swagger-mate';
 import { IBaseAction, IBaseCache, IBaseClient, IBaseKernelModule, IBasePresenter, IKernel } from '../lib/index.js';
 import { XActionEvent, XRequest, XResponse } from '../lib/express.js';
-export declare enum ActionMode {
-    'DEFAULT' = 0,
-    'DMZ' = 1,
-    'DMZ_WITH_USER' = 2
-}
 export default abstract class BaseAction<K extends IKernel = IKernel, T extends IDataBase<any, any> | null = any, P extends IBaseClient | null = any, C extends IBaseCache | null = any, E extends IBasePresenter | null = any> extends CoreAction<K, T, P, C, E> implements IBaseAction<K, T, P, C, E> {
     mode: ActionMode;
     forceDebug: boolean;
-    schema: SSchemaEl | null;
+    requestSchema: SSchemaEl | null;
     constructor(chanel: string, module: IBaseKernelModule<K, T, P, C, E>);
     abstract handler(event: XActionEvent): Promise<void>;
     static validateSchema(error: ErrorType, schema: SSchemaEl, key: string, field: any, required?: boolean): void;

package/dist/mjs/classes/BaseAction.js

@@ -1,20 +1,14 @@
 import { CoreAction } from '@grandlinex/core';
-import { isErrorType, isSwaggerRef, } from '@grandlinex/swagger-mate';
+import { ActionMode, isErrorType, isSwaggerRef, } from '@grandlinex/swagger-mate';
 import { ExpressServerTiming } from './timing/index.js';
 import { BaseUserAgent } from './BaseUserAgent.js';
-export var ActionMode;
-(function (ActionMode) {
-    ActionMode[ActionMode["DEFAULT"] = 0] = "DEFAULT";
-    ActionMode[ActionMode["DMZ"] = 1] = "DMZ";
-    ActionMode[ActionMode["DMZ_WITH_USER"] = 2] = "DMZ_WITH_USER";
-})(ActionMode || (ActionMode = {}));
 export default class BaseAction extends CoreAction {
     constructor(chanel, module) {
         super(chanel, module);
         this.secureHandler = this.secureHandler.bind(this);
         this.mode = ActionMode.DEFAULT;
         this.forceDebug = false;
-        this.schema = null;
+        this.requestSchema = null;
     }
     static validateSchema(error, schema, key, field, required = true) {
         if (isSwaggerRef(schema)) {
@@ -88,7 +82,7 @@ export default class BaseAction extends CoreAction {
         }
     }
     bodyValidation(req) {
-        if (!this.schema) {
+        if (!this.requestSchema) {
             return null;
         }
         if (!req.body) {
@@ -99,7 +93,7 @@ export default class BaseAction extends CoreAction {
             global: [],
             field: [],
         };
-        BaseAction.validateSchema(error, this.schema, 'body', req.body);
+        BaseAction.validateSchema(error, this.requestSchema, 'body', req.body);
         if (error.field.length > 0 || error.global.length > 0) {
             return error;
         }
@@ -129,14 +123,14 @@ export default class BaseAction extends CoreAction {
             auth.stop();
             try {
                 let body = null;
-                if (this.schema) {
+                if (this.requestSchema) {
                     body = this.bodyValidation(req);
                 }
                 if (isErrorType(body)) {
                     res.status(400).send(body);
                     return;
                 }
-                if (this.schema && body === null) {
+                if (this.requestSchema && body === null) {
                     res.sendStatus(400);
                     return;
                 }
@@ -165,14 +159,14 @@ export default class BaseAction extends CoreAction {
         if (dat && typeof dat !== 'number') {
             try {
                 let body = null;
-                if (this.schema) {
+                if (this.requestSchema) {
                     body = this.bodyValidation(req);
                 }
                 if (isErrorType(body)) {
                     res.status(400).send(body);
                     return;
                 }
-                if (this.schema && body === null) {
+                if (this.requestSchema && body === null) {
                     res.sendStatus(400);
                     return;
                 }
@@ -198,14 +192,14 @@ export default class BaseAction extends CoreAction {
         else if (this.mode === ActionMode.DMZ_WITH_USER) {
             try {
                 let body = null;
-                if (this.schema) {
+                if (this.requestSchema) {
                     body = this.bodyValidation(req);
                 }
                 if (isErrorType(body)) {
                     res.status(400).send(body);
                     return;
                 }
-                if (this.schema && body === null) {
+                if (this.requestSchema && body === null) {
                     res.sendStatus(400);
                     return;
                 }

package/dist/mjs/classes/BaseApiAction.d.ts

@@ -1,5 +1,6 @@
 import { IDataBase } from '@grandlinex/core';
-import { ActionTypes, IBaseAction, IBaseCache, IBaseClient, IBaseKernelModule, IBasePresenter, IKernel } from '../lib/index.js';
+import { ActionTypes } from '@grandlinex/swagger-mate';
+import { IBaseAction, IBaseCache, IBaseClient, IBaseKernelModule, IBasePresenter, IKernel } from '../lib/index.js';
 import BaseAction from './BaseAction.js';
 export default abstract class BaseApiAction<K extends IKernel = IKernel, T extends IDataBase<any, any> | null = any, P extends IBaseClient | null = any, C extends IBaseCache | null = any, E extends IBasePresenter | null = any> extends BaseAction<K, T, P, C, E> implements IBaseAction<K, T, P, C, E> {
     exmod: undefined | IBaseKernelModule<K>;

package/dist/mjs/classes/RouteApiAction.js

@@ -1,19 +1,19 @@
-import { getRouteMeta } from '../annotation/index.js';
+import { getRouteMeta } from '@grandlinex/swagger-mate';
 import BaseApiAction from './BaseApiAction.js';
 export default class RouteApiAction extends BaseApiAction {
     constructor(module, extMod) {
         super('GET', 'action', module, extMod);
         this.exmod = extMod;
-        const meta = getRouteMeta(this);
-        if (!meta) {
+        const route = getRouteMeta(this);
+        if (!route) {
             throw this.lError('No route meta found for action');
         }
-        const { type, path, mode, schema } = meta;
+        const { type, path, meta } = route;
         this.type = type;
         this.channel = path;
-        if (mode) {
-            this.setMode(mode);
+        if (meta?.mode) {
+            this.setMode(meta.mode);
         }
-        this.schema = schema ?? null;
+        this.requestSchema = meta?.requestSchema ?? null;
     }
 }

package/dist/mjs/classes/index.d.ts

@@ -1,5 +1,5 @@
 import { CoreBridge as BaseBridge, CoreCache as BaseCache, CoreClient as BaseClient, CoreElement as BaseElement, CoreLoopService as BaseLoopService, CoreService as BaseService } from '@grandlinex/core';
-import BaseAction, { ActionMode } from './BaseAction.js';
+import BaseAction from './BaseAction.js';
 import BaseEndpoint, { keepRawBody } from './BaseEndpoint.js';
 import BaseKernelModule from './BaseKernelModule.js';
 import BaseApiAction from './BaseApiAction.js';
@@ -9,4 +9,4 @@ export * from './BaseAction.js';
 export * from './BaseUserAgent.js';
 export * from './BaseAuthProvider.js';
 export * from './timing/index.js';
-export { BaseLoopService, BaseAuthProvider, BaseKernelModule, BaseService, BaseApiAction, BaseEndpoint, BaseElement, RouteApiAction, BaseCache, BaseAction, BaseClient, BaseBridge, keepRawBody, ActionMode, };
+export { BaseLoopService, BaseAuthProvider, BaseKernelModule, BaseService, BaseApiAction, BaseEndpoint, BaseElement, RouteApiAction, BaseCache, BaseAction, BaseClient, BaseBridge, keepRawBody, };

package/dist/mjs/classes/index.js

@@ -1,5 +1,5 @@
 import { CoreBridge as BaseBridge, CoreCache as BaseCache, CoreClient as BaseClient, CoreElement as BaseElement, CoreLoopService as BaseLoopService, CoreService as BaseService, } from '@grandlinex/core';
-import BaseAction, { ActionMode } from './BaseAction.js';
+import BaseAction from './BaseAction.js';
 import BaseEndpoint, { keepRawBody } from './BaseEndpoint.js';
 import BaseKernelModule from './BaseKernelModule.js';
 import BaseApiAction from './BaseApiAction.js';
@@ -9,4 +9,4 @@ export * from './BaseAction.js';
 export * from './BaseUserAgent.js';
 export * from './BaseAuthProvider.js';
 export * from './timing/index.js';
-export { BaseLoopService, BaseAuthProvider, BaseKernelModule, BaseService, BaseApiAction, BaseEndpoint, BaseElement, RouteApiAction, BaseCache, BaseAction, BaseClient, BaseBridge, keepRawBody, ActionMode, };
+export { BaseLoopService, BaseAuthProvider, BaseKernelModule, BaseService, BaseApiAction, BaseEndpoint, BaseElement, RouteApiAction, BaseCache, BaseAction, BaseClient, BaseBridge, keepRawBody, };

package/dist/mjs/index.d.ts

@@ -6,7 +6,6 @@ import Kernel from './Kernel.js';
 import KernelModule from './KernelModule.js';
 export * from './actions/index.js';
 export * from './api/index.js';
-export * from './annotation/index.js';
 export * from './classes/index.js';
 export * from './modules/crypto/index.js';
 export * from './lib/index.js';

package/dist/mjs/index.js

@@ -6,7 +6,6 @@ import Kernel from './Kernel.js';
 import KernelModule from './KernelModule.js';
 export * from './actions/index.js';
 export * from './api/index.js';
-export * from './annotation/index.js';
 export * from './classes/index.js';
 export * from './modules/crypto/index.js';
 export * from './lib/index.js';

package/dist/mjs/lib/index.d.ts

@@ -5,7 +5,6 @@ import { IAuthProvider, JwtExtend, JwtToken } from '../classes/index.js';
 import EntitySchemaExtender from './EntitySchemaExtender.js';
 import { XActionEvent, XRequest } from './express.js';
 export { EntitySchemaExtender };
-export type ActionTypes = 'POST' | 'GET' | 'USE' | 'PATCH' | 'DELETE';
 export interface ICClient<T extends JwtExtend = JwtExtend> extends ICoreCClient {
     setAuthProvider(provider: IAuthProvider<T>): boolean;
     jwtVerifyAccessToken(token: string): Promise<JwtToken<T> | number>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grandlinex/kernel",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "GrandLineX is an out-of-the-box server framework on top of ExpressJs.",
   "type": "module",
   "exports": {
@@ -46,16 +46,16 @@
   },
   "license": "BSD-3-Clause",
   "dependencies": {
-    "reflect-metadata": "0.2.2",
-    "@grandlinex/core": "1.1.1",
-    "@grandlinex/swagger-mate": "1.1.1",
+    "@grandlinex/core": "1.2.0",
+    "@grandlinex/swagger-mate": "1.2.1",
+    "@types/express": "5.0.3",
+    "@types/jsonwebtoken": "9.0.10",
+    "@types/ms": "2.1.0",
     "axios": "1.11.0",
     "body-parser": "1.20.3",
     "express": "5.1.0",
     "jsonwebtoken": "9.0.2",
-    "@types/express": "5.0.3",
-    "@types/jsonwebtoken": "9.0.10",
-    "@types/ms": "2.1.0"
+    "reflect-metadata": "0.2.2"
   },
   "devDependencies": {
     "@types/jest": "29.5.14",

package/dist/cjs/annotation/index.d.ts

@@ -1,13 +0,0 @@
-import 'reflect-metadata';
-import { ObjectLike } from '@grandlinex/core';
-import { SSchemaEl } from '@grandlinex/swagger-mate';
-import { ActionTypes } from '../lib/index.js';
-import { ActionMode } from '../classes/index.js';
-export type RouteMeta = {
-    type: ActionTypes;
-    path: string;
-    mode?: ActionMode;
-    schema?: SSchemaEl;
-};
-export declare const Route: (type: ActionTypes, path: string, mode?: ActionMode, schema?: SSchemaEl) => ClassDecorator;
-export declare function getRouteMeta<T extends ObjectLike>(target: T): RouteMeta | undefined;

package/dist/cjs/annotation/index.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Route = void 0;
-exports.getRouteMeta = getRouteMeta;
-require("reflect-metadata");
-const routeKey = Symbol('route');
-const Route = (type, path, mode, schema) => {
-    return (target) => {
-        const metadata = {
-            type,
-            path,
-            mode,
-            schema,
-        };
-        Reflect.defineMetadata(routeKey, metadata, target.prototype);
-    };
-};
-exports.Route = Route;
-function getRouteMeta(target) {
-    return Reflect.getMetadata(routeKey, target.constructor.prototype);
-}

package/dist/mjs/annotation/index.d.ts

@@ -1,13 +0,0 @@
-import 'reflect-metadata';
-import { ObjectLike } from '@grandlinex/core';
-import { SSchemaEl } from '@grandlinex/swagger-mate';
-import { ActionTypes } from '../lib/index.js';
-import { ActionMode } from '../classes/index.js';
-export type RouteMeta = {
-    type: ActionTypes;
-    path: string;
-    mode?: ActionMode;
-    schema?: SSchemaEl;
-};
-export declare const Route: (type: ActionTypes, path: string, mode?: ActionMode, schema?: SSchemaEl) => ClassDecorator;
-export declare function getRouteMeta<T extends ObjectLike>(target: T): RouteMeta | undefined;

package/dist/mjs/annotation/index.js

@@ -1,16 +0,0 @@
-import 'reflect-metadata';
-const routeKey = Symbol('route');
-export const Route = (type, path, mode, schema) => {
-    return (target) => {
-        const metadata = {
-            type,
-            path,
-            mode,
-            schema,
-        };
-        Reflect.defineMetadata(routeKey, metadata, target.prototype);
-    };
-};
-export function getRouteMeta(target) {
-    return Reflect.getMetadata(routeKey, target.constructor.prototype);
-}