@solid-stack/builder 1.2.0 → 2.0.1

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 (156) hide show
  1. package/README.md +66 -197
  2. package/dist/bin.js +1768 -2587
  3. package/dist/bin.js.map +1 -1
  4. package/dist/commands/mesh/commands/up/command.d.ts.map +1 -1
  5. package/dist/commands/mesh/commands/up/handler.d.ts.map +1 -1
  6. package/dist/commands/service/commands/down/handler.d.ts.map +1 -1
  7. package/dist/commands/service/commands/export/command.d.ts.map +1 -1
  8. package/dist/commands/service/commands/up/command.d.ts.map +1 -1
  9. package/dist/core/buildSchema.d.ts +1029 -110
  10. package/dist/core/buildSchema.d.ts.map +1 -1
  11. package/dist/core/checkers/checkDockerfile.d.ts.map +1 -1
  12. package/dist/core/checkers/checkDockerfileContract.d.ts +1 -1
  13. package/dist/core/checkers/checkDockerfileContract.d.ts.map +1 -1
  14. package/dist/core/checkers/checkEffectiveServiceStages.d.ts +2 -0
  15. package/dist/core/checkers/checkEffectiveServiceStages.d.ts.map +1 -0
  16. package/dist/core/checkers/checkYamlFiles.d.ts +1 -1
  17. package/dist/core/checkers/checkYamlFiles.d.ts.map +1 -1
  18. package/dist/core/checkers/getDeclaredYamlFiles.d.ts +3 -1
  19. package/dist/core/checkers/getDeclaredYamlFiles.d.ts.map +1 -1
  20. package/dist/core/compileEnvironment.d.ts +1 -1
  21. package/dist/core/compileEnvironment.d.ts.map +1 -1
  22. package/dist/core/composition/compileServiceComposition.d.ts +18 -0
  23. package/dist/core/composition/compileServiceComposition.d.ts.map +1 -0
  24. package/dist/core/composition/composeEnvironment.d.ts +4 -0
  25. package/dist/core/composition/composeEnvironment.d.ts.map +1 -0
  26. package/dist/core/composition/composeNetworks.d.ts +2 -0
  27. package/dist/core/composition/composeNetworks.d.ts.map +1 -0
  28. package/dist/core/composition/composePaths.d.ts +3 -0
  29. package/dist/core/composition/composePaths.d.ts.map +1 -0
  30. package/dist/core/composition/composeVolumes.d.ts +15 -0
  31. package/dist/core/composition/composeVolumes.d.ts.map +1 -0
  32. package/dist/core/composition/dependencyLifecycle.d.ts +4 -0
  33. package/dist/core/composition/dependencyLifecycle.d.ts.map +1 -0
  34. package/dist/core/composition/loadCompose.d.ts +8 -0
  35. package/dist/core/composition/loadCompose.d.ts.map +1 -0
  36. package/dist/core/composition/namespaceDependencyCompose.d.ts +15 -0
  37. package/dist/core/composition/namespaceDependencyCompose.d.ts.map +1 -0
  38. package/dist/core/composition/serviceEndpoints.d.ts +5 -0
  39. package/dist/core/composition/serviceEndpoints.d.ts.map +1 -0
  40. package/dist/core/composition/types.d.ts +64 -0
  41. package/dist/core/composition/types.d.ts.map +1 -0
  42. package/dist/core/composition/validateDependencyCompose.d.ts +8 -0
  43. package/dist/core/composition/validateDependencyCompose.d.ts.map +1 -0
  44. package/dist/core/composition/validateOverrideCompose.d.ts +11 -0
  45. package/dist/core/composition/validateOverrideCompose.d.ts.map +1 -0
  46. package/dist/core/config/constants.d.ts +13 -0
  47. package/dist/core/config/constants.d.ts.map +1 -0
  48. package/dist/core/config/endpointProperties.d.ts +16 -0
  49. package/dist/core/config/endpointProperties.d.ts.map +1 -0
  50. package/dist/core/config/hostPorts.d.ts +10 -0
  51. package/dist/core/config/hostPorts.d.ts.map +1 -0
  52. package/dist/core/config/lifecycleGraph.d.ts +7 -0
  53. package/dist/core/config/lifecycleGraph.d.ts.map +1 -0
  54. package/dist/core/config/pathSafety.d.ts +7 -0
  55. package/dist/core/config/pathSafety.d.ts.map +1 -0
  56. package/dist/core/config/references.d.ts +15 -0
  57. package/dist/core/config/references.d.ts.map +1 -0
  58. package/dist/core/config/resolveBuildStage.d.ts +4 -0
  59. package/dist/core/config/resolveBuildStage.d.ts.map +1 -0
  60. package/dist/core/config/resolveMeshStage.d.ts +4 -0
  61. package/dist/core/config/resolveMeshStage.d.ts.map +1 -0
  62. package/dist/core/config/stageMerge.d.ts +4 -0
  63. package/dist/core/config/stageMerge.d.ts.map +1 -0
  64. package/dist/core/config/types.d.ts +44 -0
  65. package/dist/core/config/types.d.ts.map +1 -0
  66. package/dist/core/mesh/MeshRunOptions.d.ts +0 -1
  67. package/dist/core/mesh/MeshRunOptions.d.ts.map +1 -1
  68. package/dist/core/mesh/checkers/checkMeshJson.d.ts +1 -1
  69. package/dist/core/mesh/checkers/checkMeshJson.d.ts.map +1 -1
  70. package/dist/core/mesh/checkers/checkMeshServices.d.ts +1 -1
  71. package/dist/core/mesh/checkers/checkMeshServices.d.ts.map +1 -1
  72. package/dist/core/mesh/checkers/checkMeshTester.d.ts +1 -1
  73. package/dist/core/mesh/checkers/checkMeshTester.d.ts.map +1 -1
  74. package/dist/core/mesh/compileMeshEnvironment.d.ts +1 -3
  75. package/dist/core/mesh/compileMeshEnvironment.d.ts.map +1 -1
  76. package/dist/core/mesh/getMeshJson.d.ts.map +1 -1
  77. package/dist/core/mesh/meshSchema.d.ts +267 -334
  78. package/dist/core/mesh/meshSchema.d.ts.map +1 -1
  79. package/dist/core/mesh/runners/runMeshDev.d.ts.map +1 -1
  80. package/dist/core/mesh/runners/runMeshProd.d.ts.map +1 -1
  81. package/dist/core/mesh/runners/runMeshTest.d.ts.map +1 -1
  82. package/dist/core/mesh/runners/runMeshTestE2e.d.ts.map +1 -1
  83. package/dist/core/mesh/runners/runMeshTestUnit.d.ts.map +1 -1
  84. package/dist/core/mesh/types.d.ts +34 -40
  85. package/dist/core/mesh/types.d.ts.map +1 -1
  86. package/dist/core/mesh/v2/compileMeshComposition.d.ts +6 -0
  87. package/dist/core/mesh/v2/compileMeshComposition.d.ts.map +1 -0
  88. package/dist/core/mesh/v2/compileMeshTester.d.ts +14 -0
  89. package/dist/core/mesh/v2/compileMeshTester.d.ts.map +1 -0
  90. package/dist/core/mesh/v2/lifecycle.d.ts +10 -0
  91. package/dist/core/mesh/v2/lifecycle.d.ts.map +1 -0
  92. package/dist/core/mesh/v2/loadMeshServices.d.ts +5 -0
  93. package/dist/core/mesh/v2/loadMeshServices.d.ts.map +1 -0
  94. package/dist/core/mesh/v2/meshReferences.d.ts +15 -0
  95. package/dist/core/mesh/v2/meshReferences.d.ts.map +1 -0
  96. package/dist/core/mesh/v2/publication.d.ts +3 -0
  97. package/dist/core/mesh/v2/publication.d.ts.map +1 -0
  98. package/dist/core/mesh/v2/substitution.d.ts +5 -0
  99. package/dist/core/mesh/v2/substitution.d.ts.map +1 -0
  100. package/dist/core/mesh/v2/types.d.ts +40 -0
  101. package/dist/core/mesh/v2/types.d.ts.map +1 -0
  102. package/dist/core/runners/runDev.d.ts.map +1 -1
  103. package/dist/core/runners/runProd.d.ts.map +1 -1
  104. package/dist/core/runners/runTestE2e.d.ts.map +1 -1
  105. package/dist/core/runners/runTestUnit.d.ts.map +1 -1
  106. package/dist/core/teardownCompose.d.ts +1 -0
  107. package/dist/core/teardownCompose.d.ts.map +1 -1
  108. package/dist/core/templates.d.ts +1 -0
  109. package/dist/core/templates.d.ts.map +1 -1
  110. package/dist/errors/ConfigError.d.ts +15 -0
  111. package/dist/errors/ConfigError.d.ts.map +1 -0
  112. package/dist/errors/PortConflictError.d.ts +8 -0
  113. package/dist/errors/PortConflictError.d.ts.map +1 -0
  114. package/dist/index.d.ts +2 -0
  115. package/dist/index.d.ts.map +1 -1
  116. package/dist/index.js +1770 -2589
  117. package/dist/index.js.map +1 -1
  118. package/dist/templates/docker/docker-compose.base.yml +4 -4
  119. package/dist/templates/docker/docker-compose.dev.yml +1 -5
  120. package/dist/templates/docker/docker-compose.e2e.yml +9 -8
  121. package/dist/templates/docker/docker-compose.prod.yml +1 -6
  122. package/dist/templates/docker/docker-compose.test.yml +3 -8
  123. package/dist/templates/policy/dockerfile/dockerfile.rego +64 -0
  124. package/dist/types/index.d.ts +60 -50
  125. package/dist/types/index.d.ts.map +1 -1
  126. package/dist/utils/checkPortCollision.d.ts.map +1 -1
  127. package/dist/utils/getBuildJson.d.ts.map +1 -1
  128. package/dist/utils/paths.d.ts +2 -0
  129. package/dist/utils/paths.d.ts.map +1 -1
  130. package/dist/utils/runState.d.ts +1 -0
  131. package/dist/utils/runState.d.ts.map +1 -1
  132. package/package.json +7 -2
  133. package/schemas/build-schema.json +620 -101
  134. package/schemas/mesh-schema.json +225 -133
  135. package/templates/docker/docker-compose.base.yml +4 -4
  136. package/templates/docker/docker-compose.dev.yml +1 -5
  137. package/templates/docker/docker-compose.e2e.yml +9 -8
  138. package/templates/docker/docker-compose.prod.yml +1 -6
  139. package/templates/docker/docker-compose.test.yml +3 -8
  140. package/templates/policy/dockerfile/dockerfile.rego +64 -0
  141. package/dist/core/checkers/checkComposeContract.d.ts +0 -3
  142. package/dist/core/checkers/checkComposeContract.d.ts.map +0 -1
  143. package/dist/templates/docker/docker-compose.standalone.yml +0 -5
  144. package/dist/utils/dependencyPorts.d.ts +0 -10
  145. package/dist/utils/dependencyPorts.d.ts.map +0 -1
  146. package/dist/utils/extractBuildDeps.d.ts +0 -3
  147. package/dist/utils/extractBuildDeps.d.ts.map +0 -1
  148. package/dist/utils/extractOverrides.d.ts +0 -3
  149. package/dist/utils/extractOverrides.d.ts.map +0 -1
  150. package/dist/utils/ymlMods/addDependenciesToAppService.d.ts +0 -3
  151. package/dist/utils/ymlMods/addDependenciesToAppService.d.ts.map +0 -1
  152. package/dist/utils/ymlMods/makeE2eDependOnApp.d.ts +0 -2
  153. package/dist/utils/ymlMods/makeE2eDependOnApp.d.ts.map +0 -1
  154. package/dist/utils/ymlMods/renameServicesWithDependencies.d.ts +0 -3
  155. package/dist/utils/ymlMods/renameServicesWithDependencies.d.ts.map +0 -1
  156. package/templates/docker/docker-compose.standalone.yml +0 -5
