Merge pull request #263 from 4513ECHO/optimize_std_import

💪 Optimize imports from std

Author: lambdalisue

.scripts/gen-function/gen-function.ts

@@ -1,4 +1,4 @@
-import * as path from "@std/path";
+import { fromFileUrl } from "@std/path/from-file-url";
 import { parse } from "./parse.ts";
 import { format } from "./format.ts";
 import { DOCS_OVERRIDES } from "./override.ts";
@@ -103,5 +103,5 @@ await transform(resolvePath(vimManualModule), vimDefs);
 await transform(resolvePath(nvimManualModule), nvimDefs);
 
 function resolvePath(p: string): string {
-  return path.fromFileUrl(new URL(p, import.meta.url));
+  return fromFileUrl(new URL(p, import.meta.url));
 }

.scripts/gen-option/gen-option.ts

@@ -1,4 +1,4 @@
-import * as path from "@std/path";
+import { fromFileUrl } from "@std/path/from-file-url";
 import { parse } from "./parse.ts";
 import { format } from "./format.ts";
 import { DOCS_OVERRIDES } from "./override.ts";
@@ -98,5 +98,5 @@ await transform(resolvePath(vimManualModule), vimDefs);
 await transform(resolvePath(nvimManualModule), nvimDefs);
 
 function resolvePath(p: string): string {
-  return path.fromFileUrl(new URL(p, import.meta.url));
+  return fromFileUrl(new URL(p, import.meta.url));
 }

.scripts/transform.ts

