namirasoft-node 1.1.12 → 1.1.14

package/dist/BaseApplication.d.ts

@@ -2,7 +2,7 @@ import express, { Router } from 'express';
 import { BaseDatabase } from './BaseDatabase';
 import { ILogger } from "namirasoft-log";
 import { BaseApplicationLink } from './BaseApplicationLink';
-import { ApplicationSchema } from './Schema/ApplicationSchema';
+import { ApplicationSchema } from 'namirasoft-schema';
 export declare abstract class BaseApplication<D extends BaseDatabase> {
     private title;
     protected description: string;

package/dist/BaseController.d.ts

@@ -1,13 +1,10 @@
 import * as express from 'express';
 import { BaseDatabase } from './BaseDatabase';
-import { SchemaLike } from 'joi';
 import { AnomalyDetector } from './AnomalyDetector';
 import { ILogger } from 'namirasoft-log';
 import { Meta } from './Meta';
-import { HTTPMethod } from './HTTPMethod';
 import { BaseApplication } from './BaseApplication';
-import { ControllerSchema } from './Schema/ControllerSchema';
-import { VariableSchema } from './Schema/VariableSchema';
+import { HTTPMethod, BaseVariableSchema, ControllerSchema } from 'namirasoft-schema';
 export declare abstract class BaseController<D extends BaseDatabase, State, Props, Output> {
     protected showLogAtTheBeginning: boolean;
     protected showLogAtTheEnd: boolean;
@@ -31,10 +28,10 @@ export declare abstract class BaseController<D extends BaseDatabase, State, Prop
         tag: string;
         summary: string;
     };
-    abstract getParameterSchema(): SchemaLike | null;
-    abstract getBodySchema(): SchemaLike | null;
-    abstract getQuerySchema(): SchemaLike | null;
-    abstract getOutputSchema(): VariableSchema;
+    abstract getParameterSchema(): BaseVariableSchema[];
+    abstract getBodySchema(): BaseVariableSchema | null;
+    abstract getQuerySchema(): BaseVariableSchema[];
+    abstract getOutputSchema(): BaseVariableSchema | null;
     abstract getState(): Promise<State>;
     abstract getProps(): Promise<Props>;
     abstract preHandle(): Promise<void>;
@@ -42,4 +39,5 @@ export declare abstract class BaseController<D extends BaseDatabase, State, Prop
     abstract postHandle(): Promise<void>;
     run(): Promise<express.Response<any, Record<string, any>>>;
     getSchema(): Promise<ControllerSchema>;
+    private checkParameterSchema;
 }

package/dist/BaseController.js

@@ -8,16 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseController = void 0;
 const Meta_1 = require("./Meta");
-const joi_1 = __importDefault(require("joi"));
 const namirasoft_core_1 = require("namirasoft-core");
