From 3ac9f1e209c3bb10cbb3c0a49077877a5bc5e2eb Mon Sep 17 00:00:00 2001 From: Casper Beyer Date: Thu, 24 Sep 2020 02:09:09 +0800 Subject: [PATCH] fix(std/fs): mark createWalkEntry(Sync) as internal (#7643) --- std/fs/expand_glob.ts | 12 ++++++------ std/fs/walk.ts | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/std/fs/expand_glob.ts b/std/fs/expand_glob.ts index 267d7a8c04..c57ddef45d 100644 --- a/std/fs/expand_glob.ts +++ b/std/fs/expand_glob.ts @@ -10,8 +10,8 @@ import { } from "../path/mod.ts"; import { WalkEntry, - createWalkEntry, - createWalkEntrySync, + _createWalkEntry, + _createWalkEntrySync, walk, walkSync, } from "./walk.ts"; @@ -104,7 +104,7 @@ export async function* expandGlob( let fixedRootInfo: WalkEntry; try { - fixedRootInfo = await createWalkEntry(fixedRoot); + fixedRootInfo = await _createWalkEntry(fixedRoot); } catch (error) { return throwUnlessNotFound(error); } @@ -119,7 +119,7 @@ export async function* expandGlob( const parentPath = joinGlobs([walkInfo.path, ".."], globOptions); try { if (shouldInclude(parentPath)) { - return yield await createWalkEntry(parentPath); + return yield await _createWalkEntry(parentPath); } } catch (error) { throwUnlessNotFound(error); @@ -211,7 +211,7 @@ export function* expandGlobSync( let fixedRootInfo: WalkEntry; try { - fixedRootInfo = createWalkEntrySync(fixedRoot); + fixedRootInfo = _createWalkEntrySync(fixedRoot); } catch (error) { return throwUnlessNotFound(error); } @@ -226,7 +226,7 @@ export function* expandGlobSync( const parentPath = joinGlobs([walkInfo.path, ".."], globOptions); try { if (shouldInclude(parentPath)) { - return yield createWalkEntrySync(parentPath); + return yield _createWalkEntrySync(parentPath); } } catch (error) { throwUnlessNotFound(error); diff --git a/std/fs/walk.ts b/std/fs/walk.ts index 06d889b0e4..4ae85ff75a 100644 --- a/std/fs/walk.ts +++ b/std/fs/walk.ts @@ -4,7 +4,7 @@ import { assert } from "../_util/assert.ts"; import { basename, join, normalize } from "../path/mod.ts"; -export function createWalkEntrySync(path: string): WalkEntry { +export function _createWalkEntrySync(path: string): WalkEntry { path = normalize(path); const name = basename(path); const info = Deno.statSync(path); @@ -17,7 +17,7 @@ export function createWalkEntrySync(path: string): WalkEntry { }; } -export async function createWalkEntry(path: string): Promise { +export async function _createWalkEntry(path: string): Promise { path = normalize(path); const name = basename(path); const info = await Deno.stat(path); @@ -98,7 +98,7 @@ export async function* walk( return; } if (includeDirs && include(root, exts, match, skip)) { - yield await createWalkEntry(root); + yield await _createWalkEntry(root); } if (maxDepth < 1 || !include(root, undefined, undefined, skip)) { return; @@ -151,7 +151,7 @@ export function* walkSync( return; } if (includeDirs && include(root, exts, match, skip)) { - yield createWalkEntrySync(root); + yield _createWalkEntrySync(root); } if (maxDepth < 1 || !include(root, undefined, undefined, skip)) { return;