Skip to content

Commit 64bfe85

Browse files
kitsonkkitsonk
committed
chore: update deps and Deno v2
1 parent ddd6094 commit 64bfe85

10 files changed

+83
-72
lines changed

‎.github/workflows/ci.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,17 @@ on: [push, pull_request]
55
jobs:
66
ci:
77
runs-on: ubuntu-latest
8+
strategy:
9+
matrix:
10+
version: ["v1.x", canary]
811
steps:
912
- name: clone repository
1013
uses: actions/checkout@v4
1114

1215
- name: install deno
1316
uses: denoland/setup-deno@v1
1417
with:
15-
deno-version: 1.x
18+
deno-version: ${{ matrix.version }}
1619

1720
- name: check format
1821
run: deno fmt --check

‎_test_util.ts

+23-16
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,31 @@
1-
import { assert } from "jsr:@std/assert@0.225/assert";
2-
export { concat } from "jsr:@std/bytes@0.224/concat";
3-
export { delay } from "jsr:@std/async@0.224/delay";
4-
export { assert } from "jsr:@std/assert@0.225/assert";
5-
export { assertEquals } from "jsr:@std/assert@0.225/assert-equals";
6-
export { assertNotEquals } from "jsr:@std/assert@0.225/assert-not-equals";
7-
export { assertRejects } from "jsr:@std/assert@0.225/assert-rejects";
8-
export { assertStrictEquals } from "jsr:@std/assert@0.225/assert-strict-equals";
9-
export { timingSafeEqual } from "jsr:@std/crypto@0.224/timing-safe-equal";
1+
import { assert } from "jsr:@std/assert@~1/assert";
2+
export { concat } from "jsr:@std/bytes@~1/concat";
3+
export { delay } from "jsr:@std/async@~1/delay";
4+
export { assert } from "jsr:@std/assert@~1/assert";
5+
export { assertEquals } from "jsr:@std/assert@~1/equals";
6+
export { assertNotEquals } from "jsr:@std/assert@~1/not-equals";
7+
export { assertRejects } from "jsr:@std/assert@~1/rejects";
8+
export { assertStrictEquals } from "jsr:@std/assert@~1/strict-equals";
9+
export { timingSafeEqual } from "jsr:@std/crypto@~1/timing-safe-equal";
1010

11-
let kv: Deno.Kv | undefined;
11+
let kv: { close(): void } | undefined;
1212
let path: string | undefined;
1313

