@onroad/core 4.0.0-alpha.2 → 4.0.0-alpha.21

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 (54) hide show
  1. package/README.md +409 -7
  2. package/dist/OnRoadExpress.d.ts.map +1 -1
  3. package/dist/OnRoadExpress.js +19 -6
  4. package/dist/OnRoadExpress.js.map +1 -1
  5. package/dist/container/Container.d.ts +1 -1
  6. package/dist/container/Container.d.ts.map +1 -1
  7. package/dist/container/Container.js +15 -6
  8. package/dist/container/Container.js.map +1 -1
  9. package/dist/core/AbstractController.d.ts +11 -0
  10. package/dist/core/AbstractController.d.ts.map +1 -1
  11. package/dist/core/AbstractController.js +65 -1
  12. package/dist/core/AbstractController.js.map +1 -1
  13. package/dist/core/AbstractService.d.ts +17 -0
  14. package/dist/core/AbstractService.d.ts.map +1 -1
  15. package/dist/core/AbstractService.js +50 -0
  16. package/dist/core/AbstractService.js.map +1 -1
  17. package/dist/core/SequelizeRepository.d.ts +4 -1
  18. package/dist/core/SequelizeRepository.d.ts.map +1 -1
  19. package/dist/core/SequelizeRepository.js +22 -1
  20. package/dist/core/SequelizeRepository.js.map +1 -1
  21. package/dist/core/index.d.ts +1 -1
  22. package/dist/core/index.d.ts.map +1 -1
  23. package/dist/database/ConnectionManager.d.ts +2 -0
  24. package/dist/database/ConnectionManager.d.ts.map +1 -1
  25. package/dist/database/ConnectionManager.js +12 -1
  26. package/dist/database/ConnectionManager.js.map +1 -1
  27. package/dist/dev/DevServer.d.ts +67 -0
  28. package/dist/dev/DevServer.d.ts.map +1 -0
  29. package/dist/dev/DevServer.js +496 -0
  30. package/dist/dev/DevServer.js.map +1 -0
  31. package/dist/dev/MigrationCLI.d.ts +19 -0
  32. package/dist/dev/MigrationCLI.d.ts.map +1 -0
  33. package/dist/dev/MigrationCLI.js +140 -0
  34. package/dist/dev/MigrationCLI.js.map +1 -0
  35. package/dist/dev/index.d.ts +5 -0
  36. package/dist/dev/index.d.ts.map +1 -0
  37. package/dist/dev/index.js +3 -0
  38. package/dist/dev/index.js.map +1 -0
  39. package/dist/entity/EntityRegistry.d.ts +26 -0
  40. package/dist/entity/EntityRegistry.d.ts.map +1 -1
  41. package/dist/entity/EntityRegistry.js +140 -4
  42. package/dist/entity/EntityRegistry.js.map +1 -1
  43. package/dist/entity/decorators.d.ts +1 -0
  44. package/dist/entity/decorators.d.ts.map +1 -1
  45. package/dist/entity/decorators.js.map +1 -1
  46. package/dist/filters/builtins/JwtFilter.d.ts +6 -3
  47. package/dist/filters/builtins/JwtFilter.d.ts.map +1 -1
  48. package/dist/filters/builtins/JwtFilter.js +29 -4
  49. package/dist/filters/builtins/JwtFilter.js.map +1 -1
  50. package/dist/index.d.ts +3 -1
  51. package/dist/index.d.ts.map +1 -1
  52. package/dist/index.js +2 -0
  53. package/dist/index.js.map +1 -1
  54. package/package.json +5 -1
@@ -88,8 +88,10 @@ export class OnRoadContainer {
88
88
  if (this.singletons.has(key)) {
89
89
  return this.singletons.get(key);
90
90
  }
91
- const instance = this.createAndWire(meta, scope);
91
+ // Pre-register before wiring to allow circular service deps
92
+ const instance = new meta.target();
92
93
  this.singletons.set(key, instance);
94
+ this.wire(meta, instance, scope);
93
95
  return instance;
94
96
  }
95
97
  // Request scope cache
@@ -97,14 +99,17 @@ export class OnRoadContainer {
97
99
  if (scope.instances.has(key)) {
98
100
  return scope.instances.get(key);
99
101
  }
100
- const instance = this.createAndWire(meta, scope);
102
+ // Pre-register before wiring to allow circular service deps
103
+ const instance = new meta.target();
101
104
  scope.instances.set(key, instance);
105
+ this.wire(meta, instance, scope);
102
106
  return instance;
103
107
  }
