@rsaglobaltech/specgate 0.17.6 → 0.17.8
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/CHANGELOG.md +44 -0
- package/dist/packages/core/src/application/ValidateProjectUseCase.js +15 -1
- package/dist/packages/core/src/application/ValidateProjectUseCase.js.map +1 -1
- package/dist/packages/core/src/domain/DoneVerification.js +30 -31
- package/dist/packages/core/src/domain/DoneVerification.js.map +1 -1
- package/dist/packages/core/src/domain/DraftChecklist.js +39 -1
- package/dist/packages/core/src/domain/DraftChecklist.js.map +1 -1
- package/dist/scripts/cli/commands/config/CiInitCommand.js +28 -3
- package/dist/scripts/cli/commands/config/CiInitCommand.js.map +1 -1
- package/dist/scripts/cli/commands/config/CiToolchain.js +234 -0
- package/dist/scripts/cli/commands/config/CiToolchain.js.map +1 -0
- package/dist/scripts/cli/commands/project/AdoptCommand.js +71 -10
- package/dist/scripts/cli/commands/project/AdoptCommand.js.map +1 -1
- package/dist/scripts/cli/commands/spec/DoneCommand.js +17 -0
- package/dist/scripts/cli/commands/spec/DoneCommand.js.map +1 -1
- package/dist/scripts/cli/commands/spec/StatusCommand.js +46 -0
- package/dist/scripts/cli/commands/spec/StatusCommand.js.map +1 -1
- package/dist/scripts/harness/init.js +105 -1
- package/dist/scripts/harness/init.js.map +1 -1
- package/package.json +1 -1
- package/templates/ci/azure.yml.tpl +4 -6
- package/templates/ci/github.yml.tpl +6 -6
- package/templates/ci/gitlab.yml.tpl +5 -2
- package/templates/ci/jenkins.tpl +6 -2
|
@@ -0,0 +1,234 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.javaVersion = javaVersion;
|
|
37
|
+
exports.stackKind = stackKind;
|
|
38
|
+
exports.shQuote = shQuote;
|
|
39
|
+
exports.planCi = planCi;
|
|
40
|
+
exports.githubSetup = githubSetup;
|
|
41
|
+
exports.azureSetup = azureSetup;
|
|
42
|
+
exports.ciImage = ciImage;
|
|
43
|
+
exports.containerSetup = containerSetup;
|
|
44
|
+
exports.describeTests = describeTests;
|
|
45
|
+
const fs = __importStar(require("node:fs"));
|
|
46
|
+
const path = __importStar(require("node:path"));
|
|
47
|
+
const init_1 = require("../../../harness/init");
|
|
48
|
+
const HarnessConfigFile_1 = require("../../../../packages/core/src/infrastructure/HarnessConfigFile");
|
|
49
|
+
const DEFAULT_JAVA = "21";
|
|
50
|
+
function read(projectDir, rel) {
|
|
51
|
+
try {
|
|
52
|
+
return fs.readFileSync(path.join(projectDir, rel), "utf8");
|
|
53
|
+
}
|
|
54
|
+
catch {
|
|
55
|
+
return null;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
function plainVersion(v) {
|
|
59
|
+
const t = (v || "").trim().replace(/^1\./, "");
|
|
60
|
+
return /^\d{1,2}$/.test(t) ? t : null;
|
|
61
|
+
}
|
|
62
|
+
function javaVersion(projectDir) {
|
|
63
|
+
const pom = read(projectDir, "pom.xml");
|
|
64
|
+
if (pom !== null) {
|
|
65
|
+
const tags = [
|
|
66
|
+
/<java\.version>([^<]+)</,
|
|
67
|
+
/<maven\.compiler\.release>([^<]+)</,
|
|
68
|
+
/<maven\.compiler\.source>([^<]+)</,
|
|
69
|
+
];
|
|
70
|
+
for (const tag of tags) {
|
|
71
|
+
const v = plainVersion(tag.exec(pom)?.[1]);
|
|
72
|
+
if (v)
|
|
73
|
+
return v;
|
|
74
|
+
}
|
|
75
|
+
return DEFAULT_JAVA;
|
|
76
|
+
}
|
|
77
|
+
const gradle = read(projectDir, "build.gradle.kts") ?? read(projectDir, "build.gradle") ?? "";
|
|
78
|
+
const patterns = [
|
|
79
|
+
/JavaLanguageVersion\.of\(\s*(\d{1,2})\s*\)/,
|
|
80
|
+
/JavaVersion\.VERSION_(?:1_)?(\d{1,2})\b/,
|
|
81
|
+
/sourceCompatibility\s*=\s*['"]?(\d{1,2}(?:\.\d)?)['"]?/,
|
|
82
|
+
];
|
|
83
|
+
for (const p of patterns) {
|
|
84
|
+
const v = plainVersion(p.exec(gradle)?.[1]);
|
|
85
|
+
if (v)
|
|
86
|
+
return v;
|
|
87
|
+
}
|
|
88
|
+
return DEFAULT_JAVA;
|
|
89
|
+
}
|
|
90
|
+
function stackKind(projectDir) {
|
|
91
|
+
const has = (rel) => fs.existsSync(path.join(projectDir, rel));
|
|
92
|
+
if (has("pom.xml"))
|
|
93
|
+
return "maven";
|
|
94
|
+
if (has("build.gradle") || has("build.gradle.kts"))
|
|
95
|
+
return "gradle";
|
|
96
|
+
if (has("package.json"))
|
|
97
|
+
return "node";
|
|
98
|
+
if (has("go.mod"))
|
|
99
|
+
return "go";
|
|
100
|
+
if (has("pyproject.toml") || has("setup.py") || has("requirements.txt"))
|
|
101
|
+
return "python";
|
|
102
|
+
return "unknown";
|
|
103
|
+
}
|
|
104
|
+
/** Single-quoted for a POSIX shell. */
|
|
105
|
+
function shQuote(s) {
|
|
106
|
+
return `'${s.replace(/'/g, `'\\''`)}'`;
|
|
107
|
+
}
|
|
108
|
+
function planCi(projectDir, version) {
|
|
109
|
+
const kind = stackKind(projectDir);
|
|
110
|
+
const npx = `npx @rsaglobaltech/specgate@${version}`;
|
|
111
|
+
let configured = null;
|
|
112
|
+
try {
|
|
113
|
+
configured = (0, HarnessConfigFile_1.readHarnessConfig)(projectDir)?.testCmd ?? null;
|
|
114
|
+
}
|
|
115
|
+
catch {
|
|
116
|
+
configured = null;
|
|
117
|
+
}
|
|
118
|
+
const base = { kind, javaVersion: javaVersion(projectDir) };
|
|
119
|
+
if (configured) {
|
|
120
|
+
// `check` reads test_cmd from harness.config.yaml, so a later
|
|
121
|
+
// `config set test_cmd` changes CI too, with no second place to edit.
|
|
122
|
+
return { ...base, gateCmd: `${npx} check .`, testSource: "config", testCmd: configured };
|
|
123
|
+
}
|
|
124
|
+
const detected = (0, init_1.withBuild)(projectDir, (0, init_1.detectTestCommand)(projectDir));
|
|
125
|
+
if (detected) {
|
|
126
|
+
return {
|
|
127
|
+
...base,
|
|
128
|
+
gateCmd: `${npx} check . --test-cmd ${shQuote(detected)}`,
|
|
129
|
+
testSource: "detected",
|
|
130
|
+
testCmd: detected,
|
|
131
|
+
};
|
|
132
|
+
}
|
|
133
|
+
return { ...base, gateCmd: `${npx} validate . --strict`, testSource: "none", testCmd: null };
|
|
134
|
+
}
|
|
135
|
+
const NODE_VERSION = "22";
|
|
136
|
+
function indent(lines, n) {
|
|
137
|
+
const pad = " ".repeat(n);
|
|
138
|
+
return lines.map((l) => (l ? pad + l : l)).join("\n");
|
|
139
|
+
}
|
|
140
|
+
/** GitHub Actions steps after checkout, indented for `steps:`. */
|
|
141
|
+
function githubSetup(plan, projectDir) {
|
|
142
|
+
const steps = [
|
|
143
|
+
"- uses: actions/setup-node@v4",
|
|
144
|
+
" with:",
|
|
145
|
+
` node-version: '${NODE_VERSION}'`,
|
|
146
|
+
];
|
|
147
|
+
if (plan.kind === "maven" || plan.kind === "gradle") {
|
|
148
|
+
steps.push("- uses: actions/setup-java@v4", " with:", " distribution: temurin", ` java-version: '${plan.javaVersion}'`, ` cache: ${plan.kind}`);
|
|
149
|
+
}
|
|
150
|
+
else if (plan.kind === "node") {
|
|
151
|
+
const lock = fs.existsSync(path.join(projectDir, "package-lock.json"));
|
|
152
|
+
steps.push(`- run: ${lock ? "npm ci" : "npm install"}`);
|
|
153
|
+
}
|
|
154
|
+
else if (plan.kind === "go") {
|
|
155
|
+
steps.push("- uses: actions/setup-go@v5", " with:", " go-version-file: go.mod");
|
|
156
|
+
}
|
|
157
|
+
else if (plan.kind === "python") {
|
|
158
|
+
steps.push("- uses: actions/setup-python@v5", " with:", " python-version: '3.12'", "# Install what your tests need, e.g. pip install -r requirements.txt");
|
|
159
|
+
}
|
|
160
|
+
return indent(steps, 6);
|
|
161
|
+
}
|
|
162
|
+
/** Azure Pipelines steps before the gate, indented for `steps:`. */
|
|
163
|
+
function azureSetup(plan, projectDir) {
|
|
164
|
+
const steps = [
|
|
165
|
+
"- task: NodeTool@0",
|
|
166
|
+
" inputs:",
|
|
167
|
+
` versionSpec: '${NODE_VERSION}.x'`,
|
|
168
|
+
` displayName: Use Node.js ${NODE_VERSION}`,
|
|
169
|
+
];
|
|
170
|
+
if (plan.kind === "maven" || plan.kind === "gradle") {
|
|
171
|
+
steps.push("- task: JavaToolInstaller@0", " inputs:", ` versionSpec: '${plan.javaVersion}'`, " jdkArchitectureOption: x64", " jdkSourceOption: PreInstalled", ` displayName: Use Java ${plan.javaVersion}`);
|
|
172
|
+
}
|
|
173
|
+
else if (plan.kind === "node") {
|
|
174
|
+
const lock = fs.existsSync(path.join(projectDir, "package-lock.json"));
|
|
175
|
+
steps.push(`- script: ${lock ? "npm ci" : "npm install"}`, " displayName: Install dependencies");
|
|
176
|
+
}
|
|
177
|
+
else if (plan.kind === "go") {
|
|
178
|
+
steps.push("- task: GoTool@0", " inputs:", " version: '1.22'");
|
|
179
|
+
}
|
|
180
|
+
else if (plan.kind === "python") {
|
|
181
|
+
steps.push("- task: UsePythonVersion@0", " inputs:", " versionSpec: '3.12'", "# Install what your tests need, e.g. pip install -r requirements.txt");
|
|
182
|
+
}
|
|
183
|
+
return indent(steps, 2);
|
|
184
|
+
}
|
|
185
|
+
/** The container image a GitLab or Jenkins job runs in. */
|
|
186
|
+
function ciImage(plan) {
|
|
187
|
+
switch (plan.kind) {
|
|
188
|
+
case "maven":
|
|
189
|
+
return `maven:3-eclipse-temurin-${plan.javaVersion}`;
|
|
190
|
+
case "gradle":
|
|
191
|
+
return `gradle:jdk${plan.javaVersion}`;
|
|
192
|
+
case "go":
|
|
193
|
+
return "golang:1";
|
|
194
|
+
case "python":
|
|
195
|
+
return "python:3.12";
|
|
196
|
+
default:
|
|
197
|
+
return `node:${NODE_VERSION}`;
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
/**
|
|
201
|
+
* Shell lines run before the gate in a container job. A JDK, Go or Python image
|
|
202
|
+
* has no Node, and Specgate runs on Node: the official tarball is fetched and
|
|
203
|
+
* checked against the release's SHASUMS256.txt before it is unpacked. It goes
|
|
204
|
+
* to /tmp, not the workspace — a Jenkins agent runs as a user that cannot write
|
|
205
|
+
* /usr/local, and node's files inside the repository would be scanned as the
|
|
206
|
+
* project's own. The lines share one shell, so PATH holds for the gate.
|
|
207
|
+
*/
|
|
208
|
+
function containerSetup(plan, projectDir) {
|
|
209
|
+
if (plan.kind === "unknown")
|
|
210
|
+
return [];
|
|
211
|
+
if (plan.kind === "node") {
|
|
212
|
+
const lock = fs.existsSync(path.join(projectDir, "package-lock.json"));
|
|
213
|
+
return [lock ? "npm ci" : "npm install"];
|
|
214
|
+
}
|
|
215
|
+
const base = `https://nodejs.org/dist/latest-v${NODE_VERSION}.x`;
|
|
216
|
+
return [
|
|
217
|
+
"NODE_DIR=/tmp/specgate-node && mkdir -p $NODE_DIR && cd $NODE_DIR",
|
|
218
|
+
`curl -fsSLO ${base}/SHASUMS256.txt`,
|
|
219
|
+
"ARCH=$(uname -m | sed 's/x86_64/x64/;s/aarch64/arm64/')",
|
|
220
|
+
`NODE_TGZ=$(grep -o "node-v${NODE_VERSION}[.0-9]*-linux-$ARCH.tar.gz" SHASUMS256.txt | head -1)`,
|
|
221
|
+
`curl -fsSLO "${base}/$NODE_TGZ"`,
|
|
222
|
+
"sha256sum -c --ignore-missing SHASUMS256.txt",
|
|
223
|
+
'tar -xzf "$NODE_TGZ" --strip-components=1 && cd - > /dev/null',
|
|
224
|
+
'export PATH="$NODE_DIR/bin:$PATH"',
|
|
225
|
+
];
|
|
226
|
+
}
|
|
227
|
+
function describeTests(plan) {
|
|
228
|
+
if (plan.testSource === "config")
|
|
229
|
+
return `runs your tests: \`${plan.testCmd}\` (test_cmd)`;
|
|
230
|
+
if (plan.testSource === "detected")
|
|
231
|
+
return `runs your tests: \`${plan.testCmd}\` (detected — \`specgate config set test_cmd\` and re-run to change it)`;
|
|
232
|
+
return 'runs no tests: none detected — `specgate config set test_cmd "<command>"`, then re-run `ci init --force`';
|
|
233
|
+
}
|
|
234
|
+
//# sourceMappingURL=CiToolchain.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CiToolchain.js","sourceRoot":"","sources":["../../../../../scripts/cli/commands/config/CiToolchain.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,8 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.AdoptProjectCommand = void 0;
|
|
37
37
|
exports.parseArgs = parseArgs;
|
|
38
|
+
exports.pomProjectName = pomProjectName;
|
|
39
|
+
exports.gradleRootProjectName = gradleRootProjectName;
|
|
38
40
|
exports.detectStack = detectStack;
|
|
39
41
|
exports.buildProposedRequirements = buildProposedRequirements;
|
|
40
42
|
const contract_file_1 = require("../../../agents/contract-file");
|
|
@@ -156,6 +158,65 @@ function readIfExists(p) {
|
|
|
156
158
|
return null;
|
|
157
159
|
}
|
|
158
160
|
}
|
|
161
|
+
// The project's own coordinates sit at the top level of the POM, but the
|
|
162
|
+
// first `<artifactId>` in the file is usually the `<parent>`'s — a Spring Boot
|
|
163
|
+
// project was reported as `spring-boot-starter-parent` (#69). Blocks that carry
|
|
164
|
+
// other `<artifactId>`s or `<name>`s are removed before matching.
|
|
165
|
+
const POM_NESTED_BLOCKS = [
|
|
166
|
+
"parent",
|
|
167
|
+
"dependencies",
|
|
168
|
+
"dependencyManagement",
|
|
169
|
+
"build",
|
|
170
|
+
"profiles",
|
|
171
|
+
"reporting",
|
|
172
|
+
"organization",
|
|
173
|
+
"licenses",
|
|
174
|
+
"developers",
|
|
175
|
+
"contributors",
|
|
176
|
+
"scm",
|
|
177
|
+
"distributionManagement",
|
|
178
|
+
"repositories",
|
|
179
|
+
"pluginRepositories",
|
|
180
|
+
"issueManagement",
|
|
181
|
+
"ciManagement",
|
|
182
|
+
"mailingLists",
|
|
183
|
+
"modules",
|
|
184
|
+
"properties",
|
|
185
|
+
];
|
|
186
|
+
function stripBlocks(text, open, close) {
|
|
187
|
+
let out = "";
|
|
188
|
+
let from = 0;
|
|
189
|
+
for (;;) {
|
|
190
|
+
const start = text.indexOf(open, from);
|
|
191
|
+
if (start === -1)
|
|
192
|
+
return out + text.slice(from);
|
|
193
|
+
const end = text.indexOf(close, start + open.length);
|
|
194
|
+
if (end === -1)
|
|
195
|
+
return out + text.slice(from);
|
|
196
|
+
out += text.slice(from, start);
|
|
197
|
+
from = end + close.length;
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
function pomProjectName(pom) {
|
|
201
|
+
let top = stripBlocks(pom, "<!--", "-->");
|
|
202
|
+
for (const tag of POM_NESTED_BLOCKS)
|
|
203
|
+
top = stripBlocks(top, `<${tag}>`, `</${tag}>`);
|
|
204
|
+
const name = /<name>([^<]+)<\/name>/.exec(top)?.[1]?.trim();
|
|
205
|
+
if (name && !name.includes("${"))
|
|
206
|
+
return name;
|
|
207
|
+
const artifactId = /<artifactId>([^<]+)<\/artifactId>/.exec(top)?.[1]?.trim();
|
|
208
|
+
return artifactId && !artifactId.includes("${") ? artifactId : null;
|
|
209
|
+
}
|
|
210
|
+
// `rootProject.name = "x"` in settings.gradle or settings.gradle.kts (#69).
|
|
211
|
+
function gradleRootProjectName(dir) {
|
|
212
|
+
for (const f of ["settings.gradle.kts", "settings.gradle"]) {
|
|
213
|
+
const text = readIfExists(path.join(dir, f));
|
|
214
|
+
const m = text && /rootProject\.name\s*=\s*["']([^"'\n]+)["']/.exec(text);
|
|
215
|
+
if (m)
|
|
216
|
+
return m[1].trim();
|
|
217
|
+
}
|
|
218
|
+
return null;
|
|
219
|
+
}
|
|
159
220
|
function detectStack(dir) {
|
|
160
221
|
const facts = {
|
|
161
222
|
PROJECT_NAME: path.basename(dir),
|
|
@@ -178,21 +239,18 @@ function detectStack(dir) {
|
|
|
178
239
|
if (pom.includes("hapi-fhir"))
|
|
179
240
|
parts.push("HAPI FHIR");
|
|
180
241
|
parts.push("Maven");
|
|
181
|
-
const
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
facts.PROJECT_NAME = name[1].trim();
|
|
185
|
-
else if (artifactId)
|
|
186
|
-
facts.PROJECT_NAME = artifactId[1].trim();
|
|
242
|
+
const projectName = pomProjectName(pom);
|
|
243
|
+
if (projectName)
|
|
244
|
+
facts.PROJECT_NAME = projectName;
|
|
187
245
|
facts.STACK = parts.join(", ");
|
|
188
246
|
facts.TESTING = pom.includes("testcontainers") ? "JUnit 5, Testcontainers" : "JUnit 5";
|
|
189
247
|
facts.TEST_CMD = sharedTestCommand(dir);
|
|
190
248
|
facts.detected = "pom.xml";
|
|
191
249
|
return facts;
|
|
192
250
|
}
|
|
193
|
-
const
|
|
194
|
-
|
|
195
|
-
if (gradle !== null) {
|
|
251
|
+
const gradleFile = ["build.gradle", "build.gradle.kts"].find((f) => readIfExists(path.join(dir, f)) !== null);
|
|
252
|
+
const gradle = gradleFile ? readIfExists(path.join(dir, gradleFile)) : null;
|
|
253
|
+
if (gradleFile && gradle !== null) {
|
|
196
254
|
const parts = [gradle.includes("kotlin") ? "Kotlin" : "Java"];
|
|
197
255
|
if (gradle.includes("spring-boot") || gradle.includes("org.springframework.boot")) {
|
|
198
256
|
parts.push("Spring Boot");
|
|
@@ -200,8 +258,11 @@ function detectStack(dir) {
|
|
|
200
258
|
parts.push("Gradle");
|
|
201
259
|
facts.STACK = parts.join(", ");
|
|
202
260
|
facts.TESTING = "JUnit 5";
|
|
261
|
+
const rootName = gradleRootProjectName(dir);
|
|
262
|
+
if (rootName)
|
|
263
|
+
facts.PROJECT_NAME = rootName;
|
|
203
264
|
facts.TEST_CMD = sharedTestCommand(dir);
|
|
204
|
-
facts.detected =
|
|
265
|
+
facts.detected = gradleFile;
|
|
205
266
|
return facts;
|
|
206
267
|
}
|
|
207
268
|
const pkgRaw = readIfExists(path.join(dir, "package.json"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AdoptCommand.js","sourceRoot":"","sources":["../../../../../scripts/cli/commands/project/AdoptCommand.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AdoptCommand.js","sourceRoot":"","sources":["../../../../../scripts/cli/commands/project/AdoptCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,6 +44,7 @@ const UpdateRequirementStatusUseCase_1 = require("../../../../packages/core/src/
|
|
|
44
44
|
const DoneVerification_1 = require("../../../../packages/core/src/domain/DoneVerification");
|
|
45
45
|
const HarnessConfigFile_1 = require("../../../../packages/core/src/infrastructure/HarnessConfigFile");
|
|
46
46
|
const node_child_process_1 = require("node:child_process");
|
|
47
|
+
const fs = __importStar(require("node:fs"));
|
|
47
48
|
const path = __importStar(require("node:path"));
|
|
48
49
|
const project_root_2 = require("../../../lib/project-root");
|
|
49
50
|
const derived_writes_1 = require("../../../lib/derived-writes");
|
|
@@ -171,6 +172,22 @@ class DoneCommand extends command_1.BaseCommand {
|
|
|
171
172
|
// generated matrix up to date before checking it, or `done --check`
|
|
172
173
|
// would refuse the very test that makes the requirement deliverable.
|
|
173
174
|
(0, MatrixCommand_1.refreshDerivedMatrix)(projectDir);
|
|
175
|
+
// Before the suite: a requirement waiting for an answer is refused in a
|
|
176
|
+
// second, with the reason, instead of after the slowest step (#72).
|
|
177
|
+
if (opts.check && exports.DELIVERED_STATUSES.includes(opts.status)) {
|
|
178
|
+
const tracePath = path.join(projectDir, "docs", "specs", "traceability.md");
|
|
179
|
+
const blocker = fs.existsSync(tracePath)
|
|
180
|
+
? (0, DoneVerification_1.deliveryBlocker)(fs.readFileSync(tracePath, "utf8"), opts.reqId)
|
|
181
|
+
: null;
|
|
182
|
+
if (blocker) {
|
|
183
|
+
io.fail(NULL_SHAPE, [
|
|
184
|
+
(0, diagnostics_1.error)(blocker.code, `not marked ${opts.status}: ${blocker.message}`, {
|
|
185
|
+
target: opts.reqId,
|
|
186
|
+
fix: blocker.fix,
|
|
187
|
+
}),
|
|
188
|
+
]);
|
|
189
|
+
}
|
|
190
|
+
}
|
|
174
191
|
const harness = (0, HarnessConfigFile_1.readHarnessConfig)(projectDir) || {};
|
|
175
192
|
const plan = (0, DoneVerification_1.planDoneVerification)(projectDir, {
|
|
176
193
|
check: opts.check,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DoneCommand.js","sourceRoot":"","sources":["../../../../../scripts/cli/commands/spec/DoneCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"DoneCommand.js","sourceRoot":"","sources":["../../../../../scripts/cli/commands/spec/DoneCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,6 +94,15 @@ function parseArgs(argv) {
|
|
|
94
94
|
function summarise(projectDir, traceContent) {
|
|
95
95
|
const rows = (0, PlanCommand_1.parseTraceability)(traceContent);
|
|
96
96
|
const items = rows.map((r) => (0, PlanCommand_1.classify)(r, projectDir)).filter((x) => x !== null);
|
|
97
|
+
// A requirement waiting for an answer is not work anyone can start: listing
|
|
98
|
+
// it as "a test and code" under To do invited exactly that (FinCore, #73).
|
|
99
|
+
const questions = questionsByRequirement(projectDir);
|
|
100
|
+
for (const it of items) {
|
|
101
|
+
if (it.status === "Needs Clarification" && it.category !== "DONE") {
|
|
102
|
+
it.category = "WAITING_FOR_ANSWER";
|
|
103
|
+
it.question = questions.get(it.requirement) || null;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
97
106
|
const counts = {
|
|
98
107
|
total: items.length,
|
|
99
108
|
DONE: 0,
|
|
@@ -102,6 +111,7 @@ function summarise(projectDir, traceContent) {
|
|
|
102
111
|
NEEDS_TEST: 0,
|
|
103
112
|
NEEDS_IMPLEMENTATION: 0,
|
|
104
113
|
NEEDS_STATUS_UPDATE: 0,
|
|
114
|
+
WAITING_FOR_ANSWER: 0,
|
|
105
115
|
};
|
|
106
116
|
for (const it of items)
|
|
107
117
|
counts[it.category] = (counts[it.category] || 0) + 1;
|
|
@@ -109,6 +119,33 @@ function summarise(projectDir, traceContent) {
|
|
|
109
119
|
const orphans = (0, PlanCommand_1.detectOrphans)(projectDir, items);
|
|
110
120
|
return { items, counts, pending, orphans, derived: (0, derived_writes_1.isDerivedProject)(projectDir) };
|
|
111
121
|
}
|
|
122
|
+
/**
|
|
123
|
+
* Requirement → the open question that blocks it, as `Q3 (docs/specs/…/questions.md)`,
|
|
124
|
+
* from every `questions.md` under docs/specs/changes (archived ones included:
|
|
125
|
+
* a draft is archived with its questions still open).
|
|
126
|
+
*/
|
|
127
|
+
function questionsByRequirement(projectDir) {
|
|
128
|
+
const found = new Map();
|
|
129
|
+
const walk = (dir) => {
|
|
130
|
+
if (!fs.existsSync(dir))
|
|
131
|
+
return;
|
|
132
|
+
for (const e of fs.readdirSync(dir, { withFileTypes: true })) {
|
|
133
|
+
const full = path.join(dir, e.name);
|
|
134
|
+
if (e.isDirectory())
|
|
135
|
+
walk(full);
|
|
136
|
+
else if (e.name === "questions.md") {
|
|
137
|
+
const rel = path.relative(projectDir, full).split(path.sep).join("/");
|
|
138
|
+
for (const q of (0, DraftChecklist_1.openQuestions)(fs.readFileSync(full, "utf8"))) {
|
|
139
|
+
for (const req of q.blocks)
|
|
140
|
+
if (!found.has(req))
|
|
141
|
+
found.set(req, `${q.row} (${rel})`);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
};
|
|
146
|
+
walk(path.join(projectDir, "docs", "specs", "changes"));
|
|
147
|
+
return found;
|
|
148
|
+
}
|
|
112
149
|
/** How many queue lines `status` prints before pointing at `plan` for the rest. */
|
|
113
150
|
const QUEUE_LIMIT = 12;
|
|
114
151
|
const TODO_CATEGORIES = ["NEEDS_FEATURE", "NEEDS_EVERYTHING", "NEEDS_TEST", "NEEDS_IMPLEMENTATION"];
|
|
@@ -125,6 +162,8 @@ function needsOf(item) {
|
|
|
125
162
|
return "its code";
|
|
126
163
|
case "NEEDS_STATUS_UPDATE":
|
|
127
164
|
return "its test is in place";
|
|
165
|
+
case "WAITING_FOR_ANSWER":
|
|
166
|
+
return item.question ? `an answer to ${String(item.question).split(" ")[0]}` : "an answer";
|
|
128
167
|
default:
|
|
129
168
|
return "";
|
|
130
169
|
}
|
|
@@ -191,6 +230,8 @@ function nextReason({ items, counts, orphans, derived }) {
|
|
|
191
230
|
return `write the test first, then record where it is`;
|
|
192
231
|
if (counts.total === 0)
|
|
193
232
|
return "no requirements yet";
|
|
233
|
+
if (counts.WAITING_FOR_ANSWER > 0)
|
|
234
|
+
return `${counts.WAITING_FOR_ANSWER} wait for an answer; everything else is implemented — run the gate`;
|
|
194
235
|
return "everything is implemented; run the gate";
|
|
195
236
|
}
|
|
196
237
|
function titleOf(item) {
|
|
@@ -217,6 +258,10 @@ function emitText(projectDir, summary, lock, notes = []) {
|
|
|
217
258
|
};
|
|
218
259
|
queue("Ready to close", ["NEEDS_STATUS_UPDATE"], c.green);
|
|
219
260
|
queue("To do", TODO_CATEGORIES, c.yellow);
|
|
261
|
+
queue("Waiting for an answer", ["WAITING_FOR_ANSWER"], c.dim);
|
|
262
|
+
const waiting = items.filter((it) => it.category === "WAITING_FOR_ANSWER" && it.question);
|
|
263
|
+
if (waiting.length > 0)
|
|
264
|
+
process.stdout.write(` ${c.dim}Questions: ${[...new Set(waiting.map((it) => it.question))].join(" · ")}${c.reset}\n`);
|
|
220
265
|
if (orphans.length > 0)
|
|
221
266
|
process.stdout.write(`\n ${c.red}${orphans.length} orphan feature file(s)${c.reset} ${c.dim}— not in the matrix${c.reset}\n`);
|
|
222
267
|
if (notes.length > 0) {
|
|
@@ -250,6 +295,7 @@ function emitJson(projectDir, summary, lock, notes = []) {
|
|
|
250
295
|
title: titleOf(it) || null,
|
|
251
296
|
category: it.category,
|
|
252
297
|
needs: needsOf(it) || null,
|
|
298
|
+
...(it.category === "WAITING_FOR_ANSWER" ? { question: it.question || null } : {}),
|
|
253
299
|
})),
|
|
254
300
|
nextCommand: nextCommandPlain(summary),
|
|
255
301
|
status: notes,
|