@allgemein/config 1.4.1 → 1.5.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/browser.d.ts +11 -11
- package/browser.js +8 -23
- package/browser.js.map +1 -1
- package/config/Config.d.ts +4 -4
- package/config/Config.js +31 -35
- package/config/Config.js.map +1 -1
- package/config/ConfigHandler.d.ts +3 -3
- package/config/ConfigHandler.js +11 -15
- package/config/ConfigHandler.js.map +1 -1
- package/config/ConfigJar.d.ts +3 -3
- package/config/ConfigJar.js +17 -21
- package/config/ConfigJar.js.map +1 -1
- package/config/ConfigSupport.d.ts +2 -2
- package/config/ConfigSupport.js +5 -9
- package/config/ConfigSupport.js.map +1 -1
- package/config/IConfigData.js +1 -2
- package/config/IConfigOptions.js +1 -2
- package/config/IJarOptions.js +1 -2
- package/config/IOptions.d.ts +1 -1
- package/config/IOptions.js +1 -2
- package/config/Source.d.ts +1 -1
- package/config/Source.js +1 -5
- package/config/Source.js.map +1 -1
- package/config/handler/DirectoryConfig.d.ts +6 -6
- package/config/handler/DirectoryConfig.js +26 -30
- package/config/handler/DirectoryConfig.js.map +1 -1
- package/config/handler/FileConfig.d.ts +4 -4
- package/config/handler/FileConfig.js +18 -22
- package/config/handler/FileConfig.js.map +1 -1
- package/config/handler/FileSource.d.ts +2 -2
- package/config/handler/FileSource.js +2 -6
- package/config/handler/FileSource.js.map +1 -1
- package/config/handler/IDirectoryConfigOptions.d.ts +2 -2
- package/config/handler/IDirectoryConfigOptions.js +1 -2
- package/config/handler/IFileConfigOptions.d.ts +2 -2
- package/config/handler/IFileConfigOptions.js +1 -2
- package/config/handler/IFilePath.js +1 -2
- package/config/handler/SystemConfig.d.ts +4 -4
- package/config/handler/SystemConfig.js +12 -16
- package/config/handler/SystemConfig.js.map +1 -1
- package/config/handler/index.d.ts +2 -2
- package/config/handler/index.js +2 -18
- package/config/handler/index.js.map +1 -1
- package/filesupport/FileSupport.d.ts +2 -2
- package/filesupport/FileSupport.js +13 -17
- package/filesupport/FileSupport.js.map +1 -1
- package/filesupport/IFileSupport.d.ts +1 -1
- package/filesupport/IFileSupport.js +1 -2
- package/filesupport/IFileSupportInfo.js +1 -2
- package/filesupport/types/JsonFileSupport.d.ts +2 -2
- package/filesupport/types/JsonFileSupport.js +1 -5
- package/filesupport/types/JsonFileSupport.js.map +1 -1
- package/filesupport/types/PropertiesFileSupport.d.ts +2 -2
- package/filesupport/types/PropertiesFileSupport.js +5 -9
- package/filesupport/types/PropertiesFileSupport.js.map +1 -1
- package/filesupport/types/XmlFileSupport.d.ts +2 -2
- package/filesupport/types/XmlFileSupport.js +4 -8
- package/filesupport/types/XmlFileSupport.js.map +1 -1
- package/filesupport/types/YamlFileSupport.d.ts +2 -2
- package/filesupport/types/YamlFileSupport.js +4 -8
- package/filesupport/types/YamlFileSupport.js.map +1 -1
- package/index.d.ts +16 -16
- package/index.js +11 -35
- package/index.js.map +1 -1
- package/package.json +3 -2
- package/supports/InterpolationSupport.d.ts +1 -1
- package/supports/InterpolationSupport.js +3 -7
- package/supports/InterpolationSupport.js.map +1 -1
- package/types.js +6 -9
- package/types.js.map +1 -1
- package/utils/Utils.d.ts +1 -1
- package/utils/Utils.js +16 -20
- package/utils/Utils.js.map +1 -1
package/browser.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
export { Utils } from './utils/Utils';
|
|
2
|
-
export { Config } from './config/Config';
|
|
3
|
-
export { ConfigJar } from './config/ConfigJar';
|
|
4
|
-
export { IConfigData } from './config/IConfigData';
|
|
5
|
-
export { IConfigOptions } from './config/IConfigOptions';
|
|
6
|
-
export { ConfigSupport } from './config/ConfigSupport';
|
|
7
|
-
export { IJarOptions } from './config/IJarOptions';
|
|
8
|
-
export { IOptions } from './config/IOptions';
|
|
9
|
-
export { Source } from './config/Source';
|
|
10
|
-
export { SystemConfig } from './config/handler/SystemConfig';
|
|
11
|
-
export { DEFAULT_JAR_NAME, NAMING_BY_DIRECTORY, NAMING_BY_DIRECTORYPATH, NAMING_BY_FILENAME, NAMING_BY_FULLPATH, NamingResolvePattern, SELECTOR_SEPARATOR } from './types';
|
|
1
|
+
export { Utils } from './utils/Utils.js';
|
|
2
|
+
export { Config } from './config/Config.js';
|
|
3
|
+
export { ConfigJar } from './config/ConfigJar.js';
|
|
4
|
+
export { IConfigData } from './config/IConfigData.js';
|
|
5
|
+
export { IConfigOptions } from './config/IConfigOptions.js';
|
|
6
|
+
export { ConfigSupport } from './config/ConfigSupport.js';
|
|
7
|
+
export { IJarOptions } from './config/IJarOptions.js';
|
|
8
|
+
export { IOptions } from './config/IOptions.js';
|
|
9
|
+
export { Source } from './config/Source.js';
|
|
10
|
+
export { SystemConfig } from './config/handler/SystemConfig.js';
|
|
11
|
+
export { DEFAULT_JAR_NAME, NAMING_BY_DIRECTORY, NAMING_BY_DIRECTORYPATH, NAMING_BY_FILENAME, NAMING_BY_FULLPATH, NamingResolvePattern, SELECTOR_SEPARATOR } from './types.js';
|
package/browser.js
CHANGED
|
@@ -1,27 +1,12 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SELECTOR_SEPARATOR = exports.NAMING_BY_FULLPATH = exports.NAMING_BY_FILENAME = exports.NAMING_BY_DIRECTORYPATH = exports.NAMING_BY_DIRECTORY = exports.DEFAULT_JAR_NAME = exports.SystemConfig = exports.Source = exports.ConfigSupport = exports.ConfigJar = exports.Config = exports.Utils = void 0;
|
|
4
1
|
// Utils
|
|
5
|
-
|
|
6
|
-
Object.defineProperty(exports, "Utils", { enumerable: true, get: function () { return Utils_1.Utils; } });
|
|
2
|
+
export { Utils } from './utils/Utils.js';
|
|
7
3
|
// Config
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
var ConfigSupport_1 = require("./config/ConfigSupport");
|
|
14
|
-
Object.defineProperty(exports, "ConfigSupport", { enumerable: true, get: function () { return ConfigSupport_1.ConfigSupport; } });
|
|
15
|
-
var Source_1 = require("./config/Source");
|
|
16
|
-
Object.defineProperty(exports, "Source", { enumerable: true, get: function () { return Source_1.Source; } });
|
|
4
|
+
export { Config } from './config/Config.js';
|
|
5
|
+
// export {ConfigHandler} from './config/ConfigHandler.js';
|
|
6
|
+
export { ConfigJar } from './config/ConfigJar.js';
|
|
7
|
+
export { ConfigSupport } from './config/ConfigSupport.js';
|
|
8
|
+
export { Source } from './config/Source.js';
|
|
17
9
|
// SystemConfig
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
var types_1 = require("./types");
|
|
21
|
-
Object.defineProperty(exports, "DEFAULT_JAR_NAME", { enumerable: true, get: function () { return types_1.DEFAULT_JAR_NAME; } });
|
|
22
|
-
Object.defineProperty(exports, "NAMING_BY_DIRECTORY", { enumerable: true, get: function () { return types_1.NAMING_BY_DIRECTORY; } });
|
|
23
|
-
Object.defineProperty(exports, "NAMING_BY_DIRECTORYPATH", { enumerable: true, get: function () { return types_1.NAMING_BY_DIRECTORYPATH; } });
|
|
24
|
-
Object.defineProperty(exports, "NAMING_BY_FILENAME", { enumerable: true, get: function () { return types_1.NAMING_BY_FILENAME; } });
|
|
25
|
-
Object.defineProperty(exports, "NAMING_BY_FULLPATH", { enumerable: true, get: function () { return types_1.NAMING_BY_FULLPATH; } });
|
|
26
|
-
Object.defineProperty(exports, "SELECTOR_SEPARATOR", { enumerable: true, get: function () { return types_1.SELECTOR_SEPARATOR; } });
|
|
10
|
+
export { SystemConfig } from './config/handler/SystemConfig.js';
|
|
11
|
+
export { DEFAULT_JAR_NAME, NAMING_BY_DIRECTORY, NAMING_BY_DIRECTORYPATH, NAMING_BY_FILENAME, NAMING_BY_FULLPATH, SELECTOR_SEPARATOR } from './types.js';
|
|
27
12
|
//# sourceMappingURL=browser.js.map
|
package/browser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/browser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/browser.ts"],"names":[],"mappings":"AAAA,QAAQ;AACR,OAAO,EAAC,KAAK,EAAC,MAAM,kBAAkB,CAAC;AAEvC,SAAS;AACT,OAAO,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAC;AAC1C,2DAA2D;AAC3D,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAIhD,OAAO,EAAC,aAAa,EAAC,MAAM,2BAA2B,CAAC;AAGxD,OAAO,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAC;AAE1C,eAAe;AACf,OAAO,EAAC,YAAY,EAAC,MAAM,kCAAkC,CAAC;AAG9D,OAAO,EACL,gBAAgB,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,kBAAkB,EAClF,kBAAkB,EAAwB,kBAAkB,EAC7D,MAAM,YAAY,CAAC"}
|
package/config/Config.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { ConfigJar } from './ConfigJar';
|
|
2
|
-
import { IOptions } from './IOptions';
|
|
3
|
-
import { IConfigData } from './IConfigData';
|
|
4
|
-
import { IJarOptions } from './IJarOptions';
|
|
1
|
+
import { ConfigJar } from './ConfigJar.js';
|
|
2
|
+
import { IOptions } from './IOptions.js';
|
|
3
|
+
import { IConfigData } from './IConfigData.js';
|
|
4
|
+
import { IJarOptions } from './IJarOptions.js';
|
|
5
5
|
export declare class Config {
|
|
6
6
|
private static DEFAULT_OPTIONS;
|
|
7
7
|
private static $self;
|
package/config/Config.js
CHANGED
|
@@ -1,15 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
const base_1 = require("@allgemein/base");
|
|
11
|
-
const lodash_1 = require("lodash");
|
|
12
|
-
class Config {
|
|
1
|
+
import { Utils } from '../utils/Utils.js';
|
|
2
|
+
import { ConfigJar } from './ConfigJar.js';
|
|
3
|
+
import { ConfigHandler } from './ConfigHandler.js';
|
|
4
|
+
import { FileSupport } from '../filesupport/FileSupport.js';
|
|
5
|
+
import { DEFAULT_JAR_NAME } from '../types.js';
|
|
6
|
+
import { InterpolationSupport } from '../supports/InterpolationSupport.js';
|
|
7
|
+
import { PlatformUtils } from '@allgemein/base';
|
|
8
|
+
import { cloneDeep, has, isEmpty, merge } from "@allgemein/base";
|
|
9
|
+
export class Config {
|
|
13
10
|
constructor() {
|
|
14
11
|
this.$options = {};
|
|
15
12
|
this.$jars = {};
|
|
@@ -31,9 +28,9 @@ class Config {
|
|
|
31
28
|
return this.instance(false)._jar(name, jar);
|
|
32
29
|
}
|
|
33
30
|
_jar(name = 'default', jar, override = false) {
|
|
34
|
-
let options = { namespace:
|
|
31
|
+
let options = { namespace: DEFAULT_JAR_NAME };
|
|
35
32
|
let _name = null;
|
|
36
|
-
if (!
|
|
33
|
+
if (!Utils.isString(name)) {
|
|
37
34
|
options = name;
|
|
38
35
|
_name = options.namespace;
|
|
39
36
|
}
|
|
@@ -44,7 +41,7 @@ class Config {
|
|
|
44
41
|
if (this.$jars[_name] && !jar) {
|
|
45
42
|
// jar already exists
|
|
46
43
|
if (options && override) {
|
|
47
|
-
this.$jars[_name] =
|
|
44
|
+
this.$jars[_name] = ConfigJar.create(options);
|
|
48
45
|
}
|
|
49
46
|
}
|
|
50
47
|
else if (this.$jars[_name] && jar) {
|
|
@@ -57,7 +54,7 @@ class Config {
|
|
|
57
54
|
this.$jars[_name] = jar;
|
|
58
55
|
}
|
|
59
56
|
else {
|
|
60
|
-
this.$jars[_name] =
|
|
57
|
+
this.$jars[_name] = ConfigJar.create(options);
|
|
61
58
|
}
|
|
62
59
|
return this.$jars[_name];
|
|
63
60
|
}
|
|
@@ -104,7 +101,7 @@ class Config {
|
|
|
104
101
|
let options = {};
|
|
105
102
|
if (!_options.configs) {
|
|
106
103
|
// Test if configs key was ignored
|
|
107
|
-
if (
|
|
104
|
+
if (Utils.isArray(_options) && _options.length > 0) {
|
|
108
105
|
if (_options[0].type) {
|
|
109
106
|
// okay configs was ignored, prepend it!
|
|
110
107
|
options = { configs: _options };
|
|
@@ -121,7 +118,7 @@ class Config {
|
|
|
121
118
|
options = _options;
|
|
122
119
|
}
|
|
123
120
|
if (append) {
|
|
124
|
-
this.$options =
|
|
121
|
+
this.$options = Utils.merge(this.$options, options);
|
|
125
122
|
}
|
|
126
123
|
else {
|
|
127
124
|
// clear current jars
|
|
@@ -129,29 +126,29 @@ class Config {
|
|
|
129
126
|
Object.assign(this.$options, options);
|
|
130
127
|
}
|
|
131
128
|
if (this.$options.fileSupport) {
|
|
132
|
-
|
|
129
|
+
FileSupport.reload(this.$options.fileSupport);
|
|
133
130
|
}
|
|
134
131
|
if (!this.$options.handlers || this.$options.handlers.length === 0) {
|
|
135
|
-
this.$options.handlers =
|
|
132
|
+
this.$options.handlers = ConfigHandler.DEFAULT_HANDLER;
|
|
136
133
|
}
|
|
137
|
-
if (!
|
|
138
|
-
|
|
134
|
+
if (!isEmpty(this.$options.workdir)) {
|
|
135
|
+
PlatformUtils.setWorkDir(this.$options.workdir);
|
|
139
136
|
}
|
|
140
|
-
else if (
|
|
137
|
+
else if (has(this.$options, 'workdir')) {
|
|
141
138
|
// reset workdir, it is set to null
|
|
142
|
-
|
|
139
|
+
PlatformUtils.setWorkDir(null);
|
|
143
140
|
}
|
|
144
|
-
|
|
141
|
+
ConfigHandler.reload(this.$options.handlers);
|
|
145
142
|
for (const _config of this.$options.configs) {
|
|
146
|
-
const handler =
|
|
143
|
+
const handler = ConfigHandler.getHandlerByType(_config.type, _config, this._jarsData);
|
|
147
144
|
if (handler) {
|
|
148
145
|
const jar = handler.create();
|
|
149
146
|
if (jar) {
|
|
150
147
|
_config.state = true;
|
|
151
|
-
if (
|
|
148
|
+
if (Utils.isArray(jar)) {
|
|
152
149
|
for (const _jar of jar) {
|
|
153
150
|
const _inst_jar = Config.jar(_jar.namespace);
|
|
154
|
-
|
|
151
|
+
InterpolationSupport.exec(_config, _inst_jar.data);
|
|
155
152
|
_inst_jar.merge(_jar.data);
|
|
156
153
|
_inst_jar.sources(_jar.sources());
|
|
157
154
|
}
|
|
@@ -159,7 +156,7 @@ class Config {
|
|
|
159
156
|
else {
|
|
160
157
|
const _jar = jar;
|
|
161
158
|
const _inst_jar = Config.jar(_jar.namespace);
|
|
162
|
-
|
|
159
|
+
InterpolationSupport.exec(_config, _inst_jar.data);
|
|
163
160
|
// InterpolationSupport.exec(_inst_jar.data,this._jarsData);
|
|
164
161
|
_inst_jar.merge(_jar.data);
|
|
165
162
|
_inst_jar.sources(_jar.sources());
|
|
@@ -177,17 +174,17 @@ class Config {
|
|
|
177
174
|
}
|
|
178
175
|
static get(path = null, namespace_or_fallback, fallback) {
|
|
179
176
|
if (path == null) {
|
|
180
|
-
const data =
|
|
177
|
+
const data = cloneDeep(this.jarsData);
|
|
181
178
|
if (this.hasJar('system')) {
|
|
182
179
|
data.shift();
|
|
183
180
|
}
|
|
184
181
|
if (data.length > 1) {
|
|
185
|
-
return
|
|
182
|
+
return merge(data.shift(), ...data);
|
|
186
183
|
}
|
|
187
184
|
return data;
|
|
188
185
|
}
|
|
189
186
|
let jars = this.jars;
|
|
190
|
-
if (
|
|
187
|
+
if (Utils.isString(namespace_or_fallback) && this.hasJar(namespace_or_fallback)) {
|
|
191
188
|
jars = [this.jar(namespace_or_fallback)];
|
|
192
189
|
}
|
|
193
190
|
else {
|
|
@@ -212,12 +209,11 @@ class Config {
|
|
|
212
209
|
}
|
|
213
210
|
static clear() {
|
|
214
211
|
this.$self = null;
|
|
215
|
-
|
|
212
|
+
PlatformUtils.setWorkDir(null);
|
|
216
213
|
}
|
|
217
214
|
}
|
|
218
|
-
exports.Config = Config;
|
|
219
215
|
Config.DEFAULT_OPTIONS = {
|
|
220
|
-
fileSupport:
|
|
216
|
+
fileSupport: FileSupport.DEFAULT_TYPES,
|
|
221
217
|
// handlers: {}DEFAULT_HANDLER,
|
|
222
218
|
configs: [
|
|
223
219
|
{
|
package/config/Config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../../src/config/Config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../../src/config/Config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { ConfigSupport } from "./ConfigSupport";
|
|
2
|
-
import { IConfigOptions } from "./IConfigOptions";
|
|
3
|
-
import { IConfigData } from "./IConfigData";
|
|
1
|
+
import { ConfigSupport } from "./ConfigSupport.js";
|
|
2
|
+
import { IConfigOptions } from "./IConfigOptions.js";
|
|
3
|
+
import { IConfigData } from "./IConfigData.js";
|
|
4
4
|
import { StringOrFunction } from "@allgemein/base";
|
|
5
5
|
export declare class ConfigHandler {
|
|
6
6
|
static DEFAULT_HANDLER: StringOrFunction[];
|
package/config/ConfigHandler.js
CHANGED
|
@@ -1,12 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const Utils_1 = require("../utils/Utils");
|
|
8
|
-
const base_1 = require("@allgemein/base");
|
|
9
|
-
class ConfigHandler {
|
|
1
|
+
import { SystemConfig } from "./handler/SystemConfig.js";
|
|
2
|
+
import { FileConfig } from "./handler/FileConfig.js";
|
|
3
|
+
import { DirectoryConfig } from "./handler/DirectoryConfig.js";
|
|
4
|
+
import { Utils } from "../utils/Utils.js";
|
|
5
|
+
import { ClassLoader } from "@allgemein/base";
|
|
6
|
+
export class ConfigHandler {
|
|
10
7
|
/**
|
|
11
8
|
* Loades classes in *.js or *.ts files from given directories, verifing if they implement the
|
|
12
9
|
* IConfigSupport interface.
|
|
@@ -19,8 +16,8 @@ class ConfigHandler {
|
|
|
19
16
|
if (!Array.isArray(directories)) {
|
|
20
17
|
directories = [directories];
|
|
21
18
|
}
|
|
22
|
-
let classes =
|
|
23
|
-
classes =
|
|
19
|
+
let classes = ClassLoader.importClassesFromAny(directories);
|
|
20
|
+
classes = Utils.uniqArr(classes);
|
|
24
21
|
classes.forEach((klass) => {
|
|
25
22
|
let l = null;
|
|
26
23
|
try {
|
|
@@ -50,11 +47,10 @@ class ConfigHandler {
|
|
|
50
47
|
this.$supports = {};
|
|
51
48
|
}
|
|
52
49
|
}
|
|
53
|
-
exports.ConfigHandler = ConfigHandler;
|
|
54
50
|
ConfigHandler.DEFAULT_HANDLER = [
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
51
|
+
SystemConfig,
|
|
52
|
+
FileConfig,
|
|
53
|
+
DirectoryConfig
|
|
58
54
|
];
|
|
59
55
|
ConfigHandler.$supports = {};
|
|
60
56
|
//# sourceMappingURL=ConfigHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfigHandler.js","sourceRoot":"","sources":["../../../src/config/ConfigHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ConfigHandler.js","sourceRoot":"","sources":["../../../src/config/ConfigHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAC,UAAU,EAAC,MAAM,yBAAyB,CAAC;AAInD,OAAO,EAAC,eAAe,EAAC,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAC,KAAK,EAAC,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAC,WAAW,EAAmB,MAAM,iBAAiB,CAAC;AAG9D,MAAM,OAAO,aAAa;IAWtB;;;;;OAKG;IACH,MAAM,CAAC,MAAM,CAAC,cAAqD,aAAa,CAAC,eAAe;QAC5F,IAAI,CAAC,KAAK,EAAE,CAAC;QAEb,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YAC9B,WAAW,GAAG,CAAC,WAAW,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,OAAO,GAAG,WAAW,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAE5D,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAe,EAAE,EAAE;YAEhC,IAAI,CAAC,GAAQ,IAAI,CAAC;YAClB,IAAI,CAAC;gBACD,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;YACpC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACnB,OAAO;YACX,CAAC;YAED,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC;QAErC,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,CAAA;IACjD,CAAC;IAED,MAAM,CAAC,eAAe;QAClB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,MAAM;QACT,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;IAC9C,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,GAAW,EAAE,IAAmB,EAAE,YAAwB,EAAE;QAChF,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YACtB,OAAO,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QACrE,CAAC;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IAGD,MAAM,CAAC,KAAK;QACR,IAAI,CAAC,SAAS,GAAG,EAAE,CAAA;IACvB,CAAC;;AA5DM,6BAAe,GAAuB;IACzC,YAAY;IACZ,UAAU;IACV,eAAe;CAClB,CAAC;AAGa,uBAAS,GAA8B,EAAE,CAAC"}
|
package/config/ConfigJar.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { IConfigData } from "./IConfigData";
|
|
2
|
-
import { IJarOptions } from "./IJarOptions";
|
|
3
|
-
import { Source } from "./Source";
|
|
1
|
+
import { IConfigData } from "./IConfigData.js";
|
|
2
|
+
import { IJarOptions } from "./IJarOptions.js";
|
|
3
|
+
import { Source } from "./Source.js";
|
|
4
4
|
export declare class ConfigJar {
|
|
5
5
|
private _options;
|
|
6
6
|
private _data;
|
package/config/ConfigJar.js
CHANGED
|
@@ -1,17 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const InterpolationSupport_1 = require("../supports/InterpolationSupport");
|
|
7
|
-
const Config_1 = require("./Config");
|
|
8
|
-
const Source_1 = require("./Source");
|
|
1
|
+
import * as _ from "@allgemein/base";
|
|
2
|
+
import { Utils } from "../utils/Utils.js";
|
|
3
|
+
import { InterpolationSupport } from "../supports/InterpolationSupport.js";
|
|
4
|
+
import { Config } from "./Config.js";
|
|
5
|
+
import { Source } from "./Source.js";
|
|
9
6
|
const DEFAULT_JAR_OPTS = {
|
|
10
7
|
namespace: 'default',
|
|
11
8
|
standalone: false,
|
|
12
9
|
interpolate: true
|
|
13
10
|
};
|
|
14
|
-
class ConfigJar {
|
|
11
|
+
export class ConfigJar {
|
|
15
12
|
constructor(options = DEFAULT_JAR_OPTS) {
|
|
16
13
|
// private _config:
|
|
17
14
|
this._data = {};
|
|
@@ -28,43 +25,43 @@ class ConfigJar {
|
|
|
28
25
|
return this._data;
|
|
29
26
|
}
|
|
30
27
|
get(path) {
|
|
31
|
-
return
|
|
28
|
+
return Utils.get(this._data, path);
|
|
32
29
|
}
|
|
33
30
|
set(path, value) {
|
|
34
|
-
return
|
|
31
|
+
return Utils.set(this._data, path, value);
|
|
35
32
|
}
|
|
36
33
|
merge(data, opts = { interpolate: true }) {
|
|
37
34
|
let source = data;
|
|
38
|
-
if (data instanceof
|
|
39
|
-
source =
|
|
35
|
+
if (data instanceof Source) {
|
|
36
|
+
source = Utils.clone(data);
|
|
40
37
|
this._source.push(source);
|
|
41
38
|
data = source.data;
|
|
42
39
|
if (source.prefix) {
|
|
43
40
|
let _data = {};
|
|
44
|
-
|
|
41
|
+
Utils.set(_data, source.prefix, data);
|
|
45
42
|
data = _data;
|
|
46
43
|
}
|
|
47
44
|
}
|
|
48
45
|
if (this._options.interpolate && opts.interpolate) {
|
|
49
46
|
// interpolate first then merge
|
|
50
|
-
let collection =
|
|
47
|
+
let collection = Config.jarsData;
|
|
51
48
|
// interpolate against self execute
|
|
52
|
-
if (!
|
|
49
|
+
if (!Config.hasJar(this.namespace) && !Utils.isEmpty(this._data)) {
|
|
53
50
|
collection.push(this._data);
|
|
54
51
|
}
|
|
55
52
|
collection.unshift(data);
|
|
56
|
-
|
|
53
|
+
InterpolationSupport.exec(data, collection);
|
|
57
54
|
}
|
|
58
|
-
this._data =
|
|
55
|
+
this._data = Utils.merge(this._data, data);
|
|
59
56
|
}
|
|
60
57
|
/**
|
|
61
58
|
* Execute interpolation over the config data
|
|
62
59
|
*/
|
|
63
60
|
runInterpolation() {
|
|
64
|
-
|
|
61
|
+
InterpolationSupport.exec(this._data);
|
|
65
62
|
}
|
|
66
63
|
interpolateAgainst(data) {
|
|
67
|
-
|
|
64
|
+
InterpolationSupport.exec(data, this._data);
|
|
68
65
|
return data;
|
|
69
66
|
}
|
|
70
67
|
static create(options = { namespace: 'default' }) {
|
|
@@ -81,5 +78,4 @@ class ConfigJar {
|
|
|
81
78
|
return this._source;
|
|
82
79
|
}
|
|
83
80
|
}
|
|
84
|
-
exports.ConfigJar = ConfigJar;
|
|
85
81
|
//# sourceMappingURL=ConfigJar.js.map
|
package/config/ConfigJar.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfigJar.js","sourceRoot":"","sources":["../../../src/config/ConfigJar.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ConfigJar.js","sourceRoot":"","sources":["../../../src/config/ConfigJar.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ConfigJar } from './ConfigJar';
|
|
2
|
-
import { IConfigData } from './IConfigData';
|
|
1
|
+
import { ConfigJar } from './ConfigJar.js';
|
|
2
|
+
import { IConfigData } from './IConfigData.js';
|
|
3
3
|
export declare abstract class ConfigSupport<T> {
|
|
4
4
|
$options: T;
|
|
5
5
|
constructor(options: T, jarsData?: IConfigData[]);
|
package/config/ConfigSupport.js
CHANGED
|
@@ -1,21 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const InterpolationSupport_1 = require("../supports/InterpolationSupport");
|
|
5
|
-
const lodash_1 = require("lodash");
|
|
6
|
-
class ConfigSupport {
|
|
1
|
+
import { InterpolationSupport } from '../supports/InterpolationSupport.js';
|
|
2
|
+
import { isEmpty } from '@allgemein/base';
|
|
3
|
+
export class ConfigSupport {
|
|
7
4
|
constructor(options, jarsData = []) {
|
|
8
5
|
this.$options = options;
|
|
9
6
|
// if not globally definied then load directly
|
|
10
7
|
// @ts-ignore
|
|
11
|
-
if (options && options['type'] !== 'system' && !
|
|
8
|
+
if (options && options['type'] !== 'system' && !isEmpty(jarsData)) {
|
|
12
9
|
try {
|
|
13
|
-
|
|
10
|
+
InterpolationSupport.exec(this.$options, jarsData);
|
|
14
11
|
}
|
|
15
12
|
catch (e) {
|
|
16
13
|
}
|
|
17
14
|
}
|
|
18
15
|
}
|
|
19
16
|
}
|
|
20
|
-
exports.ConfigSupport = ConfigSupport;
|
|
21
17
|
//# sourceMappingURL=ConfigSupport.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfigSupport.js","sourceRoot":"","sources":["../../../src/config/ConfigSupport.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ConfigSupport.js","sourceRoot":"","sources":["../../../src/config/ConfigSupport.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,oBAAoB,EAAC,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAC,OAAO,EAAC,MAAM,iBAAiB,CAAC;AAGxC,MAAM,OAAgB,aAAa;IAIjC,YAAY,OAAU,EAAE,WAA0B,EAAE;QAClD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QAExB,8CAA8C;QAC9C,aAAa;QACb,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClE,IAAI,CAAC;gBACH,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACrD,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;YAEb,CAAC;QACH,CAAC;IAEH,CAAC;CAOF"}
|
package/config/IConfigData.js
CHANGED
package/config/IConfigOptions.js
CHANGED
package/config/IJarOptions.js
CHANGED
package/config/IOptions.d.ts
CHANGED
package/config/IOptions.js
CHANGED
package/config/Source.d.ts
CHANGED
package/config/Source.js
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Source = void 0;
|
|
4
|
-
class Source {
|
|
1
|
+
export class Source {
|
|
5
2
|
constructor(opts) {
|
|
6
3
|
this.source = 'none';
|
|
7
4
|
this.data = null;
|
|
@@ -9,5 +6,4 @@ class Source {
|
|
|
9
6
|
Object.assign(this, opts);
|
|
10
7
|
}
|
|
11
8
|
}
|
|
12
|
-
exports.Source = Source;
|
|
13
9
|
//# sourceMappingURL=Source.js.map
|
package/config/Source.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Source.js","sourceRoot":"","sources":["../../../src/config/Source.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Source.js","sourceRoot":"","sources":["../../../src/config/Source.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,MAAM;IAQf,YAAY,IAAQ;QANpB,WAAM,GAAU,MAAM,CAAC;QAEvB,SAAI,GAAe,IAAI,CAAC;QAExB,WAAM,GAAW,IAAI,CAAC;QAGlB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAC,IAAI,CAAC,CAAA;IAC5B,CAAC;CACJ"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { IDirectoryConfigOptions } from './IDirectoryConfigOptions';
|
|
2
|
-
import { ConfigJar } from '../ConfigJar';
|
|
3
|
-
import { IFileConfigOptions } from './IFileConfigOptions';
|
|
4
|
-
import { NamingResolvePattern } from '../../types';
|
|
5
|
-
import { ConfigSupport } from '../ConfigSupport';
|
|
6
|
-
import { IConfigData } from '../IConfigData';
|
|
1
|
+
import { IDirectoryConfigOptions } from './IDirectoryConfigOptions.js';
|
|
2
|
+
import { ConfigJar } from '../ConfigJar.js';
|
|
3
|
+
import { IFileConfigOptions } from './IFileConfigOptions.js';
|
|
4
|
+
import { NamingResolvePattern } from '../../types.js';
|
|
5
|
+
import { ConfigSupport } from '../ConfigSupport.js';
|
|
6
|
+
import { IConfigData } from '../IConfigData.js';
|
|
7
7
|
/**
|
|
8
8
|
* Load config
|
|
9
9
|
*/
|