@map-colonies/config 2.1.0 → 2.2.0
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.
- package/dist/constants.js +1 -1
- package/dist/constants.js.map +1 -1
- package/dist/validator.js +20 -1
- package/dist/validator.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +2 -1
package/dist/constants.js
CHANGED
|
@@ -11,5 +11,5 @@ exports.LOCAL_SCHEMAS_PACKAGE_VERSION = (0, read_pkg_1.readPackageJsonSync)(node
|
|
|
11
11
|
exports.PACKAGE_NAME = (0, read_pkg_1.readPackageJsonSync)('package.json').name ?? 'package-name-not-defined';
|
|
12
12
|
exports.SCHEMA_DOMAIN = 'https://mapcolonies.com/';
|
|
13
13
|
exports.SCHEMAS_PACKAGE_RESOLVED_PATH = require.resolve('@map-colonies/schemas');
|
|
14
|
-
exports.SCHEMA_BASE_PATH = exports.SCHEMAS_PACKAGE_RESOLVED_PATH.substring(0, exports.SCHEMAS_PACKAGE_RESOLVED_PATH.lastIndexOf(
|
|
14
|
+
exports.SCHEMA_BASE_PATH = exports.SCHEMAS_PACKAGE_RESOLVED_PATH.substring(0, exports.SCHEMAS_PACKAGE_RESOLVED_PATH.lastIndexOf(node_path_1.default.sep));
|
|
15
15
|
//# sourceMappingURL=constants.js.map
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA6B;AAC7B,qDAA6D;AAE7D,MAAM,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;AACxI,QAAA,6BAA6B,GAAG,IAAA,8BAAmB,EAAC,mBAAI,CAAC,IAAI,CAAC,2BAA2B,EAAE,cAAc,CAAC,CAAC,CAAC,OAAiB,CAAC;AAC9H,QAAA,YAAY,GAAG,IAAA,8BAAmB,EAAC,cAAc,CAAC,CAAC,IAAI,IAAI,0BAA0B,CAAC;AAEtF,QAAA,aAAa,GAAG,0BAA0B,CAAC;AAE3C,QAAA,6BAA6B,GAAG,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;AACzE,QAAA,gBAAgB,GAAG,qCAA6B,CAAC,SAAS,CAAC,CAAC,EAAE,qCAA6B,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA6B;AAC7B,qDAA6D;AAE7D,MAAM,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;AACxI,QAAA,6BAA6B,GAAG,IAAA,8BAAmB,EAAC,mBAAI,CAAC,IAAI,CAAC,2BAA2B,EAAE,cAAc,CAAC,CAAC,CAAC,OAAiB,CAAC;AAC9H,QAAA,YAAY,GAAG,IAAA,8BAAmB,EAAC,cAAc,CAAC,CAAC,IAAI,IAAI,0BAA0B,CAAC;AAEtF,QAAA,aAAa,GAAG,0BAA0B,CAAC;AAE3C,QAAA,6BAA6B,GAAG,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;AACzE,QAAA,gBAAgB,GAAG,qCAA6B,CAAC,SAAS,CAAC,CAAC,EAAE,qCAA6B,CAAC,WAAW,CAAC,mBAAI,CAAC,GAAG,CAAC,CAAC,CAAC"}
|
package/dist/validator.js
CHANGED
|
@@ -22,6 +22,25 @@ const ajvConfigValidator = (0, ajv_formats_1.default)(new _2019_1.default({
|
|
|
22
22
|
}));
|
|
23
23
|
exports.ajvConfigValidator = ajvConfigValidator;
|
|
24
24
|
ajvConfigValidator.addMetaSchema(draft7MetaSchema, 'http://json-schema.org/draft-07/schema#');
|
|
25
|
+
function enrichErrors(betterErrors, errors) {
|
|
26
|
+
return betterErrors.map((error, index) => {
|
|
27
|
+
// eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
|
|
28
|
+
switch (error.context.errorType) {
|
|
29
|
+
case 'unevaluatedProperties': {
|
|
30
|
+
const originalError = errors[index];
|
|
31
|
+
if (!originalError || originalError.keyword !== 'unevaluatedProperties') {
|
|
32
|
+
return error;
|
|
33
|
+
}
|
|
34
|
+
return {
|
|
35
|
+
...error,
|
|
36
|
+
params: originalError.params,
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
default:
|
|
40
|
+
return error;
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
}
|
|
25
44
|
exports.ajvOptionsValidator = new _2019_1.default({
|
|
26
45
|
useDefaults: true,
|
|
27
46
|
coerceTypes: true,
|
|
@@ -35,7 +54,7 @@ function validate(ajv, schema, data) {
|
|
|
35
54
|
if (!valid) {
|
|
36
55
|
debug('validation failed with errors %j', ajv.errors);
|
|
37
56
|
const betterErrors = (0, better_ajv_errors_1.betterAjvErrors)({ schema: schema, data, errors: ajv.errors });
|
|
38
|
-
return [betterErrors, undefined];
|
|
57
|
+
return [enrichErrors(betterErrors, ajv.errors), undefined];
|
|
39
58
|
}
|
|
40
59
|
debug('validation successful');
|
|
41
60
|
return [undefined, clonedData];
|
package/dist/validator.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":";;;;;;AAsDA,4BAcC;AApED,qCAAuC;AACvC,0DAAgF;AAChF,8DAAqC;AACrC,oDAA4B;AAC5B,kEAA8E;AAC9E,yCAA4C;AAE5C,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,WAAW,CAAC,CAAC;AAEvC,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CACjC,IAAA,sBAAY,EAAC,OAAO,CAAC,OAAO,CAAC,yCAAyC,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAC7E,CAAC;AAErB,MAAM,kBAAkB,GAAG,IAAA,qBAAU,EACnC,IAAI,eAAG,CAAC;IACN,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,IAAI;IACf,OAAO,EAAE,IAAI;IACb,aAAa,EAAE,IAAI;IACnB,QAAQ,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC;CAC1C,CAAC,CACH,CAAC;AAwBO,gDAAkB;AAtB3B,kBAAkB,CAAC,aAAa,CAAC,gBAAgB,EAAE,yCAAyC,CAAC,CAAC;AAE9F,SAAS,YAAY,CAAC,YAA+B,EAAE,MAAqB;IAC1E,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACvC,0EAA0E;QAC1E,QAAQ,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;YAChC,KAAK,uBAAuB,CAAC,CAAC,CAAC;gBAC7B,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;gBACpC,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,OAAO,KAAK,uBAAuB,EAAE,CAAC;oBACxE,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,OAAO;oBACL,GAAG,KAAK;oBACR,MAAM,EAAE,aAAa,CAAC,MAAM;iBAC7B,CAAC;YACJ,CAAC;YACD;gBACE,OAAO,KAAK,CAAC;QACjB,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAIY,QAAA,mBAAmB,GAAG,IAAI,eAAG,CAAC;IACzC,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,IAAI;IACf,OAAO,EAAE,IAAI;CACd,CAAC,CAAC;AAEH,SAAgB,QAAQ,CAAI,GAAQ,EAAE,MAAoB,EAAE,IAAa;IACvE,KAAK,CAAC,mCAAmC,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAE7D,MAAM,UAAU,GAAG,gBAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE/C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,KAAK,CAAC,kCAAkC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,YAAY,GAAG,IAAA,mCAAe,EAAC,EAAE,MAAM,EAAE,MAAyD,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QACtI,OAAO,CAAC,YAAY,CAAC,YAAY,EAAE,GAAG,CAAC,MAAuB,CAAC,EAAE,SAAS,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC/B,OAAO,CAAC,SAAS,EAAE,UAAe,CAAC,CAAC;AACtC,CAAC"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const PACKAGE_VERSION = "2.
|
|
1
|
+
export declare const PACKAGE_VERSION = "2.2.0";
|
package/dist/version.js
CHANGED
package/package.json
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@map-colonies/config",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.2.0",
|
|
4
4
|
"description": "Config package for MapColonies with support for central config management",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"exports": {
|
|
7
7
|
".": {
|
|
8
8
|
"require": "./dist/index.js",
|
|
9
|
+
"import": "./dist/index.js",
|
|
9
10
|
"types": "./dist/index.d.ts"
|
|
10
11
|
}
|
|
11
12
|
},
|