@spinajs/validation 1.1.2 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,14 +1,13 @@
1
1
  import { SyncModule, IContainer } from "@spinajs/di";
2
2
  import Ajv from "ajv";
3
- import { Configuration } from "@spinajs/configuration";
4
3
  import { ValidationError } from "./exceptions";
5
4
  export declare class DataValidator extends SyncModule {
6
5
  Options: any;
7
6
  SchemaDirs: string[];
8
7
  protected Validator: Ajv;
9
- protected Configuration: Configuration;
10
8
  protected Container: IContainer;
11
9
  resolve(container: IContainer): void;
10
+ addSchema(schemaObject: any, identifier: string): void;
12
11
  /**
13
12
  *
14
13
  * Checks if schema is loaded ( from file )
@@ -82,13 +82,17 @@ class DataValidator extends di_1.SyncModule {
82
82
  }
83
83
  })
84
84
  .forEach(s => {
85
- var _a, _b;
86
- const schemaName = (_a = s.schema.$id) !== null && _a !== void 0 ? _a : path.basename(s.file);
87
- this.Validator.addSchema(s.schema, (_b = s.schema.$id) !== null && _b !== void 0 ? _b : path.basename(s.file));
88
- log_1.Log.info(`Schema ${schemaName} added !`, "validator");
85
+ var _a;
86
+ this.addSchema(s.schema, (_a = s.schema.$id) !== null && _a !== void 0 ? _a : path.basename(s.file));
89
87
  });
90
88
  super.resolve(container);
91
89
  }
90
+ addSchema(schemaObject, identifier) {
91
+ if (!this.hasSchema(identifier)) {
92
+ this.Validator.addSchema(schemaObject, identifier);
93
+ log_1.Log.trace(`Schema ${identifier} added !`, "validator");
94
+ }
95
+ }
92
96
  /**
93
97
  *
94
98
  * Checks if schema is loaded ( from file )
@@ -1 +1 @@
1
- {"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/validator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/validator.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@spinajs/validation",
3
- "version": "1.1.2",
3
+ "version": "1.1.3",
4
4
  "description": "validation library for spinajs framework",
5
5
  "main": "lib/index.js",
6
6
  "private": false,
@@ -36,10 +36,10 @@
36
36
  },
37
37
  "homepage": "https://github.com/spinajs/validation#readme",
38
38
  "dependencies": {
39
- "@spinajs/configuration": "^1.1.2",
39
+ "@spinajs/configuration": "^1.1.4",
40
40
  "@spinajs/di": "^1.1.7",
41
41
  "@spinajs/exceptions": "^1.0.5",
42
- "@spinajs/log": "^1.1.0",
42
+ "@spinajs/log": "^1.1.1",
43
43
  "ajv": "^8.8.2",
44
44
  "ajv-formats": "^2.1.1",
45
45
  "ajv-keywords": "^5.1.0",