@beyonk/http 12.0.0 → 12.1.1

package/README.MD

@@ -188,9 +188,7 @@ Handlers have a signature with two items:
 ```js
 .badData((e, ctx) => {
   console.error('Bad data', e)
-  ctx.redirect('/foo/bar')
-  // or
-  ctx.error('/foo/bar')
+  throw redirect('/foo/bar')
 })
 ```
 
@@ -201,7 +199,7 @@ However, if the `context` object you pass in has a `fetch` function, this is use
 ```js
 export async function preload () {
   await Api
-    .context(this) // fetch, redirect, error.
+    .context({ fetch })
     .endpoint('foo/bar')
     ...
 }
@@ -232,7 +230,7 @@ Names are the same as the local handlers:
     baseUrl: 'https://example.com/your/api/base',
     handlers: {
       paymentRequired(e => {
-        redirect(307, '/checkout')
+        throw redirect(307, '/checkout')
       })
     }
   })

package/package.json

@@ -1,24 +1,30 @@
 {
   "name": "@beyonk/http",
-  "version": "12.0.0",
+  "version": "12.1.1",
   "description": "An isomorphic http client for Svelte apps",
-  "main": "lib/entrypoint.js",
-  "module": "lib/entrypoint.js",
   "type": "module",
-  "directories": {
-    "lib": "lib"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/beyonk-adventures/http.git"
   },
+  "files": [
+    "dist"
+  ],
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    }
+  },
   "devDependencies": {
-    "@beyonk/eslint-config": "^4.2.0",
-    "@beyonk/esm": "^4.0.1",
+    "@beyonk/eslint-config": "^9.0.3",
     "@hapi/code": "^5.3.1",
-    "eslint": "^7.2.0",
+    "eslint": "^9.29.0",
     "mocha": "^9.0.2",
-    "sinon": "^7.5.0"
+    "sinon": "^7.5.0",
+    "tsup": "^8.4.0",
+    "typescript": "^5.8.3"
   },
   "eslintConfig": {
     "extends": "@beyonk",
@@ -45,9 +51,9 @@
   "volta": {
     "node": "18.15.0"
   },
-  "packageManager": "pnpm@8.0.0",
   "scripts": {
     "test": "mocha './!(node_modules)/**/**.+(spec).js'",
-    "lint": "eslint lib --ext .js"
+    "lint": "eslint lib --ext .js",
+    "build": "tsup"
   }
 }

package/.github/workflows/publish.yml

@@ -1,60 +0,0 @@
-name: publish
-
-on:
-  push:
-    branches:
-      - '*'
-    tags:
-      - 'v*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: master
-
-      - uses: volta-cli/action@v4
-
-      - name: Cache pnpm modules
-        uses: actions/cache@v2
-        with:
-          path: ~/.pnpm-store
-          key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-
-
-      - uses: pnpm/action-setup@v2.2.4
-        with:
-          run_install: true
-
-      - run: pnpm lint
-
-  publish-npm:
-    if: startsWith(github.ref, 'refs/tags/v')
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: master
-
-      - uses: volta-cli/action@v4
-
-      - name: Authorize NPM
-        run: npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
-
-      - name: Cache pnpm modules
-        uses: actions/cache@v2
-        with:
-          path: ~/.pnpm-store
-          key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-
-
-      - uses: pnpm/action-setup@v2.2.4
-        with:
-          run_install: true
-
-      - run: pnpm publish

package/lib/api/_just-compose.js

@@ -1,12 +0,0 @@
-function compose (...fns) {
-  return function () {
-    var result = fns[0].apply(this, arguments)
-    var len = fns.length
-    for (var i = 1; i < len; i++) {
-      result = fns[i].call(this, result)
-    }
-    return result
-  }
-}
-
-export { compose }

package/lib/api/index.js

@@ -1,231 +0,0 @@
-import { AccessDeniedMixin } from '../error-handlers/access-denied.js'
-import { ConflictMixin } from '../error-handlers/conflict.js'
-import { DefaultMixin } from '../error-handlers/default.js'
-import { ForbiddenMixin } from '../error-handlers/forbidden.js'
-import { HandleMixin } from '../error-handlers/handle.js'
-import { NotFoundMixin } from '../error-handlers/not-found.js'
-import { BadDataMixin } from '../error-handlers/bad-data.js'
-import { PaymentRequiredMixin } from '../error-handlers/payment-required.js'
-import { PreconditionFailedMixin } from '../error-handlers/precondition-failed.js'
-import { TooManyRequestsMixin } from '../error-handlers/too-many-requests.js'
-import { NotAcceptableMixin } from '../error-handlers/not-acceptable.js'
-import { GoneMixin } from '../error-handlers/gone.js'
-import { byCode } from '../errors.js'
-import { compose } from './_just-compose.js'
-
-class ApiBase {}
-const Behaviours = compose(
-  AccessDeniedMixin,
-  ConflictMixin,
-  DefaultMixin,
-  ForbiddenMixin,
-  HandleMixin,
-  NotFoundMixin,
-  BadDataMixin,
-  PaymentRequiredMixin,
-  PreconditionFailedMixin,
-  TooManyRequestsMixin,
-  NotAcceptableMixin,
-  GoneMixin
-)(ApiBase)
-
-class Api extends Behaviours {
-  constructor (options) {
-    super()
-    this.options = Object.assign({
-      retry: false,
-      parseErrors: true,
-      handlers: {}
-    }, options)
-
-    this.handlers = {}
-    this.client = null
-    this.resetRequest()
-  }
-
-  resetRequest () {
-    this.config = {
-      endpoint: null,
-      method: 'get',
-      payload: null,
-      query: null,
-      headers: {},
-      overrides: {}
-    }
-  }
-
-  getClient () {
-    if (this.options.mock) {
-      console.warn('@beyonk/http: Using mocked http client')
-      return this.options.mock
-    }
-
-    if (this.client) {
-      return this.client
-    } else if (typeof window !== 'undefined') {
-      return window.fetch.bind(window)
-    }
-
-    throw Error("No client provided and can't find one automatically")
-  }
-
-  async send (fn) {
-    const endpoint = this.config.endpoint.includes('://') ? this.config.endpoint : `${this.options.baseUrl}/${this.config.endpoint}`
-    const hasPayload = !!this.config.payload
-
-    const options = Object.assign(
-      {
-        method: this.config.method,
-        cors: true,
-        credentials: 'include',
-        headers: Object.assign(
-          { Accept: 'application/json' },
-          hasPayload ? { 'Content-Type': 'application/json' } : {},
-          this.config.headers
-        )
-      },
-      hasPayload ? { body: JSON.stringify(this.config.payload) } : {},
-      this.config.overrides
-    )
-
-    const client = this.getClient()
-    const ep = this.config.query ? `${endpoint}?${this.config.query}` : `${endpoint}`
-
-    let result
-    try {
-      result = await this._doQuery(1, client, ep, options)
-    } catch (e) {
-      console.log(e)
-      return this.handle(e, this.ctx)
-    } finally {
-      this.resetRequest()
-    }
-
-    const { json, httpStatus } = result
-    return fn ? fn(json, httpStatus) : json
-  }
-
-  _hasContent (response) {
-    const contentLength = parseInt(response.headers.get('content-length'), 10)
-
-    const isNoContentResponse = response.status === 204
-    if (isNoContentResponse) {
-      return false
-    }
-
-    const headerExists = !isNaN(contentLength)
-    return !headerExists || contentLength > 0
-  }
-
-  async _doQuery (attempt, client, endpoint, options) {
-    const retry = this.options.retry || { attempts: 1 }
-    try {
-      const r = await client(endpoint, options)
-
-      if (r.status >= 200 && r.status < 400) {
-        let json
-
-        if (this._hasContent(r)) {
-          try {
-            json = await r.json()
-          } catch (e) {
-            console.error('Unable to parse response json', e.message)
-          }
-        }
-
-        return { httpStatus: r.status, json }
-      }
-
-      let content = ''
-      try {
-        content = this.options.parseErrors ? await r.json() : await r.text()
-      } catch (e) {
-        console.log('Failed to parse error body when asked.')
-      }
-
-      const ClientError = byCode(r.status)
-      throw new ClientError(r.statusText, content)
-    } catch (e) {
-      if (attempt < retry.attempts && retry.errors.includes(e.code)) {
-        console.warn(`Got ${e.code} when calling ${endpoint}. Retrying request (${attempt}/${retry.attempts})`)
-        return this._doQuery(++attempt, client, endpoint, options)
-      }
-
-      throw e
-    }
-  }
-
-  context (ctx) {
-    if (ctx.fetch) {
-      this.client = ctx.fetch
-    }
-    this.ctx = ctx
-    return this
-  }
-
-  override (override) {
-    this.config.overrides = override
-    return this
-  }
-
-  headers (headers) {
-    this.config.headers = headers
-    return this
-  }
-
-  async get (fn) {
-    this.config.method = 'GET'
-    return this.send(fn)
-  }
-
-  async post (fn) {
-    this.config.method = 'POST'
-    return this.send(fn)
-  }
-
-  async patch (fn) {
-    this.config.method = 'PATCH'
-    return this.send(fn)
-  }
-
-  async put (fn) {
-    this.config.method = 'PUT'
-    return this.send(fn)
-  }
-
-  async del (fn) {
-    this.config.method = 'DELETE'
-    return this.send(fn)
-  }
-
-  endpoint (endpoint) {
-    this.config.endpoint = endpoint
-    return this
-  }
-
-  query (query) {
-    const q = Object.entries(query).reduce((curr, [ k, v ]) => {
-      if (typeof v === 'undefined') {
-        return curr
-      }
-      if (Array.isArray(v)) {
-        curr.push(...v.map(n => `${k}=${encodeURIComponent(n)}`))
-      } else {
-        curr.push(`${k}=${encodeURIComponent(v)}`)
-      }
-      return curr
-    }, [])
-
-    this.config.query = q.join('&')
-    return this
-  }
-
-  payload (payload) {
-    this.config.payload = payload
-    return this
-  }
-}
-
-export {
-  Api
-}