@solid-stack/builder 1.0.0 → 1.0.4
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/bin.cjs +231 -234
- package/dist/bin.cjs.map +1 -1
- package/dist/bin.js +3 -791
- package/dist/bin.js.map +1 -1
- package/dist/cli.d.ts +2 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +42 -0
- package/dist/cli.js.map +1 -0
- package/dist/commands/check/command.d.ts +3 -0
- package/dist/commands/check/command.d.ts.map +1 -0
- package/dist/commands/check/command.js +19 -0
- package/dist/commands/check/command.js.map +1 -0
- package/dist/commands/check/handler.d.ts +5 -0
- package/dist/commands/check/handler.d.ts.map +1 -0
- package/dist/commands/check/handler.js +7 -0
- package/dist/commands/check/handler.js.map +1 -0
- package/dist/commands/checkInfra.d.ts +7 -1
- package/dist/commands/checkInfra.d.ts.map +1 -1
- package/dist/commands/checkInfra.js +8 -0
- package/dist/commands/checkInfra.js.map +1 -0
- package/dist/commands/service/command.d.ts +3 -0
- package/dist/commands/service/command.d.ts.map +1 -0
- package/dist/commands/service/command.js +17 -0
- package/dist/commands/service/command.js.map +1 -0
- package/dist/commands/service/commands/up/command.d.ts +3 -0
- package/dist/commands/service/commands/up/command.d.ts.map +1 -0
- package/dist/commands/service/commands/up/command.js +26 -0
- package/dist/commands/service/commands/up/command.js.map +1 -0
- package/dist/commands/{serviceUp.d.ts → service/commands/up/handler.d.ts} +2 -2
- package/dist/commands/service/commands/up/handler.d.ts.map +1 -0
- package/dist/commands/service/commands/up/handler.js +40 -0
- package/dist/commands/service/commands/up/handler.js.map +1 -0
- package/dist/commands/service/commands/up/serviceUp.d.ts +3 -0
- package/dist/commands/service/commands/up/serviceUp.d.ts.map +1 -0
- package/dist/commands/service/commands/up/serviceUp.js +62 -0
- package/dist/commands/service/commands/up/serviceUp.js.map +1 -0
- package/dist/core/RunOptions.d.ts +6 -0
- package/dist/core/RunOptions.d.ts.map +1 -0
- package/dist/core/RunOptions.js +2 -0
- package/dist/core/RunOptions.js.map +1 -0
- package/dist/core/checkers/checkComposeContract.d.ts +3 -0
- package/dist/core/checkers/checkComposeContract.d.ts.map +1 -0
- package/dist/core/checkers/checkComposeContract.js +29 -0
- package/dist/core/checkers/checkComposeContract.js.map +1 -0
- package/dist/core/checkers/checkDockerfile.d.ts +3 -0
- package/dist/core/checkers/checkDockerfile.d.ts.map +1 -0
- package/dist/core/checkers/checkDockerfile.js +19 -0
- package/dist/core/checkers/checkDockerfile.js.map +1 -0
- package/dist/core/checkers/checkDockerfileContract.d.ts +3 -0
- package/dist/core/checkers/checkDockerfileContract.d.ts.map +1 -0
- package/dist/core/checkers/checkDockerfileContract.js +18 -0
- package/dist/core/checkers/checkDockerfileContract.js.map +1 -0
- package/dist/core/checkers/checkInfra.d.ts +2 -0
- package/dist/core/checkers/checkInfra.d.ts.map +1 -0
- package/dist/core/checkers/checkInfra.js +16 -0
- package/dist/core/checkers/checkInfra.js.map +1 -0
- package/dist/core/checkers/checkYamlFiles.d.ts +3 -0
- package/dist/core/checkers/checkYamlFiles.d.ts.map +1 -0
- package/dist/core/checkers/checkYamlFiles.js +31 -0
- package/dist/core/checkers/checkYamlFiles.js.map +1 -0
- package/dist/core/checkers/explainComposeMergeFailure.d.ts +4 -0
- package/dist/core/checkers/explainComposeMergeFailure.d.ts.map +1 -0
- package/dist/core/checkers/explainComposeMergeFailure.js +63 -0
- package/dist/core/checkers/explainComposeMergeFailure.js.map +1 -0
- package/dist/core/checkers/getDeclaredYamlFiles.d.ts +8 -0
- package/dist/core/checkers/getDeclaredYamlFiles.d.ts.map +1 -0
- package/dist/core/checkers/getDeclaredYamlFiles.js +39 -0
- package/dist/core/checkers/getDeclaredYamlFiles.js.map +1 -0
- package/dist/core/checkers/runStep.d.ts +7 -0
- package/dist/core/checkers/runStep.d.ts.map +1 -0
- package/dist/core/checkers/runStep.js +32 -0
- package/dist/core/checkers/runStep.js.map +1 -0
- package/dist/core/compileEnvironment.js +110 -0
- package/dist/core/compileEnvironment.js.map +1 -0
- package/dist/core/runCompose.d.ts +2 -0
- package/dist/core/runCompose.d.ts.map +1 -0
- package/dist/core/runCompose.js +15 -0
- package/dist/core/runCompose.js.map +1 -0
- package/dist/core/runDev.d.ts +3 -0
- package/dist/core/runDev.d.ts.map +1 -0
- package/dist/core/runDev.js +17 -0
- package/dist/core/runDev.js.map +1 -0
- package/dist/core/runProd.d.ts +3 -0
- package/dist/core/runProd.d.ts.map +1 -0
- package/dist/core/runProd.js +17 -0
- package/dist/core/runProd.js.map +1 -0
- package/dist/core/runTestE2e.d.ts +3 -0
- package/dist/core/runTestE2e.d.ts.map +1 -0
- package/dist/core/runTestE2e.js +34 -0
- package/dist/core/runTestE2e.js.map +1 -0
- package/dist/core/runTestUnit.d.ts +3 -0
- package/dist/core/runTestUnit.d.ts.map +1 -0
- package/dist/core/runTestUnit.js +28 -0
- package/dist/core/runTestUnit.js.map +1 -0
- package/dist/core/runners/runDev.d.ts +3 -0
- package/dist/core/runners/runDev.d.ts.map +1 -0
- package/dist/core/runners/runDev.js +17 -0
- package/dist/core/runners/runDev.js.map +1 -0
- package/dist/core/runners/runProd.d.ts +3 -0
- package/dist/core/runners/runProd.d.ts.map +1 -0
- package/dist/core/runners/runProd.js +17 -0
- package/dist/core/runners/runProd.js.map +1 -0
- package/dist/core/runners/runTest.d.ts +3 -0
- package/dist/core/runners/runTest.d.ts.map +1 -0
- package/dist/core/runners/runTest.js +28 -0
- package/dist/core/runners/runTest.js.map +1 -0
- package/dist/core/runners/runTestE2e.d.ts +3 -0
- package/dist/core/runners/runTestE2e.d.ts.map +1 -0
- package/dist/core/runners/runTestE2e.js +34 -0
- package/dist/core/runners/runTestE2e.js.map +1 -0
- package/dist/core/runners/runTestUnit.d.ts +3 -0
- package/dist/core/runners/runTestUnit.d.ts.map +1 -0
- package/dist/core/runners/runTestUnit.js +28 -0
- package/dist/core/runners/runTestUnit.js.map +1 -0
- package/dist/core/teardownCompose.d.ts +2 -0
- package/dist/core/teardownCompose.d.ts.map +1 -0
- package/dist/core/teardownCompose.js +23 -0
- package/dist/core/teardownCompose.js.map +1 -0
- package/dist/core/templates.js +40 -0
- package/dist/core/templates.js.map +1 -0
- package/dist/errors/NotFoundError.js +9 -0
- package/dist/errors/NotFoundError.js.map +1 -0
- package/dist/errors/ScriptError.js +8 -0
- package/dist/errors/ScriptError.js.map +1 -0
- package/dist/types/index.d.ts +0 -4
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js +2 -0
- package/dist/types/index.js.map +1 -0
- package/dist/utils/checkDependencies.js +9 -0
- package/dist/utils/checkDependencies.js.map +1 -0
- package/dist/utils/extractBuildDeps.js +32 -0
- package/dist/utils/extractBuildDeps.js.map +1 -0
- package/dist/utils/extractOverrides.js +28 -0
- package/dist/utils/extractOverrides.js.map +1 -0
- package/dist/utils/getBuildJson.js +39 -0
- package/dist/utils/getBuildJson.js.map +1 -0
- package/dist/utils/ymlMods/addDependenciesToAppService.js +16 -0
- package/dist/utils/ymlMods/addDependenciesToAppService.js.map +1 -0
- package/dist/utils/ymlMods/attachName.js +8 -0
- package/dist/utils/ymlMods/attachName.js.map +1 -0
- package/dist/utils/ymlMods/makeE2eDependOnApp.js +19 -0
- package/dist/utils/ymlMods/makeE2eDependOnApp.js.map +1 -0
- package/dist/utils/ymlMods/renameServicesWithDependencies.js +13 -0
- package/dist/utils/ymlMods/renameServicesWithDependencies.js.map +1 -0
- package/dist/version.d.ts +2 -0
- package/dist/version.d.ts.map +1 -0
- package/dist/version.js +12 -0
- package/dist/version.js.map +1 -0
- package/package.json +4 -15
- package/dist/commands/serviceUp.d.ts.map +0 -1
- package/dist/index.cjs +0 -814
- package/dist/index.cjs.map +0 -1
- package/dist/index.d.ts +0 -13
- package/dist/index.d.ts.map +0 -1
- package/dist/index.js +0 -792
- package/dist/index.js.map +0 -1
package/dist/bin.cjs
CHANGED
|
@@ -1,22 +1,23 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
'use strict';
|
|
3
3
|
|
|
4
|
-
var
|
|
5
|
-
var
|
|
4
|
+
var commander = require('commander');
|
|
5
|
+
var pc7 = require('picocolors');
|
|
6
6
|
var child_process = require('child_process');
|
|
7
7
|
var fs = require('fs');
|
|
8
8
|
var path5 = require('path');
|
|
9
|
+
var module$1 = require('module');
|
|
10
|
+
var z2 = require('zod');
|
|
9
11
|
var yaml = require('yaml');
|
|
10
|
-
var z = require('zod');
|
|
11
12
|
var url = require('url');
|
|
12
13
|
|
|
13
14
|
var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
|
|
14
15
|
function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
|
|
15
16
|
|
|
16
|
-
var
|
|
17
|
+
var pc7__default = /*#__PURE__*/_interopDefault(pc7);
|
|
17
18
|
var fs__default = /*#__PURE__*/_interopDefault(fs);
|
|
18
19
|
var path5__default = /*#__PURE__*/_interopDefault(path5);
|
|
19
|
-
var
|
|
20
|
+
var z2__default = /*#__PURE__*/_interopDefault(z2);
|
|
20
21
|
|
|
21
22
|
// src/errors/ScriptError.ts
|
|
22
23
|
var ScriptError = class extends Error {
|
|
@@ -121,7 +122,7 @@ function runStep(command, projectDir, ctx) {
|
|
|
121
122
|
if (stderr) process.stderr.write(stderr);
|
|
122
123
|
if (result.status !== 0) {
|
|
123
124
|
console.error("\n" + "=".repeat(60));
|
|
124
|
-
console.error(
|
|
125
|
+
console.error(pc7__default.default.red(`\u{1F6A8} INFRASTRUCTURE CHECK FAILED \u{1F6A8}`));
|
|
125
126
|
console.error("=".repeat(60));
|
|
126
127
|
console.error(`Failed Step : ${ctx.stepName}`);
|
|
127
128
|
if (ctx.targetFile) {
|
|
@@ -138,10 +139,10 @@ function runStep(command, projectDir, ctx) {
|
|
|
138
139
|
function checkInfra(projectDir = process.cwd()) {
|
|
139
140
|
const dockerfilePath = path5__default.default.join(projectDir, "Dockerfile");
|
|
140
141
|
if (!fs.existsSync(dockerfilePath)) {
|
|
141
|
-
console.log(
|
|
142
|
+
console.log(pc7__default.default.yellow("\u26A0\uFE0F No Dockerfile found in project directory. Skipping Dockerfile checks."));
|
|
142
143
|
return;
|
|
143
144
|
}
|
|
144
|
-
console.log(
|
|
145
|
+
console.log(pc7__default.default.cyan("\n\u{1F50D} 1. Linting Dockerfile..."));
|
|
145
146
|
runStep(
|
|
146
147
|
"docker run --rm -i hadolint/hadolint hadolint --failure-threshold error - < Dockerfile",
|
|
147
148
|
projectDir,
|
|
@@ -149,15 +150,22 @@ function checkInfra(projectDir = process.cwd()) {
|
|
|
149
150
|
);
|
|
150
151
|
const policyDockerfileDir = path5__default.default.join(projectDir, "policy/dockerfile");
|
|
151
152
|
if (fs.existsSync(policyDockerfileDir)) {
|
|
152
|
-
console.log(
|
|
153
|
+
console.log(pc7__default.default.cyan("\n\u{1F50D} 2. Validating Dockerfile Contract..."));
|
|
153
154
|
runStep(
|
|
154
155
|
`docker run --rm -v "${projectDir}:/project" -w /project openpolicyagent/conftest test Dockerfile -p policy/dockerfile/`,
|
|
155
156
|
projectDir,
|
|
156
157
|
{ stepName: "Dockerfile Contract", targetFile: "Dockerfile" }
|
|
157
158
|
);
|
|
158
159
|
}
|
|
159
|
-
console.log(
|
|
160
|
+
console.log(pc7__default.default.green("\n\u2705 All infrastructure and contract checks passed.\n"));
|
|
160
161
|
}
|
|
162
|
+
var require2 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('bin.cjs', document.baseURI).href)));
|
|
163
|
+
var pkg = require2("../package.json");
|
|
164
|
+
var packageSchema = z2.z.object({
|
|
165
|
+
version: z2.z.string().min(1, "Version string cannot be empty")
|
|
166
|
+
});
|
|
167
|
+
var parsedPkg = packageSchema.parse(pkg);
|
|
168
|
+
var version = parsedPkg.version;
|
|
161
169
|
var extractBuildDeps = (buildJson, projectDir = process.cwd()) => {
|
|
162
170
|
if (!buildJson || typeof buildJson !== "object") {
|
|
163
171
|
return [];
|
|
@@ -165,12 +173,12 @@ var extractBuildDeps = (buildJson, projectDir = process.cwd()) => {
|
|
|
165
173
|
if (!("dependencies" in buildJson) || !buildJson.dependencies) {
|
|
166
174
|
return [];
|
|
167
175
|
}
|
|
168
|
-
const schema =
|
|
169
|
-
dependencies:
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
path:
|
|
173
|
-
service:
|
|
176
|
+
const schema = z2__default.default.object({
|
|
177
|
+
dependencies: z2__default.default.record(
|
|
178
|
+
z2__default.default.string(),
|
|
179
|
+
z2__default.default.object({
|
|
180
|
+
path: z2__default.default.string(),
|
|
181
|
+
service: z2__default.default.string()
|
|
174
182
|
})
|
|
175
183
|
)
|
|
176
184
|
});
|
|
@@ -199,11 +207,11 @@ var extractOverrides = (buildJson, projectDir = process.cwd()) => {
|
|
|
199
207
|
if (!("overrides" in buildJson) || !buildJson.overrides) {
|
|
200
208
|
return {};
|
|
201
209
|
}
|
|
202
|
-
const schema =
|
|
203
|
-
overrides:
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
path:
|
|
210
|
+
const schema = z2__default.default.object({
|
|
211
|
+
overrides: z2__default.default.record(
|
|
212
|
+
z2__default.default.string(),
|
|
213
|
+
z2__default.default.object({
|
|
214
|
+
path: z2__default.default.string()
|
|
207
215
|
})
|
|
208
216
|
)
|
|
209
217
|
});
|
|
@@ -476,8 +484,6 @@ function checkDependencies() {
|
|
|
476
484
|
);
|
|
477
485
|
}
|
|
478
486
|
}
|
|
479
|
-
|
|
480
|
-
// src/commands/serviceUp.ts
|
|
481
487
|
function runCompose(args, yamlConfig, projectDir) {
|
|
482
488
|
const runResult = child_process.spawnSync(
|
|
483
489
|
"docker",
|
|
@@ -518,209 +524,192 @@ function teardownCompose(yamlConfig, projectDir) {
|
|
|
518
524
|
);
|
|
519
525
|
if (downResult.error) {
|
|
520
526
|
console.error(
|
|
521
|
-
|
|
527
|
+
pc7__default.default.red(`Failed to run docker compose down: ${downResult.error.message}`)
|
|
522
528
|
);
|
|
523
529
|
}
|
|
524
530
|
}
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
if (!options.skipCheck) {
|
|
530
|
-
checkInfra(projectDir);
|
|
531
|
-
}
|
|
532
|
-
if (stage === "dev") {
|
|
533
|
-
console.log(pc2__default.default.cyan(`\u{1F680} Starting DEV environment...`));
|
|
534
|
-
const finalYamlConfig = compileEnvironment("dev", projectDir);
|
|
535
|
-
if (options.dryRun || options.debug || process.env.CI_DEBUG === "true") {
|
|
536
|
-
console.log(pc2__default.default.yellow("Final merged YAML configuration:\n"), finalYamlConfig);
|
|
537
|
-
}
|
|
538
|
-
if (options.dryRun) {
|
|
539
|
-
console.log(pc2__default.default.green("\u2705 Dry run completed successfully."));
|
|
540
|
-
return 0;
|
|
541
|
-
}
|
|
542
|
-
const upArgs = ["up", "--build"];
|
|
543
|
-
if (options.detach) {
|
|
544
|
-
upArgs.push("-d");
|
|
545
|
-
}
|
|
546
|
-
const status = runCompose(upArgs, finalYamlConfig, projectDir);
|
|
547
|
-
return status;
|
|
548
|
-
}
|
|
549
|
-
if (stage === "prod") {
|
|
550
|
-
console.log(pc2__default.default.cyan(`\u{1F3ED} Starting PROD environment...`));
|
|
551
|
-
const finalYamlConfig = compileEnvironment("prod", projectDir);
|
|
552
|
-
if (options.dryRun || options.debug || process.env.CI_DEBUG === "true") {
|
|
553
|
-
console.log(pc2__default.default.yellow("Final merged YAML configuration:\n"), finalYamlConfig);
|
|
554
|
-
}
|
|
555
|
-
if (options.dryRun) {
|
|
556
|
-
console.log(pc2__default.default.green("\u2705 Dry run completed successfully."));
|
|
557
|
-
return 0;
|
|
558
|
-
}
|
|
559
|
-
const upArgs = ["up", "--build"];
|
|
560
|
-
if (options.detach) {
|
|
561
|
-
upArgs.push("-d");
|
|
562
|
-
}
|
|
563
|
-
const status = runCompose(upArgs, finalYamlConfig, projectDir);
|
|
564
|
-
return status;
|
|
565
|
-
}
|
|
566
|
-
if (stage === "test-unit" || stage === "test" && options.unit && !options.e2e) {
|
|
567
|
-
console.log(pc2__default.default.bold(pc2__default.default.blue(`
|
|
531
|
+
|
|
532
|
+
// src/core/runTestUnit.ts
|
|
533
|
+
var runTestUnit = (options) => {
|
|
534
|
+
console.log(pc7__default.default.bold(pc7__default.default.blue(`
|
|
568
535
|
========================================`)));
|
|
569
|
-
|
|
570
|
-
|
|
536
|
+
console.log(pc7__default.default.bold(pc7__default.default.blue(`\u{1F9EA} STAGE: UNIT & ISOLATED TESTS`)));
|
|
537
|
+
console.log(pc7__default.default.bold(pc7__default.default.blue(`========================================
|
|
571
538
|
`)));
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
586
|
-
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
console.log(pc2__default.default.bold(pc2__default.default.green(`
|
|
539
|
+
const finalYamlConfig = compileEnvironment("test", options.projectDir);
|
|
540
|
+
if (options.debug) {
|
|
541
|
+
console.log(
|
|
542
|
+
pc7__default.default.yellow("Final merged YAML configuration:\n"),
|
|
543
|
+
finalYamlConfig
|
|
544
|
+
);
|
|
545
|
+
}
|
|
546
|
+
let status = 0;
|
|
547
|
+
try {
|
|
548
|
+
status = runCompose(
|
|
549
|
+
["up", "--build", "--abort-on-container-exit"],
|
|
550
|
+
finalYamlConfig,
|
|
551
|
+
options.projectDir
|
|
552
|
+
);
|
|
553
|
+
} finally {
|
|
554
|
+
teardownCompose(finalYamlConfig, options.projectDir);
|
|
555
|
+
}
|
|
556
|
+
if (status === 0) {
|
|
557
|
+
console.log(pc7__default.default.bold(pc7__default.default.green(`
|
|
592
558
|
\u2705 Unit tests passed successfully.
|
|
593
559
|
`)));
|
|
594
|
-
|
|
595
|
-
|
|
560
|
+
} else {
|
|
561
|
+
console.error(pc7__default.default.red(`
|
|
596
562
|
\u274C Unit tests failed with exit code ${status}.
|
|
597
563
|
`));
|
|
598
|
-
}
|
|
599
|
-
return status;
|
|
600
564
|
}
|
|
601
|
-
|
|
602
|
-
|
|
565
|
+
return status;
|
|
566
|
+
};
|
|
567
|
+
var runTestE2e = (options) => {
|
|
568
|
+
console.log(pc7__default.default.bold(pc7__default.default.blue(`
|
|
603
569
|
========================================`)));
|
|
604
|
-
|
|
605
|
-
|
|
570
|
+
console.log(pc7__default.default.bold(pc7__default.default.blue(`\u{1F6A6} STAGE: INTEGRATED E2E TESTS`)));
|
|
571
|
+
console.log(pc7__default.default.bold(pc7__default.default.blue(`========================================
|
|
606
572
|
`)));
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
console.log(pc2__default.default.bold(pc2__default.default.green(`
|
|
573
|
+
const finalYamlConfig = compileEnvironment("e2e", options.projectDir);
|
|
574
|
+
if (options.debug) {
|
|
575
|
+
console.log(
|
|
576
|
+
pc7__default.default.yellow("Final merged YAML configuration:\n"),
|
|
577
|
+
finalYamlConfig
|
|
578
|
+
);
|
|
579
|
+
}
|
|
580
|
+
let status = 0;
|
|
581
|
+
try {
|
|
582
|
+
status = runCompose(
|
|
583
|
+
[
|
|
584
|
+
"up",
|
|
585
|
+
"--build",
|
|
586
|
+
"--abort-on-container-exit",
|
|
587
|
+
"--exit-code-from",
|
|
588
|
+
"tester"
|
|
589
|
+
],
|
|
590
|
+
finalYamlConfig,
|
|
591
|
+
options.projectDir
|
|
592
|
+
);
|
|
593
|
+
} finally {
|
|
594
|
+
teardownCompose(finalYamlConfig, options.projectDir);
|
|
595
|
+
}
|
|
596
|
+
if (status === 0) {
|
|
597
|
+
console.log(pc7__default.default.bold(pc7__default.default.green(`
|
|
633
598
|
\u2705 E2E tests passed successfully.
|
|
634
599
|
`)));
|
|
635
|
-
|
|
636
|
-
|
|
600
|
+
} else {
|
|
601
|
+
console.error(pc7__default.default.red(`
|
|
637
602
|
\u274C E2E tests failed with exit code ${status}.
|
|
638
603
|
`));
|
|
639
|
-
|
|
604
|
+
}
|
|
605
|
+
return status;
|
|
606
|
+
};
|
|
607
|
+
var runDev = (options) => {
|
|
608
|
+
console.log(pc7__default.default.cyan(`\u{1F680} Starting DEV environment...`));
|
|
609
|
+
const finalYamlConfig = compileEnvironment("dev", options.projectDir);
|
|
610
|
+
if (options.debug) {
|
|
611
|
+
console.log(
|
|
612
|
+
pc7__default.default.yellow("Final merged YAML configuration:\n"),
|
|
613
|
+
finalYamlConfig
|
|
614
|
+
);
|
|
615
|
+
}
|
|
616
|
+
const upArgs = ["up", "--build"];
|
|
617
|
+
if (options.detach) {
|
|
618
|
+
upArgs.push("-d");
|
|
619
|
+
}
|
|
620
|
+
const status = runCompose(upArgs, finalYamlConfig, options.projectDir);
|
|
621
|
+
return status;
|
|
622
|
+
};
|
|
623
|
+
var runProd = (options) => {
|
|
624
|
+
console.log(pc7__default.default.cyan(`\u{1F3ED} Starting PROD environment...`));
|
|
625
|
+
const finalYamlConfig = compileEnvironment("prod", options.projectDir);
|
|
626
|
+
if (options.debug) {
|
|
627
|
+
console.log(
|
|
628
|
+
pc7__default.default.yellow("Final merged YAML configuration:\n"),
|
|
629
|
+
finalYamlConfig
|
|
630
|
+
);
|
|
631
|
+
}
|
|
632
|
+
const upArgs = ["up", "--build"];
|
|
633
|
+
if (options.detach) {
|
|
634
|
+
upArgs.push("-d");
|
|
635
|
+
}
|
|
636
|
+
const status = runCompose(upArgs, finalYamlConfig, options.projectDir);
|
|
637
|
+
return status;
|
|
638
|
+
};
|
|
639
|
+
|
|
640
|
+
// src/commands/service/commands/up/serviceUp.ts
|
|
641
|
+
async function handleServiceUp(rawStage, options = {}) {
|
|
642
|
+
const projectDir = options.projectDir || process.cwd();
|
|
643
|
+
const stage = (rawStage || "dev").toLowerCase();
|
|
644
|
+
checkDependencies();
|
|
645
|
+
checkInfra(projectDir);
|
|
646
|
+
const runOptions = {
|
|
647
|
+
projectDir,
|
|
648
|
+
debug: options.debug || false,
|
|
649
|
+
detach: options.detach || false
|
|
650
|
+
};
|
|
651
|
+
if (stage === "dev") {
|
|
652
|
+
const status = runDev(runOptions);
|
|
653
|
+
return status;
|
|
654
|
+
}
|
|
655
|
+
if (stage === "prod") {
|
|
656
|
+
const status = runProd(runOptions);
|
|
657
|
+
return status;
|
|
658
|
+
}
|
|
659
|
+
if (stage === "test-unit") {
|
|
660
|
+
const status = runTestUnit(runOptions);
|
|
661
|
+
return status;
|
|
662
|
+
}
|
|
663
|
+
if (stage === "test-e2e") {
|
|
664
|
+
const status = runTestE2e(runOptions);
|
|
640
665
|
return status;
|
|
641
666
|
}
|
|
642
667
|
if (stage === "test") {
|
|
643
|
-
|
|
644
|
-
console.log(pc2__default.default.bold(pc2__default.default.blue(`
|
|
645
|
-
========================================`)));
|
|
646
|
-
console.log(pc2__default.default.bold(pc2__default.default.blue(`\u{1F9EA} [1/2] STAGE: UNIT & ISOLATED TESTS`)));
|
|
647
|
-
console.log(pc2__default.default.bold(pc2__default.default.blue(`========================================
|
|
648
|
-
`)));
|
|
649
|
-
const unitYaml2 = compileEnvironment("test", projectDir);
|
|
650
|
-
console.log(pc2__default.default.yellow("Unit Test YAML configuration:\n"), unitYaml2);
|
|
651
|
-
console.log(pc2__default.default.bold(pc2__default.default.blue(`
|
|
652
|
-
========================================`)));
|
|
653
|
-
console.log(pc2__default.default.bold(pc2__default.default.blue(`\u{1F6A6} [2/2] STAGE: INTEGRATED E2E TESTS`)));
|
|
654
|
-
console.log(pc2__default.default.bold(pc2__default.default.blue(`========================================
|
|
655
|
-
`)));
|
|
656
|
-
const e2eYaml2 = compileEnvironment("e2e", projectDir);
|
|
657
|
-
console.log(pc2__default.default.yellow("E2E Test YAML configuration:\n"), e2eYaml2);
|
|
658
|
-
console.log(pc2__default.default.green("\u2705 Dry run completed successfully for all test stages."));
|
|
659
|
-
return 0;
|
|
660
|
-
}
|
|
661
|
-
console.log(pc2__default.default.bold(pc2__default.default.blue(`
|
|
668
|
+
console.log(pc7__default.default.bold(pc7__default.default.blue(`
|
|
662
669
|
========================================`)));
|
|
663
|
-
console.log(
|
|
664
|
-
console.log(
|
|
670
|
+
console.log(pc7__default.default.bold(pc7__default.default.blue(`\u{1F9EA} [1/2] STAGE: UNIT & ISOLATED TESTS`)));
|
|
671
|
+
console.log(pc7__default.default.bold(pc7__default.default.blue(`========================================
|
|
665
672
|
`)));
|
|
666
|
-
const
|
|
667
|
-
if (options.debug || process.env.CI_DEBUG === "true") {
|
|
668
|
-
console.log(pc2__default.default.yellow("Unit Test YAML configuration:\n"), unitYaml);
|
|
669
|
-
}
|
|
670
|
-
let unitStatus = 0;
|
|
671
|
-
try {
|
|
672
|
-
unitStatus = runCompose(
|
|
673
|
-
["up", "--build", "--abort-on-container-exit"],
|
|
674
|
-
unitYaml,
|
|
675
|
-
projectDir
|
|
676
|
-
);
|
|
677
|
-
} finally {
|
|
678
|
-
teardownCompose(unitYaml, projectDir);
|
|
679
|
-
}
|
|
673
|
+
const unitStatus = runTestUnit(runOptions);
|
|
680
674
|
if (unitStatus !== 0) {
|
|
681
|
-
console.error(
|
|
675
|
+
console.error(
|
|
676
|
+
pc7__default.default.red(
|
|
677
|
+
`
|
|
682
678
|
\u274C [1/2] Unit tests failed with exit code ${unitStatus}. Aborting E2E tests.
|
|
683
|
-
`
|
|
679
|
+
`
|
|
680
|
+
)
|
|
681
|
+
);
|
|
684
682
|
return unitStatus;
|
|
685
683
|
}
|
|
686
|
-
console.log(
|
|
684
|
+
console.log(
|
|
685
|
+
pc7__default.default.bold(pc7__default.default.green(`
|
|
687
686
|
\u2705 [1/2] Unit tests passed successfully.
|
|
687
|
+
`))
|
|
688
|
+
);
|
|
689
|
+
console.log(pc7__default.default.bold(pc7__default.default.blue(`========================================`)));
|
|
690
|
+
console.log(pc7__default.default.bold(pc7__default.default.blue(`\u{1F6A6} [2/2] STAGE: INTEGRATED E2E TESTS`)));
|
|
691
|
+
console.log(pc7__default.default.bold(pc7__default.default.blue(`========================================
|
|
688
692
|
`)));
|
|
689
|
-
|
|
690
|
-
console.log(pc2__default.default.bold(pc2__default.default.blue(`\u{1F6A6} [2/2] STAGE: INTEGRATED E2E TESTS`)));
|
|
691
|
-
console.log(pc2__default.default.bold(pc2__default.default.blue(`========================================
|
|
692
|
-
`)));
|
|
693
|
-
const e2eYaml = compileEnvironment("e2e", projectDir);
|
|
694
|
-
if (options.debug || process.env.CI_DEBUG === "true") {
|
|
695
|
-
console.log(pc2__default.default.yellow("E2E Test YAML configuration:\n"), e2eYaml);
|
|
696
|
-
}
|
|
697
|
-
let e2eStatus = 0;
|
|
698
|
-
try {
|
|
699
|
-
e2eStatus = runCompose(
|
|
700
|
-
[
|
|
701
|
-
"up",
|
|
702
|
-
"--build",
|
|
703
|
-
"--abort-on-container-exit",
|
|
704
|
-
"--exit-code-from",
|
|
705
|
-
"tester"
|
|
706
|
-
],
|
|
707
|
-
e2eYaml,
|
|
708
|
-
projectDir
|
|
709
|
-
);
|
|
710
|
-
} finally {
|
|
711
|
-
teardownCompose(e2eYaml, projectDir);
|
|
712
|
-
}
|
|
693
|
+
const e2eStatus = runTestE2e(runOptions);
|
|
713
694
|
if (e2eStatus !== 0) {
|
|
714
|
-
console.error(
|
|
695
|
+
console.error(
|
|
696
|
+
pc7__default.default.red(`
|
|
715
697
|
\u274C [2/2] E2E tests failed with exit code ${e2eStatus}.
|
|
716
|
-
`)
|
|
698
|
+
`)
|
|
699
|
+
);
|
|
717
700
|
return e2eStatus;
|
|
718
701
|
}
|
|
719
|
-
console.log(
|
|
702
|
+
console.log(
|
|
703
|
+
pc7__default.default.bold(pc7__default.default.green(`
|
|
720
704
|
\u2705 [2/2] E2E tests passed successfully.
|
|
721
|
-
`))
|
|
722
|
-
|
|
723
|
-
|
|
705
|
+
`))
|
|
706
|
+
);
|
|
707
|
+
console.log(
|
|
708
|
+
pc7__default.default.bold(
|
|
709
|
+
pc7__default.default.green(`\u{1F389} All test stages (unit + e2e) completed successfully!
|
|
710
|
+
`)
|
|
711
|
+
)
|
|
712
|
+
);
|
|
724
713
|
return 0;
|
|
725
714
|
}
|
|
726
715
|
throw new ScriptError(
|
|
@@ -728,64 +717,72 @@ async function handleServiceUp(rawStage, options = {}) {
|
|
|
728
717
|
);
|
|
729
718
|
}
|
|
730
719
|
|
|
731
|
-
// src/
|
|
732
|
-
|
|
733
|
-
|
|
734
|
-
|
|
735
|
-
|
|
720
|
+
// src/commands/service/commands/up/command.ts
|
|
721
|
+
var registerUpCommand = (cmd) => {
|
|
722
|
+
cmd.command("up [stage]").description(
|
|
723
|
+
"Start or test a service environment (dev, prod, test, test-unit, test-e2e)"
|
|
724
|
+
).option("--skip-check", "Skip infrastructure and contract checks").option("--debug", "Output the merged Docker Compose YAML configuration").option("-d, --detach", "Run containers in the background").option(
|
|
725
|
+
"--dry-run",
|
|
726
|
+
"Preview generated compose configuration without starting containers"
|
|
727
|
+
).option(
|
|
728
|
+
"-C, --project-dir <dir>",
|
|
729
|
+
"Service project directory (defaults to cwd)"
|
|
730
|
+
).option("--unit", "Run only unit tests (when stage is test)").option("--e2e", "Run only e2e tests (when stage is test)").addHelpText(
|
|
731
|
+
"after",
|
|
732
|
+
`
|
|
733
|
+
Examples:
|
|
734
|
+
$ builder service up dev
|
|
735
|
+
$ builder service up prod
|
|
736
|
+
$ builder service up test`
|
|
737
|
+
).action(
|
|
738
|
+
async (stage = "dev", options = {}) => {
|
|
736
739
|
const exitCode = await handleServiceUp(stage, {
|
|
737
|
-
projectDir:
|
|
738
|
-
|
|
739
|
-
|
|
740
|
-
detach: flags.detach || flags.d,
|
|
741
|
-
dryRun: flags.dryRun,
|
|
742
|
-
unit: flags.unit,
|
|
743
|
-
e2e: flags.e2e
|
|
740
|
+
projectDir: options.projectDir,
|
|
741
|
+
debug: options.debug,
|
|
742
|
+
detach: options.detach
|
|
744
743
|
});
|
|
745
744
|
if (exitCode !== 0) {
|
|
746
745
|
process.exit(exitCode);
|
|
747
746
|
}
|
|
748
|
-
return;
|
|
749
747
|
}
|
|
750
|
-
|
|
751
|
-
|
|
752
|
-
|
|
753
|
-
|
|
754
|
-
|
|
755
|
-
|
|
756
|
-
|
|
757
|
-
|
|
758
|
-
|
|
759
|
-
|
|
760
|
-
|
|
761
|
-
|
|
762
|
-
|
|
763
|
-
|
|
764
|
-
|
|
765
|
-
|
|
766
|
-
|
|
767
|
-
|
|
768
|
-
|
|
769
|
-
cli.command("check", "Run infrastructure and contract checks (hadolint, conftest)").option("-C, --project-dir <dir>", "Service project directory (defaults to cwd)").action((flags = {}) => {
|
|
770
|
-
const projectDir = flags.projectDir || flags.C || process.cwd();
|
|
748
|
+
);
|
|
749
|
+
};
|
|
750
|
+
|
|
751
|
+
// src/commands/service/command.ts
|
|
752
|
+
var registerServiceCommand = (cmd) => {
|
|
753
|
+
const service = cmd.command("service").description("Manage and run services");
|
|
754
|
+
registerUpCommand(service);
|
|
755
|
+
};
|
|
756
|
+
|
|
757
|
+
// src/cli.ts
|
|
758
|
+
function createCli() {
|
|
759
|
+
const program = new commander.Command();
|
|
760
|
+
program.name("builder").description("CLI build tool and orchestrator for Solid Stack services").version(version, "-v, --version", "Output the current version");
|
|
761
|
+
registerServiceCommand(program);
|
|
762
|
+
program.command("check").description("Run infrastructure and contract checks (hadolint, conftest)").option(
|
|
763
|
+
"-C, --project-dir <dir>",
|
|
764
|
+
"Service project directory (defaults to cwd)"
|
|
765
|
+
).action((options = {}) => {
|
|
766
|
+
const projectDir = options.projectDir || process.cwd();
|
|
771
767
|
checkInfra(projectDir);
|
|
772
768
|
});
|
|
773
|
-
|
|
774
|
-
cli.version("1.0.0");
|
|
775
|
-
return cli;
|
|
769
|
+
return program;
|
|
776
770
|
}
|
|
777
771
|
async function runCli(argv = process.argv) {
|
|
778
772
|
const cli = createCli();
|
|
779
773
|
try {
|
|
780
|
-
cli.
|
|
774
|
+
await cli.parseAsync(argv);
|
|
781
775
|
} catch (err) {
|
|
776
|
+
if (err?.code === "commander.helpDisplayed" || err?.code === "commander.version") {
|
|
777
|
+
return;
|
|
778
|
+
}
|
|
782
779
|
if (err instanceof ScriptError) {
|
|
783
|
-
console.error(
|
|
780
|
+
console.error(pc7__default.default.red(`
|
|
784
781
|
\u274C ${err.message}
|
|
785
782
|
`));
|
|
786
783
|
} else {
|
|
787
784
|
const message = err instanceof Error ? err.message : String(err);
|
|
788
|
-
console.error(
|
|
785
|
+
console.error(pc7__default.default.red(`
|
|
789
786
|
\u274C Error: ${message}
|
|
790
787
|
`));
|
|
791
788
|
}
|