feat!: merge api (#920)

* test: add shape tests

* feat: merge api

.depcheckrc.json

@@ -8,16 +8,10 @@
     "@babel/preset-typescript",
     "@commitlint/cli",
     "@commitlint/config-conventional",
-    "@types/content-disposition",
-    "@types/debug",
     "babel-jest",
     "babel-loader",
-    "bufferutil",
-    "cross-blob",
-    "debug",
     "husky",
     "ts-node",
-    "utf-8-validate",
     "webpack-cli",
     "playwright-test"
   ]

.gitignore

@@ -28,3 +28,6 @@ node_modules
 
 # Generated files
 docs
+
+*.shape
+shaper.ts

README.md

@@ -1,66 +1,47 @@
-# Bee-js
+# Bee-JS
 
-[![Tests](https://github.com/ethersphere/bee-js/actions/workflows/tests.yaml/badge.svg)](https://github.com/ethersphere/bee-js/actions/workflows/tests.yaml)
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fethersphere%2Fbee-js.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fethersphere%2Fbee-js?ref=badge_shield)
 [![](https://img.shields.io/badge/made%20by-Swarm-blue.svg?style=flat-square)](https://swarm.ethereum.org/)
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fethersphere%2Fbee-js.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fethersphere%2Fbee-js?ref=badge_shield)
 [![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-brightgreen.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme)
 [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard)
-![](https://img.shields.io/badge/npm-%3E%3D6.9.0-orange.svg?style=flat-square)
-![](https://img.shields.io/badge/Node.js-%3E%3D14.0.0-orange.svg?style=flat-square)
+![](https://img.shields.io/badge/Node.js-%3E%3D18.0.0-orange.svg?style=flat-square)
 ![](https://img.shields.io/badge/runs%20in-browser%20%7C%20node%20%7C%20webworker%20%7C%20electron-orange)
 
-> Client library for connecting to Bee decentralised storage
+> JavaScript SDK for connecting to a Bee node in the Swarm decentralised storage.
 
-**Warning: This project is in beta state. There might (and most probably will) be changes in the future to its API and working. Also, no guarantees can be made about its stability, efficiency, and security at this stage.**
+> Supports Node.js 18+, Vite and Webpack.
 
-This project is intended to be used with **Bee version <!-- SUPPORTED_BEE_START -->1.13.0<!-- SUPPORTED_BEE_END -->**. Using it with older or newer Bee versions is not recommended and may not work. Stay up to date by joining the [official Discord](https://discord.gg/GU22h2utj6) and by keeping an eye on the [releases tab](https://github.com/ethersphere/bee-js/releases).
+> Write your code in CJS, MJS or TypeScript.
 
-## Table of Contents
-
-- [Install](#install)
-  - [npm](#npm)
-  - [Use in Node.js](#use-in-nodejs)
-  - [Use in a browser with browserify, webpack or any other bundler](#use-in-a-browser-with-browserify-webpack-or-any-other-bundler)
-  - [Use in a browser Using a script tag](#use-in-a-browser-using-a-script-tag)
-- [Usage](#usage)
-- [API](#api)
-- [Contribute](#contribute)
-  - [Setup](#setup)
-  - [Test](#test)
-- [License](#license)
+> Intended to be used with Bee version 2.1.0.
 
 ## Install
 
-### npm
-
 ```sh
-> npm install @ethersphere/bee-js --save
+npm install @ethersphere/bee-js
 ```
 
-### yarn
+or
 
 ```sh
-> yarn add @ethersphere/bee-js
+yarn add @ethersphere/bee-js
 ```
 
-Be aware, if you are running Yarn v1 and are attempting to install this repo using GitHub URL, this won't unfortunately
-work as it does not correctly handle execution of `prepare` script.
+## Import
 
-### Use in Node.js
-
-**We require Node.js's version of at least 12.x**
+### CJS
 
 ```js
-var BeeJs = require("@ethersphere/bee-js");
+const { Bee } = require('@ethersphere/bee-js')
 ```
 
-### Use in a browser with browserify, webpack or any other bundler
+### MJS and TypeScript
 
-```js
-var BeeJs = require("@ethersphere/bee-js");
+```ts
+import { Bee } from '@ethersphere/bee-js'
 ```
 
-### Use in a browser Using a script tag
+### Script tag
 
 Loading this module through a script tag will make the `BeeJs` object available in the global namespace.
 
@@ -70,33 +51,101 @@ Loading this module through a script tag will make the `BeeJs` object available
 
 ## Usage
 
+### Create or select an existing postage batch
+
+Swarm incentivizes nodes in the network to store content, therefor all uploads require a paid
+[postage batch](https://docs.ethswarm.org/docs/learn/technology/contracts/postage-stamp).
+
+```js
+import { Bee } from '@ethersphere/bee-js'
+
+async function getOrCreatePostageBatch() {
+  const bee = new Bee('http://localhost:1633')
+  let batchId
+
+  const batches = await bee.getAllPostageBatch()
+  const usable = batches.find(x => x.usable)
+
+  if (usable) {
+    batchId = usable.batchID
+  } else {
+    batchId = await bee.createPostageBatch('500000000', 20)
+  }
+}
+```
+
+> The following examples all assume an existing batchId.
+
+### Upload simple data (Browser + Node.js)
+
 ```js
-import { Bee, BeeDebug } from '@ethersphere/bee-js'
+import { Bee } from '@ethersphere/bee-js'
 
 const bee = new Bee('http://localhost:1633')
-const beeDebug = new BeeDebug('http://localhost:1635')
 
-// Be aware, this creates on-chain transactions that spend Eth and BZZ!
-const batchId = await bee.createPostageBatch('2000', 20)
-const uploadResult = await bee.uploadData(batchId, "Bee is awesome!")
+const uploadResult = await bee.uploadData(batchId, 'Bee is awesome!')
 const data = await bee.downloadData(uploadResult.reference)
 
 console.log(data.text()) // prints 'Bee is awesome!'
 ```
 
+### Upload data from a file input (React)
+
+```js
+import { Bee } from '@ethersphere/bee-js'
+
+const bee = new Bee('http://localhost:1633')
+const result = await bee.uploadFile(batchId, file)
+```
+
+### Upload multiple files or a directory (React)
+
+```js
+import { Bee } from '@ethersphere/bee-js'
+
+const bee = new Bee('http://localhost:1633')
+const result = await bee.uploadFiles(batchId, fileList)
+```
+
+### Upload arbitrary large file (Node.js)
+
+```js
+import { Bee } from '@ethersphere/bee-js'
+import { createReadStream } from 'fs'
+
+const bee = new Bee('http://localhost:1633')
+const readable = createReadStream('./path/to/large.bin')
+const uploadResult = await bee.uploadFile(batchId, readable)
+```
+
+### Upload arbitrary large directories (Node.js)
+
+```js
+import { Bee } from '@ethersphere/bee-js'
+import { createReadStream } from 'fs'
+
+const bee = new Bee('http://localhost:1633')
+const uploadResult = await bee.uploadFilesFromDirectory(batchId, './path/to/gallery/')
+```
+
 [**Check out our examples repo for some more ideas on how to use `bee-js`**](https://github.com/ethersphere/examples-js)
 
 ## Documentation
 
-You can find the full documentation [here](https://bee-js.ethswarm.org/docs). The API reference documentation can be found [here](https://bee-js.ethswarm.org/docs/api).
+You can find the full documentation [here](https://bee-js.ethswarm.org/docs). The API reference documentation can be
+found [here](https://bee-js.ethswarm.org/docs/api).
 
 ## Contribute
 
+Stay up to date by joining the [official Discord](https://discord.gg/GU22h2utj6) and by keeping an eye on the
+[releases tab](https://github.com/ethersphere/bee-js/releases).
+
 There are some ways you can make this module better:
 
 - Consult our [open issues](https://github.com/ethersphere/bee-js/issues) and take on one of them
 - Help our tests reach 100% coverage!
-- Join us in our [Discord chat](https://discord.gg/wdghaQsGq5) in the #develop-on-swarm channel if you have questions or want to give feedback
+- Join us in our [Discord chat](https://discord.gg/wdghaQsGq5) in the #develop-on-swarm channel if you have questions or
+  want to give feedback
 
 ### Setup
 
@@ -106,35 +155,32 @@ Install project dependencies with
 npm i
 ```
 
-### Node 18
-
-Node 18 came with its own fetch's native implementation called Undici. If you want to run bee-js tests under Node 18, then disable
-the native's fetch implementation otherwise unit tests will fail as they capture HTTP calls with library called `nock` that does
-not support native fetch yet.
-
-```
-export NODE_OPTIONS='--no-experimental-fetch'
-```
-
 ### Test
 
 The tests run in both context: node and dom with Jest.
 
-To run the integration tests, you need to spin up local Bee cluster using our [`bee-factory`](https://github.com/ethersphere/bee-factory/) project.
-In order to do that you have to have locally Docker running on your machine, but afterwards you can just simply run `npm run bee`, which spins up the
-cluster and display Queen's logs. If you want to exit hit `CTRL+C`.
+To run the integration tests, you need to spin up local Bee cluster using our
+[`fdp-play`](https://github.com/fairDataSociety/fdp-play/) project. In order to do that you have to have locally Docker
+running on your machine, but afterwards you can just simply run `npm run bee`, which spins up the cluster and display
+Queen's logs. If you want to exit hit `CTRL+C`.
 
-If you want to skip creation of postage stamps every run of integration tests you can create stamps for both nodes and set them under env. variables `BEE_POSTAGE` and `BEE_PEER_POSTAGE`.
+If you want to skip creation of postage stamps every run of integration tests you can create stamps for both nodes and
+set them under env. variables `BEE_POSTAGE` and `BEE_PEER_POSTAGE`.
 
-By default, for integration tests two bee nodes are expected to run on localhost on addresses `http://localhost:1633` and `http://localhost:11633`. These are the default values for the `bee-factory` script.
-If you want to use custom setup, you can change the behavior of tests to different addresses using environment variables `BEE_API_URL`, `BEE_DEBUG_API_URL`, `BEE_PEER_DEBUG_API_URL` and `BEE_PEER_API_URL`.
+By default, for integration tests two bee nodes are expected to run on localhost on addresses `http://localhost:1633`
+and `http://localhost:11633`. These are the default values for the `fdp-play` script. If you want to use custom setup,
+you can change the behavior of tests to different addresses using environment variables `BEE_API_URL` and
+`BEE_PEER_API_URL`.
 
 There are also browser tests by Puppeteer, which also provide integrity testing.
+
 ```sh
 npm run test:browser
 ```
-The test HTML file which Puppeteer uses is the [test/testpage/testpage.html](test/testpage/testpage.html).
-To open and manually test BeeJS with developer console, it is necessary to build the library first with `npm run compile:browser` (running the browser tests `npm run test:browser` also builds the library).
+
+The test HTML file which Puppeteer uses is the [test/testpage/testpage.html](test/testpage/testpage.html). To open and
+manually test BeeJS with developer console, it is necessary to build the library first with `npm run compile:browser`
+(running the browser tests `npm run test:browser` also builds the library).
 
 ### Compile code
 
@@ -146,12 +192,8 @@ or for Browsers
 
 `npm run compile:browser`
 
-## Maintainers
-
-
 ## License
 
 [BSD-3-Clause](./LICENSE)
 
-
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fethersphere%2Fbee-js.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fethersphere%2Fbee-js?ref=badge_large)

build-fixup

@@ -9,6 +9,10 @@ cat >dist/cjs/package.json <<!EOF
     "type": "commonjs",
     "browser": {
      "stream": false,
+     "fs": false,
+      "./utils/tar.js": "./utils/tar.browser.js",
+      "./utils/tar-writer.js": "./utils/tar-writer.browser.js",
+      "./utils/tar-uploader.js": "./utils/tar-uploader.browser.js",
       "./utils/data.js": "./utils/data.browser.js",
       "./utils/collection.node.js": "./utils/collection.browser.js"
     }
@@ -20,8 +24,12 @@ cat >dist/mjs/package.json <<!EOF
     "type": "module",
     "browser": {
      "stream": false,
-      "./utils/data.js": "./utils/data.browser.js",
-      "./utils/collection.node.js": "./utils/collection.browser.js"
+     "fs": false,
+     "./utils/tar.js": "./utils/tar.browser.js",
+     "./utils/tar-writer.js": "./utils/tar-writer.browser.js",
+      "./utils/tar-uploader.js": "./utils/tar-uploader.browser.js",
+     "./utils/data.js": "./utils/data.browser.js",
+     "./utils/collection.node.js": "./utils/collection.browser.js"
     }
 }
 !EOF