npm - @nocobase/app-plugin-projects - Versions diffs - 0.1.0-beta.2 → 0.1.0-beta.20 - Mend

@nocobase/app-plugin-projects 0.1.0-beta.2 → 0.1.0-beta.20

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 (774) hide show

package/dist/server/domains/subtasks/subtask.release.js CHANGED Viewed

@@ -3,13 +3,13 @@ import { blockersOf, catalogsFor } from './subtask.blocking.js';
 import { incoming } from './subtask.store.js';
 import './subtask.events.js';
 const eventActor = (actor) => ({ type: actor.type, id: actor.id });
-/** Tells the issue nothing holds it any more, when that is so. */
+/** Called after removing an actual wait; tells the issue when nothing holds it any more. */
 export async function releaseIfFree(deps, tx, catalogs, issue, releasedBy, actor) {
     if (issue.deletedAt || (await catalogs.terminal(issue)))
         return;
     if ((await blockersOf(tx.conn, catalogs, issue)).length > 0)
         return;
-    await deps.triggers().onUnblocked?.(tx, { issue, releasedBy });
+    await deps.triggers().onUnblocked?.(tx, { issue, releasedBy, actor });
     tx.emit({ type: 'issue.changed', issueId: issue.id });
     tx.emit({
         type: 'issue.dependencyReleased',
@@ -33,7 +33,7 @@ async function join(deps, tx, catalogs, finished, actor) {
     const before = await findIssue(tx.conn, parentId);
     if (!before || before.deletedAt)
         return;
-    // Writing the parent's row locks it until the transaction ends: siblings finishing at once take turns here.
+    // The originating transition took the graph guard before writing the child; keep that order for this parent too.
     await updateIssue(tx.conn, parentId, {
         lastActivityAt: new Date().toISOString(),
     });
@@ -67,10 +67,8 @@ async function join(deps, tx, catalogs, finished, actor) {
             parent,
             stage: null,
             childIssueIds: children.map((child) => child.id),
+            actor,
         });
-        await deps
-            .issues()
-            .fireEvent(tx, parent.id, 'subtasks.done', { issueId: finished.id });
         return;
     }
     if (finished.stage === null || finished.deletedAt)
@@ -82,12 +80,15 @@ async function join(deps, tx, catalogs, finished, actor) {
             parent,
             stage: finished.stage,
             childIssueIds: stage.map((child) => child.id),
+            actor,
         });
     }
 }
 /** `finished` entered a finished status, or was deleted: release what waited for it, then join at its parent. */
 export async function onTerminal(deps, tx, finished, actor) {
     const catalogs = catalogsFor(deps.statuses, tx.conn);
+    // Completing an issue releases waits; deleting one that was already terminal does not release them again.
+    const releasesWaits = !finished.deletedAt || !(await catalogs.terminal(finished));
     const waiting = (await incoming(tx.conn, [finished.id], 'blockedBy')).map((dependency) => dependency.issueId);
     const candidates = await findIssues(tx.conn, waiting);
     if (finished.parentIssueId && finished.stage !== null) {
@@ -101,7 +102,8 @@ export async function onTerminal(deps, tx, finished, actor) {
         if (seen.has(candidate.id))
             continue;
         seen.add(candidate.id);
-        await releaseIfFree(deps, tx, catalogs, candidate, finished, actor);
+        if (releasesWaits)
+            await releaseIfFree(deps, tx, catalogs, candidate, finished, actor);
     }
     await join(deps, tx, catalogs, finished, actor);
 }

package/dist/server/domains/subtasks/subtask.release.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"subtask.release.js","sourceRoot":"","sources":["../../../../server/domains/subtasks/subtask.release.ts"],"names":[],"mappings":"~~AAeA~~,OAAO,EACL,SAAS,EACT,UAAU,EACV,YAAY,EACZ,WAAW,GAGZ,MAAM,oBAAoB,CAAC;~~AAE5B~~,OAAO,EAAE,UAAU,EAAE,WAAW,EAAiB,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,qBAAqB,CAAC;~~AAQ7B~~,MAAM,UAAU,GAAG,CAAC,KAAY,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;AAE1E,~~kEAAkE~~;~~AAClE~~,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAiB,EACjB,EAAM,EACN,QAAkB,EAClB,KAAY,EACZ,UAAiB,EACjB,KAAY;IAEZ,IAAI,KAAK,CAAC,SAAS,IAAI,CAAC,MAAM,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAAE,OAAO;IAChE,IAAI,CAAC,MAAM,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO;IACpE,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;~~IAC/D~~,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IACtD,EAAE,CAAC,IAAI,CAAC;QACN,IAAI,EAAE,0BAA0B;QAChC,OAAO,EAAE,KAAK,CAAC,EAAE;QACjB,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,UAAU,EAAE;YACV,OAAO,EAAE,UAAU,CAAC,EAAE;YACtB,UAAU,EAAE,UAAU,CAAC,UAAU;YACjC,QAAQ,EAAE,UAAU,CAAC,QAAQ;SAC9B;QACD,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC;KACzB,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,IAAI,CACjB,IAAiB,EACjB,EAAM,EACN,QAAkB,EAClB,QAAe,EACf,KAAY;IAEZ,MAAM,QAAQ,GAAG,QAAQ,CAAC,aAAa,CAAC;IACxC,IAAI,CAAC,QAAQ;QAAE,OAAO;IACtB,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAClD,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,SAAS;QAAE,OAAO;IACxC,~~4GAA4G~~;~~IAC5G~~,MAAM,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE;QACnC,cAAc,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KACzC,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,CAAC,MAAM,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAU,CAAC;IAC7D,IAAI,MAAM,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO;IAC5C,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAClC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAmB,CAAC;IACxC,KAAK,MAAM,KAAK,IAAI,QAAQ;QAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IACrD,MAAM,KAAK,GAAG,CAAC,KAAoB,EAAE,OAAyB,EAAE,EAAE;QAChE,EAAE,CAAC,IAAI,CAAC;YACN,IAAI,EAAE,iBAAiB;YACvB,aAAa,EAAE,MAAM,CAAC,EAAE;YACxB,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,KAAK;YACL,GAAG,EAAE,KAAK,KAAK,IAAI;YACnB,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/C,UAAU,EAAE,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;YACjE,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC;SACzB,CAAC,CAAC;QACH,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC;IACF,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAClD,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACtB,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,kBAAkB,EAAE,CAAC,EAAE,EAAE;YAC7C,MAAM;YACN,KAAK,EAAE,IAAI;YACX,aAAa,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;~~SACjD~~,~~CAAC,CAAC~~;~~QACH~~,~~MAAM,IAAI;aACP,MAAM,EAAE;aACR,SAAS,~~CAAC,~~EAAE,EAAE,MAAM,~~CAAC~~,EAAE,EAAE,eAAe,EAAE,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC~~;~~QACvE~~,OAAO;IACT,CAAC;IACD,IAAI,QAAQ,CAAC,KAAK,KAAK,IAAI,IAAI,QAAQ,CAAC,SAAS;QAAE,OAAO;IAC1D,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QACnE,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC7B,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,kBAAkB,EAAE,CAAC,EAAE,EAAE;YAC7C,MAAM;YACN,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;~~SAC9C~~,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,iHAAiH;AACjH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAAiB,EACjB,EAAM,EACN,QAAe,EACf,KAAY;IAEZ,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CACvE,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CACnC,CAAC;IACF,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACtD,IAAI,QAAQ,CAAC,aAAa,IAAI,QAAQ,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;QACtD,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC;QAC3B,KAAK,MAAM,OAAO,IAAI,MAAM,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YACzE,IAAI,OAAO,CAAC,KAAK,KAAK,IAAI,IAAI,OAAO,CAAC,KAAK,GAAG,GAAG;gBAC/C,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,GAAG,CAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5C,KAAK,MAAM,SAAS,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;QACvE,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAAE,SAAS;QACrC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACvB,MAAM,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;~~IACtE~~,CAAC;IACD,MAAM,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;AAClD,CAAC"}
1	+ {"version":3,"file":"subtask.release.js","sourceRoot":"","sources":["../../../../server/domains/subtasks/subtask.release.ts"],"names":[],"mappings":"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"}

