refactor: use HyperErr from hyper-utils

Author: TillaTheHun0

adapter.js

@@ -1,4 +1,4 @@
-import { crocks, R } from "./deps.js";
+import { crocks, HyperErr, R } from "./deps.js";
 
 import {
   bulkPath,
@@ -14,7 +14,6 @@ import {
   bulkToEsBulk,
   esErrToHyperErr,
   handleHyperErr,
-  HyperErr,
   mappingsToEsMappings,
   moveUnderscoreId,
   queryToEsQuery,
@@ -185,7 +184,9 @@ export default function ({ config, asyncFetch, headers, handleResponse }) {
               headers,
               method: "GET",
             },
-          ).chain(handleResponse((res) => res.status === 404))
+          ).chain(
+            handleResponse((res) => res.status === 404),
+          )
             .bichain(
               () =>
                 Async.Rejected(HyperErr({
@@ -227,6 +228,7 @@ export default function ({ config, asyncFetch, headers, handleResponse }) {
    * @returns {Promise<Response>}
    */
   function getDoc({ index, key }) {
+    // Will 404 if doc or index is not found, but with different error codes in body
     return asyncFetch(
       getDocPath(config.origin, index, key),
       {

deps.js

@@ -1,4 +1,9 @@
 export * as R from "https://cdn.skypack.dev/ramda@0.28.0";
 export { default as crocks } from "https://cdn.skypack.dev/crocks@0.12.4";
 
+export {
+  HyperErr,
+  isHyperErr,
+} from "https://x.nest.land/hyper-utils@0.1.0/hyper-err.js";
+
 export { encode as base64Encode } from "https://deno.land/std@0.127.0/encoding/base64.ts";

deps_lock.json

@@ -1,4 +1,5 @@
 {
+  "https://arweave.net/afjNOdumqZhfVMIjRw_8fCYZoecSB6XtHGZpNNUNIr8/hyper-err.js": "434ce4bd1cc58e220aad95148bfb04ad7c43738cb5f771a02a45ea8608ac71cc",
   "https://cdn.skypack.dev/-/crocks@v0.12.4-Mje8nEhNx2rmIpwz3ROp/dist=es2019,mode=imports/optimized/crocks.js": "93d587d18dc5f124f30e5b38de37a6471eb65309c94ef2ffc7a36dc40ab394da",
   "https://cdn.skypack.dev/-/ramda@v0.28.0-vDL6KbwpPkq7DJAM324O/dist=es2019,mode=imports/optimized/common/_Set-d915dfa1.js": "85edd0c60ae74c28bfd7a6d831d1274b2299de6c46cc19ddfed24f593365f0c8",
   "https://cdn.skypack.dev/-/ramda@v0.28.0-vDL6KbwpPkq7DJAM324O/dist=es2019,mode=imports/optimized/common/_arity-fefc01f2.js": "dd07d98af13cc6d84a8fc656ae901b590bbeebfcdff21a1eb9903f3d22a1dbc9",

utils.js

@@ -1,25 +1,14 @@
-import { crocks, R } from "./deps.js";
+import { crocks, HyperErr, isHyperErr, R } from "./deps.js";
 
 const { Async } = crocks;
 const {
-  __,
   assoc,
   dissoc,
-  isEmpty,
   ifElse,
   defaultTo,
-  propEq,
-  cond,
-  is,
   identity,
-  T,
-  complement,
-  isNil,
   compose,
   has,
-  allPass,
-  anyPass,
-  filter,
   evolve,
   applyTo,
   propOr,
@@ -37,63 +26,6 @@ const {
 
 export const underscoreIdAlias = "__movedUnderscoreId63__";
 
-const isDefined = complement(isNil);
-const isEmptyObject = allPass([
-  complement(is(Array)), // not an array
-  is(Object),
-  isEmpty,
-]);
-const rejectNil = filter(isDefined);
-
-/**
- * Constructs a hyper-esque error
- *
- * @typedef {Object} HyperErrArgs
- * @property {string} msg
- * @property {string?} status
- *
- * @typedef {Object} NotOk
- * @property {false} ok
- *
- * @param {(HyperErrArgs | string)} argsOrMsg
- * @returns {NotOk & HyperErrArgs} - the hyper-esque error
- */
-export const HyperErr = (argsOrMsg) =>
-  compose(
-    ({ ok, msg, status }) => rejectNil({ ok, msg, status }), // pick and filter nil
-    assoc("ok", false),
-    cond([
-      // string
-      [is(String), assoc("msg", __, {})],
-      // { msg?, status? }
-      [
-        anyPass([
-          isEmptyObject,
-          has("msg"),
-          has("status"),
-        ]),
-        identity,
-      ],
-      // Fallthrough to error
-      [T, () => {
-        throw new Error(
-          "HyperErr args must be a string or an object with msg or status",
-        );
-      }],
-    ]),
-    defaultTo({}),
-  )(argsOrMsg);
-
-export const isHyperErr = allPass([
-  propEq("ok", false),
-  /**
-   * should not have an _id.
-   * Otherwise it's a document ie data.retrieveDocument
-   * or cache.getDoc
-   */
-  complement(has("_id")),
-]);
-
 export const handleHyperErr = ifElse(
   isHyperErr,
   Async.Resolved,