@solid-stack/builder 3.1.0 → 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.
- package/README.md +5 -3
- package/dist/bin.js +84 -48
- package/dist/bin.js.map +1 -1
- package/dist/core/buildSchema.d.ts +65 -0
- package/dist/core/buildSchema.d.ts.map +1 -1
- package/dist/core/composition/compileServiceComposition.d.ts.map +1 -1
- package/dist/core/config/resolveBuildStage.d.ts +5 -1
- package/dist/core/config/resolveBuildStage.d.ts.map +1 -1
- package/dist/core/config/serviceGraph.d.ts +1 -1
- package/dist/core/config/serviceGraph.d.ts.map +1 -1
- package/dist/core/config/types.d.ts +1 -0
- package/dist/core/config/types.d.ts.map +1 -1
- package/dist/core/runners/runFiniteTester.d.ts +1 -0
- package/dist/core/runners/runFiniteTester.d.ts.map +1 -1
- package/dist/core/runners/runTestUnit.d.ts +2 -0
- package/dist/core/runners/runTestUnit.d.ts.map +1 -1
- package/dist/index.js +84 -48
- package/dist/index.js.map +1 -1
- package/dist/types/index.d.ts +9 -2
- package/dist/types/index.d.ts.map +1 -1
- package/package.json +1 -1
- package/schemas/build-schema.json +364 -0
|
@@ -280,16 +280,56 @@ export declare const buildStageSchema: z.ZodObject<{
|
|
|
280
280
|
}, {
|
|
281
281
|
services?: Record<string, unknown> | undefined;
|
|
282
282
|
}>;
|
|
283
|
+
export declare const isolatedInfraOverlaySchema: z.ZodObject<{
|
|
284
|
+
services: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodUnknown>, Record<string, unknown>, Record<string, unknown>>>;
|
|
285
|
+
}, "strict", z.ZodTypeAny, {
|
|
286
|
+
services?: Record<string, unknown> | undefined;
|
|
287
|
+
}, {
|
|
288
|
+
services?: Record<string, unknown> | undefined;
|
|
289
|
+
}>;
|
|
290
|
+
export declare const isolatableBuildStageSchema: z.ZodObject<{
|
|
291
|
+
services: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodUnknown>, Record<string, unknown>, Record<string, unknown>>>;
|
|
292
|
+
"on-inframode-isolated": z.ZodOptional<z.ZodObject<{
|
|
293
|
+
services: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodUnknown>, Record<string, unknown>, Record<string, unknown>>>;
|
|
294
|
+
}, "strict", z.ZodTypeAny, {
|
|
295
|
+
services?: Record<string, unknown> | undefined;
|
|
296
|
+
}, {
|
|
297
|
+
services?: Record<string, unknown> | undefined;
|
|
298
|
+
}>>;
|
|
299
|
+
}, "strict", z.ZodTypeAny, {
|
|
300
|
+
services?: Record<string, unknown> | undefined;
|
|
301
|
+
"on-inframode-isolated"?: {
|
|
302
|
+
services?: Record<string, unknown> | undefined;
|
|
303
|
+
} | undefined;
|
|
304
|
+
}, {
|
|
305
|
+
services?: Record<string, unknown> | undefined;
|
|
306
|
+
"on-inframode-isolated"?: {
|
|
307
|
+
services?: Record<string, unknown> | undefined;
|
|
308
|
+
} | undefined;
|
|
309
|
+
}>;
|
|
283
310
|
export declare const buildJsonSchema: z.ZodObject<{
|
|
284
311
|
$schema: z.ZodOptional<z.ZodString>;
|
|
285
312
|
name: z.ZodEffects<z.ZodString, string, string>;
|
|
286
313
|
services: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodUnknown>, Record<string, unknown>, Record<string, unknown>>;
|
|
287
314
|
dev: z.ZodOptional<z.ZodObject<{
|
|
288
315
|
services: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodUnknown>, Record<string, unknown>, Record<string, unknown>>>;
|
|
316
|
+
"on-inframode-isolated": z.ZodOptional<z.ZodObject<{
|
|
317
|
+
services: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodUnknown>, Record<string, unknown>, Record<string, unknown>>>;
|
|
318
|
+
}, "strict", z.ZodTypeAny, {
|
|
319
|
+
services?: Record<string, unknown> | undefined;
|
|
320
|
+
}, {
|
|
321
|
+
services?: Record<string, unknown> | undefined;
|
|
322
|
+
}>>;
|
|
289
323
|
}, "strict", z.ZodTypeAny, {
|
|
290
324
|
services?: Record<string, unknown> | undefined;
|
|
325
|
+
"on-inframode-isolated"?: {
|
|
326
|
+
services?: Record<string, unknown> | undefined;
|
|
327
|
+
} | undefined;
|
|
291
328
|
}, {
|
|
292
329
|
services?: Record<string, unknown> | undefined;
|
|
330
|
+
"on-inframode-isolated"?: {
|
|
331
|
+
services?: Record<string, unknown> | undefined;
|
|
332
|
+
} | undefined;
|
|
293
333
|
}>>;
|
|
294
334
|
prod: z.ZodOptional<z.ZodObject<{
|
|
295
335
|
services: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodUnknown>, Record<string, unknown>, Record<string, unknown>>>;
|
|
@@ -300,10 +340,23 @@ export declare const buildJsonSchema: z.ZodObject<{
|
|
|
300
340
|
}>>;
|
|
301
341
|
test: z.ZodOptional<z.ZodObject<{
|
|
302
342
|
services: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodUnknown>, Record<string, unknown>, Record<string, unknown>>>;
|
|
343
|
+
"on-inframode-isolated": z.ZodOptional<z.ZodObject<{
|
|
344
|
+
services: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodUnknown>, Record<string, unknown>, Record<string, unknown>>>;
|
|
345
|
+
}, "strict", z.ZodTypeAny, {
|
|
346
|
+
services?: Record<string, unknown> | undefined;
|
|
347
|
+
}, {
|
|
348
|
+
services?: Record<string, unknown> | undefined;
|
|
349
|
+
}>>;
|
|
303
350
|
}, "strict", z.ZodTypeAny, {
|
|
304
351
|
services?: Record<string, unknown> | undefined;
|
|
352
|
+
"on-inframode-isolated"?: {
|
|
353
|
+
services?: Record<string, unknown> | undefined;
|
|
354
|
+
} | undefined;
|
|
305
355
|
}, {
|
|
306
356
|
services?: Record<string, unknown> | undefined;
|
|
357
|
+
"on-inframode-isolated"?: {
|
|
358
|
+
services?: Record<string, unknown> | undefined;
|
|
359
|
+
} | undefined;
|
|
307
360
|
}>>;
|
|
308
361
|
e2e: z.ZodOptional<z.ZodObject<{
|
|
309
362
|
services: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodUnknown>, Record<string, unknown>, Record<string, unknown>>>;
|
|
@@ -318,12 +371,18 @@ export declare const buildJsonSchema: z.ZodObject<{
|
|
|
318
371
|
services: Record<string, unknown>;
|
|
319
372
|
dev?: {
|
|
320
373
|
services?: Record<string, unknown> | undefined;
|
|
374
|
+
"on-inframode-isolated"?: {
|
|
375
|
+
services?: Record<string, unknown> | undefined;
|
|
376
|
+
} | undefined;
|
|
321
377
|
} | undefined;
|
|
322
378
|
prod?: {
|
|
323
379
|
services?: Record<string, unknown> | undefined;
|
|
324
380
|
} | undefined;
|
|
325
381
|
test?: {
|
|
326
382
|
services?: Record<string, unknown> | undefined;
|
|
383
|
+
"on-inframode-isolated"?: {
|
|
384
|
+
services?: Record<string, unknown> | undefined;
|
|
385
|
+
} | undefined;
|
|
327
386
|
} | undefined;
|
|
328
387
|
e2e?: {
|
|
329
388
|
services?: Record<string, unknown> | undefined;
|
|
@@ -334,12 +393,18 @@ export declare const buildJsonSchema: z.ZodObject<{
|
|
|
334
393
|
services: Record<string, unknown>;
|
|
335
394
|
dev?: {
|
|
336
395
|
services?: Record<string, unknown> | undefined;
|
|
396
|
+
"on-inframode-isolated"?: {
|
|
397
|
+
services?: Record<string, unknown> | undefined;
|
|
398
|
+
} | undefined;
|
|
337
399
|
} | undefined;
|
|
338
400
|
prod?: {
|
|
339
401
|
services?: Record<string, unknown> | undefined;
|
|
340
402
|
} | undefined;
|
|
341
403
|
test?: {
|
|
342
404
|
services?: Record<string, unknown> | undefined;
|
|
405
|
+
"on-inframode-isolated"?: {
|
|
406
|
+
services?: Record<string, unknown> | undefined;
|
|
407
|
+
} | undefined;
|
|
343
408
|
} | undefined;
|
|
344
409
|
e2e?: {
|
|
345
410
|
services?: Record<string, unknown> | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildSchema.d.ts","sourceRoot":"","sources":["../../src/core/buildSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAYxB,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;EAAgK,CAAC;AAChM,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;EAA4D,CAAC;AAC/F,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAA0N,CAAC;AACzP,eAAO,MAAM,mBAAmB;;;;;;;;;;;;EAAmF,CAAC;AACpH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAyV,CAAC;AAC5X,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAmP,CAAC;AAClR,eAAO,MAAM,mBAAmB;;;;;;;;;;;;EAAyC,CAAC;AAC1E,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAwO,CAAC;AAC3Q,eAAO,MAAM,mBAAmB,wGAO9B,CAAC;
|
|
1
|
+
{"version":3,"file":"buildSchema.d.ts","sourceRoot":"","sources":["../../src/core/buildSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAYxB,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;EAAgK,CAAC;AAChM,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;EAA4D,CAAC;AAC/F,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAA0N,CAAC;AACzP,eAAO,MAAM,mBAAmB;;;;;;;;;;;;EAAmF,CAAC;AACpH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAyV,CAAC;AAC5X,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAmP,CAAC;AAClR,eAAO,MAAM,mBAAmB;;;;;;;;;;;;EAAyC,CAAC;AAC1E,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAwO,CAAC;AAC3Q,eAAO,MAAM,mBAAmB,wGAO9B,CAAC;AASH,eAAO,MAAM,gBAAgB;;;;;;EAAoE,CAAC;AAClG,eAAO,MAAM,0BAA0B;;;;;;EAAqE,CAAC;AAC7G,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;EAAoI,CAAC;AAC5K,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAqQ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileServiceComposition.d.ts","sourceRoot":"","sources":["../../../src/core/composition/compileServiceComposition.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"compileServiceComposition.d.ts","sourceRoot":"","sources":["../../../src/core/composition/compileServiceComposition.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAMxD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACtD,MAAM,WAAW,gCAAgC;IAAG,IAAI,CAAC,EAAC,OAAO,GAAC,SAAS,CAAC;IAAC,eAAe,CAAC,EAAC,OAAO,GAAC,SAAS,CAAC;IAAC,cAAc,CAAC,EAAC,OAAO,GAAC,SAAS,CAAA;CAAE;AACpJ,wBAAgB,yBAAyB,CAAC,KAAK,EAAC,WAAW,EAAC,UAAU,EAAC,MAAM,EAAC,OAAO,GAAC,gCAAmC,GAAE,mBAAmB,CAI7I"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import type { BuildJson, Environment } from "../../types/index.js";
|
|
2
2
|
import type { EffectiveBuildConfig } from "./types.js";
|
|
3
|
-
export declare
|
|
3
|
+
export declare const ISOLATED_OVERLAY_KEY: "on-inframode-isolated";
|
|
4
|
+
export interface ResolveBuildStageOptions {
|
|
5
|
+
isolated?: boolean;
|
|
6
|
+
}
|
|
7
|
+
export declare function resolveBuildStage(build: BuildJson, stage: Environment, sourceFile: string, options?: ResolveBuildStageOptions): EffectiveBuildConfig;
|
|
4
8
|
//# sourceMappingURL=resolveBuildStage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveBuildStage.d.ts","sourceRoot":"","sources":["../../../src/core/config/resolveBuildStage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"resolveBuildStage.d.ts","sourceRoot":"","sources":["../../../src/core/config/resolveBuildStage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAiB,MAAM,sBAAsB,CAAC;AAGlF,OAAO,KAAK,EAAE,oBAAoB,EAA4B,MAAM,YAAY,CAAC;AAEjF,eAAO,MAAM,oBAAoB,EAAG,uBAAgC,CAAC;AACrE,MAAM,WAAW,wBAAwB;IAAG,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE;AAGhE,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAE,wBAA6B,GAAG,oBAAoB,CAoExJ"}
|
|
@@ -4,7 +4,7 @@ export interface GraphProfile {
|
|
|
4
4
|
stage: string;
|
|
5
5
|
}
|
|
6
6
|
export declare function buildDeclaredGraph(input: EffectiveComposition): DeclaredGraph;
|
|
7
|
-
export declare function computeClosure(start: NodeId, adjacency: ReadonlyMap<NodeId, readonly Edge[]
|
|
7
|
+
export declare function computeClosure(start: NodeId, adjacency: ReadonlyMap<NodeId, readonly Edge[]>, follow?: (edge: Edge) => boolean): Set<NodeId>;
|
|
8
8
|
export declare function selectReachableGraph(declared: DeclaredGraph, profile: GraphProfile): EffectiveGraph;
|
|
9
9
|
export declare function validateGraphLifecycle(graph: EffectiveGraph, stage?: string): void;
|
|
10
10
|
//# sourceMappingURL=serviceGraph.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serviceGraph.d.ts","sourceRoot":"","sources":["../../../src/core/config/serviceGraph.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,EAAU,MAAM,YAAY,CAAC;AAE5G,MAAM,WAAW,YAAY;IAAG,SAAS,EAAE,UAAU,GAAC,YAAY,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE;AAEnF,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,oBAAoB,GAAG,aAAa,CAc7E;AACD,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,IAAI,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"serviceGraph.d.ts","sourceRoot":"","sources":["../../../src/core/config/serviceGraph.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,EAAU,MAAM,YAAY,CAAC;AAE5G,MAAM,WAAW,YAAY;IAAG,SAAS,EAAE,UAAU,GAAC,YAAY,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE;AAEnF,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,oBAAoB,GAAG,aAAa,CAc7E;AACD,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,IAAI,EAAE,CAAC,EAAE,MAAM,GAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAoB,GAAG,GAAG,CAAC,MAAM,CAAC,CAIxJ;AACD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,YAAY,GAAG,cAAc,CAkCnG;AACD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,SAAQ,GAAG,IAAI,CAkBjF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/config/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1K,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,MAAM,MAAM,WAAW,GAAG,WAAW,CAAC;AACtC,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC;AAC5B,MAAM,MAAM,MAAM,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,WAAW,CAAA;CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/config/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1K,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,MAAM,MAAM,WAAW,GAAG,WAAW,CAAC;AACtC,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC;AAC5B,MAAM,MAAM,MAAM,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,WAAW,CAAC;IAAC,eAAe,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AACrL,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI;IAAE,KAAK,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AACtD,MAAM,MAAM,IAAI,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAC7F,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAC,MAAM,CAAC,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAC,MAAM,CAAC,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAC,YAAY,CAAC,CAAC;IAAC,UAAU,EAAE,UAAU,CAAA;CAAE,CAAC;AACzL,MAAM,MAAM,iBAAiB,GAAG,eAAe,GAAG;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAC,MAAM,CAAC,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAC,eAAe,CAAC,CAAC;IAAC,UAAU,EAAE,UAAU,CAAA;CAAE,CAAC;AACtK,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG,iBAAiB,CAAC;AACjE,MAAM,WAAW,mBAAmB;IAAG,KAAK,EAAE,MAAM,GAAG,WAAW,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAC,OAAO,CAAC,CAAC,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE;AACtI,MAAM,WAAW,oBAAoB;IAAG,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,GAAG,aAAa,CAAC,CAAC;IAAC,MAAM,EAAE,mBAAmB,EAAE,CAAC;IAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE;AAC7W,MAAM,WAAW,mBAAmB;IAAG,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,GAAG,WAAW,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAC,OAAO,CAAC,CAAC,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE;AAC1O,MAAM,WAAW,mBAAmB;IAAG,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAAC,MAAM,EAAE,aAAa,CAAC;IAAC,YAAY,EAAE,mBAAmB,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAC;IAAC,GAAG,EAAE,UAAU,CAAA;CAAE;AAChP,MAAM,WAAW,SAAS;IAAG,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,gBAAgB,CAAC;IAAC,SAAS,EAAE,gBAAgB,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAC,MAAM,CAAC,CAAC;IAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAC,MAAM,CAAC,CAAC;IAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAC,MAAM,CAAC,CAAA;CAAE;AAC5T,MAAM,WAAW,gBAAgB;IAAG,IAAI,EAAE,QAAQ,GAAG,iBAAiB,GAAG,OAAO,GAAG,kBAAkB,GAAG,MAAM,GAAG,UAAU,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAA;CAAE;AAC7K,MAAM,WAAW,cAAc;IAAG,KAAK,EAAE,GAAG,CAAC,MAAM,EAAC,SAAS,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,EAAE,IAAI,EAAE,CAAC;IAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAC,cAAc,GAAC,cAAc,CAAC,CAAA;CAAE;AACzL,MAAM,WAAW,aAAa;IAAG,KAAK,EAAE,GAAG,CAAC,MAAM,EAAC,SAAS,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,EAAE,IAAI,EAAE,CAAA;CAAE;AAC/F,MAAM,WAAW,oBAAoB;IAAG,KAAK,EAAE,GAAG,CAAC,MAAM,EAAC,SAAS,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,aAAa,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,WAAW,CAAC;IAAC,WAAW,EAAE,SAAS,GAAG,MAAM,CAAA;CAAE;AACzL,MAAM,WAAW,gBAAgB;IAAG,WAAW,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,oBAAoB,EAAE,OAAO,CAAA;CAAE;AAC7L,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAAG,cAAc,GAAG,iBAAiB,GAAG,aAAa,GAAG,aAAa,GAAG,aAAa,GAAG,gBAAgB,GAAG,YAAY,CAAC;AACrK,MAAM,WAAW,aAAa;IAAG,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,gBAAgB,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE;AACvH,eAAO,MAAM,MAAM,aAAc,MAAM,GAAG,SAAS,iBAAiB,MAAM,KAAG,MAA2D,CAAC;AACzI,eAAO,MAAM,WAAW,OAAQ,MAAM,KAAG,MAAkI,CAAC"}
|
|
@@ -8,6 +8,7 @@ export interface FiniteTesterAdapters {
|
|
|
8
8
|
inspectImage?: InspectImage;
|
|
9
9
|
checkPorts?: typeof checkHostPortCollisions;
|
|
10
10
|
}
|
|
11
|
+
export declare function inspectRunnerExit(yaml: string, projectDir: string, runner: string): number | undefined;
|
|
11
12
|
/** Start the full effective graph and report only the selected runner's exit status. */
|
|
12
13
|
export declare function runFiniteTester(compiled: CompiledComposition, projectDir: string, adapters?: FiniteTesterAdapters): Promise<number>;
|
|
13
14
|
//# sourceMappingURL=runFiniteTester.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runFiniteTester.d.ts","sourceRoot":"","sources":["../../../src/core/runners/runFiniteTester.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAyB,KAAK,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACnG,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAmB,MAAM,mCAAmC,CAAC;AAC7F,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,UAAU,CAAC;IAC5B,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAC,MAAM,EAAC,UAAU,EAAC,MAAM,EAAC,MAAM,EAAC,MAAM,KAAG,MAAM,GAAC,SAAS,CAAC;IACpF,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,UAAU,CAAC,EAAE,OAAO,uBAAuB,CAAC;CAC7C;
|
|
1
|
+
{"version":3,"file":"runFiniteTester.d.ts","sourceRoot":"","sources":["../../../src/core/runners/runFiniteTester.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAyB,KAAK,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACnG,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAmB,MAAM,mCAAmC,CAAC;AAC7F,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,UAAU,CAAC;IAC5B,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAC,MAAM,EAAC,UAAU,EAAC,MAAM,EAAC,MAAM,EAAC,MAAM,KAAG,MAAM,GAAC,SAAS,CAAC;IACpF,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,UAAU,CAAC,EAAE,OAAO,uBAAuB,CAAC;CAC7C;AACD,wBAAgB,iBAAiB,CAAC,IAAI,EAAC,MAAM,EAAC,UAAU,EAAC,MAAM,EAAC,MAAM,EAAC,MAAM,GAAE,MAAM,GAAC,SAAS,CAO9F;AACD,wFAAwF;AACxF,wBAAsB,eAAe,CAAC,QAAQ,EAAC,mBAAmB,EAAC,UAAU,EAAC,MAAM,EAAC,QAAQ,GAAC,oBAAuB,GAAE,OAAO,CAAC,MAAM,CAAC,CAuBrI"}
|
|
@@ -2,10 +2,12 @@ import type { RunOptions } from "../RunOptions.js";
|
|
|
2
2
|
import { checkHostPortCollisions } from "../../utils/checkPortCollision.js";
|
|
3
3
|
import { runCompose } from "../runCompose.js";
|
|
4
4
|
import { teardownCompose } from "../teardownCompose.js";
|
|
5
|
+
export type InspectServiceExit = (yaml: string, projectDir: string, service: string) => number | undefined;
|
|
5
6
|
export interface UnitRuntimeAdapters {
|
|
6
7
|
compose?: typeof runCompose;
|
|
7
8
|
teardown?: typeof teardownCompose;
|
|
8
9
|
checkPorts?: typeof checkHostPortCollisions;
|
|
10
|
+
inspectExit?: InspectServiceExit;
|
|
9
11
|
}
|
|
10
12
|
export declare function runTestUnit(options: RunOptions, adapters?: UnitRuntimeAdapters): Promise<number>;
|
|
11
13
|
//# sourceMappingURL=runTestUnit.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runTestUnit.d.ts","sourceRoot":"","sources":["../../../src/core/runners/runTestUnit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"runTestUnit.d.ts","sourceRoot":"","sources":["../../../src/core/runners/runTestUnit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAKnD,OAAO,EAAE,uBAAuB,EAAoB,MAAM,mCAAmC,CAAC;AAI9F,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,CAAC,IAAI,EAAC,MAAM,EAAC,UAAU,EAAC,MAAM,EAAC,OAAO,EAAC,MAAM,KAAG,MAAM,GAAC,SAAS,CAAC;AAClG,MAAM,WAAW,mBAAmB;IAAG,OAAO,CAAC,EAAE,OAAO,UAAU,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,eAAe,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,uBAAuB,CAAC;IAAC,WAAW,CAAC,EAAE,kBAAkB,CAAA;CAAE;AAUtL,wBAAsB,WAAW,CAAC,OAAO,EAAC,UAAU,EAAC,QAAQ,GAAC,mBAAsB,GAAE,OAAO,CAAC,MAAM,CAAC,CAcpG"}
|
package/dist/index.js
CHANGED
|
@@ -81,14 +81,21 @@ var buildServicesSchema = z.record(identifier, z.unknown()).superRefine((value,
|
|
|
81
81
|
if (!parsed.success) for (const issue of parsed.error.issues) context.addIssue({ ...issue, path: [key, ...issue.path] });
|
|
82
82
|
}
|
|
83
83
|
});
|
|
84
|
-
var
|
|
84
|
+
var overlayServices = (allowTester) => z.record(identifier, z.unknown()).superRefine((value, context) => {
|
|
85
85
|
for (const [key, entry] of Object.entries(value)) {
|
|
86
|
+
if (key === "tester" && !allowTester) {
|
|
87
|
+
context.addIssue({ code: "custom", path: [key], message: "tester cannot be configured in on-inframode-isolated" });
|
|
88
|
+
continue;
|
|
89
|
+
}
|
|
86
90
|
const schema = key === "main" ? mainOverlaySchema : key === "tester" ? testerOverlaySchema : ordinaryOverlaySchema;
|
|
87
91
|
const parsed = schema.safeParse(entry);
|
|
88
92
|
if (!parsed.success) for (const issue of parsed.error.issues) context.addIssue({ ...issue, path: [key, ...issue.path] });
|
|
89
93
|
}
|
|
90
|
-
})
|
|
91
|
-
var
|
|
94
|
+
});
|
|
95
|
+
var buildStageSchema = z.object({ services: overlayServices(true).optional() }).strict();
|
|
96
|
+
var isolatedInfraOverlaySchema = z.object({ services: overlayServices(false).optional() }).strict();
|
|
97
|
+
var isolatableBuildStageSchema = z.object({ services: overlayServices(true).optional(), "on-inframode-isolated": isolatedInfraOverlaySchema.optional() }).strict();
|
|
98
|
+
var buildJsonSchema = z.object({ $schema: z.string().optional(), name: nonblank, services: buildServicesSchema, dev: isolatableBuildStageSchema.optional(), prod: buildStageSchema.optional(), test: isolatableBuildStageSchema.optional(), e2e: buildStageSchema.optional() }).strict();
|
|
92
99
|
|
|
93
100
|
// src/utils/errorMessage.ts
|
|
94
101
|
function errorMessage(err) {
|
|
@@ -337,6 +344,14 @@ function checkDockerfileContract(build, projectDir) {
|
|
|
337
344
|
runStep("docker", ["run", "--rm", "--network", "none", "--mount", `type=bind,src=${root},dst=/project,readonly`, "--mount", `type=bind,src=${policyDir},dst=/builder-policy,readonly`, "-w", "/project", CONFTEST_IMAGE, "test", relative, "-p", "/builder-policy"], root, { stepName: "Dockerfile Contract", targetFile: relative });
|
|
338
345
|
}
|
|
339
346
|
|
|
347
|
+
// src/core/config/executionProfile.ts
|
|
348
|
+
function executionProfile(stage2, composition, full = false) {
|
|
349
|
+
if (composition === "mesh" && stage2 === "test") throw new Error("Mesh test is a workflow, not a configuration stage");
|
|
350
|
+
if (stage2 === "dev") return { configStage: stage2, envStage: stage2, mainTarget: "dev", execMode: "dev", infraMode: composition === "mesh" || full ? "integrated" : "isolated", attachTester: false };
|
|
351
|
+
if (stage2 === "test") return { configStage: stage2, envStage: stage2, mainTarget: "test", execMode: "test", infraMode: "isolated", attachTester: false };
|
|
352
|
+
return { configStage: stage2, envStage: stage2, mainTarget: "prod", execMode: "prod", infraMode: "integrated", attachTester: stage2 === "e2e" };
|
|
353
|
+
}
|
|
354
|
+
|
|
340
355
|
// src/core/config/endpointProperties.ts
|
|
341
356
|
function resolveEndpointProperty(endpoint, property, context) {
|
|
342
357
|
const reference = context.referencedObject ?? endpoint.logicalPath;
|
|
@@ -404,11 +419,12 @@ function applyServiceOverlay(base, patch) {
|
|
|
404
419
|
}
|
|
405
420
|
|
|
406
421
|
// src/core/config/resolveBuildStage.ts
|
|
407
|
-
var
|
|
422
|
+
var ISOLATED_OVERLAY_KEY = "on-inframode-isolated";
|
|
423
|
+
var originFor = (sourceFile, configPath, layer, isolatedOverlay = false) => ({ sourceFile, configPath, projectDir: path.dirname(sourceFile), scope: "build", layer, ...isolatedOverlay ? { isolatedOverlay: true } : {} });
|
|
408
424
|
var fail = (sourceFile, stage2, configPath, reason, value) => {
|
|
409
425
|
throw new ConfigError({ sourceFile, stage: stage2, composition: "service", configPath, reason, value });
|
|
410
426
|
};
|
|
411
|
-
function resolveBuildStage(build, stage2, sourceFile) {
|
|
427
|
+
function resolveBuildStage(build, stage2, sourceFile, options = {}) {
|
|
412
428
|
const services2 = structuredClone(build.services);
|
|
413
429
|
const origins = /* @__PURE__ */ new Map();
|
|
414
430
|
const envOrigins = /* @__PURE__ */ new Map();
|
|
@@ -416,38 +432,43 @@ function resolveBuildStage(build, stage2, sourceFile) {
|
|
|
416
432
|
const requisiteOrigins = /* @__PURE__ */ new Map();
|
|
417
433
|
const layers = [];
|
|
418
434
|
const deletedRequisiteTargets = [];
|
|
419
|
-
const record = (name, entry, layer) => {
|
|
420
|
-
const where =
|
|
421
|
-
const origin = originFor(sourceFile, where, layer);
|
|
435
|
+
const record = (name, entry, layer, servicesPath, isolatedOverlay = false) => {
|
|
436
|
+
const where = `${servicesPath}.${name}`;
|
|
437
|
+
const origin = originFor(sourceFile, where, layer, isolatedOverlay);
|
|
422
438
|
origins.set(name, origin);
|
|
423
439
|
const env2 = envOrigins.get(name) ?? /* @__PURE__ */ new Map();
|
|
424
|
-
for (const key of Object.keys(entry.env ?? {})) env2.set(key, originFor(sourceFile, `${where}.env.${key}`, layer));
|
|
440
|
+
for (const key of Object.keys(entry.env ?? {})) env2.set(key, originFor(sourceFile, `${where}.env.${key}`, layer, isolatedOverlay));
|
|
425
441
|
envOrigins.set(name, env2);
|
|
426
442
|
const args = buildArgsOrigins.get(name) ?? /* @__PURE__ */ new Map();
|
|
427
|
-
for (const key of Object.keys(entry.buildArgs ?? {})) args.set(key, originFor(sourceFile, `${where}.buildArgs.${key}`, layer));
|
|
443
|
+
for (const key of Object.keys(entry.buildArgs ?? {})) args.set(key, originFor(sourceFile, `${where}.buildArgs.${key}`, layer, isolatedOverlay));
|
|
428
444
|
buildArgsOrigins.set(name, args);
|
|
429
445
|
const edges = requisiteOrigins.get(name) ?? /* @__PURE__ */ new Map();
|
|
430
446
|
for (const [key, value] of Object.entries(entry.requisites ?? {})) {
|
|
431
447
|
if (value === false) edges.delete(key);
|
|
432
|
-
else edges.set(key, originFor(sourceFile, `${where}.requisites.${key}`, layer));
|
|
448
|
+
else edges.set(key, originFor(sourceFile, `${where}.requisites.${key}`, layer, isolatedOverlay));
|
|
433
449
|
}
|
|
434
450
|
requisiteOrigins.set(name, edges);
|
|
435
451
|
};
|
|
436
|
-
|
|
437
|
-
layers.push({ stage: "base", services: structuredClone(services2), origin: originFor(sourceFile, "services", "base") });
|
|
438
|
-
for (const overlayStage of stageOverlayChain(stage2)) {
|
|
439
|
-
const patches = build[overlayStage]?.services ?? {};
|
|
452
|
+
const applyOverlay = (patches, overlayStage, servicesPath, isolatedOverlay) => {
|
|
440
453
|
for (const [name, patch] of Object.entries(patches).sort(([a], [b]) => a.localeCompare(b))) {
|
|
441
454
|
const current = services2[name];
|
|
442
|
-
const where = `${
|
|
455
|
+
const where = `${servicesPath}.${name}`;
|
|
456
|
+
if (isolatedOverlay && name === "tester") fail(sourceFile, stage2, where, `tester cannot be configured in ${ISOLATED_OVERLAY_KEY}`);
|
|
443
457
|
if (!current && (name === "main" || name === "tester")) fail(sourceFile, stage2, where, "Required special service is missing from base");
|
|
444
458
|
if (current && patch.compose !== void 0 && patch.compose !== current.compose) fail(sourceFile, stage2, `${where}.compose`, `compose is immutable; previous declaration ${origins.get(name)?.configPath}.compose, attempted ${where}.compose`, patch.compose);
|
|
445
459
|
if (!current && name !== "main" && name !== "tester" && (typeof patch.compose !== "string" || !patch.compose.trim())) fail(sourceFile, stage2, `${where}.compose`, "Stage-introduced service requires a complete compose declaration");
|
|
446
460
|
services2[name] = current ? applyServiceOverlay(current, patch) : structuredClone(patch);
|
|
447
461
|
for (const [target, kind] of Object.entries(patch.requisites ?? {})) if (kind === false) deletedRequisiteTargets.push({ target, path: `${where}.requisites.${target}` });
|
|
448
|
-
record(name, patch, overlayStage);
|
|
462
|
+
record(name, patch, overlayStage, servicesPath, isolatedOverlay);
|
|
449
463
|
}
|
|
450
|
-
layers.push({ stage: overlayStage, services: structuredClone(patches), origin: originFor(sourceFile,
|
|
464
|
+
layers.push({ stage: overlayStage, services: structuredClone(patches), origin: originFor(sourceFile, servicesPath, overlayStage, isolatedOverlay) });
|
|
465
|
+
};
|
|
466
|
+
for (const [name, value] of Object.entries(services2).sort(([a], [b]) => a.localeCompare(b))) record(name, value, "base", "services");
|
|
467
|
+
layers.push({ stage: "base", services: structuredClone(services2), origin: originFor(sourceFile, "services", "base") });
|
|
468
|
+
for (const overlayStage of stageOverlayChain(stage2)) applyOverlay(build[overlayStage]?.services ?? {}, overlayStage, `${overlayStage}.services`, false);
|
|
469
|
+
if (options.isolated && (stage2 === "dev" || stage2 === "test")) {
|
|
470
|
+
const block = build[stage2]?.[ISOLATED_OVERLAY_KEY];
|
|
471
|
+
if (block) applyOverlay(block.services ?? {}, stage2, `${stage2}.${ISOLATED_OVERLAY_KEY}.services`, true);
|
|
451
472
|
}
|
|
452
473
|
for (const deleted of deletedRequisiteTargets) if (!(deleted.target in services2)) fail(sourceFile, stage2, deleted.path, "Unknown requisite target", deleted.target);
|
|
453
474
|
for (const [name, value] of Object.entries(services2)) {
|
|
@@ -532,14 +553,6 @@ function assertDotenvDoesNotDefineKeys(filePath, keys, context) {
|
|
|
532
553
|
}
|
|
533
554
|
}
|
|
534
555
|
|
|
535
|
-
// src/core/config/executionProfile.ts
|
|
536
|
-
function executionProfile(stage2, composition, full = false) {
|
|
537
|
-
if (composition === "mesh" && stage2 === "test") throw new Error("Mesh test is a workflow, not a configuration stage");
|
|
538
|
-
if (stage2 === "dev") return { configStage: stage2, envStage: stage2, mainTarget: "dev", execMode: "dev", infraMode: composition === "mesh" || full ? "integrated" : "isolated", attachTester: false };
|
|
539
|
-
if (stage2 === "test") return { configStage: stage2, envStage: stage2, mainTarget: "test", execMode: "test", infraMode: "isolated", attachTester: false };
|
|
540
|
-
return { configStage: stage2, envStage: stage2, mainTarget: "prod", execMode: "prod", infraMode: "integrated", attachTester: stage2 === "e2e" };
|
|
541
|
-
}
|
|
542
|
-
|
|
543
556
|
// src/errors/PortConflictError.ts
|
|
544
557
|
var PortConflictError = class extends ConfigError {
|
|
545
558
|
port;
|
|
@@ -736,14 +749,14 @@ function buildDeclaredGraph(input) {
|
|
|
736
749
|
edges.sort((a, b) => `${a.consumer}:${a.target}:${a.kind}`.localeCompare(`${b.consumer}:${b.target}:${b.kind}`));
|
|
737
750
|
return { nodes: input.nodes, roots: [...input.roots].sort(), edges };
|
|
738
751
|
}
|
|
739
|
-
function computeClosure(start, adjacency) {
|
|
752
|
+
function computeClosure(start, adjacency, follow = () => true) {
|
|
740
753
|
const visited = /* @__PURE__ */ new Set();
|
|
741
754
|
const stack = [start];
|
|
742
755
|
while (stack.length) {
|
|
743
756
|
const id = stack.pop();
|
|
744
757
|
if (visited.has(id)) continue;
|
|
745
758
|
visited.add(id);
|
|
746
|
-
for (const edge of adjacency.get(id) ?? []) stack.push(edge.target);
|
|
759
|
+
for (const edge of adjacency.get(id) ?? []) if (follow(edge)) stack.push(edge.target);
|
|
747
760
|
}
|
|
748
761
|
return visited;
|
|
749
762
|
}
|
|
@@ -754,11 +767,12 @@ function selectReachableGraph(declared, profile) {
|
|
|
754
767
|
list.push(edge);
|
|
755
768
|
adjacency.set(edge.consumer, list);
|
|
756
769
|
}
|
|
770
|
+
const rootSet = new Set(declared.roots), isolated = profile.infraMode === "isolated";
|
|
771
|
+
const follow = (edge) => !isolated || !rootSet.has(edge.consumer) || edge.origin.isolatedOverlay === true;
|
|
757
772
|
const active = /* @__PURE__ */ new Set();
|
|
758
|
-
|
|
759
|
-
else for (const root of declared.roots) for (const id of computeClosure(root, adjacency)) active.add(id);
|
|
773
|
+
for (const root of declared.roots) for (const id of computeClosure(root, adjacency, follow)) active.add(id);
|
|
760
774
|
const nodes = new Map([...declared.nodes].filter(([id]) => active.has(id)));
|
|
761
|
-
const edges =
|
|
775
|
+
const edges = declared.edges.filter((edge) => follow(edge) && active.has(edge.consumer) && active.has(edge.target));
|
|
762
776
|
const activeAdjacency = /* @__PURE__ */ new Map();
|
|
763
777
|
for (const edge of edges) {
|
|
764
778
|
const list = activeAdjacency.get(edge.consumer) ?? [];
|
|
@@ -1929,7 +1943,8 @@ function compileGraphComposition(input) {
|
|
|
1929
1943
|
|
|
1930
1944
|
// src/core/composition/compileServiceComposition.ts
|
|
1931
1945
|
function compileServiceComposition(stage2, projectDir, options = {}) {
|
|
1932
|
-
const root = resolveProjectDir(projectDir),
|
|
1946
|
+
const root = resolveProjectDir(projectDir), isolated = executionProfile(stage2, "service", Boolean(options.full)).infraMode === "isolated";
|
|
1947
|
+
const build = resolveBuildStage(getBuildJson(root), stage2, path.join(root, "build.json"), { isolated });
|
|
1933
1948
|
return compileGraphComposition({ stage: stage2, composition: "service", projectDir: root, name: build.name, instances: /* @__PURE__ */ new Map([["", build]]), full: Boolean(options.full), validationMode: Boolean(options.validationMode) });
|
|
1934
1949
|
}
|
|
1935
1950
|
|
|
@@ -3002,21 +3017,6 @@ var runMeshProd = (options = {}) => {
|
|
|
3002
3017
|
const root = resolveProjectDir(options.projectDir);
|
|
3003
3018
|
return runLongLived("prod", root, options, (validationMode) => compileMeshComposition("prod", root, { validationMode }), "mesh");
|
|
3004
3019
|
};
|
|
3005
|
-
async function runTestUnit(options, adapters = {}) {
|
|
3006
|
-
const compiled = compileServiceComposition("test", options.projectDir, { validationMode: Boolean(options.dryRun) }), yaml = stringify(compiled.compose);
|
|
3007
|
-
const main = compiled.mainServiceNames.get(nodeId(void 0, "main"));
|
|
3008
|
-
if (options.debug) console.log(redactYamlSecrets(yaml));
|
|
3009
|
-
if (options.dryRun) return 0;
|
|
3010
|
-
await (adapters.checkPorts ?? checkHostPortCollisions)(extractHostPorts(yaml));
|
|
3011
|
-
await (adapters.teardown ?? teardownCompose)(yaml, options.projectDir, { removeVolumes: true, silent: true });
|
|
3012
|
-
persistHostPortAllocations(options.projectDir, compiled.allocations);
|
|
3013
|
-
writeRunState(options.projectDir, { projectName: compiled.projectName, stage: "test-unit", configStage: "test", workflow: "test", composition: "service", projectDir: options.projectDir, runtimeServiceNames: [main], testerServiceNames: [], allocatedEndpointKeys: [...compiled.allocations.keys()] });
|
|
3014
|
-
return runWithCleanup(() => (adapters.compose ?? runCompose)(["up", "--build", "--abort-on-container-exit", "--exit-code-from", main, main], yaml, options.projectDir, { removeVolumes: true }), async () => {
|
|
3015
|
-
await (adapters.teardown ?? teardownCompose)(yaml, options.projectDir, { removeVolumes: true });
|
|
3016
|
-
removeHostPortAllocations(options.projectDir, [...compiled.allocations.keys()]);
|
|
3017
|
-
clearRunState(options.projectDir);
|
|
3018
|
-
});
|
|
3019
|
-
}
|
|
3020
3020
|
function inspectRunnerExit(yaml, projectDir, runner) {
|
|
3021
3021
|
const ps = spawnSync("docker", ["compose", "--project-directory", projectDir, "-f", "-", "ps", "-aq", runner], { cwd: projectDir, encoding: "utf8", input: yaml });
|
|
3022
3022
|
const id = ps.stdout?.trim();
|
|
@@ -3067,7 +3067,43 @@ async function runFiniteTester(compiled, projectDir, adapters = {}) {
|
|
|
3067
3067
|
return status;
|
|
3068
3068
|
}
|
|
3069
3069
|
|
|
3070
|
-
// src/core/runners/
|
|
3070
|
+
// src/core/runners/runTestUnit.ts
|
|
3071
|
+
async function runUnitWithLocalModules(compiled, yaml, main, projectDir, compose, inspectExit) {
|
|
3072
|
+
const started = await compose(["up", "--build", "--detach", ...compiled.runtimeServiceNames], yaml, projectDir, { removeVolumes: true, timeoutMs: 12e4 });
|
|
3073
|
+
if (started !== 0) {
|
|
3074
|
+
try {
|
|
3075
|
+
await compose(["logs", "--no-color"], yaml, projectDir, { removeVolumes: true });
|
|
3076
|
+
} catch (error) {
|
|
3077
|
+
console.warn("Could not collect startup logs", error);
|
|
3078
|
+
}
|
|
3079
|
+
return started;
|
|
3080
|
+
}
|
|
3081
|
+
const waited = await compose(["wait", main], yaml, projectDir, { removeVolumes: true });
|
|
3082
|
+
const status = inspectExit(yaml, projectDir, main) ?? (waited === 0 ? 1 : waited);
|
|
3083
|
+
try {
|
|
3084
|
+
await compose(["logs", "--no-color", main], yaml, projectDir, { removeVolumes: true });
|
|
3085
|
+
} catch (error) {
|
|
3086
|
+
console.warn("Could not collect unit logs", error);
|
|
3087
|
+
}
|
|
3088
|
+
return status;
|
|
3089
|
+
}
|
|
3090
|
+
async function runTestUnit(options, adapters = {}) {
|
|
3091
|
+
const compiled = compileServiceComposition("test", options.projectDir, { validationMode: Boolean(options.dryRun) }), yaml = stringify(compiled.compose);
|
|
3092
|
+
const main = compiled.mainServiceNames.get(nodeId(void 0, "main"));
|
|
3093
|
+
if (options.debug) console.log(redactYamlSecrets(yaml));
|
|
3094
|
+
if (options.dryRun) return 0;
|
|
3095
|
+
await (adapters.checkPorts ?? checkHostPortCollisions)(extractHostPorts(yaml));
|
|
3096
|
+
await (adapters.teardown ?? teardownCompose)(yaml, options.projectDir, { removeVolumes: true, silent: true });
|
|
3097
|
+
persistHostPortAllocations(options.projectDir, compiled.allocations);
|
|
3098
|
+
writeRunState(options.projectDir, { projectName: compiled.projectName, stage: "test-unit", configStage: "test", workflow: "test", composition: "service", projectDir: options.projectDir, runtimeServiceNames: compiled.runtimeServiceNames, testerServiceNames: [], allocatedEndpointKeys: [...compiled.allocations.keys()] });
|
|
3099
|
+
const compose = adapters.compose ?? runCompose;
|
|
3100
|
+
const execute = compiled.runtimeServiceNames.length === 1 ? () => compose(["up", "--build", "--abort-on-container-exit", "--exit-code-from", main, main], yaml, options.projectDir, { removeVolumes: true }) : () => runUnitWithLocalModules(compiled, yaml, main, options.projectDir, compose, adapters.inspectExit ?? inspectRunnerExit);
|
|
3101
|
+
return runWithCleanup(execute, async () => {
|
|
3102
|
+
await (adapters.teardown ?? teardownCompose)(yaml, options.projectDir, { removeVolumes: true });
|
|
3103
|
+
removeHostPortAllocations(options.projectDir, [...compiled.allocations.keys()]);
|
|
3104
|
+
clearRunState(options.projectDir);
|
|
3105
|
+
});
|
|
3106
|
+
}
|
|
3071
3107
|
async function runTestE2e(options, adapters = {}) {
|
|
3072
3108
|
const compiled = compileServiceComposition("e2e", options.projectDir, { validationMode: Boolean(options.dryRun) }), yaml = stringify(compiled.compose);
|
|
3073
3109
|
if (options.debug) console.log(redactYamlSecrets(yaml));
|