@graffy/fill 0.15.6 → 0.15.8-alpha.3

package/index.cjs

@@ -0,0 +1 @@
+"use strict";var r=require("@graffy/common"),n=require("@graffy/stream"),t=require("debug"),e=require("@graffy/testing");function a(r){return r&&"object"==typeof r&&"default"in r?r:{default:r}}var o=a(t);const i=o.default("graffy:fill:subscribe");function f(t,a,{raw:o}){const f=()=>r.finalize([],a,0);let l,u,c,s=[],m=f(),g=[];const w=n.makeStream(((r,n)=>(l=n=>{i("Push",e.format(n)),r(n)},u=n,p)));return d(a),w;async function d(n){try{const a=r.add(s,n);if(i(a?"Resubscribing":"Not resubscribing",e.format(n)),!a)return;c&&c.return(),c=t.call("watch",s,{skipFill:!0});let{value:o}=await c.next();i("First payload",typeof o,e.format(o)),void 0===o&&(o=await t.call("read",n,{skipCache:!0}),i("Read initial value",e.format(o))),k(o,!1)}catch(a){i("resubscribe error",a),y(a)}!async function(r){i("Start putting stream");try{for await(const n of r)k(n,!0)}catch(a){y(a)}}(c)}function k(n,t){if(void 0===n)return;if(i("Put",t?"Change":"Value",typeof n),null===n)return m=f(),void l(null);let u;t?u=r.sieve(m,n):(u=r.slice(n,s).known,u&&r.merge(m,u)),i("Sieved: ",u&&e.format(u)),o&&u&&r.merge(g,u);let{known:c,unknown:w}=r.slice(m,a);if(m=c||f(),i("Data and unknown",e.format(m),w&&e.format(w)),i("Payload and value",e.format(g),n&&e.format(n)),t&&n&&w){const t=r.slice(n,w);t.known&&(r.merge(m,t.known),o&&r.merge(g,t.known),w=t.unknown)}if(w)return d(w);o?g.length&&(l(g),g=[]):(!t||u&&u.length)&&l(m)}function y(r){u&&u(r),p()}function p(){c&&c.return()}}const l=o.default("graffy:fill");module.exports=function(n){return n=>{n.on("read",[],(async function(t,a,o){let i=await o(t);if(a.skipFill)return i;if(!i||!i.length)throw l("No progress",e.format(t)),Error("fill.no_progress");let f=10;for(;f-- >1;){const{known:e,unknown:a}=r.slice(i,t);if(i=e,!a)break;const o=await n.call("read",a,{skipFill:!0});r.merge(i,o)}if(!f)throw l("fill.max_recursion",e.format(i),e.format(t)),new Error("fill.max_recursion");return i})),n.on("watch",[],(function(r,t,e){return t.skipFill?e(r):f(n,r,t)}))}};

package/index.d.ts

@@ -0,0 +1,8 @@
+declare module "subscribe" {
+    export default function subscribe(store: any, originalQuery: any, { raw }: {
+        raw: any;
+    }): any;
+}
+declare module "index" {
+    export default function fill(_: any): (store: any) => void;
+}

package/index.mjs

