Compare commits
3 Commits
f69a12fb52
...
2a1078a3a2
Author | SHA1 | Date |
---|---|---|
Derrick Hammer | 2a1078a3a2 | |
Derrick Hammer | a3f3e157b9 | |
Derrick Hammer | 785e0b836c |
|
@ -65,7 +65,9 @@ class Config {
|
||||||
for (const key of Object.keys(settings)) {
|
for (const key of Object.keys(settings)) {
|
||||||
const value = json[key];
|
const value = json[key];
|
||||||
let keyPath = key.split(".");
|
let keyPath = key.split(".");
|
||||||
let isArray = typeof parseInt(keyPath.pop()) === "number";
|
let isArray = key.includes(".") &&
|
||||||
|
keyPath.length > 1 &&
|
||||||
|
typeof parseInt(keyPath.pop()) === "number";
|
||||||
if (isArray) {
|
if (isArray) {
|
||||||
let itemPath = keyPath.join(".");
|
let itemPath = keyPath.join(".");
|
||||||
let item = this.get(itemPath, []);
|
let item = this.get(itemPath, []);
|
||||||
|
@ -127,7 +129,7 @@ class Config {
|
||||||
}
|
}
|
||||||
(0, bsert_1.default)(typeof key === "string", "Key must be a string.");
|
(0, bsert_1.default)(typeof key === "string", "Key must be a string.");
|
||||||
key = this.normalize(key);
|
key = this.normalize(key);
|
||||||
return object_path_1.default.get(this.data, key);
|
return object_path_1.default.get(this.data, key, fallback);
|
||||||
}
|
}
|
||||||
typeOf(key) {
|
typeOf(key) {
|
||||||
const value = this.get(key);
|
const value = this.get(key);
|
||||||
|
|
|
@ -77,7 +77,10 @@ export default class Config {
|
||||||
const value = json[key];
|
const value = json[key];
|
||||||
|
|
||||||
let keyPath = key.split(".");
|
let keyPath = key.split(".");
|
||||||
let isArray = typeof parseInt(keyPath.pop()) === "number";
|
let isArray =
|
||||||
|
key.includes(".") &&
|
||||||
|
keyPath.length > 1 &&
|
||||||
|
typeof parseInt(keyPath.pop()) === "number";
|
||||||
|
|
||||||
if (isArray) {
|
if (isArray) {
|
||||||
let itemPath = keyPath.join(".");
|
let itemPath = keyPath.join(".");
|
||||||
|
@ -160,7 +163,7 @@ export default class Config {
|
||||||
|
|
||||||
key = this.normalize(key);
|
key = this.normalize(key);
|
||||||
|
|
||||||
return objectPath.get(this.data, key);
|
return objectPath.get(this.data, key, fallback);
|
||||||
}
|
}
|
||||||
|
|
||||||
public typeOf(key: string) {
|
public typeOf(key: string) {
|
||||||
|
|
Loading…
Reference in New Issue