wrangler 0.0.0-e5a3814 → 0.0.0-e60dc909

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 (302) hide show
  1. package/README.md +23 -3
  2. package/bin/wrangler.js +170 -62
  3. package/kv-asset-handler.js +1 -0
  4. package/miniflare-dist/index.mjs +1499 -21
  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 +4152 -3476
  13. package/src/__tests__/d1/d1.test.ts +123 -0
  14. package/src/__tests__/d1/splitter.test.ts +255 -0
  15. package/src/__tests__/delete.test.ts +266 -0
  16. package/src/__tests__/deployments.test.ts +105 -0
  17. package/src/__tests__/dev.test.tsx +1559 -956
  18. package/src/__tests__/generate.test.ts +238 -0
  19. package/src/__tests__/get-host-from-url.test.ts +16 -0
  20. package/src/__tests__/guess-worker-format.test.ts +68 -68
  21. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  22. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  23. package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
  24. package/src/__tests__/helpers/mock-bin.ts +20 -20
  25. package/src/__tests__/helpers/mock-cfetch.ts +167 -100
  26. package/src/__tests__/helpers/mock-console.ts +58 -39
  27. package/src/__tests__/helpers/mock-dialogs.ts +88 -81
  28. package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -0
  29. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  30. package/src/__tests__/helpers/mock-istty.ts +65 -18
  31. package/src/__tests__/helpers/mock-known-routes.ts +7 -0
  32. package/src/__tests__/helpers/mock-kv.ts +27 -27
  33. package/src/__tests__/helpers/mock-oauth-flow.ts +244 -228
  34. package/src/__tests__/helpers/mock-process.ts +34 -0
  35. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  36. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  37. package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
  38. package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
  39. package/src/__tests__/helpers/msw/handlers/deployments.ts +59 -0
  40. package/src/__tests__/helpers/msw/handlers/namespaces.ts +104 -0
  41. package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -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/msw/read-file-sync.js +61 -0
  48. package/src/__tests__/helpers/run-in-tmp.ts +27 -28
  49. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  50. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
  51. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
  52. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
  53. package/src/__tests__/helpers/worker-scripts/parent-worker.js +8 -0
  54. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
  55. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  56. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  57. package/src/__tests__/https-options.test.ts +142 -109
  58. package/src/__tests__/index.test.ts +245 -234
  59. package/src/__tests__/init.test.ts +3146 -1608
  60. package/src/__tests__/jest.setup.ts +167 -46
  61. package/src/__tests__/kv.test.ts +1778 -1471
  62. package/src/__tests__/logger.test.ts +100 -74
  63. package/src/__tests__/logout.test.ts +47 -0
  64. package/src/__tests__/metrics.test.ts +493 -0
  65. package/src/__tests__/middleware.scheduled.test.ts +145 -0
  66. package/src/__tests__/middleware.test.ts +750 -0
  67. package/src/__tests__/package-manager.test.ts +303 -303
  68. package/src/__tests__/pages-deployment-tail.test.ts +884 -0
  69. package/src/__tests__/pages.test.ts +2888 -743
  70. package/src/__tests__/parse.test.ts +252 -252
  71. package/src/__tests__/paths.test.ts +39 -0
  72. package/src/__tests__/publish.test.ts +7641 -5626
  73. package/src/__tests__/pubsub.test.ts +490 -0
  74. package/src/__tests__/queues.test.ts +522 -0
  75. package/src/__tests__/r2.test.ts +388 -228
  76. package/src/__tests__/route.test.ts +18 -18
  77. package/src/__tests__/secret.test.ts +689 -469
  78. package/src/__tests__/tail.test.ts +782 -567
  79. package/src/__tests__/test-old-node-version.js +31 -0
  80. package/src/__tests__/tsconfig-sanity.ts +12 -0
  81. package/src/__tests__/tsconfig.json +8 -0
  82. package/src/__tests__/tsconfig.tsbuildinfo +1 -0
  83. package/src/__tests__/type-generation.test.ts +233 -0
  84. package/src/__tests__/user.test.ts +117 -119
  85. package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
  86. package/src/__tests__/validate-dev-props.test.ts +56 -0
  87. package/src/__tests__/version.test.ts +35 -0
  88. package/src/__tests__/whoami.test.tsx +176 -132
  89. package/src/__tests__/worker-namespace.test.ts +326 -0
  90. package/src/abort.d.ts +1 -1
  91. package/src/api/dev.ts +247 -0
  92. package/src/api/index.ts +2 -0
  93. package/src/bundle-reporter.ts +68 -0
  94. package/src/bundle.ts +785 -159
  95. package/src/cfetch/index.ts +120 -83
  96. package/src/cfetch/internal.ts +211 -92
  97. package/src/cli.ts +23 -8
  98. package/src/config/config.ts +236 -195
  99. package/src/config/diagnostics.ts +61 -61
  100. package/src/config/environment.ts +514 -357
  101. package/src/config/index.ts +326 -193
  102. package/src/config/validation-helpers.ts +379 -366
  103. package/src/config/validation.ts +1979 -1380
  104. package/src/config-cache.ts +81 -41
  105. package/src/create-worker-preview.ts +239 -142
  106. package/src/create-worker-upload-form.ts +309 -238
  107. package/src/d1/backups.tsx +223 -0
  108. package/src/d1/constants.ts +2 -0
  109. package/src/d1/create.tsx +63 -0
  110. package/src/d1/delete.ts +56 -0
  111. package/src/d1/execute.tsx +323 -0
  112. package/src/d1/formatTimeAgo.ts +14 -0
  113. package/src/d1/index.ts +101 -0
  114. package/src/d1/list.tsx +48 -0
  115. package/src/d1/migrations/apply.tsx +197 -0
  116. package/src/d1/migrations/create.tsx +77 -0
  117. package/src/d1/migrations/helpers.ts +147 -0
  118. package/src/d1/migrations/index.ts +3 -0
  119. package/src/d1/migrations/list.tsx +79 -0
  120. package/src/d1/migrations/options.ts +18 -0
  121. package/src/d1/options.ts +22 -0
  122. package/src/d1/splitter.ts +161 -0
  123. package/src/d1/types.ts +24 -0
  124. package/src/d1/utils.ts +48 -0
  125. package/src/delete.ts +103 -0
  126. package/src/deployments.ts +83 -0
  127. package/src/deprecated/index.ts +145 -0
  128. package/src/dev/dev-vars.ts +20 -17
  129. package/src/dev/dev.tsx +546 -333
  130. package/src/dev/get-local-persistence-path.ts +31 -0
  131. package/src/dev/local.tsx +912 -302
  132. package/src/dev/remote.tsx +618 -225
  133. package/src/dev/start-server.ts +543 -0
  134. package/src/dev/use-esbuild.ts +183 -97
  135. package/src/dev/validate-dev-props.ts +31 -0
  136. package/src/dev-registry.ts +201 -0
  137. package/src/dev.tsx +949 -0
  138. package/src/dialogs.ts +136 -0
  139. package/src/dispatch-namespace.ts +207 -0
  140. package/src/docs/index.ts +97 -0
  141. package/src/durable.ts +87 -87
  142. package/src/entry.ts +235 -228
  143. package/src/environment-variables/factory.ts +88 -0
  144. package/src/environment-variables/misc-variables.ts +30 -0
  145. package/src/errors.ts +6 -6
  146. package/src/generate/index.ts +300 -0
  147. package/src/git-client.ts +135 -0
  148. package/src/global-wrangler-config-path.ts +26 -0
  149. package/src/https-options.ts +84 -80
  150. package/src/index.ts +694 -0
  151. package/src/init.ts +1024 -0
  152. package/src/inspect.ts +698 -593
  153. package/src/intl-polyfill.d.ts +123 -123
  154. package/src/is-ci.ts +14 -0
  155. package/src/is-interactive.ts +16 -0
  156. package/src/jest.d.ts +4 -0
  157. package/src/kv/helpers.ts +430 -0
  158. package/src/kv/index.ts +596 -0
  159. package/src/logger.ts +80 -42
  160. package/src/metrics/index.ts +5 -0
  161. package/src/metrics/metrics-config.ts +239 -0
  162. package/src/metrics/metrics-dispatcher.ts +96 -0
  163. package/src/metrics/metrics-usage-headers.ts +24 -0
  164. package/src/metrics/send-event.ts +97 -0
  165. package/src/miniflare-cli/assets.ts +250 -0
  166. package/src/miniflare-cli/index.ts +202 -33
  167. package/src/miniflare-cli/request-context.ts +18 -18
  168. package/src/miniflare-cli/tsconfig.json +9 -0
  169. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  170. package/src/miniflare-cli/types.ts +11 -0
  171. package/src/module-collection.ts +221 -212
  172. package/src/open-in-browser.ts +4 -6
  173. package/src/package-manager.ts +173 -128
  174. package/src/pages/build.ts +270 -0
  175. package/src/pages/constants.ts +18 -0
  176. package/src/pages/deployment-tails.ts +284 -0
  177. package/src/pages/deployments.tsx +84 -0
  178. package/src/pages/dev.ts +711 -0
  179. package/src/pages/errors.ts +66 -0
  180. package/src/pages/functions/buildPlugin.ts +107 -0
  181. package/src/pages/functions/buildWorker.ts +166 -0
  182. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  183. package/src/pages/functions/filepath-routing.ts +189 -0
  184. package/src/pages/functions/identifiers.ts +78 -0
  185. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  186. package/src/pages/functions/routes-consolidation.ts +73 -0
  187. package/src/pages/functions/routes-transformation.test.ts +282 -0
  188. package/src/pages/functions/routes-transformation.ts +115 -0
  189. package/src/pages/functions/routes-validation.test.ts +403 -0
  190. package/src/pages/functions/routes-validation.ts +202 -0
  191. package/src/pages/functions/routes.ts +151 -0
  192. package/src/pages/functions/tsconfig.json +8 -0
  193. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  194. package/src/pages/functions.ts +82 -0
  195. package/src/pages/hash.ts +13 -0
  196. package/src/pages/index.ts +102 -0
  197. package/src/pages/projects.tsx +167 -0
  198. package/src/pages/prompt-select-project.tsx +31 -0
  199. package/src/pages/publish.tsx +462 -0
  200. package/src/pages/types.ts +41 -0
  201. package/src/pages/upload.tsx +447 -0
  202. package/src/pages/utils.ts +23 -0
  203. package/src/parse.ts +208 -125
  204. package/src/paths.ts +53 -8
  205. package/src/proxy.ts +623 -407
  206. package/src/publish/index.ts +270 -0
  207. package/src/publish/publish.ts +1038 -0
  208. package/src/pubsub/index.ts +286 -0
  209. package/src/pubsub/pubsub-commands.ts +624 -0
  210. package/src/queues/cli/commands/consumer/add.ts +71 -0
  211. package/src/queues/cli/commands/consumer/index.ts +22 -0
  212. package/src/queues/cli/commands/consumer/remove.ts +38 -0
  213. package/src/queues/cli/commands/create.ts +25 -0
  214. package/src/queues/cli/commands/delete.ts +26 -0
  215. package/src/queues/cli/commands/index.ts +36 -0
  216. package/src/queues/cli/commands/list.ts +25 -0
  217. package/src/queues/client.ts +135 -0
  218. package/src/queues/utils.ts +18 -0
  219. package/src/r2/constants.ts +4 -0
  220. package/src/r2/helpers.ts +131 -0
  221. package/src/r2/index.ts +289 -0
  222. package/src/routes.ts +140 -0
  223. package/src/secret/index.ts +379 -0
  224. package/src/selfsigned.d.ts +23 -23
  225. package/src/sites.ts +372 -0
  226. package/src/tail/createTail.ts +379 -0
  227. package/src/tail/filters.ts +108 -110
  228. package/src/tail/index.ts +210 -296
  229. package/src/tail/printing.ts +86 -46
  230. package/src/tsconfig-sanity.ts +16 -0
  231. package/src/type-generation.ts +181 -0
  232. package/src/update-check.ts +11 -11
  233. package/src/user/access.ts +68 -0
  234. package/src/user/auth-variables.ts +113 -0
  235. package/src/user/choose-account.tsx +39 -0
  236. package/src/user/generate-auth-url.ts +33 -0
  237. package/src/user/generate-random-state.ts +16 -0
  238. package/src/user/index.ts +2 -0
  239. package/src/user/user.ts +1232 -0
  240. package/src/utils/collectKeyValues.ts +14 -0
  241. package/src/whoami.ts +135 -0
  242. package/src/worker.ts +177 -107
  243. package/src/yargs-types.ts +24 -0
  244. package/src/zones.ts +158 -40
  245. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  246. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  247. package/templates/__tests__/tsconfig.json +8 -0
  248. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  249. package/templates/checked-fetch.js +17 -0
  250. package/templates/d1-beta-facade.js +241 -0
  251. package/templates/facade.d.ts +14 -0
  252. package/templates/first-party-worker-module-facade.ts +19 -0
  253. package/templates/format-dev-errors.ts +33 -0
  254. package/templates/init-tests/test-jest-new-worker.js +23 -0
  255. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  256. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  257. package/templates/middleware/common.ts +62 -0
  258. package/templates/middleware/loader-modules.ts +82 -0
  259. package/templates/middleware/loader-sw.ts +233 -0
  260. package/templates/middleware/middleware-miniflare3-json-error.ts +20 -0
  261. package/templates/middleware/middleware-pretty-error.ts +40 -0
  262. package/templates/middleware/middleware-scheduled.ts +15 -0
  263. package/templates/new-worker-scheduled.js +3 -3
  264. package/templates/new-worker-scheduled.ts +15 -15
  265. package/templates/new-worker.js +3 -3
  266. package/templates/new-worker.ts +15 -15
  267. package/templates/no-op-worker.js +10 -0
  268. package/templates/pages-dev-pipeline.ts +31 -0
  269. package/templates/pages-dev-util.ts +52 -0
  270. package/templates/pages-shim.ts +12 -0
  271. package/templates/pages-template-plugin.ts +176 -0
  272. package/templates/pages-template-worker.ts +189 -0
  273. package/templates/serve-static-assets.ts +65 -0
  274. package/templates/service-bindings-module-facade.js +54 -0
  275. package/templates/service-bindings-sw-facade.js +42 -0
  276. package/templates/tsconfig-sanity.ts +11 -0
  277. package/templates/tsconfig.init.json +106 -0
  278. package/templates/tsconfig.json +6 -103
  279. package/templates/tsconfig.tsbuildinfo +1 -0
  280. package/wrangler-dist/cli.d.ts +906 -0
  281. package/wrangler-dist/cli.js +128866 -110945
  282. package/wrangler-dist/wasm-sync.wasm +0 -0
  283. package/pages/functions/buildPlugin.ts +0 -105
  284. package/pages/functions/buildWorker.ts +0 -151
  285. package/pages/functions/filepath-routing.ts +0 -189
  286. package/pages/functions/identifiers.ts +0 -78
  287. package/pages/functions/routes.ts +0 -156
  288. package/pages/functions/template-plugin.ts +0 -147
  289. package/pages/functions/template-worker.ts +0 -143
  290. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  291. package/src/dialogs.tsx +0 -135
  292. package/src/environment-variables.ts +0 -35
  293. package/src/index.tsx +0 -2846
  294. package/src/kv.ts +0 -408
  295. package/src/miniflare-cli/enum-keys.ts +0 -17
  296. package/src/pages.tsx +0 -2093
  297. package/src/publish.ts +0 -716
  298. package/src/r2.ts +0 -50
  299. package/src/sites.tsx +0 -326
  300. package/src/user.tsx +0 -1214
  301. package/src/whoami.tsx +0 -71
  302. package/templates/static-asset-facade.js +0 -43