104
- return this.createAndWire(meta, scope);
105
- }
106
- createAndWire(meta, scope) {
107
108
  const instance = new meta.target();
109
+ this.wire(meta, instance, scope);
110
+ return instance;
111
+ }
112
+ wire(meta, instance, scope) {
108
113
  // Controller → Service (auto-inject)
109
114
  if (meta.type === "controller" && hasMethod(instance, "getServiceClass")) {
110
115
  const ServiceClass = instance.getServiceClass();
@@ -121,6 +126,11 @@ export class OnRoadContainer {
121
126
  instance.setRepository(repo);
122
127
  }
123
128
  }
129
+ // Service → Service dependencies (auto-inject via configDependencies hook)
130
+ if (meta.type === "service" && hasMethod(instance, "configDependencies")) {
131
+ const resolver = (token) => this.resolve(token, scope);
132
+ instance.configDependencies(resolver);
133
+ }
124
134
  // Repository → ConnectionManager + EntityClass (auto-bind)
125
135
  if (meta.type === "repository") {
126
136
  const repoOptions = Reflect.getMetadata(METADATA_KEY.REPOSITORY, meta.target);
@@ -146,7 +156,6 @@ export class OnRoadContainer {
146
156
  instance.setTenant(scope.tenant);
147
157
  }
148
158
  }
149
- return instance;
150
159
  }