-const ControllerSchema_1 = require("./Schema/ControllerSchema");
-const VariableSchema_1 = require("./Schema/VariableSchema");
+const namirasoft_schema_1 = require("namirasoft-schema");
 class BaseController {
     constructor(app, req, res) {
         this.showLogAtTheBeginning = false;
@@ -50,28 +45,9 @@ class BaseController {
                 if (anomaly != null)
                     if (anomaly.isAnomaly(this.meta.ip, this.meta.url))
                         namirasoft_core_1.ErrorOperation.throwHTTP(403, 'Suspicious activity detected.');
-                // check body validation
-                let bodySchema = this.getBodySchema();
-                if (bodySchema != null) {
-                    const validation = yield joi_1.default.compile(bodySchema)
-                        .prefs({ errors: { label: 'key' } })
-                        .validate(this.req.body);
-                    if (validation.error) {
-                        let message = validation.error.details.map((details) => details.message).join(', ');
-                        namirasoft_core_1.ErrorOperation.throwHTTP(400, message);
-                    }
-                }
-                // check query validation
-                let querySchema = this.getQuerySchema();
-                if (querySchema != null) {
-                    const validation = yield joi_1.default.compile(querySchema)
-                        .prefs({ errors: { label: 'key' } })
-                        .validate(this.req.query);
-                    if (validation.error) {
-                        let message = validation.error.details.map((details) => details.message).join(', ');
-                        namirasoft_core_1.ErrorOperation.throwHTTP(400, message);
-                    }
-                }
+                // check
+                namirasoft_schema_1.JoiValidator.check(this.getBodySchema(), this.req.body);
+                namirasoft_schema_1.JoiValidator.checkArray(this.getQuerySchema(), this.req.query);
                 // call controller
                 this.output = yield this.handle();
                 // postHandle
@@ -116,18 +92,29 @@ class BaseController {
     }
     getSchema() {
         return __awaiter(this, void 0, void 0, function* () {
-            let x = this.getInfo();
-            let parameter = this.getParameterSchema();
-            let body = this.getBodySchema();
-            let query = this.getQuerySchema();
-            let schema = new ControllerSchema_1.ControllerSchema(x.method, x.path, x.tag, x.summary);
-            schema.parameters = yield VariableSchema_1.VariableSchema.parse(parameter);
-            schema.body = yield VariableSchema_1.VariableSchema.parse(body);
-            schema.queries = yield VariableSchema_1.VariableSchema.parse(query);
+            let info = this.getInfo();
+            let schema = new namirasoft_schema_1.ControllerSchema(info.method, info.path, info.tag, info.summary);
+            schema.parameters = this.getParameterSchema();
+            schema.body = this.getBodySchema();
+            schema.queries = this.getQuerySchema();
             schema.output = this.getOutputSchema();
+            this.checkParameterSchema(schema.parameters, info.path);
             return schema;
         });
     }
+    checkParameterSchema(parameters, path) {
+        let regex = /\/:(\w+)\//gm;
+        let ps = [];
+        let match;
+        while ((match = regex.exec("/" + path + "/")) !== null)
+            ps.push(match[1]);
+        for (let i = 0; i < ps.length; i++)
+            if (parameters.filter(p => p.name == ps[i]).length == 0)
+                throw new Error(`There is a parameter ${ps[i]} is path, but not in getParameterSchema function.`);
+        for (let i = 0; i < parameters.length; i++)
+            if (!ps.includes(parameters[i].name))
+                throw new Error(`There is a parameter ${parameters[i].name} is getParameterSchema function, but not in path.`);
+    }
 }
 exports.BaseController = BaseController;
 //# sourceMappingURL=BaseController.js.map

package/dist/BaseController.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseController.js","sourceRoot":"","sources":["../src/BaseController.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseController.js","sourceRoot":"","sources":["../src/BaseController.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -10,7 +10,6 @@ export * from "./BaseSequelizeTable";
 export * from "./BaseTable";
 export * from "./EmailService";
 export * from "./EnvService";
-export * from "./HTTPMethod";
 export * from "./IPOperation";
 export * from "./Meta";
 export * from "./OTPOperation";

package/dist/index.js

@@ -26,7 +26,6 @@ __exportStar(require("./BaseSequelizeTable"), exports);
 __exportStar(require("./BaseTable"), exports);
 __exportStar(require("./EmailService"), exports);
 __exportStar(require("./EnvService"), exports);
-__exportStar(require("./HTTPMethod"), exports);
 __exportStar(require("./IPOperation"), exports);
 __exportStar(require("./Meta"), exports);
 __exportStar(require("./OTPOperation"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,oDAAkC;AAClC,wDAAsC;AACtC,mDAAiC;AACjC,iDAA+B;AAC/B,sDAAoC;AACpC,0DAAwC;AACxC,uDAAqC;AACrC,uDAAqC;AACrC,8CAA4B;AAC5B,iDAA+B;AAC/B,+CAA6B;AAC7B,+CAA6B;AAC7B,gDAA8B;AAC9B,yCAAuB;AACvB,iDAA+B;AAC/B,yDAAuC;AACvC,4DAA0C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,oDAAkC;AAClC,wDAAsC;AACtC,mDAAiC;AACjC,iDAA+B;AAC/B,sDAAoC;AACpC,0DAAwC;AACxC,uDAAqC;AACrC,uDAAqC;AACrC,8CAA4B;AAC5B,iDAA+B;AAC/B,+CAA6B;AAC7B,gDAA8B;AAC9B,yCAAuB;AACvB,iDAA+B;AAC/B,yDAAuC;AACvC,4DAA0C"}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "namirasoft-node",
     "description": "Namira Software Corporation Node NPM Package",
-    "version": "1.1.12",
+    "version": "1.1.14",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "scripts": {},
@@ -11,6 +11,7 @@
         "@supercharge/request-ip": "^1.2.0",
         "@types/cors": "^2.8.17",
         "@types/express": "^4.17.21",
+        "@types/node": "^20.9.4",
         "@types/nodemailer": "^6.4.14",
         "@types/nodemailer-smtp-transport": "^2.7.8",
         "@types/swagger-jsdoc": "^6.0.4",
@@ -20,12 +21,12 @@
         "joi": "^17.11.0",
         "namirasoft-core": "^1.1.7",
         "namirasoft-log": "^1.1.1",
+        "namirasoft-schema": "^1.1.24",
         "nodemailer": "^6.9.7",
         "nodemailer-smtp-transport": "^2.7.4",
         "request-ip": "^3.3.0",
         "sequelize": "^6.35.1",
         "swagger-jsdoc": "^6.2.8",
-        "swagger-ui-express": "^5.0.0",
-        "@types/node": "^20.9.3"
+        "swagger-ui-express": "^5.0.0"
     }
 }

package/src/BaseApplication.ts

@@ -8,7 +8,7 @@ import { ILogger } from "namirasoft-log";
 import { BaseApplicationLink } from './BaseApplicationLink';
 import path from 'path';
 import { PackageService } from 'namirasoft-core';
-import { ApplicationSchema } from './Schema/ApplicationSchema';
+import { ApplicationSchema } from 'namirasoft-schema';
 
 export abstract class BaseApplication<D extends BaseDatabase>
 {

package/src/BaseController.ts

@@ -1,15 +1,11 @@
 import * as express from 'express';
 import { BaseDatabase } from './BaseDatabase';
-import { SchemaLike } from 'joi';
 import { AnomalyDetector } from './AnomalyDetector';
 import { ILogger } from 'namirasoft-log';
 import { Meta } from './Meta';
-import Joi from 'joi';
 import { ErrorOperation, HTTPError } from 'namirasoft-core';
-import { HTTPMethod } from './HTTPMethod';
 import { BaseApplication } from './BaseApplication';
-import { ControllerSchema } from './Schema/ControllerSchema';
-import { VariableSchema } from './Schema/VariableSchema';
+import { HTTPMethod, BaseVariableSchema, ControllerSchema, JoiValidator } from 'namirasoft-schema';
 
 export abstract class BaseController<D extends BaseDatabase, State, Props, Output>
 {
@@ -36,10 +32,10 @@ export abstract class BaseController<D extends BaseDatabase, State, Props, Outpu
     abstract getDatabase(): D;
     abstract getLogger(): ILogger;
     abstract getInfo(): { method: HTTPMethod, path: string, tag: string, summary: string };
-    abstract getParameterSchema(): SchemaLike | null;
-    abstract getBodySchema(): SchemaLike | null;
-    abstract getQuerySchema(): SchemaLike | null;
-    abstract getOutputSchema(): VariableSchema;
+    abstract getParameterSchema(): BaseVariableSchema[];
+    abstract getBodySchema(): BaseVariableSchema | null;
+    abstract getQuerySchema(): BaseVariableSchema[];
+    abstract getOutputSchema(): BaseVariableSchema | null;
     abstract getState(): Promise<State>;
     abstract getProps(): Promise<Props>;
     abstract preHandle(): Promise<void>;
@@ -73,32 +69,9 @@ export abstract class BaseController<D extends BaseDatabase, State, Props, Outpu
                 if (anomaly.isAnomaly(this.meta.ip, this.meta.url))
                     ErrorOperation.throwHTTP(403, 'Suspicious activity detected.');
 
-            // check body validation
-            let bodySchema = this.getBodySchema();
-            if (bodySchema != null)
-            {
-                const validation = await Joi.compile(bodySchema)
-                    .prefs({ errors: { label: 'key' } })
-                    .validate(this.req.body);
-                if (validation.error)
-                {
-                    let message = validation.error.details.map((details) => details.message).join(', ');
-                    ErrorOperation.throwHTTP(400, message);
-                }
-            }
-            // check query validation
-            let querySchema = this.getQuerySchema();
-            if (querySchema != null)
-            {
-                const validation = await Joi.compile(querySchema)
-                    .prefs({ errors: { label: 'key' } })
-                    .validate(this.req.query);
-                if (validation.error)
-                {
-                    let message = validation.error.details.map((details) => details.message).join(', ');
-                    ErrorOperation.throwHTTP(400, message);
-                }
-            }
+            // check
+            JoiValidator.check(this.getBodySchema(), this.req.body);
+            JoiValidator.checkArray(this.getQuerySchema(), this.req.query);
 
             // call controller
             this.output = await this.handle();
@@ -149,15 +122,27 @@ export abstract class BaseController<D extends BaseDatabase, State, Props, Outpu
     }
     async getSchema(): Promise<ControllerSchema>
     {
-        let x = this.getInfo();
-        let parameter = this.getParameterSchema();
-        let body = this.getBodySchema();
-        let query = this.getQuerySchema();
-        let schema = new ControllerSchema(x.method, x.path, x.tag, x.summary);
-        schema.parameters = await VariableSchema.parse(parameter);
-        schema.body = await VariableSchema.parse(body);
-        schema.queries = await VariableSchema.parse(query);
+        let info = this.getInfo();
+        let schema = new ControllerSchema(info.method, info.path, info.tag, info.summary);
+        schema.parameters = this.getParameterSchema();
+        schema.body = this.getBodySchema();
+        schema.queries = this.getQuerySchema();
         schema.output = this.getOutputSchema();
+        this.checkParameterSchema(schema.parameters, info.path);
         return schema;
     }
+    private checkParameterSchema(parameters: BaseVariableSchema[], path: string)
+    {
+        let regex = /\/:(\w+)\//gm;
+        let ps: string[] = []
+        let match;
+        while ((match = regex.exec("/" + path + "/")) !== null)
+            ps.push(match[1]);
+        for (let i = 0; i < ps.length; i++)
+            if (parameters.filter(p => p.name == ps[i]).length == 0)
+                throw new Error(`There is a parameter ${ps[i]} is path, but not in getParameterSchema function.`);
+        for (let i = 0; i < parameters.length; i++)
+            if (!ps.includes(parameters[i].name))
+                throw new Error(`There is a parameter ${parameters[i].name} is getParameterSchema function, but not in path.`);
+    }
 }

package/src/index.ts

@@ -10,7 +10,6 @@ export * from "./BaseSequelizeTable";
 export * from "./BaseTable";
 export * from "./EmailService";
 export * from "./EnvService";
-export * from "./HTTPMethod";
 export * from "./IPOperation";
 export * from "./Meta";
 export * from "./OTPOperation";

package/dist/HTTPMethod.d.ts

@@ -1,6 +0,0 @@
-export declare enum HTTPMethod {
-    GET = 0,
-    POST = 1,
-    PUT = 2,
-    DELETE = 3
-}

package/dist/HTTPMethod.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HTTPMethod = void 0;
-var HTTPMethod;
-(function (HTTPMethod) {
-    HTTPMethod[HTTPMethod["GET"] = 0] = "GET";
-    HTTPMethod[HTTPMethod["POST"] = 1] = "POST";
-    HTTPMethod[HTTPMethod["PUT"] = 2] = "PUT";
-    HTTPMethod[HTTPMethod["DELETE"] = 3] = "DELETE";
-})(HTTPMethod || (exports.HTTPMethod = HTTPMethod = {}));
-//# sourceMappingURL=HTTPMethod.js.map

package/dist/HTTPMethod.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"HTTPMethod.js","sourceRoot":"","sources":["../src/HTTPMethod.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAMX;AAND,WAAY,UAAU;IAElB,yCAAG,CAAA;IACH,2CAAI,CAAA;IACJ,yCAAG,CAAA;IACH,+CAAM,CAAA;AACV,CAAC,EANW,UAAU,0BAAV,UAAU,QAMrB"}

package/dist/Schema/ApplicationSchema.d.ts

@@ -1,6 +0,0 @@
-import { ControllerSchema } from "./ControllerSchema";
-export declare class ApplicationSchema {
-    name: string;
-    controllers: ControllerSchema[];
-    constructor(name: string);
-}

package/dist/Schema/ApplicationSchema.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApplicationSchema = void 0;
-class ApplicationSchema {
-    constructor(name) {
-        this.controllers = [];
-        this.name = name;
-    }
-}
-exports.ApplicationSchema = ApplicationSchema;
-//# sourceMappingURL=ApplicationSchema.js.map

package/dist/Schema/ApplicationSchema.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ApplicationSchema.js","sourceRoot":"","sources":["../../src/Schema/ApplicationSchema.ts"],"names":[],"mappings":";;;AAEA,MAAa,iBAAiB;IAI1B,YAAY,IAAY;QADxB,gBAAW,GAAuB,EAAE,CAAC;QAGjC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;CACJ;AARD,8CAQC"}

package/dist/Schema/ControllerSchema.d.ts

@@ -1,13 +0,0 @@
-import { HTTPMethod } from "../HTTPMethod";
-import { VariableSchema } from "./VariableSchema";
-export declare class ControllerSchema {
-    method: HTTPMethod;
-    path: string;
-    tag: string;
-    summary: string;
-    parameters: VariableSchema[];
-    body: VariableSchema[];
-    queries: VariableSchema[];
-    output: VariableSchema | null;
-    constructor(method: HTTPMethod, path: string, tag: string, summary: string);
-}

package/dist/Schema/ControllerSchema.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControllerSchema = void 0;
-class ControllerSchema {
-    constructor(method, path, tag, summary) {
-        this.parameters = [];
-        this.body = [];
-        this.queries = [];
-        this.output = null;
-        this.method = method;
-        this.path = path;
-        this.tag = tag;
-        this.summary = summary;
-    }
-}
-exports.ControllerSchema = ControllerSchema;
-//# sourceMappingURL=ControllerSchema.js.map

package/dist/Schema/ControllerSchema.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ControllerSchema.js","sourceRoot":"","sources":["../../src/Schema/ControllerSchema.ts"],"names":[],"mappings":";;;AAGA,MAAa,gBAAgB;IAUzB,YAAY,MAAkB,EAAE,IAAY,EAAE,GAAW,EAAE,OAAe;QAJ1E,eAAU,GAAqB,EAAE,CAAC;QAClC,SAAI,GAAqB,EAAE,CAAC;QAC5B,YAAO,GAAqB,EAAE,CAAC;QAC/B,WAAM,GAA0B,IAAI,CAAC;QAGjC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;CACJ;AAjBD,4CAiBC"}

package/dist/Schema/VariableSchema.d.ts

@@ -1,13 +0,0 @@
-import { SchemaLike } from "joi";
-export declare class VariableSchema {
-    static parse(schema: SchemaLike | null): Promise<VariableSchema[]>;
-    name: string;
-    type: string;
-    nullable: boolean;
-    array: number;
-    object: VariableSchema[];
-    valids: string[];
-    min: number | null;
-    max: number | null;
-    constructor(name: string, type: string, nullable: boolean);
-}

package/dist/Schema/VariableSchema.js

@@ -1,33 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VariableSchema = void 0;
-class VariableSchema {
-    static parse(schema) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!schema)
-                return [];
-            return [];
-        });
-    }
-    constructor(name, type, nullable) {
-        this.array = 0;
-        this.object = [];
-        this.valids = [];
-        this.min = null;
-        this.max = null;
-        this.name = name;
-        this.type = type;
-        this.nullable = nullable;
-    }
-}
-exports.VariableSchema = VariableSchema;
-//# sourceMappingURL=VariableSchema.js.map

