@spinajs/validation 1.0.0 → 1.1.6

package/lib/config/validation.d.ts

@@ -1 +1,9 @@
-export {};
+declare const config: {
+    validation: {
+        allErrors: boolean;
+        removeAdditional: boolean;
+        useDefaults: boolean;
+        coerceTypes: boolean;
+    };
+};
+export default config;

package/lib/config/validation.js

@@ -1,15 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = require("path");
-function dir(path) {
-    return path_1.resolve(path_1.normalize(path_1.join(__dirname, path)));
-}
-module.exports = {
-    system: {
-        dirs: {
-            schemas: [dir('./../schemas')],
-        }
-    },
+const config = {
     validation: {
         // enable all errors on  validation, not only first one that occurred
         allErrors: true,
@@ -21,4 +12,5 @@ module.exports = {
         coerceTypes: true
     }
 };
+exports.default = config;
 //# sourceMappingURL=validation.js.map

package/lib/config/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/config/validation.ts"],"names":[],"mappings":";;AAAA,+BAAgD;AAEhD,SAAS,GAAG,CAAC,IAAY;IACrB,OAAO,cAAO,CAAC,gBAAS,CAAC,WAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,CAAC,OAAO,GAAG;IACb,MAAM,EAAE;QACJ,IAAI,EAAE;YACF,OAAO,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;SACjC;KACJ;IACD,UAAU,EAAE;QAER,qEAAqE;QACrE,SAAS,EAAE,IAAI;QAEf,mDAAmD;QACnD,gBAAgB,EAAE,IAAI;QAEtB,iCAAiC;QACjC,WAAW,EAAE,IAAI;QAEjB,wHAAwH;QACxH,WAAW,EAAE,IAAI;KACpB;CACJ,CAAA"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/config/validation.ts"],"names":[],"mappings":";;AAAA,MAAM,MAAM,GAAG;IACX,UAAU,EAAE;QACR,qEAAqE;QACrE,SAAS,EAAE,IAAI;QAEf,mDAAmD;QACnD,gBAAgB,EAAE,IAAI;QAEtB,iCAAiC;QACjC,WAAW,EAAE,IAAI;QAEjB,wHAAwH;QACxH,WAAW,EAAE,IAAI;KACpB;CACJ,CAAA;AAED,kBAAe,MAAM,CAAC"}

package/lib/decorators.js

@@ -10,7 +10,7 @@ exports.SCHEMA_SYMBOL = Symbol('SCHEMA_SYMBOL');
  */
 function Schema(schema) {
     return (target) => {
-        Reflect.defineMetadata(exports.SCHEMA_SYMBOL, schema, target);
+        Reflect.defineMetadata(exports.SCHEMA_SYMBOL, schema, target.prototype || target);
     };
 }
 exports.Schema = Schema;

package/lib/decorators.js.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAErD;;;;;GAKG;AACH,SAAgB,MAAM,CAAC,MAAuB;IAC1C,OAAO,CAAC,MAAW,EAAE,EAAE;QACnB,OAAO,CAAC,cAAc,CAAC,qBAAa,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC,CAAC;AACN,CAAC;AAJD,wBAIC"}
+{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAErD;;;;;GAKG;AACH,SAAgB,MAAM,CAAC,MAAuB;IAC1C,OAAO,CAAC,MAAW,EAAE,EAAE;QACnB,OAAO,CAAC,cAAc,CAAC,qBAAa,EAAE,MAAM,EAAE,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,CAAC;IAC9E,CAAC,CAAC;AACN,CAAC;AAJD,wBAIC"}

package/lib/exceptions/index.d.ts

@@ -5,7 +5,7 @@ import { ErrorObject } from "ajv";
  */
 export declare class ValidationFailed extends Exception {
     parameter: any;
-    constructor(message: string, validationErrors: ValidationError[]);
+    constructor(message: string, validationErrors: IValidationError[]);
 }
-export interface ValidationError extends ErrorObject {
+export interface IValidationError extends ErrorObject {
 }

package/lib/exceptions/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/exceptions/index.ts"],"names":[],"mappings":";;;AAAA,oDAAgD;AAEhD;;GAEG;AACF,MAAa,gBAAiB,SAAQ,sBAAS;IAG5C,YAAY,OAAe,EAAE,gBAAmC;QAC9D,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,gBAAgB,CAAC;IACpC,CAAC;CACF;AAPF,4CAOE"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/exceptions/index.ts"],"names":[],"mappings":";;;AAAA,oDAAgD;AAEhD;;GAEG;AACF,MAAa,gBAAiB,SAAQ,sBAAS;IAG5C,YAAY,OAAe,EAAE,gBAAoC;QAC/D,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,gBAAgB,CAAC;IACpC,CAAC;CACF;AAPF,4CAOE"}

