@paradigma-inc/flywheel 0.2.0 → 0.2.2
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/package.json +1 -1
- package/src/runtime/required-runtime-commands.json +1 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/graph-operation-resources.js +3 -17
- package/src/runtime/vendor/flywheel-cli-dist/commands/graph-operation-resources.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/graph-operation.js +21 -4
- package/src/runtime/vendor/flywheel-cli-dist/commands/graph-operation.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/hosted-repository-control.js +5 -2
- package/src/runtime/vendor/flywheel-cli-dist/commands/hosted-repository-control.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/hosted-repository-list.js +6 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/hosted-repository-list.js.map +1 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/index.js +2 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/index.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry.js +15 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/repository-edit.js +8 -14
- package/src/runtime/vendor/flywheel-cli-dist/commands/repository-edit.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/types.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/adapter.js +21 -18
- package/src/runtime/vendor/flywheel-cli-dist/local/adapter.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/domain/rebase/resolve.js +2 -0
- package/src/runtime/vendor/flywheel-cli-dist/local/domain/rebase/resolve.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/domain/service/staging.js +33 -18
- package/src/runtime/vendor/flywheel-cli-dist/local/domain/service/staging.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/dispatch.js +10 -7
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/dispatch.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/operations/core.js +1 -22
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/operations/core.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/operations/index.js +1 -2
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/operations/index.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/projection.js +11 -14
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/projection.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/commits.js +25 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/commits.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/contract.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/pending.js +26 -5
- package/src/runtime/vendor/flywheel-cli-dist/local/store/pending.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/sqlite/errors.js +4 -0
- package/src/runtime/vendor/flywheel-cli-dist/local/store/sqlite/errors.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/sqlite/store.js +9 -21
- package/src/runtime/vendor/flywheel-cli-dist/local/store/sqlite/store.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/workspace.js +15 -3
- package/src/runtime/vendor/flywheel-cli-dist/local/store/workspace.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/main.js +1 -2
- package/src/runtime/vendor/flywheel-cli-dist/main.js.map +1 -1
- package/src/runtime/vendor/manifest.json +3 -1
|
@@ -29,6 +29,8 @@ export async function resolveConflict(store, repositoryId, operationId, conflict
|
|
|
29
29
|
};
|
|
30
30
|
const batch = {
|
|
31
31
|
repositoryId, expectedStaging: workspace.staging, expectedRebase: workspace.rebase,
|
|
32
|
+
expectedLocalHeadCommitId: workspace.localHeadCommitId,
|
|
33
|
+
validateStaging: false,
|
|
32
34
|
expectedConflicts: workspace.conflicts, staging: workspace.staging, rebase, conflicts,
|
|
33
35
|
};
|
|
34
36
|
await store.applyWorkspaceAtomic(batch);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../../src/local/domain/rebase/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAExE,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAErD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,KAAwB,EACxB,YAAoB,EACpB,WAAmB,EACnB,UAAkB,EAClB,QAAgB,EAChB,WAA0B;IAE1B,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;QAAE,MAAM,IAAI,sBAAsB,CAAC,6BAA6B,CAAC,CAAC;IAC1F,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;IAC1D,IAAI,SAAS,CAAC,MAAM,KAAK,IAAI;QAAE,MAAM,IAAI,sBAAsB,CAAC,iCAAiC,CAAC,CAAC;IACnG,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;IAC5F,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,QAAQ,KAAK,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC9E,MAAM,IAAI,sBAAsB,CAAC,mCAAmC,CAAC,CAAC;IACxE,CAAC;IACD,IAAI,cAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,cAAc,GAAG,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IACzE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,qBAAqB;YAAE,MAAM,IAAI,sBAAsB,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9G,MAAM,KAAK,CAAC;IACd,CAAC;IACD,MAAM,QAAQ,GAAmB,EAAE,GAAG,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC;IACpF,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACnH,MAAM,MAAM,GAAgB;QAC1B,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW;QACrE,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,YAAY,EAAE,uBAAuB,EAAE,gBAAgB,CAAC,SAAS,CAAC;KAClG,CAAC;IACF,MAAM,KAAK,GAAyB;QAClC,YAAY,EAAE,eAAe,EAAE,SAAS,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,CAAC,MAAM;QAClF,iBAAiB,EAAE,SAAS,CAAC,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS;KACtF,CAAC;IACF,MAAM,KAAK,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;IACxC,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
1
|
+
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../../src/local/domain/rebase/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAExE,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAErD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,KAAwB,EACxB,YAAoB,EACpB,WAAmB,EACnB,UAAkB,EAClB,QAAgB,EAChB,WAA0B;IAE1B,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;QAAE,MAAM,IAAI,sBAAsB,CAAC,6BAA6B,CAAC,CAAC;IAC1F,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;IAC1D,IAAI,SAAS,CAAC,MAAM,KAAK,IAAI;QAAE,MAAM,IAAI,sBAAsB,CAAC,iCAAiC,CAAC,CAAC;IACnG,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;IAC5F,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,QAAQ,KAAK,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC9E,MAAM,IAAI,sBAAsB,CAAC,mCAAmC,CAAC,CAAC;IACxE,CAAC;IACD,IAAI,cAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,cAAc,GAAG,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IACzE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,qBAAqB;YAAE,MAAM,IAAI,sBAAsB,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9G,MAAM,KAAK,CAAC;IACd,CAAC;IACD,MAAM,QAAQ,GAAmB,EAAE,GAAG,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC;IACpF,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACnH,MAAM,MAAM,GAAgB;QAC1B,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW;QACrE,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,YAAY,EAAE,uBAAuB,EAAE,gBAAgB,CAAC,SAAS,CAAC;KAClG,CAAC;IACF,MAAM,KAAK,GAAyB;QAClC,YAAY,EAAE,eAAe,EAAE,SAAS,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,CAAC,MAAM;QAClF,yBAAyB,EAAE,SAAS,CAAC,iBAAiB;QACtD,eAAe,EAAE,KAAK;QACtB,iBAAiB,EAAE,SAAS,CAAC,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS;KACtF,CAAC;IACF,MAAM,KAAK,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;IACxC,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
2
|
import { RepositoryServiceError } from "../errors.js";
|
|
3
3
|
import { canonicalBytes } from "../models/encoding.js";
|
|
4
|
-
import { RepositoryStoreError } from "../../store/sqlite/errors.js";
|
|
5
|
-
import { latestValueWrites } from "./writes.js";
|
|
4
|
+
import { RepositoryStoreError, WorkspacePreconditionError } from "../../store/sqlite/errors.js";
|
|
6
5
|
export function stagingBytes(operations) {
|
|
7
6
|
return canonicalBytes(operations.map((operation) => operation.toMapping()));
|
|
8
7
|
}
|
|
@@ -15,16 +14,18 @@ export function stagingDigest(operations, latestValues = []) {
|
|
|
15
14
|
});
|
|
16
15
|
return `sha256:${createHash("sha256").update("flywheel.staging.v2\0").update(bytes).digest("hex")}`;
|
|
17
16
|
}
|
|
18
|
-
export async function stageOperations(store, repositoryId, newOperations, latestValues = []) {
|
|
17
|
+
export async function stageOperations(store, repositoryId, newOperations, latestValues = [], pendingCapture) {
|
|
19
18
|
if (newOperations.length === 0)
|
|
20
19
|
throw new RepositoryServiceError("cannot stage an empty operation batch");
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
throw new RepositoryServiceError("cannot stage a cross-repository operation");
|
|
20
|
+
if (pendingCapture !== undefined && pendingCapture.repositoryId !== repositoryId) {
|
|
21
|
+
throw new RepositoryServiceError("cannot stage a cross-repository capture");
|
|
24
22
|
}
|
|
23
|
+
// The atomic append validates the resulting batch against the committed base
|
|
24
|
+
// itself, so a capture-less caller needs only the expectations, not a
|
|
25
|
+
// rendered pending graph.
|
|
26
|
+
const workspace = pendingCapture?.workspace ?? await store.loadWorkspace(repositoryId);
|
|
25
27
|
const operations = [...workspace.staging.operations, ...newOperations];
|
|
26
28
|
const stagedLatestValues = [...workspace.staging.latestValues, ...latestValues];
|
|
27
|
-
latestValueWrites(operations, stagedLatestValues);
|
|
28
29
|
const staging = {
|
|
29
30
|
repositoryId,
|
|
30
31
|
state: "open",
|
|
@@ -32,15 +33,28 @@ export async function stageOperations(store, repositoryId, newOperations, latest
|
|
|
32
33
|
operations,
|
|
33
34
|
latestValues: stagedLatestValues,
|
|
34
35
|
};
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
36
|
+
try {
|
|
37
|
+
return (await store.applyWorkspaceAtomic({
|
|
38
|
+
repositoryId,
|
|
39
|
+
expectedLocalHeadCommitId: workspace.localHeadCommitId,
|
|
40
|
+
validateStaging: true,
|
|
41
|
+
expectedStaging: workspace.staging,
|
|
42
|
+
expectedRebase: workspace.rebase,
|
|
43
|
+
expectedConflicts: workspace.conflicts,
|
|
44
|
+
staging,
|
|
45
|
+
rebase: workspace.rebase,
|
|
46
|
+
conflicts: workspace.conflicts,
|
|
47
|
+
})).state.staging;
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
if (preconditionFailed(error)) {
|
|
51
|
+
throw new RepositoryServiceError(`${error.cause.message}; reissue the edit against the current pending graph`, { cause: error });
|
|
52
|
+
}
|
|
53
|
+
throw error;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
function preconditionFailed(error) {
|
|
57
|
+
return error instanceof RepositoryStoreError && error.cause instanceof WorkspacePreconditionError;
|
|
44
58
|
}
|
|
45
59
|
export async function discardStaging(store, repositoryId, expectedDigest) {
|
|
46
60
|
const workspace = await store.loadWorkspace(repositoryId);
|
|
@@ -53,6 +67,8 @@ export async function discardStaging(store, repositoryId, expectedDigest) {
|
|
|
53
67
|
try {
|
|
54
68
|
await store.applyWorkspaceAtomic({
|
|
55
69
|
repositoryId,
|
|
70
|
+
expectedLocalHeadCommitId: workspace.localHeadCommitId,
|
|
71
|
+
validateStaging: false,
|
|
56
72
|
expectedStaging: workspace.staging,
|
|
57
73
|
expectedRebase: workspace.rebase,
|
|
58
74
|
expectedConflicts: workspace.conflicts,
|
|
@@ -62,8 +78,7 @@ export async function discardStaging(store, repositoryId, expectedDigest) {
|
|
|
62
78
|
});
|
|
63
79
|
}
|
|
64
80
|
catch (error) {
|
|
65
|
-
if (error
|
|
66
|
-
error.cause.message === "workspace precondition changed") {
|
|
81
|
+
if (preconditionFailed(error)) {
|
|
67
82
|
throw new RepositoryServiceError("workspace changed concurrently; exact-batch discard made no change; inspect repo:status", { cause: error });
|
|
68
83
|
}
|
|
69
84
|
throw error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"staging.js","sourceRoot":"","sources":["../../../../src/local/domain/service/staging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,OAAO,EAAE,oBAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"staging.js","sourceRoot":"","sources":["../../../../src/local/domain/service/staging.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ import { pushFromStore } from "./remote/push.js";
|
|
|
15
15
|
import { purgeFromStore } from "./remote/purge.js";
|
|
16
16
|
import { randomUUID } from "node:crypto";
|
|
17
17
|
const MUTATIONS = {
|
|
18
|
-
stage: true, "
|
|
18
|
+
stage: true, "conflicts:resolve": true, "rebase:continue": true, "rebase:abort": true,
|
|
19
19
|
"staging:discard": true,
|
|
20
20
|
pull: true, push: true, purge: true, revert: true, backup: true, restore: true, commit: true, object_install: true,
|
|
21
21
|
};
|
|
@@ -90,15 +90,18 @@ async function execute(state, operation, args, options, writerHeld, runtimeIdent
|
|
|
90
90
|
await diagnostics.close();
|
|
91
91
|
};
|
|
92
92
|
state.deferCompletion({ success: () => complete(true), failure: () => complete(false) });
|
|
93
|
-
if (operation === "repository_identity") {
|
|
94
|
-
if (Object.keys(args).length !== 0)
|
|
95
|
-
throw new Error("repository_command_request_invalid");
|
|
96
|
-
return { repository_id: identity.repositoryId };
|
|
97
|
-
}
|
|
98
93
|
const objects = new RepositoryObjectStorage(state);
|
|
99
94
|
const store = new SQLiteRepositoryStore(state, objects);
|
|
100
|
-
const context = {
|
|
95
|
+
const context = {
|
|
96
|
+
state, objects, store, diagnostics, repositoryId: identity.repositoryId, clientId: identity.clientId,
|
|
97
|
+
pendingSnapshot: options.pendingCapture === undefined ? undefined : Promise.resolve(options.pendingCapture),
|
|
98
|
+
};
|
|
101
99
|
let result;
|
|
100
|
+
if (operation === "pending_capture") {
|
|
101
|
+
if (Object.keys(args).length !== 0)
|
|
102
|
+
throw new Error("repository_command_request_invalid");
|
|
103
|
+
return { capture: await store.capturePending(identity.repositoryId) };
|
|
104
|
+
}
|
|
102
105
|
if (operation === "object_install") {
|
|
103
106
|
const bytes = options.objectBytes;
|
|
104
107
|
if (Object.keys(args).length !== 2 || !isDigest(args.digest) || !(bytes instanceof Uint8Array) || args.byte_length !== bytes.byteLength || bytes.byteLength > 10 * 1024 * 1024) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../../src/local/runtime/dispatch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,4BAA4B,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,+BAA+B,EAAE,MAAM,gCAAgC,CAAC;AACjF,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,OAAO,EAAwB,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../../src/local/runtime/dispatch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,4BAA4B,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,+BAA+B,EAAE,MAAM,gCAAgC,CAAC;AACjF,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,OAAO,EAAwB,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAWzC,MAAM,SAAS,GAAmC;IAChD,KAAK,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI;IACrF,iBAAiB,EAAE,IAAI;IACvB,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI;CACnH,CAAC;AAEF,6FAA6F;AAC7F,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,QAAgB,EAChB,SAAiB,EACjB,IAAuC,EACvC,UAA2B,EAAE;IAE7B,MAAM,eAAe,GAAG,MAAM,oBAAoB,EAAE,CAAC;IACrD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,SAAS,KAAK,IAAI,IAAI,IAAI,CAAC,OAAO,KAAK,KAAK,CAAC;IACpG,IAAI,OAAO;QAAE,OAAO,aAAa,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;IAEvF,MAAM,KAAK,GAAG,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;QAC5E,IAAI,QAAQ,CAAC,WAAW,KAAK,+BAA+B,EAAE,CAAC;YAC7D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;YACtF,KAAK,CAAC,WAAW,EAAE,CAAC;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,KAAK,CAAC,WAAW,EAAE,CAAC;IACtB,CAAC;YAAS,CAAC;QACT,IAAI,CAAC;YAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAAC,CAAC;gBAAS,CAAC;YAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAAC,CAAC;IACnE,CAAC;IACD,6EAA6E;IAC7E,OAAO,aAAa,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;AAC5E,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,QAAgB,EAChB,SAAiB,EACjB,IAAuC,EACvC,OAAwB,EACxB,eAAqC;IAErC,IAAI,CAAC;QACH,OAAO,MAAM,oBAAoB,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;IACxH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,4BAA4B,EAAE,CAAC;YAClD,MAAM,KAAK,GAAG,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrD,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;gBAC5E,MAAM,WAAW,GAAG,IAAI,qBAAqB,CAAC,OAAO,CAAC,eAAe,IAAI,eAAe,EAAE,CAAC,CAAC;gBAC5F,WAAW,CAAC,MAAM,CAAC;oBACjB,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ;oBAChE,KAAK,EAAE,4BAA4B,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS;oBACjE,MAAM,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,mBAAmB,EAAE;iBAC7E,CAAC,CAAC;gBACH,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC;YAC5B,CAAC;oBAAS,CAAC;gBAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YAAC,CAAC;QAC9B,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,OAAO,CACpB,KAA8B,EAC9B,SAAiB,EACjB,IAAuC,EACvC,OAAwB,EACxB,UAAmB,EACnB,eAAqC;IAErC,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,MAAM,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;IAC/H,MAAM,WAAW,GAAG,IAAI,qBAAqB,CAAC,OAAO,CAAC,eAAe,IAAI,eAAe,EAAE,CAAC,CAAC;IAC5F,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;IAC/E,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9E,WAAW,CAAC,MAAM,CAAC;QACjB,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAChE,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE;KACxE,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,KAAK,EAAE,OAAgB,EAAiB,EAAE;QACzD,WAAW,CAAC,MAAM,CAAC;YACjB,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAChE,KAAK,EAAE,2BAA2B,EAAE,SAAS,EAAE,WAAW;YAC1D,MAAM,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,OAAO,IAAI,EAAE,YAAY,EAAE,qBAAqB,EAAE,CAAC,EAAE;SAC1H,CAAC,CAAC;QACH,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC,CAAC;IACF,KAAK,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACzF,MAAM,OAAO,GAAG,IAAI,uBAAuB,CAAC,KAAK,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,IAAI,qBAAqB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACxD,MAAM,OAAO,GAAmB;QAC9B,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QACpG,eAAe,EAAE,OAAO,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;KAC5G,CAAC;IACF,IAAI,MAA+B,CAAC;IACpC,IAAI,SAAS,KAAK,iBAAiB,EAAE,CAAC;QACpC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAC1F,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;IACxE,CAAC;IACD,IAAI,SAAS,KAAK,gBAAgB,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;QAClC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,YAAY,UAAU,CAAC,IAAI,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC;YAC/K,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;QACD,MAAM,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrE,MAAM,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACzE,CAAC;SAAM,IAAI,SAAS,KAAK,MAAM,IAAI,SAAS,KAAK,MAAM,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;QACjF,IAAI,CAAC,OAAO,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QACjF,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,SAAS,CAAC,CAAC;QAC9F,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3D,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;IACnF,CAAC;IACD,KAAK,CAAC,WAAW,EAAE,CAAC;IACpB,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -2,9 +2,7 @@ import { existsSync, readdirSync, statSync } from "node:fs";
|
|
|
2
2
|
import { join } from "node:path";
|
|
3
3
|
import { RepositoryOperation } from "../../domain/models/operations.js";
|
|
4
4
|
import { commitStaged } from "../../domain/service/commit.js";
|
|
5
|
-
import { composeNodeOperations } from "../../domain/service/compose.js";
|
|
6
5
|
import { discardStaging, stageOperations } from "../../domain/service/staging.js";
|
|
7
|
-
import { composableSourceTitles } from "../projection.js";
|
|
8
6
|
import { doctorReport } from "../doctor.js";
|
|
9
7
|
import { UnpublishedHistoryDivergedError, unpublishedCommits } from "../remote/unpublished.js";
|
|
10
8
|
import { requireExactArguments } from "./shared.js";
|
|
@@ -49,28 +47,9 @@ export async function stage(context, arguments_) {
|
|
|
49
47
|
throw new Error("invalid internal operation arguments");
|
|
50
48
|
}
|
|
51
49
|
const parsed = operations.map(operation => RepositoryOperation.fromMapping(operation));
|
|
52
|
-
const result = await stageOperations(context.store, context.repositoryId, parsed, latestValues);
|
|
50
|
+
const result = await stageOperations(context.store, context.repositoryId, parsed, latestValues, await context.pendingSnapshot);
|
|
53
51
|
return { operation_id: parsed.at(-1).operationId, staging_digest: result.digest, operation_count: result.operations.length };
|
|
54
52
|
}
|
|
55
|
-
/**
|
|
56
|
-
* Stage one branched or merged node with its lineage in a single workspace update.
|
|
57
|
-
* Sources resolve against the committed projection with the open staged operations
|
|
58
|
-
* applied, so nodes created or edited in this staging area are usable sources.
|
|
59
|
-
*/
|
|
60
|
-
export async function stageComposition(context, arguments_) {
|
|
61
|
-
requireExactArguments(arguments_, ["source_ids", "verb"]);
|
|
62
|
-
const { verb, source_ids: sourceIds } = arguments_;
|
|
63
|
-
if ((verb !== "node:branch" && verb !== "node:merge") || !Array.isArray(sourceIds) || sourceIds.length === 0 ||
|
|
64
|
-
(verb === "node:branch" && sourceIds.length !== 1) || sourceIds.some(sourceId => typeof sourceId !== "string")) {
|
|
65
|
-
throw new Error("invalid internal operation arguments");
|
|
66
|
-
}
|
|
67
|
-
const pending = await context.store.capturePending(context.repositoryId);
|
|
68
|
-
const sourceTitles = composableSourceTitles(pending.pendingSnapshot, sourceIds);
|
|
69
|
-
const { nodeId, operations } = composeNodeOperations(context.repositoryId, verb, sourceIds, sourceTitles);
|
|
70
|
-
const parsed = operations.map(operation => RepositoryOperation.fromMapping(operation));
|
|
71
|
-
const result = await stageOperations(context.store, context.repositoryId, parsed);
|
|
72
|
-
return { operation_id: parsed.at(-1).operationId, staging_digest: result.digest, operation_count: result.operations.length, node_id: nodeId };
|
|
73
|
-
}
|
|
74
53
|
export async function stagingDiscard(context, arguments_) {
|
|
75
54
|
requireExactArguments(arguments_, ["staging_digest", "confirm"]);
|
|
76
55
|
if (arguments_.confirm !== true)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../../src/local/runtime/operations/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../../src/local/runtime/operations/core.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { commit, doctor, localHead, stage,
|
|
1
|
+
import { commit, doctor, localHead, stage, staging, stagingDiscard, status } from "./core.js";
|
|
2
2
|
import { conflictsList, conflictsResolve, conflictsShow, rebaseAbort, rebaseContinue } from "./conflicts.js";
|
|
3
3
|
import { diff, log, revert } from "./history.js";
|
|
4
4
|
import { backup, gc, restore } from "./maintenance.js";
|
|
@@ -10,7 +10,6 @@ export async function dispatchLocalOperation(context, operation, arguments_, run
|
|
|
10
10
|
switch (operation) {
|
|
11
11
|
case "staging": return staging(context, arguments_);
|
|
12
12
|
case "stage": return stage(context, arguments_);
|
|
13
|
-
case "stage:compose": return stageComposition(context, arguments_);
|
|
14
13
|
case "staging:discard": return stagingDiscard(context, arguments_);
|
|
15
14
|
case "commit": return commit(context, arguments_);
|
|
16
15
|
case "local-head": return localHead(context, arguments_);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/local/runtime/operations/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/local/runtime/operations/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC7G,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAGpE,kFAAkF;AAClF,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,OAAuB,EACvB,SAAiB,EACjB,UAA6C,EAC7C,eAAqC;IAErC,IAAI,MAAM,CAAC,MAAM,CAAC,oBAAoB,EAAE,SAAS,CAAC;QAAE,OAAO,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IACtG,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,SAAS,CAAC,CAAC,OAAO,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACpD,KAAK,OAAO,CAAC,CAAC,OAAO,KAAK,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAChD,KAAK,iBAAiB,CAAC,CAAC,OAAO,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACnE,KAAK,QAAQ,CAAC,CAAC,OAAO,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAClD,KAAK,YAAY,CAAC,CAAC,OAAO,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACzD,KAAK,QAAQ,CAAC,CAAC,OAAO,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;QACnE,KAAK,KAAK,CAAC,CAAC,OAAO,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC5C,KAAK,MAAM,CAAC,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC9C,KAAK,QAAQ,CAAC,CAAC,OAAO,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAClD,KAAK,gBAAgB,CAAC,CAAC,OAAO,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACjE,KAAK,gBAAgB,CAAC,CAAC,OAAO,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACjE,KAAK,mBAAmB,CAAC,CAAC,OAAO,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACvE,KAAK,iBAAiB,CAAC,CAAC,OAAO,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACnE,KAAK,cAAc,CAAC,CAAC,OAAO,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC7D,KAAK,QAAQ,CAAC,CAAC,OAAO,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAClD,KAAK,SAAS,CAAC,CAAC,OAAO,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACpD,KAAK,QAAQ,CAAC,CAAC,OAAO,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;QACnE,KAAK,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC1C,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACjE,CAAC;AACH,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
2
|
import { isRecord } from "../domain/models/constants.js";
|
|
3
3
|
import { canonicalBytes, parseRepositoryJson } from "../domain/models/encoding.js";
|
|
4
|
-
import { SNAPSHOT_TABLES } from "../store/snapshot/schema.js";
|
|
4
|
+
import { SNAPSHOT_BOOLEAN_COLUMNS, SNAPSHOT_TABLES } from "../store/snapshot/schema.js";
|
|
5
|
+
import { boundedInteger } from "../store/sqlite/rows.js";
|
|
5
6
|
const COLUMNS = new Map(SNAPSHOT_TABLES.map(([name, columns]) => [name, columns]));
|
|
6
7
|
const TARGET_FIELDS = ["node_id", "scope_node_id", "edge_id", "artifact_id", "containment_id", "child_node_id", "container_node_id", "graph_node_id"];
|
|
7
8
|
function digest(value) {
|
|
@@ -24,7 +25,12 @@ function rows(tables, table) {
|
|
|
24
25
|
if (!Array.isArray(rawRows) || rawRows.some(row => !Array.isArray(row) || row.length !== columns.length)) {
|
|
25
26
|
throw new Error("local projection snapshot is invalid");
|
|
26
27
|
}
|
|
27
|
-
return rawRows.map((row) => Object.fromEntries(columns.map((column, index) =>
|
|
28
|
+
return rawRows.map((row) => Object.fromEntries(columns.map((column, index) => {
|
|
29
|
+
const value = row[index];
|
|
30
|
+
if (!(column in SNAPSHOT_BOOLEAN_COLUMNS))
|
|
31
|
+
return [column, value];
|
|
32
|
+
return [column, boundedInteger(value, 0, 1) === 1];
|
|
33
|
+
})));
|
|
28
34
|
}
|
|
29
35
|
function matching(tables, table, field, value) {
|
|
30
36
|
return rows(tables, table).filter(row => row[field] === value);
|
|
@@ -35,18 +41,6 @@ function one(tables, table, field, value) {
|
|
|
35
41
|
throw new Error("local projection entity is unavailable");
|
|
36
42
|
return values[0];
|
|
37
43
|
}
|
|
38
|
-
/** Titles of live source nodes in the given snapshot; a missing, tombstoned or purged source is unusable. */
|
|
39
|
-
export function composableSourceTitles(snapshot, sourceIds) {
|
|
40
|
-
const tables = tablesFrom(snapshot);
|
|
41
|
-
const nodes = new Map(rows(tables, "repository_nodes").map(row => [row.node_id, row]));
|
|
42
|
-
const latest = new Map(rows(tables, "repository_node_latest_values").map(row => [row.node_id, row]));
|
|
43
|
-
return sourceIds.map(sourceId => {
|
|
44
|
-
if (nodes.get(sourceId)?.lifecycle_state !== "live")
|
|
45
|
-
throw new Error(`source node ${sourceId} is unavailable`);
|
|
46
|
-
const title = latest.get(sourceId)?.title;
|
|
47
|
-
return typeof title === "string" ? title : "";
|
|
48
|
-
});
|
|
49
|
-
}
|
|
50
44
|
function target(arguments_) {
|
|
51
45
|
for (const name of TARGET_FIELDS) {
|
|
52
46
|
const value = arguments_[name];
|
|
@@ -108,6 +102,9 @@ function page(atHead, field, values, arguments_, extra = {}, scope) {
|
|
|
108
102
|
}
|
|
109
103
|
/** Render command-facing values from one pinned repository snapshot. */
|
|
110
104
|
export function renderProjection(operation, snapshot, arguments_, stagingDigest) {
|
|
105
|
+
if (stagingDigest !== undefined && arguments_.at_head !== undefined && arguments_.at_head !== snapshot.headCommitId) {
|
|
106
|
+
throw new Error("repository_local_history_changed");
|
|
107
|
+
}
|
|
111
108
|
const tables = tablesFrom(snapshot);
|
|
112
109
|
const atHead = snapshot.headCommitId;
|
|
113
110
|
const id = target(arguments_);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projection.js","sourceRoot":"","sources":["../../../src/local/runtime/projection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAEnF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"projection.js","sourceRoot":"","sources":["../../../src/local/runtime/projection.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { canonicalBytes, parseRepositoryJson } from "../domain/models/encoding.j
|
|
|
4
4
|
import { RepositoryContractError } from "../domain/errors.js";
|
|
5
5
|
import { LatestValueWrite } from "./contract.js";
|
|
6
6
|
import { RepositoryStoreError } from "./sqlite/errors.js";
|
|
7
|
-
import { getRow, runSql } from "./sqlite/rows.js";
|
|
7
|
+
import { getRow, iterateRows, runSql } from "./sqlite/rows.js";
|
|
8
8
|
export function workspaceHeadIn(database, repositoryId) {
|
|
9
9
|
const row = getRow(database.prepare("SELECT workspace_head_commit_id FROM repository_heads WHERE repository_id = ?"), repositoryId);
|
|
10
10
|
if (row === undefined || row.workspace_head_commit_id === null)
|
|
@@ -37,6 +37,30 @@ export function loadCommitByOperationId(database, repositoryId, operationId) {
|
|
|
37
37
|
}
|
|
38
38
|
return commit;
|
|
39
39
|
}
|
|
40
|
+
export function committedOperationIds(database, repositoryId, operations) {
|
|
41
|
+
const committed = new Set();
|
|
42
|
+
if (operations.length === 0)
|
|
43
|
+
return committed;
|
|
44
|
+
// One bound array avoids SQLite's parameter limit for large saved batches.
|
|
45
|
+
const identifiers = JSON.stringify(operations.map(operation => operation.operationId));
|
|
46
|
+
for (const row of iterateRows(database.prepare(`
|
|
47
|
+
SELECT operation_id FROM repository_operations
|
|
48
|
+
WHERE repository_id = ? AND operation_id IN (SELECT value FROM json_each(?))
|
|
49
|
+
`), repositoryId, identifiers)) {
|
|
50
|
+
if (typeof row.operation_id !== "string")
|
|
51
|
+
throw new RepositoryStoreError("committed operation identifier is invalid");
|
|
52
|
+
committed.add(row.operation_id);
|
|
53
|
+
}
|
|
54
|
+
return committed;
|
|
55
|
+
}
|
|
56
|
+
/** The one repository identity a pending capture and its later append validation must agree on. */
|
|
57
|
+
export function capturedRepositoryIdentityIn(database, repositoryId) {
|
|
58
|
+
const identity = getRow(database.prepare("SELECT client_id, created_at FROM repository_metadata WHERE repository_id = ?"), repositoryId);
|
|
59
|
+
if (!identity || typeof identity.client_id !== "string" || typeof identity.created_at !== "string") {
|
|
60
|
+
throw new RepositoryStoreError("repository identity is missing");
|
|
61
|
+
}
|
|
62
|
+
return { clientId: identity.client_id, createdAt: identity.created_at };
|
|
63
|
+
}
|
|
40
64
|
export function listCommitsIn(database, repositoryId, atHead, afterCommitId, limit) {
|
|
41
65
|
if (!Number.isInteger(limit) || limit < 1 || limit > 256)
|
|
42
66
|
throw new RepositoryStoreError("commit page limit is unsafe");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commits.js","sourceRoot":"","sources":["../../../src/local/store/commits.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAmB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"commits.js","sourceRoot":"","sources":["../../../src/local/store/commits.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../../src/local/store/contract.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,0BAA0B,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACpH,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../../src/local/store/contract.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,13 @@ function insertSnapshotTables(database, tables) {
|
|
|
21
21
|
runSql(statement, ...row);
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
-
|
|
24
|
+
/**
|
|
25
|
+
* Open a transient in-memory copy of the base graph, apply the batch with the
|
|
26
|
+
* authoritative appliers, and hand the open connection to `render` while the
|
|
27
|
+
* database is still valid. Every validation failure is raised before `render`
|
|
28
|
+
* runs, attributed to the first failing operation by `applyOperations`.
|
|
29
|
+
*/
|
|
30
|
+
function withPendingGraph(repositoryId, identity, baseHeadCommitId, baseTables, staging, committedOperationIds, render) {
|
|
25
31
|
const database = new DatabaseSync(":memory:", { allowExtension: false, defensive: true });
|
|
26
32
|
try {
|
|
27
33
|
database.exec("PRAGMA trusted_schema = OFF");
|
|
@@ -39,16 +45,31 @@ function applyPendingSnapshot(repositoryId, identity, baseHeadCommitId, baseTabl
|
|
|
39
45
|
operationCount: staging.operations.length,
|
|
40
46
|
}, staging.operations, iterateOperationLatestValues(staging.operations, staging.latestValues), committedOperationIds);
|
|
41
47
|
assertProjectionInvariants(database, repositoryId);
|
|
48
|
+
return render(database);
|
|
49
|
+
}
|
|
50
|
+
finally {
|
|
51
|
+
database.close();
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
function applyPendingSnapshot(repositoryId, identity, baseHeadCommitId, baseTables, staging, committedOperationIds) {
|
|
55
|
+
return withPendingGraph(repositoryId, identity, baseHeadCommitId, baseTables, staging, committedOperationIds, database => {
|
|
42
56
|
const tables = snapshotTablesFromConnection(database, repositoryId);
|
|
43
57
|
return {
|
|
44
58
|
repositoryId,
|
|
45
59
|
headCommitId: baseHeadCommitId,
|
|
46
60
|
canonicalBytes: canonicalSnapshotBytes(repositoryId, baseHeadCommitId, validateSnapshotTables(repositoryId, tables)),
|
|
47
61
|
};
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* Reject an invalid batch against its committed base without exposing the
|
|
66
|
+
* rendered pending graph; the append path only needs pass/fail plus the
|
|
67
|
+
* first-failing-operation attribution `applyOperations` already raises.
|
|
68
|
+
*/
|
|
69
|
+
export function validatePendingBatch(repositoryId, identity, baseHeadCommitId, baseTables, staging, committedOperationIds) {
|
|
70
|
+
if (staging.operations.length === 0 && staging.latestValues.length === 0)
|
|
71
|
+
return;
|
|
72
|
+
withPendingGraph(repositoryId, identity, baseHeadCommitId, validateSnapshotTables(repositoryId, baseTables), staging, committedOperationIds, () => undefined);
|
|
52
73
|
}
|
|
53
74
|
export function pendingRepositorySnapshot(repositoryId, identity, baseHeadCommitId, baseTables, staging, committedOperationIds) {
|
|
54
75
|
const tables = validateSnapshotTables(repositoryId, baseTables);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pending.js","sourceRoot":"","sources":["../../../src/local/store/pending.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,eAAe,EAAuB,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AACxF,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAO1C,SAAS,eAAe;IACtB,6EAA6E;IAC7E,OAAO,aAAa,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAC7C,4HAA4H,EAC5H,SAAS,CACV,CAAC,OAAO,CACP,sEAAsE,EACtE,EAAE,CACH,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,QAAsB,EAAE,MAAsB;IAC1E,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAChC,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,eAAe,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChI,KAAK,MAAM,GAAG,IAAI,IAAI;YAAE,MAAM,CAAC,SAAS,EAAE,GAAG,GAAG,CAAC,CAAC;IACpD,CAAC;AACH,CAAC;AAED,SAAS,
|
|
1
|
+
{"version":3,"file":"pending.js","sourceRoot":"","sources":["../../../src/local/store/pending.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
export class RepositoryStoreError extends Error {
|
|
2
2
|
name = "RepositoryStoreError";
|
|
3
3
|
}
|
|
4
|
+
/** The workspace moved between capture and the atomic write; nothing was changed. */
|
|
5
|
+
export class WorkspacePreconditionError extends RepositoryStoreError {
|
|
6
|
+
name = "WorkspacePreconditionError";
|
|
7
|
+
}
|
|
4
8
|
//# sourceMappingURL=errors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../src/local/store/sqlite/errors.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,oBAAqB,SAAQ,KAAK;IACpC,IAAI,GAAG,sBAAsB,CAAC;CACxC"}
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../src/local/store/sqlite/errors.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,oBAAqB,SAAQ,KAAK;IACpC,IAAI,GAAG,sBAAsB,CAAC;CACxC;AAED,qFAAqF;AACrF,MAAM,OAAO,0BAA2B,SAAQ,oBAAoB;IACzD,IAAI,GAAG,4BAA4B,CAAC;CAC9C"}
|