Merge pull request #164 from Shougo/import-map

Import map support

Author: Shougo

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,9 +1,9 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
+title: ""
 labels: bug
-assignees: ''
+assignees: ""
 ---
 
 **Warning: I will close the issue without the minimal init.vim and the

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,9 +1,9 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
+title: ""
+labels: ""
+assignees: ""
 ---
 
 **Is your feature request related to a problem? Please describe.** A clear and

.github/workflows/deno.yml

@@ -1,7 +1,7 @@
 name: deno
 
 env:
-  DENO_VERSION: 1.x
+  DENO_VERSION: 2.x
   DENOPS_PATH: "./"
 
 on:
@@ -46,3 +46,14 @@ jobs:
         run: |
           grep -rl Deno.test denops| xargs deno test --unstable -A
         timeout-minutes: 5
+
+  deno-test-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: denoland/setup-deno@main
+        with:
+          deno-version: ${{ env.DENO_VERSION }}
+
+      - name: Test Publish
+        run: deno task test:publish

.github/workflows/jsr.yml

@@ -1,7 +1,7 @@
 name: jsr
 
 env:
-  DENO_VERSION: 1.x
+  DENO_VERSION: 2.x
 
 on:
   push:
@@ -19,9 +19,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: denoland/setup-deno@v1
+      - uses: denoland/setup-deno@v2
         with:
           deno-version: ${{ env.DENO_VERSION }}
       - name: Publish
         run: |
-          deno run -A jsr:@david/publish-on-tag@0.1.3
+          deno run -A jsr:@david/publish-on-tag@0.2.0

README.md

@@ -53,12 +53,12 @@ completion](https://user-images.githubusercontent.com/41495/135711007-8c24c606-2
 
 ## Install
 
-**NOTE:** Ddc.vim requires Vim 9.1.0448+ or Neovim 0.10.0+. See
+**NOTE:** It requires Vim 9.1.0448+ or Neovim 0.10.0+. See
 [requirements](#requirements) if you aren't sure whether you have this.
 
 ### Requirements
 
-Please install both Deno 1.45+ and "denops.vim" v7.0+.
+Please install both Deno 2.3.0+ and "denops.vim" v8.0+.
 
 - <https://deno.land/>
 - <https://github.com/vim-denops/denops.vim>

autoload/ddc/denops.vim

@@ -3,15 +3,15 @@ function ddc#denops#_init(opts = {}) abort
     return
   endif
 
-  if !has('patch-9.1.0448') && !has('nvim-0.10')
+  if !has('patch-9.1.1646') && !has('nvim-0.11')
     call ddc#util#print_error(
-          \ 'ddc requires Vim 9.1.0448+ or neovim 0.10.0+.')
+          \ 'ddc requires Vim 9.1.1646+ or neovim 0.11.0+.')
     return
   endif
 
   augroup ddc
     autocmd!
-    autocmd InsertLeave * ++nested call ddc#hide('InsertLeave')
+    autocmd ModeChanged *:n ++nested call ddc#hide('ModeChanged')
   augroup END
 
   let context_filetype = a:opts->get('context_filetype', 'none')
@@ -66,7 +66,7 @@ function ddc#denops#_request(method, args, default=v:null) abort
         \ denops#request('ddc', a:method, a:args) : a:default
 endfunction
 
-const s:root_dir = '<sfile>:h:h:h'->expand()
+const s:root_dir = '<script>:h:h:h'->expand()
 const s:sep = has('win32') ? '\' : '/'
 function ddc#denops#_mods() abort
   return [s:root_dir, 'denops', 'ddc', '_mods.js']->join(s:sep)

deno.jsonc