14-
export async function setup(): Promise<Deno.Kv> {
15-
path = `${await Deno.makeTempDir()}/test.db`;
16-
return kv = await Deno.openKv(path);
14+
export async function getPath() {
15+
return path = `${await Deno.makeTempDir()}/test.db`;
1716
}
1817

19-
export async function teardown() {
18+
export async function setup() {
19+
return kv = await Deno.openKv(await getPath());
20+
}
21+
22+
export function cleanup() {
23+
assert(path);
24+
return Deno.remove(path);
25+
}
26+
27+
export function teardown() {
2028
assert(kv);
2129
kv.close();
22-
assert(path);
23-
await Deno.remove(path);
30+
return cleanup();
2431
}

‎batched_atomic.test.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ Deno.test({
3434
async fn() {
3535
const kv = await setup();
3636
let value = new Uint8Array(65_536);
37-
window.crypto.getRandomValues(value);
37+
globalThis.crypto.getRandomValues(value);
3838
const res = await set(kv, ["hello"], value);
3939
assert(res.ok);
4040
value = new Uint8Array(65_536);
41-
window.crypto.getRandomValues(value);
41+
globalThis.crypto.getRandomValues(value);
4242
const actual = await batchedAtomic(kv)
4343
.checkBlob({ key: ["hello"], versionstamp: res.versionstamp })
4444
.setBlob(["hello"], value)
@@ -55,11 +55,11 @@ Deno.test({
5555
async fn() {
5656
const kv = await setup();
5757
let value = new Uint8Array(65_536);
58-
window.crypto.getRandomValues(value);
58+
globalThis.crypto.getRandomValues(value);
5959
const res = await set(kv, ["hello"], value);
6060
assert(res.ok);
6161
value = new Uint8Array(65_536);
62-
window.crypto.getRandomValues(value);
62+
globalThis.crypto.getRandomValues(value);
6363
const actual = await batchedAtomic(kv)
6464
.checkBlob({ key: ["hello"], versionstamp: null })
6565
.setBlob(["hello"], value)
@@ -125,7 +125,7 @@ Deno.test({
125125
async fn() {
126126
const kv = await setup();
127127
const blob = new Uint8Array(65_536);
128-
window.crypto.getRandomValues(blob);
128+
globalThis.crypto.getRandomValues(blob);
129129
const operation = batchedAtomic(kv);
130130
operation.setBlob(["hello"], blob);
131131
await operation.commit();
@@ -144,7 +144,7 @@ Deno.test({
144144
async fn() {
145145
const kv = await setup();
146146
const blob = new Uint8Array(65_536);
147-
window.crypto.getRandomValues(blob);
147+
globalThis.crypto.getRandomValues(blob);
148148
await set(kv, ["hello"], blob);
149149
assertEquals((await keys(kv, { prefix: ["hello"] })).length, 3);
150150
const operation = batchedAtomic(kv);

‎blob.test.ts

+17-17
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Deno.test({
2727
async fn() {
2828
const kv = await setup();
2929
const blob = new Uint8Array(65_536);
30-
window.crypto.getRandomValues(blob);
30+
globalThis.crypto.getRandomValues(blob);
3131
const res = await set(kv, ["hello"], blob);
3232
assert(res.ok);
3333
assert(res.versionstamp);
@@ -46,7 +46,7 @@ Deno.test({
4646
async fn() {
4747
const kv = await setup();
4848
const u8 = new Uint8Array(65_536);
49-
window.crypto.getRandomValues(u8);
49+
globalThis.crypto.getRandomValues(u8);
5050
const blob = new DataView(u8.buffer);
5151
const res = await set(kv, ["hello"], blob);
5252
assert(res.ok);
@@ -66,7 +66,7 @@ Deno.test({
6666
async fn() {
6767
const kv = await setup();
6868
const data = new Uint8Array(65_536);
69-
window.crypto.getRandomValues(data);
69+
globalThis.crypto.getRandomValues(data);
7070
const blob = new Blob([data]);
7171
const res = await set(kv, ["hello"], blob.stream());
7272
assert(res.ok);
@@ -85,7 +85,7 @@ Deno.test({
8585
async fn() {
8686
const kv = await setup();
8787
const data = new Uint8Array(65_536);
88-
window.crypto.getRandomValues(data);
88+
globalThis.crypto.getRandomValues(data);
8989
const blob = new Blob([data], { type: "application/octet-stream" });
9090
const res = await set(kv, ["hello"], blob);
9191
assert(res.ok);
@@ -110,7 +110,7 @@ Deno.test({
110110
async fn() {
111111
const kv = await setup();
112112
const data = new Uint8Array(65_536);
113-
window.crypto.getRandomValues(data);
113+
globalThis.crypto.getRandomValues(data);
114114
const blob = new File([data], "test.bin", {
115115
type: "application/octet-stream",
116116
lastModified: 12345678,
@@ -140,7 +140,7 @@ Deno.test({
140140
async fn() {
141141
const kv = await setup();
142142
const blob = new Uint8Array(65_536);
143-
window.crypto.getRandomValues(blob);
143+
globalThis.crypto.getRandomValues(blob);
144144
const res = await set(kv, ["hello"], blob);
145145
assert(res.ok);
146146
const actual = await keys(kv, { prefix: ["hello"] });
@@ -207,7 +207,7 @@ Deno.test({
207207
async fn() {
208208
const kv = await setup();
209209
const blob = new Uint8Array(65_536);
210-
window.crypto.getRandomValues(blob);
210+
globalThis.crypto.getRandomValues(blob);
211211
await set(kv, ["hello"], blob);
212212
const actual = await get(kv, ["hello"]);
213213
assert(actual.value);
@@ -221,7 +221,7 @@ Deno.test({
221221
async fn() {
222222
const kv = await setup();
223223
const blob = new Uint8Array(65_536);
224-
window.crypto.getRandomValues(blob);
224+
globalThis.crypto.getRandomValues(blob);
225225
await set(kv, ["hello"], blob);
226226
const entry = await get(kv, ["hello"], { stream: true });
227227
assert(entry.value);
@@ -239,7 +239,7 @@ Deno.test({
239239
async fn() {
240240
const kv = await setup();
241241
const blob = new Uint8Array(65_536);
242-
window.crypto.getRandomValues(blob);
242+
globalThis.crypto.getRandomValues(blob);
243243
await set(kv, ["hello"], blob);
244244
const stream = getAsStream(kv, ["hello"]);
245245
let count = 0;
@@ -353,7 +353,7 @@ Deno.test({
353353
async fn() {
354354
const kv = await setup();
355355
const u8 = new Uint8Array(65_536);
356-
window.crypto.getRandomValues(u8);
356+
globalThis.crypto.getRandomValues(u8);
357357
await set(kv, ["hello"], u8);
358358
const json = await getAsJSON(kv, ["hello"]);
359359
assert(json);
@@ -368,7 +368,7 @@ Deno.test({
368368
async fn() {
369369
const kv = await setup();
370370
const u8 = new Uint8Array(65_536);
371-
window.crypto.getRandomValues(u8);
371+
globalThis.crypto.getRandomValues(u8);
372372
await set(
373373
kv,
374374
["hello"],
@@ -391,7 +391,7 @@ Deno.test({
391391
async fn() {
392392
const kv = await setup();
393393
const u8 = new Uint8Array(65_536);
394-
window.crypto.getRandomValues(u8);
394+
globalThis.crypto.getRandomValues(u8);
395395
await set(
396396
kv,
397397
["hello"],
@@ -419,7 +419,7 @@ Deno.test({
419419
async fn() {
420420
const kv = await setup();
421421
const u8 = new Uint8Array(65_536);
422-
window.crypto.getRandomValues(u8);
422+
globalThis.crypto.getRandomValues(u8);
423423
await set(kv, ["hello"], u8);
424424
const meta = await getMeta(kv, ["hello"]);
425425
assert(meta);
@@ -432,7 +432,7 @@ Deno.test({
432432
name: "toJSON/toValue - File",
433433
async fn() {
434434
const u8 = new Uint8Array(65_536);
435-
window.crypto.getRandomValues(u8);
435+
globalThis.crypto.getRandomValues(u8);
436436
const json = await toJSON(
437437
new File([u8], "test.bin", {
438438
type: "application/octet-stream",
@@ -459,7 +459,7 @@ Deno.test({
459459
name: "toJSON/toValue - Blob",
460460
async fn() {
461461
const u8 = new Uint8Array(65_536);
462-
window.crypto.getRandomValues(u8);
462+
globalThis.crypto.getRandomValues(u8);
463463
const json = await toJSON(
464464
new Blob([u8], { type: "application/octet-stream" }),
465465
);
@@ -477,7 +477,7 @@ Deno.test({
477477
name: "toJSON/toValue - buffer",
478478
async fn() {
479479
const u8 = new Uint8Array(65_536);
480-
window.crypto.getRandomValues(u8);
480+
globalThis.crypto.getRandomValues(u8);
481481
const json = await toJSON(u8);
482482
assertEquals(json.meta, { kind: "buffer" });
483483
assertEquals(json.parts.length, 2);
@@ -541,7 +541,7 @@ Deno.test({
541541
async fn() {
542542
const kv = await setup();
543543
const data = new Uint8Array(65_536);
544-
window.crypto.getRandomValues(data);
544+
globalThis.crypto.getRandomValues(data);
545545
await set(kv, ["hello"], new Blob([data]));
546546
assertEquals((await keys(kv, { prefix: ["hello"] })).length, 3);
547547
await remove(kv, ["hello"]);

‎blob.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@
6565
* @module
6666
*/
6767

68-
import { concat } from "jsr:@std/bytes@0.224/concat";
68+
import { concat } from "jsr:@std/bytes@~1/concat";
6969
import {
7070
decodeBase64Url,
7171
encodeBase64Url,
72-
} from "jsr:@std/encoding@0.224/base64url";
73-
import { extension } from "jsr:@std/media-types@0.224/extension";
72+
} from "jsr:@std/encoding@~1/base64url";
73+
import { extension } from "jsr:@std/media-types@~1/extension";
7474

7575
import { batchedAtomic } from "./batched_atomic.ts";
7676
import {
@@ -436,12 +436,12 @@ export function getAsJSON(
436436
* await kv.close();
437437
* ```
438438
*/
439-
export async function getMeta(
439+
export function getMeta(
440440
kv: Deno.Kv,
441441
key: Deno.KvKey,
442442
options: { consistency?: Deno.KvConsistencyLevel | undefined } = {},
443443
): Promise<Deno.KvEntryMaybe<BlobMeta>> {
444-
return await asMeta(kv, key, options);
444+
return asMeta(kv, key, options);
445445
}
446446

447447
/** Options which can be used when calling {@linkcode getAsResponse}. */

‎crypto.test.ts

+9-8
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Deno.test({
1414
const kv = await setup();
1515
const key = generateKey();
1616
const cryptoKv = new CryptoKv(kv, key);
17-
const value = window.crypto.getRandomValues(new Uint8Array(65_536));
17+
const value = globalThis.crypto.getRandomValues(new Uint8Array(65_536));
1818
const res = await cryptoKv.setBlob(["example"], value);
1919
assert(res.ok);
2020
const actual = await cryptoKv.getBlob(["example"]);
@@ -31,7 +31,8 @@ Deno.test({
3131
const kv = await setup();
3232
const key = generateKey();
3333
const cryptoKv = new CryptoKv(kv, key);
34-
const value = window.crypto.getRandomValues(new Uint8Array(65_536)).buffer;
34+
const value =
35+
globalThis.crypto.getRandomValues(new Uint8Array(65_536)).buffer;
3536
const res = await cryptoKv.setBlob(["example"], value);
3637
assert(res.ok);
3738
const actual = await cryptoKv.getBlob(["example"]);
@@ -48,7 +49,7 @@ Deno.test({
4849
const kv = await setup();
4950
const key = generateKey();
5051
const cryptoKv = new CryptoKv(kv, key);
51-
const part = window.crypto.getRandomValues(new Uint8Array(65_536));
52+
const part = globalThis.crypto.getRandomValues(new Uint8Array(65_536));
5253
const value = new Blob([part], { type: "text/plain" });
5354
const res = await cryptoKv.setBlob(["example"], value);
5455
assert(res.ok);
@@ -66,7 +67,7 @@ Deno.test({
6667
const kv = await setup();
6768
const key = generateKey();
6869
const cryptoKv = new CryptoKv(kv, key);
69-
const part = window.crypto.getRandomValues(new Uint8Array(65_536));
70+
const part = globalThis.crypto.getRandomValues(new Uint8Array(65_536));
7071
const value = new File([part], "test.bin", { type: "text/plain" });
7172
const res = await cryptoKv.setBlob(["example"], value);
7273
assert(res.ok);
@@ -84,7 +85,7 @@ Deno.test({
8485
const kv = await setup();
8586
const key = generateKey();
8687
const cryptoKv = new CryptoKv(kv, key);
87-
const part = window.crypto.getRandomValues(new Uint8Array(65_536));
88+
const part = globalThis.crypto.getRandomValues(new Uint8Array(65_536));
8889
const value = new File([part], "test.bin", { type: "text/plain" });
8990
const res = await cryptoKv.setBlob(["example"], value);
9091
assert(res.ok);
@@ -104,7 +105,7 @@ Deno.test({
104105
const kv = await setup();
105106
const key = generateKey();
106107
const cryptoKv = new CryptoKv(kv, key);
107-
const part = window.crypto.getRandomValues(new Uint8Array(65_536));
108+
const part = globalThis.crypto.getRandomValues(new Uint8Array(65_536));
108109
const value = new File([part], "test.bin", { type: "text/plain" });
109110
const res = await cryptoKv.setBlob(["example"], value);
110111
assert(res.ok);
@@ -123,7 +124,7 @@ Deno.test({
123124
const kv = await setup();
124125
const key = generateKey();
125126
const cryptoKv = new CryptoKv(kv, key);
126-
const part = window.crypto.getRandomValues(new Uint8Array(65_536));
127+
const part = globalThis.crypto.getRandomValues(new Uint8Array(65_536));
127128
const value = new File([part], "test.bin", { type: "text/plain" });
128129
const res = await cryptoKv.setBlob(["example"], value);
129130
assert(res.ok);
@@ -141,7 +142,7 @@ Deno.test({
141142
const kv = await setup();
142143
const key = generateKey();
143144
const cryptoKv = new CryptoKv(kv, key);
144-
const part = window.crypto.getRandomValues(new Uint8Array(65_536));
145+
const part = globalThis.crypto.getRandomValues(new Uint8Array(65_536));
145146
const value = new File([part], "test.bin", { type: "text/plain" });
146147
const res = await cryptoKv.setBlob(["example"], value);
147148
assert(res.ok);

0 commit comments

Comments
 (0)