wrangler 0.0.0-e3278fa → 0.0.0-e33bea9b

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 (323) hide show
  1. package/README.md +24 -4
  2. package/bin/wrangler.js +170 -62
  3. package/kv-asset-handler.js +1 -0
  4. package/miniflare-dist/index.mjs +1516 -34
  5. package/package.json +193 -153
  6. package/src/__tests__/access.test.ts +25 -0
  7. package/src/__tests__/api-dev.test.ts +238 -0
  8. package/src/__tests__/api-devregistry.test.js +64 -0
  9. package/src/__tests__/api.test.ts +80 -0
  10. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  11. package/src/__tests__/config-cache.test.ts +30 -24
  12. package/src/__tests__/configuration.test.ts +4451 -3397
  13. package/src/__tests__/d1/d1.test.ts +82 -0
  14. package/src/__tests__/d1/execute.test.ts +64 -0
  15. package/src/__tests__/d1/migrate.test.ts +155 -0
  16. package/src/__tests__/d1/splitter.test.ts +255 -0
  17. package/src/__tests__/delete.test.ts +266 -0
  18. package/src/__tests__/deployments.test.ts +129 -0
  19. package/src/__tests__/dev.test.tsx +1575 -956
  20. package/src/__tests__/generate.test.ts +238 -0
  21. package/src/__tests__/get-host-from-url.test.ts +16 -0
  22. package/src/__tests__/guess-worker-format.test.ts +103 -68
  23. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  24. package/src/__tests__/helpers/end-event-loop.ts +6 -0
  25. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  26. package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
  27. package/src/__tests__/helpers/mock-bin.ts +20 -20
  28. package/src/__tests__/helpers/mock-console.ts +58 -39
  29. package/src/__tests__/helpers/mock-dialogs.ts +88 -79
  30. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +25 -0
  31. package/src/__tests__/helpers/mock-get-zone-from-host.ts +11 -0
  32. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  33. package/src/__tests__/helpers/mock-istty.ts +65 -18
  34. package/src/__tests__/helpers/mock-known-routes.ts +12 -0
  35. package/src/__tests__/helpers/mock-kv.ts +41 -28
  36. package/src/__tests__/helpers/mock-oauth-flow.ts +241 -233
  37. package/src/__tests__/helpers/mock-process.ts +34 -0
  38. package/src/__tests__/helpers/mock-set-timeout.ts +16 -0
  39. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  40. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  41. package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
  42. package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
  43. package/src/__tests__/helpers/msw/handlers/deployments.ts +93 -0
  44. package/src/__tests__/helpers/msw/handlers/namespaces.ts +81 -0
  45. package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -0
  46. package/src/__tests__/helpers/msw/handlers/r2.ts +60 -0
  47. package/src/__tests__/helpers/msw/handlers/script.ts +56 -0
  48. package/src/__tests__/helpers/msw/handlers/user.ts +52 -0
  49. package/src/__tests__/helpers/msw/handlers/zones.ts +20 -0
  50. package/src/__tests__/helpers/msw/index.ts +50 -0
  51. package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
  52. package/src/__tests__/helpers/run-in-tmp.ts +27 -28
  53. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  54. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +28 -0
  55. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
  56. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
  57. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
  58. package/src/__tests__/helpers/worker-scripts/parent-worker.js +8 -0
  59. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
  60. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  61. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  62. package/src/__tests__/https-options.test.ts +142 -109
  63. package/src/__tests__/index.test.ts +254 -236
  64. package/src/__tests__/init.test.ts +3136 -1608
  65. package/src/__tests__/jest.setup.ts +148 -50
  66. package/src/__tests__/kv.test.ts +1789 -1471
  67. package/src/__tests__/logger.test.ts +100 -74
  68. package/src/__tests__/logout.test.ts +47 -0
  69. package/src/__tests__/metrics.test.ts +493 -0
  70. package/src/__tests__/middleware.scheduled.test.ts +145 -0
  71. package/src/__tests__/middleware.test.ts +816 -0
  72. package/src/__tests__/mtls-certificates.test.ts +585 -0
  73. package/src/__tests__/package-manager.test.ts +303 -303
  74. package/src/__tests__/pages/deployment-list.test.ts +78 -0
  75. package/src/__tests__/pages/functions-build.test.ts +452 -0
  76. package/src/__tests__/pages/pages.test.ts +81 -0
  77. package/src/__tests__/pages/project-create.test.ts +63 -0
  78. package/src/__tests__/pages/project-list.test.ts +108 -0
  79. package/src/__tests__/pages/project-upload.test.ts +481 -0
  80. package/src/__tests__/pages/publish.test.ts +2820 -0
  81. package/src/__tests__/pages-deployment-tail.test.ts +955 -0
  82. package/src/__tests__/parse.test.ts +358 -252
  83. package/src/__tests__/paths.test.ts +39 -0
  84. package/src/__tests__/publish.test.ts +8178 -5629
  85. package/src/__tests__/pubsub.test.ts +493 -0
  86. package/src/__tests__/queues.test.ts +529 -0
  87. package/src/__tests__/r2.test.ts +369 -228
  88. package/src/__tests__/route.test.ts +18 -18
  89. package/src/__tests__/secret.test.ts +681 -469
  90. package/src/__tests__/tail.test.ts +835 -567
  91. package/src/__tests__/test-old-node-version.js +31 -0
  92. package/src/__tests__/tsconfig-sanity.ts +12 -0
  93. package/src/__tests__/tsconfig.json +8 -0
  94. package/src/__tests__/tsconfig.tsbuildinfo +1 -0
  95. package/src/__tests__/type-generation.test.ts +234 -0
  96. package/src/__tests__/user.test.ts +107 -120
  97. package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
  98. package/src/__tests__/validate-dev-props.test.ts +56 -0
  99. package/src/__tests__/version.test.ts +35 -0
  100. package/src/__tests__/whoami.test.tsx +165 -132
  101. package/src/__tests__/worker-namespace.test.ts +339 -0
  102. package/src/abort.d.ts +1 -1
  103. package/src/api/dev.ts +327 -0
  104. package/src/api/index.ts +11 -0
  105. package/src/api/mtls-certificate.ts +148 -0
  106. package/src/api/pages/create-worker-bundle-contents.ts +75 -0
  107. package/src/api/pages/index.ts +5 -0
  108. package/src/api/pages/publish.tsx +355 -0
  109. package/src/bundle-reporter.ts +68 -0
  110. package/src/bundle.ts +856 -159
  111. package/src/cfetch/index.ts +120 -83
  112. package/src/cfetch/internal.ts +208 -92
  113. package/src/cli.ts +23 -8
  114. package/src/config/config.ts +244 -196
  115. package/src/config/diagnostics.ts +61 -61
  116. package/src/config/environment.ts +528 -357
  117. package/src/config/index.ts +356 -196
  118. package/src/config/validation-helpers.ts +379 -366
  119. package/src/config/validation.ts +2080 -1367
  120. package/src/config-cache.ts +81 -41
  121. package/src/create-worker-preview.ts +250 -142
  122. package/src/create-worker-upload-form.ts +326 -238
  123. package/src/d1/backups.tsx +215 -0
  124. package/src/d1/constants.ts +2 -0
  125. package/src/d1/create.tsx +64 -0
  126. package/src/d1/delete.ts +53 -0
  127. package/src/d1/execute.tsx +354 -0
  128. package/src/d1/formatTimeAgo.ts +14 -0
  129. package/src/d1/index.ts +100 -0
  130. package/src/d1/list.tsx +60 -0
  131. package/src/d1/migrations/apply.tsx +206 -0
  132. package/src/d1/migrations/create.tsx +76 -0
  133. package/src/d1/migrations/helpers.ts +172 -0
  134. package/src/d1/migrations/index.ts +3 -0
  135. package/src/d1/migrations/list.tsx +92 -0
  136. package/src/d1/migrations/options.ts +23 -0
  137. package/src/d1/options.ts +22 -0
  138. package/src/d1/splitter.ts +161 -0
  139. package/src/d1/types.ts +25 -0
  140. package/src/d1/utils.ts +49 -0
  141. package/src/delete.ts +100 -0
  142. package/src/deployments.ts +116 -0
  143. package/src/deprecated/index.ts +144 -0
  144. package/src/dev/dev-vars.ts +20 -17
  145. package/src/dev/dev.tsx +533 -345
  146. package/src/dev/get-local-persistence-path.ts +31 -0
  147. package/src/dev/local.tsx +900 -302
  148. package/src/dev/remote.tsx +620 -225
  149. package/src/dev/start-server.ts +540 -0
  150. package/src/dev/use-esbuild.ts +188 -97
  151. package/src/dev/validate-dev-props.ts +40 -0
  152. package/src/dev-registry.ts +201 -0
  153. package/src/dev.tsx +928 -0
  154. package/src/dialogs.ts +136 -0
  155. package/src/dispatch-namespace.ts +211 -0
  156. package/src/docs/index.ts +97 -0
  157. package/src/durable.ts +87 -87
  158. package/src/entry.ts +235 -230
  159. package/src/environment-variables/factory.ts +88 -0
  160. package/src/environment-variables/misc-variables.ts +30 -0
  161. package/src/errors.ts +6 -6
  162. package/src/generate/index.ts +298 -0
  163. package/src/git-client.ts +135 -0
  164. package/src/global-wrangler-config-path.ts +26 -0
  165. package/src/https-options.ts +84 -80
  166. package/src/index.ts +705 -0
  167. package/src/init.ts +1023 -0
  168. package/src/inspect.ts +713 -593
  169. package/src/intl-polyfill.d.ts +123 -123
  170. package/src/is-ci.ts +14 -0
  171. package/src/is-interactive.ts +16 -0
  172. package/src/jest.d.ts +4 -0
  173. package/src/kv/helpers.ts +430 -0
  174. package/src/kv/index.ts +594 -0
  175. package/src/logger.ts +80 -42
  176. package/src/metrics/index.ts +5 -0
  177. package/src/metrics/metrics-config.ts +239 -0
  178. package/src/metrics/metrics-dispatcher.ts +96 -0
  179. package/src/metrics/metrics-usage-headers.ts +24 -0
  180. package/src/metrics/send-event.ts +98 -0
  181. package/src/miniflare-cli/assets.ts +251 -0
  182. package/src/miniflare-cli/index.ts +202 -33
  183. package/src/miniflare-cli/request-context.ts +18 -18
  184. package/src/miniflare-cli/tsconfig.json +9 -0
  185. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  186. package/src/miniflare-cli/types.ts +11 -0
  187. package/src/module-collection.ts +221 -212
  188. package/src/mtls-certificate/cli.ts +155 -0
  189. package/src/open-in-browser.ts +4 -6
  190. package/src/package-manager.ts +173 -128
  191. package/src/pages/build.ts +410 -0
  192. package/src/pages/buildFunctions.ts +140 -0
  193. package/src/pages/constants.ts +18 -0
  194. package/src/pages/deployment-tails.ts +281 -0
  195. package/src/pages/deployments.tsx +86 -0
  196. package/src/pages/dev.ts +716 -0
  197. package/src/pages/errors.ts +67 -0
  198. package/src/pages/functions/buildPlugin.ts +112 -0
  199. package/src/pages/functions/buildWorker.ts +297 -0
  200. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  201. package/src/pages/functions/filepath-routing.ts +189 -0
  202. package/src/pages/functions/identifiers.ts +78 -0
  203. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  204. package/src/pages/functions/routes-consolidation.ts +73 -0
  205. package/src/pages/functions/routes-transformation.test.ts +282 -0
  206. package/src/pages/functions/routes-transformation.ts +115 -0
  207. package/src/pages/functions/routes-validation.test.ts +403 -0
  208. package/src/pages/functions/routes-validation.ts +202 -0
  209. package/src/pages/functions/routes.ts +151 -0
  210. package/src/pages/functions/tsconfig.json +8 -0
  211. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  212. package/src/pages/functions.ts +86 -0
  213. package/src/pages/hash.ts +13 -0
  214. package/src/pages/index.ts +102 -0
  215. package/src/pages/projects.tsx +162 -0
  216. package/src/pages/prompt-select-project.tsx +31 -0
  217. package/src/pages/publish.tsx +267 -0
  218. package/src/pages/types.ts +46 -0
  219. package/src/pages/upload.tsx +449 -0
  220. package/src/pages/utils.ts +23 -0
  221. package/src/parse.ts +232 -126
  222. package/src/paths.ts +53 -8
  223. package/src/proxy.ts +623 -407
  224. package/src/publish/index.ts +274 -0
  225. package/src/publish/publish.ts +1076 -0
  226. package/src/pubsub/index.ts +286 -0
  227. package/src/pubsub/pubsub-commands.ts +623 -0
  228. package/src/queues/cli/commands/consumer/add.ts +65 -0
  229. package/src/queues/cli/commands/consumer/index.ts +19 -0
  230. package/src/queues/cli/commands/consumer/remove.ts +31 -0
  231. package/src/queues/cli/commands/create.ts +25 -0
  232. package/src/queues/cli/commands/delete.ts +26 -0
  233. package/src/queues/cli/commands/index.ts +35 -0
  234. package/src/queues/cli/commands/list.ts +25 -0
  235. package/src/queues/client.ts +135 -0
  236. package/src/queues/utils.ts +18 -0
  237. package/src/r2/constants.ts +4 -0
  238. package/src/r2/helpers.ts +132 -0
  239. package/src/r2/index.ts +289 -0
  240. package/src/routes.ts +140 -0
  241. package/src/secret/index.ts +375 -0
  242. package/src/selfsigned.d.ts +23 -23
  243. package/src/sites.ts +372 -0
  244. package/src/tail/createTail.ts +406 -0
  245. package/src/tail/filters.ts +109 -111
  246. package/src/tail/index.ts +208 -296
  247. package/src/tail/printing.ts +101 -46
  248. package/src/tsconfig-sanity.ts +16 -0
  249. package/src/type-generation.ts +181 -0
  250. package/src/update-check.ts +11 -11
  251. package/src/user/access.ts +68 -0
  252. package/src/user/auth-variables.ts +113 -0
  253. package/src/user/choose-account.tsx +39 -0
  254. package/src/user/generate-auth-url.ts +33 -0
  255. package/src/user/generate-random-state.ts +16 -0
  256. package/src/user/index.ts +2 -0
  257. package/src/user/user.ts +1233 -0
  258. package/src/utils/collectKeyValues.ts +14 -0
  259. package/src/whoami.ts +135 -0
  260. package/src/worker.ts +190 -107
  261. package/src/yargs-types.ts +37 -0
  262. package/src/zones.ts +158 -40
  263. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  264. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  265. package/templates/__tests__/tsconfig.json +8 -0
  266. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  267. package/templates/checked-fetch.js +23 -0
  268. package/templates/d1-beta-facade.js +244 -0
  269. package/templates/facade.d.ts +14 -0
  270. package/templates/first-party-worker-module-facade.ts +19 -0
  271. package/templates/format-dev-errors.ts +34 -0
  272. package/templates/gitignore +1 -0
  273. package/templates/init-tests/test-jest-new-worker.js +23 -0
  274. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  275. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  276. package/templates/middleware/common.ts +62 -0
  277. package/templates/middleware/loader-modules.ts +84 -0
  278. package/templates/middleware/loader-sw.ts +233 -0
  279. package/templates/middleware/middleware-miniflare3-json-error.ts +32 -0
  280. package/templates/middleware/middleware-pretty-error.ts +40 -0
  281. package/templates/middleware/middleware-scheduled.ts +15 -0
  282. package/templates/new-worker-scheduled.js +3 -3
  283. package/templates/new-worker-scheduled.ts +15 -15
  284. package/templates/new-worker.js +3 -3
  285. package/templates/new-worker.ts +18 -15
  286. package/templates/no-op-worker.js +10 -0
  287. package/templates/pages-dev-pipeline.ts +31 -0
  288. package/templates/pages-dev-util.ts +52 -0
  289. package/templates/pages-shim.ts +12 -0
  290. package/templates/pages-template-plugin.ts +180 -0
  291. package/templates/pages-template-worker.ts +189 -0
  292. package/templates/serve-static-assets.ts +66 -0
  293. package/templates/service-bindings-module-facade.js +55 -0
  294. package/templates/service-bindings-sw-facade.js +42 -0
  295. package/templates/tsconfig-sanity.ts +11 -0
  296. package/templates/tsconfig.init.json +105 -0
  297. package/templates/tsconfig.json +6 -103
  298. package/templates/tsconfig.tsbuildinfo +1 -0
  299. package/wrangler-dist/cli.d.ts +1617 -0
  300. package/wrangler-dist/cli.js +137866 -111950
  301. package/wrangler-dist/wasm-sync.wasm +0 -0
  302. package/pages/functions/buildPlugin.ts +0 -105
  303. package/pages/functions/buildWorker.ts +0 -151
  304. package/pages/functions/filepath-routing.ts +0 -189
  305. package/pages/functions/identifiers.ts +0 -78
  306. package/pages/functions/routes.ts +0 -156
  307. package/pages/functions/template-plugin.ts +0 -147
  308. package/pages/functions/template-worker.ts +0 -143
  309. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  310. package/src/__tests__/helpers/mock-cfetch.ts +0 -211
  311. package/src/__tests__/pages.test.ts +0 -754
  312. package/src/dialogs.tsx +0 -135
  313. package/src/environment-variables.ts +0 -35
  314. package/src/index.tsx +0 -2846
  315. package/src/kv.ts +0 -408
  316. package/src/miniflare-cli/enum-keys.ts +0 -17
  317. package/src/pages.tsx +0 -2093
  318. package/src/publish.ts +0 -716
  319. package/src/r2.ts +0 -50
  320. package/src/sites.tsx +0 -326
  321. package/src/user.tsx +0 -1214
  322. package/src/whoami.tsx +0 -71
  323. package/templates/static-asset-facade.js +0 -43
