wrangler 0.0.0-eebdb6c → 0.0.0-eec88346

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 (304) hide show
  1. package/Cloudflare_CA.pem +18 -0
  2. package/README.md +47 -14
  3. package/bin/wrangler.js +160 -28
  4. package/kv-asset-handler.js +1 -0
  5. package/miniflare-dist/index.mjs +6314 -0
  6. package/package.json +190 -122
  7. package/src/__tests__/access.test.ts +25 -0
  8. package/src/__tests__/api-dev.test.ts +209 -0
  9. package/src/__tests__/api-devregistry.test.js +56 -0
  10. package/src/__tests__/api.test.ts +80 -0
  11. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  12. package/src/__tests__/config-cache.test.ts +42 -0
  13. package/src/__tests__/configuration.test.ts +3972 -0
  14. package/src/__tests__/d1.test.ts +72 -0
  15. package/src/__tests__/delete.test.ts +230 -0
  16. package/src/__tests__/deployments.test.ts +91 -0
  17. package/src/__tests__/dev.test.tsx +1455 -0
  18. package/src/__tests__/dialogs.test.tsx +40 -0
  19. package/src/__tests__/generate.test.ts +235 -0
  20. package/src/__tests__/get-host-from-url.test.ts +16 -0
  21. package/src/__tests__/guess-worker-format.test.ts +85 -0
  22. package/src/__tests__/{clipboardy-mock.js → helpers/clipboardy-mock.js} +0 -0
  23. package/src/__tests__/helpers/cmd-shim.d.ts +11 -0
  24. package/src/__tests__/helpers/mock-account-id.ts +48 -0
  25. package/src/__tests__/helpers/mock-bin.ts +36 -0
  26. package/src/__tests__/helpers/mock-cfetch.ts +333 -0
  27. package/src/__tests__/helpers/mock-console.ts +106 -0
  28. package/src/__tests__/helpers/mock-dialogs.ts +153 -0
  29. package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -0
  30. package/src/__tests__/helpers/mock-http-server.ts +46 -0
  31. package/src/__tests__/helpers/mock-istty.ts +74 -0
  32. package/src/__tests__/helpers/mock-known-routes.ts +7 -0
  33. package/src/__tests__/helpers/mock-kv.ts +33 -0
  34. package/src/__tests__/helpers/mock-oauth-flow.ts +252 -0
  35. package/src/__tests__/helpers/mock-process.ts +39 -0
  36. package/src/__tests__/helpers/mock-stdin.ts +108 -0
  37. package/src/__tests__/helpers/mock-web-socket.ts +29 -0
  38. package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
  39. package/src/__tests__/helpers/msw/handlers/deployments.ts +86 -0
  40. package/src/__tests__/helpers/msw/handlers/namespaces.ts +104 -0
  41. package/src/__tests__/helpers/msw/handlers/oauth.ts +36 -0
  42. package/src/__tests__/helpers/msw/handlers/r2.ts +80 -0
  43. package/src/__tests__/helpers/msw/handlers/script.ts +75 -0
  44. package/src/__tests__/helpers/msw/handlers/user.ts +63 -0
  45. package/src/__tests__/helpers/msw/handlers/zones.ts +22 -0
  46. package/src/__tests__/helpers/msw/index.ts +21 -0
  47. package/src/__tests__/helpers/run-in-tmp.ts +38 -0
  48. package/src/__tests__/helpers/run-wrangler.ts +16 -0
  49. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
  50. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
  51. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
  52. package/src/__tests__/helpers/worker-scripts/parent-worker.js +8 -0
  53. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
  54. package/src/__tests__/helpers/write-worker-source.ts +31 -0
  55. package/src/__tests__/helpers/write-wrangler-toml.ts +17 -0
  56. package/src/__tests__/https-options.test.ts +163 -0
  57. package/src/__tests__/index.test.ts +252 -284
  58. package/src/__tests__/init.test.ts +2900 -0
  59. package/src/__tests__/jest.setup.ts +190 -10
  60. package/src/__tests__/kv.test.ts +1463 -886
  61. package/src/__tests__/logger.test.ts +141 -0
  62. package/src/__tests__/metrics.test.ts +450 -0
  63. package/src/__tests__/middleware.scheduled.test.ts +135 -0
  64. package/src/__tests__/middleware.test.ts +726 -0
  65. package/src/__tests__/package-manager.test.ts +353 -0
  66. package/src/__tests__/pages.test.ts +2221 -0
  67. package/src/__tests__/parse.test.ts +330 -0
  68. package/src/__tests__/paths.test.ts +39 -0
  69. package/src/__tests__/publish.test.ts +7282 -0
  70. package/src/__tests__/pubsub.test.ts +367 -0
  71. package/src/__tests__/queues.test.ts +368 -0
  72. package/src/__tests__/r2.test.ts +371 -0
  73. package/src/__tests__/route.test.ts +45 -0
  74. package/src/__tests__/secret.test.ts +644 -0
  75. package/src/__tests__/tail.test.ts +800 -0
  76. package/src/__tests__/test-old-node-version.js +31 -0
  77. package/src/__tests__/type-generation.test.ts +217 -0
  78. package/src/__tests__/user.test.ts +155 -0
  79. package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
  80. package/src/__tests__/validate-dev-props.test.ts +56 -0
  81. package/src/__tests__/version.test.ts +35 -0
  82. package/src/__tests__/whoami.test.tsx +278 -0
  83. package/src/__tests__/worker-namespace.test.ts +321 -0
  84. package/src/abort.d.ts +3 -0
  85. package/src/api/dev.ts +208 -0
  86. package/src/api/index.ts +2 -0
  87. package/src/bundle-reporter.tsx +29 -0
  88. package/src/bundle.ts +782 -0
  89. package/src/cfetch/index.ts +128 -71
  90. package/src/cfetch/internal.ts +240 -46
  91. package/src/cli.ts +26 -6
  92. package/src/config/README.md +107 -0
  93. package/src/config/config.ts +275 -0
  94. package/src/config/diagnostics.ts +80 -0
  95. package/src/config/environment.ts +549 -0
  96. package/src/config/index.ts +306 -0
  97. package/src/config/validation-helpers.ts +597 -0
  98. package/src/config/validation.ts +2095 -0
  99. package/src/config-cache.ts +85 -0
  100. package/src/create-worker-preview.ts +282 -0
  101. package/src/create-worker-upload-form.ts +314 -0
  102. package/src/d1/backups.tsx +218 -0
  103. package/src/d1/constants.ts +2 -0
  104. package/src/d1/create.tsx +54 -0
  105. package/src/d1/delete.tsx +56 -0
  106. package/src/d1/execute.tsx +334 -0
  107. package/src/d1/formatTimeAgo.ts +14 -0
  108. package/src/d1/index.ts +98 -0
  109. package/src/d1/list.tsx +48 -0
  110. package/src/d1/migrations.tsx +446 -0
  111. package/src/d1/options.ts +22 -0
  112. package/src/d1/types.tsx +24 -0
  113. package/src/d1/utils.ts +48 -0
  114. package/src/delete.ts +111 -0
  115. package/src/deprecated/index.ts +453 -0
  116. package/src/dev/dev-vars.ts +36 -0
  117. package/src/dev/dev.tsx +587 -0
  118. package/src/dev/get-local-persistence-path.tsx +31 -0
  119. package/src/dev/local.tsx +717 -0
  120. package/src/dev/remote.tsx +602 -0
  121. package/src/dev/start-server.ts +516 -0
  122. package/src/dev/use-esbuild.ts +200 -0
  123. package/src/dev/validate-dev-props.ts +31 -0
  124. package/src/dev-registry.tsx +201 -0
  125. package/src/dev.tsx +850 -857
  126. package/src/dialogs.tsx +153 -61
  127. package/src/dispatch-namespace.ts +206 -0
  128. package/src/durable.ts +102 -0
  129. package/src/entry.ts +329 -0
  130. package/src/environment-variables.ts +50 -0
  131. package/src/errors.ts +11 -0
  132. package/src/git-client.ts +124 -0
  133. package/src/global-wrangler-config-path.ts +26 -0
  134. package/src/https-options.ts +127 -0
  135. package/src/index.tsx +663 -1889
  136. package/src/init.ts +969 -0
  137. package/src/inspect.ts +767 -0
  138. package/src/intl-polyfill.d.ts +139 -0
  139. package/src/is-ci.ts +14 -0
  140. package/src/is-interactive.ts +16 -0
  141. package/src/kv/helpers.ts +430 -0
  142. package/src/kv/index.ts +645 -0
  143. package/src/logger.ts +92 -0
  144. package/src/metrics/index.ts +5 -0
  145. package/src/metrics/metrics-config.ts +239 -0
  146. package/src/metrics/metrics-dispatcher.ts +96 -0
  147. package/src/metrics/metrics-usage-headers.ts +24 -0
  148. package/src/metrics/send-event.ts +94 -0
  149. package/src/miniflare-cli/README.md +30 -0
  150. package/src/miniflare-cli/assets.ts +215 -0
  151. package/src/miniflare-cli/index.ts +213 -0
  152. package/src/miniflare-cli/request-context.ts +40 -0
  153. package/src/module-collection.ts +256 -53
  154. package/src/open-in-browser.ts +17 -0
  155. package/src/package-manager.ts +219 -0
  156. package/src/pages/build.tsx +238 -0
  157. package/src/pages/constants.ts +18 -0
  158. package/src/pages/deployments.tsx +106 -0
  159. package/src/pages/dev.tsx +693 -0
  160. package/src/pages/errors.ts +66 -0
  161. package/src/pages/functions/buildPlugin.ts +110 -0
  162. package/src/pages/functions/buildWorker.ts +156 -0
  163. package/src/pages/functions/filepath-routing.test.ts +234 -0
  164. package/src/pages/functions/filepath-routing.ts +189 -0
  165. package/src/pages/functions/identifiers.ts +78 -0
  166. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  167. package/src/pages/functions/routes-consolidation.ts +73 -0
  168. package/src/pages/functions/routes-transformation.test.ts +282 -0
  169. package/src/pages/functions/routes-transformation.ts +115 -0
  170. package/src/pages/functions/routes-validation.test.ts +403 -0
  171. package/src/pages/functions/routes-validation.ts +202 -0
  172. package/src/pages/functions/routes.ts +151 -0
  173. package/src/pages/functions.tsx +82 -0
  174. package/src/pages/hash.tsx +13 -0
  175. package/src/pages/index.tsx +94 -0
  176. package/src/pages/projects.tsx +169 -0
  177. package/src/pages/publish.tsx +436 -0
  178. package/src/pages/types.ts +49 -0
  179. package/src/pages/upload.tsx +425 -0
  180. package/src/pages/utils.ts +12 -0
  181. package/src/parse.ts +286 -0
  182. package/src/paths.ts +71 -0
  183. package/src/proxy.ts +678 -92
  184. package/src/publish/index.ts +267 -0
  185. package/src/publish/publish.ts +976 -0
  186. package/src/pubsub/index.ts +286 -0
  187. package/src/pubsub/pubsub-commands.tsx +623 -0
  188. package/src/queues/cli/commands/consumer/add.ts +75 -0
  189. package/src/queues/cli/commands/consumer/index.ts +19 -0
  190. package/src/queues/cli/commands/consumer/remove.ts +44 -0
  191. package/src/queues/cli/commands/create.ts +25 -0
  192. package/src/queues/cli/commands/delete.ts +26 -0
  193. package/src/queues/cli/commands/index.ts +32 -0
  194. package/src/queues/cli/commands/list.ts +25 -0
  195. package/src/queues/client.ts +135 -0
  196. package/src/r2/helpers.ts +131 -0
  197. package/src/r2/index.ts +277 -0
  198. package/src/routes.ts +140 -0
  199. package/src/secret/index.ts +404 -0
  200. package/src/selfsigned.d.ts +29 -0
  201. package/src/sites.tsx +357 -99
  202. package/src/tail/createTail.ts +315 -0
  203. package/src/tail/filters.ts +277 -0
  204. package/src/tail/index.ts +217 -0
  205. package/src/tail/printing.ts +107 -0
  206. package/src/type-generation.ts +159 -0
  207. package/src/update-check.ts +19 -0
  208. package/src/user/access.ts +69 -0
  209. package/src/user/choose-account.tsx +69 -0
  210. package/src/user/env-vars.ts +46 -0
  211. package/src/user/generate-auth-url.ts +33 -0
  212. package/src/user/generate-random-state.ts +16 -0
  213. package/src/user/index.ts +3 -0
  214. package/src/user/user.tsx +1192 -0
  215. package/src/utils/collectKeyValues.ts +14 -0
  216. package/src/whoami.tsx +169 -0
  217. package/src/worker.ts +243 -0
  218. package/src/yargs-types.ts +7 -0
  219. package/src/zones.ts +191 -0
  220. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  221. package/templates/checked-fetch.js +17 -0
  222. package/templates/d1-beta-facade.js +185 -0
  223. package/templates/experimental-local-cache-stubs.js +27 -0
  224. package/templates/first-party-worker-module-facade.ts +18 -0
  225. package/templates/format-dev-errors.ts +32 -0
  226. package/templates/gitignore +171 -0
  227. package/templates/init-tests/test-jest-new-worker.js +25 -0
  228. package/templates/init-tests/test-vitest-new-worker.js +26 -0
  229. package/templates/middleware/common.ts +62 -0
  230. package/templates/middleware/loader-modules.ts +84 -0
  231. package/templates/middleware/loader-sw.ts +213 -0
  232. package/templates/middleware/middleware-pretty-error.ts +40 -0
  233. package/templates/middleware/middleware-scheduled.ts +15 -0
  234. package/templates/new-worker-scheduled.js +17 -0
  235. package/templates/new-worker-scheduled.ts +32 -0
  236. package/templates/new-worker.js +15 -0
  237. package/templates/new-worker.ts +30 -0
  238. package/templates/no-op-worker.js +10 -0
  239. package/templates/pages-dev-pipeline.ts +28 -0
  240. package/templates/pages-dev-util.ts +52 -0
  241. package/templates/pages-shim.ts +9 -0
  242. package/templates/pages-template-plugin.ts +171 -0
  243. package/templates/pages-template-worker.ts +189 -0
  244. package/templates/serve-static-assets.ts +63 -0
  245. package/templates/service-bindings-module-facade.js +54 -0
  246. package/templates/service-bindings-sw-facade.js +42 -0
  247. package/templates/tsconfig.json +106 -0
  248. package/wrangler-dist/cli.d.ts +880 -0
  249. package/wrangler-dist/cli.js +144775 -105026
  250. package/pages/functions/buildWorker.ts +0 -57
  251. package/pages/functions/filepath-routing.test.ts +0 -32
  252. package/pages/functions/filepath-routing.ts +0 -225
  253. package/pages/functions/identifiers.ts +0 -78
  254. package/pages/functions/routes.ts +0 -158
  255. package/pages/functions/template-worker.ts +0 -135
  256. package/src/__tests__/mock-cfetch.ts +0 -171
  257. package/src/__tests__/mock-dialogs.ts +0 -65
  258. package/src/__tests__/run-in-tmp.ts +0 -19
  259. package/src/__tests__/run-wrangler.ts +0 -32
  260. package/src/api/form_data.ts +0 -131
  261. package/src/api/inspect.ts +0 -430
  262. package/src/api/preview.ts +0 -128
  263. package/src/api/worker.ts +0 -155
  264. package/src/config.ts +0 -131
  265. package/src/kv.tsx +0 -267
  266. package/src/pages.tsx +0 -921
  267. package/src/publish.ts +0 -350
  268. package/src/tail.tsx +0 -73
  269. package/src/user.tsx +0 -1022
  270. package/static-asset-facade.js +0 -47
  271. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  272. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  273. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  274. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  275. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  276. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  277. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  278. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  279. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  280. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  281. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  282. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  283. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  284. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  285. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  286. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  287. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  288. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  289. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  290. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  291. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  292. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  293. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  294. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  295. package/vendor/wrangler-mime/LICENSE +0 -21
  296. package/vendor/wrangler-mime/Mime.js +0 -97
  297. package/vendor/wrangler-mime/README.md +0 -187
  298. package/vendor/wrangler-mime/cli.js +0 -46
  299. package/vendor/wrangler-mime/index.js +0 -4
  300. package/vendor/wrangler-mime/lite.js +0 -4
  301. package/vendor/wrangler-mime/package.json +0 -52
  302. package/vendor/wrangler-mime/types/other.js +0 -1
  303. package/vendor/wrangler-mime/types/standard.js +0 -1
  304. package/wrangler-dist/cli.js.map +0 -7
