@diory/client-js 0.2.0-rc19 → 0.2.0-rc20

package/dist/dioryClient/dioryClient.d.ts

@@ -19,6 +19,7 @@ declare class DioryClient implements IDioryClient {
     initialiseDiograph: (roomObject: IRoomObject) => Promise<IDiograph>;
     getDiograph: (connections?: IConnectionObject[]) => Promise<IDiographObject | undefined>;
     saveDiograph: (connections?: IConnectionObject[]) => Promise<IDiographObject>;
-    generateDiograph: (connections?: IConnectionObject[]) => Promise<IDiograph>;
+    mergeDiograph: (diographObject: IDiographObject) => Promise<void>;
+    generateDiograph: (connections?: IConnectionObject[]) => Promise<IDiographObject | undefined>;
 }
 export { DioryClient };

package/dist/dioryClient/dioryClient.js

@@ -4,9 +4,9 @@ exports.DioryClient = void 0;
 const diosphere_js_1 = require("@diory/diosphere-js");
 const diograph_1 = require("@diograph/diograph");
 const getConnectionClients_1 = require("../utils/getConnectionClients");
+const debounce_1 = require("../connectionClient/utils/debounce");
 const getDefaultDiosphere_1 = require("./getDefaultDiosphere");
 const getDefaultDiograph_1 = require("./getDefaultDiograph");
