Update for the latest ddc (#16)

Author: Shougo

denops/@ddc-file/deps.ts

@@ -1,22 +1,22 @@
 export type {
-  Candidate,
   Context,
-} from "https://deno.land/x/ddc_vim@v1.3.0/types.ts";
-export { BaseSource } from "https://deno.land/x/ddc_vim@v1.3.0/types.ts";
-export type { Denops } from "https://deno.land/x/ddc_vim@v1.3.0/deps.ts";
-export { fn, vars } from "https://deno.land/x/ddc_vim@v1.3.0/deps.ts";
+  Item,
+} from "https://deno.land/x/ddc_vim@v3.0.0/types.ts";
+export { BaseSource } from "https://deno.land/x/ddc_vim@v3.0.0/types.ts";
+export type { Denops } from "https://deno.land/x/ddc_vim@v3.0.0/deps.ts";
+export { fn, vars } from "https://deno.land/x/ddc_vim@v3.0.0/deps.ts";
 export type {
-  GatherCandidatesArguments,
-} from "https://deno.land/x/ddc_vim@v1.3.0/base/source.ts";
-export * as path from "https://deno.land/std@0.125.0/path/mod.ts";
-export * as io from "https://deno.land/std@0.125.0/io/mod.ts";
-export * as fs from "https://deno.land/std@0.125.0/fs/mod.ts";
-export * as asserts from "https://deno.land/std@0.125.0/testing/asserts.ts";
+  GatherArguments,
+} from "https://deno.land/x/ddc_vim@v3.0.0/base/source.ts";
+export * as path from "https://deno.land/std@0.160.0/path/mod.ts";
+export * as io from "https://deno.land/std@0.160.0/io/mod.ts";
+export * as fs from "https://deno.land/std@0.160.0/fs/mod.ts";
+export * as asserts from "https://deno.land/std@0.160.0/testing/asserts.ts";
 export {
   asyncIteratorFrom as fromA,
   iteratorFrom as from,
   wrapAsyncIterator as wrapA,
   wrapIterator as wrap,
 } from "https://deno.land/x/iterator_helpers@v0.1.2/mod.ts";
-import homeDir from "https://deno.land/x/dir@v1.2.0/home_dir/mod.ts";
+import homeDir from "https://deno.land/x/dir@1.5.1/home_dir/mod.ts";
 export { homeDir };

denops/@ddc-file/util.spec.ts

