Merge pull request #153 from Shougo/v7-pre

Migrate to JSR

.github/workflows/jsr.yml

@@ -0,0 +1,28 @@
+name: jsr
+
+env:
+  DENO_VERSION: 1.x
+
+on:
+  push:
+    tags:
+      - "v*"
+
+permissions:
+  contents: read
+  id-token: write
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: denoland/setup-deno@v1
+        with:
+          deno-version: ${{ env.DENO_VERSION }}
+      - name: Publish
+        run: |
+          deno run -A jsr:@david/publish-on-tag@0.1.3
+

README.md

@@ -58,7 +58,7 @@ whether you have this.
 
 ### Requirements
 
-Ddc.vim requires both Deno 1.42+ and denops.vim.
+Please install both Deno 1.45+ and "denops.vim" v7.0+.
 
 - <https://deno.land/>
 - <https://github.com/vim-denops/denops.vim>

deno.jsonc

@@ -1,8 +1,27 @@
 {
+  "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": {
     "check": "deno check denops/**/*.ts",
     "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 --no-resolve --write"

denops/@ddu-sources/ddc.ts

@@ -1,7 +1,11 @@
-import { Context, Item } from "https://deno.land/x/ddu_vim@v4.1.1/types.ts";
-import { BaseSource } from "https://deno.land/x/ddu_vim@v4.1.1/base/source.ts";
-import { Denops, vars } from "https://deno.land/x/ddu_vim@v4.1.1/deps.ts";
-import { DdcItem } from "../ddc/types.ts";
+import type {
+  Context,
+  Denops,
+  Item,
+} from "jsr:@shougo/ddu-vim@5.0.0-pre8/types";
+import { BaseSource } from "jsr:@shougo/ddu-vim@5.0.0-pre8/source";
+import type { DdcItem } from "../ddc/types.ts";
+import { vars } from "../ddc/deps.ts";
 
 type Params = Record<string, never>;
 

denops/ddc/app.ts

@@ -1,6 +1,6 @@
 import { Ddc } from "./ddc.ts";
-import { ContextBuilder, ContextCallbacks } from "./context.ts";
-import {
+import { ContextBuilder, type ContextCallbacks } from "./context.ts";
+import type {
   DdcEvent,
   DdcExtType,
   DdcItem,
@@ -11,9 +11,9 @@ import {
   UserOptions,
 } from "./types.ts";
 import {
-  Denops,
+  type Denops,
   ensure,
-  Entrypoint,
+  type Entrypoint,
   is,
   Lock,
   toFileUrl,

denops/ddc/base/config.ts

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

denops/ddc/base/filter.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   Context,
   DdcEvent,
   DdcOptions,
@@ -7,7 +7,7 @@ import {
   OnCallback,
   SourceOptions,
 } from "../types.ts";
-import { Denops } from "../deps.ts";
+import type { Denops } from "../deps.ts";
 
 export type BaseFilterParams = Record<string, unknown>;
 

denops/ddc/base/source.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   Context,
   DdcEvent,
   DdcGatherItems,
@@ -9,9 +9,9 @@ import {
   Previewer,
   SourceOptions,
 } from "../types.ts";
-import { Denops } from "../deps.ts";
+import type { Denops } from "../deps.ts";
 import { convertKeywordPattern } from "../utils.ts";
-import { Loader } from "../loader.ts";
+import type { Loader } from "../loader.ts";
 
 export type BaseSourceParams = Record<string, unknown>;
 

denops/ddc/base/ui.ts

@@ -1,5 +1,5 @@
-import { Context, DdcItem, DdcOptions, UiOptions } from "../types.ts";
-import { Denops } from "../deps.ts";
+import type { Context, DdcItem, DdcOptions, UiOptions } from "../types.ts";
+import type { Denops } from "../deps.ts";
 
 export type BaseUiParams = Record<string, unknown>;
 

denops/ddc/callback.ts

@@ -1,5 +1,5 @@
 import { assertEquals, spy } from "./deps.ts";
-import { CallbackContext } from "./types.ts";
+import type { CallbackContext } from "./types.ts";
 
 class DdcCallbackCancelError extends Error {
   constructor(message?: string) {

denops/ddc/context.ts

@@ -1,15 +1,15 @@
 import {
   assertEquals,
   collect,
-  Denops,
+  type Denops,
   ensure,
   fn,
   is,
   op,
   vars,
   vimOp,
 } from "./deps.ts";
-import {
+import type {
   BaseFilterParams,
   BaseSourceParams,
   BaseUiParams,

denops/ddc/ddc.ts

@@ -2,13 +2,13 @@ import {
   assertEquals,
   autocmd,
   batch,
-  Denops,
+  type Denops,
   equal,
   fn,
   op,
   vars,
 } from "./deps.ts";
-import {
+import type {
   BaseUi,
   BaseUiParams,
   CallbackContext,
@@ -23,7 +23,7 @@ import {
   UserSource,
 } from "./types.ts";
 import { defaultDummy } from "./context.ts";
-import { Loader } from "./loader.ts";
+import type { Loader } from "./loader.ts";
 import { defaultUiOptions } from "./base/ui.ts";
 import { defaultSourceOptions } from "./base/source.ts";
 import {

denops/ddc/deps.ts

@@ -1,20 +1,11 @@
-export type {
-  Denops,
-  Entrypoint,
-} from "https://deno.land/x/denops_std@v6.5.1/mod.ts";
-export {
-  echo,
-  execute,
-} from "https://deno.land/x/denops_std@v6.5.1/helper/mod.ts";
-export {
-  batch,
-  collect,
-} from "https://deno.land/x/denops_std@v6.5.1/batch/mod.ts";
-export * as op from "https://deno.land/x/denops_std@v6.5.1/option/mod.ts";
-export * as vimOp from "https://deno.land/x/denops_std@v6.5.1/option/vim/mod.ts";
-export * as fn from "https://deno.land/x/denops_std@v6.5.1/function/mod.ts";
-export * as vars from "https://deno.land/x/denops_std@v6.5.1/variable/mod.ts";
-export * as autocmd from "https://deno.land/x/denops_std@v6.5.1/autocmd/mod.ts";
+export type { Denops, Entrypoint } from "jsr:@denops/std@7.0.0";
+export { echo, execute } from "jsr:@denops/std@7.0.0/helper";
+export { batch, collect } from "jsr:@denops/std@7.0.0/batch";
+export * as op from "jsr:@denops/std@7.0.0/option";
+export * as vimOp from "jsr:@denops/std@7.0.0/option/vim";
+export * as fn from "jsr:@denops/std@7.0.0/function";
+export * as vars from "jsr:@denops/std@7.0.0/variable";
+export * as autocmd from "jsr:@denops/std@7.0.0/autocmd";
 
 export * from "jsr:@std/encoding@1.0.1/base64";
 export { assertEquals, equal } from "jsr:@std/assert@1.0.1";

denops/ddc/ext.ts

@@ -1,5 +1,5 @@
-import { deadline, Denops } from "./deps.ts";
-import {
+import { deadline, type Denops } from "./deps.ts";
+import type {
   BaseFilter,
   BaseFilterParams,
   BaseSource,
@@ -32,8 +32,8 @@ import {
   mergeUiOptions,
   mergeUiParams,
 } from "./context.ts";
-import { Loader } from "./loader.ts";
-import { Ddc } from "./ddc.ts";
+import type { Loader } from "./loader.ts";
+import type { Ddc } from "./ddc.ts";
 import { isDdcCallbackCancelError } from "./callback.ts";
 import { defaultUiOptions } from "./base/ui.ts";
 import { defaultSourceOptions } from "./base/source.ts";

denops/ddc/loader.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   BaseFilter,
   BaseFilterParams,
   BaseSource,
@@ -12,7 +12,7 @@ import {
 } from "./types.ts";
 import {
   basename,
-  Denops,
+  type Denops,
   fn,
   is,
   Lock,
@@ -113,19 +113,19 @@ export class Loader {
     });
   }
 
-  getAliasNames(type: DdcExtType) {
+  getAliasNames(type: DdcExtType): string[] {
     return Object.keys(this.#aliases[type]);
   }
-  getAlias(type: DdcExtType, name: string) {
+  getAlias(type: DdcExtType, name: string): string {
     return this.#aliases[type][name];
   }
-  getUi(name: UiName) {
+  getUi(name: UiName): BaseUi<BaseUiParams> {
     return this.#uis[name];
   }
-  getSource(name: SourceName) {
+  getSource(name: SourceName): BaseSource<BaseSourceParams> {
     return this.#sources[name];
   }
-  getFilter(name: FilterName) {
+  getFilter(name: FilterName): BaseFilter<BaseUiParams> {
     return this.#filters[name];
   }
 

denops/ddc/types.ts

@@ -1,7 +1,7 @@
-import { autocmd } from "./deps.ts";
-import { BaseUiParams } from "./base/ui.ts";
-import { BaseSourceParams } from "./base/source.ts";
-import { BaseFilterParams } from "./base/filter.ts";
+import type { autocmd } from "./deps.ts";
+import type { BaseUiParams } from "./base/ui.ts";
+import type { BaseSourceParams } from "./base/source.ts";
+import type { BaseFilterParams } from "./base/filter.ts";
 
 export { BaseConfig } from "./base/config.ts";
 export { BaseUi } from "./base/ui.ts";
@@ -10,6 +10,7 @@ export { BaseSource } from "./base/source.ts";
 export type { BaseSourceParams } from "./base/source.ts";
 export { BaseFilter } from "./base/filter.ts";
 export type { BaseFilterParams } from "./base/filter.ts";
+export type { Denops } from "./deps.ts";
 
 export { ContextBuilder } from "./context.ts";
 

denops/ddc/utils.ts

@@ -1,4 +1,4 @@
-import { assertEquals, Denops, op } from "./deps.ts";
+import { assertEquals, type Denops, op } from "./deps.ts";
 
 export async function convertKeywordPattern(
   denops: Denops,

doc/ddc.txt

@@ -53,7 +53,7 @@ INSTALL                                                          *ddc-install*
 NOTE: Ddc.vim requires Neovim (0.8.0+) or Vim 9.0.1276+ (latest is
 recommended).
 
-Please install both Deno 1.42+ and "denops.vim".
+Please install both Deno 1.45+ and "denops.vim" v7.0+.
 
 https://deno.land/
 https://github.com/vim-denops/denops.vim
@@ -907,7 +907,7 @@ TYPES                                                              *ddc-types*
 
 Please see the TypeScript definition.
 
-https://deno.land/x/ddc_vim/types.ts?doc
+https://jsr.io/@shougo/ddc-vim@6.0.0-pre6/doc
 
 
 ==============================================================================