@decocms/blocks 8.1.0-next.6 → 8.1.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 (81) hide show
  1. package/dist/v8/cli/check/index.d.ts +6 -2
  2. package/dist/v8/cli/check/index.d.ts.map +1 -1
  3. package/dist/v8/cli/check/index.js +34 -7
  4. package/dist/v8/cli/check/index.js.map +1 -1
  5. package/dist/v8/cli/color.d.ts +14 -0
  6. package/dist/v8/cli/color.d.ts.map +1 -0
  7. package/dist/v8/cli/color.js +14 -0
  8. package/dist/v8/cli/color.js.map +1 -0
  9. package/dist/v8/cli/content.d.ts +24 -3
  10. package/dist/v8/cli/content.d.ts.map +1 -1
  11. package/dist/v8/cli/content.js +70 -5
  12. package/dist/v8/cli/content.js.map +1 -1
  13. package/dist/v8/cli/log.d.ts +4 -0
  14. package/dist/v8/cli/log.d.ts.map +1 -1
  15. package/dist/v8/cli/log.js +9 -0
  16. package/dist/v8/cli/log.js.map +1 -1
  17. package/dist/v8/cli/run.d.ts +1 -0
  18. package/dist/v8/cli/run.d.ts.map +1 -1
  19. package/dist/v8/cli/run.js +18 -4
  20. package/dist/v8/cli/run.js.map +1 -1
  21. package/dist/v8/cli/schema/index.d.ts.map +1 -1
  22. package/dist/v8/cli/schema/index.js +5 -3
  23. package/dist/v8/cli/schema/index.js.map +1 -1
  24. package/dist/v8/cli/schema/tsProgram.d.ts +1 -0
  25. package/dist/v8/cli/schema/tsProgram.d.ts.map +1 -1
  26. package/dist/v8/cli/schema/tsProgram.js +1 -0
  27. package/dist/v8/cli/schema/tsProgram.js.map +1 -1
  28. package/dist/v8/cli/schema/typeToSchema.d.ts.map +1 -1
  29. package/dist/v8/cli/schema/typeToSchema.js +50 -7
  30. package/dist/v8/cli/schema/typeToSchema.js.map +1 -1
  31. package/dist/v8/cms.d.ts.map +1 -1
  32. package/dist/v8/cms.js +16 -19
  33. package/dist/v8/cms.js.map +1 -1
  34. package/dist/v8/content.d.ts +4 -5
  35. package/dist/v8/content.d.ts.map +1 -1
  36. package/dist/v8/content.js +46 -44
  37. package/dist/v8/content.js.map +1 -1
  38. package/dist/v8/draftChanges.d.ts +37 -14
  39. package/dist/v8/draftChanges.d.ts.map +1 -1
  40. package/dist/v8/draftChanges.js +66 -44
  41. package/dist/v8/draftChanges.js.map +1 -1
  42. package/dist/v8/identity.d.ts +0 -2
  43. package/dist/v8/identity.d.ts.map +1 -1
  44. package/dist/v8/identity.js +0 -10
  45. package/dist/v8/identity.js.map +1 -1
  46. package/dist/v8/matchRoute.d.ts +12 -10
  47. package/dist/v8/matchRoute.d.ts.map +1 -1
  48. package/dist/v8/matchRoute.js +60 -86
  49. package/dist/v8/matchRoute.js.map +1 -1
  50. package/dist/v8/remoteLoader.d.ts +4 -4
  51. package/dist/v8/remoteLoader.d.ts.map +1 -1
  52. package/dist/v8/remoteLoader.js +106 -96
  53. package/dist/v8/remoteLoader.js.map +1 -1
  54. package/dist/v8/routeTrie.d.ts +43 -0
  55. package/dist/v8/routeTrie.d.ts.map +1 -0
  56. package/dist/v8/routeTrie.js +88 -0
  57. package/dist/v8/routeTrie.js.map +1 -0
  58. package/dist/v8/telemetry.d.ts +7 -7
  59. package/dist/v8/telemetry.d.ts.map +1 -1
  60. package/dist/v8/telemetry.js +24 -100
  61. package/dist/v8/telemetry.js.map +1 -1
  62. package/dist/v8/types.d.ts +59 -17
  63. package/dist/v8/types.d.ts.map +1 -1
  64. package/package.json +1 -1
  65. package/src/v8/cli/check/index.ts +32 -7
  66. package/src/v8/cli/color.ts +29 -0
  67. package/src/v8/cli/content.ts +85 -5
  68. package/src/v8/cli/log.ts +12 -0
  69. package/src/v8/cli/run.ts +19 -4
  70. package/src/v8/cli/schema/index.ts +5 -3
  71. package/src/v8/cli/schema/tsProgram.ts +2 -1
  72. package/src/v8/cli/schema/typeToSchema.ts +47 -7
  73. package/src/v8/cms.ts +17 -20
  74. package/src/v8/content.ts +54 -46
  75. package/src/v8/draftChanges.ts +79 -43
  76. package/src/v8/identity.ts +0 -10
  77. package/src/v8/matchRoute.ts +70 -106
  78. package/src/v8/remoteLoader.ts +112 -111
  79. package/src/v8/routeTrie.ts +103 -0
  80. package/src/v8/telemetry.ts +27 -108
  81. package/src/v8/types.ts +60 -15
