diff --git a/autoload/denops/_internal/server/proc.vim b/autoload/denops/_internal/server/proc.vim index 4458ec43..50cff19c 100644 --- a/autoload/denops/_internal/server/proc.vim +++ b/autoload/denops/_internal/server/proc.vim @@ -1,4 +1,5 @@ const s:SCRIPT = denops#_internal#path#script(['@denops-private', 'cli.ts']) +const s:CONFIG = denops#_internal#path#script(['@denops-private', 'deno.jsonc']) let s:job = v:null let s:stopped_on_purpose = 0 @@ -47,6 +48,8 @@ function! s:start(options) abort let l:args = [g:denops#server#deno, 'run'] let l:args += g:denops#server#deno_args let l:args += [ + \ '--config', + \ s:CONFIG, \ s:SCRIPT, \ '--quiet', \ '--identity', diff --git a/deno.jsonc b/deno.jsonc index be98ada0..7ff94edd 100644 --- a/deno.jsonc +++ b/deno.jsonc @@ -1,14 +1,15 @@ { + "workspace": [ + "denops/@denops-private" + ], "tasks": { "check": "deno check **/*.ts", "check:doc": "deno test --doc --no-run", "test": "LANG=C deno test -A --parallel --shuffle", "test:coverage": "deno task test --coverage=.coverage", - "coverage": "deno coverage --exclude=\"test[.]ts(#.*)?$\" .coverage", - // NOTE: `--ignore @std/internal` is required to preserve test fixture. - "update": "deno run --allow-env --allow-read --allow-write --allow-run=git,deno --allow-net=jsr.io,registry.npmjs.org jsr:@molt/cli --no-lock --ignore @std/internal **/*.ts", - "update:write": "deno task -q update --write", - "update:commit": "deno task -q update --commit --prefix :package: --pre-commit=fmt,lint", + "coverage": "deno coverage --exclude=\"test[.]ts(#.*)?$\" --exclude=\"/tests/\" --exclude=\"import_map_importer\" .coverage", + "update": "deno outdated --update --latest --recursive", + "update:interactive": "deno task update -- --interactive", "apply:supported-versions": "deno run --allow-read --allow-write .scripts/apply_supported_versions.ts" }, "exclude": [ @@ -16,10 +17,19 @@ "tests/denops/testdata/no_check/", "tests/denops/testdata/with_import_map/" ], - // NOTE: Import maps should only be used from test modules. "imports": { "/denops-private/": "./denops/@denops-private/", "/denops-testdata/": "./tests/denops/testdata/", - "/denops-testutil/": "./tests/denops/testutil/" + "/denops-testutil/": "./tests/denops/testutil/", + "@core/asyncutil": "jsr:@core/asyncutil@^1.1.1", + "@core/streamutil": "jsr:@core/streamutil@^1.0.0", + "@denops/core": "jsr:@denops/core@^7.0.0", + "@milly/streams": "jsr:@milly/streams@^1.0.0", + "@nick/dispose": "jsr:@nick/dispose@^1.1.0", + "@std/assert": "jsr:@std/assert@^1.0.1", + "@std/async": "jsr:@std/async@^1.0.1", + "@std/path": "jsr:@std/path@^1.0.2", + "@std/testing": "jsr:@std/testing@^1.0.0", + "sinon": "npm:sinon@^21.0.0" } } diff --git a/denops/@denops-private/cli.ts b/denops/@denops-private/cli.ts index a8d6e98a..58b1531c 100644 --- a/denops/@denops-private/cli.ts +++ b/denops/@denops-private/cli.ts @@ -1,10 +1,10 @@ import { readableStreamFromWorker, writableStreamFromWorker, -} from "jsr:@lambdalisue/workerio@^4.0.1"; -import { deadline } from "jsr:@std/async@^1.0.1/deadline"; -import { parseArgs } from "jsr:@std/cli@^1.0.1/parse-args"; -import { asyncSignal } from "jsr:@milly/async-signal@^1.0.0"; +} from "@lambdalisue/workerio"; +import { deadline } from "@std/async/deadline"; +import { parseArgs } from "@std/cli/parse-args"; +import { asyncSignal } from "@milly/async-signal"; const WORKER_SCRIPT = import.meta.resolve("./worker.ts"); const WORKER_CLOSE_TIMEOUT_MS = 5000; diff --git a/denops/@denops-private/cli_test.ts b/denops/@denops-private/cli_test.ts index c0d8f5e6..13594e2d 100644 --- a/denops/@denops-private/cli_test.ts +++ b/denops/@denops-private/cli_test.ts @@ -1,13 +1,13 @@ // NOTE: Use sinon to stub the getter property. // @deno-types="npm:@types/sinon@^17.0.3" -import sinon from "npm:sinon@^21.0.0"; +import sinon from "sinon"; import { assertEquals, assertMatch, assertNotMatch, assertStringIncludes, -} from "jsr:@std/assert@^1.0.1"; +} from "@std/assert"; import { assertSpyCallArgs, assertSpyCalls, @@ -16,10 +16,10 @@ import { spy, type Stub, stub, -} from "jsr:@std/testing@^1.0.0/mock"; -import { FakeTime } from "jsr:@std/testing@^1.0.0/time"; -import { delay } from "jsr:@std/async@^1.0.1/delay"; -import { flushPromises, peekPromiseState } from "jsr:@core/asyncutil@^1.1.1"; +} from "@std/testing/mock"; +import { FakeTime } from "@std/testing/time"; +import { delay } from "@std/async/delay"; +import { flushPromises, peekPromiseState } from "@core/asyncutil"; import { createFakeTcpConn, createFakeTcpListener, diff --git a/denops/@denops-private/deno.jsonc b/denops/@denops-private/deno.jsonc new file mode 100644 index 00000000..32663e5f --- /dev/null +++ b/denops/@denops-private/deno.jsonc @@ -0,0 +1,19 @@ +{ + "imports": { + "@core/asyncutil": "jsr:@core/asyncutil@^1.1.1", + "@core/errorutil": "jsr:@core/errorutil@^1.2.1", + "@core/unknownutil": "jsr:@core/unknownutil@^4.0.0", + "@denops/core": "jsr:@denops/core@^7.0.0", + "@denops/vim-channel-command": "jsr:@denops/vim-channel-command@^4.0.2", + "@lambdalisue/import-map-importer": "jsr:@lambdalisue/import-map-importer@^0.4.0", + "@lambdalisue/messagepack": "jsr:@lambdalisue/messagepack@^1.0.1", + "@lambdalisue/messagepack-rpc": "jsr:@lambdalisue/messagepack-rpc@^2.4.1", + "@lambdalisue/workerio": "jsr:@lambdalisue/workerio@^4.0.1", + "@milly/async-signal": "jsr:@milly/async-signal@^1.0.0", + "@nick/dispose": "jsr:@nick/dispose@^1.1.0", + "@std/async": "jsr:@std/async@^1.0.1", + "@std/cli": "jsr:@std/cli@^1.0.1", + "@std/path": "jsr:@std/path@^1.0.2", + "@std/semver": "jsr:@std/semver@^1.0.1" + } +} diff --git a/denops/@denops-private/denops.ts b/denops/@denops-private/denops.ts index a7c073bd..0341a08a 100644 --- a/denops/@denops-private/denops.ts +++ b/denops/@denops-private/denops.ts @@ -4,11 +4,11 @@ import { type Denops, type Dispatcher, type Meta, -} from "jsr:@denops/core@^7.0.0"; -import { ensure } from "jsr:@core/unknownutil@^4.0.0/ensure"; -import { isTupleOf } from "jsr:@core/unknownutil@^4.0.0/is/tuple-of"; -import { isArray } from "jsr:@core/unknownutil@^4.0.0/is/array"; -import { isString } from "jsr:@core/unknownutil@^4.0.0/is/string"; +} from "@denops/core"; +import { ensure } from "@core/unknownutil/ensure"; +import { isTupleOf } from "@core/unknownutil/is/tuple-of"; +import { isArray } from "@core/unknownutil/is/array"; +import { isString } from "@core/unknownutil/is/string"; import type { Host as HostOrigin } from "./host.ts"; import type { Service as ServiceOrigin } from "./service.ts"; diff --git a/denops/@denops-private/denops_test.ts b/denops/@denops-private/denops_test.ts index 768ebdec..bb3204a6 100644 --- a/denops/@denops-private/denops_test.ts +++ b/denops/@denops-private/denops_test.ts @@ -1,4 +1,4 @@ -import { BatchError, type Meta } from "jsr:@denops/core@^7.0.0"; +import { BatchError, type Meta } from "@denops/core"; import { assert, assertEquals, @@ -7,14 +7,14 @@ import { assertRejects, assertStrictEquals, unimplemented, -} from "jsr:@std/assert@^1.0.1"; +} from "@std/assert"; import { assertSpyCallArgs, assertSpyCalls, resolvesNext, stub, -} from "jsr:@std/testing@^1.0.0/mock"; -import { flushPromises, peekPromiseState } from "jsr:@core/asyncutil@^1.1.1"; +} from "@std/testing/mock"; +import { flushPromises, peekPromiseState } from "@core/asyncutil"; import { DenopsImpl, type Host, type Service } from "./denops.ts"; type BatchReturn = [results: unknown[], errmsg: string]; diff --git a/denops/@denops-private/error.ts b/denops/@denops-private/error.ts index b4b4406d..cc1588d3 100644 --- a/denops/@denops-private/error.ts +++ b/denops/@denops-private/error.ts @@ -1,10 +1,10 @@ -import { isString } from "jsr:@core/unknownutil@^4.0.0/is/string"; +import { isString } from "@core/unknownutil/is/string"; import { fromErrorObject, isErrorObject, toErrorObject, tryOr, -} from "jsr:@core/errorutil@^1.2.1"; +} from "@core/errorutil"; export function errorSerializer(err: unknown): unknown { if (err instanceof Error) { diff --git a/denops/@denops-private/error_test.ts b/denops/@denops-private/error_test.ts index 1e9e2508..8db82c97 100644 --- a/denops/@denops-private/error_test.ts +++ b/denops/@denops-private/error_test.ts @@ -1,5 +1,5 @@ -import { assert, assertEquals, assertInstanceOf } from "jsr:@std/assert@^1.0.1"; -import { isString } from "jsr:@core/unknownutil@^4.0.0/is/string"; +import { assert, assertEquals, assertInstanceOf } from "@std/assert"; +import { isString } from "@core/unknownutil/is/string"; import { errorDeserializer, errorSerializer } from "./error.ts"; Deno.test("errorSerializer", async (t) => { diff --git a/denops/@denops-private/host.ts b/denops/@denops-private/host.ts index 6ee00434..97ca3ada 100644 --- a/denops/@denops-private/host.ts +++ b/denops/@denops-private/host.ts @@ -1,10 +1,10 @@ -import type { Predicate } from "jsr:@core/unknownutil@^4.0.0/type"; -import { ensure } from "jsr:@core/unknownutil@^4.0.0/ensure"; -import { asOptional } from "jsr:@core/unknownutil@^4.0.0/as/optional"; -import { isArray } from "jsr:@core/unknownutil@^4.0.0/is/array"; -import { isParametersOf } from "jsr:@core/unknownutil@^4.0.0/is/parameters-of"; -import { isString } from "jsr:@core/unknownutil@^4.0.0/is/string"; -import { isUnknown } from "jsr:@core/unknownutil@^4.0.0/is/unknown"; +import type { Predicate } from "@core/unknownutil/type"; +import { ensure } from "@core/unknownutil/ensure"; +import { asOptional } from "@core/unknownutil/as/optional"; +import { isArray } from "@core/unknownutil/is/array"; +import { isParametersOf } from "@core/unknownutil/is/parameters-of"; +import { isString } from "@core/unknownutil/is/string"; +import { isUnknown } from "@core/unknownutil/is/unknown"; /** * Host (Vim/Neovim) which is visible from Service diff --git a/denops/@denops-private/host/nvim.ts b/denops/@denops-private/host/nvim.ts index d8e556c1..228c8630 100644 --- a/denops/@denops-private/host/nvim.ts +++ b/denops/@denops-private/host/nvim.ts @@ -1,11 +1,11 @@ -import { ensure } from "jsr:@core/unknownutil@^4.0.0/ensure"; -import { isArray } from "jsr:@core/unknownutil@^4.0.0/is/array"; -import { isNull } from "jsr:@core/unknownutil@^4.0.0/is/null"; -import { isNumber } from "jsr:@core/unknownutil@^4.0.0/is/number"; -import { isString } from "jsr:@core/unknownutil@^4.0.0/is/string"; -import { isTupleOf } from "jsr:@core/unknownutil@^4.0.0/is/tuple-of"; -import { isUnionOf } from "jsr:@core/unknownutil@^4.0.0/is/union-of"; -import { Client, Session } from "jsr:@lambdalisue/messagepack-rpc@^2.4.1"; +import { ensure } from "@core/unknownutil/ensure"; +import { isArray } from "@core/unknownutil/is/array"; +import { isNull } from "@core/unknownutil/is/null"; +import { isNumber } from "@core/unknownutil/is/number"; +import { isString } from "@core/unknownutil/is/string"; +import { isTupleOf } from "@core/unknownutil/is/tuple-of"; +import { isUnionOf } from "@core/unknownutil/is/union-of"; +import { Client, Session } from "@lambdalisue/messagepack-rpc"; import { errorDeserializer, errorSerializer } from "../error.ts"; import { getVersionOr } from "../version.ts"; import { type Host, invoke, type Service } from "../host.ts"; diff --git a/denops/@denops-private/host/nvim_test.ts b/denops/@denops-private/host/nvim_test.ts index 6ab3cf85..f1faf899 100644 --- a/denops/@denops-private/host/nvim_test.ts +++ b/denops/@denops-private/host/nvim_test.ts @@ -3,17 +3,17 @@ import { assertMatch, assertRejects, assertStringIncludes, -} from "jsr:@std/assert@^1.0.1"; +} from "@std/assert"; import { assertSpyCallArgs, assertSpyCalls, resolvesNext, stub, -} from "jsr:@std/testing@^1.0.0/mock"; -import { delay } from "jsr:@std/async@^1.0.1/delay"; -import { peekPromiseState } from "jsr:@core/asyncutil@^1.1.1"; -import { unimplemented } from "jsr:@core/errorutil@^1.2.1"; -import { Client } from "jsr:@lambdalisue/messagepack-rpc@^2.4.1"; +} from "@std/testing/mock"; +import { delay } from "@std/async/delay"; +import { peekPromiseState } from "@core/asyncutil"; +import { unimplemented } from "@core/errorutil"; +import { Client } from "@lambdalisue/messagepack-rpc"; import { withNeovim } from "/denops-testutil/with.ts"; import type { Service } from "../host.ts"; import { Neovim } from "./nvim.ts"; diff --git a/denops/@denops-private/host/vim.ts b/denops/@denops-private/host/vim.ts index 3c2626a6..6226bcad 100644 --- a/denops/@denops-private/host/vim.ts +++ b/denops/@denops-private/host/vim.ts @@ -1,14 +1,10 @@ -import { ensure } from "jsr:@core/unknownutil@^4.0.0/ensure"; -import { isArray } from "jsr:@core/unknownutil@^4.0.0/is/array"; -import { isLiteralOf } from "jsr:@core/unknownutil@^4.0.0/is/literal-of"; -import { isString } from "jsr:@core/unknownutil@^4.0.0/is/string"; -import { isTupleOf } from "jsr:@core/unknownutil@^4.0.0/is/tuple-of"; -import { isUnknown } from "jsr:@core/unknownutil@^4.0.0/is/unknown"; -import { - Client, - type Message, - Session, -} from "jsr:@denops/vim-channel-command@^4.0.2"; +import { ensure } from "@core/unknownutil/ensure"; +import { isArray } from "@core/unknownutil/is/array"; +import { isLiteralOf } from "@core/unknownutil/is/literal-of"; +import { isString } from "@core/unknownutil/is/string"; +import { isTupleOf } from "@core/unknownutil/is/tuple-of"; +import { isUnknown } from "@core/unknownutil/is/unknown"; +import { Client, type Message, Session } from "@denops/vim-channel-command"; import { type Host, invoke, type Service } from "../host.ts"; export class Vim implements Host { diff --git a/denops/@denops-private/host/vim_test.ts b/denops/@denops-private/host/vim_test.ts index 88ace8da..e86ef5ea 100644 --- a/denops/@denops-private/host/vim_test.ts +++ b/denops/@denops-private/host/vim_test.ts @@ -1,18 +1,14 @@ -import { - assertEquals, - assertMatch, - assertRejects, -} from "jsr:@std/assert@^1.0.1"; +import { assertEquals, assertMatch, assertRejects } from "@std/assert"; import { assertSpyCallArgs, assertSpyCalls, resolvesNext, stub, -} from "jsr:@std/testing@^1.0.0/mock"; -import { delay } from "jsr:@std/async@^1.0.1/delay"; -import { peekPromiseState } from "jsr:@core/asyncutil@^1.1.1"; -import { unimplemented } from "jsr:@core/errorutil@^1.2.1"; -import { Client, Session } from "jsr:@denops/vim-channel-command@^4.0.2"; +} from "@std/testing/mock"; +import { delay } from "@std/async/delay"; +import { peekPromiseState } from "@core/asyncutil"; +import { unimplemented } from "@core/errorutil"; +import { Client, Session } from "@denops/vim-channel-command"; import { withVim } from "/denops-testutil/with.ts"; import type { Service } from "../host.ts"; import { Vim } from "./vim.ts"; diff --git a/denops/@denops-private/host_test.ts b/denops/@denops-private/host_test.ts index 5e218ccb..c798c627 100644 --- a/denops/@denops-private/host_test.ts +++ b/denops/@denops-private/host_test.ts @@ -1,11 +1,7 @@ -import { assertThrows } from "jsr:@std/assert@^1.0.1"; -import { - assertSpyCall, - assertSpyCalls, - stub, -} from "jsr:@std/testing@^1.0.0/mock"; -import { AssertError } from "jsr:@core/unknownutil@^4.0.0/assert"; -import { unimplemented } from "jsr:@core/errorutil@^1.2.1"; +import { assertThrows } from "@std/assert"; +import { assertSpyCall, assertSpyCalls, stub } from "@std/testing/mock"; +import { AssertError } from "@core/unknownutil/assert"; +import { unimplemented } from "@core/errorutil"; import { invoke, type Service } from "./host.ts"; Deno.test("invoke", async (t) => { diff --git a/denops/@denops-private/plugin.ts b/denops/@denops-private/plugin.ts index 17efc91f..5bddc0b8 100644 --- a/denops/@denops-private/plugin.ts +++ b/denops/@denops-private/plugin.ts @@ -1,13 +1,13 @@ -import type { Denops, Entrypoint } from "jsr:@denops/core@^7.0.0"; +import type { Denops, Entrypoint } from "@denops/core"; import { type ImportMap, ImportMapImporter, loadImportMap, -} from "jsr:@lambdalisue/import-map-importer@^0.3.1"; -import { toFileUrl } from "jsr:@std/path@^1.0.2/to-file-url"; -import { fromFileUrl } from "jsr:@std/path@^1.0.2/from-file-url"; -import { join } from "jsr:@std/path@^1.0.2/join"; -import { dirname } from "jsr:@std/path@^1.0.2/dirname"; +} from "@lambdalisue/import-map-importer"; +import { toFileUrl } from "@std/path/to-file-url"; +import { fromFileUrl } from "@std/path/from-file-url"; +import { join } from "@std/path/join"; +import { dirname } from "@std/path/dirname"; type PluginModule = { main: Entrypoint; diff --git a/denops/@denops-private/plugin_test.ts b/denops/@denops-private/plugin_test.ts index a1e91b22..3f9dbcb4 100644 --- a/denops/@denops-private/plugin_test.ts +++ b/denops/@denops-private/plugin_test.ts @@ -4,16 +4,11 @@ import { assertInstanceOf, assertRejects, assertStringIncludes, -} from "jsr:@std/assert@^1.0.1"; -import { - assertSpyCall, - assertSpyCalls, - spy, - stub, -} from "jsr:@std/testing@^1.0.0/mock"; -import type { Denops, Meta } from "jsr:@denops/core@^7.0.0"; -import { flushPromises } from "jsr:@core/asyncutil@^1.1.1"; -import { unimplemented } from "jsr:@core/errorutil@^1.2.1"; +} from "@std/assert"; +import { assertSpyCall, assertSpyCalls, spy, stub } from "@std/testing/mock"; +import type { Denops, Meta } from "@denops/core"; +import { flushPromises } from "@core/asyncutil"; +import { unimplemented } from "@core/errorutil"; import { resolveTestDataURL } from "/denops-testdata/resolve.ts"; import { Plugin } from "./plugin.ts"; diff --git a/denops/@denops-private/service.ts b/denops/@denops-private/service.ts index 65918810..0c0241c1 100644 --- a/denops/@denops-private/service.ts +++ b/denops/@denops-private/service.ts @@ -1,5 +1,5 @@ -import type { Meta } from "jsr:@denops/core@^7.0.0"; -import { toErrorObject } from "jsr:@core/errorutil@^1.2.1"; +import type { Meta } from "@denops/core"; +import { toErrorObject } from "@core/errorutil"; import { DenopsImpl, type Host } from "./denops.ts"; import type { CallbackId, Service as HostService } from "./host.ts"; import { Plugin } from "./plugin.ts"; diff --git a/denops/@denops-private/service_test.ts b/denops/@denops-private/service_test.ts index b7f855e1..e8dd7614 100644 --- a/denops/@denops-private/service_test.ts +++ b/denops/@denops-private/service_test.ts @@ -10,18 +10,18 @@ import { assertRejects, assertStrictEquals, assertStringIncludes, -} from "jsr:@std/assert@^1.0.1"; +} from "@std/assert"; import { assertSpyCall, assertSpyCalls, resolvesNext, spy, stub, -} from "jsr:@std/testing@^1.0.0/mock"; -import { toFileUrl } from "jsr:@std/path@^1.0.2/to-file-url"; -import type { Meta } from "jsr:@denops/core@^7.0.0"; -import { flushPromises, peekPromiseState } from "jsr:@core/asyncutil@^1.1.1"; -import { unimplemented } from "jsr:@core/errorutil@^1.2.1"; +} from "@std/testing/mock"; +import { toFileUrl } from "@std/path/to-file-url"; +import type { Meta } from "@denops/core"; +import { flushPromises, peekPromiseState } from "@core/asyncutil"; +import { unimplemented } from "@core/errorutil"; import { INVALID_PLUGIN_NAMES } from "/denops-testdata/invalid_plugin_names.ts"; import { resolveTestDataURL } from "/denops-testdata/resolve.ts"; import type { Host } from "./denops.ts"; diff --git a/denops/@denops-private/util.ts b/denops/@denops-private/util.ts index fb407e27..1224f5f6 100644 --- a/denops/@denops-private/util.ts +++ b/denops/@denops-private/util.ts @@ -1,8 +1,8 @@ -import type { Meta } from "jsr:@denops/core@^7.0.0"; -import type { Predicate } from "jsr:@core/unknownutil@^4.0.0/type"; -import { isLiteralOneOf } from "jsr:@core/unknownutil@^4.0.0/is/literal-one-of"; -import { isObjectOf } from "jsr:@core/unknownutil@^4.0.0/is/object-of"; -import { isString } from "jsr:@core/unknownutil@^4.0.0/is/string"; +import type { Meta } from "@denops/core"; +import type { Predicate } from "@core/unknownutil/type"; +import { isLiteralOneOf } from "@core/unknownutil/is/literal-one-of"; +import { isObjectOf } from "@core/unknownutil/is/object-of"; +import { isString } from "@core/unknownutil/is/string"; export const isMeta: Predicate = isObjectOf({ mode: isLiteralOneOf(["release", "debug", "test"] as const), diff --git a/denops/@denops-private/version.ts b/denops/@denops-private/version.ts index 1505222b..aa35295d 100644 --- a/denops/@denops-private/version.ts +++ b/denops/@denops-private/version.ts @@ -1,7 +1,7 @@ -import { dirname } from "jsr:@std/path@^1.0.2/dirname"; -import { fromFileUrl } from "jsr:@std/path@^1.0.2/from-file-url"; -import type { SemVer } from "jsr:@std/semver@^1.0.1/types"; -import { parse } from "jsr:@std/semver@^1.0.1/parse"; +import { dirname } from "@std/path/dirname"; +import { fromFileUrl } from "@std/path/from-file-url"; +import type { SemVer } from "@std/semver/types"; +import { parse } from "@std/semver/parse"; const decoder = new TextDecoder(); diff --git a/denops/@denops-private/version_test.ts b/denops/@denops-private/version_test.ts index bfd7045e..88aa5daa 100644 --- a/denops/@denops-private/version_test.ts +++ b/denops/@denops-private/version_test.ts @@ -1,12 +1,12 @@ -import { assert, assertEquals } from "jsr:@std/assert@^1.0.1"; -import { resolvesNext, stub } from "jsr:@std/testing@^1.0.0/mock"; -import type { SemVer } from "jsr:@std/semver@^1.0.1/types"; -import type { Predicate } from "jsr:@core/unknownutil@^4.0.0/type"; -import { isArrayOf } from "jsr:@core/unknownutil@^4.0.0/is/array-of"; -import { isNumber } from "jsr:@core/unknownutil@^4.0.0/is/number"; -import { isObjectOf } from "jsr:@core/unknownutil@^4.0.0/is/object-of"; -import { isString } from "jsr:@core/unknownutil@^4.0.0/is/string"; -import { isUnionOf } from "jsr:@core/unknownutil@^4.0.0/is/union-of"; +import { assert, assertEquals } from "@std/assert"; +import { resolvesNext, stub } from "@std/testing/mock"; +import type { SemVer } from "@std/semver/types"; +import type { Predicate } from "@core/unknownutil/type"; +import { isArrayOf } from "@core/unknownutil/is/array-of"; +import { isNumber } from "@core/unknownutil/is/number"; +import { isObjectOf } from "@core/unknownutil/is/object-of"; +import { isString } from "@core/unknownutil/is/string"; +import { isUnionOf } from "@core/unknownutil/is/union-of"; import { getVersionOr } from "./version.ts"; Deno.test("getVersionOr()", async (t) => { diff --git a/denops/@denops-private/worker.ts b/denops/@denops-private/worker.ts index dc2bb121..751dd71c 100644 --- a/denops/@denops-private/worker.ts +++ b/denops/@denops-private/worker.ts @@ -4,11 +4,11 @@ import { readableStreamFromWorker, writableStreamFromWorker, -} from "jsr:@lambdalisue/workerio@^4.0.1"; -import { ensure } from "jsr:@core/unknownutil@^4.0.0/ensure"; -import { pop } from "jsr:@core/streamutil@^1.0.0"; -import { asyncSignal } from "jsr:@milly/async-signal@^1.0.0"; -import type { Meta } from "jsr:@denops/core@^7.0.0"; +} from "@lambdalisue/workerio"; +import { ensure } from "@core/unknownutil/ensure"; +import { pop } from "@core/streamutil"; +import { asyncSignal } from "@milly/async-signal"; +import type { Meta } from "@denops/core"; import type { Host, HostConstructor } from "./host.ts"; import { Vim } from "./host/vim.ts"; import { Neovim } from "./host/nvim.ts"; diff --git a/denops/@denops-private/worker_test.ts b/denops/@denops-private/worker_test.ts index 86f36255..d2009376 100644 --- a/denops/@denops-private/worker_test.ts +++ b/denops/@denops-private/worker_test.ts @@ -1,20 +1,15 @@ // @deno-types="npm:@types/sinon@^17.0.3" -import sinon from "npm:sinon@^21.0.0"; +import sinon from "sinon"; import { assertEquals, assertInstanceOf, assertMatch, assertObjectMatch, -} from "jsr:@std/assert@^1.0.1"; -import { - assertSpyCalls, - resolvesNext, - spy, - stub, -} from "jsr:@std/testing@^1.0.0/mock"; -import { delay } from "jsr:@std/async@^1.0.1/delay"; -import { DisposableStack } from "jsr:@nick/dispose@^1.1.0/disposable-stack"; -import * as nvimCodec from "jsr:@lambdalisue/messagepack@^1.0.1"; +} from "@std/assert"; +import { assertSpyCalls, resolvesNext, spy, stub } from "@std/testing/mock"; +import { delay } from "@std/async/delay"; +import { DisposableStack } from "@nick/dispose/disposable-stack"; +import * as nvimCodec from "@lambdalisue/messagepack"; import { createFakeMeta } from "/denops-testutil/mock.ts"; import { Neovim } from "./host/nvim.ts"; import { Vim } from "./host/vim.ts"; diff --git a/tests/denops/runtime/functions/denops/interrupt_test.ts b/tests/denops/runtime/functions/denops/interrupt_test.ts index 52d138e0..44ca29a9 100644 --- a/tests/denops/runtime/functions/denops/interrupt_test.ts +++ b/tests/denops/runtime/functions/denops/interrupt_test.ts @@ -1,4 +1,4 @@ -import { assert, assertEquals } from "jsr:@std/assert@^1.0.1"; +import { assert, assertEquals } from "@std/assert"; import { resolveTestDataPath } from "/denops-testdata/resolve.ts"; import { testHost } from "/denops-testutil/host.ts"; import { wait } from "/denops-testutil/wait.ts"; diff --git a/tests/denops/runtime/functions/denops/notify_test.ts b/tests/denops/runtime/functions/denops/notify_test.ts index 5e1000cc..59e4b70d 100644 --- a/tests/denops/runtime/functions/denops/notify_test.ts +++ b/tests/denops/runtime/functions/denops/notify_test.ts @@ -1,5 +1,5 @@ -import { assertEquals, assertStringIncludes } from "jsr:@std/assert@^1.0.1"; -import { delay } from "jsr:@std/async@^1.0.1/delay"; +import { assertEquals, assertStringIncludes } from "@std/assert"; +import { delay } from "@std/async/delay"; import { INVALID_PLUGIN_NAMES } from "/denops-testdata/invalid_plugin_names.ts"; import { resolveTestDataPath } from "/denops-testdata/resolve.ts"; import { testHost } from "/denops-testutil/host.ts"; diff --git a/tests/denops/runtime/functions/denops/request_async_test.ts b/tests/denops/runtime/functions/denops/request_async_test.ts index 4ad4b314..03559837 100644 --- a/tests/denops/runtime/functions/denops/request_async_test.ts +++ b/tests/denops/runtime/functions/denops/request_async_test.ts @@ -3,7 +3,7 @@ import { assertEquals, assertObjectMatch, assertStringIncludes, -} from "jsr:@std/assert@^1.0.1"; +} from "@std/assert"; import { INVALID_PLUGIN_NAMES } from "/denops-testdata/invalid_plugin_names.ts"; import { resolveTestDataPath } from "/denops-testdata/resolve.ts"; import { testHost } from "/denops-testutil/host.ts"; diff --git a/tests/denops/runtime/functions/denops/request_test.ts b/tests/denops/runtime/functions/denops/request_test.ts index a5fa17ce..74e3fac1 100644 --- a/tests/denops/runtime/functions/denops/request_test.ts +++ b/tests/denops/runtime/functions/denops/request_test.ts @@ -3,7 +3,7 @@ import { assertInstanceOf, assertRejects, assertStringIncludes, -} from "jsr:@std/assert@^1.0.1"; +} from "@std/assert"; import { INVALID_PLUGIN_NAMES } from "/denops-testdata/invalid_plugin_names.ts"; import { resolveTestDataPath } from "/denops-testdata/resolve.ts"; import { testHost } from "/denops-testutil/host.ts"; diff --git a/tests/denops/runtime/functions/plugin/check_type_test.ts b/tests/denops/runtime/functions/plugin/check_type_test.ts index 68943665..765635b9 100644 --- a/tests/denops/runtime/functions/plugin/check_type_test.ts +++ b/tests/denops/runtime/functions/plugin/check_type_test.ts @@ -1,8 +1,4 @@ -import { - assertMatch, - assertNotMatch, - assertRejects, -} from "jsr:@std/assert@^1.0.1"; +import { assertMatch, assertNotMatch, assertRejects } from "@std/assert"; import { INVALID_PLUGIN_NAMES } from "/denops-testdata/invalid_plugin_names.ts"; import { resolveTestDataPath } from "/denops-testdata/resolve.ts"; import { testHost } from "/denops-testutil/host.ts"; diff --git a/tests/denops/runtime/functions/plugin/discover_test.ts b/tests/denops/runtime/functions/plugin/discover_test.ts index a18746dd..83dcfe53 100644 --- a/tests/denops/runtime/functions/plugin/discover_test.ts +++ b/tests/denops/runtime/functions/plugin/discover_test.ts @@ -1,9 +1,5 @@ -import { - assertArrayIncludes, - assertEquals, - assertMatch, -} from "jsr:@std/assert@^1.0.1"; -import { delay } from "jsr:@std/async@^1.0.1"; +import { assertArrayIncludes, assertEquals, assertMatch } from "@std/assert"; +import { delay } from "@std/async"; import { resolveTestDataPath } from "/denops-testdata/resolve.ts"; import { testHost } from "/denops-testutil/host.ts"; import { wait } from "/denops-testutil/wait.ts"; diff --git a/tests/denops/runtime/functions/plugin/is_loaded_test.ts b/tests/denops/runtime/functions/plugin/is_loaded_test.ts index 33b50c36..b65e94f4 100644 --- a/tests/denops/runtime/functions/plugin/is_loaded_test.ts +++ b/tests/denops/runtime/functions/plugin/is_loaded_test.ts @@ -1,5 +1,5 @@ -import { assertEquals, assertRejects } from "jsr:@std/assert@^1.0.1"; -import { delay } from "jsr:@std/async@^1.0.1"; +import { assertEquals, assertRejects } from "@std/assert"; +import { delay } from "@std/async"; import { INVALID_PLUGIN_NAMES } from "/denops-testdata/invalid_plugin_names.ts"; import { resolveTestDataPath } from "/denops-testdata/resolve.ts"; import { testHost } from "/denops-testutil/host.ts"; diff --git a/tests/denops/runtime/functions/plugin/load_test.ts b/tests/denops/runtime/functions/plugin/load_test.ts index 616ecba3..40dcf409 100644 --- a/tests/denops/runtime/functions/plugin/load_test.ts +++ b/tests/denops/runtime/functions/plugin/load_test.ts @@ -1,9 +1,5 @@ -import { - assertEquals, - assertMatch, - assertRejects, -} from "jsr:@std/assert@^1.0.1"; -import { delay } from "jsr:@std/async@^1.0.1"; +import { assertEquals, assertMatch, assertRejects } from "@std/assert"; +import { delay } from "@std/async"; import { INVALID_PLUGIN_NAMES } from "/denops-testdata/invalid_plugin_names.ts"; import { resolveTestDataPath } from "/denops-testdata/resolve.ts"; import { testHost } from "/denops-testutil/host.ts"; diff --git a/tests/denops/runtime/functions/plugin/reload_test.ts b/tests/denops/runtime/functions/plugin/reload_test.ts index 4cf0b230..54f1c6a8 100644 --- a/tests/denops/runtime/functions/plugin/reload_test.ts +++ b/tests/denops/runtime/functions/plugin/reload_test.ts @@ -1,9 +1,5 @@ -import { - assertEquals, - assertMatch, - assertRejects, -} from "jsr:@std/assert@^1.0.1"; -import { delay } from "jsr:@std/async@^1.0.1"; +import { assertEquals, assertMatch, assertRejects } from "@std/assert"; +import { delay } from "@std/async"; import { INVALID_PLUGIN_NAMES } from "/denops-testdata/invalid_plugin_names.ts"; import { resolveTestDataPath } from "/denops-testdata/resolve.ts"; import { testHost } from "/denops-testutil/host.ts"; diff --git a/tests/denops/runtime/functions/plugin/unload_test.ts b/tests/denops/runtime/functions/plugin/unload_test.ts index 019348a3..14e34dc0 100644 --- a/tests/denops/runtime/functions/plugin/unload_test.ts +++ b/tests/denops/runtime/functions/plugin/unload_test.ts @@ -1,9 +1,5 @@ -import { - assertEquals, - assertMatch, - assertRejects, -} from "jsr:@std/assert@^1.0.1"; -import { delay } from "jsr:@std/async@^1.0.1"; +import { assertEquals, assertMatch, assertRejects } from "@std/assert"; +import { delay } from "@std/async"; import { INVALID_PLUGIN_NAMES } from "/denops-testdata/invalid_plugin_names.ts"; import { resolveTestDataPath } from "/denops-testdata/resolve.ts"; import { testHost } from "/denops-testutil/host.ts"; diff --git a/tests/denops/runtime/functions/plugin/wait_async_test.ts b/tests/denops/runtime/functions/plugin/wait_async_test.ts index 258fb5c2..a161a02c 100644 --- a/tests/denops/runtime/functions/plugin/wait_async_test.ts +++ b/tests/denops/runtime/functions/plugin/wait_async_test.ts @@ -3,8 +3,8 @@ import { assertEquals, assertLess, assertRejects, -} from "jsr:@std/assert@^1.0.1"; -import { delay } from "jsr:@std/async@^1.0.1"; +} from "@std/assert"; +import { delay } from "@std/async"; import { INVALID_PLUGIN_NAMES } from "/denops-testdata/invalid_plugin_names.ts"; import { resolveTestDataPath } from "/denops-testdata/resolve.ts"; import { testHost } from "/denops-testutil/host.ts"; diff --git a/tests/denops/runtime/functions/plugin/wait_test.ts b/tests/denops/runtime/functions/plugin/wait_test.ts index 04a9494e..c40b20d9 100644 --- a/tests/denops/runtime/functions/plugin/wait_test.ts +++ b/tests/denops/runtime/functions/plugin/wait_test.ts @@ -5,8 +5,8 @@ import { assertLess, assertRejects, assertStringIncludes, -} from "jsr:@std/assert@^1.0.1"; -import { delay } from "jsr:@std/async@^1.0.1"; +} from "@std/assert"; +import { delay } from "@std/async"; import { INVALID_PLUGIN_NAMES } from "/denops-testdata/invalid_plugin_names.ts"; import { resolveTestDataPath } from "/denops-testdata/resolve.ts"; import { testHost } from "/denops-testutil/host.ts"; diff --git a/tests/denops/runtime/functions/server/close_test.ts b/tests/denops/runtime/functions/server/close_test.ts index f96ae991..a8eec31d 100644 --- a/tests/denops/runtime/functions/server/close_test.ts +++ b/tests/denops/runtime/functions/server/close_test.ts @@ -1,11 +1,6 @@ -import { - assert, - assertEquals, - assertMatch, - assertRejects, -} from "jsr:@std/assert@^1.0.1"; -import { delay } from "jsr:@std/async@^1.0.1/delay"; -import { AsyncDisposableStack } from "jsr:@nick/dispose@^1.1.0/async-disposable-stack"; +import { assert, assertEquals, assertMatch, assertRejects } from "@std/assert"; +import { delay } from "@std/async/delay"; +import { AsyncDisposableStack } from "@nick/dispose/async-disposable-stack"; import { testHost } from "/denops-testutil/host.ts"; import { useSharedServer } from "/denops-testutil/shared_server.ts"; import { wait } from "/denops-testutil/wait.ts"; diff --git a/tests/denops/runtime/functions/server/connect_test.ts b/tests/denops/runtime/functions/server/connect_test.ts index ca9f1bec..afa23093 100644 --- a/tests/denops/runtime/functions/server/connect_test.ts +++ b/tests/denops/runtime/functions/server/connect_test.ts @@ -4,9 +4,9 @@ import { assertFalse, assertMatch, assertRejects, -} from "jsr:@std/assert@^1.0.1"; -import { delay } from "jsr:@std/async@^1.0.1/delay"; -import { AsyncDisposableStack } from "jsr:@nick/dispose@^1.1.0/async-disposable-stack"; +} from "@std/assert"; +import { delay } from "@std/async/delay"; +import { AsyncDisposableStack } from "@nick/dispose/async-disposable-stack"; import { testHost } from "/denops-testutil/host.ts"; import { useSharedServer } from "/denops-testutil/shared_server.ts"; import { wait } from "/denops-testutil/wait.ts"; diff --git a/tests/denops/runtime/functions/server/start_test.ts b/tests/denops/runtime/functions/server/start_test.ts index b0cdcbaf..0d034f4b 100644 --- a/tests/denops/runtime/functions/server/start_test.ts +++ b/tests/denops/runtime/functions/server/start_test.ts @@ -5,9 +5,9 @@ import { assertMatch, assertNotMatch, assertStringIncludes, -} from "jsr:@std/assert@^1.0.1"; -import { delay } from "jsr:@std/async@^1.0.1/delay"; -import { AsyncDisposableStack } from "jsr:@nick/dispose@^1.1.0/async-disposable-stack"; +} from "@std/assert"; +import { delay } from "@std/async/delay"; +import { AsyncDisposableStack } from "@nick/dispose/async-disposable-stack"; import { resolveTestDataURL } from "/denops-testdata/resolve.ts"; import { testHost } from "/denops-testutil/host.ts"; import { useSharedServer } from "/denops-testutil/shared_server.ts"; diff --git a/tests/denops/runtime/functions/server/status_test.ts b/tests/denops/runtime/functions/server/status_test.ts index 4bda35cd..71eb7aa2 100644 --- a/tests/denops/runtime/functions/server/status_test.ts +++ b/tests/denops/runtime/functions/server/status_test.ts @@ -1,4 +1,4 @@ -import { assertEquals } from "jsr:@std/assert@^1.0.1"; +import { assertEquals } from "@std/assert"; import { testHost } from "/denops-testutil/host.ts"; import { wait } from "/denops-testutil/wait.ts"; diff --git a/tests/denops/runtime/functions/server/stop_test.ts b/tests/denops/runtime/functions/server/stop_test.ts index 2e0a7765..502b2399 100644 --- a/tests/denops/runtime/functions/server/stop_test.ts +++ b/tests/denops/runtime/functions/server/stop_test.ts @@ -3,8 +3,8 @@ import { assertFalse, assertMatch, assertRejects, -} from "jsr:@std/assert@^1.0.1"; -import { AsyncDisposableStack } from "jsr:@nick/dispose@^1.1.0/async-disposable-stack"; +} from "@std/assert"; +import { AsyncDisposableStack } from "@nick/dispose/async-disposable-stack"; import { testHost } from "/denops-testutil/host.ts"; import { useSharedServer } from "/denops-testutil/shared_server.ts"; import { wait } from "/denops-testutil/wait.ts"; diff --git a/tests/denops/runtime/plugin_test.ts b/tests/denops/runtime/plugin_test.ts index 7d5a7d4d..71886b68 100644 --- a/tests/denops/runtime/plugin_test.ts +++ b/tests/denops/runtime/plugin_test.ts @@ -1,5 +1,5 @@ -import { assertEquals, assertMatch } from "jsr:@std/assert@^1.0.1"; -import { delay } from "jsr:@std/async@^1.0.1/delay"; +import { assertEquals, assertMatch } from "@std/assert"; +import { delay } from "@std/async/delay"; import { withHost } from "/denops-testutil/host.ts"; import { useSharedServer } from "/denops-testutil/shared_server.ts"; import { wait } from "/denops-testutil/wait.ts"; diff --git a/tests/denops/testdata/dummy_dispatcher_plugin.ts b/tests/denops/testdata/dummy_dispatcher_plugin.ts index 2ce1fffd..32e5132a 100644 --- a/tests/denops/testdata/dummy_dispatcher_plugin.ts +++ b/tests/denops/testdata/dummy_dispatcher_plugin.ts @@ -1,5 +1,5 @@ -import { delay } from "jsr:@std/async@^1.0.1/delay"; -import type { Entrypoint } from "jsr:@denops/core@^7.0.0"; +import { delay } from "@std/async/delay"; +import type { Entrypoint } from "@denops/core"; const MIMIC_DISPATCHER_METHOD_DELAY = 100; diff --git a/tests/denops/testdata/dummy_interrupt_plugin.ts b/tests/denops/testdata/dummy_interrupt_plugin.ts index 6ed3a456..709d527b 100644 --- a/tests/denops/testdata/dummy_interrupt_plugin.ts +++ b/tests/denops/testdata/dummy_interrupt_plugin.ts @@ -1,5 +1,5 @@ -import type { Entrypoint } from "jsr:@denops/core@^7.0.0"; -import { delay } from "jsr:@std/async@^1.0.1/delay"; +import type { Entrypoint } from "@denops/core"; +import { delay } from "@std/async/delay"; const MIMIC_ABORT_DELAY = 100; diff --git a/tests/denops/testdata/dummy_invalid_constraint_plugin.ts b/tests/denops/testdata/dummy_invalid_constraint_plugin.ts index 0ef10a6f..ed17bc9a 100644 --- a/tests/denops/testdata/dummy_invalid_constraint_plugin.ts +++ b/tests/denops/testdata/dummy_invalid_constraint_plugin.ts @@ -1,4 +1,4 @@ -import type { Entrypoint } from "jsr:@denops/core@^7.0.0"; +import type { Entrypoint } from "@denops/core"; export const main: Entrypoint = (_denops) => { // Mimic the situation diff --git a/tests/denops/testdata/dummy_invalid_constraint_plugin2.ts b/tests/denops/testdata/dummy_invalid_constraint_plugin2.ts index 1e852fb0..5e5eca71 100644 --- a/tests/denops/testdata/dummy_invalid_constraint_plugin2.ts +++ b/tests/denops/testdata/dummy_invalid_constraint_plugin2.ts @@ -1,4 +1,4 @@ -import type { Entrypoint } from "jsr:@denops/core@^7.0.0"; +import type { Entrypoint } from "@denops/core"; export const main: Entrypoint = (_denops) => { // Mimic the situation diff --git a/tests/denops/testdata/dummy_invalid_dispose_plugin.ts b/tests/denops/testdata/dummy_invalid_dispose_plugin.ts index 7749b70d..985d041f 100644 --- a/tests/denops/testdata/dummy_invalid_dispose_plugin.ts +++ b/tests/denops/testdata/dummy_invalid_dispose_plugin.ts @@ -1,4 +1,4 @@ -import type { Entrypoint } from "jsr:@denops/core@^7.0.0"; +import type { Entrypoint } from "@denops/core"; export const main: Entrypoint = (_denops) => { return { diff --git a/tests/denops/testdata/dummy_invalid_plugin.ts b/tests/denops/testdata/dummy_invalid_plugin.ts index eee183ce..de1c152f 100644 --- a/tests/denops/testdata/dummy_invalid_plugin.ts +++ b/tests/denops/testdata/dummy_invalid_plugin.ts @@ -1,4 +1,4 @@ -import type { Entrypoint } from "jsr:@denops/core@^7.0.0"; +import type { Entrypoint } from "@denops/core"; export const main: Entrypoint = (_denops) => { throw new Error("This is dummy error"); diff --git a/tests/denops/testdata/dummy_invalid_wait_plugin.ts b/tests/denops/testdata/dummy_invalid_wait_plugin.ts index b0d3223e..4452af60 100644 --- a/tests/denops/testdata/dummy_invalid_wait_plugin.ts +++ b/tests/denops/testdata/dummy_invalid_wait_plugin.ts @@ -1,5 +1,5 @@ -import type { Entrypoint } from "jsr:@denops/core@^7.0.0"; -import { delay } from "jsr:@std/async@^1.0.1/delay"; +import type { Entrypoint } from "@denops/core"; +import { delay } from "@std/async/delay"; export const main: Entrypoint = async (_denops) => { await delay(1000); diff --git a/tests/denops/testdata/dummy_plugins/denops/@dummy_namespace/main.ts b/tests/denops/testdata/dummy_plugins/denops/@dummy_namespace/main.ts index 39794292..22fe312e 100644 --- a/tests/denops/testdata/dummy_plugins/denops/@dummy_namespace/main.ts +++ b/tests/denops/testdata/dummy_plugins/denops/@dummy_namespace/main.ts @@ -1,4 +1,4 @@ -import type { Entrypoint } from "jsr:@denops/core@^7.0.0"; +import type { Entrypoint } from "@denops/core"; // NOTE: This should not be called, a directory starting with '@' is not a denops plugin. export const main: Entrypoint = async (denops) => { diff --git a/tests/denops/testdata/dummy_plugins/denops/dummy.invalid_name/main.ts b/tests/denops/testdata/dummy_plugins/denops/dummy.invalid_name/main.ts index 662327e0..0c7a5e94 100644 --- a/tests/denops/testdata/dummy_plugins/denops/dummy.invalid_name/main.ts +++ b/tests/denops/testdata/dummy_plugins/denops/dummy.invalid_name/main.ts @@ -1,4 +1,4 @@ -import type { Entrypoint } from "jsr:@denops/core@^7.0.0"; +import type { Entrypoint } from "@denops/core"; // NOTE: This should not be called, a directory contains '.' is not a valid denops plugin. export const main: Entrypoint = async (denops) => { diff --git a/tests/denops/testdata/dummy_plugins/denops/dummy_invalid/main.ts b/tests/denops/testdata/dummy_plugins/denops/dummy_invalid/main.ts index eee183ce..de1c152f 100644 --- a/tests/denops/testdata/dummy_plugins/denops/dummy_invalid/main.ts +++ b/tests/denops/testdata/dummy_plugins/denops/dummy_invalid/main.ts @@ -1,4 +1,4 @@ -import type { Entrypoint } from "jsr:@denops/core@^7.0.0"; +import type { Entrypoint } from "@denops/core"; export const main: Entrypoint = (_denops) => { throw new Error("This is dummy error"); diff --git a/tests/denops/testdata/dummy_plugins/denops/dummy_valid/main.ts b/tests/denops/testdata/dummy_plugins/denops/dummy_valid/main.ts index 8f76df58..f096a330 100644 --- a/tests/denops/testdata/dummy_plugins/denops/dummy_valid/main.ts +++ b/tests/denops/testdata/dummy_plugins/denops/dummy_valid/main.ts @@ -1,4 +1,4 @@ -import type { Entrypoint } from "jsr:@denops/core@^7.0.0"; +import type { Entrypoint } from "@denops/core"; export const main: Entrypoint = async (denops) => { await denops.cmd("echo 'Hello, Denops!'"); diff --git a/tests/denops/testdata/dummy_valid_dispose_plugin.ts b/tests/denops/testdata/dummy_valid_dispose_plugin.ts index df3e5cfa..b4bc6a71 100644 --- a/tests/denops/testdata/dummy_valid_dispose_plugin.ts +++ b/tests/denops/testdata/dummy_valid_dispose_plugin.ts @@ -1,4 +1,4 @@ -import type { Entrypoint } from "jsr:@denops/core@^7.0.0"; +import type { Entrypoint } from "@denops/core"; export const main: Entrypoint = (denops) => { return { diff --git a/tests/denops/testdata/dummy_valid_plugin.ts b/tests/denops/testdata/dummy_valid_plugin.ts index abd23dc7..40c1d82e 100644 --- a/tests/denops/testdata/dummy_valid_plugin.ts +++ b/tests/denops/testdata/dummy_valid_plugin.ts @@ -1,4 +1,4 @@ -import type { Entrypoint } from "jsr:@denops/core@^7.0.0"; +import type { Entrypoint } from "@denops/core"; export const main: Entrypoint = async (denops) => { denops.dispatcher = { diff --git a/tests/denops/testdata/dummy_valid_wait_plugin.ts b/tests/denops/testdata/dummy_valid_wait_plugin.ts index ea7add2d..283bccaf 100644 --- a/tests/denops/testdata/dummy_valid_wait_plugin.ts +++ b/tests/denops/testdata/dummy_valid_wait_plugin.ts @@ -1,5 +1,5 @@ -import type { Entrypoint } from "jsr:@denops/core@^7.0.0"; -import { delay } from "jsr:@std/async@^1.0.1/delay"; +import type { Entrypoint } from "@denops/core"; +import { delay } from "@std/async/delay"; export const main: Entrypoint = async (_denops) => { await delay(1000); diff --git a/tests/denops/testdata/resolve.ts b/tests/denops/testdata/resolve.ts index fb570743..4006b79c 100644 --- a/tests/denops/testdata/resolve.ts +++ b/tests/denops/testdata/resolve.ts @@ -1,4 +1,4 @@ -import { join } from "jsr:@std/path@^1.0.2/join"; +import { join } from "@std/path/join"; /** Resolve testdata script path. */ export function resolveTestDataPath(path: string): string { diff --git a/tests/denops/testdata/shared_server_test_no_verbose.ts b/tests/denops/testdata/shared_server_test_no_verbose.ts index d236ca6a..3e523f39 100644 --- a/tests/denops/testdata/shared_server_test_no_verbose.ts +++ b/tests/denops/testdata/shared_server_test_no_verbose.ts @@ -1,4 +1,4 @@ -import { delay } from "jsr:@std/async@^1.0.1/delay"; +import { delay } from "@std/async/delay"; import { useSharedServer } from "/denops-testutil/shared_server.ts"; { diff --git a/tests/denops/testdata/shared_server_test_verbose_true.ts b/tests/denops/testdata/shared_server_test_verbose_true.ts index fea2a51e..f75d66d1 100644 --- a/tests/denops/testdata/shared_server_test_verbose_true.ts +++ b/tests/denops/testdata/shared_server_test_verbose_true.ts @@ -1,4 +1,4 @@ -import { delay } from "jsr:@std/async@^1.0.1/delay"; +import { delay } from "@std/async/delay"; import { useSharedServer } from "/denops-testutil/shared_server.ts"; { diff --git a/tests/denops/testdata/with_import_map/plugin_with_import_map.ts b/tests/denops/testdata/with_import_map/plugin_with_import_map.ts index 81229c88..e733dc34 100644 --- a/tests/denops/testdata/with_import_map/plugin_with_import_map.ts +++ b/tests/denops/testdata/with_import_map/plugin_with_import_map.ts @@ -1,4 +1,4 @@ -import type { Entrypoint } from "jsr:@denops/core@^7.0.0"; +import type { Entrypoint } from "@denops/core"; import { getMessage, greeting } from "@test/helper"; export const main: Entrypoint = async (denops) => { diff --git a/tests/denops/testutil/conf.ts b/tests/denops/testutil/conf.ts index 9916d47b..ce28e000 100644 --- a/tests/denops/testutil/conf.ts +++ b/tests/denops/testutil/conf.ts @@ -1,6 +1,6 @@ -import { fromFileUrl } from "jsr:@std/path@^1.0.2/from-file-url"; -import { resolve } from "jsr:@std/path@^1.0.2/resolve"; -import { SEPARATOR as SEP } from "jsr:@std/path@^1.0.2/constants"; +import { fromFileUrl } from "@std/path/from-file-url"; +import { resolve } from "@std/path/resolve"; +import { SEPARATOR as SEP } from "@std/path/constants"; let conf: Config | undefined; diff --git a/tests/denops/testutil/conf_test.ts b/tests/denops/testutil/conf_test.ts index 18bcfa5a..4ea11e4a 100644 --- a/tests/denops/testutil/conf_test.ts +++ b/tests/denops/testutil/conf_test.ts @@ -1,4 +1,4 @@ -import { assertEquals } from "jsr:@std/assert@^1.0.1"; +import { assertEquals } from "@std/assert"; import { _internal } from "./conf.ts"; Deno.test({ diff --git a/tests/denops/testutil/mock.ts b/tests/denops/testutil/mock.ts index a7dab9ea..d3d6bd3c 100644 --- a/tests/denops/testutil/mock.ts +++ b/tests/denops/testutil/mock.ts @@ -1,5 +1,5 @@ -import { AssertionError, unimplemented } from "jsr:@std/assert@^1.0.1"; -import type { Meta } from "jsr:@denops/core@^7.0.0"; +import { AssertionError, unimplemented } from "@std/assert"; +import type { Meta } from "@denops/core"; /** Returns a Promise that is never resolves or rejects. */ export function pendingPromise(): Promise { diff --git a/tests/denops/testutil/mock_test.ts b/tests/denops/testutil/mock_test.ts index bca30a24..6a9af175 100644 --- a/tests/denops/testutil/mock_test.ts +++ b/tests/denops/testutil/mock_test.ts @@ -3,21 +3,16 @@ import { assertEquals, assertInstanceOf, assertRejects, -} from "jsr:@std/assert@^1.0.1"; -import { flushPromises, peekPromiseState } from "jsr:@core/asyncutil@^1.1.1"; +} from "@std/assert"; +import { flushPromises, peekPromiseState } from "@core/asyncutil"; import { createFakeTcpConn, createFakeTcpListener, createFakeWorker, pendingPromise, } from "./mock.ts"; -import { assertThrows } from "jsr:@std/assert@^1.0.1/throws"; -import { - assertSpyCalls, - resolvesNext, - spy, - stub, -} from "jsr:@std/testing@^1.0.0/mock"; +import { assertThrows } from "@std/assert/throws"; +import { assertSpyCalls, resolvesNext, spy, stub } from "@std/testing/mock"; // deno-lint-ignore no-explicit-any type AnyFn = (...args: any[]) => unknown; diff --git a/tests/denops/testutil/shared_server.ts b/tests/denops/testutil/shared_server.ts index 6c8e5384..d4a78d3a 100644 --- a/tests/denops/testutil/shared_server.ts +++ b/tests/denops/testutil/shared_server.ts @@ -1,8 +1,8 @@ -import { assert } from "jsr:@std/assert@^1.0.1"; -import { deadline } from "jsr:@std/async@^1.0.1/deadline"; -import { resolve } from "jsr:@std/path@^1.0.2/resolve"; -import { channel, pop } from "jsr:@core/streamutil@^1.0.0"; -import { tap } from "jsr:@milly/streams@^1.0.0/transform/tap"; +import { assert } from "@std/assert"; +import { deadline } from "@std/async/deadline"; +import { resolve } from "@std/path/resolve"; +import { channel, pop } from "@core/streamutil"; +import { tap } from "@milly/streams/transform/tap"; import { getConfig } from "./conf.ts"; const DEFAULT_TIMEOUT = 30_000; diff --git a/tests/denops/testutil/shared_server_test.ts b/tests/denops/testutil/shared_server_test.ts index 7261844d..1e3ac894 100644 --- a/tests/denops/testutil/shared_server_test.ts +++ b/tests/denops/testutil/shared_server_test.ts @@ -4,9 +4,9 @@ import { assertMatch, assertNotMatch, assertRejects, -} from "jsr:@std/assert@^1.0.1"; -import { delay } from "jsr:@std/async@^1.0.1/delay"; -import { retry } from "jsr:@std/async@^1.0.1/retry"; +} from "@std/assert"; +import { delay } from "@std/async/delay"; +import { retry } from "@std/async/retry"; import { resolveTestDataPath } from "/denops-testdata/resolve.ts"; import { useSharedServer } from "./shared_server.ts"; diff --git a/tests/denops/testutil/wait.ts b/tests/denops/testutil/wait.ts index 8dd6760d..2ab9d2e2 100644 --- a/tests/denops/testutil/wait.ts +++ b/tests/denops/testutil/wait.ts @@ -1,6 +1,6 @@ -import { AssertionError } from "jsr:@std/assert@^1.0.1/assertion-error"; -import { abortable } from "jsr:@std/async@^1.0.1/abortable"; -import { delay } from "jsr:@std/async@^1.0.1/delay"; +import { AssertionError } from "@std/assert/assertion-error"; +import { abortable } from "@std/async/abortable"; +import { delay } from "@std/async/delay"; import { getConfig } from "./conf.ts"; const DEFAULT_TIMEOUT = 30_000; diff --git a/tests/denops/testutil/wait_test.ts b/tests/denops/testutil/wait_test.ts index 4494641b..2fd5417c 100644 --- a/tests/denops/testutil/wait_test.ts +++ b/tests/denops/testutil/wait_test.ts @@ -1,11 +1,11 @@ -import { assertEquals, assertRejects } from "jsr:@std/assert@^1.0.1"; +import { assertEquals, assertRejects } from "@std/assert"; import { assertSpyCalls, resolvesNext, returnsNext, spy, -} from "jsr:@std/testing@^1.0.0/mock"; -import { FakeTime } from "jsr:@std/testing@^1.0.0/time"; +} from "@std/testing/mock"; +import { FakeTime } from "@std/testing/time"; import { wait } from "./wait.ts"; Deno.test("wait()", async (t) => { diff --git a/tests/denops/testutil/with.ts b/tests/denops/testutil/with.ts index 3c3f8989..7ce1d839 100644 --- a/tests/denops/testutil/with.ts +++ b/tests/denops/testutil/with.ts @@ -1,5 +1,5 @@ -import { channel } from "jsr:@core/streamutil@^1.0.0"; -import { tap } from "jsr:@milly/streams@^1.0.0/transform/tap"; +import { channel } from "@core/streamutil"; +import { tap } from "@milly/streams/transform/tap"; import { ADDR_ENV_NAME } from "./cli.ts"; import { getConfig } from "./conf.ts";