mirror of
https://github.com/denoland/deno.git
synced 2024-12-11 18:17:48 -05:00
ce75e31625
This commit changes "include_js_files!" macro from "deno_core" in a way that "dir" option doesn't cause specifiers to be rewritten to include it. Example: ``` include_js_files! { dir "js", "hello.js", } ``` The above definition required embedders to use: `import ... from "internal:<ext_name>/js/hello.js"`. But with this change, the "js" directory in which the files are stored is an implementation detail, which for embedders results in: `import ... from "internal:<ext_name>/hello.js"`. The directory the files are stored in, is an implementation detail and in some cases might result in a significant size difference for the snapshot. As an example, in "deno_node" extension, we store the source code in "polyfills" directory; which resulted in each specifier to look like "internal:deno_node/polyfills/<module_name>", but with this change it's "internal:deno_node/<module_name>". Given that "deno_node" has over 100 files, many of them having several import specifiers to the same extension, this change removes 10 characters from each import specifier.
142 lines
4.1 KiB
TypeScript
142 lines
4.1 KiB
TypeScript
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
|
|
|
import {
|
|
TextDecoder,
|
|
TextEncoder,
|
|
} from "internal:deno_web/08_text_encoding.js";
|
|
import { asyncIterableToCallback } from "internal:deno_node/_fs/_fs_watch.ts";
|
|
import Dirent from "internal:deno_node/_fs/_fs_dirent.ts";
|
|
import { denoErrorToNodeError } from "internal:deno_node/internal/errors.ts";
|
|
import { getValidatedPath } from "internal:deno_node/internal/fs/utils.mjs";
|
|
import { Buffer } from "internal:deno_node/buffer.ts";
|
|
import { promisify } from "internal:deno_node/internal/util.mjs";
|
|
|
|
function toDirent(val: Deno.DirEntry): Dirent {
|
|
return new Dirent(val);
|
|
}
|
|
|
|
type readDirOptions = {
|
|
encoding?: string;
|
|
withFileTypes?: boolean;
|
|
};
|
|
|
|
type readDirCallback = (err: Error | null, files: string[]) => void;
|
|
|
|
type readDirCallbackDirent = (err: Error | null, files: Dirent[]) => void;
|
|
|
|
type readDirBoth = (
|
|
...args: [Error] | [null, string[] | Dirent[] | Array<string | Dirent>]
|
|
) => void;
|
|
|
|
export function readdir(
|
|
path: string | Buffer | URL,
|
|
options: { withFileTypes?: false; encoding?: string },
|
|
callback: readDirCallback,
|
|
): void;
|
|
export function readdir(
|
|
path: string | Buffer | URL,
|
|
options: { withFileTypes: true; encoding?: string },
|
|
callback: readDirCallbackDirent,
|
|
): void;
|
|
export function readdir(path: string | URL, callback: readDirCallback): void;
|
|
export function readdir(
|
|
path: string | Buffer | URL,
|
|
optionsOrCallback: readDirOptions | readDirCallback | readDirCallbackDirent,
|
|
maybeCallback?: readDirCallback | readDirCallbackDirent,
|
|
) {
|
|
const callback =
|
|
(typeof optionsOrCallback === "function"
|
|
? optionsOrCallback
|
|
: maybeCallback) as readDirBoth | undefined;
|
|
const options = typeof optionsOrCallback === "object"
|
|
? optionsOrCallback
|
|
: null;
|
|
const result: Array<string | Dirent> = [];
|
|
path = getValidatedPath(path);
|
|
|
|
if (!callback) throw new Error("No callback function supplied");
|
|
|
|
if (options?.encoding) {
|
|
try {
|
|
new TextDecoder(options.encoding);
|
|
} catch {
|
|
throw new Error(
|
|
`TypeError [ERR_INVALID_OPT_VALUE_ENCODING]: The value "${options.encoding}" is invalid for option "encoding"`,
|
|
);
|
|
}
|
|
}
|
|
|
|
try {
|
|
asyncIterableToCallback(Deno.readDir(path.toString()), (val, done) => {
|
|
if (typeof path !== "string") return;
|
|
if (done) {
|
|
callback(null, result);
|
|
return;
|
|
}
|
|
if (options?.withFileTypes) {
|
|
result.push(toDirent(val));
|
|
} else result.push(decode(val.name));
|
|
}, (e) => {
|
|
callback(denoErrorToNodeError(e as Error, { syscall: "readdir" }));
|
|
});
|
|
} catch (e) {
|
|
callback(denoErrorToNodeError(e as Error, { syscall: "readdir" }));
|
|
}
|
|
}
|
|
|
|
function decode(str: string, encoding?: string): string {
|
|
if (!encoding) return str;
|
|
else {
|
|
const decoder = new TextDecoder(encoding);
|
|
const encoder = new TextEncoder();
|
|
return decoder.decode(encoder.encode(str));
|
|
}
|
|
}
|
|
|
|
export const readdirPromise = promisify(readdir) as (
|
|
& ((path: string | Buffer | URL, options: {
|
|
withFileTypes: true;
|
|
encoding?: string;
|
|
}) => Promise<Dirent[]>)
|
|
& ((path: string | Buffer | URL, options?: {
|
|
withFileTypes?: false;
|
|
encoding?: string;
|
|
}) => Promise<string[]>)
|
|
);
|
|
|
|
export function readdirSync(
|
|
path: string | Buffer | URL,
|
|
options: { withFileTypes: true; encoding?: string },
|
|
): Dirent[];
|
|
export function readdirSync(
|
|
path: string | Buffer | URL,
|
|
options?: { withFileTypes?: false; encoding?: string },
|
|
): string[];
|
|
export function readdirSync(
|
|
path: string | Buffer | URL,
|
|
options?: readDirOptions,
|
|
): Array<string | Dirent> {
|
|
const result = [];
|
|
path = getValidatedPath(path);
|
|
|
|
if (options?.encoding) {
|
|
try {
|
|
new TextDecoder(options.encoding);
|
|
} catch {
|
|
throw new Error(
|
|
`TypeError [ERR_INVALID_OPT_VALUE_ENCODING]: The value "${options.encoding}" is invalid for option "encoding"`,
|
|
);
|
|
}
|
|
}
|
|
|
|
try {
|
|
for (const file of Deno.readDirSync(path.toString())) {
|
|
if (options?.withFileTypes) {
|
|
result.push(toDirent(file));
|
|
} else result.push(decode(file.name));
|
|
}
|
|
} catch (e) {
|
|
throw denoErrorToNodeError(e as Error, { syscall: "readdir" });
|
|
}
|
|
return result;
|
|
}
|