package/lib/index.d.ts

@@ -1,44 +1,12 @@
-import { AsyncModule, IContainer } from "@spinajs/di";
-import Ajv from "ajv";
-import { Configuration } from "@spinajs/configuration";
-import { Log } from "@spinajs/log";
-import { ValidationError } from "./exceptions";
-export declare class DataValidator extends AsyncModule {
-    protected Validator: Ajv.Ajv;
-    protected Configuration: Configuration;
-    protected Container: IContainer;
-    protected Log: Log;
-    resolveAsync(container: IContainer): Promise<void>;
-    /**
-     * Tries to validate given data
-     *
-     * @param data data to validate. Function will try to extract schema attached to object via @Schema decorator
-     * @return { array : [boolean, ValidationError[]]} [0] true if data is valid, false otherwise, [1] list of all errors. If
-     *                                                 set in config validation.allErrors is set to false, only firs error is returned
-     */
-    tryValidate(data: any): [boolean, ValidationError[]];
-    /**
-     * Tries to validate given data
-     *
-     * @param  {string|object|Boolean} schemaKeyRef key, ref or schema object
-     * @param  {Any} data to be validated
-     * @return { array : [boolean, ValidationError[]]} [0] true if data is valid, false otherwise, [1] list of all errors. If
-     *                                                 set in config validation.allErrors is set to false, only firs error is returned
-     */
-    tryValidate(schema: object | string | boolean, data: any): [boolean, ValidationError[]];
-    /**
-     * Validate given data. When failed, exception is thrown
-     *
-     * @param data data to validate. Function will try to extract schema attached to object via @Schema decorator
-     * @throws {InvalidArgumen | ValidationFailed }
-     */
-    validate(data: any): void;
-    /**
-     * Validate given data
-     *
-     * @param  {string|object|Boolean} schemaKeyRef key, ref or schema object
-     * @param  {Any} data to be validated
-     * @throws {InvalidArgumen | ValidationFailed }
-     */
-    validate(schema: object | string | boolean, data: any): void;
-}
+/**
+ * We export default configuration for webpack modules
+ * Normally we load configuration from disk via filesystem
+ * But webpack is bundlig all files into one.
+ *
+ * When we export, we can see configuration variable
+ * in webpack module cache and webpack config loader can see it
+ */
+export * from "./config/validation";
+export * from "./decorators";
+export * from "./exceptions";
+export * from "./validator";

package/lib/index.js

