@ddd-qc/cell-proxy 0.9.8 → 0.10.1

package/dist/ConductorAppProxy.js

@@ -1,7 +1,8 @@
+import { __awaiter } from "tslib";
 import { AppWebsocket, } from "@holochain/client";
 import { CellProxy } from "./CellProxy";
-import { CellIdStr, destructureRoleInstanceId } from "./types";
-import { prettyDate } from "./utils";
+import { CellIdStr, destructureCloneName, createCloneName } from "./types";
+import { areCellsEqual, intoCell, prettyDate } from "./utils";
 import { HCL } from "./hcl";
 /**
  * Creates, connects and holds a appWebsocket.
@@ -15,7 +16,7 @@ export class ConductorAppProxy {
     /** -- Getters -- */
     /** */
     getAppCells(appId) {
-        return this._installedCellsByApp[appId];
+        return this._cellsByApp[appId];
     }
     /** */
     getLocations(cellId) {
@@ -23,28 +24,20 @@ export class ConductorAppProxy {
     }
     /** */
     getCell(hcl) {
-        const roleCellsMap = this._installedCellsByApp[hcl.appId];
+        const roleCellsMap = this._cellsByApp[hcl.appId];
         if (!roleCellsMap)
             throw Error(`getCell() failed. No hApp with ID "${hcl.appId}" found.`);
         const roleCells = roleCellsMap[hcl.baseRoleName];
         if (!roleCells)
             throw Error(`getCell() failed: BaseRoleName "${hcl.baseRoleName}" not found in happ "${hcl.appId}"`);
-        let installedCell = roleCells.original;
-        if (hcl.cloneName !== undefined) {
-            installedCell = roleCells.clones[hcl.cloneName];
-            if (!installedCell) {
-                throw Error(`getCell() failed: clone "${hcl.cloneName}" not found for role "${hcl.appId}/${hcl.baseRoleName}"`);
+        let cell = roleCells.provisioned;
+        if (hcl.cloneId !== undefined) {
+            cell = roleCells.clones[hcl.cloneId];
+            if (!cell) {
+                throw Error(`getCell() failed: clone "${hcl.cloneId}" not found for role "${hcl.appId}/${hcl.baseRoleName}"`);
             }
         }
-        else {
-            if (hcl.cloneIndex !== undefined) {
-                installedCell = roleCells.clones[String(hcl.cloneIndex)];
-                if (!installedCell) {
-                    throw Error(`getCell() failed: clone "${hcl.cloneIndex}" not found for role "${hcl.appId}/${hcl.baseRoleName}"`);
-                }
-            }
-        }
-        return installedCell;
+        return cell;
     }
     /** Get stored CellProxy or attempt to create it */
     getCellProxy(cellIdOrLoc) {
@@ -62,16 +55,16 @@ export class ConductorAppProxy {
         return maybeProxy;
     }
     /** */
-    getAppRoleInstanceIds(installedAppId) {
-        if (!this._installedCellsByApp[installedAppId])
+    getAppRoles(installedAppId) {
+        if (!this._cellsByApp[installedAppId])
             return undefined;
-        return Object.values(this._installedCellsByApp[installedAppId]).map((roleCells) => {
-            return roleCells.original.role_id;
+        return Object.values(this._cellsByApp[installedAppId]).map((roleCells) => {
+            return roleCells.provisioned.name;
         });
     }
     /** */
     getClones(appId, baseRoleName) {
-        const maybeApp = this._installedCellsByApp[appId];
+        const maybeApp = this._cellsByApp[appId];
         if (!maybeApp)
             return [];
         const roleInstalledCells = maybeApp[baseRoleName];
@@ -79,123 +72,172 @@ export class ConductorAppProxy {
             return [];
         return Object.values(roleInstalledCells.clones);
     }
+    createCloneCell(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            //console.log("createCloneCell() called:", request)
+            return this._appWs.createCloneCell(request);
+        });
+    }
     /** -- AppApi (Passthrough to appWebsocket) -- */
-    async createCloneCell(request) {
-        //console.log("createCloneCell() called:", request)
-        return this._appWs.createCloneCell(request);
+    enableCloneCell(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            //console.log("enableCloneCell() called:", request)
+            return this._appWs.enableCloneCell(request);
+        });
     }
-    async archiveCloneCell(request) {
-        //console.log("archiveCloneCell() called:", request)
-        this._appWs.archiveCloneCell(request);
+    disableCloneCell(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            //console.log("disableCloneCell() called:", request)
+            this._appWs.disableCloneCell(request);
+        });
     }
-    async appInfo(args) {
-        return this._appWs.appInfo(args);
+    appInfo(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this._appWs.appInfo(args);
+        });
     }
-    async callZome(req, timeout) {
-        timeout = timeout ? timeout : this.defaultTimeout;
-        return this._appWs.callZome(req, timeout);
+    callZome(req, timeout) {
+        return __awaiter(this, void 0, void 0, function* () {
+            timeout = timeout ? timeout : this.defaultTimeout;
+            return this._appWs.callZome(req, timeout);
+        });
     }
     /** -- Creation -- */
     /** async Factory */
-    static async new(port_or_socket, defaultTimeout) {
-        if (typeof port_or_socket == 'object') {
-            return ConductorAppProxy.fromSocket(port_or_socket);
-        }
-        else {
-            const timeout = defaultTimeout ? defaultTimeout : 10 * 1000;
-            let wsUrl = `ws://localhost:${port_or_socket}`;
+    static new(port_or_socket, defaultTimeout) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (typeof port_or_socket == 'object') {
+                return ConductorAppProxy.fromSocket(port_or_socket);
+            }
+            else {
+                const timeout = defaultTimeout ? defaultTimeout : 10 * 1000;
+                let wsUrl = `ws://localhost:${port_or_socket}`;
+                try {
+                    let conductor = new ConductorAppProxy(timeout);
+                    conductor._appWs = yield AppWebsocket.connect(wsUrl, timeout);
+                    conductor._appWs.on('signal', (sig) => { conductor.onSignal(sig); });
+                    return conductor;
+                }
+                catch (e) {
+                    console.error("ConductorAppProxy initialization failed", e);
+                    return Promise.reject("ConductorAppProxy initialization failed");
+                }
+            }
+        });
+    }
+    /** */
+    static fromSocket(appWebsocket) {
+        return __awaiter(this, void 0, void 0, function* () {
             try {
-                let conductor = new ConductorAppProxy(timeout);
-                conductor._appWs = await AppWebsocket.connect(wsUrl, timeout, (sig) => { conductor.onSignal(sig); });
+                let conductor = new ConductorAppProxy(appWebsocket.defaultTimeout);
+                conductor._appWs = appWebsocket;
+                conductor._appWs.on('signal', (sig) => { conductor.onSignal(sig); });
                 return conductor;
             }
             catch (e) {
                 console.error("ConductorAppProxy initialization failed", e);
                 return Promise.reject("ConductorAppProxy initialization failed");
             }
-        }
-    }
-    /** */
-    static async fromSocket(appWebsocket) {
-        try {
-            let conductor = new ConductorAppProxy(appWebsocket.defaultTimeout);
-            conductor._appWs = appWebsocket;
-            console.warn("Using pre-existing AppWebsocket. ConductorAppProxy's 'onSignal()' SignalHandler needs to be set by the provider of the AppWebsocket.");
-            return conductor;
-        }
-        catch (e) {
-            console.error("ConductorAppProxy initialization failed", e);
-            return Promise.reject("ConductorAppProxy initialization failed");
-        }
+        });
     }
     /** Ctor */
     constructor(defaultTimeout) {
         this.defaultTimeout = defaultTimeout;
-        /** [Timestamp, CellIdStr, Signal] */
+        /** Signal log: [Timestamp, CellIdStr, Signal] */
         this._signalLogs = [];
-        /** InstalledAppId -> (BaseRoleName -> RoleInstalledCells) */
-        this._installedCellsByApp = {};
-        /** CellIdStr -> HCL[] */
+        /** Map cells per App: InstalledAppId -> (BaseRoleName -> RoleInstalledCells) */
+        this._cellsByApp = {};
+        /** Map cell locations: CellIdStr -> HCL[] */
         this._hclMap = {};
-        /** HCLString -> AppSignalCb */
+        /** Store handlers per cell locaiton: HCLString -> AppSignalCb */
         this._signalHandlers = {};
-        /** CellIdStr -> CellProxy */
+        /** Store cell proxies per cell: CellIdStr -> CellProxy */
         this._cellProxies = {};
         const _unsub = this.addSignalHandler((sig) => this.logSignal(sig));
     }
     /** -- Methods -- */
-    async fetchCells(appId, baseRoleName) {
-        /** Make sure hApp exists */
-        const installedAppInfo = await this.appInfo({ installed_app_id: appId });
-        if (installedAppInfo == null) {
-            Promise.reject(`fetchCells() failed. App "${appId}" not found on AppWebsocket "${this._appWs.client.socket.url}"`);
-        }
-        //console.log("fetchCells() installedAppInfo:\n", printAppInfo(installedAppInfo));
-        /** Make sure app Object exists */
-        if (!this._installedCellsByApp[appId]) {
-            this._installedCellsByApp[appId] = {};
-        }
-        /** Get all cells with that baseRoleName */
-        let original;
-        let clones = {};
-        for (const curCell of installedAppInfo.cell_data) {
-            //console.log(`CreateCellProxy(): Found cell "${installedCell.role_id}":`, CellIdStr(installedCell.cell_id));
-            const maybePair = destructureRoleInstanceId(curCell.role_id);
-            const curBaseName = maybePair ? maybePair[0] : curCell.role_id;
-            if (curBaseName !== baseRoleName) {
-                continue;
+    /** */
+    fetchCell(appId, cellId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const appInfo = yield this.appInfo({ installed_app_id: appId });
+            //console.log("fetchCell", appInfo);
+            if (appInfo == null) {
+                Promise.reject(`getCell() failed. App "${appId}" not found on AppWebsocket "${this._appWs.client.socket.url}"`);
             }
-            if (maybePair) {
-                if (clones["" + maybePair[1]]) {
-                    console.error(`fetchCells() Proxy already exist for clone: "${maybePair[0]}/${maybePair[1]}"`);
+            for (const cellInfos of Object.values(appInfo.cell_info)) {
+                for (const cellInfo of Object.values(cellInfos)) {
+                    const cell = intoCell(cellInfo);
+                    if (cell === undefined) {
+                        continue;
+                    }
+                    if (areCellsEqual(cell.cell_id, cellId)) {
+                        return cell;
+                    }
                 }
-                clones["" + maybePair[1]] = curCell;
             }
-            else {
-                original = curCell;
+            Promise.reject("getCell() failed. Cell not found for app.");
+        });
+    }
+    /** */
+    fetchCells(appId, baseRoleName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            /** Make sure hApp exists */
+            const appInfo = yield this.appInfo({ installed_app_id: appId });
+            if (appInfo == null) {
+                Promise.reject(`fetchCells() failed. App "${appId}" not found on AppWebsocket "${this._appWs.client.socket.url}"`);
             }
-        }
-        if (!original) {
-            Promise.reject("Original cell not found for role " + baseRoleName);
-        }
-        let roleInstalledCells = { original, clones };
-        /** Store it*/
-        this._installedCellsByApp[appId][baseRoleName] = roleInstalledCells;
-        return roleInstalledCells;
+            //console.log("fetchCells() installedAppInfo:\n", printAppInfo(installedAppInfo));
+            /** Make sure app Object exists */
+            if (!this._cellsByApp[appId]) {
+                this._cellsByApp[appId] = {};
+            }
+            /** Get all cells with that baseRoleName */
+            let provisioned;
+            let clones = {};
+            for (const [roleName, cellInfos] of Object.entries(appInfo.cell_info)) {
+                for (const cellInfo of Object.values(cellInfos)) {
+                    const cell = intoCell(cellInfo);
+                    if (cell === undefined) {
+                        continue;
+                    }
+                    //console.log(`CreateCellProxy(): Found cell "${installedCell.role_id}":`, CellIdStr(installedCell.cell_id));
+                    const maybePair = destructureCloneName(roleName);
+                    const curBaseName = maybePair ? maybePair[0] : roleName;
+                    if (curBaseName !== baseRoleName) {
+                        continue;
+                    }
+                    if (maybePair) {
+                        if (clones["" + maybePair[1]]) {
+                            console.error(`fetchCells() Proxy already exist for clone: "${maybePair[0]}/${maybePair[1]}"`);
+                        }
+                        clones["" + maybePair[1]] = cell;
+                    }
+                    else {
+                        provisioned = cell;
+                    }
+                }
+            }
+            if (typeof provisioned === 'undefined') {
+                Promise.reject("Provisioned cell not found for role " + baseRoleName);
+            }
+            let roleInstalledCells = { provisioned: provisioned, clones };
+            /** Store it*/
+            this._cellsByApp[appId][baseRoleName] = roleInstalledCells;
+            return roleInstalledCells;
+        });
     }
     /** */
     addClone(hcl, cloneCell) {
-        if (!this._installedCellsByApp[hcl.appId])
+        if (!this._cellsByApp[hcl.appId])
             throw Error("addCloneInstalledCell() failed. no appId. " + hcl.toString());
-        if (!this._installedCellsByApp[hcl.appId][hcl.baseRoleName])
+        if (!this._cellsByApp[hcl.appId][hcl.baseRoleName])
             throw Error("addCloneInstalledCell() failed. no baseRoleName. " + hcl.toString());
-        if (hcl.cloneName !== undefined) {
-            this._installedCellsByApp[hcl.appId][hcl.baseRoleName].clones[hcl.cloneName] = cloneCell;
-            return;
+        let cloneName = hcl.cloneId;
+        if (hcl.cloneId === undefined) {
+            const cloneIndex = Object.keys(this._cellsByApp[hcl.appId][hcl.baseRoleName].clones).length;
+            cloneName = createCloneName(hcl.baseRoleName, cloneIndex);
         }
-        if (hcl.cloneIndex === undefined)
-            throw Error("addCloneInstalledCell() failed. Missing cloneIndex " + hcl.toString());
-        this._installedCellsByApp[hcl.appId][hcl.baseRoleName].clones[String(hcl.cloneIndex)] = cloneCell;
+        this._cellsByApp[hcl.appId][hcl.baseRoleName].clones[cloneName] = cloneCell;
         // const sCellId = CellIdStr(cloneCell.cell_id);
         // console.log("CreateCellProxy() adding to hclMap", sCellId, cellLoc.asHcl())
         // if (this._hclMap[sCellId]) {
@@ -208,13 +250,13 @@ export class ConductorAppProxy {
     createCellProxy(hcl) {
         //console.log("createCellProxy() for", hcl.toString());
         /** Make sure cell exists */
-        const installedCell = this.getCell(hcl);
-        const sCellId = CellIdStr(installedCell.cell_id);
+        const cell = this.getCell(hcl);
+        const sCellId = CellIdStr(cell.cell_id);
         /** Create proxy for this cell if none exist yet, otherwise reuse */
         let cellProxy = this._cellProxies[sCellId];
         if (!cellProxy) {
             /** Create and store Proxy */
-            cellProxy = new CellProxy(this, installedCell, this.defaultTimeout);
+            cellProxy = new CellProxy(this, cell, this.defaultTimeout);
             this._cellProxies[sCellId] = cellProxy;
         }
         /** Create CellId -> HCL mapping */

package/dist/ConductorAppProxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConductorAppProxy.js","sourceRoot":"","sources":["../src/ConductorAppProxy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ConductorAppProxy.js","sourceRoot":"","sources":["../src/ConductorAppProxy.ts"],"names":[],"mappings":"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"}

package/dist/ZomeProxy.d.ts

@@ -1,27 +1,34 @@
-import { CapSecret, CellId, InstalledCell, ZomeName } from "@holochain/client";
-import { AgentPubKeyB64, EntryHashB64 } from "@holochain-open-dev/core-types";
+import { CapSecret, FunctionName, ZomeName } from "@holochain/client";
 import { ZomeSpecific } from "./mixins";
 import { CellProxy } from "./CellProxy";
-import { IInstalledCell, RoleInstanceId } from "./types";
 export type ZomeProxyConstructor = {
     new (cellProxy: CellProxy, zomeName?: ZomeName): ZomeProxy;
 } & typeof ZomeSpecific;
+declare const ZomeProxy_base: (abstract new (...args: any[]) => {
+    _cell?: import("@holochain/client").Cell;
+    readonly cell: import("@holochain/client").Cell;
+    readonly cellId: import("@holochain/client").CellId;
+    readonly dnaHash: string;
+    readonly agentPubKey: string;
+}) & ((abstract new (...args: any[]) => {
+    zomeName: string;
+    readonly defaultZomeName: string;
+    readonly fnNames: [string, string][];
+}) & {
+    readonly DEFAULT_ZOME_NAME: string;
+    readonly FN_NAMES: string[];
+}) & typeof import("./mixins").Empty;
 /**
  * ABC for representing the zome function bindings of a Zome.
  * It holds the zomeName and reference to a CellProxy.
  */
-export declare abstract class ZomeProxy extends ZomeSpecific implements IInstalledCell {
+export declare abstract class ZomeProxy extends ZomeProxy_base {
     protected _cellProxy: CellProxy;
     /** Ctor */
     constructor(_cellProxy: CellProxy, zomeName?: ZomeName);
-    /** InstalledCell interface */
-    get installedCell(): InstalledCell;
-    get roleInstanceId(): RoleInstanceId;
-    get cellId(): CellId;
-    get dnaHash(): EntryHashB64;
-    get agentPubKey(): AgentPubKeyB64;
     /** Helper for calling a zome function on its zome */
-    protected call(fn_name: string, payload: any, maybeSecret?: CapSecret, timeout?: number): Promise<any>;
+    protected call(fnName: FunctionName, payload: any, maybeSecret?: CapSecret, timeout?: number): Promise<any>;
     /** Helper for calling a zome function on its zome */
-    protected callBlocking(fn_name: string, payload: any, maybeSecret?: CapSecret, timeout?: number): Promise<any>;
+    protected callBlocking(fnName: FunctionName, payload: any, maybeSecret?: CapSecret, timeout?: number): Promise<any>;
 }
+export {};

package/dist/ZomeProxy.js

@@ -1,9 +1,10 @@
-import { ZomeSpecific } from "./mixins";
+import { __awaiter } from "tslib";
+import { CellMixin, ZomeSpecific } from "./mixins";
 /**
  * ABC for representing the zome function bindings of a Zome.
  * It holds the zomeName and reference to a CellProxy.
  */
-export class ZomeProxy extends ZomeSpecific {
+export class ZomeProxy extends CellMixin(ZomeSpecific) {
     /** Ctor */
     constructor(_cellProxy, zomeName) {
         super();
@@ -12,28 +13,45 @@ export class ZomeProxy extends ZomeSpecific {
             this.zomeName = zomeName;
         }
         else {
-            if (!this.getDefaultZomeName()) {
+            if (!this.defaultZomeName) {
                 throw Error("zomeName not defined in ZomeProxy subclass " + this.constructor.name);
             }
         }
+        this._cell = _cellProxy.cell;
     }
-    /** InstalledCell interface */
-    get installedCell() { return this._cellProxy.installedCell; }
-    get roleInstanceId() { return this._cellProxy.roleInstanceId; }
-    get cellId() { return this._cellProxy.cellId; }
-    get dnaHash() { return this._cellProxy.dnaHash; }
-    get agentPubKey() { return this._cellProxy.agentPubKey; }
+    // private _signingProps?: {
+    //   capSecret: CapSecret;
+    //   keyPair: nacl.SignKeyPair;
+    //   signingKey: AgentPubKey;
+    // };
+    // setSigningProps(signingProps: { capSecret: CapSecret; keyPair: nacl.SignKeyPair; signingKey: AgentPubKey}): void {
+    //   this._signingProps = signingProps;
+    // }
     /** Helper for calling a zome function on its zome */
-    async call(fn_name, payload, maybeSecret, timeout) {
-        //console.log("ZomeProxy.call", this.zomeName)
-        const cap_secret = maybeSecret ? maybeSecret : null;
-        return this._cellProxy.callZome(this.zomeName, fn_name, payload, cap_secret, timeout);
+    call(fnName, payload, maybeSecret, timeout) {
+        return __awaiter(this, void 0, void 0, function* () {
+            //console.log("ZomeProxy.call", this.zomeName)
+            if (!this.constructor.FN_NAMES.includes(fnName)) {
+                Promise.reject(`Function "${fnName}()" not part of zome "${this.zomeName}"`);
+            }
+            const cap_secret = maybeSecret
+                ? maybeSecret
+                // : this._signingProps
+                //   ? this._signingProps.capSecret
+                : null;
+            return this._cellProxy.callZome(this.zomeName, fnName, payload, cap_secret, timeout);
+        });
     }
     /** Helper for calling a zome function on its zome */
-    async callBlocking(fn_name, payload, maybeSecret, timeout) {
-        //console.log("ZomeProxy.call", this.zomeName)
-        const cap_secret = maybeSecret ? maybeSecret : null;
-        return this._cellProxy.callZomeBlocking(this.zomeName, fn_name, payload, cap_secret, timeout);
+    callBlocking(fnName, payload, maybeSecret, timeout) {
+        return __awaiter(this, void 0, void 0, function* () {
+            //console.log("ZomeProxy.call", this.zomeName)
+            if (!this.constructor.FN_NAMES.includes(fnName)) {
+                Promise.reject(`Function "${fnName}()" not part of zome "${this.zomeName}"`);
+            }
+            const cap_secret = maybeSecret ? maybeSecret : null;
+            return this._cellProxy.callZomeBlocking(this.zomeName, fnName, payload, cap_secret, timeout);
+        });
     }
 }
 //# sourceMappingURL=ZomeProxy.js.map

package/dist/ZomeProxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"ZomeProxy.js","sourceRoot":"","sources":["../src/ZomeProxy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AAQtC;;;GAGG;AACH,MAAM,OAAgB,SAAU,SAAQ,YAAY;IAElD,WAAW;IACX,YAAsB,UAAqB,EAAE,QAAmB;QAC9D,KAAK,EAAE,CAAC;QADY,eAAU,GAAV,UAAU,CAAW;QAEzC,IAAI,QAAQ,EAAE;YAAC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;SAAC;aAClC;YACH,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE;gBAC9B,MAAM,KAAK,CAAC,6CAA6C,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aACpF;SACF;IACL,CAAC;IAED,8BAA8B;IAC9B,IAAI,aAAa,KAAoB,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAA,CAAC,CAAC;IAC3E,IAAI,cAAc,KAAqB,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,CAAA,CAAC,CAAC;IAC9E,IAAI,MAAM,KAAa,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAA,CAAC,CAAC;IACtD,IAAI,OAAO,KAAmB,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAA,CAAA,CAAC;IAC7D,IAAI,WAAW,KAAqB,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAA,CAAC,CAAC;IAExE,qDAAqD;IAC3C,KAAK,CAAC,IAAI,CAAC,OAAe,EAAE,OAAY,EAAE,WAAuB,EAAE,OAAgB;QAC3F,8CAA8C;QAC9C,MAAM,UAAU,GAAG,WAAW,CAAA,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;QACnD,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACxF,CAAC;IAED,qDAAqD;IAC3C,KAAK,CAAC,YAAY,CAAC,OAAe,EAAE,OAAY,EAAE,WAAuB,EAAE,OAAgB;QACnG,8CAA8C;QAC9C,MAAM,UAAU,GAAG,WAAW,CAAA,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;QACnD,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAChG,CAAC;CAEF"}
+{"version":3,"file":"ZomeProxy.js","sourceRoot":"","sources":["../src/ZomeProxy.ts"],"names":[],"mappings":";AACA,OAAO,EAAC,SAAS,EAAE,YAAY,EAAC,MAAM,UAAU,CAAC;AAMjD;;;GAGG;AACH,MAAM,OAAgB,SAAU,SAAQ,SAAS,CAAC,YAAY,CAAC;IAE7D,WAAW;IACX,YAAsB,UAAqB,EAAE,QAAmB;QAC9D,KAAK,EAAE,CAAC;QADY,eAAU,GAAV,UAAU,CAAW;QAEzC,IAAI,QAAQ,EAAE;YACZ,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;SAC1B;aAAM;YACL,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;gBACzB,MAAM,KAAK,CAAC,6CAA6C,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aACpF;SACF;QACD,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC;IAC/B,CAAC;IAGD,4BAA4B;IAC5B,0BAA0B;IAC1B,+BAA+B;IAC/B,6BAA6B;IAC7B,KAAK;IACL,qHAAqH;IACrH,uCAAuC;IACvC,IAAI;IAEJ,qDAAqD;IACrC,IAAI,CAAC,MAAoB,EAAE,OAAY,EAAE,WAAuB,EAAE,OAAgB;;YAChG,8CAA8C;YAC9C,IAAI,CAAE,IAAI,CAAC,WAAmB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBACxD,OAAO,CAAC,MAAM,CAAC,aAAa,MAAM,yBAAyB,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;aAC9E;YACD,MAAM,UAAU,GAAG,WAAW;gBAC5B,CAAC,CAAC,WAAW;gBACb,uBAAuB;gBACvB,mCAAmC;gBACjC,CAAC,CAAC,IAAI,CAAC;YACX,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QACvF,CAAC;KAAA;IAED,qDAAqD;IACrC,YAAY,CAAC,MAAoB,EAAE,OAAY,EAAE,WAAuB,EAAE,OAAgB;;YACxG,8CAA8C;YAC9C,IAAI,CAAE,IAAI,CAAC,WAAmB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBACxD,OAAO,CAAC,MAAM,CAAC,aAAa,MAAM,yBAAyB,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;aAC9E;YACD,MAAM,UAAU,GAAG,WAAW,CAAA,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;YACnD,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QAC/F,CAAC;KAAA;CAEF"}

package/dist/hcl.d.ts

@@ -1,25 +1,21 @@
-import { InstalledAppId } from "@holochain/client";
-import { BaseRoleName, CloneIndex, RoleInstanceId } from "./types";
+import { InstalledAppId, RoleName } from "@holochain/client";
+import { BaseRoleName } from "./types";
 /** -- HCL: Holochain Cell Locator -- */
 export type HCLString = string;
 /**
- * Even when a clone is named the HCL must know its cloneIndex. It is however not displayed when in string form.
+ * `cell:/<appId>/<BaseRoleName>/<cloneName>`
  * Examples
  * `cell:/where/profiles`
- * `cell:/chatApp/channel/2`
+ * `cell:/chatApp/channel/channel.2`
  * `cell:/chatApp/channel/europe`
  */
 export declare class HCL {
     readonly appId: InstalledAppId;
-    readonly roleInstanceId: RoleInstanceId;
     readonly baseRoleName: BaseRoleName;
-    /** A Cell can have a name and an index */
-    readonly cloneName?: string;
-    readonly cloneIndex?: CloneIndex;
+    /** A Cell can have a ncloneId */
+    readonly cloneId?: string;
     /** Ctor */
-    constructor(appId: InstalledAppId, roleInstanceId: RoleInstanceId);
-    constructor(appId: InstalledAppId, baseRoleName: BaseRoleName, cloneIndex: CloneIndex);
-    constructor(appId: InstalledAppId, baseRoleName: BaseRoleName, cloneIndex: CloneIndex, cloneName: string);
+    constructor(appId: InstalledAppId, role: BaseRoleName, cloneId?: RoleName);
     /** */
     static parse(sHcl: HCLString): HCL;
     /** */