@rxdi/neo4j 0.7.154 → 0.7.156

package/dist/index.js

@@ -31,6 +31,7 @@ const core_1 = require("@rxdi/core");
 const injection_tokens_1 = require("./injection.tokens");
 const graphql_1 = require("@rxdi/graphql");
 const neo4j_service_1 = require("./neo4j.service");
+const ogm_provider_1 = require("./ogm.provider");
 let Neo4JModule = Neo4JModule_1 = class Neo4JModule {
     static forRoot(config = {}) {
         return {
@@ -59,14 +60,14 @@ let Neo4JModule = Neo4JModule_1 = class Neo4JModule {
                             deps: [neo4j_service_1.UtilService, injection_tokens_1.NEO4J_DRIVER],
                             useFactory: (util, driver) => (schema) => __awaiter(this, void 0, void 0, function* () { return util.augmentSchema(schema)(driver); })
                         }
-                    ])
+                    ]),
             ]
         };
     }
 };
 Neo4JModule = Neo4JModule_1 = __decorate([
     (0, core_1.Module)({
-        providers: [neo4j_service_1.UtilService]
+        providers: [neo4j_service_1.UtilService, ogm_provider_1.OGMProvider]
     })
 ], Neo4JModule);
 exports.Neo4JModule = Neo4JModule;

package/dist/injection.tokens.d.ts

@@ -7,6 +7,7 @@ export interface NEO4J_MODULE_CONFIG {
     password?: string;
     address?: string | 'bolt://localhost:7687';
     schemaOverride?(schema: GraphQLSchema): GraphQLSchema;
+    schema?: Promise<string>;
 }
 export interface RelationshipType {
     searchIndex?: string;

package/dist/neo4j.service.d.ts

@@ -1,13 +1,16 @@
 import { NEO4J_DRIVER, NEO4J_MODULE_CONFIG } from './injection.tokens';
 import * as neo4j from 'neo4j-driver';
 import { GraphQLSchema } from 'graphql';
+import { OGMProvider } from './ogm.provider';
 export declare class UtilService {
     private config;
-    constructor(config: NEO4J_MODULE_CONFIG);
+    private ogmProvider;
+    constructor(config: NEO4J_MODULE_CONFIG, ogmProvider: OGMProvider);
     private extendSchemaDirectives;
     private validateSchema;
     private replaceAll;
     augmentSchema(schema: GraphQLSchema): (driver: NEO4J_DRIVER) => Promise<GraphQLSchema>;
+    initOgmClient(typeDefs: string): (driver: NEO4J_DRIVER) => Promise<void>;
     mergeSchemas(...schemas: GraphQLSchema[]): GraphQLSchema;
     createDriver(): neo4j.Driver;
     generateTypeDefs(schema: GraphQLSchema): string;

package/dist/neo4j.service.js

@@ -28,9 +28,12 @@ const graphql_tools_1 = require("graphql-tools");
 const neo4j = require("neo4j-driver");
 const graphql_1 = require("@neo4j/graphql");
 const graphql_2 = require("graphql");
+const ogm_provider_1 = require("./ogm.provider");
+const graphql_ogm_1 = require("@neo4j/graphql-ogm");
 let UtilService = class UtilService {
-    constructor(config) {
+    constructor(config, ogmProvider) {
         this.config = config;
+        this.ogmProvider = ogmProvider;
     }
     extendSchemaDirectives(augmentedSchema, schema) {
         augmentedSchema['_directives'] = schema['_directives'];
@@ -48,14 +51,29 @@ let UtilService = class UtilService {
     augmentSchema(schema) {
         return (driver) => __awaiter(this, void 0, void 0, function* () {
             this.validateSchema(schema);
+            const typedSchema = yield this.config.schema;
             const typeDefs = this.generateTypeDefs(schema);
             const neoSchema = new graphql_1.Neo4jGraphQL({
-                typeDefs,
+                typeDefs: `${typeDefs} ${typedSchema !== null && typedSchema !== void 0 ? typedSchema : ''}`,
                 driver,
                 assumeValidSDL: true,
             });
             const augmentedSchema = yield neoSchema.getSchema();
-            return this.extendSchemaDirectives(augmentedSchema, schema);
+            const newSchema = this.extendSchemaDirectives(augmentedSchema, schema);
+            yield this.initOgmClient(typeDefs)(driver);
+            return newSchema;
+        });
+    }
+    initOgmClient(typeDefs) {
+        return (driver) => __awaiter(this, void 0, void 0, function* () {
+            const ogm = new graphql_ogm_1.OGM({
+                assumeValidSDL: true,
+                assumeValid: true,
+                typeDefs,
+                driver
+            });
+            yield ogm.init();
+            this.ogmProvider.client = ogm;
         });
     }
     mergeSchemas(...schemas) {
@@ -110,6 +128,6 @@ let UtilService = class UtilService {
 UtilService = __decorate([
     (0, core_1.Injectable)(),
     __param(0, (0, core_1.Inject)(injection_tokens_1.NEO4J_MODULE_CONFIG)),
-    __metadata("design:paramtypes", [Object])
+    __metadata("design:paramtypes", [Object, ogm_provider_1.OGMProvider])
 ], UtilService);
 exports.UtilService = UtilService;

package/dist/ogm.provider.d.ts

@@ -0,0 +1,4 @@
+import { OGM } from '@neo4j/graphql-ogm';
+export declare class OGMProvider<T = OGM> {
+    client: OGM<T>;
+}

package/dist/ogm.provider.js

@@ -0,0 +1,16 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OGMProvider = void 0;
+const core_1 = require("@gapi/core");
+let OGMProvider = class OGMProvider {
+};
+OGMProvider = __decorate([
+    (0, core_1.Injectable)()
+], OGMProvider);
+exports.OGMProvider = OGMProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdi/neo4j",
-  "version": "0.7.154",
+  "version": "0.7.156",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -26,15 +26,16 @@
   },
   "homepage": "https://github.com/rxdi/neo4j/blob/master/README.md",
   "dependencies": {
-    "@neo4j/graphql": "^3.8.0",
+    "@neo4j/graphql": "^3.9.0",
+    "@neo4j/graphql-ogm": "^3.9.0",
     "neo4j-driver": "^5.0.1"
   },
   "devDependencies": {
     "graphql": "^14.5.8",
     "@types/graphql": "^14.5.0",
     "graphql-tools": "^5.0.0",
-    "@rxdi/core": "^0.7.153",
-    "@rxdi/graphql": "^0.7.153",
+    "@rxdi/core": "^0.7.155",
+    "@rxdi/graphql": "^0.7.155",
     "@types/hapi": "^18.0.4",
     "@types/jest": "^24.0.22",
     "@types/node": "^12.0.10",