@@ -6,130 +6,20 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    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;
-};
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataValidator = void 0;
-const di_1 = require("@spinajs/di");
-const ajv_1 = __importDefault(require("ajv"));
-const configuration_1 = require("@spinajs/configuration");
-const fs = __importStar(require("fs"));
-const glob = __importStar(require("glob"));
-const path = __importStar(require("path"));
-const log_1 = require("@spinajs/log");
-const exceptions_1 = require("./exceptions");
-const exceptions_2 = require("@spinajs/exceptions");
-const decorators_1 = require("./decorators");
-class DataValidator extends di_1.AsyncModule {
-    async resolveAsync(container) {
-        this.Configuration = await container.resolve(configuration_1.Configuration);
-        this.Container = container;
-        const ajvConfig = Object.assign({ logger: {
-                log: this.Log.info.bind(this.Log),
-                warn: this.Log.warn.bind(this.Log),
-                error: this.Log.error.bind(this.Log)
-            } }, this.Configuration.get("validation"));
-        this.Validator = new ajv_1.default(ajvConfig);
-        // add $merge & $patch for json schema
-        require("ajv-merge-patch")(this.Validator);
-        // add common formats validation eg: date time
-        require("ajv-formats")(this.Validator);
-        // add keywords
-        require("ajv-keywords")(this.Validator);
-        this.Configuration.get("system.dirs.schemas", [])
-            .filter(dir => fs.existsSync(dir))
-            .flatMap((d) => glob.sync(path.join(d, "*.json")))
-            .map(f => {
-            return {
-                schema: require(f),
-                file: path.basename(f)
-            };
-        })
-            .filter(s => {
-            const isValid = this.Validator.validateSchema(s.schema);
-            if (!isValid) {
-                this.Log.warn(`Schema is not valid %s`, s.file);
-                return false;
-            }
-            return true;
-        })
-            .forEach(s => {
-            var _a;
-            const schemaId = (_a = s.schema.$id) !== null && _a !== void 0 ? _a : path.basename(s.file);
-            this.Log.trace(`Added schema ${schemaId}`);
-            this.Validator.addSchema(s.schema, schemaId);
-        });
-    }
-    tryValidate(schemaOrData, data) {
-        if (arguments.length === 1) {
-            const schema = Reflect.getMetadata(decorators_1.SCHEMA_SYMBOL, schemaOrData);
-            if (!schema) {
-                return [false, [{
-                            keyword: "empty_schema",
-                            dataPath: "data",
-                            schemaPath: "",
-                            params: "data"
-                        }]];
-            }
-            const result = this.Validator.validate(schema, schemaOrData);
-            if (!result) {
-                return [false, this.Validator.errors];
-            }
-        }
-        else {
-            if (!data) {
-                return [false, [{
-                            keyword: "invalid_argument",
-                            dataPath: "data",
-                            schemaPath: "",
-                            params: "data"
-                        }]];
-            }
-            const result = this.Validator.validate(schemaOrData, data);
-            if (!result) {
-                return [false, this.Validator.errors];
-            }
-        }
-    }
-    validate(schemaOrData, data) {
-        const [isValid, errors] = this.tryValidate(schemaOrData, data);
-        if (!isValid) {
-            switch (errors[0].keyword) {
-                case "invalid_argument":
-                    throw new exceptions_2.InvalidArgument("data is null or undefined");
-                case "empty_schema":
-                    throw new exceptions_2.InvalidArgument("objects schema is not set");
-                default:
-                    throw new exceptions_1.ValidationFailed("validation error", errors);
-            }
-        }
-    }
-}
-__decorate([
-    log_1.Logger(),
-    __metadata("design:type", Object)
-], DataValidator.prototype, "Log", void 0);
-exports.DataValidator = DataValidator;
+/**
+ * We export default configuration for webpack modules
+ * Normally we load configuration from disk via filesystem
+ * But webpack is bundlig all files into one.
+ *
+ * When we export, we can see configuration variable
+ * in webpack module cache and webpack config loader can see it
+ */
+__exportStar(require("./config/validation"), exports);
+__exportStar(require("./decorators"), exports);
+__exportStar(require("./exceptions"), exports);
+__exportStar(require("./validator"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;GAOG;AACF,sDAAoC;AACrC,+CAA6B;AAC7B,+CAA6B;AAC7B,8CAA4B"}

package/lib/sources.d.ts

@@ -0,0 +1,12 @@
+interface ISchema {
+    schema: any;
+    file?: string;
+}
+export declare abstract class SchemaSource {
+    abstract Load(): ISchema[];
+}
+export declare class FileSystemSource extends SchemaSource {
+    SchemaDirs: string[];
+    Load(): ISchema[];
+}
+export {};

package/lib/sources.js

@@ -0,0 +1,62 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+};
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileSystemSource = exports.SchemaSource = void 0;
+const lib_1 = require("@spinajs/configuration/lib");
+const di_1 = require("@spinajs/di");
+const log_1 = require("@spinajs/log/lib/log");
+const fs = __importStar(require("fs"));
+const glob = __importStar(require("glob"));
+const path = __importStar(require("path"));
+class SchemaSource {
+}
+exports.SchemaSource = SchemaSource;
+let FileSystemSource = class FileSystemSource extends SchemaSource {
+    Load() {
+        return this.SchemaDirs.filter(dir => fs.existsSync(dir))
+            .flatMap((d) => glob.sync(path.join(d, "/**/*.+(json|js)")))
+            .map(f => {
+            log_1.Log.trace(`Found schema at: ${f}`, "validation");
+            return {
+                schema: require(f),
+                file: path.basename(f)
+            };
+        });
+    }
+};
+__decorate([
+    (0, lib_1.Config)("system.dirs.schemas"),
+    __metadata("design:type", Array)
+], FileSystemSource.prototype, "SchemaDirs", void 0);
+FileSystemSource = __decorate([
+    (0, di_1.Injectable)(SchemaSource)
+], FileSystemSource);
+exports.FileSystemSource = FileSystemSource;
+//# sourceMappingURL=sources.js.map

package/lib/sources.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sources.js","sourceRoot":"","sources":["../src/sources.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAoD;AACpD,oCAAyC;AACzC,8CAA2C;AAC3C,uCAAyB;AACzB,2CAA6B;AAC7B,2CAA6B;AAO7B,MAAsB,YAAY;CAEjC;AAFD,oCAEC;AAGD,IAAa,gBAAgB,GAA7B,MAAa,gBAAiB,SAAQ,YAAY;IAKvC,IAAI;QACP,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;aACnD,OAAO,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC;aACnE,GAAG,CAAC,CAAC,CAAC,EAAE;YAEL,SAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;YAEjD,OAAO;gBACH,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;gBAClB,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;aACzB,CAAC;QACN,CAAC,CAAC,CAAA;IACV,CAAC;CAEJ,CAAA;AAhBG;IADC,IAAA,YAAM,EAAC,qBAAqB,CAAC;;oDACF;AAHnB,gBAAgB;IAD5B,IAAA,eAAU,EAAC,YAAY,CAAC;GACZ,gBAAgB,CAmB5B;AAnBY,4CAAgB"}

package/lib/validator.d.ts

@@ -0,0 +1,52 @@
+import { SyncModule, IContainer } from "@spinajs/di";
+import Ajv from "ajv";
+import { IValidationError } from "./exceptions";
+import { SchemaSource } from "./sources";
+export declare class DataValidator extends SyncModule {
+    Options: any;
+    protected Sources: SchemaSource[];
+    protected Validator: Ajv;
+    protected Container: IContainer;
+    resolve(container: IContainer): void;
+    addSchema(schemaObject: any, identifier: string): void;
+    /**
+     *
+     * Checks if schema is loaded ( from file )
+     *
+     * @param schemaId schema id to check
+     * @returns { boolean } true if schema is loaded, false otherwise
+     */
+    hasSchema(schemaId: string): boolean;
+    /**
+     * Tries to validate given data
+     *
+     * @param data data to validate. Function will try to extract schema attached to object via @Schema decorator
+     * @return { array : [boolean, ValidationError[]]} [0] true if data is valid, false otherwise, [1] list of all errors. If
+     *                                                 set in config validation.allErrors is set to false, only firs error is returned
+     */
+    tryValidate(data: any): [boolean, IValidationError[]];
+    /**
+     * Tries to validate given data
+     *
+     * @param  {string|object|Boolean} schemaKeyRef key, ref or schema object
+     * @param  {Any} data to be validated
+     * @return { array : [boolean, ValidationError[]]} [0] true if data is valid, false otherwise, [1] list of all errors. If
+     *                                                 set in config validation.allErrors is set to false, only firs error is returned
+     */
+    tryValidate(schema: object | string, data: any): [boolean, IValidationError[]];
+    /**
+     * Validate given data. When failed, exception is thrown
+     *
+     * @param data data to validate. Function will try to extract schema attached to object via @Schema decorator
+     * @throws {InvalidArgument | ValidationFailed }
+     */
+    validate(data: any): void;
+    /**
+     * Validate given data
+     *
+     * @param  {string|object|Boolean} schemaKeyRef key, ref or schema object
+     * @param  {Any} data to be validated
+     * @throws {InvalidArgumen | ValidationFailed }
+     */
+    validate(schema: object | string, data: any): void;
+}

package/lib/validator.js

@@ -0,0 +1,150 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataValidator = void 0;
+const di_1 = require("@spinajs/di");
+const ajv_1 = __importDefault(require("ajv"));
+const configuration_1 = require("@spinajs/configuration");
+const exceptions_1 = require("./exceptions");
+const exceptions_2 = require("@spinajs/exceptions");
+const decorators_1 = require("./decorators");
+const log_1 = require("@spinajs/log/lib/log");
+const sources_1 = require("./sources");
+class DataValidator extends di_1.SyncModule {
+    resolve(container) {
+        this.Sources = container.resolve(Array.ofType(sources_1.SchemaSource));
+        if (!this.Sources || this.Sources.length === 0) {
+            throw new exceptions_2.InvalidOperation("No schema sources avaible. Register any in DI container");
+        }
+        const ajvConfig = Object.assign({ logger: {
+                log: (msg) => log_1.Log.info(msg, "validation"),
+                warn: (msg) => log_1.Log.warn(msg, "validation"),
+                error: (msg) => log_1.Log.error(msg, "validation")
+            } }, this.Options);
+        this.Validator = new ajv_1.default(ajvConfig);
+        // add $merge & $patch for json schema
+        require("ajv-merge-patch")(this.Validator);
+        // add common formats validation eg: date time
+        require("ajv-formats")(this.Validator);
+        // add keywords
+        require("ajv-keywords")(this.Validator);
+        this.Sources.map(x => x.Load()).reduce((prev, curr) => {
+            return prev.concat(curr);
+        }, []).filter(s => {
+            // validate schema can throw sometimes
+            try {
+                const vResult = this.Validator.validateSchema(s.schema, true);
+                if (!vResult) {
+                    log_1.Log.error(`Schema at ${s.file} invalid`, "validator");
+                    return false;
+                }
+                return true;
+            }
+            catch (err) {
+                log_1.Log.error(`Schema at ${s.file} invalid, reason: ${err.message}`, "validator");
+                return false;
+            }
+        }).forEach(s => {
+            this.addSchema(s.schema, s.schema.$id);
+        });
+        super.resolve(container);
+    }
+    addSchema(schemaObject, identifier) {
+        if (!this.hasSchema(identifier)) {
+            this.Validator.addSchema(schemaObject, identifier);
+            log_1.Log.trace(`Schema ${identifier} added !`, "validator");
+        }
+    }
+    /**
+     *
+     * Checks if schema is loaded ( from file )
+     *
+     * @param schemaId schema id to check
+     * @returns { boolean } true if schema is loaded, false otherwise
+     */
+    hasSchema(schemaId) {
+        return !!this.Validator.getSchema(schemaId);
+    }
+    tryValidate(schemaOrData, data) {
+        var _a, _b;
+        if (arguments.length === 1) {
+            const schema = Reflect.getMetadata(decorators_1.SCHEMA_SYMBOL, schemaOrData);
+            if (!schema) {
+                return [false, [{
+                            keyword: "empty_schema",
+                            instancePath: "./",
+                            schemaPath: "",
+                            params: { "data": "" }
+                        }]];
+            }
+            const result = this.Validator.validate(schema, schemaOrData);
+            if (!result) {
+                return [false, (_a = this.Validator.errors) !== null && _a !== void 0 ? _a : null];
+            }
+        }
+        else {
+            if (!data) {
+                return [false, [{
+                            keyword: "invalid_argument",
+                            instancePath: "./",
+                            schemaPath: "",
+                            params: { "data": "" }
+                        }]];
+            }
+            let schema = null;
+            if (typeof schemaOrData === "object") {
+                schema = schemaOrData;
+            }
+            else if (typeof schemaOrData === 'string') {
+                const s = this.Validator.getSchema(schemaOrData);
+                schema = s === null || s === void 0 ? void 0 : s.schema;
+            }
+            else {
+                schema = Reflect.getMetadata(decorators_1.SCHEMA_SYMBOL, schemaOrData);
+            }
+            if (!schema) {
+                return [false, [{
+                            keyword: "empty_schema",
+                            instancePath: "./",
+                            schemaPath: "",
+                            params: { "data": "" }
+                        }]];
+            }
+            const result = this.Validator.validate(schema, data);
+            if (!result) {
+                return [false, (_b = this.Validator.errors) !== null && _b !== void 0 ? _b : null];
+            }
+        }
+        return [true, null];
+    }
+    validate(schemaOrData, data) {
+        const [isValid, errors] = this.tryValidate(schemaOrData, data);
+        if (!isValid) {
+            switch (errors[0].keyword) {
+                case "invalid_argument":
+                    throw new exceptions_2.InvalidArgument("data is null or undefined");
+                case "empty_schema":
+                    throw new exceptions_2.InvalidArgument("objects schema is not set");
+                default:
+                    throw new exceptions_1.ValidationFailed("validation error", errors);
+            }
+        }
+    }
+}
+__decorate([
+    (0, configuration_1.Config)("validation"),
+    __metadata("design:type", Object)
+], DataValidator.prototype, "Options", void 0);
+exports.DataValidator = DataValidator;
+//# sourceMappingURL=validator.js.map

package/lib/validator.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spinajs/validation",
-  "version": "1.0.0",
+  "version": "1.1.6",
   "description": "validation library for spinajs framework",
   "main": "lib/index.js",
   "private": false,
@@ -12,7 +12,7 @@
     "prepare": "npm run build",
     "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
     "lint": "tslint -p tsconfig.json",
-    "prepublishOnly": "",
+    "prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",
     "version": "npm run format && git add -A src",
     "postversion": "git push && git push --tags"
@@ -36,14 +36,14 @@
   },
   "homepage": "https://github.com/spinajs/validation#readme",
   "dependencies": {
-    "@spinajs/configuration": "^1.0.16",
-    "@spinajs/di": "^1.1.0",
-    "@spinajs/exceptions": "^1.0.4",
-    "@spinajs/log": "^1.0.10",
-    "ajv": "^6.12.2",
+    "@spinajs/configuration": "^1.1.7",
+    "@spinajs/di": "^1.1.7",
+    "@spinajs/exceptions": "^1.0.5",
+    "@spinajs/log": "^1.1.6",
+    "ajv": "^8.8.2",
     "ajv-formats": "^2.1.1",
     "ajv-keywords": "^5.1.0",
-    "ajv-merge-patch": "^4.1.0"
+    "ajv-merge-patch": "^5.0.1"
   },
   "devDependencies": {
     "@types/bunyan": "^1.8.6",
@@ -55,6 +55,7 @@
     "@types/cors": "^2.8.6",
     "@types/express": "^4.17.6",
     "@types/formidable": "^1.0.31",
+    "@types/glob": "^7.2.0",
     "@types/helmet": "^0.0.47",
     "@types/lodash": "^4.14.136",
     "@types/luxon": "^2.0.8",
@@ -82,6 +83,6 @@
     "tslint-config-standard": "^8.0.1",
     "tslint-no-unused-expression-chai": "^0.1.4",
     "typedoc": "^0.14.2",
-    "typescript": "^3.7.3"
+    "typescript": "^4.2.3"
   }
 }