@map-colonies/config 2.3.0 → 3.0.1
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/config.js +2 -2
- package/dist/config.js.map +1 -1
- package/dist/httpClient.d.ts +1 -1
- package/dist/httpClient.js +3 -2
- package/dist/httpClient.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +2 -2
package/dist/config.js
CHANGED
|
@@ -22,7 +22,7 @@ const helpers_1 = require("./utils/helpers");
|
|
|
22
22
|
const debug = (0, debug_1.createDebug)('config');
|
|
23
23
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
|
|
24
24
|
const arrayMerge = (destinationArray, sourceArray) => sourceArray;
|
|
25
|
-
const semverSatisfies = '
|
|
25
|
+
const semverSatisfies = '2.x';
|
|
26
26
|
/**
|
|
27
27
|
* Retrieves the configuration based on the provided options.
|
|
28
28
|
*
|
|
@@ -58,7 +58,7 @@ async function config(options) {
|
|
|
58
58
|
});
|
|
59
59
|
}
|
|
60
60
|
// get the remote config
|
|
61
|
-
serverConfigResponse = await (0, httpClient_1.getRemoteConfig)(configName, version);
|
|
61
|
+
serverConfigResponse = await (0, httpClient_1.getRemoteConfig)(configName, options.schema.$id, version);
|
|
62
62
|
if (serverConfigResponse.schemaId !== baseSchema.$id) {
|
|
63
63
|
debug('schema version mismatch. local: %s, remote: %s', baseSchema.$id, serverConfigResponse.schemaId);
|
|
64
64
|
throw (0, errors_1.createConfigError)('schemaVersionMismatchError', 'The schema version of the remote config does not match the schema version of the local config', {
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;AA+BA,wBAgHC;AA/ID,0DAAkC;AAClC,uEAAwE;AACxE,oDAA+B;AAC/B,mCAAuC;AAEvC,oDAAmD;AACnD,+BAAqC;AAErC,uCAAuC;AACvC,uCAA0D;AAC1D,6CAAsE;AACtE,2CAA2D;AAC3D,yCAA4C;AAC5C,2CAA4D;AAC5D,qCAA6C;AAC7C,uCAA2E;AAC3E,6CAA6C;AAE7C,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,QAAQ,CAAC,CAAC;AAEpC,+DAA+D;AAC/D,MAAM,UAAU,GAAoC,CAAC,gBAAgB,EAAE,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC;AACnG,MAAM,eAAe,GAAG,KAAK,CAAC;AAE9B;;;;;;GAMG;AACI,KAAK,UAAU,MAAM,CAC1B,OAAyB;IAEzB,yBAAyB;IACzB,KAAK,CAAC,gCAAgC,EAAE,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;IACpF,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,kBAAkB,EAAE,GAAG,OAAO,CAAC;IAC/E,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,+BAA+B,EAAE,GAAG,IAAA,2BAAiB,EAAC,kBAAkB,CAAC,CAAC;IAEpH,IAAI,YAAY,GAAe,EAAE,CAAC;IAElC,IAAI,oBAAoB,GAAuB,SAAS,CAAC;IACzD,uBAAuB;IACvB,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;QACzB,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACvC,uEAAuE;QACvE,MAAM,oBAAoB,GAAG,MAAM,IAAA,kCAAqB,GAAE,CAAC;QAE3D,IAAI,CAAC,IAAA,kBAAS,EAAC,oBAAoB,CAAC,aAAa,EAAE,eAAe,CAAC,EAAE,CAAC;YACpE,KAAK,CAAC,gFAAgF,EAAE,oBAAoB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;YAC7I,MAAM,IAAA,0BAAiB,EAAC,4BAA4B,EAAE,2DAA2D,EAAE;gBACjH,mBAAmB,EAAE,oBAAoB,CAAC,aAAa;gBACvD,kBAAkB,EAAE,eAAe;gBACnC,SAAS,EAAE,eAAe;aAC3B,CAAC,CAAC;QACL,CAAC;QACD,IAAI,+BAA+B,KAAK,IAAI,IAAI,IAAA,WAAE,EAAC,yCAA6B,EAAE,oBAAoB,CAAC,qBAAqB,CAAC,EAAE,CAAC;YAC9H,KAAK,CACH,gFAAgF,EAChF,yCAA6B,EAC7B,oBAAoB,CAAC,qBAAqB,CAC3C,CAAC;YACF,MAAM,IAAA,0BAAiB,EACrB,oCAAoC,EACpC,mNAAmN,EACnN;gBACE,mBAAmB,EAAE,yCAA6B;gBAClD,oBAAoB,EAAE,oBAAoB,CAAC,qBAAqB;aACjE,CACF,CAAC;QACJ,CAAC;QAED,wBAAwB;QACxB,oBAAoB,GAAG,MAAM,IAAA,4BAAe,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/dist/httpClient.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { Config, ServerCapabilities } from './types';
|
|
2
|
-
export declare function getRemoteConfig(configName: string, version: number | 'latest'): Promise<Config>;
|
|
2
|
+
export declare function getRemoteConfig(configName: string, schemaId: string, version: number | 'latest'): Promise<Config>;
|
|
3
3
|
export declare function getServerCapabilities(): Promise<ServerCapabilities>;
|
package/dist/httpClient.js
CHANGED
|
@@ -36,11 +36,12 @@ async function requestWrapper(url, query) {
|
|
|
36
36
|
throw (0, errors_1.createConfigError)('httpGeneralError', 'An error occurred while making the request', error);
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
|
-
async function getRemoteConfig(configName, version) {
|
|
39
|
+
async function getRemoteConfig(configName, schemaId, version) {
|
|
40
40
|
debug('Fetching remote config %s@%s', configName, version);
|
|
41
41
|
const { configServerUrl } = (0, options_1.getOptions)();
|
|
42
42
|
const url = `${configServerUrl}/config/${configName}/${version}`;
|
|
43
|
-
|
|
43
|
+
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
44
|
+
const res = await requestWrapper(url, { shouldDereference: true, schemaId });
|
|
44
45
|
if (res.statusCode === http_status_codes_1.default.BAD_REQUEST) {
|
|
45
46
|
debug('Invalid request to getConfig');
|
|
46
47
|
throw (0, errors_1.createConfigError)('httpResponseError', 'Invalid request to getConfig', await createHttpErrorPayload(res));
|
package/dist/httpClient.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpClient.js","sourceRoot":"","sources":["../src/httpClient.ts"],"names":[],"mappings":";;;;;AAmCA,
|
|
1
|
+
{"version":3,"file":"httpClient.js","sourceRoot":"","sources":["../src/httpClient.ts"],"names":[],"mappings":"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"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const PACKAGE_VERSION = "
|
|
1
|
+
export declare const PACKAGE_VERSION = "3.0.1";
|
package/dist/version.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@map-colonies/config",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.1",
|
|
4
4
|
"description": "Config package for MapColonies with support for central config management",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"exports": {
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
"undici": "^7.3.0"
|
|
64
64
|
},
|
|
65
65
|
"peerDependencies": {
|
|
66
|
-
"@map-colonies/schemas": "^1.
|
|
66
|
+
"@map-colonies/schemas": "^1.9.0",
|
|
67
67
|
"prom-client": "^15.0.0"
|
|
68
68
|
},
|
|
69
69
|
"peerDependenciesMeta": {
|