deprecation(path): split off all constants into their own files and deprecate old names

fs/_is_subdir.ts

@@ -1,7 +1,7 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 // Copyright the Browserify authors. MIT License.
 
-import { SEP } from "../path/separator.ts";
+import { SEPARATOR } from "../path/constants.ts";
 import { toPathString } from "./_to_path_string.ts";
 
 /**
@@ -13,7 +13,7 @@ import { toPathString } from "./_to_path_string.ts";
 export function isSubdir(
   src: string | URL,
   dest: string | URL,
-  sep: string = SEP,
+  sep = SEPARATOR,
 ): boolean {
   if (src === dest) {
     return false;

fs/_is_subdir_test.ts

@@ -2,8 +2,8 @@
 // Copyright the Browserify authors. MIT License.
 
 import { assertEquals } from "../assert/mod.ts";
-import { SEP as SEP_POSIX } from "../path/posix/separator.ts";
-import { SEP as SEP_WIN32 } from "../path/windows/separator.ts";
+import { SEPARATOR as SEP_POSIX } from "../path/posix/constants.ts";
+import { SEPARATOR as SEP_WIN32 } from "../path/windows/constants.ts";
 import { isSubdir } from "./_is_subdir.ts";
 
 Deno.test("isSubdir() returns a boolean indicating if dir is a subdir", function () {
@@ -16,13 +16,9 @@ Deno.test("isSubdir() returns a boolean indicating if dir is a subdir", function
     ["../first", "../first/second", true, SEP_POSIX],
     ["c:\\first", "c:\\first", false, SEP_WIN32],
     ["c:\\first", "c:\\first\\second", true, SEP_WIN32],
-  ];
+  ] as const;
 
-  pairs.forEach(function (p) {
-    const src = p[0] as string;
-    const dest = p[1] as string;
-    const expected = p[2] as boolean;
-    const sep = p[3] as string;
+  pairs.forEach(function ([src, dest, expected, sep]) {
     assertEquals(
       isSubdir(src, dest, sep),
       expected,

fs/expand_glob.ts

@@ -5,7 +5,7 @@ import { joinGlobs } from "../path/join_globs.ts";
 import { isGlob } from "../path/is_glob.ts";
 import { isAbsolute } from "../path/is_absolute.ts";
 import { resolve } from "../path/resolve.ts";
-import { SEP_PATTERN } from "../path/separator.ts";
+import { SEPARATOR_PATTERN } from "../path/constants.ts";
 import { walk, walkSync } from "./walk.ts";
 import { assert } from "../assert/assert.ts";
 import { toPathString } from "./_to_path_string.ts";
@@ -55,10 +55,10 @@ interface SplitPath {
 }
 
 function split(path: string): SplitPath {
-  const s = SEP_PATTERN.source;
+  const s = SEPARATOR_PATTERN.source;
   const segments = path
     .replace(new RegExp(`^${s}|${s}$`, "g"), "")
-    .split(SEP_PATTERN);
+    .split(SEPARATOR_PATTERN);
   const isAbsolute_ = isAbsolute(path);
   return {
     segments,

http/file_server.ts

@@ -37,7 +37,7 @@ import { extname } from "../path/extname.ts";
 import { join } from "../path/join.ts";
 import { relative } from "../path/relative.ts";
 import { resolve } from "../path/resolve.ts";
-import { SEP_PATTERN } from "../path/separator.ts";
+import { SEPARATOR_PATTERN } from "../path/constants.ts";
 import { contentType } from "../media_types/content_type.ts";
 import { calculate, ifNoneMatch } from "./etag.ts";
 import {
@@ -309,7 +309,7 @@ async function serveDirIndex(
   const urlRoot = options.urlRoot ? "/" + options.urlRoot : "";
   const dirUrl = `/${
     relative(options.target, dirPath).replaceAll(
-      new RegExp(SEP_PATTERN, "g"),
+      new RegExp(SEPARATOR_PATTERN, "g"),
       "/",
     )
   }`;

path/common.ts

@@ -2,7 +2,7 @@
 // This module is browser compatible.
 
 import { _common } from "./_common/common.ts";
-import { SEP } from "./separator.ts";
+import { SEPARATOR } from "./constants.ts";
 
 /** Determines the common path from a set of paths, using an optional separator,
  * which defaults to the OS default separator.
@@ -16,6 +16,9 @@ import { SEP } from "./separator.ts";
  *       console.log(p); // "./deno/std/"
  * ```
  */
