@meghjs/core 0.5.4 → 0.6.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/README.md +54 -137
- package/dist/common/container.js +0 -1
- package/dist/common/container.js.map +1 -1
- package/dist/common/exceptions/http-exceptions.d.ts +1 -50
- package/dist/common/exceptions/http-exceptions.js +15 -80
- package/dist/common/exceptions/http-exceptions.js.map +1 -1
- package/dist/common/exceptions/system-exception.d.ts +0 -10
- package/dist/common/exceptions/system-exception.js +7 -12
- package/dist/common/exceptions/system-exception.js.map +1 -1
- package/dist/common/utils/compiled-validation.d.ts +43 -0
- package/dist/common/utils/compiled-validation.js +299 -0
- package/dist/common/utils/compiled-validation.js.map +1 -0
- package/dist/common/utils/object-utils.d.ts +4 -0
- package/dist/common/utils/object-utils.js +44 -7
- package/dist/common/utils/object-utils.js.map +1 -1
- package/dist/common/utils/path-utils.d.ts +7 -0
- package/dist/common/utils/path-utils.js +15 -0
- package/dist/common/utils/path-utils.js.map +1 -1
- package/dist/config/environment-variables.d.ts +2 -0
- package/dist/config/environment-variables.js +24 -12
- package/dist/config/environment-variables.js.map +1 -1
- package/dist/core/application.d.ts +90 -12
- package/dist/core/application.js +166 -100
- package/dist/core/application.js.map +1 -1
- package/dist/core/interfaces.d.ts +48 -4
- package/dist/core/router.d.ts +59 -9
- package/dist/core/router.js +233 -123
- package/dist/core/router.js.map +1 -1
- package/dist/core/testing.js +2 -12
- package/dist/core/testing.js.map +1 -1
- package/dist/core/types.d.ts +6 -0
- package/dist/errors/error-handler.d.ts +56 -0
- package/dist/errors/error-handler.js +206 -0
- package/dist/errors/error-handler.js.map +1 -0
- package/dist/errors/exception-filter.d.ts +96 -0
- package/dist/errors/exception-filter.js +68 -0
- package/dist/errors/exception-filter.js.map +1 -0
- package/dist/errors/http-exceptions.d.ts +413 -0
- package/dist/errors/http-exceptions.js +155 -0
- package/dist/errors/http-exceptions.js.map +1 -0
- package/dist/errors/index.d.ts +4 -0
- package/dist/errors/index.js +24 -0
- package/dist/errors/index.js.map +1 -0
- package/dist/events/event-subscriber.js +14 -3
- package/dist/events/event-subscriber.js.map +1 -1
- package/dist/events/socket-dispatcher.d.ts +1 -3
- package/dist/events/socket-dispatcher.js +2 -10
- package/dist/events/socket-dispatcher.js.map +1 -1
- package/dist/http/multipart.js.map +1 -1
- package/dist/http/params.js +3 -1
- package/dist/http/params.js.map +1 -1
- package/dist/http/route-methods.js.map +1 -1
- package/dist/http/validator-extend.js +1 -1
- package/dist/http/validator-extend.js.map +1 -1
- package/dist/index.d.ts +3 -2
- package/dist/index.js +7 -3
- package/dist/index.js.map +1 -1
- package/dist/observability/health.d.ts +45 -0
- package/dist/observability/health.js +74 -0
- package/dist/observability/health.js.map +1 -0
- package/dist/observability/index.d.ts +3 -0
- package/dist/observability/index.js +5 -0
- package/dist/observability/index.js.map +1 -1
- package/dist/observability/logger.js +8 -1
- package/dist/observability/logger.js.map +1 -1
- package/dist/observability/request-context.d.ts +29 -0
- package/dist/observability/request-context.js +54 -0
- package/dist/observability/request-context.js.map +1 -0
- package/dist/openapi/swagger-schema.d.ts +0 -2
- package/dist/openapi/swagger-schema.js +21 -5
- package/dist/openapi/swagger-schema.js.map +1 -1
- package/dist/orm/connect.d.ts +2 -0
- package/dist/orm/connect.js +6 -1
- package/dist/orm/connect.js.map +1 -1
- package/dist/orm/plugin.js +2 -0
- package/dist/orm/plugin.js.map +1 -1
- package/dist/plugins/plugin.d.ts +3 -0
- package/dist/plugins/plugin.js.map +1 -1
- package/dist/plugins/registry.js +1 -0
- package/dist/plugins/registry.js.map +1 -1
- package/dist/realtime/websocket.d.ts +1 -7
- package/dist/realtime/websocket.js +2 -18
- package/dist/realtime/websocket.js.map +1 -1
- package/dist/storage/file-storage.js +6 -4
- package/dist/storage/file-storage.js.map +1 -1
- package/dist/validator/compat.d.ts +5 -0
- package/dist/validator/compat.js +42 -0
- package/dist/validator/compat.js.map +1 -0
- package/dist/validator/compiler.d.ts +20 -0
- package/dist/validator/compiler.js +219 -0
- package/dist/validator/compiler.js.map +1 -0
- package/dist/validator/decorators.d.ts +81 -0
- package/dist/validator/decorators.js +377 -0
- package/dist/validator/decorators.js.map +1 -0
- package/dist/validator/index.d.ts +16 -0
- package/dist/validator/index.js +36 -0
- package/dist/validator/index.js.map +1 -0
- package/dist/validator/is-email.d.ts +25 -0
- package/dist/validator/is-email.js +204 -0
- package/dist/validator/is-email.js.map +1 -0
- package/dist/validator/messages.d.ts +20 -0
- package/dist/validator/messages.js +186 -0
- package/dist/validator/messages.js.map +1 -0
- package/dist/validator/metadata.d.ts +118 -0
- package/dist/validator/metadata.js +153 -0
- package/dist/validator/metadata.js.map +1 -0
- package/dist/validator/transform.d.ts +29 -0
- package/dist/validator/transform.js +210 -0
- package/dist/validator/transform.js.map +1 -0
- package/package.json +8 -3
|
@@ -0,0 +1,299 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.compileValidator = compileValidator;
|
|
4
|
+
const internal_logger_1 = require("../../observability/internal-logger");
|
|
5
|
+
const schema_properties_1 = require("../../openapi/schema-properties");
|
|
6
|
+
const messages_1 = require("../../validator/messages");
|
|
7
|
+
const IS_DEFINED = "isDefined";
|
|
8
|
+
const CUSTOM_VALIDATION = "customValidation";
|
|
9
|
+
const CONDITIONAL_VALIDATION = "conditionalValidation";
|
|
10
|
+
const WHITELIST = "whitelistValidation";
|
|
11
|
+
/** Thrown inside a run to abandon the fast path for that payload. */
|
|
12
|
+
const BAIL = Symbol("megh:compiled-validation:bail");
|
|
13
|
+
const plans = new WeakMap();
|
|
14
|
+
let warnedUnavailable = false;
|
|
15
|
+
/**
|
|
16
|
+
* Compile a validator for the DTO class `target`, or return `undefined` when
|
|
17
|
+
* the class uses something the compiled path does not reproduce exactly.
|
|
18
|
+
* Results are cached per class.
|
|
19
|
+
*/
|
|
20
|
+
function compileValidator(target) {
|
|
21
|
+
if (typeof target !== "function")
|
|
22
|
+
return undefined;
|
|
23
|
+
const cached = plans.get(target);
|
|
24
|
+
if (cached !== undefined)
|
|
25
|
+
return cached ?? undefined;
|
|
26
|
+
let compiled = null;
|
|
27
|
+
try {
|
|
28
|
+
const plan = buildPlan(target);
|
|
29
|
+
compiled = plan ? createRunner(plan) : null;
|
|
30
|
+
}
|
|
31
|
+
catch (error) {
|
|
32
|
+
if (!warnedUnavailable) {
|
|
33
|
+
warnedUnavailable = true;
|
|
34
|
+
(0, internal_logger_1.internalLogger)("validation").warn({ err: error }, "Compiled validation is unavailable, using class-validator");
|
|
35
|
+
}
|
|
36
|
+
compiled = null;
|
|
37
|
+
}
|
|
38
|
+
plans.set(target, compiled);
|
|
39
|
+
return compiled ?? undefined;
|
|
40
|
+
}
|
|
41
|
+
// ---------------------------------------------------------------------------
|
|
42
|
+
// Plan
|
|
43
|
+
// ---------------------------------------------------------------------------
|
|
44
|
+
function buildPlan(target) {
|
|
45
|
+
if (hasTransformerMetadata(target))
|
|
46
|
+
return undefined;
|
|
47
|
+
const { getMetadataStorage } = require("class-validator");
|
|
48
|
+
const storage = getMetadataStorage();
|
|
49
|
+
// Same arguments `validate(instance, options)` uses: no schema, no groups,
|
|
50
|
+
// `always` and `strictGroups` off.
|
|
51
|
+
const metadatas = storage.getTargetValidationMetadatas(target, undefined, false, false, undefined);
|
|
52
|
+
// class-validator answers "unknownValue" for a class without metadata.
|
|
53
|
+
if (metadatas.length === 0)
|
|
54
|
+
return undefined;
|
|
55
|
+
const grouped = storage.groupByPropertyName(metadatas);
|
|
56
|
+
const allowed = new Set();
|
|
57
|
+
const properties = [];
|
|
58
|
+
for (const name of Object.keys(grouped)) {
|
|
59
|
+
const group = grouped[name];
|
|
60
|
+
if (group.length > 0)
|
|
61
|
+
allowed.add(name);
|
|
62
|
+
const plan = {
|
|
63
|
+
name,
|
|
64
|
+
conditions: [],
|
|
65
|
+
defined: [],
|
|
66
|
+
checks: [],
|
|
67
|
+
};
|
|
68
|
+
for (const metadata of group) {
|
|
69
|
+
switch (metadata.type) {
|
|
70
|
+
case WHITELIST:
|
|
71
|
+
break;
|
|
72
|
+
case CONDITIONAL_VALIDATION:
|
|
73
|
+
plan.conditions.push(metadata.constraints[0]);
|
|
74
|
+
break;
|
|
75
|
+
case IS_DEFINED:
|
|
76
|
+
case CUSTOM_VALIDATION: {
|
|
77
|
+
const constraints = storage.getTargetValidatorConstraints(metadata.constraintCls);
|
|
78
|
+
const list = metadata.type === IS_DEFINED ? plan.defined : plan.checks;
|
|
79
|
+
for (const constraint of constraints) {
|
|
80
|
+
if (constraint.async)
|
|
81
|
+
return undefined;
|
|
82
|
+
list.push({ metadata, constraint, each: !!metadata.each });
|
|
83
|
+
}
|
|
84
|
+
break;
|
|
85
|
+
}
|
|
86
|
+
default:
|
|
87
|
+
// nestedValidation, promiseValidation or an unknown type.
|
|
88
|
+
return undefined;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
properties.push(plan);
|
|
92
|
+
}
|
|
93
|
+
return {
|
|
94
|
+
target,
|
|
95
|
+
allowed,
|
|
96
|
+
properties,
|
|
97
|
+
readonlyKeys: readonlyKeysOf(target.prototype),
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
/** Any class-transformer decorator on the class or its ancestors. */
|
|
101
|
+
function hasTransformerMetadata(target) {
|
|
102
|
+
const storage = (0, schema_properties_1.getTransformerStorage)();
|
|
103
|
+
if (!storage)
|
|
104
|
+
return false;
|
|
105
|
+
const maps = [
|
|
106
|
+
storage._typeMetadatas,
|
|
107
|
+
storage._transformMetadatas,
|
|
108
|
+
storage._exposeMetadatas,
|
|
109
|
+
storage._excludeMetadatas,
|
|
110
|
+
];
|
|
111
|
+
let current = target;
|
|
112
|
+
while (typeof current === "function" && current !== Function.prototype) {
|
|
113
|
+
for (const map of maps) {
|
|
114
|
+
const entry = map instanceof Map ? map.get(current) : undefined;
|
|
115
|
+
if (entry instanceof Map ? entry.size > 0 : entry !== undefined) {
|
|
116
|
+
return true;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
current = Object.getPrototypeOf(current);
|
|
120
|
+
}
|
|
121
|
+
return false;
|
|
122
|
+
}
|
|
123
|
+
/**
|
|
124
|
+
* Keys `plainToInstance` never assigns on an instance of this class: any own
|
|
125
|
+
* property of the prototype without a setter (getters, methods). Inherited
|
|
126
|
+
* methods are caught per instance by the `instanceof Function` check.
|
|
127
|
+
*/
|
|
128
|
+
function readonlyKeysOf(prototype) {
|
|
129
|
+
const keys = new Set();
|
|
130
|
+
if (!prototype)
|
|
131
|
+
return keys;
|
|
132
|
+
for (const key of Object.getOwnPropertyNames(prototype)) {
|
|
133
|
+
const descriptor = Object.getOwnPropertyDescriptor(prototype, key);
|
|
134
|
+
if (descriptor && !descriptor.set)
|
|
135
|
+
keys.add(key);
|
|
136
|
+
}
|
|
137
|
+
return keys;
|
|
138
|
+
}
|
|
139
|
+
// ---------------------------------------------------------------------------
|
|
140
|
+
// Run
|
|
141
|
+
// ---------------------------------------------------------------------------
|
|
142
|
+
function createRunner(plan) {
|
|
143
|
+
const targetName = plan.target.name;
|
|
144
|
+
return (value) => {
|
|
145
|
+
if (value !== null &&
|
|
146
|
+
value !== undefined &&
|
|
147
|
+
(typeof value !== "object" || Array.isArray(value))) {
|
|
148
|
+
return {
|
|
149
|
+
value: value,
|
|
150
|
+
errors: [
|
|
151
|
+
{ path: "", constraints: { isObject: "payload must be an object" } },
|
|
152
|
+
],
|
|
153
|
+
};
|
|
154
|
+
}
|
|
155
|
+
try {
|
|
156
|
+
const instance = toInstance(plan, (value ?? {}));
|
|
157
|
+
const errors = [];
|
|
158
|
+
// whitelist + forbidNonWhitelisted
|
|
159
|
+
for (const key of Object.keys(instance)) {
|
|
160
|
+
if (!plan.allowed.has(key)) {
|
|
161
|
+
errors.push({
|
|
162
|
+
path: key,
|
|
163
|
+
constraints: { [WHITELIST]: `property ${key} should not exist` },
|
|
164
|
+
});
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
for (const property of plan.properties) {
|
|
168
|
+
const propertyValue = instance[property.name];
|
|
169
|
+
// Every condition is called, as `conditionalValidations` does.
|
|
170
|
+
let canValidate = true;
|
|
171
|
+
for (const condition of property.conditions) {
|
|
172
|
+
if (!condition(instance, propertyValue))
|
|
173
|
+
canValidate = false;
|
|
174
|
+
}
|
|
175
|
+
if (!canValidate)
|
|
176
|
+
continue;
|
|
177
|
+
let constraints;
|
|
178
|
+
for (const check of property.defined) {
|
|
179
|
+
constraints = runCheck(check, instance, propertyValue, targetName, constraints);
|
|
180
|
+
}
|
|
181
|
+
for (const check of property.checks) {
|
|
182
|
+
constraints = runCheck(check, instance, propertyValue, targetName, constraints);
|
|
183
|
+
}
|
|
184
|
+
if (constraints)
|
|
185
|
+
errors.push({ path: property.name, constraints });
|
|
186
|
+
}
|
|
187
|
+
return { value: instance, errors: errors.length > 0 ? errors : null };
|
|
188
|
+
}
|
|
189
|
+
catch (error) {
|
|
190
|
+
if (error === BAIL)
|
|
191
|
+
return undefined;
|
|
192
|
+
throw error;
|
|
193
|
+
}
|
|
194
|
+
};
|
|
195
|
+
}
|
|
196
|
+
function runCheck(check, object, value, targetName, constraints) {
|
|
197
|
+
const { metadata, constraint } = check;
|
|
198
|
+
const args = {
|
|
199
|
+
targetName,
|
|
200
|
+
property: metadata.propertyName,
|
|
201
|
+
object,
|
|
202
|
+
value,
|
|
203
|
+
constraints: metadata.constraints,
|
|
204
|
+
};
|
|
205
|
+
let valid;
|
|
206
|
+
if (!check.each ||
|
|
207
|
+
!(Array.isArray(value) || value instanceof Set || value instanceof Map)) {
|
|
208
|
+
const result = constraint.instance.validate(value, args);
|
|
209
|
+
if (isThenable(result))
|
|
210
|
+
throw BAIL;
|
|
211
|
+
valid = !!result;
|
|
212
|
+
}
|
|
213
|
+
else {
|
|
214
|
+
const items = value instanceof Map ? Array.from(value.values()) : Array.from(value);
|
|
215
|
+
valid = true;
|
|
216
|
+
for (const item of items) {
|
|
217
|
+
const result = constraint.instance.validate(item, args);
|
|
218
|
+
if (isThenable(result))
|
|
219
|
+
throw BAIL;
|
|
220
|
+
if (!result)
|
|
221
|
+
valid = false;
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
if (valid)
|
|
225
|
+
return constraints;
|
|
226
|
+
const type = constraint.name ? constraint.name : metadata.type;
|
|
227
|
+
const out = constraints ?? {};
|
|
228
|
+
out[type] = createMessage(metadata, constraint, args);
|
|
229
|
+
return out;
|
|
230
|
+
}
|
|
231
|
+
/** `ValidationExecutor.createValidationError`, message part. */
|
|
232
|
+
function createMessage(metadata, constraint, args) {
|
|
233
|
+
let message = metadata.message || "";
|
|
234
|
+
if (!metadata.message &&
|
|
235
|
+
constraint &&
|
|
236
|
+
constraint.instance.defaultMessage instanceof Function) {
|
|
237
|
+
message = constraint.instance.defaultMessage(args);
|
|
238
|
+
}
|
|
239
|
+
return (0, messages_1.replaceMessageSpecialTokens)(message, args);
|
|
240
|
+
}
|
|
241
|
+
function isThenable(value) {
|
|
242
|
+
return (value !== null &&
|
|
243
|
+
(typeof value === "object" || typeof value === "function") &&
|
|
244
|
+
typeof value.then === "function");
|
|
245
|
+
}
|
|
246
|
+
// ---------------------------------------------------------------------------
|
|
247
|
+
// plainToInstance, for a class without class-transformer metadata
|
|
248
|
+
// ---------------------------------------------------------------------------
|
|
249
|
+
/**
|
|
250
|
+
* `plainToInstance(target, plain)` with default options: a new instance, then
|
|
251
|
+
* every key of `plain` copied onto it, skipping `__proto__`, `constructor`,
|
|
252
|
+
* read-only accessors and methods. Nested values are copied the same way.
|
|
253
|
+
*/
|
|
254
|
+
function toInstance(plan, plain) {
|
|
255
|
+
const instance = new plan.target();
|
|
256
|
+
for (const key of Object.keys(plain)) {
|
|
257
|
+
if (key === "__proto__" || key === "constructor")
|
|
258
|
+
continue;
|
|
259
|
+
if (plan.readonlyKeys.has(key) || instance[key] instanceof Function)
|
|
260
|
+
continue;
|
|
261
|
+
instance[key] = copyPlain(plain[key]);
|
|
262
|
+
}
|
|
263
|
+
return instance;
|
|
264
|
+
}
|
|
265
|
+
const objectPrototypeKeys = new Set(Object.getOwnPropertyNames(Object.prototype));
|
|
266
|
+
function copyPlain(value) {
|
|
267
|
+
if (value === null || typeof value !== "object") {
|
|
268
|
+
// Functions are copied by reference too; JSON never contains them.
|
|
269
|
+
return value;
|
|
270
|
+
}
|
|
271
|
+
if (Array.isArray(value)) {
|
|
272
|
+
const out = new Array(value.length);
|
|
273
|
+
for (let i = 0; i < value.length; i++)
|
|
274
|
+
out[i] = copyPlain(value[i]);
|
|
275
|
+
return out;
|
|
276
|
+
}
|
|
277
|
+
if (value instanceof Date)
|
|
278
|
+
return new Date(value.valueOf());
|
|
279
|
+
const proto = Object.getPrototypeOf(value);
|
|
280
|
+
// Plain objects only (incl. null-prototype objects from query parsing).
|
|
281
|
+
// Sets, Maps, Buffers, promises and class instances take the slow path.
|
|
282
|
+
if (proto !== Object.prototype && proto !== null)
|
|
283
|
+
throw BAIL;
|
|
284
|
+
// An own `constructor` key makes plainToInstance guess a type from it (and
|
|
285
|
+
// throw for `{"constructor": 1}`); leave that to the slow path.
|
|
286
|
+
if (Object.prototype.hasOwnProperty.call(value, "constructor"))
|
|
287
|
+
throw BAIL;
|
|
288
|
+
const out = {};
|
|
289
|
+
for (const key of Object.keys(value)) {
|
|
290
|
+
if (key === "__proto__" || key === "constructor")
|
|
291
|
+
continue;
|
|
292
|
+
// `{}` inherits these; plainToInstance skips them.
|
|
293
|
+
if (objectPrototypeKeys.has(key))
|
|
294
|
+
continue;
|
|
295
|
+
out[key] = copyPlain(value[key]);
|
|
296
|
+
}
|
|
297
|
+
return out;
|
|
298
|
+
}
|
|
299
|
+
//# sourceMappingURL=compiled-validation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compiled-validation.js","sourceRoot":"","sources":["../../../src/common/utils/compiled-validation.ts"],"names":[],"mappings":";;AAwFA,4CAsBC;AA5ED,yEAAqE;AACrE,uEAAwE;AACxE,uDAAuE;AAWvE,MAAM,UAAU,GAAG,WAAW,CAAC;AAC/B,MAAM,iBAAiB,GAAG,kBAAkB,CAAC;AAC7C,MAAM,sBAAsB,GAAG,uBAAuB,CAAC;AACvD,MAAM,SAAS,GAAG,qBAAqB,CAAC;AAExC,qEAAqE;AACrE,MAAM,IAAI,GAAG,MAAM,CAAC,+BAA+B,CAAC,CAAC;AA0BrD,MAAM,KAAK,GAAG,IAAI,OAAO,EAAsC,CAAC;AAEhE,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAE9B;;;;GAIG;AACH,SAAgB,gBAAgB,CAC9B,MAAsB;IAEtB,IAAI,OAAO,MAAM,KAAK,UAAU;QAAE,OAAO,SAAS,CAAC;IACnD,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACjC,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,MAAM,IAAI,SAAS,CAAC;IACrD,IAAI,QAAQ,GAA6B,IAAI,CAAC;IAC9C,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;QAC/B,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,iBAAiB,GAAG,IAAI,CAAC;YACzB,IAAA,gCAAc,EAAC,YAAY,CAAC,CAAC,IAAI,CAC/B,EAAE,GAAG,EAAE,KAAK,EAAE,EACd,2DAA2D,CAC5D,CAAC;QACJ,CAAC;QACD,QAAQ,GAAG,IAAI,CAAC;IAClB,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC5B,OAAO,QAAQ,IAAI,SAAS,CAAC;AAC/B,CAAC;AAED,8EAA8E;AAC9E,OAAO;AACP,8EAA8E;AAE9E,SAAS,SAAS,CAAC,MAAmB;IACpC,IAAI,sBAAsB,CAAC,MAAM,CAAC;QAAE,OAAO,SAAS,CAAC;IAErD,MAAM,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,kBAAkB,EAAE,CAAC;IACrC,2EAA2E;IAC3E,mCAAmC;IACnC,MAAM,SAAS,GAAU,OAAO,CAAC,4BAA4B,CAC3D,MAAM,EACN,SAAS,EACT,KAAK,EACL,KAAK,EACL,SAAS,CACV,CAAC;IACF,uEAAuE;IACvE,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAE7C,MAAM,OAAO,GAA0B,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC9E,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,MAAM,UAAU,GAAmB,EAAE,CAAC;IAEtC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,IAAI,GAAiB;YACzB,IAAI;YACJ,UAAU,EAAE,EAAE;YACd,OAAO,EAAE,EAAE;YACX,MAAM,EAAE,EAAE;SACX,CAAC;QAEF,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;YAC7B,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACtB,KAAK,SAAS;oBACZ,MAAM;gBACR,KAAK,sBAAsB;oBACzB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC9C,MAAM;gBACR,KAAK,UAAU,CAAC;gBAChB,KAAK,iBAAiB,CAAC,CAAC,CAAC;oBACvB,MAAM,WAAW,GAAU,OAAO,CAAC,6BAA6B,CAC9D,QAAQ,CAAC,aAAa,CACvB,CAAC;oBACF,MAAM,IAAI,GACR,QAAQ,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;oBAC5D,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;wBACrC,IAAI,UAAU,CAAC,KAAK;4BAAE,OAAO,SAAS,CAAC;wBACvC,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;oBAC7D,CAAC;oBACD,MAAM;gBACR,CAAC;gBACD;oBACE,0DAA0D;oBAC1D,OAAO,SAAS,CAAC;YACrB,CAAC;QACH,CAAC;QACD,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,OAAO;QACL,MAAM;QACN,OAAO;QACP,UAAU;QACV,YAAY,EAAE,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC;KAC/C,CAAC;AACJ,CAAC;AAED,qEAAqE;AACrE,SAAS,sBAAsB,CAAC,MAAgB;IAC9C,MAAM,OAAO,GAAG,IAAA,yCAAqB,GAAE,CAAC;IACxC,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC3B,MAAM,IAAI,GAAG;QACX,OAAO,CAAC,cAAc;QACtB,OAAO,CAAC,mBAAmB;QAC3B,OAAO,CAAC,gBAAgB;QACxB,OAAO,CAAC,iBAAiB;KAC1B,CAAC;IACF,IAAI,OAAO,GAAQ,MAAM,CAAC;IAC1B,OAAO,OAAO,OAAO,KAAK,UAAU,IAAI,OAAO,KAAK,QAAQ,CAAC,SAAS,EAAE,CAAC;QACvE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,KAAK,GAAG,GAAG,YAAY,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAChE,IAAI,KAAK,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAChE,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QACD,OAAO,GAAG,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,SAAS,cAAc,CAAC,SAA6B;IACnD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,IAAI,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAC5B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,CAAC;QACxD,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QACnE,IAAI,UAAU,IAAI,CAAC,UAAU,CAAC,GAAG;YAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,8EAA8E;AAC9E,MAAM;AACN,8EAA8E;AAE9E,SAAS,YAAY,CAAC,IAAU;IAC9B,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IAEpC,OAAO,CAAC,KAAc,EAAE,EAAE;QACxB,IACE,KAAK,KAAK,IAAI;YACd,KAAK,KAAK,SAAS;YACnB,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EACnD,CAAC;YACD,OAAO;gBACL,KAAK,EAAE,KAAY;gBACnB,MAAM,EAAE;oBACN,EAAE,IAAI,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,2BAA2B,EAAE,EAAE;iBACrE;aACF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,EAAE,CAAwB,CAAC,CAAC;YACxE,MAAM,MAAM,GAA6B,EAAE,CAAC;YAE5C,mCAAmC;YACnC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACxC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC3B,MAAM,CAAC,IAAI,CAAC;wBACV,IAAI,EAAE,GAAG;wBACT,WAAW,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,YAAY,GAAG,mBAAmB,EAAE;qBACjE,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACvC,MAAM,aAAa,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAE9C,+DAA+D;gBAC/D,IAAI,WAAW,GAAG,IAAI,CAAC;gBACvB,KAAK,MAAM,SAAS,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;oBAC5C,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,aAAa,CAAC;wBAAE,WAAW,GAAG,KAAK,CAAC;gBAC/D,CAAC;gBACD,IAAI,CAAC,WAAW;oBAAE,SAAS;gBAE3B,IAAI,WAA+C,CAAC;gBACpD,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;oBACrC,WAAW,GAAG,QAAQ,CACpB,KAAK,EACL,QAAQ,EACR,aAAa,EACb,UAAU,EACV,WAAW,CACZ,CAAC;gBACJ,CAAC;gBACD,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;oBACpC,WAAW,GAAG,QAAQ,CACpB,KAAK,EACL,QAAQ,EACR,aAAa,EACb,UAAU,EACV,WAAW,CACZ,CAAC;gBACJ,CAAC;gBACD,IAAI,WAAW;oBAAE,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;YACrE,CAAC;YAED,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACxE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,KAAK,IAAI;gBAAE,OAAO,SAAS,CAAC;YACrC,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CACf,KAAY,EACZ,MAAW,EACX,KAAU,EACV,UAAkB,EAClB,WAA+C;IAE/C,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IACvC,MAAM,IAAI,GAAG;QACX,UAAU;QACV,QAAQ,EAAE,QAAQ,CAAC,YAAY;QAC/B,MAAM;QACN,KAAK;QACL,WAAW,EAAE,QAAQ,CAAC,WAAW;KAClC,CAAC;IAEF,IAAI,KAAc,CAAC;IACnB,IACE,CAAC,KAAK,CAAC,IAAI;QACX,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,GAAG,IAAI,KAAK,YAAY,GAAG,CAAC,EACvE,CAAC;QACD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACzD,IAAI,UAAU,CAAC,MAAM,CAAC;YAAE,MAAM,IAAI,CAAC;QACnC,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC;IACnB,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,GACT,KAAK,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxE,KAAK,GAAG,IAAI,CAAC;QACb,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACxD,IAAI,UAAU,CAAC,MAAM,CAAC;gBAAE,MAAM,IAAI,CAAC;YACnC,IAAI,CAAC,MAAM;gBAAE,KAAK,GAAG,KAAK,CAAC;QAC7B,CAAC;IACH,CAAC;IACD,IAAI,KAAK;QAAE,OAAO,WAAW,CAAC;IAE9B,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC/D,MAAM,GAAG,GAAG,WAAW,IAAI,EAAE,CAAC;IAC9B,GAAG,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IACtD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,gEAAgE;AAChE,SAAS,aAAa,CAAC,QAAa,EAAE,UAAe,EAAE,IAAS;IAC9D,IAAI,OAAO,GAAQ,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC;IAC1C,IACE,CAAC,QAAQ,CAAC,OAAO;QACjB,UAAU;QACV,UAAU,CAAC,QAAQ,CAAC,cAAc,YAAY,QAAQ,EACtD,CAAC;QACD,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC;IACD,OAAO,IAAA,sCAA2B,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,UAAU,CAAC,KAAU;IAC5B,OAAO,CACL,KAAK,KAAK,IAAI;QACd,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,UAAU,CAAC;QAC1D,OAAO,KAAK,CAAC,IAAI,KAAK,UAAU,CACjC,CAAC;AACJ,CAAC;AAED,8EAA8E;AAC9E,kEAAkE;AAClE,8EAA8E;AAE9E;;;;GAIG;AACH,SAAS,UAAU,CAAC,IAAU,EAAE,KAA0B;IACxD,MAAM,QAAQ,GAAQ,IAAK,IAAI,CAAC,MAAc,EAAE,CAAC;IACjD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,IAAI,GAAG,KAAK,WAAW,IAAI,GAAG,KAAK,aAAa;YAAE,SAAS;QAC3D,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,YAAY,QAAQ;YACjE,SAAS;QACX,QAAQ,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,mBAAmB,GAAG,IAAI,GAAG,CACjC,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,CAC7C,CAAC;AAEF,SAAS,SAAS,CAAC,KAAU;IAC3B,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAChD,mEAAmE;QACnE,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE;YAAE,GAAG,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,OAAO,GAAG,CAAC;IACb,CAAC;IACD,IAAI,KAAK,YAAY,IAAI;QAAE,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC3C,wEAAwE;IACxE,wEAAwE;IACxE,IAAI,KAAK,KAAK,MAAM,CAAC,SAAS,IAAI,KAAK,KAAK,IAAI;QAAE,MAAM,IAAI,CAAC;IAC7D,2EAA2E;IAC3E,gEAAgE;IAChE,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,aAAa,CAAC;QAAE,MAAM,IAAI,CAAC;IAE3E,MAAM,GAAG,GAAwB,EAAE,CAAC;IACpC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,IAAI,GAAG,KAAK,WAAW,IAAI,GAAG,KAAK,aAAa;YAAE,SAAS;QAC3D,mDAAmD;QACnD,IAAI,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,SAAS;QAC3C,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IACnC,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { Constructor } from "./common-utils";
|
|
2
2
|
export declare function pick<T extends object>(obj: T, paths: string[]): Partial<T>;
|
|
3
3
|
export declare function exclude<T extends object>(obj: T | T[], paths: string[]): Partial<T> | Partial<T>[];
|
|
4
|
+
/**
|
|
5
|
+
* Cast a raw path or query value. With a scalar type hint, only that type is
|
|
6
|
+
* produced; without one, numbers, booleans, dates and JSON are inferred.
|
|
7
|
+
*/
|
|
4
8
|
export declare function autoCast(value: any, typeHint?: any, schema?: any): any;
|
|
5
9
|
/**
|
|
6
10
|
* Deeply normalizes query strings into nested JS objects.
|
|
@@ -53,6 +53,25 @@ function exclude(obj, paths) {
|
|
|
53
53
|
}
|
|
54
54
|
return clone;
|
|
55
55
|
}
|
|
56
|
+
/**
|
|
57
|
+
* The scalar type a hint names. The router passes `"string"`, `"number"` and
|
|
58
|
+
* `"boolean"` (from `getDataType`); nested casting passes the constructors.
|
|
59
|
+
*/
|
|
60
|
+
function scalarHint(typeHint) {
|
|
61
|
+
if (typeHint === String || typeHint === "string")
|
|
62
|
+
return "string";
|
|
63
|
+
if (typeHint === Number || typeHint === "number")
|
|
64
|
+
return "number";
|
|
65
|
+
if (typeHint === Boolean || typeHint === "boolean")
|
|
66
|
+
return "boolean";
|
|
67
|
+
if (typeHint === Date)
|
|
68
|
+
return "date";
|
|
69
|
+
return undefined;
|
|
70
|
+
}
|
|
71
|
+
/**
|
|
72
|
+
* Cast a raw path or query value. With a scalar type hint, only that type is
|
|
73
|
+
* produced; without one, numbers, booleans, dates and JSON are inferred.
|
|
74
|
+
*/
|
|
56
75
|
function autoCast(value, typeHint, schema) {
|
|
57
76
|
if (value === null || value === undefined)
|
|
58
77
|
return value;
|
|
@@ -83,15 +102,34 @@ function autoCast(value, typeHint, schema) {
|
|
|
83
102
|
}
|
|
84
103
|
if (typeof value !== "string")
|
|
85
104
|
return value;
|
|
105
|
+
// A declared scalar type wins over guessing. Values that don't fit are
|
|
106
|
+
// returned as-is so the validator can reject them.
|
|
107
|
+
const scalar = scalarHint(typeHint);
|
|
108
|
+
if (scalar === "string")
|
|
109
|
+
return value;
|
|
86
110
|
const trimmed = value.trim();
|
|
87
|
-
if (
|
|
111
|
+
if (scalar === "number") {
|
|
112
|
+
const n = trimmed === "" ? NaN : Number(trimmed);
|
|
113
|
+
return Number.isNaN(n) ? value : n;
|
|
114
|
+
}
|
|
115
|
+
if (scalar === "boolean") {
|
|
116
|
+
const lower = trimmed.toLowerCase();
|
|
117
|
+
if (lower === "true" || lower === "1")
|
|
118
|
+
return true;
|
|
119
|
+
if (lower === "false" || lower === "0")
|
|
120
|
+
return false;
|
|
121
|
+
return value;
|
|
122
|
+
}
|
|
123
|
+
if (scalar === "date") {
|
|
124
|
+
const d = new Date(trimmed);
|
|
125
|
+
return Number.isNaN(d.getTime()) ? value : d;
|
|
126
|
+
}
|
|
127
|
+
if (trimmed.toLowerCase() === "true")
|
|
88
128
|
return true;
|
|
89
129
|
if (trimmed.toLowerCase() === "false")
|
|
90
130
|
return false;
|
|
91
|
-
if (
|
|
92
|
-
|
|
93
|
-
if (!isNaN(n))
|
|
94
|
-
return n;
|
|
131
|
+
if (trimmed !== "" && !isNaN(Number(trimmed))) {
|
|
132
|
+
return Number(trimmed);
|
|
95
133
|
}
|
|
96
134
|
if ((trimmed.startsWith("{") && trimmed.endsWith("}")) ||
|
|
97
135
|
(trimmed.startsWith("[") && trimmed.endsWith("]"))) {
|
|
@@ -103,8 +141,7 @@ function autoCast(value, typeHint, schema) {
|
|
|
103
141
|
return trimmed;
|
|
104
142
|
}
|
|
105
143
|
}
|
|
106
|
-
if (
|
|
107
|
-
/^\d{4}-\d{2}-\d{2}([Tt]\d{2}:\d{2})?/.test(trimmed)) {
|
|
144
|
+
if (/^\d{4}-\d{2}-\d{2}([Tt]\d{2}:\d{2})?/.test(trimmed)) {
|
|
108
145
|
const d = new Date(trimmed);
|
|
109
146
|
if (!isNaN(d.getTime()))
|
|
110
147
|
return d;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object-utils.js","sourceRoot":"","sources":["../../../src/common/utils/object-utils.ts"],"names":[],"mappings":";;AASA,oBAwBC;AAED,0BAsBC;
|
|
1
|
+
{"version":3,"file":"object-utils.js","sourceRoot":"","sources":["../../../src/common/utils/object-utils.ts"],"names":[],"mappings":";;AASA,oBAwBC;AAED,0BAsBC;AAoBD,4BAiFC;AAKD,gDAuDC;AAED,8EAQC;AAED,4BAMC;AAED,wCAOC;AArPD;;;;;GAKG;AACH,yDAAqE;AAGrE,SAAgB,IAAI,CAAmB,GAAM,EAAE,KAAe;IAC5D,MAAM,MAAM,GAAQ,EAAE,CAAC;IAEvB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,MAAM,GAAQ,GAAG,CAAC;QACtB,IAAI,MAAM,GAAQ,MAAM,CAAC;QAEzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YAEpB,IAAI,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC;gBAAE,MAAM;YAE5B,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;gBACrB,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBAChC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,OAAO,CACrB,GAAY,EACZ,KAAe;IAEf,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAe,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,0BAA0B;IAC9D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,MAAM,GAAQ,KAAK,CAAC;QAExB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACzC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC;gBAAE,MAAM;YAChC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC;QAED,OAAO,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAID;;;GAGG;AACH,SAAS,UAAU,CAAC,QAAa;IAC/B,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAClE,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAClE,IAAI,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACrE,IAAI,QAAQ,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IACrC,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;GAGG;AACH,SAAgB,QAAQ,CAAC,KAAU,EAAE,QAAc,EAAE,MAAY;IAC/D,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACxD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACtE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;IACpD,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,KAAK,YAAY,IAAI,CAAC,EAAE,CAAC;QAC1D,MAAM,MAAM,GAAwB,EAAE,CAAC;QACvC,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/C,IAAI,SAAS,GAAQ,SAAS,CAAC;YAE/B,IAAI,MAAM,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC;gBACpC,MAAM,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACtC,SAAS;oBACP,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,QAAQ;wBAC/B,CAAC,CAAC,MAAM;wBACR,CAAC,CAAC,CAAC,KAAK,SAAS;4BACf,CAAC,CAAC,OAAO;4BACT,CAAC,CAAC,CAAC,KAAK,OAAO;gCACb,CAAC,CAAC,KAAK;gCACP,CAAC,CAAC,CAAC,KAAK,QAAQ;oCACd,CAAC,CAAC,MAAM;oCACR,CAAC,CAAC,MAAM,CAAC;YACrB,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACzC,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAE5C,uEAAuE;IACvE,mDAAmD;IACnD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;IACpC,IAAI,MAAM,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAEtC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAE7B,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;QACxB,MAAM,CAAC,GAAG,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;QACpC,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,GAAG;YAAE,OAAO,IAAI,CAAC;QACnD,IAAI,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,GAAG;YAAE,OAAO,KAAK,CAAC;QACrD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACtB,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5B,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,OAAO,CAAC,WAAW,EAAE,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IAClD,IAAI,OAAO,CAAC,WAAW,EAAE,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC;IAEpD,IAAI,OAAO,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QAC9C,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IAED,IACE,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAClD,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAClD,CAAC;QACD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACnC,OAAO,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC5C,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,OAAO,CAAC;QACjB,CAAC;IACH,CAAC;IAED,IAAI,sCAAsC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACzD,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;YAAE,OAAO,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAChC,KAA0B;IAE1B,MAAM,MAAM,GAAwB,EAAE,CAAC;IAEvC,MAAM,OAAO,GAAG,CAAC,GAAQ,EAAE,IAAc,EAAE,KAAU,EAAE,EAAE;QACvD,IAAI,OAAO,GAAG,GAAG,CAAC;QAElB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAE5B,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,IAAI,GAAG,KAAK,EAAE,EAAE,CAAC;oBACf,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;wBAAE,OAAO,GAAG,EAAE,CAAC;oBAC1C,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACtB,CAAC;qBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;oBACvC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC3B,CAAC;qBAAM,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;oBACtC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;gBACvC,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACvB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;oBAClB,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,KAAK,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnE,CAAC;gBACD,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF,KAAK,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,MAAM,KAAK,GAAG,oBAAoB,CAAC;QACnC,IAAI,KAA6B,CAAC;QAElC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YAC7C,IAAI,KAAK,CAAC,CAAC,CAAC;gBAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC7B,IAAI,KAAK,CAAC,CAAC,CAAC;gBAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnC,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;gBACnB,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;oBAAE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;;oBAC5D,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;YACnD,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC;YAC5B,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,iCAAiC,CAC/C,QAAqB,EACrB,KAAa;IAEb,OAAO,IAAA,mCAAe,EAAC,IAAA,mCAAe,EAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;QACvD,uBAAuB,EAAE,IAAI;QAC7B,iBAAiB,EAAE,IAAI;KACxB,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,QAAQ,CAAC,KAAa;IACpC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAgB,cAAc,CAAC,KAAa,EAAE,QAAqB;IACjE,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtC,OAAO,IAAA,mCAAe,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAChD,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
|
|
@@ -25,3 +25,10 @@ export declare function randomFilename(ext: string): string;
|
|
|
25
25
|
* the RFC 5987 `filename*` parameter.
|
|
26
26
|
*/
|
|
27
27
|
export declare function contentDisposition(filename: string): string;
|
|
28
|
+
/**
|
|
29
|
+
* Absolute directory for a project-relative source path such as
|
|
30
|
+
* `src/controllers`. Outside ts-node the compiled output is read instead, so
|
|
31
|
+
* a leading `src` segment becomes `dist`. Only that segment changes: a `src`
|
|
32
|
+
* elsewhere in the absolute path (`/home/me/src/app`) is left alone.
|
|
33
|
+
*/
|
|
34
|
+
export declare function resolveSourceDir(dir: string, isTsNode: boolean): string;
|
|
@@ -9,6 +9,7 @@ exports.isSafeFilename = isSafeFilename;
|
|
|
9
9
|
exports.fileExtension = fileExtension;
|
|
10
10
|
exports.randomFilename = randomFilename;
|
|
11
11
|
exports.contentDisposition = contentDisposition;
|
|
12
|
+
exports.resolveSourceDir = resolveSourceDir;
|
|
12
13
|
/**
|
|
13
14
|
* @copyright 2024
|
|
14
15
|
* @author Tareq Hossain
|
|
@@ -103,4 +104,18 @@ function contentDisposition(filename) {
|
|
|
103
104
|
const encoded = encodeURIComponent(name).replace(/['()*]/g, (c) => "%" + c.charCodeAt(0).toString(16).toUpperCase());
|
|
104
105
|
return `attachment; filename="${ascii}"; filename*=UTF-8''${encoded}`;
|
|
105
106
|
}
|
|
107
|
+
/**
|
|
108
|
+
* Absolute directory for a project-relative source path such as
|
|
109
|
+
* `src/controllers`. Outside ts-node the compiled output is read instead, so
|
|
110
|
+
* a leading `src` segment becomes `dist`. Only that segment changes: a `src`
|
|
111
|
+
* elsewhere in the absolute path (`/home/me/src/app`) is left alone.
|
|
112
|
+
*/
|
|
113
|
+
function resolveSourceDir(dir, isTsNode) {
|
|
114
|
+
if (isTsNode || path_1.default.isAbsolute(dir))
|
|
115
|
+
return path_1.default.resolve(process.cwd(), dir);
|
|
116
|
+
const segments = path_1.default.normalize(dir).split(path_1.default.sep);
|
|
117
|
+
if (segments[0] === "src")
|
|
118
|
+
segments[0] = "dist";
|
|
119
|
+
return path_1.default.join(process.cwd(), ...segments);
|
|
120
|
+
}
|
|
106
121
|
//# sourceMappingURL=path-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path-utils.js","sourceRoot":"","sources":["../../../src/common/utils/path-utils.ts"],"names":[],"mappings":";;;;;;AA8CA,sCAcC;AAMD,wCAUC;AAGD,sCAEC;AAGD,wCAEC;AAOD,gDAeC;
|
|
1
|
+
{"version":3,"file":"path-utils.js","sourceRoot":"","sources":["../../../src/common/utils/path-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,8 @@ export declare class Environment {
|
|
|
20
20
|
* @returns A dictionary of merged environment variables.
|
|
21
21
|
*/
|
|
22
22
|
private parseEnvFile;
|
|
23
|
+
/** Forget the cached `.env` contents so the next read loads the file again. */
|
|
24
|
+
static reload(): void;
|
|
23
25
|
/**
|
|
24
26
|
* Retrieves the value of the specified environment variable.
|
|
25
27
|
*
|
|
@@ -53,8 +53,15 @@ const dotenv_1 = __importDefault(require("dotenv"));
|
|
|
53
53
|
const path_1 = __importDefault(require("path"));
|
|
54
54
|
const fs_1 = __importStar(require("fs"));
|
|
55
55
|
const di_1 = require("../di");
|
|
56
|
+
const internal_logger_1 = require("../observability/internal-logger");
|
|
56
57
|
const system_exception_1 = require("../common/exceptions/system-exception");
|
|
57
|
-
|
|
58
|
+
// Load `.env` into process.env on import, so module-level code can read it.
|
|
59
|
+
// Set MEGH_DOTENV=false to skip this and manage the environment yourself.
|
|
60
|
+
if (process.env.MEGH_DOTENV !== "false") {
|
|
61
|
+
dotenv_1.default.config({ path: path_1.default.join(process.cwd(), ".env"), quiet: true });
|
|
62
|
+
}
|
|
63
|
+
/** Parsed `.env` files by path. Read once; see `Environment.reload()`. */
|
|
64
|
+
const fileCache = new Map();
|
|
58
65
|
/**
|
|
59
66
|
* @class Environment
|
|
60
67
|
* @description A service class to manage access to environment variables.
|
|
@@ -71,19 +78,24 @@ let Environment = class Environment {
|
|
|
71
78
|
* @returns A dictionary of merged environment variables.
|
|
72
79
|
*/
|
|
73
80
|
parseEnvFile(filePath) {
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
81
|
+
if (!fileCache.has(filePath)) {
|
|
82
|
+
try {
|
|
83
|
+
fileCache.set(filePath, (0, fs_1.existsSync)(filePath)
|
|
84
|
+
? dotenv_1.default.parse(fs_1.default.readFileSync(filePath, "utf8"))
|
|
85
|
+
: {});
|
|
86
|
+
}
|
|
87
|
+
catch (error) {
|
|
88
|
+
(0, internal_logger_1.internalLogger)("config").error({ err: error, file: filePath }, "Error parsing .env file");
|
|
89
|
+
fileCache.set(filePath, null);
|
|
78
90
|
}
|
|
79
|
-
const fileContent = fs_1.default.readFileSync(filePath, "utf8");
|
|
80
|
-
const parsedEnv = dotenv_1.default.parse(fileContent);
|
|
81
|
-
return { ...parsedEnv, ...process.env };
|
|
82
|
-
}
|
|
83
|
-
catch (error) {
|
|
84
|
-
console.error(`Error parsing .env file: ${error}`);
|
|
85
|
-
return {};
|
|
86
91
|
}
|
|
92
|
+
const parsed = fileCache.get(filePath);
|
|
93
|
+
// process.env is read on every call, so runtime changes still show.
|
|
94
|
+
return parsed === null ? {} : { ...parsed, ...process.env };
|
|
95
|
+
}
|
|
96
|
+
/** Forget the cached `.env` contents so the next read loads the file again. */
|
|
97
|
+
static reload() {
|
|
98
|
+
fileCache.clear();
|
|
87
99
|
}
|
|
88
100
|
/**
|
|
89
101
|
* Retrieves the value of the specified environment variable.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment-variables.js","sourceRoot":"","sources":["../../src/config/environment-variables.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,oDAA4B;AAC5B,gDAAwB;AACxB,yCAAoC;AACpC,8BAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"environment-variables.js","sourceRoot":"","sources":["../../src/config/environment-variables.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,oDAA4B;AAC5B,gDAAwB;AACxB,yCAAoC;AACpC,8BAAmC;AACnC,sEAAkE;AAClE,4EAAoF;AAEpF,4EAA4E;AAC5E,0EAA0E;AAC1E,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,OAAO,EAAE,CAAC;IACxC,gBAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AACzE,CAAC;AAED,0EAA0E;AAC1E,MAAM,SAAS,GAAG,IAAI,GAAG,EAAyC,CAAC;AACnE;;;;;GAKG;AAEI,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB;;;;;;;OAOG;IACK,YAAY,CAAC,QAAgB;QACnC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC;gBACH,SAAS,CAAC,GAAG,CACX,QAAQ,EACR,IAAA,eAAU,EAAC,QAAQ,CAAC;oBAClB,CAAC,CAAC,gBAAM,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;oBACjD,CAAC,CAAC,EAAE,CACP,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAA,gCAAc,EAAC,QAAQ,CAAC,CAAC,KAAK,CAC5B,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,EAC9B,yBAAyB,CAC1B,CAAC;gBACF,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAChC,CAAC;QACH,CAAC;QACD,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvC,oEAAoE;QACpE,OAAO,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC9D,CAAC;IAED,+EAA+E;IAC/E,MAAM,CAAC,MAAM;QACX,SAAS,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC;IAED;;;;;;OAMG;IACH,GAAG,CAAU,GAAW;QACtB,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;QACtE,OAAO,SAAS,CAAC,GAAG,CAAM,CAAC;IAC7B,CAAC;IAED;;;;;;;;OAQG;IACH,UAAU,CAAU,GAAW;QAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;QACtE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,8CAA2B,CAAC,GAAG,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,SAAS,CAAC,GAAG,CAAM,CAAC;IAC7B,CAAC;IAED;;;;;;OAMG;IACH,MAAM;QACJ,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;QACtE,OAAO,SAAc,CAAC;IACxB,CAAC;CACF,CAAA;AA5EY,kCAAW;sBAAX,WAAW;IADvB,IAAA,eAAU,GAAE;GACA,WAAW,CA4EvB"}
|