package/dist/Schema/VariableSchema.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"VariableSchema.js","sourceRoot":"","sources":["../../src/Schema/VariableSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,MAAa,cAAc;IAEvB,MAAM,CAAO,KAAK,CAAC,MAAyB;;YAExC,IAAI,CAAC,MAAM;gBACP,OAAO,EAAE,CAAC;YACd,OAAO,EAAE,CAAC;QACd,CAAC;KAAA;IASD,YAAY,IAAY,EAAE,IAAY,EAAE,QAAiB;QALzD,UAAK,GAAW,CAAC,CAAC;QAClB,WAAM,GAAqB,EAAE,CAAC;QAC9B,WAAM,GAAa,EAAE,CAAC;QACtB,QAAG,GAAkB,IAAI,CAAC;QAC1B,QAAG,GAAkB,IAAI,CAAC;QAGtB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;CACJ;AAtBD,wCAsBC"}

package/src/HTTPMethod.ts

@@ -1,7 +0,0 @@
-export enum HTTPMethod
-{
-    GET,
-    POST,
-    PUT,
-    DELETE
-}

package/src/Schema/ApplicationSchema.ts

@@ -1,11 +0,0 @@
-import { ControllerSchema } from "./ControllerSchema";
-
-export class ApplicationSchema
-{
-    name: string;
-    controllers: ControllerSchema[] = [];
-    constructor(name: string)
-    {
-        this.name = name;
-    }
-}

