refactor: make the code work under verbatimModuleSyntax (denoland#4406

)

* Start

* Update

* Format

* Revert deno.json change

---------

Co-authored-by: Asher Gomez <ashersaupingomez@gmail.com>

_tools/check_circular_submodule_dependencies.ts

@@ -1,5 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
-import { createGraph, ModuleGraphJson, ModuleJson } from "deno_graph";
+import { createGraph, type ModuleGraphJson, type ModuleJson } from "deno_graph";
 
 /**
  * Checks for circular dependencies in the std submodules.

archive/untar.ts

@@ -34,7 +34,7 @@ import {
   HEADER_LENGTH,
   readBlock,
   type TarMeta,
-  UstarFields,
+  type UstarFields,
   ustarStructure,
 } from "./_common.ts";
 import { readAll } from "../io/read_all.ts";

archive/untar_test.ts

@@ -5,7 +5,7 @@ import { Tar, type TarMeta } from "./tar.ts";
 import {
   TarEntry,
   type TarHeader,
-  TarMetaWithLinkName,
+  type TarMetaWithLinkName,
   Untar,
 } from "./untar.ts";
 import { Buffer } from "../io/buffer.ts";

async/debounce_test.ts

@@ -1,6 +1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 import { assertEquals, assertStrictEquals } from "../assert/mod.ts";
-import { debounce, DebouncedFunction } from "./debounce.ts";
+import { debounce, type DebouncedFunction } from "./debounce.ts";
 import { delay } from "./delay.ts";
 
 Deno.test("debounce() handles called", async function () {

cli/parse_args_test.ts

@@ -1,7 +1,7 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 import { assertEquals } from "../assert/mod.ts";
-import { Args, parseArgs, ParseOptions } from "./parse_args.ts";
-import { assertType, IsExact } from "../testing/types.ts";
+import { type Args, parseArgs, type ParseOptions } from "./parse_args.ts";
+import { assertType, type IsExact } from "../testing/types.ts";
 
 // flag boolean true (default all --args to boolean)
 Deno.test("parseArgs() handles true boolean flag", function () {

crypto/crypto.ts

@@ -109,7 +109,7 @@
  */
 
 import {
-  DigestAlgorithm as WasmDigestAlgorithm,
+  type DigestAlgorithm as WasmDigestAlgorithm,
   digestAlgorithms as wasmDigestAlgorithms,
   instantiateWasm,
 } from "./_wasm/mod.ts";

crypto/crypto_test.ts

@@ -2,7 +2,7 @@
 import { assert, assertEquals, assertInstanceOf, fail } from "../assert/mod.ts";
 import { crypto as stdCrypto } from "./mod.ts";
 import { repeat } from "../bytes/repeat.ts";
-import { DigestAlgorithm, digestAlgorithms } from "./_wasm/mod.ts";
+import { type DigestAlgorithm, digestAlgorithms } from "./_wasm/mod.ts";
 import { encodeHex } from "../encoding/hex.ts";
 
 const webCrypto = globalThis.crypto;

csv/parse_test.ts

@@ -5,7 +5,7 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
 import { assert, assertEquals, assertThrows } from "../assert/mod.ts";
-import { parse, ParseError, ParseOptions } from "./parse.ts";
+import { parse, ParseError, type ParseOptions } from "./parse.ts";
 import type { AssertTrue, IsExact } from "../testing/types.ts";
 
 const BYTE_ORDER_MARK = "\ufeff";

data_structures/_red_black_node.ts

@@ -1,7 +1,7 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 // This module is browser compatible.
 
