wrangler 0.0.0-e30d1013 → 0.0.0-e3136f935

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 (270) hide show
  1. package/README.md +17 -15
  2. package/bin/wrangler.js +24 -93
  3. package/config-schema.json +3115 -0
  4. package/package.json +197 -192
  5. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  6. package/templates/__tests__/tsconfig.json +8 -0
  7. package/templates/checked-fetch.js +19 -6
  8. package/templates/facade.d.ts +19 -0
  9. package/templates/gitignore +2 -3
  10. package/templates/init-tests/test-jest-new-worker.js +3 -5
  11. package/templates/init-tests/test-vitest-new-worker.js +4 -6
  12. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  13. package/templates/middleware/common.ts +9 -4
  14. package/templates/middleware/loader-modules.ts +94 -44
  15. package/templates/middleware/loader-sw.ts +48 -32
  16. package/templates/middleware/middleware-ensure-req-body-drained.ts +18 -0
  17. package/templates/middleware/middleware-miniflare3-json-error.ts +32 -0
  18. package/templates/middleware/middleware-mock-analytics-engine.d.ts +3 -0
  19. package/templates/middleware/middleware-mock-analytics-engine.ts +30 -0
  20. package/templates/middleware/middleware-scheduled.ts +15 -1
  21. package/templates/middleware/middleware-serve-static-assets.d.ts +6 -0
  22. package/templates/middleware/middleware-serve-static-assets.ts +56 -0
  23. package/templates/modules-watch-stub.js +4 -0
  24. package/templates/new-worker-scheduled.ts +1 -1
  25. package/templates/new-worker.ts +4 -1
  26. package/templates/pages-dev-pipeline.ts +6 -2
  27. package/templates/pages-dev-util.ts +4 -1
  28. package/templates/pages-shim.ts +1 -1
  29. package/templates/pages-template-plugin.ts +33 -14
  30. package/templates/pages-template-worker.ts +12 -3
  31. package/templates/startDevWorker/InspectorProxyWorker.ts +664 -0
  32. package/templates/startDevWorker/ProxyWorker.ts +336 -0
  33. package/templates/tsconfig-sanity.ts +11 -0
  34. package/templates/tsconfig.init.json +22 -0
  35. package/templates/tsconfig.json +5 -103
  36. package/wrangler-dist/InspectorProxyWorker.js +464 -0
  37. package/wrangler-dist/InspectorProxyWorker.js.map +6 -0
  38. package/wrangler-dist/ProxyWorker.js +241 -0
  39. package/wrangler-dist/ProxyWorker.js.map +6 -0
  40. package/wrangler-dist/cli.d.ts +26093 -517
  41. package/wrangler-dist/cli.js +173222 -119058
  42. package/wrangler-dist/wasm-sync.wasm +0 -0
  43. package/Cloudflare_CA.pem +0 -18
  44. package/import_meta_url.js +0 -3
  45. package/miniflare-config-stubs/.env.empty +0 -0
  46. package/miniflare-config-stubs/package.empty.json +0 -1
  47. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  48. package/miniflare-dist/index.mjs +0 -6316
  49. package/src/__tests__/access.test.ts +0 -25
  50. package/src/__tests__/api-dev.test.ts +0 -209
  51. package/src/__tests__/api-devregistry.test.js +0 -56
  52. package/src/__tests__/api.test.ts +0 -80
  53. package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
  54. package/src/__tests__/config-cache.test.ts +0 -42
  55. package/src/__tests__/configuration.test.ts +0 -3981
  56. package/src/__tests__/d1.test.ts +0 -74
  57. package/src/__tests__/delete.test.ts +0 -230
  58. package/src/__tests__/deployments.test.ts +0 -91
  59. package/src/__tests__/dev.test.tsx +0 -1509
  60. package/src/__tests__/dialogs.test.tsx +0 -40
  61. package/src/__tests__/generate.test.ts +0 -235
  62. package/src/__tests__/get-host-from-url.test.ts +0 -16
  63. package/src/__tests__/guess-worker-format.test.ts +0 -85
  64. package/src/__tests__/helpers/clipboardy-mock.js +0 -4
  65. package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
  66. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  67. package/src/__tests__/helpers/mock-bin.ts +0 -36
  68. package/src/__tests__/helpers/mock-cfetch.ts +0 -333
  69. package/src/__tests__/helpers/mock-console.ts +0 -106
  70. package/src/__tests__/helpers/mock-dialogs.ts +0 -153
  71. package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -8
  72. package/src/__tests__/helpers/mock-http-server.ts +0 -46
  73. package/src/__tests__/helpers/mock-istty.ts +0 -74
  74. package/src/__tests__/helpers/mock-known-routes.ts +0 -7
  75. package/src/__tests__/helpers/mock-kv.ts +0 -33
  76. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -252
  77. package/src/__tests__/helpers/mock-process.ts +0 -39
  78. package/src/__tests__/helpers/mock-stdin.ts +0 -108
  79. package/src/__tests__/helpers/mock-web-socket.ts +0 -29
  80. package/src/__tests__/helpers/msw/handlers/access.ts +0 -13
  81. package/src/__tests__/helpers/msw/handlers/deployments.ts +0 -59
  82. package/src/__tests__/helpers/msw/handlers/namespaces.ts +0 -104
  83. package/src/__tests__/helpers/msw/handlers/oauth.ts +0 -36
  84. package/src/__tests__/helpers/msw/handlers/r2.ts +0 -80
  85. package/src/__tests__/helpers/msw/handlers/script.ts +0 -75
  86. package/src/__tests__/helpers/msw/handlers/user.ts +0 -63
  87. package/src/__tests__/helpers/msw/handlers/zones.ts +0 -22
  88. package/src/__tests__/helpers/msw/index.ts +0 -21
  89. package/src/__tests__/helpers/run-in-tmp.ts +0 -38
  90. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  91. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +0 -1
  92. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +0 -5
  93. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +0 -1
  94. package/src/__tests__/helpers/worker-scripts/parent-worker.js +0 -8
  95. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +0 -5
  96. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  97. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  98. package/src/__tests__/https-options.test.ts +0 -163
  99. package/src/__tests__/index.test.ts +0 -262
  100. package/src/__tests__/init.test.ts +0 -2900
  101. package/src/__tests__/jest.setup.ts +0 -202
  102. package/src/__tests__/kv.test.ts +0 -1675
  103. package/src/__tests__/logger.test.ts +0 -141
  104. package/src/__tests__/metrics.test.ts +0 -450
  105. package/src/__tests__/middleware.scheduled.test.ts +0 -135
  106. package/src/__tests__/middleware.test.ts +0 -726
  107. package/src/__tests__/package-manager.test.ts +0 -353
  108. package/src/__tests__/pages.test.ts +0 -2387
  109. package/src/__tests__/parse.test.ts +0 -330
  110. package/src/__tests__/paths.test.ts +0 -39
  111. package/src/__tests__/publish.test.ts +0 -7633
  112. package/src/__tests__/pubsub.test.ts +0 -370
  113. package/src/__tests__/queues.test.ts +0 -371
  114. package/src/__tests__/r2.test.ts +0 -393
  115. package/src/__tests__/route.test.ts +0 -45
  116. package/src/__tests__/secret.test.ts +0 -644
  117. package/src/__tests__/tail.test.ts +0 -800
  118. package/src/__tests__/test-old-node-version.js +0 -31
  119. package/src/__tests__/type-generation.test.ts +0 -225
  120. package/src/__tests__/user.test.ts +0 -155
  121. package/src/__tests__/utils-collectKeyValues.test.ts +0 -47
  122. package/src/__tests__/validate-dev-props.test.ts +0 -56
  123. package/src/__tests__/version.test.ts +0 -35
  124. package/src/__tests__/whoami.test.tsx +0 -278
  125. package/src/__tests__/worker-namespace.test.ts +0 -326
  126. package/src/abort.d.ts +0 -3
  127. package/src/api/dev.ts +0 -208
  128. package/src/api/index.ts +0 -2
  129. package/src/bundle-reporter.tsx +0 -68
  130. package/src/bundle.ts +0 -815
  131. package/src/cfetch/index.ts +0 -160
  132. package/src/cfetch/internal.ts +0 -263
  133. package/src/cli.ts +0 -28
  134. package/src/config/README.md +0 -107
  135. package/src/config/config.ts +0 -275
  136. package/src/config/diagnostics.ts +0 -80
  137. package/src/config/environment.ts +0 -561
  138. package/src/config/index.ts +0 -334
  139. package/src/config/validation-helpers.ts +0 -597
  140. package/src/config/validation.ts +0 -2103
  141. package/src/config-cache.ts +0 -85
  142. package/src/create-worker-preview.ts +0 -282
  143. package/src/create-worker-upload-form.ts +0 -316
  144. package/src/d1/backups.tsx +0 -218
  145. package/src/d1/constants.ts +0 -2
  146. package/src/d1/create.tsx +0 -63
  147. package/src/d1/delete.tsx +0 -56
  148. package/src/d1/execute.tsx +0 -344
  149. package/src/d1/formatTimeAgo.ts +0 -14
  150. package/src/d1/index.ts +0 -99
  151. package/src/d1/list.tsx +0 -48
  152. package/src/d1/migrations.tsx +0 -446
  153. package/src/d1/options.ts +0 -22
  154. package/src/d1/types.tsx +0 -24
  155. package/src/d1/utils.ts +0 -48
  156. package/src/delete.ts +0 -108
  157. package/src/deployments.ts +0 -77
  158. package/src/deprecated/index.ts +0 -438
  159. package/src/dev/dev-vars.ts +0 -39
  160. package/src/dev/dev.tsx +0 -587
  161. package/src/dev/get-local-persistence-path.tsx +0 -31
  162. package/src/dev/local.tsx +0 -746
  163. package/src/dev/remote.tsx +0 -603
  164. package/src/dev/start-server.ts +0 -519
  165. package/src/dev/use-esbuild.ts +0 -204
  166. package/src/dev/validate-dev-props.ts +0 -31
  167. package/src/dev-registry.tsx +0 -201
  168. package/src/dev.tsx +0 -868
  169. package/src/dialogs.tsx +0 -169
  170. package/src/dispatch-namespace.ts +0 -207
  171. package/src/durable.ts +0 -102
  172. package/src/entry.ts +0 -329
  173. package/src/environment-variables.ts +0 -50
  174. package/src/errors.ts +0 -11
  175. package/src/git-client.ts +0 -124
  176. package/src/global-wrangler-config-path.ts +0 -26
  177. package/src/https-options.ts +0 -127
  178. package/src/index.tsx +0 -683
  179. package/src/init.ts +0 -970
  180. package/src/inspect.ts +0 -767
  181. package/src/intl-polyfill.d.ts +0 -139
  182. package/src/is-ci.ts +0 -14
  183. package/src/is-interactive.ts +0 -16
  184. package/src/kv/helpers.ts +0 -430
  185. package/src/kv/index.ts +0 -596
  186. package/src/logger.ts +0 -92
  187. package/src/metrics/index.ts +0 -5
  188. package/src/metrics/metrics-config.ts +0 -239
  189. package/src/metrics/metrics-dispatcher.ts +0 -96
  190. package/src/metrics/metrics-usage-headers.ts +0 -24
  191. package/src/metrics/send-event.ts +0 -94
  192. package/src/miniflare-cli/README.md +0 -30
  193. package/src/miniflare-cli/assets.ts +0 -215
  194. package/src/miniflare-cli/index.ts +0 -213
  195. package/src/miniflare-cli/request-context.ts +0 -40
  196. package/src/module-collection.ts +0 -267
  197. package/src/open-in-browser.ts +0 -17
  198. package/src/package-manager.ts +0 -219
  199. package/src/pages/build.tsx +0 -270
  200. package/src/pages/constants.ts +0 -18
  201. package/src/pages/deployments.tsx +0 -106
  202. package/src/pages/dev.tsx +0 -708
  203. package/src/pages/errors.ts +0 -66
  204. package/src/pages/functions/buildPlugin.ts +0 -106
  205. package/src/pages/functions/buildWorker.ts +0 -165
  206. package/src/pages/functions/filepath-routing.test.ts +0 -234
  207. package/src/pages/functions/filepath-routing.ts +0 -189
  208. package/src/pages/functions/identifiers.ts +0 -78
  209. package/src/pages/functions/routes-consolidation.test.ts +0 -250
  210. package/src/pages/functions/routes-consolidation.ts +0 -73
  211. package/src/pages/functions/routes-transformation.test.ts +0 -282
  212. package/src/pages/functions/routes-transformation.ts +0 -115
  213. package/src/pages/functions/routes-validation.test.ts +0 -403
  214. package/src/pages/functions/routes-validation.ts +0 -202
  215. package/src/pages/functions/routes.ts +0 -151
  216. package/src/pages/functions.tsx +0 -82
  217. package/src/pages/hash.tsx +0 -13
  218. package/src/pages/index.tsx +0 -94
  219. package/src/pages/projects.tsx +0 -169
  220. package/src/pages/publish.tsx +0 -446
  221. package/src/pages/types.ts +0 -49
  222. package/src/pages/upload.tsx +0 -425
  223. package/src/pages/utils.ts +0 -12
  224. package/src/parse.ts +0 -286
  225. package/src/paths.ts +0 -71
  226. package/src/proxy.ts +0 -689
  227. package/src/publish/index.ts +0 -270
  228. package/src/publish/publish.ts +0 -1035
  229. package/src/pubsub/index.ts +0 -286
  230. package/src/pubsub/pubsub-commands.tsx +0 -624
  231. package/src/queues/cli/commands/consumer/add.ts +0 -71
  232. package/src/queues/cli/commands/consumer/index.ts +0 -22
  233. package/src/queues/cli/commands/consumer/remove.ts +0 -38
  234. package/src/queues/cli/commands/create.ts +0 -25
  235. package/src/queues/cli/commands/delete.ts +0 -26
  236. package/src/queues/cli/commands/index.ts +0 -33
  237. package/src/queues/cli/commands/list.ts +0 -25
  238. package/src/queues/client.ts +0 -135
  239. package/src/r2/constants.ts +0 -4
  240. package/src/r2/helpers.ts +0 -131
  241. package/src/r2/index.ts +0 -289
  242. package/src/routes.ts +0 -140
  243. package/src/secret/index.ts +0 -378
  244. package/src/selfsigned.d.ts +0 -29
  245. package/src/sites.tsx +0 -372
  246. package/src/tail/createTail.ts +0 -315
  247. package/src/tail/filters.ts +0 -277
  248. package/src/tail/index.ts +0 -214
  249. package/src/tail/printing.ts +0 -107
  250. package/src/type-generation.ts +0 -173
  251. package/src/update-check.ts +0 -19
  252. package/src/user/access.ts +0 -69
  253. package/src/user/choose-account.tsx +0 -69
  254. package/src/user/env-vars.ts +0 -46
  255. package/src/user/generate-auth-url.ts +0 -33
  256. package/src/user/generate-random-state.ts +0 -16
  257. package/src/user/index.ts +0 -3
  258. package/src/user/user.tsx +0 -1192
  259. package/src/utils/collectKeyValues.ts +0 -14
  260. package/src/whoami.tsx +0 -169
  261. package/src/worker.ts +0 -245
  262. package/src/yargs-types.ts +0 -20
  263. package/src/zones.ts +0 -191
  264. package/templates/d1-beta-facade.js +0 -196
  265. package/templates/experimental-local-cache-stubs.js +0 -27
  266. package/templates/first-party-worker-module-facade.ts +0 -18
  267. package/templates/format-dev-errors.ts +0 -32
  268. package/templates/serve-static-assets.ts +0 -63
  269. package/templates/service-bindings-module-facade.js +0 -54
  270. package/templates/service-bindings-sw-facade.js +0 -42
@@ -1,282 +0,0 @@
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
- });
@@ -1,115 +0,0 @@
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
- }