@decocms/blocks 8.7.0 → 8.9.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.
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/protocol/conformance/cases/changes.d.ts.map +1 -1
- package/dist/protocol/conformance/cases/changes.js +14 -3
- package/dist/protocol/conformance/cases/changes.js.map +1 -1
- package/dist/protocol/conformance/cases/guards.d.ts.map +1 -1
- package/dist/protocol/conformance/cases/guards.js +19 -42
- package/dist/protocol/conformance/cases/guards.js.map +1 -1
- package/dist/protocol/conformance/cases/overlay.d.ts +3 -0
- package/dist/protocol/conformance/cases/overlay.d.ts.map +1 -0
- package/dist/protocol/conformance/cases/overlay.js +164 -0
- package/dist/protocol/conformance/cases/overlay.js.map +1 -0
- package/dist/protocol/conformance/cases/reads.js +5 -5
- package/dist/protocol/conformance/cases/reads.js.map +1 -1
- package/dist/protocol/conformance/cases/writes.d.ts.map +1 -1
- package/dist/protocol/conformance/cases/writes.js +15 -3
- package/dist/protocol/conformance/cases/writes.js.map +1 -1
- package/dist/protocol/conformance/context.d.ts +0 -10
- package/dist/protocol/conformance/context.d.ts.map +1 -1
- package/dist/protocol/conformance/context.js.map +1 -1
- package/dist/protocol/conformance/index.d.ts.map +1 -1
- package/dist/protocol/conformance/index.js +2 -0
- package/dist/protocol/conformance/index.js.map +1 -1
- package/dist/protocol/server/content.d.ts +8 -1
- package/dist/protocol/server/content.d.ts.map +1 -1
- package/dist/protocol/server/content.js +18 -3
- package/dist/protocol/server/content.js.map +1 -1
- package/dist/protocol/server/core.d.ts +0 -6
- package/dist/protocol/server/core.d.ts.map +1 -1
- package/dist/protocol/server/core.js +0 -2
- package/dist/protocol/server/core.js.map +1 -1
- package/dist/protocol/server/methods/apply.d.ts +16 -5
- package/dist/protocol/server/methods/apply.d.ts.map +1 -1
- package/dist/protocol/server/methods/apply.js +42 -38
- package/dist/protocol/server/methods/apply.js.map +1 -1
- package/dist/protocol/server/methods/changes.d.ts.map +1 -1
- package/dist/protocol/server/methods/changes.js +31 -3
- package/dist/protocol/server/methods/changes.js.map +1 -1
- package/dist/protocol/server/methods/read.d.ts.map +1 -1
- package/dist/protocol/server/methods/read.js +2 -23
- package/dist/protocol/server/methods/read.js.map +1 -1
- package/dist/protocol/storage/fs/index.d.ts.map +1 -1
- package/dist/protocol/storage/fs/index.js +0 -18
- package/dist/protocol/storage/fs/index.js.map +1 -1
- package/dist/protocol/storage/memory.d.ts +11 -3
- package/dist/protocol/storage/memory.d.ts.map +1 -1
- package/dist/protocol/storage/memory.js +114 -45
- package/dist/protocol/storage/memory.js.map +1 -1
- package/dist/protocol/storage.d.ts +68 -18
- package/dist/protocol/storage.d.ts.map +1 -1
- package/dist/protocol/storage.js +7 -0
- package/dist/protocol/storage.js.map +1 -1
- package/dist/protocol/types.d.ts +51 -8
- package/dist/protocol/types.d.ts.map +1 -1
- package/dist/protocol/types.js +5 -3
- package/dist/protocol/types.js.map +1 -1
- package/dist/v8/analytics.d.ts +6 -2
- package/dist/v8/analytics.d.ts.map +1 -1
- package/dist/v8/analytics.js +24 -5
- package/dist/v8/analytics.js.map +1 -1
- package/dist/v8/builtins/data.d.ts +4 -0
- package/dist/v8/builtins/data.d.ts.map +1 -1
- package/dist/v8/builtins/data.js +6 -0
- package/dist/v8/builtins/data.js.map +1 -1
- package/dist/v8/builtins/index.d.ts +1 -4
- package/dist/v8/builtins/index.d.ts.map +1 -1
- package/dist/v8/builtins/index.js +1 -6
- package/dist/v8/builtins/index.js.map +1 -1
- package/dist/v8/builtins/legacy.d.ts +4 -4
- package/dist/v8/builtins/legacy.d.ts.map +1 -1
- package/dist/v8/builtins/legacy.js +4 -5
- package/dist/v8/builtins/legacy.js.map +1 -1
- package/dist/v8/cli/builtins.d.ts.map +1 -1
- package/dist/v8/cli/builtins.js +0 -1
- package/dist/v8/cli/builtins.js.map +1 -1
- package/dist/v8/cli/check/index.d.ts +1 -1
- package/dist/v8/cli/check/index.d.ts.map +1 -1
- package/dist/v8/cli/check/index.js +13 -33
- package/dist/v8/cli/check/index.js.map +1 -1
- package/dist/v8/cli/schema/builtinSchemas.d.ts.map +1 -1
- package/dist/v8/cli/schema/builtinSchemas.js +6 -8
- package/dist/v8/cli/schema/builtinSchemas.js.map +1 -1
- package/dist/v8/cli/schema/generate.d.ts.map +1 -1
- package/dist/v8/cli/schema/generate.js +1 -8
- package/dist/v8/cli/schema/generate.js.map +1 -1
- package/dist/v8/cli/schema/typeToSchema.d.ts +0 -1
- package/dist/v8/cli/schema/typeToSchema.d.ts.map +1 -1
- package/dist/v8/cli/schema/typeToSchema.js +5 -30
- package/dist/v8/cli/schema/typeToSchema.js.map +1 -1
- package/dist/v8/client.d.ts +1 -1
- package/dist/v8/client.d.ts.map +1 -1
- package/dist/v8/cms.d.ts.map +1 -1
- package/dist/v8/cms.js +5 -13
- package/dist/v8/cms.js.map +1 -1
- package/dist/v8/index.d.ts +1 -1
- package/dist/v8/index.d.ts.map +1 -1
- package/dist/v8/resolver.d.ts +1 -1
- package/dist/v8/resolver.d.ts.map +1 -1
- package/dist/v8/telemetry.d.ts +0 -2
- package/dist/v8/telemetry.d.ts.map +1 -1
- package/dist/v8/telemetry.js +5 -20
- package/dist/v8/telemetry.js.map +1 -1
- package/dist/v8/types.d.ts +4 -8
- package/dist/v8/types.d.ts.map +1 -1
- package/package.json +1 -6
- package/src/index.ts +1 -2
- package/src/protocol/conformance/cases/changes.ts +16 -4
- package/src/protocol/conformance/cases/guards.ts +19 -55
- package/src/protocol/conformance/cases/overlay.ts +195 -0
- package/src/protocol/conformance/cases/reads.ts +4 -4
- package/src/protocol/conformance/cases/writes.ts +15 -3
- package/src/protocol/conformance/context.ts +0 -7
- package/src/protocol/conformance/index.ts +2 -0
- package/src/protocol/server/content.ts +30 -4
- package/src/protocol/server/core.ts +0 -3
- package/src/protocol/server/methods/apply.ts +43 -38
- package/src/protocol/server/methods/changes.ts +42 -4
- package/src/protocol/server/methods/read.ts +2 -24
- package/src/protocol/storage/fs/index.ts +0 -18
- package/src/protocol/storage/memory.ts +124 -46
- package/src/protocol/storage.ts +69 -18
- package/src/protocol/types.ts +51 -8
- package/src/v8/analytics.ts +26 -5
- package/src/v8/builtins/data.ts +8 -0
- package/src/v8/builtins/index.ts +1 -6
- package/src/v8/builtins/legacy.ts +4 -5
- package/src/v8/cli/builtins.ts +0 -1
- package/src/v8/cli/check/index.ts +15 -34
- package/src/v8/cli/schema/builtinSchemas.ts +6 -8
- package/src/v8/cli/schema/generate.ts +1 -8
- package/src/v8/cli/schema/typeToSchema.ts +5 -31
- package/src/v8/client.ts +1 -1
- package/src/v8/cms.ts +5 -14
- package/src/v8/index.ts +0 -1
- package/src/v8/resolver.ts +1 -1
- package/src/v8/telemetry.ts +5 -20
- package/src/v8/types.ts +4 -5
- package/dist/protocol/ciphertext.d.ts +0 -7
- package/dist/protocol/ciphertext.d.ts.map +0 -1
- package/dist/protocol/ciphertext.js +0 -7
- package/dist/protocol/ciphertext.js.map +0 -1
- package/dist/protocol/secrets.d.ts +0 -22
- package/dist/protocol/secrets.d.ts.map +0 -1
- package/dist/protocol/secrets.js +0 -207
- package/dist/protocol/secrets.js.map +0 -1
- package/dist/v8/builtins/secret.d.ts +0 -7
- package/dist/v8/builtins/secret.d.ts.map +0 -1
- package/dist/v8/builtins/secret.js +0 -68
- package/dist/v8/builtins/secret.js.map +0 -1
- package/dist/v8/ciphertext.d.ts +0 -58
- package/dist/v8/ciphertext.d.ts.map +0 -1
- package/dist/v8/ciphertext.js +0 -134
- package/dist/v8/ciphertext.js.map +0 -1
- package/dist/v8/secrets.d.ts +0 -9
- package/dist/v8/secrets.d.ts.map +0 -1
- package/dist/v8/secrets.js +0 -14
- package/dist/v8/secrets.js.map +0 -1
- package/src/protocol/ciphertext.ts +0 -6
- package/src/protocol/secrets.ts +0 -239
- package/src/v8/builtins/secret.ts +0 -82
- package/src/v8/ciphertext.ts +0 -158
- package/src/v8/secrets.ts +0 -17
package/dist/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export { type Analytics, type Block, type BlockFunction, type Blocks, type Client, type ClientOptions, type CMS, type CMSError, type CMSSettings, createCMS, currentClient, type DraftPointer, type EffectiveSettings, formatDraftPointer, type Lazy, type ListOptions, type Loader, type Match, matchRoute, type Page, parseDraftPointer, parseVersion, type Redirect, type RequestLike, type RequestVersion, type Result, type Route, remoteLoader, resetForTests, type
|
|
1
|
+
export { type Analytics, type Block, type BlockFunction, type Blocks, type Client, type ClientOptions, type CMS, type CMSError, type CMSSettings, createCMS, currentClient, type DraftPointer, type EffectiveSettings, formatDraftPointer, type Lazy, type ListOptions, type Loader, type Match, matchRoute, type Page, parseDraftPointer, parseVersion, type Redirect, type RequestLike, type RequestVersion, type Result, type Route, remoteLoader, resetForTests, type Seo, type Snapshot, type Telemetry, type TelemetryConfig, type Variant, } from "./v8/index.ts";
|
|
2
2
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,KAAK,EACV,KAAK,aAAa,EAClB,KAAK,MAAM,EACX,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,GAAG,EACR,KAAK,QAAQ,EACb,KAAK,WAAW,EAChB,SAAS,EACT,aAAa,EACb,KAAK,YAAY,EACjB,KAAK,iBAAiB,EACtB,kBAAkB,EAClB,KAAK,IAAI,EACT,KAAK,WAAW,EAChB,KAAK,MAAM,EACX,KAAK,KAAK,EACV,UAAU,EACV,KAAK,IAAI,EACT,iBAAiB,EACjB,YAAY,EACZ,KAAK,QAAQ,EACb,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,MAAM,EACX,KAAK,KAAK,EACV,YAAY,EACZ,aAAa,EACb,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,KAAK,EACV,KAAK,aAAa,EAClB,KAAK,MAAM,EACX,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,GAAG,EACR,KAAK,QAAQ,EACb,KAAK,WAAW,EAChB,SAAS,EACT,aAAa,EACb,KAAK,YAAY,EACjB,KAAK,iBAAiB,EACtB,kBAAkB,EAClB,KAAK,IAAI,EACT,KAAK,WAAW,EAChB,KAAK,MAAM,EACX,KAAK,KAAK,EACV,UAAU,EACV,KAAK,IAAI,EACT,iBAAiB,EACjB,YAAY,EACZ,KAAK,QAAQ,EACb,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,MAAM,EACX,KAAK,KAAK,EACV,YAAY,EACZ,aAAa,EACb,KAAK,GAAG,EACR,KAAK,QAAQ,EACb,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,KAAK,OAAO,GACb,MAAM,eAAe,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
// @decocms/blocks: the v8 runtime API. The CLI, protocol and helpers live on
|
|
2
|
-
// their own subpaths (`/cli`, `/protocol`, `/fetch`, `/analytics`, `/
|
|
2
|
+
// their own subpaths (`/cli`, `/protocol`, `/fetch`, `/analytics`, `/vite`).
|
|
3
3
|
export { createCMS, currentClient, formatDraftPointer, matchRoute, parseDraftPointer, parseVersion, remoteLoader, resetForTests, } from "./v8/index.js";
|
|
4
4
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,6EAA6E;AAC7E,OAAO,EAUL,SAAS,EACT,aAAa,EAGb,kBAAkB,EAKlB,UAAU,EAEV,iBAAiB,EACjB,YAAY,EAMZ,YAAY,EACZ,aAAa,GAMd,MAAM,eAAe,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changes.d.ts","sourceRoot":"","sources":["../../../../src/protocol/conformance/cases/changes.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA0ClD,eAAO,MAAM,YAAY,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"changes.d.ts","sourceRoot":"","sources":["../../../../src/protocol/conformance/cases/changes.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA0ClD,eAAO,MAAM,YAAY,EAAE,eAAe,EAyTzC,CAAC"}
|
|
@@ -71,10 +71,13 @@ export const changesCases = [
|
|
|
71
71
|
assert(typeof first.base?.revision === "string", "base.revision is a string");
|
|
72
72
|
assert(first.base.resolvedRef === null || typeof first.base.resolvedRef === "string", "base.resolvedRef is a string or null");
|
|
73
73
|
assert(typeof first.changes === "object" && first.changes !== null, "a changes map");
|
|
74
|
+
const overlay = (await ctx.describe()).overlay === true;
|
|
74
75
|
for (const [name, change] of Object.entries(first.changes)) {
|
|
75
76
|
assert(change.kind === "set" || change.kind === "delete", `${name}: kind`);
|
|
76
|
-
|
|
77
|
+
// An overlay holds its deletions: a delete carries the tombstone's version.
|
|
78
|
+
if (change.kind === "delete" && !overlay) {
|
|
77
79
|
assertEqual(change.version, null, `${name}: version`);
|
|
80
|
+
}
|
|
78
81
|
else
|
|
79
82
|
assert(typeof change.version === "string", `${name}: a version`);
|
|
80
83
|
}
|
|
@@ -240,12 +243,20 @@ export const changesCases = [
|
|
|
240
243
|
const listed = (await changes(ctx)).changes[base.name];
|
|
241
244
|
assert(listed !== undefined, "the deleted entry is listed");
|
|
242
245
|
assertEqual(listed.kind, "delete", "kind");
|
|
243
|
-
|
|
246
|
+
if ((await ctx.describe()).overlay === true) {
|
|
247
|
+
assert(typeof listed.version === "string", "an overlay's delete has a tombstone version");
|
|
248
|
+
}
|
|
249
|
+
else
|
|
250
|
+
assertEqual(listed.version, null, "version");
|
|
244
251
|
assert(typeof listed.baseVersion === "string", "a base version");
|
|
245
252
|
const detail = (await ctx.client.changesGet({ names: [base.name] })).entries[base.name];
|
|
246
253
|
assertEqual(detail?.after, null, "after is null");
|
|
247
254
|
assertEqual(detail?.before, base.value, "before is the base");
|
|
248
|
-
|
|
255
|
+
// Guarded with the version changes.list showed (an overlay's tombstone, else null).
|
|
256
|
+
await ctx.client.changesDiscard({
|
|
257
|
+
names: [base.name],
|
|
258
|
+
ifMatch: { [base.name]: listed.version },
|
|
259
|
+
});
|
|
249
260
|
const after = await list(ctx);
|
|
250
261
|
assertEqual(after.blocks[base.name], base.value, "the entry is back");
|
|
251
262
|
assert(!(base.name in (await changes(ctx)).changes), "no longer a change");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changes.js","sourceRoot":"","sources":["../../../../src/protocol/conformance/cases/changes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"changes.js","sourceRoot":"","sources":["../../../../src/protocol/conformance/cases/changes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"guards.d.ts","sourceRoot":"","sources":["../../../../src/protocol/conformance/cases/guards.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"guards.d.ts","sourceRoot":"","sources":["../../../../src/protocol/conformance/cases/guards.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAQlD,eAAO,MAAM,UAAU,EAAE,eAAe,EA+EvC,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* `blocks.apply`'s own size guards and the
|
|
2
|
+
* `blocks.apply`'s own size guards, and the checks it leaves to `deco check`.
|
|
3
3
|
*/
|
|
4
|
-
import { encryptToCiphertext, publicKeyPemFromDer } from "../../ciphertext.js";
|
|
5
4
|
import { ErrorCode } from "../../errors.js";
|
|
6
5
|
import { MAX_BLOCK_BYTES, MAX_OPS_PER_APPLY, MAX_REQUEST_BYTES } from "../../server/core.js";
|
|
7
6
|
import { assert, assertEqual, expectError, rawErrorCode, } from "../context.js";
|
|
@@ -11,21 +10,6 @@ async function writable(ctx) {
|
|
|
11
10
|
return ctx.skip("read-only endpoint");
|
|
12
11
|
return d;
|
|
13
12
|
}
|
|
14
|
-
/** A throwaway public key, for endpoints that don't report one. */
|
|
15
|
-
async function ephemeralPublicKey() {
|
|
16
|
-
const pair = (await crypto.subtle.generateKey({
|
|
17
|
-
name: "RSA-OAEP",
|
|
18
|
-
modulusLength: 2048,
|
|
19
|
-
publicExponent: new Uint8Array([1, 0, 1]),
|
|
20
|
-
hash: "SHA-256",
|
|
21
|
-
}, true, ["encrypt", "decrypt"]));
|
|
22
|
-
return publicKeyPemFromDer(new Uint8Array(await crypto.subtle.exportKey("spki", pair.publicKey)));
|
|
23
|
-
}
|
|
24
|
-
/** A real ciphertext: encrypted with the endpoint's public key when it reports one. */
|
|
25
|
-
async function realCiphertext(ctx, value) {
|
|
26
|
-
const publicKey = (await ctx.describe()).secrets?.publicKey ?? (await ephemeralPublicKey());
|
|
27
|
-
return encryptToCiphertext(publicKey, value);
|
|
28
|
-
}
|
|
29
13
|
export const guardCases = [
|
|
30
14
|
{
|
|
31
15
|
id: "limits/ops-per-apply",
|
|
@@ -68,34 +52,27 @@ export const guardCases = [
|
|
|
68
52
|
},
|
|
69
53
|
},
|
|
70
54
|
{
|
|
71
|
-
id: "
|
|
72
|
-
title: "
|
|
55
|
+
id: "writes/schema-free",
|
|
56
|
+
title: "blocks.apply saves any JSON object, whatever the schema says about it",
|
|
73
57
|
async run(ctx) {
|
|
74
58
|
await writable(ctx);
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
// Text that only looks like a ciphertext is plain text all the same.
|
|
87
|
-
for (const ciphertext of ["hunter2", "v1.hunter2", "v1.my-api-key_123", "v1.QUJD.ZGVm"]) {
|
|
88
|
-
await expectError(ctx.client.blocksApply({
|
|
89
|
-
set: { [ctx.name("bad-cipher")]: block({ __resolveType: "secret", ciphertext }) },
|
|
90
|
-
}), ErrorCode.InvalidBlock, `the malformed ciphertext ${JSON.stringify(ciphertext)}`);
|
|
91
|
-
}
|
|
92
|
-
const ok = ctx.name("secret");
|
|
93
|
-
const ciphertext = await realCiphertext(ctx, "conformance-value");
|
|
94
|
-
await ctx.client.blocksApply({
|
|
95
|
-
set: { [ok]: block({ __resolveType: "secret", ciphertext }) },
|
|
96
|
-
});
|
|
59
|
+
// The schema is `deco check`'s business, in the site's CI: a write never reads it.
|
|
60
|
+
const values = {
|
|
61
|
+
[ctx.name("unknown-type")]: { __resolveType: "conformance/not-in-any-schema.tsx", x: 1 },
|
|
62
|
+
[ctx.name("v7-secret")]: {
|
|
63
|
+
__resolveType: "website/loaders/secret.ts",
|
|
64
|
+
encrypted: "not-a-ciphertext",
|
|
65
|
+
},
|
|
66
|
+
[ctx.name("plain-field")]: { __resolveType: "secret", ciphertext: "hunter2" },
|
|
67
|
+
[ctx.name("no-type")]: { title: 42, sections: "not a list" },
|
|
68
|
+
};
|
|
69
|
+
const applied = await ctx.client.blocksApply({ set: values });
|
|
97
70
|
const list = await ctx.client.blocksList();
|
|
98
|
-
assert(!list.notModified
|
|
71
|
+
assert(!list.notModified, "an unconditional list returns the map");
|
|
72
|
+
for (const [name, value] of Object.entries(values)) {
|
|
73
|
+
assertEqual(list.blocks[name], value, `${name} is saved as sent`);
|
|
74
|
+
assertEqual(list.versions[name], applied.versions[name], `${name}'s version`);
|
|
75
|
+
}
|
|
99
76
|
},
|
|
100
77
|
},
|
|
101
78
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"guards.js","sourceRoot":"","sources":["../../../../src/protocol/conformance/cases/guards.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"guards.js","sourceRoot":"","sources":["../../../../src/protocol/conformance/cases/guards.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"overlay.d.ts","sourceRoot":"","sources":["../../../../src/protocol/conformance/cases/overlay.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAkClD,eAAO,MAAM,YAAY,EAAE,eAAe,EAqJzC,CAAC"}
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Overlay endpoints (protocol 1.2, `describe.overlay`), such as a hosted
|
|
3
|
+
* draft over the published branch: `blocks.apply`'s `ifMatch` compares with
|
|
4
|
+
* the overlay alone, and `changes.list` is the overlay's own entries. A
|
|
5
|
+
* deletion the overlay records is one of them: it has a tombstone version,
|
|
6
|
+
* so `ifMatch: null` on it fails. Every case skips on an endpoint that isn't
|
|
7
|
+
* an overlay.
|
|
8
|
+
*/
|
|
9
|
+
import { ErrorCode } from "../../errors.js";
|
|
10
|
+
import { assert, assertEqual, expectError } from "../context.js";
|
|
11
|
+
async function list(ctx) {
|
|
12
|
+
const result = await ctx.client.blocksList();
|
|
13
|
+
assert(!result.notModified, "an unconditional list returns the map");
|
|
14
|
+
return result;
|
|
15
|
+
}
|
|
16
|
+
async function changes(ctx) {
|
|
17
|
+
const result = await ctx.client.changesList();
|
|
18
|
+
assert(!result.notModified, "an unconditional changes.list returns the changes");
|
|
19
|
+
return result;
|
|
20
|
+
}
|
|
21
|
+
async function overlay(ctx) {
|
|
22
|
+
const d = await ctx.describe();
|
|
23
|
+
if (d.overlay !== true)
|
|
24
|
+
return ctx.skip("not an overlay endpoint");
|
|
25
|
+
if (d.readOnly)
|
|
26
|
+
return ctx.skip("read-only endpoint");
|
|
27
|
+
return d;
|
|
28
|
+
}
|
|
29
|
+
/** The harness's base entry, which the overlay doesn't hold yet. */
|
|
30
|
+
async function baseEntry(ctx) {
|
|
31
|
+
const name = ctx.options.baseEntry?.name;
|
|
32
|
+
if (name === undefined)
|
|
33
|
+
return ctx.skip("no baseEntry");
|
|
34
|
+
const blocks = await list(ctx);
|
|
35
|
+
assert(name in blocks.blocks, `the baseEntry "${name}" exists`);
|
|
36
|
+
assert(!(name in (await changes(ctx)).changes), `the overlay doesn't hold "${name}" yet`);
|
|
37
|
+
return { name, value: blocks.blocks[name], version: blocks.versions[name] };
|
|
38
|
+
}
|
|
39
|
+
export const overlayCases = [
|
|
40
|
+
{
|
|
41
|
+
id: "overlay/if-match",
|
|
42
|
+
title: "on an overlay, ifMatch null means the overlay doesn't hold the entry yet",
|
|
43
|
+
async run(ctx) {
|
|
44
|
+
await overlay(ctx);
|
|
45
|
+
const name = ctx.name("guarded");
|
|
46
|
+
const first = await ctx.client.blocksApply({
|
|
47
|
+
set: { [name]: { v: 1 } },
|
|
48
|
+
ifMatch: { [name]: null },
|
|
49
|
+
});
|
|
50
|
+
const error = await expectError(ctx.client.blocksApply({ set: { [name]: { v: 2 } }, ifMatch: { [name]: null } }), ErrorCode.Conflict, "ifMatch null on an entry the overlay holds");
|
|
51
|
+
assertEqual(error.data?.entries, { [name]: { expected: null, actual: first.versions[name] } }, "the conflict's entries");
|
|
52
|
+
const listed = (await changes(ctx)).changes[name];
|
|
53
|
+
assertEqual(listed?.version, first.versions[name], "changes.list reports the guard's version");
|
|
54
|
+
await ctx.client.blocksApply({
|
|
55
|
+
set: { [name]: { v: 2 } },
|
|
56
|
+
ifMatch: { [name]: listed.version },
|
|
57
|
+
});
|
|
58
|
+
assertEqual((await list(ctx)).blocks[name], { v: 2 }, "the guarded save landed");
|
|
59
|
+
},
|
|
60
|
+
},
|
|
61
|
+
{
|
|
62
|
+
id: "overlay/if-match-base",
|
|
63
|
+
title: "an entry only the base has is not in the overlay: ifMatch null saves it",
|
|
64
|
+
async run(ctx) {
|
|
65
|
+
await overlay(ctx);
|
|
66
|
+
const base = await baseEntry(ctx);
|
|
67
|
+
try {
|
|
68
|
+
const modified = { ...base.value, conformance: ctx.prefix };
|
|
69
|
+
const applied = await ctx.client.blocksApply({
|
|
70
|
+
set: { [base.name]: modified },
|
|
71
|
+
ifMatch: { [base.name]: null },
|
|
72
|
+
});
|
|
73
|
+
const listed = (await changes(ctx)).changes[base.name];
|
|
74
|
+
assertEqual(listed?.kind, "set", "the saved base entry is a change");
|
|
75
|
+
assertEqual(listed?.version, applied.versions[base.name], "with the saved version");
|
|
76
|
+
await expectError(ctx.client.blocksApply({
|
|
77
|
+
set: { [base.name]: base.value },
|
|
78
|
+
ifMatch: { [base.name]: null },
|
|
79
|
+
}), ErrorCode.Conflict, "ifMatch null once the overlay holds the entry");
|
|
80
|
+
}
|
|
81
|
+
finally {
|
|
82
|
+
await ctx.client.changesDiscard({ names: [base.name] }).catch(() => { });
|
|
83
|
+
}
|
|
84
|
+
},
|
|
85
|
+
},
|
|
86
|
+
{
|
|
87
|
+
id: "overlay/own-entries",
|
|
88
|
+
title: "changes.list lists every entry the overlay holds, even one equal to the base",
|
|
89
|
+
async run(ctx) {
|
|
90
|
+
await overlay(ctx);
|
|
91
|
+
const base = await baseEntry(ctx);
|
|
92
|
+
try {
|
|
93
|
+
const applied = await ctx.client.blocksApply({ set: { [base.name]: base.value } });
|
|
94
|
+
const listed = (await changes(ctx)).changes[base.name];
|
|
95
|
+
assertEqual(listed?.kind, "set", "an entry saved with the base's value is still the overlay's");
|
|
96
|
+
assertEqual(listed?.version, applied.versions[base.name], "with the saved version");
|
|
97
|
+
await ctx.client.changesDiscard({ names: [base.name] });
|
|
98
|
+
assert(!(base.name in (await changes(ctx)).changes), "a discard drops it from the overlay");
|
|
99
|
+
assertEqual((await list(ctx)).blocks[base.name], base.value, "the base shows through");
|
|
100
|
+
}
|
|
101
|
+
finally {
|
|
102
|
+
await ctx.client.changesDiscard({ names: [base.name] }).catch(() => { });
|
|
103
|
+
}
|
|
104
|
+
},
|
|
105
|
+
},
|
|
106
|
+
{
|
|
107
|
+
id: "overlay/delete-base",
|
|
108
|
+
title: "deleting an entry only the base has records the deletion over the base",
|
|
109
|
+
async run(ctx) {
|
|
110
|
+
await overlay(ctx);
|
|
111
|
+
const base = await baseEntry(ctx);
|
|
112
|
+
try {
|
|
113
|
+
const deleted = await ctx.client.blocksApply({ delete: [base.name] });
|
|
114
|
+
const tombstone = deleted.versions[base.name];
|
|
115
|
+
assert(typeof tombstone === "string", "the deletion reports its tombstone version");
|
|
116
|
+
assert(!(base.name in (await list(ctx)).blocks), "the entry is gone from blocks.list");
|
|
117
|
+
const listed = (await changes(ctx)).changes[base.name];
|
|
118
|
+
assertEqual(listed?.kind, "delete", "a delete change");
|
|
119
|
+
assertEqual(listed?.version, tombstone, "changes.list reports the tombstone version");
|
|
120
|
+
// A discard guarded with the version changes.list showed lands.
|
|
121
|
+
await ctx.client.changesDiscard({
|
|
122
|
+
names: [base.name],
|
|
123
|
+
ifMatch: { [base.name]: tombstone },
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
finally {
|
|
127
|
+
await ctx.client.changesDiscard({ names: [base.name] }).catch(() => { });
|
|
128
|
+
}
|
|
129
|
+
assertEqual((await list(ctx)).blocks[base.name], base.value, "a discard brings it back");
|
|
130
|
+
},
|
|
131
|
+
},
|
|
132
|
+
{
|
|
133
|
+
id: "overlay/if-match-deleted",
|
|
134
|
+
title: "an entry the overlay deletes is in the overlay: ifMatch null fails, its tombstone passes",
|
|
135
|
+
async run(ctx) {
|
|
136
|
+
await overlay(ctx);
|
|
137
|
+
const base = await baseEntry(ctx);
|
|
138
|
+
try {
|
|
139
|
+
await ctx.client.blocksApply({ delete: [base.name] });
|
|
140
|
+
const tombstone = (await changes(ctx)).changes[base.name]?.version;
|
|
141
|
+
assert(typeof tombstone === "string", "changes.list reports the tombstone version");
|
|
142
|
+
const restored = { ...base.value, conformance: ctx.prefix };
|
|
143
|
+
const error = await expectError(ctx.client.blocksApply({
|
|
144
|
+
set: { [base.name]: restored },
|
|
145
|
+
ifMatch: { [base.name]: null },
|
|
146
|
+
}), ErrorCode.Conflict, "ifMatch null on an entry the overlay deletes");
|
|
147
|
+
assertEqual(error.data?.entries, { [base.name]: { expected: null, actual: tombstone } }, "the conflict's entries");
|
|
148
|
+
assert(!(base.name in (await list(ctx)).blocks), "the refused save wrote nothing");
|
|
149
|
+
const applied = await ctx.client.blocksApply({
|
|
150
|
+
set: { [base.name]: restored },
|
|
151
|
+
ifMatch: { [base.name]: tombstone },
|
|
152
|
+
});
|
|
153
|
+
assertEqual((await list(ctx)).blocks[base.name], restored, "the guarded save landed");
|
|
154
|
+
const listed = (await changes(ctx)).changes[base.name];
|
|
155
|
+
assertEqual(listed?.kind, "set", "the entry is a set change again");
|
|
156
|
+
assertEqual(listed?.version, applied.versions[base.name], "with the saved version");
|
|
157
|
+
}
|
|
158
|
+
finally {
|
|
159
|
+
await ctx.client.changesDiscard({ names: [base.name] }).catch(() => { });
|
|
160
|
+
}
|
|
161
|
+
},
|
|
162
|
+
},
|
|
163
|
+
];
|
|
164
|
+
//# sourceMappingURL=overlay.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"overlay.js","sourceRoot":"","sources":["../../../../src/protocol/conformance/cases/overlay.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,17 +26,17 @@ export const readCases = [
|
|
|
26
26
|
assert(d.assets.maxBytes > 0 && typeof d.assets.dir === "string", "assets");
|
|
27
27
|
}
|
|
28
28
|
assert(d.secrets === null || typeof d.secrets.publicKey === "string", "secrets");
|
|
29
|
+
assert(d.overlay === undefined || d.overlay === true, "overlay is absent or true");
|
|
29
30
|
},
|
|
30
31
|
},
|
|
31
32
|
{
|
|
32
33
|
id: "describe/secrets",
|
|
33
|
-
title: "describe
|
|
34
|
+
title: "describe reports no secrets key: content holds no secrets",
|
|
34
35
|
async run(ctx) {
|
|
35
|
-
const expected = ctx.options.secretsPublicKey;
|
|
36
|
-
if (expected === undefined)
|
|
37
|
-
return ctx.skip("no secretsPublicKey fixture");
|
|
38
36
|
const d = await ctx.client.describe();
|
|
39
|
-
|
|
37
|
+
if (d.version.minor < 2)
|
|
38
|
+
return ctx.skip(`protocol 1.${d.version.minor} predates 1.2`);
|
|
39
|
+
assertEqual(d.secrets, null, "describe.secrets");
|
|
40
40
|
},
|
|
41
41
|
},
|
|
42
42
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reads.js","sourceRoot":"","sources":["../../../../src/protocol/conformance/cases/reads.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGpD,MAAM,CAAC,MAAM,SAAS,GAAsB;IAC1C;QACE,EAAE,EAAE,gBAAgB;QACpB,KAAK,EAAE,qEAAqE;QAC5E,KAAK,CAAC,GAAG,CAAC,GAAG;YACX,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACtC,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;YACnD,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC;YACjD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,EAAE,eAAe,CAAC,CAAC;YACnF,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,OAAO,KAAK,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC9F,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,cAAc,IAAI,CAAC,CAAC,IAAI,KAAK,KAAK,EAAE,QAAQ,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAChF,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,KAAK,SAAS,EAAE,UAAU,CAAC,CAAC;YACpD,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,kBAAkB,CAAC,CAAC;YAClF,WAAW,CAAC,CAAC,CAAC,YAAY,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;YAC3D,MAAM,CAAC,CAAC,CAAC,cAAc,GAAG,CAAC,EAAE,gBAAgB,CAAC,CAAC;YAC/C,MAAM,CACJ,CAAC,CAAC,OAAO,KAAK,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,EACjE,gDAAgD,CACjD,CAAC;YACF,IAAI,CAAC,CAAC,QAAQ;gBAAE,WAAW,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,+BAA+B,CAAC,CAAC;YAC7E,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;gBACb,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAAC;gBAChE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,GAAG,CAAC,IAAI,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,KAAK,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC9E,CAAC;YACD,MAAM,CAAC,CAAC,CAAC,OAAO,KAAK,IAAI,IAAI,OAAO,CAAC,CAAC,OAAO,CAAC,SAAS,KAAK,QAAQ,EAAE,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"reads.js","sourceRoot":"","sources":["../../../../src/protocol/conformance/cases/reads.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writes.d.ts","sourceRoot":"","sources":["../../../../src/protocol/conformance/cases/writes.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"writes.d.ts","sourceRoot":"","sources":["../../../../src/protocol/conformance/cases/writes.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAgClD,eAAO,MAAM,UAAU,EAAE,eAAe,EAiSvC,CAAC"}
|
|
@@ -20,6 +20,16 @@ function violations(error) {
|
|
|
20
20
|
assert(Array.isArray(data?.violations), "InvalidBlock carries data.violations");
|
|
21
21
|
return data.violations;
|
|
22
22
|
}
|
|
23
|
+
/**
|
|
24
|
+
* A deleted name's version in a `blocks.apply` result: `null`, except on an
|
|
25
|
+
* overlay, which may record a tombstone even for a name the base lacks (a
|
|
26
|
+
* hosted draft's save never reads the base) and then reports its version.
|
|
27
|
+
*/
|
|
28
|
+
async function assertDeletedVersion(ctx, version, label) {
|
|
29
|
+
if ((await ctx.describe()).overlay === true && typeof version === "string")
|
|
30
|
+
return;
|
|
31
|
+
assertEqual(version, null, label);
|
|
32
|
+
}
|
|
23
33
|
export const writeCases = [
|
|
24
34
|
{
|
|
25
35
|
id: "apply/create-and-read",
|
|
@@ -47,7 +57,7 @@ export const writeCases = [
|
|
|
47
57
|
const [a, b, c] = [ctx.name("a"), ctx.name("b"), ctx.name("c")];
|
|
48
58
|
await ctx.client.blocksApply({ set: { [a]: { v: 1 }, [b]: { v: 2 } } });
|
|
49
59
|
const result = await ctx.client.blocksApply({ set: { [c]: { v: 3 } }, delete: [a] });
|
|
50
|
-
|
|
60
|
+
await assertDeletedVersion(ctx, result.versions[a], "a deleted entry's version is null");
|
|
51
61
|
const after = await list(ctx);
|
|
52
62
|
assert(!(a in after.blocks), "the deleted entry is gone");
|
|
53
63
|
assertEqual(after.blocks[b], { v: 2 }, "the untouched entry stays");
|
|
@@ -75,7 +85,8 @@ export const writeCases = [
|
|
|
75
85
|
await writable(ctx);
|
|
76
86
|
const name = ctx.name("missing");
|
|
77
87
|
const result = await ctx.client.blocksApply({ delete: [name] });
|
|
78
|
-
assertEqual(result.versions,
|
|
88
|
+
assertEqual(Object.keys(result.versions), [name], "versions");
|
|
89
|
+
await assertDeletedVersion(ctx, result.versions[name], "the missing name's version");
|
|
79
90
|
},
|
|
80
91
|
},
|
|
81
92
|
{
|
|
@@ -131,7 +142,8 @@ export const writeCases = [
|
|
|
131
142
|
}
|
|
132
143
|
// A name ending in a source extension can still be deleted.
|
|
133
144
|
const result = await ctx.client.blocksApply({ delete: [`${p}-mod.ts`] });
|
|
134
|
-
assertEqual(result.versions,
|
|
145
|
+
assertEqual(Object.keys(result.versions), [`${p}-mod.ts`], "deleting a .ts name");
|
|
146
|
+
await assertDeletedVersion(ctx, result.versions[`${p}-mod.ts`], "the .ts name's version");
|
|
135
147
|
},
|
|
136
148
|
},
|
|
137
149
|
{
|