@diory/client-js 0.4.3 → 0.4.4-rc10

package/dist/dioryClient/dioryClient.d.ts

@@ -1,5 +1,6 @@
 import { IDataClient } from '@diory/types';
 import { IDiograph, IDiographObject } from '@diograph/diograph';
+import { GenerateDiographOptions } from '@diograph/folder-generator';
 import { IDioryClient } from '../types';
 export declare class DioryClient implements IDioryClient {
     diographs: {
@@ -10,6 +11,6 @@ export declare class DioryClient implements IDioryClient {
     addDiograph: (address: string, diographObject: IDiographObject) => IDioryClient;
     getDiograph: (address: string) => IDiograph | undefined;
     fetchDiograph: (address: string) => Promise<IDioryClient>;
-    generateDiograph: (address: string, saveDiograph?: boolean) => Promise<IDioryClient>;
+    generateDiograph: (address: string, path?: string, options?: GenerateDiographOptions) => Promise<IDioryClient>;
     saveDiograph: (address: string) => () => any;
 }

package/dist/dioryClient/dioryClient.js

@@ -9,11 +9,11 @@ const resolveConnection = (address) => {
     const addressArray = (address || '').split('/') || [];
     return {
         client: addressArray[0],
-        path: addressArray.slice(1, -1).join('/'),
+        root: addressArray.slice(1, -1).join('/'),
         id: addressArray[addressArray.length - 1],
     };
 };
-const getDiographKey = (connection) => `${connection.client}/${connection.path}`;
+const getDiographKey = (connection) => `${connection.client}/${connection.root}/`;
 const findDataClient = (dataClients, client) => {
     return dataClients.find(({ type }) => type === client);
 };
@@ -33,33 +33,33 @@ class DioryClient {
             return this.diographs[diographKey];
         };
         this.fetchDiograph = async (address) => {
-            const { client, path } = resolveConnection(address);
+            const { client, root } = resolveConnection(address);
             const dataClient = findDataClient(this.dataClients, client);
             if (dataClient) {
-                const diographString = await dataClient.readTextItem((0, path_browserify_1.join)(path, DIOGRAPH_JSON));
+                const diographString = await dataClient.readTextItem((0, path_browserify_1.join)(root, DIOGRAPH_JSON));
                 if (diographString)
                     this.addDiograph(address, JSON.parse(diographString));
             }
             return this;
         };
-        this.generateDiograph = async (address, saveDiograph) => {
-            const { client, path } = resolveConnection(address);
+        this.generateDiograph = async (address, path = '/', options) => {
+            const { client, root } = resolveConnection(address);
             const dataClient = findDataClient(this.dataClients, client);
             if (dataClient) {
                 // TODO save based on client properties
-                const diographObject = await (0, folder_generator_1.generateDiograph)(path, '/', dataClient, { saveDiograph });
+                const diographObject = await (0, folder_generator_1.generateDiograph)(root, path, dataClient, options);
                 if (diographObject)
-                    this.addDiograph(address, diographObject);
+                    this.addDiograph((0, path_browserify_1.join)(address, path), diographObject);
             }
             return this;
         };
         this.saveDiograph = (address) => (0, debounce_1.debounce)(async () => {
-            const { client, path } = resolveConnection(address);
+            const { client, root } = resolveConnection(address);
             const dataClient = findDataClient(this.dataClients, client);
             if (dataClient) {
                 const diograph = this.getDiograph(address);
                 if (diograph)
-                    dataClient.writeItem((0, path_browserify_1.join)(path, DIOGRAPH_JSON), diograph.toJson());
+                    dataClient.writeItem((0, path_browserify_1.join)(root, DIOGRAPH_JSON), diograph.toJson());
             }
             return;
         }, 1000);

package/dist/types.d.ts

@@ -2,7 +2,7 @@ import { IDataClient } from '@diory/types';
 import { IDiograph } from '@diograph/diograph';
 export type IConnectionObject = {
     client: string;
-    path: string;
+    root: string;
     id: string;
 };
 export interface IDioryClient {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@diory/client-js",
-  "version": "0.4.3",
+  "version": "0.4.4-rc10",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Olli-Pekka Pohjola <op@diory.me>, Jouni Alanen <jouni@diory.me>",
   "license": "MIT",
   "dependencies": {
     "@diograph/diograph": "^0.4.3",
-    "@diograph/folder-generator": "^0.4.3",
+    "@diograph/folder-generator": "0.4.4-rc5",
     "path-browserify": "^1.0.1",
     "uuid": "8.3.2"
   },

package/src/dioryClient/dioryClient.ts

@@ -1,7 +1,7 @@
 import { join } from 'path-browserify'
 import { IDataClient } from '@diory/types'
 import { Diograph, IDiograph, IDiographObject } from '@diograph/diograph'
-import { generateDiograph } from '@diograph/folder-generator'
+import { generateDiograph, GenerateDiographOptions } from '@diograph/folder-generator'
 
 import { IConnectionObject, IDioryClient } from '../types'
 
@@ -11,12 +11,12 @@ const resolveConnection = (address: string): IConnectionObject => {
   const addressArray = (address || '').split('/') || []
   return {
     client: addressArray[0],
-    path: addressArray.slice(1, -1).join('/'),
+    root: addressArray.slice(1, -1).join('/'),
     id: addressArray[addressArray.length - 1],
   }
 }
 
-const getDiographKey = (connection: IConnectionObject) => `${connection.client}/${connection.path}`
+const getDiographKey = (connection: IConnectionObject) => `${connection.client}/${connection.root}/`
 
 const findDataClient = (dataClients: IDataClient[], client: string): IDataClient | undefined => {
   return dataClients.find(({ type }) => type === client)
@@ -48,23 +48,27 @@ export class DioryClient implements IDioryClient {
   }
 
   fetchDiograph = async (address: string): Promise<IDioryClient> => {
-    const { client, path } = resolveConnection(address)
+    const { client, root } = resolveConnection(address)
     const dataClient = findDataClient(this.dataClients, client)
     if (dataClient) {
-      const diographString = await dataClient.readTextItem(join(path, DIOGRAPH_JSON))
+      const diographString = await dataClient.readTextItem(join(root, DIOGRAPH_JSON))
       if (diographString) this.addDiograph(address, JSON.parse(diographString))
     }
 
     return this
   }
 
-  generateDiograph = async (address: string, saveDiograph?: boolean): Promise<IDioryClient> => {
-    const { client, path } = resolveConnection(address)
+  generateDiograph = async (
+    address: string,
+    path = '/',
+    options?: GenerateDiographOptions,
+  ): Promise<IDioryClient> => {
+    const { client, root } = resolveConnection(address)
     const dataClient = findDataClient(this.dataClients, client)
     if (dataClient) {
       // TODO save based on client properties
-      const diographObject = await generateDiograph(path, '/', dataClient, { saveDiograph })
-      if (diographObject) this.addDiograph(address, diographObject)
+      const diographObject = await generateDiograph(root, path, dataClient, options)
+      if (diographObject) this.addDiograph(join(address, path), diographObject)
     }
 
     return this
@@ -72,11 +76,11 @@ export class DioryClient implements IDioryClient {
 
   saveDiograph = (address: string) =>
     debounce(async () => {
-      const { client, path } = resolveConnection(address)
+      const { client, root } = resolveConnection(address)
       const dataClient = findDataClient(this.dataClients, client)
       if (dataClient) {
         const diograph = this.getDiograph(address)
-        if (diograph) dataClient.writeItem(join(path, DIOGRAPH_JSON), diograph.toJson())
+        if (diograph) dataClient.writeItem(join(root, DIOGRAPH_JSON), diograph.toJson())
       }
 
       return

package/src/types.ts

@@ -3,7 +3,7 @@ import { IDiograph } from '@diograph/diograph'
 
 export type IConnectionObject = {
   client: string
-  path: string
+  root: string
   id: string
 }