@decocms/blocks 8.1.1 → 8.2.0

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 (96) hide show
  1. package/dist/protocol/client.d.ts +17 -4
  2. package/dist/protocol/client.d.ts.map +1 -1
  3. package/dist/protocol/client.js +46 -10
  4. package/dist/protocol/client.js.map +1 -1
  5. package/dist/protocol/conformance/cases/changes.d.ts +3 -0
  6. package/dist/protocol/conformance/cases/changes.d.ts.map +1 -0
  7. package/dist/protocol/conformance/cases/changes.js +295 -0
  8. package/dist/protocol/conformance/cases/changes.js.map +1 -0
  9. package/dist/protocol/conformance/context.d.ts +14 -0
  10. package/dist/protocol/conformance/context.d.ts.map +1 -1
  11. package/dist/protocol/conformance/context.js.map +1 -1
  12. package/dist/protocol/conformance/index.d.ts.map +1 -1
  13. package/dist/protocol/conformance/index.js +4 -1
  14. package/dist/protocol/conformance/index.js.map +1 -1
  15. package/dist/protocol/errors.d.ts +26 -0
  16. package/dist/protocol/errors.d.ts.map +1 -1
  17. package/dist/protocol/errors.js.map +1 -1
  18. package/dist/protocol/index.d.ts +4 -2
  19. package/dist/protocol/index.d.ts.map +1 -1
  20. package/dist/protocol/index.js +4 -2
  21. package/dist/protocol/index.js.map +1 -1
  22. package/dist/protocol/params.d.ts +4 -2
  23. package/dist/protocol/params.d.ts.map +1 -1
  24. package/dist/protocol/params.js +11 -1
  25. package/dist/protocol/params.js.map +1 -1
  26. package/dist/protocol/server/assets.d.ts +1 -1
  27. package/dist/protocol/server/assets.js +1 -1
  28. package/dist/protocol/server/core.d.ts +12 -1
  29. package/dist/protocol/server/core.d.ts.map +1 -1
  30. package/dist/protocol/server/core.js +8 -0
  31. package/dist/protocol/server/core.js.map +1 -1
  32. package/dist/protocol/server/index.d.ts +1 -1
  33. package/dist/protocol/server/index.js +1 -1
  34. package/dist/protocol/server/methods/apply.d.ts +37 -0
  35. package/dist/protocol/server/methods/apply.d.ts.map +1 -1
  36. package/dist/protocol/server/methods/apply.js +4 -3
  37. package/dist/protocol/server/methods/apply.js.map +1 -1
  38. package/dist/protocol/server/methods/changes.d.ts +6 -0
  39. package/dist/protocol/server/methods/changes.d.ts.map +1 -0
  40. package/dist/protocol/server/methods/changes.js +381 -0
  41. package/dist/protocol/server/methods/changes.js.map +1 -0
  42. package/dist/protocol/server/rpc.d.ts.map +1 -1
  43. package/dist/protocol/server/rpc.js +7 -0
  44. package/dist/protocol/server/rpc.js.map +1 -1
  45. package/dist/protocol/storage/fs/git.d.ts +51 -0
  46. package/dist/protocol/storage/fs/git.d.ts.map +1 -0
  47. package/dist/protocol/storage/fs/git.js +274 -0
  48. package/dist/protocol/storage/fs/git.js.map +1 -0
  49. package/dist/protocol/storage/fs/index.d.ts +2 -0
  50. package/dist/protocol/storage/fs/index.d.ts.map +1 -1
  51. package/dist/protocol/storage/fs/index.js +34 -0
  52. package/dist/protocol/storage/fs/index.js.map +1 -1
  53. package/dist/protocol/storage/memory.d.ts +10 -0
  54. package/dist/protocol/storage/memory.d.ts.map +1 -1
  55. package/dist/protocol/storage/memory.js +45 -0
  56. package/dist/protocol/storage/memory.js.map +1 -1
  57. package/dist/protocol/storage.d.ts +49 -1
  58. package/dist/protocol/storage.d.ts.map +1 -1
  59. package/dist/protocol/storage.js.map +1 -1
  60. package/dist/protocol/types.d.ts +105 -4
  61. package/dist/protocol/types.d.ts.map +1 -1
  62. package/dist/protocol/types.js +16 -3
  63. package/dist/protocol/types.js.map +1 -1
  64. package/dist/v8/cli/run.d.ts.map +1 -1
  65. package/dist/v8/cli/run.js +2 -1
  66. package/dist/v8/cli/run.js.map +1 -1
  67. package/dist/v8/cli/schema/typeToSchema.d.ts +7 -0
  68. package/dist/v8/cli/schema/typeToSchema.d.ts.map +1 -1
  69. package/dist/v8/cli/schema/typeToSchema.js +12 -1
  70. package/dist/v8/cli/schema/typeToSchema.js.map +1 -1
  71. package/dist/v8/cli/serve/server.d.ts +2 -0
  72. package/dist/v8/cli/serve/server.d.ts.map +1 -1
  73. package/dist/v8/cli/serve/server.js +37 -2
  74. package/dist/v8/cli/serve/server.js.map +1 -1
  75. package/package.json +1 -1
  76. package/src/protocol/client.ts +81 -13
  77. package/src/protocol/conformance/cases/changes.ts +362 -0
  78. package/src/protocol/conformance/context.ts +12 -0
  79. package/src/protocol/conformance/index.ts +4 -1
  80. package/src/protocol/errors.ts +17 -0
  81. package/src/protocol/index.ts +4 -2
  82. package/src/protocol/params.ts +26 -3
  83. package/src/protocol/server/assets.ts +1 -1
  84. package/src/protocol/server/core.ts +9 -0
  85. package/src/protocol/server/index.ts +1 -1
  86. package/src/protocol/server/methods/apply.ts +8 -4
  87. package/src/protocol/server/methods/changes.ts +489 -0
  88. package/src/protocol/server/rpc.ts +7 -0
  89. package/src/protocol/storage/fs/git.ts +307 -0
  90. package/src/protocol/storage/fs/index.ts +40 -0
  91. package/src/protocol/storage/memory.ts +57 -0
  92. package/src/protocol/storage.ts +51 -1
  93. package/src/protocol/types.ts +106 -4
  94. package/src/v8/cli/run.ts +2 -1
  95. package/src/v8/cli/schema/typeToSchema.ts +12 -1
  96. package/src/v8/cli/serve/server.ts +46 -2
