@application-kit/acceptance 0.1.0 → 0.17.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @application-kit/acceptance
 
+## 0.17.0
+
+No changes in this release.
+
+## 0.1.1
+
+### Patch Changes
+
+- 8458cb7: `classes` и `links` видят story продукта, когда репозиторий тестов — его подкаталог: задачи читаются с коммита текущего checkout. Сценарии критериев старого формата `AC-22.10.` засчитываются своей story.
+
 ## 0.1.0
 
 ### Minor Changes

package/dist/cjs/scenarios/classify.js

@@ -16,15 +16,17 @@ const revisionStoryFiles = async (cwd, project, revision) => {
         .toReversed();
     return new Map(files.map((file) => [(0, projects_js_1.storyKey)(file), file]));
 };
-const storyPrefix = (story) => {
+const storyPrefixes = (story) => {
     const groups = storyNumber.exec(story.key)?.groups;
-    return groups === undefined ? undefined : `${story.project}:AC-${groups.epic}-${groups.story}.`;
+    return groups === undefined
+        ? []
+        : ['-', '.'].map((separator) => `${story.project}:AC-${groups.epic}${separator}${groups.story}.`);
 };
 const storyIds = (scenarios, story) => {
-    const prefix = storyPrefix(story);
+    const prefixes = storyPrefixes(story);
     const linked = (0, acceptance_class_js_1.storyLinks)(story.text, scenarios.config).map(([, tag]) => tag);
     const known = [...scenarios.ids.keys(), ...scenarios.removed.keys()];
-    const prefixed = prefix === undefined ? [] : known.filter((id) => id.startsWith(prefix));
+    const prefixed = known.filter((id) => prefixes.some((prefix) => id.startsWith(prefix)));
     return (0, python_text_js_1.sortedText)(new Set([...linked, ...prefixed]));
 };
 const scenarioOutcome = (scenarios, story, found) => {

package/dist/cjs/scenarios/projects.js

@@ -38,15 +38,21 @@ const skipNote = (name, commit, revision) => {
     return `проект ${name} пропущен — нет ${missing}${revision}`;
 };
 const isText = (text) => text !== undefined && text !== '';
-const foreignProject = async (input, name) => {
-    const repo = (0, features_js_1.joinPath)(input.projects, name);
-    const revision = input.revisions.get(name) ?? 'origin/main';
+const projectAtRevision = async (input, source) => {
+    const { name, repo } = source;
+    const revision = input.revisions.get(name) ?? source.fallback;
     const commit = await (0, git_js_1.git)(input.cwd, repo, ['rev-parse', '--verify', '-q', `${revision}${commitSuffix}`]);
     const board = await (0, git_js_1.git)(input.cwd, repo, ['show', `${revision}:${ownBoard}`]);
     return !isText(board) || !isText(commit)
         ? skipNote(name, commit, revision)
         : { board, commit: commit.trim(), name, repo, revision };
 };
+const foreignProject = async (input, name) => projectAtRevision(input, { fallback: 'origin/main', name, repo: (0, features_js_1.joinPath)(input.projects, name) });
+const hostRoot = async (cwd) => {
+    const output = await (0, git_js_1.git)(cwd, git_js_1.currentRepo, ['rev-parse', '--show-cdup']);
+    const root = output?.trim();
+    return root === '' ? undefined : root;
+};
 const ownProject = (name) => ({
     board: undefined,
     commit: undefined,
@@ -56,7 +62,12 @@ const ownProject = (name) => ({
 });
 const probe = async (input, own, name) => {
     const common = await (0, git_js_1.commonDirectory)(input.cwd, (0, features_js_1.joinPath)(input.projects, name));
-    return own !== undefined && common === own ? ownProject(name) : foreignProject(input, name);
+    if (own.common === undefined || common !== own.common) {
+        return foreignProject(input, name);
+    }
+    return own.host === undefined
+        ? ownProject(name)
+        : projectAtRevision(input, { fallback: 'HEAD', name, repo: own.host });
 };
 const checkRevisions = (input, names) => {
     const unknown = (0, python_text_js_1.sortedText)([...input.revisions.keys()].filter((name) => !names.includes(name)));
@@ -71,7 +82,7 @@ const withOwn = (found, hasOwnBoard) => {
     return isOwnSeen || !hasOwnBoard ? projects : [...projects, ownProject('.')];
 };
 const walkProjects = async (input) => {
-    const own = await (0, git_js_1.commonDirectory)(input.cwd, git_js_1.currentRepo);
+    const own = { common: await (0, git_js_1.commonDirectory)(input.cwd, git_js_1.currentRepo), host: await hostRoot(input.cwd) };
     const names = await projectNames(input.cwd, input.projects);
     checkRevisions(input, names);
     const hasOwnBoard = await (0, features_js_1.isFile)(input.cwd, ownBoard);

package/dist/esm/scenarios/classify.js

@@ -13,15 +13,17 @@ const revisionStoryFiles = async (cwd, project, revision) => {
         .toReversed();
     return new Map(files.map((file) => [storyKey(file), file]));
 };
-const storyPrefix = (story) => {
+const storyPrefixes = (story) => {
     const groups = storyNumber.exec(story.key)?.groups;
-    return groups === undefined ? undefined : `${story.project}:AC-${groups.epic}-${groups.story}.`;
+    return groups === undefined
+        ? []
+        : ['-', '.'].map((separator) => `${story.project}:AC-${groups.epic}${separator}${groups.story}.`);
 };
 const storyIds = (scenarios, story) => {
-    const prefix = storyPrefix(story);
+    const prefixes = storyPrefixes(story);
     const linked = storyLinks(story.text, scenarios.config).map(([, tag]) => tag);
     const known = [...scenarios.ids.keys(), ...scenarios.removed.keys()];
-    const prefixed = prefix === undefined ? [] : known.filter((id) => id.startsWith(prefix));
+    const prefixed = known.filter((id) => prefixes.some((prefix) => id.startsWith(prefix)));
     return sortedText(new Set([...linked, ...prefixed]));
 };
 const scenarioOutcome = (scenarios, story, found) => {

package/dist/esm/scenarios/projects.js

@@ -31,15 +31,21 @@ const skipNote = (name, commit, revision) => {
     return `проект ${name} пропущен — нет ${missing}${revision}`;
 };
 const isText = (text) => text !== undefined && text !== '';
-const foreignProject = async (input, name) => {
-    const repo = joinPath(input.projects, name);
-    const revision = input.revisions.get(name) ?? 'origin/main';
+const projectAtRevision = async (input, source) => {
+    const { name, repo } = source;
+    const revision = input.revisions.get(name) ?? source.fallback;
     const commit = await git(input.cwd, repo, ['rev-parse', '--verify', '-q', `${revision}${commitSuffix}`]);
     const board = await git(input.cwd, repo, ['show', `${revision}:${ownBoard}`]);
     return !isText(board) || !isText(commit)
         ? skipNote(name, commit, revision)
         : { board, commit: commit.trim(), name, repo, revision };
 };
+const foreignProject = async (input, name) => projectAtRevision(input, { fallback: 'origin/main', name, repo: joinPath(input.projects, name) });
+const hostRoot = async (cwd) => {
+    const output = await git(cwd, currentRepo, ['rev-parse', '--show-cdup']);
+    const root = output?.trim();
+    return root === '' ? undefined : root;
+};
 const ownProject = (name) => ({
     board: undefined,
     commit: undefined,
@@ -49,7 +55,12 @@ const ownProject = (name) => ({
 });
 const probe = async (input, own, name) => {
     const common = await commonDirectory(input.cwd, joinPath(input.projects, name));
-    return own !== undefined && common === own ? ownProject(name) : foreignProject(input, name);
+    if (own.common === undefined || common !== own.common) {
+        return foreignProject(input, name);
+    }
+    return own.host === undefined
+        ? ownProject(name)
+        : projectAtRevision(input, { fallback: 'HEAD', name, repo: own.host });
 };
 const checkRevisions = (input, names) => {
     const unknown = sortedText([...input.revisions.keys()].filter((name) => !names.includes(name)));
@@ -64,7 +75,7 @@ const withOwn = (found, hasOwnBoard) => {
     return isOwnSeen || !hasOwnBoard ? projects : [...projects, ownProject('.')];
 };
 export const walkProjects = async (input) => {
-    const own = await commonDirectory(input.cwd, currentRepo);
+    const own = { common: await commonDirectory(input.cwd, currentRepo), host: await hostRoot(input.cwd) };
     const names = await projectNames(input.cwd, input.projects);
     checkRevisions(input, names);
     const hasOwnBoard = await isFile(input.cwd, ownBoard);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@application-kit/acceptance",
-  "version": "0.1.0",
+  "version": "0.17.0",
   "description": "Инструмент репозитория приёмочных тестов: команда application-scenarios (lint, removed, links, classes, coverage, inventory) по feature-файлам и story проектов, каденс прогона, реестр окружений и чтение учётных данных окружения",
   "keywords": [
     "acceptance",