ESM/import version

index.js

@@ -1 +1,6 @@
-module.exports = require('./lib/client')
+// module.exports = require('./lib/client')
+// const client = require('./lib/client')
+// export { client }
+
+import { auth } from './lib/client'
+export default auth;

lib/client.js

@@ -1,17 +1,20 @@
-const debug       = require('debug')('bootic'),
-      colour      = require('colour'),
-      Request     = require('./request'),
-      Strategies  = require('./strategies'),
-      Entities    = require('./entities');
+// import { colour } from 'colour';
+import { sendRequest, streamData } from './request';
+import { Strategies } from './strategies';
+import { root, linkedProxy, embeddedProxy } from './entities';
 
-const ROOT_URL    = 'https://api.bootic.net/v1';
+const debug = function(str) { }
+
+const ROOT_URL = 'https://api.bootic.net/v1';
 
 function Client(strategy, opts) {
   var Strategy = Strategies[strategy]
   if (!Strategy)
     throw new Error('Invalid strategy, valid ones are: ' + Object.keys(Strategies));
 
   this.strategy = new Strategy(opts);
+  console.log('initializing client', strategy, opts)
+
   this.rootUrl  = opts.rootUrl || ROOT_URL;
 }
 
@@ -33,7 +36,7 @@ Client.prototype.authorize = function() {
       // if (!data._class || ~data._class.indexOf('errors'))
       //   throw new Error(data.message)
 
-      client.root = Entities.root(client, data);
+      client.root = root(client, data);
       return client.root;
     })
   })