package/dist/server/domains/subtasks/subtask.routes.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@ import { type ViewerEnv } from '../../access/request.js';
 import type { SubtaskService } from './subtask.service.js';
 /**
  * Under `/api/projects/issues`: `POST /{issueId}/dependencies` (201, the link as the issue page shows it),
+ * `PATCH /{issueId}/dependencies/{dependencyId}` (200, changes its type in place),
  * `DELETE /{issueId}/dependencies/{dependencyId}` and `POST /{issueId}/removeDependency { dependsOnIssueId, type? }`
  * (204), which removes the link by the other issue.
  */

package/dist/server/domains/subtasks/subtask.routes.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"subtask.routes.d.ts","sourceRoot":"","sources":["../../../../server/domains/subtasks/subtask.routes.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,~~EAGL~~,KAAK,SAAS,EACf,MAAM,yBAAyB,CAAC;~~AASjC~~,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAK3D~~;;;;GAIG~~;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,~~CAyJ7E~~"}
1	+ {"version":3,"file":"subtask.routes.d.ts","sourceRoot":"","sources":["../../../../server/domains/subtasks/subtask.routes.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,yBAAyB,CAAC;AAWjC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAK3D;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,CA2M7E"}

package/dist/server/domains/subtasks/subtask.routes.js CHANGED Viewed

@@ -1,10 +1,12 @@
 import { apiErrorResponse, apiErrorResponses, apiValidator, cliRoute, dataResponse, describeRoute, emptyResponse, } from '@nocobase/app-server/router';
-import { delegatedWrite, viewerOf, } from '../../access/request.js';
+import { delegatedWrite, refuseDelegated, viewerOf, } from '../../access/request.js';
 import { domainRouter, personOrRunSecurity, tags } from '../../kernel/http.js';
-import { AddDependencyBody, DependencyParams, IssueDependencySchema, IssueParams, RemoveDependencyBody, } from '../../routes/schemas.js';
+import { AddDependencyBody, DependencyParams, IssueDependencySchema, IssueParams, RemoveDependencyBody, UpdateDependencyBody, } from '../../routes/schemas.js';
+import { requireEditor } from '../issues/index.js';
 const access = 'Needs `edit` on the issue. `issueId` and `dependsOnIssueId` are ids or identifiers.';
 /**
  * Under `/api/projects/issues`: `POST /{issueId}/dependencies` (201, the link as the issue page shows it),
+ * `PATCH /{issueId}/dependencies/{dependencyId}` (200, changes its type in place),
  * `DELETE /{issueId}/dependencies/{dependencyId}` and `POST /{issueId}/removeDependency { dependsOnIssueId, type? }`
  * (204), which removes the link by the other issue.
  */
@@ -33,7 +35,7 @@ export function createSubtaskRoutes(subtasks) {
             ...apiErrorResponses,
             400: apiErrorResponse(400, 'When `dependsOnIssueId` names no issue the caller sees or the issue itself (`INVALID_DEPENDENCY`), or the link would make issues wait in a cycle (`DEPENDENCY_CYCLE`) or too deep a chain (`DEPENDENCY_TOO_DEEP`).'),
             404: apiErrorResponse(404),
-            409: apiErrorResponse(409, 'When the issues are already linked (`DEPENDENCY_EXISTS`).'),
+            409: apiErrorResponse(409, 'When the issues are already linked (`DEPENDENCY_EXISTS`), or concurrent graph changes require reloading and retrying (`DEPENDENCY_GRAPH_CHANGED`).'),
         },
     }), apiValidator('param', IssueParams), apiValidator('json', AddDependencyBody), async (context) => {
         const { issueId } = context.req.valid('param');
@@ -61,6 +63,30 @@ export function createSubtaskRoutes(subtasks) {
             data: await subtasks.addDependency(viewerOf(context), issueId, input),
         }, 201);
     });