package/src/parse.ts CHANGED
@@ -5,96 +5,96 @@ import { formatMessagesSync } from "esbuild";
5
5
  import { logger } from "./logger";
6
6
 
7
7
  export type Message = {
8
- text: string;
9
- location?: Location;
10
- notes?: Message[];
11
- kind?: "warning" | "error";
8
+ text: string;
9
+ location?: Location;
10
+ notes?: Message[];
11
+ kind?: "warning" | "error";
12
12
  };
13
13
 
14
14
  export type Location = File & {
15
- line: number;
16
- column: number;
17
- length?: number;
18
- lineText?: string;
19
- suggestion?: string;
15
+ line: number;
16
+ column: number;
17
+ length?: number;
18
+ lineText?: string;
19
+ suggestion?: string;
20
20
  };
21
21
 
22
22
  export type File = {
23
- file?: string;
24
- fileText?: string;
23
+ file?: string;
24
+ fileText?: string;
25
25
  };
26
26
 
27
27
  /**
28
28
  * Formats a `Message` using esbuild's pretty-printing algorithm.
29
29
  */
30
30
  export function formatMessage(
31
- { text, notes, location, kind = "error" }: Message,
32
- color = true
31
+ { text, notes, location, kind = "error" }: Message,
32
+ color = true
33
33
  ): string {
34
- const input = { text, notes, location };
35
- delete input.location?.fileText;
36
- for (const note of notes ?? []) {
37
- delete note.location?.fileText;
38
- }
39
- const lines = formatMessagesSync([input], {
40
- color,
41
- kind: kind,
42
- terminalWidth: logger.columns,
43
- });
44
- return lines.join("\n");
34
+ const input = { text, notes, location };
35
+ delete input.location?.fileText;
36
+ for (const note of notes ?? []) {
37
+ delete note.location?.fileText;
38
+ }
39
+ const lines = formatMessagesSync([input], {
40
+ color,
41
+ kind: kind,
42
+ terminalWidth: logger.columns,
43
+ });
44
+ return lines.join("\n");
45
45
  }
