Skip to content

fix(ext/node): use primordials in ext/node/polyfills/_fs/_fs_mkdtemp.ts #29072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 7, 2025
Merged

fix(ext/node): use primordials in ext/node/polyfills/_fs/_fs_mkdtemp.ts #29072

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81a90af
fix(ext/node): use primordials in ext/node/polyfills/_fs/_fs_mkdtemp.ts
efekrskl Apr 28, 2025
e958ce5
refactor(ext/node): fmt
efekrskl Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 34 additions & 10 deletions ext/node/polyfills/_fs/_fs_mkdtemp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
// Copyright 2018-2025 the Deno authors. MIT license.
// Copyright Node.js contributors. All rights reserved. MIT License.

// TODO(petamoriken): enable prefer-primordials for node polyfills
// deno-lint-ignore-file prefer-primordials

import { TextDecoder, TextEncoder } from "ext:deno_web/08_text_encoding.js";
import { existsSync } from "ext:deno_node/_fs/_fs_exists.ts";
import { mkdir, mkdirSync } from "ext:deno_node/_fs/_fs_mkdir.ts";
Expand All @@ -12,6 +9,18 @@ import {
ERR_INVALID_OPT_VALUE_ENCODING,
} from "ext:deno_node/internal/errors.ts";
import { promisify } from "ext:deno_node/internal/util.mjs";
import { primordials } from "ext:core/mod.js";

const {
ObjectPrototypeIsPrototypeOf,
Array,
SafeArrayIterator,
MathRandom,
MathFloor,
ArrayPrototypeJoin,
ArrayPrototypeMap,
ObjectPrototype,
} = primordials;

export type mkdtempCallback = (
err: Error | null,
Expand Down Expand Up @@ -70,10 +79,13 @@ function parseEncoding(
optionsOrCallback?: { encoding: string } | string | mkdtempCallback,
): string | undefined {
let encoding: string | undefined;
if (typeof optionsOrCallback == "function") encoding = undefined;
else if (optionsOrCallback instanceof Object) {
encoding = optionsOrCallback?.encoding;
} else encoding = optionsOrCallback;
if (typeof optionsOrCallback === "function") {
encoding = undefined;
} else if (isOptionsObject(optionsOrCallback)) {
encoding = optionsOrCallback.encoding;
} else {
encoding = optionsOrCallback;
}

if (encoding) {
try {
Expand All @@ -97,9 +109,13 @@ function decode(str: string, encoding?: string): string {

const CHARS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
function randomName(): string {
return [...Array(6)].map(() =>
CHARS[Math.floor(Math.random() * CHARS.length)]
).join("");
return ArrayPrototypeJoin(
ArrayPrototypeMap(
[...new SafeArrayIterator(Array(6))],
() => CHARS[MathFloor(MathRandom() * CHARS.length)],
),
"",
);
}

function tempDirPath(prefix: string): string {
Expand All @@ -110,3 +126,11 @@ function tempDirPath(prefix: string): string {

return path;
}

function isOptionsObject(value: unknown): value is { encoding: string } {
return (
value !== null &&
typeof value === "object" &&
ObjectPrototypeIsPrototypeOf(ObjectPrototype, value)
);
}
Loading