@decocms/blocks 8.9.0 → 8.10.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 (257) hide show
  1. package/dist/index.d.ts +1 -1
  2. package/dist/index.d.ts.map +1 -1
  3. package/dist/index.js +1 -1
  4. package/dist/index.js.map +1 -1
  5. package/dist/protocol/channel.d.ts +98 -0
  6. package/dist/protocol/channel.d.ts.map +1 -0
  7. package/dist/protocol/channel.js +58 -0
  8. package/dist/protocol/channel.js.map +1 -0
  9. package/dist/protocol/client.js +2 -2
  10. package/dist/protocol/client.js.map +1 -1
  11. package/dist/protocol/conformance/blockMetaVectors.json +214 -0
  12. package/dist/protocol/conformance/contentHashFixtures.d.ts +22 -0
  13. package/dist/protocol/conformance/contentHashFixtures.d.ts.map +1 -1
  14. package/dist/protocol/conformance/contentHashFixtures.js +55 -0
  15. package/dist/protocol/conformance/contentHashFixtures.js.map +1 -1
  16. package/dist/protocol/conformance/index.d.ts +2 -1
  17. package/dist/protocol/conformance/index.d.ts.map +1 -1
  18. package/dist/protocol/conformance/index.js +2 -1
  19. package/dist/protocol/conformance/index.js.map +1 -1
  20. package/dist/protocol/conformance/vectors.d.ts +33 -0
  21. package/dist/protocol/conformance/vectors.d.ts.map +1 -0
  22. package/dist/protocol/conformance/vectors.js +3 -0
  23. package/dist/protocol/conformance/vectors.js.map +1 -0
  24. package/dist/protocol/index.d.ts +11 -1
  25. package/dist/protocol/index.d.ts.map +1 -1
  26. package/dist/protocol/index.js +11 -1
  27. package/dist/protocol/index.js.map +1 -1
  28. package/dist/protocol/keys.d.ts +1 -1
  29. package/dist/protocol/keys.js +1 -1
  30. package/dist/v8/background.d.ts +13 -0
  31. package/dist/v8/background.d.ts.map +1 -1
  32. package/dist/v8/background.js +41 -0
  33. package/dist/v8/background.js.map +1 -1
  34. package/dist/v8/blockMeta.d.ts +27 -0
  35. package/dist/v8/blockMeta.d.ts.map +1 -0
  36. package/dist/v8/blockMeta.js +75 -0
  37. package/dist/v8/blockMeta.js.map +1 -0
  38. package/dist/v8/blockStore.d.ts +43 -0
  39. package/dist/v8/blockStore.d.ts.map +1 -0
  40. package/dist/v8/blockStore.js +95 -0
  41. package/dist/v8/blockStore.js.map +1 -0
  42. package/dist/v8/boundedJson.d.ts +5 -0
  43. package/dist/v8/boundedJson.d.ts.map +1 -1
  44. package/dist/v8/boundedJson.js +10 -2
  45. package/dist/v8/boundedJson.js.map +1 -1
  46. package/dist/v8/boundedMap.d.ts +19 -0
  47. package/dist/v8/boundedMap.d.ts.map +1 -0
  48. package/dist/v8/boundedMap.js +52 -0
  49. package/dist/v8/boundedMap.js.map +1 -0
  50. package/dist/v8/builtins/data.d.ts +18 -2
  51. package/dist/v8/builtins/data.d.ts.map +1 -1
  52. package/dist/v8/builtins/data.js +17 -1
  53. package/dist/v8/builtins/data.js.map +1 -1
  54. package/dist/v8/builtins/index.d.ts.map +1 -1
  55. package/dist/v8/builtins/index.js +2 -1
  56. package/dist/v8/builtins/index.js.map +1 -1
  57. package/dist/v8/builtins/legacy.d.ts +6 -3
  58. package/dist/v8/builtins/legacy.d.ts.map +1 -1
  59. package/dist/v8/builtins/legacy.js +6 -3
  60. package/dist/v8/builtins/legacy.js.map +1 -1
  61. package/dist/v8/canonical.d.ts +8 -0
  62. package/dist/v8/canonical.d.ts.map +1 -1
  63. package/dist/v8/canonical.js +15 -0
  64. package/dist/v8/canonical.js.map +1 -1
  65. package/dist/v8/cli/builtins.d.ts.map +1 -1
  66. package/dist/v8/cli/builtins.js +1 -0
  67. package/dist/v8/cli/builtins.js.map +1 -1
  68. package/dist/v8/cli/check/index.d.ts +10 -0
  69. package/dist/v8/cli/check/index.d.ts.map +1 -1
  70. package/dist/v8/cli/check/index.js +91 -7
  71. package/dist/v8/cli/check/index.js.map +1 -1
  72. package/dist/v8/cli/content.d.ts +12 -25
  73. package/dist/v8/cli/content.d.ts.map +1 -1
  74. package/dist/v8/cli/content.js +46 -75
  75. package/dist/v8/cli/content.js.map +1 -1
  76. package/dist/v8/cli/index.d.ts +1 -2
  77. package/dist/v8/cli/index.d.ts.map +1 -1
  78. package/dist/v8/cli/index.js +1 -2
  79. package/dist/v8/cli/index.js.map +1 -1
  80. package/dist/v8/cli/remote/commands.d.ts +71 -0
  81. package/dist/v8/cli/remote/commands.d.ts.map +1 -0
  82. package/dist/v8/cli/remote/commands.js +644 -0
  83. package/dist/v8/cli/remote/commands.js.map +1 -0
  84. package/dist/v8/cli/remote/diff.d.ts +15 -0
  85. package/dist/v8/cli/remote/diff.d.ts.map +1 -0
  86. package/dist/v8/cli/remote/diff.js +102 -0
  87. package/dist/v8/cli/remote/diff.js.map +1 -0
  88. package/dist/v8/cli/remote/env.d.ts +35 -0
  89. package/dist/v8/cli/remote/env.d.ts.map +1 -0
  90. package/dist/v8/cli/remote/env.js +84 -0
  91. package/dist/v8/cli/remote/env.js.map +1 -0
  92. package/dist/v8/cli/remote/http.d.ts +149 -0
  93. package/dist/v8/cli/remote/http.d.ts.map +1 -0
  94. package/dist/v8/cli/remote/http.js +381 -0
  95. package/dist/v8/cli/remote/http.js.map +1 -0
  96. package/dist/v8/cli/remote/local.d.ts +90 -0
  97. package/dist/v8/cli/remote/local.d.ts.map +1 -0
  98. package/dist/v8/cli/remote/local.js +309 -0
  99. package/dist/v8/cli/remote/local.js.map +1 -0
  100. package/dist/v8/cli/root.d.ts +29 -0
  101. package/dist/v8/cli/root.d.ts.map +1 -1
  102. package/dist/v8/cli/root.js +28 -0
  103. package/dist/v8/cli/root.js.map +1 -1
  104. package/dist/v8/cli/run.d.ts +11 -1
  105. package/dist/v8/cli/run.d.ts.map +1 -1
  106. package/dist/v8/cli/run.js +281 -124
  107. package/dist/v8/cli/run.js.map +1 -1
  108. package/dist/v8/cli/schema/builtinSchemas.d.ts.map +1 -1
  109. package/dist/v8/cli/schema/builtinSchemas.js +28 -10
  110. package/dist/v8/cli/schema/builtinSchemas.js.map +1 -1
  111. package/dist/v8/cli/schema/generate.js +1 -1
  112. package/dist/v8/cli/schema/generate.js.map +1 -1
  113. package/dist/v8/client.d.ts +9 -9
  114. package/dist/v8/client.d.ts.map +1 -1
  115. package/dist/v8/client.js +138 -50
  116. package/dist/v8/client.js.map +1 -1
  117. package/dist/v8/cms.d.ts +2 -1
  118. package/dist/v8/cms.d.ts.map +1 -1
  119. package/dist/v8/cms.js +55 -46
  120. package/dist/v8/cms.js.map +1 -1
  121. package/dist/v8/content.d.ts +39 -78
  122. package/dist/v8/content.d.ts.map +1 -1
  123. package/dist/v8/content.js +155 -195
  124. package/dist/v8/content.js.map +1 -1
  125. package/dist/v8/contentIndex.d.ts +71 -0
  126. package/dist/v8/contentIndex.d.ts.map +1 -0
  127. package/dist/v8/contentIndex.js +137 -0
  128. package/dist/v8/contentIndex.js.map +1 -0
  129. package/dist/v8/draft.d.ts +7 -7
  130. package/dist/v8/draft.d.ts.map +1 -1
  131. package/dist/v8/draft.js +10 -9
  132. package/dist/v8/draft.js.map +1 -1
  133. package/dist/v8/draftChanges.d.ts +59 -32
  134. package/dist/v8/draftChanges.d.ts.map +1 -1
  135. package/dist/v8/draftChanges.js +139 -75
  136. package/dist/v8/draftChanges.js.map +1 -1
  137. package/dist/v8/errors.d.ts +21 -0
  138. package/dist/v8/errors.d.ts.map +1 -1
  139. package/dist/v8/errors.js +22 -0
  140. package/dist/v8/errors.js.map +1 -1
  141. package/dist/v8/hostedSource.d.ts +57 -0
  142. package/dist/v8/hostedSource.d.ts.map +1 -0
  143. package/dist/v8/hostedSource.js +18 -0
  144. package/dist/v8/hostedSource.js.map +1 -0
  145. package/dist/v8/identity.d.ts +1 -1
  146. package/dist/v8/identity.js +1 -1
  147. package/dist/v8/index.d.ts +1 -0
  148. package/dist/v8/index.d.ts.map +1 -1
  149. package/dist/v8/index.js +1 -0
  150. package/dist/v8/index.js.map +1 -1
  151. package/dist/v8/matchRoute.js +7 -4
  152. package/dist/v8/matchRoute.js.map +1 -1
  153. package/dist/v8/pin.d.ts +34 -0
  154. package/dist/v8/pin.d.ts.map +1 -0
  155. package/dist/v8/pin.js +156 -0
  156. package/dist/v8/pin.js.map +1 -0
  157. package/dist/v8/preview/StudioBridge.d.ts +8 -8
  158. package/dist/v8/preview/StudioBridge.d.ts.map +1 -1
  159. package/dist/v8/preview/StudioBridge.js +8 -10
  160. package/dist/v8/preview/StudioBridge.js.map +1 -1
  161. package/dist/v8/preview/StudioChannel.d.ts +51 -0
  162. package/dist/v8/preview/StudioChannel.d.ts.map +1 -0
  163. package/dist/v8/preview/StudioChannel.js +104 -0
  164. package/dist/v8/preview/StudioChannel.js.map +1 -0
  165. package/dist/v8/preview/index.d.ts +3 -0
  166. package/dist/v8/preview/index.d.ts.map +1 -1
  167. package/dist/v8/preview/index.js +3 -0
  168. package/dist/v8/preview/index.js.map +1 -1
  169. package/dist/v8/remoteLoader.d.ts +42 -5
  170. package/dist/v8/remoteLoader.d.ts.map +1 -1
  171. package/dist/v8/remoteLoader.js +317 -259
  172. package/dist/v8/remoteLoader.js.map +1 -1
  173. package/dist/v8/resolver.d.ts +22 -8
  174. package/dist/v8/resolver.d.ts.map +1 -1
  175. package/dist/v8/resolver.js +37 -32
  176. package/dist/v8/resolver.js.map +1 -1
  177. package/dist/v8/revisionId.d.ts +11 -0
  178. package/dist/v8/revisionId.d.ts.map +1 -0
  179. package/dist/v8/revisionId.js +13 -0
  180. package/dist/v8/revisionId.js.map +1 -0
  181. package/dist/v8/settings.d.ts +6 -6
  182. package/dist/v8/settings.d.ts.map +1 -1
  183. package/dist/v8/settings.js +8 -7
  184. package/dist/v8/settings.js.map +1 -1
  185. package/dist/v8/telemetry.d.ts +4 -2
  186. package/dist/v8/telemetry.d.ts.map +1 -1
  187. package/dist/v8/telemetry.js +2 -2
  188. package/dist/v8/telemetry.js.map +1 -1
  189. package/dist/v8/types.d.ts +52 -40
  190. package/dist/v8/types.d.ts.map +1 -1
  191. package/dist/v8/variants.d.ts +7 -2
  192. package/dist/v8/variants.d.ts.map +1 -1
  193. package/dist/v8/variants.js +21 -24
  194. package/dist/v8/variants.js.map +1 -1
  195. package/dist/v8/vite/index.d.ts +2 -2
  196. package/dist/v8/vite/index.js +1 -1
  197. package/dist/v8/vite/index.js.map +1 -1
  198. package/package.json +1 -1
  199. package/src/index.ts +2 -0
  200. package/src/protocol/channel.ts +127 -0
  201. package/src/protocol/client.ts +2 -2
  202. package/src/protocol/conformance/blockMetaVectors.json +214 -0
  203. package/src/protocol/conformance/contentHashFixtures.ts +74 -0
  204. package/src/protocol/conformance/index.ts +9 -1
  205. package/src/protocol/conformance/vectors.ts +36 -0
  206. package/src/protocol/index.ts +32 -0
  207. package/src/protocol/keys.ts +1 -1
  208. package/src/v8/background.ts +42 -0
  209. package/src/v8/blockMeta.ts +100 -0
  210. package/src/v8/blockStore.ts +124 -0
  211. package/src/v8/boundedJson.ts +20 -2
  212. package/src/v8/boundedMap.ts +53 -0
  213. package/src/v8/builtins/data.ts +26 -2
  214. package/src/v8/builtins/index.ts +2 -1
  215. package/src/v8/builtins/legacy.ts +6 -3
  216. package/src/v8/canonical.ts +15 -0
  217. package/src/v8/cli/builtins.ts +1 -0
  218. package/src/v8/cli/check/index.ts +97 -7
  219. package/src/v8/cli/content.ts +49 -91
  220. package/src/v8/cli/index.ts +1 -2
  221. package/src/v8/cli/remote/commands.ts +834 -0
  222. package/src/v8/cli/remote/diff.ts +100 -0
  223. package/src/v8/cli/remote/env.ts +107 -0
  224. package/src/v8/cli/remote/http.ts +484 -0
  225. package/src/v8/cli/remote/local.ts +343 -0
  226. package/src/v8/cli/root.ts +40 -0
  227. package/src/v8/cli/run.ts +333 -136
  228. package/src/v8/cli/schema/builtinSchemas.ts +29 -10
  229. package/src/v8/cli/schema/generate.ts +1 -1
  230. package/src/v8/client.ts +162 -60
  231. package/src/v8/cms.ts +62 -53
  232. package/src/v8/content.ts +179 -229
  233. package/src/v8/contentIndex.ts +183 -0
  234. package/src/v8/draft.ts +15 -14
  235. package/src/v8/draftChanges.ts +151 -85
  236. package/src/v8/errors.ts +37 -0
  237. package/src/v8/hostedSource.ts +67 -0
  238. package/src/v8/identity.ts +1 -1
  239. package/src/v8/index.ts +1 -0
  240. package/src/v8/matchRoute.ts +7 -4
  241. package/src/v8/pin.ts +176 -0
  242. package/src/v8/preview/StudioBridge.ts +8 -10
  243. package/src/v8/preview/StudioChannel.ts +116 -0
  244. package/src/v8/preview/index.ts +3 -0
  245. package/src/v8/remoteLoader.ts +350 -286
  246. package/src/v8/resolver.ts +56 -33
  247. package/src/v8/revisionId.ts +14 -0
  248. package/src/v8/settings.ts +10 -9
  249. package/src/v8/telemetry.ts +3 -3
  250. package/src/v8/types.ts +52 -40
  251. package/src/v8/variants.ts +30 -26
  252. package/src/v8/vite/index.ts +3 -3
  253. package/dist/v8/cli/serve/server.d.ts +0 -29
  254. package/dist/v8/cli/serve/server.d.ts.map +0 -1
  255. package/dist/v8/cli/serve/server.js +0 -296
  256. package/dist/v8/cli/serve/server.js.map +0 -1
  257. package/src/v8/cli/serve/server.ts +0 -348
