Skip to content

Commit 931c3c7

Browse files
committed
change interface name
1 parent fbd3979 commit 931c3c7

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

src/deno_ext/smtp.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {createTransport} from "../../deps.ts";
2-
import {type DataMap} from "../pure/minipack.ts";
2+
import {type DataEntry} from "../pure/minipack.ts";
33

44
/**
55
* E-MAIL message.
@@ -11,7 +11,7 @@ export interface MailMessage {
1111
body: string;
1212
cc?: string[];
1313
bcc?: string[];
14-
files?: DataMap[];
14+
files?: DataEntry[];
1515
}
1616

1717
/**

src/pure/fetch.ts

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
interface ResponseType {
1+
interface ReturnTypeMap {
22
"text": string;
33
"json": unknown;
44
"form": FormData;
@@ -29,7 +29,7 @@ export interface FetchInit extends Omit<RequestInit, "integrity" | "window"> {
2929
* const response = await fetchExtend("./asset", "byte");
3030
* ```
3131
*/
32-
export async function fetchExtend<T extends keyof ResponseType>(path: string, type: T, option?: FetchInit): Promise<ResponseType[T]> {
32+
export async function fetchExtend<T extends keyof ReturnTypeMap>(path: string, type: T, option?: FetchInit): Promise<ReturnTypeMap[T]> {
3333
const u = new URL(path, globalThis?.location?.href);
3434
u.hash = "";
3535

@@ -52,17 +52,17 @@ export async function fetchExtend<T extends keyof ResponseType>(path: string, ty
5252
});
5353

5454
switch(type) {
55-
case "text": return <ResponseType[T]>await response.text();
56-
case "json": return <ResponseType[T]>await response.json();
57-
case "form": return <ResponseType[T]>await response.formData();
58-
case "byte": return <ResponseType[T]>new Uint8Array(await response.arrayBuffer());
59-
case "buffer": return <ResponseType[T]>await response.arrayBuffer();
60-
case "blob": return <ResponseType[T]>await response.blob();
61-
case "stream": return <ResponseType[T]>(response.body ?? undefined);
62-
case "ok": await response.body?.cancel(); return <ResponseType[T]>response.ok;
63-
case "code": await response.body?.cancel(); return <ResponseType[T]>response.status;
64-
case "header": await response.body?.cancel(); return <ResponseType[T]>response.headers;
65-
case "response": return <ResponseType[T]>response;
55+
case "text": return <ReturnTypeMap[T]> await response.text();
56+
case "json": return <ReturnTypeMap[T]> await response.json();
57+
case "form": return <ReturnTypeMap[T]> await response.formData();
58+
case "byte": return <ReturnTypeMap[T]> new Uint8Array(await response.arrayBuffer());
59+
case "buffer": return <ReturnTypeMap[T]> await response.arrayBuffer();
60+
case "blob": return <ReturnTypeMap[T]> await response.blob();
61+
case "stream": return <ReturnTypeMap[T]> (response.body ?? undefined);
62+
case "ok": await response.body?.cancel(); return <ReturnTypeMap[T]> response.ok;
63+
case "code": await response.body?.cancel(); return <ReturnTypeMap[T]> response.status;
64+
case "header": await response.body?.cancel(); return <ReturnTypeMap[T]> response.headers;
65+
case "response": return <ReturnTypeMap[T]> response;
6666
default: throw new Error();
6767
}
6868
}

src/pure/minipack.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const BODY_SIZE = 4;
66
/**
77
* Simple name and body pair.
88
*/
9-
export interface DataMap {
9+
export interface DataEntry {
1010
name: string;
1111
body: Uint8Array;
1212
}
@@ -24,7 +24,7 @@ export interface DataMap {
2424
* const decode = minipackDecode(encode);
2525
* ```
2626
*/
27-
export function minipackEncode(files: DataMap[]): Uint8Array {
27+
export function minipackEncode(files: DataEntry[]): Uint8Array {
2828
const archive = new Uint8Array(files.reduce((size, {name, body}) => size + NAME_SIZE + BODY_SIZE + textEncode(name).byteLength + body.byteLength, 0));
2929

3030
let i = 0;
@@ -60,8 +60,8 @@ export function minipackEncode(files: DataMap[]): Uint8Array {
6060
* const decode = minipackDecode(encode);
6161
* ```
6262
*/
63-
export function minipackDecode(archive: Uint8Array): DataMap[] {
64-
const files: DataMap[] = [];
63+
export function minipackDecode(archive: Uint8Array): DataEntry[] {
64+
const files: DataEntry[] = [];
6565

6666
for(let i = 0; i < archive.byteLength;) {
6767
const ns = new DataView(archive.buffer, i).getUint8(0);

src/pure_ext/zip.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {ZipReader, ZipWriter, Uint8ArrayReader, Uint8ArrayWriter} from "../../deps.pure.ts";
2-
import {type DataMap} from "../pure/minipack.ts";
2+
import {type DataEntry} from "../pure/minipack.ts";
33

44
/**
55
* Convert from named binary to ZIP archive.
@@ -14,7 +14,7 @@ import {type DataMap} from "../pure/minipack.ts";
1414
* const files = await zipDecode(zip);
1515
* ```
1616
*/
17-
export async function zipEncode(files: DataMap[], pw?: string, weak?: boolean): Promise<Uint8Array> {
17+
export async function zipEncode(files: DataEntry[], pw?: string, weak?: boolean): Promise<Uint8Array> {
1818
const zip = new ZipWriter(new Uint8ArrayWriter(), {
1919
password: pw,
2020
zipCrypto: weak
@@ -42,8 +42,8 @@ export async function zipEncode(files: DataMap[], pw?: string, weak?: boolean):
4242
* const files = await zipDecode(zip);
4343
* ```
4444
*/
45-
export async function zipDecode(archive: Uint8Array, pw?: string, encode?: string): Promise<DataMap[]> {
46-
const files: DataMap[] = [];
45+
export async function zipDecode(archive: Uint8Array, pw?: string, encode?: string): Promise<DataEntry[]> {
46+
const files: DataEntry[] = [];
4747
const zip = new ZipReader(new Uint8ArrayReader(archive), {
4848
useWebWorkers: false,
4949
filenameEncoding: encode,

0 commit comments

Comments
 (0)