@decocms/blocks 8.1.0-next.3 → 8.1.0-next.4
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/secrets.d.ts.map +1 -1
- package/dist/protocol/secrets.js +9 -2
- package/dist/protocol/secrets.js.map +1 -1
- package/dist/protocol/server/assets.d.ts +1 -1
- package/dist/protocol/server/assets.js +1 -1
- package/dist/v8/builtins/data.d.ts +21 -5
- package/dist/v8/builtins/data.d.ts.map +1 -1
- package/dist/v8/builtins/data.js +47 -6
- package/dist/v8/builtins/data.js.map +1 -1
- package/dist/v8/builtins/index.d.ts.map +1 -1
- package/dist/v8/builtins/index.js +2 -3
- package/dist/v8/builtins/index.js.map +1 -1
- package/dist/v8/canonical.d.ts +1 -1
- package/dist/v8/cli/check/index.d.ts.map +1 -1
- package/dist/v8/cli/check/index.js +13 -1
- package/dist/v8/cli/check/index.js.map +1 -1
- package/dist/v8/cli/index.d.ts +2 -1
- package/dist/v8/cli/index.d.ts.map +1 -1
- package/dist/v8/cli/index.js +2 -1
- package/dist/v8/cli/index.js.map +1 -1
- package/dist/v8/cli/run.d.ts.map +1 -1
- package/dist/v8/cli/run.js +2 -9
- package/dist/v8/cli/run.js.map +1 -1
- package/dist/v8/cli/schema/builtinSchemas.d.ts.map +1 -1
- package/dist/v8/cli/schema/builtinSchemas.js +48 -28
- package/dist/v8/cli/schema/builtinSchemas.js.map +1 -1
- package/dist/v8/cli/schema/tsProgram.d.ts +10 -0
- package/dist/v8/cli/schema/tsProgram.d.ts.map +1 -1
- package/dist/v8/cli/schema/tsProgram.js +31 -0
- package/dist/v8/cli/schema/tsProgram.js.map +1 -1
- package/dist/v8/cli/schema/typeToSchema.d.ts.map +1 -1
- package/dist/v8/cli/schema/typeToSchema.js +15 -1
- package/dist/v8/cli/schema/typeToSchema.js.map +1 -1
- package/dist/v8/cli/serve/server.d.ts +0 -4
- package/dist/v8/cli/serve/server.d.ts.map +1 -1
- package/dist/v8/cli/serve/server.js +20 -46
- package/dist/v8/cli/serve/server.js.map +1 -1
- package/dist/v8/cms.d.ts +5 -2
- package/dist/v8/cms.d.ts.map +1 -1
- package/dist/v8/cms.js +180 -23
- package/dist/v8/cms.js.map +1 -1
- package/dist/v8/content.d.ts +14 -0
- package/dist/v8/content.d.ts.map +1 -1
- package/dist/v8/content.js +28 -0
- package/dist/v8/content.js.map +1 -1
- package/dist/v8/draft.d.ts +9 -12
- package/dist/v8/draft.d.ts.map +1 -1
- package/dist/v8/draft.js +8 -4
- package/dist/v8/draft.js.map +1 -1
- package/dist/v8/hosts.d.ts +55 -0
- package/dist/v8/hosts.d.ts.map +1 -0
- package/dist/v8/hosts.js +197 -0
- package/dist/v8/hosts.js.map +1 -0
- package/dist/v8/index.d.ts +4 -3
- package/dist/v8/index.d.ts.map +1 -1
- package/dist/v8/index.js +3 -2
- package/dist/v8/index.js.map +1 -1
- package/dist/v8/remoteLoader.d.ts.map +1 -1
- package/dist/v8/remoteLoader.js +14 -2
- package/dist/v8/remoteLoader.js.map +1 -1
- package/dist/v8/settings.d.ts +27 -0
- package/dist/v8/settings.d.ts.map +1 -0
- package/dist/v8/settings.js +130 -0
- package/dist/v8/settings.js.map +1 -0
- package/dist/v8/telemetry.d.ts +13 -3
- package/dist/v8/telemetry.d.ts.map +1 -1
- package/dist/v8/telemetry.js +31 -32
- package/dist/v8/telemetry.js.map +1 -1
- package/dist/v8/types.d.ts +56 -2
- package/dist/v8/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +3 -3
- package/src/protocol/secrets.ts +10 -2
- package/src/protocol/server/assets.ts +1 -1
- package/src/v8/builtins/data.ts +56 -7
- package/src/v8/builtins/index.ts +2 -3
- package/src/v8/canonical.ts +1 -1
- package/src/v8/cli/check/index.ts +23 -1
- package/src/v8/cli/index.ts +2 -1
- package/src/v8/cli/run.ts +3 -8
- package/src/v8/cli/schema/builtinSchemas.ts +49 -28
- package/src/v8/cli/schema/tsProgram.ts +27 -0
- package/src/v8/cli/schema/typeToSchema.ts +18 -1
- package/src/v8/cli/serve/server.ts +20 -55
- package/src/v8/cms.ts +226 -26
- package/src/v8/content.ts +30 -0
- package/src/v8/draft.ts +14 -10
- package/src/v8/hosts.ts +184 -0
- package/src/v8/index.ts +6 -8
- package/src/v8/remoteLoader.ts +17 -2
- package/src/v8/settings.ts +157 -0
- package/src/v8/telemetry.ts +43 -40
- package/src/v8/types.ts +48 -2
package/dist/v8/content.js
CHANGED
|
@@ -23,6 +23,19 @@ export function isLoader(content) {
|
|
|
23
23
|
content !== null &&
|
|
24
24
|
typeof content.load === "function");
|
|
25
25
|
}
|
|
26
|
+
/**
|
|
27
|
+
* An internal hook a built-in loader (`remoteLoader`) has: the release it
|
|
28
|
+
* would return right now, from memory, or `undefined` when that takes a load.
|
|
29
|
+
* `cms.settings()` reads through it, so it never fetches.
|
|
30
|
+
*/
|
|
31
|
+
export const PEEK_RELEASE = Symbol.for("decocms.blocks.peekRelease");
|
|
32
|
+
/** The release a source holds in memory: the snapshot itself, or what a loader can peek. */
|
|
33
|
+
export function peekRelease(source) {
|
|
34
|
+
if (!isLoader(source))
|
|
35
|
+
return source;
|
|
36
|
+
const peek = source[PEEK_RELEASE];
|
|
37
|
+
return typeof peek === "function" ? peek.call(source) : undefined;
|
|
38
|
+
}
|
|
26
39
|
export function isSnapshot(content) {
|
|
27
40
|
return (isPlainObject(content) &&
|
|
28
41
|
typeof content.revision === "string" &&
|
|
@@ -35,6 +48,8 @@ export class ContentStore {
|
|
|
35
48
|
#updating;
|
|
36
49
|
#drafts = new BoundedMap(CACHED_DRAFTS);
|
|
37
50
|
#served = new BoundedMap(SERVED_REVISIONS);
|
|
51
|
+
/** The release this store last handed a client, for a loader that can't peek. */
|
|
52
|
+
#latest;
|
|
38
53
|
constructor(source) {
|
|
39
54
|
this.#source = source;
|
|
40
55
|
}
|
|
@@ -96,6 +111,14 @@ export class ContentStore {
|
|
|
96
111
|
});
|
|
97
112
|
return entry.pending;
|
|
98
113
|
}
|
|
114
|
+
/**
|
|
115
|
+
* The current release as it is in memory, without loading anything: the
|
|
116
|
+
* content module, what a built-in loader holds, or the release this store
|
|
117
|
+
* last loaded. `undefined` before a custom loader's first load.
|
|
118
|
+
*/
|
|
119
|
+
current() {
|
|
120
|
+
return peekRelease(this.#source) ?? this.#latest;
|
|
121
|
+
}
|
|
99
122
|
/** A release revision this store has served, or the release when it's unknown (drafts included). */
|
|
100
123
|
revision(revision) {
|
|
101
124
|
const served = this.#served.get(revision);
|
|
@@ -113,6 +136,8 @@ export class ContentStore {
|
|
|
113
136
|
const updated = result?.updated === true;
|
|
114
137
|
if (updated) {
|
|
115
138
|
this.#release = undefined;
|
|
139
|
+
// `#latest` stays: settings keep the release that was serving until
|
|
140
|
+
// the next one loads, never the defaults (which may allow every host).
|
|
116
141
|
// A loader that ignores the pointer hands back the release as the
|
|
117
142
|
// draft; that copy is as stale as the release now.
|
|
118
143
|
this.#drafts.clear();
|
|
@@ -140,6 +165,7 @@ export class ContentStore {
|
|
|
140
165
|
// The same loader (a hosted remoteLoader that adopted new fallback content): re-read it.
|
|
141
166
|
// Cached drafts were layered over the old content, so they go too.
|
|
142
167
|
this.#release = undefined;
|
|
168
|
+
this.#latest = undefined;
|
|
143
169
|
this.#drafts.clear();
|
|
144
170
|
return;
|
|
145
171
|
}
|
|
@@ -147,6 +173,7 @@ export class ContentStore {
|
|
|
147
173
|
this.#served.delete(previous.revision);
|
|
148
174
|
this.#source = source;
|
|
149
175
|
this.#release = undefined;
|
|
176
|
+
this.#latest = undefined;
|
|
150
177
|
this.#drafts.clear();
|
|
151
178
|
}
|
|
152
179
|
async #load(loader, pointer) {
|
|
@@ -165,6 +192,7 @@ export class ContentStore {
|
|
|
165
192
|
return snapshot;
|
|
166
193
|
}
|
|
167
194
|
#serve(snapshot) {
|
|
195
|
+
this.#latest = snapshot;
|
|
168
196
|
this.#served.set(snapshot.revision, snapshot);
|
|
169
197
|
return snapshot;
|
|
170
198
|
}
|
package/dist/v8/content.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content.js","sourceRoot":"","sources":["../../src/v8/content.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAG1C,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAC5B,uFAAuF;AACvF,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB;;;GAGG;AACH,MAAM,YAAY,GAAG,MAAM,CAAC;AAE5B,MAAM,UAAU,QAAQ,CAAC,OAAgB;IACvC,OAAO,CACL,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,UAAU,CAAC;QAC9D,OAAO,KAAK,IAAI;QAChB,OAAQ,OAAkB,CAAC,IAAI,KAAK,UAAU,CAC/C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,OAAgB;IACzC,OAAO,CACL,aAAa,CAAC,OAAO,CAAC;QACtB,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ;QACpC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC;QAC7B,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,IAAI,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAClE,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,YAAY;IACvB,OAAO,CAAoB;IAC3B,QAAQ,CAAgC;IACxC,SAAS,CAA4C;IAC5C,OAAO,GAAG,IAAI,UAAU,CAC/B,aAAa,CACd,CAAC;IACO,OAAO,GAAG,IAAI,UAAU,CAAmB,gBAAgB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"content.js","sourceRoot":"","sources":["../../src/v8/content.ts"],"names":[],"mappings":"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"}
|
package/dist/v8/draft.d.ts
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Draft pointers (see /next/api-reference#draft-pointers): the string
|
|
3
|
-
* `<host[:port]><path[?query]>@<version>` that names a draft, and
|
|
4
|
-
*
|
|
3
|
+
* `<host[:port]><path[?query]>@<version>` that names a draft, and what
|
|
4
|
+
* `cms.draftPointer` and `cms.draftCookie` read and write to carry one from a
|
|
5
|
+
* `?__draft=` link into a cookie. The host check against the preview hosts is
|
|
6
|
+
* the CMS's: these read the request only.
|
|
5
7
|
*
|
|
6
8
|
* The query's reserved `__variant` parameters are the variants a preview
|
|
7
9
|
* forces (`<block>@<path>=<index>`, URL-encoded, one per multivariate); the
|
|
8
10
|
* parser lifts them out of `path` into `variants`.
|
|
9
11
|
*/
|
|
10
|
-
import type { DraftPointer } from "./types.ts";
|
|
11
|
-
/** The draft cookie's name, for frameworks whose cookie API has no Request (Next.js `cookies()`). */
|
|
12
|
-
export declare const DRAFT_COOKIE = "deco-draft";
|
|
12
|
+
import type { DraftPointer, RequestLike } from "./types.ts";
|
|
13
13
|
/**
|
|
14
14
|
* Parses a pointer, strictly: `null` on a scheme, a stray `@`, an unrooted
|
|
15
15
|
* path, an odd character in the host or version, or a port out of range. The
|
|
@@ -23,17 +23,12 @@ export declare function parseDraftPointer(raw: string | null | undefined): Draft
|
|
|
23
23
|
* bad pointer is caught where it's built rather than where it's loaded.
|
|
24
24
|
*/
|
|
25
25
|
export declare function formatDraftPointer(pointer: DraftPointer): string;
|
|
26
|
-
/** Anything with a `url` and `headers`: a fetch `Request`, a `NextRequest`, a framework wrapper. */
|
|
27
|
-
export type RequestLike = Request | {
|
|
28
|
-
url: string;
|
|
29
|
-
headers: Headers;
|
|
30
|
-
};
|
|
31
26
|
/**
|
|
32
27
|
* The draft pointer a request carries: `?__draft=` from the URL first, then
|
|
33
28
|
* the `deco-draft` cookie. `null` when neither is present, or when the URL
|
|
34
29
|
* says `?__draft=off`. The value is returned as is; `cms.forDraft` validates it.
|
|
35
30
|
*/
|
|
36
|
-
export declare function
|
|
31
|
+
export declare function readDraftPointer(request: RequestLike): string | null;
|
|
37
32
|
/**
|
|
38
33
|
* The `Set-Cookie` value for a request whose URL carries `?__draft=`: one that
|
|
39
34
|
* stores the pointer, or one that expires the cookie when the value is `off`
|
|
@@ -44,5 +39,7 @@ export declare function draftPointer(request: RequestLike): string | null;
|
|
|
44
39
|
* is `Secure; SameSite=None; Partitioned` (CHIPS): `SameSite=Lax` would never
|
|
45
40
|
* be sent there. `HttpOnly` keeps page scripts from reading the pointer.
|
|
46
41
|
*/
|
|
47
|
-
export declare function
|
|
42
|
+
export declare function draftCookieFor(request: RequestLike): string | null;
|
|
43
|
+
/** Whether the request's URL says `?__draft=off`: the cookie that ends a preview is set on any host. */
|
|
44
|
+
export declare function endsPreview(request: RequestLike): boolean;
|
|
48
45
|
//# sourceMappingURL=draft.d.ts.map
|
package/dist/v8/draft.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"draft.d.ts","sourceRoot":"","sources":["../../src/v8/draft.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"draft.d.ts","sourceRoot":"","sources":["../../src/v8/draft.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,YAAY,EAAiB,WAAW,EAAE,MAAM,YAAY,CAAC;AAkB3E;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,YAAY,GAAG,IAAI,CAoBrF;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,CAiBhE;AA4DD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAMpE;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAMlE;AAED,wGAAwG;AACxG,wBAAgB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAEzD"}
|
package/dist/v8/draft.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
/** The draft cookie's name
|
|
2
|
-
|
|
1
|
+
/** The draft cookie's name. Not exported from the package: reading it directly would skip the host check. */
|
|
2
|
+
const DRAFT_COOKIE = "deco-draft";
|
|
3
3
|
const DRAFT_PARAM = "__draft";
|
|
4
4
|
const DRAFT_OFF = "off";
|
|
5
5
|
/** Lowercase DNS name; a single label (`localhost`) is allowed. */
|
|
@@ -127,7 +127,7 @@ function normalizeHost(authority) {
|
|
|
127
127
|
* the `deco-draft` cookie. `null` when neither is present, or when the URL
|
|
128
128
|
* says `?__draft=off`. The value is returned as is; `cms.forDraft` validates it.
|
|
129
129
|
*/
|
|
130
|
-
export function
|
|
130
|
+
export function readDraftPointer(request) {
|
|
131
131
|
const param = draftParam(request);
|
|
132
132
|
if (param === DRAFT_OFF)
|
|
133
133
|
return null;
|
|
@@ -146,7 +146,7 @@ export function draftPointer(request) {
|
|
|
146
146
|
* is `Secure; SameSite=None; Partitioned` (CHIPS): `SameSite=Lax` would never
|
|
147
147
|
* be sent there. `HttpOnly` keeps page scripts from reading the pointer.
|
|
148
148
|
*/
|
|
149
|
-
export function
|
|
149
|
+
export function draftCookieFor(request) {
|
|
150
150
|
const param = draftParam(request);
|
|
151
151
|
if (!param)
|
|
152
152
|
return null;
|
|
@@ -156,6 +156,10 @@ export function draftCookie(request) {
|
|
|
156
156
|
return null;
|
|
157
157
|
return serializeCookie(encodeURIComponent(param), []);
|
|
158
158
|
}
|
|
159
|
+
/** Whether the request's URL says `?__draft=off`: the cookie that ends a preview is set on any host. */
|
|
160
|
+
export function endsPreview(request) {
|
|
161
|
+
return draftParam(request) === DRAFT_OFF;
|
|
162
|
+
}
|
|
159
163
|
function serializeCookie(value, extra) {
|
|
160
164
|
return [
|
|
161
165
|
`${DRAFT_COOKIE}=${value}`,
|
package/dist/v8/draft.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"draft.js","sourceRoot":"","sources":["../../src/v8/draft.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"draft.js","sourceRoot":"","sources":["../../src/v8/draft.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Host patterns (see /next/api-reference#host-patterns): the format of
|
|
3
|
+
* `preview.hosts`, in `createCMS` and in the `CMS` block.
|
|
4
|
+
*
|
|
5
|
+
* - Hostnames and patterns are compared lowercase, with one trailing dot
|
|
6
|
+
* removed; names outside ASCII in their punycode form.
|
|
7
|
+
* - A pattern without `*` matches that one hostname.
|
|
8
|
+
* - `*.name` matches a hostname that ends in `.name` with at least one more
|
|
9
|
+
* label in front, compared label by label from the right. `*` is only ever
|
|
10
|
+
* the whole leading label, and at least two labels follow it.
|
|
11
|
+
* - `"*"` alone matches every host.
|
|
12
|
+
* - A pattern without a port matches any port; one with a port matches only
|
|
13
|
+
* a URL that names that port.
|
|
14
|
+
* - IPv4, and IPv6 in brackets, match exactly and never take a wildcard.
|
|
15
|
+
* - Anything else (a scheme, a path, a space, an empty label) isn't a pattern.
|
|
16
|
+
*/
|
|
17
|
+
/** A parsed pattern. `port` is absent when the pattern names none. */
|
|
18
|
+
export type HostPattern = {
|
|
19
|
+
kind: "any";
|
|
20
|
+
} | {
|
|
21
|
+
kind: "name";
|
|
22
|
+
host: string;
|
|
23
|
+
port?: string;
|
|
24
|
+
} | {
|
|
25
|
+
kind: "wildcard";
|
|
26
|
+
suffix: string;
|
|
27
|
+
port?: string;
|
|
28
|
+
} | {
|
|
29
|
+
kind: "ip";
|
|
30
|
+
host: string;
|
|
31
|
+
port?: string;
|
|
32
|
+
};
|
|
33
|
+
/** The list that allows every host. */
|
|
34
|
+
export declare const EVERY_HOST = "*";
|
|
35
|
+
/** Parses one pattern; `null` when it isn't one. */
|
|
36
|
+
export declare function parseHostPattern(raw: unknown): HostPattern | null;
|
|
37
|
+
/** Formats a parsed pattern back into its normal form. */
|
|
38
|
+
export declare function formatHostPattern(pattern: HostPattern): string;
|
|
39
|
+
/**
|
|
40
|
+
* Whether a request URL's host is one a pattern matches. A URL that can't be
|
|
41
|
+
* read matches only `"*"`, and neither does a hostname with an empty label.
|
|
42
|
+
*/
|
|
43
|
+
export declare function hostMatches(pattern: HostPattern, url: URL | null): boolean;
|
|
44
|
+
/**
|
|
45
|
+
* Whether a request may preview under this list: some pattern matches its URL's
|
|
46
|
+
* host. A URL with a username or password (`https://public.com@staging.example.com/`,
|
|
47
|
+
* which a forged Host header can produce) counts as unreadable.
|
|
48
|
+
*/
|
|
49
|
+
export declare function allowsHost(patterns: readonly HostPattern[], requestUrl: string): boolean;
|
|
50
|
+
/**
|
|
51
|
+
* Whether every host `inner` matches is matched by `outer`: content's entry
|
|
52
|
+
* `inner` is within code's entry `outer`.
|
|
53
|
+
*/
|
|
54
|
+
export declare function patternWithin(inner: HostPattern, outer: HostPattern): boolean;
|
|
55
|
+
//# sourceMappingURL=hosts.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hosts.d.ts","sourceRoot":"","sources":["../../src/v8/hosts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,sEAAsE;AACtE,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,GACf;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAC7C;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GACnD;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhD,uCAAuC;AACvC,eAAO,MAAM,UAAU,MAAM,CAAC;AAQ9B,oDAAoD;AACpD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,WAAW,GAAG,IAAI,CAsBjE;AAED,0DAA0D;AAC1D,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAI9D;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,GAAG,OAAO,CAe1E;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,WAAW,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CASxF;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAe7E"}
|
package/dist/v8/hosts.js
ADDED
|
@@ -0,0 +1,197 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Host patterns (see /next/api-reference#host-patterns): the format of
|
|
3
|
+
* `preview.hosts`, in `createCMS` and in the `CMS` block.
|
|
4
|
+
*
|
|
5
|
+
* - Hostnames and patterns are compared lowercase, with one trailing dot
|
|
6
|
+
* removed; names outside ASCII in their punycode form.
|
|
7
|
+
* - A pattern without `*` matches that one hostname.
|
|
8
|
+
* - `*.name` matches a hostname that ends in `.name` with at least one more
|
|
9
|
+
* label in front, compared label by label from the right. `*` is only ever
|
|
10
|
+
* the whole leading label, and at least two labels follow it.
|
|
11
|
+
* - `"*"` alone matches every host.
|
|
12
|
+
* - A pattern without a port matches any port; one with a port matches only
|
|
13
|
+
* a URL that names that port.
|
|
14
|
+
* - IPv4, and IPv6 in brackets, match exactly and never take a wildcard.
|
|
15
|
+
* - Anything else (a scheme, a path, a space, an empty label) isn't a pattern.
|
|
16
|
+
*/
|
|
17
|
+
/** The list that allows every host. */
|
|
18
|
+
export const EVERY_HOST = "*";
|
|
19
|
+
const LABEL_RE = /^[a-z0-9_]([a-z0-9_-]{0,61}[a-z0-9_])?$/;
|
|
20
|
+
const PORT_RE = /^[0-9]{1,5}$/;
|
|
21
|
+
const IPV4_RE = /^(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}$/;
|
|
22
|
+
const NUMERIC_LABEL_RE = /^(0x[0-9a-f]*|[0-9]+)$/;
|
|
23
|
+
/** Parses one pattern; `null` when it isn't one. */
|
|
24
|
+
export function parseHostPattern(raw) {
|
|
25
|
+
if (typeof raw !== "string" || raw.length === 0 || raw.length > 300)
|
|
26
|
+
return null;
|
|
27
|
+
if (raw === EVERY_HOST)
|
|
28
|
+
return { kind: "any" };
|
|
29
|
+
if (/[\s/\\?#@]/.test(raw) || raw.includes("://"))
|
|
30
|
+
return null;
|
|
31
|
+
const split = splitPort(raw);
|
|
32
|
+
if (split === null)
|
|
33
|
+
return null;
|
|
34
|
+
const { port } = split;
|
|
35
|
+
let host = split.host;
|
|
36
|
+
if (host.startsWith("[")) {
|
|
37
|
+
const ip = normalizeIPv6(host);
|
|
38
|
+
return ip === null ? null : withPort({ kind: "ip", host: ip }, port);
|
|
39
|
+
}
|
|
40
|
+
host = host.toLowerCase();
|
|
41
|
+
if (host.endsWith("."))
|
|
42
|
+
host = host.slice(0, -1);
|
|
43
|
+
if (host.startsWith("*.")) {
|
|
44
|
+
const suffix = normalizeName(host.slice(2));
|
|
45
|
+
if (suffix === null || suffix.split(".").length < 2)
|
|
46
|
+
return null;
|
|
47
|
+
return withPort({ kind: "wildcard", suffix }, port);
|
|
48
|
+
}
|
|
49
|
+
if (IPV4_RE.test(host))
|
|
50
|
+
return withPort({ kind: "ip", host }, port);
|
|
51
|
+
const name = normalizeName(host);
|
|
52
|
+
return name === null ? null : withPort({ kind: "name", host: name }, port);
|
|
53
|
+
}
|
|
54
|
+
/** Formats a parsed pattern back into its normal form. */
|
|
55
|
+
export function formatHostPattern(pattern) {
|
|
56
|
+
if (pattern.kind === "any")
|
|
57
|
+
return EVERY_HOST;
|
|
58
|
+
const host = pattern.kind === "wildcard" ? `*.${pattern.suffix}` : pattern.host;
|
|
59
|
+
return pattern.port === undefined ? host : `${host}:${pattern.port}`;
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* Whether a request URL's host is one a pattern matches. A URL that can't be
|
|
63
|
+
* read matches only `"*"`, and neither does a hostname with an empty label.
|
|
64
|
+
*/
|
|
65
|
+
export function hostMatches(pattern, url) {
|
|
66
|
+
if (pattern.kind === "any")
|
|
67
|
+
return true;
|
|
68
|
+
if (url === null)
|
|
69
|
+
return false;
|
|
70
|
+
if (pattern.port !== undefined && pattern.port !== url.port)
|
|
71
|
+
return false;
|
|
72
|
+
let host = url.hostname.toLowerCase();
|
|
73
|
+
if (host.endsWith("."))
|
|
74
|
+
host = host.slice(0, -1);
|
|
75
|
+
// An empty label (`a..example.com`) isn't a hostname any pattern names.
|
|
76
|
+
if (host.split(".").includes(""))
|
|
77
|
+
return false;
|
|
78
|
+
switch (pattern.kind) {
|
|
79
|
+
case "name":
|
|
80
|
+
case "ip":
|
|
81
|
+
return host === pattern.host;
|
|
82
|
+
case "wildcard":
|
|
83
|
+
return host.length > pattern.suffix.length + 1 && host.endsWith(`.${pattern.suffix}`);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Whether a request may preview under this list: some pattern matches its URL's
|
|
88
|
+
* host. A URL with a username or password (`https://public.com@staging.example.com/`,
|
|
89
|
+
* which a forged Host header can produce) counts as unreadable.
|
|
90
|
+
*/
|
|
91
|
+
export function allowsHost(patterns, requestUrl) {
|
|
92
|
+
let url;
|
|
93
|
+
try {
|
|
94
|
+
url = new URL(requestUrl);
|
|
95
|
+
}
|
|
96
|
+
catch {
|
|
97
|
+
url = null;
|
|
98
|
+
}
|
|
99
|
+
if (url !== null && (url.username !== "" || url.password !== ""))
|
|
100
|
+
url = null;
|
|
101
|
+
return patterns.some((pattern) => hostMatches(pattern, url));
|
|
102
|
+
}
|
|
103
|
+
/**
|
|
104
|
+
* Whether every host `inner` matches is matched by `outer`: content's entry
|
|
105
|
+
* `inner` is within code's entry `outer`.
|
|
106
|
+
*/
|
|
107
|
+
export function patternWithin(inner, outer) {
|
|
108
|
+
if (outer.kind === "any")
|
|
109
|
+
return true;
|
|
110
|
+
if (inner.kind === "any")
|
|
111
|
+
return false;
|
|
112
|
+
if (outer.port !== undefined && inner.port !== outer.port)
|
|
113
|
+
return false;
|
|
114
|
+
switch (outer.kind) {
|
|
115
|
+
case "name":
|
|
116
|
+
case "ip":
|
|
117
|
+
return inner.kind === outer.kind && inner.host === outer.host;
|
|
118
|
+
case "wildcard":
|
|
119
|
+
if (inner.kind === "name")
|
|
120
|
+
return inner.host.endsWith(`.${outer.suffix}`);
|
|
121
|
+
if (inner.kind === "wildcard") {
|
|
122
|
+
return inner.suffix === outer.suffix || inner.suffix.endsWith(`.${outer.suffix}`);
|
|
123
|
+
}
|
|
124
|
+
return false;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
function withPort(pattern, port) {
|
|
128
|
+
return port === undefined ? pattern : { ...pattern, port };
|
|
129
|
+
}
|
|
130
|
+
/** `host[:port]`, with the port checked; `null` on an empty host or a bad port. */
|
|
131
|
+
function splitPort(raw) {
|
|
132
|
+
let host = raw;
|
|
133
|
+
let port;
|
|
134
|
+
if (raw.startsWith("[")) {
|
|
135
|
+
const end = raw.indexOf("]");
|
|
136
|
+
if (end === -1)
|
|
137
|
+
return null;
|
|
138
|
+
host = raw.slice(0, end + 1);
|
|
139
|
+
const rest = raw.slice(end + 1);
|
|
140
|
+
if (rest !== "") {
|
|
141
|
+
if (!rest.startsWith(":"))
|
|
142
|
+
return null;
|
|
143
|
+
port = rest.slice(1);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
const colon = raw.indexOf(":");
|
|
148
|
+
if (colon !== -1) {
|
|
149
|
+
if (raw.indexOf(":", colon + 1) !== -1)
|
|
150
|
+
return null; // an IPv6 address without brackets
|
|
151
|
+
host = raw.slice(0, colon);
|
|
152
|
+
port = raw.slice(colon + 1);
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
if (host === "")
|
|
156
|
+
return null;
|
|
157
|
+
if (port !== undefined && (!PORT_RE.test(port) || Number(port) > 65535))
|
|
158
|
+
return null;
|
|
159
|
+
// The form a URL gives it: no leading zeros.
|
|
160
|
+
return port === undefined ? { host } : { host, port: String(Number(port)) };
|
|
161
|
+
}
|
|
162
|
+
/** A DNS name in its ASCII (punycode) form, lowercase; `null` if it isn't one. */
|
|
163
|
+
function normalizeName(name) {
|
|
164
|
+
if (name === "" || name.includes("*"))
|
|
165
|
+
return null;
|
|
166
|
+
let ascii = name;
|
|
167
|
+
// biome-ignore lint/suspicious/noControlCharactersInRegex: the ASCII range is the point
|
|
168
|
+
if (/[^\x00-\x7f]/.test(name)) {
|
|
169
|
+
try {
|
|
170
|
+
ascii = new URL(`http://${name}/`).hostname;
|
|
171
|
+
}
|
|
172
|
+
catch {
|
|
173
|
+
return null;
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
const labels = ascii.split(".");
|
|
177
|
+
if (labels.some((label) => !LABEL_RE.test(label)))
|
|
178
|
+
return null;
|
|
179
|
+
// A name ending in a numeric label is an IPv4 address to a URL parser: only
|
|
180
|
+
// the canonical dotted form above is one.
|
|
181
|
+
if (NUMERIC_LABEL_RE.test(labels[labels.length - 1]))
|
|
182
|
+
return null;
|
|
183
|
+
return ascii.length > 253 ? null : ascii;
|
|
184
|
+
}
|
|
185
|
+
/** `[addr]` in the compressed, lowercase form a URL's hostname has. */
|
|
186
|
+
function normalizeIPv6(bracketed) {
|
|
187
|
+
if (!/^\[[0-9a-fA-F:.]+\]$/.test(bracketed))
|
|
188
|
+
return null;
|
|
189
|
+
try {
|
|
190
|
+
const host = new URL(`http://${bracketed}/`).hostname;
|
|
191
|
+
return host.startsWith("[") ? host : null;
|
|
192
|
+
}
|
|
193
|
+
catch {
|
|
194
|
+
return null;
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
//# sourceMappingURL=hosts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hosts.js","sourceRoot":"","sources":["../../src/v8/hosts.ts"],"names":[],"mappings":"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"}
|
package/dist/v8/index.d.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The next-major (v8) core SDK: `createCMS`, the clients, the built-in blocks,
|
|
3
|
-
* `matchRoute` and the draft helpers.
|
|
3
|
+
* `matchRoute` and the draft pointer helpers (`cms.draftPointer` and
|
|
4
|
+
* `cms.draftCookie` are methods: they check the preview hosts). Re-exported from the package root, where
|
|
4
5
|
* these names are the documented ones; see /next/api-reference.
|
|
5
6
|
*/
|
|
6
7
|
export { createCMS, resetForTests } from "./cms.ts";
|
|
7
|
-
export {
|
|
8
|
+
export { formatDraftPointer, parseDraftPointer } from "./draft.ts";
|
|
8
9
|
export { matchRoute } from "./matchRoute.ts";
|
|
9
10
|
export { remoteLoader } from "./remoteLoader.ts";
|
|
10
|
-
export type { Analytics, Block, BlockFunction, Blocks, Client, CMS, CMSError, DraftPointer, Lazy, ListOptions, Loader, Match, Page, Redirect, Result, Route, Secret, Seo, Snapshot, Telemetry, TelemetryConfig, Variant, } from "./types.ts";
|
|
11
|
+
export type { Analytics, Block, BlockFunction, Blocks, Client, CMS, CMSError, CMSSettings, DraftPointer, EffectiveSettings, Lazy, ListOptions, Loader, Match, Page, Redirect, RequestLike, Result, Route, Secret, Seo, Snapshot, Telemetry, TelemetryConfig, Variant, } from "./types.ts";
|
|
11
12
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/v8/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/v8/index.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/v8/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,YAAY,EACV,SAAS,EACT,KAAK,EACL,aAAa,EACb,MAAM,EACN,MAAM,EACN,GAAG,EACH,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,iBAAiB,EACjB,IAAI,EACJ,WAAW,EACX,MAAM,EACN,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,WAAW,EACX,MAAM,EACN,KAAK,EACL,MAAM,EACN,GAAG,EACH,QAAQ,EACR,SAAS,EACT,eAAe,EACf,OAAO,GACR,MAAM,YAAY,CAAC"}
|
package/dist/v8/index.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The next-major (v8) core SDK: `createCMS`, the clients, the built-in blocks,
|
|
3
|
-
* `matchRoute` and the draft helpers.
|
|
3
|
+
* `matchRoute` and the draft pointer helpers (`cms.draftPointer` and
|
|
4
|
+
* `cms.draftCookie` are methods: they check the preview hosts). Re-exported from the package root, where
|
|
4
5
|
* these names are the documented ones; see /next/api-reference.
|
|
5
6
|
*/
|
|
6
7
|
export { createCMS, resetForTests } from "./cms.js";
|
|
7
|
-
export {
|
|
8
|
+
export { formatDraftPointer, parseDraftPointer } from "./draft.js";
|
|
8
9
|
export { matchRoute } from "./matchRoute.js";
|
|
9
10
|
export { remoteLoader } from "./remoteLoader.js";
|
|
10
11
|
//# sourceMappingURL=index.js.map
|
package/dist/v8/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/v8/index.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/v8/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remoteLoader.d.ts","sourceRoot":"","sources":["../../src/v8/remoteLoader.ts"],"names":[],"mappings":"AA6CA,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAkBnD,UAAU,mBAAmB;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,qFAAqF;IACrF,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;
|
|
1
|
+
{"version":3,"file":"remoteLoader.d.ts","sourceRoot":"","sources":["../../src/v8/remoteLoader.ts"],"names":[],"mappings":"AA6CA,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAkBnD,UAAU,mBAAmB;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,qFAAqF;IACrF,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAkSD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,MAAM,CAwB9F;AAED,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}
|
package/dist/v8/remoteLoader.js
CHANGED
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
* Instances are process-wide singletons, like `createCMS`'s.
|
|
34
34
|
*/
|
|
35
35
|
import { computeBlockHash, computeContentRevision, computeOverlayVersion, DRAFT_OVERLAY_FORMAT, } from "./canonical.js";
|
|
36
|
-
import { BoundedMap, isSnapshot } from "./content.js";
|
|
36
|
+
import { BoundedMap, isSnapshot, PEEK_RELEASE, peekRelease } from "./content.js";
|
|
37
37
|
import { parseDraftPointer } from "./draft.js";
|
|
38
38
|
import { clearGlobals, contentIdentity, fnv1a } from "./identity.js";
|
|
39
39
|
import { isPlainObject } from "./json.js";
|
|
@@ -58,6 +58,8 @@ class RemoteLoader {
|
|
|
58
58
|
interval;
|
|
59
59
|
#fallback;
|
|
60
60
|
#fallbackRevision;
|
|
61
|
+
/** The fallback's content as last loaded, for a fallback that is itself a loader. */
|
|
62
|
+
#fallbackSnapshot;
|
|
61
63
|
#current;
|
|
62
64
|
#generation = -1;
|
|
63
65
|
/** Authorized manifests, by overlay version and grant: a version alone unlocks nothing. */
|
|
@@ -77,6 +79,11 @@ class RemoteLoader {
|
|
|
77
79
|
return;
|
|
78
80
|
this.#fallback = fallback;
|
|
79
81
|
this.#fallbackRevision = undefined;
|
|
82
|
+
this.#fallbackSnapshot = undefined;
|
|
83
|
+
}
|
|
84
|
+
/** What `load()` would return now, from memory only (see `peekRelease`). */
|
|
85
|
+
[PEEK_RELEASE]() {
|
|
86
|
+
return this.#current ?? peekRelease(this.#fallback) ?? this.#fallbackSnapshot;
|
|
80
87
|
}
|
|
81
88
|
load(pointer) {
|
|
82
89
|
if (pointer)
|
|
@@ -116,8 +123,10 @@ class RemoteLoader {
|
|
|
116
123
|
async #loadFallback() {
|
|
117
124
|
const fallback = this.#fallback;
|
|
118
125
|
const snapshot = isSnapshot(fallback) ? fallback : await fallback.load();
|
|
119
|
-
if (fallback === this.#fallback)
|
|
126
|
+
if (fallback === this.#fallback) {
|
|
120
127
|
this.#fallbackRevision = snapshot.revision;
|
|
128
|
+
this.#fallbackSnapshot = snapshot;
|
|
129
|
+
}
|
|
121
130
|
return snapshot;
|
|
122
131
|
}
|
|
123
132
|
async #fallbackRevisionNow() {
|
|
@@ -276,6 +285,9 @@ class LocalLoader {
|
|
|
276
285
|
adopt(fallback) {
|
|
277
286
|
this.#fallback = fallback;
|
|
278
287
|
}
|
|
288
|
+
[PEEK_RELEASE]() {
|
|
289
|
+
return peekRelease(this.#fallback);
|
|
290
|
+
}
|
|
279
291
|
load(pointer) {
|
|
280
292
|
const fallback = this.#fallback;
|
|
281
293
|
return isSnapshot(fallback) ? Promise.resolve(fallback) : fallback.load(pointer);
|