@spinajs/configuration 2.0.485 → 2.0.487
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/cjs/sources.d.ts +4 -0
- package/lib/cjs/sources.d.ts.map +1 -1
- package/lib/cjs/sources.js +5 -11
- package/lib/cjs/sources.js.map +1 -1
- package/lib/mjs/sources.d.ts +4 -0
- package/lib/mjs/sources.d.ts.map +1 -1
- package/lib/mjs/sources.js +6 -12
- package/lib/mjs/sources.js.map +1 -1
- package/lib/tsconfig.cjs.tsbuildinfo +1 -1
- package/lib/tsconfig.mjs.tsbuildinfo +1 -1
- package/package.json +6 -6
package/lib/cjs/sources.d.ts
CHANGED
|
@@ -28,6 +28,10 @@ export declare abstract class BaseFileSource extends ConfigurationSource {
|
|
|
28
28
|
protected static findHoistingRoot(startDir: string): string | null;
|
|
29
29
|
constructor(RunApp?: string | undefined, CustomConfigPaths?: string[] | undefined, appBaseDir?: string | undefined, Env?: string | undefined);
|
|
30
30
|
protected load(extension: string, callback: (file: string) => Promise<IConfigLike>): Promise<{}>;
|
|
31
|
+
/**
|
|
32
|
+
* Delegates to `normalizeEnvironment` so config file loading and migration file loading can
|
|
33
|
+
* never disagree about what an environment name means. Signature kept - subclasses override it.
|
|
34
|
+
*/
|
|
31
35
|
protected getEnvironment(config: Configuration): string;
|
|
32
36
|
}
|
|
33
37
|
export declare class JsFileSource extends BaseFileSource {
|
package/lib/cjs/sources.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sources.d.ts","sourceRoot":"","sources":["../../src/sources.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"sources.d.ts","sourceRoot":"","sources":["../../src/sources.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAwB,MAAM,+BAA+B,CAAC;AAEtH,8BAAsB,cAAe,SAAQ,mBAAmB;IA8D5D,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM;IACzB,SAAS,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE;IACtC,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM;IAC7B,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM;IAhExB;;OAEG;IACI,OAAO,SAAQ;IAEtB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,CAAM;IAEpC,SAAS,CAAC,QAAQ,SAAM;IAExB,IAAW,KAAK,WAEf;IAED;;;;OAIG;IACH,SAAS,CAAC,MAAM,CAAC,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE;IAkBjE;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;gBAiBtD,MAAM,CAAC,EAAE,MAAM,YAAA,EACf,iBAAiB,CAAC,EAAE,MAAM,EAAE,YAAA,EAC5B,UAAU,CAAC,EAAE,MAAM,YAAA,EACnB,GAAG,CAAC,EAAE,MAAM,YAAA;cAyFR,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC;IA2BxF;;;OAGG;IACH,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,aAAa;CAG/C;AAED,qBACa,YAAa,SAAQ,cAAc;IACjC,IAAI,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC;CAgC/D;AAED,qBACa,cAAe,SAAQ,cAAc;IACnC,IAAI,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC;CA2B/D"}
|
package/lib/cjs/sources.js
CHANGED
|
@@ -195,18 +195,12 @@ class BaseFileSource extends configuration_common_1.ConfigurationSource {
|
|
|
195
195
|
.map((c) => lodash_1.default.mergeWith(config, c.default ?? c, util_js_1.mergeArrays));
|
|
196
196
|
return config;
|
|
197
197
|
}
|
|
198
|
+
/**
|
|
199
|
+
* Delegates to `normalizeEnvironment` so config file loading and migration file loading can
|
|
200
|
+
* never disagree about what an environment name means. Signature kept - subclasses override it.
|
|
201
|
+
*/
|
|
198
202
|
getEnvironment(config) {
|
|
199
|
-
|
|
200
|
-
switch (env) {
|
|
201
|
-
case 'dev':
|
|
202
|
-
case 'development':
|
|
203
|
-
return 'dev';
|
|
204
|
-
case 'prod':
|
|
205
|
-
case 'production':
|
|
206
|
-
return 'prod';
|
|
207
|
-
default:
|
|
208
|
-
return env;
|
|
209
|
-
}
|
|
203
|
+
return (0, configuration_common_1.normalizeEnvironment)(config.get('process.env.APP_ENV', undefined) ?? this.Env);
|
|
210
204
|
}
|
|
211
205
|
}
|
|
212
206
|
exports.BaseFileSource = BaseFileSource;
|
package/lib/cjs/sources.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sources.js","sourceRoot":"","sources":["../../src/sources.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAA6C;AAC7C,gDAAwB;AACxB,oDAAsC;AACtC,+BAAgD;AAChD,uCAAsD;AACtD,uCAAyB;AACzB,2CAA6B;AAC7B,8DAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"sources.js","sourceRoot":"","sources":["../../src/sources.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAA6C;AAC7C,gDAAwB;AACxB,oDAAsC;AACtC,+BAAgD;AAChD,uCAAsD;AACtD,uCAAyB;AACzB,2CAA6B;AAC7B,8DAA0D;AAC1D,wEAAsH;AAEtH,MAAsB,cAAe,SAAQ,0CAAmB;IAU9D,IAAW,KAAK;QACd,OAAO,CAAC,CAAC;IACX,CAAC;IAED;;;;OAIG;IACO,MAAM,CAAC,oBAAoB,CAAC,QAAgB;QACpD,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAI,OAAO,GAAG,QAAQ,CAAC;QAEvB,SAAS,CAAC;YACR,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC;gBACtD,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtB,CAAC;YAED,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACrC,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;gBACvB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,OAAO,GAAG,MAAM,CAAC;QACnB,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACO,MAAM,CAAC,gBAAgB,CAAC,QAAgB;QAChD,KAAK,MAAM,GAAG,IAAI,cAAc,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;YAE5D,IAAI,CAAC;gBACH,IAAI,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACxC,OAAO,GAAG,CAAC;gBACb,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,2CAA2C;YAC7C,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YACY,MAAe,EACf,iBAA4B,EAC5B,UAAmB,EACnB,GAAY;QAEtB,KAAK,EAAE,CAAC;QALE,WAAM,GAAN,MAAM,CAAS;QACf,sBAAiB,GAAjB,iBAAiB,CAAW;QAC5B,eAAU,GAAV,UAAU,CAAS;QACnB,QAAG,GAAH,GAAG,CAAS;QAhExB;;WAEG;QACI,YAAO,GAAG,IAAI,CAAC;QAEZ,eAAU,GAAa,EAAE,CAAC;QAE1B,aAAQ,GAAG,EAAE,CAAC;QA6DtB,MAAM,SAAS,GAAG,OAAE,CAAC,GAAG,CAAU,aAAa,CAAC,CAAC;QAEjD,gFAAgF;QAChF,iFAAiF;QACjF,iFAAiF;QACjF,2EAA2E;QAC3E,kFAAkF;QAClF,8EAA8E;QAC9E,2EAA2E;QAC3E,8BAA8B;QAC9B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;YACrC,MAAM,YAAY,GAAG,cAAc,CAAC,gBAAgB,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YAE7E,IAAI,YAAY,EAAE,CAAC;gBACjB,gCAAc,CAAC,KAAK,CAAC,0DAA0D,YAAY,EAAE,EAAE,eAAe,CAAC,CAAC;gBAChH,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,YAAY,CAAC;YACjD,CAAC;QACH,CAAC;QAED,MAAM,iBAAiB,GAAG,SAAS,CAAC,CAAC,CAAC,wCAAwC,CAAC,CAAC,CAAC,wCAAwC,CAAC;QAE1H,IAAI,CAAC,UAAU,GAAG;YAChB,wBAAwB;YACxB,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;YAEzD,+BAA+B;YAC/B,EAAE;YACF,8EAA8E;YAC9E,6EAA6E;YAC7E,4EAA4E;YAC5E,yEAAyE;YACzE,0EAA0E;YAC1E,6DAA6D;YAC7D,2EAA2E;YAC3E,iDAAiD;YACjD,GAAG,cAAc,CAAC,oBAAoB,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC,CAAC;SACrH,CAAC;QAGF,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;YACpC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;gBAEvC,sBAAsB;gBACtB,IAAA,gBAAS,EACP,IAAA,WAAI,EACF,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,EACxC,SAAS,CAAC,CAAC,CAAC,wCAAwC,CAAC,CAAC,CAAC,wCAAwC,CAChG,CACF;aACF,CAAC,CAAC;QACL,CAAC;QAEE,wDAAwD;QAC1D,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;QAC7E,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;QAC9E,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;QAEzE,4CAA4C;QAC5C,wBAAwB;QACxB,MAAM,KAAK,GAAG,IAAA,sBAAY,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAE1C,uDAAuD;QACvD,+CAA+C;QAC/C,8BAA8B;QAC9B,IAAI,CAAC,QAAQ,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;QAEvD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAEhB,IAAG,IAAI,CAAC,UAAU,EAAE,CAAC;gBACnB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAA,WAAI,EAAC,IAAI,CAAC,UAAU,EAAE,IAAI,IAAI,CAAC,MAAM,SAAS,CAAC,CAAC,CAAC,CAAC;YAC9F,CAAC;YAED,2CAA2C;YAC3C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,IAAI,CAAC,MAAM,SAAS,CAAC,CAAC,CAAC,CAAC;YAC/F,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,IAAI,CAAC,MAAM,SAAS,CAAC,CAAC,CAAC,CAAC;YACpG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,IAAI,CAAC,MAAM,SAAS,CAAC,CAAC,CAAC,CAAC;YACnG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,eAAe,IAAI,CAAC,MAAM,SAAS,CAAC,CAAC,CAAC,CAAC;QACvG,CAAC;QAED,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAES,KAAK,CAAC,IAAI,CAAC,SAAiB,EAAE,QAAgD;QACtF,MAAM,MAAM,GAAG,EAAE,CAAC;QAElB,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;YAC7F,uBAAuB;aACtB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,OAAO,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QACzE,CAAC,CAAC;YACF,gBAAgB;aACf,MAAM,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;YACxB,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7C,CAAC,EAAE,EAAE,CAAC;YACN,uCAAuC;aACtC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAA,gBAAS,EAAC,IAAA,cAAO,EAAC,CAAC,CAAC,CAAC,CAAC;aACzC,MAAM,CAAC,CAAC,CAAS,EAAE,KAAa,EAAE,IAAe,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC;aAChF,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEjB,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAc,SAAS,CAAC,CAAC;QAEzD,MAAM;aACH,MAAM,CAAC,CAAC,CAAc,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,CAAC;YAC1D,uBAAuB;aACtB,GAAG,CAAC,CAAC,CAAc,EAAE,EAAE,CAAC,gBAAC,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,IAAI,CAAC,EAAE,qBAAW,CAAC,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;OAGG;IACO,cAAc,CAAC,MAAqB;QAC5C,OAAO,IAAA,2CAAoB,EAAC,MAAM,CAAC,GAAG,CAAS,qBAAqB,EAAE,SAAS,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;IAChG,CAAC;CACF;AA5LD,wCA4LC;AAGM,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,cAAc;IACvC,KAAK,CAAC,IAAI,CAAC,MAAqB;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;QACzD,MAAM,IAAI,GAAG,KAAK,GAAG,WAAW,CAAC;QACjC,IAAI,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAgB,CAAC;QAExD,OAAO,gBAAC,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,qBAAW,CAAC,CAAC;QAE7C,KAAK,UAAU,KAAK,CAAC,IAAY;YAC/B,IAAI,CAAC;gBACH,gCAAc,CAAC,KAAK,CAAC,uBAAuB,IAAI,EAAE,EAAE,eAAe,CAAC,CAAC;gBAErE,IAAI,GAAG,GAAG,CAAC,MAAM,OAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAgB,CAAC;gBAC9D,8DAA8D;gBAC9D,IAAI,OAAO,GAAG,CAAC,YAAY,KAAK,UAAU,EAAE,CAAC;oBAC3C,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAE,CAAC;gBACvC,CAAC;gBAED,sCAAsC;gBACtC,yBAAyB;gBACzB,KAAK,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;oBAClB,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;wBAC3E,GAAG,CAAC,CAAC,CAAS,CAAC,QAAQ,GAAG,CAAC,IAAI,CAAC,CAAC;oBACpC,CAAC;gBACH,CAAC;gBAED,OAAO,GAAG,CAAC;YACb,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,gCAAc,CAAC,KAAK,CAAC,GAAY,EAAE,oCAAoC,IAAI,EAAE,EAAE,eAAe,CAAC,CAAC;gBAChG,OAAO,EAAiB,CAAC;YAAM,CAAC;QACpC,CAAC;IACH,CAAC;CACF,CAAA;AAjCY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,eAAU,EAAC,0CAAmB,CAAC;GACnB,YAAY,CAiCxB;AAGM,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,cAAc;IACzC,KAAK,CAAC,IAAI,CAAC,MAAqB;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,KAAK,GAAG,OAAO,CAAC;QAC7B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACzC,OAAO,gBAAC,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,qBAAW,CAAgB,CAAC;QAE5D,SAAS,KAAK,CAAC,IAAY;YACzB,IAAI,CAAC;gBACH,gCAAc,CAAC,KAAK,CAAC,uBAAuB,IAAI,EAAE,EAAE,eAAe,CAAC,CAAC;gBAErE,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAQ,CAAC;gBAE9D,sCAAsC;gBACtC,yBAAyB;gBACzB,KAAK,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;oBAClB,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;wBAC3E,GAAG,CAAC,CAAC,CAAS,CAAC,QAAQ,GAAG,CAAC,IAAI,CAAC,CAAC;oBACpC,CAAC;gBACH,CAAC;gBACD,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC9B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,gCAAc,CAAC,KAAK,CAAC,GAAY,EAAE,oCAAoC,IAAI,EAAE,EAAE,eAAe,CAAC,CAAC;gBAChG,OAAO,OAAO,CAAC,OAAO,CAAC,EAAiB,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC;IACH,CAAC;CACF,CAAA;AA5BY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,eAAU,EAAC,0CAAmB,CAAC;GACnB,cAAc,CA4B1B"}
|
package/lib/mjs/sources.d.ts
CHANGED
|
@@ -28,6 +28,10 @@ export declare abstract class BaseFileSource extends ConfigurationSource {
|
|
|
28
28
|
protected static findHoistingRoot(startDir: string): string | null;
|
|
29
29
|
constructor(RunApp?: string | undefined, CustomConfigPaths?: string[] | undefined, appBaseDir?: string | undefined, Env?: string | undefined);
|
|
30
30
|
protected load(extension: string, callback: (file: string) => Promise<IConfigLike>): Promise<{}>;
|
|
31
|
+
/**
|
|
32
|
+
* Delegates to `normalizeEnvironment` so config file loading and migration file loading can
|
|
33
|
+
* never disagree about what an environment name means. Signature kept - subclasses override it.
|
|
34
|
+
*/
|
|
31
35
|
protected getEnvironment(config: Configuration): string;
|
|
32
36
|
}
|
|
33
37
|
export declare class JsFileSource extends BaseFileSource {
|
package/lib/mjs/sources.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sources.d.ts","sourceRoot":"","sources":["../../src/sources.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"sources.d.ts","sourceRoot":"","sources":["../../src/sources.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAwB,MAAM,+BAA+B,CAAC;AAEtH,8BAAsB,cAAe,SAAQ,mBAAmB;IA8D5D,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM;IACzB,SAAS,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE;IACtC,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM;IAC7B,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM;IAhExB;;OAEG;IACI,OAAO,SAAQ;IAEtB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,CAAM;IAEpC,SAAS,CAAC,QAAQ,SAAM;IAExB,IAAW,KAAK,WAEf;IAED;;;;OAIG;IACH,SAAS,CAAC,MAAM,CAAC,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE;IAkBjE;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;gBAiBtD,MAAM,CAAC,EAAE,MAAM,YAAA,EACf,iBAAiB,CAAC,EAAE,MAAM,EAAE,YAAA,EAC5B,UAAU,CAAC,EAAE,MAAM,YAAA,EACnB,GAAG,CAAC,EAAE,MAAM,YAAA;cAyFR,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC;IA2BxF;;;OAGG;IACH,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,aAAa;CAG/C;AAED,qBACa,YAAa,SAAQ,cAAc;IACjC,IAAI,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC;CAgC/D;AAED,qBACa,cAAe,SAAQ,cAAc;IACnC,IAAI,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC;CA2B/D"}
|
package/lib/mjs/sources.js
CHANGED
|
@@ -12,7 +12,7 @@ import { findBasePath, mergeArrays } from './util.js';
|
|
|
12
12
|
import * as fs from 'fs';
|
|
13
13
|
import * as path from 'path';
|
|
14
14
|
import { InternalLogger } from '@spinajs/internal-logger';
|
|
15
|
-
import { ConfigurationSource } from '@spinajs/configuration-common';
|
|
15
|
+
import { ConfigurationSource, normalizeEnvironment } from '@spinajs/configuration-common';
|
|
16
16
|
export class BaseFileSource extends ConfigurationSource {
|
|
17
17
|
get Order() {
|
|
18
18
|
return 1;
|
|
@@ -156,18 +156,12 @@ export class BaseFileSource extends ConfigurationSource {
|
|
|
156
156
|
.map((c) => _.mergeWith(config, c.default ?? c, mergeArrays));
|
|
157
157
|
return config;
|
|
158
158
|
}
|
|
159
|
+
/**
|
|
160
|
+
* Delegates to `normalizeEnvironment` so config file loading and migration file loading can
|
|
161
|
+
* never disagree about what an environment name means. Signature kept - subclasses override it.
|
|
162
|
+
*/
|
|
159
163
|
getEnvironment(config) {
|
|
160
|
-
|
|
161
|
-
switch (env) {
|
|
162
|
-
case 'dev':
|
|
163
|
-
case 'development':
|
|
164
|
-
return 'dev';
|
|
165
|
-
case 'prod':
|
|
166
|
-
case 'production':
|
|
167
|
-
return 'prod';
|
|
168
|
-
default:
|
|
169
|
-
return env;
|
|
170
|
-
}
|
|
164
|
+
return normalizeEnvironment(config.get('process.env.APP_ENV', undefined) ?? this.Env);
|
|
171
165
|
}
|
|
172
166
|
}
|
|
173
167
|
let JsFileSource = class JsFileSource extends BaseFileSource {
|
package/lib/mjs/sources.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sources.js","sourceRoot":"","sources":["../../src/sources.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAiB,mBAAmB,EAAe,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"sources.js","sourceRoot":"","sources":["../../src/sources.ts"],"names":[],"mappings":"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"}
|