@zintrust/core 0.1.22 → 0.1.24

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 (234) hide show
  1. package/bin/z.d.ts +1 -1
  2. package/bin/z.js +1 -1
  3. package/bin/zin.d.ts +1 -1
  4. package/bin/zin.js +1 -1
  5. package/bin/zintrust-main.d.ts +1 -1
  6. package/bin/zintrust-main.js +2 -2
  7. package/bin/zintrust-microservices.d.ts +1 -1
  8. package/bin/zintrust-microservices.js +1 -1
  9. package/bin/zintrust.d.ts +1 -1
  10. package/bin/zintrust.js +1 -1
  11. package/bin/zt.d.ts +1 -1
  12. package/bin/zt.js +1 -1
  13. package/package.json +2 -3
  14. package/public/index.html +3 -3
  15. package/routes/api.js +1 -1
  16. package/routes/health.d.ts +3 -4
  17. package/routes/health.d.ts.map +1 -1
  18. package/routes/health.js +3 -125
  19. package/src/boot/Application.d.ts.map +1 -1
  20. package/src/boot/Application.js +11 -22
  21. package/src/boot/bootstrap.d.ts +1 -1
  22. package/src/boot/bootstrap.js +48 -7
  23. package/src/builder/BundleOptimizer.d.ts +1 -1
  24. package/src/builder/BundleOptimizer.js +1 -1
  25. package/src/cache/drivers/KVRemoteDriver.d.ts +1 -1
  26. package/src/cache/drivers/KVRemoteDriver.js +1 -1
  27. package/src/cli/CLI.d.ts.map +1 -1
  28. package/src/cli/CLI.js +15 -1
  29. package/src/cli/ErrorHandler.js +3 -3
  30. package/src/cli/commands/AddCommand.d.ts +1 -1
  31. package/src/cli/commands/AddCommand.d.ts.map +1 -1
  32. package/src/cli/commands/AddCommand.js +1 -1
  33. package/src/cli/commands/DbSeedCommand.d.ts.map +1 -1
  34. package/src/cli/commands/DbSeedCommand.js +7 -39
  35. package/src/cli/commands/MakeMailTemplateCommand.js +2 -1
  36. package/src/cli/commands/MakeNotificationTemplateCommand.js +2 -1
  37. package/src/cli/commands/MigrateCommand.d.ts.map +1 -1
  38. package/src/cli/commands/MigrateCommand.js +12 -55
  39. package/src/cli/commands/MigrateWorkerCommand.d.ts +9 -0
  40. package/src/cli/commands/MigrateWorkerCommand.d.ts.map +1 -0
  41. package/src/cli/commands/MigrateWorkerCommand.js +136 -0
  42. package/src/cli/commands/NewCommand.d.ts +1 -1
  43. package/src/cli/commands/NewCommand.d.ts.map +1 -1
  44. package/src/cli/commands/NewCommand.js +9 -7
  45. package/src/cli/commands/PublishCommand.d.ts +5 -0
  46. package/src/cli/commands/PublishCommand.d.ts.map +1 -0
  47. package/src/cli/commands/PublishCommand.js +54 -0
  48. package/src/cli/commands/QACommand.js +4 -4
  49. package/src/cli/commands/ResourceControlCommand.d.ts +6 -0
  50. package/src/cli/commands/ResourceControlCommand.d.ts.map +1 -0
  51. package/src/cli/commands/ResourceControlCommand.js +43 -0
  52. package/src/cli/commands/SimulateCommand.d.ts +1 -1
  53. package/src/cli/commands/SimulateCommand.js +4 -4
  54. package/src/cli/commands/StartCommand.js +7 -7
  55. package/src/cli/commands/UpgradeCommand.d.ts +1 -1
  56. package/src/cli/commands/UpgradeCommand.js +2 -2
  57. package/src/cli/commands/WorkerCommands.d.ts +17 -0
  58. package/src/cli/commands/WorkerCommands.d.ts.map +1 -0
  59. package/src/cli/commands/WorkerCommands.js +264 -0
  60. package/src/cli/commands/index.d.ts +2 -0
  61. package/src/cli/commands/index.d.ts.map +1 -1
  62. package/src/cli/commands/index.js +2 -0
  63. package/src/cli/config/ConfigSchema.d.ts +1 -1
  64. package/src/cli/config/ConfigSchema.d.ts.map +1 -1
  65. package/src/cli/config/ConfigSchema.js +4 -3
  66. package/src/cli/scaffolding/ProjectScaffolder.js +5 -5
  67. package/src/cli/scaffolding/RouteGenerator.d.ts.map +1 -1
  68. package/src/cli/scaffolding/RouteGenerator.js +21 -2
  69. package/src/cli/scaffolding/TemplateEngine.js +1 -1
  70. package/src/cli/utils/DatabaseCliUtils.d.ts +20 -0
  71. package/src/cli/utils/DatabaseCliUtils.d.ts.map +1 -0
  72. package/src/cli/utils/DatabaseCliUtils.js +54 -0
  73. package/src/cli/utils/EnvFileLoader.d.ts.map +1 -1
  74. package/src/common/ExternalServiceUtils.d.ts +63 -0
  75. package/src/common/ExternalServiceUtils.d.ts.map +1 -0
  76. package/src/common/ExternalServiceUtils.js +116 -0
  77. package/src/common/HealthRoutes.d.ts +10 -0
  78. package/src/common/HealthRoutes.d.ts.map +1 -0
  79. package/src/common/HealthRoutes.js +114 -0
  80. package/src/config/SecretsManager.d.ts.map +1 -1
  81. package/src/config/SecretsManager.js +2 -1
  82. package/src/config/app.d.ts +2 -1
  83. package/src/config/app.d.ts.map +1 -1
  84. package/src/config/app.js +98 -52
  85. package/src/config/broadcast.d.ts.map +1 -1
  86. package/src/config/broadcast.js +1 -1
  87. package/src/config/cache.d.ts.map +1 -1
  88. package/src/config/cache.js +2 -2
  89. package/src/config/database.d.ts.map +1 -1
  90. package/src/config/database.js +24 -5
  91. package/src/config/env.d.ts +43 -1
  92. package/src/config/env.d.ts.map +1 -1
  93. package/src/config/env.js +68 -21
  94. package/src/config/index.d.ts +10 -1
  95. package/src/config/index.d.ts.map +1 -1
  96. package/src/config/index.js +1 -0
  97. package/src/config/mail.d.ts.map +1 -1
  98. package/src/config/mail.js +3 -3
  99. package/src/config/middleware.d.ts.map +1 -1
  100. package/src/config/middleware.js +1 -1
  101. package/src/config/notification.d.ts.map +1 -1
  102. package/src/config/notification.js +2 -2
  103. package/src/config/queue.d.ts +14 -0
  104. package/src/config/queue.d.ts.map +1 -1
  105. package/src/config/queue.js +61 -36
  106. package/src/config/security.js +2 -2
  107. package/src/config/storage.d.ts.map +1 -1
  108. package/src/config/storage.js +1 -1
  109. package/src/config/type.d.ts +111 -0
  110. package/src/config/type.d.ts.map +1 -1
  111. package/src/config/workers.d.ts +13 -0
  112. package/src/config/workers.d.ts.map +1 -0
  113. package/src/config/workers.js +173 -0
  114. package/src/database/Paginator.d.ts +37 -0
  115. package/src/database/Paginator.d.ts.map +1 -0
  116. package/src/database/Paginator.js +81 -0
  117. package/src/exceptions/ZintrustError.d.ts +5 -2
  118. package/src/exceptions/ZintrustError.d.ts.map +1 -1
  119. package/src/exceptions/ZintrustError.js +6 -2
  120. package/src/features/Auth.d.ts +1 -1
  121. package/src/features/Auth.d.ts.map +1 -1
  122. package/src/features/Auth.js +3 -2
  123. package/src/features/Queue.d.ts.map +1 -1
  124. package/src/features/Queue.js +0 -2
  125. package/src/index.d.ts +15 -5
  126. package/src/index.d.ts.map +1 -1
  127. package/src/index.js +24 -3
  128. package/src/microservices/MicroserviceBootstrap.d.ts.map +1 -1
  129. package/src/microservices/MicroserviceBootstrap.js +3 -1
  130. package/src/microservices/MicroserviceGenerator.js +4 -4
  131. package/src/microservices/MicroserviceManager.d.ts +1 -1
  132. package/src/microservices/MicroserviceManager.js +1 -1
  133. package/src/middleware/RateLimiter.d.ts.map +1 -1
  134. package/src/middleware/RateLimiter.js +4 -3
  135. package/src/node-singletons/crypto.d.ts +1 -1
  136. package/src/node-singletons/crypto.d.ts.map +1 -1
  137. package/src/node-singletons/crypto.js +1 -1
  138. package/src/node-singletons/os.d.ts +10 -1
  139. package/src/node-singletons/os.d.ts.map +1 -1
  140. package/src/node-singletons/os.js +10 -1
  141. package/src/openapi/OpenApiGenerator.js +2 -2
  142. package/src/orm/ConnectionManager.d.ts +1 -1
  143. package/src/orm/ConnectionManager.d.ts.map +1 -1
  144. package/src/orm/ConnectionManager.js +37 -19
  145. package/src/orm/Model.d.ts +8 -1
  146. package/src/orm/Model.d.ts.map +1 -1
  147. package/src/orm/Model.js +85 -24
  148. package/src/orm/QueryBuilder.d.ts +12 -2
  149. package/src/orm/QueryBuilder.d.ts.map +1 -1
  150. package/src/orm/QueryBuilder.js +438 -38
  151. package/src/orm/Relationships.d.ts +61 -1
  152. package/src/orm/Relationships.d.ts.map +1 -1
  153. package/src/orm/Relationships.js +190 -0
  154. package/src/orm/adapters/D1RemoteAdapter.d.ts +1 -1
  155. package/src/orm/adapters/D1RemoteAdapter.js +1 -1
  156. package/src/performance/Optimizer.d.ts.map +1 -1
  157. package/src/performance/Optimizer.js +2 -4
  158. package/src/routing/CoreRoutes.d.ts +1 -1
  159. package/src/routing/CoreRoutes.d.ts.map +1 -1
  160. package/src/routing/CoreRoutes.js +2 -116
  161. package/src/routing/error.d.ts.map +1 -1
  162. package/src/routing/error.js +3 -2
  163. package/src/routing/publicRoot.d.ts.map +1 -1
  164. package/src/routing/publicRoot.js +4 -2
  165. package/src/runtime/PluginAutoImports.d.ts.map +1 -1
  166. package/src/runtime/PluginAutoImports.js +8 -4
  167. package/src/runtime/PluginManager.d.ts.map +1 -1
  168. package/src/runtime/PluginManager.js +11 -6
  169. package/src/runtime/RuntimeAdapter.d.ts +3 -3
  170. package/src/runtime/RuntimeAdapter.d.ts.map +1 -1
  171. package/src/runtime/StartupConfigFileRegistry.d.ts +2 -1
  172. package/src/runtime/StartupConfigFileRegistry.d.ts.map +1 -1
  173. package/src/runtime/StartupConfigFileRegistry.js +2 -1
  174. package/src/runtime/adapters/CloudflareAdapter.d.ts.map +1 -1
  175. package/src/runtime/adapters/CloudflareAdapter.js +1 -1
  176. package/src/runtime/adapters/DenoAdapter.d.ts.map +1 -1
  177. package/src/runtime/adapters/DenoAdapter.js +1 -1
  178. package/src/runtime/adapters/FargateAdapter.d.ts +2 -2
  179. package/src/runtime/adapters/FargateAdapter.d.ts.map +1 -1
  180. package/src/runtime/adapters/FargateAdapter.js +1 -1
  181. package/src/runtime/adapters/LambdaAdapter.d.ts +1 -1
  182. package/src/runtime/adapters/LambdaAdapter.d.ts.map +1 -1
  183. package/src/runtime/adapters/LambdaAdapter.js +6 -4
  184. package/src/runtime/adapters/NodeServerAdapter.js +1 -1
  185. package/src/scripts/GenerateEnvArtifacts.js +1 -1
  186. package/src/security/SignedRequest.js +1 -1
  187. package/src/security/StartupSecretValidation.d.ts.map +1 -1
  188. package/src/security/StartupSecretValidation.js +7 -1
  189. package/src/start.d.ts.map +1 -1
  190. package/src/start.js +0 -2
  191. package/src/templates/features/Auth.ts.tpl +4 -4
  192. package/src/templates/project/basic/README.md.tpl +1 -1
  193. package/src/templates/project/basic/app/Middleware/index.ts.tpl +1 -1
  194. package/src/templates/project/basic/config/notification.ts.tpl +1 -1
  195. package/src/templates/project/basic/routes/api.ts.tpl +1 -3
  196. package/src/templates/project/basic/src/index.ts.tpl +1 -1
  197. package/src/templates/project/basic/src/zintrust.plugins.ts.tpl +1 -1
  198. package/src/templates/project/basic/template.json +1 -1
  199. package/src/toolkit/Secrets/index.d.ts.map +1 -1
  200. package/src/toolkit/Secrets/index.js +13 -9
  201. package/src/toolkit/Secrets/providers/AwsSecretsManager.d.ts.map +1 -1
  202. package/src/toolkit/Secrets/providers/AwsSecretsManager.js +8 -7
  203. package/src/toolkit/Secrets/providers/CloudflareKv.d.ts.map +1 -1
  204. package/src/toolkit/Secrets/providers/CloudflareKv.js +7 -6
  205. package/src/tools/http/Http.js +1 -1
  206. package/src/tools/mail/drivers/Ses.d.ts.map +1 -1
  207. package/src/tools/mail/drivers/Ses.js +5 -4
  208. package/src/tools/mail/templates/index.js +2 -2
  209. package/src/tools/notification/drivers/Termii.d.ts.map +1 -1
  210. package/src/tools/notification/drivers/Termii.js +6 -17
  211. package/src/tools/notification/testingHelpers.d.ts.map +1 -1
  212. package/src/tools/queue/Queue.d.ts.map +1 -1
  213. package/src/tools/queue/Queue.js +3 -5
  214. package/src/tools/queue/drivers/Redis.d.ts.map +1 -1
  215. package/src/tools/queue/drivers/Redis.js +7 -1
  216. package/src/tools/storage/drivers/S3.d.ts.map +1 -1
  217. package/src/tools/storage/drivers/S3.js +4 -3
  218. package/src/routes/health.d.ts +0 -2
  219. package/src/routes/health.d.ts.map +0 -1
  220. package/src/routes/health.js +0 -1
  221. package/src/runtime/RuntimeDetector.d.ts +0 -15
  222. package/src/runtime/RuntimeDetector.d.ts.map +0 -1
  223. package/src/runtime/RuntimeDetector.js +0 -271
  224. package/src/templates/project/basic/routes/health.ts.tpl +0 -143
  225. package/src/templates/project/basic/routes/metrics.ts.tpl +0 -22
  226. package/src/workers/BroadcastWorker.d.ts +0 -22
  227. package/src/workers/BroadcastWorker.d.ts.map +0 -1
  228. package/src/workers/BroadcastWorker.js +0 -24
  229. package/src/workers/NotificationWorker.d.ts +0 -22
  230. package/src/workers/NotificationWorker.d.ts.map +0 -1
  231. package/src/workers/NotificationWorker.js +0 -23
  232. package/src/workers/createQueueWorker.d.ts +0 -24
  233. package/src/workers/createQueueWorker.d.ts.map +0 -1
  234. package/src/workers/createQueueWorker.js +0 -114