@@ -2,9 +2,9 @@ services:
2
2
  app:
3
3
  build:
4
4
  context: .
5
- init: true
5
+ init: true
6
6
  logging:
7
- driver: "json-file"
7
+ driver: json-file
8
8
  options:
9
- max-size: "10m"
10
- max-file: "3"
9
+ max-size: 10m
10
+ max-file: "3"
@@ -1,5 +1,5 @@
1
1
  services:
2
- app:
2
+ app:
3
3
  build:
4
4
  target: dev
5
5
  env_file:
@@ -8,7 +8,3 @@ services:
8
8
  volumes:
9
9
  - .:/app
10
10
  - /app/node_modules
11
- environment:
12
- - INFRA_MODE=isolated
13
- - EXEC_MODE=dev
14
-
@@ -1,11 +1,12 @@
1
- services:
2
- tester:
3
- build:
4
- context: .
5
- target: test-e2e
6
- network_mode: "host"
1
+ services:
2
+ app:
3
+ build:
4
+ target: prod
7
5
  env_file:
8
6
  - path: .env.e2e
9
7
  required: false
10
- environment:
11
- - API_URL=http://localhost:${PUBLIC_PORT:-3000}
8
+ tester:
9
+ build:
10
+ context: .
11
+ target: test-e2e
12
+ network_mode: host
@@ -1,12 +1,7 @@
1
1
  services:
