@creator.co/wapi 1.3.8 → 1.3.9

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.
Files changed (5) hide show
  1. package/dist/package.json +1 -1
  2. package/dist/src/Config/Configuration.js +8 -9
  3. package/dist/src/Config/Configuration.js.map +1 -1
  4. package/package.json +1 -1
  5. package/src/Config/Configuration.ts +2 -3
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@creator.co/wapi",
3
- "version": "1.3.8",
3
+ "version": "1.3.9",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/dist/src/Config/Configuration.js CHANGED
@@ -83,13 +83,17 @@ var Configuration = /** @class */ (function () {
83
83
  */
84
84
  Configuration.prototype.asyncGet = function (propName) {
85
85
  return __awaiter(this, void 0, void 0, function () {
86
- var propString, propSchema, v, v_1, _a;
87
- return __generator(this, function (_b) {
88
- switch (_b.label) {
86
+ var propString, propSchema, v, v_1;
87
+ return __generator(this, function (_a) {
88
+ switch (_a.label) {
89
89
  case 0:
90
90
  propString = propName;
91
91
  propSchema = this.schema[propString];
92
92
  v = this.getCachedValue(propString);
93
+ if (v !== undefined)
94
+ return [2 /*return*/, v
95
+ // check for local override
96
+ ];
93
97
  // check for local override
94
98
  if (Configuration.isLocal && process.env[propString] !== undefined) {
95
99
  console.log("Overriding remote variable ".concat(propString, " with local value!"));
@@ -97,15 +101,10 @@ var Configuration = /** @class */ (function () {
97
101
  this.cacheValue(propString, v_1, propSchema.cachingPolicy);
98
102
  return [2 /*return*/, v_1];
99
103
  }
100
- _a = v;
101
- if (_a) return [3 /*break*/, 2];
102
104
  return [4 /*yield*/, new EnvironmentVar_1.default(propString, propSchema.isSecure ? EnvironmentVar_1.EnvironmentType.SecureRemote : EnvironmentVar_1.EnvironmentType.PlainRemote, !propSchema.required, !propSchema.noPrefix ? this.remotePrefix : '').resolve()];
103
105
  case 1:
104
- _a = (_b.sent());
105
- _b.label = 2;
106
- case 2:
107
106
  // remote
108
- v = _a;
107
+ v = (_a.sent());
109
108
  this.cacheValue(propString, v, propSchema.cachingPolicy);
110
109
  return [2 /*return*/, v];
111
110
  }
package/dist/src/Config/Configuration.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Configuration.js","sourceRoot":"","sources":["../../../src/Config/Configuration.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Configuration.js","sourceRoot":"","sources":["../../../src/Config/Configuration.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@creator.co/wapi",
3
- "version": "1.3.8",
3
+ "version": "1.3.9",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/Config/Configuration.ts CHANGED
@@ -148,6 +148,7 @@ export default class Configuration<T extends ConfigurationSchema> {
148
148
  const propSchema = this.schema[propString]
149
149
  // check cache
150
150
  let v = this.getCachedValue(propString)
151
+ if (v !== undefined) return v
151
152
  // check for local override
152
153
  if (Configuration.isLocal && process.env[propString] !== undefined) {
153
154
  console.log(`Overriding remote variable ${propString} with local value!`)
@@ -156,9 +157,7 @@ export default class Configuration<T extends ConfigurationSchema> {
156
157
  return v
157
158
  }
158
159
  // remote
159
- v =
160
- v ||
161
- (await new EnvironmentVar<string>(
160
+ v = (await new EnvironmentVar<string>(
162
161
  propString,
163
162
  propSchema.isSecure ? EnvironmentType.SecureRemote : EnvironmentType.PlainRemote,
164
163
  !propSchema.required,