Merge pull request #21 from vim-denops/publish-jsr

lambdalisue · web-flow · commit 722910ab8889 · 2024-05-12T22:32:54.000+09:00
JSR support
diff --git a/.github/workflows/jsr.yml b/.github/workflows/jsr.yml
@@ -0,0 +1,27 @@
+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
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,18 +4,22 @@ env:
   DENO_VERSION: 1.x
 
 on:
-  schedule:
-    - cron: "0 7 * * 0"
   push:
     branches:
       - main
   pull_request:
+    paths:
+      - "**.md"
+      - "**.ts"
+      - "deno.jsonc"
+      - ".github/workflows/test.yml"
+  workflow_dispatch:
 
 jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: denoland/setup-deno@v1
         with:
           deno-version: ${{ env.DENO_VERSION }}
@@ -30,16 +34,29 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: denoland/setup-deno@v1
         with:
           deno-version: ${{ env.DENO_VERSION }}
       - name: Test
         run: |
-          deno task test
+          deno task test:coverage
         timeout-minutes: 5
       - run: |
           deno task coverage --lcov > coverage.lcov
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v4
         with:
-          file: ./coverage.lcov
+          os: ${{ runner.os }}
+          files: ./coverage.lcov
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+  jsr-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: denoland/setup-deno@v1
+        with:
+          deno-version: ${{ env.DENO_VERSION }}
+      - name: Publish (dry-run)
+        run: |
+          deno publish --dry-run
diff --git a/.github/workflows/udd.yml b/.github/workflows/udd.yml
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -0,0 +1,48 @@
+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
+        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] <github-actions[bot]@users.noreply.github.com>
+          branch: automation/update-dependencies
+          title: ${{ steps.title.outputs.content }}
+          body: ${{ steps.body.outputs.content }}
+          labels: automation
+          delete-branch: true
diff --git a/README.md b/README.md
@@ -1,14 +1,13 @@
 # vim-channel-command
 