@@ -1,4 +1,5 @@
-import { fromFileUrl, toFileUrl } from "@std/path";
+import { fromFileUrl } from "@std/path/from-file-url";
+import { toFileUrl } from "@std/path/to-file-url";
 
 interface ModuleInformation {
   sourcePath: string;

.scripts/utils.ts

@@ -1,4 +1,4 @@
-import * as streams from "@std/streams";
+import { toText } from "@std/streams/to-text";
 
 /**
  * Downloads a text file and returns the contents.
@@ -9,8 +9,7 @@ export async function downloadString(url: string): Promise<string> {
   if (response.status >= 400 || !response.body) {
     throw new Error(`Failed to read ${url}`);
   }
-  //const reader = streams.readerFromStreamReader(response.body.getReader());
-  return await streams.toText(response.body);
+  return await toText(response.body);
 }
 
 /**

buffer/buffer.ts

@@ -1,6 +1,6 @@
 import type { Denops } from "@denops/core";
 import { maybe } from "@core/unknownutil/maybe";
-import { ulid } from "@std/ulid";
+import { ulid } from "@std/ulid/ulid";
 import * as autocmd from "../autocmd/mod.ts";
 import * as batch from "../batch/mod.ts";
 import * as fn from "../function/mod.ts";

bufname/bufname.ts

@@ -139,15 +139,15 @@ const exprPattern = /^(.*?)(?:;(.*?))?(?:#(.*))?$/;
  *
  * ```typescript
  * import { assertEquals } from "jsr:@std/assert";
- * import * as path from "jsr:@std/path";
+ * import { toFileUrl } from "jsr:@std/path/to-file-url";
  * import { format } from "jsr:@denops/std/bufname";
  *
  * // NOTE:
  * // Works only on Windows (Use path.win32.toFileUrl instead on other platforms)
  * assertEquals(
  *   format({
  *     scheme: "denops",
- *     expr: path.toFileUrl("C:\\Users\John Titor\test.git").pathname,
+ *     expr:toFileUrl("C:\\Users\John Titor\test.git").pathname,
  *   }),
  *   "denops:///C:/Users/John%2520Titor/test.git",
  * );
@@ -233,7 +233,7 @@ export function format(
  *
  * ```typescript
  * import { assertEquals } from "jsr:@std/assert";
- * import * as path from "jsr:@std/path";
+ * import { fromFileUrl } from "jsr:@std/path/from-file-url";
  * import { parse } from "jsr:@denops/std/bufname";
  *
  * const bufname = parse("denops:///C:/Users/John%2520Titor/test.git");
@@ -244,7 +244,7 @@ export function format(
  * // NOTE:
  * // Works only on Windows (Use path.win32.fromFileUrl instead on other platforms)
  * assertEquals(
- *   path.fromFileUrl(`file://${bufname.expr}`),
+ *   fromFileUrl(`file://${bufname.expr}`),
  *   "C:\\Users\\John Titor\\test.git",
  * );
  * ```

bufname/bufname_test.ts

@@ -1,5 +1,6 @@
 import { assertEquals, assertThrows } from "@std/assert";
-import * as pathWin from "@std/path/windows";
+import { fromFileUrl } from "@std/path/windows/from-file-url";
+import { toFileUrl } from "@std/path/windows/to-file-url";
 import { format, parse } from "./bufname.ts";
 
 Deno.test("format throws exception when 'scheme' contains unusable characters", () => {
@@ -188,7 +189,7 @@ Deno.test("format pass example in README.md", () => {
     "denops:///Users/John Titor/test.git;foo=foo&bar=bar1&bar=bar2#README.md",
   );
 
-  const fileUrl = pathWin.toFileUrl("C:\\Users\\John Titor\\test.git");
+  const fileUrl = toFileUrl("C:\\Users\\John Titor\\test.git");
   assertEquals(
     fileUrl.pathname,
     "/C:/Users/John%20Titor/test.git",
@@ -407,7 +408,7 @@ Deno.test("parse pass example in README.md", () => {
     },
   );
   assertEquals(
-    pathWin.fromFileUrl(`file://${bufname.expr}`),
+    fromFileUrl(`file://${bufname.expr}`),
     "C:\\Users\\John Titor\\test.git",
   );
 });

deno.jsonc

@@ -58,7 +58,7 @@
     "@std/path": "jsr:@std/path@^1.0.2",
     "@std/semver": "jsr:@std/semver@^1.0.0",
     "@std/streams": "jsr:@std/streams@^1.0.0",
-    "@std/testing": "jsr:@std/testing@^1.0.0-rc.5",
+    "@std/testing": "jsr:@std/testing@^1.0.1",
     "@std/ulid": "jsr:@std/ulid@^1.0.0",
     "encoding-japanese": "npm:encoding-japanese@^2.1.0",
     "jsr:@denops/std": "./mod.ts",

function/getreginfo.ts

@@ -1,6 +1,7 @@
 import type { Denops } from "../mod.ts";
-import { lessThan, parse } from "@std/semver";
-import { ulid } from "@std/ulid";
+import { lessThan } from "@std/semver/less-than";
+import { parse } from "@std/semver/parse";
+import { ulid } from "@std/ulid/ulid";
 import { execute } from "../helper/mod.ts";
 
 const cacheKey = "denops_std/function/getreginfo.ts@1";

helper/echo.ts

@@ -1,5 +1,5 @@
 import type { Denops } from "@denops/core";
-import { ulid } from "@std/ulid";
+import { ulid } from "@std/ulid/ulid";
 import { execute } from "./execute.ts";
 
 const cacheKey = "denops_std/helper/echo@1";

helper/expr_string.ts

@@ -39,7 +39,7 @@ import { isRecord } from "@core/unknownutil/is/record";
 import { isString } from "@core/unknownutil/is/string";
 import { isSymbol } from "@core/unknownutil/is/symbol";
 import { isUndefined } from "@core/unknownutil/is/undefined";
-import { ulid } from "@std/ulid";
+import { ulid } from "@std/ulid/ulid";
 import { execute } from "./execute.ts";
 
 const EXPR_STRING_MARK = "__denops_expr_string";

helper/input.ts

@@ -2,7 +2,7 @@ import type { Denops } from "@denops/core";
 import { assert } from "@core/unknownutil/assert";
 import { isNumber } from "@core/unknownutil/is/number";
 import { isString } from "@core/unknownutil/is/string";
-import { ulid } from "@std/ulid";
+import { ulid } from "@std/ulid/ulid";
 import * as fn from "../function/mod.ts";
 import * as lambda from "../lambda/mod.ts";
 import { execute } from "./execute.ts";

helper/load.ts

@@ -1,6 +1,8 @@
 import type { Denops } from "@denops/core";
-import * as fs from "@std/fs";
-import * as path from "@std/path";
+import { exists } from "@std/fs/exists";
+import { basename } from "@std/path/basename";
+import { fromFileUrl } from "@std/path/from-file-url";
+import { join } from "@std/path/join";
 import { execute } from "./execute.ts";
 
 const loaded = new Set<URL>();
@@ -101,12 +103,12 @@ export async function load(
 
 async function ensureLocalFile(url: URL): Promise<string> {
   if (url.protocol === "file:") {
-    return path.fromFileUrl(url);
+    return fromFileUrl(url);
   }
   const cacheDir = await getOrCreateCacheDir();
   const filename = await getLocalFilename(url);
-  const filepath = path.join(cacheDir, filename);
-  if (await fs.exists(filepath)) {
+  const filepath = join(cacheDir, filename);
+  if (await exists(filepath)) {
     return filepath;
   }
   const response = await fetch(url);
@@ -131,8 +133,7 @@ async function getLocalFilename(url: URL): Promise<string> {
   const h = Array.from(new Uint8Array(buf))
     .map((b) => b.toString(16).padStart(2, "0"))
     .join("");
-  const basename = path.basename(url.pathname);
-  return `${h}-${basename}`;
+  return `${h}-${basename(url.pathname)}`;
 }
 
 async function getOrCreateCacheDir(): Promise<string> {
@@ -148,13 +149,13 @@ function getCacheDirUnix(): string {
   if (!root) {
     throw new Error("`HOME` environment variable is not defined.");
   }
-  return path.join(root, ".cache", "denops_std", "load");
+  return join(root, ".cache", "denops_std", "load");
 }
 
 function getCacheDirWindows(): string {
   const root = Deno.env.get("LOCALAPPDATA");
   if (!root) {
     throw new Error("`LOCALAPPDATA` environment variable is not defined.");
   }
-  return path.join(root, "denops_std", "load");
+  return join(root, "denops_std", "load");
 }

popup/nvim.ts

@@ -1,5 +1,5 @@
 import type { Denops } from "@denops/core";
-import { ulid } from "@std/ulid";
+import { ulid } from "@std/ulid/ulid";
 import * as nvimFn from "../function/nvim/mod.ts";
 import { execute } from "../helper/execute.ts";