46
46
 
47
47
  /**
48
48
  * An error that's thrown when something fails to parse.
49
49
  */
50
50
  export class ParseError extends Error implements Message {
51
- readonly text: string;
52
- readonly notes: Message[];
53
- readonly location?: Location;
54
- readonly kind: "warning" | "error";
55
-
56
- constructor({ text, notes, location, kind }: Message) {
57
- super(text);
58
- this.name = this.constructor.name;
59
- this.text = text;
60
- this.notes = notes ?? [];
61
- this.location = location;
62
- this.kind = kind ?? "error";
63
- }
51
+ readonly text: string;
52
+ readonly notes: Message[];
53
+ readonly location?: Location;
54
+ readonly kind: "warning" | "error";
55
+
56
+ constructor({ text, notes, location, kind }: Message) {
57
+ super(text);
58
+ this.name = this.constructor.name;
59
+ this.text = text;
60
+ this.notes = notes ?? [];
61
+ this.location = location;
62
+ this.kind = kind ?? "error";
63
+ }
64
64
  }
65
65
 
66
66
  const TOML_ERROR_NAME = "TomlError";
67
67
  const TOML_ERROR_SUFFIX = " at row ";
68
68
 
69
69
  type TomlError = Error & {
70
- line: number;
71
- col: number;
70
+ line: number;
71
+ col: number;
72
72
  };