2
- app:
2
+ app:
3
3
  build:
4
4
  target: prod
5
5
  env_file:
6
6
  - path: .env.prod
7
7
  required: false
8
- environment:
9
- - INFRA_MODE=integrated
10
- - EXEC_MODE=prod
11
-
12
-
@@ -1,12 +1,7 @@
1
- services:
2
- app:
3
- build:
1
+ services:
2
+ app:
3
+ build:
4
4
  target: test
5
5
  env_file:
6
6
  - path: .env.test
7
7
  required: false
8
- environment:
9
- - INFRA_MODE=isolated
10
- - EXEC_MODE=test
11
-
12
-
@@ -0,0 +1,64 @@
1
+ package main
2
+
3
+ import rego.v1
4
+
5
+ # Conftest supplies Dockerfile instructions in source order.
6
+ from_indices := {i | some i; input[i].Cmd == "from"}
7
+ alias_at[i] := lower(input[i].Value[count(input[i].Value)-1]) if {
8
+ i in from_indices
9
+ value := input[i].Value
10
+ count(value) >= 3
11
+ lower(value[count(value)-2]) == "as"
12
+ }
13
+ stages := {a | a := alias_at[_]}
14
+ stage_alias[n] := alias_at[i] if { some i; n := input[i].Stage; alias_at[i] }
15
+ stage_at[i] := stage_alias[input[i].Stage] if { some i; _ := input[i] }
16
+ parent[a] := lower(input[i].Value[0]) if {
17
+ some i
18
+ a := alias_at[i]
19
+ lower(input[i].Value[0]) in stages
20
+ }
21
+ edges := {a: neighbors | some i; a := alias_at[i]; neighbors := [p | p := parent[a]]}
22
+ lineage[a] := graph.reachable(edges, {a}) | {a} if { some i; a := alias_at[i] }
23
+ commands[a] := {i | some i; stage_at[i] in lineage[a]; input[i].Cmd == "cmd"} if { some j; a := alias_at[j] }
24
+ healthchecks[a] := {i | some i; stage_at[i] in lineage[a]; input[i].Cmd == "healthcheck"; lower(concat(" ", input[i].Value)) != "none"} if { some j; a := alias_at[j] }
25
+ artifact_copies[a] := {i | some i; stage_at[i] in lineage[a]; input[i].Cmd == "copy"; startswith(lower(input[i].Flags[_]), "--from=")} if { some j; a := alias_at[j] }
26
+
27
+ deny contains msg if {
28
+ missing := {"dev", "test", "test-e2e", "prod"} - stages
29
+ count(missing) > 0
30
+ msg := sprintf("Missing required Dockerfile stages: %v", [missing])
31
+ }
32
+ deny contains "Hardcoded EXPOSE is forbidden; Builder owns endpoint publication" if { some i; input[i].Cmd == "expose" }
33
+ deny contains "dev stage requires a default CMD" if { "dev" in stages; count(commands.dev) == 0 }
34
+ deny contains "dev stage requires a valid HEALTHCHECK" if { "dev" in stages; count(healthchecks.dev) == 0 }
35
+ deny contains "prod stage requires a valid HEALTHCHECK" if { "prod" in stages; count(healthchecks.prod) == 0 }
36
+ deny contains "prod stage requires COPY --from= artifact isolation" if { "prod" in stages; count(artifact_copies.prod) == 0 }
37
+ deny contains msg if {
38
+ some i
39
+ a := alias_at[i]
40
+ p := parent[a]
41
+ a in lineage[p]
42
+ msg := sprintf("Dockerfile stage inheritance cycle at %s", [a])
43
+ }
44
+ deny contains msg if {
45
+ some i
46
+ input[i].Cmd == "cmd"
47
+ command := lower(concat(" ", input[i].Value))
48
+ regex.match("(^|[ ;])nohup[ ;]|&[[:space:]]*$|pm2[[:space:]]+start.*--daemon|nginx(.*[[:space:]])?-g[[:space:]]*['\"]?daemon[[:space:]]+on", command)
49
+ msg := sprintf("Runtime CMD must remain in foreground (instruction %v)", [i])
50
+ }
51
+ deny contains msg if {
52
+ some i
53
+ input[i].Cmd == "healthcheck"
54
+ lower(concat(" ", input[i].Value)) == "none"
55
+ msg := sprintf("HEALTHCHECK NONE is forbidden (instruction %v)", [i])
56
+ }
57
+ deny contains msg if {
58
+ some i
59
+ input[i].Cmd == "cmd"
60
+ command := lower(concat(" ", input[i].Value))
61
+ regex.match("(^|[ ;])nginx([ ;]|$)", command)
62
+ not contains(command, "daemon off")
63
+ msg := sprintf("nginx CMD must use daemon off (instruction %v)", [i])
64
+ }
@@ -1,58 +1,68 @@
1
1
  export type Environment = "dev" | "test" | "e2e" | "prod";
