@volcanicminds/backend 3.0.1 → 3.2.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.
Files changed (127) hide show
  1. package/README.md +128 -27
  2. package/dist/index.d.ts +1 -0
  3. package/dist/index.d.ts.map +1 -1
  4. package/dist/index.js +34 -9
  5. package/dist/index.js.map +1 -1
  6. package/dist/lib/api/admin/controller/manifest.d.ts +3 -0
  7. package/dist/lib/api/admin/controller/manifest.d.ts.map +1 -0
  8. package/dist/lib/api/admin/controller/manifest.js +6 -0
  9. package/dist/lib/api/admin/controller/manifest.js.map +1 -0
  10. package/dist/lib/api/admin/routes.d.ts +23 -0
  11. package/dist/lib/api/admin/routes.d.ts.map +1 -0
  12. package/dist/lib/api/admin/routes.js +26 -0
  13. package/dist/lib/api/admin/routes.js.map +1 -0
  14. package/dist/lib/api/auth/controller/auth.d.ts +1 -1
  15. package/dist/lib/api/auth/controller/auth.d.ts.map +1 -1
  16. package/dist/lib/api/auth/controller/auth.js +90 -66
  17. package/dist/lib/api/auth/controller/auth.js.map +1 -1
  18. package/dist/lib/api/auth/routes.d.ts +29 -0
  19. package/dist/lib/api/auth/routes.d.ts.map +1 -1
  20. package/dist/lib/api/auth/routes.js +10 -0
  21. package/dist/lib/api/auth/routes.js.map +1 -1
  22. package/dist/lib/api/token/controller/token.js +17 -17
  23. package/dist/lib/api/token/controller/token.js.map +1 -1
  24. package/dist/lib/api/users/controller/user.d.ts.map +1 -1
  25. package/dist/lib/api/users/controller/user.js +25 -19
  26. package/dist/lib/api/users/controller/user.js.map +1 -1
  27. package/dist/lib/api/users/routes.d.ts.map +1 -1
  28. package/dist/lib/api/users/routes.js.map +1 -1
  29. package/dist/lib/config/general.d.ts +3 -0
  30. package/dist/lib/config/general.d.ts.map +1 -1
  31. package/dist/lib/config/general.js +3 -0
  32. package/dist/lib/config/general.js.map +1 -1
  33. package/dist/lib/config/plugins.d.ts +17 -0
  34. package/dist/lib/config/plugins.d.ts.map +1 -1
  35. package/dist/lib/config/plugins.js +2 -2
  36. package/dist/lib/config/plugins.js.map +1 -1
  37. package/dist/lib/database/typeorm/embedded.d.ts +12 -0
  38. package/dist/lib/database/typeorm/embedded.d.ts.map +1 -0
  39. package/dist/lib/database/typeorm/embedded.js +92 -0
  40. package/dist/lib/database/typeorm/embedded.js.map +1 -0
  41. package/dist/lib/database/typeorm/entities/user.d.ts +1 -0
  42. package/dist/lib/database/typeorm/entities/user.d.ts.map +1 -1
  43. package/dist/lib/database/typeorm/entities/user.js.map +1 -1
  44. package/dist/lib/database/typeorm/loader/tenantManager.d.ts.map +1 -1
  45. package/dist/lib/database/typeorm/loader/tenantManager.js +4 -1
  46. package/dist/lib/database/typeorm/loader/tenantManager.js.map +1 -1
  47. package/dist/lib/database/typeorm/loader/userManager.d.ts.map +1 -1
  48. package/dist/lib/database/typeorm/loader/userManager.js +2 -1
  49. package/dist/lib/database/typeorm/loader/userManager.js.map +1 -1
  50. package/dist/lib/database/typeorm/query/operators.d.ts +10 -0
  51. package/dist/lib/database/typeorm/query/operators.d.ts.map +1 -0
  52. package/dist/lib/database/typeorm/query/operators.js +122 -0
  53. package/dist/lib/database/typeorm/query/operators.js.map +1 -0
  54. package/dist/lib/database/typeorm/query.d.ts +2 -0
  55. package/dist/lib/database/typeorm/query.d.ts.map +1 -1
  56. package/dist/lib/database/typeorm/query.js +29 -62
  57. package/dist/lib/database/typeorm/query.js.map +1 -1
  58. package/dist/lib/database/typeorm/util/crypto.d.ts.map +1 -1
  59. package/dist/lib/database/typeorm/util/crypto.js +50 -26
  60. package/dist/lib/database/typeorm/util/crypto.js.map +1 -1
  61. package/dist/lib/hooks/onRequest.d.ts.map +1 -1
  62. package/dist/lib/hooks/onRequest.js +15 -29
  63. package/dist/lib/hooks/onRequest.js.map +1 -1
  64. package/dist/lib/loader/general.d.ts.map +1 -1
  65. package/dist/lib/loader/general.js +3 -0
  66. package/dist/lib/loader/general.js.map +1 -1
  67. package/dist/lib/loader/router.d.ts +2 -0
  68. package/dist/lib/loader/router.d.ts.map +1 -1
  69. package/dist/lib/loader/router.js +11 -4
  70. package/dist/lib/loader/router.js.map +1 -1
  71. package/dist/lib/loader/tracking.d.ts.map +1 -1
  72. package/dist/lib/loader/tracking.js +6 -1
  73. package/dist/lib/loader/tracking.js.map +1 -1
  74. package/dist/lib/manifest/generator.d.ts +90 -0
  75. package/dist/lib/manifest/generator.d.ts.map +1 -0
  76. package/dist/lib/manifest/generator.js +274 -0
  77. package/dist/lib/manifest/generator.js.map +1 -0
  78. package/dist/lib/middleware/isAdmin.d.ts.map +1 -1
  79. package/dist/lib/middleware/isAdmin.js +2 -1
  80. package/dist/lib/middleware/isAdmin.js.map +1 -1
  81. package/dist/lib/middleware/isAuthenticated.d.ts.map +1 -1
  82. package/dist/lib/middleware/isAuthenticated.js +2 -1
  83. package/dist/lib/middleware/isAuthenticated.js.map +1 -1
  84. package/dist/lib/schemas/user.d.ts +17 -0
  85. package/dist/lib/schemas/user.d.ts.map +1 -1
  86. package/dist/lib/schemas/user.js +8 -1
  87. package/dist/lib/schemas/user.js.map +1 -1
  88. package/dist/lib/util/errors.d.ts.map +1 -1
  89. package/dist/lib/util/errors.js +3 -2
  90. package/dist/lib/util/errors.js.map +1 -1
  91. package/dist/lib/util/httpError.d.ts +8 -0
  92. package/dist/lib/util/httpError.d.ts.map +1 -0
  93. package/dist/lib/util/httpError.js +19 -0
  94. package/dist/lib/util/httpError.js.map +1 -0
  95. package/dist/typeorm.d.ts +3 -2
  96. package/dist/typeorm.d.ts.map +1 -1
  97. package/dist/typeorm.js +14 -2
  98. package/dist/typeorm.js.map +1 -1
  99. package/dist/types/global.d.ts +22 -1
  100. package/lib/api/admin/controller/manifest.ts +9 -0
  101. package/lib/api/admin/routes.ts +26 -0
  102. package/lib/api/auth/controller/auth.ts +113 -67
  103. package/lib/api/auth/routes.ts +17 -0
  104. package/lib/api/token/controller/token.ts +17 -17
  105. package/lib/api/users/controller/user.ts +32 -19
  106. package/lib/api/users/routes.ts +3 -0
  107. package/lib/config/general.ts +3 -0
  108. package/lib/config/plugins.ts +5 -2
  109. package/lib/database/typeorm/embedded.ts +173 -0
  110. package/lib/database/typeorm/entities/user.ts +2 -0
  111. package/lib/database/typeorm/loader/tenantManager.ts +8 -1
  112. package/lib/database/typeorm/loader/userManager.ts +6 -1
  113. package/lib/database/typeorm/query/operators.ts +187 -0
  114. package/lib/database/typeorm/query.ts +48 -73
  115. package/lib/database/typeorm/util/crypto.ts +89 -27
  116. package/lib/defaults/managers.ts +1 -1
  117. package/lib/hooks/onRequest.ts +17 -29
  118. package/lib/loader/general.ts +3 -0
  119. package/lib/loader/router.ts +16 -3
  120. package/lib/loader/tracking.ts +10 -1
  121. package/lib/manifest/generator.ts +345 -0
  122. package/lib/middleware/isAdmin.ts +3 -1
  123. package/lib/middleware/isAuthenticated.ts +4 -1
  124. package/lib/schemas/user.ts +17 -1
  125. package/lib/util/errors.ts +4 -2
  126. package/lib/util/httpError.ts +37 -0
  127. package/package.json +29 -4