-import { BinarySearchNode, Direction } from "./_binary_search_node.ts";
+import { BinarySearchNode, type Direction } from "./_binary_search_node.ts";
 export type { Direction };
 
 export class RedBlackNode<T> extends BinarySearchNode<T> {

data_structures/binary_heap_test.ts

@@ -2,7 +2,7 @@
 import { assert, assertEquals } from "../assert/mod.ts";
 import { BinaryHeap } from "./binary_heap.ts";
 import { ascend, descend } from "./comparators.ts";
-import { Container, MyMath } from "./_test_utils.ts";
+import { type Container, MyMath } from "./_test_utils.ts";
 
 Deno.test("BinaryHeap works with default descend comparator", () => {
   const maxHeap = new BinaryHeap<number>();

data_structures/red_black_tree.ts

@@ -3,7 +3,7 @@
 
 import { ascend } from "./comparators.ts";
 import { BinarySearchTree } from "./binary_search_tree.ts";
-import { Direction, RedBlackNode } from "./_red_black_node.ts";
+import { type Direction, RedBlackNode } from "./_red_black_node.ts";
 
 /**
  * A red-black tree. This is a kind of self-balancing binary search tree. The

data_structures/red_black_tree_test.ts

@@ -2,7 +2,7 @@
 import { assertEquals, assertStrictEquals } from "../assert/mod.ts";
 import { RedBlackTree } from "./red_black_tree.ts";
 import { ascend, descend } from "./comparators.ts";
-import { Container, MyMath } from "./_test_utils.ts";
+import { type Container, MyMath } from "./_test_utils.ts";
 
 Deno.test("RedBlackTree works as expected with default ascend comparator", () => {
   const trees = [

encoding/ascii85_test.ts

@@ -1,6 +1,10 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 import { assertEquals } from "../assert/mod.ts";
-import { Ascii85Standard, decodeAscii85, encodeAscii85 } from "./ascii85.ts";
+import {
+  type Ascii85Standard,
+  decodeAscii85,
+  encodeAscii85,
+} from "./ascii85.ts";
 type TestCases = Partial<{ [index in Ascii85Standard]: string[][] }>;
 const utf8encoder = new TextEncoder();
 const testCasesNoDelimiter: TestCases = {

expect/_assert_equals.ts

@@ -5,7 +5,7 @@
 import { AssertionError } from "../assert/assertion_error.ts";
 import { buildEqualErrorMessage } from "./_build_message.ts";
 import { equal } from "./_equal.ts";
-import { EqualOptions } from "./_types.ts";
+import type { EqualOptions } from "./_types.ts";
 
 /**
  * Make an assertion that `actual` and `expected` are equal, deeply. If not

expect/_assert_not_equals.ts

@@ -5,7 +5,7 @@
 import { AssertionError } from "../assert/assertion_error.ts";
 import { buildNotEqualErrorMessage } from "./_build_message.ts";
 import { equal } from "./_equal.ts";
-import { EqualOptions } from "./_types.ts";
+import type { EqualOptions } from "./_types.ts";
 
 /**
  * Make an assertion that `actual` and `expected` are not equal, deeply.

expect/_build_message.ts

@@ -4,7 +4,7 @@ import { red } from "../fmt/colors.ts";
 import { CAN_NOT_DISPLAY } from "./_constants.ts";
 import { buildMessage, diff, diffstr } from "./_diff.ts";
 import { format } from "./_format.ts";
-import { EqualOptions } from "./_types.ts";
+import type { EqualOptions } from "./_types.ts";
 
 type EqualErrorMessageOptions = Pick<
   EqualOptions,

expect/_custom_equality_tester.ts

@@ -1,6 +1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { Tester } from "./_types.ts";
+import type { Tester } from "./_types.ts";
 
 const customEqualityTesters: Tester[] = [];
 

expect/_equal.ts

@@ -2,7 +2,7 @@
 
 // This file is copied from `std/assert`.
 
-import { EqualOptions } from "./_types.ts";
+import type { EqualOptions } from "./_types.ts";
 
 function isKeyedCollection(x: unknown): x is Set<unknown> {
   return [Symbol.iterator, "size"].every((k) => k in (x as Set<unknown>));

expect/_matchers.ts

@@ -14,7 +14,7 @@ import { assertEquals } from "./_assert_equals.ts";
 import { assertNotEquals } from "./_assert_not_equals.ts";
 import { equal } from "./_equal.ts";
 import { format } from "./_format.ts";
-import { AnyConstructor, MatcherContext, MatchResult } from "./_types.ts";
+import type { AnyConstructor, MatcherContext, MatchResult } from "./_types.ts";
 import { getMockCalls } from "./_mock_util.ts";
 import { inspectArg, inspectArgs } from "./_inspect_args.ts";
 import { buildEqualOptions } from "./_utils.ts";

expect/_to_have_returned_with.ts

@@ -1,6 +1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { MatcherContext, MatchResult } from "./_types.ts";
+import type { MatcherContext, MatchResult } from "./_types.ts";
 import { AssertionError } from "../assert/assertion_error.ts";
 import { equal } from "../assert/equal.ts";
 import { getMockCalls } from "./_mock_util.ts";

expect/_utils.ts

@@ -1,6 +1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { EqualOptions, EqualOptionUtil } from "./_types.ts";
+import type { EqualOptions, EqualOptionUtil } from "./_types.ts";
 
 export function buildEqualOptions(options: EqualOptionUtil): EqualOptions {
   const { customMessage, customTesters = [], strictCheck } = options || {};

expect/fn.ts

@@ -2,7 +2,7 @@
 // Copyright 2019 Allain Lalonde. All rights reserved. ISC License.
 // deno-lint-ignore-file no-explicit-any ban-types
 
-import { MOCK_SYMBOL, MockCall } from "./_mock_util.ts";
+import { MOCK_SYMBOL, type MockCall } from "./_mock_util.ts";
 
 export function fn(...stubs: Function[]): Function {
   const calls: MockCall[] = [];

front_matter/any.ts

@@ -1,6 +1,10 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { createExtractor, type Extractor, Parser } from "./create_extractor.ts";
+import {
+  createExtractor,
+  type Extractor,
+  type Parser,
+} from "./create_extractor.ts";
 import { parse as parseYAML } from "../yaml/parse.ts";
 import { parse as parseTOML } from "../toml/parse.ts";
 

front_matter/create_extractor_test.ts

@@ -11,7 +11,7 @@ import {
   runExtractYAMLTests1,
   runExtractYAMLTests2,
 } from "./_test_utils.ts";
-import { createExtractor, Parser } from "./create_extractor.ts";
+import { createExtractor, type Parser } from "./create_extractor.ts";
 
 const extractYAML = createExtractor({ "yaml": parseYAML as Parser });
 const extractTOML = createExtractor({ "toml": parseTOML as Parser });

front_matter/json.ts

@@ -1,6 +1,10 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { createExtractor, type Extractor, Parser } from "./create_extractor.ts";
+import {
+  createExtractor,
+  type Extractor,
+  type Parser,
+} from "./create_extractor.ts";
 
 export const extract: Extractor = createExtractor({
   json: JSON.parse as Parser,

front_matter/toml.ts

@@ -1,6 +1,10 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { createExtractor, type Extractor, Parser } from "./create_extractor.ts";
+import {
+  createExtractor,
+  type Extractor,
+  type Parser,
+} from "./create_extractor.ts";
 import { parse } from "../toml/parse.ts";
 
 export const extract: Extractor = createExtractor({

front_matter/yaml.ts

@@ -1,6 +1,10 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { createExtractor, type Extractor, Parser } from "./create_extractor.ts";
+import {
+  createExtractor,
+  type Extractor,
+  type Parser,
+} from "./create_extractor.ts";
 import { parse } from "../yaml/parse.ts";
 
 export const extract: Extractor = createExtractor({

fs/_get_file_info_type_test.ts

@@ -3,7 +3,7 @@
 
 import { assertEquals } from "../assert/mod.ts";
 import * as path from "../path/mod.ts";
-import { getFileInfoType, PathType } from "./_get_file_info_type.ts";
+import { getFileInfoType, type PathType } from "./_get_file_info_type.ts";
 import { ensureFileSync } from "./ensure_file.ts";
 import { ensureDirSync } from "./ensure_dir.ts";
 

fs/expand_glob_test.ts

@@ -9,7 +9,7 @@ import {
 } from "../path/mod.ts";
 import {
   expandGlob,
-  ExpandGlobOptions,
+  type ExpandGlobOptions,
   expandGlobSync,
 } from "./expand_glob.ts";
 

fs/walk_test.ts

@@ -1,5 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
-import { walk, WalkError, WalkOptions, walkSync } from "./walk.ts";
+import { walk, WalkError, type WalkOptions, walkSync } from "./walk.ts";
 import {
   assertArrayIncludes,
   assertEquals,

http/_negotiation/encoding.ts

@@ -29,7 +29,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { compareSpecs, isQuality, Specificity } from "./common.ts";
+import { compareSpecs, isQuality, type Specificity } from "./common.ts";
 
 interface EncodingSpecificity extends Specificity {
   encoding?: string;

http/_negotiation/language.ts

@@ -29,7 +29,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { compareSpecs, isQuality, Specificity } from "./common.ts";
+import { compareSpecs, isQuality, type Specificity } from "./common.ts";
 
 interface LanguageSpecificity extends Specificity {
   prefix: string;

http/_negotiation/media_type.ts

@@ -29,7 +29,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { compareSpecs, isQuality, Specificity } from "./common.ts";
+import { compareSpecs, isQuality, type Specificity } from "./common.ts";
 
 interface MediaTypeSpecificity extends Specificity {
   type: string;

http/file_server_test.ts

@@ -8,7 +8,7 @@ import {
   assertStringIncludes,
 } from "../assert/mod.ts";
 import { stub } from "../testing/mock.ts";
-import { serveDir, ServeDirOptions, serveFile } from "./file_server.ts";
+import { serveDir, type ServeDirOptions, serveFile } from "./file_server.ts";
 import { calculate } from "./etag.ts";
 import {
   basename,

http/server_test.ts

@@ -1,5 +1,11 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
-import { ConnInfo, serve, serveListener, Server, serveTls } from "./server.ts";
+import {
+  type ConnInfo,
+  serve,
+  serveListener,
+  Server,
+  serveTls,
+} from "./server.ts";
 import { mockConn as createMockConn } from "./_mock_conn.ts";
 import { dirname, fromFileUrl, join, resolve } from "../path/mod.ts";
 import { writeAll } from "../io/write_all.ts";

ini/parse.ts

@@ -1,6 +1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { IniMap, ParseOptions } from "./ini_map.ts";
+import { IniMap, type ParseOptions } from "./ini_map.ts";
 /** Parse an INI config string into an object. Provide formatting options to override the default assignment operator. */
 export function parse(
   text: string,

ini/parse_test.ts

@@ -1,6 +1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { IniMap, parse, ParseOptions } from "./mod.ts";
+import { IniMap, parse, type ParseOptions } from "./mod.ts";
 import {
   assert,
   assertEquals,

ini/stringify.ts

@@ -1,6 +1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { IniMap, StringifyOptions } from "./ini_map.ts";
+import { IniMap, type StringifyOptions } from "./ini_map.ts";
 
 /** Compile an object into an INI config string. Provide formatting options to modify the output. */
 export function stringify(

ini/stringify_test.ts

@@ -2,7 +2,7 @@
 
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { stringify, StringifyOptions } from "./mod.ts";
+import { stringify, type StringifyOptions } from "./mod.ts";
 import { assertEquals } from "../assert/mod.ts";
 
 function assertValidStringify(

io/read_int.ts

@@ -1,6 +1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { type BufReader } from "./buf_reader.ts";
+import type { BufReader } from "./buf_reader.ts";
 import { readShort } from "./read_short.ts";
 
 /**

io/read_lines.ts

@@ -1,7 +1,7 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 // This module is browser compatible.
 
-import { type Reader } from "./types.ts";
+import type { Reader } from "./types.ts";
 import { BufReader } from "./buf_reader.ts";
 import { concat } from "../bytes/concat.ts";
 

io/read_long.ts

@@ -1,6 +1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { type BufReader } from "./buf_reader.ts";
+import type { BufReader } from "./buf_reader.ts";
 import { readInt } from "./read_int.ts";
 
 const MAX_SAFE_INTEGER = BigInt(Number.MAX_SAFE_INTEGER);

io/read_short.ts

@@ -1,6 +1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { type BufReader } from "./buf_reader.ts";
+import type { BufReader } from "./buf_reader.ts";
 
 /**
  * Read big endian 16bit short from BufReader