@contember/engine-server 1.2.0-alpha.16 → 1.2.0-alpha.17
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/dist/src/config/configSchema.d.ts +51 -4
- package/dist/src/config/configSchema.d.ts.map +1 -1
- package/dist/src/config/configSchema.js +11 -9
- package/dist/src/config/configSchema.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/tests/cases/configResolver.test.d.ts +2 -0
- package/dist/tests/cases/configResolver.test.d.ts.map +1 -0
- package/dist/tests/cases/configResolver.test.js +67 -0
- package/dist/tests/cases/configResolver.test.js.map +1 -0
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/package.json +22 -21
- package/src/config/configSchema.ts +19 -12
- package/tests/cases/configResolver.test.ts +67 -0
|
@@ -21,6 +21,29 @@ export declare const dbConfigSchema: Typesafe.Type<{
|
|
|
21
21
|
readonly maxUses?: number | undefined;
|
|
22
22
|
readonly maxAgeMs?: number | undefined;
|
|
23
23
|
} | undefined;
|
|
24
|
+
} & {
|
|
25
|
+
readonly read?: ({
|
|
26
|
+
readonly host?: string | undefined;
|
|
27
|
+
readonly port?: number | undefined;
|
|
28
|
+
readonly user?: string | undefined;
|
|
29
|
+
readonly password?: string | undefined;
|
|
30
|
+
readonly database?: string | undefined;
|
|
31
|
+
} & {
|
|
32
|
+
readonly ssl?: boolean | undefined;
|
|
33
|
+
readonly queryTimeoutMs?: number | undefined;
|
|
34
|
+
readonly statementTimeoutMs?: number | undefined;
|
|
35
|
+
readonly connectionTimeoutMs?: number | undefined;
|
|
36
|
+
readonly pool?: {
|
|
37
|
+
readonly maxConnections?: number | undefined;
|
|
38
|
+
readonly maxConnecting?: number | undefined;
|
|
39
|
+
readonly maxIdle?: number | undefined;
|
|
40
|
+
readonly reconnectIntervalMs?: number | undefined;
|
|
41
|
+
readonly idleTimeoutMs?: number | undefined;
|
|
42
|
+
readonly acquireTimeoutMs?: number | undefined;
|
|
43
|
+
readonly maxUses?: number | undefined;
|
|
44
|
+
readonly maxAgeMs?: number | undefined;
|
|
45
|
+
} | undefined;
|
|
46
|
+
}) | undefined;
|
|
24
47
|
}>;
|
|
25
48
|
export declare const tenantConfigSchema: Typesafe.Type<{
|
|
26
49
|
readonly db: {
|
|
@@ -44,6 +67,29 @@ export declare const tenantConfigSchema: Typesafe.Type<{
|
|
|
44
67
|
readonly maxUses?: number | undefined;
|
|
45
68
|
readonly maxAgeMs?: number | undefined;
|
|
46
69
|
} | undefined;
|
|
70
|
+
} & {
|
|
71
|
+
readonly read?: ({
|
|
72
|
+
readonly host?: string | undefined;
|
|
73
|
+
readonly port?: number | undefined;
|
|
74
|
+
readonly user?: string | undefined;
|
|
75
|
+
readonly password?: string | undefined;
|
|
76
|
+
readonly database?: string | undefined;
|
|
77
|
+
} & {
|
|
78
|
+
readonly ssl?: boolean | undefined;
|
|
79
|
+
readonly queryTimeoutMs?: number | undefined;
|
|
80
|
+
readonly statementTimeoutMs?: number | undefined;
|
|
81
|
+
readonly connectionTimeoutMs?: number | undefined;
|
|
82
|
+
readonly pool?: {
|
|
83
|
+
readonly maxConnections?: number | undefined;
|
|
84
|
+
readonly maxConnecting?: number | undefined;
|
|
85
|
+
readonly maxIdle?: number | undefined;
|
|
86
|
+
readonly reconnectIntervalMs?: number | undefined;
|
|
87
|
+
readonly idleTimeoutMs?: number | undefined;
|
|
88
|
+
readonly acquireTimeoutMs?: number | undefined;
|
|
89
|
+
readonly maxUses?: number | undefined;
|
|
90
|
+
readonly maxAgeMs?: number | undefined;
|
|
91
|
+
} | undefined;
|
|
92
|
+
}) | undefined;
|
|
47
93
|
};
|
|
48
94
|
readonly mailer: MailerOptions & Typesafe.JsonObject;
|
|
49
95
|
readonly credentials: {
|
|
@@ -111,10 +157,7 @@ export declare const projectConfigSchema: Typesafe.Type<{
|
|
|
111
157
|
readonly maxUses?: number | undefined;
|
|
112
158
|
readonly maxAgeMs?: number | undefined;
|
|
113
159
|
} | undefined;
|
|
114
|
-
}
|
|
115
|
-
readonly useTenantDb: true;
|
|
116
|
-
}) & {
|
|
117
|
-
readonly systemSchema?: string | undefined;
|
|
160
|
+
} & {
|
|
118
161
|
readonly read?: ({
|
|
119
162
|
readonly host?: string | undefined;
|
|
120
163
|
readonly port?: number | undefined;
|
|
@@ -137,6 +180,10 @@ export declare const projectConfigSchema: Typesafe.Type<{
|
|
|
137
180
|
readonly maxAgeMs?: number | undefined;
|
|
138
181
|
} | undefined;
|
|
139
182
|
}) | undefined;
|
|
183
|
+
}) | {
|
|
184
|
+
readonly useTenantDb: true;
|
|
185
|
+
}) & {
|
|
186
|
+
readonly systemSchema?: string | undefined;
|
|
140
187
|
};
|
|
141
188
|
}>;
|
|
142
189
|
//# sourceMappingURL=configSchema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configSchema.d.ts","sourceRoot":"","sources":["../../../src/config/configSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;
|
|
1
|
+
{"version":3,"file":"configSchema.d.ts","sourceRoot":"","sources":["../../../src/config/configSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAsC5D,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAW1B,CAAA;AAED,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6B9B,CAAA;AAED,eAAO,MAAM,kBAAkB;;;;;;;iBAMJ,MAAM;;;;;;;EAO/B,CAAA;AAEF,eAAO,MAAM,WAAW;;;;;;;EAcvB,CAAA;AAED,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkB9B,CAAA"}
|
|
@@ -49,7 +49,17 @@ const dbConfigOptional = {
|
|
|
49
49
|
maxAgeMs: Typesafe.number,
|
|
50
50
|
}),
|
|
51
51
|
};
|
|
52
|
-
|
|
52
|
+
const dbConfigSchemaInner = Typesafe.intersection(Typesafe.object(dbConfigRequired), Typesafe.partial(dbConfigOptional));
|
|
53
|
+
const readDbSchema = Typesafe.intersection(Typesafe.partial(dbConfigRequired), Typesafe.partial(dbConfigOptional));
|
|
54
|
+
exports.dbConfigSchema = Typesafe.intersection(dbConfigSchemaInner, Typesafe.partial({
|
|
55
|
+
read: (val) => {
|
|
56
|
+
const readDb = readDbSchema(val);
|
|
57
|
+
if ('host' in readDb) {
|
|
58
|
+
return readDb;
|
|
59
|
+
}
|
|
60
|
+
return undefined;
|
|
61
|
+
},
|
|
62
|
+
}));
|
|
53
63
|
exports.tenantConfigSchema = Typesafe.intersection(Typesafe.object({
|
|
54
64
|
db: exports.dbConfigSchema,
|
|
55
65
|
mailer: Typesafe.transform(Typesafe.partial({
|
|
@@ -94,7 +104,6 @@ exports.stageConfig = Typesafe.record(Typesafe.string, Typesafe.intersection(Typ
|
|
|
94
104
|
}), Typesafe.partial({
|
|
95
105
|
schema: Typesafe.string,
|
|
96
106
|
})));
|
|
97
|
-
const readDbSchema = Typesafe.intersection(Typesafe.partial(dbConfigRequired), Typesafe.partial(dbConfigOptional));
|
|
98
107
|
exports.projectConfigSchema = Typesafe.object({
|
|
99
108
|
name: Typesafe.union(Typesafe.string, (_, path = []) => (0, utils_1.upperCaseFirst)(String(path[path.length - 2])).replace(/-/g, ' ')),
|
|
100
109
|
slug: (_, path = []) => String(path[path.length - 2]),
|
|
@@ -103,13 +112,6 @@ exports.projectConfigSchema = Typesafe.object({
|
|
|
103
112
|
useTenantDb: Typesafe.literal(true),
|
|
104
113
|
}), exports.dbConfigSchema), Typesafe.partial({
|
|
105
114
|
systemSchema: Typesafe.string,
|
|
106
|
-
read: (val) => {
|
|
107
|
-
const readDb = readDbSchema(val);
|
|
108
|
-
if ('host' in readDb) {
|
|
109
|
-
return readDb;
|
|
110
|
-
}
|
|
111
|
-
return undefined;
|
|
112
|
-
},
|
|
113
115
|
})),
|
|
114
116
|
});
|
|
115
117
|
//# sourceMappingURL=configSchema.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configSchema.js","sourceRoot":"","sources":["../../../src/config/configSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAA+C;AAE/C,oCAAyC;AAGzC,MAAM,gBAAgB,GAAG;IACxB,IAAI,EAAE,QAAQ,CAAC,MAAM;IACrB,IAAI,EAAE,QAAQ,CAAC,MAAM;IACrB,IAAI,EAAE,QAAQ,CAAC,MAAM;IACrB,QAAQ,EAAE,QAAQ,CAAC,MAAM;IACzB,QAAQ,EAAE,QAAQ,CAAC,MAAM;CACzB,CAAA;AACD,MAAM,gBAAgB,GAAG;IACxB,GAAG,EAAE,QAAQ,CAAC,OAAO;IACrB,cAAc,EAAE,QAAQ,CAAC,MAAM;IAC/B,kBAAkB,EAAE,QAAQ,CAAC,MAAM;IACnC,mBAAmB,EAAE,QAAQ,CAAC,MAAM;IACpC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC;QACtB,cAAc,EAAE,QAAQ,CAAC,MAAM;QAC/B,aAAa,EAAE,QAAQ,CAAC,MAAM;QAC9B,OAAO,EAAE,QAAQ,CAAC,MAAM;QACxB,mBAAmB,EAAE,QAAQ,CAAC,MAAM;QACpC,aAAa,EAAE,QAAQ,CAAC,MAAM;QAC9B,gBAAgB,EAAE,QAAQ,CAAC,MAAM;QACjC,OAAO,EAAE,QAAQ,CAAC,MAAM;QACxB,QAAQ,EAAE,QAAQ,CAAC,MAAM;KACzB,CAAC;CACF,CAAA;
|
|
1
|
+
{"version":3,"file":"configSchema.js","sourceRoot":"","sources":["../../../src/config/configSchema.ts"],"names":[],"mappings":"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"}
|