@@ -0,0 +1,274 @@
1
+ /**
2
+ * The filesystem storage's base: the git `HEAD` of the repository the app
3
+ * root is in. Read-only: it runs `git` (no new dependency, no shell, argv
4
+ * arrays only) and never writes git state — no index writes, no commits, no
5
+ * `git restore`. A discard writes the files themselves, through the storage's
6
+ * own commit.
7
+ *
8
+ * Changes are the working tree against `HEAD` (the index is never
9
+ * consulted), with git's own idea of equal: a file whose bytes differ only by
10
+ * the checkout filters (`eol=crlf`, `autocrlf`, LFS) isn't a change.
11
+ */
12
+ import { execFile } from "node:child_process";
13
+ import { join } from "node:path";
14
+ import { isBlockFileName } from "../../keys.js";
15
+ import { StorageUnavailableError } from "../../storage.js";
16
+ /** The base revision reported for a repository with no commits yet (an empty base). */
17
+ export const UNBORN_REVISION = "unborn";
18
+ /** Environment that would point git at another repository, index or object store. */
19
+ const INHERITED_GIT_ENV = [
20
+ "GIT_DIR",
21
+ "GIT_WORK_TREE",
22
+ "GIT_INDEX_FILE",
23
+ "GIT_OBJECT_DIRECTORY",
24
+ "GIT_ALTERNATE_OBJECT_DIRECTORIES",
25
+ "GIT_NAMESPACE",
26
+ "GIT_PREFIX",
27
+ "GIT_COMMON_DIR",
28
+ ];
29
+ const COMMIT_ID = /^[0-9a-f]{40,64}$/;
30
+ /** Files per `git hash-object` call, so an argv stays far below any OS limit. */
31
+ const HASH_CHUNK = 100;
32
+ /** Base bodies read at once. */
33
+ const READ_CONCURRENCY = 4;
34
+ /** A git call that failed: `missing` when the binary isn't there. */
35
+ export class GitError extends Error {
36
+ reason;
37
+ exitCode;
38
+ stderr;
39
+ constructor(message, reason, exitCode, stderr) {
40
+ super(message);
41
+ this.reason = reason;
42
+ this.exitCode = exitCode;
43
+ this.stderr = stderr;
44
+ this.name = "GitError";
45
+ }
46
+ }
47
+ function gitEnv() {
48
+ const env = { ...process.env };
49
+ for (const key of INHERITED_GIT_ENV)
50
+ delete env[key];
51
+ return {
52
+ ...env,
53
+ // Pathspecs are literal: a file named `:(glob)x.json` is just a file.
54
+ GIT_LITERAL_PATHSPECS: "1",
55
+ // Never refresh (write) the index while reading.
56
+ GIT_OPTIONAL_LOCKS: "0",
57
+ GIT_TERMINAL_PROMPT: "0",
58
+ LC_ALL: "C",
59
+ };
60
+ }
61
+ /** Runs git and resolves with its stdout bytes; rejects with a `GitError`. */
62
+ export function runGit(cwd, args, options = {}) {
63
+ const git = options.git ?? "git";
64
+ return new Promise((resolve, reject) => {
65
+ execFile(git, args, {
66
+ cwd,
67
+ env: gitEnv(),
68
+ encoding: "buffer",
69
+ maxBuffer: 64 * 1024 * 1024,
70
+ timeout: 30_000,
71
+ windowsHide: true,
72
+ }, (error, stdout, stderr) => {
73
+ if (!error)
74
+ return resolve(stdout);
75
+ const code = error.code;
76
+ const text = Buffer.isBuffer(stderr) ? stderr.toString("utf8") : String(stderr ?? "");
77
+ if (code === "ENOENT") {
78
+ return reject(new GitError(`${git} isn't installed`, "missing", null, text));
79
+ }
80
+ const exitCode = typeof code === "number" ? code : null;
81
+ const line = text.split("\n").find((l) => l.trim() !== "") ?? error.message;
82
+ reject(new GitError(line.trim(), "failed", exitCode, text));
83
+ });
84
+ });
85
+ }
86
+ const firstLine = (bytes) => bytes.toString("utf8").split("\n")[0].trim();
87
+ /** Checks that `dir` is inside a git work tree (not a bare repository, not inside `.git`). */
88
+ export async function checkGitWorkTree(dir, options = {}) {
89
+ try {
90
+ const inside = firstLine(await runGit(dir, ["rev-parse", "--is-inside-work-tree"], options));
91
+ return inside === "true" ? { status: "ok" } : { status: "not-a-repository" };
92
+ }
93
+ catch (error) {
94
+ if (!(error instanceof GitError))
95
+ throw error;
96
+ if (error.reason === "missing")
97
+ return { status: "missing" };
98
+ if (/not a git repository/i.test(error.stderr))
99
+ return { status: "not-a-repository" };
100
+ return { status: "failed", message: error.message };
101
+ }
102
+ }
103
+ function unavailable(error) {
104
+ if (error instanceof GitError)
105
+ throw new StorageUnavailableError(`git: ${error.message}`);
106
+ throw error;
107
+ }
108
+ /**
109
+ * The git base of the app root `root` (the folder that contains `.deco`),
110
+ * whose saved blocks are `.deco/blocks/*.json`.
111
+ */
112
+ export function createGitBase(root, options = {}) {
113
+ const blocksDir = join(root, ".deco", "blocks");
114
+ let prefix;
115
+ /** Base listings by commit: a commit's tree never changes. */
116
+ let listing;
117
+ const git = (args, cwd = root) => runGit(cwd, args, options);
118
+ async function base() {
119
+ try {
120
+ let revision = UNBORN_REVISION;
121
+ try {
122
+ const sha = firstLine(await git(["rev-parse", "-q", "--verify", "HEAD^{commit}"]));
123
+ if (COMMIT_ID.test(sha))
124
+ revision = sha;
125
+ }
126
+ catch (error) {
127
+ // `--verify -q` exits 1 without output on an unborn HEAD (a fresh `git init`).
128
+ if (!(error instanceof GitError) || error.reason !== "failed" || error.stderr.trim()) {
129
+ throw error;
130
+ }
131
+ }
132
+ let resolvedRef = null;
133
+ try {
134
+ resolvedRef = firstLine(await git(["symbolic-ref", "-q", "--short", "HEAD"])) || null;
135
+ }
136
+ catch (error) {
137
+ // Exits 1 on a detached HEAD.
138
+ if (!(error instanceof GitError) || error.reason !== "failed" || error.stderr.trim()) {
139
+ throw error;
140
+ }
141
+ }
142
+ return { revision, resolvedRef };
143
+ }
144
+ catch (error) {
145
+ unavailable(error);
146
+ }
147
+ }
148
+ async function listBase(revision) {
149
+ if (!COMMIT_ID.test(revision))
150
+ return [];
151
+ // Relative to the app root (cwd): `.deco/blocks/<file>`. Only regular
152
+ // files directly in the folder; subfolders, symlinks and submodules aren't blocks.
153
+ const out = await git(["ls-tree", "-z", "--long", revision, "--", ".deco/blocks/"]);
154
+ const files = [];
155
+ for (const record of out.toString("utf8").split("\0")) {
156
+ const tab = record.indexOf("\t");
157
+ if (tab === -1)
158
+ continue;
159
+ const [mode, type, id, size] = record.slice(0, tab).trim().split(/\s+/);
160
+ const path = record.slice(tab + 1);
161
+ if (type !== "blob" || (mode !== "100644" && mode !== "100755"))
162
+ continue;
163
+ if (!path.startsWith(".deco/blocks/"))
164
+ continue;
165
+ const file = path.slice(".deco/blocks/".length);
166
+ if (!isBlockFileName(file) || !id || !COMMIT_ID.test(id))
167
+ continue;
168
+ const bytes = Number(size);
169
+ files.push(Number.isFinite(bytes) ? { file, version: id, size: bytes } : { file, version: id });
170
+ }
171
+ return files;
172
+ }
173
+ function baseFiles(current) {
174
+ if (listing?.revision !== current.revision) {
175
+ const files = listBase(current.revision).catch(unavailable);
176
+ listing = { revision: current.revision, files };
177
+ files.catch(() => {
178
+ if (listing?.files === files)
179
+ listing = undefined;
180
+ });
181
+ }
182
+ return listing.files;
183
+ }
184
+ /** The blob ids git would store for these working-tree files (filters applied). */
185
+ async function hashWorking(files) {
186
+ const ids = [];
187
+ for (let i = 0; i < files.length; i += HASH_CHUNK) {
188
+ const chunk = files.slice(i, i + HASH_CHUNK);
189
+ const out = await git(["hash-object", "--", ...chunk], blocksDir);
190
+ const lines = out.toString("utf8").split("\n").filter(Boolean);
191
+ if (lines.length !== chunk.length) {
192
+ throw new GitError("hash-object answered an unexpected listing", "failed", null, "");
193
+ }
194
+ ids.push(...lines);
195
+ }
196
+ return ids;
197
+ }
198
+ async function differing(current, now) {
199
+ try {
200
+ const inBase = new Map((await baseFiles(current)).map((f) => [f.file, f.version]));
201
+ const changed = new Set();
202
+ const toConfirm = [];
203
+ const present = new Set();
204
+ for (const file of now) {
205
+ present.add(file.file);
206
+ const id = inBase.get(file.file);
207
+ if (id === undefined)
208
+ changed.add(file.file);
209
+ // The raw bytes' hash equals the blob id: the same content, no filter involved.
210
+ else if (id !== file.version)
211
+ toConfirm.push(file.file);
212
+ }
213
+ for (const file of inBase.keys())
214
+ if (!present.has(file))
215
+ changed.add(file);
216
+ if (toConfirm.length > 0) {
217
+ let ids;
218
+ try {
219
+ ids = await hashWorking(toConfirm);
220
+ }
221
+ catch (error) {
222
+ // A file vanished meanwhile: count every candidate as changed; the
223
+ // core's next snapshot reports the truth.
224
+ if (error instanceof GitError &&
225
+ /No such file|cannot open|unable to/i.test(error.stderr)) {
226
+ ids = toConfirm.map(() => "");
227
+ }
228
+ else
229
+ throw error;
230
+ }
231
+ toConfirm.forEach((file, i) => {
232
+ if (ids[i] !== inBase.get(file))
233
+ changed.add(file);
234
+ });
235
+ }
236
+ return [...changed].sort();
237
+ }
238
+ catch (error) {
239
+ unavailable(error);
240
+ }
241
+ }
242
+ async function readBase(current, files) {
243
+ try {
244
+ const out = new Map();
245
+ if (files.length === 0)
246
+ return out;
247
+ const inBase = new Map((await baseFiles(current)).map((f) => [f.file, f.version]));
248
+ prefix ??= git(["rev-parse", "--show-prefix"]).then((b) => firstLine(b));
249
+ const repoPrefix = await prefix;
250
+ const wanted = files.filter((file) => isBlockFileName(file) && inBase.has(file));
251
+ for (let i = 0; i < wanted.length; i += READ_CONCURRENCY) {
252
+ await Promise.all(wanted.slice(i, i + READ_CONCURRENCY).map(async (file) => {
253
+ const id = inBase.get(file);
254
+ // Per file: `cat-file --batch --filters` frames its output with the
255
+ // unfiltered size, so a filtered stream can't be split reliably.
256
+ const body = await git([
257
+ "cat-file",
258
+ "--filters",
259
+ `--path=${repoPrefix}.deco/blocks/${file}`,
260
+ id,
261
+ ]);
262
+ out.set(file, body);
263
+ }));
264
+ }
265
+ return out;
266
+ }
267
+ catch (error) {
268
+ prefix = undefined;
269
+ unavailable(error);
270
+ }
271
+ }
272
+ return { base, baseFiles, differing, readBase };
273
+ }
274
+ //# sourceMappingURL=git.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"git.js","sourceRoot":"","sources":["../../../../src/protocol/storage/fs/git.ts"],"names":[],"mappings":"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"}
@@ -18,6 +18,8 @@ export interface FsStorageOptions {
18
18
  pollIntervalMs?: number;
19
19
  /** How long a commit waits for another process's lock (default 10 s). */
20
20
  lockTimeoutMs?: number;
21
+ /** The git binary the base is read with (default `git`, from `PATH`). */
22
+ git?: string;
21
23
  }
