foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-01 16:51:13 -05:00
Code Issues Packages 1 Wiki Activity

Move getHeaderValueParams & hasHeaderValueOf to util.ts (#5824)

Browse source
This commit is contained in:
Marcos Casagrande 2020-05-25 15:12:09 +02:00 committed by GitHub
parent 131f2a5f0c
commit 20bf04dc7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cli/js/web/body.ts
View file

@ -2,6 +2,7 @@ import * as blob from "./blob.ts";
import * as encoding from "./text_encoding.ts"; import * as encoding from "./text_encoding.ts";
import * as domTypes from "./dom_types.d.ts"; import * as domTypes from "./dom_types.d.ts";
import { ReadableStreamImpl } from "./streams/readable_stream.ts"; import { ReadableStreamImpl } from "./streams/readable_stream.ts";
import { getHeaderValueParams, hasHeaderValueOf } from "./util.ts";
// only namespace imports work for now, plucking out what we need // only namespace imports work for now, plucking out what we need
const { TextEncoder, TextDecoder } = encoding; const { TextEncoder, TextDecoder } = encoding;
@ -90,23 +91,6 @@ function bufferFromStream(stream: ReadableStreamReader): Promise<ArrayBuffer> {
}); });
} }
function getHeaderValueParams(value: string): Map<string, string> {
const params = new Map();
// Forced to do so for some Map constructor param mismatch
value
.split(";")
.slice(1)
.map((s): string[] => s.trim().split("="))
.filter((arr): boolean => arr.length > 1)
.map(([k, v]): [string, string] => [k, v.replace(/^"([^"]*)"$/, "$1")])
.forEach(([k, v]): Map<string, string> => params.set(k, v));
return params;
}
function hasHeaderValueOf(s: string, value: string): boolean {
return new RegExp(`^${value}[\t\s]*;?`).test(s);
}
export const BodyUsedError = export const BodyUsedError =
"Failed to execute 'clone' on 'Body': body is already used"; "Failed to execute 'clone' on 'Body': body is already used";

18
cli/js/web/fetch.ts
View file

@ -10,23 +10,7 @@ import { close } from "../ops/resources.ts";
import { Buffer } from "../buffer.ts"; import { Buffer } from "../buffer.ts";
import { fetch as opFetch, FetchResponse } from "../ops/fetch.ts"; import { fetch as opFetch, FetchResponse } from "../ops/fetch.ts";
import { DomFileImpl } from "./dom_file.ts"; import { DomFileImpl } from "./dom_file.ts";
import { getHeaderValueParams, hasHeaderValueOf } from "./util.ts";
function getHeaderValueParams(value: string): Map<string, string> {
const params = new Map();
// Forced to do so for some Map constructor param mismatch
value
.split(";")
.slice(1)
.map((s): string[] => s.trim().split("="))
.filter((arr): boolean => arr.length > 1)
.map(([k, v]): [string, string] => [k, v.replace(/^"([^"]*)"$/, "$1")])
.forEach(([k, v]): Map<string, string> => params.set(k, v));
return params;
}
function hasHeaderValueOf(s: string, value: string): boolean {
return new RegExp(`^${value}[\t\s]*;?`).test(s);
}
class Body class Body
implements domTypes.Body, ReadableStream<Uint8Array>, io.Reader, io.Closer { implements domTypes.Body, ReadableStream<Uint8Array>, io.Reader, io.Closer {

19
cli/js/web/util.ts
View file

@ -189,3 +189,22 @@ export function defineEnumerableProps(
Reflect.defineProperty(Ctor.prototype, prop, { enumerable: true }); Reflect.defineProperty(Ctor.prototype, prop, { enumerable: true });
} }
} }
// @internal
export function getHeaderValueParams(value: string): Map<string, string> {
const params = new Map();
// Forced to do so for some Map constructor param mismatch
value
.split(";")
.slice(1)
.map((s): string[] => s.trim().split("="))
.filter((arr): boolean => arr.length > 1)
.map(([k, v]): [string, string] => [k, v.replace(/^"([^"]*)"$/, "$1")])
.forEach(([k, v]): Map<string, string> => params.set(k, v));
return params;
}
// @internal
export function hasHeaderValueOf(s: string, value: string): boolean {
return new RegExp(`^${value}[\t\s]*;?`).test(s);
}