@ddd-qc/cell-proxy 0.9.8 → 0.10.1

package/dist/hcl.js

@@ -1,35 +1,16 @@
-import { destructureRoleInstanceId } from "./types";
 /**
- * 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 class HCL {
-    constructor(appId, role, cloneIndex, cloneName) {
+    /** Ctor */
+    constructor(appId, role, cloneId) {
         this.appId = appId;
         this.baseRoleName = role;
-        if (cloneName !== undefined) {
-            this.cloneName = cloneName;
-            this.cloneIndex = cloneIndex;
-        }
-        else {
-            if (cloneIndex !== undefined) {
-                //this.cloneName = String(cloneIndex);
-                this.cloneIndex = cloneIndex;
-            }
-            else {
-                const maybe = destructureRoleInstanceId(role);
-                if (maybe !== undefined) {
-                    this.baseRoleName = maybe[0];
-                    this.cloneIndex = maybe[1];
-                }
-            }
-        }
-        this.roleInstanceId = cloneIndex === undefined
-            ? role
-            : role + "." + cloneIndex;
+        this.cloneId = cloneId;
     }
     /** */
     static parse(sHcl) {
@@ -37,41 +18,26 @@ export class HCL {
         //console.log({subs});
         if (subs[0] !== "cell:")
             throw Error("HCL.parse() Bad string format: " + sHcl);
-        if (subs.length < 3)
+        if (subs.length < 2)
             throw Error("HCL.parse() Bad string format. Too few components: " + sHcl);
-        if (subs.length > 5)
+        if (subs.length > 4)
             throw Error("HCL.parse() Bad string format. Too many components: " + sHcl);
-        if (subs.length == 5) {
-            const index = Number(subs[3]);
-            if (isNaN(index) || index < 0)
-                throw Error("HCL.parse() Invalid clone Index:" + index);
-            return new HCL(subs[1], subs[2], index, subs[3]);
-        }
         if (subs.length == 4) {
-            const index = Number(subs[3]);
-            if (isNaN(index) || index < 0)
-                throw Error("HCL.parse() Missing clone Index when cloneName is provided: " + sHcl);
-            return new HCL(subs[1], subs[2], index);
+            return new HCL(subs[1], subs[2], subs[3]);
         }
         return new HCL(subs[1], subs[2]);
     }
     /** */
     toString() {
         let hcl = "cell:/" + this.appId + "/" + this.baseRoleName;
-        const maybeCloneName = this.cloneName;
-        if (maybeCloneName !== undefined) {
-            hcl += "/" + maybeCloneName;
-        }
-        else {
-            const maybeCloneIndex = this.cloneIndex;
-            if (maybeCloneIndex !== undefined) {
-                hcl += "/" + maybeCloneIndex;
-            }
+        const maybeCloneName = this.cloneId;
+        if (this.isClone()) {
+            hcl += "/" + this.cloneId;
         }
         return hcl;
     }
     isClone() {
-        return this.cloneIndex !== undefined;
+        return this.cloneId !== undefined;
     }
     /** */
     match(hcl) {
@@ -82,7 +48,7 @@ export class HCL {
         if (hcl.isClone()) {
             if (!this.isClone())
                 return false;
-            if (hcl.cloneName != this.cloneName)
+            if (hcl.cloneId != this.cloneId)
                 return false;
         }
         return true;

package/dist/hcl.js.map

@@ -1 +1 @@
-{"version":3,"file":"hcl.js","sourceRoot":"","sources":["../src/hcl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hcl.js","sourceRoot":"","sources":["../src/hcl.ts"],"names":[],"mappings":"AAQA;;;;;;GAMG;AACH,MAAM,OAAO,GAAG;IASd,WAAW;IACX,YAAY,KAAqB,EAAE,IAAkB,EAAE,OAAkB;QACvE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAGD,MAAM;IACN,MAAM,CAAC,KAAK,CAAC,IAAe;QAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7B,sBAAsB;QACtB,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO;YAAE,MAAM,KAAK,CAAC,iCAAiC,GAAG,IAAI,CAAC,CAAC;QAC/E,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,KAAK,CAAC,qDAAqD,GAAG,IAAI,CAAC,CAAC;QAC/F,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,KAAK,CAAC,sDAAsD,GAAG,IAAI,CAAC,CAAC;QAChG,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE;YACpB,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3C;QACD,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;IAGD,MAAM;IACN,QAAQ;QACN,IAAI,GAAG,GAAG,QAAQ,GAAG,IAAI,CAAC,KAAK,GAAG,GAAG,GAAG,IAAI,CAAC,YAAY,CAAA;QACzD,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC;QACpC,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE;YAClB,GAAG,IAAI,GAAG,GAAG,IAAI,CAAC,OAAO,CAAA;SAC1B;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAGD,OAAO;QACL,OAAO,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC;IACpC,CAAC;IAGD,MAAM;IACN,KAAK,CAAC,GAAQ;QACZ,IAAI,IAAI,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK;YAAE,OAAO,KAAK,CAAC;QAC1C,IAAI,IAAI,CAAC,YAAY,IAAI,GAAG,CAAC,YAAY;YAAE,OAAO,KAAK,CAAC;QACxD,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE;YACjB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBAAE,OAAO,KAAK,CAAC;YAClC,IAAI,GAAG,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO;gBAAE,OAAO,KAAK,CAAC;SAC/C;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CAEF"}

package/dist/mixins.d.ts

@@ -1,42 +1,40 @@
-import { InstalledAppId, ZomeName } from "@holochain/client";
-import { BaseRoleName } from "./types";
-type AbstractConstructor<T = {}> = abstract new (...args: any[]) => T;
-declare class Empty {
+import { Cell, CellId, FunctionName, ZomeName } from "@holochain/client";
+export type AbstractConstructor<T = {}> = abstract new (...args: any[]) => T;
+export declare class Empty {
     constructor(...args: any[]);
 }
 /** ------------------------------------------------------------------------------------------- **/
-export declare function ZomeSpecificMixin<TBase extends AbstractConstructor>(Base: TBase): ((abstract new (...args: any[]) => {
-    getDefaultZomeName(): ZomeName;
+/**
+ * Mixin for Cell bound classes.
+ * A Cell bound class must have a "Cell" from @/holochain/client
+ */
+export declare function CellMixin<TBase extends AbstractConstructor>(Base: TBase): (abstract new (...args: any[]) => {
+    _cell?: Cell;
+    readonly cell: Cell;
+    readonly cellId: CellId;
+    readonly dnaHash: string;
+    readonly agentPubKey: string;
+}) & TBase;
+/** ------------------------------------------------------------------------------------------- **/
+/**
+ * Mixin for Zome bound classes.
+ * A Zome bound class must have a zome name and a list of zome functions
+ */
+export declare function ZomeMixin<TBase extends AbstractConstructor>(Base: TBase): ((abstract new (...args: any[]) => {
     zomeName: ZomeName;
+    readonly defaultZomeName: string;
+    /** Tuple array with zome name */
+    readonly fnNames: [string, string][];
 }) & {
     readonly DEFAULT_ZOME_NAME: ZomeName;
+    readonly FN_NAMES: FunctionName[];
 }) & TBase;
 export declare const ZomeSpecific: ((abstract new (...args: any[]) => {
-    getDefaultZomeName(): ZomeName;
     zomeName: ZomeName;
+    readonly defaultZomeName: string;
+    /** Tuple array with zome name */
+    readonly fnNames: [string, string][];
 }) & {
     readonly DEFAULT_ZOME_NAME: ZomeName;
+    readonly FN_NAMES: FunctionName[];
 }) & typeof Empty;
-/** ------------------------------------------------------------------------------------------- **/
-export declare function RoleSpecificMixin<TBase extends AbstractConstructor>(Base: TBase): ((abstract new (...args: any[]) => {
-    baseRoleName: BaseRoleName;
-}) & {
-    readonly DEFAULT_BASE_ROLE_NAME: BaseRoleName;
-}) & TBase;
-export declare const RoleSpecific: ((abstract new (...args: any[]) => {
-    baseRoleName: BaseRoleName;
-}) & {
-    readonly DEFAULT_BASE_ROLE_NAME: BaseRoleName;
-}) & typeof Empty;
-/** ------------------------------------------------------------------------------------------- **/
-export declare function HappSpecificMixin<TBase extends AbstractConstructor>(Base: TBase): ((abstract new (...args: any[]) => {
-    happId: InstalledAppId;
-}) & {
-    readonly DEFAULT_HAPP_ID: InstalledAppId;
-}) & TBase;
-export declare const HappSpecific: ((abstract new (...args: any[]) => {
-    happId: InstalledAppId;
-}) & {
-    readonly DEFAULT_HAPP_ID: InstalledAppId;
-}) & typeof Empty;
-export {};

package/dist/mixins.js

@@ -1,37 +1,51 @@
-class Empty {
+import { encodeHashToBase64 } from "@holochain/client";
+export class Empty {
     constructor(...args) { }
 }
 /** ------------------------------------------------------------------------------------------- **/
-export function ZomeSpecificMixin(Base) {
+/**
+ * Mixin for Cell bound classes.
+ * A Cell bound class must have a "Cell" from @/holochain/client
+ */
+export function CellMixin(Base) {
+    class ACell extends Base {
+        get cell() { if (!this._cell)
+            throw Error("Cell not set for object"); return this._cell; }
+        get cellId() { return this._cell.cell_id; }
+        get dnaHash() { return encodeHashToBase64(this._cell.cell_id[0]); }
+        get agentPubKey() { return encodeHashToBase64(this._cell.cell_id[1]); }
+    }
+    ;
+    return ACell;
+}
+//export const CellSpecific = CellMixin(Empty);
+/** ------------------------------------------------------------------------------------------- **/
+/**
+ * Mixin for Zome bound classes.
+ * A Zome bound class must have a zome name and a list of zome functions
+ */
+export function ZomeMixin(Base) {
     class AZomeSpecific extends Base {
         constructor(...args) {
             super(args);
             this.zomeName = this.constructor.DEFAULT_ZOME_NAME;
         }
-        getDefaultZomeName() {
+        get defaultZomeName() {
             return this.constructor.DEFAULT_ZOME_NAME;
         }
+        /** Tuple array with zome name */
+        get fnNames() {
+            const fnNames = this.constructor.FN_NAMES;
+            if (!fnNames) {
+                throw Error("FN_NAMES not defined in ZomeProxy subclass " + this.constructor.name);
+            }
+            return fnNames.map((fnName) => {
+                return [this.zomeName, fnName];
+            });
+        }
     }
     ;
     return AZomeSpecific;
 }
-export const ZomeSpecific = ZomeSpecificMixin(Empty);
-/** ------------------------------------------------------------------------------------------- **/
-export function RoleSpecificMixin(Base) {
-    class ARoleSpecific extends Base {
-        constructor(...args) { super(); this.baseRoleName = this.constructor.DEFAULT_BASE_ROLE_NAME; }
-    }
-    ;
-    return ARoleSpecific;
-}
-export const RoleSpecific = RoleSpecificMixin(Empty);
-/** ------------------------------------------------------------------------------------------- **/
-export function HappSpecificMixin(Base) {
-    class AHappSpecific extends Base {
-        constructor(...args) { super(); this.happId = this.constructor.DEFAULT_HAPP_ID; }
-    }
-    ;
-    return AHappSpecific;
-}
-export const HappSpecific = HappSpecificMixin(Empty);
+export const ZomeSpecific = ZomeMixin(Empty);
 //# sourceMappingURL=mixins.js.map

package/dist/mixins.js.map

@@ -1 +1 @@
-{"version":3,"file":"mixins.js","sourceRoot":"","sources":["../src/mixins.ts"],"names":[],"mappings":"AAOA,MAAM,KAAK;IACT,YAAY,GAAG,IAAW,IAAG,CAAC;CAC/B;AAGD,mGAAmG;AAEnG,MAAM,UAAU,iBAAiB,CAAoC,IAAW;IAC9E,MAAe,aAAc,SAAQ,IAAI;QACvC,YAAY,GAAG,IAAW;YACxB,KAAK,CAAC,IAAI,CAAC,CAAC;YACZ,IAAI,CAAC,QAAQ,GAAI,IAAI,CAAC,WAAmB,CAAC,iBAAiB,CAAA;QAC7D,CAAC;QACD,kBAAkB;YAChB,OAAQ,IAAI,CAAC,WAAoC,CAAC,iBAAiB,CAAC;QACxE,CAAC;KAGA;IAAA,CAAC;IACF,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAGrD,mGAAmG;AAEnG,MAAM,UAAU,iBAAiB,CAAoC,IAAW;IAC9E,MAAe,aAAc,SAAQ,IAAI;QACvC,YAAY,GAAG,IAAW,IAAE,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,GAAI,IAAI,CAAC,WAAmB,CAAC,sBAAsB,CAAA,CAAA,CAAC;KAG3G;IAAA,CAAC;IACF,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAGrD,mGAAmG;AAEnG,MAAM,UAAU,iBAAiB,CAAoC,IAAW;IAC9E,MAAe,aAAc,SAAQ,IAAI;QACvC,YAAY,GAAG,IAAW,IAAE,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,GAAI,IAAI,CAAC,WAAmB,CAAC,eAAe,CAAA,CAAA,CAAC;KAG9F;IAAA,CAAC;IACF,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC"}
+{"version":3,"file":"mixins.js","sourceRoot":"","sources":["../src/mixins.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,kBAAkB,EAGnB,MAAM,mBAAmB,CAAC;AAO3B,MAAM,OAAO,KAAK;IAChB,YAAY,GAAG,IAAW,IAAG,CAAC;CAC/B;AAGD,mGAAmG;AAEnG;;;GAGG;AACH,MAAM,UAAU,SAAS,CAAoC,IAAW;IACtE,MAAe,KAAM,SAAQ,IAAI;QAM/B,IAAI,IAAI,KAAW,IAAI,CAAC,IAAI,CAAC,KAAK;YAAE,MAAM,KAAK,CAAC,yBAAyB,CAAC,CAAE,CAAC,OAAO,IAAI,CAAC,KAAM,CAAA,CAAC,CAAC;QACjG,IAAI,MAAM,KAAa,OAAO,IAAI,CAAC,KAAM,CAAC,OAAO,CAAA,CAAC,CAAC;QACnD,IAAI,OAAO,KAAiB,OAAO,kBAAkB,CAAC,IAAI,CAAC,KAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA,CAAC,CAAC;QAC/E,IAAI,WAAW,KAAqB,OAAO,kBAAkB,CAAC,IAAI,CAAC,KAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA,CAAC,CAAC;KACxF;IAAA,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,+CAA+C;AAI/C,mGAAmG;AAEnG;;;GAGG;AACH,MAAM,UAAU,SAAS,CAAoC,IAAW;IACtE,MAAe,aAAc,SAAQ,IAAI;QAOvC,YAAY,GAAG,IAAW;YACxB,KAAK,CAAC,IAAI,CAAC,CAAC;YACZ,IAAI,CAAC,QAAQ,GAAI,IAAI,CAAC,WAAoC,CAAC,iBAAiB,CAAA;QAC9E,CAAC;QAED,IAAI,eAAe;YACjB,OAAQ,IAAI,CAAC,WAAoC,CAAC,iBAAiB,CAAC;QACtE,CAAC;QAED,iCAAiC;QACjC,IAAI,OAAO;YACT,MAAM,OAAO,GAAI,IAAI,CAAC,WAAoC,CAAC,QAAQ,CAAC;YACpE,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,KAAK,CAAC,6CAA6C,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aACpF;YACD,OAAQ,OAA0B,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;gBAChD,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;YAChC,CAAC,CAAC,CAAA;QACJ,CAAC;KACF;IAAA,CAAC;IACF,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC"}

package/dist/types.d.ts

@@ -1,30 +1,28 @@
-import { CellId, InstalledCell } from "@holochain/client";
-import { AgentPubKeyB64, Dictionary, DnaHashB64 } from "@holochain-open-dev/core-types";
+import { CellId, AgentPubKeyB64, DnaHashB64, Cell } from "@holochain/client";
 import { AgentPubKey, DnaHash } from "@holochain/client/lib/types";
+import { Dictionary } from "./utils";
 /**
  *
  */
-export interface IInstalledCell {
-    get installedCell(): InstalledCell;
-    get roleInstanceId(): RoleInstanceId;
+export interface ICell {
+    get cell(): Cell;
     get dnaHash(): DnaHashB64;
     get agentPubKey(): AgentPubKeyB64;
-    get cellId(): CellId;
 }
 export type BaseRoleName = string;
 export type CloneIndex = number;
-export type RoleCells = {
-    original: InstalledCell;
-    /** CloneName / Index -> InstalledCell */
-    clones: Dictionary<InstalledCell>;
+export type CellsForRole = {
+    provisioned: Cell;
+    /** CloneName -> Cell */
+    clones: Dictionary<Cell>;
 };
 /** BaseRoleName -> RoleCells */
-export type CellsMap = Dictionary<RoleCells>;
+export type RoleCellsMap = Dictionary<CellsForRole>;
 /** -- RoleInstanceId -- */
 /** type for string "<baseRoleName>.<cloneIndex>" */
-export type RoleInstanceId = string;
-export declare function RoleInstanceId(baseRoleName: BaseRoleName, cloneIndex?: CloneIndex): RoleInstanceId;
-export declare function destructureRoleInstanceId(id: RoleInstanceId): [BaseRoleName, CloneIndex] | undefined;
+export type CloneName = string;
+export declare function createCloneName(baseRoleName: BaseRoleName, cloneIndex: CloneIndex): CloneName;
+export declare function destructureCloneName(id: CloneName): [BaseRoleName, CloneIndex] | undefined;
 /** -- CellIdStr -- */
 export type CellIdStr = string;
 export declare function CellIdStr(hash_or_id: DnaHash | CellId, key?: AgentPubKey): CellIdStr;

package/dist/types.js

@@ -1,10 +1,9 @@
-import { deserializeHash, serializeHash } from "@holochain-open-dev/utils";
-export function RoleInstanceId(baseRoleName, cloneIndex) {
-    if (!cloneIndex)
-        return baseRoleName;
+import { decodeHashFromBase64, encodeHashToBase64 } from "@holochain/client";
+export function createCloneName(baseRoleName, cloneIndex) {
+    //if (!cloneIndex) return baseRoleName as CloneName;
     return "" + baseRoleName + "." + cloneIndex;
 }
-export function destructureRoleInstanceId(id) {
+export function destructureCloneName(id) {
     const subs = id.split(".");
     if (subs.length != 2) {
         //throw Error(`Bad RoleInstance id format: "${id}"`);
@@ -15,12 +14,12 @@ export function destructureRoleInstanceId(id) {
 const CELL_ID_SEPARATOR = "||";
 export function CellIdStr(hash_or_id, key) {
     if (Array.isArray(hash_or_id)) {
-        return "" + serializeHash(hash_or_id[0]) + CELL_ID_SEPARATOR + serializeHash(hash_or_id[1]);
+        return "" + encodeHashToBase64(hash_or_id[0]) + CELL_ID_SEPARATOR + encodeHashToBase64(hash_or_id[1]);
     }
     if (!key) {
         throw Error("CellIdStr() failed. AgentPubKey not provided");
     }
-    return "" + serializeHash(hash_or_id) + CELL_ID_SEPARATOR + serializeHash(key);
+    return "" + encodeHashToBase64(hash_or_id) + CELL_ID_SEPARATOR + encodeHashToBase64(key);
 }
 /** */
 export function str2CellId(str) {
@@ -28,6 +27,6 @@ export function str2CellId(str) {
     if (subs.length != 2) {
         throw Error("str2CellId() failed. Bad input string format");
     }
-    return [deserializeHash(subs[0]), deserializeHash(subs[1])];
+    return [decodeHashFromBase64(subs[0]), decodeHashFromBase64(subs[1])];
 }
 //# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,eAAe,EAAE,aAAa,EAAC,MAAM,2BAA2B,CAAC;AAqCzE,MAAM,UAAU,cAAc,CAAC,YAA0B,EAAE,UAAuB;IAChF,IAAI,CAAC,UAAU;QAAE,OAAO,YAA8B,CAAC;IACvD,OAAO,EAAE,GAAG,YAAY,GAAG,GAAG,GAAG,UAAU,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,EAAkB;IAC1D,MAAM,IAAI,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE;QACpB,qDAAqD;QACrD,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAiB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAe,CAAC,CAAC;AAClE,CAAC;AASD,MAAM,iBAAiB,GAAG,IAAI,CAAA;AAE9B,MAAM,UAAU,SAAS,CAAC,UAA4B,EAAE,GAAiB;IACvE,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC7B,OAAO,EAAE,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,iBAAiB,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;KAC7F;IACD,IAAI,CAAC,GAAG,EAAE;QACR,MAAM,KAAK,CAAC,8CAA8C,CAAC,CAAC;KAC7D;IACD,OAAO,EAAE,GAAG,aAAa,CAAC,UAAU,CAAC,GAAG,iBAAiB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;AACjF,CAAC;AAED,MAAM;AACN,MAAM,UAAU,UAAU,CAAC,GAAc;IACvC,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC1C,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE;QACpB,MAAM,KAAK,CAAC,8CAA8C,CAAC,CAAC;KAC7D;IACD,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAC7D,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,oBAAoB,EACpB,kBAAkB,EAInB,MAAM,mBAAmB,CAAC;AAuC3B,MAAM,UAAU,eAAe,CAAC,YAA0B,EAAE,UAAsB;IAChF,oDAAoD;IACpD,OAAO,EAAE,GAAG,YAAY,GAAG,GAAG,GAAG,UAAU,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,EAAa;IAChD,MAAM,IAAI,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE;QACpB,qDAAqD;QACrD,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAiB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAe,CAAC,CAAC;AAClE,CAAC;AASD,MAAM,iBAAiB,GAAG,IAAI,CAAA;AAE9B,MAAM,UAAU,SAAS,CAAC,UAA4B,EAAE,GAAiB;IACvE,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC7B,OAAO,EAAE,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,iBAAiB,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;KACvG;IACD,IAAI,CAAC,GAAG,EAAE;QACR,MAAM,KAAK,CAAC,8CAA8C,CAAC,CAAC;KAC7D;IACD,OAAO,EAAE,GAAG,kBAAkB,CAAC,UAAU,CAAC,GAAG,iBAAiB,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;AAC3F,CAAC;AAED,MAAM;AACN,MAAM,UAAU,UAAU,CAAC,GAAc;IACvC,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC1C,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE;QACpB,MAAM,KAAK,CAAC,8CAA8C,CAAC,CAAC;KAC7D;IACD,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AACvE,CAAC"}

package/dist/utils.d.ts

@@ -1,5 +1,8 @@
-import { CellId, InstalledAppInfo } from "@holochain/client";
-import { IInstalledCell } from "./types";
+import { CellId, AppInfo, CellInfo, Cell } from "@holochain/client";
+import { StemCell } from "@holochain/client/lib/api/admin/types";
+export declare type Dictionary<T> = {
+    [key: string]: T;
+};
 /** */
 export declare function areArraysEqual(first: Uint8Array, second: Uint8Array): boolean;
 /** */
@@ -13,10 +16,14 @@ export declare function anyToB64(obj: any): any;
 export declare function prettyDuration(date: Date): string;
 /** */
 export declare function prettyDate(date: Date): string;
+/** ... */
+export declare function intoStem(cellInfo: CellInfo): StemCell | undefined;
+/** ... */
+export declare function intoCell(cellInfo: CellInfo): Cell | undefined;
 /** */
-export declare function printAppInfo(appInfo: InstalledAppInfo): string;
+export declare function printAppInfo(appInfo: AppInfo): string;
 /** */
-export declare function printInstalledCell(installedCell: IInstalledCell): string;
+export declare function printCell(cell: Cell): string;
 /** -- Experimental -- */
 /**
  *

package/dist/utils.js

@@ -1,5 +1,5 @@
-import { serializeHash } from "@holochain-open-dev/utils";
-import { CellIdStr } from "./types";
+import { encodeHashToBase64 } from "@holochain/client";
+import { CellType } from "@holochain/client";
 /** */
 export function areArraysEqual(first, second) {
     return first.length === second.length && first.every((value, index) => value === second[index]);
@@ -16,10 +16,10 @@ export const delay = (ms) => new Promise(r => setTimeout(r, ms));
 export function anyToB64(obj) {
     /** Check if it's a hash */
     if (obj instanceof Uint8Array) {
-        return serializeHash(obj);
+        return encodeHashToBase64(obj);
     }
     else {
-        /** Check if its an array of hashes */
+        /** Check if it's an array of hashes */
         if (Array.isArray(obj)) {
             const isUint8Array = obj.length > 0 &&
                 obj.every((value) => {
@@ -28,7 +28,7 @@ export function anyToB64(obj) {
             if (isUint8Array) {
                 let result = [];
                 for (const cur of obj) {
-                    result.push(serializeHash(cur));
+                    result.push(encodeHashToBase64(cur));
                 }
                 return result;
             }
@@ -49,17 +49,45 @@ export function prettyDate(date) {
         + ":" + zeroPad(date.getSeconds(), 2)
         + "." + zeroPad(date.getMilliseconds(), 3);
 }
+/** ... */
+export function intoStem(cellInfo) {
+    if (CellType.Stem in cellInfo) {
+        return cellInfo.Stem;
+    }
+    return undefined;
+}
+/** ... */
+export function intoCell(cellInfo) {
+    if (CellType.Stem in cellInfo) {
+        return undefined;
+    }
+    if (CellType.Cloned in cellInfo) {
+        return cellInfo.Cloned;
+    }
+    if (CellType.Provisioned in cellInfo) {
+        return cellInfo.Provisioned;
+    }
+    return undefined;
+}
 /** */
 export function printAppInfo(appInfo) {
     let print = `Happ "${appInfo.installed_app_id}" info: (status: ${JSON.stringify(appInfo.status)})`;
-    for (const installedCell of appInfo.cell_data) {
-        print += "\n - " + installedCell.role_id + ": " + CellIdStr(installedCell.cell_id);
+    for (const [roleName, cellInfos] of Object.entries(appInfo.cell_info)) {
+        for (const cellInfo of Object.values(cellInfos)) {
+            if (CellType.Stem in cellInfo) {
+                const stem = intoStem(cellInfo);
+                print += `\n - ${roleName}.${stem.name ? stem.name : "unnamed"} : ${encodeHashToBase64(stem.dna)} (stem)`;
+                continue;
+            }
+            const cell = intoCell(cellInfo);
+            print += `\n - ${roleName}.${cell.name}${cell.name ? "." + cell.name : ""} : ${encodeHashToBase64(cell.cell_id[0])}`;
+        }
     }
     return print;
 }
 /** */
-export function printInstalledCell(installedCell) {
-    return `InstalledCell "${installedCell.roleInstanceId}": ${installedCell.dnaHash}`;
+export function printCell(cell) {
+    return `Cell "${cell.name}${cell.clone_id ? "." + cell.clone_id : ""}": ${encodeHashToBase64(cell.cell_id[0])}`;
 }
 /** -- Experimental -- */
 /**

package/dist/utils.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ddd-qc/cell-proxy",
-  "version": "0.9.8",
+  "version": "0.10.1",
   "description": "Proxy classes and helpers for managing a Holochain AppWebsocket",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -23,12 +23,10 @@
   },
   "homepage": "https://github.com/ddd-mtl/lit-happ#readme",
   "dependencies": {
-    "@holochain-open-dev/core-types": "^0.6.2",
-    "@holochain-open-dev/utils": "0.6.2",
-    "@holochain/client": "^0.9.3"
+    "@holochain/client": "^0.11.9"
   },
   "devDependencies": {
-    "tslib": "^2.3.0",
-    "typescript": "^4.3.5"
+    "tslib": "^2.4.0",
+    "typescript": "^4.9.0"
   }
 }