73
73
 
74
74
  /**
75
75
  * A wrapper around `TOML.parse` that throws a `ParseError`.
76
76
  */
77
77
  export function parseTOML(input: string, file?: string): TOML.JsonMap | never {
78
- try {
79
- // Normalize CRLF to LF to avoid hitting https://github.com/iarna/iarna-toml/issues/33.
80
- const normalizedInput = input.replace(/\r\n/g, "\n");
81
- return TOML.parse(normalizedInput);
82
- } catch (err) {
83
- const { name, message, line, col } = err as TomlError;
84
- if (name !== TOML_ERROR_NAME) {
85
- throw err;
86
- }
87
- const text = message.substring(0, message.lastIndexOf(TOML_ERROR_SUFFIX));
88
- const lineText = input.split("\n")[line];
89
- const location = {
90
- lineText,
91
- line: line + 1,
92
- column: col - 1,
93
- file,
94
- fileText: input,
95
- };
96
- throw new ParseError({ text, location });
97
- }
78
+ try {
79
+ // Normalize CRLF to LF to avoid hitting https://github.com/iarna/iarna-toml/issues/33.
80
+ const normalizedInput = input.replace(/\r\n/g, "\n");
81
+ return TOML.parse(normalizedInput);
82
+ } catch (err) {
83
+ const { name, message, line, col } = err as TomlError;
84
+ if (name !== TOML_ERROR_NAME) {
85
+ throw err;
86
+ }
87
+ const text = message.substring(0, message.lastIndexOf(TOML_ERROR_SUFFIX));
88
+ const lineText = input.split("\n")[line];
89
+ const location = {
90
+ lineText,
91
+ line: line + 1,
92
+ column: col - 1,
93
+ file,
94
+ fileText: input,
95
+ };
96
+ throw new ParseError({ text, location });
97
+ }
98
98
  }
