@coderich/autograph 0.9.13 → 0.9.14

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "author": "Richard Livolsi (coderich)",
-  "version": "0.9.13",
+  "version": "0.9.14",
   "description": "AutoGraph",
   "keywords": [
     "graphql",

package/src/data/Field.js

@@ -2,7 +2,7 @@ const Type = require('./Type');
 const Field = require('../graphql/ast/Field');
 const Rule = require('../core/Rule');
 const Transformer = require('../core/Transformer');
-const { map, uvl, isPlainObject, ensureArray, promiseChain } = require('../service/app.service');
+const { map, uvl, isPlainObject, ensureArray } = require('../service/app.service');
 
 module.exports = class extends Field {
   constructor(model, field) {
@@ -63,17 +63,6 @@ module.exports = class extends Field {
     return transformers.concat(this.type.getDeserializers());
   }
 
-  getResolvers() {
-    const resolvers = [];
-
-    Object.entries(this.getDirectiveArgs('field', {})).forEach(([key, value]) => {
-      if (!Array.isArray(value)) value = [value];
-      if (key === 'resolve') resolvers.push(...value.map(t => Transformer.getInstances()[t]));
-    });
-
-    return resolvers.concat(this.type.getResolvers());
-  }
-
   validate(query, value) {
     const modelRef = this.getModelRef();
     const rules = [...this.getRules()];
@@ -124,20 +113,6 @@ module.exports = class extends Field {
     return this.transform(query, value, 'deserialize');
   }
 
-  /**
-   * Applies any user-defined @field(resolve: [...methods]) in series
-   * This is ONLY run when resolving a value via the $<name> attribute
-   */
-  resolve(query, value) {
-    const resolvers = [...this.getResolvers()];
-
-    return promiseChain(resolvers.map(fn => (chain) => {
-      return Promise.resolve(fn(this, uvl(this.cast(chain.pop()), value), query));
-    })).then((results) => {
-      return uvl(this.cast(results.pop()), value);
-    });
-  }
-
   tform(query, value) {
     // Determine transformers
     const transformers = this.getTransformers();

package/src/data/ResultSet.js

@@ -1,6 +1,6 @@
 const { get } = require('lodash');
 const DataService = require('./DataService');
-const { map, ensureArray, keyPaths, mapPromise, toGUID, hashObject } = require('../service/app.service');
+const { map, ensureArray, keyPaths, toGUID } = require('../service/app.service');
 
 const modelCache = new WeakMap();
 
@@ -101,7 +101,7 @@ module.exports = class ResultSet {
         virtualField: field.getVirtualField(),
         // deserialize: field.deserialize.bind(field),
         // fieldResolve: field.resolve.bind(field),
-        get useDefaultResolver() { return Boolean((this.isScalar || this.isEmbedded) && !field.getResolvers().length); },
+        get useDefaultResolver() { return Boolean(this.isScalar || this.isEmbedded); },
       }));
 
       const template = ResultSet.makeModelTemplate(model, fieldDefs);
@@ -112,7 +112,7 @@ module.exports = class ResultSet {
 
   static makeModelTemplate(model, fieldDefs) {
     const definition = fieldDefs.reduce((prev, fieldDef) => {
-      const { field, key, name, isArray, isScalar, isVirtual, isRequired, isEmbedded, modelRef, virtualField, useDefaultResolver } = fieldDef;
+      const { field, key, name, isArray, isVirtual, isRequired, isEmbedded, modelRef, virtualField, useDefaultResolver } = fieldDef;
       const $name = `$${name}`;
 
       // Deserialized field attributes
@@ -120,9 +120,7 @@ module.exports = class ResultSet {
         get() {
           if (this.$$services.cache.has(name)) return this.$$services.cache.get(name);
           let $value = field.deserialize(this.$$services.query, this.$$services.data[key]);
-          if ($value != null && isEmbedded) {
-            $value = new ResultSet(this.$$services.query.model(modelRef), $value, false);
-          }
+          if ($value != null && isEmbedded) $value = new ResultSet(this.$$services.query.model(modelRef), $value, false);
           this.$$services.cache.set(name, $value);
           return $value;
         },
@@ -143,37 +141,26 @@ module.exports = class ResultSet {
             // Default resolver return immediately!
             if (useDefaultResolver) return $value;
 
-            // There are FIELD resolvers to run
-            return new Promise((resolve, reject) => {
-              return new Promise((res) => {
-                // Scalars and Embeds do not need DB lookup
-                if (isScalar || isEmbedded) return res($value);
-
-                // Ensure where clause for DB lookup
-                args.where = args.where || {};
-
-                if (isArray) {
-                  if (isVirtual) {
-                    args.where[[virtualField]] = this.id; // Is where[[virtualField]] correct?
-                    return res(this.$$services.resolver.match(modelRef).merge(args).many());
-                  }
-
-                  // Not a "required" query + strip out nulls
-                  args.where.id = $value;
-                  return res(this.$$services.resolver.match(modelRef).merge(args).many());
-                }
-
-                if (isVirtual) {
-                  args.where[[virtualField]] = this.id;
-                  return res(this.$$services.resolver.match(modelRef).merge(args).one());
-                }
-
-                return res(this.$$services.resolver.match(modelRef).id($value).one({ required: isRequired }));
-              }).then((results) => {
-                if (results == null) return field.resolve(this.$$services.query, results); // Allow field to determine
-                return mapPromise(results, result => field.resolve(this.$$services.query, result)).then(() => results); // Resolve the inside fields but still return "results"!!!!
-              }).then(resolve).catch(reject);
-            });
+            // Ensure where clause for DB lookup
+            args.where = args.where || {};
+
+            if (isArray) {
+              if (isVirtual) {
+                args.where[[virtualField]] = this.id; // Is where[[virtualField]] correct?
+                return this.$$services.resolver.match(modelRef).merge(args).many();
+              }
+
+              // Not a "required" query + strip out nulls
+              args.where.id = $value;
+              return this.$$services.resolver.match(modelRef).merge(args).many();
+            }
+
+            if (isVirtual) {
+              args.where[[virtualField]] = this.id;
+              return this.$$services.resolver.match(modelRef).merge(args).one();
+            }
+
+            return this.$$services.resolver.match(modelRef).id($value).one({ required: isRequired });
           };
         },
         enumerable: false,

package/src/data/Type.js

@@ -69,18 +69,4 @@ module.exports = class extends Type {
 
     return transformers;
   }
-
-  getResolvers() {
-    const resolvers = [];
-    const scalarType = this.field.getScalarRef();
-
-    if (scalarType) {
-      Object.entries(scalarType.getDirectiveArgs('field', {})).forEach(([key, value]) => {
-        if (!Array.isArray(value)) value = [value];
-        if (key === 'resolve') resolvers.push(...value.map(t => Transformer.getInstances()[t]));
-      });
-    }
-
-    return resolvers;
-  }
 };

package/src/driver/MongoDriver.js

@@ -1,3 +1,4 @@
+const Util = require('util');
 const { get, has } = require('lodash');
 const { MongoClient, ObjectID } = require('mongodb');
 const { proxyDeep, toKeyObj, globToRegex, proxyPromise, isScalarDataType, promiseRetry } = require('../service/app.service');
@@ -25,7 +26,7 @@ module.exports = class MongoDriver {
   }
 
   query(collection, method, ...args) {
-    if (has(args[args.length - 1], 'debug')) console.log(collection, method, JSON.stringify(args));
+    if (has(args[args.length - 1], 'debug')) console.log(collection, method, Util.inspect(args, { depth: null, showHidden: false, colors: true }));
     return this.raw(collection)[method](...args);
   }
 

package/src/graphql/extension/framework.js

@@ -49,7 +49,6 @@ module.exports = (schema) => {
         onDelete: AutoGraphOnDeleteEnum
 
         enforce: [AutoGraphEnforceEnum!] #
-        resolve: [AutoGraphTransformEnum!] # Transforms when resolving
         transform: [AutoGraphTransformEnum!] # Transforms when serialize + deserialize
         serialize: [AutoGraphTransformEnum!] # Transforms when serialize
         deserialize: [AutoGraphTransformEnum!] # Transforms when deserialize

package/src/data/ResultSetItem.js

@@ -1,178 +0,0 @@
-const { get } = require('lodash');
-const { map, keyPaths, mapPromise, toGUID, hashObject } = require('../service/app.service');
-
-module.exports = class ResultSetItem {
-  constructor(model) {
-    const fields = model.getFields().filter(f => f.getName() !== 'id');
-    this.resultSetItem = this.createResultSetItem(fields);
-  }
-
-  create(query, data) {
-    if (data == null || typeof data !== 'object') return data;
-    Object.assign(this, query.toObject());
-    this.data = data;
-    this.query = query;
-    return this.resultSetItem;
-  }
-
-  createResultSetItem(fields) {
-    const self = this;
-    const cache = new Map();
-
-    const definition = fields.reduce((prev, field) => {
-      const key = field.getKey();
-      const name = field.getName();
-      const $name = `$${name}`;
-
-      // Deserialized field attributes
-      prev[name] = {
-        get() {
-          const value = self.data[key];
-          if (cache.has(name)) return cache.get(name);
-          let $value = field.deserialize(self.query, value);
-          if ($value != null && field.isEmbedded()) {
-            const modelRef = field.getModelRef();
-            const newQuery = self.query.model(modelRef);
-            $value = map($value, $v => modelRef.getResultSetItem().create(newQuery, $v));
-          }
-          cache.set(name, $value);
-          return $value;
-        },
-        set($value) {
-          cache.set(name, $value);
-        },
-        enumerable: true,
-        configurable: true, // Allows things like delete
-      };
-
-      // Fully deserialized, hydrated, and resolved field attributes
-      prev[$name] = {
-        get() {
-          return (args = {}) => {
-            // Ensure where clause
-            args.where = args.where || {};
-
-            // Cache
-            const cacheKey = `${$name}-${hashObject(args)}`;
-            if (cache.has(cacheKey)) return cache.get(cacheKey);
-
-            const promise = new Promise((resolve, reject) => {
-              (() => {
-                const $value = this[name];
-
-                if (field.isScalar() || field.isEmbedded()) return Promise.resolve($value);
-
-                const modelRef = field.getModelRef();
-
-                if (field.isArray()) {
-                  if (field.isVirtual()) {
-                    args.where[[field.getVirtualField()]] = this.id; // Is where[[field.getVirtualField()]] correct?
-                    return self.resolver.match(modelRef).merge(args).many();
-                  }
-
-                  // Not a "required" query + strip out nulls
-                  args.where.id = $value;
-                  return self.resolver.match(modelRef).merge(args).many();
-                }
-
-                if (field.isVirtual()) {
-                  args.where[[field.getVirtualField()]] = this.id;
-                  return self.resolver.match(modelRef).merge(args).one();
-                }
-
-                return self.resolver.match(modelRef).id($value).one({ required: field.isRequired() });
-              })().then((results) => {
-                if (results == null) return field.resolve(self.query, results); // Allow field to determine
-                return mapPromise(results, result => field.resolve(self.query, result)).then(() => results); // Resolve the inside fields but still return "results"!!!!
-              }).then((resolved) => {
-                resolve(resolved);
-              }).catch((e) => {
-                reject(e);
-              });
-            });
-
-            cache.set(cacheKey, promise);
-            return promise;
-          };
-        },
-        enumerable: false,
-      };
-
-      // Field count (let's assume it's a Connection Type - meaning dont try with anything else)
-      prev[`${$name}:count`] = {
-        get() {
-          return (q = {}) => {
-            q.where = q.where || {};
-            if (field.isVirtual()) q.where[field.getVirtualField()] = this.id;
-            else q.where.id = this[name];
-            return self.resolver.match(field.getModelRef()).merge(q).count();
-          };
-        },
-        enumerable: false,
-      };
-
-      return prev;
-    }, {
-      id: {
-        get() { return self.data.id || self.data[self.model.idKey()]; },
-        set(id) { self.data.id = id; }, // Embedded array of documents need to set id
-        enumerable: true,
-      },
-
-      $id: {
-        get() { return toGUID(self.model.getName(), this.id); },
-        enumerable: false,
-      },
-
-      $$cursor: {
-        get() {
-          const sortPaths = keyPaths(self.sort);
-          const sortValues = sortPaths.reduce((prv, path) => Object.assign(prv, { [path]: get(this, path) }), {});
-          const sortJSON = JSON.stringify(sortValues);
-          return Buffer.from(sortJSON).toString('base64');
-        },
-        enumerable: false,
-      },
-
-      $$model: {
-        value: self.model,
-        enumerable: false,
-      },
-
-      $$isResultSetItem: {
-        value: true,
-        enumerable: false,
-      },
-
-      $$save: {
-        get() { return input => self.resolver.match(self.model).id(this.id).save({ ...this, ...input }); },
-        enumerable: false,
-      },
-
-      $$remove: {
-        get() { return () => self.resolver.match(self.model).id(this.id).remove(); },
-        enumerable: false,
-      },
-
-      $$delete: {
-        get() { return () => self.resolver.match(self.model).id(this.id).delete(); },
-        enumerable: false,
-      },
-
-      toObject: {
-        get() {
-          return () => map(this, obj => Object.entries(obj).reduce((prev, [key, value]) => {
-            if (value === undefined) return prev;
-            prev[key] = get(value, '$$isResultSet') ? value.toObject() : value;
-            return prev;
-          }, {}));
-        },
-        enumerable: false,
-        configurable: true,
-      },
-    });
-
-    // Create and return ResultSetItem
-    return Object.defineProperties({}, definition);
-  }
-};

package/src/data/ResultSetNew.js

@@ -1,47 +0,0 @@
-const { get } = require('lodash');
-const DataService = require('./DataService');
-const { map, ensureArray } = require('../service/app.service');
-
-module.exports = class ResultSet {
-  constructor(query, data, adjustForPagination = true) {
-    if (data == null) return data;
-
-    const { model, first, after, last, before } = query.toObject();
-    const rs = map(data, doc => model.getResultSetItem().create(query, doc));
-
-    let hasNextPage = false;
-    let hasPreviousPage = false;
-    if (adjustForPagination && rs.length) (({ hasPreviousPage, hasNextPage } = DataService.paginateResultSet(rs, first, after, last, before)));
-
-    return Object.defineProperties(rs, {
-      $$pageInfo: {
-        get() {
-          const edges = ensureArray(rs);
-
-          return {
-            startCursor: get(edges, '0.$$cursor', ''),
-            endCursor: get(edges, `${edges.length - 1}.$$cursor`, ''),
-            hasPreviousPage,
-            hasNextPage,
-          };
-        },
-        enumerable: false,
-      },
-      $$isResultSet: {
-        value: true,
-        enumerable: false,
-      },
-      toObject: {
-        get() {
-          return () => map(this, doc => Object.entries(doc).reduce((prev, [key, value]) => {
-            if (value === undefined) return prev;
-            prev[key] = get(value, '$$isResultSet') ? value.toObject() : value;
-            return prev;
-          }, {}));
-        },
-        enumerable: false,
-        configurable: true,
-      },
-    });
-  }
-};

package/src/data/ResultSetObj.js

@@ -1,299 +0,0 @@
-const { get } = require('lodash');
-const DataService = require('./DataService');
-const { map, ensureArray, keyPaths, mapPromise, toGUID, hashObject } = require('../service/app.service');
-
-module.exports = class ResultSet {
-  constructor(query, data, adjustForPagination = true) {
-    if (data == null) return data;
-    const { resolver, model, sort, first, after, last, before } = query.toObject();
-    const fields = model.getFields().filter(f => f.getName() !== 'id');
-
-    const rs = map(data, (doc) => {
-      if (doc == null || typeof doc !== 'object') return doc;
-
-      //
-      const cache = new Map();
-
-      const definition = {
-        // $$model: model,
-        $$isResultSetItem: true,
-
-        get id() { return doc.id || doc[model.idKey()]; },
-        set id(id) { doc.id = id; }, // Embedded array of documents need to set id
-        get $id() { return toGUID(model.getName(), this.id); },
-
-        get $$cursor() {
-          const sortPaths = keyPaths(sort);
-          const sortValues = sortPaths.reduce((prv, path) => Object.assign(prv, { [path]: get(this, path) }), {});
-          const sortJSON = JSON.stringify(sortValues);
-          return Buffer.from(sortJSON).toString('base64');
-        },
-
-        $$save: input => resolver.match(model).id(this.id).save({ ...this, ...input }),
-        $$remove: () => resolver.match(model).id(this.id).remove(),
-        $$delete: () => resolver.match(model).id(this.id).delete(),
-
-        get toObject() {
-          return () => map(this, obj => Object.entries(obj).reduce((prev, [key, value]) => {
-            if (value === undefined) return prev;
-            prev[key] = get(value, '$$isResultSet') ? value.toObject() : value;
-            return prev;
-          }, {}));
-        },
-
-        ...fields.reduce((prev, field) => {
-          const key = field.getKey();
-          const name = field.getName();
-          const $name = `$${name}`;
-          const value = doc[key];
-
-          return {
-            ...prev,
-
-            // Deserialized field attributes
-            get [name]() {
-              if (cache.has(name)) return cache.get(name);
-              let $value = field.deserialize(query, value);
-              $value = $value != null && field.isEmbedded() ? new ResultSet(query.model(field.getModelRef()), $value, false) : $value;
-              cache.set(name, $value);
-              return $value;
-            },
-            set [name]($value) {
-              cache.set(name, $value);
-            },
-
-            // Fully deserialized, hydrated, and resolved field attributes
-            get [$name]() {
-              return (args = {}) => {
-                // Ensure where clause
-                args.where = args.where || {};
-
-                // Cache
-                const cacheKey = `${$name}-${hashObject(args)}`;
-                if (cache.has(cacheKey)) return cache.get(cacheKey);
-
-                const promise = new Promise((resolve, reject) => {
-                  (() => {
-                    const $value = this[name];
-
-                    if (field.isScalar() || field.isEmbedded()) return Promise.resolve($value);
-
-                    const modelRef = field.getModelRef();
-
-                    if (field.isArray()) {
-                      if (field.isVirtual()) {
-                        args.where[[field.getVirtualField()]] = this.id; // Is where[[field.getVirtualField()]] correct?
-                        return resolver.match(modelRef).merge(args).many();
-                      }
-
-                      // Not a "required" query + strip out nulls
-                      args.where.id = $value;
-                      return resolver.match(modelRef).merge(args).many();
-                    }
-
-                    if (field.isVirtual()) {
-                      args.where[[field.getVirtualField()]] = this.id;
-                      return resolver.match(modelRef).merge(args).one();
-                    }
-
-                    return resolver.match(modelRef).id($value).one({ required: field.isRequired() });
-                  })().then((results) => {
-                    if (results == null) return field.resolve(query, results); // Allow field to determine
-                    return mapPromise(results, result => field.resolve(query, result)).then(() => results); // Resolve the inside fields but still return "results"!!!!
-                  }).then((resolved) => {
-                    resolve(resolved);
-                  }).catch((e) => {
-                    reject(e);
-                  });
-                });
-
-                cache.set(cacheKey, promise);
-                return promise;
-              };
-            },
-
-            // Field count (let's assume it's a Connection Type - meaning dont try with anything else)
-            get [`${$name}:count`]() {
-              return (q = {}) => {
-                q.where = q.where || {};
-                if (field.isVirtual()) q.where[field.getVirtualField()] = this.id;
-                else q.where.id = this[name];
-                return resolver.match(field.getModelRef()).merge(q).count();
-              };
-            },
-          };
-        }, {}),
-      };
-
-      // const definition = fields.reduce((prev, field) => {
-      //   const key = field.getKey();
-      //   const name = field.getName();
-      //   const $name = `$${name}`;
-      //   const value = doc[key];
-
-      //   return {
-      //     ...prev,
-
-      //     // Deserialized field attributes
-      //     get [name]() {
-      //       if (cache.has(name)) return cache.get(name);
-      //       let $value = field.deserialize(query, value);
-      //       $value = $value != null && field.isEmbedded() ? new ResultSet(query.model(field.getModelRef()), $value, false) : $value;
-      //       cache.set(name, $value);
-      //       return $value;
-      //     },
-      //     set [name]($value) {
-      //       cache.set(name, $value);
-      //     },
-
-      //     // Fully deserialized, hydrated, and resolved field attributes
-      //     get [$name]() {
-      //       return (args = {}) => {
-      //         // Ensure where clause
-      //         args.where = args.where || {};
-
-      //         // Cache
-      //         const cacheKey = `${$name}-${hashObject(args)}`;
-      //         if (cache.has(cacheKey)) return cache.get(cacheKey);
-
-      //         const promise = new Promise((resolve, reject) => {
-      //           (() => {
-      //             const $value = this[name];
-
-      //             if (field.isScalar() || field.isEmbedded()) return Promise.resolve($value);
-
-      //             const modelRef = field.getModelRef();
-
-      //             if (field.isArray()) {
-      //               if (field.isVirtual()) {
-      //                 args.where[[field.getVirtualField()]] = this.id; // Is where[[field.getVirtualField()]] correct?
-      //                 return resolver.match(modelRef).merge(args).many();
-      //               }
-
-      //               // Not a "required" query + strip out nulls
-      //               args.where.id = $value;
-      //               return resolver.match(modelRef).merge(args).many();
-      //             }
-
-      //             if (field.isVirtual()) {
-      //               args.where[[field.getVirtualField()]] = this.id;
-      //               return resolver.match(modelRef).merge(args).one();
-      //             }
-
-      //             return resolver.match(modelRef).id($value).one({ required: field.isRequired() });
-      //           })().then((results) => {
-      //             if (results == null) return field.resolve(query, results); // Allow field to determine
-      //             return mapPromise(results, result => field.resolve(query, result)).then(() => results); // Resolve the inside fields but still return "results"!!!!
-      //           }).then((resolved) => {
-      //             resolve(resolved);
-      //           }).catch((e) => {
-      //             reject(e);
-      //           });
-      //         });
-
-      //         cache.set(cacheKey, promise);
-      //         return promise;
-      //       };
-      //     },
-
-      //     // Field count (let's assume it's a Connection Type - meaning dont try with anything else)
-      //     get [`${$name}:count`]() {
-      //       return (q = {}) => {
-      //         q.where = q.where || {};
-      //         if (field.isVirtual()) q.where[field.getVirtualField()] = this.id;
-      //         else q.where.id = this[name];
-      //         return resolver.match(field.getModelRef()).merge(q).count();
-      //       };
-      //     },
-      //   };
-      // }, {
-      //   get id() { return doc.id || doc[model.idKey()]; },
-      //   set id(id) { doc.id = id; }, // Embedded array of documents need to set id
-
-      //   get $id() { return toGUID(model.getName(), this.id); },
-
-      //   get $$cursor() {
-      //     const sortPaths = keyPaths(sort);
-      //     const sortValues = sortPaths.reduce((prv, path) => Object.assign(prv, { [path]: get(this, path) }), {});
-      //     const sortJSON = JSON.stringify(sortValues);
-      //     return Buffer.from(sortJSON).toString('base64');
-      //   },
-
-      //   $$model: model,
-      //   $$isResultSetItem: true,
-      //   $$save: input => resolver.match(model).id(this.id).save({ ...this, ...input }),
-      //   $$remove: () => resolver.match(model).id(this.id).remove(),
-      //   $$delete: () => resolver.match(model).id(this.id).delete(),
-
-      //   get toObject() {
-      //     return () => map(this, obj => Object.entries(obj).reduce((prev, [key, value]) => {
-      //       if (value === undefined) return prev;
-      //       prev[key] = get(value, '$$isResultSet') ? value.toObject() : value;
-      //       return prev;
-      //     }, {}));
-      //   },
-      // });
-
-      return definition;
-    });
-
-    let hasNextPage = false;
-    let hasPreviousPage = false;
-    if (adjustForPagination && rs.length) (({ hasPreviousPage, hasNextPage } = DataService.paginateResultSet(rs, first, after, last, before)));
-
-    return Object.defineProperties(rs, {
-      $$pageInfo: {
-        get() {
-          const edges = ensureArray(rs);
-
-          return {
-            startCursor: get(edges, '0.$$cursor', ''),
-            endCursor: get(edges, `${edges.length - 1}.$$cursor`, ''),
-            hasPreviousPage,
-            hasNextPage,
-          };
-        },
-        enumerable: false,
-      },
-      $$isResultSet: {
-        value: true,
-        enumerable: false,
-      },
-      toObject: {
-        get() {
-          return () => map(this, doc => Object.entries(doc).reduce((prev, [key, value]) => {
-            if (value === undefined) return prev;
-            prev[key] = get(value, '$$isResultSet') ? value.toObject() : value;
-            return prev;
-          }, {}));
-        },
-        enumerable: false,
-        configurable: true,
-      },
-    });
-
-    // const idk = {
-    //   ...rs,
-    //   $$isResultSet: true,
-    //   get $$pageInfo() {
-    //     const edges = ensureArray(rs);
-
-    //     return {
-    //       startCursor: get(edges, '0.$$cursor', ''),
-    //       endCursor: get(edges, `${edges.length - 1}.$$cursor`, ''),
-    //       hasPreviousPage,
-    //       hasNextPage,
-    //     };
-    //   },
-    //   get toObject() {
-    //     return () => map(this, doc => Object.entries(doc).reduce((prev, [key, value]) => {
-    //       if (value === undefined) return prev;
-    //       prev[key] = get(value, '$$isResultSet') ? value.toObject() : value;
-    //       return prev;
-    //     }, {}));
-    //   },
-    // };
-
-    // return idk;
-  }
-};

package/src/data/ResultSetOriginal.js

@@ -1,208 +0,0 @@
-const { get } = require('lodash');
-const DataService = require('./DataService');
-const { map, ensureArray, keyPaths, mapPromise, toGUID, hashObject } = require('../service/app.service');
-
-module.exports = class ResultSet {
-  constructor(query, data, adjustForPagination = true) {
-    if (data == null) return data;
-
-    const { resolver, model, sort, first, after, last, before } = query.toObject();
-    const fields = model.getFields().filter(f => f.getName() !== 'id');
-
-    const rs = map(data, (doc) => {
-      if (doc == null || typeof doc !== 'object') return doc;
-
-      //
-      const cache = new Map();
-
-      const definition = fields.reduce((prev, field) => {
-        const key = field.getKey();
-        const name = field.getName();
-        const $name = `$${name}`;
-        const value = doc[key];
-
-        // Deserialized field attributes
-        prev[name] = {
-          // value,
-          get() {
-            if (cache.has(name)) return cache.get(name);
-            let $value = field.deserialize(query, value);
-            $value = $value != null && field.isEmbedded() ? new ResultSet(query.model(field.getModelRef()), $value, false) : $value;
-            cache.set(name, $value);
-            return $value;
-          },
-          set($value) {
-            cache.set(name, $value);
-          },
-          enumerable: true,
-          configurable: true, // Allows things like delete
-        };
-
-        // Fully deserialized, hydrated, and resolved field attributes
-        prev[$name] = {
-          // value: () => value,
-          get() {
-            return (args = {}) => {
-              // Ensure where clause
-              args.where = args.where || {};
-
-              // Cache
-              const cacheKey = `${$name}-${hashObject(args)}`;
-              if (cache.has(cacheKey)) return cache.get(cacheKey);
-
-              const promise = new Promise((resolve, reject) => {
-                (() => {
-                  const $value = this[name];
-
-                  if (field.isScalar() || field.isEmbedded()) return Promise.resolve($value);
-
-                  const modelRef = field.getModelRef();
-
-                  if (field.isArray()) {
-                    if (field.isVirtual()) {
-                      args.where[[field.getVirtualField()]] = this.id; // Is where[[field.getVirtualField()]] correct?
-                      return resolver.match(modelRef).merge(args).many();
-                    }
-
-                    // Not a "required" query + strip out nulls
-                    args.where.id = $value;
-                    return resolver.match(modelRef).merge(args).many();
-                  }
-
-                  if (field.isVirtual()) {
-                    args.where[[field.getVirtualField()]] = this.id;
-                    return resolver.match(modelRef).merge(args).one();
-                  }
-
-                  return resolver.match(modelRef).id($value).one({ required: field.isRequired() });
-                })().then((results) => {
-                  if (results == null) return field.resolve(query, results); // Allow field to determine
-                  return mapPromise(results, result => field.resolve(query, result)).then(() => results); // Resolve the inside fields but still return "results"!!!!
-                }).then((resolved) => {
-                  resolve(resolved);
-                }).catch((e) => {
-                  reject(e);
-                });
-              });
-
-              cache.set(cacheKey, promise);
-              return promise;
-            };
-          },
-          enumerable: false,
-        };
-
-        // Field count (let's assume it's a Connection Type - meaning dont try with anything else)
-        prev[`${$name}:count`] = {
-          get() {
-            return (q = {}) => {
-              q.where = q.where || {};
-              if (field.isVirtual()) q.where[field.getVirtualField()] = this.id;
-              else q.where.id = this[name];
-              return resolver.match(field.getModelRef()).merge(q).count();
-            };
-          },
-          enumerable: false,
-        };
-
-        return prev;
-      }, {
-        id: {
-          get() { return doc.id || doc[model.idKey()]; },
-          set(id) { doc.id = id; }, // Embedded array of documents need to set id
-          enumerable: true,
-        },
-
-        $id: {
-          get() { return toGUID(model.getName(), this.id); },
-          enumerable: false,
-        },
-
-        $$cursor: {
-          get() {
-            const sortPaths = keyPaths(sort);
-            const sortValues = sortPaths.reduce((prv, path) => Object.assign(prv, { [path]: get(this, path) }), {});
-            const sortJSON = JSON.stringify(sortValues);
-            return Buffer.from(sortJSON).toString('base64');
-          },
-          enumerable: false,
-        },
-
-        $$model: {
-          value: model,
-          enumerable: false,
-        },
-
-        $$isResultSetItem: {
-          value: true,
-          enumerable: false,
-        },
-
-        $$save: {
-          get() { return input => resolver.match(model).id(this.id).save({ ...this, ...input }); },
-          enumerable: false,
-        },
-
-        $$remove: {
-          get() { return () => resolver.match(model).id(this.id).remove(); },
-          enumerable: false,
-        },
-
-        $$delete: {
-          get() { return () => resolver.match(model).id(this.id).delete(); },
-          enumerable: false,
-        },
-
-        toObject: {
-          get() {
-            return () => map(this, obj => Object.entries(obj).reduce((prev, [key, value]) => {
-              if (value === undefined) return prev;
-              prev[key] = get(value, '$$isResultSet') ? value.toObject() : value;
-              return prev;
-            }, {}));
-          },
-          enumerable: false,
-          configurable: true,
-        },
-      });
-
-      // Create and return ResultSetItem
-      return Object.defineProperties({}, definition);
-    });
-
-    let hasNextPage = false;
-    let hasPreviousPage = false;
-    if (adjustForPagination && rs.length) (({ hasPreviousPage, hasNextPage } = DataService.paginateResultSet(rs, first, after, last, before)));
-
-    return Object.defineProperties(rs, {
-      $$pageInfo: {
-        get() {
-          const edges = ensureArray(rs);
-
-          return {
-            startCursor: get(edges, '0.$$cursor', ''),
-            endCursor: get(edges, `${edges.length - 1}.$$cursor`, ''),
-            hasPreviousPage,
-            hasNextPage,
-          };
-        },
-        enumerable: false,
-      },
-      $$isResultSet: {
-        value: true,
-        enumerable: false,
-      },
-      toObject: {
-        get() {
-          return () => map(this, doc => Object.entries(doc).reduce((prev, [key, value]) => {
-            if (value === undefined) return prev;
-            prev[key] = get(value, '$$isResultSet') ? value.toObject() : value;
-            return prev;
-          }, {}));
-        },
-        enumerable: false,
-        configurable: true,
-      },
-    });
-  }
-};