2
2
  export declare const SERVICE_STAGES: readonly ["dev", "prod", "test", "test-unit", "test-e2e"];
3
3
  export type ServiceStage = (typeof SERVICE_STAGES)[number];
4
- export type BuildDependency = {
5
- path: string;
6
- name: string;
7
- serviceName?: string | undefined;
8
- /** Primary host mapping: 9000 means 9000:3000. */
9
- port?: number | string | undefined;
10
- /** Additional explicit HOST_PORT:CONTAINER_PORT mappings. */
11
- ports?: string[] | undefined;
12
- };
13
- export type BuildOverride = {
14
- path: string;
15
- };
16
- export interface BuildPolicyConfig {
17
- dockerfile?: string | undefined;
18
- compose?: string | undefined;
19
- }
20
- export type BuildJson = {
21
- $schema?: string | undefined;
22
- name?: string | undefined;
23
- dockerfile?: string | undefined;
24
- port?: number | string | undefined;
25
- policy?: BuildPolicyConfig | undefined;
26
- policies?: BuildPolicyConfig | undefined;
27
- composeFiles?: string[] | undefined;
28
- dependencies?: Record<string, {
29
- path: string;
30
- service?: string | undefined;
31
- port?: number | string | undefined;
32
- ports?: string[] | undefined;
33
- }> | undefined;
34
- overrides?: Record<string, {
35
- path: string;
36
- }> | undefined;
37
- services?: Record<string, any> | undefined;
38
- envOverrides?: Record<string, string> | undefined;
39
- tester?: {
40
- envOverrides?: Record<string, string> | undefined;
41
- } | undefined;
42
- };
4
+ export type PublicPort = number | "AUTO";
5
+ export interface AppEndpoint {
6
+ port: number;
7
+ publicPort?: PublicPort;
8
+ primary?: boolean;
9
+ scheme?: string;
10
+ }
11
+ export interface DependencyEndpoint extends AppEndpoint {
12
+ service: string;
13
+ }
14
+ export interface AppConfig {
15
+ env?: Record<string, string>;
16
+ endpoints?: Record<string, AppEndpoint>;
17
+ }
18
+ export interface DependencyConfig {
19
+ compose: string;
20
+ env?: Record<string, string>;
21
+ endpoints?: Record<string, DependencyEndpoint>;
22
+ dependsOn?: string[];
23
+ }
24
+ export interface TesterConfig {
25
+ env?: Record<string, string>;
26
+ }
27
+ export interface AppStageConfig {
28
+ env?: Record<string, string>;
29
+ endpoints?: Record<string, Partial<AppEndpoint>>;
30
+ }
31
+ export interface DependencyStageConfig {
32
+ compose?: string;
33
+ env?: Record<string, string>;
34
+ endpoints?: Record<string, Partial<DependencyEndpoint>>;
35
+ dependsOn?: string[];
36
+ }
37
+ export interface BuildStageConfig {
38
+ "override-compose"?: string;
39
+ app?: AppStageConfig;
40
+ dependencies?: Record<string, DependencyStageConfig>;
41
+ }
42
+ export interface BuildJson {
43
+ $schema?: string;
44
+ name?: string;
45
+ dockerfile?: string;
46
+ app: AppConfig;
47
+ dependencies?: Record<string, DependencyConfig>;
48
+ tester?: TesterConfig;
49
+ dev?: BuildStageConfig;
50
+ prod?: BuildStageConfig;
51
+ test?: BuildStageConfig;
52
+ e2e?: BuildStageConfig;
53
+ }
43
54
  export interface ServiceUpOptions {
44
- projectDir?: string | undefined;
45
- debug?: boolean | undefined;
46
- detach?: boolean | undefined;
47
- dryRun?: boolean | undefined;
48
- skipChecks?: boolean | undefined;
49
- silenceWarnings?: boolean | undefined;
50
- full?: boolean | undefined;
51
- integrated?: boolean | undefined;
55
+ projectDir?: string;
56
+ debug?: boolean;
57
+ detach?: boolean;
58
+ dryRun?: boolean;
59
+ skipChecks?: boolean;
60
+ silenceWarnings?: boolean;
61
+ full?: boolean;
52
62
  }