@@ -0,0 +1 @@
+import{finalize as n,add as r,sieve as t,slice as o,merge as i}from"@graffy/common";import{makeStream as a}from"@graffy/stream";import e from"debug";import{format as l}from"@graffy/testing";const f=e("graffy:fill:subscribe");function u(e,u,{raw:c}){const s=()=>n([],u,0);let w,g,k,p=[],d=s(),m=[];const y=a(((n,r)=>(w=r=>{f("Push",l(r)),n(r)},g=r,F)));return h(u),y;async function h(n){try{const t=r(p,n);if(f(t?"Resubscribing":"Not resubscribing",l(n)),!t)return;k&&k.return(),k=e.call("watch",p,{skipFill:!0});let{value:o}=await k.next();f("First payload",typeof o,l(o)),void 0===o&&(o=await e.call("read",n,{skipCache:!0}),f("Read initial value",l(o))),b(o,!1)}catch(t){f("resubscribe error",t),v(t)}!async function(n){f("Start putting stream");try{for await(const r of n)b(r,!0)}catch(t){v(t)}}(k)}function b(n,r){if(void 0===n)return;if(f("Put",r?"Change":"Value",typeof n),null===n)return d=s(),void w(null);let a;r?a=t(d,n):(a=o(n,p).known,a&&i(d,a)),f("Sieved: ",a&&l(a)),c&&a&&i(m,a);let{known:e,unknown:g}=o(d,u);if(d=e||s(),f("Data and unknown",l(d),g&&l(g)),f("Payload and value",l(m),n&&l(n)),r&&n&&g){const r=o(n,g);r.known&&(i(d,r.known),c&&i(m,r.known),g=r.unknown)}if(g)return h(g);c?m.length&&(w(m),m=[]):(!r||a&&a.length)&&w(d)}function v(n){g&&g(n),F()}function F(){k&&k.return()}}const c=e("graffy:fill");function s(n){return n=>{n.on("read",[],(async function(r,t,a){let e=await a(r);if(t.skipFill)return e;if(!e||!e.length)throw c("No progress",l(r)),Error("fill.no_progress");let f=10;for(;f-- >1;){const{known:t,unknown:a}=o(e,r);if(e=t,!a)break;const l=await n.call("read",a,{skipFill:!0});i(e,l)}if(!f)throw c("fill.max_recursion",l(e),l(r)),new Error("fill.max_recursion");return e})),n.on("watch",[],(function(r,t,o){return t.skipFill?o(r):u(n,r,t)}))}}export{s as default};

package/package.json

@@ -2,19 +2,23 @@
   "name": "@graffy/fill",
   "description": "Graffy module for fulfilling queries using multiple backends, traversing links and turning subscriptions into live queries.",
   "author": "aravind (https://github.com/aravindet)",
-  "version": "0.15.6",
-  "main": "./cjs/index.js",
-  "types": "./types/index.d.ts",
+  "version": "0.15.8-alpha.3",
+  "main": "./index.cjs",
+  "exports": {
+    "import": "./index.mjs",
+    "require": "./index.cjs"
+  },
+  "module": "./index.mjs",
+  "types": "./index.d.ts",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/usegraffy/graffy.git"
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.15.3",
-    "@graffy/common": "0.15.6",
-    "@graffy/stream": "0.15.6",
+    "@graffy/common": "0.15.8-alpha.3",
+    "@graffy/stream": "0.15.8-alpha.3",
     "debug": "^4.3.2",
-    "@graffy/testing": "0.15.6"
+    "@graffy/testing": "0.15.8-alpha.3"
   }
 }

package/cjs/index.js