22
24
  export type FsStorage = ContentStorage & {
23
25
  /** The absolute app root. */
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/protocol/storage/fs/index.ts"],"names":[],"mappings":"AAyBA,OAAO,EAEL,KAAK,cAAc,EASpB,MAAM,kBAAkB,CAAC;AAK1B,MAAM,WAAW,gBAAgB;IAC/B,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,uEAAuE;IACvE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8DAA8D;IAC9D,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qDAAqD;IACrD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,yEAAyE;IACzE,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,MAAM,SAAS,GAAG,cAAc,GAAG;IACvC,6BAA6B;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;AA8DF,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CA0MpE"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/protocol/storage/fs/index.ts"],"names":[],"mappings":"AA+BA,OAAO,EAEL,KAAK,cAAc,EASpB,MAAM,kBAAkB,CAAC;AAM1B,MAAM,WAAW,gBAAgB;IAC/B,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,uEAAuE;IACvE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8DAA8D;IAC9D,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qDAAqD;IACrD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,yEAAyE;IACzE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,yEAAyE;IACzE,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,SAAS,GAAG,cAAc,GAAG;IACvC,6BAA6B;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;AA8DF,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAyOpE"}
@@ -10,6 +10,12 @@
10
10
  * - Uploads go to `public/assets` (or `assetsDir`), never overwriting a file.
