Merge pull request #17 from lambdalisue/support-jsr

Support jsr

Author: lambdalisue

.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/[email protected]

.github/workflows/test.yml

@@ -40,3 +40,6 @@ jobs:
         run: |
           deno task test
         timeout-minutes: 5
+      - name: JSR publish (dry-run)
+        run: |
+          deno publish --dry-run

README.md

@@ -1,6 +1,7 @@
 # git-browse
 
-[![deno land](http://img.shields.io/badge/available%20on-deno.land/x-lightgrey.svg?logo=deno)](https://deno.land/x/git_browse)
+[![jsr](https://img.shields.io/jsr/v/%40lambdalisue/git-browse?logo=javascript&logoColor=white)](https://jsr.io/@lambdalisue/git-browse)
+[![denoland](https://img.shields.io/github/v/release/lambdalisue/deno-git-browse?logo=deno&label=denoland)](https://github.com/lambdalisue/deno-git-browse/releases)
 [![deno doc](https://doc.deno.land/badge.svg)](https://doc.deno.land/https/deno.land/x/git_browse/mod.ts)
 [![Test](https://github.com/lambdalisue/deno-git-browse/workflows/Test/badge.svg)](https://github.com/lambdalisue/deno-git-browse/actions?query=workflow%3ATest)
 

bin/browse.ts

@@ -58,11 +58,11 @@ export async function readAliasesFile(): Promise<Record<string, string>> {
     return {};
   }
   try {
-    return await import(join(cdir, "browse", "aliases.json"), {
-      with: { type: "json" },
-    });
+    return JSON.parse(
+      await Deno.readTextFile(join(cdir, "browse", "aliases.json")),
+    );
   } catch (err) {
-    if (err instanceof TypeError) {
+    if (err instanceof Deno.errors.NotFound) {
       return {};
     }
     throw err;

commit_url.ts

@@ -18,6 +18,6 @@ export async function getCommitURL(
   if (!fetchURL) {
     throw new Error(`No remote '${remote}' found`);
   }
-  const hostingService = await getHostingService(fetchURL, options);
+  const hostingService = getHostingService(fetchURL, options);
   return hostingService.getCommitURL(fetchURL, commitish);
 }

deno.jsonc

@@ -1,5 +1,8 @@
 {
   "lock": false,
+  "name": "@lambdalisue/git-browse",
+  "version": "0.0.0",
+  "exports": "./mod.ts",
   "tasks": {
     "test": "deno test -A --parallel --doc",
     "check": "deno check **/*.ts",

home_url.ts

@@ -17,6 +17,6 @@ export async function getHomeURL(
   if (!fetchURL) {
     throw new Error(`No remote '${remote}' found or failed to get fetch URL.`);
   }
-  const hostingService = await getHostingService(fetchURL, options);
+  const hostingService = getHostingService(fetchURL, options);
   return hostingService.getHomeURL(fetchURL);
 }

hosting_service/mod.ts

@@ -1,4 +1,13 @@
 import type { ExecuteOptions } from "../process.ts";
+import { service as bitbucket_org } from "./services/bitbucket_org.ts";
+import { service as github_com } from "./services/github_com.ts";
+import { service as gitlab_com } from "./services/gitlab_com.ts";
+
+const serviceMap = {
+  bitbucket_org,
+  github_com,
+  gitlab_com,
+};
 
 export type Range = number | [number, number];
 
@@ -39,24 +48,18 @@ export type HostingService = {
 /**
  * Get git hosting service from URL
  */
-export async function getHostingService(
+export function getHostingService(
   fetchURL: URL,
   { aliases }: { aliases?: Record<string, string> } = {},
-): Promise<HostingService> {
+): HostingService {
   const hostname = aliases?.[fetchURL.hostname] ?? fetchURL.hostname;
   const svcName = hostname.replace(/\W/g, "_");
-  try {
-    const svc = await import(
-      new URL(`./services/${svcName}.ts`, import.meta.url).href
-    );
-    return svc.service;
-  } catch (err: unknown) {
-    if (err instanceof TypeError) {
-      // TypeError: Module not found "...".
-      throw new UnsupportedHostingServiceError(hostname, svcName);
-    }
-    throw err;
+  // deno-lint-ignore no-explicit-any
+  const svc = (serviceMap as any)[svcName];
+  if (!svc) {
+    throw new UnsupportedHostingServiceError(hostname, svcName);
   }
+  return svc;
 }
 
 export class UnsupportedHostingServiceError extends Error {

hosting_service/mod_test.ts

@@ -1,11 +1,11 @@
-import { assertRejects } from "https://deno.land/[email protected]/assert/mod.ts";
+import { assertThrows } from "https://deno.land/[email protected]/assert/mod.ts";
 import { assertSnapshot } from "https://deno.land/[email protected]/testing/snapshot.ts";
 import { getHostingService, UnsupportedHostingServiceError } from "./mod.ts";
 
 Deno.test("getHostingService", async (t) => {
-  await t.step("throws error for unsupported hosting service", async () => {
+  await t.step("throws error for unsupported hosting service", () => {
     const url = new URL("https://example.com/lambdalisue/deno-git-browse");
-    await assertRejects(
+    assertThrows(
       () => {
         return getHostingService(url);
       },
@@ -22,7 +22,7 @@ Deno.test("getHostingService", async (t) => {
     new URL("https://bitbucket.org/lambdalisue/deno-git-browse"),
   ];
   for (const url of urls) {
-    const svc = await getHostingService(url);
+    const svc = getHostingService(url);
 
     await t.step(`getHomeURL for ${url}`, async () => {
       const result = await svc.getHomeURL(url);
@@ -134,7 +134,7 @@ Deno.test("getHostingService with alias", async (t) => {
   };
 
   for (const url of urls) {
-    const svc = await getHostingService(url, { aliases });
+    const svc = getHostingService(url, { aliases });
 
     await t.step(`getHomeURL for ${url}`, async () => {
       const result = await svc.getHomeURL(url);

object_url.ts

@@ -1,5 +1,5 @@
-import { execute, ExecuteOptions } from "./process.ts";
-import { getHostingService, Range } from "./hosting_service/mod.ts";
+import { execute, type ExecuteOptions } from "./process.ts";
+import { getHostingService, type Range } from "./hosting_service/mod.ts";
 import { getRemoteContains, getRemoteFetchURL } from "./util.ts";
 
 type Options = ExecuteOptions & {
@@ -20,7 +20,7 @@ export async function getObjectURL(
   if (!fetchURL) {
     throw new Error(`No remote '${remote}' found`);
   }
-  const hostingService = await getHostingService(fetchURL, options);
+  const hostingService = getHostingService(fetchURL, options);
   const [normPath, range] = parsePath(path);
   const objectType = await getObjectType(commitish, normPath, options);
   if (objectType === "tree") {

pull_request_url.ts

@@ -1,5 +1,8 @@
-import { execute, ExecuteOptions } from "./process.ts";
-import { getHostingService, HostingService } from "./hosting_service/mod.ts";
+import { execute, type ExecuteOptions } from "./process.ts";
+import {
+  getHostingService,
+  type HostingService,
+} from "./hosting_service/mod.ts";
 import {
   __throw,
   getCommitSHA1,
@@ -23,7 +26,7 @@ export async function getPullRequestURL(
   if (!fetchURL) {
     throw new Error(`No remote '${remote}' found`);
   }
-  const hostingService = await getHostingService(fetchURL, options);
+  const hostingService = getHostingService(fetchURL, options);
   if (!hostingService.getPullRequestURL) {
     throw new Error(
       `Hosting service of ${fetchURL} has no pull request URL`,

util.ts

@@ -1,4 +1,4 @@
-import { execute, ExecuteError, ExecuteOptions } from "./process.ts";
+import { execute, ExecuteError, type ExecuteOptions } from "./process.ts";
 
 /**
  * A helper function to throw error