@@ -1,123 +0,0 @@
-"use strict";
-
-var _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
-
-var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports.default = fill;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs3/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/asyncToGenerator"));
-
-var _common = require("@graffy/common");
-
-var _subscribe = _interopRequireDefault(require("./subscribe.js"));
-
-var _testing = require("@graffy/testing");
-
-var _debug = _interopRequireDefault(require("debug"));
-
-var log = (0, _debug.default)('graffy:fill');
-var MAX_RECURSIONS = 10;
-
-function fill(_) {
-  return function (store) {
-    store.on('read', [], /*#__PURE__*/function () {
-      var _fillOnRead = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(query, options, next) {
-        var value, budget, _slice, known, unknown, res;
-
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return next(query);
-
-              case 2:
-                value = _context.sent;
-
-                if (!options.skipFill) {
-                  _context.next = 5;
-                  break;
-                }
-
-                return _context.abrupt("return", value);
-
-              case 5:
-                if (!(!value || !value.length)) {
-                  _context.next = 8;
-                  break;
-                }
-
-                log('No progress', (0, _testing.format)(query));
-                throw Error('fill.no_progress');
-
-              case 8:
-                budget = MAX_RECURSIONS;
-
-              case 9:
-                if (!(budget-- > 1)) {
-                  _context.next = 20;
-                  break;
-                }
-
-                // console.log('filled value', value);
-                _slice = (0, _sliceInstanceProperty(_common))(value, query), known = _slice.known, unknown = _slice.unknown;
-                value = known;
-
-                if (unknown) {
-                  _context.next = 14;
-                  break;
-                }
-
-                return _context.abrupt("break", 20);
-
-              case 14:
-                _context.next = 16;
-                return store.call('read', unknown, {
-                  skipFill: true
-                });
-
-              case 16:
-                res = _context.sent;
-                // console.log('fetched', res);
-                (0, _common.merge)(value, res);
-                _context.next = 9;
-                break;
-
-              case 20:
-                if (budget) {
-                  _context.next = 23;
-                  break;
-                }
-
-                log('fill.max_recursion', (0, _testing.format)(value), (0, _testing.format)(query));
-                throw new Error('fill.max_recursion');
-
-              case 23:
-                return _context.abrupt("return", value);
-
-              case 24:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-
-      function fillOnRead(_x, _x2, _x3) {
-        return _fillOnRead.apply(this, arguments);
-      }
-
-      return fillOnRead;
-    }());
-    store.on('watch', [], function fillOnWatch(query, options, next) {
-      if (options.skipFill) return next(query);
-      return (0, _subscribe.default)(store, query, options);
-    });
-  };
-}
-
-module.exports = exports.default;

package/cjs/subscribe.js

@@ -1,296 +0,0 @@
-"use strict";
-
-var _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
-
-var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports.default = subscribe;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs3/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/asyncToGenerator"));
-
-var _asyncIterator2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/asyncIterator"));
-
-var _common = require("@graffy/common");
-
-var _stream = require("@graffy/stream");
-
-var _debug = _interopRequireDefault(require("debug"));
-
-var _testing = require("@graffy/testing");
-
-var log = (0, _debug.default)('graffy:fill:subscribe');
-
-function subscribe(store, originalQuery, _ref) {
-  var raw = _ref.raw;
-
-  var empty = function empty() {
-    return (0, _common.finalize)([], originalQuery, 0);
-  };
-
-  var push, end;
-  var upstream;
-  var query = [];
-  var data = empty();
-  var payload = [];
-  var stream = (0, _stream.makeStream)(function (streamPush, streamEnd) {
-    push = function push(v) {
-      log('Push', (0, _testing.format)(v));
-      streamPush(v);
-    };
-
-    end = streamEnd;
-    return unsubscribe;
-  });
-  resubscribe(originalQuery);
-  return stream;
-
-  function resubscribe(_x) {
-    return _resubscribe.apply(this, arguments);
-  }
-
-  function _resubscribe() {
-    _resubscribe = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(unknown) {
-      var changed, _yield$upstream$next, value;
-
-      return _regenerator.default.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.prev = 0;
-              changed = (0, _common.add)(query, unknown);
-              log(changed ? 'Resubscribing' : 'Not resubscribing', (0, _testing.format)(unknown));
-
-              if (changed) {
-                _context.next = 5;
-                break;
-              }
-
-              return _context.abrupt("return");
-
-            case 5:
-              if (upstream) upstream.return(); // Close the existing stream.
-
-              upstream = store.call('watch', query, {
-                skipFill: true
-              });
-              _context.next = 9;
-              return upstream.next();
-
-            case 9:
-              _yield$upstream$next = _context.sent;
-              value = _yield$upstream$next.value;
-              log('First payload', typeof value, (0, _testing.format)(value));
-
-              if (!(typeof value === 'undefined')) {
-                _context.next = 17;
-                break;
-              }
-
-              _context.next = 15;
-              return store.call('read', unknown, {
-                skipCache: true
-              });
-
-            case 15:
-              value = _context.sent;
-              log('Read initial value', (0, _testing.format)(value));
-
-            case 17:
-              // value = value && slice(value, unknown).known;
-              putValue(value, false);
-              _context.next = 24;
-              break;
-
-            case 20:
-              _context.prev = 20;
-              _context.t0 = _context["catch"](0);
-              log('resubscribe error', _context.t0);
-              error(_context.t0);
-
-            case 24:
-              putStream(upstream);
-
-            case 25:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee, null, [[0, 20]]);
-    }));
-    return _resubscribe.apply(this, arguments);
-  }
-
-  function putStream(_x2) {
-    return _putStream.apply(this, arguments);
-  }
-
-  function _putStream() {
-    _putStream = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(stream) {
-      var _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, value;
-
-      return _regenerator.default.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              // TODO: Backpressure: pause pulling if downstream listener is saturated.
-              log('Start putting stream');
-              _context2.prev = 1;
-              _iteratorAbruptCompletion = false;
-              _didIteratorError = false;
-              _context2.prev = 4;
-              _iterator = (0, _asyncIterator2.default)(stream);
-
-            case 6:
-              _context2.next = 8;
-              return _iterator.next();
-
-            case 8:
-              if (!(_iteratorAbruptCompletion = !(_step = _context2.sent).done)) {
-                _context2.next = 14;
-                break;
-              }
-
-              value = _step.value;
-              putValue(value, true);
-
-            case 11:
-              _iteratorAbruptCompletion = false;
-              _context2.next = 6;
-              break;
-
-            case 14:
-              _context2.next = 20;
-              break;
-
-            case 16:
-              _context2.prev = 16;
-              _context2.t0 = _context2["catch"](4);
-              _didIteratorError = true;
-              _iteratorError = _context2.t0;
-
-            case 20:
-              _context2.prev = 20;
-              _context2.prev = 21;
-
-              if (!(_iteratorAbruptCompletion && _iterator.return != null)) {
-                _context2.next = 25;
-                break;
-              }
-
-              _context2.next = 25;
-              return _iterator.return();
-
-            case 25:
-              _context2.prev = 25;
-
-              if (!_didIteratorError) {
-                _context2.next = 28;
-                break;
-              }
-
-              throw _iteratorError;
-
-            case 28:
-              return _context2.finish(25);
-
-            case 29:
-              return _context2.finish(20);
-
-            case 30:
-              _context2.next = 35;
-              break;
-
-            case 32:
-              _context2.prev = 32;
-              _context2.t1 = _context2["catch"](1);
-              error(_context2.t1);
-
-            case 35:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2, null, [[1, 32], [4, 16, 20, 30], [21,, 25, 29]]);
-    }));
-    return _putStream.apply(this, arguments);
-  }
-
-  function putValue(value, isChange) {
-    if (typeof value === 'undefined') return;
-    log('Put', isChange ? 'Change' : 'Value', typeof value);
-
-    if (value === null) {
-      // No results exist at this moment.
-      data = empty();
-      push(null);
-      return;
-    } // We do this to ensure that everything in value gets incorporated
-    // into data, even as we use sieve to ensure only actual changes are
-    // added to payload.
-    // if (!isChange) merge(data, [{ key: '', end: '\uffff', version: -1 }]);
-    // log('Data before sieve', format(data));
-
-
-    var sieved;
-
-    if (isChange) {
-      sieved = (0, _common.sieve)(data, value);
-    } else {
-      sieved = (0, _sliceInstanceProperty(_common))(value, query).known;
-      if (sieved) (0, _common.merge)(data, sieved);
-    }
-
-    log('Sieved: ', sieved && (0, _testing.format)(sieved));
-
-    if (raw && sieved) {
-      // log('Payload before adding sieved', format(payload));
-      (0, _common.merge)(payload, sieved); // log('Payload after adding sieved', format(payload));
-    } // The new value might have removed a link, making parts of
-    // data unnecessary, or added a link, introducing
-    // new data requirements. Let's find out.
-
-
-    var _slice = (0, _sliceInstanceProperty(_common))(data, originalQuery),
-        known = _slice.known,
-        unknown = _slice.unknown;
-
-    data = known || empty();
-    log('Data and unknown', (0, _testing.format)(data), unknown && (0, _testing.format)(unknown));
-    log('Payload and value', (0, _testing.format)(payload), value && (0, _testing.format)(value));
-
-    if (isChange && value && unknown) {
-      // The sieve may have removed some necessary data (that we weren't aware
-      // was necessary). Get it back.
-      var valueParts = (0, _sliceInstanceProperty(_common))(value, unknown);
-
-      if (valueParts.known) {
-        (0, _common.merge)(data, valueParts.known);
-        if (raw) (0, _common.merge)(payload, valueParts.known);
-        unknown = valueParts.unknown;
-      }
-    }
-
-    if (unknown) return resubscribe(unknown);
-
-    if (!raw) {
-      if (!isChange || sieved && sieved.length) push(data);
-    } else if (payload.length) {
-      push(payload);
-      payload = [];
-    }
-  }
-
-  function error(e) {
-    if (end) end(e);
-    unsubscribe();
-  }
-
-  function unsubscribe() {
-    if (upstream) upstream.return();
-  }
-}
-
-module.exports = exports.default;

package/types/index.d.ts

@@ -1 +0,0 @@
-export default function fill(_: any): (store: any) => void;

package/types/subscribe.d.ts

@@ -1,3 +0,0 @@
-export default function subscribe(store: any, originalQuery: any, { raw }: {
-    raw: any;
-}): any;