99
99
 
100
100
  const JSON_ERROR_SUFFIX = " in JSON at position ";
@@ -103,101 +103,184 @@ const JSON_ERROR_SUFFIX = " in JSON at position ";
103
103
  * A minimal type describing a package.json file.
104
104
  */
105
105
  export type PackageJSON = {
106
- devDependencies?: Record<string, unknown>;
107
- dependencies?: Record<string, unknown>;
108
- scripts?: Record<string, unknown>;
106
+ devDependencies?: Record<string, unknown>;
107
+ dependencies?: Record<string, unknown>;
108
+ scripts?: Record<string, unknown>;
109
109
  };
110
110
 
111
111
  /**
112
112
  * A typed version of `parseJSON()`.
113
113
  */
114
114
  export function parsePackageJSON<T extends PackageJSON = PackageJSON>(
115
- input: string,
116
- file?: string
115
+ input: string,
116
+ file?: string
117
117
  ): T {
118
- return parseJSON<T>(input, file);
118
+ return parseJSON<T>(input, file);
119
119
  }
120
120
 
121
121
  /**
122
122
  * A wrapper around `JSON.parse` that throws a `ParseError`.
123
123
  */
124
124
  export function parseJSON<T>(input: string, file?: string): T {
125
- try {
126
- return JSON.parse(input);
127
- } catch (err) {
128
- const { message } = err as Error;
129
- const index = message.lastIndexOf(JSON_ERROR_SUFFIX);
130
- if (index < 0) {
131
- throw err;
132
- }
133
- const text = message.substring(0, index);
134
- const position = parseInt(
135
- message.substring(index + JSON_ERROR_SUFFIX.length)
136
- );
137
- const location = indexLocation({ file, fileText: input }, position);
138
- throw new ParseError({ text, location });
139
- }
125
+ try {
126
+ return JSON.parse(input);
127
+ } catch (err) {
128
+ const { message } = err as Error;
129
+ const index = message.lastIndexOf(JSON_ERROR_SUFFIX);
130
+ if (index < 0) {
131
+ throw err;
132
+ }
133
+ const text = message.substring(0, index);
134
+ const position = parseInt(
135
+ message.substring(index + JSON_ERROR_SUFFIX.length)
136
+ );
137
+ const location = indexLocation({ file, fileText: input }, position);
138
+ throw new ParseError({ text, location });
139
+ }
140
+ }
141
+
142
+ /**
143
+ * Reads a file into a node Buffer.
144
+ */
145
+ export function readFileSyncToBuffer(file: string): Buffer {
146
+ try {
147
+ return fs.readFileSync(file);
148
+ } catch (err) {
149
+ const { message } = err as Error;
150
+ throw new ParseError({
151
+ text: `Could not read file: ${file}`,
152
+ notes: [
153
+ {
154
+ text: message.replace(file, resolve(file)),
155
+ },
156
+ ],
157
+ });
158
+ }
140
159
  }