151
160
  createScope(requestId, tenant) {
152
161
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"Container.js","sourceRoot":"","sources":["../../src/container/Container.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Container.js","sourceRoot":"","sources":["../../src/container/Container.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@ import type { Constructor } from "../container/Container.js";
2
2
  export interface RouteConfig {
3
3
  method: "get" | "post" | "put" | "delete" | "patch";
4
4
  path?: string;
5
+ absolutePath?: string;
5
6
  hasMessagingEvent?: boolean;
6
7
  afterPropagation?: boolean;
7
8
  }
@@ -15,6 +16,16 @@ export declare abstract class AbstractController<TService = unknown> {
15
16
  constructor(config: ControllerConfig<TService>);
16
17
  setService(service: TService): void;
17
18
  getRoutes(): Record<string, RouteConfig>;
19
+ /**
20
+ * Extracts a common context prefix (e.g. "/acao") from explicitly defined routes.
21
+ * Returns null when no prefix can be inferred, preserving default CRUD behaviour.
22
+ */
23
+ private inferContextPrefix;
18
24
  getServiceClass(): Constructor<TService>;
25
+ create(req: any, res: any): Promise<any>;
26
+ readAll(req: any, res: any): Promise<any>;
27
+ read(req: any, res: any): Promise<any>;
28
+ update(req: any, res: any): Promise<any>;
29
+ delete(req: any, res: any): Promise<any>;
19
30
  }
20
31
  //# sourceMappingURL=AbstractController.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractController.d.ts","sourceRoot":"","sources":["../../src/core/AbstractController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAE5D,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,CAAA;IACnD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B;AAED,MAAM,WAAW,gBAAgB,CAAC,QAAQ;IACxC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAA;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;CACrC;AAED,8BAAsB,kBAAkB,CAAC,QAAQ,GAAG,OAAO;IACzD,SAAS,CAAC,OAAO,EAAG,QAAQ,CAAA;IAC5B,SAAS,CAAC,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAA;gBAEhC,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC;IAI9C,UAAU,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAInC,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC;IAIxC,eAAe,IAAI,WAAW,CAAC,QAAQ,CAAC;CAGzC"}
1
+ {"version":3,"file":"AbstractController.d.ts","sourceRoot":"","sources":["../../src/core/AbstractController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAE5D,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,CAAA;IACnD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B;AAED,MAAM,WAAW,gBAAgB,CAAC,QAAQ;IACxC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAA;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;CACrC;AAED,8BAAsB,kBAAkB,CAAC,QAAQ,GAAG,OAAO;IACzD,SAAS,CAAC,OAAO,EAAG,QAAQ,CAAA;IAC5B,SAAS,CAAC,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAA;gBAEhC,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC;IAI9C,UAAU,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAInC,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC;IA2BxC;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAU1B,eAAe,IAAI,WAAW,CAAC,QAAQ,CAAC;IAIlC,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAOzB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAO1B,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAOvB,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAOzB,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;CAMhC"}
@@ -8,10 +8,74 @@ export class AbstractController {
8
8
  this.service = service;
9
9
  }
10
10
  getRoutes() {
11
- return this.config.routes ?? {};
11
+ const explicitRoutes = this.config.routes ?? {};
12
+ // Infer route context prefix from explicit route paths.
13
+ // When controllers use @Controller("/") with explicit paths like "/acao/:id",
14
+ // auto-CRUD routes must share the same prefix to avoid catch-all "/:id".
15
+ const prefix = this.inferContextPrefix(explicitRoutes);
16
+ const autoConfig = prefix
17
+ ? {
18
+ create: { method: "post", path: prefix },
19
+ update: { method: "put", path: `${prefix}/:id` },
20
+ read: { method: "get", path: `${prefix}/:id` },
21
+ readAll: { method: "get", path: prefix },
22
+ delete: { method: "delete", path: `${prefix}/:id` },
23
+ }
24
+ : {
25
+ create: { method: "post", path: "/" },
26
+ update: { method: "put", path: "/:id" },
27
+ read: { method: "get", path: "/:id" },
28
+ readAll: { method: "get", path: "/" },
29
+ delete: { method: "delete", path: "/:id" },
30
+ };
31
+ return { ...autoConfig, ...explicitRoutes };
32
+ }
33
+ /**
34
+ * Extracts a common context prefix (e.g. "/acao") from explicitly defined routes.
35
+ * Returns null when no prefix can be inferred, preserving default CRUD behaviour.
36
+ */
37
+ inferContextPrefix(routes) {
38
+ for (const route of Object.values(routes)) {
39
+ if (route.path) {
40
+ const match = route.path.match(/^(\/[a-zA-Z][a-zA-Z0-9_-]*)/);
41
+ if (match)
42
+ return match[1];
43
+ }
44
+ }
45
+ return null;
12
46
  }
13
47
  getServiceClass() {
14
48
  return this.config.service;
15
49
  }
50
+ async create(req, res) {
51
+ if (this.service && typeof this.service.create === "function") {
52
+ return this.service.create(req.body);
53
+ }
54
+ res.status(404).json({ error: "Method create not implemented on service" });
55
+ }
56
+ async readAll(req, res) {
57
+ if (this.service && typeof this.service.readAll === "function") {
58
+ return this.service.readAll(req.query);
59
+ }
60
+ res.status(404).json({ error: "Method readAll not implemented on service" });
61
+ }
62
+ async read(req, res) {
63
+ if (this.service && typeof this.service.read === "function") {
64
+ return this.service.read(req.params.id);
65
+ }
66
+ res.status(404).json({ error: "Method read not implemented on service" });
67
+ }
68
+ async update(req, res) {
69
+ if (this.service && typeof this.service.update === "function") {
70
+ return this.service.update(req.params.id, req.body);
71
+ }
72
+ res.status(404).json({ error: "Method update not implemented on service" });
73
+ }
74
+ async delete(req, res) {
75
+ if (this.service && typeof this.service.delete === "function") {
76
+ return this.service.delete(req.params.id);
77
+ }
78
+ res.status(404).json({ error: "Method delete not implemented on service" });
79
+ }
16
80
  }
17
81
  //# sourceMappingURL=AbstractController.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractController.js","sourceRoot":"","sources":["../../src/core/AbstractController.ts"],"names":[],"mappings":"AAcA,MAAM,OAAgB,kBAAkB;IAC5B,OAAO,CAAW;IAClB,MAAM,CAA4B;IAE5C,YAAY,MAAkC;QAC5C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,UAAU,CAAC,OAAiB;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAA;IACjC,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAA;IAC5B,CAAC;CACF"}
1
+ {"version":3,"file":"AbstractController.js","sourceRoot":"","sources":["../../src/core/AbstractController.ts"],"names":[],"mappings":"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"}
@@ -2,11 +2,28 @@ import type { Constructor } from "../container/Container.js";
2
2
  export interface ServiceConfig<TRepository> {
3
3
  repository: Constructor<TRepository>;
4
4
  }
5
+ export type ServiceResolver = <T>(token: Constructor<T>) => T;
5
6
  export declare abstract class AbstractService<TRepository = unknown> {
6
7
  protected config: ServiceConfig<TRepository>;
7
8
  protected repository: TRepository;
8
9
  constructor(config: ServiceConfig<TRepository>);
9
10
  setRepository(repository: TRepository): void;
10
11
  getRepositoryClass(): Constructor<TRepository>;
12
+ /**
13
+ * Called by the container after the instance is created and the repository is injected.
14
+ * Override this method to declare service-to-service dependencies via the resolver.
15
+ *
16
+ * @example
17
+ * configDependencies(resolve: ServiceResolver): void {
18
+ * this.companySVC = resolve(CompanyService)
19
+ * this.roleSVC = resolve(RoleService)
20
+ * }
21
+ */
22
+ configDependencies(_resolve: ServiceResolver): void;
23
+ readAll(_query?: unknown): Promise<unknown>;
24
+ read(id: unknown, ..._args: unknown[]): Promise<unknown>;
25
+ create(data: unknown, ..._args: unknown[]): Promise<unknown>;
26
+ update(id: unknown, data: unknown, ..._args: unknown[]): Promise<unknown>;
27
+ delete(id: unknown, ..._args: unknown[]): Promise<unknown>;
11
28
  }
12
29
  //# sourceMappingURL=AbstractService.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractService.d.ts","sourceRoot":"","sources":["../../src/core/AbstractService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAE5D,MAAM,WAAW,aAAa,CAAC,WAAW;IACxC,UAAU,EAAE,WAAW,CAAC,WAAW,CAAC,CAAA;CACrC;AAED,8BAAsB,eAAe,CAAC,WAAW,GAAG,OAAO;IAG7C,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC;IAFxD,SAAS,CAAC,UAAU,EAAG,WAAW,CAAA;gBAEZ,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC;IAExD,aAAa,CAAC,UAAU,EAAE,WAAW,GAAG,IAAI;IAI5C,kBAAkB,IAAI,WAAW,CAAC,WAAW,CAAC;CAG/C"}
1
+ {"version":3,"file":"AbstractService.d.ts","sourceRoot":"","sources":["../../src/core/AbstractService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAE5D,MAAM,WAAW,aAAa,CAAC,WAAW;IACxC,UAAU,EAAE,WAAW,CAAC,WAAW,CAAC,CAAA;CACrC;AAED,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;AAE7D,8BAAsB,eAAe,CAAC,WAAW,GAAG,OAAO;IAG7C,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC;IAFxD,SAAS,CAAC,UAAU,EAAG,WAAW,CAAA;gBAEZ,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC;IAExD,aAAa,CAAC,UAAU,EAAE,WAAW,GAAG,IAAI;IAI5C,kBAAkB,IAAI,WAAW,CAAC,WAAW,CAAC;IAI9C;;;;;;;;;OASG;IAEH,kBAAkB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAM7C,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAQ3C,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAQxD,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAQ5D,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAQzE,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CAOjE"}
@@ -10,5 +10,55 @@ export class AbstractService {
10
10
  getRepositoryClass() {
11
11
  return this.config.repository;
12
12
  }
13
+ /**
14
+ * Called by the container after the instance is created and the repository is injected.
15
+ * Override this method to declare service-to-service dependencies via the resolver.
16
+ *
17
+ * @example
18
+ * configDependencies(resolve: ServiceResolver): void {
19
+ * this.companySVC = resolve(CompanyService)
20
+ * this.roleSVC = resolve(RoleService)
21
+ * }
22
+ */
23
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
24
+ configDependencies(_resolve) {
25
+ // Default no-op — override in concrete services
26
+ }
27
+ // --- Default CRUD — delegate to repository when available ---
28
+ async readAll(_query) {
29
+ const repo = this.repository;
30
+ if (repo && typeof repo.findAll === "function") {
31
+ return repo.findAll();
32
+ }
33
+ return [];
34
+ }
35
+ async read(id, ..._args) {
36
+ const repo = this.repository;
37
+ if (repo && typeof repo.findByPk === "function") {
38
+ return repo.findByPk(id);
39
+ }
40
+ return null;
41
+ }
42
+ async create(data, ..._args) {
43
+ const repo = this.repository;
44
+ if (repo && typeof repo.create === "function") {
45
+ return repo.create(data);
46
+ }
47
+ return null;
48
+ }
49
+ async update(id, data, ..._args) {
50
+ const repo = this.repository;
51
+ if (repo && typeof repo.update === "function") {
52
+ return repo.update(id, data);
53
+ }
54
+ return null;
55
+ }
56
+ async delete(id, ..._args) {
57
+ const repo = this.repository;
58
+ if (repo && typeof repo.destroy === "function") {
59
+ return repo.destroy(id);
60
+ }
61
+ return null;
62
+ }
13
63
  }
14
64
  //# sourceMappingURL=AbstractService.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractService.js","sourceRoot":"","sources":["../../src/core/AbstractService.ts"],"names":[],"mappings":"AAMA,MAAM,OAAgB,eAAe;IAGb;IAFZ,UAAU,CAAc;IAElC,YAAsB,MAAkC;QAAlC,WAAM,GAAN,MAAM,CAA4B;IAAG,CAAC;IAE5D,aAAa,CAAC,UAAuB;QACnC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAA;IAC/B,CAAC;CACF"}
1
+ {"version":3,"file":"AbstractService.js","sourceRoot":"","sources":["../../src/core/AbstractService.ts"],"names":[],"mappings":"AAQA,MAAM,OAAgB,eAAe;IAGb;IAFZ,UAAU,CAAc;IAElC,YAAsB,MAAkC;QAAlC,WAAM,GAAN,MAAM,CAA4B;IAAG,CAAC;IAE5D,aAAa,CAAC,UAAuB;QACnC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAA;IAC/B,CAAC;IAED;;;;;;;;;OASG;IACH,6DAA6D;IAC7D,kBAAkB,CAAC,QAAyB;QAC1C,gDAAgD;IAClD,CAAC;IAED,+DAA+D;IAE/D,KAAK,CAAC,OAAO,CAAC,MAAgB;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,UAAqC,CAAA;QACvD,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;YAC/C,OAAO,IAAI,CAAC,OAAO,EAAE,CAAA;QACvB,CAAC;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAW,EAAE,GAAG,KAAgB;QACzC,MAAM,IAAI,GAAG,IAAI,CAAC,UAAqC,CAAA;QACvD,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;YAChD,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QAC1B,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAa,EAAE,GAAG,KAAgB;QAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,UAAqC,CAAA;QACvD,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAC9C,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC1B,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAW,EAAE,IAAa,EAAE,GAAG,KAAgB;QAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,UAAqC,CAAA;QACvD,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAC9C,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;QAC9B,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAW,EAAE,GAAG,KAAgB;QAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,UAAqC,CAAA;QACvD,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;YAC/C,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QACzB,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}
@@ -5,10 +5,13 @@ export declare abstract class SequelizeRepository<_TEntity = unknown> extends Ab
5
5
  protected connectionManager: ConnectionManager<unknown>;
6
6
  protected tenant: string;
7
7
  protected entityClass?: Constructor;
8
+ private _cachedConnection;
9
+ /** Cached Sequelize connection for the current tenant. Available after any model operation (findAll, findByPk, etc.) */
10
+ get connection(): any;
8
11
  setConnectionManager(manager: ConnectionManager<unknown>): void;
9
12
  setTenant(tenant: string): void;
10
13
  setEntityClass(entity: Constructor): void;
11
- protected getConnection(): Promise<unknown>;
14
+ getConnection(): Promise<unknown>;
12
15
  protected getModel(): Promise<any>;
13
16
  findAll(options?: unknown): Promise<unknown[]>;
14
17
  findByPk(id: unknown, options?: unknown): Promise<unknown | null>;
@@ -1 +1 @@
1
- {"version":3,"file":"SequelizeRepository.d.ts","sourceRoot":"","sources":["../../src/core/SequelizeRepository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAG5D,8BAAsB,mBAAmB,CAAC,QAAQ,GAAG,OAAO,CAAE,SAAQ,kBAAkB;IACtF,SAAS,CAAC,iBAAiB,EAAG,iBAAiB,CAAC,OAAO,CAAC,CAAA;IACxD,SAAS,CAAC,MAAM,EAAG,MAAM,CAAA;IACzB,SAAS,CAAC,WAAW,CAAC,EAAE,WAAW,CAAA;IAEnC,oBAAoB,CAAC,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,GAAG,IAAI;IAI/D,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI/B,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;cAIzB,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;cAKjC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC;IAQlC,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAK9C,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAKjE,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAK1D,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAKvE,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAIhE"}
1
+ {"version":3,"file":"SequelizeRepository.d.ts","sourceRoot":"","sources":["../../src/core/SequelizeRepository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAG5D,8BAAsB,mBAAmB,CAAC,QAAQ,GAAG,OAAO,CAAE,SAAQ,kBAAkB;IACtF,SAAS,CAAC,iBAAiB,EAAG,iBAAiB,CAAC,OAAO,CAAC,CAAA;IACxD,SAAS,CAAC,MAAM,EAAG,MAAM,CAAA;IACzB,SAAS,CAAC,WAAW,CAAC,EAAE,WAAW,CAAA;IAEnC,OAAO,CAAC,iBAAiB,CAAY;IAErC,wHAAwH;IAExH,IAAI,UAAU,IAAI,GAAG,CAYpB;IAED,oBAAoB,CAAC,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,GAAG,IAAI;IAI/D,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK/B,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;IAInC,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;cAOvB,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC;IAQlC,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAK9C,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAKjE,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAK1D,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAKvE,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAIhE"}
@@ -4,17 +4,38 @@ export class SequelizeRepository extends AbstractRepository {
4
4
  connectionManager;
5
5
  tenant;
6
6
  entityClass;
7
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
8
+ _cachedConnection = null;
9
+ /** Cached Sequelize connection for the current tenant. Available after any model operation (findAll, findByPk, etc.) */
10
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
11
+ get connection() {
12
+ if (this._cachedConnection)
13
+ return this._cachedConnection;
14
+ // Return a shim so raw queries work even before the first model operation
15
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
16
+ const self = this;
17
+ return {
18
+ query: async (sql, options) => {
19
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
20
+ const conn = (await self.getConnection());
21
+ return conn.query(sql, options);
22
+ },
23
+ };
24
+ }
7
25
  setConnectionManager(manager) {
8
26
  this.connectionManager = manager;
9
27
  }
10
28
  setTenant(tenant) {
11
29
  this.tenant = tenant;
30
+ this._cachedConnection = null;
12
31
  }
13
32
  setEntityClass(entity) {
14
33
  this.entityClass = entity;
15
34
  }
16
35
  async getConnection() {
17
- return this.connectionManager.getConnection(this.tenant);
36
+ const conn = await this.connectionManager.getConnection(this.tenant);
37
+ this._cachedConnection = conn;
38
+ return conn;
18
39
  }
19
40
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
20
41
  async getModel() {
@@ -1 +1 @@
1
- {"version":3,"file":"SequelizeRepository.js","sourceRoot":"","sources":["../../src/core/SequelizeRepository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAG5D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAE5D,MAAM,OAAgB,mBAAwC,SAAQ,kBAAkB;IAC5E,iBAAiB,CAA6B;IAC9C,MAAM,CAAS;IACf,WAAW,CAAc;IAEnC,oBAAoB,CAAC,OAAmC;QACtD,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAA;IAClC,CAAC;IAED,SAAS,CAAC,MAAc;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,cAAc,CAAC,MAAmB;QAChC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAA;IAC3B,CAAC;IAES,KAAK,CAAC,aAAa;QAC3B,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC1D,CAAC;IAED,8DAA8D;IACpD,KAAK,CAAC,QAAQ;QACtB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,uFAAuF,CAAC,CAAA;QAC1G,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;QAC7C,OAAO,cAAc,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;IACvE,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAiB;QAC7B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;QACnC,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,EAAW,EAAE,OAAiB;QAC3C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;QACnC,OAAO,KAAK,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IACpC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAa,EAAE,OAAiB;QAC3C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;QACnC,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IACpC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAW,EAAE,IAAa,EAAE,OAAiB;QACxD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;QACnC,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,CAAE,OAAkB,IAAI,EAAE,CAAC,EAAE,CAAC,CAAA;IAC9E,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAW,EAAE,OAAiB;QAC1C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;QACnC,OAAO,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,CAAE,OAAkB,IAAI,EAAE,CAAC,EAAE,CAAC,CAAA;IACzE,CAAC;CACF"}
1
+ {"version":3,"file":"SequelizeRepository.js","sourceRoot":"","sources":["../../src/core/SequelizeRepository.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  export { AbstractController } from "./AbstractController.js";
2
2
  export type { RouteConfig, ControllerConfig } from "./AbstractController.js";
3
3
  export { AbstractService } from "./AbstractService.js";
4
- export type { ServiceConfig } from "./AbstractService.js";
4
+ export type { ServiceConfig, ServiceResolver } from "./AbstractService.js";
5
5
  export { AbstractRepository } from "./AbstractRepository.js";
6
6
  export { SequelizeRepository } from "./SequelizeRepository.js";
7
7
  export { MongooseRepository } from "./MongooseRepository.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAC5D,YAAY,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAE5E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,YAAY,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAEzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAE5D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,YAAY,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAC5D,YAAY,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAE5E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAE1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAE5D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,YAAY,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA"}
@@ -3,7 +3,9 @@ export interface DatabaseConfig {
3
3
  port?: number;
4
4
  user?: string;
5
5
  password?: string;
6
+ database?: string;
6
7
  prefix?: string;
8
+ suffix?: string;
7
9
  uri?: string;
8
10
  pool?: {
9
11
  max?: number;
@@ -1 +1 @@
1
- {"version":3,"file":"ConnectionManager.d.ts","sourceRoot":"","sources":["../../src/database/ConnectionManager.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE;QACL,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,IAAI,CAAC,EAAE,MAAM,CAAA;KACd,CAAA;CACF;AAED,8BAAsB,iBAAiB,CAAC,WAAW;IACjD,SAAS,CAAC,WAAW,2BAAiC;IACtD,SAAS,CAAC,MAAM,EAAE,cAAc,CAAA;gBAEpB,MAAM,EAAE,cAAc;IAIlC,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAEjF,QAAQ,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAElC,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAEpD,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;IAI/D,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;CAG3E"}
1
+ {"version":3,"file":"ConnectionManager.d.ts","sourceRoot":"","sources":["../../src/database/ConnectionManager.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE;QACL,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,IAAI,CAAC,EAAE,MAAM,CAAA;KACd,CAAA;CACF;AAED,8BAAsB,iBAAiB,CAAC,WAAW;IACjD,SAAS,CAAC,WAAW,2BAAiC;IACtD,SAAS,CAAC,MAAM,EAAE,cAAc,CAAA;gBAEpB,MAAM,EAAE,cAAc;IAIlC,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAEjF,QAAQ,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAElC,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAEpD,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;IAS/D,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;CAM3E"}
@@ -8,10 +8,21 @@ export class ConnectionManager {
8
8
  return this.constructor.name;
9
9
  }
10
10
  buildKey(tenant, dataSource) {
11
+ // When database name is fixed (single-tenant), all tenants share the same
12
+ // connection — key by database name to avoid creating duplicate pools.
13
+ if (this.config.database) {
14
+ return dataSource ? `${this.config.database}:${dataSource}` : this.config.database;
15
+ }
11
16
  return dataSource ? `${tenant}:${dataSource}` : tenant;
12
17
  }
13
18
  resolveDatabaseName(tenant, dataSource) {
14
- return dataSource ?? `${this.config.prefix}_${tenant}`;
19
+ if (this.config.database)
20
+ return this.config.database;
21
+ if (dataSource)
22
+ return dataSource;
23
+ if (this.config.suffix)
24
+ return `${tenant}_${this.config.suffix}`;
25
+ return `${this.config.prefix}_${tenant}`;
15
26
  }
16
27
  }
17
28
  //# sourceMappingURL=ConnectionManager.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ConnectionManager.js","sourceRoot":"","sources":["../../src/database/ConnectionManager.ts"],"names":[],"mappings":"AAeA,MAAM,OAAgB,iBAAiB;IAC3B,WAAW,GAAG,IAAI,GAAG,EAAuB,CAAA;IAC5C,MAAM,CAAgB;IAEhC,YAAY,MAAsB;QAChC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAQD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAA;IAC9B,CAAC;IAES,QAAQ,CAAC,MAAc,EAAE,UAAmB;QACpD,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,MAAM,CAAA;IACxD,CAAC;IAES,mBAAmB,CAAC,MAAc,EAAE,UAAmB;QAC/D,OAAO,UAAU,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,EAAE,CAAA;IACxD,CAAC;CACF"}
1
+ {"version":3,"file":"ConnectionManager.js","sourceRoot":"","sources":["../../src/database/ConnectionManager.ts"],"names":[],"mappings":"AAiBA,MAAM,OAAgB,iBAAiB;IAC3B,WAAW,GAAG,IAAI,GAAG,EAAuB,CAAA;IAC5C,MAAM,CAAgB;IAEhC,YAAY,MAAsB;QAChC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAQD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAA;IAC9B,CAAC;IAES,QAAQ,CAAC,MAAc,EAAE,UAAmB;QACpD,0EAA0E;QAC1E,uEAAuE;QACvE,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACzB,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAA;QACpF,CAAC;QACD,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,MAAM,CAAA;IACxD,CAAC;IAES,mBAAmB,CAAC,MAAc,EAAE,UAAmB;QAC/D,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAA;QACrD,IAAI,UAAU;YAAE,OAAO,UAAU,CAAA;QACjC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,OAAO,GAAG,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAA;QAChE,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,EAAE,CAAA;IAC1C,CAAC;CACF"}
@@ -0,0 +1,67 @@
1
+ import type { OnRoadExpress, BuildServerConfig } from "../OnRoadExpress.js";
2
+ export interface DevDatabaseConfig {
3
+ engine: "postgres" | "mysql";
4
+ port?: number;
5
+ user?: string;
6
+ password?: string;
7
+ database?: string;
8
+ image?: string;
9
+ containerName?: string;
10
+ }
11
+ /** GCP Cloud SQL backup restore configuration */
12
+ export interface GcpRestoreConfig {
13
+ /** Cloud SQL instance connection name, e.g. "project:region:instance" */
14
+ instance: string;
15
+ /** Source database name on Cloud SQL */
16
+ sourceDatabase: string;
17
+ /** GCS bucket for intermediate dump storage (optional — uses gcloud sql export) */
18
+ gcsBucket?: string;
19
+ /** Cloud SQL user for export (default: "postgres") */
20
+ sqlUser?: string;
21
+ }
22
+ export interface DevServerConfig {
23
+ app: OnRoadExpress;
24
+ databases?: DevDatabaseConfig[];
25
+ frontendVars?: Record<string, string>;
26
+ migrationsPath?: string;
27
+ projectRoot?: string;
28
+ autoMigrate?: boolean;
29
+ composeFile?: string;
30
+ tenants?: string[];
31
+ /** Restore latest backup from GCP Cloud SQL on startup */
32
+ gcpRestore?: GcpRestoreConfig;
33
+ }
34
+ export declare class DevServer {
35
+ private readonly app;
36
+ private readonly logger;
37
+ private readonly databases;
38
+ private readonly frontendVars;
39
+ private readonly migrationsPath?;
40
+ private readonly projectRoot;
41
+ private readonly autoMigrate;
42
+ private readonly composeFile;
43
+ private readonly tenants;
44
+ private readonly gcpRestore?;
45
+ private containers;
46
+ private composeCmd;
47
+ constructor(config: DevServerConfig);
48
+ start(buildConfig?: BuildServerConfig): Promise<void>;
49
+ stop(): Promise<void>;
50
+ private ensureComposeFile;
51
+ private generateComposeContent;
52
+ private getComposeCommand;
53
+ private startContainers;
54
+ private stopContainers;
55
+ private isDockerAvailable;
56
+ private waitForDatabases;
57
+ private waitForContainer;
58
+ private populateContainersFromConfig;
59
+ private waitForSequelizeConnection;
60
+ private runMigrations;
61
+ private printFrontendEnvVars;
62
+ private printBanner;
63
+ private printSummary;
64
+ private restoreFromGcp;
65
+ private localDbHasData;
66
+ }
67
+ //# sourceMappingURL=DevServer.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"DevServer.d.ts","sourceRoot":"","sources":["../../src/dev/DevServer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAM3E,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAA;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,iDAAiD;AACjD,MAAM,WAAW,gBAAgB;IAC/B,yEAAyE;IACzE,QAAQ,EAAE,MAAM,CAAA;IAChB,wCAAwC;IACxC,cAAc,EAAE,MAAM,CAAA;IACtB,mFAAmF;IACnF,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,sDAAsD;IACtD,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,aAAa,CAAA;IAClB,SAAS,CAAC,EAAE,iBAAiB,EAAE,CAAA;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,0DAA0D;IAC1D,UAAU,CAAC,EAAE,gBAAgB,CAAA;CAC9B;AAcD,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqB;IAC/C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAwB;IACrD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAQ;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAkB;IAC9C,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,UAAU,CAAsB;gBAE5B,MAAM,EAAE,eAAe;IAe7B,KAAK,CAAC,WAAW,GAAE,iBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoCzD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3B,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,sBAAsB;IA+E9B,OAAO,CAAC,iBAAiB;YAyBX,eAAe;IAiC7B,OAAO,CAAC,cAAc;IActB,OAAO,CAAC,iBAAiB;YAWX,gBAAgB;YAahB,gBAAgB;IA0B9B,OAAO,CAAC,4BAA4B;YAiBtB,0BAA0B;YAgC1B,aAAa;IAmC3B,OAAO,CAAC,oBAAoB;IAmD5B,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,YAAY;YAwBN,cAAc;YA0Ed,cAAc;CAW7B"}