Merge pull request #4 from lambdalisue/prefer-jsr

Prefer jsr

Author: lambdalisue

README.md

@@ -1,17 +1,27 @@
 # errorutil
 
 [![JSR](https://jsr.io/badges/@lambdalisue/errorutil)](https://jsr.io/@lambdalisue/errorutil)
-[![denoland](https://img.shields.io/github/v/release/lambdalisue/deno-errorutil?logo=deno&label=denoland)](https://deno.land/x/errorutil)
-[![npm](http://img.shields.io/badge/available%20on-npm-lightgrey.svg?logo=npm&logoColor=white)](https://www.npmjs.com/package/@lambdalisue/errorutil)
-[![deno doc](https://doc.deno.land/badge.svg)](https://doc.deno.land/https/deno.land/x/errorutil/mod.ts)
 [![Test](https://github.com/lambdalisue/deno-errorutil/workflows/Test/badge.svg)](https://github.com/lambdalisue/deno-errorutil/actions?query=workflow%3ATest)
-[![npm version](https://badge.fury.io/js/@lambdalisue%2Ferrorutil.svg)](https://badge.fury.io/js/@lambdalisue%2Ferrorutil)
 [![codecov](https://codecov.io/gh/lambdalisue/deno-errorutil/graph/badge.svg?token=O0cA5Xj5la)](https://codecov.io/gh/lambdalisue/deno-errorutil)
 
 A utility pack for handling error.
 
 [deno]: https://deno.land/
 
+> [!WARN]
+>
+> The package on [deno.land] and [npm] is deprecated. Use the package on
+> [jsr.io] instead.
+>
+> ```
+> $ deno add @lambdalisue/errorutil
+> $ npx jsr add @lambdalisue/errorutil
+> ```
+
+[deno.land]: https://deno.land/x/errorutil
+[npm]: https://www.npmjs.com/package/@lambdalisue/errorutil
+[jsr.io]: https://jsr.io/@lambdalisue/errorutil
+
 ## License
 
 The code follows MIT license written in [LICENSE](./LICENSE). Contributors need

deno.jsonc

@@ -1,7 +1,15 @@
 {
   "name": "@lambdalisue/errorutil",
   "version": "0.0.0",
-  "exports": "./mod.ts",
+  "exports": {
+    ".": "./mod.ts",
+    "./error-object": "./error_object.ts",
+    "./raise": "./raise.ts",
+    "./try-or": "./try_or.ts",
+    "./try-or-else": "./try_or_else.ts",
+    "./unimplemented": "./unimplemented.ts",
+    "./unreachable": "./unreachable.ts"
+  },
   "exclude": [
     ".coverage",
     "npm"
@@ -16,6 +24,12 @@
     "update:commit": "deno task -q update --commit --pre-commit=fmt,lint"
   },
   "imports": {
-    "https://deno.land/x/errorutil@$MODULE_VERSION/": "./"
+    "@lambdalisue/errorutil": "./mod.ts",
+    "@lambdalisue/errorutil/error-object": "./error_object.ts",
+    "@lambdalisue/errorutil/raise": "./raise.ts",
+    "@lambdalisue/errorutil/try-or": "./try_or.ts",
+    "@lambdalisue/errorutil/try-or-else": "./try_or_else.ts",
+    "@lambdalisue/errorutil/unimplemented": "./unimplemented.ts",
+    "@lambdalisue/errorutil/unreachable": "./unreachable.ts"
   }
 }

error_object.ts

@@ -1,4 +1,4 @@
-import { is } from "jsr:@core/unknownutil";
+import { is } from "jsr:@core/unknownutil@3.18.0";
 
 export type ErrorObject = {
   proto: string;

error_object_test.ts

@@ -1,4 +1,4 @@
-import { assertEquals, assertInstanceOf } from "jsr:@std/assert";
+import { assertEquals, assertInstanceOf } from "jsr:@std/assert@0.225.1";
 import { fromErrorObject, toErrorObject } from "./error_object.ts";
 
 class CustomError extends Error {

mod.ts

@@ -1,5 +1,6 @@
 export * from "./error_object.ts";
 export * from "./raise.ts";
 export * from "./try_or.ts";
+export * from "./try_or_else.ts";
 export * from "./unimplemented.ts";
 export * from "./unreachable.ts";

raise.ts

@@ -4,7 +4,7 @@
  * This is function thus can be used as an expression.
  *
  * ```typescript
- * import { raise } from "https://deno.land/x/errorutil@$MODULE_VERSION/raise.ts";
+ * import { raise } from "@lambdalisue/errorutil/raise";
  *
  * const fn = () => raise(new Error("fail"));
  * ```

raise_test.ts

@@ -1,4 +1,4 @@
-import { assertThrows } from "jsr:@std/assert";
+import { assertThrows } from "jsr:@std/assert@0.225.1";
 import { raise } from "./raise.ts";
 
 Deno.test("raise", () => {

try_or.ts

@@ -1,9 +1,10 @@
+import { tryOrElse } from "./try_or_else.ts";
 /**
  * Try to execute a function and return the result or a default value.
  *
  * ```ts
- * import { tryOr } from "https://deno.land/x/errorutil@$MODULE_VERSION/try_or.ts";
- * import { raise } from "https://deno.land/x/errorutil@$MODULE_VERSION/raise.ts";
+ * import { tryOr } from "@lambdalisue/errorutil/try-or";
+ * import { raise } from "@lambdalisue/errorutil/raise";
  *
  * // Sync
  * console.log(tryOr(() => 1, 2)); // 1
@@ -25,39 +26,3 @@ export function tryOr<T>(
 ): T | Promise<T> {
   return tryOrElse(fn, () => orValue);
 }
-
-/**
- * Try to execute a function and return the result or execute another function.
- *
- * ```ts
- * import { tryOrElse } from "https://deno.land/x/errorutil@$MODULE_VERSION/try_or.ts";
- * import { raise } from "https://deno.land/x/errorutil@$MODULE_VERSION/raise.ts";
- *
- * // Sync
- * console.log(tryOrElse(() => 1, () => 2)); // 1
- * console.log(tryOrElse(() => raise("err"), () => 2)); // 2
- *
- * // Async
- * console.log(await tryOrElse(() => Promise.resolve(1), () => 2)); // 1
- * console.log(await tryOrElse(() => Promise.reject("err"), () => 2)); // 2
- * ```
- */
-export function tryOrElse<T>(fn: () => T, elseFn: (err: unknown) => T): T;
-export function tryOrElse<T>(
-  fn: () => Promise<T>,
-  elseFn: (err: unknown) => T | Promise<T>,
-): Promise<T>;
-export function tryOrElse<T>(
-  fn: () => T | Promise<T>,
-  elseFn: (err: unknown) => T | Promise<T>,
-): T | Promise<T> {
-  try {
-    const ret = fn();
-    if (ret instanceof Promise) {
-      return ret.catch((err) => elseFn(err));
-    }
-    return ret;
-  } catch (err) {
-    return elseFn(err);
-  }
-}

try_or_else.ts

@@ -0,0 +1,35 @@
+/**
+ * Try to execute a function and return the result or execute another function.
+ *
+ * ```ts
+ * import { tryOrElse } from "@lambdalisue/errorutil/try-or-else";
+ * import { raise } from "@lambdalisue/errorutil/raise";
+ *
+ * // Sync
+ * console.log(tryOrElse(() => 1, () => 2)); // 1
+ * console.log(tryOrElse(() => raise("err"), () => 2)); // 2
+ *
+ * // Async
+ * console.log(await tryOrElse(() => Promise.resolve(1), () => 2)); // 1
+ * console.log(await tryOrElse(() => Promise.reject("err"), () => 2)); // 2
+ * ```
+ */
+export function tryOrElse<T>(fn: () => T, elseFn: (err: unknown) => T): T;
+export function tryOrElse<T>(
+  fn: () => Promise<T>,
+  elseFn: (err: unknown) => T | Promise<T>,
+): Promise<T>;
+export function tryOrElse<T>(
+  fn: () => T | Promise<T>,
+  elseFn: (err: unknown) => T | Promise<T>,
+): T | Promise<T> {
+  try {
+    const ret = fn();
+    if (ret instanceof Promise) {
+      return ret.catch((err) => elseFn(err));
+    }
+    return ret;
+  } catch (err) {
+    return elseFn(err);
+  }
+}

try_or_else_test.ts

@@ -0,0 +1,62 @@
+import {
+  assertEquals,
+  assertRejects,
+  assertThrows,
+} from "jsr:@std/[email protected]";
+import { raise } from "./raise.ts";
+import { tryOrElse } from "./try_or_else.ts";
+
+Deno.test("tryOrElse", async (t) => {
+  const err = new Error("error");
+  const resolve = Promise.resolve.bind(Promise);
+  const reject = Promise.reject.bind(Promise);
+
+  await t.step("sync", () => {
+    type T = number;
+    assertEquals(tryOrElse((): T => 1, () => 2), 1);
+    assertEquals(tryOrElse((): T => raise(err), () => 2), 2);
+  });
+
+  await t.step("sync (error)", () => {
+    type T = number;
+    assertThrows(
+      () => tryOrElse((): T => raise(err), () => raise(err)),
+      Error,
+      "error",
+    );
+  });
+
+  await t.step("async", async () => {
+    type T = Promise<number>;
+    assertEquals(await tryOrElse((): T => resolve(1), () => 2), 1);
+    assertEquals(await tryOrElse((): T => resolve(1), () => resolve(2)), 1);
+    assertEquals(await tryOrElse((): T => reject(err), () => 2), 2);
+    assertEquals(await tryOrElse((): T => reject(err), () => resolve(2)), 2);
+    assertEquals(await tryOrElse((): T => raise(err), () => 2), 2);
+    assertEquals(await tryOrElse((): T => raise(err), () => resolve(2)), 2);
+  });
+
+  await t.step("async (error)", async () => {
+    type T = Promise<number>;
+    await assertRejects(
+      () => tryOrElse((): T => reject(err), () => reject(err)),
+      Error,
+      "error",
+    );
+    await assertRejects(
+      () => tryOrElse((): T => reject(err), () => raise(err)),
+      Error,
+      "error",
+    );
+    await assertRejects(
+      () => tryOrElse((): T => raise(err), () => reject(err)),
+      Error,
+      "error",
+    );
+    assertThrows(
+      () => tryOrElse((): T => raise(err), () => raise(err)),
+      Error,
+      "error",
+    );
+  });
+});