141
160
 
142
161
  /**
143
162
  * Reads a file and parses it based on its type.
144
163
  */
145
164
  export function readFileSync(file: string): string {
146
- try {
147
- return fs.readFileSync(file, { encoding: "utf-8" });
148
- } catch (err) {
149
- const { message } = err as Error;
150
- throw new ParseError({
151
- text: `Could not read file: ${file}`,
152
- notes: [
153
- {
154
- text: message.replace(file, resolve(file)),
155
- },
156
- ],
157
- });
158
- }
165
+ try {
166
+ return fs.readFileSync(file, { encoding: "utf-8" });
167
+ } catch (err) {
168
+ const { message } = err as Error;
169
+ throw new ParseError({
170
+ text: `Could not read file: ${file}`,
171
+ notes: [
172
+ {
173
+ text: message.replace(file, resolve(file)),
174
+ },
175
+ ],
176
+ });
177
+ }
159
178
  }
160
179
 
161
180
  /**
162
181
  * Calculates the line and column location from an index.
163
182
  */
164
183
  export function indexLocation(file: File, index: number): Location {
165
- let lineText,
166
- line = 0,
167
- column = 0,
168
- cursor = 0;
169
- const { fileText = "" } = file;
170
- for (const row of fileText.split("\n")) {
171
- line++;
172
- cursor += row.length + 1;
173
- if (cursor >= index) {
174
- lineText = row;
175
- column = row.length - (cursor - index);
176
- break;
177
- }
178
- }
179
- return { lineText, line, column, ...file };
184
+ let lineText,
185
+ line = 0,
186
+ column = 0,
187
+ cursor = 0;
188
+ const { fileText = "" } = file;
189
+ for (const row of fileText.split("\n")) {
190
+ line++;
191
+ cursor += row.length + 1;
192
+ if (cursor >= index) {
193
+ lineText = row;
194
+ column = row.length - (cursor - index);
195
+ break;
196
+ }
197
+ }
198
+ return { lineText, line, column, ...file };
180
199
  }
