@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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsonFileSupport.js","sourceRoot":"","sources":["../../../../src/filesupport/types/JsonFileSupport.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"JsonFileSupport.js","sourceRoot":"","sources":["../../../../src/filesupport/types/JsonFileSupport.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,eAAe;IAExB,cAAc;QACV,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,OAAc;QAChB,IAAI,SAAS,GAAiB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAClD,OAAO,SAAS,CAAC;IACrB,CAAC;CAEJ"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { IConfigData } from '../../config/IConfigData';
|
|
2
|
-
import { IFileSupport } from '../IFileSupport';
|
|
1
|
+
import { IConfigData } from '../../config/IConfigData.js';
|
|
2
|
+
import { IFileSupport } from '../IFileSupport.js';
|
|
3
3
|
export declare class PropertiesFileSupport implements IFileSupport {
|
|
4
4
|
requirements(): void;
|
|
5
5
|
supportedTypes(): string | string[];
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.PropertiesFileSupport = void 0;
|
|
4
|
-
const lodash_1 = require("lodash");
|
|
5
|
-
const base_1 = require("@allgemein/base");
|
|
1
|
+
import { clone } from '@allgemein/base';
|
|
2
|
+
import { PlatformUtils } from '@allgemein/base';
|
|
6
3
|
let Prop;
|
|
7
4
|
const OPTIONS = {
|
|
8
5
|
path: false,
|
|
@@ -11,19 +8,18 @@ const OPTIONS = {
|
|
|
11
8
|
variables: true,
|
|
12
9
|
include: false
|
|
13
10
|
};
|
|
14
|
-
class PropertiesFileSupport {
|
|
11
|
+
export class PropertiesFileSupport {
|
|
15
12
|
requirements() {
|
|
16
|
-
Prop =
|
|
13
|
+
Prop = PlatformUtils.load('properties');
|
|
17
14
|
}
|
|
18
15
|
supportedTypes() {
|
|
19
16
|
return ['conf', 'properties', 'ini'];
|
|
20
17
|
}
|
|
21
18
|
parse(content) {
|
|
22
19
|
let cfg = null;
|
|
23
|
-
const opts =
|
|
20
|
+
const opts = clone(OPTIONS);
|
|
24
21
|
cfg = Prop.parse(content, opts);
|
|
25
22
|
return cfg;
|
|
26
23
|
}
|
|
27
24
|
}
|
|
28
|
-
exports.PropertiesFileSupport = PropertiesFileSupport;
|
|
29
25
|
//# sourceMappingURL=PropertiesFileSupport.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PropertiesFileSupport.js","sourceRoot":"","sources":["../../../../src/filesupport/types/PropertiesFileSupport.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PropertiesFileSupport.js","sourceRoot":"","sources":["../../../../src/filesupport/types/PropertiesFileSupport.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C,IAAI,IAAS,CAAC;AAEd,MAAM,OAAO,GAAG;IACd,IAAI,EAAE,KAAK;IACX,UAAU,EAAE,IAAI;IAChB,QAAQ,EAAE,IAAI;IACd,SAAS,EAAE,IAAI;IACf,OAAO,EAAE,KAAK;CACf,CAAC;AAEF,MAAM,OAAO,qBAAqB;IAEhC,YAAY;QACV,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC1C,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,OAAe;QACnB,IAAI,GAAG,GAAgB,IAAI,CAAC;QAC5B,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5B,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAChC,OAAO,GAAG,CAAC;IACb,CAAC;CAGF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { IConfigData } from '../../config/IConfigData';
|
|
2
|
-
import { IFileSupport } from '../IFileSupport';
|
|
1
|
+
import { IConfigData } from '../../config/IConfigData.js';
|
|
2
|
+
import { IFileSupport } from '../IFileSupport.js';
|
|
3
3
|
export declare class XmlFileSupport implements IFileSupport {
|
|
4
4
|
requirements(): void;
|
|
5
5
|
supportedTypes(): string | string[];
|
|
@@ -1,18 +1,15 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.XmlFileSupport = void 0;
|
|
4
|
-
const base_1 = require("@allgemein/base");
|
|
1
|
+
import { PlatformUtils } from '@allgemein/base';
|
|
5
2
|
let XML;
|
|
6
|
-
class XmlFileSupport {
|
|
3
|
+
export class XmlFileSupport {
|
|
7
4
|
requirements() {
|
|
8
|
-
|
|
5
|
+
PlatformUtils.load('x2js');
|
|
9
6
|
}
|
|
10
7
|
supportedTypes() {
|
|
11
8
|
return 'xml';
|
|
12
9
|
}
|
|
13
10
|
parse(content) {
|
|
14
11
|
if (!XML) {
|
|
15
|
-
XML =
|
|
12
|
+
XML = PlatformUtils.load('x2js');
|
|
16
13
|
}
|
|
17
14
|
const x2js = new XML();
|
|
18
15
|
let rawConfig = x2js.xml2js(content);
|
|
@@ -23,5 +20,4 @@ class XmlFileSupport {
|
|
|
23
20
|
return rawConfig;
|
|
24
21
|
}
|
|
25
22
|
}
|
|
26
|
-
exports.XmlFileSupport = XmlFileSupport;
|
|
27
23
|
//# sourceMappingURL=XmlFileSupport.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XmlFileSupport.js","sourceRoot":"","sources":["../../../../src/filesupport/types/XmlFileSupport.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"XmlFileSupport.js","sourceRoot":"","sources":["../../../../src/filesupport/types/XmlFileSupport.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C,IAAI,GAAQ,CAAC;AAEb,MAAM,OAAO,cAAc;IAEzB,YAAY;QACV,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;IAED,cAAc;QACZ,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,OAAe;QACnB,IAAG,CAAC,GAAG,EAAC,CAAC;YACP,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;QACvB,IAAI,SAAS,GAAgB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxC,IAAG,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACxB,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CAEF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { IConfigData } from "../../config/IConfigData";
|
|
2
|
-
import { IFileSupport } from "../IFileSupport";
|
|
1
|
+
import { IConfigData } from "../../config/IConfigData.js";
|
|
2
|
+
import { IFileSupport } from "../IFileSupport.js";
|
|
3
3
|
export declare class YamlFileSupport implements IFileSupport {
|
|
4
4
|
requirements(): void;
|
|
5
5
|
supportedTypes(): string | string[];
|
|
@@ -1,15 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.YamlFileSupport = void 0;
|
|
4
|
-
const base_1 = require("@allgemein/base");
|
|
1
|
+
import { PlatformUtils } from "@allgemein/base";
|
|
5
2
|
let Yaml, VisionmediaYaml;
|
|
6
|
-
class YamlFileSupport {
|
|
3
|
+
export class YamlFileSupport {
|
|
7
4
|
requirements() {
|
|
8
5
|
try {
|
|
9
|
-
Yaml =
|
|
6
|
+
Yaml = PlatformUtils.load('js-yaml');
|
|
10
7
|
}
|
|
11
8
|
catch (e) {
|
|
12
|
-
VisionmediaYaml =
|
|
9
|
+
VisionmediaYaml = PlatformUtils.load('yaml');
|
|
13
10
|
}
|
|
14
11
|
}
|
|
15
12
|
supportedTypes() {
|
|
@@ -37,5 +34,4 @@ class YamlFileSupport {
|
|
|
37
34
|
return fileStr.replace(/^\s*#.*/mg, '').replace(/^\s*[\n|\r]+/mg, '');
|
|
38
35
|
}
|
|
39
36
|
}
|
|
40
|
-
exports.YamlFileSupport = YamlFileSupport;
|
|
41
37
|
//# sourceMappingURL=YamlFileSupport.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"YamlFileSupport.js","sourceRoot":"","sources":["../../../../src/filesupport/types/YamlFileSupport.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"YamlFileSupport.js","sourceRoot":"","sources":["../../../../src/filesupport/types/YamlFileSupport.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C,IAAI,IAAQ,EAAE,eAAmB,CAAC;AAElC,MAAM,OAAO,eAAe;IAExB,YAAY;QACR,IAAI,CAAC;YACD,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;QACD,OAAO,CAAC,EAAE,CAAC;YACP,eAAe,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjD,CAAC;IACL,CAAC;IAED,cAAc;QACV,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,OAAe;QACjB,IAAI,GAAG,GAAiB,IAAI,CAAC;QAC7B,IAAI,IAAI,EAAE,CAAC;YACP,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;aACI,IAAI,eAAe,EAAE,CAAC;YACvB,qEAAqE;YACrE,2EAA2E;YAC3E,OAAO,IAAI,IAAI,CAAC;YAChB,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3E,CAAC;aACI,CAAC;YACF,OAAO,CAAC,KAAK,CAAC,sFAAsF,CAAC,CAAA;QACzG,CAAC;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAEO,MAAM,CAAC,iBAAiB,CAAE,OAAc;QAC5C,2CAA2C;QAC3C,qCAAqC;QACrC,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,EAAC,EAAE,CAAC,CAAC,OAAO,CAAC,gBAAgB,EAAC,EAAE,CAAC,CAAC;IACxE,CAAC;CAEJ"}
|
package/index.d.ts
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
export { ConfigJar, Config, IConfigOptions, IOptions, ConfigSupport, IConfigData, IJarOptions, Source, SystemConfig, Utils } from './browser';
|
|
2
|
-
export { ConfigHandler } from './config/ConfigHandler';
|
|
3
|
-
export { DEFAULT_JAR_NAME, NAMING_BY_DIRECTORY, NAMING_BY_DIRECTORYPATH, NAMING_BY_FILENAME, NAMING_BY_FULLPATH, NamingResolvePattern, SELECTOR_SEPARATOR } from './types';
|
|
4
|
-
export { IFileSupportInfo } from './filesupport/IFileSupportInfo';
|
|
5
|
-
export { IFileSupport } from './filesupport/IFileSupport';
|
|
6
|
-
export { FileSupport } from './filesupport/FileSupport';
|
|
7
|
-
export { JsonFileSupport } from './filesupport/types/JsonFileSupport';
|
|
8
|
-
export { XmlFileSupport } from './filesupport/types/XmlFileSupport';
|
|
9
|
-
export { YamlFileSupport } from './filesupport/types/YamlFileSupport';
|
|
10
|
-
export { IFilePath } from './config/handler/IFilePath';
|
|
11
|
-
export { IFileConfigOptions } from './config/handler/IFileConfigOptions';
|
|
12
|
-
export { FileSource } from './config/handler/FileSource';
|
|
13
|
-
export { FileConfig } from './config/handler/FileConfig';
|
|
14
|
-
export { IDirectoryConfigOptions } from './config/handler/IDirectoryConfigOptions';
|
|
15
|
-
export { DirectoryConfig } from './config/handler/DirectoryConfig';
|
|
16
|
-
export { InterpolationSupport } from './supports/InterpolationSupport';
|
|
1
|
+
export { ConfigJar, Config, IConfigOptions, IOptions, ConfigSupport, IConfigData, IJarOptions, Source, SystemConfig, Utils } from './browser.js';
|
|
2
|
+
export { ConfigHandler } from './config/ConfigHandler.js';
|
|
3
|
+
export { DEFAULT_JAR_NAME, NAMING_BY_DIRECTORY, NAMING_BY_DIRECTORYPATH, NAMING_BY_FILENAME, NAMING_BY_FULLPATH, NamingResolvePattern, SELECTOR_SEPARATOR } from './types.js';
|
|
4
|
+
export { IFileSupportInfo } from './filesupport/IFileSupportInfo.js';
|
|
5
|
+
export { IFileSupport } from './filesupport/IFileSupport.js';
|
|
6
|
+
export { FileSupport } from './filesupport/FileSupport.js';
|
|
7
|
+
export { JsonFileSupport } from './filesupport/types/JsonFileSupport.js';
|
|
8
|
+
export { XmlFileSupport } from './filesupport/types/XmlFileSupport.js';
|
|
9
|
+
export { YamlFileSupport } from './filesupport/types/YamlFileSupport.js';
|
|
10
|
+
export { IFilePath } from './config/handler/IFilePath.js';
|
|
11
|
+
export { IFileConfigOptions } from './config/handler/IFileConfigOptions.js';
|
|
12
|
+
export { FileSource } from './config/handler/FileSource.js';
|
|
13
|
+
export { FileConfig } from './config/handler/FileConfig.js';
|
|
14
|
+
export { IDirectoryConfigOptions } from './config/handler/IDirectoryConfigOptions.js';
|
|
15
|
+
export { DirectoryConfig } from './config/handler/DirectoryConfig.js';
|
|
16
|
+
export { InterpolationSupport } from './supports/InterpolationSupport.js';
|
package/index.js
CHANGED
|
@@ -1,39 +1,15 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.InterpolationSupport = exports.DirectoryConfig = exports.FileConfig = exports.FileSource = exports.YamlFileSupport = exports.XmlFileSupport = exports.JsonFileSupport = exports.FileSupport = exports.SELECTOR_SEPARATOR = exports.NAMING_BY_FULLPATH = exports.NAMING_BY_FILENAME = exports.NAMING_BY_DIRECTORYPATH = exports.NAMING_BY_DIRECTORY = exports.DEFAULT_JAR_NAME = exports.ConfigHandler = exports.Utils = exports.SystemConfig = exports.Source = exports.ConfigSupport = exports.Config = exports.ConfigJar = void 0;
|
|
4
1
|
// browser
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
Object.defineProperty(exports, "Source", { enumerable: true, get: function () { return browser_1.Source; } });
|
|
10
|
-
Object.defineProperty(exports, "SystemConfig", { enumerable: true, get: function () { return browser_1.SystemConfig; } });
|
|
11
|
-
Object.defineProperty(exports, "Utils", { enumerable: true, get: function () { return browser_1.Utils; } });
|
|
12
|
-
var ConfigHandler_1 = require("./config/ConfigHandler");
|
|
13
|
-
Object.defineProperty(exports, "ConfigHandler", { enumerable: true, get: function () { return ConfigHandler_1.ConfigHandler; } });
|
|
14
|
-
var types_1 = require("./types");
|
|
15
|
-
Object.defineProperty(exports, "DEFAULT_JAR_NAME", { enumerable: true, get: function () { return types_1.DEFAULT_JAR_NAME; } });
|
|
16
|
-
Object.defineProperty(exports, "NAMING_BY_DIRECTORY", { enumerable: true, get: function () { return types_1.NAMING_BY_DIRECTORY; } });
|
|
17
|
-
Object.defineProperty(exports, "NAMING_BY_DIRECTORYPATH", { enumerable: true, get: function () { return types_1.NAMING_BY_DIRECTORYPATH; } });
|
|
18
|
-
Object.defineProperty(exports, "NAMING_BY_FILENAME", { enumerable: true, get: function () { return types_1.NAMING_BY_FILENAME; } });
|
|
19
|
-
Object.defineProperty(exports, "NAMING_BY_FULLPATH", { enumerable: true, get: function () { return types_1.NAMING_BY_FULLPATH; } });
|
|
20
|
-
Object.defineProperty(exports, "SELECTOR_SEPARATOR", { enumerable: true, get: function () { return types_1.SELECTOR_SEPARATOR; } });
|
|
21
|
-
var FileSupport_1 = require("./filesupport/FileSupport");
|
|
22
|
-
Object.defineProperty(exports, "FileSupport", { enumerable: true, get: function () { return FileSupport_1.FileSupport; } });
|
|
2
|
+
export { ConfigJar, Config, ConfigSupport, Source, SystemConfig, Utils } from './browser.js';
|
|
3
|
+
export { ConfigHandler } from './config/ConfigHandler.js';
|
|
4
|
+
export { DEFAULT_JAR_NAME, NAMING_BY_DIRECTORY, NAMING_BY_DIRECTORYPATH, NAMING_BY_FILENAME, NAMING_BY_FULLPATH, SELECTOR_SEPARATOR } from './types.js';
|
|
5
|
+
export { FileSupport } from './filesupport/FileSupport.js';
|
|
23
6
|
// Supported types
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
var FileSource_1 = require("./config/handler/FileSource");
|
|
31
|
-
Object.defineProperty(exports, "FileSource", { enumerable: true, get: function () { return FileSource_1.FileSource; } });
|
|
32
|
-
var FileConfig_1 = require("./config/handler/FileConfig");
|
|
33
|
-
Object.defineProperty(exports, "FileConfig", { enumerable: true, get: function () { return FileConfig_1.FileConfig; } });
|
|
34
|
-
var DirectoryConfig_1 = require("./config/handler/DirectoryConfig");
|
|
35
|
-
Object.defineProperty(exports, "DirectoryConfig", { enumerable: true, get: function () { return DirectoryConfig_1.DirectoryConfig; } });
|
|
7
|
+
export { JsonFileSupport } from './filesupport/types/JsonFileSupport.js';
|
|
8
|
+
export { XmlFileSupport } from './filesupport/types/XmlFileSupport.js';
|
|
9
|
+
export { YamlFileSupport } from './filesupport/types/YamlFileSupport.js';
|
|
10
|
+
export { FileSource } from './config/handler/FileSource.js';
|
|
11
|
+
export { FileConfig } from './config/handler/FileConfig.js';
|
|
12
|
+
export { DirectoryConfig } from './config/handler/DirectoryConfig.js';
|
|
36
13
|
// InterpolationSupport
|
|
37
|
-
|
|
38
|
-
Object.defineProperty(exports, "InterpolationSupport", { enumerable: true, get: function () { return InterpolationSupport_1.InterpolationSupport; } });
|
|
14
|
+
export { InterpolationSupport } from './supports/InterpolationSupport.js';
|
|
39
15
|
//# sourceMappingURL=index.js.map
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,OAAO,EACL,SAAS,EACT,MAAM,EAGN,aAAa,EAGb,MAAM,EACN,YAAY,EACZ,KAAK,EACN,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAC,aAAa,EAAC,MAAM,2BAA2B,CAAC;AAExD,OAAO,EACL,gBAAgB,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,kBAAkB,EAClF,kBAAkB,EAAwB,kBAAkB,EAC7D,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,kBAAkB;AAClB,OAAO,EAAC,eAAe,EAAC,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAC,cAAc,EAAC,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAC,eAAe,EAAC,MAAM,wCAAwC,CAAC;AAKvE,OAAO,EAAC,UAAU,EAAC,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAC,MAAM,gCAAgC,CAAC;AAI1D,OAAO,EAAC,eAAe,EAAC,MAAM,qCAAqC,CAAC;AAEpE,uBAAuB;AACvB,OAAO,EAAC,oBAAoB,EAAC,MAAM,oCAAoC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@allgemein/config",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.5.0",
|
|
4
|
+
"type": "module",
|
|
4
5
|
"description": "@allgemein/config is a configurable configuration content handler which supports multiple configuration infrastructures and file formats.",
|
|
5
6
|
"main": "index.js",
|
|
6
7
|
"browser": "browser.js",
|
|
@@ -27,7 +28,7 @@
|
|
|
27
28
|
},
|
|
28
29
|
"homepage": "https://github.com/allgemein-node/config#readme",
|
|
29
30
|
"devDependencies": {
|
|
30
|
-
"@allgemein/base": "^1.
|
|
31
|
+
"@allgemein/base": "^1.10.0",
|
|
31
32
|
"@types/micromatch": "^4.0.9",
|
|
32
33
|
"glob": "^11.0.0",
|
|
33
34
|
"js-yaml": "^4.1.0",
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.InterpolationSupport = void 0;
|
|
4
|
-
const Interpolation_1 = require("@allgemein/base/utils/Interpolation");
|
|
1
|
+
import { Interpolation } from "@allgemein/base/utils/Interpolation.js";
|
|
5
2
|
const REGEX = /\${[^}]+}/g;
|
|
6
|
-
class InterpolationSupport {
|
|
3
|
+
export class InterpolationSupport {
|
|
7
4
|
static exec(data, ...lookup) {
|
|
8
|
-
return
|
|
5
|
+
return Interpolation.exec(data, ...lookup);
|
|
9
6
|
//
|
|
10
7
|
// if (!lookup.length) {
|
|
11
8
|
// lookup = [data];
|
|
@@ -54,5 +51,4 @@ class InterpolationSupport {
|
|
|
54
51
|
// });
|
|
55
52
|
}
|
|
56
53
|
}
|
|
57
|
-
exports.InterpolationSupport = InterpolationSupport;
|
|
58
54
|
//# sourceMappingURL=InterpolationSupport.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InterpolationSupport.js","sourceRoot":"","sources":["../../../src/supports/InterpolationSupport.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"InterpolationSupport.js","sourceRoot":"","sources":["../../../src/supports/InterpolationSupport.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,wCAAwC,CAAC;AAErE,MAAM,KAAK,GAAG,YAAY,CAAC;AAG3B,MAAM,OAAO,oBAAoB;IAE/B,MAAM,CAAC,IAAI,CAAC,IAAiB,EAAE,GAAG,MAAa;QAC7C,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,EAAC,GAAG,MAAM,CAAC,CAAC;QAC1C,EAAE;QACF,wBAAwB;QACxB,qBAAqB;QACrB,WAAW;QACX,oCAAoC;QACpC,0BAA0B;QAC1B,MAAM;QACN,IAAI;QACJ,EAAE;QACF,iCAAiC;QACjC,qBAAqB;QACrB,kDAAkD;QAClD,oCAAoC;QACpC,gCAAgC;QAChC,wDAAwD;QACxD,+CAA+C;QAC/C,qCAAqC;QACrC,+CAA+C;QAC/C,yCAAyC;QACzC,2BAA2B;QAC3B,EAAE;QACF,kDAAkD;QAClD,+CAA+C;QAC/C,wBAAwB;QACxB,mBAAmB;QACnB,YAAY;QACZ,UAAU;QACV,EAAE;QACF,sBAAsB;QACtB,kCAAkC;QAClC,sEAAsE;QACtE,mBAAmB;QACnB,6DAA6D;QAC7D,YAAY;QACZ,iBAAiB;QACjB,6BAA6B;QAC7B,oCAAoC;QACpC,0EAA0E;QAC1E,qBAAqB;QACrB,iEAAiE;QACjE,cAAc;QACd,YAAY;QACZ,UAAU;QACV,UAAU;QACV,MAAM;QACN,MAAM;IAER,CAAC;CAEF"}
|
package/types.js
CHANGED
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
exports.NAMING_BY_FILENAME = 'by_filename';
|
|
8
|
-
exports.NAMING_BY_DIRECTORYPATH = 'by_dirpath';
|
|
9
|
-
exports.NAMING_BY_FULLPATH = 'by_filepath';
|
|
1
|
+
export const DEFAULT_JAR_NAME = 'default';
|
|
2
|
+
export const SELECTOR_SEPARATOR = '.';
|
|
3
|
+
export const NAMING_BY_DIRECTORY = 'by_dirname';
|
|
4
|
+
export const NAMING_BY_FILENAME = 'by_filename';
|
|
5
|
+
export const NAMING_BY_DIRECTORYPATH = 'by_dirpath';
|
|
6
|
+
export const NAMING_BY_FULLPATH = 'by_filepath';
|
|
10
7
|
//# sourceMappingURL=types.js.map
|
package/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAW,SAAS,CAAC;AAClD,MAAM,CAAC,MAAM,kBAAkB,GAAW,GAAG,CAAC;AAE9C,MAAM,CAAC,MAAM,mBAAmB,GAAW,YAAY,CAAC;AACxD,MAAM,CAAC,MAAM,kBAAkB,GAAW,aAAa,CAAC;AACxD,MAAM,CAAC,MAAM,uBAAuB,GAAW,YAAY,CAAC;AAC5D,MAAM,CAAC,MAAM,kBAAkB,GAAW,aAAa,CAAC"}
|
package/utils/Utils.d.ts
CHANGED
|
@@ -13,7 +13,7 @@ export declare class Utils {
|
|
|
13
13
|
static splitTyped(arr: string, sep?: string): any[];
|
|
14
14
|
static set(arr: any, path: string | any[], value: any): boolean;
|
|
15
15
|
static isArray(o: any): o is any[];
|
|
16
|
-
static isObject(o: any): o is
|
|
16
|
+
static isObject(o: any): o is Record<string | number | symbol, any>;
|
|
17
17
|
static isString(o: any): o is string;
|
|
18
18
|
static isEmpty(o: any): boolean;
|
|
19
19
|
}
|
package/utils/Utils.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// import {merge, mergeDeep} from "typescript-object-utils";
|
|
3
2
|
// import * as merge from 'deepmerge'
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const lodash_1 = require("lodash");
|
|
8
|
-
class Utils {
|
|
3
|
+
import { Interpolation } from "@allgemein/base/utils/Interpolation.js";
|
|
4
|
+
import { cloneDeep, isEmpty, concat, isFunction, isPlainObject, mergeWith, uniqBy, isObject, isArray, isString } from "@allgemein/base";
|
|
5
|
+
export class Utils {
|
|
9
6
|
/**
|
|
10
7
|
* https://stackoverflow.com/questions/1960473/unique-values-in-an-array
|
|
11
8
|
* @param arr
|
|
@@ -18,7 +15,7 @@ class Utils {
|
|
|
18
15
|
return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
|
|
19
16
|
}
|
|
20
17
|
static clone(obj) {
|
|
21
|
-
return
|
|
18
|
+
return cloneDeep(obj);
|
|
22
19
|
}
|
|
23
20
|
/*
|
|
24
21
|
static mergeArray(dest: any[], source: any[], options?: merge.Options) {
|
|
@@ -27,9 +24,9 @@ class Utils {
|
|
|
27
24
|
}
|
|
28
25
|
*/
|
|
29
26
|
static uniqArr(res) {
|
|
30
|
-
return
|
|
27
|
+
return uniqBy(res, (entry) => {
|
|
31
28
|
let x = null;
|
|
32
|
-
if (
|
|
29
|
+
if (isFunction(entry)) {
|
|
33
30
|
x = entry.toString();
|
|
34
31
|
}
|
|
35
32
|
else {
|
|
@@ -39,13 +36,13 @@ class Utils {
|
|
|
39
36
|
});
|
|
40
37
|
}
|
|
41
38
|
static merge(...args) {
|
|
42
|
-
const first =
|
|
43
|
-
return
|
|
44
|
-
if (
|
|
45
|
-
const res =
|
|
39
|
+
const first = cloneDeep(args.shift());
|
|
40
|
+
return mergeWith(first, ...args, (dest, source) => {
|
|
41
|
+
if (isArray(dest)) {
|
|
42
|
+
const res = concat(dest, source);
|
|
46
43
|
return Utils.uniqArr(res);
|
|
47
44
|
}
|
|
48
|
-
else if (
|
|
45
|
+
else if (isPlainObject(dest)) {
|
|
49
46
|
return Utils.merge(dest, source);
|
|
50
47
|
}
|
|
51
48
|
else {
|
|
@@ -111,7 +108,7 @@ class Utils {
|
|
|
111
108
|
// walk(root);
|
|
112
109
|
// }
|
|
113
110
|
static get(arr, path = null) {
|
|
114
|
-
return
|
|
111
|
+
return Interpolation.get(arr, path);
|
|
115
112
|
// if (path) {
|
|
116
113
|
// const paths = path.split('.');
|
|
117
114
|
// let first: string | number = paths.shift();
|
|
@@ -202,17 +199,16 @@ class Utils {
|
|
|
202
199
|
}
|
|
203
200
|
}
|
|
204
201
|
static isArray(o) {
|
|
205
|
-
return
|
|
202
|
+
return isArray(o);
|
|
206
203
|
}
|
|
207
204
|
static isObject(o) {
|
|
208
|
-
return
|
|
205
|
+
return isObject(o);
|
|
209
206
|
}
|
|
210
207
|
static isString(o) {
|
|
211
|
-
return
|
|
208
|
+
return isString(o);
|
|
212
209
|
}
|
|
213
210
|
static isEmpty(o) {
|
|
214
|
-
return
|
|
211
|
+
return isEmpty(o);
|
|
215
212
|
}
|
|
216
213
|
}
|
|
217
|
-
exports.Utils = Utils;
|
|
218
214
|
//# sourceMappingURL=Utils.js.map
|
package/utils/Utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/utils/Utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/utils/Utils.ts"],"names":[],"mappings":"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"}
|