@@ -1 +1 @@
1
- {"version":3,"file":"draftChanges.js","sourceRoot":"","sources":["../../src/v8/draftChanges.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"draftChanges.js","sourceRoot":"","sources":["../../src/v8/draftChanges.ts"],"names":[],"mappings":"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"}
@@ -12,8 +12,6 @@ import type { Loader, Snapshot } from "./types.ts";
12
12
  export declare function contentIdentity(content: Snapshot | Loader): string;
13
13
  /** FNV-1a, 32-bit: a non-cryptographic fingerprint that keeps secrets out of keys and logs. */
14
14
  export declare function fnv1a(input: string): string;
15
- /** Reads an environment variable where there is one (Node, Bun, Workers with nodejs_compat). */
16
- export declare function readEnv(name: string): string | undefined;
17
15
  /** Clears every global instance whose registry key starts with `prefix`. */
18
16
  export declare function clearGlobals(prefix: string): void;
19
17
  //# sourceMappingURL=identity.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../src/v8/identity.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAInD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAMlE;AAkBD,+FAA+F;AAC/F,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAO3C;AAED,gGAAgG;AAChG,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAOxD;AAED,4EAA4E;AAC5E,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAKjD"}
1
+ {"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../src/v8/identity.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAInD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAMlE;AAkBD,+FAA+F;AAC/F,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAO3C;AAED,4EAA4E;AAC5E,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAKjD"}
@@ -33,16 +33,6 @@ export function fnv1a(input) {
33
33
  }
34
34
  return (hash >>> 0).toString(16).padStart(8, "0");
35
35
  }
36
- /** Reads an environment variable where there is one (Node, Bun, Workers with nodejs_compat). */
37
- export function readEnv(name) {
38
- try {
39
- return globalThis.process
40
- ?.env?.[name];
41
- }
42
- catch {
43
- return undefined;
44
- }
45
- }
46
36
  /** Clears every global instance whose registry key starts with `prefix`. */
47
37
  export function clearGlobals(prefix) {
48
38
  const store = globalThis;
@@ -1 +1 @@
1
- {"version":3,"file":"identity.js","sourceRoot":"","sources":["../../src/v8/identity.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;AAE/D;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,OAA0B;IACxD,IAAI,OAAQ,OAAkB,CAAC,IAAI,KAAK,UAAU;QAAE,OAAO,UAAU,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;IACzF,MAAM,IAAI,GAAa,OAA8B,CAAC,IAAI,CAAC;IAC3D,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;QAChD,CAAC,CAAC,UAAU,IAAI,EAAE;QAClB,CAAC,CAAC,UAAU,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;AACpC,CAAC;AAED,wGAAwG;AACxG,SAAS,QAAQ,CAAC,MAAc;IAC9B,MAAM,KAAK,GAAG,UAGb,CAAC;IACF,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IACtD,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;IACnC,IAAI,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAClC,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;QACrB,EAAE,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;QACrB,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,+FAA+F;AAC/F,MAAM,UAAU,KAAK,CAAC,KAAa;IACjC,IAAI,IAAI,GAAG,UAAU,CAAC;IACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,IAAI,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AACpD,CAAC;AAED,gGAAgG;AAChG,MAAM,UAAU,OAAO,CAAC,IAAY;IAClC,IAAI,CAAC;QACH,OAAQ,UAAyE,CAAC,OAAO;YACvF,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,MAAM,KAAK,GAAG,UAAgD,CAAC;IAC/D,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,qBAAqB,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9D,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC;IACtE,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"identity.js","sourceRoot":"","sources":["../../src/v8/identity.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;AAE/D;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,OAA0B;IACxD,IAAI,OAAQ,OAAkB,CAAC,IAAI,KAAK,UAAU;QAAE,OAAO,UAAU,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;IACzF,MAAM,IAAI,GAAa,OAA8B,CAAC,IAAI,CAAC;IAC3D,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;QAChD,CAAC,CAAC,UAAU,IAAI,EAAE;QAClB,CAAC,CAAC,UAAU,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;AACpC,CAAC;AAED,wGAAwG;AACxG,SAAS,QAAQ,CAAC,MAAc;IAC9B,MAAM,KAAK,GAAG,UAGb,CAAC;IACF,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IACtD,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;IACnC,IAAI,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAClC,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;QACrB,EAAE,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;QACrB,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,+FAA+F;AAC/F,MAAM,UAAU,KAAK,CAAC,KAAa;IACjC,IAAI,IAAI,GAAG,UAAU,CAAC;IACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,IAAI,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AACpD,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,MAAM,KAAK,GAAG,UAAgD,CAAC;IAC/D,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,qBAAqB,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9D,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC;IACtE,CAAC;AACH,CAAC"}
@@ -2,14 +2,16 @@
2
2
  * `matchRoute(url, items)`: finds the entry for a URL (see /next/routing and
3
3
  * /next/router-internals).
4
4
  *
5
- * Paths compile into a segment trie, cached per array object: a lookup costs
6
- * the URL's depth, not the number of routes. At every node the walk tries the
7
- * literal child, then the parameter child, then a trailing `*` (a splat: one
8
- * or more remaining segments), so exact paths win over parameters and
9
- * parameters over a splat, per segment. Redirects are a second trie, checked
10
- * first. Two entries that
11
- * reach the same leaf are a conflict `deco check` reports; here the earlier
12
- * one keeps it, so a lookup never throws. No regex, no sorting.
5
+ * Paths compile into a segment trie (`routeTrie.ts`), cached per array
6
+ * object: a lookup costs the URL's depth, not the number of routes. At every
7
+ * node the walk tries the literal child, then the parameter child, then a
8
+ * trailing `*` (a splat: one or more remaining segments), so exact paths win
9
+ * over parameters and parameters over a splat, per segment. Redirects are
10
+ * checked first, in their own tries: one per query a `from` is scoped to
11
+ * (`/calcados?map=c,ft`), tried when the request's query is exactly that one,
12
+ * then one for the path-only sources. Two entries that reach the same leaf
13
+ * are a conflict `deco check` reports; here the earlier one keeps it, so a
14
+ * lookup never throws. No regex, no sorting.
13
15
  */
14
16
  import type { Match, Redirect, Route } from "./types.ts";
15
17
  export declare function matchRoute<T extends Route>(url: string | URL | Request, items: {
@@ -18,8 +20,8 @@ export declare function matchRoute<T extends Route>(url: string | URL | Request,
18
20
  }): Match<T>;
19
21
  /**
20
22
  * The entries that reach a leaf an earlier entry already holds: two equal
21
- * paths, or two templates of one shape (`/:slug/p` and `/:id/p`). `matchRoute`
22
- * serves the earlier one; `deco check` reports each pair.
23
+ * paths, or two templates of one shape (`/:slug/p` and `/:id/p`), scoped to the
24
+ * same query. `matchRoute` serves the earlier one; `deco check` reports each pair.
23
25
  */
24
26
  export declare function findRouteConflicts<T extends {
25
27
  path: string;
@@ -1 +1 @@
1
- {"version":3,"file":"matchRoute.d.ts","sourceRoot":"","sources":["../../src/v8/matchRoute.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,EAAkB,KAAK,EAAE,QAAQ,EAAkB,KAAK,EAAE,MAAM,YAAY,CAAC;AAiBzF,wBAAgB,UAAU,CAAC,CAAC,SAAS,KAAK,EACxC,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAC3B,KAAK,EAAE;IAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAA;CAAE,GAC7C,KAAK,CAAC,CAAC,CAAC,CAwBV;AAsED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE;WAExD,CAAC;WAAS,CAAC;IAMtC"}
1
+ {"version":3,"file":"matchRoute.d.ts","sourceRoot":"","sources":["../../src/v8/matchRoute.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAYH,OAAO,KAAK,EAAkB,KAAK,EAAE,QAAQ,EAAkB,KAAK,EAAE,MAAM,YAAY,CAAC;AAWzF,wBAAgB,UAAU,CAAC,CAAC,SAAS,KAAK,EACxC,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAC3B,KAAK,EAAE;IAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAA;CAAE,GAC7C,KAAK,CAAC,CAAC,CAAC,CAwBV;AAmCD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE;WAGxD,CAAC;WAAS,CAAC;IAStC"}
@@ -1,3 +1,19 @@
1
+ /**
2
+ * `matchRoute(url, items)`: finds the entry for a URL (see /next/routing and
3
+ * /next/router-internals).
4
+ *
5
+ * Paths compile into a segment trie (`routeTrie.ts`), cached per array
6
+ * object: a lookup costs the URL's depth, not the number of routes. At every
7
+ * node the walk tries the literal child, then the parameter child, then a
8
+ * trailing `*` (a splat: one or more remaining segments), so exact paths win
9
+ * over parameters and parameters over a splat, per segment. Redirects are
10
+ * checked first, in their own tries: one per query a `from` is scoped to
11
+ * (`/calcados?map=c,ft`), tried when the request's query is exactly that one,
12
+ * then one for the path-only sources. Two entries that reach the same leaf
13
+ * are a conflict `deco check` reports; here the earlier one keeps it, so a
14
+ * lookup never throws. No regex, no sorting.
15
+ */
16
+ import { buildTrie, insert, lookup, safeDecode, splitPath, splitRef, } from "./routeTrie.js";
1
17
  const routeTries = new WeakMap();
2
18
  const redirectTries = new WeakMap();
3
19
  const STATUSES = new Set([301, 302, 307, 308]);
@@ -6,17 +22,18 @@ export function matchRoute(url, items) {
6
22
  if (target === null)
7
23
  return { kind: "not-found" };
8
24
  const redirects = Array.isArray(items?.redirects) ? items.redirects : [];
9
- const redirectTrie = cached(redirectTries, redirects, () => redirects.flatMap((input) => {
10
- const r = normalizeRedirect(input);
11
- return r ? [[r.from, r]] : [];
12
- }));
13
- const redirect = lookup(redirectTrie, target.segments);
14
- if (redirect !== null) {
25
+ const tries = cached(redirectTries, redirects, () => compileRedirects(redirects));
26
+ // A source scoped to the request's exact query string beats a path-only one,
27
+ // as Fresh's router tried `pathname + search` before `pathname`.
28
+ const scoped = target.search ? tries.get(target.search.slice(1)) : undefined;
29
+ const pathOnly = tries.get("");
30
+ const redirect = (scoped && lookup(scoped, target.segments)) || (pathOnly && lookup(pathOnly, target.segments));
31
+ if (redirect) {
15
32
  const location = buildLocation(redirect, target.search);
16
33
  return { kind: "redirect", location, status: redirect.value.status };
17
34
  }
18
35
  const routes = Array.isArray(items?.routes) ? items.routes : [];
19
- const trie = cached(routeTries, routes, () => routes.filter((r) => typeof r?.path === "string").map((r) => [r.path, r]));
36
+ const trie = cached(routeTries, routes, () => buildTrie(routes.filter((r) => typeof r?.path === "string").map((r) => [r.path, r])));
20
37
  const found = lookup(trie, target.segments);
21
38
  if (found === null)
22
39
  return { kind: "not-found" };
@@ -35,96 +52,45 @@ function parseTarget(url) {
35
52
  return null;
36
53
  }
37
54
  }
38
- /** `/a/b/`, `/a//b` and `/a/b?x` all name `["a", "b"]`; `/` names `[]`. */
39
- function splitPath(path) {
40
- const query = path.indexOf("?");
41
- const hash = path.indexOf("#");
42
- const end = Math.min(query === -1 ? path.length : query, hash === -1 ? path.length : hash);
43
- return path
44
- .slice(0, end)
45
- .split("/")
46
- .filter((segment) => segment.length > 0);
47
- }
48
- function safeDecode(segment) {
49
- try {
50
- return decodeURIComponent(segment);
51
- }
52
- catch {
53
- return segment;
54
- }
55
- }
56
- /** The trie for an array, built once per array object. */
57
- function cached(cache, key, entries) {
55
+ /** Built once per array object. */
56
+ function cached(cache, key, build) {
58
57
  const hit = cache.get(key);
59
58
  if (hit)
60
59
  return hit;
61
- const root = { literals: new Map() };
62
- for (const [path, value] of entries())
63
- insert(root, path, value);
64
- cache.set(key, root);
65
- return root;
60
+ const value = build();
61
+ cache.set(key, value);
62
+ return value;
66
63
  }
67
- /** Adds `path`; returns the value already holding its leaf (a conflict: the earlier keeps it). */
68
- function insert(root, path, value) {
69
- const names = [];
70
- const segments = splitPath(path);
71
- let node = root;
72
- for (const [i, segment] of segments.entries()) {
73
- if (segment === "*" && i === segments.length - 1) {
74
- if (node.splat)
75
- return node.splat.value;
76
- node.splat = { value, names };
77
- return undefined;
78
- }
79
- if (segment.startsWith(":") && segment.length > 1) {
80
- names.push(segment.slice(1));
81
- node = node.param ??= { literals: new Map() };
64
+ function compileRedirects(redirects) {
65
+ const tries = new Map();
66
+ for (const redirect of redirects.map(normalizeRedirect)) {
67
+ if (redirect === null)
82
68
  continue;
83
- }
84
- const literal = safeDecode(segment);
85
- const child = node.literals.get(literal) ?? { literals: new Map() };
86
- node.literals.set(literal, child);
87
- node = child;
69
+ const root = tries.get(redirect.query) ?? { literals: new Map() };
70
+ tries.set(redirect.query, root);
71
+ insert(root, redirect.from, redirect);
88
72
  }
89
- if (node.leaf)
90
- return node.leaf.value;
91
- node.leaf = { value, names };
92
- return undefined;
73
+ return tries;
93
74
  }
94
75
  /**
95
76
  * The entries that reach a leaf an earlier entry already holds: two equal
96
- * paths, or two templates of one shape (`/:slug/p` and `/:id/p`). `matchRoute`
97
- * serves the earlier one; `deco check` reports each pair.
77
+ * paths, or two templates of one shape (`/:slug/p` and `/:id/p`), scoped to the
78
+ * same query. `matchRoute` serves the earlier one; `deco check` reports each pair.
98
79
  */
99
80
  export function findRouteConflicts(entries) {
100
- const root = { literals: new Map() };
81
+ // A redirect scoped to a query (`/x?map=ft`) never meets `/x` or `/x?map=c`.
82
+ const roots = new Map();
101
83
  const conflicts = [];
102
84
  for (const entry of entries) {
85
+ const query = splitRef(entry.path).query;
86
+ const root = roots.get(query) ?? { literals: new Map() };
87
+ roots.set(query, root);
103
88
  const other = insert(root, entry.path, entry);
104
89
  if (other !== undefined)
105
90
  conflicts.push({ entry, other });
106
91
  }
107
92
  return conflicts;
108
93
  }
109
- /** Walks the URL's segments: the literal child first, then the parameter child, then the splat. */
110
- function lookup(node, segs, i = 0, vals = []) {
111
- if (i === segs.length)
112
- return node.leaf ? hit(node.leaf, vals, []) : null;
113
- const literal = node.literals.get(segs[i]);
114
- let found = literal ? lookup(literal, segs, i + 1, vals) : null;
115
- // A parameter is one segment and never contains a slash, even an encoded one.
116
- if (!found && node.param && !segs[i].includes("/")) {
117
- found = lookup(node.param, segs, i + 1, [...vals, segs[i]]);
118
- }
119
- // A splat takes the rest (at least one segment, as there is one here).
120
- return found ?? (node.splat ? hit(node.splat, vals, segs.slice(i)) : null);
121
- }
122
- function hit({ value, names }, values, rest) {
123
- const params = Object.fromEntries(names.map((n, i) => [n, values[i]]));
124
- if (rest.length > 0)
125
- params["*"] = rest.join("/");
126
- return { value, params, rest };
127
- }
128
94
  /**
129
95
  * Both redirect shapes: the flat built-in `{ from, to, permanent, status?,
130
96
  * discardQueryParameters? }` and the site editor's legacy nested
@@ -144,7 +110,18 @@ function normalizeRedirect(input) {
144
110
  else if (STATUSES.has(flat.status))
145
111
  status = flat.status;
146
112
  const { from, to, discardQueryParameters } = flat;
147
- return { from, to, permanent: status === 301 || status === 308, status, discardQueryParameters };
113
+ const query = splitRef(from).query;
114
+ // A `to` naming the path `from` matches would match again, forever: `/a` →
115
+ // `/a`, `/a/` → `/a`, `/x` → `/x?utm=1` (a path-only source takes any
116
+ // query), `/p/:id` → `/p/:id`, and `/x?a=1` → `/x` (the query is carried
117
+ // over). Dropped, as Fresh's loader skipped `from === to`. Compared as
118
+ // written (`/café` and `/caf%C3%A9` aren't folded); `https://…` never equals.
119
+ const back = [splitRef(to).query, discardQueryParameters ? "" : query].filter(Boolean).join("&");
120
+ const loops = splitPath(from).join("/") === splitPath(to).join("/") && (!query || back === query);
121
+ if (to[0] === "/" && loops)
122
+ return null;
123
+ const permanent = status === 301 || status === 308;
124
+ return { from, to, permanent, status, discardQueryParameters, query };
148
125
  }
149
126
  /**
150
127
  * Fills the redirect's `:name` segments with the parameters `from` captured,
@@ -154,11 +131,8 @@ function normalizeRedirect(input) {
154
131
  * into `//other.host` (or `/\other.host`).
155
132
  */
156
133
  function buildLocation({ value: redirect, params, rest }, search) {
157
- const { to } = redirect;
158
- const hashAt = to.indexOf("#") === -1 ? to.length : to.indexOf("#");
159
- const queryAt = to.indexOf("?") === -1 || to.indexOf("?") > hashAt ? hashAt : to.indexOf("?");
160
- const filled = to
161
- .slice(0, queryAt)
134
+ const { path, query: written, hash } = splitRef(redirect.to);
135
+ const filled = path
162
136
  .split("/")
163
137
  .map((s) => {
164
138
  if (s === "*" && rest.length > 0)
@@ -169,7 +143,7 @@ function buildLocation({ value: redirect, params, rest }, search) {
169
143
  })
170
144
  .join("/");
171
145
  const carried = redirect.discardQueryParameters ? "" : search.slice(1);
172
- const query = [to.slice(queryAt + 1, hashAt), carried].filter(Boolean).join("&");
173
- return `${filled}${query ? `?${query}` : ""}${to.slice(hashAt)}`;
146
+ const query = [written, carried].filter(Boolean).join("&");
147
+ return `${filled}${query ? `?${query}` : ""}${hash}`;
174
148
  }
175
149
  //# sourceMappingURL=matchRoute.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"matchRoute.js","sourceRoot":"","sources":["../../src/v8/matchRoute.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"matchRoute.js","sourceRoot":"","sources":["../../src/v8/matchRoute.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,14 @@
1
1
  import type { Loader, Snapshot } from "./types.ts";
2
2
  interface RemoteLoaderOptions {
3
3
  site?: string;
4
- token?: string;
5
4
  /** ms between release checks, used when `createCMS` has no `interval` of its own. */
6
5
  interval?: number;
6
+ /** Local development: never swap in a release, so local files win. */
7
+ dev?: boolean;
7
8
  }
8
9
  /**
9
- * Hosted releases over a fallback. `createCMS` builds it for you
10
- * when `site` and `token` are set. With either unset (a dev or test
11
- * environment without the variables), it's a loader over the fallback alone.
10
+ * Hosted releases over a fallback. `createCMS` builds it for you when `site`
11
+ * is set. Without `site`, it's a loader over the fallback alone.
12
12
  */
13
13
  export declare function remoteLoader(fallback: Snapshot | Loader, options: RemoteLoaderOptions): Loader;
14
14
  export declare function resetRemoteLoaders(): void;
@@ -1 +1 @@
1
- {"version":3,"file":"remoteLoader.d.ts","sourceRoot":"","sources":["../../src/v8/remoteLoader.ts"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAWnD,UAAU,mBAAmB;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,qFAAqF;IACrF,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAiKD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,MAAM,CAwB9F;AAED,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}
1
+ {"version":3,"file":"remoteLoader.d.ts","sourceRoot":"","sources":["../../src/v8/remoteLoader.ts"],"names":[],"mappings":"AAwCA,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAenD,UAAU,mBAAmB;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qFAAqF;IACrF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,sEAAsE;IACtE,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AA0ID;;;GAGG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,MAAM,CAuB9F;AAED,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}