wrangler 0.0.0-e64812e → 0.0.0-e8e684c7

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 (214) hide show
  1. package/README.md +27 -3
  2. package/bin/wrangler.js +150 -62
  3. package/kv-asset-handler.js +1 -0
  4. package/miniflare-dist/index.mjs +663 -7
  5. package/package.json +173 -152
  6. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  7. package/src/__tests__/config-cache.test.ts +30 -24
  8. package/src/__tests__/configuration.test.ts +4015 -3363
  9. package/src/__tests__/dev.test.tsx +1290 -952
  10. package/src/__tests__/generate.test.ts +91 -0
  11. package/src/__tests__/guess-worker-format.test.ts +68 -68
  12. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  13. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  14. package/src/__tests__/helpers/mock-bin.ts +20 -20
  15. package/src/__tests__/helpers/mock-cfetch.ts +179 -94
  16. package/src/__tests__/helpers/mock-console.ts +49 -39
  17. package/src/__tests__/helpers/mock-dialogs.ts +94 -71
  18. package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -0
  19. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  20. package/src/__tests__/helpers/mock-istty.ts +65 -18
  21. package/src/__tests__/helpers/mock-known-routes.ts +7 -0
  22. package/src/__tests__/helpers/mock-kv.ts +26 -26
  23. package/src/__tests__/helpers/mock-oauth-flow.ts +223 -228
  24. package/src/__tests__/helpers/mock-process.ts +39 -0
  25. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  26. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  27. package/src/__tests__/helpers/run-in-tmp.ts +27 -28
  28. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  29. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  30. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  31. package/src/__tests__/https-options.test.ts +142 -109
  32. package/src/__tests__/index.test.ts +222 -233
  33. package/src/__tests__/init.test.ts +2139 -1603
  34. package/src/__tests__/jest.setup.ts +114 -34
  35. package/src/__tests__/kv.test.ts +1222 -1032
  36. package/src/__tests__/logger.test.ts +100 -74
  37. package/src/__tests__/metrics.test.ts +450 -0
  38. package/src/__tests__/package-manager.test.ts +303 -303
  39. package/src/__tests__/pages.test.ts +1173 -652
  40. package/src/__tests__/parse.test.ts +252 -252
  41. package/src/__tests__/publish.test.ts +6788 -5301
  42. package/src/__tests__/pubsub.test.ts +367 -0
  43. package/src/__tests__/r2.test.ts +328 -225
  44. package/src/__tests__/route.test.ts +18 -18
  45. package/src/__tests__/secret.test.ts +470 -459
  46. package/src/__tests__/tail.test.ts +676 -564
  47. package/src/__tests__/test-old-node-version.js +31 -0
  48. package/src/__tests__/user.test.ts +136 -112
  49. package/src/__tests__/validate-dev-props.test.ts +56 -0
  50. package/src/__tests__/version.test.ts +35 -0
  51. package/src/__tests__/whoami.test.tsx +267 -83
  52. package/src/__tests__/worker-namespace.test.ts +329 -0
  53. package/src/abort.d.ts +1 -1
  54. package/src/api/dev.ts +93 -0
  55. package/src/api/index.ts +1 -0
  56. package/src/bundle-reporter.tsx +29 -0
  57. package/src/bundle.ts +430 -157
  58. package/src/cfetch/index.ts +80 -80
  59. package/src/cfetch/internal.ts +244 -91
  60. package/src/cli.ts +21 -7
  61. package/src/config/config.ts +224 -195
  62. package/src/config/diagnostics.ts +61 -61
  63. package/src/config/environment.ts +422 -357
  64. package/src/config/index.ts +219 -193
  65. package/src/config/validation-helpers.ts +379 -357
  66. package/src/config/validation.ts +1690 -1367
  67. package/src/config-cache.ts +81 -41
  68. package/src/create-worker-preview.ts +208 -136
  69. package/src/create-worker-upload-form.ts +275 -238
  70. package/src/dev/dev-vars.ts +13 -13
  71. package/src/dev/dev.tsx +477 -351
  72. package/src/dev/local.tsx +426 -295
  73. package/src/dev/remote.tsx +406 -211
  74. package/src/dev/use-esbuild.ts +154 -94
  75. package/src/dev/validate-dev-props.ts +31 -0
  76. package/src/dev-registry.tsx +160 -0
  77. package/src/dev.tsx +696 -0
  78. package/src/dialogs.tsx +97 -97
  79. package/src/dispatch-namespace.ts +206 -0
  80. package/src/durable.ts +87 -87
  81. package/src/entry.ts +234 -228
  82. package/src/environment-variables.ts +23 -23
  83. package/src/errors.ts +6 -6
  84. package/src/faye-websocket.d.ts +6 -0
  85. package/src/generate.ts +131 -0
  86. package/src/git-client.ts +42 -0
  87. package/src/global-wrangler-config-path.ts +26 -0
  88. package/src/https-options.ts +84 -80
  89. package/src/index.tsx +2164 -2768
  90. package/src/init.ts +622 -0
  91. package/src/inspect.ts +678 -593
  92. package/src/intl-polyfill.d.ts +123 -123
  93. package/src/is-ci.ts +14 -0
  94. package/src/is-interactive.ts +12 -0
  95. package/src/kv.ts +299 -277
  96. package/src/logger.ts +46 -39
  97. package/src/metrics/index.ts +5 -0
  98. package/src/metrics/metrics-config.ts +239 -0
  99. package/src/metrics/metrics-dispatcher.ts +96 -0
  100. package/src/metrics/metrics-usage-headers.ts +24 -0
  101. package/src/metrics/send-event.ts +92 -0
  102. package/src/miniflare-cli/assets.ts +554 -0
  103. package/src/miniflare-cli/enum-keys.ts +8 -8
  104. package/src/miniflare-cli/index.ts +198 -32
  105. package/src/miniflare-cli/request-context.ts +18 -18
  106. package/src/module-collection.ts +212 -212
  107. package/src/open-in-browser.ts +4 -6
  108. package/src/package-manager.ts +173 -128
  109. package/src/pages/build.tsx +238 -0
  110. package/src/pages/constants.ts +12 -0
  111. package/src/pages/deployments.tsx +106 -0
  112. package/src/pages/dev.tsx +528 -0
  113. package/src/pages/errors.ts +22 -0
  114. package/src/pages/functions/buildPlugin.ts +109 -0
  115. package/src/pages/functions/buildWorker.ts +155 -0
  116. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  117. package/src/pages/functions/filepath-routing.ts +189 -0
  118. package/src/pages/functions/identifiers.ts +78 -0
  119. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  120. package/src/pages/functions/routes-consolidation.ts +73 -0
  121. package/src/pages/functions/routes-transformation.test.ts +271 -0
  122. package/src/pages/functions/routes-transformation.ts +122 -0
  123. package/src/pages/functions/routes.ts +151 -0
  124. package/src/pages/functions.tsx +96 -0
  125. package/src/pages/index.tsx +94 -0
  126. package/src/pages/projects.tsx +169 -0
  127. package/src/pages/publish.tsx +391 -0
  128. package/src/pages/types.ts +49 -0
  129. package/src/pages/upload.tsx +413 -0
  130. package/src/pages/utils.ts +12 -0
  131. package/src/parse.ts +209 -125
  132. package/src/paths.ts +6 -6
  133. package/src/preview.ts +31 -0
  134. package/src/proxy.ts +410 -389
  135. package/src/publish.ts +773 -534
  136. package/src/pubsub/index.ts +286 -0
  137. package/src/pubsub/pubsub-commands.tsx +623 -0
  138. package/src/r2.ts +100 -19
  139. package/src/selfsigned.d.ts +23 -23
  140. package/src/sites.tsx +278 -201
  141. package/src/tail/filters.ts +111 -109
  142. package/src/tail/index.ts +230 -217
  143. package/src/tail/printing.ts +86 -46
  144. package/src/update-check.ts +11 -11
  145. package/src/user/choose-account.tsx +69 -0
  146. package/src/user/env-vars.ts +46 -0
  147. package/src/user/generate-auth-url.ts +33 -0
  148. package/src/user/generate-random-state.ts +16 -0
  149. package/src/user/index.ts +3 -0
  150. package/src/user/user.tsx +1191 -0
  151. package/src/whoami.tsx +141 -42
  152. package/src/worker.ts +123 -99
  153. package/src/zones.ts +167 -0
  154. package/templates/checked-fetch.js +17 -0
  155. package/templates/first-party-worker-module-facade.ts +18 -0
  156. package/templates/format-dev-errors.ts +32 -0
  157. package/templates/new-worker-scheduled.js +3 -3
  158. package/templates/new-worker-scheduled.ts +15 -15
  159. package/templates/new-worker.js +3 -3
  160. package/templates/new-worker.ts +15 -15
  161. package/templates/no-op-worker.js +10 -0
  162. package/templates/pages-shim.ts +9 -0
  163. package/templates/pages-template-plugin.ts +167 -0
  164. package/templates/pages-template-worker.ts +172 -0
  165. package/templates/serve-static-assets.ts +63 -0
  166. package/templates/service-bindings-module-facade.js +54 -0
  167. package/templates/service-bindings-sw-facade.js +42 -0
  168. package/templates/tsconfig.json +95 -95
  169. package/wrangler-dist/cli.d.ts +338 -0
  170. package/wrangler-dist/cli.js +95449 -67524
  171. package/pages/functions/buildPlugin.ts +0 -105
  172. package/pages/functions/buildWorker.ts +0 -151
  173. package/pages/functions/filepath-routing.ts +0 -189
  174. package/pages/functions/identifiers.ts +0 -78
  175. package/pages/functions/routes.ts +0 -156
  176. package/pages/functions/template-plugin.ts +0 -147
  177. package/pages/functions/template-worker.ts +0 -143
  178. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  179. package/src/pages.tsx +0 -2038
  180. package/src/user.tsx +0 -1203
  181. package/templates/static-asset-facade.js +0 -47
  182. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  183. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  184. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  185. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  186. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  187. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  188. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  189. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  190. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  191. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  192. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  193. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  194. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  195. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  196. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  197. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  198. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  199. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  200. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  201. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  202. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  203. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  204. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  205. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  206. package/vendor/wrangler-mime/LICENSE +0 -21
  207. package/vendor/wrangler-mime/Mime.js +0 -97
  208. package/vendor/wrangler-mime/README.md +0 -187
  209. package/vendor/wrangler-mime/cli.js +0 -46
  210. package/vendor/wrangler-mime/index.js +0 -4
  211. package/vendor/wrangler-mime/lite.js +0 -4
  212. package/vendor/wrangler-mime/package.json +0 -52
  213. package/vendor/wrangler-mime/types/other.js +0 -1
  214. package/vendor/wrangler-mime/types/standard.js +0 -1