@@ -3,8 +3,8 @@ import * as util from "./util.ts";
 
 const createVirtualDirReader: (
   virtualStorage: Record<string, string[]>,
-) => util.DirReader = (virtualStorage) =>
-  (abs: string) => fromA(virtualStorage[abs] ?? []);
+) => util.DirReader = (virtualStorage) => (abs: string) =>
+  fromA(virtualStorage[abs] ?? []);
 
 Deno.test({
   name: "findMarkers() for posix",

denops/@ddc-sources/file.ts

@@ -1,9 +1,9 @@
 import {
   BaseSource,
-  Candidate,
   fn,
-  GatherCandidatesArguments,
+  GatherArguments,
   homeDir,
+  Item,
   path as univPath,
   vars,
   wrapA,
@@ -15,10 +15,10 @@ type Params = {
   mode: "os" | "win32" | "posix";
   takeFileNum: number;
   projMarkers: string[];
-  cwdMaxCandidates: number;
-  bufMaxCandidates: number;
-  projFromCwdMaxCandidates: number[];
-  projFromBufMaxCandidates: number[];
+  cwdMaxItems: number;
+  bufMaxItems: number;
+  projFromCwdMaxItems: number[];
+  projFromBufMaxItems: number[];
   cwdAsRoot: boolean;
   bufAsRoot: boolean;
   projAsRoot: boolean;
@@ -57,19 +57,19 @@ const existsDir = async (filePath: string): Promise<boolean> => {
 };
 
 export class Source extends BaseSource<Params> {
-  async gatherCandidates(
-    args: GatherCandidatesArguments<Params>,
-  ): Promise<Candidate[]> {
+  async gather(
+    args: GatherArguments<Params>,
+  ): Promise<Item[]> {
     const p = args.sourceParams;
     const mode = p.mode === "os"
       ? (Deno.build.os === "windows" ? "win32" : "posix")
       : p.mode;
     const path = mode === "posix" ? univPath.posix : univPath.win32;
     const maxOfMax = Math.max(
-      p.cwdMaxCandidates,
-      p.bufMaxCandidates,
-      ...p.projFromCwdMaxCandidates,
-      ...p.projFromBufMaxCandidates,
+      p.cwdMaxItems,
+      p.bufMaxItems,
+      ...p.projFromCwdMaxItems,
+      ...p.projFromBufMaxItems,
     );
 
     // e.g. (
@@ -162,23 +162,23 @@ export class Source extends BaseSource<Params> {
     // point from cwd
     findPointsAsync.push({
       dir: cwd,
-      max: p.cwdMaxCandidates,
+      max: p.cwdMaxItems,
       menu: p.displayCwd,
       asRoot: p.cwdAsRoot,
     });
 
     // point from project-root found from cwd
     findPointsAsync.push(
       util.findMarkers(
-        p.projFromCwdMaxCandidates.length,
+        p.projFromCwdMaxItems.length,
         cwd,
         p.projMarkers,
         path,
       )
         .then((dirs) =>
           dirs.map((dir, i) => ({
             dir,
-            max: p.projFromCwdMaxCandidates[i],
+            max: p.projFromCwdMaxItems[i],
             menu: `${p.displayCwd}^${i === 0 ? "" : i + 1}`,
             asRoot: p.projAsRoot,
           }))
@@ -192,22 +192,22 @@ export class Source extends BaseSource<Params> {
       findPointsAsync.push({
         dir: bufDir,
         menu: p.displayBuf,
-        max: p.bufMaxCandidates,
+        max: p.bufMaxItems,
         asRoot: p.bufAsRoot,
       });
 
       // point from project-root found from buf
       findPointsAsync.push(
         util.findMarkers(
-          p.projFromBufMaxCandidates.length,
+          p.projFromBufMaxItems.length,
           bufDir,
           p.projMarkers,
           path,
         )
           .then((dirs) =>
             dirs.map((dir, i) => ({
               dir,
-              max: p.projFromBufMaxCandidates[i],
+              max: p.projFromBufMaxItems[i],
               menu: `${p.displayBuf}^${i === 0 ? "" : i + 1}`,
               asRoot: p.projAsRoot,
             }))
@@ -243,7 +243,7 @@ export class Source extends BaseSource<Params> {
         })),
     );
 
-    const candidatesList = await Promise.all(
+    const itemsList = await Promise.all(
       resolvedFindPoints
         .filter(({ ex }) => ex)
         .map(({ point }) => point)
@@ -261,7 +261,7 @@ export class Source extends BaseSource<Params> {
                   (entry.isSymlink && p.followSymlinks &&
                     await existsDir(path.join(dir, entry.name))),
               }))
-              .map(({ name, isDirectory, isSymlink }): Candidate => ({
+              .map(({ name, isDirectory, isSymlink }): Item => ({
                 word: name.slice(inputFileBasePrefix.length) +
                   (p.trailingSlash && isDirectory ? path.sep : ""),
                 abbr: name.slice(inputFileBasePrefix.length) +
@@ -282,10 +282,9 @@ export class Source extends BaseSource<Params> {
               .catch(() => []),
         ),
     );
-    const candidates: Candidate[] = candidatesList
-      .flat();
+    const items: Item[] = itemsList.flat();
 
-    return candidates;
+    return items;
   }
 
   params(): Params {
@@ -297,10 +296,10 @@ export class Source extends BaseSource<Params> {
         ".github",
       ],
       takeFileNum: 10000,
-      cwdMaxCandidates: 1000,
-      bufMaxCandidates: 1000,
-      projFromCwdMaxCandidates: [1000],
-      projFromBufMaxCandidates: [1000],
+      cwdMaxItems: 1000,
+      bufMaxItems: 1000,
+      projFromCwdMaxItems: [1000],
+      projFromBufMaxItems: [1000],
       cwdAsRoot: false,
       bufAsRoot: false,
       projAsRoot: true,

doc/ddc-file.txt

@@ -19,14 +19,14 @@ FREQUENTLY ASKED QUESTIONS (FAQ)			        |ddc-file-faq|
 ==============================================================================
 INTRODUCTION					       *ddc-file-introduction*
 
-This source collects candidates from file paths under the (1) buffer relative,
+This source collects items from file paths under the (1) buffer relative,
 (2) cwd relative, (3) project root (.git/, etc...; configurable by
 |ddc-file-param-projMarkers|) relative.
 
 ==============================================================================
 DISPLAY RULES					      *ddc-file-display-rules*
 
-In menu (right side of the completion candidates), this source shows how was
+In menu (right side of the completion items), this source shows how was
 that completion got from.
 >
     /cwd^2
@@ -161,21 +161,21 @@ projMarkers	(string[])
 		    ".github",
 		]
 
-					     *ddc-file-param-cwdMaxCandidates*
-cwdMaxCandidates	(number)
-		Max candidates number for cwd relative.
+					     *ddc-file-param-cwdMaxItems*
+cwdMaxItems	(number)
+		Max items number for cwd relative.
 
 		Default: 1000
 
-					     *ddc-file-param-bufMaxCandidates*
-bufMaxCandidates	(number)
-		Max candidates number for buffer relative.
+					     *ddc-file-param-bufMaxItems*
+bufMaxItems	(number)
+		Max items number for buffer relative.
 
 		Default: 1000
 
-				     *ddc-file-param-projFromCwdMaxCandidates*
-projFromCwdMaxCandidates	(number[])
-		Max candidates number for project-root relative found by cwd.
+				     *ddc-file-param-projFromCwdMaxItems*
+projFromCwdMaxItems	(number[])
+		Max items number for project-root relative found by cwd.
 		n-th number is used for n-th recursively found project-root.
 
 		e.g. Consider following situation.
@@ -191,10 +191,10 @@ projFromCwdMaxCandidates	(number[])
 
 		Default: [1000]
 
-				     *ddc-file-param-projFromBufMaxCandidates*
-projFromBufMaxCandidates	(number[])
+				     *ddc-file-param-projFromBufMaxItems*
+projFromBufMaxItems	(number[])
 		Project-root from buffer relative version of
-		|ddc-file-params-projFromCwdMaxCandidates|.
+		|ddc-file-params-projFromCwdMaxItems|.
 
 		Default: [1000]