@adminide-stack/core 1.1.1-alpha.125 → 1.1.1-alpha.148
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/lib/core/configurations/configuration.d.ts +2 -2
- package/lib/core/configurations/configuration.js +9 -1
- package/lib/core/configurations/configuration.js.map +1 -1
- package/lib/core/organization/configuration.d.ts +2 -1
- package/lib/core/organization/configuration.js +2 -3
- package/lib/core/organization/configuration.js.map +1 -1
- package/lib/interfaces/configuration/configuraton-service.d.ts +2 -1
- package/lib/interfaces/generated/generated-models.d.ts +3 -0
- package/lib/interfaces/generated/generated-models.js.map +1 -1
- package/lib/services/abstract-configuration.d.ts +3 -1
- package/lib/services/abstract-configuration.js +4 -0
- package/lib/services/abstract-configuration.js.map +1 -1
- package/lib/utils/flatten-utils.d.ts +1 -0
- package/lib/utils/flatten-utils.js +20 -0
- package/lib/utils/flatten-utils.js.map +1 -0
- package/lib/utils/generate-uri.d.ts +3 -1
- package/lib/utils/generate-uri.js +3 -1
- package/lib/utils/generate-uri.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { IClientConfigurationService, IConfigurationChangeEvent, IConfigurationOverrides, ConfigurationTarget, IConfigurationData, IOrganizationResource, IIConfigurationModel, IOrganizationContext } from '../interfaces';
|
|
1
|
+
import { IClientConfigurationService, IConfigurationChangeEvent, IConfigurationOverrides, ConfigurationTarget, IConfigurationData, IConfigurationModel, IOrganizationResource, IIConfigurationModel, IOrganizationContext } from '../interfaces';
|
|
2
2
|
import { IDisposable } from '@vscode-alt/monaco-editor/esm/vs/base/common/lifecycle';
|
|
3
3
|
import { Disposable } from '@workbench-stack/core';
|
|
4
4
|
import { OrganizationConfiguration as Configuration, ConfigurationModel } from '../core';
|
|
5
5
|
import { ResourceMap } from '@vscode-alt/monaco-editor/esm/vs/base/common/map';
|
|
6
|
+
import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
|
|
6
7
|
import { CdmLogger } from '@cdm-logger/core';
|
|
7
8
|
import { Event, Emitter } from '@vscode-alt/monaco-editor/esm/vs/base/common/event';
|
|
8
9
|
declare type ILogger = CdmLogger.ILogger;
|
|
@@ -28,6 +29,7 @@ export declare abstract class AbstractOrganizationConfigurationClientService ext
|
|
|
28
29
|
abstract updateValue(key: string, value: any, overrides: IConfigurationOverrides, target: ConfigurationTarget, donotNotifyError: boolean): Promise<void>;
|
|
29
30
|
abstract updateValue(key: string, value: any, arg3?: any, arg4?: any, donotNotifyError?: any): Promise<void>;
|
|
30
31
|
abstract reloadConfiguration(resource?: IOrganizationResource): Promise<void>;
|
|
32
|
+
abstract externalConfiguration?(resource: URI): IConfigurationModel;
|
|
31
33
|
inspect<T>(key: string, overrides?: IConfigurationOverrides): {
|
|
32
34
|
default: T;
|
|
33
35
|
user: T;
|
|
@@ -39,6 +39,10 @@ let AbstractOrganizationConfigurationClientService = AbstractOrganizationConfigu
|
|
|
39
39
|
getValue(arg1, arg2) {
|
|
40
40
|
const section = typeof arg1 === 'string' ? arg1 : undefined;
|
|
41
41
|
const overrides = core_2.isConfigurationOverrides(arg1) ? arg1 : core_2.isConfigurationOverrides(arg2) ? arg2 : {};
|
|
42
|
+
if (overrides === null || overrides === void 0 ? void 0 : overrides.externalResource) {
|
|
43
|
+
const externalConfiguration = this.externalConfiguration(overrides.externalResource);
|
|
44
|
+
return this.configuration.getValue(section, overrides, externalConfiguration);
|
|
45
|
+
}
|
|
42
46
|
return this.configuration.getValue(section, overrides);
|
|
43
47
|
}
|
|
44
48
|
inspect(key, overrides) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-configuration.js","sourceRoot":"","sources":["../../src/services/abstract-configuration.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAA+C;AAM/C,gDAAmD;AACnD,kCAAmH;AACnH,0EAA+E;AAC/E,0EAAuE;AAEvE,8EAAoF;AAKpF,IAAsB,8CAA8C,sDAApE,MAAsB,8CAA+C,SAAQ,iBAAU;IAMnF,YAEI,MAAe;QAEf,KAAK,EAAE,CAAC;QAIO,8BAAyB,GAAuC,IAAI,CAAC,SAAS,CAAC,IAAI,eAAO,EAA6B,CAAC,CAAC;QAC5H,6BAAwB,GAAqC,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC;QAJ9G,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,wCAAwC,EAAE,CAAC,CAAC;IACxF,CAAC;IAQD,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IACD,IAAI,aAAa,CAAC,aAA4B;QAC1C,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;IACxC,CAAC;IAEM,oBAAoB;QACvB,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;IACvC,CAAC;IAOM,QAAQ,CAAC,IAAU,EAAE,IAAU;QAClC,MAAM,OAAO,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5D,MAAM,SAAS,GAAG,+BAAwB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,+BAAwB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACrG,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC3D,CAAC;
|
|
1
|
+
{"version":3,"file":"abstract-configuration.js","sourceRoot":"","sources":["../../src/services/abstract-configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function flatten<T extends Record<string, any>>(object: T, path?: string | null, separator?: string): T;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.flatten = void 0;
|
|
4
|
+
function flatten(object, path = null, separator = '.') {
|
|
5
|
+
return Object.keys(object).reduce((acc, key) => {
|
|
6
|
+
const value = object[key];
|
|
7
|
+
const newPath = [path, key].filter(Boolean).join(separator);
|
|
8
|
+
const isObject = [
|
|
9
|
+
typeof value === 'object',
|
|
10
|
+
value !== null,
|
|
11
|
+
!(value instanceof Date),
|
|
12
|
+
!(value instanceof RegExp),
|
|
13
|
+
!(Array.isArray(value) && value.length === 0),
|
|
14
|
+
].every(Boolean);
|
|
15
|
+
return isObject
|
|
16
|
+
? Object.assign(Object.assign({}, acc), flatten(value, newPath, separator)) : Object.assign(Object.assign({}, acc), { [newPath]: value });
|
|
17
|
+
}, {});
|
|
18
|
+
}
|
|
19
|
+
exports.flatten = flatten;
|
|
20
|
+
//# sourceMappingURL=flatten-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flatten-utils.js","sourceRoot":"","sources":["../../src/utils/flatten-utils.ts"],"names":[],"mappings":";;;AAEA,SAAgB,OAAO,CACnB,MAAS,EACT,OAAsB,IAAI,EAC1B,SAAS,GAAG,GAAG;IAEf,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAM,EAAE,GAAW,EAAK,EAAE;QAC3D,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAE1B,MAAM,OAAO,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE5D,MAAM,QAAQ,GAAG;YACf,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK,KAAK,IAAI;YACd,CAAC,CAAC,KAAK,YAAY,IAAI,CAAC;YACxB,CAAC,CAAC,KAAK,YAAY,MAAM,CAAC;YAC1B,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC;SAC9C,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEjB,OAAO,QAAQ;YACb,CAAC,iCAAM,GAAG,GAAK,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,EACjD,CAAC,iCAAM,GAAG,KAAE,CAAC,OAAO,CAAC,EAAE,KAAK,GAAE,CAAC;IACnC,CAAC,EAAE,EAAO,CAAC,CAAC;AACd,CAAC;AAtBH,0BAsBG"}
|
|
@@ -9,7 +9,9 @@ import { IConfigCollectionName, IConfigFragmentName } from '../interfaces';
|
|
|
9
9
|
*/
|
|
10
10
|
export declare const generateUri: (collectionName: IConfigCollectionName, params: {
|
|
11
11
|
[key: string]: any;
|
|
12
|
-
}, fragment: string, authority?: string
|
|
12
|
+
}, fragment: string, authority?: string, options?: {
|
|
13
|
+
flatten: boolean;
|
|
14
|
+
}) => URI;
|
|
13
15
|
/**
|
|
14
16
|
* Generates URI for User with `_id` as `self` if the user logged in otherwise `guest`
|
|
15
17
|
*/
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.generateMachineUri = exports.generateOrgUri = exports.generateResourceUri = exports.generateApplicationUri = exports.generateUserUri = exports.generateProxyUserUri = exports.generateUri = void 0;
|
|
4
4
|
const core_1 = require("@workbench-stack/core");
|
|
5
5
|
const uri_1 = require("@vscode-alt/monaco-editor/esm/vs/base/common/uri");
|
|
6
|
+
const flatten_utils_1 = require("./flatten-utils");
|
|
6
7
|
const sortKeys = require('sort-keys');
|
|
7
8
|
const querystring = require('querystring');
|
|
8
9
|
/**
|
|
@@ -12,7 +13,8 @@ const querystring = require('querystring');
|
|
|
12
13
|
* @param fragment
|
|
13
14
|
* @param authority
|
|
14
15
|
*/
|
|
15
|
-
const generateUri = (collectionName, params, fragment, authority = '') => {
|
|
16
|
+
const generateUri = (collectionName, params, fragment, authority = '', options = { flatten: false }) => {
|
|
17
|
+
params = options.flatten ? flatten_utils_1.flatten(params) : params;
|
|
16
18
|
const orderedParams = sortKeys(params);
|
|
17
19
|
const queryString = querystring.stringify(orderedParams);
|
|
18
20
|
return uri_1.URI.file(`/${collectionName}`).with({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-uri.js","sourceRoot":"","sources":["../../src/utils/generate-uri.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,0EAAuE;
|
|
1
|
+
{"version":3,"file":"generate-uri.js","sourceRoot":"","sources":["../../src/utils/generate-uri.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,0EAAuE;AAEvE,mDAA0C;AAE1C,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAEtC,MAAM,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAE3C;;;;;;GAMG;AACI,MAAM,WAAW,GAAG,CACvB,cAAqC,EACrC,MAA8B,EAC9B,QAAgB,EAChB,SAAS,GAAG,EAAE,EACd,OAAO,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,EAC9B,EAAE;IACA,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACpD,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAEzD,OAAO,SAAG,CAAC,IAAI,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC;QACvC,MAAM,EAAE,cAAO,CAAC,WAAW;QAC3B,SAAS;QACT,QAAQ;QACR,KAAK,EAAE,WAAW;KACrB,CAAC,CAAC;AACP,CAAC,CAAC;AAjBW,QAAA,WAAW,eAiBtB;AAEF;;GAEG;AACI,MAAM,oBAAoB,GAAG,CAAC,WAA6B,EAAE,QAAQ,4BAA+B,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,CAC3H,mBAAW,4BAAiC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAD9E,QAAA,oBAAoB,wBAC0D;AAE3F;;EAEE;AACK,MAAM,eAAe,GAAG,CAAC,MAA8B,EAAE,QAAQ,4BAA+B,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,CACvH,mBAAW,4BAAiC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AADhE,QAAA,eAAe,mBACiD;AAE7E;;GAEG;AACI,MAAM,sBAAsB,GAAG,CAAC,OAAe,EAAE,QAAQ,4BAA+B,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,CAC/G,mBAAW,sCAAsC,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAD1E,QAAA,sBAAsB,0BACoD;AAEhF,MAAM,mBAAmB,GAAG,CAC/B,cAAqC,EACrC,MAA6D,EAC7D,QAAgB,EAChB,SAAS,GAAG,EAAE,EAChB,EAAE,CAAC,mBAAW,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AALjD,QAAA,mBAAmB,uBAK8B;AAEvD,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,QAAgB,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,CACrE,mBAAW,sCAAsC,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AADvE,QAAA,cAAc,kBACyD;AAE7E,MAAM,kBAAkB,GAAG,CAAC,IAAI,EAAE,QAAgB,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,CACzE,mBAAW,4BAAiC,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAA;AADjE,QAAA,kBAAkB,sBAC+C"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adminide-stack/core",
|
|
3
|
-
"version": "1.1.1-alpha.
|
|
3
|
+
"version": "1.1.1-alpha.148",
|
|
4
4
|
"description": "AdminIDE core for higher packages to depend on",
|
|
5
5
|
"license": "ISC",
|
|
6
6
|
"author": "CDMBase LLC",
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"typescript": {
|
|
53
53
|
"definition": "lib/index.d.ts"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "5f772e154658db6c9c0e29e22d27ec1a65bd24f4"
|
|
56
56
|
}
|