@@ -1,44 +1,44 @@
1
1
  import {
2
- formatMessage,
3
- searchLocation,
4
- indexLocation,
5
- parseJSON,
6
- parseTOML,
2
+ formatMessage,
3
+ searchLocation,
4
+ indexLocation,
5
+ parseJSON,
6
+ parseTOML,
7
7
  } from "../parse";
8
8
  import type { Message } from "../parse";
9
9
 
10
10
  describe("formatMessage", () => {
11
- const format = (input: Message) => {
12
- // No color and skip emojis at the start.
13
- return formatMessage(input, false).substring(2);
14
- };
11
+ const format = (input: Message) => {
12
+ // No color and skip emojis at the start.
13
+ return formatMessage(input, false).substring(2);
14
+ };
15
15
 
16
- it("should format message without location", () => {
17
- expect(
18
- format({
19
- text: "Invalid argument",
20
- kind: "warning",
21
- })
22
- ).toMatchInlineSnapshot(`
16
+ it("should format message without location", () => {
17
+ expect(
18
+ format({
19
+ text: "Invalid argument",
20
+ kind: "warning",
21
+ })
22
+ ).toMatchInlineSnapshot(`
23
23
  "[WARNING] Invalid argument
24
24
 
25
25
  "
26
26
  `);
27
- });
27
+ });
28
28
 
29
- it("should format message with location", () => {
30
- expect(
31
- format({
32
- text: "Missing property: main",
33
- location: {
34
- line: 1,
35
- column: 0,
36
- lineText: "{}",
37
- file: "package.json",
38
- fileText: "{}",
39
- },
40
- })
41
- ).toMatchInlineSnapshot(`
29
+ it("should format message with location", () => {
30
+ expect(
31
+ format({
32
+ text: "Missing property: main",
33
+ location: {
34
+ line: 1,
35
+ column: 0,
36
+ lineText: "{}",
37
+ file: "package.json",
38
+ fileText: "{}",
39
+ },
40
+ })
41
+ ).toMatchInlineSnapshot(`
42
42
  "[ERROR] Missing property: main
43
43
 
44
44
  package.json:1:0:
@@ -47,28 +47,28 @@ describe("formatMessage", () => {
47
47
 
48
48
  "
49
49
  `);
50
- });
50
+ });
51
51
 
52
- it("should format message with location and notes", () => {
53
- expect(
54
- format({
55
- text: "Invalid property: type",
56
- location: {
57
- line: 3,
58
- column: 8,
59
- length: 7,
60
- lineText: "type = 'modular'",
61
- suggestion: "Did you mean 'module'?",
62
- file: "package.toml",
63
- fileText: "[package]\ntype = 'modular'\n",
64
- },
65
- notes: [
66
- {
67
- text: "There are two acceptable types: 'module' and 'commonjs'",
68
- },
69
- ],
70
- })
71
- ).toMatchInlineSnapshot(`
52
+ it("should format message with location and notes", () => {
53
+ expect(
54
+ format({
55
+ text: "Invalid property: type",
56
+ location: {
57
+ line: 3,
58
+ column: 8,
59
+ length: 7,
60
+ lineText: "type = 'modular'",
61
+ suggestion: "Did you mean 'module'?",
62
+ file: "package.toml",
63
+ fileText: "[package]\ntype = 'modular'\n",
64
+ },
65
+ notes: [
66
+ {
67
+ text: "There are two acceptable types: 'module' and 'commonjs'",
68
+ },
69
+ ],
70
+ })
71
+ ).toMatchInlineSnapshot(`
72
72
  "[ERROR] Invalid property: type
73
73
 
74
74
  package.toml:3:8:
@@ -80,29 +80,29 @@ describe("formatMessage", () => {
80
80
 
81
81
  "
82
82
  `);
83
- });
83
+ });
84
84
  });
85
85
 
86
86
  describe("parseTOML", () => {
87
- it("should parse toml that is empty", () => {
88
- expect(parseTOML("")).toStrictEqual({});
89
- });
87
+ it("should parse toml that is empty", () => {
88
+ expect(parseTOML("")).toStrictEqual({});
89
+ });
90
90
 
91
- it("should parse toml with basic values", () => {
92
- expect(
93
- parseTOML(`
91
+ it("should parse toml with basic values", () => {
92
+ expect(
93
+ parseTOML(`
94
94
  name = "basic"
95
95
  version = 1
96
96
  `)
97
- ).toStrictEqual({
98
- name: "basic",
99
- version: 1,
100
- });
101
- });
97
+ ).toStrictEqual({
98
+ name: "basic",
99
+ version: 1,
100
+ });
101
+ });
102
102
 
103
- it("should parse toml with complex values", () => {
104
- expect(
105
- parseTOML(`
103
+ it("should parse toml with complex values", () => {
104
+ expect(
105
+ parseTOML(`
106
106
  name = 'complex'
107
107
  version = 1
108
108
  [owner]
@@ -111,220 +111,220 @@ describe("parseTOML", () => {
111
111
  [owner.dog]
112
112
  exists = true
113
113
  `)
114
- ).toStrictEqual({
115
- name: "complex",
116
- owner: {
117
- alive: true,
118
- dog: {
119
- exists: true,
120
- },
121
- name: ["tim"],
122
- },
123
- version: 1,
124
- });
125
- });
114
+ ).toStrictEqual({
115
+ name: "complex",
116
+ owner: {
117
+ alive: true,
118
+ dog: {
119
+ exists: true,
120
+ },
121
+ name: ["tim"],
122
+ },
123
+ version: 1,
124
+ });
125
+ });
126
126
 
127
- it("should fail to parse toml with invalid string", () => {
128
- try {
129
- parseTOML(`name = 'fail"`);
130
- fail("parseTOML did not throw");
131
- } catch (err) {
132
- expect({ ...(err as Error) }).toStrictEqual({
133
- name: "ParseError",
134
- text: "Unterminated string",
135
- kind: "error",
136
- location: {
137
- line: 1,
138
- column: 14,
139
- fileText: "name = 'fail\"",
140
- file: undefined,
141
- lineText: "name = 'fail\"",
142
- },
143
- notes: [],
144
- });
145
- }
146
- });
127
+ it("should fail to parse toml with invalid string", () => {
128
+ try {
129
+ parseTOML(`name = 'fail"`);
130
+ fail("parseTOML did not throw");
131
+ } catch (err) {
132
+ expect({ ...(err as Error) }).toStrictEqual({
133
+ name: "ParseError",
134
+ text: "Unterminated string",
135
+ kind: "error",
136
+ location: {
137
+ line: 1,
138
+ column: 14,
139
+ fileText: "name = 'fail\"",
140
+ file: undefined,
141
+ lineText: "name = 'fail\"",
142
+ },
143
+ notes: [],
144
+ });
145
+ }
146
+ });
147
147
 
148
- it("should fail to parse toml with invalid header", () => {
149
- try {
150
- parseTOML(`\n[name`, "config.toml");
151
- fail("parseTOML did not throw");
152
- } catch (err) {
153
- expect({ ...(err as Error) }).toStrictEqual({
154
- name: "ParseError",
155
- text: "Key ended without value",
156
- kind: "error",
157
- location: {
158
- line: 2,
159
- column: 5,
160
- lineText: "[name",
161
- file: "config.toml",
162
- fileText: "\n[name",
163
- },
164
- notes: [],
165
- });
166
- }
167
- });
148
+ it("should fail to parse toml with invalid header", () => {
149
+ try {
150
+ parseTOML(`\n[name`, "config.toml");
151
+ fail("parseTOML did not throw");
152
+ } catch (err) {
153
+ expect({ ...(err as Error) }).toStrictEqual({
154
+ name: "ParseError",
155
+ text: "Key ended without value",
156
+ kind: "error",
157
+ location: {
158
+ line: 2,
159
+ column: 5,
160
+ lineText: "[name",
161
+ file: "config.toml",
162
+ fileText: "\n[name",
163
+ },
164
+ notes: [],
165
+ });
166
+ }
167
+ });
168
168
 
169
- it("should cope with Windows line-endings", () => {
170
- expect(
171
- parseTOML(
172
- "# A comment with a Windows line-ending\r\n# Another comment with a Windows line-ending\r\n"
173
- )
174
- ).toEqual({});
175
- });
169
+ it("should cope with Windows line-endings", () => {
170
+ expect(
171
+ parseTOML(
172
+ "# A comment with a Windows line-ending\r\n# Another comment with a Windows line-ending\r\n"
173
+ )
174
+ ).toEqual({});
175
+ });
176
176
  });
177
177
 
178
178
  describe("parseJSON", () => {
179
- it("should parse json that is empty", () => {
180
- expect(parseJSON("{}")).toStrictEqual({});
181
- });
179
+ it("should parse json that is empty", () => {
180
+ expect(parseJSON("{}")).toStrictEqual({});
181
+ });
182
182
 
183
- it("should parse json with basic values", () => {
184
- expect(
185
- parseJSON(`
183
+ it("should parse json with basic values", () => {
184
+ expect(
185
+ parseJSON(`
186
186
  {
187
187
  "name" : "basic",
188
188
  "version": 1
189
189
  }`)
190
- ).toStrictEqual({
191
- name: "basic",
192
- version: 1,
193
- });
194
- });
190
+ ).toStrictEqual({
191
+ name: "basic",
192
+ version: 1,
193
+ });
194
+ });
195
195
 
196
- it("should parse json with complex values", () => {
197
- expect(
198
- parseJSON(
199
- `{
196
+ it("should parse json with complex values", () => {
197
+ expect(
198
+ parseJSON(
199
+ `{
200
200
  "name":"complex",
201
201
  "spec":{
202
202
  "uptime":[1,2.5,3],
203
203
  "ok":true
204
204
  }
205
205
  }`
206
- )
207
- ).toStrictEqual({
208
- name: "complex",
209
- spec: {
210
- uptime: [1, 2.5, 3],
211
- ok: true,
212
- },
213
- });
214
- });
206
+ )
207
+ ).toStrictEqual({
208
+ name: "complex",
209
+ spec: {
210
+ uptime: [1, 2.5, 3],
211
+ ok: true,
212
+ },
213
+ });
214
+ });
215
215
 
216
- it("should fail to parse json with invalid string", () => {
217
- try {
218
- parseJSON(`\n{\n"version" "1\n}\n`);
219
- fail("parseJSON did not throw");
220
- } catch (err) {
221
- expect({ ...(err as Error) }).toStrictEqual({
222
- name: "ParseError",
223
- text: "Unexpected string",
224
- kind: "error",
225
- location: {
226
- line: 3,
227
- column: 9,
228
- lineText: '"version" "1',
229
- file: undefined,
230
- fileText: `\n{\n"version" "1\n}\n`,
231
- },
232
- notes: [],
233
- });
234
- }
235
- });
216
+ it("should fail to parse json with invalid string", () => {
217
+ try {
218
+ parseJSON(`\n{\n"version" "1\n}\n`);
219
+ fail("parseJSON did not throw");
220
+ } catch (err) {
221
+ expect({ ...(err as Error) }).toStrictEqual({
222
+ name: "ParseError",
223
+ text: "Unexpected string",
224
+ kind: "error",
225
+ location: {
226
+ line: 3,
227
+ column: 9,
228
+ lineText: '"version" "1',
229
+ file: undefined,
230
+ fileText: `\n{\n"version" "1\n}\n`,
231
+ },
232
+ notes: [],
233
+ });
234
+ }
235
+ });
236
236
 
237
- it("should fail to parse json with invalid number", () => {
238
- const file = "config.json",
239
- fileText = `{\n\t"a":{\n\t\t"b":{\n\t\t\t"c":[012345]\n}\n}\n}`;
240
- try {
241
- parseJSON(fileText, file);
242
- fail("parseJSON did not throw");
243
- } catch (err) {
244
- expect({ ...(err as Error) }).toStrictEqual({
245
- name: "ParseError",
246
- text: "Unexpected number",
247
- kind: "error",
248
- location: {
249
- file,
250
- fileText,
251
- line: 4,
252
- column: 8,
253
- lineText: `\t\t\t"c":[012345]`,
254
- },
255
- notes: [],
256
- });
257
- }
258
- });
237
+ it("should fail to parse json with invalid number", () => {
238
+ const file = "config.json",
239
+ fileText = `{\n\t"a":{\n\t\t"b":{\n\t\t\t"c":[012345]\n}\n}\n}`;
240
+ try {
241
+ parseJSON(fileText, file);
242
+ fail("parseJSON did not throw");
243
+ } catch (err) {
244
+ expect({ ...(err as Error) }).toStrictEqual({
245
+ name: "ParseError",
246
+ text: "Unexpected number",
247
+ kind: "error",
248
+ location: {
249
+ file,
250
+ fileText,
251
+ line: 4,
252
+ column: 8,
253
+ lineText: `\t\t\t"c":[012345]`,
254
+ },
255
+ notes: [],
256
+ });
257
+ }
258
+ });
259
259
  });
260
260
 
261
261
  describe("indexLocation", () => {
262
- it("should calculate location from one-line input", () => {
263
- const fileText = "";
264
- expect(indexLocation({ fileText }, 1)).toStrictEqual({
265
- fileText,
266
- line: 1,
267
- column: 0,
268
- lineText: "",
269
- });
270
- });
262
+ it("should calculate location from one-line input", () => {
263
+ const fileText = "";
264
+ expect(indexLocation({ fileText }, 1)).toStrictEqual({
265
+ fileText,
266
+ line: 1,
267
+ column: 0,
268
+ lineText: "",
269
+ });
270
+ });
271
271
 
272
- it("should calculate location from multi-line input", () => {
273
- const file = "package.json",
274
- fileText = `\n{\n\t"hello":"world"\n}\n`;
275
- expect(indexLocation({ file, fileText }, 11)).toStrictEqual({
276
- file,
277
- fileText,
278
- line: 3,
279
- column: 7,
280
- lineText: `\t"hello":"world"`,
281
- });
282
- });
272
+ it("should calculate location from multi-line input", () => {
273
+ const file = "package.json",
274
+ fileText = `\n{\n\t"hello":"world"\n}\n`;
275
+ expect(indexLocation({ file, fileText }, 11)).toStrictEqual({
276
+ file,
277
+ fileText,
278
+ line: 3,
279
+ column: 7,
280
+ lineText: `\t"hello":"world"`,
281
+ });
282
+ });
283
283
 
284
- it("should calculate location when index is out of bounds", () => {
285
- const fileText = `\n\n\n\n`;
286
- expect(indexLocation({ fileText }, 10)).toStrictEqual({
287
- fileText,
288
- line: 5,
289
- column: 0,
290
- lineText: undefined,
291
- });
292
- });
284
+ it("should calculate location when index is out of bounds", () => {
285
+ const fileText = `\n\n\n\n`;
286
+ expect(indexLocation({ fileText }, 10)).toStrictEqual({
287
+ fileText,
288
+ line: 5,
289
+ column: 0,
290
+ lineText: undefined,
291
+ });
292
+ });
293
293
  });
294
294
 
295
295
  describe("searchLocation", () => {
296
- it("should calculate location from one-line match", () => {
297
- const file = "config.toml",
298
- fileText = `name = 'coolthing'`;
299
- expect(searchLocation({ file, fileText }, "coolthing")).toStrictEqual({
300
- file,
301
- fileText,
302
- line: 1,
303
- column: 8,
304
- length: 9,
305
- lineText: `name = 'coolthing'`,
306
- });
307
- });
296
+ it("should calculate location from one-line match", () => {
297
+ const file = "config.toml",
298
+ fileText = `name = 'coolthing'`;
299
+ expect(searchLocation({ file, fileText }, "coolthing")).toStrictEqual({
300
+ file,
301
+ fileText,
302
+ line: 1,
303
+ column: 8,
304
+ length: 9,
305
+ lineText: `name = 'coolthing'`,
306
+ });
307
+ });
308
308
 
309
- it("should calculate location from multi-line match", () => {
310
- const fileText = `\n{"versions":[\n\t"1.2.3",\n\t"1.2.4",\n\t"1.2.5"\n]}\n`;
311
- expect(searchLocation({ fileText }, "1.2.4")).toStrictEqual({
312
- fileText,
313
- line: 4,
314
- column: 2,
315
- length: 5,
316
- lineText: `\t"1.2.4",`,
317
- });
318
- });
309
+ it("should calculate location from multi-line match", () => {
310
+ const fileText = `\n{"versions":[\n\t"1.2.3",\n\t"1.2.4",\n\t"1.2.5"\n]}\n`;
311
+ expect(searchLocation({ fileText }, "1.2.4")).toStrictEqual({
312
+ fileText,
313
+ line: 4,
314
+ column: 2,
315
+ length: 5,
316
+ lineText: `\t"1.2.4",`,
317
+ });
318
+ });
319
319
 
320
- it("should calculate location from no match", () => {
321
- const fileText = `\n{}\n`;
322
- expect(searchLocation({ fileText }, "apple")).toStrictEqual({
323
- fileText,
324
- line: 3,
325
- column: 0,
326
- length: undefined,
327
- lineText: undefined,
328
- });
329
- });
320
+ it("should calculate location from no match", () => {
321
+ const fileText = `\n{}\n`;
322
+ expect(searchLocation({ fileText }, "apple")).toStrictEqual({
323
+ fileText,
324
+ line: 3,
325
+ column: 0,
326
+ length: undefined,
327
+ lineText: undefined,
328
+ });
329
+ });
330
330
  });