11
11
  *
12
12
  * A file's version is its git blob hash, as `git hash-object` prints it.
13
+ *
14
+ * Its base (what `changes.*` compares with) is the git `HEAD` of the
15
+ * repository the app root is in, read with the `git` binary (./git.ts):
16
+ * `changes.list`, `changes.get` and `changes.discard` need the app root to be
17
+ * inside a git work tree, and answer Unavailable otherwise. `deco serve`
18
+ * refuses to start outside one. The other methods don't need git.
13
19
  * Commits are serialized per `.deco` folder (in process and across processes)
14
20
  * and applied with staged files and atomic renames, rolled back on failure,
15
21
  * with the folder fsynced before a commit returns.
@@ -24,6 +30,7 @@ import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
24
30
  import { suffixedAssetName } from "../../assets.js";
25
31
  import { isBlockFileName } from "../../keys.js";
26
32
  import { StorageInvalidFileError, StorageNotFoundError, StorageUnavailableError, } from "../../storage.js";
33
+ import { createGitBase } from "./git.js";
27
34
  import { gitBlobHash, revisionOf } from "./hash.js";
28
35
  import { withCommitLock } from "./lock.js";
29
36
  import { applyFileChange, sweepStaleTransactions } from "./transaction.js";
@@ -94,6 +101,7 @@ export function createFsStorage(options) {
94
101
  const lockOptions = { timeoutMs: options.lockTimeoutMs ?? 10_000, staleMs: 30_000 };
95
102
  let repoRoot;
96
103
  let swept = false;
104
+ const gitBase = createGitBase(root, { git: options.git });
97
105
  /** file -> stat fingerprint and its hash, so a poll only rehashes changed files. */
98
106
  const hashCache = new Map();
99
107
  async function hashFile(file) {
@@ -238,6 +246,10 @@ export function createFsStorage(options) {
238
246
  await sweepStaleTransactions(decoDir);
239
247
  swept = true;
240
248
  }
249
+ if (attempt.expectedBase !== undefined &&
250
+ (await gitBase.base()).revision !== attempt.expectedBase) {
251
+ return { status: "stale" };
252
+ }
241
253
  if (attempt.expectedSchemaVersion !== undefined) {
242
254
  const schema = await readSchema();
243
255
  if ((schema?.version ?? null) !== attempt.expectedSchemaVersion) {
@@ -260,6 +272,28 @@ export function createFsStorage(options) {
260
272
  wrapIoError(error);
261
273
  }
262
274
  },
275
+ base: () => gitBase.base(),
276
+ async changes(base, current) {
277
+ const [files, baseFiles] = await Promise.all([
278
+ gitBase.differing(base, current.files),
279
+ gitBase.baseFiles(base),
280
+ ]);
281
+ return { files, baseFiles };
282
+ },
283
+ async readBaseFiles(base, files) {
284
+ for (const file of files)
285
+ assertBlockFile(file);
286
+ const versions = new Map((await gitBase.baseFiles(base)).map((f) => [f.file, f.version]));
287
+ const bodies = await gitBase.readBase(base, files);
288
+ // Exactly as a checkout writes them, a leading BOM included: a discard
289
+ // writes this text back, and anything else would still differ from HEAD.
290
+ const decoder = new TextDecoder("utf-8", { ignoreBOM: true });
291
+ const out = Object.create(null);
292
+ for (const [file, bytes] of bodies) {
293
+ out[file] = { text: decoder.decode(bytes), version: versions.get(file) };
294
+ }
295
+ return out;
296
+ },
263
297
  async putAsset(name, body) {
264
298
  if (readOnly)
265
299
  throw new StorageUnavailableError("the storage is read-only");
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/protocol/storage/fs/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/protocol/storage/fs/index.ts"],"names":[],"mappings":"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"}
@@ -11,6 +11,12 @@ export interface MemoryStorageState {
11
11
  assets: Record<string, string>;
12
12
  /** `false` simulates an app root with no `.deco` folder at all. */
13
13
  hasDecoFolder: boolean;
14
+ /** The base's saved-block files (what `changes.*` compares with), by file name. Default: none. */
15
+ base: Record<string, string>;
16
+ /** The base's revision; moves with every `setBase`/`commitBase`. */
17
+ baseRevision: string;
18
+ /** The base's branch. Default `null`. */
19
+ baseRef: string | null;
14
20
  }
15
21
  export interface MemoryStorageOptions {
16
22
  state?: Partial<MemoryStorageState>;
@@ -28,6 +34,10 @@ export interface MemoryStorage extends ContentStorage {
28
34
  setFile(file: string, content: string | null): void;
29
35
  /** Replaces `schema.gen.json` (`null` removes it). */
30
36
  setSchema(schema: string | object | null): void;
37
+ /** Replaces the base's files, as a publish (or an outside commit) would. */
38
+ setBase(files: Record<string, string>): void;
39
+ /** Makes the current files the base, as a commit of every change would. */
40
+ commitBase(): void;
31
41
  /** How many commits landed. */
32
42
  readonly commits: number;
33
43
  }
@@ -1 +1 @@
1
- {"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/protocol/storage/memory.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EAMxB,MAAM,eAAe,CAAC;AAEvB,wFAAwF;AACxF,MAAM,WAAW,kBAAkB;IACjC,2DAA2D;IAC3D,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,+DAA+D;IAC/D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,sEAAsE;IACtE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,mEAAmE;IACnE,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACpC,kDAAkD;IAClD,WAAW,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC1C,iFAAiF;IACjF,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3E,8EAA8E;IAC9E,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzF;AAED,MAAM,WAAW,aAAc,SAAQ,cAAc;IACnD,wCAAwC;IACxC,IAAI,IAAI,kBAAkB,CAAC;IAC3B,4EAA4E;IAC5E,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;IACpD,sDAAsD;IACtD,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;IAChD,+BAA+B;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAID,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,oBAAyB,GAAG,aAAa,CA+IrF"}
1
+ {"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/protocol/storage/memory.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EAMxB,MAAM,eAAe,CAAC;AAEvB,wFAAwF;AACxF,MAAM,WAAW,kBAAkB;IACjC,2DAA2D;IAC3D,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,+DAA+D;IAC/D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,sEAAsE;IACtE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,mEAAmE;IACnE,aAAa,EAAE,OAAO,CAAC;IACvB,kGAAkG;IAClG,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,oEAAoE;IACpE,YAAY,EAAE,MAAM,CAAC;IACrB,yCAAyC;IACzC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACpC,kDAAkD;IAClD,WAAW,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC1C,iFAAiF;IACjF,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3E,8EAA8E;IAC9E,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzF;AAED,MAAM,WAAW,aAAc,SAAQ,cAAc;IACnD,wCAAwC;IACxC,IAAI,IAAI,kBAAkB,CAAC;IAC3B,4EAA4E;IAC5E,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;IACpD,sDAAsD;IACtD,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;IAChD,4EAA4E;IAC5E,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAC7C,2EAA2E;IAC3E,UAAU,IAAI,IAAI,CAAC;IACnB,+BAA+B;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAID,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,oBAAyB,GAAG,aAAa,CA8LrF"}
@@ -18,8 +18,13 @@ export function createMemoryStorage(options = {}) {
18
18
  secretsPublicKey: null,
19
19
  assets: {},
20
20
  hasDecoFolder: true,
21
+ base: {},
22
+ baseRevision: "base-0",
23
+ baseRef: null,
21
24
  ...options.state,
22
25
  });
26
+ // structuredClone keeps shared references: the base is never the files object.
27
+ state.base = { ...state.base };
23
28
  const description = {
24
29
  kind: "git",
25
30
  root: ".",
@@ -53,6 +58,9 @@ export function createMemoryStorage(options = {}) {
53
58
  }
54
59
  if (!state.hasDecoFolder)
55
60
  throw new StorageNotFoundError("no .deco folder");
61
+ if (attempt.expectedBase !== undefined && attempt.expectedBase !== state.baseRevision) {
62
+ return { status: "stale" };
63
+ }
56
64
  if (attempt.expectedSchemaVersion !== undefined &&
57
65
  (await schemaVersion()) !== attempt.expectedSchemaVersion) {
58
66
  return { status: "stale" };
@@ -120,6 +128,36 @@ export function createMemoryStorage(options = {}) {
120
128
  async readSecretsPublicKey() {
121
129
  return state.secretsPublicKey;
122
130
  },
131
+ async base() {
132
+ return { revision: state.baseRevision, resolvedRef: state.baseRef };
133
+ },
134
+ async changes(_base, snapshot) {
135
+ const baseFiles = await Promise.all(Object.entries(state.base).map(async ([file, content]) => ({
136
+ file,
137
+ version: await version(content),
138
+ size: new TextEncoder().encode(content).byteLength,
139
+ })));
140
+ const baseVersion = new Map(baseFiles.map((f) => [f.file, f.version]));
141
+ const current = new Map(snapshot.files.map((f) => [f.file, f.version]));
142
+ const files = new Set();
143
+ for (const [file, v] of current)
144
+ if (baseVersion.get(file) !== v)
145
+ files.add(file);
146
+ for (const file of baseVersion.keys())
147
+ if (!current.has(file))
148
+ files.add(file);
149
+ return { files: [...files], baseFiles };
150
+ },
151
+ async readBaseFiles(_base, files) {
152
+ const out = Object.create(null);
153
+ for (const file of files) {
154
+ if (!(file in state.base))
155
+ continue;
156
+ const text = state.base[file];
157
+ out[file] = { text, version: await version(text) };
158
+ }
159
+ return out;
160
+ },
123
161
  commit(attempt) {
124
162
  // Serialized, so a commit's checks and its mutation are one atomic step.
125
163
  const run = commitQueue.then(() => commitNow(attempt));
@@ -140,6 +178,13 @@ export function createMemoryStorage(options = {}) {
140
178
  else
141
179
  state.files[file] = content;
142
180
  },
181
+ setBase(files) {
182
+ state.base = { ...files };
183
+ state.baseRevision = `base-${Math.random().toString(36).slice(2, 10)}`;
184
+ },
185
+ commitBase() {
186
+ storage.setBase(state.files);
187
+ },
143
188
  setSchema(schema) {
144
189
  state.schema =
145
190
  schema === null || typeof schema === "string" ? schema : JSON.stringify(schema);
@@ -1 +1 @@
1
- {"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../src/protocol/storage/memory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../src/protocol/storage/memory.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,9 @@
2
2
  * The storage interface a content-protocol backend implements.
3
3
  *
4
4
  * A storage is deliberately small: a snapshot of file names and versions,
5
- * reading file bodies, reading the schema, and one atomic commit attempt.
5
+ * reading file bodies, reading the schema, one atomic commit attempt, and its
6
+ * base (what `changes.*` compares the content with: the files that differ
7
+ * from it, and reading base bodies).
6
8
  * The protocol core (`createContentHandler`) owns everything else: the
7
9
  * JSON-RPC layer, validation, the file-name rule, the secret guard, limits and
8
10
  * retries. Storages deal in *files* inside `<root>/.deco/blocks`; entry names
@@ -81,6 +83,39 @@ export interface CommitAttempt {
81
83
  * commit time differs, checked atomically with `expected`.
82
84
  */
83
85
  expectedSchemaVersion?: string | null;
86
+ /**
87
+ * The base revision (`StorageBase.revision`) the core computed the write
88
+ * from, when the write depends on it (`changes.discard` restores base
89
+ * bytes). When set, a storage MUST reject the attempt as stale if its base
90
+ * revision at commit time differs, checked atomically with `expected`.
91
+ */
92
+ expectedBase?: string;
93
+ /** Why the core commits, for logs: `apply` (default) or `discard`. */
94
+ reason?: "apply" | "discard";
95
+ }
96
+ /** What a storage's content is compared against (`changes.*`). */
97
+ export interface StorageBase {
98
+ /** An opaque revision of the base, compared only for equality (a commit sha). */
99
+ revision: string;
100
+ /** The branch the base was read from; `null` when there's none. */
101
+ resolvedRef: string | null;
102
+ }
103
+ /** The files of a snapshot that differ from the base. */
104
+ export interface StorageChanges {
105
+ /**
106
+ * Saved-block file names that differ from the base: in the snapshot and not
107
+ * in the base, in the base and not in the snapshot, or in both with
108
+ * different content. A file whose content equals the base's (the storage
109
+ * decides equality, such as honouring git's eol conversion) MUST NOT be
110
+ * listed, so a file a discard just restored is never listed again.
111
+ */
112
+ files: string[];
113
+ /**
114
+ * The base's files, with their versions in the base: at least every file
115
+ * whose spelling group (`spellingKey`) a file in `files` belongs to; more
116
+ * is fine.
117
+ */
118
+ baseFiles: StorageFile[];
84
119
  }
85
120
  export type CommitResult = {
86
121
  status: "committed";
@@ -110,6 +145,19 @@ export interface ContentStorage {
110
145
  readSecretsPublicKey(): Promise<string | null>;
111
146
  /** One all-or-nothing commit attempt; durable when it resolves. */
112
147
  commit(attempt: CommitAttempt): Promise<CommitResult>;
148
+ /**
149
+ * The current base, cheaply: the core calls it on every `changes.list`
150
+ * poll. Throws `StorageUnavailableError` when the base can't be read now.
151
+ */
152
+ base(): Promise<StorageBase>;
153
+ /** The files of `snapshot` that differ from `base`, and the base files they touch. */
154
+ changes(base: StorageBase, snapshot: StorageSnapshot): Promise<StorageChanges>;
155
+ /**
156
+ * Reads base file bodies, as a checkout would write them (a leading BOM
157
+ * kept: a discard writes the text back as is), each with its version in the
158
+ * base. A file the base doesn't have is left out.
159
+ */
160
+ readBaseFiles(base: StorageBase, files: string[]): Promise<Record<string, StoredFileBody>>;
113
161
  /** Stores an uploaded file, never overwriting one; returns the stored file name. */
114
162
  putAsset?(name: string, body: Uint8Array): Promise<{
115
163
  name: string;