@data-client/rest 0.7.0 → 0.7.2

package/dist/index.js

@@ -86,27 +86,20 @@ function paginatedMerge(existing, incoming) {
   }
   return mergedList;
 }
-const paginatedFilter = removeCursor => (...args) => {
-  var _removeCursor$;
-  const noCursorArgs = (_removeCursor$ = removeCursor(...args)[0]) != null ? _removeCursor$ : {};
-  return collectionKey => shallowEqual(collectionKey, noCursorArgs);
-};
-function shallowEqual(object1, object2) {
-  const keys1 = Object.keys(object1);
-  const keys2 = Object.keys(object2);
-  let length2 = 0;
-  for (const key of keys2) {
-    // we should ignore any members with value undefined
-    if (object2[key] === undefined) continue;
-    if (object1[key] !== `${object2[key]}`) {
-      return false;
+function createPaginationSchema(removeCursor, collection) {
+  return Object.create(collection, {
+    name: {
+      value: `Pagination(${collection.schema})`
+    },
+    merge: {
+      value: paginatedMerge
+    },
+    pk: {
+      value: function (value, parent, key, args) {
+        return collection.pk.call(this, value, parent, key, removeCursor(...args));
+      }
     }
-    length2++;
-  }
-  if (keys1.length !== length2) {
-    return false;
-  }
-  return true;
+  });
 }
 
 function getArrayPath(s) {
@@ -363,13 +356,12 @@ Response (first 300 characters): ${text.substring(0, 300)}`;
     // extend from it and init with options sent
     class E extends this.constructor {}
     Object.assign(E.prototype, this);
-    const instance = new E(
+    return new E(
     //  fetch get overridden by function prototype, so we must set it explicitly every time
     {
       fetch: this.fetch,
       ...options
     });
-    return instance;
   }
   paginated(removeCursor) {
     if (typeof removeCursor === 'string') {
@@ -384,12 +376,16 @@ Response (first 300 characters): ${text.substring(0, 300)}`;
     let found = false;
     const createPaginatedSchema = collection => {
       found = true;
-      return collection.addWith(paginatedMerge, paginatedFilter(removeCursor));
+      return createPaginationSchema(removeCursor, collection);
     };
     const newSchema = mapCollection(this.schema, createPaginatedSchema);
     if (found) {
+      const sup = this;
       return this.extend({
-        schema: newSchema
+        schema: newSchema,
+        key(...args) {
+          return sup.key.call(this, ...removeCursor(...args));
+        }
       });
     }
     return this.extend({

package/dist/index.umd.min.js

@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("@data-client/endpoint"),require("path-to-regexp")):"function"==typeof define&&define.amd?define(["exports","@data-client/endpoint","path-to-regexp"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).restHookRest={},t.endpoint,t.pathToRegexp)}(this,(function(t,e,n){"use strict";function s(t){return t&&t.__esModule&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t}function r(t,e){return t(e={exports:{}},e.exports),e.exports}var o=s(r((function(t){t.exports=function(t){if(null==t)throw new TypeError("Cannot destructure "+t)},t.exports.__esModule=!0,t.exports.default=t.exports}))),i=s(r((function(t){t.exports=function(t,e){if(!Object.prototype.hasOwnProperty.call(t,e))throw new TypeError("attempted to use private field on non-instance");return t},t.exports.__esModule=!0,t.exports.default=t.exports}))),c=s(r((function(t){var e=0;t.exports=function(t){return"__private_"+e+++"_"+t},t.exports.__esModule=!0,t.exports.default=t.exports})));function a(t,n){if("object"!=typeof t||void 0===t||Array.isArray(t))return;if(t instanceof e.schema.Collection)return n(t);const s=Object.assign({},t instanceof e.schema.Object?t.schema:t);for(const t in s){if(!s[t])continue;const e=a(s[t],n);if(e)return e}}function h(t,n){if("object"!=typeof t||void 0===t)return t;if(t instanceof e.schema.Collection)return n(t);const s=Object.assign({},t instanceof e.schema.Object?t.schema:t);for(const t in s)s[t]&&(s[t]=h(s[t],n));return s}class u extends Error{constructor(t){super(t.statusText||`Network response not 'ok': ${t.status}`),this.name="NetworkError",this.status=t.status,this.response=t}}function f(t,e){const n=new Set(t),s=[...t];for(const t of e)n.has(t)||s.push(t);return s}const p=t=>(...e)=>{var n;const s=null!=(n=t(...e)[0])?n:{};return t=>function(t,e){const n=Object.keys(t),s=Object.keys(e);let r=0;for(const n of s)if(void 0!==e[n]){if(t[n]!==`${e[n]}`)return!1;r++}if(n.length!==r)return!1;return!0}(t,s)};function d(t){if("object"!=typeof t)return!1;if(void 0===t||t instanceof e.schema.Array||Array.isArray(t))return[];const n=t instanceof e.schema.Object?t.schema:t;for(const t in n){if(!n[t])continue;const e=d(n[t]);if(!1!==e)return e.unshift(t),e}return!1}function l(t,e){const n=d(t.schema);if(!1===n)throw new Error("schema has no array");return(s,...r)=>({[t.key(...e(...r))]:t=>{const e=g(t,n),r=new Set(e),o=g(s,n).filter((t=>!r.has(t))),i=[...e,...o];return m(s,n,i)}})}const g=(t,e)=>{let n=t;for(const t of e){if(!n)return[];n=n[t]}return n||[]},m=(t,e,n)=>{if(0===e.length)return n;const s=Object.assign({},t);let r=s;for(let t=0;t<e.length-1;t++){const n=e[t];r=r[n]=Object.assign({},r[n])}return r[e[e.length-1]]=n,s};const O=Object.create(null);const b=Object.create(null);const y=Object.prototype,x=Object.getPrototypeOf;var j=c("hasBody");class w extends e.Endpoint{constructor(t){var e;super(null!=(e=t.fetch)?e:async function(...t){const e=i(this,j)[j]&&t.length<2?{}:t[0]||{},n=i(this,j)[j]?t[t.length-1]:void 0;return this.fetchResponse(this.url(e),await this.getRequestInit(n)).then((t=>this.parseResponse(t))).then((e=>this.process(e,...t)))},t),Object.defineProperty(this,j,{writable:!0,value:void 0}),(!("sideEffect"in this)||"method"in t&&!("sideEffect"in t))&&(this.sideEffect="GET"!==t.method&&void 0!==t.method||void 0),void 0===this.method&&(this.method=this.sideEffect?"POST":"GET"),void 0===this.urlPrefix&&(this.urlPrefix=""),i(this,j)[j]=!("body"in this&&void 0===this.body||["GET","DELETE"].includes(this.method)),Object.defineProperty(this,"name",{get(){return"__name"in this?this.__name:this.urlPrefix+this.path}})}key(...t){return`${this.method} ${this.url(i(this,j)[j]&&t.length<2?{}:t[0]||{})}`}url(t={}){const e=((s=this.path)in O||(O[s]=n.compile(s,{encode:encodeURIComponent,validate:!1})),O[s])(t);var s;const r=function(t){return t in b||(b[t]=new Set(n.parse(t).map((t=>"string"==typeof t?t:`${t.name}`)))),b[t]}(this.path),o={};return Object.keys(t).forEach((e=>{r.has(e)||(o[e]=t[e])})),Object.keys(o).length?`${this.urlPrefix}${e}?${function(t){const e=new URLSearchParams(t);return e.sort(),e.toString()}(o)}`:`${this.urlPrefix}${e}`}getHeaders(t){return t}async getRequestInit(t){const e=null!==(n=t)&&"object"==typeof n&&x(n)===y;var n;e&&(t=JSON.stringify(t));const s=Object.assign({},this.requestInit,{method:this.method,signal:this.signal,body:t});return t&&!e||(s.headers=Object.assign({"Content-Type":"application/json"},s.headers)),s.headers=await this.getHeaders(s.headers),s}fetchResponse(t,e){return fetch(t,e).then((t=>{if(!t.ok)throw new u(t);return t})).catch((t=>{throw t instanceof TypeError&&(t.status=500),t}))}parseResponse(t){var e;return 204===t.status?Promise.resolve(null):null!=(e=t.headers.get("content-type"))&&e.includes("json")?t.json().catch((t=>{throw t.status=400,t})):t.text().then((e=>{if(["string","undefined"].includes(typeof this.schema)||null===this.schema||this.process!==w.prototype.process)return e;const n=new u(t);throw n.status=404,n.message=`Unexpected text response for schema ${this.schema}`,n}))}process(t){return t}errorPolicy(t){return t.status>=500?"soft":void 0}get pathRegex(){return n.pathToRegexp(this.path)}testKey(t){const e=this.method+" "+this.urlPrefix;if(!t.startsWith(e))return!1;let n=t.lastIndexOf("?");return-1===n&&(n=void 0),this.pathRegex.test(t.substring(e.length,n))}extend(t){class e extends this.constructor{}Object.assign(e.prototype,this);return new e(Object.assign({fetch:this.fetch},t))}paginated(t){if("string"==typeof t){const e=t;t=t=>{let n=Object.assign({},(o(t),t));return delete n[e],[n]}}let e=!1;const n=h(this.schema,(n=>(e=!0,n.addWith(f,p(t)))));return e?this.extend({schema:n}):this.extend({update:l(this,t)})}get getPage(){return this.paginated(this.paginationField)}get push(){return this.extend({method:"POST",schema:a(this.schema,(t=>t.push))})}get unshift(){return this.extend({method:"POST",schema:a(this.schema,(t=>t.unshift))})}get assign(){return this.extend({method:"POST",schema:a(this.schema,(t=>t.assign))})}}var v=s(r((function(t){t.exports=function(t,e){if(null==t)return{};var n,s,r={},o=Object.keys(t);for(s=0;s<o.length;s++)n=o[s],e.indexOf(n)>=0||(r[n]=t[n]);return r},t.exports.__esModule=!0,t.exports.default=t.exports})));const E=["path","schema","Endpoint","optimistic","paginationField"],{Invalidate:P,Collection:R}=e.schema;function T(t,e,n){return Object.assign({},e,k(n))}function _(t,e){return e}function k(t){return t instanceof FormData?Object.fromEntries(t.entries()):t}Object.hasOwn=Object.hasOwn||function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},t.NetworkError=u,t.RestEndpoint=w,t.createResource=function(t){let{path:n,schema:s,Endpoint:r=w,optimistic:o,paginationField:i}=t,c=v(t,E);const a=function(t){const e=t.lastIndexOf(":");if(-1===e)throw new Error("Resource path requires at least one :parameter");let n=t.substring(0,e);return"/"===n[n.length-1]&&(n=n.substring(0,n.length-1)),n}(n),h=t=>`${null==s?void 0:s.name}.${t}`;function u(t,e,n){t[e]=t[e].extend(n)}const f=Object.assign({},c),p=Object.assign({},c),d=new r(Object.assign({},c,{path:n,schema:s,name:h("get")}));var l;o&&(f.getOptimisticResponse=T,p.getOptimisticResponse=(l=d,function(t,n,s){const{data:r}=t.getResponse(l,n);if(!r)throw new e.AbortOptimistic;return Object.assign({},n,r,k(s))}));const g=new r(Object.assign({},f,{paginationField:i,path:a,schema:new R([s]),name:h("getList")}));return{get:d,getList:g,create:g.push.extend({name:h("create")}),update:new r(Object.assign({},f,{path:n,schema:s,method:"PUT",name:h("update")})),partialUpdate:new r(Object.assign({},p,{path:n,schema:s,method:"PATCH",name:h("partialUpdate")})),delete:new r(Object.assign({},f,{path:n,schema:s.process?new P(s):s,method:"DELETE",name:h("delete"),process:(t,e)=>t&&Object.keys(t).length?t:e,getOptimisticResponse:o?_:void 0})),extend(...t){if("string"==typeof t[0]){const[e,n]=t;if(e in this){const t=Object.assign({},this);return u(t,e,n),t}return Object.assign({},this,{[e]:this.get.extend(n)})}if("function"==typeof t[0]){const e=t[0](this);return Object.assign({},this,e)}const e=t[0],n=Object.assign({},this);for(const t in e)u(n,t,e[t]);return n}}},t.hookifyResource=function(t,e){const n={};return Object.keys(t).forEach((s=>{const r=t[s];var o;void 0!==r.extend&&(n[`use${o=s,o.charAt(0).toUpperCase()+o.slice(1)}`]=()=>{const t=e();return r.extend({requestInit:t})})})),n},t.paginationUpdate=l,Object.keys(e).forEach((function(n){"default"===n||t.hasOwnProperty(n)||Object.defineProperty(t,n,{enumerable:!0,get:function(){return e[n]}})})),Object.defineProperty(t,"__esModule",{value:!0})}));
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("@data-client/endpoint"),require("path-to-regexp")):"function"==typeof define&&define.amd?define(["exports","@data-client/endpoint","path-to-regexp"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).restHookRest={},t.endpoint,t.pathToRegexp)}(this,(function(t,e,n){"use strict";function s(t){return t&&t.__esModule&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t}function r(t,e){return t(e={exports:{}},e.exports),e.exports}var i=s(r((function(t){t.exports=function(t){if(null==t)throw new TypeError("Cannot destructure "+t)},t.exports.__esModule=!0,t.exports.default=t.exports}))),o=s(r((function(t){t.exports=function(t,e){if(!Object.prototype.hasOwnProperty.call(t,e))throw new TypeError("attempted to use private field on non-instance");return t},t.exports.__esModule=!0,t.exports.default=t.exports}))),a=s(r((function(t){var e=0;t.exports=function(t){return"__private_"+e+++"_"+t},t.exports.__esModule=!0,t.exports.default=t.exports})));function c(t,n){if("object"!=typeof t||void 0===t||Array.isArray(t))return;if(t instanceof e.schema.Collection)return n(t);const s=Object.assign({},t instanceof e.schema.Object?t.schema:t);for(const t in s){if(!s[t])continue;const e=c(s[t],n);if(e)return e}}function h(t,n){if("object"!=typeof t||void 0===t)return t;if(t instanceof e.schema.Collection)return n(t);const s=Object.assign({},t instanceof e.schema.Object?t.schema:t);for(const t in s)s[t]&&(s[t]=h(s[t],n));return s}class u extends Error{constructor(t){super(t.statusText||`Network response not 'ok': ${t.status}`),this.name="NetworkError",this.status=t.status,this.response=t}}function p(t,e){const n=new Set(t),s=[...t];for(const t of e)n.has(t)||s.push(t);return s}function f(t){if("object"!=typeof t)return!1;if(void 0===t||t instanceof e.schema.Array||Array.isArray(t))return[];const n=t instanceof e.schema.Object?t.schema:t;for(const t in n){if(!n[t])continue;const e=f(n[t]);if(!1!==e)return e.unshift(t),e}return!1}function d(t,e){const n=f(t.schema);if(!1===n)throw new Error("schema has no array");return(s,...r)=>({[t.key(...e(...r))]:t=>{const e=l(t,n),r=new Set(e),i=l(s,n).filter((t=>!r.has(t))),o=[...e,...i];return g(s,n,o)}})}const l=(t,e)=>{let n=t;for(const t of e){if(!n)return[];n=n[t]}return n||[]},g=(t,e,n)=>{if(0===e.length)return n;const s=Object.assign({},t);let r=s;for(let t=0;t<e.length-1;t++){const n=e[t];r=r[n]=Object.assign({},r[n])}return r[e[e.length-1]]=n,s};const m=Object.create(null);const O=Object.create(null);const b=Object.prototype,y=Object.getPrototypeOf;var x=a("hasBody");class j extends e.Endpoint{constructor(t){var e;super(null!=(e=t.fetch)?e:async function(...t){const e=o(this,x)[x]&&t.length<2?{}:t[0]||{},n=o(this,x)[x]?t[t.length-1]:void 0;return this.fetchResponse(this.url(e),await this.getRequestInit(n)).then((t=>this.parseResponse(t))).then((e=>this.process(e,...t)))},t),Object.defineProperty(this,x,{writable:!0,value:void 0}),(!("sideEffect"in this)||"method"in t&&!("sideEffect"in t))&&(this.sideEffect="GET"!==t.method&&void 0!==t.method||void 0),void 0===this.method&&(this.method=this.sideEffect?"POST":"GET"),void 0===this.urlPrefix&&(this.urlPrefix=""),o(this,x)[x]=!("body"in this&&void 0===this.body||["GET","DELETE"].includes(this.method)),Object.defineProperty(this,"name",{get(){return"__name"in this?this.__name:this.urlPrefix+this.path}})}key(...t){return`${this.method} ${this.url(o(this,x)[x]&&t.length<2?{}:t[0]||{})}`}url(t={}){const e=((s=this.path)in m||(m[s]=n.compile(s,{encode:encodeURIComponent,validate:!1})),m[s])(t);var s;const r=function(t){return t in O||(O[t]=new Set(n.parse(t).map((t=>"string"==typeof t?t:`${t.name}`)))),O[t]}(this.path),i={};return Object.keys(t).forEach((e=>{r.has(e)||(i[e]=t[e])})),Object.keys(i).length?`${this.urlPrefix}${e}?${function(t){const e=new URLSearchParams(t);return e.sort(),e.toString()}(i)}`:`${this.urlPrefix}${e}`}getHeaders(t){return t}async getRequestInit(t){const e=null!==(n=t)&&"object"==typeof n&&y(n)===b;var n;e&&(t=JSON.stringify(t));const s=Object.assign({},this.requestInit,{method:this.method,signal:this.signal,body:t});return t&&!e||(s.headers=Object.assign({"Content-Type":"application/json"},s.headers)),s.headers=await this.getHeaders(s.headers),s}fetchResponse(t,e){return fetch(t,e).then((t=>{if(!t.ok)throw new u(t);return t})).catch((t=>{throw t instanceof TypeError&&(t.status=500),t}))}parseResponse(t){var e;return 204===t.status?Promise.resolve(null):null!=(e=t.headers.get("content-type"))&&e.includes("json")?t.json().catch((t=>{throw t.status=400,t})):t.text().then((e=>{if(["string","undefined"].includes(typeof this.schema)||null===this.schema||this.process!==j.prototype.process)return e;const n=new u(t);throw n.status=404,n.message=`Unexpected text response for schema ${this.schema}`,n}))}process(t){return t}errorPolicy(t){return t.status>=500?"soft":void 0}get pathRegex(){return n.pathToRegexp(this.path)}testKey(t){const e=this.method+" "+this.urlPrefix;if(!t.startsWith(e))return!1;let n=t.lastIndexOf("?");return-1===n&&(n=void 0),this.pathRegex.test(t.substring(e.length,n))}extend(t){class e extends this.constructor{}return Object.assign(e.prototype,this),new e(Object.assign({fetch:this.fetch},t))}paginated(t){if("string"==typeof t){const e=t;t=t=>{let n=Object.assign({},(i(t),t));return delete n[e],[n]}}let e=!1;const n=h(this.schema,(n=>(e=!0,function(t,e){return Object.create(e,{name:{value:`Pagination(${e.schema})`},merge:{value:p},pk:{value:function(n,s,r,i){return e.pk.call(this,n,s,r,t(...i))}}})}(t,n))));if(e){const e=this;return this.extend({schema:n,key(...n){return e.key.call(this,...t(...n))}})}return this.extend({update:d(this,t)})}get getPage(){return this.paginated(this.paginationField)}get push(){return this.extend({method:"POST",schema:c(this.schema,(t=>t.push))})}get unshift(){return this.extend({method:"POST",schema:c(this.schema,(t=>t.unshift))})}get assign(){return this.extend({method:"POST",schema:c(this.schema,(t=>t.assign))})}}var w=s(r((function(t){t.exports=function(t,e){if(null==t)return{};var n,s,r={},i=Object.keys(t);for(s=0;s<i.length;s++)n=i[s],e.indexOf(n)>=0||(r[n]=t[n]);return r},t.exports.__esModule=!0,t.exports.default=t.exports})));const v=["path","schema","Endpoint","optimistic","paginationField"],{Invalidate:E,Collection:P}=e.schema;function R(t,e,n){return Object.assign({},e,_(n))}function T(t,e){return e}function _(t){return t instanceof FormData?Object.fromEntries(t.entries()):t}Object.hasOwn=Object.hasOwn||function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},t.NetworkError=u,t.RestEndpoint=j,t.createResource=function(t){let{path:n,schema:s,Endpoint:r=j,optimistic:i,paginationField:o}=t,a=w(t,v);const c=function(t){const e=t.lastIndexOf(":");if(-1===e)throw new Error("Resource path requires at least one :parameter");let n=t.substring(0,e);return"/"===n[n.length-1]&&(n=n.substring(0,n.length-1)),n}(n),h=t=>`${null==s?void 0:s.name}.${t}`;function u(t,e,n){t[e]=t[e].extend(n)}const p=Object.assign({},a),f=Object.assign({},a),d=new r(Object.assign({},a,{path:n,schema:s,name:h("get")}));var l;i&&(p.getOptimisticResponse=R,f.getOptimisticResponse=(l=d,function(t,n,s){const{data:r}=t.getResponse(l,n);if(!r)throw new e.AbortOptimistic;return Object.assign({},n,r,_(s))}));const g=new r(Object.assign({},p,{paginationField:o,path:c,schema:new P([s]),name:h("getList")}));return{get:d,getList:g,create:g.push.extend({name:h("create")}),update:new r(Object.assign({},p,{path:n,schema:s,method:"PUT",name:h("update")})),partialUpdate:new r(Object.assign({},f,{path:n,schema:s,method:"PATCH",name:h("partialUpdate")})),delete:new r(Object.assign({},p,{path:n,schema:s.process?new E(s):s,method:"DELETE",name:h("delete"),process:(t,e)=>t&&Object.keys(t).length?t:e,getOptimisticResponse:i?T:void 0})),extend(...t){if("string"==typeof t[0]){const[e,n]=t;if(e in this){const t=Object.assign({},this);return u(t,e,n),t}return Object.assign({},this,{[e]:this.get.extend(n)})}if("function"==typeof t[0]){const e=t[0](this);return Object.assign({},this,e)}const e=t[0],n=Object.assign({},this);for(const t in e)u(n,t,e[t]);return n}}},t.hookifyResource=function(t,e){const n={};return Object.keys(t).forEach((s=>{const r=t[s];var i;void 0!==r.extend&&(n[`use${i=s,i.charAt(0).toUpperCase()+i.slice(1)}`]=()=>{const t=e();return r.extend({requestInit:t})})})),n},t.paginationUpdate=d,Object.keys(e).forEach((function(n){"default"===n||t.hasOwnProperty(n)||Object.defineProperty(t,n,{enumerable:!0,get:function(){return e[n]}})})),Object.defineProperty(t,"__esModule",{value:!0})}));

