|
1 | 1 | import assert from "node:assert"; |
2 | | -import { buffer } from "node:stream/consumers"; |
| 2 | +import { buffer, text } from "node:stream/consumers"; |
3 | 3 | import { describe, it, mock } from "node:test"; |
4 | | -import { CompressionMethod } from "../core/compression-core.js"; |
5 | | -import { ZipPlatform, ZipVersion } from "../core/constants.js"; |
6 | | -import { UnixFileAttributes } from "../core/file-attributes.js"; |
7 | | -import { ZipEntry } from "../core/zip-entry.js"; |
8 | 4 | import { |
9 | 5 | EmptyZip32, |
10 | 6 | Zip32WithThreeEntries, |
11 | 7 | generateZip, |
12 | | -} from "../test-util/fixtures.js"; |
13 | | -import { ZipBufferReader } from "./buffer.js"; |
| 8 | +} from "../test-util/fixtures.ts"; |
| 9 | +import { ZipBufferReader } from "./buffer.ts"; |
| 10 | +import { ZipEntry, ZipEntryReader } from "./entry.ts"; |
| 11 | +import { CompressionMethod, ZipPlatform, ZipVersion } from "./raw/constants.ts"; |
| 12 | +import { UnixFileAttributes } from "./raw/file-attributes.ts"; |
14 | 13 |
|
15 | 14 | describe("web/buffer", () => { |
16 | 15 | describe("ZipBufferReader", () => { |
@@ -44,7 +43,7 @@ describe("web/buffer", () => { |
44 | 43 | it("iterates all the files", async () => { |
45 | 44 | const reader = new ZipBufferReader(Zip32WithThreeEntries); |
46 | 45 |
|
47 | | - const files: ZipEntry[] = []; |
| 46 | + const files: ZipEntryReader[] = []; |
48 | 47 | for (const file of reader.filesSync()) { |
49 | 48 | files.push(file); |
50 | 49 | } |
@@ -80,7 +79,7 @@ describe("web/buffer", () => { |
80 | 79 | assert.strictEqual(file0.isDirectory, false); |
81 | 80 | assert.strictEqual(file0.isFile, true); |
82 | 81 |
|
83 | | - assert.strictEqual(await file0.toText(), "this is the file 1 content"); |
| 82 | + assert.strictEqual(await text(file0), "this is the file 1 content"); |
84 | 83 |
|
85 | 84 | //// FILE 1 |
86 | 85 | const file1 = files[1]; |
@@ -111,10 +110,7 @@ describe("web/buffer", () => { |
111 | 110 | assert.strictEqual(file1.isDirectory, false); |
112 | 111 | assert.strictEqual(file1.isFile, true); |
113 | 112 |
|
114 | | - assert.strictEqual( |
115 | | - await file1.toText(), |
116 | | - "file 2 content goes right here", |
117 | | - ); |
| 113 | + assert.strictEqual(await text(file1), "file 2 content goes right here"); |
118 | 114 |
|
119 | 115 | //// FILE 2 |
120 | 116 | const file2 = files[2]; |
@@ -144,7 +140,7 @@ describe("web/buffer", () => { |
144 | 140 | assert.strictEqual(file2.isDirectory, true); |
145 | 141 | assert.strictEqual(file2.isFile, false); |
146 | 142 |
|
147 | | - assert.strictEqual(await file2.toText(), ""); |
| 143 | + assert.strictEqual(await text(file2), ""); |
148 | 144 | }); |
149 | 145 | }); |
150 | 146 |
|
|
0 commit comments