@@ -47,7 +50,7 @@ Client.prototype.request = function(link, params) {
   debug(link);
   console.log((link.method || 'GET').toUpperCase().blue, link.href.split('{?')[0].grey)
 
-  return Request.send(link.method, link.href, params, headers).then(function(resp) {
+  return sendRequest(link.method, link.href, params, headers).then(function(resp) {
     var code = resp.status,
         time = Date.now() - start;
 
@@ -73,15 +76,16 @@ Client.prototype.request = function(link, params) {
 
 Client.prototype.stream = function(url, headers, onData, onClose) {
   console.log('GET'.blue, url.split('{?')[0].grey)
-  return Request.stream(url, headers, onData, onClose);
+  return streamData(url, headers, onData, onClose);
 }
 
-module.exports = Client
+// module.exports = Client
+export default Client;
 
-module.exports.auth = function(strategy, opts) {
+export function auth(strategy, opts) {
   if (typeof strategy == 'object') {
     opts = strategy
-    strategy = opts.strategy || (opts.token && opts.clientId ? 'authorized' : opts.token ? 'bearer' : 'credentials')
+    strategy = opts.strategy || (opts.token && opts.clientId ? 'authorized' : opts.accessToken ? 'bearer' : 'credentials')
   }
 
   return new Client(strategy, opts).authorize()

lib/entities.js

@@ -1,9 +1,11 @@
-const debug   = require('debug')('bootic');
-const explain = require('./explain');
-const h       = require('./helpers');
+
+import explain from './explain'
+import { isObject, isArray, isNumber, isFunction, containsVerb } from './helpers'
 
 const LINK_PREFIX = 'btc:';
 
+const debug = function(str) { }
+
 // promise vs callback wrapper
 function invoke(fn, cb) {
   if (cb) {
@@ -40,6 +42,9 @@ function buildPagedArray(itemName, client, result) {
   }
 
   Object.defineProperties(arr, {
+    'toArray': {
+      get: function() { return arr }
+    },
     'totalItems': {
       get: function() { return result.total_items }
     },
@@ -204,7 +209,7 @@ Collection.prototype.resetFilters = function() {
 */
 
 Collection.prototype.where = function(params) {
-  if (!params || !h.isObject(params))
+  if (!params || !isObject(params))
     throw new Error('Object expected, not ' + typeof(params));
 
   this._params = params;
@@ -233,8 +238,8 @@ Collection.prototype.all = function(cb) {
 }
 
 Collection.prototype.first = function(num, cb) {
-  cb  = h.isFunction(num) ? num : cb;
-  num = h.isNumber(num) ? num : null;
+  cb  = isFunction(num) ? num : cb;
+  num = isNumber(num) ? num : null;
 
   return invoke(function(done) {
     this._fetchItems(function(items) {
@@ -244,8 +249,8 @@ Collection.prototype.first = function(num, cb) {
 }
 
 Collection.prototype.last = function(num, cb) {
-  cb  = h.isFunction(num) ? num : cb;
-  num = h.isNumber(num) ? num : null;
+  cb  = isFunction(num) ? num : cb;
+  num = isNumber(num) ? num : null;
 
   return invoke(function(done) {
     this._fetchItems(function(items) {
@@ -307,8 +312,8 @@ LinkedEntity.prototype = Object.create(Entity.prototype)
 LinkedEntity.prototype.constructor = LinkedEntity
 
 LinkedEntity.prototype.get = function(params, cb) {
-  cb = h.isFunction(params) ? params : cb;
-  params = h.isObject(params) ? params : {};
+  cb = isFunction(params) ? params : cb;
+  params = isObject(params) ? params : {};
 
   return invoke(function(done) {
     return this._client.request(this._link, params).then(function(result) {
@@ -410,13 +415,13 @@ LinkedCollection.prototype.desc = function(count) {
 
 LinkedCollection.prototype.first = function(num, cb) {
   this.asc();
-  if (h.isNumber(num)) this.limit(num);
+  if (isNumber(num)) this.limit(num);
   return Collection.prototype.first.call(this, num, cb);
 }
 
 LinkedCollection.prototype.last = function(num, cb) {
   this.desc();
-  if (h.isNumber(num)) this.limit(num);
+  if (isNumber(num)) this.limit(num);
   return Collection.prototype.last.call(this, num, cb);
 }
 
@@ -522,7 +527,7 @@ VirtualCollection.prototype._fetch = function(cb) {
 // TODO: less duplication, if possible.
 
 function embeddedProxy(client, name, data) {
-  if (h.isArray(data)) {
+  if (isArray(data)) {
     var target = new Collection(name, client, data)
   } else {
     var target = new Entity(name, client, data)
@@ -543,7 +548,7 @@ function detectProxy(client, data, defaultName) {
 }
 
 function linkedProxy(client, name, link, singular) {
-  if (link.type || h.containsVerb(name) || (link.method && link.method.toLowerCase() != 'get'))
+  if (link.type || containsVerb(name) || (link.method && link.method.toLowerCase() != 'get'))
     return new LinkedAction(name, client, link)
 
   if (name[name.length-1] != 's') // singular, not a collection
@@ -610,13 +615,19 @@ let proxyHandler = {
 ////////////////////////////////////////////////////////////////
 // the root exports
 
-exports.root = function(client, data) {
+function root(client, data) {
   if (data && (data._links || {})['btc:all_shops'] && (data._embedded || {})['shops'])
     delete data._embedded['shops'] // so root.shops returns 'all_shops' link
 
   var target  = new Entity('root', client, data)
   return new Proxy(target, proxyHandler)
 }
 
-exports.embeddedProxy = embeddedProxy;
-exports.linkedProxy = linkedProxy;
+export {
+  root,
+  embeddedProxy,
+  linkedProxy
+}
+
+// exports.embeddedProxy = embeddedProxy;
+// exports.linkedProxy = linkedProxy;

lib/explain.js

@@ -1,5 +1,7 @@
-const colour = require('colour')
-const containsVerb = require('./helpers').containsVerb
+// const colour = require('colour')
+import colour from 'colour';
+import { containsVerb } from './helpers';
+
 const LINK_PREFIX = 'btc:'
 
 function explain(el) {
@@ -46,4 +48,6 @@ function explain(el) {
   }
 }
 
-module.exports = explain
+export default explain;
+
+// module.exports = explain

lib/fetch-polyfill.js

@@ -0,0 +1,20 @@
+// fetch-polyfill.js
+import fetch, {
+  Blob,
+  blobFrom,
+  blobFromSync,
+  File,
+  fileFrom,
+  fileFromSync,
+  FormData,
+  Headers,
+  Request,
+  Response,
+} from 'node-fetch'
+
+if (!globalThis.fetch) {
+  globalThis.fetch = fetch
+  globalThis.Headers = Headers
+  globalThis.Request = Request
+  globalThis.Response = Response
+}

lib/helpers.js

@@ -1,23 +1,27 @@
-var helpers = {};
-
-helpers.isObject = function(obj) {
+function isObject(obj) {
   return obj && obj.constructor.name == 'Object'
 }
 
-helpers.isArray = function(obj) {
+function isArray(obj) {
   return obj && obj.constructor.name == 'Array'
 }
 
-helpers.isNumber = function(num) {
+function isNumber(num) {
   return typeof num == 'number'
 }
 
-helpers.isFunction = function(fn) {
+function isFunction(fn) {
   return typeof fn == 'function'
 }
 
-helpers.containsVerb = function(word) {
+function containsVerb(word) {
   return !!word.replace('btc:', '').match(/^(get|update|create|remove|destroy)_/)
 }
 
-module.exports = helpers;
+export {
+  isObject,
+  isArray,
+  isNumber,
+  isFunction,
+  containsVerb,
+}

lib/request.js

@@ -1,10 +1,12 @@
-var debug       = require('debug')('bootic');
-var uriTemplate = require('uri-templates');
+// var debug       = require('debug')('bootic');
+// var uriTemplate = require('uri-templates');
 
-if (typeof fetch == 'undefined') {
-  var fetch = require('node-fetch-polyfill');
-  require('http').globalAgent.keepAlive = true;
-}
+const debug = function(str) { }
+import uriTemplate from 'uri-templates';
+
+// import { fetch } from 'node-fetch-polyfill';
+// import fetch from 'node-fetch';
+// import './fetch-polyfill'
 
 function sendRequest(method, url, params, headers) {
   var template, params = params || {}, options = {
@@ -90,5 +92,10 @@ function streamData(url, headers, cb, done) {
   });
 }
 
-exports.send = sendRequest;
-exports.stream = streamData;
+// exports.send = sendRequest;
+// exports.stream = streamData;
+
+export {
+  sendRequest,
+  streamData
+}

lib/strategies/authorized.js

@@ -1,6 +1,8 @@
-var ClientOAuth2 = require('client-oauth2')
+// var ClientOAuth2 = require('client-oauth2')
+// import ClientOAuth2 from 'client-oauth2';
+import ClientOAuth2 from './oauth2';
 
-function AuthorizedStrategy(opts) {
+export default function AuthorizedStrategy(opts) {
   if (!opts.clientId || !opts.clientSecret || (!opts.token && !opts.accessToken))
     throw new Error('token, clientId and clientSecret required!')
 
@@ -23,5 +25,3 @@ function AuthorizedStrategy(opts) {
 
   return { getToken: getToken, canRefresh: true }
 }
-
-module.exports = AuthorizedStrategy

lib/strategies/bearer.js

@@ -1,4 +1,4 @@
-function BearerStrategy(opts) {
+export default function BearerStrategy(opts) {
   if (!opts.accessToken && !opts.token)
     throw new Error('accessToken required!')
 
@@ -13,4 +13,3 @@ function BearerStrategy(opts) {
   return { getToken: getToken, canRefresh: false }
 }
 
-module.exports = BearerStrategy

lib/strategies/credentials.js

@@ -1,6 +1,8 @@
-var ClientOAuth2 = require('client-oauth2')
+// var ClientOAuth2 = require('client-oauth2')
+// import ClientOAuth2 from 'client-oauth2';
+import ClientOAuth2 from './oauth2';
 
-function CredentialsStrategy(opts) {
+export default function CredentialsStrategy(opts) {
   if (!opts.clientId || !opts.clientSecret)
     throw new Error('clientId and clientSecret required!')
 
@@ -21,4 +23,3 @@ function CredentialsStrategy(opts) {
   return { getToken: getToken, canRefresh: true }
 }
 
-module.exports = CredentialsStrategy

lib/strategies/index.js

@@ -1,3 +1,10 @@
-exports.authorized  = require('./authorized')
-exports.bearer      = require('./bearer')
-exports.credentials = require('./credentials')
+import authorized from './authorized';
+import bearer from './bearer';
+import credentials from './credentials';
+
+export const Strategies = {
+  authorized,
+  bearer,
+  credentials
+}
+