181
200
 
182
201
  /**
183
202
  * Guesses the line and column location of a search query.
184
203
  */
185
204
  export function searchLocation(file: File, query: unknown): Location {
186
- let lineText,
187
- length,
188
- line = 0,
189
- column = 0;
190
- const queryText = String(query);
191
- const { fileText = "" } = file;
192
- for (const content of fileText.split("\n")) {
193
- line++;
194
- const index = content.indexOf(queryText);
195
- if (index >= 0) {
196
- lineText = content;
197
- column = index;
198
- length = queryText.length;
199
- break;
200
- }
201
- }
202
- return { lineText, line, column, length, ...file };
205
+ let lineText,
206
+ length,
207
+ line = 0,
208
+ column = 0;
209
+ const queryText = String(query);
210
+ const { fileText = "" } = file;
211
+ for (const content of fileText.split("\n")) {
212
+ line++;
213
+ const index = content.indexOf(queryText);
214
+ if (index >= 0) {
215
+ lineText = content;
216
+ column = index;
217
+ length = queryText.length;
218
+ break;
219
+ }
220
+ }
221
+ return { lineText, line, column, length, ...file };
222
+ }
223
+
224
+ const units = {
225
+ nanoseconds: 0.000000001,
226
+ nanosecond: 0.000000001,
227
+ microseconds: 0.000001,
228
+ microsecond: 0.000001,
229
+ milliseconds: 0.001,
230
+ millisecond: 0.001,
231
+ seconds: 1,
232
+ second: 1,
233
+ minutes: 60,
234
+ minute: 60,
235
+ hours: 3600,
236
+ hour: 3600,
237
+ days: 86400,
238
+ day: 86400,
239
+ weeks: 604800,
240
+ week: 604800,
241
+ month: 18144000,
242
+ year: 220752000,
243
+
244
+ nsecs: 0.000000001,
245
+ nsec: 0.000000001,
246
+ usecs: 0.000001,
247
+ usec: 0.000001,
248
+ msecs: 0.001,
249
+ msec: 0.001,
250
+ secs: 1,
251
+ sec: 1,
252
+ mins: 60,
253
+ min: 60,
254
+
255
+ ns: 0.000000001,
256
+ us: 0.000001,
257
+ ms: 0.001,
258
+ mo: 18144000,
259
+ yr: 220752000,
260
+
261
+ s: 1,
262
+ m: 60,
263
+ h: 3600,
264
+ d: 86400,
265
+ w: 604800,
266
+ y: 220752000,
267
+ };
268
+
269
+ /**
270
+ * Parse a human-readable time duration in seconds (including fractional)
271
+ *
272
+ * Invalid values will return NaN
273
+ */
274
+ export function parseHumanDuration(s: string): number {
275
+ const unitsMap = new Map(Object.entries(units));
276
+ s = s.trim().toLowerCase();
277
+ let base = 1;
278
+ for (const [name, _] of unitsMap) {
279
+ if (s.endsWith(name)) {
280
+ s = s.substring(0, s.length - name.length);
281
+ base = unitsMap.get(name) || 1;
282
+ break;
283
+ }
284
+ }
285
+ return Number(s) * base;
203
286
  }
