怒涛の依存書き換え

Author: kuuote

conf/plug/deno.toml

@@ -2,7 +2,7 @@
 repo = 'https://github.com/denoland/deno_std'
 
 [[plugins]]
-repo = 'https://github.com/lambdalisue/deno-unknownutil'
+repo = 'https://github.com/jsr-core/unknownutil'
 
 [[plugins]]
 repo = 'https://github.com/uga-rosa/deno-denops-lsputil'

denops/@deps/unknownutil.ts

@@ -1,2 +1,2 @@
 export * as u from "/data/vim/repos/github.com/lambdalisue/deno-unknownutil/mod.ts";
-export { is } from "/data/vim/repos/github.com/lambdalisue/deno-unknownutil/mod.ts";
+export * from "/data/vim/repos/github.com/jsr-core/unknownutil/mod.ts";

script/build/build.ts

@@ -1,5 +1,10 @@
 import { Denops, lambda } from "../../denops/@deps/denops_std.ts";
-import { is, u } from "../../denops/@deps/unknownutil.ts";
+import {
+  as,
+  ensure,
+  is,
+  PredicateType,
+} from "../../denops/@deps/unknownutil.ts";
 import { generateDenopsCall } from "../../denops/@vimrc/lib/denops.ts";
 import { encodeBase64 } from "/data/vim/deps/deno_std/encoding/base64.ts";
 import * as stdpath from "/data/vim/deps/deno_std/path/mod.ts";
@@ -12,15 +17,15 @@ const vimdir = String(Deno.env.get("VIMDIR"));
 
 const isDefinitions = is.RecordOf(is.ObjectOf({
   script: is.String,
-  deps: is.OptionalOf(is.ArrayOf(is.String)),
+  deps: as.Optional(is.ArrayOf(is.String)),
 }));
 