-[![deno land](http://img.shields.io/badge/available%20on-deno.land/x-lightgrey.svg?logo=deno)](https://deno.land/x/vim_channel_command)
-[![deno doc](https://doc.deno.land/badge.svg)](https://doc.deno.land/https/deno.land/x/vim_channel_command/mod.ts)
+[![JSR](https://jsr.io/badges/@denops/vim-channel-command)](https://jsr.io/@denops/vim-channel-command)
 [![Test](https://github.com/vim-denops/deno-vim-channel-command/workflows/Test/badge.svg)](https://github.com/vim-denops/deno-vim-channel-command/actions?query=workflow%3ATest)
 [![codecov](https://codecov.io/github/vim-denops/deno-vim-channel-command/branch/main/graph/badge.svg?token=FYH6RHO6UC)](https://codecov.io/github/vim-denops/deno-vim-channel-command)
 
-[Deno][deno] module to support [Vim's Channel commands][vim's channel commands].
+[Deno] module to support [Vim's Channel commands].
 
-[deno]: https://deno.land/
-[vim's channel commands]: https://github.com/vim/vim/blob/master/runtime/doc/channel.txt#L291
+[Deno]: https://deno.land/
+[Vim's Channel commands]: https://github.com/vim/vim/blob/master/runtime/doc/channel.txt#L291
 
 ## License
 
diff --git a/client.ts b/client.ts
@@ -1,12 +1,12 @@
-import { Indexer } from "https://deno.land/x/indexer@v0.1.0/mod.ts";
-import { buildMessage, Message } from "./message.ts";
+import { Indexer } from "@lambdalisue/indexer";
+import { buildMessage, type Message } from "./message.ts";
 import {
   buildCallCommand,
   buildExCommand,
   buildExprCommand,
   buildNormalCommand,
   buildRedrawCommand,
-  Command,
+  type Command,
 } from "./command.ts";
 
 const msgidThreshold = 2 ** 32;
diff --git a/client_test.ts b/client_test.ts
@@ -1,16 +1,13 @@
-import {
-  assertEquals,
-  assertRejects,
-} from "https://deno.land/std@0.210.0/assert/mod.ts";
+import { assertEquals, assertRejects } from "@std/assert";
 import {
   assertSpyCallArgs,
   assertSpyCalls,
   resolvesNext,
   spy,
   stub,
-} from "https://deno.land/std@0.224.0/testing/mock.ts";
-import { unimplemented } from "https://deno.land/x/errorutil@v0.1.1/mod.ts";
-import { Indexer } from "https://deno.land/x/indexer@v0.1.0/mod.ts";
+} from "@std/testing/mock";
+import { unimplemented } from "@lambdalisue/errorutil";
+import { Indexer } from "@lambdalisue/indexer";
 import { buildMessage, type Message } from "./message.ts";
 import { Client, type Session } from "./client.ts";
 
diff --git a/command_test.ts b/command_test.ts
@@ -1,7 +1,4 @@
-import {
-  assertEquals,
-  assertThrows,
-} from "https://deno.land/std@0.210.0/assert/mod.ts";
+import { assertEquals, assertThrows } from "@std/assert";
 import {
   buildCallCommand,
   buildExCommand,
diff --git a/deno.jsonc b/deno.jsonc
@@ -1,9 +1,29 @@
 {
-  "lock": false,
+  "name": "@denops/vim-channel-command",
+  "version": "0.0.0",
+  "exports": {
+    ".": "./mod.ts",
+    "./client": "./client.ts",
+    "./command": "./command.ts",
+    "./message": "./message.ts",
+    "./session": "./session.ts"
+  },
   "tasks": {
-    "test": "deno test -A --parallel --doc --coverage=.coverage",
     "check": "deno check **/*.ts",
+    "test": "deno test -A --parallel --shuffle --doc",
+    "test:coverage": "deno task test --coverage=.coverage",
     "coverage": "deno coverage .coverage",
-    "upgrade": "deno run -A https://deno.land/x/udd/main.ts **/*.ts"
+    "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:commit": "deno task -q update --commit --pre-commit=fmt,lint"
+  },
+  "imports": {
+    "@lambdalisue/async": "jsr:@lambdalisue/async@^2.1.1",
+    "@lambdalisue/errorutil": "jsr:@lambdalisue/errorutil@^1.0.0",
+    "@lambdalisue/indexer": "jsr:@lambdalisue/indexer@^1.0.0",
+    "@lambdalisue/reservator": "jsr:@lambdalisue/reservator@^1.0.1",
+    "@lambdalisue/streamtools": "jsr:@lambdalisue/streamtools@^1.0.0",
+    "@std/assert": "jsr:@std/assert@^0.225.1",
+    "@std/testing": "jsr:@std/testing@^0.224.0",
+    "@streamparser/json": "npm:@streamparser/json@^0.0.21"
   }
 }
diff --git a/json_streams.ts b/json_streams.ts
@@ -1,7 +1,4 @@
-// NOTE:
-// streamparser-json must be v0.0.5 because it automatically end-up parsing without separator after v0.0.5
-// https://github.com/juanjoDiaz/streamparser-json/commit/577e918b90c19d6758b87d41bdb6c5571a2c012d
-import JSONParser from "https://deno.land/x/streamparser_json@v0.0.5/jsonparse.ts#=";
+import { JSONParser } from "@streamparser/json";
 
 /**
  * EncodeStream encodes object stream to JSON string in Uin8Array stream.
@@ -22,12 +19,14 @@ export class EncodeStream<T> extends TransformStream<T, Uint8Array> {
  */
 export class DecodeStream<T> extends TransformStream<Uint8Array, T> {
   constructor() {
-    const parser = new JSONParser();
+    const parser = new JSONParser({
+      separator: "",
+    });
     super({
       start(controller) {
-        parser.onValue = (value, _key, _parent, stack) => {
+        parser.onValue = ({ value, stack }) => {
           if (stack.length) return;
-          controller.enqueue(value);
+          controller.enqueue(value as T);
         };
       },
       transform(chunk) {
diff --git a/json_streams_test.ts b/json_streams_test.ts
@@ -1,8 +1,5 @@
-import { assertEquals } from "https://deno.land/std@0.210.0/assert/mod.ts";
-import {
-  channel,
-  collect,
-} from "https://deno.land/x/streamtools@v0.5.0/mod.ts";
+import { assertEquals } from "@std/assert";
+import { channel, collect } from "@lambdalisue/streamtools";
 import { DecodeStream, EncodeStream } from "./json_streams.ts";
 
 const encoder = new TextEncoder();
diff --git a/message_test.ts b/message_test.ts
@@ -1,4 +1,4 @@
-import { assertEquals } from "https://deno.land/std@0.210.0/assert/mod.ts";
+import { assertEquals } from "@std/assert";
 import { buildMessage, isMessage } from "./message.ts";
 
 const isMessageTestCases = [
diff --git a/session.ts b/session.ts
@@ -1,11 +1,8 @@
-import { Reservator } from "https://deno.land/x/reservator@v0.1.0/mod.ts";
-import {
-  Channel,
-  channel,
-} from "https://deno.land/x/streamtools@v0.5.0/mod.ts";
+import { Reservator } from "@lambdalisue/reservator";
+import { type Channel, channel } from "@lambdalisue/streamtools";
 import { DecodeStream, EncodeStream } from "./json_streams.ts";
-import { Command } from "./command.ts";
-import { isMessage, Message } from "./message.ts";
+import type { Command } from "./command.ts";
+import { isMessage, type Message } from "./message.ts";
 
 const shutdown = Symbol("shutdown");
 
diff --git a/session_test.ts b/session_test.ts
@@ -4,17 +4,12 @@ import {
   AssertionError,
   assertRejects,
   assertThrows,
-} from "https://deno.land/std@0.210.0/assert/mod.ts";
-import { promiseState } from "https://deno.land/x/async@v2.1.0/state.ts";
-import {
-  Channel,
-  channel,
-  pop,
-  push,
-} from "https://deno.land/x/streamtools@v0.5.0/mod.ts";
-import { AlreadyReservedError } from "https://deno.land/x/reservator@v0.1.0/errors.ts";
+} from "@std/assert";
+import { promiseState } from "@lambdalisue/async";
+import { type Channel, channel, pop, push } from "@lambdalisue/streamtools";
+import { AlreadyReservedError } from "@lambdalisue/reservator";
 import { buildRedrawCommand } from "./command.ts";
-import { buildMessage, Message } from "./message.ts";
+import { buildMessage, type Message } from "./message.ts";
 import { Session } from "./session.ts";
 
 const encoder = new TextEncoder();
