fix - as the long term version needs more time

Author: michael-spengler

.gitignore

@@ -2,7 +2,7 @@
 
 Thanks to [ntrotner](https://github.com/ntrotner) and thanks to the hints we have received in the context of [this issue](https://github.com/ChainSafe/web3.js/issues/3700), Deno is ready for web3 with this module.   
 
-## Usage Example
+## Usage Examples
 
 ### Get Balance
 

README.md

@@ -1,3 +1,4 @@
-import Web3 from "./packages/web3/src/index.js";
+import Web3 from './packages/web3/src/index.js';
 
-export default Web3
+export type * from './packages/web3/types/index.d.ts';
+export default Web3;

mod.ts

@@ -19,7 +19,7 @@ npm install web3-bzz
 ## Usage
 
 ```js
-const Web3Bzz = require('web3-bzz');
+const Web3Bzz = require('https://deno.land/x/web3/packages/web3-bzz/src/index.js');
 
 const bzz = new Web3Bzz('http://swarm-gateways.net');
 ```

packages/web3-bzz/README.md

@@ -20,68 +20,63 @@
  * @date 2017
  */
 
-"use strict";
+'use strict';
 
-import swarm from "https://jspm.dev/swarm-js";
+import swarm from 'https://jspm.dev/swarm-js';
 
+const Bzz = function Bzz(provider) {
+  this.givenProvider = Bzz.givenProvider;
 
-var Bzz = function Bzz(provider) {
+  if (provider && provider._requestManager) {
+    provider = provider.currentProvider;
+  }
 
-    this.givenProvider = Bzz.givenProvider;
+  // only allow file picker when in browser
+  if (typeof document !== 'undefined') {
+    this.pick = swarm.pick;
+  }
 
-    if (provider && provider._requestManager) {
-        provider = provider.currentProvider;
-    }
-
-    // only allow file picker when in browser
-    if(typeof document !== 'undefined') {
-        this.pick = swarm.pick;
-    }
-
-    this.setProvider(provider);
+  this.setProvider(provider);
 };
 
 // set default ethereum provider
 /* jshint ignore:start */
 Bzz.givenProvider = null;
 if (typeof ethereum !== 'undefined' && ethereum.bzz) {
-    Bzz.givenProvider = ethereum.bzz;
+  Bzz.givenProvider = ethereum.bzz;
 }
 /* jshint ignore:end */
 
-Bzz.prototype.setProvider = function(provider) {
-    // is ethereum provider
-    if(!!provider && typeof provider === 'object' && typeof provider.bzz === 'string') {
-        provider = provider.bzz;
+Bzz.prototype.setProvider = function (provider) {
+  // is ethereum provider
+  if (!!provider && typeof provider === 'object' && typeof provider.bzz === 'string') {
+    provider = provider.bzz;
     // is no string, set default
-    }
-    // else if(!_.isString(provider)) {
-    //      provider = 'http://swarm-gateways.net'; // default to gateway
-    // }
-
+  }
+  // else if(!_.isString(provider)) {
+  //      provider = 'http://swarm-gateways.net'; // default to gateway
+  // }
 
-    if(typeof provider === 'string') {
-        this.currentProvider = provider;
-    } else {
-        this.currentProvider = null;
+  if (typeof provider === 'string') {
+    this.currentProvider = provider;
+  } else {
+    this.currentProvider = null;
 
-        var noProviderError = new Error('No provider set, please set one using bzz.setProvider().');
+    const noProviderError = new Error('No provider set, please set one using bzz.setProvider().');
 
-        this.download = this.upload = this.isAvailable = function(){
-            throw noProviderError;
-        };
+    this.download = this.upload = this.isAvailable = function () {
+      throw noProviderError;
+    };
 
-        return false;
-    }
+    return false;
+  }
 
-    // add functions
-    this.download = swarm.at(provider).download;
-    this.upload = swarm.at(provider).upload;
-    this.isAvailable = swarm.at(provider).isAvailable;
+  // add functions
+  this.download = swarm.at(provider).download;
+  this.upload = swarm.at(provider).upload;
+  this.isAvailable = swarm.at(provider).isAvailable;
 
-    return true;
+  return true;
 };
 
-
 export default Bzz;
-

packages/web3-bzz/src/index.js

@@ -18,12 +18,16 @@
  */
 
 export class Bzz {
-    constructor();
-    constructor(provider: any);
+  constructor();
+
+  constructor(provider: any);
 
     readonly givenProvider: any;
+
     static readonly givenProvider: any;
+
     readonly currentProvider: any;
+
     setProvider(provider: any): boolean;
 
     upload(data: any): Promise<string>;

packages/web3-bzz/types/index.d.ts

@@ -17,7 +17,7 @@
  * @date 2018
  */
 
-import { Bzz } from 'https://github.com/ntrotner/web3-deno/raw/main/packages/web3-bzz/src/index.js';
+import { Bzz } from 'https://deno.land/x/web3/packages/web3-bzz/src/index.js';
 
 // $ExpectType Bzz
 const bzz_empty = new Bzz();
@@ -44,17 +44,17 @@ bzz.setProvider('https://localhost:2100');
 bzz.upload('test file');
 
 const dir = {
-    '/foo.txt': { type: 'text/plain', data: 'sample file' },
-    '/bar.txt': { type: 'text/plain', data: 'another file' }
+  '/foo.txt': { type: 'text/plain', data: 'sample file' },
+  '/bar.txt': { type: 'text/plain', data: 'another file' },
 };
 
 // $ExpectType Promise<string>
 bzz.upload(dir);
 // $ExpectType Promise<string>
 bzz.upload({
-    path: '/path/to/thing',
-    kind: 'directory',
-    defaultFile: '/index.html'
+  path: '/path/to/thing',
+  kind: 'directory',
+  defaultFile: '/index.html',
 });
 
 // ExpectType Promise<any>;

packages/web3-bzz/types/tests/bzz-test.ts

@@ -17,7 +17,7 @@ npm install web3-core-helpers
 ## Usage
 
 ```js
-const helpers = require('web3-core-helpers');
+const helpers = require('https://deno.land/x/web3/packages/web3-core-helpers/src/index.js');
 
 helpers.formatters;
 helpers.errors;