-type Definitions = u.PredicateType<typeof isDefinitions>;
+type Definitions = PredicateType<typeof isDefinitions>;
 
 async function load(
   path: string,
 ): Promise<Definitions> {
-  return u.ensure(
+  return ensure(
     TOML.parse(await Deno.readTextFile(path)),
     isDefinitions,
   );
@@ -31,13 +36,13 @@ const isPlugin = is.ObjectOf({
   path: is.String,
 });
 
-type Plugin = u.PredicateType<typeof isPlugin>;
+type Plugin = PredicateType<typeof isPlugin>;
 type Plugins = Record<string, Plugin>;
 
 const isStringArray = is.ArrayOf(is.String);
 
 async function glob(denops: Denops, path: string): Promise<string[]> {
-  return u.ensure(
+  return ensure(
     await denops.call("glob", path, 1, 1),
     isStringArray,
   );
@@ -92,7 +97,7 @@ async function executermNvim(
     }
 
     await denops.cmd("autocmd TermOpen * normal! G");
-    const code = u.ensure(
+    const code = ensure(
       await new Promise((resolve) => {
         const id = lambda.register(denops, resolve, { once: true });
         const notify = generateDenopsCall(denops, id, "[code]", {
@@ -149,7 +154,7 @@ async function executermVim(
       continue;
     }
 
-    const code = u.ensure(
+    const code = ensure(
       await new Promise(async (resolve) => {
         const id = lambda.register(denops, resolve, { once: true });
         const notify = generateDenopsCall(denops, id, "[code]", {
@@ -186,7 +191,7 @@ async function executermVim(
 export function main(denops: Denops) {
   denops.dispatcher = {
     async build() {
-      const plugins = u.ensure(
+      const plugins = ensure(
         await denops.eval("g:dpp#_plugins"),
         is.RecordOf(isPlugin),
       );

script/gitupdate/denops_view.ts

@@ -1,5 +1,5 @@
 import { autocmd, Denops } from "../../denops/@deps/denops_std.ts";
-import { is, u } from "../../denops/@deps/unknownutil.ts";
+import { assert, is } from "../../denops/@deps/unknownutil.ts";
 import {
   isDoneMessage,
   isEndMessage,
@@ -132,7 +132,7 @@ class Buffer {
 }
 
 export async function run(denops: Denops, args: unknown[]) {
-  u.assert(
+  assert(
     args,
     is.TupleOf(
       [

script/gitupdate/dpp_dump.ts

@@ -1,5 +1,5 @@
 import { Denops } from "../../denops/@deps/denops_std.ts";
-import { is, u } from "../../denops/@deps/unknownutil.ts";
+import { as, ensure, is } from "../../denops/@deps/unknownutil.ts";
 import { Task } from "./run.ts";
 
 // sort keys for JSON.stringify
@@ -20,7 +20,7 @@ function isRemoteRepo(repo: unknown): repo is string {
 }
 
 export async function main(denops: Denops) {
-  const recordPlugins = u.ensure(
+  const recordPlugins = ensure(
     await denops.eval("g:dpp#_plugins"),
     is.Record,
   );
@@ -29,9 +29,9 @@ export async function main(denops: Denops) {
       name: is.String,
       path: is.String,
       repo: isRemoteRepo,
-      rev: is.OptionalOf(is.String),
+      rev: as.Optional(is.String),
       // trueとかにするとマッチしなくなるので弾ける
-      gitupdate_ignore: is.OptionalOf(is.LiteralOf(false)),
+      gitupdate_ignore: as.Optional(is.LiteralOf(false)),
     }))
     .map((plugin) => ({
       repo: plugin.repo,

script/gitupdate/run.ts

@@ -1,4 +1,4 @@
-import { is, u } from "../../denops/@deps/unknownutil.ts";
+import { as, assert, is, Predicate } from "../../denops/@deps/unknownutil.ts";
 import { TextLineStream } from "/data/vim/deps/deno_std/streams/text_line_stream.ts";
 
 export type Task = {
@@ -8,11 +8,11 @@ export type Task = {
   rev?: string;
 };
 
-export const isTask: u.Predicate<Task> = is.ObjectOf({
+export const isTask: Predicate<Task> = is.ObjectOf({
   repo: is.String,
   path: is.String,
-  label: is.OptionalOf(is.String),
-  rev: is.OptionalOf(is.String),
+  label: as.Optional(is.String),
+  rev: as.Optional(is.String),
 });
 
 export type InitializeMessage = {
@@ -21,7 +21,7 @@ export type InitializeMessage = {
   maxJobs: number;
 };
 
-export const isInitializeMessage: u.Predicate<InitializeMessage> = is.ObjectOf({
+export const isInitializeMessage: Predicate<InitializeMessage> = is.ObjectOf({
   type: is.LiteralOf("initialize"),
   jobs: is.Number,
   maxJobs: is.Number,
@@ -31,7 +31,7 @@ export type DoneMessage = {
   type: "done";
 };
 
-export const isDoneMessage: u.Predicate<DoneMessage> = is.ObjectOf({
+export const isDoneMessage: Predicate<DoneMessage> = is.ObjectOf({
   type: is.LiteralOf("done"),
 });
 
@@ -42,7 +42,7 @@ export type StartMessage = {
   hash: string;
 };
 
-export const isStartMessage: u.Predicate<StartMessage> = is.ObjectOf({
+export const isStartMessage: Predicate<StartMessage> = is.ObjectOf({
   type: is.LiteralOf("start"),
   jobnr: is.Number,
   label: is.String,
@@ -56,7 +56,7 @@ export type EndMessage = {
   success: boolean;
 };
 
-export const isEndMessage: u.Predicate<EndMessage> = is.ObjectOf({
+export const isEndMessage: Predicate<EndMessage> = is.ObjectOf({
   type: is.LiteralOf("end"),
   jobnr: is.Number,
   hash: is.String,
@@ -69,8 +69,8 @@ export type TextMessage = {
   text: string;
 };
 
-export const isTextMessage: u.Predicate<TextMessage> = is.ObjectOf({
-  type: is.OneOf([
+export const isTextMessage: Predicate<TextMessage> = is.ObjectOf({
+  type: is.UnionOf([
     is.LiteralOf("stdout"),
     is.LiteralOf("stderr"),
   ]),
@@ -190,7 +190,7 @@ export function newTaskRunner(tasks: Task[], script: string, maxJobs = 8) {
 
 if (import.meta.main) {
   const tasks: unknown = await (new Response(Deno.stdin.readable).json());
-  u.assert(tasks, is.ArrayOf(isTask));
+  assert(tasks, is.ArrayOf(isTask));
   const taskRunner = newTaskRunner(tasks, Deno.args[0]);
   for await (const output of taskRunner) {
     console.log(output);

script/gitupdate/snap/dps_shot.ts

@@ -1,10 +1,10 @@
 import { Denops } from "../../../denops/@deps/denops_std.ts";
-import { is, u } from "../../../denops/@deps/unknownutil.ts";
+import { assert, is } from "../../../denops/@deps/unknownutil.ts";
 import { loadTasks } from "../util.ts";
 import { getSnapshot } from "./libsnapshot.ts";
 
 export async function run(args: unknown) {
-  u.assert(
+  assert(
     args,
     is.TupleOf(
       [