Merge pull request #139 from Shougo/import-map

Add import map support

Author: Shougo

.github/workflows/deno.yml

@@ -1,7 +1,7 @@
 name: deno
 
 env:
-  DENO_VERSION: 1.x
+  DENO_VERSION: 2.x
   DENOPS_PATH: "./"
 
 on:
@@ -43,3 +43,14 @@ jobs:
       - name: Test
         run: deno task test
         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

@@ -47,12 +47,12 @@ Please see: https://github.com/Shougo/ddu.vim/issues/10
 
 ## Install
 
-**NOTE:** Ddu.vim requires Vim 9.0.1276+ 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/ddu/denops.vim

@@ -36,7 +36,7 @@ function ddu#denops#_notify(method, args) abort
   return s:notify(a:method, a:args)
 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 ddu#denops#_mods() abort
   return [s:root_dir, 'denops', 'ddu', '_mods.js']->join(s:sep)
@@ -73,9 +73,9 @@ function s:init() abort
     return
   endif
 
-  if !has('patch-9.1.0448') && !has('nvim-0.10')
+  if !has('patch-9.1.1646') && !has('nvim-0.11')
     call ddu#util#print_error(
-          \ 'ddu requires Vim 9.1.0448+ or neovim 0.10.0+.')
+          \ 'ddu requires Vim 9.1.1646+ or neovim 0.11.0+.')
     return 1
   endif
 

deno.jsonc

@@ -1,33 +1,17 @@
 {
-  "name": "@shougo/ddu-vim",
-  "version": "0.0.0",
-  "exports": {
-    "./action": "./denops/ddu/base/action.ts",
-    "./column": "./denops/ddu/base/column.ts",
-    "./config": "./denops/ddu/base/config.ts",
-    "./filter": "./denops/ddu/base/filter.ts",
-    "./kind": "./denops/ddu/base/kind.ts",
-    "./source": "./denops/ddu/base/source.ts",
-    "./state": "./denops/ddu/state.ts",
-    "./types": "./denops/ddu/types.ts",
-    "./ui": "./denops/ddu/base/ui.ts",
-    "./utils": "./denops/ddu/utils.ts"
-  },
-  "publish": {
-    "include": [
-      "denops/ddu/**/*.ts",
-      "denops/ddu/**/*.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/ddu"
+  ]
 }

denops/ddu/app.ts

@@ -27,20 +27,19 @@ import {
   getItemActions,
   uiSearchItem,
 } from "./ext.ts";
-import { isDenoCacheIssueError } from "./utils.ts";
+import { importPlugin, isDenoCacheIssueError } from "./utils.ts";
 import { type BaseUi, defaultUiOptions } from "./base/ui.ts";
 import { type BaseSource, defaultSourceOptions } from "./base/source.ts";
 import { type BaseFilter, defaultFilterOptions } from "./base/filter.ts";
 import { type BaseKind, defaultKindOptions } from "./base/kind.ts";
 import { type BaseColumn, defaultColumnOptions } from "./base/column.ts";
 import { defaultActionOptions } from "./base/action.ts";
 
-import type { Denops, Entrypoint } from "jsr:@denops/std@~7.6.0";
+import type { Denops, Entrypoint } from "@denops/std";
 
-import { toFileUrl } from "jsr:@std/path@~1.1.0/to-file-url";
-import { Lock } from "jsr:@core/asyncutil@~1.2.0/lock";
-import { is } from "jsr:@core/unknownutil@~4.3.0/is";
-import { ensure } from "jsr:@core/unknownutil@~4.3.0/ensure";
+import { Lock } from "@core/asyncutil/lock";
+import { is } from "@core/unknownutil/is";
+import { ensure } from "@core/unknownutil/ensure";
 
 export const main: Entrypoint = (denops: Denops) => {
   type RedrawTreeMode = "collapse" | "expand";
@@ -280,12 +279,9 @@ export const main: Entrypoint = (denops: Denops) => {
         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/ddu/base/column.ts

@@ -7,7 +7,7 @@ import type {
   ItemHighlight,
 } from "../types.ts";
 
-import type { Denops } from "jsr:@denops/std@~7.6.0";
+import type { Denops } from "@denops/std";
 
 export type OnInitArguments<Params extends BaseParams> = {
   denops: Denops;

denops/ddu/base/config.ts

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

denops/ddu/base/filter.ts

@@ -8,7 +8,7 @@ import type {
   SourceOptions,
 } from "../types.ts";
 
-import type { Denops } from "jsr:@denops/std@~7.6.0";
+import type { Denops } from "@denops/std";
 
 export type OnInitArguments<Params extends BaseParams> = {
   denops: Denops;

denops/ddu/base/kind.ts

@@ -9,7 +9,7 @@ import type {
   Previewer,
 } from "../types.ts";
 
-import type { Denops } from "jsr:@denops/std@~7.6.0";
+import type { Denops } from "@denops/std";
 
 export type GetPreviewerArguments = {
   denops: Denops;