-export function common(paths: string[], sep: typeof SEP = SEP): string {
+export function common(
+  paths: string[],
+  sep: string = SEPARATOR,
+): string {
   return _common(paths, sep);
 }

path/constants.ts

@@ -0,0 +1,7 @@
+// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
+// This module is browser compatible.
+import { isWindows } from "./_os.ts";
+
+export const DELIMITER = isWindows ? ";" as const : ":" as const;
+export const SEPARATOR = isWindows ? "\\" as const : "/" as const;
+export const SEPARATOR_PATTERN = isWindows ? /[\\/]+/ : /\/+/;

path/join_globs_test.ts

@@ -1,8 +1,8 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 import { assertEquals } from "../assert/mod.ts";
 import { joinGlobs } from "./join_globs.ts";
-import { SEP } from "./mod.ts";
+import { SEPARATOR } from "./mod.ts";
 
 Deno.test("joinGlobs() checks options.globstar", function () {
-  assertEquals(joinGlobs(["**", ".."], { globstar: true }), `**${SEP}..`);
+  assertEquals(joinGlobs(["**", ".."], { globstar: true }), `**${SEPARATOR}..`);
 });

path/mod.ts

@@ -34,22 +34,28 @@
  * @module
  */
 
-import { isWindows } from "./_os.ts";
 import * as _windows from "./windows/mod.ts";
 import * as _posix from "./posix/mod.ts";
+import { DELIMITER, SEPARATOR } from "./constants.ts";
 
 /** @deprecated (will be removed after 1.0.0) Import from {@link https://deno.land/std/path/windows/mod.ts} instead. */
 export const win32: typeof _windows = _windows;
 
 /** @deprecated (will be removed after 1.0.0) Import from {@link https://deno.land/std/posix/mod.ts} instead. */
 export const posix: typeof _posix = _posix;
 
-export const sep: "/" | "\\" = isWindows ? _windows.sep : _posix.sep;
-export const delimiter: ":" | ";" = isWindows
-  ? _windows.delimiter
-  : _posix.delimiter;
+/**
+ * @deprecated (will be removed in 0.215.0) Use {@linkcode SEPARATOR} instead.
+ */
+export const sep = SEPARATOR;
+
+/**
+ * @deprecated (will be removed in 0.215.0) Use {@linkcode DELIMITER} instead.
+ */
+export const delimiter = DELIMITER;
 
 export * from "./basename.ts";
+export * from "./constants.ts";
 export * from "./dirname.ts";
 export * from "./extname.ts";
 export * from "./format.ts";

path/normalize_glob_test.ts

@@ -1,8 +1,11 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 import { assertEquals } from "../assert/mod.ts";
 import { normalizeGlob } from "./normalize_glob.ts";
-import { SEP } from "./mod.ts";
+import { SEPARATOR } from "./constants.ts";
 
 Deno.test("normalizeGlob() checks options.globstar", function () {
-  assertEquals(normalizeGlob(`**${SEP}..`, { globstar: true }), `**${SEP}..`);
+  assertEquals(
+    normalizeGlob(`**${SEPARATOR}..`, { globstar: true }),
+    `**${SEPARATOR}..`,
+  );
 });

path/posix/common.ts

@@ -2,7 +2,7 @@
 // This module is browser compatible.
 
 import { _common } from "../_common/common.ts";
-import { SEP } from "./separator.ts";
+import { SEPARATOR } from "./constants.ts";
 
 /** Determines the common path from a set of paths, using an optional separator,
  * which defaults to the OS default separator.
@@ -16,6 +16,9 @@
  *       console.log(p); // "./deno/std/"
  * ```
  */
-export function common(paths: string[], sep: typeof SEP = SEP): string {
+export function common(
+  paths: string[],
+  sep: string = SEPARATOR,
+): string {
   return _common(paths, sep);
 }

path/posix/constants.ts

@@ -0,0 +1,6 @@
+// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
+// This module is browser compatible.
+
+export const DELIMITER = ":" as const;
+export const SEPARATOR = "/" as const;
+export const SEPARATOR_PATTERN = /\/+/;

path/posix/join_globs.ts

@@ -3,7 +3,7 @@
 
 import { GlobOptions } from "../_common/glob_to_reg_exp.ts";
 import { join } from "./join.ts";
-import { SEP } from "./separator.ts";
+import { SEPARATOR } from "./constants.ts";
 import { normalizeGlob } from "./normalize_glob.ts";
 
 /** Like join(), but doesn't collapse "**\/.." when `globstar` is true. */
@@ -20,7 +20,7 @@ export function joinGlobs(
     const path = glob;
     if (path.length > 0) {
       if (!joined) joined = path;
-      else joined += `${SEP}${path}`;
+      else joined += `${SEPARATOR}${path}`;
     }
   }
   if (!joined) return ".";

path/posix/mod.ts

@@ -22,10 +22,18 @@
  * @module
  */
 
+/**
+ * @deprecated (will be removed in 0.215.0) Use {@linkcode SEPARATOR} from {@link https://deno.land/std/path/posix/constants.ts} instead.
+ */
 export const sep = "/";
-export const delimiter = ":";
+
+/**
+ * @deprecated (will be removed in 0.215.0) Use {@linkcode DELIMITER} from {@link https://deno.land/std/path/posix/constants.ts} instead.
+ */
+export const delimiter = "/";
 
 export * from "./basename.ts";
+export * from "./constants.ts";
 export * from "./dirname.ts";
 export * from "./extname.ts";
 export * from "./format.ts";

path/posix/normalize_glob.ts

@@ -3,7 +3,7 @@
 
 import { GlobOptions } from "../_common/glob_to_reg_exp.ts";
 import { normalize } from "./normalize.ts";
-import { SEP_PATTERN } from "./separator.ts";
+import { SEPARATOR_PATTERN } from "./constants.ts";
 
 /** Like normalize(), but doesn't collapse "**\/.." when `globstar` is true. */
 export function normalizeGlob(
@@ -16,7 +16,7 @@ export function normalizeGlob(
   if (!globstar) {
     return normalize(glob);
   }
-  const s = SEP_PATTERN.source;
+  const s = SEPARATOR_PATTERN.source;
   const badParentPattern = new RegExp(
     `(?<=(${s}|^)\\*\\*${s})\\.\\.(?=${s}|$)`,
     "g",

path/posix/separator.ts

@@ -1,5 +1,11 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 // This module is browser compatible.
 
+/**
+ * @deprecated (will be removed in 0.215.0) Use {@linkcode SEPARATOR} from {@link https://deno.land/std/path/posix/constants.ts} instead.
+ */
 export const SEP = "/";
+/**
+ * @deprecated (will be removed in 0.215.0) Use {@linkcode SEPARATOR_PATTERN} from {@link https://deno.land/std/path/posix/constants.ts} instead.
+ */
 export const SEP_PATTERN = /\/+/;

path/separator.ts

@@ -3,5 +3,11 @@
 
 import { isWindows } from "./_os.ts";
 
+/**
+ * @deprecated (will be removed in 0.215.0) Use {@linkcode SEPARATOR} from {@link https://deno.land/std/path/constants.ts} instead.
+ */
 export const SEP: "/" | "\\" = isWindows ? "\\" : "/";
+/**
+ * @deprecated (will be removed in 0.215.0) Use {@linkcode SEPARATOR_PATTERN} from {@link https://deno.land/std/path/constants.ts} instead.
+ */
 export const SEP_PATTERN: RegExp = isWindows ? /[\\/]+/ : /\/+/;

path/windows/common.ts

@@ -2,7 +2,7 @@
 // This module is browser compatible.
 
 import { _common } from "../_common/common.ts";
-import { SEP } from "./separator.ts";
+import { SEPARATOR } from "./constants.ts";
 
 /** Determines the common path from a set of paths, using an optional separator,
  * which defaults to the OS default separator.
@@ -16,6 +16,9 @@
  *       console.log(p); // "./deno/std/"
  * ```
  */
-export function common(paths: string[], sep: typeof SEP = SEP): string {
+export function common(
+  paths: string[],
+  sep: string = SEPARATOR,
+): string {
   return _common(paths, sep);
 }

path/windows/constants.ts

@@ -0,0 +1,6 @@
+// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
+// This module is browser compatible.
+
+export const DELIMITER = ";" as const;
+export const SEPARATOR = "\\" as const;
+export const SEPARATOR_PATTERN = /[\\/]+/;

path/windows/join_globs.ts

@@ -3,7 +3,7 @@
 
 import { GlobOptions } from "../_common/glob_to_reg_exp.ts";
 import { join } from "./join.ts";
-import { SEP } from "./separator.ts";
+import { SEPARATOR } from "./constants.ts";
 import { normalizeGlob } from "./normalize_glob.ts";
 
 /** Like join(), but doesn't collapse "**\/.." when `globstar` is true. */
@@ -20,7 +20,7 @@ export function joinGlobs(
     const path = glob;
     if (path.length > 0) {
       if (!joined) joined = path;
-      else joined += `${SEP}${path}`;
+      else joined += `${SEPARATOR}${path}`;
     }
   }
   if (!joined) return ".";

path/windows/mod.ts

@@ -22,10 +22,18 @@
  * @module
  */
 
+/**
+ * @deprecated (will be removed in 0.215.0) Use {@linkcode SEPARATOR} from {@link https://deno.land/std/path/windows/constants.ts} instead.
+ */
 export const sep = "\\";
+
+/**
+ * @deprecated (will be removed in 0.215.0) Use {@linkcode DELIMITER} from {@link https://deno.land/std/path/windows/constants.ts} instead.
+ */
 export const delimiter = ";";
 
 export * from "./basename.ts";
+export * from "./constants.ts";
 export * from "./dirname.ts";
 export * from "./extname.ts";
 export * from "./format.ts";

path/windows/normalize_glob.ts

@@ -4,7 +4,7 @@
 import { globToRegExp as _globToRegExp } from "./glob_to_regexp.ts";
 import { GlobOptions } from "../_common/glob_to_reg_exp.ts";
 import { normalize } from "./normalize.ts";
-import { SEP_PATTERN } from "./separator.ts";
+import { SEPARATOR_PATTERN } from "./constants.ts";
 
 /** Like normalize(), but doesn't collapse "**\/.." when `globstar` is true. */
 export function normalizeGlob(
@@ -17,7 +17,7 @@ export function normalizeGlob(
   if (!globstar) {
     return normalize(glob);
   }
-  const s = SEP_PATTERN.source;
+  const s = SEPARATOR_PATTERN.source;
   const badParentPattern = new RegExp(
     `(?<=(${s}|^)\\*\\*${s})\\.\\.(?=${s}|$)`,
     "g",

path/windows/separator.ts

@@ -1,5 +1,11 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 // This module is browser compatible.
 
+/**
+ * @deprecated (will be removed in 0.216.0) Use {@linkcode SEPARATOR} from {@link https://deno.land/std/path/windows/constants.ts} instead.
+ */
 export const SEP = "\\";
+/**
+ * @deprecated (will be removed in 0.216.0) Use {@linkcode SEPARATOR_PATTERN} from {@link https://deno.land/std/path/windows/constants.ts} instead.
+ */
 export const SEP_PATTERN = /[\\/]+/;