@@ -1 +1 @@
1
- {"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/v8/builtins/data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE/E,uFAAuF;AACvF,eAAO,MAAM,0BAA0B,iCAAiC,CAAC;AAEzE,qFAAqF;AACrF,eAAO,MAAM,qBAAqB,kCAAkC,CAAC;AAErE,yFAAyF;AACzF,eAAO,MAAM,qBAAqB,cAAc,CAAC;AAEjD;;;GAGG;AACH,eAAO,MAAM,IAAI,GAAI,CAAC,SAAS,CAAC,KAAG,CAAU,CAAC;AAE9C,kDAAkD;AAClD,eAAO,MAAM,QAAQ,UAAW,QAAQ,KAAG,QAAiB,CAAC;AAE7D,4EAA4E;AAC5E,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAK3D,CAAC;AAEH,qFAAqF;AACrF,eAAO,MAAM,cAAc,QAAQ,CAAC;AACpC,eAAO,MAAM,aAAa,iBAAiB,CAAC;AAE5C,2FAA2F;AAC3F,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,CAQtE;AAED,2DAA2D;AAC3D,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,CAWtE;AAED;;;;GAIG;AACH,eAAO,MAAM,WAAW,WACf,WAAW,KACjB,WAAW,GAAG;IAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;IAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAA;CAI/E,CAAC;AAEH,2EAA2E;AAC3E,wBAAgB,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAI7D"}
1
+ {"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/v8/builtins/data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE/F,uFAAuF;AACvF,eAAO,MAAM,0BAA0B,iCAAiC,CAAC;AAEzE,qFAAqF;AACrF,eAAO,MAAM,qBAAqB,kCAAkC,CAAC;AAErE,yFAAyF;AACzF,eAAO,MAAM,qBAAqB,cAAc,CAAC;AAEjD;;;GAGG;AACH,eAAO,MAAM,IAAI,GAAI,CAAC,SAAS,CAAC,KAAG,CAAU,CAAC;AAE9C;;;;GAIG;AACH,eAAO,MAAM,QAAQ,UAAW,QAAQ,KAAG,QAAiB,CAAC;AAE7D,qFAAqF;AACrF,eAAO,MAAM,cAAc,cAAc,CAAC;AAE1C;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,UAAW;IAC/B,SAAS,CAAC,EAAE,KAAK,CAAC,QAAQ,GAAG,cAAc,CAAC,CAAC;CAC9C,KAAG,KAAK,CAAC,QAAQ,GAAG,cAAc,CAM3B,CAAC;AAET,4EAA4E;AAC5E,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAK3D,CAAC;AAEH,qFAAqF;AACrF,eAAO,MAAM,cAAc,QAAQ,CAAC;AACpC,eAAO,MAAM,aAAa,iBAAiB,CAAC;AAE5C,2FAA2F;AAC3F,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,CAQtE;AAED,2DAA2D;AAC3D,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,CAWtE;AAED;;;;GAIG;AACH,eAAO,MAAM,WAAW,WACf,WAAW,KACjB,WAAW,GAAG;IAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;IAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAA;CAI/E,CAAC;AAEH,2EAA2E;AAC3E,wBAAgB,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAI7D"}
@@ -9,8 +9,24 @@ export const DECO_ANALYTICS_SCRIPT = "/_dq/a.js";
9
9
  * `sections`), so the page is its input.