-const debounce_1 = require("../connectionClient/utils/debounce");
 class DioryClient {
     constructor(dataClients) {
         this.dataClients = [];
@@ -24,7 +24,6 @@ class DioryClient {
             this.diosphere.resetRooms();
             const diosphereObject = (_a = (await this.getDiosphere())) !== null && _a !== void 0 ? _a : (0, getDefaultDiosphere_1.getDefaultDiosphere)(connections);
             this.diosphere.addDiosphere(diosphereObject);
-            await this.saveDiosphere();
             this.selectRoom({ id: '/' });
             console.info(this.diosphere.toObject());
             return this.diosphere;
@@ -68,7 +67,6 @@ class DioryClient {
             this.diograph.resetDiograph();
             const diographObject = (_a = (await this.getDiograph())) !== null && _a !== void 0 ? _a : (0, getDefaultDiograph_1.getDefaultDiograph)();
             this.diograph.addDiograph(diographObject);
-            await this.saveDiograph();
             this.focusDiory({ id: '/' });
             console.info(this.diograph.toObject());
             return this.diograph;
@@ -98,26 +96,29 @@ class DioryClient {
             }));
             return diographObject;
         };
+        this.mergeDiograph = async (diographObject) => {
+            Object.entries(diographObject).forEach(([key, dioryObject]) => {
+                try {
+                    key === '/'
+                        ? this.diograph.addDioryLink({ id: '/' }, diographObject['/'])
+                        : this.diograph.addDiory(dioryObject);
+                }
+                catch (error) {
+                    console.error(error);
+                }
+            });
+            await this.saveDiograph();
+            console.info(this.diograph.toObject());
+        };
         this.generateDiograph = async (connections) => {
             console.info('generateDiograph', connections);
+            let diographObject;
             await Promise.all(this.getDiographClients(connections).map(async (connectionClient) => {
-                const diographObject = await connectionClient.generateDiograph();
+                diographObject = await connectionClient.generateDiograph();
                 console.info(diographObject);
-                Object.entries(diographObject).forEach(([key, dioryObject]) => {
-                    try {
-                        key === '/'
-                            ? this.diograph.addDioryLink({ id: '/' }, diographObject['/'])
-                            : this.diograph.addDiory(dioryObject);
-                    }
-                    catch (error) {
-                        console.error(error);
-                    }
-                });
-                await connectionClient.saveDiograph(this.diograph.toObject());
-                console.info(this.diograph.toObject());
                 return;
             }));
-            return this.diograph;
+            return diographObject;
         };
         this.dataClients = dataClients;
         this.diosphere = new diosphere_js_1.Diosphere();

package/dist/types.d.ts

@@ -56,5 +56,5 @@ export interface IDioryClient {
     getDiograph: () => Promise<IDiographObject | undefined>;
     saveDiograph: () => Promise<IDiographObject>;
     initialiseDiograph: (roomObject: IRoomObject) => Promise<IDiograph>;
-    generateDiograph: () => Promise<IDiograph>;
+    generateDiograph: () => Promise<IDiographObject | undefined>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diory/client-js",
-  "version": "0.2.0-rc19",
+  "version": "0.2.0-rc20",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Olli-Pekka Pohjola <op@diory.me>, Jouni Alanen <jouni@diory.me>",

package/src/dioryClient/dioryClient.ts

@@ -10,10 +10,10 @@ import { Diograph, IDiograph, IDiographObject, IDiory, IDioryObject } from '@dio
 
 import { IDioryClient, IDataClient } from '../types'
 import { getConnectionClients } from '../utils/getConnectionClients'
+import { debounce } from '../connectionClient/utils/debounce'
 
 import { getDefaultDiosphere } from './getDefaultDiosphere'
 import { getDefaultDiograph } from './getDefaultDiograph'
-import { debounce } from '../connectionClient/utils/debounce'
 
 class DioryClient implements IDioryClient {
   dataClients: IDataClient[] = []
@@ -48,7 +48,6 @@ class DioryClient implements IDioryClient {
     this.diosphere.resetRooms()
     const diosphereObject = (await this.getDiosphere()) ?? getDefaultDiosphere(connections)
     this.diosphere.addDiosphere(diosphereObject)
-    await this.saveDiosphere()
 
     this.selectRoom({ id: '/' })
 
@@ -107,7 +106,6 @@ class DioryClient implements IDioryClient {
     this.diograph.resetDiograph()
     const diographObject = (await this.getDiograph()) ?? getDefaultDiograph()
     this.diograph.addDiograph(diographObject)
-    await this.saveDiograph()
 
     this.focusDiory({ id: '/' })
 
@@ -149,32 +147,36 @@ class DioryClient implements IDioryClient {
     return diographObject
   }
 
-  generateDiograph = async (connections?: IConnectionObject[]): Promise<IDiograph> => {
+  mergeDiograph = async (diographObject: IDiographObject) => {
+    Object.entries(diographObject).forEach(([key, dioryObject]) => {
+      try {
+        key === '/'
+          ? this.diograph.addDioryLink({ id: '/' }, diographObject['/'])
+          : this.diograph.addDiory(dioryObject)
+      } catch (error) {
+        console.error(error)
+      }
+    })
+
+    await this.saveDiograph()
+    console.info(this.diograph.toObject())
+  }
+
+  generateDiograph = async (
+    connections?: IConnectionObject[],
+  ): Promise<IDiographObject | undefined> => {
     console.info('generateDiograph', connections)
 
+    let diographObject
     await Promise.all(
       this.getDiographClients(connections).map(async (connectionClient) => {
-        const diographObject = await connectionClient.generateDiograph()
+        diographObject = await connectionClient.generateDiograph()
         console.info(diographObject)
-
-        Object.entries(diographObject).forEach(([key, dioryObject]) => {
-          try {
-            key === '/'
-              ? this.diograph.addDioryLink({ id: '/' }, diographObject['/'])
-              : this.diograph.addDiory(dioryObject)
-          } catch (error) {
-            console.error(error)
-          }
-        })
-
-        await connectionClient.saveDiograph(this.diograph.toObject())
-        console.info(this.diograph.toObject())
-
         return
       }),
     )
 
-    return this.diograph
+    return diographObject
   }
 }
 

package/src/types.ts

@@ -66,5 +66,5 @@ export interface IDioryClient {
   getDiograph: () => Promise<IDiographObject | undefined>
   saveDiograph: () => Promise<IDiographObject>
   initialiseDiograph: (roomObject: IRoomObject) => Promise<IDiograph>
-  generateDiograph: () => Promise<IDiograph>
+  generateDiograph: () => Promise<IDiographObject | undefined>
 }