@@ -0,0 +1,282 @@
1
+ import { toUrlPath } from "../../paths";
2
+ import {
3
+ MAX_FUNCTIONS_ROUTES_RULES,
4
+ ROUTES_SPEC_VERSION,
5
+ ROUTES_SPEC_DESCRIPTION,
6
+ } from "../constants";
7
+ import {
8
+ compareRoutes,
9
+ convertRoutesToGlobPatterns,
10
+ convertRoutesToRoutesJSONSpec,
11
+ optimizeRoutesJSONSpec,
12
+ } from "./routes-transformation";
13
+
14
+ // TODO: make a convenience function for creating a list
15
+ // of `convertRoutesToGlobPatterns` inputs from a string array
16
+ describe("route-paths-to-glob-patterns", () => {
17
+ describe("convertRoutePathsToGlobPatterns()", () => {
18
+ it("should pass through routes with no wildcards", () => {
19
+ expect(
20
+ convertRoutesToGlobPatterns([{ routePath: toUrlPath("/api/foo") }])
21
+ ).toEqual(["/api/foo"]);
22
+ expect(
23
+ convertRoutesToGlobPatterns([
24
+ { routePath: toUrlPath("/api/foo") },
25
+ { routePath: toUrlPath("/api/bar") },
26
+ ])
27
+ ).toEqual(["/api/foo", "/api/bar"]);
28
+ expect(
29
+ convertRoutesToGlobPatterns([
30
+ { routePath: toUrlPath("/api/foo") },
31
+ { routePath: toUrlPath("/api/bar/foo") },
32
+ { routePath: toUrlPath("/foo/bar") },
33
+ ])
34
+ ).toEqual(["/api/foo", "/api/bar/foo", "/foo/bar"]);
35
+ });
36
+
37
+ it("should escalate a single param route to a wildcard", () => {
38
+ expect(
39
+ convertRoutesToGlobPatterns([{ routePath: toUrlPath("/api/:foo") }])
40
+ ).toEqual(["/api/*"]);
41
+ expect(
42
+ convertRoutesToGlobPatterns([{ routePath: toUrlPath("/api/foo/:bar") }])
43
+ ).toEqual(["/api/foo/*"]);
44
+ expect(
45
+ convertRoutesToGlobPatterns([
46
+ { routePath: toUrlPath("/bar/:barId/foo") },
47
+ ])
48
+ ).toEqual(["/bar/*"]);
49
+ expect(
50
+ convertRoutesToGlobPatterns([
51
+ { routePath: toUrlPath("/bar/:barId/foo/:fooId") },
52
+ ])
53
+ ).toEqual(["/bar/*"]);
54
+ expect(
55
+ convertRoutesToGlobPatterns([
56
+ { routePath: toUrlPath("/api/:foo") },
57
+ { routePath: toUrlPath("/bar/:barName/profile") },
58
+ { routePath: toUrlPath("/foo/bar/:barId/:fooId") },
59
+ ])
60
+ ).toEqual(["/api/*", "/bar/*", "/foo/bar/*"]);
61
+ });
62
+
63
+ it("should pass through a single wildcard route", () => {
64
+ expect(
65
+ convertRoutesToGlobPatterns([{ routePath: toUrlPath("/api/:baz*") }])
66
+ ).toEqual(["/api/*"]);
67
+ expect(
68
+ convertRoutesToGlobPatterns([
69
+ { routePath: toUrlPath("/api/foo/bar/:baz*") },
70
+ ])
71
+ ).toEqual(["/api/foo/bar/*"]);
72
+ expect(
73
+ convertRoutesToGlobPatterns([
74
+ { routePath: toUrlPath("/api/:foo/:bar*") },
75
+ ])
76
+ ).toEqual(["/api/*"]);
77
+ expect(
78
+ convertRoutesToGlobPatterns([
79
+ { routePath: toUrlPath("/foo/:foo*/bar/:bar*") },
80
+ ])
81
+ ).toEqual(["/foo/*"]);
82
+ expect(
83
+ convertRoutesToGlobPatterns([
84
+ { routePath: toUrlPath("/foo/:foo/bar/:bar*") },
85
+ ])
86
+ ).toEqual(["/foo/*"]);
87
+ expect(
88
+ convertRoutesToGlobPatterns([
89
+ { routePath: toUrlPath("/api/:baz*") },
90
+ { routePath: toUrlPath("/api/foo/bar/:baz*") },
91
+ { routePath: toUrlPath("/api/:foo/:bar*") },
92
+ ])
93
+ ).toEqual(["/api/*", "/api/foo/bar/*"]);
94
+ });
95
+
96
+ it("should deduplicate identical rules", () => {
97
+ expect(
98
+ convertRoutesToGlobPatterns([
99
+ { routePath: toUrlPath("/api/foo") },
100
+ { routePath: toUrlPath("/api/foo") },
101
+ ])
102
+ ).toEqual(["/api/foo"]);
103
+ expect(
104
+ convertRoutesToGlobPatterns([
105
+ { routePath: toUrlPath("/api/foo/bar") },
106
+ { routePath: toUrlPath("/foo/bar") },
107
+ { routePath: toUrlPath("/api/foo/bar") },
108
+ ])
109
+ ).toEqual(["/api/foo/bar", "/foo/bar"]);
110
+ expect(
111
+ convertRoutesToGlobPatterns([
112
+ { routePath: toUrlPath("/api/foo/:bar") },
113
+ { routePath: toUrlPath("/api/foo") },
114
+ { routePath: toUrlPath("/api/foo/:fooId/bar") },
115
+ { routePath: toUrlPath("/api/foo/*") },
116
+ ])
117
+ ).toEqual(["/api/foo/*", "/api/foo"]);
118
+ expect(
119
+ convertRoutesToGlobPatterns([
120
+ { routePath: toUrlPath("/api/:baz*") },
121
+ { routePath: toUrlPath("/api/:foo") },
122
+ ])
123
+ ).toEqual(["/api/*"]);
124
+ });
125
+
126
+ it("should handle middleware mounting", () => {
127
+ expect(
128
+ convertRoutesToGlobPatterns([
129
+ {
130
+ routePath: toUrlPath("/middleware"),
131
+ middleware: ["./some-middleware.ts"],
132
+ },
133
+ ])
134
+ ).toEqual(["/middleware/*"]);
135
+
136
+ expect(
137
+ convertRoutesToGlobPatterns([
138
+ {
139
+ routePath: toUrlPath("/middleware"),
140
+ middleware: "./some-middleware.ts",
141
+ },
142
+ ])
143
+ ).toEqual(["/middleware/*"]);
144
+
145
+ expect(
146
+ convertRoutesToGlobPatterns([
147
+ {
148
+ routePath: toUrlPath("/middleware"),
149
+ middleware: [],
150
+ },
151
+ ])
152
+ ).toEqual(["/middleware"]);
153
+ });
154
+ });
155
+
156
+ describe("convertRoutesToRoutesJSONSpec()", () => {
157
+ it("should convert and consolidate routes into JSONSpec", () => {
158
+ expect(
159
+ convertRoutesToRoutesJSONSpec([
160
+ { routePath: toUrlPath("/api/foo/bar") },
161
+ { routePath: toUrlPath("/foo/bar") },
162
+ { routePath: toUrlPath("/foo/:bar") },
163
+ { routePath: toUrlPath("/api/foo/bar") },
164
+ {
165
+ routePath: toUrlPath("/middleware"),
166
+ middleware: "./some-middleware.ts",
167
+ },
168
+ ])
169
+ ).toEqual({
170
+ version: ROUTES_SPEC_VERSION,
171
+ description: ROUTES_SPEC_DESCRIPTION,
172
+ include: ["/middleware/*", "/foo/*", "/api/foo/bar"],
173
+ exclude: [],
174
+ });
175
+ });
176
+
177
+ it("should truncate all routes if over limit", () => {
178
+ const routes = [];
179
+ for (let i = 0; i < MAX_FUNCTIONS_ROUTES_RULES + 1; i++) {
180
+ routes.push({ routePath: toUrlPath(`/api/foo-${i}`) });
181
+ }
182
+ expect(convertRoutesToRoutesJSONSpec(routes)).toEqual({
183
+ version: ROUTES_SPEC_VERSION,
184
+ description: ROUTES_SPEC_DESCRIPTION,
185
+ include: ["/*"],
186
+ exclude: [],
187
+ });
188
+ });
189
+
190
+ it("should allow max routes", () => {
191
+ const routes = [];
192
+ for (let i = 0; i < MAX_FUNCTIONS_ROUTES_RULES; i++) {
193
+ routes.push({ routePath: toUrlPath(`/api/foo-${i}`) });
194
+ }
195
+ expect(convertRoutesToRoutesJSONSpec(routes).include.length).toEqual(
196
+ MAX_FUNCTIONS_ROUTES_RULES
197
+ );
198
+ });
199
+ });
200
+
201
+ describe("optimizeRoutesJSONSpec()", () => {
202
+ it("should convert and consolidate routes into JSONSpec", () => {
203
+ expect(
204
+ optimizeRoutesJSONSpec({
205
+ version: ROUTES_SPEC_VERSION,
206
+ description: ROUTES_SPEC_DESCRIPTION,
207
+ exclude: [],
208
+ include: [
209
+ "/api/foo/bar",
210
+ "/foo/bar",
211
+ "/foo/*",
212
+ "/api/foo/bar",
213
+ "/middleware/*",
214
+ ],
215
+ })
216
+ ).toEqual({
217
+ version: ROUTES_SPEC_VERSION,
218
+ description: ROUTES_SPEC_DESCRIPTION,
219
+ include: ["/middleware/*", "/foo/*", "/api/foo/bar"],
220
+ exclude: [],
221
+ });
222
+ });
223
+
224
+ it("should truncate all routes if over limit", () => {
225
+ const include: string[] = [];
226
+ for (let i = 0; i < MAX_FUNCTIONS_ROUTES_RULES + 1; i++) {
227
+ include.push(`/api/foo-${i}`);
228
+ }
229
+ expect(
230
+ optimizeRoutesJSONSpec({
231
+ version: ROUTES_SPEC_VERSION,
232
+ description: ROUTES_SPEC_DESCRIPTION,
233
+ include,
234
+ exclude: [],
235
+ })
236
+ ).toEqual({
237
+ version: ROUTES_SPEC_VERSION,
238
+ description: ROUTES_SPEC_DESCRIPTION,
239
+ include: ["/*"],
240
+ exclude: [],
241
+ });
242
+ });
243
+
244
+ it("should allow max routes", () => {
245
+ const include: string[] = [];
246
+ for (let i = 0; i < MAX_FUNCTIONS_ROUTES_RULES; i++) {
247
+ include.push(`/api/foo-${i}`);
248
+ }
249
+ expect(
250
+ optimizeRoutesJSONSpec({
251
+ version: ROUTES_SPEC_VERSION,
252
+ description: ROUTES_SPEC_DESCRIPTION,
253
+ include,
254
+ exclude: [],
255
+ }).include.length
256
+ ).toEqual(MAX_FUNCTIONS_ROUTES_RULES);
257
+ });
258
+ });
259
+
260
+ describe("compareRoutes()", () => {
261
+ describe("compareRoutes()", () => {
262
+ test("routes / last", () => {
263
+ expect(compareRoutes("/", "/foo")).toBeGreaterThanOrEqual(1);
264
+ expect(compareRoutes("/", "/*")).toBeGreaterThanOrEqual(1);
265
+ });
266
+
267
+ test("routes with fewer segments come after those with more segments", () => {
268
+ expect(compareRoutes("/foo", "/foo/bar")).toBeGreaterThanOrEqual(1);
269
+ expect(compareRoutes("/foo", "/foo/bar/cat")).toBeGreaterThanOrEqual(1);
270
+ });
271
+
272
+ test("routes with wildcard segments come after those without", () => {
273
+ expect(compareRoutes("/*", "/foo")).toBe(1);
274
+ expect(compareRoutes("/foo/*", "/foo/bar")).toBe(1);
275
+ });
276
+
277
+ test("routes with dynamic segments occurring earlier come after those with dynamic segments in later positions", () => {
278
+ expect(compareRoutes("/foo/*/bar", "/foo/bar/*")).toBe(1);
279
+ });
280
+ });
281
+ });
282
+ });
@@ -0,0 +1,115 @@
1
+ import { join as pathJoin } from "node:path";
2
+ import { toUrlPath } from "../../paths";
3
+ import {
4
+ MAX_FUNCTIONS_ROUTES_RULES,
5
+ ROUTES_SPEC_DESCRIPTION,
6
+ ROUTES_SPEC_VERSION,
7
+ } from "../constants";
8
+ import { consolidateRoutes } from "./routes-consolidation";
9
+ import type { RouteConfig } from "./routes";
10
+
11
+ /** Interface for _routes.json */
12
+ export interface RoutesJSONSpec {
13
+ version: typeof ROUTES_SPEC_VERSION;
14
+ description?: string;
15
+ include: string[];
16
+ exclude: string[];
17
+ }
18
+
19
+ type RoutesJSONRouteInput = Pick<RouteConfig, "routePath" | "middleware">[];
20
+
21
+ export function convertRoutesToGlobPatterns(
22
+ routes: RoutesJSONRouteInput
23
+ ): string[] {
24
+ const convertedRoutes = routes.map(({ routePath, middleware }) => {
25
+ const globbedRoutePath: string = routePath.replace(/:\w+\*?.*/, "*");
26
+
27
+ // Middleware mountings need to end in glob so that they can handle their
28
+ // own sub-path routes
29
+ if (
30
+ typeof middleware === "string" ||
31
+ (Array.isArray(middleware) && middleware.length > 0)
32
+ ) {
33
+ if (!globbedRoutePath.endsWith("*")) {
34
+ return toUrlPath(pathJoin(globbedRoutePath, "*"));
35
+ }
36
+ }
37
+
38
+ return toUrlPath(globbedRoutePath);
39
+ });
40
+
41
+ return Array.from(new Set(convertedRoutes));
42
+ }
43
+
44
+ /**
45
+ * Converts Functions routes like /foo/:bar to a Routing object that's used
46
+ * to determine if a request should run in the Functions user-worker.
47
+ * Also consolidates redundant routes such as [/foo/bar, /foo/:bar] -> /foo/*
48
+ *
49
+ * @returns RoutesJSONSpec to be written to _routes.json
50
+ */
51
+ export function convertRoutesToRoutesJSONSpec(
52
+ routes: RoutesJSONRouteInput
53
+ ): RoutesJSONSpec {
54
+ // The initial routes coming in are sorted most-specific to least-specific.
55
+ // The order doesn't have any affect on the output of this function, but
56
+ // it should speed up route consolidation with less-specific routes being first.
57
+ const reversedRoutes = [...routes].reverse();
58
+ const include = convertRoutesToGlobPatterns(reversedRoutes);
59
+ return optimizeRoutesJSONSpec({
60
+ version: ROUTES_SPEC_VERSION,
61
+ description: ROUTES_SPEC_DESCRIPTION,
62
+ include,
63
+ exclude: [],
64
+ });
65
+ }
66
+
67
+ /**
68
+ * Optimizes and returns a new Routes JSON Spec instance performing
69
+ * de-duping, consolidation, truncation, and sorting
70
+ */
71
+ export function optimizeRoutesJSONSpec(spec: RoutesJSONSpec): RoutesJSONSpec {
72
+ const optimizedSpec = { ...spec };
73
+
74
+ let consolidatedRoutes = consolidateRoutes(optimizedSpec.include);
75
+ if (consolidatedRoutes.length > MAX_FUNCTIONS_ROUTES_RULES) {
76
+ consolidatedRoutes = ["/*"];
77
+ }
78
+ // Sort so that least-specific routes are first
79
+ consolidatedRoutes.sort((a, b) => compareRoutes(b, a));
80
+
81
+ optimizedSpec.include = consolidatedRoutes;
82
+
83
+ return optimizedSpec;
84
+ }
85
+
86
+ /**
87
+ * Simplified routes comparison (copied from the one in filepath-routing.)
88
+ * This version will sort most-specific to least-specific, but the input is simplified
89
+ * routes like /foo/*, /foo, etc
90
+ */
91
+ export function compareRoutes(routeA: string, routeB: string) {
92
+ function parseRoutePath(routePath: string): string[] {
93
+ return routePath.slice(1).split("/").filter(Boolean);
94
+ }
95
+
96
+ const segmentsA = parseRoutePath(routeA);
97
+ const segmentsB = parseRoutePath(routeB);
98
+
99
+ // sort routes with fewer segments after those with more segments
100
+ if (segmentsA.length !== segmentsB.length) {
101
+ return segmentsB.length - segmentsA.length;
102
+ }
103
+
104
+ for (let i = 0; i < segmentsA.length; i++) {
105
+ const isWildcardA = segmentsA[i].includes("*");
106
+ const isWildcardB = segmentsB[i].includes("*");
107
+
108
+ // sort wildcard segments after non-wildcard segments
109
+ if (isWildcardA && !isWildcardB) return 1;
110
+ if (!isWildcardA && isWildcardB) return -1;
111
+ }
112
+
113
+ // all else equal, just sort the paths lexicographically
114
+ return routeA.localeCompare(routeB);
115
+ }