$isPersisted not being set on array elements when using ConnectionMode.PLAIN

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuex-orm/plugin-graphql",
-  "version": "1.0.0-rc.36",
+  "version": "1.0.0-jr03",
   "description": "Vuex-ORM persistence plugin to sync the store against a GraphQL API.",
   "main": "dist/vuex-orm-graphql.umd.js",
   "module": "dist/vuex-orm-graphql.es5.js",
@@ -52,8 +52,7 @@
     "url": "https://github.com/vuex-orm/plugin-graphql/issues"
   },
   "dependencies": {
-    "apollo-cache-inmemory": "^1.1.7",
-    "app": "latest"
+    "apollo-cache-inmemory": "^1.1.7"
   },
   "peerDependencies": {
     "@vuex-orm/core": "^0.31.12"

src/actions/action.ts

@@ -7,6 +7,7 @@ import RootState from "@vuex-orm/core/lib/modules/contracts/RootState";
 import Transformer from "../graphql/transformer";
 import Schema from "../graphql/schema";
 import { singularize } from "../support/utils";
+import { GraphQLType } from "../support/interfaces";
 
 /**
  * Base class for all Vuex actions. Contains some utility and convenience methods.
@@ -46,19 +47,19 @@ export default class Action {
         newData.id = parseInt(newData.id, 10);
 
         const insertedData: Data = await Store.insertData(
-          { [model.pluralName]: newData } as Data,
+          { [model.singularName]: newData } as Data,
           dispatch
         );
 
         // Try to find the record to return
-        const records = insertedData[model.pluralName];
+        const records = insertedData[model.singularName];
         const newRecord = records[records.length - 1];
         if (newRecord) {
           return newRecord;
         } else {
           Context.getInstance().logger.log(
             "Couldn't find the record of type '",
-            model.pluralName,
+            model.singularName,
             "' within",
             insertedData,
             ". Falling back to find()"
@@ -104,7 +105,12 @@ export default class Action {
    * @returns {Arguments}
    */
   static addRecordToArgs(args: Arguments, model: Model, data: Data): Arguments {
-    args[model.singularName] = Transformer.transformOutgoingData(model, data, false);
+    args[model.singularName] = Transformer.transformOutgoingData(
+      model,
+      data,
+      false,
+      this.getInputType(model)
+    );
     return args;
   }
 
@@ -121,7 +127,12 @@ export default class Action {
 
       if (value instanceof context.components.Model) {
         const model = context.getModel(singularize(value.$self().entity));
-        const transformedValue = Transformer.transformOutgoingData(model, value, false);
+        const transformedValue = Transformer.transformOutgoingData(
+          model,
+          value,
+          false,
+          this.getInputType(model)
+        );
         context.logger.log(
           "A",
           key,
@@ -136,4 +147,15 @@ export default class Action {
 
     return args;
   }
+
+  /**
+   * Gets the mutation input type for the given model
+   * @param {Model} model
+   * @returns {GraphQLType | null}
+   */
+  protected static getInputType(model: Model): GraphQLType | null {
+    const context: Context = Context.getInstance();
+    const inputTypeName: string = context.adapter.getInputTypeName(model);
+    return context.schema!.getType(inputTypeName);
+  }
 }

src/actions/fetch.ts

@@ -40,6 +40,7 @@ export default class Fetch extends Action {
         model,
         params.filter as Data,
         true,
+        undefined,
         Object.keys(params.filter)
       );
     }

src/actions/persist.ts

@@ -21,7 +21,12 @@ export default class Persist extends Action {
     if (id) {
       const model = this.getModelFromState(state!);
       const mutationName = Context.getInstance().adapter.getNameForPersist(model);
-      const oldRecord = model.getRecordWithId(id)!;
+
+      const oldRecord = model.baseModel
+        .query()
+        .withAllRecursive()
+        .where("$id", id)
+        .first()!;
 
       const mockReturnValue = model.$mockHook("persist", {
         id,

src/graphql/transformer.ts

@@ -10,6 +10,7 @@ import {
   singularize
 } from "../support/utils";
 import { ConnectionMode } from "../adapters/adapter";
+import { GraphQLType, GraphQLField } from "../support/interfaces";
 
 /**
  * This class provides methods to transform incoming data from GraphQL in to a format Vuex-ORM understands and
@@ -32,13 +33,15 @@ export default class Transformer {
     model: Model,
     data: Data,
     read: boolean,
+    inputType?: GraphQLType | null,
     whitelist?: Array<String>,
     outgoingRecords?: Map<string, Array<string>>,
     recursiveCall?: boolean
   ): Data {
     const context = Context.getInstance();
     const relations: Map<string, Relation> = model.getRelations();
     const returnValue: Data = {} as Data;
+    const inputFields = inputType ? inputType.inputFields : undefined;
     if (outgoingRecords === undefined) outgoingRecords = new Map<string, Array<string>>();
     if (recursiveCall === undefined) recursiveCall = false;
 
@@ -64,7 +67,8 @@ export default class Transformer {
           key,
           value,
           model,
-          whitelist
+          whitelist,
+          inputFields
         )
       ) {
         let relatedModel = Model.getRelatedModel(relations.get(key)!);
@@ -81,6 +85,7 @@ export default class Transformer {
                 v,
                 read,
                 undefined,
+                undefined,
                 outgoingRecords,
                 true
               );
@@ -102,6 +107,7 @@ export default class Transformer {
             value,
             read,
             undefined,
+            undefined,
             outgoingRecords,
             true
           );
@@ -176,6 +182,12 @@ export default class Transformer {
             result[key] = parseFloat(data[key]);
           } else if (key.endsWith("Type") && model.isTypeFieldOfPolymorphicRelation(key)) {
             result[key] = pluralize(downcaseFirstLetter(data[key]));
+          } else if (Array.isArray(data[key]) && recursiveCall) {
+            const relation: Relation | undefined = model.getRelations().get(key);
+            if (relation) {
+              const related: Model | null = Model.getRelatedModel(relation)!;
+              result[key] = this.transformIncomingData(data[key], related, mutation, true);
+            }
           } else {
             result[key] = data[key];
           }
@@ -201,14 +213,16 @@ export default class Transformer {
    * @param {any} value Value of the field.
    * @param {Model} model Model class which contains the field.
    * @param {Array<String>|undefined} whitelist Contains a list of fields which should always be included.
+   * @param {Array<GraphQLField>|undefined} schemaFields Contains a list of schema fields which are defined in the model input type for the mutation.
    * @returns {boolean}
    */
   public static shouldIncludeOutgoingField(
     forFilter: boolean,
     fieldName: string,
     value: any,
     model: Model,
-    whitelist?: Array<String>
+    whitelist?: Array<String>,
+    schemaFields?: Array<GraphQLField>
   ): boolean {
     // Always add fields on the whitelist.
     if (whitelist && whitelist.includes(fieldName)) return true;
@@ -219,6 +233,9 @@ export default class Transformer {
     // Ignore empty fields
     if (value === null || value === undefined) return false;
 
+    // Is the field in the mutation type field list, if provided?
+    if (schemaFields && !schemaFields.find(f => f.name === fieldName)) return false;
+
     // Include all eager save connections
     if (model.getRelations().has(fieldName)) {
       // We never add relations to filters.

src/orm/model.ts

@@ -67,9 +67,7 @@ export default class Model {
     if (!field) return false;
 
     const context = Context.getInstance();
-    return (
-      field instanceof context.components.Number || field instanceof context.components.Increment
-    );
+    return field instanceof context.components.Number;
   }
 
   /**
@@ -81,7 +79,6 @@ export default class Model {
     const context = Context.getInstance();
 
     return (
-      field instanceof context.components.Increment ||
       field instanceof context.components.Attr ||
       field instanceof context.components.String ||
       field instanceof context.components.Number ||