@@ -1 +1 @@
1
- {"version":3,"file":"ConnectionManager.d.ts","sourceRoot":"","sources":["../../../src/orm/ConnectionManager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ConnectionManager.d.ts","sourceRoot":"","sources":["../../../src/orm/ConnectionManager.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  /* eslint-disable no-await-in-loop */
2
2
  /* eslint-disable @typescript-eslint/require-await */
3
3
  /**
4
- * Persistent Connection Manager for Zintrust Framework
4
+ * Persistent Connection Manager for ZinTrust Framework
5
5
  * Handles database connections across different runtime environments
6
6
  * Supports: PostgreSQL, MySQL, SQL Server with connection pooling for Lambda
7
7
  */
@@ -45,7 +45,7 @@ const testConnection = async (_config, conn) => {
45
45
  * Update connection usage metrics
46
46
  */
47
47
  const updateConnectionUsage = (connectionPool, id) => {
48
- const entry = connectionPool.find((c) => c.id === id);
48
+ const entry = connectionPool.get(id); // O(1) lookup instead of O(n) find
49
49
  if (entry !== undefined) {
50
50
  entry.lastUsedAt = Date.now();
51
51
  entry.queryCount++;
@@ -192,19 +192,26 @@ const getHealthyExistingConnection = async (config, state, id) => {
192
192
  return conn;
193
193
  }
194
194
  state.connections.delete(id);
195
- state.connectionPool = state.connectionPool.filter((c) => c.id !== id);
195
+ state.connectionPool.delete(id); // O(1) instead of O(n) filter
196
196
  return null;
197
197
  };
198
198
  /**
199
199
  * Find an idle connection in the pool
200
200
  */
201
201
  const findIdleConnection = (state) => {
202
- const idleConnections = state.connectionPool.filter((c) => !c.isActive);
203
- if (idleConnections.length === 0)
202
+ let lruEntry = null;
203
+ let lruTime = Date.now();
204
+ // Iterate through Map values to find least recently used idle connection
205
+ for (const poolEntry of state.connectionPool.values()) {
206
+ if (!poolEntry.isActive && poolEntry.lastUsedAt < lruTime) {
207
+ lruTime = poolEntry.lastUsedAt;
208
+ lruEntry = poolEntry;
209
+ }
210
+ }
211
+ if (lruEntry === null)
204
212
  return null;
205
- const lru = idleConnections.reduce((prev, current) => (prev.lastUsedAt < current.lastUsedAt ? prev : current), idleConnections[0]);
206
- updateConnectionUsage(state.connectionPool, lru.id);
207
- const conn = state.connections.get(lru.id);
213
+ updateConnectionUsage(state.connectionPool, lruEntry.id);
214
+ const conn = state.connections.get(lruEntry.id);
208
215
  return conn ?? null;
209
216
  };
210
217
  /**
@@ -267,16 +274,16 @@ const startIdleConnectionCleanup = (state, idleTimeout) => {
267
274
  state.cleanupInterval = setInterval(() => {
268
275
  const now = Date.now();
269
276
  const toRemove = [];
270
- for (const poolEntry of state.connectionPool) {
277
+ for (const [id, poolEntry] of state.connectionPool.entries()) {
271
278
  if (!poolEntry.isActive && now - poolEntry.lastUsedAt > idleTimeout) {
272
- toRemove.push(poolEntry.id);
279
+ toRemove.push(id);
273
280
  }
274
281
  }
275
282
  for (const id of toRemove) {
276
283
  const conn = state.connections.get(id);
277
284
  closeConnection(conn).catch((err) => Logger.error(`Failed to close idle connection ${id}:`, err));
278
285
  state.connections.delete(id);
279
- state.connectionPool = state.connectionPool.filter((c) => c.id !== id);
286
+ state.connectionPool.delete(id); // O(1) instead of O(n) filter
280
287
  Logger.info(`Removed idle connection: ${id}`);
281
288
  }
282
289
  }, 300000); // Every 5 minutes
@@ -290,7 +297,8 @@ const startIdleConnectionCleanup = (state, idleTimeout) => {
290
297
  const createNewConnection = async (config, state, id) => {
291
298
  const connection = await createConnection(config, id);
292
299
  state.connections.set(id, connection);
293
- state.connectionPool.push({
300
+ state.connectionPool.set(id, {
301
+ // O(1) instead of O(n) push
294
302
  id,
295
303
  adapter: config.adapter,
296
304
  createdAt: Date.now(),
@@ -326,16 +334,25 @@ const closeAllConnections = async (state) => {
326
334
  }
327
335
  }
328
336
  state.connections.clear();
329
- state.connectionPool = [];
337
+ state.connectionPool.clear(); // Use Map.clear() instead of array reset
330
338
  };
331
339
  /**
332
340
  * Get connection pool statistics
333
341
  */
334
342
  const getPoolStatistics = (state) => {
335
- const active = state.connectionPool.filter((c) => c.isActive).length;
336
- const idle = state.connectionPool.filter((c) => !c.isActive).length;
343
+ let active = 0;
344
+ let idle = 0;
345
+ // Iterate through Map values instead of filtering array
346
+ for (const poolEntry of state.connectionPool.values()) {
347
+ if (poolEntry.isActive) {
348
+ active++;
349
+ }
350
+ else {
351
+ idle++;
352
+ }
353
+ }
337
354
  return {
338
- total: state.connectionPool.length,
355
+ total: state.connectionPool.size, // Use Map.size instead of array length
339
356
  active,
340
357
  idle,
341
358
  queued: state.waiters.length,
@@ -352,7 +369,7 @@ const ConnectionManagerImpl = {
352
369
  create(config) {
353
370
  const state = {
354
371
  connections: new Map(),
355
- connectionPool: [],
372
+ connectionPool: new Map(), // Changed from Array to Map
356
373
  waiters: [],
357
374
  };
358
375
  const maxConnections = config.maxConnections ?? 10;
@@ -367,7 +384,8 @@ const ConnectionManagerImpl = {
367
384
  const existing = await getHealthyExistingConnection(config, state, id);
368
385
  if (existing !== null)
369
386
  return existing;
370
- if (state.connectionPool.length < maxConnections) {
387
+ if (state.connectionPool.size < maxConnections) {
388
+ // Use Map.size instead of array length
371
389
  return createNewConnection(config, state, id);
372
390
  }
373
391
  return getOrReuseConnection(state);
@@ -376,7 +394,7 @@ const ConnectionManagerImpl = {
376
394
  * Release connection back to pool (but keep persistent)
377
395
  */
378
396
  async releaseConnection(connectionId = 'default') {
379
- const poolEntry = state.connectionPool.find((c) => c.id === connectionId);
397
+ const poolEntry = state.connectionPool.get(connectionId); // O(1) instead of O(n) find
380
398
  if (poolEntry === undefined)
381
399
  return;
382
400
  poolEntry.isActive = false;
@@ -2,7 +2,8 @@
2
2
  * Enhanced Model with Relationships
3
3
  * Full ORM capabilities with eager/lazy loading
4
4
  */
5
- import type { IQueryBuilder, InsertResult } from './QueryBuilder';
5
+ import type { Paginator } from '../database/Paginator';
6
+ import type { IQueryBuilder, InsertResult, PaginationOptions } from './QueryBuilder';
6
7
  import type { IRelationship } from './Relationships';
7
8
  export interface ModelConfig {
8
9
  table: string;
@@ -54,6 +55,11 @@ export interface IModel {
54
55
  hasMany(relatedModel: ModelStatic, foreignKey?: string): IRelationship;
55
56
  belongsTo(relatedModel: ModelStatic, foreignKey?: string): IRelationship;
56
57
  belongsToMany(relatedModel: ModelStatic, throughTable?: string, foreignKey?: string, relatedKey?: string): IRelationship;
58
+ morphOne(relatedModel: ModelStatic, morphName: string, morphType?: string, morphId?: string, localKey?: string): IRelationship;
59
+ morphMany(relatedModel: ModelStatic, morphName: string, morphType?: string, morphId?: string, localKey?: string): IRelationship;
60
+ morphTo(morphName: string, morphMap: Record<string, ModelStatic>, morphType?: string, morphId?: string): IRelationship;
61
+ hasOneThrough(relatedModel: ModelStatic, through: ModelStatic, foreignKey?: string, throughForeignKey?: string, localKey?: string, secondLocalKey?: string): IRelationship;
62
+ hasManyThrough(relatedModel: ModelStatic, through: ModelStatic, foreignKey?: string, throughForeignKey?: string, localKey?: string, secondLocalKey?: string): IRelationship;
57
63
  }
58
64
  /**
59
65
  * Create a new model instance
@@ -84,6 +90,7 @@ export type DefinedModel<T extends BoundModelMethods> = {
84
90
  all: () => Promise<Array<IModel & T>>;
85
91
  raw: () => Promise<Array<Record<string, unknown>>>;
86
92
  query: () => IQueryBuilder;
93
+ paginate: (page: number, perPage: number, options?: PaginationOptions) => Promise<Paginator<IModel & T>>;
87
94
  where: (column: string, operator: string | number | boolean | null, value?: unknown) => IQueryBuilder;
88
95
  andWhere: (column: string, operator: string, value?: unknown) => IQueryBuilder;
89
96
  orWhere: (column: string, operator: string, value?: unknown) => IQueryBuilder;
@@ -1 +1 @@
1
- {"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../../src/orm/Model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../../src/orm/Model.ts"],"names":[],"mappings":"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"}
package/src/orm/Model.js CHANGED
@@ -6,7 +6,7 @@ import { DEFAULTS } from '../config/constants.js';
6
6
  import { ErrorFactory } from '../exceptions/ZintrustError.js';
7
7
  import { useDatabase } from './Database.js';
8
8
  import { QueryBuilder } from './QueryBuilder.js';
9
- import { BelongsTo, BelongsToMany, HasMany, HasOne } from './Relationships.js';
9
+ import { BelongsTo, BelongsToMany, HasMany, HasManyThrough, HasOne, HasOneThrough, MorphMany, MorphOne, MorphTo, } from './Relationships.js';
10
10
  const getRelatedTableName = (relatedModel) => {
11
11
  if (typeof relatedModel.getTable === 'function') {
12
12
  return relatedModel.getTable();
@@ -97,19 +97,33 @@ const createModelJSON = (config, attrs) => {
97
97
  }
98
98
  return json;
99
99
  };
100
+ const createHasOneFactory = (config) => (relatedModel, foreignKey) => HasOne.create(relatedModel, foreignKey ?? `${config.table.slice(0, -1)}_id`, 'id');
101
+ const createHasManyFactory = (config) => (relatedModel, foreignKey) => HasMany.create(relatedModel, foreignKey ?? `${config.table.slice(0, -1)}_id`, 'id');
102
+ const createBelongsToFactory = () => (relatedModel, foreignKey) => {
103
+ const relatedTable = getRelatedTableName(relatedModel);
104
+ return BelongsTo.create(relatedModel, foreignKey ?? `${relatedTable.slice(0, -1)}_id`, 'id');
105
+ };
106
+ const createBelongsToManyFactory = (config) => (relatedModel, throughTable, foreignKey, relatedKey) => {
107
+ const relatedTable = getRelatedTableName(relatedModel);
108
+ const table = throughTable ?? [config.table, relatedTable].sort((a, b) => a.localeCompare(b)).join('_');
109
+ return BelongsToMany.create(relatedModel, table, foreignKey ?? `${config.table.slice(0, -1)}_id`, relatedKey ?? `${relatedTable.slice(0, -1)}_id`);
110
+ };
111
+ const createMorphOneFactory = () => (relatedModel, morphName, morphType, morphId, localKey) => MorphOne.create(relatedModel, morphName, morphType, morphId, localKey);
112
+ const createMorphManyFactory = () => (relatedModel, morphName, morphType, morphId, localKey) => MorphMany.create(relatedModel, morphName, morphType, morphId, localKey);
113
+ const createMorphToFactory = () => (morphName, morphMap, morphType, morphId) => MorphTo.create(morphName, morphMap, morphType, morphId);
114
+ const createHasOneThroughFactory = () => (relatedModel, through, foreignKey, throughForeignKey, localKey, secondLocalKey) => HasOneThrough.create(relatedModel, through, foreignKey, throughForeignKey, localKey, secondLocalKey);
115
+ const createHasManyThroughFactory = () => (relatedModel, through, foreignKey, throughForeignKey, localKey, secondLocalKey) => HasManyThrough.create(relatedModel, through, foreignKey, throughForeignKey, localKey, secondLocalKey);
100
116
  const createModelRelationships = (config) => {
101
117
  return {
102
- hasOne: (relatedModel, foreignKey) => HasOne.create(relatedModel, foreignKey ?? `${config.table.slice(0, -1)}_id`, 'id'),
103
- hasMany: (relatedModel, foreignKey) => HasMany.create(relatedModel, foreignKey ?? `${config.table.slice(0, -1)}_id`, 'id'),
104
- belongsTo: (relatedModel, foreignKey) => {
105
- const relatedTable = getRelatedTableName(relatedModel);
106
- return BelongsTo.create(relatedModel, foreignKey ?? `${relatedTable.slice(0, -1)}_id`, 'id');
107
- },
108
- belongsToMany: (relatedModel, throughTable, foreignKey, relatedKey) => {
109
- const relatedTable = getRelatedTableName(relatedModel);
110
- const table = throughTable ?? [config.table, relatedTable].sort((a, b) => a.localeCompare(b)).join('_');
111
- return BelongsToMany.create(relatedModel, table, foreignKey ?? `${config.table.slice(0, -1)}_id`, relatedKey ?? `${relatedTable.slice(0, -1)}_id`);
112
- },
118
+ hasOne: createHasOneFactory(config),
119
+ hasMany: createHasManyFactory(config),
120
+ belongsTo: createBelongsToFactory(),
121
+ belongsToMany: createBelongsToManyFactory(config),
122
+ morphOne: createMorphOneFactory(),
123
+ morphMany: createMorphManyFactory(),
124
+ morphTo: createMorphToFactory(),
125
+ hasOneThrough: createHasOneThroughFactory(),
126
+ hasManyThrough: createHasManyThroughFactory(),
113
127
  };
114
128
  };
115
129
  const performModelSave = async (model, config, attrs, getDb, context) => {
@@ -330,24 +344,70 @@ const createRelationMapping = (cfg, resolveMethods) => {
330
344
  }
331
345
  return relationMapping;
332
346
  };
347
+ const hydrateRows = (raw, hydrateModel) => {
348
+ if (!Array.isArray(raw))
349
+ return null;
350
+ const rows = raw.filter(isRecord);
351
+ return rows.map(hydrateModel);
352
+ };
353
+ const loadEagerRelations = async (eagerBuilder, models) => {
354
+ const eagerLoads = typeof eagerBuilder.getEagerLoads === 'function' ? eagerBuilder.getEagerLoads() : undefined;
355
+ const eagerLoadConstraints = typeof eagerBuilder.getEagerLoadConstraints === 'function'
356
+ ? eagerBuilder.getEagerLoadConstraints()
357
+ : undefined;
358
+ if (!Array.isArray(eagerLoads) ||
359
+ eagerLoads.length === 0 ||
360
+ typeof eagerBuilder.load !== 'function' ||
361
+ models.length === 0) {
362
+ return;
363
+ }
364
+ await Promise.all(eagerLoads.map(async (relation) => {
365
+ const constraint = eagerLoadConstraints?.[relation];
366
+ await eagerBuilder.load?.(models, relation, constraint);
367
+ }));
368
+ };
369
+ const loadEagerCounts = async (eagerBuilder, models) => {
370
+ const eagerLoadCounts = typeof eagerBuilder.getEagerLoadCounts === 'function'
371
+ ? eagerBuilder.getEagerLoadCounts()
372
+ : undefined;
373
+ if (!Array.isArray(eagerLoadCounts) ||
374
+ eagerLoadCounts.length === 0 ||
375
+ typeof eagerBuilder.loadCount !== 'function' ||
376
+ models.length === 0) {
377
+ return;
378
+ }
379
+ await Promise.all(eagerLoadCounts.map(async (relation) => eagerBuilder.loadCount?.(models, relation)));
380
+ };
381
+ const hydrateAndLoadRelations = async (raw, eagerBuilder, hydrateModel) => {
382
+ const models = hydrateRows(raw, hydrateModel);
383
+ if (!models)
384
+ return raw;
385
+ await loadEagerRelations(eagerBuilder, models);
386
+ await loadEagerCounts(eagerBuilder, models);
387
+ return models;
388
+ };
333
389
  const wrapBuilderGetForEagerLoading = (builder, hydrateModel) => {
334
390
  const eagerBuilder = builder;
335
391
  const originalGet = eagerBuilder.get.bind(builder);
336
392
  eagerBuilder.get = async () => {
337
393
  const raw = await originalGet();
338
- if (!Array.isArray(raw))
339
- return raw;
340
- const rows = raw.filter(isRecord);
341
- const models = rows.map(hydrateModel);
342
- const eagerLoads = typeof eagerBuilder.getEagerLoads === 'function' ? eagerBuilder.getEagerLoads() : undefined;
343
- if (Array.isArray(eagerLoads) &&
344
- eagerLoads.length > 0 &&
345
- typeof eagerBuilder.load === 'function' &&
346
- models.length > 0) {
347
- await Promise.all(eagerLoads.map(async (relation) => eagerBuilder.load?.(models, relation)));
348
- }
349
- return models;
394
+ return hydrateAndLoadRelations(raw, eagerBuilder, hydrateModel);
350
395
  };
396
+ if (typeof eagerBuilder.paginate === 'function') {
397
+ const originalPaginate = eagerBuilder.paginate.bind(builder);
398
+ eagerBuilder.paginate = async (page, perPage, options) => {
399
+ const result = await originalPaginate(page, perPage, options);
400
+ if (!Array.isArray(result.items))
401
+ return result;
402
+ const models = await hydrateAndLoadRelations(result.items, eagerBuilder, hydrateModel);
403
+ if (!Array.isArray(models))
404
+ return result;
405
+ return {
406
+ ...result,
407
+ items: models,
408
+ };
409
+ };
410
+ }
351
411
  };
352
412
  const createQueryBuilderMethods = (cfg, hydrateModel) => {
353
413
  const wrappedBuilder = () => {
@@ -357,6 +417,7 @@ const createQueryBuilderMethods = (cfg, hydrateModel) => {
357
417
  };
358
418
  return {
359
419
  query: () => wrappedBuilder(),
420
+ paginate: async (page, perPage, options) => wrappedBuilder().paginate(page, perPage, options),
360
421
  where: (column, operator, value) => wrappedBuilder().where(column, operator, value),
361
422
  andWhere: (column, operator, value) => wrappedBuilder().andWhere(column, operator, value),
362
423
  orWhere: (column, operator, value) => wrappedBuilder().orWhere(column, operator, value),
@@ -2,6 +2,7 @@
2
2
  * QueryBuilder - Type-Safe Query Builder
3
3
  * Build queries without raw SQL
4
4
  */
5
+ import type { PaginationQuery, Paginator } from '../database/Paginator';
5
6
  import type { IDatabase } from './Database';
6
7
  import type { IModel } from './Model';
7
8
  export interface WhereClause {
@@ -23,6 +24,12 @@ export interface QueryBuilderOptions {
23
24
  softDeleteColumn?: string;
24
25
  softDeleteMode?: SoftDeleteMode;
25
26
  }
27
+ export interface PaginationOptions {
28
+ baseUrl?: string;
29
+ query?: PaginationQuery;
30
+ }
31
+ export type EagerLoadConstraint = (builder: IQueryBuilder) => IQueryBuilder;
32
+ export type EagerLoadConstraints = Record<string, EagerLoadConstraint>;
26
33
  export interface IQueryBuilder {
27
34
  select(...columns: string[]): IQueryBuilder;
28
35
  selectAs(column: string, alias: string): IQueryBuilder;
@@ -60,8 +67,11 @@ export interface IQueryBuilder {
60
67
  firstOrFail<T>(message?: string): Promise<T>;
61
68
  get<T>(): Promise<T[]>;
62
69
  raw<T>(): Promise<T[]>;
63
- with(relation: string): IQueryBuilder;
64
- load(models: IModel[], relation: string): Promise<void>;
70
+ paginate<T>(page: number, perPage: number, options?: PaginationOptions): Promise<Paginator<T>>;
71
+ with(relation: string | EagerLoadConstraints): IQueryBuilder;
72
+ withCount(relation: string): IQueryBuilder;
73
+ load(models: IModel[], relation: string, constraint?: EagerLoadConstraint): Promise<void>;
74
+ loadCount(models: IModel[], relation: string): Promise<void>;
65
75
  insert(values: Record<string, unknown> | Array<Record<string, unknown>>): Promise<InsertResult>;
66
76
  update(values: Record<string, unknown>): Promise<void>;
67
77
  delete(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../src/orm/QueryBuilder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAGzC,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACpC,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;CAC7C;AAED,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,CAAC;AAE5D,MAAM,WAAW,mBAAmB;IAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAC5C,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC;IACvD,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC;IACnD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC;IAClG,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC;IAC3E,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC;IAC1E,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IAC1D,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IAC7D,WAAW,IAAI,aAAa,CAAC;IAC7B,WAAW,IAAI,aAAa,CAAC;IAC7B,cAAc,IAAI,aAAa,CAAC;IAChC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/C,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,aAAa,CAAC;IACnD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,aAAa,CAAC;IACnE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC;IACpC,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC;IACrC,eAAe,IAAI,WAAW,EAAE,CAAC;IACjC,gBAAgB,IAAI,MAAM,EAAE,CAAC;IAC7B,QAAQ,IAAI,MAAM,CAAC;IACnB,QAAQ,IAAI,MAAM,GAAG,SAAS,CAAC;IAC/B,SAAS,IAAI,MAAM,GAAG,SAAS,CAAC;IAChC,UAAU,IAAI;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IACxE,QAAQ,IAAI,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjD,eAAe,IAAI,OAAO,CAAC;IAC3B,KAAK,IAAI,MAAM,CAAC;IAChB,aAAa,IAAI,OAAO,EAAE,CAAC;IAC3B,KAAK,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC9B,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7C,GAAG,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IACvB,GAAG,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IAEvB,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa,CAAC;IACtC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAChG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB;AAovBD;;;;;GAKG;AACH,eAAO,MAAM,YAAY;IACvB;;OAEG;sBAEU,MAAM,GAAG,SAAS,OACxB,SAAS,YACL,mBAAmB,GAC3B,aAAa;IA4BhB;;;;;OAKG;aACY,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;EAIxC,CAAC"}
1
+ {"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../src/orm/QueryBuilder.ts"],"names":[],"mappings":"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"}