@@ -0,0 +1,274 @@
1
+ const SENSITIVE_ALWAYS = ['token', 'externalId', 'mfaSecret', 'refreshToken', 'resetPasswordToken', 'confirmationToken'];
2
+ const SENSITIVE_WRITE_ONLY = ['password'];
3
+ function segments(p) {
4
+ return (p || '').split('/').filter(Boolean);
5
+ }
6
+ function rolesOf(route) {
7
+ const rs = (route.roles || []);
8
+ return [...new Set(rs.map((r) => (r && typeof r === 'object' ? r.code : String(r))).filter(Boolean))];
9
+ }
10
+ function deref(schema, schemas, depth = 0) {
11
+ if (!schema || depth > 10)
12
+ return schema || null;
13
+ if (typeof schema === 'object' && schema.$ref) {
14
+ const id = String(schema.$ref).replace(/#.*$/, '');
15
+ const found = schemas[id] || schemas[`${id}#`] || Object.values(schemas).find((s) => s && (s.$id === id || s.$id === `${id}#`));
16
+ return found ? deref(found, schemas, depth + 1) : null;
17
+ }
18
+ if (schema.type === 'array' && schema.items)
19
+ return deref(schema.items, schemas, depth + 1);
20
+ return schema;
21
+ }
22
+ function mapType(ps) {
23
+ if (!ps)
24
+ return 'string';
25
+ if (Array.isArray(ps.enum) && ps.enum.length)
26
+ return 'enum';
27
+ switch (ps.type) {
28
+ case 'integer':
29
+ return 'integer';
30
+ case 'number':
31
+ return 'number';
32
+ case 'boolean':
33
+ return 'boolean';
34
+ case 'array':
35
+ case 'object':
36
+ return 'json';
37
+ case 'string':
38
+ switch (ps.format) {
39
+ case 'email':
40
+ return 'email';
41
+ case 'uri':
42
+ case 'url':
43
+ return 'url';
44
+ case 'uuid':
45
+ return 'uuid';
46
+ case 'date-time':
47
+ return 'datetime';
48
+ case 'date':
49
+ return 'date';
50
+ default:
51
+ return 'string';
52
+ }
53
+ default:
54
+ return 'string';
55
+ }
56
+ }
57
+ function validationOf(ps) {
58
+ const v = {};
59
+ if (typeof ps.minimum === 'number')
60
+ v.min = ps.minimum;
61
+ if (typeof ps.maximum === 'number')
62
+ v.max = ps.maximum;
63
+ if (typeof ps.minLength === 'number')
64
+ v.minLength = ps.minLength;
65
+ if (typeof ps.maxLength === 'number')
66
+ v.maxLength = ps.maxLength;
67
+ if (typeof ps.pattern === 'string')
68
+ v.pattern = ps.pattern;
69
+ return Object.keys(v).length ? v : undefined;
70
+ }
71
+ function crudKind(method, rest) {
72
+ if (rest.length === 0) {
73
+ if (method === 'GET')
74
+ return 'list';
75
+ if (method === 'POST')
76
+ return 'create';
77
+ if (method === 'DELETE')
78
+ return 'delete';
79
+ return null;
80
+ }
81
+ if (rest.length === 1 && rest[0].startsWith(':')) {
82
+ if (method === 'GET')
83
+ return 'read';
84
+ if (method === 'PUT' || method === 'PATCH')
85
+ return 'update';
86
+ if (method === 'DELETE')
87
+ return 'delete';
88
+ return null;
89
+ }
90
+ return null;
91
+ }
92
+ export function buildManifest(input) {
93
+ const { routes = [], schemas = {}, options = {} } = input;
94
+ const sensitiveAlways = options.sensitiveAlways ?? SENSITIVE_ALWAYS;
95
+ const sensitiveWriteOnly = options.sensitiveWriteOnly ?? SENSITIVE_WRITE_ONLY;
96
+ const bySegment = new Map();
97
+ for (const r of routes) {
98
+ const segs = segments(r.path);
99
+ if (!segs.length)
100
+ continue;
101
+ const base = segs[0];
102
+ if (!bySegment.has(base))
103
+ bySegment.set(base, []);
104
+ bySegment.get(base).push(r);
105
+ }
106
+ const resources = [];
107
+ const topCapabilities = [];
108
+ const groupNames = new Set();
109
+ for (const [base, segRoutes] of bySegment) {
110
+ const hint = segRoutes.find((r) => r.resource)?.resource;
111
+ const name = hint?.name || base;
112
+ const group = segRoutes.find((r) => r.group)?.group;
113
+ if (group)
114
+ groupNames.add(group);
115
+ const crud = new Map();
116
+ const actions = [];
117
+ const usedNames = new Set();
118
+ let hasItemDelete = false;
119
+ let hasCollDelete = false;
120
+ for (const r of segRoutes) {
121
+ const rest = segments(r.path).slice(1);
122
+ if (rest[rest.length - 1] === 'count')
123
+ continue;
124
+ const kind = crudKind(r.method, rest);
125
+ if (kind) {
126
+ if (kind === 'delete') {
127
+ if (rest.length === 0)
128
+ hasCollDelete = true;
129
+ else
130
+ hasItemDelete = true;
131
+ }
132
+ if (!crud.has(kind) || (kind === 'delete' && rest.length === 1)) {
133
+ crud.set(kind, { name: kind, kind, method: r.method, path: r.path, roles: rolesOf(r) });
134
+ }
135
+ }
136
+ else {
137
+ const lastNamed = [...rest].reverse().find((s) => !s.startsWith(':'));
138
+ let actName = lastNamed || r.method.toLowerCase();
139
+ while (usedNames.has(actName))
140
+ actName = `${actName}_${r.method.toLowerCase()}`;
141
+ usedNames.add(actName);
142
+ actions.push({
143
+ name: actName,
144
+ kind: 'action',
145
+ method: r.method,
146
+ path: r.path,
147
+ roles: rolesOf(r),
148
+ label: `action.${name}.${actName}`,
149
+ target: rest.some((s) => s.startsWith(':')) ? ['row'] : ['collection']
150
+ });
151
+ }
152
+ }
153
+ const del = crud.get('delete');
154
+ if (del) {
155
+ const t = [];
156
+ if (hasItemDelete)
157
+ t.push('row');
158
+ if (hasCollDelete)
159
+ t.push('bulk');
160
+ if (t.length)
161
+ del.target = t;
162
+ }
163
+ const caps = [...crud.values(), ...actions];
164
+ const isResource = crud.size > 0;
165
+ if (!isResource) {
166
+ topCapabilities.push(...caps);
167
+ continue;
168
+ }
169
+ const fields = collectFields(segRoutes, schemas, sensitiveAlways, sensitiveWriteOnly);
170
+ const resource = {
171
+ name,
172
+ path: base,
173
+ label: { singular: `res.${name}.singular`, plural: `res.${name}.plural` },
174
+ capabilities: caps,
175
+ fields
176
+ };
177
+ if (group)
178
+ resource.group = group;
179
+ if (hint?.titleField)
180
+ resource.titleField = hint.titleField;
181
+ if (hint?.subtitleField)
182
+ resource.subtitleField = hint.subtitleField;
183
+ if (hint?.globalSearch?.length)
184
+ resource.search = { fields: hint.globalSearch, operator: 'containsi' };
185
+ resources.push(resource);
186
+ }
187
+ const manifest = {
188
+ version: 2,
189
+ generatedAt: options.generatedAt || '1970-01-01T00:00:00.000Z',
190
+ i18n: options.i18n || { defaultLocale: 'en', locales: ['en'] },
191
+ auth: {
192
+ mode: options.authMode || 'bearer',
193
+ endpoints: options.authEndpoints || { login: '/auth/login', refresh: '/auth/refresh-token', logout: '/auth/logout' }
194
+ },
195
+ tenancy: options.tenancy || { mode: 'single' },
196
+ groups: [...groupNames].map((n) => ({ name: n, label: `group.${n}` })),
197
+ enums: {},
198
+ resources
199
+ };
200
+ if (topCapabilities.length)
201
+ manifest.capabilities = topCapabilities;
202
+ return manifest;
203
+ }
204
+ function collectFields(segRoutes, schemas, sensitiveAlways, sensitiveWriteOnly) {
205
+ const byName = new Map();
206
+ const addSide = (schema, side) => {
207
+ const s = deref(schema, schemas);
208
+ const props = s?.properties;
209
+ if (!props)
210
+ return;
211
+ const required = Array.isArray(s.required) ? s.required : [];
212
+ for (const [fname, ps] of Object.entries(props)) {
213
+ if (sensitiveAlways.includes(fname))
214
+ continue;
215
+ if (side === 'read' && sensitiveWriteOnly.includes(fname))
216
+ continue;
217
+ let f = byName.get(fname);
218
+ if (!f) {
219
+ f = { name: fname, type: mapType(ps) };
220
+ byName.set(fname, f);
221
+ }
222
+ if (f.type === 'string' && mapType(ps) !== 'string')
223
+ f.type = mapType(ps);
224
+ if (!f.validation) {
225
+ const val = validationOf(ps);
226
+ if (val)
227
+ f.validation = val;
228
+ }
229
+ if (!f.enum && Array.isArray(ps.enum) && ps.enum.length) {
230
+ f.enum = ps.enum.map((v) => ({ value: String(v), label: `enum.${fname}.${v}` }));
231
+ }
232
+ if (required.includes(fname))
233
+ f.required = true;
234
+ if (side === 'read')
235
+ f._read = true;
236
+ if (side === 'write')
237
+ f._write = true;
238
+ }
239
+ };
240
+ for (const r of segRoutes) {
241
+ const rest = segments(r.path).slice(1);
242
+ const kind = crudKind(r.method, rest);
243
+ if (kind === 'create' || kind === 'update')
244
+ addSide(r.doc?.body, 'write');
245
+ if (kind === 'read' || kind === 'list') {
246
+ const resp = r.doc?.response;
247
+ const schema = resp && typeof resp === 'object' && !resp.type && !resp.$ref ? resp['200'] || resp[200] || Object.values(resp)[0] : resp;
248
+ addSide(schema, 'read');
249
+ }
250
+ }
251
+ const out = [];
252
+ for (const f of byName.values()) {
253
+ const { _read, _write, ...rest } = f;
254
+ if (_read && !_write)
255
+ rest.readOnly = true;
256
+ out.push(rest);
257
+ }
258
+ return out;
259
+ }
260
+ export function generateManifest(server, options = {}) {
261
+ const routes = global.routes || [];
262
+ const schemas = typeof server?.getSchemas === 'function' ? server.getSchemas() : {};
263
+ const authMode = process.env.AUTH_MODE === 'COOKIE' ? 'cookie' : 'bearer';
264
+ const mt = global.config?.options?.multi_tenant;
265
+ const tenancy = mt?.enabled
266
+ ? { mode: 'multi', switchable: true, header: mt.header_key || 'x-tenant-id', listEndpoint: '/tenants' }
267
+ : { mode: 'single' };
268
+ return buildManifest({
269
+ routes,
270
+ schemas,
271
+ options: { authMode, tenancy, generatedAt: new Date().toISOString(), ...options }
272
+ });
273
+ }
274
+ //# sourceMappingURL=generator.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../lib/manifest/generator.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"isAdmin.d.ts","sourceRoot":"","sources":["../../../lib/middleware/isAdmin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAEtD,wBAAgB,UAAU,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,OAW3E"}
1
+ {"version":3,"file":"isAdmin.d.ts","sourceRoot":"","sources":["../../../lib/middleware/isAdmin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAGtD,wBAAgB,UAAU,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,OAY3E"}
@@ -1,3 +1,4 @@
1
+ import { httpError } from '../util/httpError.js';
1
2
  export function preHandler(req, res, done) {
2
3
  try {
3
4
  if (req.user && req.user.getId() && req.hasRole(roles.admin)) {
@@ -8,7 +9,7 @@ export function preHandler(req, res, done) {
8
9
  catch (err) {
9
10
  if (log.e)
10
11
  log.error(`Upps, something just happened ${err}`);
11
- res.code(403).send(new Error('User without this privilege'));
12
+ res.code(403).send(httpError(403, 'User without this privilege', 'FORBIDDEN'));
12
13
  }
13
14
  }
14
15
  //# sourceMappingURL=isAdmin.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"isAdmin.js","sourceRoot":"","sources":["../../../lib/middleware/isAdmin.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,UAAU,CAAC,GAAmB,EAAE,GAAiB,EAAE,IAAS;IAC1E,IAAI,CAAC;QACH,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7D,OAAO,IAAI,EAAE,CAAA;QACf,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;IAChD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,CAAC,CAAC;YAAE,GAAG,CAAC,KAAK,CAAC,iCAAiC,GAAG,EAAE,CAAC,CAAA;QAC5D,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAA;IAC9D,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"isAdmin.js","sourceRoot":"","sources":["../../../lib/middleware/isAdmin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAEhD,MAAM,UAAU,UAAU,CAAC,GAAmB,EAAE,GAAiB,EAAE,IAAS;IAC1E,IAAI,CAAC;QACH,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7D,OAAO,IAAI,EAAE,CAAA;QACf,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;IAChD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,CAAC,CAAC;YAAE,GAAG,CAAC,KAAK,CAAC,iCAAiC,GAAG,EAAE,CAAC,CAAA;QAE5D,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,6BAA6B,EAAE,WAAW,CAAC,CAAC,CAAA;IAChF,CAAC;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"isAuthenticated.d.ts","sourceRoot":"","sources":["../../../lib/middleware/isAuthenticated.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAEtD,wBAAgB,UAAU,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,OAW3E"}
1
+ {"version":3,"file":"isAuthenticated.d.ts","sourceRoot":"","sources":["../../../lib/middleware/isAuthenticated.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAGtD,wBAAgB,UAAU,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,OAa3E"}
@@ -1,3 +1,4 @@
1
+ import { httpError } from '../util/httpError.js';
1
2
  export function preHandler(req, res, done) {
2
3
  try {
3
4
  if (req.user?.getId()) {
@@ -8,7 +9,7 @@ export function preHandler(req, res, done) {
8
9
  catch (err) {
9
10
  if (log.e)
10
11
  log.error(`Upps, something just happened ${err}`);
11
- return res.code(401).send(new Error('Unauthorized'));
12
+ return res.code(401).send(httpError(401, 'Unauthorized', 'UNAUTHORIZED'));
12
13
  }
13
14
  }
14
15
  //# sourceMappingURL=isAuthenticated.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"isAuthenticated.js","sourceRoot":"","sources":["../../../lib/middleware/isAuthenticated.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,UAAU,CAAC,GAAmB,EAAE,GAAiB,EAAE,IAAS;IAC1E,IAAI,CAAC;QACH,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACtB,OAAO,IAAI,EAAE,CAAA;QACf,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAA;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,CAAC,CAAC;YAAE,GAAG,CAAC,KAAK,CAAC,iCAAiC,GAAG,EAAE,CAAC,CAAA;QAC5D,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC,CAAA;IACtD,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"isAuthenticated.js","sourceRoot":"","sources":["../../../lib/middleware/isAuthenticated.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAEhD,MAAM,UAAU,UAAU,CAAC,GAAmB,EAAE,GAAiB,EAAE,IAAS;IAC1E,IAAI,CAAC;QACH,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACtB,OAAO,IAAI,EAAE,CAAA;QACf,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAA;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,CAAC,CAAC;YAAE,GAAG,CAAC,KAAK,CAAC,iCAAiC,GAAG,EAAE,CAAC,CAAA;QAG5D,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC,CAAA;IAC3E,CAAC;AACH,CAAC"}
@@ -2,16 +2,24 @@ export declare const currentUserBodySchema: {
2
2
  $id: string;
3
3
  type: string;
4
4
  nullable: boolean;
5
+ additionalProperties: boolean;
5
6
  properties: {
6
7
  username: {
7
8
  type: string;
8
9
  };
10
+ firstName: {
11
+ type: string;
12
+ };
13
+ lastName: {
14
+ type: string;
15
+ };
9
16
  };
10
17
  };
11
18
  export declare const userBodySchema: {
12
19
  $id: string;
13
20
  type: string;
14
21
  nullable: boolean;
22
+ additionalProperties: boolean;
15
23
  properties: {
16
24
  username: {
17
25
  type: string;
@@ -19,6 +27,15 @@ export declare const userBodySchema: {
19
27
  email: {
20
28
  type: string;
21
29
  };
30
+ password: {
31
+ type: string;
32
+ };
33
+ firstName: {
34
+ type: string;
35
+ };
36
+ lastName: {
37
+ type: string;
38
+ };
22
39
  blocked: {
23
40
  type: string;
24
41
  };
@@ -1 +1 @@
1
- {"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../lib/schemas/user.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB;;;;;;;;;CAOjC,CAAA;AAED,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAc1B,CAAA;AAED,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoBtB,CAAA;AAED,eAAO,MAAM,aAAa;;;;;;;;;CAOzB,CAAA;AAED,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;CAStB,CAAA"}
1
+ {"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../lib/schemas/user.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;CAcjC,CAAA;AAED,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuB1B,CAAA;AAED,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoBtB,CAAA;AAED,eAAO,MAAM,aAAa;;;;;;;;;CAOzB,CAAA;AAED,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;CAStB,CAAA"}
@@ -2,17 +2,24 @@ export const currentUserBodySchema = {
2
2
  $id: 'currentUserBodySchema',
3
3
  type: 'object',
4
4
  nullable: true,
5
+ additionalProperties: false,
5
6
  properties: {
6
- username: { type: 'string' }
7
+ username: { type: 'string' },
8
+ firstName: { type: 'string' },
9
+ lastName: { type: 'string' }
7
10
  }
8
11
  };
9
12
  export const userBodySchema = {
10
13
  $id: 'userBodySchema',
11
14
  type: 'object',
12
15
  nullable: true,
16
+ additionalProperties: false,
13
17
  properties: {
14
18
  username: { type: 'string' },
15
19
  email: { type: 'string' },
20
+ password: { type: 'string' },
21
+ firstName: { type: 'string' },
22
+ lastName: { type: 'string' },
16
23
  blocked: { type: 'boolean' },
17
24
  blockedReason: { type: 'string' },
18
25
  blockedAt: { type: 'string' },
@@ -1 +1 @@
1
- {"version":3,"file":"user.js","sourceRoot":"","sources":["../../../lib/schemas/user.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,GAAG,EAAE,uBAAuB;IAC5B,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE;QACV,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KAC7B;CACF,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,GAAG,EAAE,gBAAgB;IACrB,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE;QACV,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC5B,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACzB,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC5B,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACjC,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC7B,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC9B,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC/B,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;KACpD;CACF,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,GAAG,EAAE,YAAY;IACjB,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE;QACV,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACtB,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC5B,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACzB,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC5B,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACjC,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC7B,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC9B,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC/B,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;QACnD,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC7B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC7B,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;KAChC;CACF,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,GAAG,EAAE,eAAe;IACpB,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE;QACV,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;KAC7B;CACF,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,GAAG,EAAE,YAAY;IACjB,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE;QACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxB,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KAChC;CACF,CAAA"}
1
+ {"version":3,"file":"user.js","sourceRoot":"","sources":["../../../lib/schemas/user.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../lib/util/errors.ts"],"names":[],"mappings":"AACA,qBAAa,eAAgB,SAAQ,KAAK;IACxC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,eAAe,EAAE,MAAM,CAAA;IACvB,iBAAiB,EAAE,MAAM,CAAA;IACzB,IAAI,EAAE,GAAG,CAAA;gBAEG,EAAE,eAAe,EAAE,IAAS,EAAE,MAAa,EAAE,cAAqB,EAAE,MAAY,EAAE;;;;;;KAAA;CAY/F"}
1
+ {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../lib/util/errors.ts"],"names":[],"mappings":"AACA,qBAAa,eAAgB,SAAQ,KAAK;IACxC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,eAAe,EAAE,MAAM,CAAA;IACvB,iBAAiB,EAAE,MAAM,CAAA;IACzB,IAAI,EAAE,GAAG,CAAA;gBAEG,EAAE,eAAe,EAAE,IAAS,EAAE,MAAa,EAAE,cAAqB,EAAE,MAAY,EAAE;;;;;;KAAA;CAc/F"}
@@ -10,8 +10,9 @@ export class TranslatedError extends Error {
10
10
  this.locale = locale;
11
11
  this.status = status;
12
12
  this.translationCode = translationCode;
13
- this.translatedMessage = global.t.__({ phrase: translationCode || defaultMessage, locale: locale || 'en' }, data);
14
- this.message = this.translatedMessage || defaultMessage || 'generic error';
13
+ const phrase = translationCode || defaultMessage;
14
+ this.translatedMessage = phrase ? global.t.__({ phrase, locale: locale || 'en' }, data) : null;
15
+ this.message = this.translatedMessage || translationCode || defaultMessage || 'generic error';
15
16
  this.data = data;
16
17
  Error.captureStackTrace(this, this.constructor || TranslatedError);
17
18
  }
@@ -1 +1 @@
1
- {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../lib/util/errors.ts"],"names":[],"mappings":"AACA,MAAM,OAAO,eAAgB,SAAQ,KAAK;IACxC,MAAM,CAAQ;IACd,MAAM,CAAQ;IACd,eAAe,CAAQ;IACvB,iBAAiB,CAAQ;IACzB,IAAI,CAAK;IAET,YAAY,EAAE,eAAe,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,GAAG,IAAI,EAAE,cAAc,GAAG,IAAI,EAAE,MAAM,GAAG,GAAG,EAAE;QAC5F,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,IAAI,iBAAiB,CAAA;QACvD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,eAAe,IAAI,cAAc,EAAE,MAAM,EAAE,MAAM,IAAI,IAAI,EAAE,EAAE,IAAI,CAAC,CAAA;QACjH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,iBAAiB,IAAI,cAAc,IAAI,eAAe,CAAA;QAC1E,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAEhB,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,IAAI,eAAe,CAAC,CAAA;IACpE,CAAC;CACF"}
1
+ {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../lib/util/errors.ts"],"names":[],"mappings":"AACA,MAAM,OAAO,eAAgB,SAAQ,KAAK;IACxC,MAAM,CAAQ;IACd,MAAM,CAAQ;IACd,eAAe,CAAQ;IACvB,iBAAiB,CAAQ;IACzB,IAAI,CAAK;IAET,YAAY,EAAE,eAAe,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,GAAG,IAAI,EAAE,cAAc,GAAG,IAAI,EAAE,MAAM,GAAG,GAAG,EAAE;QAC5F,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,IAAI,iBAAiB,CAAA;QACvD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,MAAM,MAAM,GAAG,eAAe,IAAI,cAAc,CAAA;QAChD,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAE9F,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,iBAAiB,IAAI,eAAe,IAAI,cAAc,IAAI,eAAe,CAAA;QAC7F,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAEhB,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,IAAI,eAAe,CAAC,CAAA;IACpE,CAAC;CACF"}
@@ -0,0 +1,8 @@
1
+ export interface HttpErrorBody {
2
+ statusCode: number;
3
+ error: string;
4
+ code?: string;
5
+ message?: string;
6
+ }
7
+ export declare function httpError(statusCode: number, message?: string, code?: string): HttpErrorBody;
8
+ //# sourceMappingURL=httpError.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"httpError.d.ts","sourceRoot":"","sources":["../../../lib/util/httpError.ts"],"names":[],"mappings":"AAsBA,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,aAAa,CAO5F"}
@@ -0,0 +1,19 @@
1
+ const REASON = {
2
+ 400: 'Bad Request',
3
+ 401: 'Unauthorized',
4
+ 403: 'Forbidden',
5
+ 404: 'Not Found',
6
+ 409: 'Conflict',
7
+ 422: 'Unprocessable Entity',
8
+ 429: 'Too Many Requests',
9
+ 500: 'Internal Server Error'
10
+ };
11
+ export function httpError(statusCode, message, code) {
12
+ return {
13
+ statusCode,
14
+ error: REASON[statusCode] || 'Error',
15
+ ...(code ? { code } : {}),
16
+ ...(message ? { message } : {})
17
+ };
18
+ }
19
+ //# sourceMappingURL=httpError.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"httpError.js","sourceRoot":"","sources":["../../../lib/util/httpError.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,GAA2B;IACrC,GAAG,EAAE,aAAa;IAClB,GAAG,EAAE,cAAc;IACnB,GAAG,EAAE,WAAW;IAChB,GAAG,EAAE,WAAW;IAChB,GAAG,EAAE,UAAU;IACf,GAAG,EAAE,sBAAsB;IAC3B,GAAG,EAAE,mBAAmB;IACxB,GAAG,EAAE,uBAAuB;CAC7B,CAAA;AASD,MAAM,UAAU,SAAS,CAAC,UAAkB,EAAE,OAAgB,EAAE,IAAa;IAC3E,OAAO;QACL,UAAU;QACV,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,OAAO;QACpC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzB,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAChC,CAAA;AACH,CAAC"}
package/dist/typeorm.d.ts CHANGED
@@ -4,12 +4,13 @@ import * as userManager from './lib/database/typeorm/loader/userManager.js';
4
4
  import * as tokenManager from './lib/database/typeorm/loader/tokenManager.js';
5
5
  import * as dataBaseManager from './lib/database/typeorm/loader/dataBaseManager.js';
6
6
  import { TenantManager } from './lib/database/typeorm/loader/tenantManager.js';
7
+ import { closeEmbedded } from './lib/database/typeorm/embedded.js';
7
8
  import { User } from './lib/database/typeorm/entities/user.js';
8
9
  import { Tenant } from './lib/database/typeorm/entities/tenant.js';
9
10
  import { Token } from './lib/database/typeorm/entities/token.js';
10
11
  import { Change } from './lib/database/typeorm/entities/change.js';
11
- import { applyQuery, executeCountQuery, executeCountView, executeFindQuery, executeFindView, useOrder, useWhere, configureSensitiveFields } from './lib/database/typeorm/query.js';
12
+ import { applyQuery, executeCountQuery, executeCountView, executeFindQuery, executeFindView, useOrder, useWhere, configureSensitiveFields, configureCaseInsensitiveDefault, configureMaxPageSize } from './lib/database/typeorm/query.js';
12
13
  declare function start(options: any): Promise<DataSource>;
13
14
  export { Database } from './types/database/typeorm/global.js';
14
- export { start, User, Tenant, Token, Change, userManager, tokenManager, dataBaseManager, TenantManager, DataSource, applyQuery, executeCountQuery, executeCountView, executeFindQuery, executeFindView, useOrder, useWhere, configureSensitiveFields };
15
+ export { start, closeEmbedded, User, Tenant, Token, Change, userManager, tokenManager, dataBaseManager, TenantManager, DataSource, applyQuery, executeCountQuery, executeCountView, executeFindQuery, executeFindView, useOrder, useWhere, configureSensitiveFields, configureCaseInsensitiveDefault, configureMaxPageSize };
15
16
  //# sourceMappingURL=typeorm.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"typeorm.d.ts","sourceRoot":"","sources":["../typeorm.ts"],"names":[],"mappings":"AAIA,OAAO,kBAAkB,CAAA;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAEpC,OAAO,KAAK,WAAW,MAAM,8CAA8C,CAAA;AAC3E,OAAO,KAAK,YAAY,MAAM,+CAA+C,CAAA;AAC7E,OAAO,KAAK,eAAe,MAAM,kDAAkD,CAAA;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,gDAAgD,CAAA;AAC9E,OAAO,EAAE,IAAI,EAAE,MAAM,yCAAyC,CAAA;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAA;AAClE,OAAO,EAAE,KAAK,EAAE,MAAM,0CAA0C,CAAA;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAA;AAClE,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,QAAQ,EACR,QAAQ,EACR,wBAAwB,EACzB,MAAM,iCAAiC,CAAA;AAIxC,iBAAe,KAAK,CAAC,OAAO,KAAA,uBAqF3B;AAED,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAA;AAC7D,OAAO,EACL,KAAK,EACL,IAAI,EACJ,MAAM,EACN,KAAK,EACL,MAAM,EACN,WAAW,EACX,YAAY,EACZ,eAAe,EACf,aAAa,EACb,UAAU,EACV,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,QAAQ,EACR,QAAQ,EACR,wBAAwB,EACzB,CAAA"}
1
+ {"version":3,"file":"typeorm.d.ts","sourceRoot":"","sources":["../typeorm.ts"],"names":[],"mappings":"AAIA,OAAO,kBAAkB,CAAA;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAEpC,OAAO,KAAK,WAAW,MAAM,8CAA8C,CAAA;AAC3E,OAAO,KAAK,YAAY,MAAM,+CAA+C,CAAA;AAC7E,OAAO,KAAK,eAAe,MAAM,kDAAkD,CAAA;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,gDAAgD,CAAA;AAC9E,OAAO,EAA6B,aAAa,EAAE,MAAM,oCAAoC,CAAA;AAC7F,OAAO,EAAE,IAAI,EAAE,MAAM,yCAAyC,CAAA;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAA;AAClE,OAAO,EAAE,KAAK,EAAE,MAAM,0CAA0C,CAAA;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAA;AAClE,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,QAAQ,EACR,QAAQ,EACR,wBAAwB,EACxB,+BAA+B,EAC/B,oBAAoB,EACrB,MAAM,iCAAiC,CAAA;AAIxC,iBAAe,KAAK,CAAC,OAAO,KAAA,uBAsG3B;AAED,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAA;AAC7D,OAAO,EACL,KAAK,EACL,aAAa,EACb,IAAI,EACJ,MAAM,EACN,KAAK,EACL,MAAM,EACN,WAAW,EACX,YAAY,EACZ,eAAe,EACf,aAAa,EACb,UAAU,EACV,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,QAAQ,EACR,QAAQ,EACR,wBAAwB,EACxB,+BAA+B,EAC/B,oBAAoB,EACrB,CAAA"}
package/dist/typeorm.js CHANGED
@@ -7,11 +7,12 @@ import * as userManager from './lib/database/typeorm/loader/userManager.js';
7
7
  import * as tokenManager from './lib/database/typeorm/loader/tokenManager.js';
8
8
  import * as dataBaseManager from './lib/database/typeorm/loader/dataBaseManager.js';
9
9
  import { TenantManager } from './lib/database/typeorm/loader/tenantManager.js';
10
+ import { isEmbedded, setupEmbedded, closeEmbedded } from './lib/database/typeorm/embedded.js';
10
11
  import { User } from './lib/database/typeorm/entities/user.js';
11
12
  import { Tenant } from './lib/database/typeorm/entities/tenant.js';
12
13
  import { Token } from './lib/database/typeorm/entities/token.js';
13
14
  import { Change } from './lib/database/typeorm/entities/change.js';
14
- import { applyQuery, executeCountQuery, executeCountView, executeFindQuery, executeFindView, useOrder, useWhere, configureSensitiveFields } from './lib/database/typeorm/query.js';
15
+ import { applyQuery, executeCountQuery, executeCountView, executeFindQuery, executeFindView, useOrder, useWhere, configureSensitiveFields, configureCaseInsensitiveDefault, configureMaxPageSize } from './lib/database/typeorm/query.js';
15
16
  import * as log from './lib/database/typeorm/util/logger.js';
16
17
  import yn from './lib/database/typeorm/util/yn.js';
17
18
  async function start(options) {
@@ -34,6 +35,17 @@ async function start(options) {
34
35
  if (options.sensitiveFields) {
35
36
  configureSensitiveFields(options.sensitiveFields);
36
37
  }
38
+ if (typeof options.caseInsensitiveByDefault === 'boolean') {
39
+ configureCaseInsensitiveDefault(options.caseInsensitiveByDefault);
40
+ delete options.caseInsensitiveByDefault;
41
+ }
42
+ if (typeof options.maxPageSize === 'number') {
43
+ configureMaxPageSize(options.maxPageSize);
44
+ delete options.maxPageSize;
45
+ }
46
+ if (isEmbedded(options)) {
47
+ await setupEmbedded(options);
48
+ }
37
49
  const { LOG_DB_LEVEL = 'warn', LOG_COLORIZE = true, DB_SYNCHRONIZE_SCHEMA_AT_STARTUP = false } = process.env;
38
50
  const logLevel = LOG_DB_LEVEL === 'trace'
39
51
  ? 'all'
@@ -82,5 +94,5 @@ async function start(options) {
82
94
  });
83
95
  return ds;
84
96
  }
85
- export { start, User, Tenant, Token, Change, userManager, tokenManager, dataBaseManager, TenantManager, DataSource, applyQuery, executeCountQuery, executeCountView, executeFindQuery, executeFindView, useOrder, useWhere, configureSensitiveFields };
97
+ export { start, closeEmbedded, User, Tenant, Token, Change, userManager, tokenManager, dataBaseManager, TenantManager, DataSource, applyQuery, executeCountQuery, executeCountView, executeFindQuery, executeFindView, useOrder, useWhere, configureSensitiveFields, configureCaseInsensitiveDefault, configureMaxPageSize };
86
98
  //# sourceMappingURL=typeorm.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"typeorm.js","sourceRoot":"","sources":["../typeorm.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"typeorm.js","sourceRoot":"","sources":["../typeorm.ts"],"names":[],"mappings":"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"}