53
63
  export interface ServiceDownOptions {
54
- projectDir?: string | undefined;
55
- volumes?: boolean | undefined;
56
- debug?: boolean | undefined;
64
+ projectDir?: string;
65
+ volumes?: boolean;
66
+ debug?: boolean;
57
67
  }
58
68
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"checkPortCollision.d.ts","sourceRoot":"","sources":["../../src/utils/checkPortCollision.ts"],"names":[],"mappings":"AAIA,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAyB7D;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAehE;AAED,wBAAsB,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAa5E"}
1
+ {"version":3,"file":"checkPortCollision.d.ts","sourceRoot":"","sources":["../../src/utils/checkPortCollision.ts"],"names":[],"mappings":"AAIA,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAyB7D;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAehE;AAED,wBAAsB,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAS5E"}
@@ -1 +1 @@
1
- {"version":3,"file":"getBuildJson.d.ts","sourceRoot":"","sources":["../../src/utils/getBuildJson.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAKnD,eAAO,MAAM,YAAY,gBAAgB,MAAM,KAAmB,SA8CjE,CAAC"}
1
+ {"version":3,"file":"getBuildJson.d.ts","sourceRoot":"","sources":["../../src/utils/getBuildJson.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAGnD,eAAO,MAAM,YAAY,gBAAgB,MAAM,KAAmB,SAQjE,CAAC"}
@@ -17,4 +17,6 @@ export declare function isBindMount(source: string): boolean;
17
17
  * Verifies that a path does not escape the project directory.
18
18
  */
19
19
  export declare function isPathInside(parentDir: string, childPath: string): boolean;
20
+ /** Resolve symlinks even when the final artifact has not been created yet. */
21
+ export declare function canonicalPath(value: string): string;
20
22
  //# sourceMappingURL=paths.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/utils/paths.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAqBzE;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAUnD;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAU1E"}
1
+ {"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/utils/paths.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAqBzE;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAUnD;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAU1E;AAED,8EAA8E;AAC9E,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAenD"}
@@ -3,6 +3,7 @@ export interface RunState {
3
3
  stage: string;
4
4
  projectDir: string;
5
5
  timestamp: string;
6
+ anonymousVolumeServices?: string[];
6
7
  }
7
8
  export declare function getRunStatePath(projectDir: string): string;
8
9
  export declare function writeRunState(projectDir: string, state: Omit<RunState, "timestamp">): void;
@@ -1 +1 @@
1
- {"version":3,"file":"runState.d.ts","sourceRoot":"","sources":["../../src/utils/runState.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,QAAQ;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,aAAa,CAC3B,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,GACjC,IAAI,CAmBN;AAED,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAShE;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAStD;AAED,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,GACZ,MAAM,EAAE,CA8BV;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,MAAM,EAAE,CAuCV"}
1
+ {"version":3,"file":"runState.d.ts","sourceRoot":"","sources":["../../src/utils/runState.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,QAAQ;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;CACpC;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,aAAa,CAC3B,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,GACjC,IAAI,CAmBN;AAED,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAShE;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAStD;AAED,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,GACZ,MAAM,EAAE,CA8BV;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,MAAM,EAAE,CA6BV"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@solid-stack/builder",
3
- "version": "1.2.0",
3
+ "version": "2.0.1",
4
4
  "description": "CLI build tool and orchestrator for Solid Stack services.",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
@@ -69,6 +69,11 @@
69
69
  "test:watch": "vitest",
70
70
  "test:coverage": "vitest run --coverage",
71
71
  "typecheck": "tsc --noEmit",
72
- "check": "pnpm typecheck && pnpm test && pnpm build"
72
+ "check": "pnpm typecheck && pnpm test:conformance",
73
+ "check:v2-no-legacy": "tsx scripts/check-no-v1-config-code.ts",
74
+ "builder": "tsx src/bin.ts",
75
+ "test:conformance": "vitest run tests/conformance",
76
+ "test:docker": "vitest run --config vitest.docker.config.ts",
77
+ "check:full": "pnpm check && pnpm test && pnpm check:v2-no-legacy && pnpm build && pnpm test:docker"
73
78
  }
74
79
  }