10
10
  */
11
11
  export const page = (props) => props;
12
- /** `redirect`: returns its arguments as saved. */
12
+ /**
13
+ * `redirect`: returns its arguments as saved. Still a built-in, so a v7 rule
14
+ * block resolves, but no longer routed: `client.redirects()` reads only the
15
+ * redirects block (`deco check` warns on every `redirect` block).
16
+ */
13
17
  export const redirect = (props) => props;
18
+ /** The type of the site's one redirects block (canonically saved as `Redirects`). */
19
+ export const REDIRECTS_TYPE = "redirects";
20
+ /**
21
+ * `redirects`: the site's whole list of rules, one block (routing needs every
22
+ * rule, so it is one cached fetch). Each rule has either shape `matchRoute`
23
+ * reads: the flat `{ from, to, permanent?, status?, discardQueryParameters? }`
24
+ * or v7's nested `{ redirect: { from, to, type? } }`; anything that isn't an
25
+ * object is left out.
26
+ */
27
+ export const redirects = (props) => Array.isArray(props?.redirects)
28
+ ? props.redirects.filter((rule) => typeof rule === "object" && rule !== null && !Array.isArray(rule))
29
+ : [];
14
30
  /** The `telemetry` section's defaults (sample rates before code's caps). */
15
31
  export const TELEMETRY_DEFAULTS = Object.freeze({
16
32
  enabled: true,
@@ -1 +1 @@
1
- {"version":3,"file":"data.js","sourceRoot":"","sources":["../../../src/v8/builtins/data.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data.js","sourceRoot":"","sources":["../../../src/v8/builtins/data.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/v8/builtins/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAQjD,gDAAgD;AAChD,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAY3D,CAAC;AAEH,oEAAoE;AACpE,eAAO,MAAM,cAAc,EAAE,WAAW,CAAC,MAAM,CAAkC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/v8/builtins/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAQjD,gDAAgD;AAChD,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAa3D,CAAC;AAEH,oEAAoE;AACpE,eAAO,MAAM,cAAc,EAAE,WAAW,CAAC,MAAM,CAAkC,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import { CALENDAR_TYPE, calendar, campaign } from "./campaigns.js";
2
- import { cmsSettings, page, redirect, SETTINGS_TYPE } from "./data.js";
2
+ import { cmsSettings, page, REDIRECTS_TYPE, redirect, redirects, SETTINGS_TYPE } from "./data.js";
3
3
  import { experiment, SPLIT_TRAFFIC_TYPE, splitTraffic } from "./experiments.js";
4
4
  import { lazy } from "./lazy.js";
5
5
  import { always, never } from "./matchers.js";
@@ -14,6 +14,7 @@ export const builtIns = Object.freeze({
14
14
  campaign,
15
15
  page,
16
16
  redirect,
17
+ [REDIRECTS_TYPE]: redirects,
17
18
  [SETTINGS_TYPE]: cmsSettings,
18
19
  [SPLIT_TRAFFIC_TYPE]: splitTraffic,
19
20
  [CALENDAR_TYPE]: calendar,
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/v8/builtins/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,gDAAgD;AAChD,MAAM,CAAC,MAAM,QAAQ,GAA4C,MAAM,CAAC,MAAM,CAAC;IAC7E,IAAI;IACJ,YAAY;IACZ,MAAM;IACN,KAAK;IACL,UAAU;IACV,QAAQ;IACR,IAAI;IACJ,QAAQ;IACR,CAAC,aAAa,CAAC,EAAE,WAAW;IAC5B,CAAC,kBAAkB,CAAC,EAAE,YAAY;IAClC,CAAC,aAAa,CAAC,EAAE,QAAQ;CAC1B,CAAC,CAAC;AAEH,oEAAoE;AACpE,MAAM,CAAC,MAAM,cAAc,GAAwB,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/v8/builtins/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAClG,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,gDAAgD;AAChD,MAAM,CAAC,MAAM,QAAQ,GAA4C,MAAM,CAAC,MAAM,CAAC;IAC7E,IAAI;IACJ,YAAY;IACZ,MAAM;IACN,KAAK;IACL,UAAU;IACV,QAAQ;IACR,IAAI;IACJ,QAAQ;IACR,CAAC,cAAc,CAAC,EAAE,SAAS;IAC3B,CAAC,aAAa,CAAC,EAAE,WAAW;IAC5B,CAAC,kBAAkB,CAAC,EAAE,YAAY;IAClC,CAAC,aAAa,CAAC,EAAE,QAAQ;CAC1B,CAAC,CAAC;AAEH,oEAAoE;AACpE,MAAM,CAAC,MAAM,cAAc,GAAwB,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC"}
@@ -4,11 +4,14 @@
4
4
  * without a block-map entry (see /next/studio-compatibility#well-known-types-and-the-alias-table
5
5
  * and /next/renames-and-migrations#rename-a-type-with-an-alias).
6
6
  *
7
- * A snapshot's own `aliases` (the table `deco content` writes) win over these, and a key in the block map wins over
7
+ * A snapshot's own `aliases` (the table the content module carries) win over these, and a key in the block map wins over
8
8
  * both, so a site can still register a legacy name itself.
9
9
  *
10
10
  * - Redirects keep v7's nested shape: `redirect` returns its arguments as
11
- * saved, and `matchRoute` accepts both shapes.
11
+ * saved, and `matchRoute` accepts both shapes. v7's `website/loaders/redirects.ts`
12
+ * has no alias: v8 routes only a block typed `redirects`, so the v7-to-v8
13
+ * migration folds every v7 redirect block into `Redirects` and `deco check`
14
+ * warns about one left over.
12
15
  * - `website/loaders/secret.ts` has no alias: secrets live in the deploy
13
16
  * platform, read by the site's code and passed as params (see
14
17
  * /next/renames-and-migrations#secrets), so a leftover v7 secret block
@@ -19,7 +22,7 @@
19
22
  import { type JsonObject } from "../json.ts";
20
23
  /**
21
24
  * Legacy type name → built-in. The one table: the runtime falls back to it,
22
- * and `deco schema` / `deco content` write it into the schema and the content
25
+ * and `deco schema` and the content module write it into the schema and the content
23
26
  * module. Exactly the names the site editor's special screens look for
24
27
  * (/next/studio-compatibility#well-known-types-and-the-alias-table); other
25
28
  * legacy names (`$live/…`, the per-kind multivariate files, the date
@@ -1 +1 @@
1
- {"version":3,"file":"legacy.d.ts","sourceRoot":"","sources":["../../../src/v8/builtins/legacy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,EAAiB,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAE5D;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQ1D,CAAC;AAEH;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU,CAW7E"}
1
+ {"version":3,"file":"legacy.d.ts","sourceRoot":"","sources":["../../../src/v8/builtins/legacy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,EAAiB,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAE5D;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQ1D,CAAC;AAEH;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU,CAW7E"}
@@ -4,11 +4,14 @@
4
4
  * without a block-map entry (see /next/studio-compatibility#well-known-types-and-the-alias-table
5
5
  * and /next/renames-and-migrations#rename-a-type-with-an-alias).
6
6
  *
7
- * A snapshot's own `aliases` (the table `deco content` writes) win over these, and a key in the block map wins over
7
+ * A snapshot's own `aliases` (the table the content module carries) win over these, and a key in the block map wins over
8
8
  * both, so a site can still register a legacy name itself.
9
9
  *
10
10
  * - Redirects keep v7's nested shape: `redirect` returns its arguments as
11
- * saved, and `matchRoute` accepts both shapes.
11
+ * saved, and `matchRoute` accepts both shapes. v7's `website/loaders/redirects.ts`
12
+ * has no alias: v8 routes only a block typed `redirects`, so the v7-to-v8
13
+ * migration folds every v7 redirect block into `Redirects` and `deco check`
14
+ * warns about one left over.
12
15
  * - `website/loaders/secret.ts` has no alias: secrets live in the deploy
13
16
  * platform, read by the site's code and passed as params (see
14
17
  * /next/renames-and-migrations#secrets), so a leftover v7 secret block
@@ -19,7 +22,7 @@
19
22
  import { isPlainObject } from "../json.js";
20
23
  /**
21
24
  * Legacy type name → built-in. The one table: the runtime falls back to it,
22
- * and `deco schema` / `deco content` write it into the schema and the content
25
+ * and `deco schema` and the content module write it into the schema and the content
23
26
  * module. Exactly the names the site editor's special screens look for
24
27
  * (/next/studio-compatibility#well-known-types-and-the-alias-table); other
25
28
  * legacy names (`$live/…`, the per-kind multivariate files, the date
@@ -1 +1 @@
1
- {"version":3,"file":"legacy.js","sourceRoot":"","sources":["../../../src/v8/builtins/legacy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,EAAE,aAAa,EAAmB,MAAM,YAAY,CAAC;AAE5D;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,cAAc,GAAqC,MAAM,CAAC,MAAM,CAAC;IAC5E,wBAAwB,EAAE,MAAM;IAChC,0BAA0B,EAAE,MAAM;IAClC,+BAA+B,EAAE,cAAc;IAC/C,uCAAuC,EAAE,cAAc;IACvD,4BAA4B,EAAE,QAAQ;IACtC,2BAA2B,EAAE,OAAO;IACpC,6BAA6B,EAAE,UAAU;CAC1C,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC9C,OAAO,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,cAAc,CAAC;AACxF,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAY,EAAE,IAAgB;IAC/D,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAC7E,OAAO;QACL,GAAG,IAAI;QACP,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACtC,aAAa,CAAC,OAAO,CAAC;YACtB,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,aAAa,KAAK,MAAM,CAAC;YACvE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE;YACxE,CAAC,CAAC,OAAO,CACZ;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"legacy.js","sourceRoot":"","sources":["../../../src/v8/builtins/legacy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,EAAE,aAAa,EAAmB,MAAM,YAAY,CAAC;AAE5D;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,cAAc,GAAqC,MAAM,CAAC,MAAM,CAAC;IAC5E,wBAAwB,EAAE,MAAM;IAChC,0BAA0B,EAAE,MAAM;IAClC,+BAA+B,EAAE,cAAc;IAC/C,uCAAuC,EAAE,cAAc;IACvD,4BAA4B,EAAE,QAAQ;IACtC,2BAA2B,EAAE,OAAO;IACpC,6BAA6B,EAAE,UAAU;CAC1C,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC9C,OAAO,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,cAAc,CAAC;AACxF,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAY,EAAE,IAAgB;IAC/D,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAC7E,OAAO;QACL,GAAG,IAAI;QACP,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACtC,aAAa,CAAC,OAAO,CAAC;YACtB,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,aAAa,KAAK,MAAM,CAAC;YACvE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE;YACxE,CAAC,CAAC,OAAO,CACZ;KACF,CAAC;AACJ,CAAC"}
@@ -32,4 +32,12 @@ export declare const CONTENT_HASH_FORMAT = 1;
32
32
  * is opaque and may be computed differently (from file versions).
33
33
  */
34
34
  export declare function computeContentRevision(blocks: Record<string, unknown>): Promise<string>;
35
+ /**
36
+ * A saved block's version: the first 16 bytes of SHA-256 over its canonical
37
+ * JSON, written as 22 characters of base64url without padding. The one
38
+ * definition `ifMatch`, conflicts, `blocks.list` versions and the CLI's
39
+ * `.deco/pull.json` share; `blockVersionFixtures` (in
40
+ * `@decocms/blocks/protocol/conformance`) pins its output.
41
+ */
42
+ export declare function blockVersion(block: unknown): Promise<string>;
35
43
  //# sourceMappingURL=canonical.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"canonical.d.ts","sourceRoot":"","sources":["../../src/v8/canonical.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAsDD,uGAAuG;AACvG,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAIpD;AAKD,uEAAuE;AACvE,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAG1E;AAED;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,IAAI,CAAC;AAErC;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAE7F"}
1
+ {"version":3,"file":"canonical.d.ts","sourceRoot":"","sources":["../../src/v8/canonical.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAsDD,uGAAuG;AACvG,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAIpD;AAKD,uEAAuE;AACvE,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAG1E;AAED;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,IAAI,CAAC;AAErC;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAE7F;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAMlE"}
@@ -99,4 +99,19 @@ export const CONTENT_HASH_FORMAT = 1;
99
99
  export async function computeContentRevision(blocks) {
100
100
  return sha256Hex(canonicalJson(blocks));
101
101
  }
102
+ /**
103
+ * A saved block's version: the first 16 bytes of SHA-256 over its canonical
104
+ * JSON, written as 22 characters of base64url without padding. The one
105
+ * definition `ifMatch`, conflicts, `blocks.list` versions and the CLI's
106
+ * `.deco/pull.json` share; `blockVersionFixtures` (in
107
+ * `@decocms/blocks/protocol/conformance`) pins its output.
108
+ */
109
+ export async function blockVersion(block) {
110
+ const bytes = new TextEncoder().encode(canonicalJson(block));
111
+ const digest = new Uint8Array(await crypto.subtle.digest("SHA-256", bytes));
112
+ let binary = "";
113
+ for (const byte of digest.subarray(0, 16))
114
+ binary += String.fromCharCode(byte);
115
+ return btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
116
+ }
102
117
  //# sourceMappingURL=canonical.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"canonical.js","sourceRoot":"","sources":["../../src/v8/canonical.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;IACnC,CAAC;CACF;AAED,SAAS,KAAK,CAAC,KAAc,EAAE,IAAY,EAAE,IAAiB,EAAE,GAAa;IAC3E,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjB,OAAO;IACT,CAAC;IACD,QAAQ,OAAO,KAAK,EAAE,CAAC;QACrB,KAAK,QAAQ;YACX,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;YAChC,OAAO;QACT,KAAK,SAAS;YACZ,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACnC,OAAO;QACT,KAAK,QAAQ;YACX,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5B,MAAM,IAAI,kBAAkB,CAAC,GAAG,IAAI,KAAK,KAAK,+BAA+B,CAAC,CAAC;YACjF,CAAC;YACD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;YAC7D,OAAO;QACT,KAAK,QAAQ;YACX,MAAM;QACR;YACE,MAAM,IAAI,kBAAkB,CAAC,GAAG,IAAI,OAAO,OAAO,KAAK,+BAA+B,CAAC,CAAC;IAC5F,CAAC;IACD,MAAM,MAAM,GAAG,KAAe,CAAC;IAC/B,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;QAClB,MAAM,IAAI,kBAAkB,CAAC,GAAG,IAAI,wCAAwC,CAAC,CAAC;IAChF,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACjB,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACd,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC7B,IAAI,KAAK,GAAG,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7B,KAAK,CAAC,IAAI,EAAE,GAAG,IAAI,IAAI,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;SAAM,CAAC;QACN,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAChD,IAAI,SAAS,KAAK,MAAM,CAAC,SAAS,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACzD,MAAM,IAAI,kBAAkB,CAAC,GAAG,IAAI,iDAAiD,CAAC,CAAC;QACzF,CAAC;QACD,4DAA4D;QAC5D,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QACxC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACd,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YAC1B,IAAI,KAAK,GAAG,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;YACnC,KAAK,CAAE,MAAkC,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,IAAI,GAAG,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QAC/E,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AACtB,CAAC;AAED,uGAAuG;AACvG,MAAM,UAAU,aAAa,CAAC,KAAc;IAC1C,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;IACjC,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC;AAED,MAAM,GAAG,GAAG,CAAC,KAAkB,EAAE,EAAE,CACjC,KAAK,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAErF,uEAAuE;AACvE,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,IAAyB;IACvD,MAAM,KAAK,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/E,OAAO,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,KAAqB,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAErC;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,MAA+B;IAC1E,OAAO,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;AAC1C,CAAC"}
1
+ {"version":3,"file":"canonical.js","sourceRoot":"","sources":["../../src/v8/canonical.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;IACnC,CAAC;CACF;AAED,SAAS,KAAK,CAAC,KAAc,EAAE,IAAY,EAAE,IAAiB,EAAE,GAAa;IAC3E,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjB,OAAO;IACT,CAAC;IACD,QAAQ,OAAO,KAAK,EAAE,CAAC;QACrB,KAAK,QAAQ;YACX,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;YAChC,OAAO;QACT,KAAK,SAAS;YACZ,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACnC,OAAO;QACT,KAAK,QAAQ;YACX,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5B,MAAM,IAAI,kBAAkB,CAAC,GAAG,IAAI,KAAK,KAAK,+BAA+B,CAAC,CAAC;YACjF,CAAC;YACD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;YAC7D,OAAO;QACT,KAAK,QAAQ;YACX,MAAM;QACR;YACE,MAAM,IAAI,kBAAkB,CAAC,GAAG,IAAI,OAAO,OAAO,KAAK,+BAA+B,CAAC,CAAC;IAC5F,CAAC;IACD,MAAM,MAAM,GAAG,KAAe,CAAC;IAC/B,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;QAClB,MAAM,IAAI,kBAAkB,CAAC,GAAG,IAAI,wCAAwC,CAAC,CAAC;IAChF,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACjB,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACd,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC7B,IAAI,KAAK,GAAG,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7B,KAAK,CAAC,IAAI,EAAE,GAAG,IAAI,IAAI,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;SAAM,CAAC;QACN,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAChD,IAAI,SAAS,KAAK,MAAM,CAAC,SAAS,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACzD,MAAM,IAAI,kBAAkB,CAAC,GAAG,IAAI,iDAAiD,CAAC,CAAC;QACzF,CAAC;QACD,4DAA4D;QAC5D,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QACxC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACd,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YAC1B,IAAI,KAAK,GAAG,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;YACnC,KAAK,CAAE,MAAkC,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,IAAI,GAAG,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QAC/E,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AACtB,CAAC;AAED,uGAAuG;AACvG,MAAM,UAAU,aAAa,CAAC,KAAc;IAC1C,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;IACjC,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC;AAED,MAAM,GAAG,GAAG,CAAC,KAAkB,EAAE,EAAE,CACjC,KAAK,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAErF,uEAAuE;AACvE,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,IAAyB;IACvD,MAAM,KAAK,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/E,OAAO,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,KAAqB,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAErC;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,MAA+B;IAC1E,OAAO,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,KAAc;IAC/C,MAAM,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,KAAqB,CAAC,CAAC,CAAC;IAC5F,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC;QAAE,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC/E,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACjF,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"builtins.d.ts","sourceRoot":"","sources":["../../../src/v8/cli/builtins.ts"],"names":[],"mappings":"AAMA,wEAAwE;AACxE,eAAO,MAAM,eAAe,EAAE,SAAS,MAAM,EAAwB,CAAC;AAEtE,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAezD,CAAC;AAEH;;;;;GAKG;AACH,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC"}
1
+ {"version":3,"file":"builtins.d.ts","sourceRoot":"","sources":["../../../src/v8/cli/builtins.ts"],"names":[],"mappings":"AAMA,wEAAwE;AACxE,eAAO,MAAM,eAAe,EAAE,SAAS,MAAM,EAAwB,CAAC;AAEtE,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBzD,CAAC;AAEH;;;;;GAKG;AACH,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC"}
@@ -22,6 +22,7 @@ export const BUILT_IN_USES = Object.freeze({
22
22
  campaign: "Studio's campaign rules rely on it, each naming a campaign of the saved block campaigns",
23
23
  page: "Studio's page list and page editor rely on it",
24
24
  redirect: "Studio's redirect list relies on it",
25
+ redirects: "the site's routing reads its rules from the saved block Redirects, through it",
25
26
  "cms-settings": "the saved block CMS relies on it, and Studio's settings edit that block",
26
27
  "split-traffic": "the saved block experiments relies on it, and Studio's Experiments view edits its percentages",
27
28
  calendar: "the saved block campaigns relies on it, and Studio's Campaigns view edits its dates",
@@ -1 +1 @@
1
- {"version":3,"file":"builtins.js","sourceRoot":"","sources":["../../../src/v8/cli/builtins.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,wEAAwE;AACxE,MAAM,CAAC,MAAM,eAAe,GAAsB,CAAC,GAAG,cAAc,CAAC,CAAC;AAEtE,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,OAAO,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,aAAa,GAAqC,MAAM,CAAC,MAAM,CAAC;IAC3E,IAAI,EAAE,0FAA0F;IAChG,YAAY,EAAE,uEAAuE;IACrF,MAAM,EAAE,uEAAuE;IAC/E,KAAK,EAAE,yCAAyC;IAChD,UAAU,EACR,uFAAuF;IACzF,QAAQ,EACN,yFAAyF;IAC3F,IAAI,EAAE,+CAA+C;IACrD,QAAQ,EAAE,qCAAqC;IAC/C,cAAc,EAAE,yEAAyE;IACzF,eAAe,EACb,+FAA+F;IACjG,QAAQ,EAAE,qFAAqF;CAChG,CAAC,CAAC;AAEH;;;;;GAKG;AACH,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC"}
1
+ {"version":3,"file":"builtins.js","sourceRoot":"","sources":["../../../src/v8/cli/builtins.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,wEAAwE;AACxE,MAAM,CAAC,MAAM,eAAe,GAAsB,CAAC,GAAG,cAAc,CAAC,CAAC;AAEtE,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,OAAO,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,aAAa,GAAqC,MAAM,CAAC,MAAM,CAAC;IAC3E,IAAI,EAAE,0FAA0F;IAChG,YAAY,EAAE,uEAAuE;IACrF,MAAM,EAAE,uEAAuE;IAC/E,KAAK,EAAE,yCAAyC;IAChD,UAAU,EACR,uFAAuF;IACzF,QAAQ,EACN,yFAAyF;IAC3F,IAAI,EAAE,+CAA+C;IACrD,QAAQ,EAAE,qCAAqC;IAC/C,SAAS,EAAE,+EAA+E;IAC1F,cAAc,EAAE,yEAAyE;IACzF,eAAe,EACb,+FAA+F;IACjG,QAAQ,EAAE,qFAAqF;CAChG,CAAC,CAAC;AAEH;;;;;GAKG;AACH,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC"}
@@ -40,6 +40,7 @@ export interface CheckOptions {
40
40
  cwd?: string;
41
41
  reporter?: Reporter;
42
42
  }
43
+ export declare function readSchemaFile(file: string): DecoMeta;
43
44
  /**
44
45
  * A schema must declare `"blocksMajor": 8`: the site editor treats a site as
45
46
  * v8 only on that field, so a schema without it would edit as a v7 site.
@@ -47,4 +48,13 @@ export interface CheckOptions {
47
48
  export declare function assertBlocksMajor(meta: unknown, file: string): void;
48
49
  /** `deco check`. Returns the exit code: 0 when everything fits (warnings aside), 1 otherwise. */
49
50
  export declare function check(options?: CheckOptions): number;
51
+ export interface CheckReport {
52
+ exitCode: number;
53
+ count: number;
54
+ errors: number;
55
+ warnings: number;
56
+ problems: Problem[];
57
+ }
58
+ /** Check saved blocks against the local schema and print the problems and a summary. */
59
+ export declare function reportCheck(meta: DecoMeta, saved: SavedBlocks, reporter: Reporter): CheckReport;
50
60
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/v8/cli/check/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAqBH,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAItD,MAAM,WAAW,OAAO;IACtB,kFAAkF;IAClF,IAAI,EAAE,MAAM,CAAC;IACb,gFAAgF;IAChF,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;CAC/B;AAm6BD,gEAAgE;AAChE,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,EAAE,CAe1E;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,KAAK,UAAQ,GAAG,MAAM,CAmBzE;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAmBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAcnE;AAED,iGAAiG;AACjG,wBAAgB,KAAK,CAAC,OAAO,GAAE,YAAiB,GAAG,MAAM,CAkBxD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/v8/cli/check/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAqBH,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAItD,MAAM,WAAW,OAAO;IACtB,kFAAkF;IAClF,IAAI,EAAE,MAAM,CAAC;IACb,gFAAgF;IAChF,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;CAC/B;AAi/BD,gEAAgE;AAChE,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,EAAE,CAe1E;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,KAAK,UAAQ,GAAG,MAAM,CAmBzE;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAerD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAcnE;AAED,iGAAiG;AACjG,wBAAgB,KAAK,CAAC,OAAO,GAAE,YAAiB,GAAG,MAAM,CAKxD;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,EAAE,CAAC;CACrB;AAED,wFAAwF;AACxF,wBAAgB,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,GAAG,WAAW,CAc/F"}
@@ -20,7 +20,7 @@ import fs from "node:fs";
20
20
  import { Ajv } from "ajv";
21
21
  import { BLOCKS_MAJOR } from "../../../protocol/types.js";
22
22
  import { CALENDAR_TYPE, CAMPAIGN_RULE, CAMPAIGNS_BLOCK, campaignTime, } from "../../builtins/campaigns.js";
23
- import { SETTINGS_BLOCK, SETTINGS_TYPE } from "../../builtins/data.js";
23
+ import { REDIRECTS_TYPE, SETTINGS_BLOCK, SETTINGS_TYPE } from "../../builtins/data.js";
24
24
  import { EXPERIMENT_RULE, EXPERIMENTS_BLOCK, SPLIT_TRAFFIC_TYPE, } from "../../builtins/experiments.js";
25
25
  import { isBlock, own } from "../../json.js";
26
26
  import { findRouteConflicts } from "../../matchRoute.js";
@@ -32,6 +32,20 @@ import { CliError, decoPaths, findDecoRoot } from "../root.js";
32
32
  import { SECTION_REF_KEY, toBase64 } from "../schema/typeToSchema.js";
33
33
  import { BLOCK_DEF, joinPath, rewriteErrors } from "./messages.js";
34
34
  const DOC_ID = "deco";
35
+ /** The per-rule redirect type: it resolves, but routing reads only the redirects block. */
36
+ const REDIRECT_TYPE = "redirect";
37
+ /**
38
+ * v7's redirect block types, per-rule and list: v8 routes neither (only a
39
+ * block typed `redirects`), so their rules belong in the Redirects block.
40
+ * `website/loaders/redirect.ts` still resolves (an alias of `redirect`);
41
+ * `website/loaders/redirects.ts` has no alias.
42
+ */
43
+ const V7_REDIRECT_TYPES = new Set([
44
+ "website/loaders/redirect.ts",
45
+ "website/loaders/redirects.ts",
46
+ ]);
47
+ /** The block routing reads its redirects from, canonically. */
48
+ const REDIRECTS_BLOCK = "Redirects";
35
49
  /** JSON-parsed objects only, so any non-array object is a plain one. */
36
50
  function isObject(value) {
37
51
  return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -60,6 +74,15 @@ const FOLDED_BUILT_INS = {
60
74
  secret: SECRETS_MOVED,
61
75
  "website/loaders/secret.ts": SECRETS_MOVED,
62
76
  };
77
+ /**
78
+ * A `__resolveType` that names no block type, built-in, alias or saved block:
79
+ * what a delete leaves behind (a section, banner or saved rule), or a block
80
+ * type the site doesn't export. Block types are bare keys too, so the check
81
+ * can't tell which and names both.
82
+ */
83
+ function missingName(name) {
84
+ return `no saved block or block type "${name}"`;
85
+ }
63
86
  /** A `CMS` block saved with preview hosts, which Studio keeps now (in the release it publishes). */
64
87
  const PREVIEW_FIELD_GONE = "the site editor now keeps the addresses this site can be previewed on, so this field isn't read any more: you can delete it";
65
88
  /** The prerelease `date` rule, which the `campaign` rule replaced. */
@@ -585,7 +608,7 @@ class Checker {
585
608
  ? oldDateRuleProblem(block)
586
609
  : Object.hasOwn(FOLDED_BUILT_INS, name)
587
610
  ? `unknown block type "${name}": ${FOLDED_BUILT_INS[name]}`
588
- : `unknown block type "${name}"`);
611
+ : missingName(name));
589
612
  return;
590
613
  }
591
614
  // A reference to a saved block: check what it resolves to against the field.
@@ -641,7 +664,7 @@ class Checker {
641
664
  const name = this.ruleInputs(block, EXPERIMENT_RULE)?.name;
642
665
  if (typeof name === "string" &&
643
666
  !this.savedNames(EXPERIMENTS_BLOCK, SPLIT_TRAFFIC_TYPE)?.has(name)) {
644
- this.report(ctx, joinPath(path, "/name"), `no test "${name}" in the saved block "${EXPERIMENTS_BLOCK}": this rule is always false`, "warning");
667
+ this.report(ctx, joinPath(path, "/name"), `no test "${name}" in the saved block "${EXPERIMENTS_BLOCK}": this rule is always false`);
645
668
  }
646
669
  return;
647
670
  }
@@ -654,7 +677,7 @@ class Checker {
654
677
  }
655
678
  if (typeof campaign === "string" &&
656
679
  !this.savedNames(CAMPAIGNS_BLOCK, CALENDAR_TYPE)?.has(campaign)) {
657
- this.report(ctx, joinPath(path, "/name"), `no campaign "${campaign}" in the saved block "${CAMPAIGNS_BLOCK}": this rule is always false`, "warning");
680
+ this.report(ctx, joinPath(path, "/name"), `no campaign "${campaign}" in the saved block "${CAMPAIGNS_BLOCK}": this rule is always false`);
658
681
  }
659
682
  return;
660
683
  }
@@ -785,10 +808,68 @@ class Checker {
785
808
  this.report(ctx, "preview", PREVIEW_FIELD_GONE, "warning");
786
809
  continue;
787
810
  }
811
+ // A v7 redirect block left over: redirectBlockProblems says to fold it into
812
+ // Redirects. With no alias its type is unknown here, which isn't an error.
813
+ if (V7_REDIRECT_TYPES.has(entry.__resolveType) && !this.canonicalType(entry.__resolveType)) {
814
+ continue;
815
+ }
788
816
  this.checkBlock(ctx, entry, "", null);
789
817
  }
790
818
  problems.push(...this.builtInOverrides());
791
819
  problems.push(...this.routeProblems());
820
+ problems.push(...this.redirectBlockProblems());
821
+ return problems;
822
+ }
823
+ /**
824
+ * Routing reads its redirects from one block: the first `redirects`-typed
825
+ * one in code-unit name order (see /next/routing). A per-rule `redirect`
826
+ * block still resolves but is never routed, and a second `redirects`
827
+ * block is ignored: both are warnings. So is a block under one of v7's
828
+ * redirect types, which v8 doesn't route: its rules belong in Redirects.
829
+ */
830
+ redirectBlockProblems() {
831
+ const problems = [];
832
+ let routed = null;
833
+ const names = Object.keys(this.saved.blocks).sort((a, b) => (a < b ? -1 : a > b ? 1 : 0));
834
+ for (const name of names) {
835
+ const entry = this.saved.blocks[name];
836
+ if (!isBlock(entry))
837
+ continue;
838
+ const file = `.deco/blocks/${this.saved.files[name]}`;
839
+ if (V7_REDIRECT_TYPES.has(entry.__resolveType)) {
840
+ problems.push({
841
+ file,
842
+ path: "",
843
+ severity: "warning",
844
+ message: `v7 redirect block (type ${entry.__resolveType}) isn't routed: v8 routes only a block ` +
845
+ `typed "${REDIRECTS_TYPE}". Fold its rules into the "${REDIRECTS_BLOCK}" block ` +
846
+ `(type "${REDIRECTS_TYPE}"; v7's type permanent is permanent: true) and delete it`,
847
+ });
848
+ continue;
849
+ }
850
+ const { type } = this.underlyingType(entry.__resolveType);
851
+ if (type !== REDIRECT_TYPE && type !== REDIRECTS_TYPE)
852
+ continue;
853
+ if (type === REDIRECT_TYPE) {
854
+ problems.push({
855
+ file,
856
+ path: "",
857
+ severity: "warning",
858
+ message: "not routed; move it into the redirects block",
859
+ });
860
+ }
861
+ else if (routed === null) {
862
+ routed = name;
863
+ }
864
+ else {
865
+ problems.push({
866
+ file,
867
+ path: "",
868
+ severity: "warning",
869
+ message: `another redirects block, "${routed}", is the one routed; this one is ignored. Move its rules there`,
870
+ });
871
+ }
872
+ }
792
873
  return problems;
793
874
  }
794
875
  /**
@@ -895,7 +976,7 @@ export function formatProblems(problems, color = false) {
895
976
  }
896
977
  return lines.join("\n");
897
978
  }
898
- function readSchemaFile(file) {
979
+ export function readSchemaFile(file) {
899
980
  let text;
900
981
  try {
901
982
  text = fs.readFileSync(file, "utf8");
@@ -934,7 +1015,10 @@ export function check(options = {}) {
934
1015
  const reporter = options.reporter ?? consoleReporter;
935
1016
  const paths = decoPaths(findDecoRoot(options));
936
1017
  const meta = readSchemaFile(paths.schema);
937
- const saved = readSavedBlocks(paths.blocks);
1018
+ return reportCheck(meta, readSavedBlocks(paths.blocks), reporter).exitCode;
1019
+ }
1020
+ /** Check saved blocks against the local schema and print the problems and a summary. */
1021
+ export function reportCheck(meta, saved, reporter) {
938
1022
  const problems = checkContent(meta, saved);
939
1023
  const errors = problems.filter((p) => p.severity === "error").length;
940
1024
  const warnings = problems.length - errors;
@@ -951,7 +1035,7 @@ export function check(options = {}) {
951
1035
  reporter.error(summary);
952
1036
  else
953
1037
  reporter.info(summary);
954
- return errors > 0 ? 1 : 0;
1038
+ return { exitCode: errors > 0 ? 1 : 0, count, errors, warnings, problems };
955
1039
  }
956
1040
  /**
957
1041
  * `39 saved blocks checked: 0 errors, 0 warnings`. With colour it leads with