@@ -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
+ }
@@ -0,0 +1,403 @@
1
+ import { FatalError } from "../../errors";
2
+ import {
3
+ MAX_FUNCTIONS_ROUTES_RULES,
4
+ MAX_FUNCTIONS_ROUTES_RULE_LENGTH,
5
+ ROUTES_SPEC_VERSION,
6
+ } from "../constants";
7
+ import { getRoutesValidationErrorMessage } from "../errors";
8
+ import {
9
+ isRoutesJSONSpec,
10
+ RoutesValidationError,
11
+ validateRoutes,
12
+ } from "./routes-validation";
13
+ import type { RoutesJSONSpec } from "./routes-transformation";
14
+
15
+ describe("routes-validation", () => {
16
+ describe("isRoutesJSONSpec", () => {
17
+ it("should return true if the given routes are in a valid RoutesJSONSpec format", () => {
18
+ const routes = {
19
+ version: ROUTES_SPEC_VERSION,
20
+ description: "Test routes Object",
21
+ include: [],
22
+ exclude: [],
23
+ };
24
+ const routesWithoutDescription = {
25
+ version: ROUTES_SPEC_VERSION,
26
+ include: [],
27
+ exclude: [],
28
+ };
29
+
30
+ expect(isRoutesJSONSpec(routes)).toBeTruthy();
31
+ expect(isRoutesJSONSpec(routesWithoutDescription)).toBeTruthy();
32
+ });
33
+
34
+ it("should return false otherwise", () => {
35
+ const routesWithMissingVersion = {
36
+ include: [],
37
+ exclude: [],
38
+ };
39
+ const routesWithIncorrectVersionNumber = {
40
+ version: 1000,
41
+ include: [],
42
+ exclude: [],
43
+ };
44
+ const routesWithIncorrectVersionType = {
45
+ version: "1000",
46
+ include: [],
47
+ exclude: [],
48
+ };
49
+ const routesWithMissingInclude = {
50
+ version: ROUTES_SPEC_VERSION,
51
+ exclude: [],
52
+ };
53
+ const routesWithMissingExclude = {
54
+ version: ROUTES_SPEC_VERSION,
55
+ include: [],
56
+ };
57
+ const routesWithIncorrectIncludeType = {
58
+ version: ROUTES_SPEC_VERSION,
59
+ include: "[]",
60
+ exclude: [],
61
+ };
62
+ const routesWithIncorrectExcludeType = {
63
+ version: ROUTES_SPEC_VERSION,
64
+ include: [],
65
+ exclude: { route: "/hello" },
66
+ };
67
+
68
+ expect(isRoutesJSONSpec(null)).toBeFalsy();
69
+ expect(isRoutesJSONSpec({})).toBeFalsy();
70
+ expect(isRoutesJSONSpec([])).toBeFalsy();
71
+ expect(isRoutesJSONSpec(routesWithMissingVersion)).toBeFalsy();
72
+ expect(isRoutesJSONSpec(routesWithIncorrectVersionNumber)).toBeFalsy();
73
+ expect(isRoutesJSONSpec(routesWithIncorrectVersionType)).toBeFalsy();
74
+ expect(isRoutesJSONSpec(routesWithMissingInclude)).toBeFalsy();
75
+ expect(isRoutesJSONSpec(routesWithMissingExclude)).toBeFalsy();
76
+ expect(isRoutesJSONSpec(routesWithIncorrectIncludeType)).toBeFalsy();
77
+ expect(isRoutesJSONSpec(routesWithIncorrectExcludeType)).toBeFalsy();
78
+ });
79
+ });
80
+
81
+ describe("validateRoutes", () => {
82
+ const testRoutesPath = "/public";
83
+
84
+ const generateUniqueRoutingRules = (count: number): string[] => {
85
+ let counter = 0;
86
+ return Array(count)
87
+ .fill("/abc")
88
+ .map((route) => `${route}${counter++}`);
89
+ };
90
+
91
+ const generateRoutingRule = (charCount: number): string => {
92
+ return `/${Array(charCount).fill("a").join("")}`;
93
+ };
94
+
95
+ it("should return if the given routes are valid", () => {
96
+ const routes: RoutesJSONSpec = {
97
+ version: ROUTES_SPEC_VERSION,
98
+ description: "Test routes Object",
99
+ include: ["/*"],
100
+ exclude: [],
101
+ };
102
+ const routesWithoutDescription: RoutesJSONSpec = {
103
+ version: ROUTES_SPEC_VERSION,
104
+ include: ["/hello"],
105
+ exclude: [],
106
+ };
107
+
108
+ expect(() => validateRoutes(routes, testRoutesPath)).not.toThrow();
109
+ expect(() =>
110
+ validateRoutes(routesWithoutDescription, testRoutesPath)
111
+ ).not.toThrow();
112
+ });
113
+
114
+ it("should throw a fatal error if the routes are not a valid RoutesJSONSpec object", () => {
115
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
116
+ // @ts-ignore: sanity check
117
+ const routesWithoutVersion: RoutesJSONSpec = {
118
+ include: ["/*"],
119
+ exclude: [],
120
+ };
121
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
122
+ // @ts-ignore: sanity check
123
+ const routesWithoutInclude: RoutesJSONSpec = {
124
+ version: ROUTES_SPEC_VERSION,
125
+ exclude: [],
126
+ };
127
+
128
+ expect(() =>
129
+ // wrap the code in a function, otherwise the error will not be caught
130
+ // and the assertion will fail
131
+ validateRoutes(routesWithoutVersion, testRoutesPath)
132
+ ).toThrow(FatalError);
133
+ expect(() =>
134
+ validateRoutes(routesWithoutVersion, testRoutesPath)
135
+ ).toThrow(
136
+ getRoutesValidationErrorMessage(
137
+ RoutesValidationError.INVALID_JSON_SPEC,
138
+ testRoutesPath
139
+ )
140
+ );
141
+
142
+ expect(() =>
143
+ validateRoutes(routesWithoutInclude, testRoutesPath)
144
+ ).toThrow(FatalError);
145
+ expect(() =>
146
+ validateRoutes(routesWithoutInclude, testRoutesPath)
147
+ ).toThrow(
148
+ getRoutesValidationErrorMessage(
149
+ RoutesValidationError.INVALID_JSON_SPEC,
150
+ testRoutesPath
151
+ )
152
+ );
153
+ });
154
+
155
+ it("should throw a fatal error if there are no include routing rules", () => {
156
+ const routesWithoutIncludeRules: RoutesJSONSpec = {
157
+ version: ROUTES_SPEC_VERSION,
158
+ description: "Test routes Object",
159
+ include: [],
160
+ exclude: [],
161
+ };
162
+
163
+ expect(() =>
164
+ validateRoutes(routesWithoutIncludeRules, testRoutesPath)
165
+ ).toThrow(FatalError);
166
+ expect(() =>
167
+ validateRoutes(routesWithoutIncludeRules, testRoutesPath)
168
+ ).toThrow(
169
+ getRoutesValidationErrorMessage(
170
+ RoutesValidationError.NO_INCLUDE_RULES,
171
+ testRoutesPath
172
+ )
173
+ );
174
+ });
175
+
176
+ it("should throw a fatal error if there are more than MAX_FUNCTIONS_ROUTES_RULES include and exclude routing rules combined", () => {
177
+ const routesWithMaxIncludeRules: RoutesJSONSpec = {
178
+ version: ROUTES_SPEC_VERSION,
179
+ description: "Test routes Object",
180
+ include: generateUniqueRoutingRules(MAX_FUNCTIONS_ROUTES_RULES + 1),
181
+ exclude: [],
182
+ };
183
+ const routesWithMaxExcludeRules: RoutesJSONSpec = {
184
+ version: ROUTES_SPEC_VERSION,
185
+ description: "Test routes Object",
186
+ include: ["/hello"],
187
+ exclude: generateUniqueRoutingRules(MAX_FUNCTIONS_ROUTES_RULES + 1),
188
+ };
189
+ const routesWithMaxIncludeExcludeRulesCombined: RoutesJSONSpec = {
190
+ version: ROUTES_SPEC_VERSION,
191
+ description: "Test routes Object",
192
+ include: generateUniqueRoutingRules(
193
+ Math.floor(MAX_FUNCTIONS_ROUTES_RULES / 2) + 1
194
+ ),
195
+ exclude: generateUniqueRoutingRules(
196
+ Math.floor(MAX_FUNCTIONS_ROUTES_RULES / 2)
197
+ ),
198
+ };
199
+
200
+ expect(() =>
201
+ validateRoutes(routesWithMaxIncludeRules, testRoutesPath)
202
+ ).toThrow(FatalError);
203
+ expect(() =>
204
+ validateRoutes(routesWithMaxIncludeRules, testRoutesPath)
205
+ ).toThrow(
206
+ getRoutesValidationErrorMessage(
207
+ RoutesValidationError.TOO_MANY_RULES,
208
+ testRoutesPath
209
+ )
210
+ );
211
+
212
+ expect(() =>
213
+ validateRoutes(routesWithMaxExcludeRules, testRoutesPath)
214
+ ).toThrow(FatalError);
215
+ expect(() =>
216
+ validateRoutes(routesWithMaxExcludeRules, testRoutesPath)
217
+ ).toThrow(
218
+ getRoutesValidationErrorMessage(
219
+ RoutesValidationError.TOO_MANY_RULES,
220
+ testRoutesPath
221
+ )
222
+ );
223
+
224
+ expect(() =>
225
+ validateRoutes(routesWithMaxIncludeExcludeRulesCombined, testRoutesPath)
226
+ ).toThrow(FatalError);
227
+ expect(() =>
228
+ validateRoutes(routesWithMaxIncludeExcludeRulesCombined, testRoutesPath)
229
+ ).toThrow(
230
+ getRoutesValidationErrorMessage(
231
+ RoutesValidationError.TOO_MANY_RULES,
232
+ testRoutesPath
233
+ )
234
+ );
235
+ });
236
+
237
+ it("should throw a fatal error if any include or exclude routing rule is more than MAX_FUNCTIONS_ROUTES_RULE_LENGTH chars long", () => {
238
+ const routesWithMaxCharLengthIncludeRules: RoutesJSONSpec = {
239
+ version: ROUTES_SPEC_VERSION,
240
+ description: "Test routes Object",
241
+ include: [generateRoutingRule(MAX_FUNCTIONS_ROUTES_RULE_LENGTH + 1)],
242
+ exclude: [],
243
+ };
244
+ const routesWithMaxCharLengthExcludeRules: RoutesJSONSpec = {
245
+ version: ROUTES_SPEC_VERSION,
246
+ description: "Test routes Object",
247
+ include: ["/*"],
248
+ exclude: [generateRoutingRule(MAX_FUNCTIONS_ROUTES_RULE_LENGTH + 1)],
249
+ };
250
+ const routesWithMaxCharLengthRules: RoutesJSONSpec = {
251
+ version: ROUTES_SPEC_VERSION,
252
+ description: "Test routes Object",
253
+ include: [generateRoutingRule(MAX_FUNCTIONS_ROUTES_RULE_LENGTH + 1)],
254
+ exclude: [generateRoutingRule(MAX_FUNCTIONS_ROUTES_RULE_LENGTH + 1)],
255
+ };
256
+
257
+ expect(() =>
258
+ validateRoutes(routesWithMaxCharLengthIncludeRules, testRoutesPath)
259
+ ).toThrow(FatalError);
260
+ expect(() =>
261
+ validateRoutes(routesWithMaxCharLengthIncludeRules, testRoutesPath)
262
+ ).toThrow(
263
+ getRoutesValidationErrorMessage(
264
+ RoutesValidationError.RULE_TOO_LONG,
265
+ testRoutesPath
266
+ )
267
+ );
268
+
269
+ expect(() =>
270
+ validateRoutes(routesWithMaxCharLengthExcludeRules, testRoutesPath)
271
+ ).toThrow(FatalError);
272
+ expect(() =>
273
+ validateRoutes(routesWithMaxCharLengthExcludeRules, testRoutesPath)
274
+ ).toThrow(
275
+ getRoutesValidationErrorMessage(
276
+ RoutesValidationError.RULE_TOO_LONG,
277
+ testRoutesPath
278
+ )
279
+ );
280
+
281
+ expect(() =>
282
+ validateRoutes(routesWithMaxCharLengthRules, testRoutesPath)
283
+ ).toThrow(FatalError);
284
+ expect(() =>
285
+ validateRoutes(routesWithMaxCharLengthRules, testRoutesPath)
286
+ ).toThrow(
287
+ getRoutesValidationErrorMessage(
288
+ RoutesValidationError.RULE_TOO_LONG,
289
+ testRoutesPath
290
+ )
291
+ );
292
+ });
293
+
294
+ it("should throw a fatal error if any include or exclude routing rule does not start with a `/`", () => {
295
+ const routesWithInvalidIncludeRules: RoutesJSONSpec = {
296
+ version: ROUTES_SPEC_VERSION,
297
+ description: "Test routes Object",
298
+ include: ["hello"],
299
+ exclude: [],
300
+ };
301
+ const routesWithInvalidExcludeRules: RoutesJSONSpec = {
302
+ version: ROUTES_SPEC_VERSION,
303
+ description: "Test routes Object",
304
+ include: ["/*"],
305
+ exclude: ["hello"],
306
+ };
307
+ const routesWithInvalidRules: RoutesJSONSpec = {
308
+ version: ROUTES_SPEC_VERSION,
309
+ description: "Test routes Object",
310
+ include: ["hello"],
311
+ exclude: ["goodbye"],
312
+ };
313
+
314
+ expect(() =>
315
+ validateRoutes(routesWithInvalidIncludeRules, testRoutesPath)
316
+ ).toThrow(FatalError);
317
+ expect(() =>
318
+ validateRoutes(routesWithInvalidIncludeRules, testRoutesPath)
319
+ ).toThrow(
320
+ getRoutesValidationErrorMessage(
321
+ RoutesValidationError.INVALID_RULES,
322
+ testRoutesPath
323
+ )
324
+ );
325
+
326
+ expect(() =>
327
+ validateRoutes(routesWithInvalidExcludeRules, testRoutesPath)
328
+ ).toThrow(FatalError);
329
+ expect(() =>
330
+ validateRoutes(routesWithInvalidExcludeRules, testRoutesPath)
331
+ ).toThrow(
332
+ getRoutesValidationErrorMessage(
333
+ RoutesValidationError.INVALID_RULES,
334
+ testRoutesPath
335
+ )
336
+ );
337
+
338
+ expect(() =>
339
+ validateRoutes(routesWithInvalidRules, testRoutesPath)
340
+ ).toThrow(FatalError);
341
+ expect(() =>
342
+ validateRoutes(routesWithInvalidRules, testRoutesPath)
343
+ ).toThrow(
344
+ getRoutesValidationErrorMessage(
345
+ RoutesValidationError.INVALID_RULES,
346
+ testRoutesPath
347
+ )
348
+ );
349
+ });
350
+
351
+ it("should throw a fatal error if there are overlapping include rules or overlapping exclude rules", () => {
352
+ const routesWithOverlappingIncludeRules: RoutesJSONSpec = {
353
+ version: ROUTES_SPEC_VERSION,
354
+ include: [
355
+ "/greeting/hello",
356
+ "/api/time",
357
+ "/date",
358
+ "/greeting/*",
359
+ "/greeting/goodbye",
360
+ "/api/*",
361
+ ],
362
+ exclude: [],
363
+ };
364
+ const routesWithOverlappingExcludeRules: RoutesJSONSpec = {
365
+ version: ROUTES_SPEC_VERSION,
366
+ include: ["/hello"],
367
+ exclude: [
368
+ "/greeting/hello",
369
+ "/api/time",
370
+ "/date",
371
+ "/*",
372
+ "/greeting/*",
373
+ "/greeting/goodbye",
374
+ "/api/*",
375
+ ],
376
+ };
377
+
378
+ expect(() =>
379
+ validateRoutes(routesWithOverlappingIncludeRules, testRoutesPath)
380
+ ).toThrow(FatalError);
381
+ expect(() =>
382
+ validateRoutes(routesWithOverlappingIncludeRules, testRoutesPath)
383
+ ).toThrow(
384
+ getRoutesValidationErrorMessage(
385
+ RoutesValidationError.OVERLAPPING_RULES,
386
+ testRoutesPath
387
+ )
388
+ );
389
+
390
+ expect(() =>
391
+ validateRoutes(routesWithOverlappingExcludeRules, testRoutesPath)
392
+ ).toThrow(FatalError);
393
+ expect(() =>
394
+ validateRoutes(routesWithOverlappingExcludeRules, testRoutesPath)
395
+ ).toThrow(
396
+ getRoutesValidationErrorMessage(
397
+ RoutesValidationError.OVERLAPPING_RULES,
398
+ testRoutesPath
399
+ )
400
+ );
401
+ });
402
+ });
403
+ });
@@ -0,0 +1,202 @@
1
+ import { FatalError } from "../../errors";
2
+ import {
3
+ MAX_FUNCTIONS_ROUTES_RULES,
4
+ MAX_FUNCTIONS_ROUTES_RULE_LENGTH,
5
+ ROUTES_SPEC_VERSION,
6
+ } from "../constants";
7
+ import { getRoutesValidationErrorMessage } from "../errors";
8
+ import type { RoutesJSONSpec } from "./routes-transformation";
9
+
10
+ /* eslint-disable-next-line no-shadow */
11
+ export enum RoutesValidationError {
12
+ INVALID_JSON_SPEC,
13
+ NO_INCLUDE_RULES,
14
+ INVALID_RULES,
15
+ TOO_MANY_RULES,
16
+ RULE_TOO_LONG,
17
+ OVERLAPPING_RULES,
18
+ }
19
+
20
+ /**
21
+ * Check if given routes data is a valid RoutesJSONSpec
22
+ */
23
+ export function isRoutesJSONSpec(data: unknown): data is RoutesJSONSpec {
24
+ return (
25
+ (typeof data === "object" &&
26
+ data &&
27
+ "version" in data &&
28
+ typeof (data as RoutesJSONSpec).version === "number" &&
29
+ (data as RoutesJSONSpec).version === ROUTES_SPEC_VERSION &&
30
+ Array.isArray((data as RoutesJSONSpec).include) &&
31
+ Array.isArray((data as RoutesJSONSpec).exclude)) ||
32
+ false
33
+ );
34
+ }
35
+
36
+ export function validateRoutes(routesJSON: RoutesJSONSpec, routesPath: string) {
37
+ if (!isRoutesJSONSpec(routesJSON)) {
38
+ throw new FatalError(
39
+ getRoutesValidationErrorMessage(
40
+ RoutesValidationError.INVALID_JSON_SPEC,
41
+ routesPath
42
+ ),
43
+ 1
44
+ );
45
+ }
46
+
47
+ if (!hasIncludeRules(routesJSON)) {
48
+ throw new FatalError(
49
+ getRoutesValidationErrorMessage(
50
+ RoutesValidationError.NO_INCLUDE_RULES,
51
+ routesPath
52
+ ),
53
+ 1
54
+ );
55
+ }
56
+
57
+ if (!hasValidRulesCount(routesJSON)) {
58
+ throw new FatalError(
59
+ getRoutesValidationErrorMessage(
60
+ RoutesValidationError.TOO_MANY_RULES,
61
+ routesPath
62
+ ),
63
+ 1
64
+ );
65
+ }
66
+
67
+ if (!hasValidRuleCharCount(routesJSON)) {
68
+ throw new FatalError(
69
+ getRoutesValidationErrorMessage(
70
+ RoutesValidationError.RULE_TOO_LONG,
71
+ routesPath
72
+ ),
73
+ 1
74
+ );
75
+ }
76
+
77
+ if (!hasValidRules(routesJSON)) {
78
+ throw new FatalError(
79
+ getRoutesValidationErrorMessage(
80
+ RoutesValidationError.INVALID_RULES,
81
+ routesPath
82
+ ),
83
+ 1
84
+ );
85
+ }
86
+
87
+ if (
88
+ hasOverlappingRules(routesJSON.include) ||
89
+ hasOverlappingRules(routesJSON.exclude)
90
+ ) {
91
+ throw new FatalError(
92
+ getRoutesValidationErrorMessage(
93
+ RoutesValidationError.OVERLAPPING_RULES,
94
+ routesPath
95
+ ),
96
+ 1
97
+ );
98
+ }
99
+ }
100
+
101
+ /**
102
+ * Returns true if the given `routingSpec` object contains at least
103
+ * `MIN_FUNCTIONS_ROUTES_INCLUDE_RULES` include routing rules
104
+ */
105
+ function hasIncludeRules(routesJSON: RoutesJSONSpec): boolean {
106
+ // sanity check
107
+ // this should never be the case, because of the context from which these validation fns are
108
+ // called, but let's not assume anything
109
+ if (!routesJSON || !routesJSON.include) {
110
+ throw new Error(
111
+ "Function `hasIncludeRules` was called out of context. Attempting to validate include rules for routes that are undefined or an invalid RoutesJSONSpec"
112
+ );
113
+ }
114
+
115
+ return routesJSON?.include?.length > 0;
116
+ }
117
+
118
+ /**
119
+ * Returns true if the given `routesJSON` object contains at most MAX_FUNCTIONS_ROUTES_RULES
120
+ * include and exclude routing rules, combined
121
+ */
122
+ function hasValidRulesCount(routesJSON: RoutesJSONSpec): boolean {
123
+ // sanity check
124
+ if (!routesJSON || !routesJSON.include || !routesJSON.exclude) {
125
+ throw new Error(
126
+ "Function `hasValidRulesCount` was called out of context. Attempting to validate maximum rules count for routes that are undefined or an invalid RoutesJSONSpec"
127
+ );
128
+ }
129
+
130
+ return (
131
+ routesJSON.include.length + routesJSON.exclude.length <=
132
+ MAX_FUNCTIONS_ROUTES_RULES
133
+ );
134
+ }
135
+
136
+ /**
137
+ * Returns true if each individual routing rule of the given `routesJSON` object is at most
138
+ * MAX_FUNCTIONS_ROUTES_RULE_LENGTH characters long
139
+ */
140
+ function hasValidRuleCharCount(routesJSON: RoutesJSONSpec): boolean {
141
+ // sanity check
142
+ if (!routesJSON || !routesJSON.include || !routesJSON.exclude) {
143
+ throw new Error(
144
+ "Function `hasValidRuleCharCount` was called out of context. Attempting to validate rules maximum character count for routes that are undefined or an invalid RoutesJSONSpec"
145
+ );
146
+ }
147
+
148
+ const rules = [...routesJSON.include, ...routesJSON.exclude];
149
+ return (
150
+ rules.filter((rule) => rule.length > MAX_FUNCTIONS_ROUTES_RULE_LENGTH)
151
+ .length === 0
152
+ );
153
+ }
154
+
155
+ /**
156
+ * Returns true if each individual routing rule of the given `routesJSON` object is valid.
157
+ * We consider a rule to be valid if it is prefixed by slash ('/')
158
+ */
159
+ function hasValidRules(routesJSON: RoutesJSONSpec): boolean {
160
+ // sanity check
161
+ if (!routesJSON || !routesJSON.include || !routesJSON.exclude) {
162
+ throw new Error(
163
+ "Function `hasValidRules` was called out of context. Attempting to validate rules for routes that are undefined or an invalid RoutesJSONSpec"
164
+ );
165
+ }
166
+
167
+ const rules = [...routesJSON.include, ...routesJSON.exclude];
168
+ return rules.filter((rule) => !rule.match(/^\//)).length === 0;
169
+ }
170
+
171
+ /**
172
+ * Returns true if the given routes array has overlapping routing rules (eg. ["/api/*"", "/api/foo"])
173
+ *
174
+ * based on `consolidateRoutes()`
175
+ * 🚨 O(n2) time complexity 🚨
176
+ */
177
+ function hasOverlappingRules(routes: string[]): boolean {
178
+ if (!routes) {
179
+ throw new Error(
180
+ "Function `hasverlappingRules` was called out of context. Attempting to validate rules for routes that are undefined"
181
+ );
182
+ }
183
+
184
+ // Find routes that might render other routes redundant
185
+ const endingSplatRoutes = routes.filter((route) => route.endsWith("/*"));
186
+
187
+ for (let i = 0; i < endingSplatRoutes.length; i++) {
188
+ const crrRoute = endingSplatRoutes[i];
189
+ // Remove splat at the end, leaving the /
190
+ // eg. /api/* -> /api/
191
+ const crrRouteTrimmed = crrRoute.substring(0, crrRoute.length - 1);
192
+
193
+ for (let j = 0; j < routes.length; j++) {
194
+ const nextRoute = routes[j];
195
+ if (nextRoute !== crrRoute && nextRoute.startsWith(crrRouteTrimmed)) {
196
+ return true;
197
+ }
198
+ }
199
+ }
200
+
201
+ return false;
202
+ }