package/src/Schema/ControllerSchema.ts

@@ -1,21 +0,0 @@
-import { HTTPMethod } from "../HTTPMethod";
-import { VariableSchema } from "./VariableSchema";
-
-export class ControllerSchema
-{
-    method: HTTPMethod;
-    path: string;
-    tag: string;
-    summary: string;
-    parameters: VariableSchema[] = [];
-    body: VariableSchema[] = [];
-    queries: VariableSchema[] = [];
-    output: VariableSchema | null = null;
-    constructor(method: HTTPMethod, path: string, tag: string, summary: string)
-    {
-        this.method = method;
-        this.path = path;
-        this.tag = tag;
-        this.summary = summary;
-    }
-}

package/src/Schema/VariableSchema.ts

@@ -1,25 +0,0 @@
-import { SchemaLike } from "joi";
-
-export class VariableSchema
-{
-    static async parse(schema: SchemaLike | null): Promise<VariableSchema[]>
-    {
-        if (!schema)
-            return [];
-        return [];
-    }
-    name: string;
-    type: string;
-    nullable: boolean;
-    array: number = 0;
-    object: VariableSchema[] = [];
-    valids: string[] = [];
-    min: number | null = null;
-    max: number | null = null;
-    constructor(name: string, type: string, nullable: boolean)
-    {
-        this.name = name;
-        this.type = type;
-        this.nullable = nullable;
-    }
-}