+    routes.patch('/:issueId/dependencies/:dependencyId', async (context, next) => {
+        requireEditor(viewerOf(context));
+        refuseDelegated(context);
+        await next();
+    }, describeRoute({
+        tags,
+        summary: 'Change an issue relationship type',
+        operationId: 'projectsUpdateIssueDependency',
+        // The issue page names a relationship row; the CLI links and unlinks by the other issue.
+        ...cliRoute(false),
+        description: `${access} Changes the link in one transaction and keeps its id. A related link may be changed from either end; the current issue waits when the new type is blockedBy. An existing target type is refused without removing either link.`,
+        responses: {
+            200: dataResponse(IssueDependencySchema),
+            ...apiErrorResponses,
+            400: apiErrorResponse(400, 'The target is no longer visible, the change would create a dependency cycle, or a delegated caller needs a confirmed plan (PLAN_REQUIRED).'),
+            404: apiErrorResponse(404),
+            409: apiErrorResponse(409, 'The relationship changed (DEPENDENCY_CHANGED), the target type already exists (DEPENDENCY_EXISTS), or concurrent graph changes require reloading and retrying (DEPENDENCY_GRAPH_CHANGED).'),
+        },
+    }), apiValidator('param', DependencyParams), apiValidator('json', UpdateDependencyBody), async (context) => {
+        const { issueId, dependencyId } = context.req.valid('param');
+        return context.json({
+            data: await subtasks.updateDependency(viewerOf(context), issueId, dependencyId, context.req.valid('json')),
+        });
+    });
     routes.delete('/:issueId/dependencies/:dependencyId', describeRoute({
         tags,
         summary: 'Remove a dependency by its id',
@@ -72,6 +98,7 @@ export function createSubtaskRoutes(subtasks) {
             204: emptyResponse(),
             ...apiErrorResponses,
             404: apiErrorResponse(404),
+            409: apiErrorResponse(409, 'When the dependency graph changed (DEPENDENCY_GRAPH_CHANGED): reload and retry.'),
         },
     }), apiValidator('param', DependencyParams), async (context) => {
         const { issueId, dependencyId } = context.req.valid('param');
@@ -103,6 +130,7 @@ export function createSubtaskRoutes(subtasks) {
             204: emptyResponse(),
             ...apiErrorResponses,
             404: apiErrorResponse(404),
+            409: apiErrorResponse(409, 'When the dependency graph changed (DEPENDENCY_GRAPH_CHANGED): reload and retry.'),
         },
     }), apiValidator('param', IssueParams), apiValidator('json', RemoveDependencyBody), async (context) => {
         const { dependsOnIssueId, type } = context.req.valid('json');

package/dist/server/domains/subtasks/subtask.routes.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"subtask.routes.js","sourceRoot":"","sources":["../../../../server/domains/subtasks/subtask.routes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,aAAa,GACd,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EACL,cAAc,EACd,QAAQ,GAET,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,qBAAqB,EACrB,WAAW,EACX,oBAAoB,GACrB,MAAM,yBAAyB,CAAC;~~AAGjC~~,MAAM,MAAM,GACV,qFAAqF,CAAC;AAExF~~;;;;GAIG~~;AACH,MAAM,UAAU,mBAAmB,CAAC,QAAwB;IAC1D,MAAM,MAAM,GAAG,YAAY,EAAa,CAAC;IACzC,MAAM,CAAC,IAAI,CACT,wBAAwB,EACxB,aAAa,CAAC;QACZ,IAAI;QACJ,OAAO,EAAE,8BAA8B;QACvC,WAAW,EAAE,4BAA4B;QACzC,QAAQ,EAAE,mBAAmB;QAC7B,GAAG,QAAQ,CAAC;YACV,OAAO,EAAE,sBAAsB;YAC/B,IAAI,EAAE,CAAC,SAAS,EAAE,kBAAkB,CAAC;YACrC,KAAK,EAAE;gBACL,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;gBAC1B,gBAAgB,EAAE;oBAChB,IAAI,EAAE,WAAW;oBACjB,WAAW,EAAE,8CAA8C;iBAC5D;aACF;YACD,MAAM,EAAE,gBAAgB;SACzB,CAAC;QACF,WAAW,EAAE,GAAG,MAAM,0GAA0G;QAChI,SAAS,EAAE;YACT,GAAG,EAAE,YAAY,CAAC,qBAAqB,CAAC;YACxC,GAAG,iBAAiB;YACpB,GAAG,EAAE,gBAAgB,CACnB,GAAG,EACH,oNAAoN,CACrN;YACD,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC;YAC1B,GAAG,EAAE,gBAAgB,CACnB,GAAG,EACH,~~2DAA2D~~,~~CAC5D~~;SACF;KACF,CAAC,EACF,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,EAClC,YAAY,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACvC,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE;YAC9C,KAAK,EAAE,QAAQ,OAAO,QAAQ,KAAK,CAAC,gBAAgB,EAAE;YACtD,IAAI,EAAE;gBACJ;oBACE,EAAE,EAAE,YAAY;oBAChB,MAAM,EAAE;wBACN,MAAM,EAAE,KAAK;wBACb,KAAK,EAAE,OAAO;wBACd,SAAS,EAAE,KAAK,CAAC,gBAAgB;wBACjC,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,WAAW;qBAChC;iBACF;aACF;SACF,CAAC,CAAC;QACH,IAAI,SAAS;YACX,OAAO,OAAO,CAAC,IAAI,CACjB;gBACE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,IAAI,IAAI;gBACrD,IAAI,EAAE,SAAS,CAAC,IAAI;aACrB,EACD,GAAG,CACJ,CAAC;QACJ,OAAO,OAAO,CAAC,IAAI,CACjB;YACE,IAAI,EAAE,MAAM,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC;SACtE,EACD,GAAG,CACJ,CAAC;IACJ,CAAC,CACF,CAAC;IACF,MAAM,CAAC,MAAM,CACX,sCAAsC,EACtC,aAAa,CAAC;QACZ,IAAI;QACJ,OAAO,EAAE,+BAA+B;QACxC,WAAW,EAAE,+BAA+B;QAC5C,qGAAqG;QACrG,GAAG,QAAQ,CAAC,KAAK,CAAC;QAClB,WAAW,EAAE,MAAM;QACnB,SAAS,EAAE;YACT,GAAG,EAAE,aAAa,EAAE;YACpB,GAAG,iBAAiB;YACpB,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC;~~SAC3B~~;KACF,CAAC,EACF,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,EACvC,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7D,MAAM,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;QAC1E,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACjC,CAAC,CACF,CAAC;IACF,MAAM,CAAC,IAAI,CACT,4BAA4B,EAC5B,aAAa,CAAC;QACZ,IAAI;QACJ,OAAO,EAAE,wCAAwC;QACjD,WAAW,EAAE,+BAA+B;QAC5C,QAAQ,EAAE,mBAAmB;QAC7B,GAAG,QAAQ,CAAC;YACV,OAAO,EAAE,yBAAyB;YAClC,IAAI,EAAE,CAAC,SAAS,EAAE,kBAAkB,CAAC;YACrC,KAAK,EAAE;gBACL,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;gBAC1B,gBAAgB,EAAE;oBAChB,IAAI,EAAE,WAAW;oBACjB,WAAW,EAAE,8CAA8C;iBAC5D;aACF;YACD,MAAM,EAAE,gBAAgB;SACzB,CAAC;QACF,WAAW,EAAE,GAAG,MAAM,mFAAmF;QACzG,SAAS,EAAE;YACT,GAAG,EAAE;gBACH,WAAW,EACT,oJAAoJ;aACvJ;YACD,GAAG,EAAE,aAAa,EAAE;YACpB,GAAG,iBAAiB;YACpB,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC;~~SAC3B~~;KACF,CAAC,EACF,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,EAClC,YAAY,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC1C,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7D,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE;YAC9C,KAAK,EAAE,UAAU,OAAO,QAAQ,gBAAgB,EAAE;YAClD,IAAI,EAAE;gBACJ;oBACE,EAAE,EAAE,YAAY;oBAChB,MAAM,EAAE;wBACN,MAAM,EAAE,QAAQ;wBAChB,KAAK,EAAE,OAAO;wBACd,SAAS,EAAE,gBAAgB;wBAC3B,IAAI,EAAE,IAAI,IAAI,WAAW;qBAC1B;iBACF;aACF;SACF,CAAC,CAAC;QACH,IAAI,SAAS;YAAE,OAAO,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;QACzE,MAAM,QAAQ,CAAC,kBAAkB,CAC/B,QAAQ,CAAC,OAAO,CAAC,EACjB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,EAClC,gBAAgB,EAChB,IAAI,CACL,CAAC;QACF,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACjC,CAAC,CACF,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC"}
1	+ {"version":3,"file":"subtask.routes.js","sourceRoot":"","sources":["../../../../server/domains/subtasks/subtask.routes.ts"],"names":[],"mappings":"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"}

package/dist/server/domains/subtasks/subtask.service.d.ts CHANGED Viewed

@@ -4,21 +4,22 @@
  * and both issues visible; the "blocks" side is read-only (the link belongs to the issue that waits).
  *
  * Toward the issues domain this implements `IssueRelations` (linking on create, cycle checks, release and join), the
- * extras the issue page and list show, and the checks the `subtasksDone` and `blockersDone` workflow rules make.
+ * extras the issue page and list show.
  */
 import type { DatabaseConnection } from '@nocobase/db';
 import type { Issue } from '../../../shared/issues.js';
-import { type AddDependencyRequest, type Blocker, type IssueDependency } from '../../../shared/subtasks.js';
+import { type AddDependencyRequest, type Blocker, type IssueDependency, type UpdateDependencyRequest } from '../../../shared/subtasks.js';
 import type { Viewer } from '../../access/viewer.js';
 import type { ActivityRecorder } from '../../kernel/activity.js';
 import type { IdSource } from '../../kernel/ids.js';
 import type { KindRegistry } from '../../kernel/kinds.js';
 import type { TxRunner } from '../../kernel/tx.js';
 import { type IssueExtras, type IssueRelations } from '../issues/index.js';
-import type { RelationChecks } from '../workflows/index.js';
 import { type ReleaseDeps } from './subtask.release.js';
 export interface SubtaskService {
     addDependency(viewer: Viewer, idOrKey: string, input: AddDependencyRequest): Promise<IssueDependency>;
+    /** Changes one link in place. An existing target type is refused rather than merging two links. */
+    updateDependency(viewer: Viewer, idOrKey: string, dependencyId: string, input: UpdateDependencyRequest): Promise<IssueDependency>;
     removeDependency(viewer: Viewer, idOrKey: string, dependencyId: string): Promise<void>;
     /** By the other issue and type (`blockedBy` when left out). */
     removeDependencyTo(viewer: Viewer, idOrKey: string, dependsOnIssueId: string, type?: string): Promise<void>;
@@ -31,8 +32,7 @@ export interface SubtaskService {
      */
     visibleBlockers(viewer: Viewer, issueIds: readonly string[]): Promise<Map<string, Blocker[]>>;
     readonly relations: IssueRelations;
-    readonly checks: RelationChecks;
-    readonly extras: Pick<IssueExtras, 'relations' | 'listCounts'>;
+    readonly extras: Pick<IssueExtras, 'relations' | 'listCounts' | 'blockedIds'>;
 }
 export interface SubtaskDeps extends ReleaseDeps {
     readonly tx: TxRunner;

package/dist/server/domains/subtasks/subtask.service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"subtask.service.d.ts","sourceRoot":"","sources":["../../../../server/domains/subtasks/subtask.service.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAEL,KAAK,oBAAoB,EACzB,KAAK,OAAO,EAEZ,KAAK,eAAe,~~EAErB~~,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAIjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EAAM,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,~~EAQL~~,KAAK,WAAW,EAChB,KAAK,cAAc,EACpB,MAAM,oBAAoB,CAAC;~~AAC5B~~,OAAO,~~KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAS5D,OAAO,~~EAGL,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;~~AAW9B~~,MAAM,WAAW,cAAc;IAC7B,aAAa,CACX,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,eAAe,CAAC,CAAC;IAC5B,gBAAgB,CACd,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,+DAA+D;IAC/D,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,EACxB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,oGAAoG;IACpG,UAAU,CAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IACvE;;;;OAIG;IACH,eAAe,CACb,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,SAAS,MAAM,EAAE,GAC1B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IACnC,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,~~cAAc,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,~~IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,YAAY,CAAC,CAAC;~~CAChE~~;AAED,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC9C,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;CAC9B;AAYD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,WAAW,GAAG,cAAc,~~CA8XtE~~"}
1	+ {"version":3,"file":"subtask.service.d.ts","sourceRoot":"","sources":["../../../../server/domains/subtasks/subtask.service.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAEL,KAAK,oBAAoB,EACzB,KAAK,OAAO,EAEZ,KAAK,eAAe,EAEpB,KAAK,uBAAuB,EAC7B,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAIjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EAAM,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EASL,KAAK,WAAW,EAChB,KAAK,cAAc,EACpB,MAAM,oBAAoB,CAAC;AAW5B,OAAO,EAGL,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAY9B,MAAM,WAAW,cAAc;IAC7B,aAAa,CACX,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,eAAe,CAAC,CAAC;IAC5B,mGAAmG;IACnG,gBAAgB,CACd,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,uBAAuB,GAC7B,OAAO,CAAC,eAAe,CAAC,CAAC;IAC5B,gBAAgB,CACd,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,+DAA+D;IAC/D,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,EACxB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,oGAAoG;IACpG,UAAU,CAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IACvE;;;;OAIG;IACH,eAAe,CACb,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,SAAS,MAAM,EAAE,GAC1B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IACnC,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,YAAY,GAAG,YAAY,CAAC,CAAC;CAC/E;AAED,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC9C,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;CAC9B;AAYD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,WAAW,GAAG,cAAc,CAietE"}

package/dist/server/domains/subtasks/subtask.service.js CHANGED Viewed

@@ -1,11 +1,12 @@
 import { DEPENDENCY_TYPES, } from '../../../shared/subtasks.js';
 import { isUniqueViolation } from '../../kernel/db.js';
 import { conflict, invalid, notFound } from '../../kernel/errors.js';
-import { canSee, childCounts, findIssue, findIssues, liveChildren, requireEditor, requireVisible, } from '../issues/index.js';
-import { blockedCounts, blockersOf, blockersOfMany, catalogsFor, } from './subtask.blocking.js';
+import { canSee, childCounts, findIssue, findIssues, liveChildren, requireEditor, requireVisible, visibleIssueIds, } from '../issues/index.js';
+import { blockedCounts, blockersOf, blockersOfMany, blockedAmong, catalogsFor, } from './subtask.blocking.js';
 import { assertNoCycleThrough } from './subtask.graph.js';
+import { lockIssueGraph } from './subtask.guard.js';
 import { onTerminal, releaseIfFree, } from './subtask.release.js';
-import { deleteDependency, findDependency, findDependencyBetween, incoming, insertDependency, outgoing, } from './subtask.store.js';
+import { deleteDependency, findDependency, findDependencyBetween, incoming, insertDependency, outgoing, updateDependency, } from './subtask.store.js';
 function dependencyType(value) {
     if (value === undefined)
         return 'blockedBy';
@@ -73,16 +74,22 @@ export function createSubtaskService(deps) {
         await deps.tx.run(async (tx) => {
             const issue = await requireVisible(tx.conn, viewer, idOrKey);
             requireEditor(viewer);
+            // Conversion keeps the link id: protect the type and endpoints used by removal and its release effects.
+            await lockIssueGraph(tx.conn);
             const dependency = await find(tx.conn, issue);
             if (!dependency)
                 throw notFound('Dependency');
-            await deleteDependency(tx.conn, dependency.id);
             const ends = await findIssues(tx.conn, [
                 dependency.issueId,
                 dependency.dependsOnIssueId,
             ]);
             const waiting = ends.find((end) => end.id === dependency.issueId);
             const other = ends.find((end) => end.id === dependency.dependsOnIssueId);
+            const catalogs = catalogsFor(deps.statuses, tx.conn);
+            const wasBlocked = dependency.type === 'blockedBy' &&
+                waiting &&
+                (await blockersOf(tx.conn, catalogs, waiting)).length > 0;
+            await deleteDependency(tx.conn, dependency.id);
             if (waiting)
                 await record(tx, waiting.id, viewer.actor, 'dependency_removed', {
                     dependencyId: dependency.id,
@@ -92,8 +99,8 @@ export function createSubtaskService(deps) {
                 });
             for (const id of [dependency.issueId, dependency.dependsOnIssueId])
                 tx.emit({ type: 'issue.changed', issueId: id });
-            if (dependency.type === 'blockedBy' && waiting && other)
-                await releaseIfFree(deps, tx, catalogsFor(deps.statuses, tx.conn), waiting, other, viewer.actor);
+            if (wasBlocked && waiting && other)
+                await releaseIfFree(deps, tx, catalogs, waiting, other, viewer.actor);
         });
     }
     /** The link may be removed from this issue: it is the issue's own, or a `relatedTo` pointing at it. */
@@ -104,6 +111,7 @@ export function createSubtaskService(deps) {
         ? dependency
         : undefined;
     const relations = {
+        lock: (tx, advance) => lockIssueGraph(tx.conn, advance),
         async created(tx, issue, blockedBy, viewer) {
             const links = new Set();
             for (const ref of blockedBy) {
@@ -125,23 +133,13 @@ export function createSubtaskService(deps) {
         },
         removed: (tx, issue, actor) => onTerminal(deps, tx, issue, actor),
     };
-    const checks = {
-        async openChildren(conn, issueId) {
-            const catalogs = catalogsFor(deps.statuses, conn);
-            const open = [];
-            for (const child of await liveChildren(conn, [issueId]))
-                if (!(await catalogs.terminal(child)))
-                    open.push(child);
-            return open;
-        },
-        blockers: (conn, issue) => blockersOf(conn, catalogsFor(deps.statuses, conn), issue),
-    };
     return {
         async addDependency(viewer, idOrKey, input) {
             return deps.tx.run(async (tx) => {
                 const issue = await requireVisible(tx.conn, viewer, idOrKey);
                 requireEditor(viewer);
                 const type = dependencyType(input?.type);
+                await lockIssueGraph(tx.conn);
                 const other = await target(tx.conn, viewer, issue, input?.dependsOnIssueId);
                 const dependency = await link(tx, issue, other, type, viewer.actor);
                 const catalogs = catalogsFor(deps.statuses, tx.conn);
@@ -154,6 +152,76 @@ export function createSubtaskService(deps) {
                 return dependencyView(catalogs, dependency, other);
             });
         },
+        async updateDependency(viewer, idOrKey, dependencyId, input) {
+            requireEditor(viewer);
+            return deps.tx.run(async (tx) => {
+                await lockIssueGraph(tx.conn);
+                const issue = await requireVisible(tx.conn, viewer, idOrKey);
+                const before = removable(issue, await findDependency(tx.conn, dependencyId));
+                if (!before)
+                    throw notFound('Dependency');
+                if (input?.type === undefined || input.expectedType === undefined)
+                    throw invalid('INVALID_DEPENDENCY', 'type and expectedType are required.');
+                const type = dependencyType(input.type);
+                if (before.type !== dependencyType(input.expectedType))
+                    throw conflict('DEPENDENCY_CHANGED', 'The relationship was changed meanwhile. Reload and retry.');
+                const other = await target(tx.conn, viewer, issue, before.issueId === issue.id
+                    ? before.dependsOnIssueId
+                    : before.issueId);
+                const catalogs = catalogsFor(deps.statuses, tx.conn);
+                if (before.type === type)
+                    return dependencyView(catalogs, before, other);
+                // Do not merge two links by deleting one: two opposite conversions could otherwise delete both.
+                if ((await findDependencyBetween(tx.conn, issue.id, other.id, type)) ||
+                    (type === 'relatedTo' &&
+                        (await findDependencyBetween(tx.conn, other.id, issue.id, type))))
+                    throw conflict('DEPENDENCY_EXISTS', 'The target relationship already exists. Remove the unwanted link explicitly.');
+                const after = {
+                    ...before,
+                    issueId: issue.id,
+                    dependsOnIssueId: other.id,
+                    type,
+                };
+                // A completed prerequisite is still a relationship, but converting it releases no work.
+                const wasBlocked = before.type === 'blockedBy' &&
+                    (await blockersOf(tx.conn, catalogs, issue)).length > 0;
+                try {
+                    const changed = await tx.conn.transaction((conn) => updateDependency(conn, before, after));
+                    if (!changed)
+                        throw conflict('DEPENDENCY_CHANGED', 'The relationship was changed or removed meanwhile. Reload and retry.');
+                }
+                catch (error) {
+                    if (isUniqueViolation(error))
+                        throw conflict('DEPENDENCY_EXISTS', 'The target relationship already exists. Remove the unwanted link explicitly.');
+                    throw error;
+                }
+                if (type === 'blockedBy')
+                    await assertNoCycleThrough(tx.conn, issue.id);
+                await record(tx, before.issueId, viewer.actor, 'dependency_removed', {
+                    dependencyId,
+                    dependsOnIssueId: before.dependsOnIssueId,
+                    identifier: before.issueId === issue.id ? other.identifier : issue.identifier,
+                    type: before.type,
+                });
+                await record(tx, issue.id, viewer.actor, 'dependency_added', {
+                    dependencyId,
+                    dependsOnIssueId: other.id,
+                    identifier: other.identifier,
+                    type,
+                });
+                tx.emit({ type: 'issue.changed', issueId: issue.id });
+                tx.emit({ type: 'issue.changed', issueId: other.id });
+                if (type === 'blockedBy') {
+                    const blockers = await blockersOf(tx.conn, catalogs, issue);
+                    if (blockers.length > 0)
+                        await deps.triggers().onBlocked?.(tx, { issue, blockers });
+                }
+                else if (wasBlocked) {
+                    await releaseIfFree(deps, tx, catalogs, issue, other, viewer.actor);
+                }
+                return dependencyView(catalogs, after, other);
+            });
+        },
         removeDependency: (viewer, idOrKey, dependencyId) => unlink(viewer, idOrKey, async (conn, issue) => removable(issue, await findDependency(conn, dependencyId))),
         async removeDependencyTo(viewer, idOrKey, dependsOnIssueId, type) {
             const kind = dependencyType(type);
@@ -209,23 +277,26 @@ export function createSubtaskService(deps) {
             return result;
         },
         relations,
-        checks,
         extras: {
             async relations(conn, viewer, issue) {
                 const catalogs = catalogsFor(deps.statuses, conn);
-                const visible = new Map();
-                const sees = async (other) => {
-                    let value = visible.get(other.id);
-                    if (value === undefined) {
-                        value = await canSee(conn, viewer, other);
-                        visible.set(other.id, value);
-                    }
-                    return value;
-                };
-                const children = [];
-                for (const child of await liveChildren(conn, [issue.id]))
-                    if (await sees(child))
-                        children.push(child);
+                const allChildren = await liveChildren(conn, [issue.id]);
+                const out = await outgoing(conn, [issue.id]);
+                const into = await incoming(conn, [issue.id]);
+                const others = new Map((await findIssues(conn, [
+                    ...out.map((dependency) => dependency.dependsOnIssueId),
+                    ...into.map((dependency) => dependency.issueId),
+                ])).map((other) => [other.id, other]));
+                const blockers = await blockersOf(conn, catalogs, issue);
+                const loaded = new Map([
+                    ...allChildren.map((child) => [child.id, child]),
+                    ...others,
+                ]);
+                const missing = blockers.flatMap((blocker) => loaded.has(blocker.issueId) ? [] : [blocker.issueId]);
+                for (const other of await findIssues(conn, missing))
+                    loaded.set(other.id, other);
+                const visible = await visibleIssueIds(conn, viewer, [...loaded.keys()]);
+                const children = allChildren.filter((child) => visible.has(child.id));
                 const counts = await blockedCounts(conn, catalogs, children);
                 const name = await deps.kinds.nameAll(conn, children.flatMap((child) => (child.executor ? [child.executor] : [])));
                 const subtasks = [];
@@ -243,30 +314,16 @@ export function createSubtaskService(deps) {
                         blockedCount: counts.get(child.id) ?? 0,
                         terminal: await catalogs.terminal(child),
                     });
-                const out = await outgoing(conn, [issue.id]);
-                const into = await incoming(conn, [issue.id]);
-                const others = new Map((await findIssues(conn, [
-                    ...out.map((dependency) => dependency.dependsOnIssueId),
-                    ...into.map((dependency) => dependency.issueId),
-                ])).map((other) => [other.id, other]));
                 const views = async (list, end) => {
                     const result = [];
                     for (const dependency of list) {
                         const other = others.get(dependency[end]);
-                        if (other && (await sees(other)))
+                        if (other && visible.has(other.id))
                             result.push(await dependencyView(catalogs, dependency, other));
                     }
                     return result;
                 };
-                const blockers = await blockersOf(conn, catalogs, issue);
-                const shown = [];
-                for (const blocker of blockers) {
-                    const other = others.get(blocker.issueId) ??
-                        children.find((child) => child.id === blocker.issueId) ??
-                        (await findIssues(conn, [blocker.issueId]))[0];
-                    if (other && (await sees(other)))
-                        shown.push(blocker);
-                }
+                const shown = blockers.filter((blocker) => visible.has(blocker.issueId));
                 return {
                     subtasks,
                     blockedBy: await views(out.filter((dependency) => dependency.type === 'blockedBy'), 'dependsOnIssueId'),
@@ -279,11 +336,22 @@ export function createSubtaskService(deps) {
                     hiddenBlockerCount: blockers.length - shown.length,
                 };
             },
-            async listCounts(conn, issues) {
+            blockedIds(conn, issues) {
+                return blockedAmong(conn, deps.statuses.catalog(), issues);
+            },
+            async listCounts(conn, issues, readableIds) {
                 const catalogs = catalogsFor(deps.statuses, conn);
                 const ids = issues.map((issue) => issue.id);
-                const children = await childCounts(conn, ids);
-                const blocked = await blockedCounts(conn, catalogs, issues);
+                const children = readableIds
+                    ? new Map()
+                    : await childCounts(conn, ids);
+                if (readableIds) {
+                    for (const child of await liveChildren(conn, ids)) {
+                        if (readableIds.has(child.id) && child.parentIssueId)
+                            children.set(child.parentIssueId, (children.get(child.parentIssueId) ?? 0) + 1);
+                    }
+                }
+                const blocked = await blockedCounts(conn, catalogs, issues, readableIds);
                 return new Map(ids.map((id) => [
                     id,
                     {

package/dist/server/domains/subtasks/subtask.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"subtask.service.js","sourceRoot":"","sources":["../../../../server/domains/subtasks/subtask.service.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"subtask.service.js","sourceRoot":"","sources":["../../../../server/domains/subtasks/subtask.service.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,gBAAgB,GAOjB,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAIrE,OAAO,EACL,MAAM,EACN,WAAW,EACX,SAAS,EACT,UAAU,EACV,YAAY,EACZ,aAAa,EACb,cAAc,EACd,eAAe,GAGhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,aAAa,EACb,UAAU,EACV,cAAc,EACd,YAAY,EACZ,WAAW,GAEZ,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EACL,UAAU,EACV,aAAa,GAEd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,qBAAqB,EACrB,QAAQ,EACR,gBAAgB,EAChB,QAAQ,EACR,gBAAgB,GAEjB,MAAM,oBAAoB,CAAC;AAiD5B,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,WAAW,CAAC;IAC5C,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAuB,CAAC;QACrD,MAAM,OAAO,CACX,oBAAoB,EACpB,kBAAkB,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CACjD,CAAC;IACJ,OAAO,KAAuB,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAiB;IACpD,MAAM,MAAM,GAAG,CACb,EAAM,EACN,OAAe,EACf,KAAY,EACZ,MAAc,EACd,OAAgC,EAChC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAExE,KAAK,UAAU,cAAc,CAC3B,QAAkB,EAClB,UAA4B,EAC5B,KAAY;QAEZ,OAAO;YACL,YAAY,EAAE,UAAU,CAAC,EAAE;YAC3B,OAAO,EAAE,KAAK,CAAC,EAAE;YACjB,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,MAAM,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC;YACpC,IAAI,EAAE,UAAU,CAAC,IAAI;SACtB,CAAC;IACJ,CAAC;IAED,+FAA+F;IAC/F,KAAK,UAAU,MAAM,CACnB,IAAwB,EACxB,MAAc,EACd,KAAY,EACZ,GAAY;QAEZ,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,GAAG;YACjC,MAAM,OAAO,CAAC,oBAAoB,EAAE,+BAA+B,CAAC,CAAC;QACvE,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACxE,IAAI,CAAC,KAAK;YACR,MAAM,OAAO,CACX,oBAAoB,EACpB,8CAA8C,CAC/C,CAAC;QACJ,IAAI,KAAK,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE;YACvB,MAAM,OAAO,CAAC,oBAAoB,EAAE,mCAAmC,CAAC,CAAC;QAC3E,OAAO,KAAK,CAAC;IACf,CAAC;IAED,oFAAoF;IACpF,KAAK,UAAU,IAAI,CACjB,EAAM,EACN,KAAY,EACZ,KAAY,EACZ,IAAoB,EACpB,KAAY;QAEZ,IACE,IAAI,KAAK,WAAW;YACpB,CAAC,MAAM,qBAAqB,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;YAEvE,MAAM,QAAQ,CAAC,mBAAmB,EAAE,gCAAgC,CAAC,CAAC;QACxE,MAAM,UAAU,GAAqB;YACnC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;YACnB,OAAO,EAAE,KAAK,CAAC,EAAE;YACjB,gBAAgB,EAAE,KAAK,CAAC,EAAE;YAC1B,IAAI;YACJ,aAAa,EAAE,KAAK,CAAC,IAAI;YACzB,WAAW,EAAE,KAAK,CAAC,EAAE;YACrB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC;QACF,IAAI,CAAC;YACH,yEAAyE;YACzE,MAAM,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;QAC1E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,iBAAiB,CAAC,KAAK,CAAC;gBAC1B,MAAM,QAAQ,CAAC,mBAAmB,EAAE,gCAAgC,CAAC,CAAC;YACxE,MAAM,KAAK,CAAC;QACd,CAAC;QACD,MAAM,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,kBAAkB,EAAE;YACpD,YAAY,EAAE,UAAU,CAAC,EAAE;YAC3B,gBAAgB,EAAE,KAAK,CAAC,EAAE;YAC1B,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,IAAI;SACL,CAAC,CAAC;QACH,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACtD,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACtD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK,UAAU,MAAM,CACnB,MAAc,EACd,OAAe,EACf,IAG0C;QAE1C,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YAC7B,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YAC7D,aAAa,CAAC,MAAM,CAAC,CAAC;YACtB,wGAAwG;YACxG,MAAM,cAAc,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAC9B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC9C,IAAI,CAAC,UAAU;gBAAE,MAAM,QAAQ,CAAC,YAAY,CAAC,CAAC;YAC9C,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE;gBACrC,UAAU,CAAC,OAAO;gBAClB,UAAU,CAAC,gBAAgB;aAC5B,CAAC,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,UAAU,CAAC,OAAO,CAAC,CAAC;YAClE,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,UAAU,CAAC,gBAAgB,CAAC,CAAC;YACzE,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;YACrD,MAAM,UAAU,GACd,UAAU,CAAC,IAAI,KAAK,WAAW;gBAC/B,OAAO;gBACP,CAAC,MAAM,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YAC5D,MAAM,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;YAC/C,IAAI,OAAO;gBACT,MAAM,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,KAAK,EAAE,oBAAoB,EAAE;oBAC/D,YAAY,EAAE,UAAU,CAAC,EAAE;oBAC3B,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;oBAC7C,UAAU,EAAE,KAAK,EAAE,UAAU,IAAI,IAAI;oBACrC,IAAI,EAAE,UAAU,CAAC,IAAI;iBACtB,CAAC,CAAC;YACL,KAAK,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;gBAChE,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;YAClD,IAAI,UAAU,IAAI,OAAO,IAAI,KAAK;gBAChC,MAAM,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;IACL,CAAC;IAED,uGAAuG;IACvG,MAAM,SAAS,GAAG,CAAC,KAAY,EAAE,UAAwC,EAAE,EAAE,CAC3E,UAAU;QACV,CAAC,UAAU,CAAC,OAAO,KAAK,KAAK,CAAC,EAAE;YAC9B,CAAC,UAAU,CAAC,IAAI,KAAK,WAAW;gBAC9B,UAAU,CAAC,gBAAgB,KAAK,KAAK,CAAC,EAAE,CAAC,CAAC;QAC5C,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,SAAS,GAAmB;QAChC,IAAI,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC;QACvD,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM;YACxC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;YAChC,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;gBAC5B,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;gBACxD,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;oBAAE,SAAS;gBAClC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACpB,MAAM,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YAC1D,CAAC;YACD,IAAI,KAAK,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,aAAa;gBACvC,MAAM,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAClD,CAAC;QACD,MAAM,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;QAC9D,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE;YACxC,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;YACrD,IACE,CAAC,CAAC,MAAM,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAClC,CAAC,MAAM,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAEhC,MAAM,UAAU,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC;KAClE,CAAC;IAEF,OAAO;QACL,KAAK,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK;YACxC,OAAO,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBAC9B,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;gBAC7D,aAAa,CAAC,MAAM,CAAC,CAAC;gBACtB,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;gBACzC,MAAM,cAAc,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;gBAC9B,MAAM,KAAK,GAAG,MAAM,MAAM,CACxB,EAAE,CAAC,IAAI,EACP,MAAM,EACN,KAAK,EACL,KAAK,EAAE,gBAAgB,CACxB,CAAC;gBACF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;gBACpE,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;gBACrD,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;oBACzB,MAAM,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;oBAC9C,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;oBAC5D,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;wBACrB,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAC/D,CAAC;gBACD,OAAO,cAAc,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;QACL,CAAC;QAED,KAAK,CAAC,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK;YACzD,aAAa,CAAC,MAAM,CAAC,CAAC;YACtB,OAAO,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBAC9B,MAAM,cAAc,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;gBAC9B,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;gBAC7D,MAAM,MAAM,GAAG,SAAS,CACtB,KAAK,EACL,MAAM,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,CAAC,CAC5C,CAAC;gBACF,IAAI,CAAC,MAAM;oBAAE,MAAM,QAAQ,CAAC,YAAY,CAAC,CAAC;gBAC1C,IAAI,KAAK,EAAE,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS;oBAC/D,MAAM,OAAO,CACX,oBAAoB,EACpB,qCAAqC,CACtC,CAAC;gBACJ,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACxC,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,CAAC,KAAK,CAAC,YAAY,CAAC;oBACpD,MAAM,QAAQ,CACZ,oBAAoB,EACpB,2DAA2D,CAC5D,CAAC;gBACJ,MAAM,KAAK,GAAG,MAAM,MAAM,CACxB,EAAE,CAAC,IAAI,EACP,MAAM,EACN,KAAK,EACL,MAAM,CAAC,OAAO,KAAK,KAAK,CAAC,EAAE;oBACzB,CAAC,CAAC,MAAM,CAAC,gBAAgB;oBACzB,CAAC,CAAC,MAAM,CAAC,OAAO,CACnB,CAAC;gBACF,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;gBACrD,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI;oBACtB,OAAO,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;gBACjD,gGAAgG;gBAChG,IACE,CAAC,MAAM,qBAAqB,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;oBAChE,CAAC,IAAI,KAAK,WAAW;wBACnB,CAAC,MAAM,qBAAqB,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;oBAEnE,MAAM,QAAQ,CACZ,mBAAmB,EACnB,8EAA8E,CAC/E,CAAC;gBACJ,MAAM,KAAK,GAAG;oBACZ,GAAG,MAAM;oBACT,OAAO,EAAE,KAAK,CAAC,EAAE;oBACjB,gBAAgB,EAAE,KAAK,CAAC,EAAE;oBAC1B,IAAI;iBACL,CAAC;gBACF,wFAAwF;gBACxF,MAAM,UAAU,GACd,MAAM,CAAC,IAAI,KAAK,WAAW;oBAC3B,CAAC,MAAM,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;gBAC1D,IAAI,CAAC;oBACH,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,EAAE,CACjD,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CACtC,CAAC;oBACF,IAAI,CAAC,OAAO;wBACV,MAAM,QAAQ,CACZ,oBAAoB,EACpB,sEAAsE,CACvE,CAAC;gBACN,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,iBAAiB,CAAC,KAAK,CAAC;wBAC1B,MAAM,QAAQ,CACZ,mBAAmB,EACnB,8EAA8E,CAC/E,CAAC;oBACJ,MAAM,KAAK,CAAC;gBACd,CAAC;gBACD,IAAI,IAAI,KAAK,WAAW;oBAAE,MAAM,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;gBACxE,MAAM,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,EAAE,oBAAoB,EAAE;oBACnE,YAAY;oBACZ,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;oBACzC,UAAU,EACR,MAAM,CAAC,OAAO,KAAK,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU;oBACnE,IAAI,EAAE,MAAM,CAAC,IAAI;iBAClB,CAAC,CAAC;gBACH,MAAM,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,KAAK,EAAE,kBAAkB,EAAE;oBAC3D,YAAY;oBACZ,gBAAgB,EAAE,KAAK,CAAC,EAAE;oBAC1B,UAAU,EAAE,KAAK,CAAC,UAAU;oBAC5B,IAAI;iBACL,CAAC,CAAC;gBACH,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;gBACtD,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;gBACtD,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;oBACzB,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;oBAC5D,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;wBACrB,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAC/D,CAAC;qBAAM,IAAI,UAAU,EAAE,CAAC;oBACtB,MAAM,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;gBACtE,CAAC;gBACD,OAAO,cAAc,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YAChD,CAAC,CAAC,CAAC;QACL,CAAC;QAED,gBAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,CAClD,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAC5C,SAAS,CAAC,KAAK,EAAE,MAAM,cAAc,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAC3D;QAEH,KAAK,CAAC,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI;YAC9D,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;YAClC,IAAI,CAAC,gBAAgB;gBACnB,MAAM,OAAO,CAAC,oBAAoB,EAAE,+BAA+B,CAAC,CAAC;YACvE,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;gBAClD,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;gBACtD,IAAI,CAAC,KAAK;oBAAE,OAAO,SAAS,CAAC;gBAC7B,OAAO,CACL,CAAC,MAAM,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;oBAC7D,CAAC,IAAI,KAAK,WAAW;wBACnB,CAAC,CAAC,MAAM,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC;wBAC7D,CAAC,CAAC,SAAS,CAAC,CACf,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;QAED,UAAU,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAC1B,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC;QAE3D,KAAK,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ;YACpC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAqB,CAAC;YAC5C,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,MAAM,CAAC;YACzC,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;YAC5B,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAClD,2GAA2G;YAC3G,MAAM,SAAS,GAAG,IAAI,GAAG,EAAmC,CAAC;YAC7D,MAAM,IAAI,GAAG,CAAC,KAAY,EAAE,EAAE;gBAC5B,IAAI,KAAK,CAAC,SAAS;oBAAE,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBACnD,IAAI,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBAC3C,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;oBACpC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;gBACxC,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC;YACF,MAAM,MAAM,GAAY,EAAE,CAAC;YAC3B,KAAK,MAAM,KAAK,IAAI,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAChE,IAAI,MAAM,IAAI,CAAC,KAAK,CAAC;oBAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5C,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;YACzD,MAAM,MAAM,GAAG,IAAI,GAAG,CACpB,CACE,MAAM,UAAU,CAAC,IAAI,EAAE;gBACrB,GAAG,IAAI,GAAG,CACR,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACjC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CACvC,CACF;aACF,CAAC,CACH,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CACpC,CAAC;YACF,KAAK,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,GAAG,EAAE,CAAC;gBACtC,MAAM,KAAK,GAAc,EAAE,CAAC;gBAC5B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;oBAC/B,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAC1C,IAAI,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC;wBAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACxD,CAAC;gBACD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;oBAAE,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACnD,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,SAAS;QAET,MAAM,EAAE;YACN,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK;gBACjC,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;gBAClD,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;gBACzD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC7C,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC9C,MAAM,MAAM,GAAG,IAAI,GAAG,CACpB,CACE,MAAM,UAAU,CAAC,IAAI,EAAE;oBACrB,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC;oBACvD,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;iBAChD,CAAC,CACH,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CACpC,CAAC;gBACF,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;gBACzD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC;oBACrB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAU,CAAC;oBACzD,GAAG,MAAM;iBACV,CAAC,CAAC;gBACH,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAC3C,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CACrD,CAAC;gBACF,KAAK,MAAM,KAAK,IAAI,MAAM,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC;oBACjD,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;gBAC9B,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBACxE,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;gBACtE,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBAC7D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CACnC,IAAI,EACJ,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CACtE,CAAC;gBACF,MAAM,QAAQ,GAAqB,EAAE,CAAC;gBACtC,KAAK,MAAM,KAAK,IAAI,QAAQ;oBAC1B,QAAQ,CAAC,IAAI,CAAC;wBACZ,EAAE,EAAE,KAAK,CAAC,EAAE;wBACZ,UAAU,EAAE,KAAK,CAAC,UAAU;wBAC5B,KAAK,EAAE,KAAK,CAAC,KAAK;wBAClB,MAAM,EAAE,MAAM,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC;wBACpC,KAAK,EAAE,KAAK,CAAC,KAAK;wBAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ;wBACxB,YAAY,EAAE,KAAK,CAAC,QAAQ;4BAC1B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;4BAC9C,CAAC,CAAC,IAAI;wBACR,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC;wBACvC,QAAQ,EAAE,MAAM,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC;qBACzC,CAAC,CAAC;gBAEL,MAAM,KAAK,GAAG,KAAK,EACjB,IAAiC,EACjC,GAAmC,EACnC,EAAE;oBACF,MAAM,MAAM,GAAsB,EAAE,CAAC;oBACrC,KAAK,MAAM,UAAU,IAAI,IAAI,EAAE,CAAC;wBAC9B,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;wBAC1C,IAAI,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;4BAChC,MAAM,CAAC,IAAI,CAAC,MAAM,cAAc,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;oBACnE,CAAC;oBACD,OAAO,MAAM,CAAC;gBAChB,CAAC,CAAC;gBACF,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CACxC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAC7B,CAAC;gBACF,OAAO;oBACL,QAAQ;oBACR,SAAS,EAAE,MAAM,KAAK,CACpB,GAAG,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,WAAW,CAAC,EAC3D,kBAAkB,CACnB;oBACD,MAAM,EAAE,MAAM,KAAK,CACjB,IAAI,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,WAAW,CAAC,EAC5D,SAAS,CACV;oBACD,SAAS,EAAE;wBACT,GAAG,CAAC,MAAM,KAAK,CACb,GAAG,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,WAAW,CAAC,EAC3D,kBAAkB,CACnB,CAAC;wBACF,GAAG,CAAC,MAAM,KAAK,CACb,IAAI,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,WAAW,CAAC,EAC5D,SAAS,CACV,CAAC;qBACH;oBACD,QAAQ,EAAE,KAAK;oBACf,kBAAkB,EAAE,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM;iBASnD,CAAC;YACJ,CAAC;YAED,UAAU,CAAC,IAAI,EAAE,MAAM;gBACrB,OAAO,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;YAC7D,CAAC;YAED,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW;gBACxC,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;gBAClD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAC5C,MAAM,QAAQ,GAAG,WAAW;oBAC1B,CAAC,CAAC,IAAI,GAAG,EAAkB;oBAC3B,CAAC,CAAC,MAAM,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBACjC,IAAI,WAAW,EAAE,CAAC;oBAChB,KAAK,MAAM,KAAK,IAAI,MAAM,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;wBAClD,IAAI,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,aAAa;4BAClD,QAAQ,CAAC,GAAG,CACV,KAAK,CAAC,aAAa,EACnB,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAC7C,CAAC;oBACN,CAAC;gBACH,CAAC;gBACD,MAAM,OAAO,GAAG,MAAM,aAAa,CACjC,IAAI,EACJ,QAAQ,EACR,MAAM,EACN,WAAW,CACZ,CAAC;gBACF,OAAO,IAAI,GAAG,CACZ,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC;oBACd,EAAE;oBACF;wBACE,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC;wBACnC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC;qBACnC;iBACF,CAAC,CACH,CAAC;YACJ,CAAC;SACF;KACF,CAAC;AACJ,CAAC"}

package/dist/server/domains/subtasks/subtask.store.d.ts CHANGED Viewed

@@ -17,9 +17,16 @@ export interface DependencyRecord {
 }
 export declare function insertDependency(conn: DatabaseConnection, values: DependencyRecord): Promise<void>;
 export declare function deleteDependency(conn: DatabaseConnection, id: string): Promise<void>;
+/** The predicate is part of the UPDATE, so a stale transaction cannot overwrite a changed or removed link. */
+export declare function updateDependency(conn: DatabaseConnection, before: DependencyRecord, values: Pick<DependencyRecord, 'issueId' | 'dependsOnIssueId' | 'type'>): Promise<boolean>;
 export declare function findDependency(conn: DatabaseConnection, id: string): Promise<DependencyRecord | undefined>;
 /** The dependency of `issueId` on `dependsOnIssueId` of `type`, if there is one. */
 export declare function findDependencyBetween(conn: DatabaseConnection, issueId: string, dependsOnIssueId: string, type: DependencyType): Promise<DependencyRecord | undefined>;
+/**
+ * Every `blockedBy` link whose issue waited for is live and not in one of `finishedKeys`, of any issue: one query, for
+ * telling which of many issues wait without a query per issue.
+ */
+export declare function unfinishedBlockedBy(conn: DatabaseConnection, finishedKeys: readonly string[]): Promise<DependencyRecord[]>;
 /** What `issueIds` depend on, oldest first. */
 export declare function outgoing(conn: DatabaseConnection, issueIds: readonly string[], type?: DependencyType): Promise<DependencyRecord[]>;
 /** What depends on `issueIds`, oldest first. */

package/dist/server/domains/subtasks/subtask.store.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"subtask.store.d.ts","sourceRoot":"","sources":["../../../../server/domains/subtasks/subtask.store.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAKlE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,wCAAwC;IACxC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,8BAA8B;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAKD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,kBAAkB,EACxB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAsB,cAAc,CAClC,IAAI,EAAE,kBAAkB,EACxB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAEvC;AAED,oFAAoF;AACpF,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,kBAAkB,EACxB,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAMvC;AAED,+CAA+C;AAC/C,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,kBAAkB,EACxB,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,IAAI,CAAC,EAAE,cAAc,GACpB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAU7B;AAED,gDAAgD;AAChD,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,kBAAkB,EACxB,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,IAAI,CAAC,EAAE,cAAc,GACpB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAU7B"}
1	+ {"version":3,"file":"subtask.store.d.ts","sourceRoot":"","sources":["../../../../server/domains/subtasks/subtask.store.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAKlE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,wCAAwC;IACxC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,8BAA8B;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAKD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,kBAAkB,EACxB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,8GAA8G;AAC9G,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,GAAG,kBAAkB,GAAG,MAAM,CAAC,GACtE,OAAO,CAAC,OAAO,CAAC,CAelB;AAED,wBAAsB,cAAc,CAClC,IAAI,EAAE,kBAAkB,EACxB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAEvC;AAED,oFAAoF;AACpF,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,kBAAkB,EACxB,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAMvC;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,kBAAkB,EACxB,YAAY,EAAE,SAAS,MAAM,EAAE,GAC9B,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAe7B;AAED,+CAA+C;AAC/C,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,kBAAkB,EACxB,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,IAAI,CAAC,EAAE,cAAc,GACpB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAU7B;AAED,gDAAgD;AAChD,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,kBAAkB,EACxB,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,IAAI,CAAC,EAAE,cAAc,GACpB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAU7B"}