package/dist/next.js

@@ -86,27 +86,20 @@ function paginatedMerge(existing, incoming) {
   }
   return mergedList;
 }
-const paginatedFilter = removeCursor => (...args) => {
-  var _removeCursor$;
-  const noCursorArgs = (_removeCursor$ = removeCursor(...args)[0]) != null ? _removeCursor$ : {};
-  return collectionKey => shallowEqual(collectionKey, noCursorArgs);
-};
-function shallowEqual(object1, object2) {
-  const keys1 = Object.keys(object1);
-  const keys2 = Object.keys(object2);
-  let length2 = 0;
-  for (const key of keys2) {
-    // we should ignore any members with value undefined
-    if (object2[key] === undefined) continue;
-    if (object1[key] !== `${object2[key]}`) {
-      return false;
+function createPaginationSchema(removeCursor, collection) {
+  return Object.create(collection, {
+    name: {
+      value: `Pagination(${collection.schema})`
+    },
+    merge: {
+      value: paginatedMerge
+    },
+    pk: {
+      value: function (value, parent, key, args) {
+        return collection.pk.call(this, value, parent, key, removeCursor(...args));
+      }
     }
-    length2++;
-  }
-  if (keys1.length !== length2) {
-    return false;
-  }
-  return true;
+  });
 }
 
 function getArrayPath(s) {
@@ -363,13 +356,12 @@ Response (first 300 characters): ${text.substring(0, 300)}`;
     // extend from it and init with options sent
     class E extends this.constructor {}
     Object.assign(E.prototype, this);
-    const instance = new E(
+    return new E(
     //  fetch get overridden by function prototype, so we must set it explicitly every time
     {
       fetch: this.fetch,
       ...options
     });
-    return instance;
   }
   paginated(removeCursor) {
     if (typeof removeCursor === 'string') {
@@ -384,12 +376,16 @@ Response (first 300 characters): ${text.substring(0, 300)}`;
     let found = false;
     const createPaginatedSchema = collection => {
       found = true;
-      return collection.addWith(paginatedMerge, paginatedFilter(removeCursor));
+      return createPaginationSchema(removeCursor, collection);
     };
     const newSchema = mapCollection(this.schema, createPaginatedSchema);
     if (found) {
+      const sup = this;
       return this.extend({
-        schema: newSchema
+        schema: newSchema,
+        key(...args) {
+          return sup.key.call(this, ...removeCursor(...args));
+        }
       });
     }
     return this.extend({

package/legacy/RestEndpoint.js

@@ -6,7 +6,7 @@ import { pathToRegexp } from 'path-to-regexp';
 import extractCollection from './extractCollection.js';
 import mapCollection from './mapCollection.js';
 import NetworkError from './NetworkError.js';
-import { paginatedMerge, paginatedFilter } from './paginatedCollections.js';
+import { createPaginationSchema } from './paginatedCollections.js';
 import paginationUpdate from './paginationUpdate.js';
 import paramsToString from './paramsToString.js';
 import { getUrlBase, getUrlTokens, isPojo } from './RestHelpers.js';
@@ -166,11 +166,10 @@ Response (first 300 characters): ${text.substring(0, 300)}`;
     // extend from it and init with options sent
     class E extends this.constructor {}
     Object.assign(E.prototype, this);
-    const instance = new E( //  fetch get overridden by function prototype, so we must set it explicitly every time
+    return new E( //  fetch get overridden by function prototype, so we must set it explicitly every time
     Object.assign({
       fetch: this.fetch
     }, options));
-    return instance;
   }
   paginated(removeCursor) {
     if (typeof removeCursor === 'string') {
@@ -184,12 +183,16 @@ Response (first 300 characters): ${text.substring(0, 300)}`;
     let found = false;
     const createPaginatedSchema = collection => {
       found = true;
-      return collection.addWith(paginatedMerge, paginatedFilter(removeCursor));
+      return createPaginationSchema(removeCursor, collection);
     };
     const newSchema = mapCollection(this.schema, createPaginatedSchema);
     if (found) {
+      const sup = this;
       return this.extend({
-        schema: newSchema
+        schema: newSchema,
+        key(...args) {
+          return sup.key.call(this, ...removeCursor(...args));
+        }
       });
     }
     return this.extend({
@@ -225,4 +228,4 @@ const tryParse = input => {
     return undefined;
   }
 };
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["Endpoint","pathToRegexp","extractCollection","mapCollection","NetworkError","paginatedMerge","paginatedFilter","paginationUpdate","paramsToString","getUrlBase","getUrlTokens","isPojo","_hasBody","_classPrivateFieldLooseKey","RestEndpoint","constructor","options","_options$fetch","fetch","args","urlParams","_classPrivateFieldLooseBase","length","body","undefined","fetchResponse","url","getRequestInit","then","response","parseResponse","res","process","Object","defineProperty","writable","value","sideEffect","method","urlPrefix","includes","get","__name","path","key","urlBase","tokens","searchParams","keys","forEach","k","has","getHeaders","headers","bodyIsPojo","JSON","stringify","init","assign","requestInit","signal","input","ok","catch","error","TypeError","status","_response$headers$get","Promise","resolve","text","schema","prototype","message","env","NODE_ENV","_response$headers$get2","startsWith","tryParse","substring","json","errorPolicy","pathRegex","testKey","prefix","lastQuestion","lastIndexOf","test","extend","E","instance","paginated","removeCursor","fieldName","_ref","params","_objectDestructuringEmpty","found","createPaginatedSchema","collection","addWith","newSchema","update","getPage","paginationField","push","s","unshift","parse","e"],"sources":["../src/RestEndpoint.js"],"sourcesContent":["import { Endpoint } from '@data-client/endpoint';\nimport { pathToRegexp } from 'path-to-regexp';\n\nimport extractCollection from './extractCollection.js';\nimport mapCollection from './mapCollection.js';\nimport NetworkError from './NetworkError.js';\nimport { paginatedMerge, paginatedFilter } from './paginatedCollections.js';\nimport paginationUpdate from './paginationUpdate.js';\nimport paramsToString from './paramsToString.js';\nimport { getUrlBase, getUrlTokens, isPojo } from './RestHelpers.js';\n\n/** Simplifies endpoint definitions that follow REST patterns\n *\n * @see https://resthooks.io/rest/api/RestEndpoint\n */\nexport default class RestEndpoint extends Endpoint {\n  #hasBody;\n  constructor(options) {\n    super(\n      options.fetch ??\n        async function (...args) {\n          const urlParams =\n            this.#hasBody && args.length < 2 ? {} : args[0] || {};\n          const body = this.#hasBody ? args[args.length - 1] : undefined;\n          return this.fetchResponse(\n            this.url(urlParams),\n            await this.getRequestInit(body),\n          )\n            .then(response => this.parseResponse(response))\n            .then(res => this.process(res, ...args));\n        },\n      options,\n    );\n    // we want to use the prototype chain here\n    if (\n      !('sideEffect' in this) ||\n      ('method' in options && !('sideEffect' in options))\n    ) {\n      this.sideEffect =\n        options.method === 'GET' || options.method === undefined\n          ? undefined\n          : true;\n    }\n    if (this.method === undefined) {\n      this.method = this.sideEffect ? 'POST' : 'GET';\n    }\n    if (this.urlPrefix === undefined) {\n      this.urlPrefix = '';\n    }\n    this.#hasBody =\n      (!('body' in this) || this.body !== undefined) &&\n      !['GET', 'DELETE'].includes(this.method);\n\n    Object.defineProperty(this, 'name', {\n      get() {\n        // using 'in' to ensure inheritance lookup\n        if ('__name' in this) return this.__name;\n        return this.urlPrefix + this.path;\n      },\n    });\n  }\n\n  key(...args) {\n    return `${this.method} ${this.url(\n      this.#hasBody && args.length < 2 ? {} : args[0] || {},\n    )}`;\n  }\n\n  /** Get the url */\n  url(urlParams = {}) {\n    const urlBase = getUrlBase(this.path)(urlParams);\n    const tokens = getUrlTokens(this.path);\n    const searchParams = {};\n    Object.keys(urlParams).forEach(k => {\n      if (!tokens.has(k)) {\n        searchParams[k] = urlParams[k];\n      }\n    });\n    if (Object.keys(searchParams).length) {\n      return `${this.urlPrefix}${urlBase}?${paramsToString(searchParams)}`;\n    }\n    return `${this.urlPrefix}${urlBase}`;\n  }\n\n  getHeaders(headers) {\n    return headers;\n  }\n\n  /** Init options for fetch - run at fetch */\n  async getRequestInit(body) {\n    const bodyIsPojo = isPojo(body);\n    if (bodyIsPojo) {\n      body = JSON.stringify(body);\n    }\n    const init = {\n      ...this.requestInit,\n      method: this.method,\n      signal: this.signal,\n      body,\n    };\n    if (!body || bodyIsPojo) {\n      init.headers = {\n        // default to application/json but allow user explicit overrides\n        'Content-Type': 'application/json',\n        ...init.headers,\n      };\n    }\n    init.headers = await this.getHeaders(init.headers);\n    return init;\n  }\n\n  /** Perform network request and resolve with HTTP Response */\n  fetchResponse(input, init) {\n    return fetch(input, init)\n      .then(response => {\n        if (!response.ok) {\n          throw new NetworkError(response);\n        }\n        return response;\n      })\n      .catch(error => {\n        // ensure CORS, network down, and parse errors are still caught by NetworkErrorBoundary\n        if (error instanceof TypeError) {\n          error.status = 500;\n        }\n        throw error;\n      });\n  }\n\n  parseResponse(response) {\n    // this should not have any content to read\n    if (response.status === 204) return Promise.resolve(null);\n    if (!response.headers.get('content-type')?.includes('json')) {\n      return response.text().then(text => {\n        // string or 'not set' schema, are valid\n        // when overriding process they might handle other cases, so we don't want to block on our logic\n        if (\n          ['string', 'undefined'].includes(typeof this.schema) ||\n          this.schema === null ||\n          this.process !== RestEndpoint.prototype.process\n        )\n          return text;\n\n        const error = new NetworkError(response);\n        error.status = 404;\n        error.message = `Unexpected text response for schema ${this.schema}`;\n        // custom dev-only messages for more detailed cause\n        /* istanbul ignore else */\n        if (process.env.NODE_ENV !== 'production') {\n          if (\n            !(\n              response.headers.get('content-type')?.includes('html') ||\n              text.startsWith('<!doctype html>')\n            )\n          ) {\n            if (tryParse(text) !== undefined) {\n              error.message = `\"content-type\" header does not include \"json\", but JSON response found.\nSee https://www.rfc-editor.org/rfc/rfc4627 for information on JSON responses\n\nUsing parsed JSON.\nIf text content was expected see https://resthooks.io/rest/api/RestEndpoint#parseResponse`;\n            }\n          } else {\n            error.message = `Unexpected html response for schema ${this.schema}\nThis likely means no API endpoint was configured for this request, resulting in an HTML fallback.\n\nResponse (first 300 characters): ${text.substring(0, 300)}`;\n          }\n        }\n        throw error;\n      });\n    }\n    return response.json().catch(error => {\n      error.status = 400;\n      throw error;\n    });\n  }\n\n  process(value) {\n    return value;\n  }\n\n  errorPolicy(error) {\n    return error.status >= 500 ? 'soft' : undefined;\n  }\n\n  get pathRegex() {\n    return pathToRegexp(this.path);\n  }\n\n  testKey(key) {\n    const prefix = this.method + ' ' + this.urlPrefix;\n    if (!key.startsWith(prefix)) return false;\n    let lastQuestion = key.lastIndexOf('?');\n    if (lastQuestion === -1) lastQuestion = undefined;\n    return this.pathRegex.test(key.substring(prefix.length, lastQuestion));\n  }\n\n  extend(options) {\n    // make a constructor/prototype based off this\n    // extend from it and init with options sent\n    class E extends this.constructor {}\n\n    Object.assign(E.prototype, this);\n    const instance = new E(\n      //  fetch get overridden by function prototype, so we must set it explicitly every time\n      { fetch: this.fetch, ...options },\n    );\n\n    return instance;\n  }\n\n  paginated(removeCursor) {\n    if (typeof removeCursor === 'string') {\n      const fieldName = removeCursor;\n      removeCursor = ({ ...params }) => {\n        delete params[fieldName];\n        return [params];\n      };\n    }\n    let found = false;\n    const createPaginatedSchema = collection => {\n      found = true;\n      return collection.addWith(paginatedMerge, paginatedFilter(removeCursor));\n    };\n    const newSchema = mapCollection(this.schema, createPaginatedSchema);\n    if (found) {\n      return this.extend({ schema: newSchema });\n    }\n\n    return this.extend({ update: paginationUpdate(this, removeCursor) });\n  }\n\n  get getPage() {\n    return this.paginated(this.paginationField);\n  }\n\n  get push() {\n    return this.extend({\n      method: 'POST',\n      schema: extractCollection(this.schema, s => s.push),\n    });\n  }\n\n  get unshift() {\n    return this.extend({\n      method: 'POST',\n      schema: extractCollection(this.schema, s => s.unshift),\n    });\n  }\n\n  get assign() {\n    return this.extend({\n      method: 'POST',\n      schema: extractCollection(this.schema, s => s.assign),\n    });\n  }\n}\n\nconst tryParse = input => {\n  try {\n    return JSON.parse(input);\n  } catch (e) {\n    return undefined;\n  }\n};\n"],"mappings":";;;AAAA,SAASA,QAAQ,QAAQ,uBAAuB;AAChD,SAASC,YAAY,QAAQ,gBAAgB;AAE7C,OAAOC,iBAAiB,MAAM,wBAAwB;AACtD,OAAOC,aAAa,MAAM,oBAAoB;AAC9C,OAAOC,YAAY,MAAM,mBAAmB;AAC5C,SAASC,cAAc,EAAEC,eAAe,QAAQ,2BAA2B;AAC3E,OAAOC,gBAAgB,MAAM,uBAAuB;AACpD,OAAOC,cAAc,MAAM,qBAAqB;AAChD,SAASC,UAAU,EAAEC,YAAY,EAAEC,MAAM,QAAQ,kBAAkB;;AAEnE;AACA;AACA;AACA;AAHA,IAAAC,QAAA,gBAAAC,0BAAA;AAIA,eAAe,MAAMC,YAAY,SAASd,QAAQ,CAAC;EAEjDe,WAAWA,CAACC,OAAO,EAAE;IAAA,IAAAC,cAAA;IACnB,KAAK,EAAAA,cAAA,GACHD,OAAO,CAACE,KAAK,YAAAD,cAAA,GACX,gBAAgB,GAAGE,IAAI,EAAE;MACvB,MAAMC,SAAS,GACbC,2BAAA,KAAI,EAAAT,QAAA,EAAAA,QAAA,KAAaO,IAAI,CAACG,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,GAAGH,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;MACvD,MAAMI,IAAI,GAAGF,2BAAA,KAAI,EAAAT,QAAA,EAAAA,QAAA,IAAYO,IAAI,CAACA,IAAI,CAACG,MAAM,GAAG,CAAC,CAAC,GAAGE,SAAS;MAC9D,OAAO,IAAI,CAACC,aAAa,CACvB,IAAI,CAACC,GAAG,CAACN,SAAS,CAAC,EACnB,MAAM,IAAI,CAACO,cAAc,CAACJ,IAAI,CAChC,CAAC,CACEK,IAAI,CAACC,QAAQ,IAAI,IAAI,CAACC,aAAa,CAACD,QAAQ,CAAC,CAAC,CAC9CD,IAAI,CAACG,GAAG,IAAI,IAAI,CAACC,OAAO,CAACD,GAAG,EAAE,GAAGZ,IAAI,CAAC,CAAC;IAC5C,CAAC,EACHH,OACF,CAAC;IACD;IAAAiB,MAAA,CAAAC,cAAA,OAAAtB,QAAA;MAAAuB,QAAA;MAAAC,KAAA;IAAA;IACA,IACE,EAAE,YAAY,IAAI,IAAI,CAAC,IACtB,QAAQ,IAAIpB,OAAO,IAAI,EAAE,YAAY,IAAIA,OAAO,CAAE,EACnD;MACA,IAAI,CAACqB,UAAU,GACbrB,OAAO,CAACsB,MAAM,KAAK,KAAK,IAAItB,OAAO,CAACsB,MAAM,KAAKd,SAAS,GACpDA,SAAS,GACT,IAAI;IACZ;IACA,IAAI,IAAI,CAACc,MAAM,KAAKd,SAAS,EAAE;MAC7B,IAAI,CAACc,MAAM,GAAG,IAAI,CAACD,UAAU,GAAG,MAAM,GAAG,KAAK;IAChD;IACA,IAAI,IAAI,CAACE,SAAS,KAAKf,SAAS,EAAE;MAChC,IAAI,CAACe,SAAS,GAAG,EAAE;IACrB;IACAlB,2BAAA,KAAI,EAAAT,QAAA,EAAAA,QAAA,IACF,CAAC,EAAE,MAAM,IAAI,IAAI,CAAC,IAAI,IAAI,CAACW,IAAI,KAAKC,SAAS,KAC7C,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAACgB,QAAQ,CAAC,IAAI,CAACF,MAAM,CAAC;IAE1CL,MAAM,CAACC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE;MAClCO,GAAGA,CAAA,EAAG;QACJ;QACA,IAAI,QAAQ,IAAI,IAAI,EAAE,OAAO,IAAI,CAACC,MAAM;QACxC,OAAO,IAAI,CAACH,SAAS,GAAG,IAAI,CAACI,IAAI;MACnC;IACF,CAAC,CAAC;EACJ;EAEAC,GAAGA,CAAC,GAAGzB,IAAI,EAAE;IACX,OAAQ,GAAE,IAAI,CAACmB,MAAO,IAAG,IAAI,CAACZ,GAAG,CAC/BL,2BAAA,KAAI,EAAAT,QAAA,EAAAA,QAAA,KAAaO,IAAI,CAACG,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,GAAGH,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CACtD,CAAE,EAAC;EACL;;EAEA;EACAO,GAAGA,CAACN,SAAS,GAAG,CAAC,CAAC,EAAE;IAClB,MAAMyB,OAAO,GAAGpC,UAAU,CAAC,IAAI,CAACkC,IAAI,CAAC,CAACvB,SAAS,CAAC;IAChD,MAAM0B,MAAM,GAAGpC,YAAY,CAAC,IAAI,CAACiC,IAAI,CAAC;IACtC,MAAMI,YAAY,GAAG,CAAC,CAAC;IACvBd,MAAM,CAACe,IAAI,CAAC5B,SAAS,CAAC,CAAC6B,OAAO,CAACC,CAAC,IAAI;MAClC,IAAI,CAACJ,MAAM,CAACK,GAAG,CAACD,CAAC,CAAC,EAAE;QAClBH,YAAY,CAACG,CAAC,CAAC,GAAG9B,SAAS,CAAC8B,CAAC,CAAC;MAChC;IACF,CAAC,CAAC;IACF,IAAIjB,MAAM,CAACe,IAAI,CAACD,YAAY,CAAC,CAACzB,MAAM,EAAE;MACpC,OAAQ,GAAE,IAAI,CAACiB,SAAU,GAAEM,OAAQ,IAAGrC,cAAc,CAACuC,YAAY,CAAE,EAAC;IACtE;IACA,OAAQ,GAAE,IAAI,CAACR,SAAU,GAAEM,OAAQ,EAAC;EACtC;EAEAO,UAAUA,CAACC,OAAO,EAAE;IAClB,OAAOA,OAAO;EAChB;;EAEA;EACA,MAAM1B,cAAcA,CAACJ,IAAI,EAAE;IACzB,MAAM+B,UAAU,GAAG3C,MAAM,CAACY,IAAI,CAAC;IAC/B,IAAI+B,UAAU,EAAE;MACd/B,IAAI,GAAGgC,IAAI,CAACC,SAAS,CAACjC,IAAI,CAAC;IAC7B;IACA,MAAMkC,IAAI,GAAAxB,MAAA,CAAAyB,MAAA,KACL,IAAI,CAACC,WAAW;MACnBrB,MAAM,EAAE,IAAI,CAACA,MAAM;MACnBsB,MAAM,EAAE,IAAI,CAACA,MAAM;MACnBrC;IAAI,EACL;IACD,IAAI,CAACA,IAAI,IAAI+B,UAAU,EAAE;MACvBG,IAAI,CAACJ,OAAO,GAAApB,MAAA,CAAAyB,MAAA;QACV;QACA,cAAc,EAAE;MAAkB,GAC/BD,IAAI,CAACJ,OAAO,CAChB;IACH;IACAI,IAAI,CAACJ,OAAO,GAAG,MAAM,IAAI,CAACD,UAAU,CAACK,IAAI,CAACJ,OAAO,CAAC;IAClD,OAAOI,IAAI;EACb;;EAEA;EACAhC,aAAaA,CAACoC,KAAK,EAAEJ,IAAI,EAAE;IACzB,OAAOvC,KAAK,CAAC2C,KAAK,EAAEJ,IAAI,CAAC,CACtB7B,IAAI,CAACC,QAAQ,IAAI;MAChB,IAAI,CAACA,QAAQ,CAACiC,EAAE,EAAE;QAChB,MAAM,IAAI1D,YAAY,CAACyB,QAAQ,CAAC;MAClC;MACA,OAAOA,QAAQ;IACjB,CAAC,CAAC,CACDkC,KAAK,CAACC,KAAK,IAAI;MACd;MACA,IAAIA,KAAK,YAAYC,SAAS,EAAE;QAC9BD,KAAK,CAACE,MAAM,GAAG,GAAG;MACpB;MACA,MAAMF,KAAK;IACb,CAAC,CAAC;EACN;EAEAlC,aAAaA,CAACD,QAAQ,EAAE;IAAA,IAAAsC,qBAAA;IACtB;IACA,IAAItC,QAAQ,CAACqC,MAAM,KAAK,GAAG,EAAE,OAAOE,OAAO,CAACC,OAAO,CAAC,IAAI,CAAC;IACzD,IAAI,GAAAF,qBAAA,GAACtC,QAAQ,CAACwB,OAAO,CAACZ,GAAG,CAAC,cAAc,CAAC,aAApC0B,qBAAA,CAAsC3B,QAAQ,CAAC,MAAM,CAAC,GAAE;MAC3D,OAAOX,QAAQ,CAACyC,IAAI,CAAC,CAAC,CAAC1C,IAAI,CAAC0C,IAAI,IAAI;QAClC;QACA;QACA,IACE,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC9B,QAAQ,CAAC,OAAO,IAAI,CAAC+B,MAAM,CAAC,IACpD,IAAI,CAACA,MAAM,KAAK,IAAI,IACpB,IAAI,CAACvC,OAAO,KAAKlB,YAAY,CAAC0D,SAAS,CAACxC,OAAO,EAE/C,OAAOsC,IAAI;QAEb,MAAMN,KAAK,GAAG,IAAI5D,YAAY,CAACyB,QAAQ,CAAC;QACxCmC,KAAK,CAACE,MAAM,GAAG,GAAG;QAClBF,KAAK,CAACS,OAAO,GAAI,uCAAsC,IAAI,CAACF,MAAO,EAAC;QACpE;QACA;QACA,IAAIvC,OAAO,CAAC0C,GAAG,CAACC,QAAQ,KAAK,YAAY,EAAE;UAAA,IAAAC,sBAAA;UACzC,IACE,EACE,CAAAA,sBAAA,GAAA/C,QAAQ,CAACwB,OAAO,CAACZ,GAAG,CAAC,cAAc,CAAC,aAApCmC,sBAAA,CAAsCpC,QAAQ,CAAC,MAAM,CAAC,IACtD8B,IAAI,CAACO,UAAU,CAAC,iBAAiB,CAAC,CACnC,EACD;YACA,IAAIC,QAAQ,CAACR,IAAI,CAAC,KAAK9C,SAAS,EAAE;cAChCwC,KAAK,CAACS,OAAO,GAAI;AAC/B;AACA;AACA;AACA,0FAA0F;YAC9E;UACF,CAAC,MAAM;YACLT,KAAK,CAACS,OAAO,GAAI,uCAAsC,IAAI,CAACF,MAAO;AAC/E;AACA;AACA,mCAAmCD,IAAI,CAACS,SAAS,CAAC,CAAC,EAAE,GAAG,CAAE,EAAC;UACjD;QACF;QACA,MAAMf,KAAK;MACb,CAAC,CAAC;IACJ;IACA,OAAOnC,QAAQ,CAACmD,IAAI,CAAC,CAAC,CAACjB,KAAK,CAACC,KAAK,IAAI;MACpCA,KAAK,CAACE,MAAM,GAAG,GAAG;MAClB,MAAMF,KAAK;IACb,CAAC,CAAC;EACJ;EAEAhC,OAAOA,CAACI,KAAK,EAAE;IACb,OAAOA,KAAK;EACd;EAEA6C,WAAWA,CAACjB,KAAK,EAAE;IACjB,OAAOA,KAAK,CAACE,MAAM,IAAI,GAAG,GAAG,MAAM,GAAG1C,SAAS;EACjD;EAEA,IAAI0D,SAASA,CAAA,EAAG;IACd,OAAOjF,YAAY,CAAC,IAAI,CAAC0C,IAAI,CAAC;EAChC;EAEAwC,OAAOA,CAACvC,GAAG,EAAE;IACX,MAAMwC,MAAM,GAAG,IAAI,CAAC9C,MAAM,GAAG,GAAG,GAAG,IAAI,CAACC,SAAS;IACjD,IAAI,CAACK,GAAG,CAACiC,UAAU,CAACO,MAAM,CAAC,EAAE,OAAO,KAAK;IACzC,IAAIC,YAAY,GAAGzC,GAAG,CAAC0C,WAAW,CAAC,GAAG,CAAC;IACvC,IAAID,YAAY,KAAK,CAAC,CAAC,EAAEA,YAAY,GAAG7D,SAAS;IACjD,OAAO,IAAI,CAAC0D,SAAS,CAACK,IAAI,CAAC3C,GAAG,CAACmC,SAAS,CAACK,MAAM,CAAC9D,MAAM,EAAE+D,YAAY,CAAC,CAAC;EACxE;EAEAG,MAAMA,CAACxE,OAAO,EAAE;IACd;IACA;IACA,MAAMyE,CAAC,SAAS,IAAI,CAAC1E,WAAW,CAAC;IAEjCkB,MAAM,CAACyB,MAAM,CAAC+B,CAAC,CAACjB,SAAS,EAAE,IAAI,CAAC;IAChC,MAAMkB,QAAQ,GAAG,IAAID,CAAC,EACpB;IAAAxD,MAAA,CAAAyB,MAAA;MACExC,KAAK,EAAE,IAAI,CAACA;IAAK,GAAKF,OAAO,CACjC,CAAC;IAED,OAAO0E,QAAQ;EACjB;EAEAC,SAASA,CAACC,YAAY,EAAE;IACtB,IAAI,OAAOA,YAAY,KAAK,QAAQ,EAAE;MACpC,MAAMC,SAAS,GAAGD,YAAY;MAC9BA,YAAY,GAAGE,IAAA,IAAmB;QAAA,IAAbC,MAAM,GAAA9D,MAAA,CAAAyB,MAAA,MAAAsC,yBAAA,CAAAF,IAAA,GAAAA,IAAA;QACzB,OAAOC,MAAM,CAACF,SAAS,CAAC;QACxB,OAAO,CAACE,MAAM,CAAC;MACjB,CAAC;IACH;IACA,IAAIE,KAAK,GAAG,KAAK;IACjB,MAAMC,qBAAqB,GAAGC,UAAU,IAAI;MAC1CF,KAAK,GAAG,IAAI;MACZ,OAAOE,UAAU,CAACC,OAAO,CAAC/F,cAAc,EAAEC,eAAe,CAACsF,YAAY,CAAC,CAAC;IAC1E,CAAC;IACD,MAAMS,SAAS,GAAGlG,aAAa,CAAC,IAAI,CAACoE,MAAM,EAAE2B,qBAAqB,CAAC;IACnE,IAAID,KAAK,EAAE;MACT,OAAO,IAAI,CAACT,MAAM,CAAC;QAAEjB,MAAM,EAAE8B;MAAU,CAAC,CAAC;IAC3C;IAEA,OAAO,IAAI,CAACb,MAAM,CAAC;MAAEc,MAAM,EAAE/F,gBAAgB,CAAC,IAAI,EAAEqF,YAAY;IAAE,CAAC,CAAC;EACtE;EAEA,IAAIW,OAAOA,CAAA,EAAG;IACZ,OAAO,IAAI,CAACZ,SAAS,CAAC,IAAI,CAACa,eAAe,CAAC;EAC7C;EAEA,IAAIC,IAAIA,CAAA,EAAG;IACT,OAAO,IAAI,CAACjB,MAAM,CAAC;MACjBlD,MAAM,EAAE,MAAM;MACdiC,MAAM,EAAErE,iBAAiB,CAAC,IAAI,CAACqE,MAAM,EAAEmC,CAAC,IAAIA,CAAC,CAACD,IAAI;IACpD,CAAC,CAAC;EACJ;EAEA,IAAIE,OAAOA,CAAA,EAAG;IACZ,OAAO,IAAI,CAACnB,MAAM,CAAC;MACjBlD,MAAM,EAAE,MAAM;MACdiC,MAAM,EAAErE,iBAAiB,CAAC,IAAI,CAACqE,MAAM,EAAEmC,CAAC,IAAIA,CAAC,CAACC,OAAO;IACvD,CAAC,CAAC;EACJ;EAEA,IAAIjD,MAAMA,CAAA,EAAG;IACX,OAAO,IAAI,CAAC8B,MAAM,CAAC;MACjBlD,MAAM,EAAE,MAAM;MACdiC,MAAM,EAAErE,iBAAiB,CAAC,IAAI,CAACqE,MAAM,EAAEmC,CAAC,IAAIA,CAAC,CAAChD,MAAM;IACtD,CAAC,CAAC;EACJ;AACF;AAEA,MAAMoB,QAAQ,GAAGjB,KAAK,IAAI;EACxB,IAAI;IACF,OAAON,IAAI,CAACqD,KAAK,CAAC/C,KAAK,CAAC;EAC1B,CAAC,CAAC,OAAOgD,CAAC,EAAE;IACV,OAAOrF,SAAS;EAClB;AACF,CAAC"}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["Endpoint","pathToRegexp","extractCollection","mapCollection","NetworkError","createPaginationSchema","paginationUpdate","paramsToString","getUrlBase","getUrlTokens","isPojo","_hasBody","_classPrivateFieldLooseKey","RestEndpoint","constructor","options","_options$fetch","fetch","args","urlParams","_classPrivateFieldLooseBase","length","body","undefined","fetchResponse","url","getRequestInit","then","response","parseResponse","res","process","Object","defineProperty","writable","value","sideEffect","method","urlPrefix","includes","get","__name","path","key","urlBase","tokens","searchParams","keys","forEach","k","has","getHeaders","headers","bodyIsPojo","JSON","stringify","init","assign","requestInit","signal","input","ok","catch","error","TypeError","status","_response$headers$get","Promise","resolve","text","schema","prototype","message","env","NODE_ENV","_response$headers$get2","startsWith","tryParse","substring","json","errorPolicy","pathRegex","testKey","prefix","lastQuestion","lastIndexOf","test","extend","E","paginated","removeCursor","fieldName","_ref","params","_objectDestructuringEmpty","found","createPaginatedSchema","collection","newSchema","sup","call","update","getPage","paginationField","push","s","unshift","parse","e"],"sources":["../src/RestEndpoint.js"],"sourcesContent":["import { Endpoint } from '@data-client/endpoint';\nimport { pathToRegexp } from 'path-to-regexp';\n\nimport extractCollection from './extractCollection.js';\nimport mapCollection from './mapCollection.js';\nimport NetworkError from './NetworkError.js';\nimport { createPaginationSchema } from './paginatedCollections.js';\nimport paginationUpdate from './paginationUpdate.js';\nimport paramsToString from './paramsToString.js';\nimport { getUrlBase, getUrlTokens, isPojo } from './RestHelpers.js';\n\n/** Simplifies endpoint definitions that follow REST patterns\n *\n * @see https://resthooks.io/rest/api/RestEndpoint\n */\nexport default class RestEndpoint extends Endpoint {\n  #hasBody;\n  constructor(options) {\n    super(\n      options.fetch ??\n        async function (...args) {\n          const urlParams =\n            this.#hasBody && args.length < 2 ? {} : args[0] || {};\n          const body = this.#hasBody ? args[args.length - 1] : undefined;\n          return this.fetchResponse(\n            this.url(urlParams),\n            await this.getRequestInit(body),\n          )\n            .then(response => this.parseResponse(response))\n            .then(res => this.process(res, ...args));\n        },\n      options,\n    );\n    // we want to use the prototype chain here\n    if (\n      !('sideEffect' in this) ||\n      ('method' in options && !('sideEffect' in options))\n    ) {\n      this.sideEffect =\n        options.method === 'GET' || options.method === undefined\n          ? undefined\n          : true;\n    }\n    if (this.method === undefined) {\n      this.method = this.sideEffect ? 'POST' : 'GET';\n    }\n    if (this.urlPrefix === undefined) {\n      this.urlPrefix = '';\n    }\n    this.#hasBody =\n      (!('body' in this) || this.body !== undefined) &&\n      !['GET', 'DELETE'].includes(this.method);\n\n    Object.defineProperty(this, 'name', {\n      get() {\n        // using 'in' to ensure inheritance lookup\n        if ('__name' in this) return this.__name;\n        return this.urlPrefix + this.path;\n      },\n    });\n  }\n\n  key(...args) {\n    return `${this.method} ${this.url(\n      this.#hasBody && args.length < 2 ? {} : args[0] || {},\n    )}`;\n  }\n\n  /** Get the url */\n  url(urlParams = {}) {\n    const urlBase = getUrlBase(this.path)(urlParams);\n    const tokens = getUrlTokens(this.path);\n    const searchParams = {};\n    Object.keys(urlParams).forEach(k => {\n      if (!tokens.has(k)) {\n        searchParams[k] = urlParams[k];\n      }\n    });\n    if (Object.keys(searchParams).length) {\n      return `${this.urlPrefix}${urlBase}?${paramsToString(searchParams)}`;\n    }\n    return `${this.urlPrefix}${urlBase}`;\n  }\n\n  getHeaders(headers) {\n    return headers;\n  }\n\n  /** Init options for fetch - run at fetch */\n  async getRequestInit(body) {\n    const bodyIsPojo = isPojo(body);\n    if (bodyIsPojo) {\n      body = JSON.stringify(body);\n    }\n    const init = {\n      ...this.requestInit,\n      method: this.method,\n      signal: this.signal,\n      body,\n    };\n    if (!body || bodyIsPojo) {\n      init.headers = {\n        // default to application/json but allow user explicit overrides\n        'Content-Type': 'application/json',\n        ...init.headers,\n      };\n    }\n    init.headers = await this.getHeaders(init.headers);\n    return init;\n  }\n\n  /** Perform network request and resolve with HTTP Response */\n  fetchResponse(input, init) {\n    return fetch(input, init)\n      .then(response => {\n        if (!response.ok) {\n          throw new NetworkError(response);\n        }\n        return response;\n      })\n      .catch(error => {\n        // ensure CORS, network down, and parse errors are still caught by NetworkErrorBoundary\n        if (error instanceof TypeError) {\n          error.status = 500;\n        }\n        throw error;\n      });\n  }\n\n  parseResponse(response) {\n    // this should not have any content to read\n    if (response.status === 204) return Promise.resolve(null);\n    if (!response.headers.get('content-type')?.includes('json')) {\n      return response.text().then(text => {\n        // string or 'not set' schema, are valid\n        // when overriding process they might handle other cases, so we don't want to block on our logic\n        if (\n          ['string', 'undefined'].includes(typeof this.schema) ||\n          this.schema === null ||\n          this.process !== RestEndpoint.prototype.process\n        )\n          return text;\n\n        const error = new NetworkError(response);\n        error.status = 404;\n        error.message = `Unexpected text response for schema ${this.schema}`;\n        // custom dev-only messages for more detailed cause\n        /* istanbul ignore else */\n        if (process.env.NODE_ENV !== 'production') {\n          if (\n            !(\n              response.headers.get('content-type')?.includes('html') ||\n              text.startsWith('<!doctype html>')\n            )\n          ) {\n            if (tryParse(text) !== undefined) {\n              error.message = `\"content-type\" header does not include \"json\", but JSON response found.\nSee https://www.rfc-editor.org/rfc/rfc4627 for information on JSON responses\n\nUsing parsed JSON.\nIf text content was expected see https://resthooks.io/rest/api/RestEndpoint#parseResponse`;\n            }\n          } else {\n            error.message = `Unexpected html response for schema ${this.schema}\nThis likely means no API endpoint was configured for this request, resulting in an HTML fallback.\n\nResponse (first 300 characters): ${text.substring(0, 300)}`;\n          }\n        }\n        throw error;\n      });\n    }\n    return response.json().catch(error => {\n      error.status = 400;\n      throw error;\n    });\n  }\n\n  process(value) {\n    return value;\n  }\n\n  errorPolicy(error) {\n    return error.status >= 500 ? 'soft' : undefined;\n  }\n\n  get pathRegex() {\n    return pathToRegexp(this.path);\n  }\n\n  testKey(key) {\n    const prefix = this.method + ' ' + this.urlPrefix;\n    if (!key.startsWith(prefix)) return false;\n    let lastQuestion = key.lastIndexOf('?');\n    if (lastQuestion === -1) lastQuestion = undefined;\n    return this.pathRegex.test(key.substring(prefix.length, lastQuestion));\n  }\n\n  extend(options) {\n    // make a constructor/prototype based off this\n    // extend from it and init with options sent\n    class E extends this.constructor {}\n\n    Object.assign(E.prototype, this);\n\n    return new E(\n      //  fetch get overridden by function prototype, so we must set it explicitly every time\n      { fetch: this.fetch, ...options },\n    );\n  }\n\n  paginated(removeCursor) {\n    if (typeof removeCursor === 'string') {\n      const fieldName = removeCursor;\n      removeCursor = ({ ...params }) => {\n        delete params[fieldName];\n        return [params];\n      };\n    }\n    let found = false;\n    const createPaginatedSchema = collection => {\n      found = true;\n      return createPaginationSchema(removeCursor, collection);\n    };\n    const newSchema = mapCollection(this.schema, createPaginatedSchema);\n    if (found) {\n      const sup = this;\n\n      return this.extend({\n        schema: newSchema,\n        key(...args) {\n          return sup.key.call(this, ...removeCursor(...args));\n        },\n      });\n    }\n\n    return this.extend({ update: paginationUpdate(this, removeCursor) });\n  }\n\n  get getPage() {\n    return this.paginated(this.paginationField);\n  }\n\n  get push() {\n    return this.extend({\n      method: 'POST',\n      schema: extractCollection(this.schema, s => s.push),\n    });\n  }\n\n  get unshift() {\n    return this.extend({\n      method: 'POST',\n      schema: extractCollection(this.schema, s => s.unshift),\n    });\n  }\n\n  get assign() {\n    return this.extend({\n      method: 'POST',\n      schema: extractCollection(this.schema, s => s.assign),\n    });\n  }\n}\n\nconst tryParse = input => {\n  try {\n    return JSON.parse(input);\n  } catch (e) {\n    return undefined;\n  }\n};\n"],"mappings":"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"}

package/legacy/paginatedCollections.js

@@ -6,26 +6,19 @@ export function paginatedMerge(existing, incoming) {
   }
   return mergedList;
 }
-export const paginatedFilter = removeCursor => (...args) => {
-  var _removeCursor$;
-  const noCursorArgs = (_removeCursor$ = removeCursor(...args)[0]) != null ? _removeCursor$ : {};
-  return collectionKey => shallowEqual(collectionKey, noCursorArgs);
-};
-function shallowEqual(object1, object2) {
-  const keys1 = Object.keys(object1);
-  const keys2 = Object.keys(object2);
-  let length2 = 0;
-  for (const key of keys2) {
-    // we should ignore any members with value undefined
-    if (object2[key] === undefined) continue;
-    if (object1[key] !== `${object2[key]}`) {
-      return false;
+export function createPaginationSchema(removeCursor, collection) {
+  return Object.create(collection, {
+    name: {
+      value: `Pagination(${collection.schema})`
+    },
+    merge: {
+      value: paginatedMerge
+    },
+    pk: {
+      value: function (value, parent, key, args) {
+        return collection.pk.call(this, value, parent, key, removeCursor(...args));
+      }
     }
-    length2++;
-  }
-  if (keys1.length !== length2) {
-    return false;
-  }
-  return true;
+  });
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJwYWdpbmF0ZWRNZXJnZSIsImV4aXN0aW5nIiwiaW5jb21pbmciLCJleGlzdGluZ1NldCIsIlNldCIsIm1lcmdlZExpc3QiLCJwayIsImhhcyIsInB1c2giLCJwYWdpbmF0ZWRGaWx0ZXIiLCJyZW1vdmVDdXJzb3IiLCJhcmdzIiwiX3JlbW92ZUN1cnNvciQiLCJub0N1cnNvckFyZ3MiLCJjb2xsZWN0aW9uS2V5Iiwic2hhbGxvd0VxdWFsIiwib2JqZWN0MSIsIm9iamVjdDIiLCJrZXlzMSIsIk9iamVjdCIsImtleXMiLCJrZXlzMiIsImxlbmd0aDIiLCJrZXkiLCJ1bmRlZmluZWQiLCJsZW5ndGgiXSwic291cmNlcyI6WyIuLi9zcmMvcGFnaW5hdGVkQ29sbGVjdGlvbnMudHMiXSwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGZ1bmN0aW9uIHBhZ2luYXRlZE1lcmdlKGV4aXN0aW5nOiBhbnlbXSwgaW5jb21pbmc6IGFueVtdKSB7XG4gIGNvbnN0IGV4aXN0aW5nU2V0OiBTZXQ8c3RyaW5nPiA9IG5ldyBTZXQoZXhpc3RpbmcpO1xuICBjb25zdCBtZXJnZWRMaXN0ID0gWy4uLmV4aXN0aW5nXTtcbiAgZm9yIChjb25zdCBwayBvZiBpbmNvbWluZykge1xuICAgIGlmICghZXhpc3RpbmdTZXQuaGFzKHBrKSkgbWVyZ2VkTGlzdC5wdXNoKHBrKTtcbiAgfVxuICByZXR1cm4gbWVyZ2VkTGlzdDtcbn1cbmV4cG9ydCBjb25zdCBwYWdpbmF0ZWRGaWx0ZXIgPVxuICA8QyBleHRlbmRzICguLi5hcmdzOiByZWFkb25seSBhbnlbXSkgPT4gcmVhZG9ubHkgYW55W10+KHJlbW92ZUN1cnNvcjogQykgPT5cbiAgKC4uLmFyZ3M6IFBhcmFtZXRlcnM8Qz4pID0+IHtcbiAgICBjb25zdCBub0N1cnNvckFyZ3MgPSByZW1vdmVDdXJzb3IoLi4uYXJncylbMF0gPz8ge307XG4gICAgcmV0dXJuIChjb2xsZWN0aW9uS2V5OiBSZWNvcmQ8c3RyaW5nLCBzdHJpbmc+KSA9PlxuICAgICAgc2hhbGxvd0VxdWFsKGNvbGxlY3Rpb25LZXksIG5vQ3Vyc29yQXJncyk7XG4gIH07XG5cbmZ1bmN0aW9uIHNoYWxsb3dFcXVhbChcbiAgb2JqZWN0MTogUmVjb3JkPHN0cmluZywgYW55PixcbiAgb2JqZWN0MjogUmVjb3JkPHN0cmluZywgYW55Pixcbikge1xuICBjb25zdCBrZXlzMSA9IE9iamVjdC5rZXlzKG9iamVjdDEpO1xuICBjb25zdCBrZXlzMiA9IE9iamVjdC5rZXlzKG9iamVjdDIpO1xuICBsZXQgbGVuZ3RoMiA9IDA7XG4gIGZvciAoY29uc3Qga2V5IG9mIGtleXMyKSB7XG4gICAgLy8gd2Ugc2hvdWxkIGlnbm9yZSBhbnkgbWVtYmVycyB3aXRoIHZhbHVlIHVuZGVmaW5lZFxuICAgIGlmIChvYmplY3QyW2tleV0gPT09IHVuZGVmaW5lZCkgY29udGludWU7XG4gICAgaWYgKG9iamVjdDFba2V5XSAhPT0gYCR7b2JqZWN0MltrZXldfWApIHtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG4gICAgbGVuZ3RoMisrO1xuICB9XG4gIGlmIChrZXlzMS5sZW5ndGggIT09IGxlbmd0aDIpIHtcbiAgICByZXR1cm4gZmFsc2U7XG4gIH1cbiAgcmV0dXJuIHRydWU7XG59XG4iXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sU0FBU0EsY0FBY0EsQ0FBQ0MsUUFBZSxFQUFFQyxRQUFlLEVBQUU7RUFDL0QsTUFBTUMsV0FBd0IsR0FBRyxJQUFJQyxHQUFHLENBQUNILFFBQVEsQ0FBQztFQUNsRCxNQUFNSSxVQUFVLEdBQUcsQ0FBQyxHQUFHSixRQUFRLENBQUM7RUFDaEMsS0FBSyxNQUFNSyxFQUFFLElBQUlKLFFBQVEsRUFBRTtJQUN6QixJQUFJLENBQUNDLFdBQVcsQ0FBQ0ksR0FBRyxDQUFDRCxFQUFFLENBQUMsRUFBRUQsVUFBVSxDQUFDRyxJQUFJLENBQUNGLEVBQUUsQ0FBQztFQUMvQztFQUNBLE9BQU9ELFVBQVU7QUFDbkI7QUFDQSxPQUFPLE1BQU1JLGVBQWUsR0FDOEJDLFlBQWUsSUFDdkUsQ0FBQyxHQUFHQyxJQUFtQixLQUFLO0VBQUEsSUFBQUMsY0FBQTtFQUMxQixNQUFNQyxZQUFZLElBQUFELGNBQUEsR0FBR0YsWUFBWSxDQUFDLEdBQUdDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxZQUFBQyxjQUFBLEdBQUksQ0FBQyxDQUFDO0VBQ25ELE9BQVFFLGFBQXFDLElBQzNDQyxZQUFZLENBQUNELGFBQWEsRUFBRUQsWUFBWSxDQUFDO0FBQzdDLENBQUM7QUFFSCxTQUFTRSxZQUFZQSxDQUNuQkMsT0FBNEIsRUFDNUJDLE9BQTRCLEVBQzVCO0VBQ0EsTUFBTUMsS0FBSyxHQUFHQyxNQUFNLENBQUNDLElBQUksQ0FBQ0osT0FBTyxDQUFDO0VBQ2xDLE1BQU1LLEtBQUssR0FBR0YsTUFBTSxDQUFDQyxJQUFJLENBQUNILE9BQU8sQ0FBQztFQUNsQyxJQUFJSyxPQUFPLEdBQUcsQ0FBQztFQUNmLEtBQUssTUFBTUMsR0FBRyxJQUFJRixLQUFLLEVBQUU7SUFDdkI7SUFDQSxJQUFJSixPQUFPLENBQUNNLEdBQUcsQ0FBQyxLQUFLQyxTQUFTLEVBQUU7SUFDaEMsSUFBSVIsT0FBTyxDQUFDTyxHQUFHLENBQUMsS0FBTSxHQUFFTixPQUFPLENBQUNNLEdBQUcsQ0FBRSxFQUFDLEVBQUU7TUFDdEMsT0FBTyxLQUFLO0lBQ2Q7SUFDQUQsT0FBTyxFQUFFO0VBQ1g7RUFDQSxJQUFJSixLQUFLLENBQUNPLE1BQU0sS0FBS0gsT0FBTyxFQUFFO0lBQzVCLE9BQU8sS0FBSztFQUNkO0VBQ0EsT0FBTyxJQUFJO0FBQ2IifQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJwYWdpbmF0ZWRNZXJnZSIsImV4aXN0aW5nIiwiaW5jb21pbmciLCJleGlzdGluZ1NldCIsIlNldCIsIm1lcmdlZExpc3QiLCJwayIsImhhcyIsInB1c2giLCJjcmVhdGVQYWdpbmF0aW9uU2NoZW1hIiwicmVtb3ZlQ3Vyc29yIiwiY29sbGVjdGlvbiIsIk9iamVjdCIsImNyZWF0ZSIsIm5hbWUiLCJ2YWx1ZSIsInNjaGVtYSIsIm1lcmdlIiwicGFyZW50Iiwia2V5IiwiYXJncyIsImNhbGwiXSwic291cmNlcyI6WyIuLi9zcmMvcGFnaW5hdGVkQ29sbGVjdGlvbnMudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgeyBzY2hlbWEgfSBmcm9tICdAZGF0YS1jbGllbnQvZW5kcG9pbnQnO1xuXG5leHBvcnQgZnVuY3Rpb24gcGFnaW5hdGVkTWVyZ2UoZXhpc3Rpbmc6IGFueVtdLCBpbmNvbWluZzogYW55W10pIHtcbiAgY29uc3QgZXhpc3RpbmdTZXQ6IFNldDxzdHJpbmc+ID0gbmV3IFNldChleGlzdGluZyk7XG4gIGNvbnN0IG1lcmdlZExpc3QgPSBbLi4uZXhpc3RpbmddO1xuICBmb3IgKGNvbnN0IHBrIG9mIGluY29taW5nKSB7XG4gICAgaWYgKCFleGlzdGluZ1NldC5oYXMocGspKSBtZXJnZWRMaXN0LnB1c2gocGspO1xuICB9XG4gIHJldHVybiBtZXJnZWRMaXN0O1xufVxuXG5leHBvcnQgZnVuY3Rpb24gY3JlYXRlUGFnaW5hdGlvblNjaGVtYShcbiAgcmVtb3ZlQ3Vyc29yOiAoLi4uYXJnczogcmVhZG9ubHkgYW55W10pID0+IGFueVtdLFxuICBjb2xsZWN0aW9uOiBzY2hlbWEuQ29sbGVjdGlvbixcbikge1xuICByZXR1cm4gT2JqZWN0LmNyZWF0ZShjb2xsZWN0aW9uLCB7XG4gICAgbmFtZToge1xuICAgICAgdmFsdWU6IGBQYWdpbmF0aW9uKCR7Y29sbGVjdGlvbi5zY2hlbWF9KWAsXG4gICAgfSxcbiAgICBtZXJnZToge1xuICAgICAgdmFsdWU6IHBhZ2luYXRlZE1lcmdlLFxuICAgIH0sXG4gICAgcGs6IHtcbiAgICAgIHZhbHVlOiBmdW5jdGlvbiAodmFsdWU6IGFueSwgcGFyZW50OiBhbnksIGtleTogYW55LCBhcmdzOiBhbnlbXSkge1xuICAgICAgICByZXR1cm4gY29sbGVjdGlvbi5way5jYWxsKFxuICAgICAgICAgIHRoaXMsXG4gICAgICAgICAgdmFsdWUsXG4gICAgICAgICAgcGFyZW50LFxuICAgICAgICAgIGtleSxcbiAgICAgICAgICByZW1vdmVDdXJzb3IoLi4uYXJncyksXG4gICAgICAgICk7XG4gICAgICB9LFxuICAgIH0sXG4gIH0pO1xufVxuIl0sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLFNBQVNBLGNBQWNBLENBQUNDLFFBQWUsRUFBRUMsUUFBZSxFQUFFO0VBQy9ELE1BQU1DLFdBQXdCLEdBQUcsSUFBSUMsR0FBRyxDQUFDSCxRQUFRLENBQUM7RUFDbEQsTUFBTUksVUFBVSxHQUFHLENBQUMsR0FBR0osUUFBUSxDQUFDO0VBQ2hDLEtBQUssTUFBTUssRUFBRSxJQUFJSixRQUFRLEVBQUU7SUFDekIsSUFBSSxDQUFDQyxXQUFXLENBQUNJLEdBQUcsQ0FBQ0QsRUFBRSxDQUFDLEVBQUVELFVBQVUsQ0FBQ0csSUFBSSxDQUFDRixFQUFFLENBQUM7RUFDL0M7RUFDQSxPQUFPRCxVQUFVO0FBQ25CO0FBRUEsT0FBTyxTQUFTSSxzQkFBc0JBLENBQ3BDQyxZQUFnRCxFQUNoREMsVUFBNkIsRUFDN0I7RUFDQSxPQUFPQyxNQUFNLENBQUNDLE1BQU0sQ0FBQ0YsVUFBVSxFQUFFO0lBQy9CRyxJQUFJLEVBQUU7TUFDSkMsS0FBSyxFQUFHLGNBQWFKLFVBQVUsQ0FBQ0ssTUFBTztJQUN6QyxDQUFDO0lBQ0RDLEtBQUssRUFBRTtNQUNMRixLQUFLLEVBQUVmO0lBQ1QsQ0FBQztJQUNETSxFQUFFLEVBQUU7TUFDRlMsS0FBSyxFQUFFLFNBQUFBLENBQVVBLEtBQVUsRUFBRUcsTUFBVyxFQUFFQyxHQUFRLEVBQUVDLElBQVcsRUFBRTtRQUMvRCxPQUFPVCxVQUFVLENBQUNMLEVBQUUsQ0FBQ2UsSUFBSSxDQUN2QixJQUFJLEVBQ0pOLEtBQUssRUFDTEcsTUFBTSxFQUNOQyxHQUFHLEVBQ0hULFlBQVksQ0FBQyxHQUFHVSxJQUFJLENBQ3RCLENBQUM7TUFDSDtJQUNGO0VBQ0YsQ0FBQyxDQUFDO0FBQ0oifQ==

package/lib/RestEndpoint.js

@@ -5,7 +5,7 @@ import { pathToRegexp } from 'path-to-regexp';
 import extractCollection from './extractCollection.js';
 import mapCollection from './mapCollection.js';
 import NetworkError from './NetworkError.js';
-import { paginatedMerge, paginatedFilter } from './paginatedCollections.js';
+import { createPaginationSchema } from './paginatedCollections.js';
 import paginationUpdate from './paginationUpdate.js';
 import paramsToString from './paramsToString.js';
 import { getUrlBase, getUrlTokens, isPojo } from './RestHelpers.js';
@@ -167,13 +167,12 @@ Response (first 300 characters): ${text.substring(0, 300)}`;
     // extend from it and init with options sent
     class E extends this.constructor {}
     Object.assign(E.prototype, this);
-    const instance = new E(
+    return new E(
     //  fetch get overridden by function prototype, so we must set it explicitly every time
     {
       fetch: this.fetch,
       ...options
     });
-    return instance;
   }
   paginated(removeCursor) {
     if (typeof removeCursor === 'string') {
@@ -188,12 +187,16 @@ Response (first 300 characters): ${text.substring(0, 300)}`;
     let found = false;
     const createPaginatedSchema = collection => {
       found = true;
-      return collection.addWith(paginatedMerge, paginatedFilter(removeCursor));
+      return createPaginationSchema(removeCursor, collection);
     };
     const newSchema = mapCollection(this.schema, createPaginatedSchema);
     if (found) {
+      const sup = this;
       return this.extend({
-        schema: newSchema
+        schema: newSchema,
+        key(...args) {
+          return sup.key.call(this, ...removeCursor(...args));
+        }
       });
     }
     return this.extend({
@@ -229,4 +232,4 @@ const tryParse = input => {
     return undefined;
   }
 };
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["Endpoint","pathToRegexp","extractCollection","mapCollection","NetworkError","paginatedMerge","paginatedFilter","paginationUpdate","paramsToString","getUrlBase","getUrlTokens","isPojo","_hasBody","_classPrivateFieldLooseKey","RestEndpoint","constructor","options","_options$fetch","fetch","args","urlParams","_classPrivateFieldLooseBase","length","body","undefined","fetchResponse","url","getRequestInit","then","response","parseResponse","res","process","Object","defineProperty","writable","value","sideEffect","method","urlPrefix","includes","get","__name","path","key","urlBase","tokens","searchParams","keys","forEach","k","has","getHeaders","headers","bodyIsPojo","JSON","stringify","init","requestInit","signal","input","ok","catch","error","TypeError","status","_response$headers$get","Promise","resolve","text","schema","prototype","message","env","NODE_ENV","_response$headers$get2","startsWith","tryParse","substring","json","errorPolicy","pathRegex","testKey","prefix","lastQuestion","lastIndexOf","test","extend","E","assign","instance","paginated","removeCursor","fieldName","params","found","createPaginatedSchema","collection","addWith","newSchema","update","getPage","paginationField","push","s","unshift","parse","e"],"sources":["../src/RestEndpoint.js"],"sourcesContent":["import { Endpoint } from '@data-client/endpoint';\nimport { pathToRegexp } from 'path-to-regexp';\n\nimport extractCollection from './extractCollection.js';\nimport mapCollection from './mapCollection.js';\nimport NetworkError from './NetworkError.js';\nimport { paginatedMerge, paginatedFilter } from './paginatedCollections.js';\nimport paginationUpdate from './paginationUpdate.js';\nimport paramsToString from './paramsToString.js';\nimport { getUrlBase, getUrlTokens, isPojo } from './RestHelpers.js';\n\n/** Simplifies endpoint definitions that follow REST patterns\n *\n * @see https://resthooks.io/rest/api/RestEndpoint\n */\nexport default class RestEndpoint extends Endpoint {\n  #hasBody;\n  constructor(options) {\n    super(\n      options.fetch ??\n        async function (...args) {\n          const urlParams =\n            this.#hasBody && args.length < 2 ? {} : args[0] || {};\n          const body = this.#hasBody ? args[args.length - 1] : undefined;\n          return this.fetchResponse(\n            this.url(urlParams),\n            await this.getRequestInit(body),\n          )\n            .then(response => this.parseResponse(response))\n            .then(res => this.process(res, ...args));\n        },\n      options,\n    );\n    // we want to use the prototype chain here\n    if (\n      !('sideEffect' in this) ||\n      ('method' in options && !('sideEffect' in options))\n    ) {\n      this.sideEffect =\n        options.method === 'GET' || options.method === undefined\n          ? undefined\n          : true;\n    }\n    if (this.method === undefined) {\n      this.method = this.sideEffect ? 'POST' : 'GET';\n    }\n    if (this.urlPrefix === undefined) {\n      this.urlPrefix = '';\n    }\n    this.#hasBody =\n      (!('body' in this) || this.body !== undefined) &&\n      !['GET', 'DELETE'].includes(this.method);\n\n    Object.defineProperty(this, 'name', {\n      get() {\n        // using 'in' to ensure inheritance lookup\n        if ('__name' in this) return this.__name;\n        return this.urlPrefix + this.path;\n      },\n    });\n  }\n\n  key(...args) {\n    return `${this.method} ${this.url(\n      this.#hasBody && args.length < 2 ? {} : args[0] || {},\n    )}`;\n  }\n\n  /** Get the url */\n  url(urlParams = {}) {\n    const urlBase = getUrlBase(this.path)(urlParams);\n    const tokens = getUrlTokens(this.path);\n    const searchParams = {};\n    Object.keys(urlParams).forEach(k => {\n      if (!tokens.has(k)) {\n        searchParams[k] = urlParams[k];\n      }\n    });\n    if (Object.keys(searchParams).length) {\n      return `${this.urlPrefix}${urlBase}?${paramsToString(searchParams)}`;\n    }\n    return `${this.urlPrefix}${urlBase}`;\n  }\n\n  getHeaders(headers) {\n    return headers;\n  }\n\n  /** Init options for fetch - run at fetch */\n  async getRequestInit(body) {\n    const bodyIsPojo = isPojo(body);\n    if (bodyIsPojo) {\n      body = JSON.stringify(body);\n    }\n    const init = {\n      ...this.requestInit,\n      method: this.method,\n      signal: this.signal,\n      body,\n    };\n    if (!body || bodyIsPojo) {\n      init.headers = {\n        // default to application/json but allow user explicit overrides\n        'Content-Type': 'application/json',\n        ...init.headers,\n      };\n    }\n    init.headers = await this.getHeaders(init.headers);\n    return init;\n  }\n\n  /** Perform network request and resolve with HTTP Response */\n  fetchResponse(input, init) {\n    return fetch(input, init)\n      .then(response => {\n        if (!response.ok) {\n          throw new NetworkError(response);\n        }\n        return response;\n      })\n      .catch(error => {\n        // ensure CORS, network down, and parse errors are still caught by NetworkErrorBoundary\n        if (error instanceof TypeError) {\n          error.status = 500;\n        }\n        throw error;\n      });\n  }\n\n  parseResponse(response) {\n    // this should not have any content to read\n    if (response.status === 204) return Promise.resolve(null);\n    if (!response.headers.get('content-type')?.includes('json')) {\n      return response.text().then(text => {\n        // string or 'not set' schema, are valid\n        // when overriding process they might handle other cases, so we don't want to block on our logic\n        if (\n          ['string', 'undefined'].includes(typeof this.schema) ||\n          this.schema === null ||\n          this.process !== RestEndpoint.prototype.process\n        )\n          return text;\n\n        const error = new NetworkError(response);\n        error.status = 404;\n        error.message = `Unexpected text response for schema ${this.schema}`;\n        // custom dev-only messages for more detailed cause\n        /* istanbul ignore else */\n        if (process.env.NODE_ENV !== 'production') {\n          if (\n            !(\n              response.headers.get('content-type')?.includes('html') ||\n              text.startsWith('<!doctype html>')\n            )\n          ) {\n            if (tryParse(text) !== undefined) {\n              error.message = `\"content-type\" header does not include \"json\", but JSON response found.\nSee https://www.rfc-editor.org/rfc/rfc4627 for information on JSON responses\n\nUsing parsed JSON.\nIf text content was expected see https://resthooks.io/rest/api/RestEndpoint#parseResponse`;\n            }\n          } else {\n            error.message = `Unexpected html response for schema ${this.schema}\nThis likely means no API endpoint was configured for this request, resulting in an HTML fallback.\n\nResponse (first 300 characters): ${text.substring(0, 300)}`;\n          }\n        }\n        throw error;\n      });\n    }\n    return response.json().catch(error => {\n      error.status = 400;\n      throw error;\n    });\n  }\n\n  process(value) {\n    return value;\n  }\n\n  errorPolicy(error) {\n    return error.status >= 500 ? 'soft' : undefined;\n  }\n\n  get pathRegex() {\n    return pathToRegexp(this.path);\n  }\n\n  testKey(key) {\n    const prefix = this.method + ' ' + this.urlPrefix;\n    if (!key.startsWith(prefix)) return false;\n    let lastQuestion = key.lastIndexOf('?');\n    if (lastQuestion === -1) lastQuestion = undefined;\n    return this.pathRegex.test(key.substring(prefix.length, lastQuestion));\n  }\n\n  extend(options) {\n    // make a constructor/prototype based off this\n    // extend from it and init with options sent\n    class E extends this.constructor {}\n\n    Object.assign(E.prototype, this);\n    const instance = new E(\n      //  fetch get overridden by function prototype, so we must set it explicitly every time\n      { fetch: this.fetch, ...options },\n    );\n\n    return instance;\n  }\n\n  paginated(removeCursor) {\n    if (typeof removeCursor === 'string') {\n      const fieldName = removeCursor;\n      removeCursor = ({ ...params }) => {\n        delete params[fieldName];\n        return [params];\n      };\n    }\n    let found = false;\n    const createPaginatedSchema = collection => {\n      found = true;\n      return collection.addWith(paginatedMerge, paginatedFilter(removeCursor));\n    };\n    const newSchema = mapCollection(this.schema, createPaginatedSchema);\n    if (found) {\n      return this.extend({ schema: newSchema });\n    }\n\n    return this.extend({ update: paginationUpdate(this, removeCursor) });\n  }\n\n  get getPage() {\n    return this.paginated(this.paginationField);\n  }\n\n  get push() {\n    return this.extend({\n      method: 'POST',\n      schema: extractCollection(this.schema, s => s.push),\n    });\n  }\n\n  get unshift() {\n    return this.extend({\n      method: 'POST',\n      schema: extractCollection(this.schema, s => s.unshift),\n    });\n  }\n\n  get assign() {\n    return this.extend({\n      method: 'POST',\n      schema: extractCollection(this.schema, s => s.assign),\n    });\n  }\n}\n\nconst tryParse = input => {\n  try {\n    return JSON.parse(input);\n  } catch (e) {\n    return undefined;\n  }\n};\n"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["Endpoint","pathToRegexp","extractCollection","mapCollection","NetworkError","createPaginationSchema","paginationUpdate","paramsToString","getUrlBase","getUrlTokens","isPojo","_hasBody","_classPrivateFieldLooseKey","RestEndpoint","constructor","options","_options$fetch","fetch","args","urlParams","_classPrivateFieldLooseBase","length","body","undefined","fetchResponse","url","getRequestInit","then","response","parseResponse","res","process","Object","defineProperty","writable","value","sideEffect","method","urlPrefix","includes","get","__name","path","key","urlBase","tokens","searchParams","keys","forEach","k","has","getHeaders","headers","bodyIsPojo","JSON","stringify","init","requestInit","signal","input","ok","catch","error","TypeError","status","_response$headers$get","Promise","resolve","text","schema","prototype","message","env","NODE_ENV","_response$headers$get2","startsWith","tryParse","substring","json","errorPolicy","pathRegex","testKey","prefix","lastQuestion","lastIndexOf","test","extend","E","assign","paginated","removeCursor","fieldName","params","found","createPaginatedSchema","collection","newSchema","sup","call","update","getPage","paginationField","push","s","unshift","parse","e"],"sources":["../src/RestEndpoint.js"],"sourcesContent":["import { Endpoint } from '@data-client/endpoint';\nimport { pathToRegexp } from 'path-to-regexp';\n\nimport extractCollection from './extractCollection.js';\nimport mapCollection from './mapCollection.js';\nimport NetworkError from './NetworkError.js';\nimport { createPaginationSchema } from './paginatedCollections.js';\nimport paginationUpdate from './paginationUpdate.js';\nimport paramsToString from './paramsToString.js';\nimport { getUrlBase, getUrlTokens, isPojo } from './RestHelpers.js';\n\n/** Simplifies endpoint definitions that follow REST patterns\n *\n * @see https://resthooks.io/rest/api/RestEndpoint\n */\nexport default class RestEndpoint extends Endpoint {\n  #hasBody;\n  constructor(options) {\n    super(\n      options.fetch ??\n        async function (...args) {\n          const urlParams =\n            this.#hasBody && args.length < 2 ? {} : args[0] || {};\n          const body = this.#hasBody ? args[args.length - 1] : undefined;\n          return this.fetchResponse(\n            this.url(urlParams),\n            await this.getRequestInit(body),\n          )\n            .then(response => this.parseResponse(response))\n            .then(res => this.process(res, ...args));\n        },\n      options,\n    );\n    // we want to use the prototype chain here\n    if (\n      !('sideEffect' in this) ||\n      ('method' in options && !('sideEffect' in options))\n    ) {\n      this.sideEffect =\n        options.method === 'GET' || options.method === undefined\n          ? undefined\n          : true;\n    }\n    if (this.method === undefined) {\n      this.method = this.sideEffect ? 'POST' : 'GET';\n    }\n    if (this.urlPrefix === undefined) {\n      this.urlPrefix = '';\n    }\n    this.#hasBody =\n      (!('body' in this) || this.body !== undefined) &&\n      !['GET', 'DELETE'].includes(this.method);\n\n    Object.defineProperty(this, 'name', {\n      get() {\n        // using 'in' to ensure inheritance lookup\n        if ('__name' in this) return this.__name;\n        return this.urlPrefix + this.path;\n      },\n    });\n  }\n\n  key(...args) {\n    return `${this.method} ${this.url(\n      this.#hasBody && args.length < 2 ? {} : args[0] || {},\n    )}`;\n  }\n\n  /** Get the url */\n  url(urlParams = {}) {\n    const urlBase = getUrlBase(this.path)(urlParams);\n    const tokens = getUrlTokens(this.path);\n    const searchParams = {};\n    Object.keys(urlParams).forEach(k => {\n      if (!tokens.has(k)) {\n        searchParams[k] = urlParams[k];\n      }\n    });\n    if (Object.keys(searchParams).length) {\n      return `${this.urlPrefix}${urlBase}?${paramsToString(searchParams)}`;\n    }\n    return `${this.urlPrefix}${urlBase}`;\n  }\n\n  getHeaders(headers) {\n    return headers;\n  }\n\n  /** Init options for fetch - run at fetch */\n  async getRequestInit(body) {\n    const bodyIsPojo = isPojo(body);\n    if (bodyIsPojo) {\n      body = JSON.stringify(body);\n    }\n    const init = {\n      ...this.requestInit,\n      method: this.method,\n      signal: this.signal,\n      body,\n    };\n    if (!body || bodyIsPojo) {\n      init.headers = {\n        // default to application/json but allow user explicit overrides\n        'Content-Type': 'application/json',\n        ...init.headers,\n      };\n    }\n    init.headers = await this.getHeaders(init.headers);\n    return init;\n  }\n\n  /** Perform network request and resolve with HTTP Response */\n  fetchResponse(input, init) {\n    return fetch(input, init)\n      .then(response => {\n        if (!response.ok) {\n          throw new NetworkError(response);\n        }\n        return response;\n      })\n      .catch(error => {\n        // ensure CORS, network down, and parse errors are still caught by NetworkErrorBoundary\n        if (error instanceof TypeError) {\n          error.status = 500;\n        }\n        throw error;\n      });\n  }\n\n  parseResponse(response) {\n    // this should not have any content to read\n    if (response.status === 204) return Promise.resolve(null);\n    if (!response.headers.get('content-type')?.includes('json')) {\n      return response.text().then(text => {\n        // string or 'not set' schema, are valid\n        // when overriding process they might handle other cases, so we don't want to block on our logic\n        if (\n          ['string', 'undefined'].includes(typeof this.schema) ||\n          this.schema === null ||\n          this.process !== RestEndpoint.prototype.process\n        )\n          return text;\n\n        const error = new NetworkError(response);\n        error.status = 404;\n        error.message = `Unexpected text response for schema ${this.schema}`;\n        // custom dev-only messages for more detailed cause\n        /* istanbul ignore else */\n        if (process.env.NODE_ENV !== 'production') {\n          if (\n            !(\n              response.headers.get('content-type')?.includes('html') ||\n              text.startsWith('<!doctype html>')\n            )\n          ) {\n            if (tryParse(text) !== undefined) {\n              error.message = `\"content-type\" header does not include \"json\", but JSON response found.\nSee https://www.rfc-editor.org/rfc/rfc4627 for information on JSON responses\n\nUsing parsed JSON.\nIf text content was expected see https://resthooks.io/rest/api/RestEndpoint#parseResponse`;\n            }\n          } else {\n            error.message = `Unexpected html response for schema ${this.schema}\nThis likely means no API endpoint was configured for this request, resulting in an HTML fallback.\n\nResponse (first 300 characters): ${text.substring(0, 300)}`;\n          }\n        }\n        throw error;\n      });\n    }\n    return response.json().catch(error => {\n      error.status = 400;\n      throw error;\n    });\n  }\n\n  process(value) {\n    return value;\n  }\n\n  errorPolicy(error) {\n    return error.status >= 500 ? 'soft' : undefined;\n  }\n\n  get pathRegex() {\n    return pathToRegexp(this.path);\n  }\n\n  testKey(key) {\n    const prefix = this.method + ' ' + this.urlPrefix;\n    if (!key.startsWith(prefix)) return false;\n    let lastQuestion = key.lastIndexOf('?');\n    if (lastQuestion === -1) lastQuestion = undefined;\n    return this.pathRegex.test(key.substring(prefix.length, lastQuestion));\n  }\n\n  extend(options) {\n    // make a constructor/prototype based off this\n    // extend from it and init with options sent\n    class E extends this.constructor {}\n\n    Object.assign(E.prototype, this);\n\n    return new E(\n      //  fetch get overridden by function prototype, so we must set it explicitly every time\n      { fetch: this.fetch, ...options },\n    );\n  }\n\n  paginated(removeCursor) {\n    if (typeof removeCursor === 'string') {\n      const fieldName = removeCursor;\n      removeCursor = ({ ...params }) => {\n        delete params[fieldName];\n        return [params];\n      };\n    }\n    let found = false;\n    const createPaginatedSchema = collection => {\n      found = true;\n      return createPaginationSchema(removeCursor, collection);\n    };\n    const newSchema = mapCollection(this.schema, createPaginatedSchema);\n    if (found) {\n      const sup = this;\n\n      return this.extend({\n        schema: newSchema,\n        key(...args) {\n          return sup.key.call(this, ...removeCursor(...args));\n        },\n      });\n    }\n\n    return this.extend({ update: paginationUpdate(this, removeCursor) });\n  }\n\n  get getPage() {\n    return this.paginated(this.paginationField);\n  }\n\n  get push() {\n    return this.extend({\n      method: 'POST',\n      schema: extractCollection(this.schema, s => s.push),\n    });\n  }\n\n  get unshift() {\n    return this.extend({\n      method: 'POST',\n      schema: extractCollection(this.schema, s => s.unshift),\n    });\n  }\n\n  get assign() {\n    return this.extend({\n      method: 'POST',\n      schema: extractCollection(this.schema, s => s.assign),\n    });\n  }\n}\n\nconst tryParse = input => {\n  try {\n    return JSON.parse(input);\n  } catch (e) {\n    return undefined;\n  }\n};\n"],"mappings":"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"}

package/lib/paginatedCollections.d.ts

@@ -1,3 +1,4 @@
+import type { schema } from '@data-client/endpoint';
 export declare function paginatedMerge(existing: any[], incoming: any[]): any[];
-export declare const paginatedFilter: <C extends (...args: readonly any[]) => readonly any[]>(removeCursor: C) => (...args: Parameters<C>) => (collectionKey: Record<string, string>) => boolean;
+export declare function createPaginationSchema(removeCursor: (...args: readonly any[]) => any[], collection: schema.Collection): any;
 //# sourceMappingURL=paginatedCollections.d.ts.map

package/lib/paginatedCollections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paginatedCollections.d.ts","sourceRoot":"","sources":["../src/paginatedCollections.ts"],"names":[],"mappings":"AAAA,wBAAgB,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,SAO9D;AACD,eAAO,MAAM,eAAe,uBACL,SAAS,GAAG,EAAE,KAAK,SAAS,GAAG,EAAE,kEAG7B,OAAO,MAAM,EAAE,MAAM,CAAC,YAE9C,CAAC"}
+{"version":3,"file":"paginatedCollections.d.ts","sourceRoot":"","sources":["../src/paginatedCollections.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,wBAAgB,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,SAO9D;AAED,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,CAAC,GAAG,IAAI,EAAE,SAAS,GAAG,EAAE,KAAK,GAAG,EAAE,EAChD,UAAU,EAAE,MAAM,CAAC,UAAU,OAqB9B"}

package/lib/paginatedCollections.js

@@ -6,26 +6,19 @@ export function paginatedMerge(existing, incoming) {
   }
   return mergedList;
 }
-export const paginatedFilter = removeCursor => (...args) => {
-  var _removeCursor$;
-  const noCursorArgs = (_removeCursor$ = removeCursor(...args)[0]) != null ? _removeCursor$ : {};
-  return collectionKey => shallowEqual(collectionKey, noCursorArgs);
-};
-function shallowEqual(object1, object2) {
-  const keys1 = Object.keys(object1);
-  const keys2 = Object.keys(object2);
-  let length2 = 0;
-  for (const key of keys2) {
-    // we should ignore any members with value undefined
-    if (object2[key] === undefined) continue;
-    if (object1[key] !== `${object2[key]}`) {
-      return false;
+export function createPaginationSchema(removeCursor, collection) {
+  return Object.create(collection, {
+    name: {
+      value: `Pagination(${collection.schema})`
+    },
+    merge: {
+      value: paginatedMerge
+    },
+    pk: {
+      value: function (value, parent, key, args) {
+        return collection.pk.call(this, value, parent, key, removeCursor(...args));
+      }
     }
-    length2++;
-  }
-  if (keys1.length !== length2) {
-    return false;
-  }
-  return true;
+  });
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJwYWdpbmF0ZWRNZXJnZSIsImV4aXN0aW5nIiwiaW5jb21pbmciLCJleGlzdGluZ1NldCIsIlNldCIsIm1lcmdlZExpc3QiLCJwayIsImhhcyIsInB1c2giLCJwYWdpbmF0ZWRGaWx0ZXIiLCJyZW1vdmVDdXJzb3IiLCJhcmdzIiwiX3JlbW92ZUN1cnNvciQiLCJub0N1cnNvckFyZ3MiLCJjb2xsZWN0aW9uS2V5Iiwic2hhbGxvd0VxdWFsIiwib2JqZWN0MSIsIm9iamVjdDIiLCJrZXlzMSIsIk9iamVjdCIsImtleXMiLCJrZXlzMiIsImxlbmd0aDIiLCJrZXkiLCJ1bmRlZmluZWQiLCJsZW5ndGgiXSwic291cmNlcyI6WyIuLi9zcmMvcGFnaW5hdGVkQ29sbGVjdGlvbnMudHMiXSwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGZ1bmN0aW9uIHBhZ2luYXRlZE1lcmdlKGV4aXN0aW5nOiBhbnlbXSwgaW5jb21pbmc6IGFueVtdKSB7XG4gIGNvbnN0IGV4aXN0aW5nU2V0OiBTZXQ8c3RyaW5nPiA9IG5ldyBTZXQoZXhpc3RpbmcpO1xuICBjb25zdCBtZXJnZWRMaXN0ID0gWy4uLmV4aXN0aW5nXTtcbiAgZm9yIChjb25zdCBwayBvZiBpbmNvbWluZykge1xuICAgIGlmICghZXhpc3RpbmdTZXQuaGFzKHBrKSkgbWVyZ2VkTGlzdC5wdXNoKHBrKTtcbiAgfVxuICByZXR1cm4gbWVyZ2VkTGlzdDtcbn1cbmV4cG9ydCBjb25zdCBwYWdpbmF0ZWRGaWx0ZXIgPVxuICA8QyBleHRlbmRzICguLi5hcmdzOiByZWFkb25seSBhbnlbXSkgPT4gcmVhZG9ubHkgYW55W10+KHJlbW92ZUN1cnNvcjogQykgPT5cbiAgKC4uLmFyZ3M6IFBhcmFtZXRlcnM8Qz4pID0+IHtcbiAgICBjb25zdCBub0N1cnNvckFyZ3MgPSByZW1vdmVDdXJzb3IoLi4uYXJncylbMF0gPz8ge307XG4gICAgcmV0dXJuIChjb2xsZWN0aW9uS2V5OiBSZWNvcmQ8c3RyaW5nLCBzdHJpbmc+KSA9PlxuICAgICAgc2hhbGxvd0VxdWFsKGNvbGxlY3Rpb25LZXksIG5vQ3Vyc29yQXJncyk7XG4gIH07XG5cbmZ1bmN0aW9uIHNoYWxsb3dFcXVhbChcbiAgb2JqZWN0MTogUmVjb3JkPHN0cmluZywgYW55PixcbiAgb2JqZWN0MjogUmVjb3JkPHN0cmluZywgYW55Pixcbikge1xuICBjb25zdCBrZXlzMSA9IE9iamVjdC5rZXlzKG9iamVjdDEpO1xuICBjb25zdCBrZXlzMiA9IE9iamVjdC5rZXlzKG9iamVjdDIpO1xuICBsZXQgbGVuZ3RoMiA9IDA7XG4gIGZvciAoY29uc3Qga2V5IG9mIGtleXMyKSB7XG4gICAgLy8gd2Ugc2hvdWxkIGlnbm9yZSBhbnkgbWVtYmVycyB3aXRoIHZhbHVlIHVuZGVmaW5lZFxuICAgIGlmIChvYmplY3QyW2tleV0gPT09IHVuZGVmaW5lZCkgY29udGludWU7XG4gICAgaWYgKG9iamVjdDFba2V5XSAhPT0gYCR7b2JqZWN0MltrZXldfWApIHtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG4gICAgbGVuZ3RoMisrO1xuICB9XG4gIGlmIChrZXlzMS5sZW5ndGggIT09IGxlbmd0aDIpIHtcbiAgICByZXR1cm4gZmFsc2U7XG4gIH1cbiAgcmV0dXJuIHRydWU7XG59XG4iXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sU0FBU0EsY0FBY0EsQ0FBQ0MsUUFBZSxFQUFFQyxRQUFlLEVBQUU7RUFDL0QsTUFBTUMsV0FBd0IsR0FBRyxJQUFJQyxHQUFHLENBQUNILFFBQVEsQ0FBQztFQUNsRCxNQUFNSSxVQUFVLEdBQUcsQ0FBQyxHQUFHSixRQUFRLENBQUM7RUFDaEMsS0FBSyxNQUFNSyxFQUFFLElBQUlKLFFBQVEsRUFBRTtJQUN6QixJQUFJLENBQUNDLFdBQVcsQ0FBQ0ksR0FBRyxDQUFDRCxFQUFFLENBQUMsRUFBRUQsVUFBVSxDQUFDRyxJQUFJLENBQUNGLEVBQUUsQ0FBQztFQUMvQztFQUNBLE9BQU9ELFVBQVU7QUFDbkI7QUFDQSxPQUFPLE1BQU1JLGVBQWUsR0FDOEJDLFlBQWUsSUFDdkUsQ0FBQyxHQUFHQyxJQUFtQixLQUFLO0VBQUEsSUFBQUMsY0FBQTtFQUMxQixNQUFNQyxZQUFZLElBQUFELGNBQUEsR0FBR0YsWUFBWSxDQUFDLEdBQUdDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxZQUFBQyxjQUFBLEdBQUksQ0FBQyxDQUFDO0VBQ25ELE9BQVFFLGFBQXFDLElBQzNDQyxZQUFZLENBQUNELGFBQWEsRUFBRUQsWUFBWSxDQUFDO0FBQzdDLENBQUM7QUFFSCxTQUFTRSxZQUFZQSxDQUNuQkMsT0FBNEIsRUFDNUJDLE9BQTRCLEVBQzVCO0VBQ0EsTUFBTUMsS0FBSyxHQUFHQyxNQUFNLENBQUNDLElBQUksQ0FBQ0osT0FBTyxDQUFDO0VBQ2xDLE1BQU1LLEtBQUssR0FBR0YsTUFBTSxDQUFDQyxJQUFJLENBQUNILE9BQU8sQ0FBQztFQUNsQyxJQUFJSyxPQUFPLEdBQUcsQ0FBQztFQUNmLEtBQUssTUFBTUMsR0FBRyxJQUFJRixLQUFLLEVBQUU7SUFDdkI7SUFDQSxJQUFJSixPQUFPLENBQUNNLEdBQUcsQ0FBQyxLQUFLQyxTQUFTLEVBQUU7SUFDaEMsSUFBSVIsT0FBTyxDQUFDTyxHQUFHLENBQUMsS0FBTSxHQUFFTixPQUFPLENBQUNNLEdBQUcsQ0FBRSxFQUFDLEVBQUU7TUFDdEMsT0FBTyxLQUFLO0lBQ2Q7SUFDQUQsT0FBTyxFQUFFO0VBQ1g7RUFDQSxJQUFJSixLQUFLLENBQUNPLE1BQU0sS0FBS0gsT0FBTyxFQUFFO0lBQzVCLE9BQU8sS0FBSztFQUNkO0VBQ0EsT0FBTyxJQUFJO0FBQ2IifQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJwYWdpbmF0ZWRNZXJnZSIsImV4aXN0aW5nIiwiaW5jb21pbmciLCJleGlzdGluZ1NldCIsIlNldCIsIm1lcmdlZExpc3QiLCJwayIsImhhcyIsInB1c2giLCJjcmVhdGVQYWdpbmF0aW9uU2NoZW1hIiwicmVtb3ZlQ3Vyc29yIiwiY29sbGVjdGlvbiIsIk9iamVjdCIsImNyZWF0ZSIsIm5hbWUiLCJ2YWx1ZSIsInNjaGVtYSIsIm1lcmdlIiwicGFyZW50Iiwia2V5IiwiYXJncyIsImNhbGwiXSwic291cmNlcyI6WyIuLi9zcmMvcGFnaW5hdGVkQ29sbGVjdGlvbnMudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgeyBzY2hlbWEgfSBmcm9tICdAZGF0YS1jbGllbnQvZW5kcG9pbnQnO1xuXG5leHBvcnQgZnVuY3Rpb24gcGFnaW5hdGVkTWVyZ2UoZXhpc3Rpbmc6IGFueVtdLCBpbmNvbWluZzogYW55W10pIHtcbiAgY29uc3QgZXhpc3RpbmdTZXQ6IFNldDxzdHJpbmc+ID0gbmV3IFNldChleGlzdGluZyk7XG4gIGNvbnN0IG1lcmdlZExpc3QgPSBbLi4uZXhpc3RpbmddO1xuICBmb3IgKGNvbnN0IHBrIG9mIGluY29taW5nKSB7XG4gICAgaWYgKCFleGlzdGluZ1NldC5oYXMocGspKSBtZXJnZWRMaXN0LnB1c2gocGspO1xuICB9XG4gIHJldHVybiBtZXJnZWRMaXN0O1xufVxuXG5leHBvcnQgZnVuY3Rpb24gY3JlYXRlUGFnaW5hdGlvblNjaGVtYShcbiAgcmVtb3ZlQ3Vyc29yOiAoLi4uYXJnczogcmVhZG9ubHkgYW55W10pID0+IGFueVtdLFxuICBjb2xsZWN0aW9uOiBzY2hlbWEuQ29sbGVjdGlvbixcbikge1xuICByZXR1cm4gT2JqZWN0LmNyZWF0ZShjb2xsZWN0aW9uLCB7XG4gICAgbmFtZToge1xuICAgICAgdmFsdWU6IGBQYWdpbmF0aW9uKCR7Y29sbGVjdGlvbi5zY2hlbWF9KWAsXG4gICAgfSxcbiAgICBtZXJnZToge1xuICAgICAgdmFsdWU6IHBhZ2luYXRlZE1lcmdlLFxuICAgIH0sXG4gICAgcGs6IHtcbiAgICAgIHZhbHVlOiBmdW5jdGlvbiAodmFsdWU6IGFueSwgcGFyZW50OiBhbnksIGtleTogYW55LCBhcmdzOiBhbnlbXSkge1xuICAgICAgICByZXR1cm4gY29sbGVjdGlvbi5way5jYWxsKFxuICAgICAgICAgIHRoaXMsXG4gICAgICAgICAgdmFsdWUsXG4gICAgICAgICAgcGFyZW50LFxuICAgICAgICAgIGtleSxcbiAgICAgICAgICByZW1vdmVDdXJzb3IoLi4uYXJncyksXG4gICAgICAgICk7XG4gICAgICB9LFxuICAgIH0sXG4gIH0pO1xufVxuIl0sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLFNBQVNBLGNBQWNBLENBQUNDLFFBQWUsRUFBRUMsUUFBZSxFQUFFO0VBQy9ELE1BQU1DLFdBQXdCLEdBQUcsSUFBSUMsR0FBRyxDQUFDSCxRQUFRLENBQUM7RUFDbEQsTUFBTUksVUFBVSxHQUFHLENBQUMsR0FBR0osUUFBUSxDQUFDO0VBQ2hDLEtBQUssTUFBTUssRUFBRSxJQUFJSixRQUFRLEVBQUU7SUFDekIsSUFBSSxDQUFDQyxXQUFXLENBQUNJLEdBQUcsQ0FBQ0QsRUFBRSxDQUFDLEVBQUVELFVBQVUsQ0FBQ0csSUFBSSxDQUFDRixFQUFFLENBQUM7RUFDL0M7RUFDQSxPQUFPRCxVQUFVO0FBQ25CO0FBRUEsT0FBTyxTQUFTSSxzQkFBc0JBLENBQ3BDQyxZQUFnRCxFQUNoREMsVUFBNkIsRUFDN0I7RUFDQSxPQUFPQyxNQUFNLENBQUNDLE1BQU0sQ0FBQ0YsVUFBVSxFQUFFO0lBQy9CRyxJQUFJLEVBQUU7TUFDSkMsS0FBSyxFQUFHLGNBQWFKLFVBQVUsQ0FBQ0ssTUFBTztJQUN6QyxDQUFDO0lBQ0RDLEtBQUssRUFBRTtNQUNMRixLQUFLLEVBQUVmO0lBQ1QsQ0FBQztJQUNETSxFQUFFLEVBQUU7TUFDRlMsS0FBSyxFQUFFLFNBQUFBLENBQVVBLEtBQVUsRUFBRUcsTUFBVyxFQUFFQyxHQUFRLEVBQUVDLElBQVcsRUFBRTtRQUMvRCxPQUFPVCxVQUFVLENBQUNMLEVBQUUsQ0FBQ2UsSUFBSSxDQUN2QixJQUFJLEVBQ0pOLEtBQUssRUFDTEcsTUFBTSxFQUNOQyxHQUFHLEVBQ0hULFlBQVksQ0FBQyxHQUFHVSxJQUFJLENBQ3RCLENBQUM7TUFDSDtJQUNGO0VBQ0YsQ0FBQyxDQUFDO0FBQ0oifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-client/rest",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Endpoints for REST APIs",
   "homepage": "https://dataclient.io/rest",
   "repository": {
@@ -124,7 +124,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.17.0",
-    "@data-client/endpoint": "^0.2.4",
+    "@data-client/endpoint": "^0.2.6",
     "path-to-regexp": "^6.2.1"
   },
   "devDependencies": {

package/src/RestEndpoint.js

@@ -4,7 +4,7 @@ import { pathToRegexp } from 'path-to-regexp';
 import extractCollection from './extractCollection.js';
 import mapCollection from './mapCollection.js';
 import NetworkError from './NetworkError.js';
-import { paginatedMerge, paginatedFilter } from './paginatedCollections.js';
+import { createPaginationSchema } from './paginatedCollections.js';
 import paginationUpdate from './paginationUpdate.js';
 import paramsToString from './paramsToString.js';
 import { getUrlBase, getUrlTokens, isPojo } from './RestHelpers.js';
@@ -202,12 +202,11 @@ Response (first 300 characters): ${text.substring(0, 300)}`;
     class E extends this.constructor {}
 
     Object.assign(E.prototype, this);
-    const instance = new E(
+
+    return new E(
       //  fetch get overridden by function prototype, so we must set it explicitly every time
       { fetch: this.fetch, ...options },
     );
-
-    return instance;
   }
 
   paginated(removeCursor) {
@@ -221,11 +220,18 @@ Response (first 300 characters): ${text.substring(0, 300)}`;
     let found = false;
     const createPaginatedSchema = collection => {
       found = true;
-      return collection.addWith(paginatedMerge, paginatedFilter(removeCursor));
+      return createPaginationSchema(removeCursor, collection);
     };
     const newSchema = mapCollection(this.schema, createPaginatedSchema);
     if (found) {
-      return this.extend({ schema: newSchema });
+      const sup = this;
+
+      return this.extend({
+        schema: newSchema,
+        key(...args) {
+          return sup.key.call(this, ...removeCursor(...args));
+        },
+      });
     }
 
     return this.extend({ update: paginationUpdate(this, removeCursor) });

package/src/paginatedCollections.ts

@@ -1,3 +1,5 @@
+import type { schema } from '@data-client/endpoint';
+
 export function paginatedMerge(existing: any[], incoming: any[]) {
   const existingSet: Set<string> = new Set(existing);
   const mergedList = [...existing];
@@ -6,31 +8,28 @@ export function paginatedMerge(existing: any[], incoming: any[]) {
   }
   return mergedList;
 }
-export const paginatedFilter =
-  <C extends (...args: readonly any[]) => readonly any[]>(removeCursor: C) =>
-  (...args: Parameters<C>) => {
-    const noCursorArgs = removeCursor(...args)[0] ?? {};
-    return (collectionKey: Record<string, string>) =>
-      shallowEqual(collectionKey, noCursorArgs);
-  };
 
-function shallowEqual(
-  object1: Record<string, any>,
-  object2: Record<string, any>,
+export function createPaginationSchema(
+  removeCursor: (...args: readonly any[]) => any[],
+  collection: schema.Collection,
 ) {
-  const keys1 = Object.keys(object1);
-  const keys2 = Object.keys(object2);
-  let length2 = 0;
-  for (const key of keys2) {
-    // we should ignore any members with value undefined
-    if (object2[key] === undefined) continue;
-    if (object1[key] !== `${object2[key]}`) {
-      return false;
-    }
-    length2++;
-  }
-  if (keys1.length !== length2) {
-    return false;
-  }
-  return true;
+  return Object.create(collection, {
+    name: {
+      value: `Pagination(${collection.schema})`,
+    },
+    merge: {
+      value: paginatedMerge,
+    },
+    pk: {
+      value: function (value: any, parent: any, key: any, args: any[]) {
+        return collection.pk.call(
+          this,
+          value,
+          parent,
+          key,
+          removeCursor(...args),
+        );
+      },
+    },
+  });
 }

package/ts4.0/paginatedCollections.d.ts

@@ -1,3 +1,4 @@
+import type { schema } from '@data-client/endpoint';
 export declare function paginatedMerge(existing: any[], incoming: any[]): any[];
-export declare const paginatedFilter: <C extends (...args: readonly any[]) => readonly any[]>(removeCursor: C) => (...args: Parameters<C>) => (collectionKey: Record<string, string>) => boolean;
+export declare function createPaginationSchema(removeCursor: (...args: readonly any[]) => any[], collection: schema.Collection): any;
 //# sourceMappingURL=paginatedCollections.d.ts.map

package/ts4.1/paginatedCollections.d.ts

@@ -1,3 +1,4 @@
+import type { schema } from '@data-client/endpoint';
 export declare function paginatedMerge(existing: any[], incoming: any[]): any[];
-export declare const paginatedFilter: <C extends (...args: readonly any[]) => readonly any[]>(removeCursor: C) => (...args: Parameters<C>) => (collectionKey: Record<string, string>) => boolean;
+export declare function createPaginationSchema(removeCursor: (...args: readonly any[]) => any[], collection: schema.Collection): any;
 //# sourceMappingURL=paginatedCollections.d.ts.map