@@ -1,29 +1,17 @@
 {
-  "name": "@shougo/ddc-vim",
-  "version": "0.0.0",
-  "exports": {
-    "./config": "./denops/ddc/base/config.ts",
-    "./filter": "./denops/ddc/base/filter.ts",
-    "./source": "./denops/ddc/base/source.ts",
-    "./types": "./denops/ddc/types.ts",
-    "./ui": "./denops/ddc/base/ui.ts",
-    "./utils": "./denops/ddc/utils.ts"
-  },
-  "publish": {
-    "include": [
-      "denops/ddc/**/*.ts",
-      "denops/ddc/**/*.js"
-    ]
-  },
-  "imports": {
-  },
   "lock": false,
   "tasks": {
+    "cache": "deno install --reload",
     "check": "deno check denops/**/*.ts",
+    "fmt": "deno fmt denops",
     "lint": "deno lint denops",
     "lint-fix": "deno lint --fix denops",
-    "fmt": "deno fmt denops",
     "test": "deno test -A --doc --parallel --shuffle denops/**/*.ts",
-    "upgrade": "deno run -A jsr:@molt/cli **/*.ts --write"
-  }
+    "test:publish": "deno publish --dry-run --allow-dirty --set-version 0.0.0",
+    "update": "deno outdated --recursive",
+    "upgrade": "deno outdated --recursive --update"
+  },
+  "workspace": [
+    "./denops/ddc"
+  ]
 }

denops/@ddu-sources/ddc.ts

@@ -1,5 +1,5 @@
-import type { Context, Item } from "jsr:@shougo/[email protected]/types";
-import { BaseSource } from "jsr:@shougo/[email protected]/source";
+import type { Context, Item } from "jsr:@shougo/ddu-vim@~10.3.0/types";
+import { BaseSource } from "jsr:@shougo/ddu-vim@~10.3.0/source";
 import type { DdcItem } from "../ddc/types.ts";
 
 import type { Denops } from "jsr:@denops/std@~7.6.0";

denops/ddc/app.ts

@@ -14,20 +14,19 @@ import type {
   UserOptions,
 } from "./types.ts";
 import { Loader } from "./loader.ts";
-import { isDenoCacheIssueError } from "./utils.ts";
+import { importPlugin, isDenoCacheIssueError } from "./utils.ts";
 import { createCallbackContext } from "./callback.ts";
 import { getFilter, getPreviewer, onCompleteDone, onEvent } from "./ext.ts";
 import type { BaseUi } from "./base/ui.ts";
 import type { BaseSource } from "./base/source.ts";
 import type { BaseFilter } from "./base/filter.ts";
 
-import type { Denops, Entrypoint } from "jsr:@denops/std@~7.6.0";
-import * as vars from "jsr:@denops/std@~7.6.0/variable";
+import type { Denops, Entrypoint } from "@denops/std";
+import * as vars from "@denops/std/variable";
 
-import { ensure } from "jsr:@core/unknownutil@~4.3.0/ensure";
-import { is } from "jsr:@core/unknownutil@~4.3.0/is";
-import { Lock } from "jsr:@core/asyncutil@~1.2.0/lock";
-import { toFileUrl } from "jsr:@std/path@~1.1.0/to-file-url";
+import { ensure } from "@core/unknownutil/ensure";
+import { is } from "@core/unknownutil/is";
+import { Lock } from "@core/asyncutil/lock";
 
 export const main: Entrypoint = (denops: Denops) => {
   const loader = new Loader();
@@ -193,12 +192,9 @@ export const main: Entrypoint = (denops: Denops) => {
       await lock.lock(async () => {
         const path = ensure(arg1, is.String) as string;
         try {
-          // NOTE: Import module with fragment so that reload works properly.
-          // https://github.com/vim-denops/denops.vim/issues/227
-          const mod = await import(
-            `${toFileUrl(path).href}#${performance.now()}`
-          );
-          const obj = new mod.Config();
+          const mod = await importPlugin(path);
+          // deno-lint-ignore no-explicit-any
+          const obj = new (mod as any).Config();
           await obj.config({ denops, contextBuilder, setAlias });
         } catch (e) {
           if (isDenoCacheIssueError(e)) {

denops/ddc/base/config.ts

@@ -1,6 +1,6 @@
 import type { ContextBuilder, DdcExtType } from "../types.ts";
 
-import type { Denops } from "jsr:@denops/std@~7.6.0";
+import type { Denops } from "@denops/std";
 
 export type ConfigArguments = {
   denops: Denops;