intershell 0.3.6 → 0.3.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/entities/compose/compose.d.ts +5 -0
- package/dist/entities/compose/compose.d.ts.map +1 -1
- package/dist/entities/compose/compose.js +27 -2
- package/dist/entities/compose/compose.js.map +1 -1
- package/dist/entities/compose/compose.test.js +72 -0
- package/dist/entities/compose/compose.test.js.map +1 -1
- package/dist/entities/compose/compose.types.d.ts +5 -1
- package/dist/entities/compose/compose.types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/entities/compose/compose.test.ts +81 -0
- package/src/entities/compose/compose.ts +34 -2
- package/src/entities/compose/compose.types.ts +6 -1
|
@@ -14,5 +14,10 @@ export declare class EntityCompose {
|
|
|
14
14
|
static parseDockerCompose(input: string): ComposeData;
|
|
15
15
|
static parsePortMappings(ports: string[]): PortMapping[];
|
|
16
16
|
static parseEnvironment(env?: Record<string, string> | string[]): Record<string, string>;
|
|
17
|
+
/**
|
|
18
|
+
* Normalizes depends_on to an array of service names
|
|
19
|
+
* Supports both array format: ["postgres"] and object format: { postgres: { condition: "service_healthy" } }
|
|
20
|
+
*/
|
|
21
|
+
private static normalizeDependsOn;
|
|
17
22
|
}
|
|
18
23
|
//# sourceMappingURL=compose.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../../src/entities/compose/compose.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACX,WAAW,EACX,uBAAuB,
|
|
1
|
+
{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../../src/entities/compose/compose.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACX,WAAW,EACX,uBAAuB,EAEvB,qBAAqB,EAErB,WAAW,EAEX,sBAAsB,EACtB,aAAa,EACb,WAAW,EAEX,MAAM,iBAAiB,CAAC;AAUzB,qBAAa,aAAa;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,OAAO,CAA0B;gBAE7B,WAAW,EAAE,MAAM;IAIzB,QAAQ,IAAI,OAAO,CAAC,uBAAuB,CAAC;IA4B5C,UAAU,IAAI,OAAO,CAAC,WAAW,CAAC;IAmBlC,WAAW,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IA2BrC,gBAAgB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAW5C,sBAAsB,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAezD,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAKjD,eAAe,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAazC,mBAAmB,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAiD1F,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW;WAkDvC,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE;WAWjD,gBAAgB,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAmB/F;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAYjC"}
|
|
@@ -60,7 +60,7 @@ export class EntityCompose {
|
|
|
60
60
|
ports,
|
|
61
61
|
environment,
|
|
62
62
|
volumes: service.volumes || [],
|
|
63
|
-
dependencies: service.depends_on
|
|
63
|
+
dependencies: EntityCompose.normalizeDependsOn(service.depends_on),
|
|
64
64
|
health: {
|
|
65
65
|
name,
|
|
66
66
|
status: "unknown",
|
|
@@ -86,7 +86,7 @@ export class EntityCompose {
|
|
|
86
86
|
const services = Object.keys(compose.services);
|
|
87
87
|
const dependencies = {};
|
|
88
88
|
for (const [name, service] of Object.entries(compose.services)) {
|
|
89
|
-
dependencies[name] = service.depends_on
|
|
89
|
+
dependencies[name] = EntityCompose.normalizeDependsOn(service.depends_on);
|
|
90
90
|
}
|
|
91
91
|
return {
|
|
92
92
|
services,
|
|
@@ -165,6 +165,18 @@ export class EntityCompose {
|
|
|
165
165
|
}
|
|
166
166
|
service.environment = envObj;
|
|
167
167
|
}
|
|
168
|
+
// Normalize depends_on: support both array and object formats
|
|
169
|
+
if (service.depends_on) {
|
|
170
|
+
if (Array.isArray(service.depends_on)) {
|
|
171
|
+
// Already in array format, keep as is
|
|
172
|
+
service.depends_on = service.depends_on;
|
|
173
|
+
}
|
|
174
|
+
else if (typeof service.depends_on === "object" && service.depends_on !== null) {
|
|
175
|
+
// Object format: { postgres: { condition: "service_healthy" } }
|
|
176
|
+
// Convert to array of service names
|
|
177
|
+
service.depends_on = Object.keys(service.depends_on);
|
|
178
|
+
}
|
|
179
|
+
}
|
|
168
180
|
}
|
|
169
181
|
}
|
|
170
182
|
return {
|
|
@@ -205,5 +217,18 @@ export class EntityCompose {
|
|
|
205
217
|
}
|
|
206
218
|
return env;
|
|
207
219
|
}
|
|
220
|
+
/**
|
|
221
|
+
* Normalizes depends_on to an array of service names
|
|
222
|
+
* Supports both array format: ["postgres"] and object format: { postgres: { condition: "service_healthy" } }
|
|
223
|
+
*/
|
|
224
|
+
static normalizeDependsOn(dependsOn) {
|
|
225
|
+
if (!dependsOn)
|
|
226
|
+
return [];
|
|
227
|
+
if (Array.isArray(dependsOn)) {
|
|
228
|
+
return dependsOn;
|
|
229
|
+
}
|
|
230
|
+
// Object format: extract service names
|
|
231
|
+
return Object.keys(dependsOn);
|
|
232
|
+
}
|
|
208
233
|
}
|
|
209
234
|
//# sourceMappingURL=compose.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../src/entities/compose/compose.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../src/entities/compose/compose.ts"],"names":[],"mappings":"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"}
|
|
@@ -300,6 +300,78 @@ volumes:
|
|
|
300
300
|
// Cleanup mocks
|
|
301
301
|
await cleanupMocks();
|
|
302
302
|
});
|
|
303
|
+
it("should handle depends_on in object format (long syntax)", async () => {
|
|
304
|
+
await setupMocks();
|
|
305
|
+
const mockYamlParse = mock((input) => {
|
|
306
|
+
if (input.includes("service_healthy")) {
|
|
307
|
+
return {
|
|
308
|
+
version: "3.8",
|
|
309
|
+
services: {
|
|
310
|
+
app: {
|
|
311
|
+
image: "node:18",
|
|
312
|
+
ports: ["3000:3000"],
|
|
313
|
+
depends_on: {
|
|
314
|
+
postgres: {
|
|
315
|
+
condition: "service_healthy",
|
|
316
|
+
},
|
|
317
|
+
redis: {
|
|
318
|
+
condition: "service_started",
|
|
319
|
+
},
|
|
320
|
+
},
|
|
321
|
+
},
|
|
322
|
+
postgres: {
|
|
323
|
+
image: "postgres:13",
|
|
324
|
+
ports: ["5432:5432"],
|
|
325
|
+
},
|
|
326
|
+
redis: {
|
|
327
|
+
image: "redis:alpine",
|
|
328
|
+
ports: ["6379:6379"],
|
|
329
|
+
},
|
|
330
|
+
},
|
|
331
|
+
networks: {},
|
|
332
|
+
volumes: {},
|
|
333
|
+
};
|
|
334
|
+
}
|
|
335
|
+
return defaultYaml;
|
|
336
|
+
});
|
|
337
|
+
const mockFileText = mock(() => Promise.resolve("mock yaml content"));
|
|
338
|
+
setupBunMocks(mockYamlParse, mockFileText);
|
|
339
|
+
const { EntityCompose } = await import("./compose");
|
|
340
|
+
const entityCompose = new EntityCompose("docker-compose.yml");
|
|
341
|
+
// Test parsing with object format depends_on
|
|
342
|
+
const yamlInput = `
|
|
343
|
+
version: "3.8"
|
|
344
|
+
services:
|
|
345
|
+
app:
|
|
346
|
+
image: node:18
|
|
347
|
+
ports:
|
|
348
|
+
- "3000:3000"
|
|
349
|
+
depends_on:
|
|
350
|
+
postgres:
|
|
351
|
+
condition: service_healthy
|
|
352
|
+
redis:
|
|
353
|
+
condition: service_started
|
|
354
|
+
postgres:
|
|
355
|
+
image: postgres:13
|
|
356
|
+
ports:
|
|
357
|
+
- "5432:5432"
|
|
358
|
+
redis:
|
|
359
|
+
image: redis:alpine
|
|
360
|
+
ports:
|
|
361
|
+
- "6379:6379"
|
|
362
|
+
`;
|
|
363
|
+
const composeData = EntityCompose.parseDockerCompose(yamlInput);
|
|
364
|
+
expect(composeData.services.app.depends_on).toEqual(["postgres", "redis"]);
|
|
365
|
+
// Test getServices with object format
|
|
366
|
+
const services = await entityCompose.getServices();
|
|
367
|
+
const appService = services.find((s) => s.name === "app");
|
|
368
|
+
expect(appService?.dependencies).toEqual(["postgres", "redis"]);
|
|
369
|
+
// Test getServiceDependencies with object format
|
|
370
|
+
const dependencies = await entityCompose.getServiceDependencies();
|
|
371
|
+
expect(dependencies.dependencies.app).toEqual(["postgres", "redis"]);
|
|
372
|
+
// Cleanup mocks
|
|
373
|
+
await cleanupMocks();
|
|
374
|
+
});
|
|
303
375
|
it("should handle complex scenarios and error cases comprehensively", async () => {
|
|
304
376
|
await setupMocks();
|
|
305
377
|
// Create complex test YAML with multiple services and invalid ones for validation
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.test.js","sourceRoot":"","sources":["../../../src/entities/compose/compose.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"compose.test.js","sourceRoot":"","sources":["../../../src/entities/compose/compose.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,13 +5,17 @@ export interface ComposeData {
|
|
|
5
5
|
readonly volumes: Record<string, VolumeDefinition>;
|
|
6
6
|
readonly validation: ComposeValidationResult;
|
|
7
7
|
}
|
|
8
|
+
export interface DependsOnCondition {
|
|
9
|
+
readonly condition?: "service_started" | "service_healthy" | "service_completed_successfully";
|
|
10
|
+
readonly restart?: boolean;
|
|
11
|
+
}
|
|
8
12
|
export interface ServiceDefinition {
|
|
9
13
|
readonly image?: string;
|
|
10
14
|
readonly build?: string | BuildDefinition;
|
|
11
15
|
readonly ports?: string[];
|
|
12
16
|
readonly environment?: Record<string, string> | string[];
|
|
13
17
|
readonly volumes?: string[];
|
|
14
|
-
readonly depends_on?: string[]
|
|
18
|
+
readonly depends_on?: string[] | Record<string, DependsOnCondition>;
|
|
15
19
|
readonly networks?: string[];
|
|
16
20
|
readonly restart?: string;
|
|
17
21
|
readonly command?: string | string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.types.d.ts","sourceRoot":"","sources":["../../../src/entities/compose/compose.types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACrD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACrD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACnD,QAAQ,CAAC,UAAU,EAAE,uBAAuB,CAAC;CAC7C;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,eAAe,CAAC;IAC1C,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC;IACzD,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"compose.types.d.ts","sourceRoot":"","sources":["../../../src/entities/compose/compose.types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACrD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACrD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACnD,QAAQ,CAAC,UAAU,EAAE,uBAAuB,CAAC;CAC7C;AAED,MAAM,WAAW,kBAAkB;IAClC,QAAQ,CAAC,SAAS,CAAC,EAAE,iBAAiB,GAAG,iBAAiB,GAAG,gCAAgC,CAAC;IAC9F,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,eAAe,CAAC;IAC1C,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC;IACzD,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACpE,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACxC;AAED,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;CAC/B;AAED,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,KAAK,GAAG,KAAK,CAAC;CACjC;AAED,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,UAAU,GAAG,SAAS,CAAC;IAClE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAChD;AAED,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;CACvC;AAED,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,uBAAuB;IACvC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,sBAAsB,EAAE,CAAC;CAC1C;AAED,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACxB"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"private": false,
|
|
3
3
|
"name": "intershell",
|
|
4
|
-
"version": "0.3.
|
|
4
|
+
"version": "0.3.7",
|
|
5
5
|
"description": "Bun‑first CLI toolkit for developer workflow automation in monorepos and monoliths.",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"author": "Soheil Movahedan <soheil.movahedan@gmail.com>",
|
|
@@ -375,6 +375,87 @@ volumes:
|
|
|
375
375
|
await cleanupMocks();
|
|
376
376
|
});
|
|
377
377
|
|
|
378
|
+
it("should handle depends_on in object format (long syntax)", async () => {
|
|
379
|
+
await setupMocks();
|
|
380
|
+
|
|
381
|
+
const mockYamlParse = mock((input: string) => {
|
|
382
|
+
if (input.includes("service_healthy")) {
|
|
383
|
+
return {
|
|
384
|
+
version: "3.8",
|
|
385
|
+
services: {
|
|
386
|
+
app: {
|
|
387
|
+
image: "node:18",
|
|
388
|
+
ports: ["3000:3000"],
|
|
389
|
+
depends_on: {
|
|
390
|
+
postgres: {
|
|
391
|
+
condition: "service_healthy",
|
|
392
|
+
},
|
|
393
|
+
redis: {
|
|
394
|
+
condition: "service_started",
|
|
395
|
+
},
|
|
396
|
+
},
|
|
397
|
+
},
|
|
398
|
+
postgres: {
|
|
399
|
+
image: "postgres:13",
|
|
400
|
+
ports: ["5432:5432"],
|
|
401
|
+
},
|
|
402
|
+
redis: {
|
|
403
|
+
image: "redis:alpine",
|
|
404
|
+
ports: ["6379:6379"],
|
|
405
|
+
},
|
|
406
|
+
},
|
|
407
|
+
networks: {},
|
|
408
|
+
volumes: {},
|
|
409
|
+
};
|
|
410
|
+
}
|
|
411
|
+
return defaultYaml;
|
|
412
|
+
});
|
|
413
|
+
|
|
414
|
+
const mockFileText = mock(() => Promise.resolve("mock yaml content"));
|
|
415
|
+
setupBunMocks(mockYamlParse, mockFileText);
|
|
416
|
+
|
|
417
|
+
const { EntityCompose } = await import("./compose");
|
|
418
|
+
const entityCompose = new EntityCompose("docker-compose.yml");
|
|
419
|
+
|
|
420
|
+
// Test parsing with object format depends_on
|
|
421
|
+
const yamlInput = `
|
|
422
|
+
version: "3.8"
|
|
423
|
+
services:
|
|
424
|
+
app:
|
|
425
|
+
image: node:18
|
|
426
|
+
ports:
|
|
427
|
+
- "3000:3000"
|
|
428
|
+
depends_on:
|
|
429
|
+
postgres:
|
|
430
|
+
condition: service_healthy
|
|
431
|
+
redis:
|
|
432
|
+
condition: service_started
|
|
433
|
+
postgres:
|
|
434
|
+
image: postgres:13
|
|
435
|
+
ports:
|
|
436
|
+
- "5432:5432"
|
|
437
|
+
redis:
|
|
438
|
+
image: redis:alpine
|
|
439
|
+
ports:
|
|
440
|
+
- "6379:6379"
|
|
441
|
+
`;
|
|
442
|
+
|
|
443
|
+
const composeData = EntityCompose.parseDockerCompose(yamlInput);
|
|
444
|
+
expect(composeData.services.app.depends_on).toEqual(["postgres", "redis"]);
|
|
445
|
+
|
|
446
|
+
// Test getServices with object format
|
|
447
|
+
const services = await entityCompose.getServices();
|
|
448
|
+
const appService = services.find((s) => s.name === "app");
|
|
449
|
+
expect(appService?.dependencies).toEqual(["postgres", "redis"]);
|
|
450
|
+
|
|
451
|
+
// Test getServiceDependencies with object format
|
|
452
|
+
const dependencies = await entityCompose.getServiceDependencies();
|
|
453
|
+
expect(dependencies.dependencies.app).toEqual(["postgres", "redis"]);
|
|
454
|
+
|
|
455
|
+
// Cleanup mocks
|
|
456
|
+
await cleanupMocks();
|
|
457
|
+
});
|
|
458
|
+
|
|
378
459
|
it("should handle complex scenarios and error cases comprehensively", async () => {
|
|
379
460
|
await setupMocks();
|
|
380
461
|
|
|
@@ -3,6 +3,7 @@ import { EntityPackage } from "../package";
|
|
|
3
3
|
import type {
|
|
4
4
|
ComposeData,
|
|
5
5
|
ComposeValidationResult,
|
|
6
|
+
DependsOnCondition,
|
|
6
7
|
EntityAffectedService,
|
|
7
8
|
NetworkDefinition,
|
|
8
9
|
PortMapping,
|
|
@@ -90,7 +91,7 @@ export class EntityCompose {
|
|
|
90
91
|
ports,
|
|
91
92
|
environment,
|
|
92
93
|
volumes: service.volumes || [],
|
|
93
|
-
dependencies: service.depends_on
|
|
94
|
+
dependencies: EntityCompose.normalizeDependsOn(service.depends_on),
|
|
94
95
|
health: {
|
|
95
96
|
name,
|
|
96
97
|
status: "unknown",
|
|
@@ -120,7 +121,7 @@ export class EntityCompose {
|
|
|
120
121
|
const dependencies: Record<string, string[]> = {};
|
|
121
122
|
|
|
122
123
|
for (const [name, service] of Object.entries(compose.services)) {
|
|
123
|
-
dependencies[name] = service.depends_on
|
|
124
|
+
dependencies[name] = EntityCompose.normalizeDependsOn(service.depends_on);
|
|
124
125
|
}
|
|
125
126
|
|
|
126
127
|
return {
|
|
@@ -217,6 +218,20 @@ export class EntityCompose {
|
|
|
217
218
|
}
|
|
218
219
|
(service as Record<string, unknown>).environment = envObj;
|
|
219
220
|
}
|
|
221
|
+
|
|
222
|
+
// Normalize depends_on: support both array and object formats
|
|
223
|
+
if (service.depends_on) {
|
|
224
|
+
if (Array.isArray(service.depends_on)) {
|
|
225
|
+
// Already in array format, keep as is
|
|
226
|
+
(service as Record<string, unknown>).depends_on = service.depends_on;
|
|
227
|
+
} else if (typeof service.depends_on === "object" && service.depends_on !== null) {
|
|
228
|
+
// Object format: { postgres: { condition: "service_healthy" } }
|
|
229
|
+
// Convert to array of service names
|
|
230
|
+
(service as Record<string, unknown>).depends_on = Object.keys(
|
|
231
|
+
service.depends_on as Record<string, unknown>,
|
|
232
|
+
);
|
|
233
|
+
}
|
|
234
|
+
}
|
|
220
235
|
}
|
|
221
236
|
}
|
|
222
237
|
|
|
@@ -261,4 +276,21 @@ export class EntityCompose {
|
|
|
261
276
|
|
|
262
277
|
return env;
|
|
263
278
|
}
|
|
279
|
+
|
|
280
|
+
/**
|
|
281
|
+
* Normalizes depends_on to an array of service names
|
|
282
|
+
* Supports both array format: ["postgres"] and object format: { postgres: { condition: "service_healthy" } }
|
|
283
|
+
*/
|
|
284
|
+
private static normalizeDependsOn(
|
|
285
|
+
dependsOn?: string[] | Record<string, DependsOnCondition>,
|
|
286
|
+
): string[] {
|
|
287
|
+
if (!dependsOn) return [];
|
|
288
|
+
|
|
289
|
+
if (Array.isArray(dependsOn)) {
|
|
290
|
+
return dependsOn;
|
|
291
|
+
}
|
|
292
|
+
|
|
293
|
+
// Object format: extract service names
|
|
294
|
+
return Object.keys(dependsOn);
|
|
295
|
+
}
|
|
264
296
|
}
|
|
@@ -6,13 +6,18 @@ export interface ComposeData {
|
|
|
6
6
|
readonly validation: ComposeValidationResult;
|
|
7
7
|
}
|
|
8
8
|
|
|
9
|
+
export interface DependsOnCondition {
|
|
10
|
+
readonly condition?: "service_started" | "service_healthy" | "service_completed_successfully";
|
|
11
|
+
readonly restart?: boolean;
|
|
12
|
+
}
|
|
13
|
+
|
|
9
14
|
export interface ServiceDefinition {
|
|
10
15
|
readonly image?: string;
|
|
11
16
|
readonly build?: string | BuildDefinition;
|
|
12
17
|
readonly ports?: string[];
|
|
13
18
|
readonly environment?: Record<string, string> | string[];
|
|
14
19
|
readonly volumes?: string[];
|
|
15
|
-
readonly depends_on?: string[]
|
|
20
|
+
readonly depends_on?: string[] | Record<string, DependsOnCondition>;
|
|
16
21
|
readonly networks?: string[];
|
|
17
22
|
readonly restart?: string;
|
|
18
23
|
readonly command?: string | string[];
|