refactor: remove neoSchema from OGM properties

packages/ogm/src/classes/OGM.test.ts

@@ -17,7 +17,6 @@
  * limitations under the License.
  */
 
-import { printSchema } from "graphql";
 import OGM from "./OGM";
 
 describe("OGM", () => {
@@ -27,16 +26,6 @@ describe("OGM", () => {
     });
 
     describe("methods", () => {
-        describe("constructor", () => {
-            test("should evoke the filterDocument method", () => {
-                const ogm = new OGM({ typeDefs: `type User @auth {id:ID}` });
-
-                const printed = printSchema(ogm.neoSchema.schema);
-
-                expect(printed.includes("@auth")).toBeFalsy();
-            });
-        });
-
         describe("checkNeo4jCompat", () => {
             test("should neo4j-driver Driver missing", async () => {
                 // @ts-ignore

packages/ogm/src/classes/OGM.ts

@@ -24,22 +24,26 @@ import { filterDocument } from "../utils";
 export type OGMConstructor = Neo4jGraphQLConstructor;
 
 class OGM {
-    public neoSchema: Neo4jGraphQL;
-
     public models: Model[];
 
-    public input: OGMConstructor;
+    checkNeo4jCompat: () => Promise<void>;
 
     constructor(input: OGMConstructor) {
-        this.input = input;
         const { typeDefs, ...rest } = input;
 
-        this.neoSchema = new Neo4jGraphQL({
+        const neoSchema = new Neo4jGraphQL({
             ...rest,
             typeDefs: filterDocument(typeDefs),
         });
 
-        this.models = this.neoSchema.nodes.map((n) => {
+        this.checkNeo4jCompat = function checkNeo4jCompat() {
+            return neoSchema.checkNeo4jCompat({
+                driver: rest.driver,
+                ...(rest.config?.driverConfig ? { driverConfig: rest.config.driverConfig } : {}),
+            });
+        };
+
+        this.models = neoSchema.nodes.map((n) => {
             const selectionSet = `
                 {
                     ${[n.primitiveFields, n.scalarFields, n.enumFields, n.dateTimeFields].reduce(
@@ -50,7 +54,7 @@ class OGM {
             `;
 
             return new Model({
-                neoSchema: this.neoSchema,
+                neoSchema,
                 name: n.name,
                 selectionSet,
             });
@@ -66,12 +70,6 @@ class OGM {
 
         return found;
     }
-
-    checkNeo4jCompat(): Promise<void> {
-        const { driver, config: { driverConfig } = {} } = this.input;
-
-        return this.neoSchema.checkNeo4jCompat({ driver, driverConfig });
-    }
 }
 
 export default OGM;

packages/ogm/tests/integration/ogm.int.test.ts

@@ -50,6 +50,39 @@ describe("OGM", () => {
         await session.close();
     });
 
+    test("should filter the document and remove directives such as auth", async () => {
+        const session = driver.session();
+
+        const typeDefs = `
+            type Movie @auth(rules: [{ isAuthenticated: true }]){
+                id: ID
+            }
+        `;
+
+        const ogm = new OGM({ typeDefs, driver });
+
+        const id = generate({
+            charset: "alphabetic",
+        });
+
+        try {
+            await ogm.checkNeo4jCompat();
+
+            await session.run(`
+                CREATE (:Movie {id: "${id}"})
+            `);
+
+            const Movie = ogm.model("Movie");
+
+            const movies = await Movie?.find({ where: { id } });
+
+            // should return without error due to the fact auth should be removed
+            expect(movies).toEqual([{ id }]);
+        } finally {
+            await session.close();
+        }
+    });
+
     describe("find", () => {
         test("find a single node", async () => {
             const session = driver.session();