package/src/paths.ts CHANGED
@@ -1,7 +1,8 @@
1
- import { assert } from "console";
1
+ import { assert } from "node:console";
2
+ import { relative, basename, resolve } from "node:path";
2
3
 
3
4
  type DiscriminatedPath<Discriminator extends string> = string & {
4
- _discriminator: Discriminator;
5
+ _discriminator: Discriminator;
5
6
  };
6
7
 
7
8
  /**
@@ -17,10 +18,54 @@ export type UrlPath = DiscriminatedPath<"UrlPath">;
17
18
  * Use this helper to convert a `string` to a `UrlPath` when it is not clear whether the string needs normalizing.
18
19
  * Replaces all back-slashes with forward-slashes, and throws an error if the path contains a drive letter (e.g. `C:`).
19
20
  */
20
- export function toUrlPath(path: string): UrlPath {
21
- assert(
22
- !/^[a-z]:/i.test(path),
23
- "Tried to convert a Windows file path with a drive to a URL path."
24
- );
25
- return path.replace(/\\/g, "/") as UrlPath;
21
+ export function toUrlPath(filePath: string): UrlPath {
22
+ assert(
23
+ !/^[a-z]:/i.test(filePath),
24
+ "Tried to convert a Windows file path with a drive to a URL path."
25
+ );
26
+ return filePath.replace(/\\/g, "/") as UrlPath;
27
+ }
28
+
29
+ /**
30
+ * Get a human-readable path, relative to process.cwd(), prefixed with ./ if
31
+ * in a nested subdirectory, to aid with readability.
32
+ * Only used for logging e.g. `Loading DB at ${readableRelative(dbPath)}`:
33
+ *
34
+ * E.g. (assuming process.cwd() is /pwd)
35
+ *
36
+ * readableRelative('/pwd/wrangler.toml') => 'wrangler.toml'
37
+ * readableRelative('/wrangler.toml') => '../wrangler.toml'
38
+ * readableRelative('/pwd/subdir/wrangler.toml') => './subdir/wrangler.toml'
39
+ *
40
+ * */
41
+ export function readableRelative(to: string) {
42
+ const relativePath = relative(process.cwd(), to);
43
+ if (
44
+ // No directory nesting, return as-is
45
+ basename(relativePath) === relativePath ||
46
+ // Outside current directory
47
+ relativePath.startsWith(".")
48
+ ) {
49
+ return relativePath;
50
+ } else {
51
+ return "./" + relativePath;
52
+ }
53
+ }
54
+
55
+ /**
56
+ * The __RELATIVE_PACKAGE_PATH__ is defined either in the esbuild config (for production)
57
+ * or the jest.setup.ts (for unit testing).
58
+ */
59
+ declare const __RELATIVE_PACKAGE_PATH__: string;
60
+
61
+ /**
62
+ * Use this function (rather than node.js constants like `__dirname`) to specify
63
+ * paths that are relative to the base path of the Wrangler package.
64
+ *
65
+ * It is important to use this function because it reliably maps to the root of the package
66
+ * no matter whether the code has been bundled or not.
67
+ */
68
+ export function getBasePath(): string {
69
+ // eslint-disable-next-line no-restricted-globals
70
+ return resolve(__dirname, __RELATIVE_PACKAGE_PATH__);
26
71
  }