diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fd5bb6af..0f2ff188 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,25 +1,36 @@ -name: test +name: Test on: - schedule: - - cron: "0 7 * * 0" push: branches: - main pull_request: + paths: + - "**.md" + - "**.ts" + - "deno.jsonc" + - ".github/workflows/test.yml" workflow_dispatch: + inputs: + denops_branch: + description: "Denops revision to test" + required: false + default: "main" defaults: run: shell: bash --noprofile --norc -eo pipefail {0} +env: + DENOPS_BRANCH: ${{ github.event.inputs.denops_branch || 'main' }} + jobs: check: strategy: matrix: runner: - ubuntu-latest - version: + deno_version: - "1.x" runs-on: ${{ matrix.runner }} steps: @@ -28,7 +39,13 @@ jobs: - uses: actions/checkout@v4 - uses: denoland/setup-deno@v1.1.4 with: - deno-version: "${{ matrix.version }}" + deno-version: "${{ matrix.deno_version }}" + - uses: actions/cache@v4 + with: + key: deno-${{ hashFiles('**/*') }} + restore-keys: deno- + path: | + /home/runner/.cache/deno/deps/https/deno.land - name: Lint check run: deno lint - name: Format check @@ -43,54 +60,67 @@ jobs: - windows-latest - macos-latest - ubuntu-latest - version: - - "1.38.x" + deno_version: + - "1.45.0" - "1.x" host_version: - - vim: "v9.0.1499" - nvim: "v0.8.0" + - vim: "v9.1.0448" + nvim: "v0.10.0" runs-on: ${{ matrix.runner }} + timeout-minutes: 15 steps: - - run: git config --global init.defaultBranch main - run: git config --global core.autocrlf false if: runner.os == 'Windows' + - uses: actions/checkout@v4 - - uses: actions/checkout@v4 - with: - repository: "vim-denops/denops.vim" - path: ".deps/denops.vim" + - uses: denoland/setup-deno@v1.1.4 with: - deno-version: "${{ matrix.version }}" + deno-version: "${{ matrix.deno_version }}" + + - name: Get denops + run: | + git clone https://github.com/vim-denops/denops.vim /tmp/denops.vim + echo "DENOPS_TEST_DENOPS_PATH=/tmp/denops.vim" >> "$GITHUB_ENV" + + - name: Try switching denops branch + run: | + git -C /tmp/denops.vim switch ${{ env.DENOPS_BRANCH }} || true + git -C /tmp/denops.vim branch + - uses: rhysd/action-setup-vim@v1 id: vim with: version: "${{ matrix.host_version.vim }}" - - name: Check Vim - run: | - echo ${DENOPS_TEST_VIM} - ${DENOPS_TEST_VIM} --version - env: - DENOPS_TEST_VIM: ${{ steps.vim.outputs.executable }} + - uses: rhysd/action-setup-vim@v1 id: nvim with: neovim: true version: "${{ matrix.host_version.nvim }}" - - name: Check Neovim + + - name: Export executables + run: | + echo "DENOPS_TEST_VIM_EXECUTABLE=${{ steps.vim.outputs.executable }}" >> "$GITHUB_ENV" + echo "DENOPS_TEST_NVIM_EXECUTABLE=${{ steps.nvim.outputs.executable }}" >> "$GITHUB_ENV" + + - name: Check versions run: | - echo ${DENOPS_TEST_NVIM} - ${DENOPS_TEST_NVIM} --version - env: - DENOPS_TEST_NVIM: ${{ steps.nvim.outputs.executable }} + deno --version + ${DENOPS_TEST_VIM_EXECUTABLE} --version + ${DENOPS_TEST_NVIM_EXECUTABLE} --version + + - name: Perform pre-cache + run: | + deno cache ${DENOPS_TEST_DENOPS_PATH}/denops/@denops-private/mod.ts ./denops/gin/main.ts + - name: Test run: deno task test:coverage - env: - DENOPS_TEST_DENOPS_PATH: ".deps/denops.vim" - DENOPS_TEST_VIM_EXECUTABLE: ${{ steps.vim.outputs.executable }} - DENOPS_TEST_NVIM_EXECUTABLE: ${{ steps.nvim.outputs.executable }} + timeout-minutes: 15 + - run: | deno task coverage --lcov > coverage.lcov + - uses: codecov/codecov-action@v4 with: os: ${{ runner.os }} diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml deleted file mode 100644 index afca7f81..00000000 --- a/.github/workflows/update.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: update - -on: - schedule: - - cron: "0 0 * * *" - workflow_dispatch: - -jobs: - update: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: denoland/setup-deno@v1.1.4 - with: - deno-version: 1.x - - name: Configure Git - run: | - git config user.name github-actions[bot] - git config user.email github-actions[bot]@users.noreply.github.com - - name: Update dependencies and commit changes - run: deno task -q upgrade:commit --summary ../title.txt --report ../body.md - - name: Check result - id: result - uses: andstor/file-existence-action@v2 - with: - files: ../title.txt, ../body.md - - name: Read title.txt - id: title - if: steps.result.outputs.files_exists == 'true' - uses: juliangruber/read-file-action@v1 - with: - path: ../title.txt - - name: Read body.md - id: body - if: steps.result.outputs.files_exists == 'true' - uses: juliangruber/read-file-action@v1 - with: - path: ../body.md - - name: Create a pull request - if: steps.result.outputs.files_exists == 'true' - uses: peter-evans/create-pull-request@v6 - with: - author: github-actions[bot] - branch: automation/update-dependencies - title: ${{ steps.title.outputs.content }} - body: ${{ steps.body.outputs.content }} - labels: automation - delete-branch: true diff --git a/deno.jsonc b/deno.jsonc index 86951d7e..2b7c38f4 100644 --- a/deno.jsonc +++ b/deno.jsonc @@ -1,12 +1,16 @@ { "lock": false, - "exclude": ["docs/**", ".deps/**", ".coverage/**"], + "exclude": [ + "docs/**", + ".coverage/**" + ], "tasks": { + "check": "deno check ./**/*.ts", "test": "deno test -A --parallel --shuffle --doc", "test:coverage": "deno task test --coverage=.coverage", - "check": "deno check ./**/*.ts", "coverage": "deno coverage .coverage --exclude=cli.ts --exclude=worker.ts --exclude=testdata/", - "upgrade": "deno run -q -A https://deno.land/x/molt@0.14.2/cli.ts ./**/*.ts", - "upgrade:commit": "deno task -q upgrade --commit --prefix :package: --pre-commit=fmt" + "update": "deno run --allow-env --allow-read --allow-write --allow-run=git,deno --allow-net=jsr.io,registry.npmjs.org jsr:@molt/cli **/*.ts", + "update:write": "deno task -q update --write", + "update:commit": "deno task -q update --commit --prefix :package: --pre-commit=fmt,lint" } } diff --git a/denops/gin/action/add.ts b/denops/gin/action/add.ts index fdc70135..fd01a542 100644 --- a/denops/gin/action/add.ts +++ b/denops/gin/action/add.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { path: string }; diff --git a/denops/gin/action/branch_delete.ts b/denops/gin/action/branch_delete.ts index 33bd05e2..6d645f80 100644 --- a/denops/gin/action/branch_delete.ts +++ b/denops/gin/action/branch_delete.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { define, GatherCandidates, Range } from "./core.ts"; export type Candidate = diff --git a/denops/gin/action/branch_move.ts b/denops/gin/action/branch_move.ts index 50cd86e3..a4cfccf9 100644 --- a/denops/gin/action/branch_move.ts +++ b/denops/gin/action/branch_move.ts @@ -1,6 +1,6 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as helper from "jsr:@denops/std@^7.0.0/helper"; import { define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { branch: string }; diff --git a/denops/gin/action/branch_new.ts b/denops/gin/action/branch_new.ts index 2bd86edd..45bc3b7b 100644 --- a/denops/gin/action/branch_new.ts +++ b/denops/gin/action/branch_new.ts @@ -1,6 +1,6 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as helper from "jsr:@denops/std@^7.0.0/helper"; import { define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { target?: string }; diff --git a/denops/gin/action/browse.ts b/denops/gin/action/browse.ts index 08124fda..63275afe 100644 --- a/denops/gin/action/browse.ts +++ b/denops/gin/action/browse.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { commit: string; path?: string }; diff --git a/denops/gin/action/chaperon.ts b/denops/gin/action/chaperon.ts index 319dbd3c..d2aec1d5 100644 --- a/denops/gin/action/chaperon.ts +++ b/denops/gin/action/chaperon.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { alias, define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { path: string }; diff --git a/denops/gin/action/cherry_pick.ts b/denops/gin/action/cherry_pick.ts index a3fe5891..ab62d95e 100644 --- a/denops/gin/action/cherry_pick.ts +++ b/denops/gin/action/cherry_pick.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { commit: string }; diff --git a/denops/gin/action/core.ts b/denops/gin/action/core.ts index 46be2d40..1fc704ea 100644 --- a/denops/gin/action/core.ts +++ b/denops/gin/action/core.ts @@ -1,10 +1,10 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.0.1/function/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; -import * as mapping from "https://deno.land/x/denops_std@v6.0.1/mapping/mod.ts"; -import { assert, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; +import * as fn from "jsr:@denops/std@^7.0.0/function"; +import * as helper from "jsr:@denops/std@^7.0.0/helper"; +import * as mapping from "jsr:@denops/std@^7.0.0/mapping"; +import { assert, is } from "jsr:@core/unknownutil@^4.0.0"; let rangeInternal: Range | undefined; diff --git a/denops/gin/action/diff.ts b/denops/gin/action/diff.ts index 2653bcdf..e0ede22c 100644 --- a/denops/gin/action/diff.ts +++ b/denops/gin/action/diff.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { alias, define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { path: string }; diff --git a/denops/gin/action/diff_smart.ts b/denops/gin/action/diff_smart.ts index bbca6eab..94b812a1 100644 --- a/denops/gin/action/diff_smart.ts +++ b/denops/gin/action/diff_smart.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { alias, define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { path: string; XY: string }; diff --git a/denops/gin/action/echo.ts b/denops/gin/action/echo.ts index 88e14bd4..e9a9d089 100644 --- a/denops/gin/action/echo.ts +++ b/denops/gin/action/echo.ts @@ -1,6 +1,6 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as helper from "jsr:@denops/std@^7.0.0/helper"; import { define, GatherCandidates, Range } from "./core.ts"; export type Candidate = unknown; diff --git a/denops/gin/action/edit.ts b/denops/gin/action/edit.ts index dc0ed3b0..ab68aafc 100644 --- a/denops/gin/action/edit.ts +++ b/denops/gin/action/edit.ts @@ -1,6 +1,6 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; import { alias, define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { path: string }; diff --git a/denops/gin/action/fixup.ts b/denops/gin/action/fixup.ts index 74266215..6e2276c2 100644 --- a/denops/gin/action/fixup.ts +++ b/denops/gin/action/fixup.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { alias, define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { commit: string }; diff --git a/denops/gin/action/log.ts b/denops/gin/action/log.ts index 9ba3f725..da6a4d0e 100644 --- a/denops/gin/action/log.ts +++ b/denops/gin/action/log.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { alias, define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { commitish: string }; diff --git a/denops/gin/action/merge.ts b/denops/gin/action/merge.ts index b80ce72f..d672a2e1 100644 --- a/denops/gin/action/merge.ts +++ b/denops/gin/action/merge.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { alias, define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { commit: string }; diff --git a/denops/gin/action/patch.ts b/denops/gin/action/patch.ts index a3e87a55..4fe7fa16 100644 --- a/denops/gin/action/patch.ts +++ b/denops/gin/action/patch.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { alias, define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { path: string }; diff --git a/denops/gin/action/rebase.ts b/denops/gin/action/rebase.ts index 69258cb6..a2a1e46a 100644 --- a/denops/gin/action/rebase.ts +++ b/denops/gin/action/rebase.ts @@ -1,6 +1,6 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as helper from "jsr:@denops/std@^7.0.0/helper"; import { define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { commit: string }; diff --git a/denops/gin/action/reset.ts b/denops/gin/action/reset.ts index 545cf66a..97952f30 100644 --- a/denops/gin/action/reset.ts +++ b/denops/gin/action/reset.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { commit: string }; diff --git a/denops/gin/action/reset_file.ts b/denops/gin/action/reset_file.ts index dd0c429a..46860690 100644 --- a/denops/gin/action/reset_file.ts +++ b/denops/gin/action/reset_file.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { path: string }; diff --git a/denops/gin/action/restore.ts b/denops/gin/action/restore.ts index 5418c07d..434256b6 100644 --- a/denops/gin/action/restore.ts +++ b/denops/gin/action/restore.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { path: string }; diff --git a/denops/gin/action/revert.ts b/denops/gin/action/revert.ts index 0da2676f..57b0455d 100644 --- a/denops/gin/action/revert.ts +++ b/denops/gin/action/revert.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { commit: string }; diff --git a/denops/gin/action/rm.ts b/denops/gin/action/rm.ts index 4e527ecf..fd024b1c 100644 --- a/denops/gin/action/rm.ts +++ b/denops/gin/action/rm.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { path: string }; diff --git a/denops/gin/action/show.ts b/denops/gin/action/show.ts index 6f603fe9..f36f6fcc 100644 --- a/denops/gin/action/show.ts +++ b/denops/gin/action/show.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { alias, define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { commit: string }; diff --git a/denops/gin/action/stage.ts b/denops/gin/action/stage.ts index f0195ff9..5559e57c 100644 --- a/denops/gin/action/stage.ts +++ b/denops/gin/action/stage.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { define, GatherCandidates, Range } from "./core.ts"; import { doResetFile } from "./reset_file.ts"; diff --git a/denops/gin/action/stash.ts b/denops/gin/action/stash.ts index fb154364..b43b9289 100644 --- a/denops/gin/action/stash.ts +++ b/denops/gin/action/stash.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { path: string }; diff --git a/denops/gin/action/switch.ts b/denops/gin/action/switch.ts index d371142c..304b1e50 100644 --- a/denops/gin/action/switch.ts +++ b/denops/gin/action/switch.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { target: string }; diff --git a/denops/gin/action/tag.ts b/denops/gin/action/tag.ts index f8ff8604..39326320 100644 --- a/denops/gin/action/tag.ts +++ b/denops/gin/action/tag.ts @@ -1,6 +1,6 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as helper from "jsr:@denops/std@^7.0.0/helper"; import { alias, define, GatherCandidates, Range } from "./core.ts"; export type Candidate = { commit: string }; diff --git a/denops/gin/action/yank.ts b/denops/gin/action/yank.ts index 43d6dc83..2c4af90c 100644 --- a/denops/gin/action/yank.ts +++ b/denops/gin/action/yank.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; import { define, GatherCandidates, Range } from "./core.ts"; import { yank } from "../util/yank.ts"; diff --git a/denops/gin/command/bare/command.ts b/denops/gin/command/bare/command.ts index 4a72314b..2e1e95e0 100644 --- a/denops/gin/command/bare/command.ts +++ b/denops/gin/command/bare/command.ts @@ -1,7 +1,7 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as autocmd from "https://deno.land/x/denops_std@v6.0.1/autocmd/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as autocmd from "jsr:@denops/std@^7.0.0/autocmd"; +import * as helper from "jsr:@denops/std@^7.0.0/helper"; +import * as option from "jsr:@denops/std@^7.0.0/option"; import { removeAnsiEscapeCode } from "../../util/ansi_escape_code.ts"; import { execute } from "../../git/executor.ts"; diff --git a/denops/gin/command/bare/main.ts b/denops/gin/command/bare/main.ts index a63ada79..afd53152 100644 --- a/denops/gin/command/bare/main.ts +++ b/denops/gin/command/bare/main.ts @@ -1,10 +1,7 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { assert, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; -import { - parseOpts, - validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/opts.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { assert, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as helper from "jsr:@denops/std@^7.0.0/helper"; +import { parseOpts, validateOpts } from "jsr:@denops/std@^7.0.0/argument"; import { normCmdArgs, parseSilent } from "../../util/cmd.ts"; import { exec } from "./command.ts"; diff --git a/denops/gin/command/branch/command.ts b/denops/gin/command/branch/command.ts index e2522e77..e9b5e01c 100644 --- a/denops/gin/command/branch/command.ts +++ b/denops/gin/command/branch/command.ts @@ -1,9 +1,9 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; -import { format as formatBufname } from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; -import { Flags } from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; +import * as option from "jsr:@denops/std@^7.0.0/option"; +import { format as formatBufname } from "jsr:@denops/std@^7.0.0/bufname"; +import { Flags } from "jsr:@denops/std@^7.0.0/argument"; import { findWorktreeFromDenops } from "../../git/worktree.ts"; export type ExecOptions = { diff --git a/denops/gin/command/branch/edit.ts b/denops/gin/command/branch/edit.ts index cc57a27f..81c170f9 100644 --- a/denops/gin/command/branch/edit.ts +++ b/denops/gin/command/branch/edit.ts @@ -1,15 +1,11 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.0.1/function/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; -import * as vars from "https://deno.land/x/denops_std@v6.0.1/variable/mod.ts"; -import { parse as parseBufname } from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; -import { - Flags, - formatFlags, - parseOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as fn from "jsr:@denops/std@^7.0.0/function"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; +import * as option from "jsr:@denops/std@^7.0.0/option"; +import * as vars from "jsr:@denops/std@^7.0.0/variable"; +import { parse as parseBufname } from "jsr:@denops/std@^7.0.0/bufname"; +import { Flags, formatFlags, parseOpts } from "jsr:@denops/std@^7.0.0/argument"; import { bind } from "../../command/bare/command.ts"; import { exec as execBuffer } from "../../command/buffer/edit.ts"; import { init as initActionBranchDelete } from "../../action/branch_delete.ts"; diff --git a/denops/gin/command/branch/main.ts b/denops/gin/command/branch/main.ts index b022022d..49309945 100644 --- a/denops/gin/command/branch/main.ts +++ b/denops/gin/command/branch/main.ts @@ -1,12 +1,12 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; -import { assert, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as helper from "jsr:@denops/std@^7.0.0/helper"; +import { assert, is } from "jsr:@core/unknownutil@^4.0.0"; import { builtinOpts, formatOpts, parse, validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; +} from "jsr:@denops/std@^7.0.0/argument"; import { fillCmdArgs, normCmdArgs, parseSilent } from "../../util/cmd.ts"; import { exec } from "./command.ts"; diff --git a/denops/gin/command/branch/parser_test.ts b/denops/gin/command/branch/parser_test.ts index b79e684c..7043a68f 100644 --- a/denops/gin/command/branch/parser_test.ts +++ b/denops/gin/command/branch/parser_test.ts @@ -1,4 +1,4 @@ -import { assertSnapshot } from "https://deno.land/std@0.214.0/testing/snapshot.ts"; +import { assertSnapshot } from "jsr:@std/testing@^1.0.0/snapshot"; import { parse } from "./parser.ts"; Deno.test("parse", async function (t): Promise { diff --git a/denops/gin/command/browse/command.ts b/denops/gin/command/browse/command.ts index f58c4c2f..29560ce7 100644 --- a/denops/gin/command/browse/command.ts +++ b/denops/gin/command/browse/command.ts @@ -1,15 +1,12 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/mod.ts"; -import { assert, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import { systemopen } from "https://deno.land/x/systemopen@v0.2.0/mod.ts"; -import { - getURL, - Options, -} from "https://deno.land/x/git_browse@v1.0.1/bin/browse.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as vars from "https://deno.land/x/denops_std@v6.0.1/variable/mod.ts"; -import * as path from "https://deno.land/std@0.214.0/path/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import { assert, is } from "jsr:@core/unknownutil@^4.0.0"; +import { systemopen } from "jsr:@lambdalisue/systemopen@^1.0.0"; +import { getURL, Options } from "jsr:@lambdalisue/git-browse@^1.0.1/cli"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as vars from "jsr:@denops/std@^7.0.0/variable"; +import * as path from "jsr:@std/path@^1.0.0"; +import * as option from "jsr:@denops/std@^7.0.0/option"; import { findWorktreeFromDenops } from "../../git/worktree.ts"; import { yank } from "../../util/yank.ts"; diff --git a/denops/gin/command/browse/main.ts b/denops/gin/command/browse/main.ts index ff6d1b23..bf811090 100644 --- a/denops/gin/command/browse/main.ts +++ b/denops/gin/command/browse/main.ts @@ -1,17 +1,10 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/mod.ts"; -import { - assert, - ensure, - is, -} from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.0.1/function/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; -import { - parse, - validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import { assert, ensure, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as fn from "jsr:@denops/std@^7.0.0/function"; +import * as helper from "jsr:@denops/std@^7.0.0/helper"; +import { parse, validateOpts } from "jsr:@denops/std@^7.0.0/argument"; import { fillCmdArgs, normCmdArgs } from "../../util/cmd.ts"; import { exec } from "./command.ts"; @@ -24,7 +17,7 @@ export function main(denops: Denops): void { ...denops.dispatcher, "browse:command": (args, range) => { assert(args, is.ArrayOf(is.String), { name: "args" }); - assert(range, is.OneOf([is.Undefined, isRange]), { name: "range" }); + assert(range, is.UnionOf([is.Undefined, isRange]), { name: "range" }); return helper.friendlyCall( denops, () => @@ -63,7 +56,7 @@ async function command( worktree: opts.worktree, yank: opts.yank === "" ? true : (opts.yank ?? false), noBrowser: ("n" in flags || "no-browser" in flags), - remote: ensure(flags.remote, is.OneOf([is.Undefined, is.String]), { + remote: ensure(flags.remote, is.UnionOf([is.Undefined, is.String]), { "message": "REMOTE in --remote={REMOTE} must be string", }), path, diff --git a/denops/gin/command/buffer/command.ts b/denops/gin/command/buffer/command.ts index 5e1801c3..b8ea00e0 100644 --- a/denops/gin/command/buffer/command.ts +++ b/denops/gin/command/buffer/command.ts @@ -1,10 +1,8 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; -import { - format as formatBufname, -} from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; +import * as option from "jsr:@denops/std@^7.0.0/option"; +import { format as formatBufname } from "jsr:@denops/std@^7.0.0/bufname"; import { findWorktreeFromDenops } from "../../git/worktree.ts"; export type ExecOptions = { diff --git a/denops/gin/command/buffer/edit.ts b/denops/gin/command/buffer/edit.ts index cae71e5c..ae51f472 100644 --- a/denops/gin/command/buffer/edit.ts +++ b/denops/gin/command/buffer/edit.ts @@ -1,19 +1,17 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { emojify } from "https://deno.land/x/github_emoji@v0.1.1/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/mod.ts"; -import { ensure, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; -import * as vars from "https://deno.land/x/denops_std@v6.0.1/variable/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { emojify } from "jsr:@lambdalisue/github-emoji@^1.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import { ensure, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; +import * as option from "jsr:@denops/std@^7.0.0/option"; +import * as vars from "jsr:@denops/std@^7.0.0/variable"; import { builtinOpts, parseOpts, validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; -import { - parse as parseBufname, -} from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; +} from "jsr:@denops/std@^7.0.0/argument"; +import { parse as parseBufname } from "jsr:@denops/std@^7.0.0/bufname"; import { buildDecorationsFromAnsiEscapeCode, } from "../../util/ansi_escape_code.ts"; diff --git a/denops/gin/command/buffer/main.ts b/denops/gin/command/buffer/main.ts index c6e195c3..5acdba91 100644 --- a/denops/gin/command/buffer/main.ts +++ b/denops/gin/command/buffer/main.ts @@ -1,14 +1,14 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/unnullish.ts"; -import { assert, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import { assert, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as helper from "jsr:@denops/std@^7.0.0/helper"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; import { builtinOpts, formatOpts, parseOpts, validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/opts.ts"; +} from "jsr:@denops/std@^7.0.0/argument"; import { normCmdArgs, parseSilent } from "../../util/cmd.ts"; import { exec } from "./command.ts"; diff --git a/denops/gin/command/buffer/read.ts b/denops/gin/command/buffer/read.ts index 2fa9c2aa..ad0cf7f6 100644 --- a/denops/gin/command/buffer/read.ts +++ b/denops/gin/command/buffer/read.ts @@ -1,17 +1,15 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { emojify } from "https://deno.land/x/github_emoji@v0.1.1/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/mod.ts"; -import { ensure, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; -import * as vars from "https://deno.land/x/denops_std@v6.0.1/variable/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { emojify } from "jsr:@lambdalisue/github-emoji@^1.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import { ensure, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; +import * as vars from "jsr:@denops/std@^7.0.0/variable"; import { builtinOpts, parseOpts, validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; -import { - parse as parseBufname, -} from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; +} from "jsr:@denops/std@^7.0.0/argument"; +import { parse as parseBufname } from "jsr:@denops/std@^7.0.0/bufname"; import { execute } from "../../git/executor.ts"; export async function read( diff --git a/denops/gin/command/chaperon/command.ts b/denops/gin/command/chaperon/command.ts index 9159d588..b5e72455 100644 --- a/denops/gin/command/chaperon/command.ts +++ b/denops/gin/command/chaperon/command.ts @@ -1,12 +1,12 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.0.1/function/mod.ts"; -import * as mapping from "https://deno.land/x/denops_std@v6.0.1/mapping/mod.ts"; -import * as vars from "https://deno.land/x/denops_std@v6.0.1/variable/mod.ts"; -import { assert, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as path from "https://deno.land/std@0.214.0/path/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as fn from "jsr:@denops/std@^7.0.0/function"; +import * as mapping from "jsr:@denops/std@^7.0.0/mapping"; +import * as vars from "jsr:@denops/std@^7.0.0/variable"; +import { assert, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as path from "jsr:@std/path@^1.0.0"; +import * as option from "jsr:@denops/std@^7.0.0/option"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; import { findWorktreeFromDenops } from "../../git/worktree.ts"; import { exec as execEdit } from "../edit/command.ts"; import { AliasHead, getInProgressAliasHead, stripConflicts } from "./util.ts"; diff --git a/denops/gin/command/chaperon/main.ts b/denops/gin/command/chaperon/main.ts index be2d73a1..fd12a312 100644 --- a/denops/gin/command/chaperon/main.ts +++ b/denops/gin/command/chaperon/main.ts @@ -1,12 +1,12 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; -import { assert, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as helper from "jsr:@denops/std@^7.0.0/helper"; +import { assert, is } from "jsr:@core/unknownutil@^4.0.0"; import { builtinOpts, formatOpts, parseOpts, validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; +} from "jsr:@denops/std@^7.0.0/argument"; import { fillCmdArgs, normCmdArgs, parseSilent } from "../../util/cmd.ts"; import { exec } from "./command.ts"; diff --git a/denops/gin/command/chaperon/util.ts b/denops/gin/command/chaperon/util.ts index b01a2b99..14314df7 100644 --- a/denops/gin/command/chaperon/util.ts +++ b/denops/gin/command/chaperon/util.ts @@ -1,5 +1,5 @@ -import * as fs from "https://deno.land/std@0.214.0/fs/mod.ts"; -import * as path from "https://deno.land/std@0.214.0/path/mod.ts"; +import * as fs from "jsr:@std/fs@^1.0.0"; +import * as path from "jsr:@std/path@^1.0.0"; const beginMarker = `${"<".repeat(7)} `; const endMarker = `${">".repeat(7)} `; diff --git a/denops/gin/command/chaperon/util_test.ts b/denops/gin/command/chaperon/util_test.ts index dbf6a423..e4a35abd 100644 --- a/denops/gin/command/chaperon/util_test.ts +++ b/denops/gin/command/chaperon/util_test.ts @@ -1,4 +1,4 @@ -import { assertEquals } from "https://deno.land/std@0.214.0/assert/mod.ts"; +import { assertEquals } from "jsr:@std/assert@^1.0.0"; import { stripConflicts } from "./util.ts"; // https://github.com/ojacobson/conflicts diff --git a/denops/gin/command/diff/command.ts b/denops/gin/command/diff/command.ts index d9190469..9dfd420b 100644 --- a/denops/gin/command/diff/command.ts +++ b/denops/gin/command/diff/command.ts @@ -1,12 +1,10 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as path from "https://deno.land/std@0.214.0/path/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; -import { - format as formatBufname, -} from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; -import { Flags } from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as path from "jsr:@std/path@^1.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; +import * as option from "jsr:@denops/std@^7.0.0/option"; +import { format as formatBufname } from "jsr:@denops/std@^7.0.0/bufname"; +import { Flags } from "jsr:@denops/std@^7.0.0/argument"; import { findWorktreeFromDenops } from "../../git/worktree.ts"; export type ExecOptions = { diff --git a/denops/gin/command/diff/commitish_test.ts b/denops/gin/command/diff/commitish_test.ts index bdb5f6ae..7176f156 100644 --- a/denops/gin/command/diff/commitish_test.ts +++ b/denops/gin/command/diff/commitish_test.ts @@ -1,4 +1,4 @@ -import { assertEquals } from "https://deno.land/std@0.214.0/assert/mod.ts"; +import { assertEquals } from "jsr:@std/assert@^1.0.0"; import { Commitish, INDEX, parseCommitish, WORKTREE } from "./commitish.ts"; Deno.test("parseCommitish", () => { diff --git a/denops/gin/command/diff/edit.ts b/denops/gin/command/diff/edit.ts index 07890931..05b493aa 100644 --- a/denops/gin/command/diff/edit.ts +++ b/denops/gin/command/diff/edit.ts @@ -1,21 +1,19 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/mod.ts"; -import { ensure, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as mapping from "https://deno.land/x/denops_std@v6.0.1/mapping/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; -import * as vars from "https://deno.land/x/denops_std@v6.0.1/variable/mod.ts"; -import { - parse as parseBufname, -} from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import { ensure, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as mapping from "jsr:@denops/std@^7.0.0/mapping"; +import * as option from "jsr:@denops/std@^7.0.0/option"; +import * as vars from "jsr:@denops/std@^7.0.0/variable"; +import { parse as parseBufname } from "jsr:@denops/std@^7.0.0/bufname"; import { builtinOpts, Flags, formatFlags, parseOpts, validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; +} from "jsr:@denops/std@^7.0.0/argument"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; import { exec as execBuffer } from "../../command/buffer/edit.ts"; export async function edit( diff --git a/denops/gin/command/diff/jump.ts b/denops/gin/command/diff/jump.ts index 197d66e0..717b314a 100644 --- a/denops/gin/command/diff/jump.ts +++ b/denops/gin/command/diff/jump.ts @@ -1,12 +1,10 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { ensure, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as path from "https://deno.land/std@0.214.0/path/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.0.1/function/mod.ts"; -import { - parse as parseBufname, -} from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { ensure, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as path from "jsr:@std/path@^1.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; +import * as fn from "jsr:@denops/std@^7.0.0/function"; +import { parse as parseBufname } from "jsr:@denops/std@^7.0.0/bufname"; import { exec as execEdit } from "../edit/command.ts"; import { Commitish, INDEX, parseCommitish, WORKTREE } from "./commitish.ts"; diff --git a/denops/gin/command/diff/jump_test.ts b/denops/gin/command/diff/jump_test.ts index 8222b535..d8c45f88 100644 --- a/denops/gin/command/diff/jump_test.ts +++ b/denops/gin/command/diff/jump_test.ts @@ -1,4 +1,4 @@ -import { assertEquals } from "https://deno.land/std@0.214.0/assert/mod.ts"; +import { assertEquals } from "jsr:@std/assert@^1.0.0"; import { findJumpNew, findJumpOld, Jump } from "./jump.ts"; const example = (await Deno.readTextFile( diff --git a/denops/gin/command/diff/main.ts b/denops/gin/command/diff/main.ts index b66858ae..787492ef 100644 --- a/denops/gin/command/diff/main.ts +++ b/denops/gin/command/diff/main.ts @@ -1,12 +1,12 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { assert, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { as, assert, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as helper from "jsr:@denops/std@^7.0.0/helper"; import { builtinOpts, formatOpts, parse, validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; +} from "jsr:@denops/std@^7.0.0/argument"; import { fillCmdArgs, normCmdArgs, parseSilent } from "../../util/cmd.ts"; import { exec } from "./command.ts"; import { edit } from "./edit.ts"; @@ -39,15 +39,15 @@ export function main(denops: Denops): void { return helper.friendlyCall(denops, () => read(denops, bufnr, bufname)); }, "diff:jump:new": (mods) => { - assert(mods, is.OptionalOf(is.String), { name: "mods" }); + assert(mods, as.Optional(is.String), { name: "mods" }); return helper.friendlyCall(denops, () => jumpNew(denops, mods ?? "")); }, "diff:jump:old": (mods) => { - assert(mods, is.OptionalOf(is.String), { name: "mods" }); + assert(mods, as.Optional(is.String), { name: "mods" }); return helper.friendlyCall(denops, () => jumpOld(denops, mods ?? "")); }, "diff:jump:smart": (mods) => { - assert(mods, is.OptionalOf(is.String), { name: "mods" }); + assert(mods, as.Optional(is.String), { name: "mods" }); return helper.friendlyCall(denops, () => jumpSmart(denops, mods ?? "")); }, }; diff --git a/denops/gin/command/diff/read.ts b/denops/gin/command/diff/read.ts index 808939ae..ce4e14f1 100644 --- a/denops/gin/command/diff/read.ts +++ b/denops/gin/command/diff/read.ts @@ -1,17 +1,15 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/mod.ts"; -import { ensure, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as vars from "https://deno.land/x/denops_std@v6.0.1/variable/mod.ts"; -import { - parse as parseBufname, -} from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import { ensure, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as vars from "jsr:@denops/std@^7.0.0/variable"; +import { parse as parseBufname } from "jsr:@denops/std@^7.0.0/bufname"; import { builtinOpts, Flags, formatFlags, parseOpts, validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; +} from "jsr:@denops/std@^7.0.0/argument"; import { exec as execBuffer } from "../../command/buffer/read.ts"; export async function read( diff --git a/denops/gin/command/edit/command.ts b/denops/gin/command/edit/command.ts index e15448a4..515665a8 100644 --- a/denops/gin/command/edit/command.ts +++ b/denops/gin/command/edit/command.ts @@ -1,10 +1,8 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as path from "https://deno.land/std@0.214.0/path/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; -import { - format as formatBufname, -} from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as path from "jsr:@std/path@^1.0.0"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; +import * as option from "jsr:@denops/std@^7.0.0/option"; +import { format as formatBufname } from "jsr:@denops/std@^7.0.0/bufname"; import { findWorktreeFromDenops } from "../../git/worktree.ts"; export type ExecOptions = { diff --git a/denops/gin/command/edit/edit.ts b/denops/gin/command/edit/edit.ts index 7f54c683..c60ed968 100644 --- a/denops/gin/command/edit/edit.ts +++ b/denops/gin/command/edit/edit.ts @@ -1,16 +1,13 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { ensure, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/mod.ts"; -import * as autocmd from "https://deno.land/x/denops_std@v6.0.1/autocmd/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; -import * as vars from "https://deno.land/x/denops_std@v6.0.1/variable/mod.ts"; -import { - parseOpts, - validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; -import { parse as parseBufname } from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { ensure, is } from "jsr:@core/unknownutil@^4.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import * as autocmd from "jsr:@denops/std@^7.0.0/autocmd"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; +import * as option from "jsr:@denops/std@^7.0.0/option"; +import * as vars from "jsr:@denops/std@^7.0.0/variable"; +import { parseOpts, validateOpts } from "jsr:@denops/std@^7.0.0/argument"; +import { parse as parseBufname } from "jsr:@denops/std@^7.0.0/bufname"; import { execute } from "../../git/executor.ts"; import { formatTreeish } from "./util.ts"; diff --git a/denops/gin/command/edit/main.ts b/denops/gin/command/edit/main.ts index 135d9e41..0b0d07bd 100644 --- a/denops/gin/command/edit/main.ts +++ b/denops/gin/command/edit/main.ts @@ -1,12 +1,12 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { assert, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { assert, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as helper from "jsr:@denops/std@^7.0.0/helper"; import { builtinOpts, formatOpts, parseOpts, validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; +} from "jsr:@denops/std@^7.0.0/argument"; import { fillCmdArgs, normCmdArgs, parseSilent } from "../../util/cmd.ts"; import { exec } from "./command.ts"; import { edit } from "./edit.ts"; diff --git a/denops/gin/command/edit/read.ts b/denops/gin/command/edit/read.ts index 60fec88f..dd296e29 100644 --- a/denops/gin/command/edit/read.ts +++ b/denops/gin/command/edit/read.ts @@ -1,13 +1,10 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { ensure, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; -import * as vars from "https://deno.land/x/denops_std@v6.0.1/variable/mod.ts"; -import { - parseOpts, - validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; -import { parse as parseBufname } from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { ensure, is } from "jsr:@core/unknownutil@^4.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; +import * as vars from "jsr:@denops/std@^7.0.0/variable"; +import { parseOpts, validateOpts } from "jsr:@denops/std@^7.0.0/argument"; +import { parse as parseBufname } from "jsr:@denops/std@^7.0.0/bufname"; import { execute } from "../../git/executor.ts"; import { formatTreeish } from "./util.ts"; diff --git a/denops/gin/command/edit/util.ts b/denops/gin/command/edit/util.ts index 3c22c7ca..6c62e5cb 100644 --- a/denops/gin/command/edit/util.ts +++ b/denops/gin/command/edit/util.ts @@ -1,4 +1,4 @@ -import { assert, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; +import { assert, is } from "jsr:@core/unknownutil@^4.0.0"; export function formatTreeish( commitish: string | string[] | undefined, diff --git a/denops/gin/command/edit/write.ts b/denops/gin/command/edit/write.ts index d5e9e14f..81f73ed9 100644 --- a/denops/gin/command/edit/write.ts +++ b/denops/gin/command/edit/write.ts @@ -1,12 +1,10 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as path from "https://deno.land/std@0.214.0/path/mod.ts"; -import * as fs from "https://deno.land/std@0.214.0/fs/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.0.1/function/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; -import { - parse as parseBufname, -} from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as path from "jsr:@std/path@^1.0.0"; +import * as fs from "jsr:@std/fs@^1.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as fn from "jsr:@denops/std@^7.0.0/function"; +import * as option from "jsr:@denops/std@^7.0.0/option"; +import { parse as parseBufname } from "jsr:@denops/std@^7.0.0/bufname"; import { findWorktreeFromDenops } from "../../git/worktree.ts"; import { exec as execBare } from "../../command/bare/command.ts"; diff --git a/denops/gin/command/log/command.ts b/denops/gin/command/log/command.ts index 0c517a75..e6b16e13 100644 --- a/denops/gin/command/log/command.ts +++ b/denops/gin/command/log/command.ts @@ -1,12 +1,10 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as path from "https://deno.land/std@0.214.0/path/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; -import { - format as formatBufname, -} from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; -import { Flags } from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as path from "jsr:@std/path@^1.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; +import * as option from "jsr:@denops/std@^7.0.0/option"; +import { format as formatBufname } from "jsr:@denops/std@^7.0.0/bufname"; +import { Flags } from "jsr:@denops/std@^7.0.0/argument"; import { findWorktreeFromDenops } from "../../git/worktree.ts"; export type ExecOptions = { diff --git a/denops/gin/command/log/edit.ts b/denops/gin/command/log/edit.ts index 34877475..6b2539e3 100644 --- a/denops/gin/command/log/edit.ts +++ b/denops/gin/command/log/edit.ts @@ -1,19 +1,19 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/mod.ts"; -import { ensure, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.0.1/function/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; -import * as vars from "https://deno.land/x/denops_std@v6.0.1/variable/mod.ts"; -import { parse as parseBufname } from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import { ensure, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as fn from "jsr:@denops/std@^7.0.0/function"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; +import * as option from "jsr:@denops/std@^7.0.0/option"; +import * as vars from "jsr:@denops/std@^7.0.0/variable"; +import { parse as parseBufname } from "jsr:@denops/std@^7.0.0/bufname"; import { builtinOpts, Flags, formatFlags, parseOpts, validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; +} from "jsr:@denops/std@^7.0.0/argument"; import { bind } from "../../command/bare/command.ts"; import { exec as execBuffer } from "../../command/buffer/edit.ts"; import { init as initActionBrowse } from "../../action/browse.ts"; diff --git a/denops/gin/command/log/main.ts b/denops/gin/command/log/main.ts index 550bab3a..7053ad3f 100644 --- a/denops/gin/command/log/main.ts +++ b/denops/gin/command/log/main.ts @@ -1,13 +1,13 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { assert, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/unnullish.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { assert, is } from "jsr:@core/unknownutil@^4.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import * as helper from "jsr:@denops/std@^7.0.0/helper"; import { builtinOpts, formatOpts, parse, validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; +} from "jsr:@denops/std@^7.0.0/argument"; import { fillCmdArgs, normCmdArgs, parseSilent } from "../../util/cmd.ts"; import { exec } from "./command.ts"; import { edit } from "./edit.ts"; diff --git a/denops/gin/command/log/parser_test.ts b/denops/gin/command/log/parser_test.ts index 72dfbdec..1c45169e 100644 --- a/denops/gin/command/log/parser_test.ts +++ b/denops/gin/command/log/parser_test.ts @@ -1,4 +1,4 @@ -import { assertEquals } from "https://deno.land/std@0.214.0/assert/mod.ts"; +import { assertEquals } from "jsr:@std/assert@^1.0.0"; import { parse } from "./parser.ts"; Deno.test(`parse (with --decorate=full`, () => { diff --git a/denops/gin/command/log/read.ts b/denops/gin/command/log/read.ts index 4c737005..1e8d3645 100644 --- a/denops/gin/command/log/read.ts +++ b/denops/gin/command/log/read.ts @@ -1,17 +1,15 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/mod.ts"; -import { ensure, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as vars from "https://deno.land/x/denops_std@v6.0.1/variable/mod.ts"; -import { - parse as parseBufname, -} from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import { ensure, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as vars from "jsr:@denops/std@^7.0.0/variable"; +import { parse as parseBufname } from "jsr:@denops/std@^7.0.0/bufname"; import { builtinOpts, Flags, formatFlags, parseOpts, validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; +} from "jsr:@denops/std@^7.0.0/argument"; import { exec as execBuffer } from "../../command/buffer/read.ts"; export async function read( diff --git a/denops/gin/command/patch/command.ts b/denops/gin/command/patch/command.ts index 29ad02e7..643e0340 100644 --- a/denops/gin/command/patch/command.ts +++ b/denops/gin/command/patch/command.ts @@ -1,12 +1,12 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as path from "https://deno.land/std@0.214.0/path/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.0.1/function/mod.ts"; -import * as mapping from "https://deno.land/x/denops_std@v6.0.1/mapping/mod.ts"; -import * as vars from "https://deno.land/x/denops_std@v6.0.1/variable/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; -import { assert, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as path from "jsr:@std/path@^1.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as fn from "jsr:@denops/std@^7.0.0/function"; +import * as mapping from "jsr:@denops/std@^7.0.0/mapping"; +import * as vars from "jsr:@denops/std@^7.0.0/variable"; +import * as option from "jsr:@denops/std@^7.0.0/option"; +import { assert, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; import { findWorktreeFromDenops } from "../../git/worktree.ts"; import { exec as execEdit } from "../edit/command.ts"; diff --git a/denops/gin/command/patch/main.ts b/denops/gin/command/patch/main.ts index 20384d8f..6db3e49a 100644 --- a/denops/gin/command/patch/main.ts +++ b/denops/gin/command/patch/main.ts @@ -1,12 +1,12 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { assert, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { assert, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as helper from "jsr:@denops/std@^7.0.0/helper"; import { builtinOpts, formatOpts, parseOpts, validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; +} from "jsr:@denops/std@^7.0.0/argument"; import { fillCmdArgs, normCmdArgs, parseSilent } from "../../util/cmd.ts"; import { exec } from "./command.ts"; diff --git a/denops/gin/command/status/command.ts b/denops/gin/command/status/command.ts index d6aa48a8..35feab7f 100644 --- a/denops/gin/command/status/command.ts +++ b/denops/gin/command/status/command.ts @@ -1,11 +1,9 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; -import { - format as formatBufname, -} from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; -import { Flags } from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; +import * as option from "jsr:@denops/std@^7.0.0/option"; +import { format as formatBufname } from "jsr:@denops/std@^7.0.0/bufname"; +import { Flags } from "jsr:@denops/std@^7.0.0/argument"; import { findWorktreeFromDenops } from "../../git/worktree.ts"; export type ExecOptions = { diff --git a/denops/gin/command/status/edit.ts b/denops/gin/command/status/edit.ts index 7dc0330f..2585f71f 100644 --- a/denops/gin/command/status/edit.ts +++ b/denops/gin/command/status/edit.ts @@ -1,18 +1,14 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/mod.ts"; -import * as path from "https://deno.land/std@0.214.0/path/mod.ts"; -import * as autocmd from "https://deno.land/x/denops_std@v6.0.1/autocmd/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.0.1/function/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; -import * as vars from "https://deno.land/x/denops_std@v6.0.1/variable/mod.ts"; -import { parse as parseBufname } from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; -import { - Flags, - formatFlags, - parseOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import * as path from "jsr:@std/path@^1.0.0"; +import * as autocmd from "jsr:@denops/std@^7.0.0/autocmd"; +import * as fn from "jsr:@denops/std@^7.0.0/function"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; +import * as option from "jsr:@denops/std@^7.0.0/option"; +import * as vars from "jsr:@denops/std@^7.0.0/variable"; +import { parse as parseBufname } from "jsr:@denops/std@^7.0.0/bufname"; +import { Flags, formatFlags, parseOpts } from "jsr:@denops/std@^7.0.0/argument"; import { bind } from "../../command/bare/command.ts"; import { exec as execBuffer } from "../../command/buffer/edit.ts"; import { findWorktreeFromDenops } from "../../git/worktree.ts"; diff --git a/denops/gin/command/status/main.ts b/denops/gin/command/status/main.ts index dd338809..c2b1a8dd 100644 --- a/denops/gin/command/status/main.ts +++ b/denops/gin/command/status/main.ts @@ -1,13 +1,13 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { assert, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { assert, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as helper from "jsr:@denops/std@^7.0.0/helper"; import { builtinOpts, formatOpts, parse, validateFlags, validateOpts, -} from "https://deno.land/x/denops_std@v6.0.1/argument/mod.ts"; +} from "jsr:@denops/std@^7.0.0/argument"; import { fillCmdArgs, normCmdArgs, parseSilent } from "../../util/cmd.ts"; import { exec } from "./command.ts"; import { edit } from "./edit.ts"; diff --git a/denops/gin/command/status/parser_test.ts b/denops/gin/command/status/parser_test.ts index 7a691bf7..726d6b6a 100644 --- a/denops/gin/command/status/parser_test.ts +++ b/denops/gin/command/status/parser_test.ts @@ -1,4 +1,4 @@ -import { assertEquals } from "https://deno.land/std@0.214.0/assert/mod.ts"; +import { assertEquals } from "jsr:@std/assert@^1.0.0"; import { parse } from "./parser.ts"; Deno.test(`parse`, () => { diff --git a/denops/gin/component/branch.ts b/denops/gin/component/branch.ts index bd4a707d..c15d206b 100644 --- a/denops/gin/component/branch.ts +++ b/denops/gin/component/branch.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { Cache } from "https://deno.land/x/ttl_cache@v0.1.1/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { Cache } from "jsr:@lambdalisue/ttl-cache@^1.0.0"; import { decodeUtf8 } from "../util/text.ts"; import { findWorktreeFromDenops } from "../git/worktree.ts"; import { execute } from "../git/process.ts"; diff --git a/denops/gin/component/traffic.ts b/denops/gin/component/traffic.ts index 70d2b553..974d4602 100644 --- a/denops/gin/component/traffic.ts +++ b/denops/gin/component/traffic.ts @@ -1,5 +1,5 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { Cache } from "https://deno.land/x/ttl_cache@v0.1.1/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { Cache } from "jsr:@lambdalisue/ttl-cache@^1.0.0"; import { decodeUtf8 } from "../util/text.ts"; import { findWorktreeFromDenops } from "../git/worktree.ts"; import { execute } from "../git/process.ts"; diff --git a/denops/gin/component/worktree.ts b/denops/gin/component/worktree.ts index 85dd1ff6..10793955 100644 --- a/denops/gin/component/worktree.ts +++ b/denops/gin/component/worktree.ts @@ -1,6 +1,6 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { Cache } from "https://deno.land/x/ttl_cache@v0.1.1/mod.ts"; -import * as path from "https://deno.land/std@0.214.0/path/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { Cache } from "jsr:@lambdalisue/ttl-cache@^1.0.0"; +import * as path from "jsr:@std/path@^1.0.0"; import { findWorktreeFromDenops } from "../git/worktree.ts"; import { find } from "../git/finder.ts"; diff --git a/denops/gin/git/executor.ts b/denops/gin/git/executor.ts index c5c9c4bd..a32d4ffe 100644 --- a/denops/gin/git/executor.ts +++ b/denops/gin/git/executor.ts @@ -1,8 +1,8 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { readAll } from "https://deno.land/x/streamtools@v0.5.0/read_all.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.0.1/function/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { readAll } from "jsr:@lambdalisue/streamtools@^1.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as fn from "jsr:@denops/std@^7.0.0/function"; +import * as option from "jsr:@denops/std@^7.0.0/option"; import { decodeUtf8 } from "../util/text.ts"; import { removeAnsiEscapeCode } from "../util/ansi_escape_code.ts"; import { IndicatorStream } from "../util/indicator_stream.ts"; diff --git a/denops/gin/git/finder.ts b/denops/gin/git/finder.ts index 15da9bab..7eec0ae9 100644 --- a/denops/gin/git/finder.ts +++ b/denops/gin/git/finder.ts @@ -1,5 +1,5 @@ -import * as path from "https://deno.land/std@0.214.0/path/mod.ts"; -import { Cache } from "https://deno.land/x/ttl_cache@v0.1.1/mod.ts"; +import { resolve, SEPARATOR } from "jsr:@std/path@^1.0.0"; +import { Cache } from "jsr:@lambdalisue/ttl-cache@^1.0.0"; import { execute } from "./process.ts"; import { decodeUtf8 } from "../util/text.ts"; @@ -24,12 +24,12 @@ export async function find(cwd: string): Promise { } async function findInternal(cwd: string): Promise { - const terms = cwd.split(path.SEP); + const terms = cwd.split(SEPARATOR); if (terms.includes(".git")) { // `git rev-parse` does not work in a ".git" directory // so use a parent directory of it instead. const index = terms.indexOf(".git"); - cwd = terms.slice(0, index).join(path.SEP); + cwd = terms.slice(0, index).join(SEPARATOR); } const stdout = await execute( [ @@ -42,5 +42,5 @@ async function findInternal(cwd: string): Promise { }, ); const output = decodeUtf8(stdout); - return path.resolve(output.split(/\n/, 2)[0]); + return resolve(output.split(/\n/, 2)[0]); } diff --git a/denops/gin/git/finder_test.ts b/denops/gin/git/finder_test.ts index d032e2d7..bfc54c00 100644 --- a/denops/gin/git/finder_test.ts +++ b/denops/gin/git/finder_test.ts @@ -1,8 +1,5 @@ -import { - assertEquals, - assertRejects, -} from "https://deno.land/std@0.214.0/assert/mod.ts"; -import * as path from "https://deno.land/std@0.214.0/path/mod.ts"; +import { assertEquals, assertRejects } from "jsr:@std/assert@^1.0.0"; +import * as path from "jsr:@std/path@^1.0.0"; import { find } from "./finder.ts"; import { ExecuteError } from "./process.ts"; diff --git a/denops/gin/git/process_test.ts b/denops/gin/git/process_test.ts index aac9db5c..2c77f985 100644 --- a/denops/gin/git/process_test.ts +++ b/denops/gin/git/process_test.ts @@ -1,7 +1,4 @@ -import { - assert, - assertRejects, -} from "https://deno.land/std@0.214.0/assert/mod.ts"; +import { assert, assertRejects } from "jsr:@std/assert@^1.0.0"; import { decodeUtf8 } from "../util/text.ts"; import { execute, ExecuteError, run } from "./process.ts"; diff --git a/denops/gin/git/worktree.ts b/denops/gin/git/worktree.ts index f807648a..20afd04d 100644 --- a/denops/gin/git/worktree.ts +++ b/denops/gin/git/worktree.ts @@ -1,8 +1,8 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import { parse as parseBufname } from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.0.1/function/mod.ts"; -import * as path from "https://deno.land/std@0.214.0/path/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import { parse as parseBufname } from "jsr:@denops/std@^7.0.0/bufname"; +import * as fn from "jsr:@denops/std@^7.0.0/function"; +import * as path from "jsr:@std/path@^1.0.0"; import { GIN_BUFFER_PROTOCOLS } from "../global.ts"; import { expand } from "../util/expand.ts"; import { find } from "./finder.ts"; diff --git a/denops/gin/main.ts b/denops/gin/main.ts index d1d9b4c3..e92737e1 100644 --- a/denops/gin/main.ts +++ b/denops/gin/main.ts @@ -1,4 +1,4 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; import { main as mainBare } from "./command/bare/main.ts"; import { main as mainBuffer } from "./command/buffer/main.ts"; diff --git a/denops/gin/proxy/askpass.ts b/denops/gin/proxy/askpass.ts index 1b039092..5da1d78b 100755 --- a/denops/gin/proxy/askpass.ts +++ b/denops/gin/proxy/askpass.ts @@ -1,6 +1,6 @@ #!/usr/bin/env -S deno run --no-check --allow-env=GIN_PROXY_ADDRESS --allow-net=127.0.0.1 -import { pop, push } from "https://deno.land/x/streamtools@v0.5.0/mod.ts"; -import { ensure, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; +import { pop, push } from "jsr:@lambdalisue/streamtools@^1.0.0"; +import { ensure, is } from "jsr:@core/unknownutil@^4.0.0"; const resultPattern = /^([^:]+):(.*)$/; diff --git a/denops/gin/proxy/editor.ts b/denops/gin/proxy/editor.ts index 18cc3f35..134879ca 100755 --- a/denops/gin/proxy/editor.ts +++ b/denops/gin/proxy/editor.ts @@ -1,6 +1,6 @@ #!/usr/bin/env -S deno run --no-check --allow-env=GIN_PROXY_ADDRESS --allow-net=127.0.0.1 -import { pop, push } from "https://deno.land/x/streamtools@v0.5.0/mod.ts"; -import { ensure, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; +import { pop, push } from "jsr:@lambdalisue/streamtools@^1.0.0"; +import { ensure, is } from "jsr:@core/unknownutil@^4.0.0"; const resultPattern = /^([^:]+):(.*)$/; diff --git a/denops/gin/proxy/main.ts b/denops/gin/proxy/main.ts index d8574f8d..f25696dd 100644 --- a/denops/gin/proxy/main.ts +++ b/denops/gin/proxy/main.ts @@ -1,4 +1,4 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; import { listen } from "./server.ts"; export function main(denops: Denops): void { diff --git a/denops/gin/proxy/server.ts b/denops/gin/proxy/server.ts index aadaa8be..122f45c4 100644 --- a/denops/gin/proxy/server.ts +++ b/denops/gin/proxy/server.ts @@ -1,12 +1,12 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as lambda from "https://deno.land/x/denops_std@v6.0.1/lambda/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.0.1/function/mod.ts"; -import * as vars from "https://deno.land/x/denops_std@v6.0.1/variable/mod.ts"; -import { ensure, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as path from "https://deno.land/std@0.214.0/path/mod.ts"; -import { pop, push } from "https://deno.land/x/streamtools@v0.5.0/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as lambda from "jsr:@denops/std@^7.0.0/lambda"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; +import * as fn from "jsr:@denops/std@^7.0.0/function"; +import * as vars from "jsr:@denops/std@^7.0.0/variable"; +import { ensure, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as path from "jsr:@std/path@^1.0.0"; +import { pop, push } from "jsr:@lambdalisue/streamtools@^1.0.0"; import { decodeUtf8, encodeUtf8 } from "../util/text.ts"; const recordPattern = /^([^:]+?):(.*)$/; diff --git a/denops/gin/util/ansi_escape_code.ts b/denops/gin/util/ansi_escape_code.ts index d565bc7e..1e3e511a 100644 --- a/denops/gin/util/ansi_escape_code.ts +++ b/denops/gin/util/ansi_escape_code.ts @@ -1,10 +1,10 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { assert, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import { unnullish } from "https://deno.land/x/unnullish@v1.0.1/mod.ts"; -import * as itertools from "https://deno.land/x/itertools@v1.1.1/mod.ts"; -import * as ansiEscapeCode from "https://deno.land/x/ansi_escape_code@v1.0.2/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import { Decoration } from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { assert, is } from "jsr:@core/unknownutil@^4.0.0"; +import { unnullish } from "jsr:@lambdalisue/unnullish@^1.0.0"; +import * as itertools from "jsr:@lambdalisue/itertools@^1.0.0"; +import * as ansiEscapeCode from "jsr:@lambdalisue/ansi-escape-code@^1.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import { Decoration } from "jsr:@denops/std@^7.0.0/buffer"; import { countVimBytes } from "./text.ts"; export function removeAnsiEscapeCode( diff --git a/denops/gin/util/ansi_escape_code_test.ts b/denops/gin/util/ansi_escape_code_test.ts index e23225cd..807f09ca 100644 --- a/denops/gin/util/ansi_escape_code_test.ts +++ b/denops/gin/util/ansi_escape_code_test.ts @@ -1,6 +1,4 @@ -import { - assertSnapshot, -} from "https://deno.land/std@0.214.0/testing/snapshot.ts"; +import { assertSnapshot } from "jsr:@std/testing@^1.0.0/snapshot"; import { test } from "./testutil.ts"; import { buildDecorationsFromAnsiEscapeCode } from "./ansi_escape_code.ts"; diff --git a/denops/gin/util/cmd.ts b/denops/gin/util/cmd.ts index c902e7e3..e98766e1 100644 --- a/denops/gin/util/cmd.ts +++ b/denops/gin/util/cmd.ts @@ -1,8 +1,8 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { assert, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as vars from "https://deno.land/x/denops_std@v6.0.1/variable/mod.ts"; -import { Silent } from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { assert, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as vars from "jsr:@denops/std@^7.0.0/variable"; +import { Silent } from "jsr:@denops/std@^7.0.0/helper"; import { expand } from "./expand.ts"; export function parseSilent(mods: string): Silent { diff --git a/denops/gin/util/cmd_test.ts b/denops/gin/util/cmd_test.ts index e6aecbe2..9ca1a16e 100644 --- a/denops/gin/util/cmd_test.ts +++ b/denops/gin/util/cmd_test.ts @@ -1,8 +1,8 @@ -import { assertEquals } from "https://deno.land/std@0.214.0/assert/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.0.1/function/mod.ts"; -import * as path from "https://deno.land/std@0.214.0/path/mod.ts"; -import { deadline } from "https://deno.land/std@0.214.0/async/mod.ts"; +import { assertEquals } from "jsr:@std/assert@^1.0.0"; +import * as batch from "jsr:@denops/std@^7.0.0/batch"; +import * as fn from "jsr:@denops/std@^7.0.0/function"; +import * as path from "jsr:@std/path@^1.0.0"; +import { deadline } from "jsr:@std/async@^1.0.0"; import { test } from "./testutil.ts"; import { normCmdArgs } from "./cmd.ts"; diff --git a/denops/gin/util/expand.ts b/denops/gin/util/expand.ts index 98ac3eb1..b7cdc533 100644 --- a/denops/gin/util/expand.ts +++ b/denops/gin/util/expand.ts @@ -1,8 +1,8 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.0.1/function/mod.ts"; -import { parse as parseBufname } from "https://deno.land/x/denops_std@v6.0.1/bufname/mod.ts"; -import { join } from "https://deno.land/std@0.222.1/path/join.ts"; -import { ensure, is } from "https://deno.land/x/unknownutil@v3.18.0/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as fn from "jsr:@denops/std@^7.0.0/function"; +import { parse as parseBufname } from "jsr:@denops/std@^7.0.0/bufname"; +import { join } from "jsr:@std/path@^1.0.0/join"; +import { ensure, is } from "jsr:@core/unknownutil@^4.0.0"; import { GIN_FILE_BUFFER_PROTOCOLS } from "../global.ts"; export async function expand(denops: Denops, expr: string): Promise { diff --git a/denops/gin/util/main.ts b/denops/gin/util/main.ts index bd1e1d22..e6dca576 100644 --- a/denops/gin/util/main.ts +++ b/denops/gin/util/main.ts @@ -1,6 +1,6 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import { assert, is } from "https://deno.land/x/unknownutil@v3.14.1/mod.ts"; -import * as buffer from "https://deno.land/x/denops_std@v6.0.1/buffer/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import { as, assert, is } from "jsr:@core/unknownutil@^4.0.0"; +import * as buffer from "jsr:@denops/std@^7.0.0/buffer"; import { expand } from "./expand.ts"; import { findWorktreeFromDenops } from "../git/worktree.ts"; @@ -18,7 +18,7 @@ export function main(denops: Denops): void { }, "util:worktree": (worktree) => { - assert(worktree, is.OptionalOf(is.String), { + assert(worktree, as.Optional(is.String), { name: "worktree", }); return findWorktreeFromDenops(denops, { worktree }); diff --git a/denops/gin/util/testutil.ts b/denops/gin/util/testutil.ts index 73230f61..1ce15cdc 100644 --- a/denops/gin/util/testutil.ts +++ b/denops/gin/util/testutil.ts @@ -1,8 +1,5 @@ -import * as path from "https://deno.land/std@0.214.0/path/mod.ts"; -import { - test as testOri, - TestDefinition, -} from "https://deno.land/x/denops_test@v1.6.1/mod.ts"; +import * as path from "jsr:@std/path@^1.0.0"; +import { test as testOri, TestDefinition } from "jsr:@denops/test@^3.0.0"; const runtimepath = path.resolve( path.fromFileUrl(new URL("../../..", import.meta.url)), diff --git a/denops/gin/util/text_test.ts b/denops/gin/util/text_test.ts index 4b993862..e57022f1 100644 --- a/denops/gin/util/text_test.ts +++ b/denops/gin/util/text_test.ts @@ -1,4 +1,4 @@ -import { assertEquals } from "https://deno.land/std@0.214.0/assert/mod.ts"; +import { assertEquals } from "jsr:@std/assert@^1.0.0"; import { countCodePoints, countVimBytes, diff --git a/denops/gin/util/yank.ts b/denops/gin/util/yank.ts index 56510727..a37eb7d8 100644 --- a/denops/gin/util/yank.ts +++ b/denops/gin/util/yank.ts @@ -1,6 +1,6 @@ -import type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v6.0.1/function/mod.ts"; -import { v } from "https://deno.land/x/denops_std@v6.0.1/variable/mod.ts"; +import type { Denops } from "jsr:@denops/std@^7.0.0"; +import * as fn from "jsr:@denops/std@^7.0.0/function"; +import { v } from "jsr:@denops/std@^7.0.0/variable"; export async function yank( denops: Denops, diff --git a/denops/gin/util/yank_test.ts b/denops/gin/util/yank_test.ts index 35015649..c3dae889 100644 --- a/denops/gin/util/yank_test.ts +++ b/denops/gin/util/yank_test.ts @@ -1,4 +1,4 @@ -import { assertEquals } from "https://deno.land/std@0.214.0/assert/mod.ts"; +import { assertEquals } from "jsr:@std/assert@^1.0.0"; import { test } from "./testutil.ts"; import { yank } from "./yank.ts";