@ddd-qc/lit-happ 0.26.6 → 0.27.0

package/dist/DnaViewModel.js

@@ -76,9 +76,9 @@ export class DnaViewModel extends CellMixin(RoleMixin(ViewModel)) {
         const grantedFns = { [GrantedFunctionsType.Listed]: allFnNames };
         try {
             console.log("authorizeSigningCredentials: " + this.cell.hcl().toString(), allFnNames);
-            console.log("authorizeSigningCredentials. cell_id = [" + this.cell.dnaId.b64 + " ; " + this.cell.agentId.b64 + "]");
+            console.log("authorizeSigningCredentials. cell_id = " + this.cell.address.str);
             //await adminWs.authorizeSigningCredentials(this.cell.id, grantedFns);
-            await adminWs.authorizeSigningCredentials(this.cell.id);
+            await adminWs.authorizeSigningCredentials(this.cell.address.intoId());
         }
         catch (e) {
             console.warn("authorizeSigningCredentials FAILED.", e);

package/dist/DnaViewModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"DnaViewModel.js","sourceRoot":"","sources":["../src/DnaViewModel.ts"],"names":[],"mappings":"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","sourcesContent":["import {ZomeViewModel} from \"./ZomeViewModel\";\nimport {ReactiveElement} from \"lit\";\nimport {ViewModel} from \"./ViewModel\";\nimport {\n  AdminWebsocket,\n  GrantedFunctionsType,\n  InstalledAppId,\n  ZomeName,\n} from \"@holochain/client\";\nimport {DnaModifiersOptions, ZvmDef} from \"./definitions\";\nimport {Context, createContext} from \"@lit/context\";\nimport {\n  CellProxy,\n  AppProxy,\n  HCL,\n  Dictionary, CellMixin, AgentId, EntryDef\n} from \"@ddd-qc/cell-proxy\";\nimport {RoleMixin, RoleSpecific} from \"./roleMixin\";\n\n\n//export type IDnaViewModel = _DnaViewModel & ICellDef & typeof RoleSpecific;\n\n/** Interface specific to DnaViewModel class */\ninterface IDnaViewModel {\n  dumpCallLogs(zomeName?: ZomeName): void;\n  dumpSignalLogs(zomeName?: ZomeName): void;\n  /** zomeName -> (AppEntryName, isPublic)[] */\n  fetchAllEntryDefs(): Promise<Dictionary<Dictionary<EntryDef>>>;\n  //get entryTypes(): Dictionary<[string, boolean][]>;\n  //getZomeEntryDefs(zomeName: ZomeName): [string, boolean][] | undefined;\n  //getZomeViewModel(zomeName: ZomeName): ZomeViewModel | undefined\n}\n\nexport type DvmConstructor = typeof RoleSpecific & {DNA_MODIFIERS: DnaModifiersOptions} & {\n  new(host: ReactiveElement, proxy: AppProxy, idOrHcl: HCL | InstalledAppId): DnaViewModel;\n};\n\n\n/**\n * Abstract ViewModel for a DNA.\n * It holds the CellProxy and all the ZomeViewModels of the DNA.\n * It is expected to derive this class for each DNA and add extra logic at the DNA level.\n * TODO: Split into RoleViewModel and CellViewModel (e.g. have call logs separated by role)\n */\nexport abstract class DnaViewModel extends CellMixin(RoleMixin(ViewModel)) implements IDnaViewModel {\n\n  /* private */ static ZVM_DEFS: ZvmDef[];\n  static DNA_MODIFIERS: DnaModifiersOptions;\n\n\n  /** Ctor */\n  constructor(public readonly host: ReactiveElement, appProxy: AppProxy, idOrHcl: HCL | InstalledAppId) {\n    super();\n    if (typeof idOrHcl === 'object') {\n      this.baseRoleName = idOrHcl.baseRoleName;\n      this.hcl = idOrHcl;\n    } else {\n      this.hcl = new HCL(idOrHcl, this.baseRoleName);\n    }\n    const dvmCtor = (this.constructor as typeof DnaViewModel)\n    const zvmDefs = dvmCtor.ZVM_DEFS;\n    this._cellProxy = appProxy.getCellProxy(this.hcl); // WARN can throw error\n    this._cell = this._cellProxy.cell;\n    console.log(`DVM.ctor of ${this.baseRoleName}`, this._cellProxy.cell);\n    /** Create all ZVMs for this DNA */\n    for (const zvmDef of zvmDefs) {\n      let zvm;\n      if (Array.isArray(zvmDef)) {\n        zvm = new zvmDef[0](this._cellProxy, this, zvmDef[1]);\n      } else {\n        zvm = new zvmDef(this._cellProxy, this);\n      }\n      // TODO check zvm.zomeName exists in _cellProxy\n      this._zomeViewModels[zvm.zomeName] = zvm;\n      this._zomeNames[zvmDef.constructor.name] = zvm.zomeName;\n    }\n    this.provideContext(host); // TODO move this to host.connectedCallback? e.g. change ViewModel to a ReactiveController\n  }\n\n\n  /** -- Fields -- */\n\n  protected _cellProxy: CellProxy;\n  /* ZomeName -> Zvm */\n  protected _zomeViewModels: Dictionary<ZomeViewModel> = {};\n  /* ZvmCtorName -> ZomeName */\n  protected _zomeNames: Dictionary<ZomeName> = {};\n  /* ZomeName -> (EntryName -> EntryDef) */\n  private _allEntryDefs: Dictionary<Dictionary<EntryDef>> = {};\n\n  /** list of \"known\" peers in this DNA */\n  protected _livePeers: AgentId[] = [];\n\n  public readonly hcl: HCL;\n\n\n\n  /** -- Getters -- */\n\n  get livePeers(): AgentId[] { return this._livePeers };\n\n  get zomeNames(): ZomeName[] {return Object.values(this._zomeNames);}\n\n  getZomeEntryDefs(zomeName: ZomeName): Dictionary<EntryDef> | undefined {return this._allEntryDefs[zomeName]}\n  getZomeViewModel(zomeName: ZomeName): ZomeViewModel | undefined {return this._zomeViewModels[zomeName]}\n  getZomeName(zvm: typeof ZomeViewModel): ZomeName | undefined { return this._zomeNames[zvm.constructor.name]}\n\n  /** -- Methods -- */\n\n  /** Override so we can provide context of all zvms */\n  /*private*/ provideContext(host: ReactiveElement): void {\n    //console.log(\"DVM.provideContext()\", host, this)\n    super.provideContext(host);\n    for (const zvm of Object.values(this._zomeViewModels)) {\n      zvm.provideContext(host)\n    }\n  }\n\n\n  getContext(): Context<unknown, unknown> {return createContext<typeof this>('dvm/' + this.cell.name)};\n\n\n  /** */\n  async authorizeZomeCalls(adminWs: AdminWebsocket): Promise<void> {\n    let allFnNames = [];\n    for (const [_zomeName, zvm] of Object.entries(this._zomeViewModels)) {\n      allFnNames = allFnNames.concat(zvm.zomeProxy.fnNames)\n    }\n    const grantedFns = { [GrantedFunctionsType.Listed]: allFnNames }\n    try {\n        console.log(\"authorizeSigningCredentials: \" + this.cell.hcl().toString(), allFnNames);\n        console.log(\"authorizeSigningCredentials. cell_id = [\" + this.cell.dnaId.b64 + \" ; \" + this.cell.agentId.b64 + \"]\");\n        //await adminWs.authorizeSigningCredentials(this.cell.id, grantedFns);\n        await adminWs.authorizeSigningCredentials(this.cell.id);\n    } catch(e) {\n      console.warn(\"authorizeSigningCredentials FAILED.\", e);\n    }\n   // this._signingProps = getSigningCredentials(this.cellId);\n   //  console.log({signProps: this._signingProps})\n   //\n   //  for (const [zomeName, zvm] of Object.entries(this._zomeViewModels)) {\n   //    zvm.zomeProxy.setSigningProps(this._signingProps);\n   //  }\n  }\n\n\n  /** Not async on purpose as we except this to be long. Post-processing should be done via Observer pattern */\n  protected probeAllInner(): void {\n    for (const [_name, zvm] of Object.entries(this._zomeViewModels)) {\n      //console.log(\"Dvm.probeAll()\", name)\n      zvm.probeAll();\n    }\n  }\n\n\n  /** */\n  zvmChanged(zvm: ZomeViewModel): void {}\n\n\n  /** */\n  async initializePerspectiveOffline(): Promise<void> {\n    const all = [];\n    for (const [_name, zvm] of Object.entries(this._zomeViewModels)) {\n      const p = zvm.initializePerspectiveOffline();\n      all.push(p);\n    }\n    await Promise.all(all);\n  }\n\n\n  /** */\n  async initializePerspectiveOnline(): Promise<void> {\n    const all = [];\n    for (const [_name, zvm] of Object.entries(this._zomeViewModels)) {\n      const p = zvm.initializePerspectiveOnline();\n      all.push(p);\n    }\n    await Promise.all(all);\n  }\n\n\n  /** Maybe useless since the entry defs are in the integrity zome which is not represented here */\n  async fetchAllEntryDefs(): Promise<Dictionary<Dictionary<EntryDef>>> {\n    for (const zvm of Object.values(this._zomeViewModels)) {\n      const zomeName = zvm.zomeName;\n      try {\n        const defs = await this._cellProxy.callEntryDefs(zomeName); // TODO optimize\n        this._allEntryDefs[zomeName] = defs;\n      } catch (e) {\n        console.warn(`Calling \"entry_defs()\" failed on zome \"${zomeName}\". Possibly because zome does not have any entry types defined.`)\n        this._allEntryDefs[zomeName] = {};\n      }\n    }\n    return this._allEntryDefs;\n  }\n\n\n  /** */\n  dumpCallLogs(zomeName?: ZomeName): void {\n    this._cellProxy.dumpCallLogs(zomeName);\n  }\n\n\n  /** */\n  dumpSignalLogs(zomeName?: ZomeName): void {\n    console.warn(\"Dumping signals in DVM\", this.baseRoleName);\n    if (zomeName == undefined) {\n      for (const [name, zvm] of Object.entries(this._zomeViewModels)) {\n        const logs = this._cellProxy.signalLogs.filter((log) => log.zomeName == name)\n        zvm.dumpSignalLogs(logs);\n      }\n      return;\n    }\n    if (this._zomeViewModels[zomeName]) {\n      const logs = this._cellProxy.signalLogs.filter((log) => log.zomeName == zomeName)\n      this._zomeViewModels[zomeName].dumpSignalLogs(logs);\n    } else {\n      console.error(`Unknown zome ${zomeName} in DVM ${this.baseRoleName}`)\n    }\n  }\n}\n"]}
+{"version":3,"file":"DnaViewModel.js","sourceRoot":"","sources":["../src/DnaViewModel.ts"],"names":[],"mappings":"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","sourcesContent":["import {ZomeViewModel} from \"./ZomeViewModel\";\nimport {ReactiveElement} from \"lit\";\nimport {ViewModel} from \"./ViewModel\";\nimport {\n  AdminWebsocket,\n  GrantedFunctionsType,\n  InstalledAppId,\n  ZomeName,\n} from \"@holochain/client\";\nimport {DnaModifiersOptions, ZvmDef} from \"./definitions\";\nimport {Context, createContext} from \"@lit/context\";\nimport {\n  CellProxy,\n  AppProxy,\n  HCL,\n  Dictionary, CellMixin, AgentId, EntryDef\n} from \"@ddd-qc/cell-proxy\";\nimport {RoleMixin, RoleSpecific} from \"./roleMixin\";\n\n\n//export type IDnaViewModel = _DnaViewModel & ICellDef & typeof RoleSpecific;\n\n/** Interface specific to DnaViewModel class */\ninterface IDnaViewModel {\n  dumpCallLogs(zomeName?: ZomeName): void;\n  dumpSignalLogs(zomeName?: ZomeName): void;\n  /** zomeName -> (AppEntryName, isPublic)[] */\n  fetchAllEntryDefs(): Promise<Dictionary<Dictionary<EntryDef>>>;\n  //get entryTypes(): Dictionary<[string, boolean][]>;\n  //getZomeEntryDefs(zomeName: ZomeName): [string, boolean][] | undefined;\n  //getZomeViewModel(zomeName: ZomeName): ZomeViewModel | undefined\n}\n\nexport type DvmConstructor = typeof RoleSpecific & {DNA_MODIFIERS: DnaModifiersOptions} & {\n  new(host: ReactiveElement, proxy: AppProxy, idOrHcl: HCL | InstalledAppId): DnaViewModel;\n};\n\n\n/**\n * Abstract ViewModel for a DNA.\n * It holds the CellProxy and all the ZomeViewModels of the DNA.\n * It is expected to derive this class for each DNA and add extra logic at the DNA level.\n * TODO: Split into RoleViewModel and CellViewModel (e.g. have call logs separated by role)\n */\nexport abstract class DnaViewModel extends CellMixin(RoleMixin(ViewModel)) implements IDnaViewModel {\n\n  /* private */ static ZVM_DEFS: ZvmDef[];\n  static DNA_MODIFIERS: DnaModifiersOptions;\n\n\n  /** Ctor */\n  constructor(public readonly host: ReactiveElement, appProxy: AppProxy, idOrHcl: HCL | InstalledAppId) {\n    super();\n    if (typeof idOrHcl === 'object') {\n      this.baseRoleName = idOrHcl.baseRoleName;\n      this.hcl = idOrHcl;\n    } else {\n      this.hcl = new HCL(idOrHcl, this.baseRoleName);\n    }\n    const dvmCtor = (this.constructor as typeof DnaViewModel)\n    const zvmDefs = dvmCtor.ZVM_DEFS;\n    this._cellProxy = appProxy.getCellProxy(this.hcl); // WARN can throw error\n    this._cell = this._cellProxy.cell;\n    console.log(`DVM.ctor of ${this.baseRoleName}`, this._cellProxy.cell);\n    /** Create all ZVMs for this DNA */\n    for (const zvmDef of zvmDefs) {\n      let zvm;\n      if (Array.isArray(zvmDef)) {\n        zvm = new zvmDef[0](this._cellProxy, this, zvmDef[1]);\n      } else {\n        zvm = new zvmDef(this._cellProxy, this);\n      }\n      // TODO check zvm.zomeName exists in _cellProxy\n      this._zomeViewModels[zvm.zomeName] = zvm;\n      this._zomeNames[zvmDef.constructor.name] = zvm.zomeName;\n    }\n    this.provideContext(host); // TODO move this to host.connectedCallback? e.g. change ViewModel to a ReactiveController\n  }\n\n\n  /** -- Fields -- */\n\n  protected _cellProxy: CellProxy;\n  /* ZomeName -> Zvm */\n  protected _zomeViewModels: Dictionary<ZomeViewModel> = {};\n  /* ZvmCtorName -> ZomeName */\n  protected _zomeNames: Dictionary<ZomeName> = {};\n  /* ZomeName -> (EntryName -> EntryDef) */\n  private _allEntryDefs: Dictionary<Dictionary<EntryDef>> = {};\n\n  /** list of \"known\" peers in this DNA */\n  protected _livePeers: AgentId[] = [];\n\n  public readonly hcl: HCL;\n\n\n\n  /** -- Getters -- */\n\n  get livePeers(): AgentId[] { return this._livePeers };\n\n  get zomeNames(): ZomeName[] {return Object.values(this._zomeNames);}\n\n  getZomeEntryDefs(zomeName: ZomeName): Dictionary<EntryDef> | undefined {return this._allEntryDefs[zomeName]}\n  getZomeViewModel(zomeName: ZomeName): ZomeViewModel | undefined {return this._zomeViewModels[zomeName]}\n  getZomeName(zvm: typeof ZomeViewModel): ZomeName | undefined { return this._zomeNames[zvm.constructor.name]}\n\n  /** -- Methods -- */\n\n  /** Override so we can provide context of all zvms */\n  /*private*/ provideContext(host: ReactiveElement): void {\n    //console.log(\"DVM.provideContext()\", host, this)\n    super.provideContext(host);\n    for (const zvm of Object.values(this._zomeViewModels)) {\n      zvm.provideContext(host)\n    }\n  }\n\n\n  getContext(): Context<unknown, unknown> {return createContext<typeof this>('dvm/' + this.cell.name)};\n\n\n  /** */\n  async authorizeZomeCalls(adminWs: AdminWebsocket): Promise<void> {\n    let allFnNames = [];\n    for (const [_zomeName, zvm] of Object.entries(this._zomeViewModels)) {\n      allFnNames = allFnNames.concat(zvm.zomeProxy.fnNames)\n    }\n    const grantedFns = { [GrantedFunctionsType.Listed]: allFnNames }\n    try {\n        console.log(\"authorizeSigningCredentials: \" + this.cell.hcl().toString(), allFnNames);\n        console.log(\"authorizeSigningCredentials. cell_id = \" + this.cell.address.str);\n        //await adminWs.authorizeSigningCredentials(this.cell.id, grantedFns);\n        await adminWs.authorizeSigningCredentials(this.cell.address.intoId());\n    } catch(e) {\n      console.warn(\"authorizeSigningCredentials FAILED.\", e);\n    }\n   // this._signingProps = getSigningCredentials(this.cellId);\n   //  console.log({signProps: this._signingProps})\n   //\n   //  for (const [zomeName, zvm] of Object.entries(this._zomeViewModels)) {\n   //    zvm.zomeProxy.setSigningProps(this._signingProps);\n   //  }\n  }\n\n\n  /** Not async on purpose as we except this to be long. Post-processing should be done via Observer pattern */\n  protected probeAllInner(): void {\n    for (const [_name, zvm] of Object.entries(this._zomeViewModels)) {\n      //console.log(\"Dvm.probeAll()\", name)\n      zvm.probeAll();\n    }\n  }\n\n\n  /** */\n  zvmChanged(zvm: ZomeViewModel): void {}\n\n\n  /** */\n  async initializePerspectiveOffline(): Promise<void> {\n    const all = [];\n    for (const [_name, zvm] of Object.entries(this._zomeViewModels)) {\n      const p = zvm.initializePerspectiveOffline();\n      all.push(p);\n    }\n    await Promise.all(all);\n  }\n\n\n  /** */\n  async initializePerspectiveOnline(): Promise<void> {\n    const all = [];\n    for (const [_name, zvm] of Object.entries(this._zomeViewModels)) {\n      const p = zvm.initializePerspectiveOnline();\n      all.push(p);\n    }\n    await Promise.all(all);\n  }\n\n\n  /** Maybe useless since the entry defs are in the integrity zome which is not represented here */\n  async fetchAllEntryDefs(): Promise<Dictionary<Dictionary<EntryDef>>> {\n    for (const zvm of Object.values(this._zomeViewModels)) {\n      const zomeName = zvm.zomeName;\n      try {\n        const defs = await this._cellProxy.callEntryDefs(zomeName); // TODO optimize\n        this._allEntryDefs[zomeName] = defs;\n      } catch (e) {\n        console.warn(`Calling \"entry_defs()\" failed on zome \"${zomeName}\". Possibly because zome does not have any entry types defined.`)\n        this._allEntryDefs[zomeName] = {};\n      }\n    }\n    return this._allEntryDefs;\n  }\n\n\n  /** */\n  dumpCallLogs(zomeName?: ZomeName): void {\n    this._cellProxy.dumpCallLogs(zomeName);\n  }\n\n\n  /** */\n  dumpSignalLogs(zomeName?: ZomeName): void {\n    console.warn(\"Dumping signals in DVM\", this.baseRoleName);\n    if (zomeName == undefined) {\n      for (const [name, zvm] of Object.entries(this._zomeViewModels)) {\n        const logs = this._cellProxy.signalLogs.filter((log) => log.zomeName == name)\n        zvm.dumpSignalLogs(logs);\n      }\n      return;\n    }\n    if (this._zomeViewModels[zomeName]) {\n      const logs = this._cellProxy.signalLogs.filter((log) => log.zomeName == zomeName)\n      this._zomeViewModels[zomeName].dumpSignalLogs(logs);\n    } else {\n      console.error(`Unknown zome ${zomeName} in DVM ${this.baseRoleName}`)\n    }\n  }\n}\n"]}

package/dist/HappElement.js

@@ -1,8 +1,9 @@
 import { __decorate } from "tslib";
 import { LitElement } from "lit";
 import { state } from "lit/decorators.js";
-import { ConductorAppProxy, flattenCells, CellIdStr, str2CellId, AgentIdMap, decomposeCellId } from "@ddd-qc/cell-proxy";
+import { ConductorAppProxy, flattenCells, AgentIdMap, CellAddress } from "@ddd-qc/cell-proxy";
 import { HappViewModel } from "./HappViewModel";
+import { HoloHash } from "@holochain/client";
 /**
  *
  */
@@ -61,37 +62,36 @@ export class HappElement extends LitElement {
             return Promise.reject("No cells found at given appId: " + hvmDef.id);
         }
         /** Get cell Ids */
-        let cellIds = [];
+        let cellAddrs = [];
         if (baseRoleName) {
             const cfr = cellMap[baseRoleName];
             if (!cfr) {
                 return Promise.reject("No cells found at given baseRoleName: " + baseRoleName);
             }
-            cellIds = flattenCells(cfr);
+            cellAddrs = flattenCells(cfr);
         }
         else {
             for (const cells of Object.values(cellMap)) {
-                cellIds = cellIds.concat(flattenCells(cells));
+                cellAddrs = cellAddrs.concat(flattenCells(cells));
             }
         }
-        console.log(`networkInfoAll() cellIds`, cellIds.map(cellId => CellIdStr(cellId)));
+        console.log(`networkInfoAll() cellIds`, cellAddrs.map(cellId => cellId.str));
         /* Sort by agent key */
         let dnaPerAgentMap = new AgentIdMap();
-        for (const cellId of cellIds) {
-            const [dnaId, agentId] = decomposeCellId(cellId);
-            if (!dnaPerAgentMap.get(agentId)) {
-                dnaPerAgentMap.set(agentId, []);
+        for (const cellAddr of cellAddrs) {
+            if (!dnaPerAgentMap.get(cellAddr.agentId)) {
+                dnaPerAgentMap.set(cellAddr.agentId, []);
             }
-            dnaPerAgentMap.get(agentId).push(dnaId);
+            dnaPerAgentMap.get(cellAddr.agentId).push(cellAddr.dnaId);
         }
         console.log(`networkInfoAll() dnaMap`, dnaPerAgentMap);
-        /** Call NetworkInfo per AgentPubKey */
+        /** Call NetworkInfo per AgentId */
         const allNetInfos = {};
         for (const [agent, dnaIds] of dnaPerAgentMap.entries()) {
-            const netInfos = await this.appProxy.networkInfo({ dnas: dnaIds.map((dna) => dna.hash) });
+            const netInfos = await this.appProxy.networkInfo({ dnas: dnaIds.map((dna) => new HoloHash(dna.hash)) });
             let i = 0;
             for (const netInfo of netInfos) {
-                const idStr = CellIdStr(dnaIds[i], agent);
+                const idStr = new CellAddress(dnaIds[i], agent).str;
                 allNetInfos[idStr] = netInfo;
                 i += 1;
             }
@@ -109,33 +109,31 @@ export class HappElement extends LitElement {
             throw Error("No cells found at given appId: " + hvmDef.id);
         }
         /** Get cell Ids */
-        let cellIds = [];
+        let cellAddrs = [];
         if (baseRoleName) {
             const cfr = cellMap[baseRoleName];
             if (!cfr) {
                 return Promise.reject("No cells found at given baseRoleName: " + baseRoleName);
             }
-            cellIds = flattenCells(cfr);
+            cellAddrs = flattenCells(cfr);
         }
         else {
             for (const cells of Object.values(cellMap)) {
-                cellIds = cellIds.concat(flattenCells(cells));
+                cellAddrs = cellAddrs.concat(flattenCells(cells));
             }
         }
-        let logs = cellIds.map((cellId) => {
-            const str = CellIdStr(cellId);
-            const logs = this.appProxy.networkInfoLogs[str];
+        let logs = cellAddrs.map((cellAddr) => {
+            const logs = this.appProxy.networkInfoLogs[cellAddr.str];
             if (logs.length === 0) {
                 return;
             }
             const [ts, info] = logs[logs.length - 1];
-            const [dnaId, agentId] = decomposeCellId(cellId);
-            const hcl = this.appProxy.getLocations(cellId);
+            const hcl = this.appProxy.getLocations(cellAddr);
             const cellName = this.appProxy.getCellName(hcl[0]);
             return {
                 ts,
                 name: cellName,
-                dna: dnaId.short,
+                dna: cellAddr.dnaId.short,
                 arc: info.arc_size,
                 peers: info.current_number_of_peers,
                 total_peers: info.total_network_peers,
@@ -143,7 +141,7 @@ export class HappElement extends LitElement {
                 bytes: info.bytes_since_last_time_queried,
                 fetch_bytes: info.fetch_pool_info.op_bytes_to_fetch,
                 fetch_ops: info.fetch_pool_info.num_ops_to_fetch,
-                agent: agentId.short,
+                agent: cellAddr.agentId.short,
             };
         });
         console.table(logs);
@@ -157,11 +155,10 @@ export class HappElement extends LitElement {
             logMap[cellIdStr] = this.appProxy.networkInfoLogs[cellIdStr];
         }
         for (const [cellIdStr, infoPairs] of Object.entries(logMap)) {
-            const cellId = str2CellId(cellIdStr);
-            const [dnaId, agentId] = decomposeCellId(cellId);
-            const hcl = this.appProxy.getLocations(cellId);
+            const cellAddr = CellAddress.from(cellIdStr);
+            const hcl = this.appProxy.getLocations(cellAddr);
             const cellName = this.appProxy.getCellName(hcl[0]);
-            console.log(`NetworfInfo logs of cell "${cellName}" | [${agentId.short}, ${dnaId.short}]`);
+            console.log(`NetworfInfo logs of cell "${cellName}" | [${cellAddr.agentId.short}, ${cellAddr.dnaId.short}]`);
             const logs = infoPairs
                 .map(([ts, info]) => {
                 return {

package/dist/HappElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"HappElement.js","sourceRoot":"","sources":["../src/HappElement.ts"],"names":[],"mappings":"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","sourcesContent":["import {LitElement} from \"lit\";\nimport { state } from \"lit/decorators.js\";\nimport {\n  BaseRoleName,\n  AppProxy,\n  ConductorAppProxy,\n  HCL,\n  flattenCells,\n  CellIdStr, str2CellId, AgentIdMap, DnaId, decomposeCellId\n} from \"@ddd-qc/cell-proxy\";\nimport {HappViewModel} from \"./HappViewModel\";\nimport {CellDef, HvmDef} from \"./definitions\";\nimport {\n  AppWebsocket,\n  ClonedCell,\n  InstalledAppId,\n  NetworkInfo, Timestamp\n} from \"@holochain/client\";\nimport {DnaViewModel} from \"./DnaViewModel\";\nimport {CellId} from \"@holochain/client/lib/types\";\nimport * as net from \"net\";\n\n\n/**\n *\n */\nexport class HappElement extends LitElement {\n\n  /** Must be defined by subclass */\n  static HVM_DEF: HvmDef;\n\n  /** Set during init triggered at ctor */\n  appProxy!: AppProxy;\n  @state() hvm!: HappViewModel;\n\n\n  /** Ctor */\n  protected constructor(port_or_socket: number | AppWebsocket, appId?: InstalledAppId, adminUrl?: URL, defaultTimeout?: number) {\n    super();\n    /* await */ this.constructHvm(port_or_socket, appId, adminUrl, defaultTimeout);\n  }\n\n  /** */\n  async hvmConstructed(): Promise<void> {}\n  /** */\n  async perspectiveInitializedOffline(): Promise<void> {}\n  /** */\n  async perspectiveInitializedOnline(): Promise<void> {}\n\n\n  /** */\n  protected async constructHvm(port_or_socket: number | AppWebsocket, appId?: InstalledAppId, adminUrl?: URL, defaultTimeout?: number): Promise<void> {\n    const hvmDef = (this.constructor as typeof HappElement).HVM_DEF;\n    if (!hvmDef) {\n      throw Error(\"HVM_DEF static field undefined in HappElement subclass \" + this.constructor.name);\n    }\n    /** Override appId */\n    if (appId) {\n      hvmDef.id = appId;\n    }\n    this.appProxy = await ConductorAppProxy.new(port_or_socket, hvmDef.id, adminUrl, defaultTimeout);\n    this.hvm = await HappViewModel.new(this, this.appProxy, hvmDef);\n    await this.hvm.authorizeAllZomeCalls(this.appProxy.adminWs);\n    await this.hvmConstructed();\n    await this.initializePerspective();\n  }\n\n\n  /** */\n  async initializePerspective(): Promise<void> {\n    await this.hvm.initializePerspectiveOffline();\n    await this.perspectiveInitializedOffline();\n    // TODO move this to a later stage\n    await this.hvm.initializePerspectiveOnline();\n    await this.perspectiveInitializedOnline();\n  }\n\n\n  // /** */\n  // async networkInfoCell(hcl: HCL): Promise<NetworkInfo> {\n  //   const dvm = this.hvm.getDvm(hcl);\n  //   if (!dvm) {\n  //     return Promise.reject(\"No DNA found at given HCL: \" + hcl.toString());\n  //   }\n  //   const netInfoMap = await this.appProxy.networkInfo({dnas: [dvm.cell.dnaId.hash]});\n  //   return netInfoMap[dvm.cell.dnaId][1];\n  // }\n\n\n  /** */\n  async networkInfoAll(baseRoleName?: string): Promise<Record<CellIdStr, [Timestamp, NetworkInfo]>> {\n    console.log(`networkInfoAll() \"${baseRoleName}\"`);\n    /** Grab cellMap */\n    const hvmDef = (this.constructor as typeof HappElement).HVM_DEF;\n    const cellMap = this.appProxy.getAppCells(hvmDef.id);\n    if (!cellMap) {\n      return Promise.reject(\"No cells found at given appId: \" + hvmDef.id);\n    }\n    /** Get cell Ids */\n    let cellIds: CellId[] = [];\n    if (baseRoleName) {\n      const cfr = cellMap[baseRoleName];\n      if (!cfr) {\n        return Promise.reject(\"No cells found at given baseRoleName: \" + baseRoleName);\n      }\n      cellIds = flattenCells(cfr);\n    } else {\n      for (const cells of Object.values(cellMap)) {\n        cellIds = cellIds.concat(flattenCells(cells))\n      }\n    }\n    console.log(`networkInfoAll() cellIds`, cellIds.map(cellId => CellIdStr(cellId)));\n    /* Sort by agent key */\n    let dnaPerAgentMap: AgentIdMap<DnaId[]> = new AgentIdMap();\n    for (const cellId of cellIds) {\n      const [dnaId, agentId] = decomposeCellId(cellId);\n      if (!dnaPerAgentMap.get(agentId)) {\n        dnaPerAgentMap.set(agentId, []);\n      }\n      dnaPerAgentMap.get(agentId).push(dnaId)\n    }\n    console.log(`networkInfoAll() dnaMap`, dnaPerAgentMap);\n    /** Call NetworkInfo per AgentPubKey */\n    const allNetInfos = {};\n    for (const [agent, dnaIds] of dnaPerAgentMap.entries()) {\n      const netInfos = await this.appProxy.networkInfo({dnas: dnaIds.map((dna) => dna.hash)});\n      let i  = 0;\n      for (const netInfo of netInfos) {\n        const idStr = CellIdStr(dnaIds[i], agent);\n        allNetInfos[idStr] = netInfo;\n        i += 1;\n      }\n    }\n    /* Done */\n    return allNetInfos;\n  }\n\n\n  /** */\n  dumpLastestNetworkInfo(baseRoleName?: string) {\n    console.log(`dumpLastestNetworkInfo() \"${baseRoleName}\"`);\n    /** Grab cellMap */\n    const hvmDef = (this.constructor as typeof HappElement).HVM_DEF;\n    const cellMap = this.appProxy.getAppCells(hvmDef.id);\n    if (!cellMap) {\n      throw Error(\"No cells found at given appId: \" + hvmDef.id);\n    }\n    /** Get cell Ids */\n    let cellIds: CellId[] = [];\n    if (baseRoleName) {\n      const cfr = cellMap[baseRoleName];\n      if (!cfr) {\n        return Promise.reject(\"No cells found at given baseRoleName: \" + baseRoleName);\n      }\n      cellIds = flattenCells(cfr);\n    } else {\n      for (const cells of Object.values(cellMap)) {\n        cellIds = cellIds.concat(flattenCells(cells))\n      }\n    }\n    let logs = cellIds.map((cellId) => {\n      const str = CellIdStr(cellId);\n      const logs = this.appProxy.networkInfoLogs[str];\n      if (logs.length === 0) {\n        return;\n      }\n      const [ts, info] = logs[logs.length - 1];\n      const [dnaId, agentId] = decomposeCellId(cellId);\n      const hcl = this.appProxy.getLocations(cellId);\n      const cellName = this.appProxy.getCellName(hcl[0]);\n      return {\n            ts,\n            name: cellName,\n            dna: dnaId.short,\n            arc: info.arc_size,\n            peers: info.current_number_of_peers,\n            total_peers: info.total_network_peers,\n            rounds: info.completed_rounds_since_last_time_queried,\n            bytes: info.bytes_since_last_time_queried,\n            fetch_bytes: info.fetch_pool_info.op_bytes_to_fetch,\n            fetch_ops: info.fetch_pool_info.num_ops_to_fetch,\n            agent: agentId.short,\n          }\n    })\n    console.table(logs);\n  }\n\n\n  /* */\n  dumpNetworkInfoLogs(cellIdStr?: string) {\n    console.log(`dumpNetworkInfoLogs() \"${cellIdStr}\"`);\n    let logMap = this.appProxy.networkInfoLogs;\n    if (cellIdStr) {\n      logMap = {};\n      logMap[cellIdStr] = this.appProxy.networkInfoLogs[cellIdStr];\n    }\n    for (const [cellIdStr, infoPairs] of Object.entries(logMap)) {\n      const cellId = str2CellId(cellIdStr);\n      const [dnaId, agentId] = decomposeCellId(cellId);\n      const hcl = this.appProxy.getLocations(cellId);\n      const cellName = this.appProxy.getCellName(hcl[0]);\n      console.log(`NetworfInfo logs of cell \"${cellName}\" | [${agentId.short}, ${dnaId.short}]`);\n      const logs = infoPairs\n        .map(([ts, info]) => {\n          return {\n            ts,\n            arc: info.arc_size,\n            peers: info.current_number_of_peers,\n            total_peers: info.total_network_peers,\n            rounds: info.completed_rounds_since_last_time_queried,\n            bytes: info.bytes_since_last_time_queried,\n            fetch_bytes: info.fetch_pool_info.op_bytes_to_fetch,\n            fetch_ops: info.fetch_pool_info.num_ops_to_fetch,\n          }\n        });\n      console.table(logs);\n    }\n  }\n\n\n  /** */\n  async createClone(baseRoleName: BaseRoleName, cellDef?: CellDef): Promise<[ClonedCell, DnaViewModel]> {\n    return this.hvm.cloneDvm(baseRoleName, cellDef);\n  }\n\n\n  /** */\n  shouldUpdate() {\n    return !!this.hvm;\n  }\n\n}\n"]}
+{"version":3,"file":"HappElement.js","sourceRoot":"","sources":["../src/HappElement.ts"],"names":[],"mappings":"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","sourcesContent":["import {LitElement} from \"lit\";\nimport { state } from \"lit/decorators.js\";\nimport {\n  BaseRoleName,\n  AppProxy,\n  ConductorAppProxy,\n  flattenCells,\n  CellIdStr, AgentIdMap, DnaId, CellAddress\n} from \"@ddd-qc/cell-proxy\";\nimport {HappViewModel} from \"./HappViewModel\";\nimport {CellDef, HvmDef} from \"./definitions\";\nimport {\n  AppWebsocket,\n  ClonedCell, HoloHash,\n  InstalledAppId,\n  NetworkInfo, Timestamp\n} from \"@holochain/client\";\nimport {DnaViewModel} from \"./DnaViewModel\";\n//import {CellId} from \"@holochain/client/lib/types\";\nimport * as net from \"net\";\n\n\n/**\n *\n */\nexport class HappElement extends LitElement {\n\n  /** Must be defined by subclass */\n  static HVM_DEF: HvmDef;\n\n  /** Set during init triggered at ctor */\n  appProxy!: AppProxy;\n  @state() hvm!: HappViewModel;\n\n\n  /** Ctor */\n  protected constructor(port_or_socket: number | AppWebsocket, appId?: InstalledAppId, adminUrl?: URL, defaultTimeout?: number) {\n    super();\n    /* await */ this.constructHvm(port_or_socket, appId, adminUrl, defaultTimeout);\n  }\n\n  /** */\n  async hvmConstructed(): Promise<void> {}\n  /** */\n  async perspectiveInitializedOffline(): Promise<void> {}\n  /** */\n  async perspectiveInitializedOnline(): Promise<void> {}\n\n\n  /** */\n  protected async constructHvm(port_or_socket: number | AppWebsocket, appId?: InstalledAppId, adminUrl?: URL, defaultTimeout?: number): Promise<void> {\n    const hvmDef = (this.constructor as typeof HappElement).HVM_DEF;\n    if (!hvmDef) {\n      throw Error(\"HVM_DEF static field undefined in HappElement subclass \" + this.constructor.name);\n    }\n    /** Override appId */\n    if (appId) {\n      hvmDef.id = appId;\n    }\n    this.appProxy = await ConductorAppProxy.new(port_or_socket, hvmDef.id, adminUrl, defaultTimeout);\n    this.hvm = await HappViewModel.new(this, this.appProxy, hvmDef);\n    await this.hvm.authorizeAllZomeCalls(this.appProxy.adminWs);\n    await this.hvmConstructed();\n    await this.initializePerspective();\n  }\n\n\n  /** */\n  async initializePerspective(): Promise<void> {\n    await this.hvm.initializePerspectiveOffline();\n    await this.perspectiveInitializedOffline();\n    // TODO move this to a later stage\n    await this.hvm.initializePerspectiveOnline();\n    await this.perspectiveInitializedOnline();\n  }\n\n\n  // /** */\n  // async networkInfoCell(hcl: HCL): Promise<NetworkInfo> {\n  //   const dvm = this.hvm.getDvm(hcl);\n  //   if (!dvm) {\n  //     return Promise.reject(\"No DNA found at given HCL: \" + hcl.toString());\n  //   }\n  //   const netInfoMap = await this.appProxy.networkInfo({dnas: [dvm.cell.dnaId.hash]});\n  //   return netInfoMap[dvm.cell.dnaId][1];\n  // }\n\n\n  /** */\n  async networkInfoAll(baseRoleName?: string): Promise<Record<CellIdStr, [Timestamp, NetworkInfo]>> {\n    console.log(`networkInfoAll() \"${baseRoleName}\"`);\n    /** Grab cellMap */\n    const hvmDef = (this.constructor as typeof HappElement).HVM_DEF;\n    const cellMap = this.appProxy.getAppCells(hvmDef.id);\n    if (!cellMap) {\n      return Promise.reject(\"No cells found at given appId: \" + hvmDef.id);\n    }\n    /** Get cell Ids */\n    let cellAddrs: CellAddress[] = [];\n    if (baseRoleName) {\n      const cfr = cellMap[baseRoleName];\n      if (!cfr) {\n        return Promise.reject(\"No cells found at given baseRoleName: \" + baseRoleName);\n      }\n      cellAddrs = flattenCells(cfr);\n    } else {\n      for (const cells of Object.values(cellMap)) {\n        cellAddrs = cellAddrs.concat(flattenCells(cells))\n      }\n    }\n    console.log(`networkInfoAll() cellIds`, cellAddrs.map(cellId => cellId.str));\n    /* Sort by agent key */\n    let dnaPerAgentMap: AgentIdMap<DnaId[]> = new AgentIdMap();\n    for (const cellAddr of cellAddrs) {\n      if (!dnaPerAgentMap.get(cellAddr.agentId)) {\n        dnaPerAgentMap.set(cellAddr.agentId, []);\n      }\n      dnaPerAgentMap.get(cellAddr.agentId).push(cellAddr.dnaId);\n    }\n    console.log(`networkInfoAll() dnaMap`, dnaPerAgentMap);\n    /** Call NetworkInfo per AgentId */\n    const allNetInfos = {};\n    for (const [agent, dnaIds] of dnaPerAgentMap.entries()) {\n      const netInfos = await this.appProxy.networkInfo({dnas: dnaIds.map((dna) => new HoloHash(dna.hash))});\n      let i  = 0;\n      for (const netInfo of netInfos) {\n        const idStr = new CellAddress(dnaIds[i], agent).str;\n        allNetInfos[idStr] = netInfo;\n        i += 1;\n      }\n    }\n    /* Done */\n    return allNetInfos;\n  }\n\n\n  /** */\n  dumpLastestNetworkInfo(baseRoleName?: string) {\n    console.log(`dumpLastestNetworkInfo() \"${baseRoleName}\"`);\n    /** Grab cellMap */\n    const hvmDef = (this.constructor as typeof HappElement).HVM_DEF;\n    const cellMap = this.appProxy.getAppCells(hvmDef.id);\n    if (!cellMap) {\n      throw Error(\"No cells found at given appId: \" + hvmDef.id);\n    }\n    /** Get cell Ids */\n    let cellAddrs: CellAddress[] = [];\n    if (baseRoleName) {\n      const cfr = cellMap[baseRoleName];\n      if (!cfr) {\n        return Promise.reject(\"No cells found at given baseRoleName: \" + baseRoleName);\n      }\n      cellAddrs = flattenCells(cfr);\n    } else {\n      for (const cells of Object.values(cellMap)) {\n        cellAddrs = cellAddrs.concat(flattenCells(cells))\n      }\n    }\n    let logs = cellAddrs.map((cellAddr) => {\n      const logs = this.appProxy.networkInfoLogs[cellAddr.str];\n      if (logs.length === 0) {\n        return;\n      }\n      const [ts, info] = logs[logs.length - 1];\n      const hcl = this.appProxy.getLocations(cellAddr);\n      const cellName = this.appProxy.getCellName(hcl[0]);\n      return {\n            ts,\n            name: cellName,\n            dna: cellAddr.dnaId.short,\n            arc: info.arc_size,\n            peers: info.current_number_of_peers,\n            total_peers: info.total_network_peers,\n            rounds: info.completed_rounds_since_last_time_queried,\n            bytes: info.bytes_since_last_time_queried,\n            fetch_bytes: info.fetch_pool_info.op_bytes_to_fetch,\n            fetch_ops: info.fetch_pool_info.num_ops_to_fetch,\n            agent: cellAddr.agentId.short,\n          }\n    })\n    console.table(logs);\n  }\n\n\n  /* */\n  dumpNetworkInfoLogs(cellIdStr?: string) {\n    console.log(`dumpNetworkInfoLogs() \"${cellIdStr}\"`);\n    let logMap = this.appProxy.networkInfoLogs;\n    if (cellIdStr) {\n      logMap = {};\n      logMap[cellIdStr] = this.appProxy.networkInfoLogs[cellIdStr];\n    }\n    for (const [cellIdStr, infoPairs] of Object.entries(logMap)) {\n      const cellAddr = CellAddress.from(cellIdStr);\n      const hcl = this.appProxy.getLocations(cellAddr);\n      const cellName = this.appProxy.getCellName(hcl[0]);\n      console.log(`NetworfInfo logs of cell \"${cellName}\" | [${cellAddr.agentId.short}, ${cellAddr.dnaId.short}]`);\n      const logs = infoPairs\n        .map(([ts, info]) => {\n          return {\n            ts,\n            arc: info.arc_size,\n            peers: info.current_number_of_peers,\n            total_peers: info.total_network_peers,\n            rounds: info.completed_rounds_since_last_time_queried,\n            bytes: info.bytes_since_last_time_queried,\n            fetch_bytes: info.fetch_pool_info.op_bytes_to_fetch,\n            fetch_ops: info.fetch_pool_info.num_ops_to_fetch,\n          }\n        });\n      console.table(logs);\n    }\n  }\n\n\n  /** */\n  async createClone(baseRoleName: BaseRoleName, cellDef?: CellDef): Promise<[ClonedCell, DnaViewModel]> {\n    return this.hvm.cloneDvm(baseRoleName, cellDef);\n  }\n\n\n  /** */\n  shouldUpdate() {\n    return !!this.hvm;\n  }\n\n}\n"]}

package/dist/HappViewModel.d.ts

@@ -1,9 +1,8 @@
 import { AdminWebsocket, ClonedCell, InstalledAppId } from "@holochain/client";
 import { ReactiveElement } from "lit";
-import { AppProxy, BaseRoleName, Dictionary, HCL } from "@ddd-qc/cell-proxy";
+import { AppProxy, BaseRoleName, CellAddress, Dictionary, HCL } from "@ddd-qc/cell-proxy";
 import { CellDef, DvmDef, HvmDef } from "./definitions";
 import { DnaViewModel } from "./DnaViewModel";
-import { CellId } from "@holochain/client/lib/types";
 /**
  * "ViewModel" of a hApp
  * Creates and stores all the DnaViewModels from the happDef.
@@ -22,7 +21,7 @@ export declare class HappViewModel {
     /** */
     getDef(name: BaseRoleName): DvmDef | undefined;
     /** */
-    getCellDvms(cellId: CellId): Dictionary<DnaViewModel> | undefined;
+    getCellDvms(cellId: CellAddress): Dictionary<DnaViewModel> | undefined;
     /** */
     getDvm(hclOrId: HCL | BaseRoleName): DnaViewModel | undefined;
     /** */

package/dist/HappViewModel.js

@@ -1,4 +1,4 @@
-import { createCloneName, HCL, } from "@ddd-qc/cell-proxy";
+import { CellAddress, createCloneName, HCL, } from "@ddd-qc/cell-proxy";
 //export type HvmConstructor = {new(installedAppId: InstalledAppId): HappViewModel};
 /**
  * "ViewModel" of a hApp
@@ -174,7 +174,7 @@ export class HappViewModel {
         /** Create Cell */
         const clonedCell = await this._appProxy.createCloneCell(request);
         //console.log("clone created:", CellIdStr(cloneInstalledCell.cell_id));
-        const cell = await this._appProxy.fetchCell(this.appId, clonedCell.cell_id);
+        const cell = await this._appProxy.fetchCell(this.appId, CellAddress.from(clonedCell.cell_id));
         console.log("clone created:", cell);
         const hcl = new HCL(this.appId, baseRoleName, cell.cloneId);
         /** Get created cell */

package/dist/HappViewModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"HappViewModel.js","sourceRoot":"","sources":["../src/HappViewModel.ts"],"names":[],"mappings":"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","sourcesContent":["import {AdminWebsocket, ClonedCell, CreateCloneCellRequest, InstalledAppId} from \"@holochain/client\";\nimport { ReactiveElement } from \"lit\";\nimport {\n  AppProxy,\n  BaseRoleName,\n  CloneIndex,\n  createCloneName,\n  Dictionary,\n  HCL,\n} from \"@ddd-qc/cell-proxy\";\nimport { CellDef, DvmDef, HvmDef } from \"./definitions\";\nimport { DnaViewModel } from \"./DnaViewModel\";\nimport { AppSignal } from \"@holochain/client/lib/api/app/types\";\nimport { CellId } from \"@holochain/client/lib/types\";\n\n\n//export type HvmConstructor = {new(installedAppId: InstalledAppId): HappViewModel};\n\n\n/**\n * \"ViewModel\" of a hApp\n * Creates and stores all the DnaViewModels from the happDef.\n */\nexport class HappViewModel {\n\n  /** -- Fields -- */\n  readonly appId: InstalledAppId;\n  /** HCLString -> DnaViewModel */\n  protected _dvmMap: Dictionary<DnaViewModel> = {};\n  /** BaseRoleName -> DvmDef */\n  protected _defMap: Dictionary<DvmDef> = {};\n\n\n  protected _adminWs?: AdminWebsocket;\n\n  /** -- Getters -- */\n\n  /** */\n  getDef(name: BaseRoleName): DvmDef | undefined {\n    return this._defMap[name];\n  }\n\n  /** */\n  getCellDvms(cellId: CellId): Dictionary<DnaViewModel> | undefined {\n    const hcls = this._appProxy.getLocations(cellId);\n    if (hcls === undefined) return undefined;\n    let dict: Dictionary<DnaViewModel> = {};\n    for (const hcl of hcls) {\n      const maybe = this.getDvm(hcl);\n      if (maybe) {\n        dict[hcl.toString()] = maybe;\n      }\n    }\n    return dict;\n  }\n\n  /** */\n  getDvm(hclOrId: HCL | BaseRoleName ): DnaViewModel | undefined {\n    if (typeof hclOrId === 'string') {\n      hclOrId = new HCL(this.appId, hclOrId);\n    }\n    return this._dvmMap[hclOrId.toString()];\n  }\n\n\n  /** */\n  getClones(baseRoleName: BaseRoleName): DnaViewModel[] {\n    const searchHcl = new HCL(this.appId, baseRoleName);\n    let cloneDvms = [];\n    for (const [sHcl, dvm] of Object.entries(this._dvmMap)) {\n      const hcl = HCL.parse(sHcl);\n      if (hcl.isClone() && hcl.match(searchHcl)) {\n        cloneDvms.push(dvm);\n      }\n    }\n    return cloneDvms;\n  }\n\n\n  /** -- Create -- */\n\n  /** Spawn a HappViewModel for an AppId running on the AppProxy */\n  static async new(host: ReactiveElement, appProxy: AppProxy, hvmDef: HvmDef): Promise<HappViewModel> {\n    const appId = appProxy.appIdOfShame? appProxy.appIdOfShame : hvmDef.id;\n    //console.log(\"HappViewModel.new()\", hvmDef.id, appId)\n    /** Create all Cell Proxies in the definition */\n    for (const dvmDef of hvmDef.dvmDefs) {\n      if (dvmDef.ctor.DEFAULT_BASE_ROLE_NAME === undefined) {\n        return Promise.reject(\"static field DEFAULT_BASE_ROLE_NAME not defined for class \" + dvmDef.ctor.name);\n      }\n      const baseRoleName = dvmDef.baseRoleName\n        ? dvmDef.baseRoleName\n        : dvmDef.ctor.DEFAULT_BASE_ROLE_NAME;\n      await appProxy.fetchCells(appId, baseRoleName);\n      const hcl = new HCL(appId, baseRoleName);\n      appProxy.createCellProxy(hcl);\n    }\n    const hvm = new HappViewModel(host, appProxy, hvmDef);\n    return hvm;\n  }\n\n\n  /** Ctor */\n  private constructor(\n    protected _host: ReactiveElement, /* VIEW */\n    protected _appProxy: AppProxy, /* MODEL */\n    hvmDef: HvmDef, /* VIEW-MODEL definition */\n  ) {\n    this.appId = this._appProxy.appIdOfShame? this._appProxy.appIdOfShame : hvmDef.id;\n    /** Create all non-deferred DVMs for this Happ */\n    for (const dvmDef of hvmDef.dvmDefs) {\n      this.createOriginalDvm(dvmDef);\n    }\n    this.createStartingClonesDvm();\n    //console.log(\"HappViewModel created\", this._dvmMap)\n  }\n\n\n  /** -- Methods -- */\n\n  async authorizeAllZomeCalls(adminWs?: AdminWebsocket): Promise<void> {\n    if (!adminWs) {\n      return;\n    }\n    for (const [_sHcl, dvm] of Object.entries(this._dvmMap)) {\n      //console.log(\"Authorizing\", sHcl);\n      await dvm.authorizeZomeCalls(adminWs);\n    }\n  }\n\n  /** */\n  private createStartingClonesDvm(): void {\n    const appInstalledCells = this._appProxy.getAppCells(this.appId)!;\n    for (const [baseRoleName, roleCells] of Object.entries(appInstalledCells)) {\n      const def = this._defMap[baseRoleName];\n      for (const [cloneId, clone] of Object.entries(roleCells.clones)) {\n        const hcl = new HCL(this.appId, baseRoleName, cloneId);\n        this._appProxy.createCellProxy(hcl, clone.name);\n        this.createDvm(def, hcl);\n      }\n    }\n  }\n\n\n  /** */\n  private createDvm(dvmDef: DvmDef, hcl: HCL): DnaViewModel {\n    const dvm: DnaViewModel = new dvmDef.ctor(this._host, this._appProxy, hcl); // WARN this can throw an error\n    //console.log(`  createDvm() for \"${hcl.toString()}\" ; cellId: ${CellIdStr(dvm.cellId)}`);\n    /** Setup signalHandler */\n    if (dvm.signalHandler) {\n      //console.log(`\"${dvm.baseRoleName}\" signalHandler added`, dvm.signalHandler);\n      try {\n        this._appProxy.addSignalHandler((sig: AppSignal) => {\n          dvm.signalHandler!(sig)\n        }, hcl.toString());\n      } catch (e) {\n        console.error(e)\n      }\n    }\n    /** Store it */\n    if (this._dvmMap[hcl.toString()]) {\n      throw Error(\"DVM already exists for \" + hcl.toString());\n    }\n    this._dvmMap[hcl.toString()] = dvm;\n    /** Done */\n    return dvm;\n  }\n\n\n  /** */\n  private createOriginalDvm(dvmDef: DvmDef): void {\n    /** Determine baseRoleName */\n    const baseRoleName = dvmDef.baseRoleName\n      ? dvmDef.baseRoleName\n      : dvmDef.ctor.DEFAULT_BASE_ROLE_NAME;\n    //console.log(\"createOriginalDvm() for \", baseRoleName);\n    if (this._defMap[baseRoleName]) {\n      throw Error(`createOriginalDvm() failed. DVM for original cell of ${baseRoleName} already exists.`);\n    }\n    const hcl = new HCL(this.appId, baseRoleName);\n    this.createDvm(dvmDef, hcl);\n    this._defMap[baseRoleName] = dvmDef;\n  }\n\n\n  /** */\n  async cloneDvm(baseRoleName: BaseRoleName, cellDef?: CellDef): Promise<[ClonedCell, DnaViewModel]> {\n    //console.log(\"createCloneDvm()\", baseRoleName);\n    /** Check preconditions */\n    const def = this._defMap[baseRoleName];\n    if (!def) {\n      return Promise.reject(`createCloneDvm() failed for ${baseRoleName}. No original DVM created.`)\n    }\n    if (!def.isClonable) {\n      return Promise.reject(`createCloneDvm() failed. Role \"${baseRoleName}\" is not clonable.`)\n    }\n    /** Get cloneIndex */\n    const clones = this.getClones(baseRoleName);\n    const cloneIndex: CloneIndex = clones.length;\n    const cloneName = cellDef && cellDef.cloneName\n      ? cellDef.cloneName\n      : createCloneName(baseRoleName, cloneIndex);\n    /** Build default request */\n    let request: CreateCloneCellRequest = {\n      //app_id: this.appId,\n      role_name: baseRoleName,\n      modifiers: {\n        network_seed: String(cloneIndex),\n      },\n      name: cloneName,\n    }\n    /** Modify request according to CellDef */\n    if (cellDef) {\n      request.modifiers = cellDef.modifiers;\n      request.membrane_proof = cellDef.membraneProof;\n      request.name = cellDef.cloneName;\n    }\n    /** Create Cell */\n    const clonedCell = await this._appProxy.createCloneCell(request);\n    //console.log(\"clone created:\", CellIdStr(cloneInstalledCell.cell_id));\n    const cell = await this._appProxy.fetchCell(this.appId, clonedCell.cell_id);\n    console.log(\"clone created:\", cell);\n    const hcl = new HCL(this.appId, baseRoleName, cell.cloneId);\n    /** Get created cell */\n    const clone = cell.asCloned()!;\n    this._appProxy.addClone(hcl, clone);\n    /** Create CellProxy */\n    this._appProxy.createCellProxy(hcl, clone.name);\n    /** Create DVM and authorize */\n    const dvm = this.createDvm(def, hcl);\n    if (this._adminWs) {\n      await dvm.authorizeZomeCalls(this._adminWs);\n    }\n    /** Done */\n    return [clonedCell, dvm];\n  }\n\n\n  /** */\n  probeAll(): void {\n    for (const dvm of Object.values(this._dvmMap)) {\n      dvm.probeAll();\n    }\n  }\n\n\n  /** */\n  async initializePerspectiveOnline(): Promise<void> {\n    const all = [];\n    for (const dvm of Object.values(this._dvmMap)) {\n      const p = dvm.initializePerspectiveOnline();\n      all.push(p);\n    }\n    await Promise.all(all);\n  }\n\n\n  /** */\n  async initializePerspectiveOffline(): Promise<void> {\n    const all = [];\n    for (const dvm of Object.values(this._dvmMap)) {\n      const p = dvm.initializePerspectiveOffline();\n      all.push(p);\n    }\n    await Promise.all(all);\n  }\n\n\n  /** */\n  dumpCallLogs(baseRoleName?: BaseRoleName): void {\n    if (baseRoleName) {\n      const dvm = this.getDvm(baseRoleName);\n      if (dvm) {\n        dvm.dumpCallLogs();\n      } else {\n        console.error(`dumpCallLogs() failed. Role \"${baseRoleName}\" not found in happ \"${this.appId}\"`)\n      }\n    } else {\n      for (const dvm of Object.values(this._dvmMap)) {\n        dvm.dumpCallLogs();\n      }\n    }\n  }\n}\n"]}
+{"version":3,"file":"HappViewModel.js","sourceRoot":"","sources":["../src/HappViewModel.ts"],"names":[],"mappings":"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","sourcesContent":["import {AdminWebsocket, ClonedCell, CreateCloneCellRequest, InstalledAppId} from \"@holochain/client\";\nimport { ReactiveElement } from \"lit\";\nimport {\n  AppProxy,\n  BaseRoleName, CellAddress,\n  CloneIndex,\n  createCloneName,\n  Dictionary,\n  HCL,\n} from \"@ddd-qc/cell-proxy\";\nimport { CellDef, DvmDef, HvmDef } from \"./definitions\";\nimport { DnaViewModel } from \"./DnaViewModel\";\nimport { AppSignal } from \"@holochain/client/lib/api/app/types\";\n\n\n//export type HvmConstructor = {new(installedAppId: InstalledAppId): HappViewModel};\n\n\n/**\n * \"ViewModel\" of a hApp\n * Creates and stores all the DnaViewModels from the happDef.\n */\nexport class HappViewModel {\n\n  /** -- Fields -- */\n  readonly appId: InstalledAppId;\n  /** HCLString -> DnaViewModel */\n  protected _dvmMap: Dictionary<DnaViewModel> = {};\n  /** BaseRoleName -> DvmDef */\n  protected _defMap: Dictionary<DvmDef> = {};\n\n\n  protected _adminWs?: AdminWebsocket;\n\n  /** -- Getters -- */\n\n  /** */\n  getDef(name: BaseRoleName): DvmDef | undefined {\n    return this._defMap[name];\n  }\n\n  /** */\n  getCellDvms(cellId: CellAddress): Dictionary<DnaViewModel> | undefined {\n    const hcls = this._appProxy.getLocations(cellId);\n    if (hcls === undefined) return undefined;\n    let dict: Dictionary<DnaViewModel> = {};\n    for (const hcl of hcls) {\n      const maybe = this.getDvm(hcl);\n      if (maybe) {\n        dict[hcl.toString()] = maybe;\n      }\n    }\n    return dict;\n  }\n\n  /** */\n  getDvm(hclOrId: HCL | BaseRoleName ): DnaViewModel | undefined {\n    if (typeof hclOrId === 'string') {\n      hclOrId = new HCL(this.appId, hclOrId);\n    }\n    return this._dvmMap[hclOrId.toString()];\n  }\n\n\n  /** */\n  getClones(baseRoleName: BaseRoleName): DnaViewModel[] {\n    const searchHcl = new HCL(this.appId, baseRoleName);\n    let cloneDvms = [];\n    for (const [sHcl, dvm] of Object.entries(this._dvmMap)) {\n      const hcl = HCL.parse(sHcl);\n      if (hcl.isClone() && hcl.match(searchHcl)) {\n        cloneDvms.push(dvm);\n      }\n    }\n    return cloneDvms;\n  }\n\n\n  /** -- Create -- */\n\n  /** Spawn a HappViewModel for an AppId running on the AppProxy */\n  static async new(host: ReactiveElement, appProxy: AppProxy, hvmDef: HvmDef): Promise<HappViewModel> {\n    const appId = appProxy.appIdOfShame? appProxy.appIdOfShame : hvmDef.id;\n    //console.log(\"HappViewModel.new()\", hvmDef.id, appId)\n    /** Create all Cell Proxies in the definition */\n    for (const dvmDef of hvmDef.dvmDefs) {\n      if (dvmDef.ctor.DEFAULT_BASE_ROLE_NAME === undefined) {\n        return Promise.reject(\"static field DEFAULT_BASE_ROLE_NAME not defined for class \" + dvmDef.ctor.name);\n      }\n      const baseRoleName = dvmDef.baseRoleName\n        ? dvmDef.baseRoleName\n        : dvmDef.ctor.DEFAULT_BASE_ROLE_NAME;\n      await appProxy.fetchCells(appId, baseRoleName);\n      const hcl = new HCL(appId, baseRoleName);\n      appProxy.createCellProxy(hcl);\n    }\n    const hvm = new HappViewModel(host, appProxy, hvmDef);\n    return hvm;\n  }\n\n\n  /** Ctor */\n  private constructor(\n    protected _host: ReactiveElement, /* VIEW */\n    protected _appProxy: AppProxy, /* MODEL */\n    hvmDef: HvmDef, /* VIEW-MODEL definition */\n  ) {\n    this.appId = this._appProxy.appIdOfShame? this._appProxy.appIdOfShame : hvmDef.id;\n    /** Create all non-deferred DVMs for this Happ */\n    for (const dvmDef of hvmDef.dvmDefs) {\n      this.createOriginalDvm(dvmDef);\n    }\n    this.createStartingClonesDvm();\n    //console.log(\"HappViewModel created\", this._dvmMap)\n  }\n\n\n  /** -- Methods -- */\n\n  async authorizeAllZomeCalls(adminWs?: AdminWebsocket): Promise<void> {\n    if (!adminWs) {\n      return;\n    }\n    for (const [_sHcl, dvm] of Object.entries(this._dvmMap)) {\n      //console.log(\"Authorizing\", sHcl);\n      await dvm.authorizeZomeCalls(adminWs);\n    }\n  }\n\n  /** */\n  private createStartingClonesDvm(): void {\n    const appInstalledCells = this._appProxy.getAppCells(this.appId)!;\n    for (const [baseRoleName, roleCells] of Object.entries(appInstalledCells)) {\n      const def = this._defMap[baseRoleName];\n      for (const [cloneId, clone] of Object.entries(roleCells.clones)) {\n        const hcl = new HCL(this.appId, baseRoleName, cloneId);\n        this._appProxy.createCellProxy(hcl, clone.name);\n        this.createDvm(def, hcl);\n      }\n    }\n  }\n\n\n  /** */\n  private createDvm(dvmDef: DvmDef, hcl: HCL): DnaViewModel {\n    const dvm: DnaViewModel = new dvmDef.ctor(this._host, this._appProxy, hcl); // WARN this can throw an error\n    //console.log(`  createDvm() for \"${hcl.toString()}\" ; cellId: ${CellIdStr(dvm.cellId)}`);\n    /** Setup signalHandler */\n    if (dvm.signalHandler) {\n      //console.log(`\"${dvm.baseRoleName}\" signalHandler added`, dvm.signalHandler);\n      try {\n        this._appProxy.addSignalHandler((sig: AppSignal) => {\n          dvm.signalHandler!(sig)\n        }, hcl.toString());\n      } catch (e) {\n        console.error(e)\n      }\n    }\n    /** Store it */\n    if (this._dvmMap[hcl.toString()]) {\n      throw Error(\"DVM already exists for \" + hcl.toString());\n    }\n    this._dvmMap[hcl.toString()] = dvm;\n    /** Done */\n    return dvm;\n  }\n\n\n  /** */\n  private createOriginalDvm(dvmDef: DvmDef): void {\n    /** Determine baseRoleName */\n    const baseRoleName = dvmDef.baseRoleName\n      ? dvmDef.baseRoleName\n      : dvmDef.ctor.DEFAULT_BASE_ROLE_NAME;\n    //console.log(\"createOriginalDvm() for \", baseRoleName);\n    if (this._defMap[baseRoleName]) {\n      throw Error(`createOriginalDvm() failed. DVM for original cell of ${baseRoleName} already exists.`);\n    }\n    const hcl = new HCL(this.appId, baseRoleName);\n    this.createDvm(dvmDef, hcl);\n    this._defMap[baseRoleName] = dvmDef;\n  }\n\n\n  /** */\n  async cloneDvm(baseRoleName: BaseRoleName, cellDef?: CellDef): Promise<[ClonedCell, DnaViewModel]> {\n    //console.log(\"createCloneDvm()\", baseRoleName);\n    /** Check preconditions */\n    const def = this._defMap[baseRoleName];\n    if (!def) {\n      return Promise.reject(`createCloneDvm() failed for ${baseRoleName}. No original DVM created.`)\n    }\n    if (!def.isClonable) {\n      return Promise.reject(`createCloneDvm() failed. Role \"${baseRoleName}\" is not clonable.`)\n    }\n    /** Get cloneIndex */\n    const clones = this.getClones(baseRoleName);\n    const cloneIndex: CloneIndex = clones.length;\n    const cloneName = cellDef && cellDef.cloneName\n      ? cellDef.cloneName\n      : createCloneName(baseRoleName, cloneIndex);\n    /** Build default request */\n    let request: CreateCloneCellRequest = {\n      //app_id: this.appId,\n      role_name: baseRoleName,\n      modifiers: {\n        network_seed: String(cloneIndex),\n      },\n      name: cloneName,\n    }\n    /** Modify request according to CellDef */\n    if (cellDef) {\n      request.modifiers = cellDef.modifiers;\n      request.membrane_proof = cellDef.membraneProof;\n      request.name = cellDef.cloneName;\n    }\n    /** Create Cell */\n    const clonedCell = await this._appProxy.createCloneCell(request);\n    //console.log(\"clone created:\", CellIdStr(cloneInstalledCell.cell_id));\n    const cell = await this._appProxy.fetchCell(this.appId, CellAddress.from(clonedCell.cell_id));\n    console.log(\"clone created:\", cell);\n    const hcl = new HCL(this.appId, baseRoleName, cell.cloneId);\n    /** Get created cell */\n    const clone = cell.asCloned()!;\n    this._appProxy.addClone(hcl, clone);\n    /** Create CellProxy */\n    this._appProxy.createCellProxy(hcl, clone.name);\n    /** Create DVM and authorize */\n    const dvm = this.createDvm(def, hcl);\n    if (this._adminWs) {\n      await dvm.authorizeZomeCalls(this._adminWs);\n    }\n    /** Done */\n    return [clonedCell, dvm];\n  }\n\n\n  /** */\n  probeAll(): void {\n    for (const dvm of Object.values(this._dvmMap)) {\n      dvm.probeAll();\n    }\n  }\n\n\n  /** */\n  async initializePerspectiveOnline(): Promise<void> {\n    const all = [];\n    for (const dvm of Object.values(this._dvmMap)) {\n      const p = dvm.initializePerspectiveOnline();\n      all.push(p);\n    }\n    await Promise.all(all);\n  }\n\n\n  /** */\n  async initializePerspectiveOffline(): Promise<void> {\n    const all = [];\n    for (const dvm of Object.values(this._dvmMap)) {\n      const p = dvm.initializePerspectiveOffline();\n      all.push(p);\n    }\n    await Promise.all(all);\n  }\n\n\n  /** */\n  dumpCallLogs(baseRoleName?: BaseRoleName): void {\n    if (baseRoleName) {\n      const dvm = this.getDvm(baseRoleName);\n      if (dvm) {\n        dvm.dumpCallLogs();\n      } else {\n        console.error(`dumpCallLogs() failed. Role \"${baseRoleName}\" not found in happ \"${this.appId}\"`)\n      }\n    } else {\n      for (const dvm of Object.values(this._dvmMap)) {\n        dvm.dumpCallLogs();\n      }\n    }\n  }\n}\n"]}

package/dist/ViewModel.js

@@ -1,12 +1,11 @@
 import { ContextProvider } from "@lit/context";
 import { Mutex } from 'async-mutex';
-var InitializationState;
-(function (InitializationState) {
-    InitializationState["Uninitialized"] = "Uninitialized";
-    InitializationState["InitializingOffline"] = "InitializingOffline";
-    InitializationState["InitializingOnline"] = "InitializingOnline";
-    InitializationState["Initialized"] = "Initialized";
-})(InitializationState || (InitializationState = {}));
+// enum InitializationState {
+//   Uninitialized = "Uninitialized",
+//   InitializingOffline = "InitializingOffline",
+//   InitializingOnline = "InitializingOnline",
+//   Initialized = "Initialized",
+// }
 /**
  * ABC of a ViewModel.
  * It mediates the interaction between a View (CustomElements) and a Model (Zome / DNA).

package/dist/ViewModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"ViewModel.js","sourceRoot":"","sources":["../src/ViewModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAC,MAAM,cAAc,CAAC;AAItD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGpC,IAAK,mBAKJ;AALD,WAAK,mBAAmB;IACtB,sDAA+B,CAAA;IAC/B,kEAA2C,CAAA;IAC3C,gEAAyC,CAAA;IACzC,kDAA2B,CAAA;AAC7B,CAAC,EALI,mBAAmB,KAAnB,mBAAmB,QAKvB;AAED;;;;;;;;;;GAUG;AACF,MAAM,OAAgB,SAAS;IAA/B;QAIW,mBAAc,GAA4C,EAAE,CAAC;QAGvE,0FAA0F;QAGhF,gBAAW,GAAG,IAAI,KAAK,EAAE,CAAC;IAwFtC,CAAC;IA3EC,qEAAqE;IACrE,KAAK,CAAC,4BAA4B,KAAmB,CAAC;IACtD,uDAAuD;IACvD,KAAK,CAAC,2BAA2B,KAAmB,CAAC;IACrD,0GAA0G;IAChG,aAAa,KAAU,CAAC;IAAA,CAAC;IAEnC;;;OAGG;IACH,QAAQ;QACN,uEAAuE;QACvE,gEAAgE;QAChE,YAAY;QACZ,IAAI;QACJ,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE;YAC/B,OAAO,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;YACjE,OAAO;SACR;QACD,IAAI,CAAC,WAAW;aACb,OAAO,EAAE;aACT,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YACtB,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACP,CAAC;IAUD,0BAA0B;IAE1B,mCAAmC;IACnC,cAAc,CAAC,YAA6B;QAC1C,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;QACrF,IAAI,CAAC,SAAS,GAAG,IAAI,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,IAAI,CAAC,CAAC;IAC9E,CAAC;IAED,6BAA6B;IAE7B,MAAM;IACN,SAAS,CAAC,YAAoC,EAAE,QAAqB;QAChE,YAAoB,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;QACnD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAA;IACtD,CAAC;IAED,MAAM;IACN,WAAW,CAAC,SAAiC;QACzC,IAAI,KAAK,GAAI,CAAC,CAAC;QACf,KAAK,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,IAAI,CAAC,cAAc,EAAE;YACjD,IAAI,IAAI,KAAK,SAAS;gBAAE,MAAM;YAC9B,KAAK,IAAI,CAAC,CAAC;SACd;QACD,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;YACZ,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SACxC;IACL,CAAC;IAED,MAAM;IACI,iBAAiB;QACzB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAAE,OAAO,KAAK,CAAC;QACnC,gEAAgE;QAChE,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,WAAW,CAAC;QAC7C,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,cAAc,EAAE;YACnD,IAAY,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC;SACrD;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CAEF","sourcesContent":["import {Context, ContextProvider} from \"@lit/context\";\nimport {ReactiveControllerHost, ReactiveElement} from \"lit\";\nimport {AppSignalCb} from \"@holochain/client\";\n\nimport { Mutex } from 'async-mutex';\n\n\nenum InitializationState {\n  Uninitialized = \"Uninitialized\",\n  InitializingOffline = \"InitializingOffline\",\n  InitializingOnline = \"InitializingOnline\",\n  Initialized = \"Initialized\",\n}\n\n/**\n * ABC of a ViewModel.\n * It mediates the interaction between a View (CustomElements) and a Model (Zome / DNA).\n * It is an Observable meant to be observed by (Lit) ReactiveElements.\n * It is meant to be a singleton passed around by a (Lit) Context.\n * The ViewModel contains a perspective: All the data that a view can observe.\n * To update subscribers, it makes use of Lit's reactive properties.\n * When subscribing, a host must provide a reactive property that has the ViewModel's perspestives's type.\n * Hosts can trigger probing in order to get an updated perspective.\n * The perspective can be automatically updated by internal events.\n */\n export abstract class ViewModel {\n\n  /** -- Fields -- */\n  protected _previousPerspective?: unknown;\n  protected _providedHosts: [ReactiveControllerHost, PropertyKey][] = [];\n  protected _provider?: unknown; // FIXME type: ContextProvider<this.getContext()>;\n\n  //protected _initializationState: InitializationState = InitializationState.Uninitialized;\n\n\n  protected _probeMutex = new Mutex();\n\n  /** -- Abstract fields -- */\n\n  abstract signalHandler?: AppSignalCb;\n\n\n  /** -- Abstract methods -- */\n\n  abstract getContext(): Context<unknown, unknown>;\n  /* Child class should implement with specific type */\n  abstract get perspective(): unknown;\n\n  /* (optional) Set perspective with data from the source-chain only */\n  async initializePerspectiveOffline(): Promise<void> {}\n  /* (optional) Set perspective with data from the DHT */\n  async initializePerspectiveOnline(): Promise<void> {}\n  /* (optional) Lets the observer trigger probing into the network in order to get an updated perspective */\n  protected probeAllInner(): void {};\n\n  /**\n   * Mutex wrapping of probeAllInner: Don't call probeAll() during a probeAll()\n   * Should not be async as we expect this to be long, so happs are expected to use signals instead if something changed.\n   */\n  probeAll(): void {\n    // if (this._initializationState !== InitializationState.Initialized) {\n    //   console.warn(\"probeAll() called on unitialized ViewModel\");\n    //   return;\n    // }\n    if (this._probeMutex.isLocked()) {\n      console.log(\"probeAll() call skipped. Reason: Already running.\");\n      return;\n    }\n    this._probeMutex\n      .acquire()\n      .then(async (release) => {\n        this.probeAllInner();\n        release();\n      });\n  }\n\n  /**\n   * Return true if the perspective has changed. This will trigger an update on the observers\n   * Child classes are expected to compare their latest constructed perspective (the one returned by this.perspective())\n   * with this._previousPerspective.\n   */\n  protected abstract hasChanged(): boolean;\n\n\n  /** -- Final methods -- */\n\n  /** Set ContextProvider for host */\n  provideContext(providerHost: ReactiveElement): void {\n    console.log(`\\t\\tProviding context \"${this.getContext()}\" | in host `, providerHost);\n    this._provider = new ContextProvider(providerHost, this.getContext(), this);\n  }\n\n  /** -- Observer pattern -- */\n\n  /** */\n  subscribe(providedHost: ReactiveControllerHost, propName: PropertyKey): void {\n      (providedHost as any)[propName] = this.perspective;\n      this._providedHosts.push([providedHost, propName])\n  }\n\n  /** */\n  unsubscribe(candidate: ReactiveControllerHost): void {\n      let index  = 0;\n      for (const [host, _propName] of this._providedHosts) {\n          if (host === candidate) break;\n          index += 1;\n      }\n      if (index > -1) {\n          this._providedHosts.splice(index, 1);\n      }\n  }\n\n  /** */\n  protected notifySubscribers(): boolean {\n    if (!this.hasChanged()) return false;\n      //this._previousPerspective = structuredClone(this.perspective);\n      this._previousPerspective = this.perspective;\n      for (const [host, propName] of this._providedHosts) {\n      (host as any)[propName] = this._previousPerspective;\n    }\n    return true;\n  }\n\n}\n"]}
+{"version":3,"file":"ViewModel.js","sourceRoot":"","sources":["../src/ViewModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAC,MAAM,cAAc,CAAC;AAItD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGpC,6BAA6B;AAC7B,qCAAqC;AACrC,iDAAiD;AACjD,+CAA+C;AAC/C,iCAAiC;AACjC,IAAI;AAGJ;;;;;;;;;;GAUG;AACF,MAAM,OAAgB,SAAS;IAA/B;QAIW,mBAAc,GAA4C,EAAE,CAAC;QAGvE,0FAA0F;QAGhF,gBAAW,GAAG,IAAI,KAAK,EAAE,CAAC;IAwFtC,CAAC;IA3EC,qEAAqE;IACrE,KAAK,CAAC,4BAA4B,KAAmB,CAAC;IACtD,uDAAuD;IACvD,KAAK,CAAC,2BAA2B,KAAmB,CAAC;IACrD,0GAA0G;IAChG,aAAa,KAAU,CAAC;IAAA,CAAC;IAEnC;;;OAGG;IACH,QAAQ;QACN,uEAAuE;QACvE,gEAAgE;QAChE,YAAY;QACZ,IAAI;QACJ,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE;YAC/B,OAAO,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;YACjE,OAAO;SACR;QACD,IAAI,CAAC,WAAW;aACb,OAAO,EAAE;aACT,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YACtB,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACP,CAAC;IAUD,0BAA0B;IAE1B,mCAAmC;IACnC,cAAc,CAAC,YAA6B;QAC1C,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;QACrF,IAAI,CAAC,SAAS,GAAG,IAAI,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,IAAI,CAAC,CAAC;IAC9E,CAAC;IAED,6BAA6B;IAE7B,MAAM;IACN,SAAS,CAAC,YAAoC,EAAE,QAAqB;QAChE,YAAoB,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;QACnD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAA;IACtD,CAAC;IAED,MAAM;IACN,WAAW,CAAC,SAAiC;QACzC,IAAI,KAAK,GAAI,CAAC,CAAC;QACf,KAAK,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,IAAI,CAAC,cAAc,EAAE;YACjD,IAAI,IAAI,KAAK,SAAS;gBAAE,MAAM;YAC9B,KAAK,IAAI,CAAC,CAAC;SACd;QACD,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;YACZ,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SACxC;IACL,CAAC;IAED,MAAM;IACI,iBAAiB;QACzB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAAE,OAAO,KAAK,CAAC;QACnC,gEAAgE;QAChE,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,WAAW,CAAC;QAC7C,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,cAAc,EAAE;YACnD,IAAY,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC;SACrD;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CAEF","sourcesContent":["import {Context, ContextProvider} from \"@lit/context\";\nimport {ReactiveControllerHost, ReactiveElement} from \"lit\";\nimport {AppSignalCb} from \"@holochain/client\";\n\nimport { Mutex } from 'async-mutex';\n\n\n// enum InitializationState {\n//   Uninitialized = \"Uninitialized\",\n//   InitializingOffline = \"InitializingOffline\",\n//   InitializingOnline = \"InitializingOnline\",\n//   Initialized = \"Initialized\",\n// }\n\n\n/**\n * ABC of a ViewModel.\n * It mediates the interaction between a View (CustomElements) and a Model (Zome / DNA).\n * It is an Observable meant to be observed by (Lit) ReactiveElements.\n * It is meant to be a singleton passed around by a (Lit) Context.\n * The ViewModel contains a perspective: All the data that a view can observe.\n * To update subscribers, it makes use of Lit's reactive properties.\n * When subscribing, a host must provide a reactive property that has the ViewModel's perspestives's type.\n * Hosts can trigger probing in order to get an updated perspective.\n * The perspective can be automatically updated by internal events.\n */\n export abstract class ViewModel {\n\n  /** -- Fields -- */\n  protected _previousPerspective?: unknown;\n  protected _providedHosts: [ReactiveControllerHost, PropertyKey][] = [];\n  protected _provider?: unknown; // FIXME type: ContextProvider<this.getContext()>;\n\n  //protected _initializationState: InitializationState = InitializationState.Uninitialized;\n\n\n  protected _probeMutex = new Mutex();\n\n  /** -- Abstract fields -- */\n\n  abstract signalHandler?: AppSignalCb;\n\n\n  /** -- Abstract methods -- */\n\n  abstract getContext(): Context<unknown, unknown>;\n  /* Child class should implement with specific type */\n  abstract get perspective(): unknown;\n\n  /* (optional) Set perspective with data from the source-chain only */\n  async initializePerspectiveOffline(): Promise<void> {}\n  /* (optional) Set perspective with data from the DHT */\n  async initializePerspectiveOnline(): Promise<void> {}\n  /* (optional) Lets the observer trigger probing into the network in order to get an updated perspective */\n  protected probeAllInner(): void {};\n\n  /**\n   * Mutex wrapping of probeAllInner: Don't call probeAll() during a probeAll()\n   * Should not be async as we expect this to be long, so happs are expected to use signals instead if something changed.\n   */\n  probeAll(): void {\n    // if (this._initializationState !== InitializationState.Initialized) {\n    //   console.warn(\"probeAll() called on unitialized ViewModel\");\n    //   return;\n    // }\n    if (this._probeMutex.isLocked()) {\n      console.log(\"probeAll() call skipped. Reason: Already running.\");\n      return;\n    }\n    this._probeMutex\n      .acquire()\n      .then(async (release) => {\n        this.probeAllInner();\n        release();\n      });\n  }\n\n  /**\n   * Return true if the perspective has changed. This will trigger an update on the observers\n   * Child classes are expected to compare their latest constructed perspective (the one returned by this.perspective())\n   * with this._previousPerspective.\n   */\n  protected abstract hasChanged(): boolean;\n\n\n  /** -- Final methods -- */\n\n  /** Set ContextProvider for host */\n  provideContext(providerHost: ReactiveElement): void {\n    console.log(`\\t\\tProviding context \"${this.getContext()}\" | in host `, providerHost);\n    this._provider = new ContextProvider(providerHost, this.getContext(), this);\n  }\n\n  /** -- Observer pattern -- */\n\n  /** */\n  subscribe(providedHost: ReactiveControllerHost, propName: PropertyKey): void {\n      (providedHost as any)[propName] = this.perspective;\n      this._providedHosts.push([providedHost, propName])\n  }\n\n  /** */\n  unsubscribe(candidate: ReactiveControllerHost): void {\n      let index  = 0;\n      for (const [host, _propName] of this._providedHosts) {\n          if (host === candidate) break;\n          index += 1;\n      }\n      if (index > -1) {\n          this._providedHosts.splice(index, 1);\n      }\n  }\n\n  /** */\n  protected notifySubscribers(): boolean {\n    if (!this.hasChanged()) return false;\n      //this._previousPerspective = structuredClone(this.perspective);\n      this._previousPerspective = this.perspective;\n      for (const [host, propName] of this._providedHosts) {\n      (host as any)[propName] = this._previousPerspective;\n    }\n    return true;\n  }\n\n}\n"]}

package/dist/ZomeElement.d.ts

@@ -20,7 +20,7 @@ export declare class ZomeElement<P, ZVM extends ZomeViewModel> extends ZomeEleme
     perspective: P;
     private _consumer?;
     /** -- Methods -- */
-    /** Request zvm from Context based on current CellId */
+    /** Request zvm from Context based on current CellAddress */
     private requestZvm;
     /** Subclass can override this to get notified when a new ZVM has been received */
     protected zvmUpdated(newZvm: ZVM, oldZvm?: ZVM): Promise<void>;

package/dist/ZomeElement.js

@@ -19,7 +19,7 @@ export class ZomeElement extends CellMixin(LitElement) {
     get zomeName() { return this._zomeName; }
     ;
     /** -- Methods -- */
-    /** Request zvm from Context based on current CellId */
+    /** Request zvm from Context based on current CellAddress */
     requestZvm(canRerequest = false) {
         if (!this._cell_via_context) {
             throw Error(`Context "${cellContext}" not found from ZomeElement "${this.constructor.name}"`);
@@ -28,7 +28,7 @@ export class ZomeElement extends CellMixin(LitElement) {
         if (!canRerequest && this._consumer) {
             return;
         }
-        const contextType = createContext('zvm/' + this.defaultZomeName + '/' + this.cell.dnaId.b64);
+        const contextType = createContext('zvm/' + this.defaultZomeName + '/' + this.cell.address.dnaId.b64);
         console.log(`\t\t Requesting context "${contextType}"`);
         this._consumer = new ContextConsumer(this, contextType, async (value, dispose) => {
             console.log(`\t\t Received value for context "${contextType}"`);

package/dist/ZomeElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"ZomeElement.js","sourceRoot":"","sources":["../src/ZomeElement.ts"],"names":[],"mappings":"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","sourcesContent":["import {LitElement, PropertyValues} from \"lit\";\nimport {property, state} from \"lit/decorators.js\";\nimport {consume, ContextConsumer, createContext} from \"@lit/context\";\nimport {ZomeName} from \"@holochain/client\";\nimport {cellContext} from \"./elements/cell-context\";\nimport { ZomeViewModel } from \"./ZomeViewModel\";\nimport {Cell, CellMixin} from \"@ddd-qc/cell-proxy\";\n\n\n/**\n * LitElement that is bound to a specific ZomeViewModel, e.g. a View for the ViewModel\n */\nexport class ZomeElement<P, ZVM extends ZomeViewModel> extends CellMixin(LitElement) {\n\n  constructor(public readonly defaultZomeName: ZomeName) {\n    super();\n    // const nameAttr = this.getAttribute(\"zomeName\");\n    // if (nameAttr) {\n    //   this.zomeName = nameAttr;\n    // }\n  }\n\n  @consume({ context: cellContext, subscribe: true})\n  @property({type: Object, attribute: false})\n  _cell_via_context!: Cell;\n\n  protected _zomeName!: ZomeName;\n  get zomeName(): ZomeName {return this._zomeName};\n\n  /** Provided by Context depending on cellData.dnaHash */\n  @state() protected _zvm!: ZVM;\n\n  @property({type: Object, attribute: false, hasChanged: (_v, _old) => true})\n  perspective!: P;\n\n  private _consumer?;\n\n\n  /** -- Methods -- */\n\n  /** Request zvm from Context based on current CellId */\n  private requestZvm(canRerequest: boolean = false) {\n    if (!this._cell_via_context) {\n      throw Error(`Context \"${cellContext}\" not found from ZomeElement \"${this.constructor.name}\"`)\n    }\n    /* DVM already requested */\n    if (!canRerequest && this._consumer) {\n      return;\n    }\n    const contextType = createContext<ZVM>('zvm/'+ this.defaultZomeName + '/' + this.cell.dnaId.b64)\n    console.log(`\\t\\t Requesting context \"${contextType}\"`)\n    this._consumer = new ContextConsumer(\n      this,\n      contextType,\n      async (value: ZVM, dispose?: () => void): Promise<void> => {\n        console.log(`\\t\\t Received value for context \"${contextType}\"`)\n        await this.zvmUpdated(value, this._zvm);\n        if (this._zvm) {\n          this._zvm.unsubscribe(this);\n        }\n        this._zvm = value;\n        this._zomeName = this._zvm.zomeName;\n        this._zvm.subscribe(this, 'perspective');\n      },\n      false, // true will call twice at init\n    );\n  }\n\n\n  /** Subclass can override this to get notified when a new ZVM has been received */\n  protected async zvmUpdated(newZvm: ZVM, oldZvm?: ZVM): Promise<void> {\n    //console.log(`\\t\\t Default zvmUpdated() called`)\n  }\n\n\n  /** */\n  shouldUpdate(changedProperties: PropertyValues<this>) {\n    //console.log(\"ZomeElement.shouldUpdate() start\", !!this._zvm, this.installedCell);\n    if (changedProperties.has(\"_cell_via_context\")) {\n      //console.log(\"ZomeElement.shouldUpdate()\", this._cell_via_context)\n      this._cell = this._cell_via_context;\n      this.requestZvm(true);\n      return false;\n    }\n    /** RequestZvm on first \"shouldUpdate\" */\n    if (!this._zvm) {\n      this.requestZvm();\n    }\n    return !!this._zvm;\n  }\n\n\n  // /** Request ZVM if cell changed */\n  // protected willUpdate(changedProperties: PropertyValues<this>) {\n  //   //console.log(\"ZomeElement.willUpdate()\", changedProperties)\n  //   if (changedProperties.has(\"_cell_via_context\")) {\n  //     this.requestZvm();\n  //   }\n  // }\n\n}\n\n"]}
+{"version":3,"file":"ZomeElement.js","sourceRoot":"","sources":["../src/ZomeElement.ts"],"names":[],"mappings":"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","sourcesContent":["import {LitElement, PropertyValues} from \"lit\";\nimport {property, state} from \"lit/decorators.js\";\nimport {consume, ContextConsumer, createContext} from \"@lit/context\";\nimport {ZomeName} from \"@holochain/client\";\nimport {cellContext} from \"./elements/cell-context\";\nimport { ZomeViewModel } from \"./ZomeViewModel\";\nimport {Cell, CellMixin} from \"@ddd-qc/cell-proxy\";\n\n\n/**\n * LitElement that is bound to a specific ZomeViewModel, e.g. a View for the ViewModel\n */\nexport class ZomeElement<P, ZVM extends ZomeViewModel> extends CellMixin(LitElement) {\n\n  constructor(public readonly defaultZomeName: ZomeName) {\n    super();\n    // const nameAttr = this.getAttribute(\"zomeName\");\n    // if (nameAttr) {\n    //   this.zomeName = nameAttr;\n    // }\n  }\n\n  @consume({ context: cellContext, subscribe: true})\n  @property({type: Object, attribute: false})\n  _cell_via_context!: Cell;\n\n  protected _zomeName!: ZomeName;\n  get zomeName(): ZomeName {return this._zomeName};\n\n  /** Provided by Context depending on cellData.dnaHash */\n  @state() protected _zvm!: ZVM;\n\n  @property({type: Object, attribute: false, hasChanged: (_v, _old) => true})\n  perspective!: P;\n\n  private _consumer?;\n\n\n  /** -- Methods -- */\n\n  /** Request zvm from Context based on current CellAddress */\n  private requestZvm(canRerequest: boolean = false) {\n    if (!this._cell_via_context) {\n      throw Error(`Context \"${cellContext}\" not found from ZomeElement \"${this.constructor.name}\"`)\n    }\n    /* DVM already requested */\n    if (!canRerequest && this._consumer) {\n      return;\n    }\n    const contextType = createContext<ZVM>('zvm/'+ this.defaultZomeName + '/' + this.cell.address.dnaId.b64)\n    console.log(`\\t\\t Requesting context \"${contextType}\"`)\n    this._consumer = new ContextConsumer(\n      this,\n      contextType,\n      async (value: ZVM, dispose?: () => void): Promise<void> => {\n        console.log(`\\t\\t Received value for context \"${contextType}\"`)\n        await this.zvmUpdated(value, this._zvm);\n        if (this._zvm) {\n          this._zvm.unsubscribe(this);\n        }\n        this._zvm = value;\n        this._zomeName = this._zvm.zomeName;\n        this._zvm.subscribe(this, 'perspective');\n      },\n      false, // true will call twice at init\n    );\n  }\n\n\n  /** Subclass can override this to get notified when a new ZVM has been received */\n  protected async zvmUpdated(newZvm: ZVM, oldZvm?: ZVM): Promise<void> {\n    //console.log(`\\t\\t Default zvmUpdated() called`)\n  }\n\n\n  /** */\n  shouldUpdate(changedProperties: PropertyValues<this>) {\n    //console.log(\"ZomeElement.shouldUpdate() start\", !!this._zvm, this.installedCell);\n    if (changedProperties.has(\"_cell_via_context\")) {\n      //console.log(\"ZomeElement.shouldUpdate()\", this._cell_via_context)\n      this._cell = this._cell_via_context;\n      this.requestZvm(true);\n      return false;\n    }\n    /** RequestZvm on first \"shouldUpdate\" */\n    if (!this._zvm) {\n      this.requestZvm();\n    }\n    return !!this._zvm;\n  }\n\n\n  // /** Request ZVM if cell changed */\n  // protected willUpdate(changedProperties: PropertyValues<this>) {\n  //   //console.log(\"ZomeElement.willUpdate()\", changedProperties)\n  //   if (changedProperties.has(\"_cell_via_context\")) {\n  //     this.requestZvm();\n  //   }\n  // }\n\n}\n\n"]}

package/dist/ZomeViewModel.d.ts

@@ -1,5 +1,5 @@
 import { Context } from "@lit/context";
-import { CellProxy, ZomeProxy, ZomeProxyConstructor, SignalLog, Cell } from "@ddd-qc/cell-proxy";
+import { CellProxy, ZomeProxy, ZomeProxyConstructor, SignalLog } from "@ddd-qc/cell-proxy";
 import { ViewModel } from "./ViewModel";
 import { AppSignalCb, ZomeName } from "@holochain/client";
 import { DnaViewModel } from "./DnaViewModel";
@@ -9,8 +9,8 @@ export type ZvmConstructor = {
 /** (EXPERIMENTAL) Class Decorator */
 export declare function zvm(zProxyCtor: typeof ZomeProxy): (ctor: Function) => void;
 declare const ZomeViewModel_base: (abstract new (...args: any[]) => {
-    _cell?: Cell;
-    readonly cell: Cell;
+    _cell?: import("@ddd-qc/cell-proxy").Cell;
+    readonly cell: import("@ddd-qc/cell-proxy").Cell;
 }) & typeof ViewModel;
 /**
  * Abstract ViewModel for a Zome.

package/dist/ZomeViewModel.js

@@ -1,5 +1,5 @@
 import { createContext } from "@lit/context";
-import { CellMixin, prettySignalLogs } from "@ddd-qc/cell-proxy";
+import { CellMixin, prettySignalLogs, } from "@ddd-qc/cell-proxy";
 import { ViewModel } from "./ViewModel";
 /** (EXPERIMENTAL) Class Decorator */
 export function zvm(zProxyCtor) {
@@ -68,7 +68,7 @@ export class ZomeViewModel extends CellMixin(ViewModel) {
     }
     /** */
     getContext() {
-        const context = createContext('zvm/' + this._zomeProxy.defaultZomeName + '/' + this.cell.dnaId.b64);
+        const context = createContext('zvm/' + this._zomeProxy.defaultZomeName + '/' + this.cell.address.dnaId.b64);
         //console.log({contextType: typeof context})
         return context;
     }

package/dist/ZomeViewModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"ZomeViewModel.js","sourceRoot":"","sources":["../src/ZomeViewModel.ts"],"names":[],"mappings":"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","sourcesContent":["import {Context, createContext} from \"@lit/context\";\nimport {\n    CellProxy,\n    ZomeProxy,\n    ZomeProxyConstructor,\n    CellMixin,\n    SignalLog,\n    prettySignalLogs,\n    Cell,\n    AbstractConstructor,\n    AgentId,\n    dec64,\n    TipProtocol,\n    ZomeSignalProtocol,\n    TipProtocolVariantEntry,\n    ZomeSignalProtocolVariantEntry,\n    TipProtocolVariantLink,\n    ZomeSignalProtocolVariantLink,\n    TipProtocolVariantApp, prettyDate, ZomeSignal, ZomeSignalProtocolType, EntryPulse, LinkPulse, ActionId, EntryId\n} from \"@ddd-qc/cell-proxy\";\nimport {ViewModel} from \"./ViewModel\";\nimport {AgentPubKeyB64, AppSignalCb, Timestamp, ZomeName} from \"@holochain/client\";\nimport {AppSignal} from \"@holochain/client/lib/api/app/types\";\nimport {DnaViewModel} from \"./DnaViewModel\";\n\nexport type ZvmConstructor = {new(proxy: CellProxy, dvmParent: DnaViewModel, zomeName?: ZomeName): ZomeViewModel} /*& typeof ZomeSpecific;*/\n\n/** (EXPERIMENTAL) Class Decorator */\nexport function zvm(zProxyCtor: typeof ZomeProxy) {\n    return (ctor: Function) => {\n        //let zvmCtor = (ctor as typeof ZomeViewModel);\n        (ctor as any).ZOME_PROXY = zProxyCtor;\n        //get zomeProxy(): DummyZomeProxy {return this._zomeProxy as DummyZomeProxy;}\n        //(ctor as any).zomeProxy = function() {return (ctor as any)._zomeProxy as typeof zProxyFactory;}\n        //(ctor as any).zomeProxy = (ctor as any)._zomeProxy as typeof zProxyFactory;\n    }\n}\n\n\n/**\n * Abstract ViewModel for a Zome.\n * It extends a ViewModel by adding a ZomeProxy.\n * Views are required to use this in order to interact with the ZomeProxy.\n * The perspective is the data from the Zome that is transformed and enhanced in order to be consumed by a View.\n * It can be automatically updated by Signals or the Zome Scheduler.\n */\nexport abstract class ZomeViewModel extends CellMixin(ViewModel) {\n\n    /** Zome proxy constructor */\n    static ZOME_PROXY: ZomeProxyConstructor;\n    protected _zomeProxy: ZomeProxy;\n    /* Child class should implement with child proxy class as return type */\n    abstract get zomeProxy(): ZomeProxy;\n    getProxyConstructor(): ZomeProxyConstructor {\n        return (this.constructor as typeof ZomeViewModel).ZOME_PROXY;\n    }\n\n\n\n    signalHandler?: AppSignalCb;\n\n    /** Zome name */\n    static get DEFAULT_ZOME_NAME(): string {\n        return this.ZOME_PROXY.DEFAULT_ZOME_NAME;\n    }\n    zomeName!: ZomeName;\n\n    static get ENTRY_TYPES(): string[] {\n        return this.ZOME_PROXY.ENTRY_TYPES;\n    }\n    static get LINK_TYPES(): string[] {\n        return this.ZOME_PROXY.LINK_TYPES;\n    }\n\n    protected _dvmParent: DnaViewModel;\n\n\n    /** Ctor */\n    constructor(cellProxy: CellProxy, dvmParent: DnaViewModel, zomeName?: ZomeName) {\n        super();\n        this._dvmParent = dvmParent;\n        const zProxyCtor = this.getProxyConstructor();\n        if (!zProxyCtor) {\n            throw Error(\"ZOME_PROXY static field undefined in ZVM subclass \" + this.constructor.name);\n        }\n        if (zomeName) {\n            this.zomeName = zomeName;\n            this._zomeProxy = new zProxyCtor(cellProxy, this.zomeName);\n        } else {\n            this._zomeProxy = new zProxyCtor(cellProxy);\n            this.zomeName = this._zomeProxy.defaultZomeName;\n        }\n        this._cell = cellProxy.cell;\n        cellProxy.addSignalHandler( (signal: AppSignal) => this.handleZomeSignal(signal));\n    }\n\n\n    /** Notify DVM parent */\n    protected notifySubscribers(): boolean {\n        const hasChanged = super.notifySubscribers();\n        if (hasChanged) {\n            this._dvmParent.zvmChanged(this);\n        }\n        return hasChanged;\n    }\n\n    /** Filter signal by zome name */\n    private handleZomeSignal(signal: AppSignal) {\n        //console.log(\"handleZomeSignal()\", this.signalHandler, this.zomeName, signal.zome_name)\n        if (this.signalHandler && signal.zome_name == this.zomeName) {\n            this.signalHandler(signal);\n        }\n    }\n\n    /** */\n    getContext(): Context<unknown, unknown> {\n        const context = createContext<typeof this>('zvm/'+ this._zomeProxy.defaultZomeName +'/' + this.cell.dnaId.b64)\n        //console.log({contextType: typeof context})\n        return context\n    }\n\n\n    /** */\n    dumpSignalLogs(signalLogs: SignalLog[]) {\n        console.warn(`All signals from zome \"${this.zomeName}\"`);\n        console.table(prettySignalLogs(signalLogs));\n    }\n}\n"]}
+{"version":3,"file":"ZomeViewModel.js","sourceRoot":"","sources":["../src/ZomeViewModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,aAAa,EAAC,MAAM,cAAc,CAAC;AACpD,OAAO,EAIH,SAAS,EAET,gBAAgB,GACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAOtC,qCAAqC;AACrC,MAAM,UAAU,GAAG,CAAC,UAA4B;IAC5C,OAAO,CAAC,IAAc,EAAE,EAAE;QACtB,+CAA+C;QAC9C,IAAY,CAAC,UAAU,GAAG,UAAU,CAAC;QACtC,6EAA6E;QAC7E,iGAAiG;QACjG,6EAA6E;IACjF,CAAC,CAAA;AACL,CAAC;AAGD;;;;;;GAMG;AACH,MAAM,OAAgB,aAAc,SAAQ,SAAS,CAAC,SAAS,CAAC;IAO5D,mBAAmB;QACf,OAAQ,IAAI,CAAC,WAAoC,CAAC,UAAU,CAAC;IACjE,CAAC;IAKD,gBAAgB;IAChB,MAAM,KAAK,iBAAiB;QACxB,OAAO,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC;IAC7C,CAAC;IAGD,MAAM,KAAK,WAAW;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;IACvC,CAAC;IACD,MAAM,KAAK,UAAU;QACjB,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;IACtC,CAAC;IAKD,WAAW;IACX,YAAY,SAAoB,EAAE,SAAuB,EAAE,QAAmB;QAC1E,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC9C,IAAI,CAAC,UAAU,EAAE;YACb,MAAM,KAAK,CAAC,oDAAoD,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SAC7F;QACD,IAAI,QAAQ,EAAE;YACV,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YACzB,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC9D;aAAM;YACH,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,SAAS,CAAC,CAAC;YAC5C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC;SACnD;QACD,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC;QAC5B,SAAS,CAAC,gBAAgB,CAAE,CAAC,MAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;IACtF,CAAC;IAGD,wBAAwB;IACd,iBAAiB;QACvB,MAAM,UAAU,GAAG,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAC7C,IAAI,UAAU,EAAE;YACZ,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SACpC;QACD,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,iCAAiC;IACzB,gBAAgB,CAAC,MAAiB;QACtC,wFAAwF;QACxF,IAAI,IAAI,CAAC,aAAa,IAAI,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,QAAQ,EAAE;YACzD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;SAC9B;IACL,CAAC;IAED,MAAM;IACN,UAAU;QACN,MAAM,OAAO,GAAG,aAAa,CAAc,MAAM,GAAE,IAAI,CAAC,UAAU,CAAC,eAAe,GAAE,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACtH,4CAA4C;QAC5C,OAAO,OAAO,CAAA;IAClB,CAAC;IAGD,MAAM;IACN,cAAc,CAAC,UAAuB;QAClC,OAAO,CAAC,IAAI,CAAC,0BAA0B,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;QACzD,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;IAChD,CAAC;CACJ","sourcesContent":["import {Context, createContext} from \"@lit/context\";\nimport {\n    CellProxy,\n    ZomeProxy,\n    ZomeProxyConstructor,\n    CellMixin,\n    SignalLog,\n    prettySignalLogs,\n} from \"@ddd-qc/cell-proxy\";\nimport {ViewModel} from \"./ViewModel\";\nimport {AppSignalCb, ZomeName} from \"@holochain/client\";\nimport {AppSignal} from \"@holochain/client/lib/api/app/types\";\nimport {DnaViewModel} from \"./DnaViewModel\";\n\nexport type ZvmConstructor = {new(proxy: CellProxy, dvmParent: DnaViewModel, zomeName?: ZomeName): ZomeViewModel} /*& typeof ZomeSpecific;*/\n\n/** (EXPERIMENTAL) Class Decorator */\nexport function zvm(zProxyCtor: typeof ZomeProxy) {\n    return (ctor: Function) => {\n        //let zvmCtor = (ctor as typeof ZomeViewModel);\n        (ctor as any).ZOME_PROXY = zProxyCtor;\n        //get zomeProxy(): DummyZomeProxy {return this._zomeProxy as DummyZomeProxy;}\n        //(ctor as any).zomeProxy = function() {return (ctor as any)._zomeProxy as typeof zProxyFactory;}\n        //(ctor as any).zomeProxy = (ctor as any)._zomeProxy as typeof zProxyFactory;\n    }\n}\n\n\n/**\n * Abstract ViewModel for a Zome.\n * It extends a ViewModel by adding a ZomeProxy.\n * Views are required to use this in order to interact with the ZomeProxy.\n * The perspective is the data from the Zome that is transformed and enhanced in order to be consumed by a View.\n * It can be automatically updated by Signals or the Zome Scheduler.\n */\nexport abstract class ZomeViewModel extends CellMixin(ViewModel) {\n\n    /** Zome proxy constructor */\n    static ZOME_PROXY: ZomeProxyConstructor;\n    protected _zomeProxy: ZomeProxy;\n    /* Child class should implement with child proxy class as return type */\n    abstract get zomeProxy(): ZomeProxy;\n    getProxyConstructor(): ZomeProxyConstructor {\n        return (this.constructor as typeof ZomeViewModel).ZOME_PROXY;\n    }\n\n\n    signalHandler?: AppSignalCb;\n\n    /** Zome name */\n    static get DEFAULT_ZOME_NAME(): string {\n        return this.ZOME_PROXY.DEFAULT_ZOME_NAME;\n    }\n    zomeName!: ZomeName;\n\n    static get ENTRY_TYPES(): string[] {\n        return this.ZOME_PROXY.ENTRY_TYPES;\n    }\n    static get LINK_TYPES(): string[] {\n        return this.ZOME_PROXY.LINK_TYPES;\n    }\n\n    protected _dvmParent: DnaViewModel;\n\n\n    /** Ctor */\n    constructor(cellProxy: CellProxy, dvmParent: DnaViewModel, zomeName?: ZomeName) {\n        super();\n        this._dvmParent = dvmParent;\n        const zProxyCtor = this.getProxyConstructor();\n        if (!zProxyCtor) {\n            throw Error(\"ZOME_PROXY static field undefined in ZVM subclass \" + this.constructor.name);\n        }\n        if (zomeName) {\n            this.zomeName = zomeName;\n            this._zomeProxy = new zProxyCtor(cellProxy, this.zomeName);\n        } else {\n            this._zomeProxy = new zProxyCtor(cellProxy);\n            this.zomeName = this._zomeProxy.defaultZomeName;\n        }\n        this._cell = cellProxy.cell;\n        cellProxy.addSignalHandler( (signal: AppSignal) => this.handleZomeSignal(signal));\n    }\n\n\n    /** Notify DVM parent */\n    protected notifySubscribers(): boolean {\n        const hasChanged = super.notifySubscribers();\n        if (hasChanged) {\n            this._dvmParent.zvmChanged(this);\n        }\n        return hasChanged;\n    }\n\n    /** Filter signal by zome name */\n    private handleZomeSignal(signal: AppSignal) {\n        //console.log(\"handleZomeSignal()\", this.signalHandler, this.zomeName, signal.zome_name)\n        if (this.signalHandler && signal.zome_name == this.zomeName) {\n            this.signalHandler(signal);\n        }\n    }\n\n    /** */\n    getContext(): Context<unknown, unknown> {\n        const context = createContext<typeof this>('zvm/'+ this._zomeProxy.defaultZomeName +'/' + this.cell.address.dnaId.b64)\n        //console.log({contextType: typeof context})\n        return context\n    }\n\n\n    /** */\n    dumpSignalLogs(signalLogs: SignalLog[]) {\n        console.warn(`All signals from zome \"${this.zomeName}\"`);\n        console.table(prettySignalLogs(signalLogs));\n    }\n}\n"]}

package/dist/ZomeViewModelWithSignals.d.ts

@@ -1,5 +1,5 @@
 import { AppSignalCb, EntryVisibility, Timestamp } from "@holochain/client";
-import { ActionId, AgentId, AnyLinkableId, EntryId, EntryPulse, LinkPulse, SignalLog, TipProtocol, ZomeSignalProtocol } from "@ddd-qc/cell-proxy";
+import { ActionId, AgentId, LinkableId, EntryId, EntryPulse, LinkPulse, SignalLog, TipProtocol, ZomeSignalProtocol } from "@ddd-qc/cell-proxy";
 import { ZomeViewModel } from "./ZomeViewModel";
 import { ZomeIndex } from "@holochain/client/lib/hdk/link";
 /** */
@@ -36,7 +36,7 @@ export declare abstract class ZomeViewModelWithSignals extends ZomeViewModel {
 export interface EntryPulseMat {
     ah: ActionId;
     state: string;
-    isNew: Boolean;
+    isNew: boolean;
     ts: Timestamp;
     author: AgentId;
     eh: EntryId;
@@ -51,8 +51,8 @@ export declare function dematerializeEntryPulse(pulse: EntryPulseMat, entryTypes
 /** */
 export interface LinkPulseMat {
     author: AgentId;
-    base: AnyLinkableId;
-    target: AnyLinkableId;
+    base: LinkableId;
+    target: LinkableId;
     timestamp: Timestamp;
     zome_index: ZomeIndex;
     link_type: string;

package/dist/ZomeViewModelWithSignals.js

@@ -1,3 +1,4 @@
+import { HoloHash } from "@holochain/client";
 import { ActionId, AgentId, anyToB64, enc64, EntryId, getIndexByVariant, intoLinkableId, prettyDate, prettyState, SignalType, ZomeSignalProtocolType } from "@ddd-qc/cell-proxy";
 import { ZomeViewModel } from "./ZomeViewModel";
 import { decode } from "@msgpack/msgpack";
@@ -45,7 +46,7 @@ export class ZomeViewModelWithSignals extends ZomeViewModel {
                 const entryPulseMat = materializeEntryPulse(pulse.Entry, this.constructor.ENTRY_TYPES);
                 all.push(this.handleEntryPulse(entryPulseMat, from));
                 /** If new entry from this agent, broadcast to peers as tip */
-                if (entryPulseMat.isNew && from.b64 == this.cell.agentId.b64 && entryPulseMat.visibility == "Public") {
+                if (entryPulseMat.isNew && from.b64 == this.cell.address.agentId.b64 && entryPulseMat.visibility == "Public") {
                     all.push(this.broadcastTip({ Entry: pulse.Entry }));
                 }
                 continue;
@@ -54,7 +55,7 @@ export class ZomeViewModelWithSignals extends ZomeViewModel {
                 const linkPulseMat = materializeLinkPulse(pulse.Link, this.constructor.LINK_TYPES);
                 all.push(this.handleLinkPulse(linkPulseMat, from));
                 /** If new Link from this agent, broadcast to peers as tip */
-                if (linkPulseMat.isNew && from.b64 == this.cell.agentId.b64) {
+                if (linkPulseMat.isNew && from.b64 == this.cell.address.agentId.b64) {
                     all.push(this.broadcastTip({ Link: pulse.Link }));
                 }
                 continue;
@@ -87,9 +88,9 @@ export class ZomeViewModelWithSignals extends ZomeViewModel {
     async broadcastTip(tip, agents) {
         agents = agents ? agents : this._dvmParent.livePeers;
         /** Skip if no recipients or sending to self only */
-        const filtered = agents.filter((key) => key.b64 != this.cell.agentId.b64);
+        const filtered = agents.filter((key) => key.b64 != this.cell.address.agentId.b64);
         const tipType = Object.keys(tip)[0];
-        console.log(`broadcastTip() Sending Tip "${tipType}" to`, filtered, this.cell.agentId.short);
+        console.log(`broadcastTip() Sending Tip "${tipType}" to`, filtered, this.cell.address.agentId.short);
         //if (!agents || agents.length == 1 && agents[0] === this._cellProxy.cell.agentPubKey) {
         if (!filtered || filtered.length == 0) {
             console.log("broadcastTip() aborted: No recipients");
@@ -123,7 +124,7 @@ export class ZomeViewModelWithSignals extends ZomeViewModel {
             const signal = log.zomeSignal;
             const pulses = signal.pulses;
             const timestamp = prettyDate(new Date(log.ts));
-            const from = enc64(signal.from) == this.cell.agentId.b64 ? "self" : new AgentId(signal.from);
+            const from = enc64(signal.from) == this.cell.address.agentId.b64 ? "self" : new AgentId(signal.from);
             for (const pulse of pulses) {
                 if (ZomeSignalProtocolType.Tip in pulse) {
                     const tip = pulse.Tip;
@@ -167,11 +168,11 @@ export function dematerializeEntryPulse(pulse, entryTypes) {
     //console.log("dematerializeEntryPulse()", state, entryTypes);
     /** */
     return {
-        ah: pulse.ah.hash,
+        ah: new HoloHash(pulse.ah.hash),
         state: state,
         ts: pulse.ts,
-        author: pulse.author.hash,
-        eh: pulse.eh.hash,
+        author: new HoloHash(pulse.author.hash),
+        eh: new HoloHash(pulse.eh.hash),
         def: {
             entry_index: getIndexByVariant(entryTypes, pulse.entryType),
             zome_index: 42,
@@ -206,14 +207,14 @@ export function dematerializeLinkPulse(pulse, linkTypes) {
     return {
         state: state,
         link: {
-            author: pulse.author.hash,
-            base: pulse.base.hash,
-            target: pulse.target.hash,
+            author: new HoloHash(pulse.author.hash),
+            base: new HoloHash(pulse.base.hash),
+            target: new HoloHash(pulse.target.hash),
             timestamp: pulse.timestamp,
             zome_index: pulse.zome_index,
             link_type: getIndexByVariant(linkTypes, pulse.link_type),
             tag: pulse.tag,
-            create_link_hash: pulse.create_link_hash.hash,
+            create_link_hash: new HoloHash(pulse.create_link_hash.hash),
         }
     };
 }

package/dist/ZomeViewModelWithSignals.js.map

@@ -1 +1 @@
-{"version":3,"file":"ZomeViewModelWithSignals.js","sourceRoot":"","sources":["../src/ZomeViewModelWithSignals.ts"],"names":[],"mappings":"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","sourcesContent":["import {AppSignalCb, EntryVisibility, Timestamp} from \"@holochain/client\";\r\nimport {\r\n  ActionId,\r\n  AgentId, AnyLinkableId, anyToB64, enc64, EntryId,\r\n  EntryPulse, getIndexByVariant, intoLinkableId, LinkPulse, prettyDate, prettyState, SignalLog, SignalType, StateChange,\r\n  TipProtocol, TipProtocolVariantApp, TipProtocolVariantEntry, TipProtocolVariantLink,\r\n  ZomeSignal, ZomeSignalProtocol,\r\n  ZomeSignalProtocolType, ZomeSignalProtocolVariantEntry, ZomeSignalProtocolVariantLink\r\n} from \"@ddd-qc/cell-proxy\";\r\nimport {AppSignal} from \"@holochain/client/lib/api/app/types\";\r\nimport {ZomeViewModel} from \"./ZomeViewModel\";\r\nimport {ZomeIndex} from \"@holochain/client/lib/hdk/link\";\r\nimport {ProfilesAltLinkType, ProfilesAltUnitEnum} from \"@ddd-qc/profiles-dvm/dist/bindings/profilesAlt.integrity\";\r\nimport {decode} from \"@msgpack/msgpack\";\r\n\r\n\r\n/** */\r\nexport interface CastLog {\r\n  ts: Timestamp,\r\n  tip: TipProtocol,\r\n  peers: AgentId[],\r\n}\r\n\r\n\r\n/**\r\n * ZVM with support for ZomeSignals\r\n */\r\nexport abstract class ZomeViewModelWithSignals extends ZomeViewModel {\r\n\r\n  private _castLogs: CastLog[] = [];\r\n\r\n  /** Methods to override */\r\n  protected handleAppTip(_appTip: Uint8Array, _from: AgentId): ZomeSignalProtocol | undefined { return undefined;}\r\n  protected async handleEntryPulse(_pulse: EntryPulseMat, _from: AgentId): Promise<void> {}\r\n  protected async handleLinkPulse(_pulse: LinkPulseMat, _from: AgentId): Promise<void> {}\r\n\r\n\r\n  /** */\r\n  signalHandler?: AppSignalCb = this.mySignalHandler;\r\n\r\n\r\n  /** */\r\n  private mySignalHandler(appSignal: AppSignal): void {\r\n    const defaultZomeName = (this.constructor as typeof ZomeViewModelWithSignals).ZOME_PROXY.DEFAULT_ZOME_NAME;\r\n    console.log(\"mySignalHandler()\", appSignal, defaultZomeName);\r\n    if (appSignal.zome_name !== defaultZomeName) {\r\n      return;\r\n    }\r\n    const zomeSignal = appSignal.payload as ZomeSignal;\r\n    if (!(\"pulses\" in zomeSignal)) {\r\n      return;\r\n    }\r\n    /*await*/ this.handleSignal(zomeSignal);\r\n  }\r\n\r\n\r\n  /** */\r\n  private async handleSignal(signal: ZomeSignal): Promise<void> {\r\n    const from = new AgentId(signal.from);\r\n    let all = [];\r\n    for (let pulse of signal.pulses) {\r\n      /** -- Handle Signal according to type -- */\r\n      /** Change tip to Entry or Link signal */\r\n      if (ZomeSignalProtocolType.Tip in pulse) {\r\n        pulse = this.handleTip(pulse.Tip as TipProtocol, from)!;\r\n        if (!pulse) {\r\n          continue;\r\n        }\r\n      }\r\n      if (ZomeSignalProtocolType.Entry in pulse) {\r\n        const entryPulseMat = materializeEntryPulse(pulse.Entry as EntryPulse, (this.constructor as typeof ZomeViewModel).ENTRY_TYPES);\r\n        all.push(this.handleEntryPulse(entryPulseMat, from));\r\n        /** If new entry from this agent, broadcast to peers as tip */\r\n        if (entryPulseMat.isNew && from.b64 == this.cell.agentId.b64 && entryPulseMat.visibility == \"Public\") {\r\n          all.push(this.broadcastTip({Entry: pulse.Entry as EntryPulse}));\r\n        }\r\n        continue;\r\n      }\r\n      if (ZomeSignalProtocolType.Link in pulse) {\r\n        const linkPulseMat = materializeLinkPulse(pulse.Link as LinkPulse, (this.constructor as typeof ZomeViewModel).LINK_TYPES);\r\n        all.push(this.handleLinkPulse(linkPulseMat, from));\r\n        /** If new Link from this agent, broadcast to peers as tip */\r\n        if (linkPulseMat.isNew && from.b64 == this.cell.agentId.b64) {\r\n          all.push(this.broadcastTip({Link: pulse.Link as LinkPulse}));\r\n        }\r\n        continue;\r\n      }\r\n    }\r\n    await Promise.all(all);\r\n    this.notifySubscribers();\r\n  }\r\n\r\n\r\n  /** */\r\n  private handleTip(tip: TipProtocol, from: AgentId): ZomeSignalProtocol | undefined {\r\n    const type = Object.keys(tip)[0];\r\n    console.log(\"handleTip()\", type, from, tip);\r\n    /* Handle tip according to its type */\r\n    switch (type) {\r\n      case \"Ping\":\r\n      case \"Pong\":\r\n        break;\r\n      case \"Entry\": return {Entry: (tip as TipProtocolVariantEntry).Entry} as ZomeSignalProtocolVariantEntry; break;\r\n      case \"Link\": return {Link: (tip as TipProtocolVariantLink).Link} as ZomeSignalProtocolVariantLink; break;\r\n      case \"App\":\r\n        return this.handleAppTip((tip as TipProtocolVariantApp).App, from);\r\n        break;\r\n    }\r\n  }\r\n\r\n\r\n  /** */\r\n  async broadcastTip(tip: TipProtocol, agents?: Array<AgentId>): Promise<void> {\r\n    agents = agents? agents : this._dvmParent.livePeers;\r\n    /** Skip if no recipients or sending to self only */\r\n    const filtered = agents.filter((key) => key.b64 != this.cell.agentId.b64);\r\n    const tipType = Object.keys(tip)[0];\r\n    console.log(`broadcastTip() Sending Tip \"${tipType}\" to`, filtered, this.cell.agentId.short);\r\n    //if (!agents || agents.length == 1 && agents[0] === this._cellProxy.cell.agentPubKey) {\r\n    if (!filtered || filtered.length == 0) {\r\n      console.log(\"broadcastTip() aborted: No recipients\")\r\n      return;\r\n    }\r\n    /** Broadcast */\r\n    const peers = agents.map((key) => key.hash);\r\n    await this.zomeProxy.call('cast_tip', {tip, peers});\r\n    /** Log */\r\n    this._castLogs.push({ts: Date.now(), tip, peers: agents});\r\n  }\r\n\r\n\r\n  /** */\r\n  dumpCastLogs() {\r\n    console.warn(`Tips sent from zome \"${this.zomeName}\"`);\r\n    let appSignals: any[] = [];\r\n    this._castLogs.map((log) => {\r\n      const type = Object.keys(log.tip)[0];\r\n      const payload = (log.tip as any)[type];\r\n      appSignals.push({timestamp: prettyDate(new Date(log.ts)), type, payload, count: log.peers.length, first: log.peers[0]});\r\n    });\r\n    console.table(appSignals);\r\n  }\r\n\r\n  /** */\r\n  dumpSignalLogs(signalLogs: SignalLog[]) {\r\n    this.dumpCastLogs();\r\n    console.warn(`Signals received from zome \"${this.zomeName}\"`);\r\n    let appSignals: any[] = [];\r\n    signalLogs\r\n      .filter((log) => log.type == SignalType.Zome)\r\n      .map((log) => {\r\n        const signal = log.zomeSignal as ZomeSignal;\r\n        const pulses = signal.pulses as ZomeSignalProtocol[];\r\n        const timestamp = prettyDate(new Date(log.ts));\r\n        const from = enc64(signal.from) == this.cell.agentId.b64? \"self\" : new AgentId(signal.from);\r\n        for (const pulse of pulses) {\r\n          if (ZomeSignalProtocolType.Tip in pulse) {\r\n            const tip: TipProtocol = pulse.Tip;\r\n            const type = Object.keys(tip)[0];\r\n            appSignals.push({timestamp, from, pulse: ZomeSignalProtocolType.Tip, type, payload: anyToB64(tip)});\r\n          }\r\n          if (ZomeSignalProtocolType.Entry in pulse) {\r\n            const entryPulse = materializeEntryPulse(pulse.Entry, Object.values(this.zomeProxy.entryTypes));\r\n            const typedEntry = decode(entryPulse.bytes);\r\n            appSignals.push({timestamp, from, pulse: ZomeSignalProtocolType.Entry, state: prettyState(pulse.Entry.state), type: entryPulse.entryType, payload: anyToB64(typedEntry), ah_base: entryPulse.ah.short, eh_target: entryPulse.eh.short});\r\n          }\r\n          if (ZomeSignalProtocolType.Link in pulse) {\r\n            const linkPulse = materializeLinkPulse(pulse.Link, Object.values(this.zomeProxy.linkTypes));\r\n            appSignals.push({timestamp, from, pulse: ZomeSignalProtocolType.Link, state: prettyState(pulse.Link.state), type: linkPulse.link_type, payload: linkPulse.tag, ah_base: linkPulse.base.print(), eh_target: linkPulse.target.print()});\r\n          }\r\n        }\r\n      });\r\n    console.table(appSignals);\r\n  }\r\n}\r\n\r\n\r\n/** -- Materialze -- */\r\n\r\nexport interface EntryPulseMat {\r\n  ah: ActionId,\r\n  state: string,\r\n  isNew: Boolean,\r\n  ts: Timestamp,\r\n  author: AgentId,\r\n  eh: EntryId,\r\n  entryType: string,\r\n  visibility: EntryVisibility,\r\n  bytes: Uint8Array,\r\n}\r\n\r\n\r\n/** */\r\nexport function materializeEntryPulse(entryPulse: EntryPulse, entryTypes: string[]): EntryPulseMat {\r\n  //console.log(\"materializeEntryPulse()\", entryTypes);\r\n  const stateStr = Object.keys(entryPulse.state)[0];\r\n  return {\r\n    ah: new ActionId(entryPulse.ah),\r\n    state: stateStr,\r\n    isNew: (entryPulse.state as any)[stateStr],\r\n    ts: entryPulse.ts,\r\n    author: new AgentId(entryPulse.author),\r\n    eh: new EntryId(entryPulse.eh),\r\n    entryType: entryTypes[entryPulse.def.entry_index],\r\n    visibility: entryPulse.def.visibility,\r\n    bytes: entryPulse.bytes,\r\n  }\r\n}\r\n\r\n\r\n/** */\r\nexport function dematerializeEntryPulse(pulse: EntryPulseMat, entryTypes: string[]): EntryPulse {\r\n  let state: Object = {};\r\n  state[pulse.state] = pulse.isNew;\r\n  //console.log(\"dematerializeEntryPulse()\", state, entryTypes);\r\n  /** */\r\n  return {\r\n    ah: pulse.ah.hash,\r\n    state: state as StateChange,\r\n    ts: pulse.ts,\r\n    author: pulse.author.hash,\r\n    eh: pulse.eh.hash,\r\n    def: {\r\n      entry_index: getIndexByVariant(entryTypes, pulse.entryType),\r\n      zome_index: 42, // Should not be used\r\n      visibility: pulse.visibility,\r\n    },\r\n    bytes: pulse.bytes,\r\n  }\r\n}\r\n\r\n\r\n/** */\r\nexport interface LinkPulseMat {\r\n  author: AgentId,\r\n  base: AnyLinkableId;\r\n  target: AnyLinkableId,\r\n  timestamp: Timestamp,\r\n  zome_index: ZomeIndex,\r\n  link_type: string,\r\n  tag: Uint8Array,\r\n  create_link_hash: ActionId,\r\n  /** */\r\n  state: string,\r\n  isNew: Boolean,\r\n}\r\n\r\n/** */\r\nexport function materializeLinkPulse(linkPulse: LinkPulse, linkTypes: string[]): LinkPulseMat {\r\n  //console.log(\"materializeLinkPulse()\", linkTypes);\r\n  const stateStr = Object.keys(linkPulse.state)[0];\r\n  return {\r\n    author: new AgentId(linkPulse.link.author),\r\n    base: intoLinkableId(linkPulse.link.base),\r\n    target: intoLinkableId(linkPulse.link.target),\r\n    timestamp: linkPulse.link.timestamp,\r\n    zome_index: linkPulse.link.zome_index,\r\n    link_type: linkTypes[linkPulse.link.link_type],\r\n    tag: linkPulse.link.tag,\r\n    create_link_hash: new ActionId(linkPulse.link.create_link_hash),\r\n    state: Object.keys(linkPulse.state)[0],\r\n    isNew: (linkPulse.state as any)[stateStr],\r\n  }\r\n}\r\n\r\n/** */\r\nexport function dematerializeLinkPulse(pulse: LinkPulseMat, linkTypes: string[]): LinkPulse {\r\n  let state: Object = {};\r\n  state[pulse.state] = pulse.isNew;\r\n  //console.log(\"dematerializeLinkPulse()\", state);\r\n  /** */\r\n  return {\r\n    state: state as StateChange,\r\n    link: {\r\n      author: pulse.author.hash,\r\n      base: pulse.base.hash,\r\n      target: pulse.target.hash,\r\n      timestamp: pulse.timestamp,\r\n      zome_index: pulse.zome_index,\r\n      link_type: getIndexByVariant(linkTypes, pulse.link_type),\r\n      tag: pulse.tag,\r\n      create_link_hash: pulse.create_link_hash.hash,\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"ZomeViewModelWithSignals.js","sourceRoot":"","sources":["../src/ZomeViewModelWithSignals.ts"],"names":[],"mappings":"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","sourcesContent":["import {AppSignalCb, EntryVisibility, HoloHash, Timestamp} from \"@holochain/client\";\r\nimport {\r\n  ActionId,\r\n  AgentId, LinkableId, anyToB64, enc64, EntryId,\r\n  EntryPulse, getIndexByVariant, intoLinkableId, LinkPulse, prettyDate, prettyState, SignalLog, SignalType, StateChange,\r\n  TipProtocol, TipProtocolVariantApp, TipProtocolVariantEntry, TipProtocolVariantLink,\r\n  ZomeSignal, ZomeSignalProtocol,\r\n  ZomeSignalProtocolType, ZomeSignalProtocolVariantEntry, ZomeSignalProtocolVariantLink\r\n} from \"@ddd-qc/cell-proxy\";\r\nimport {AppSignal} from \"@holochain/client/lib/api/app/types\";\r\nimport {ZomeViewModel} from \"./ZomeViewModel\";\r\nimport {ZomeIndex} from \"@holochain/client/lib/hdk/link\";\r\nimport {decode} from \"@msgpack/msgpack\";\r\n\r\n\r\n/** */\r\nexport interface CastLog {\r\n  ts: Timestamp,\r\n  tip: TipProtocol,\r\n  peers: AgentId[],\r\n}\r\n\r\n\r\n/**\r\n * ZVM with support for ZomeSignals\r\n */\r\nexport abstract class ZomeViewModelWithSignals extends ZomeViewModel {\r\n\r\n  private _castLogs: CastLog[] = [];\r\n\r\n  /** Methods to override */\r\n  protected handleAppTip(_appTip: Uint8Array, _from: AgentId): ZomeSignalProtocol | undefined { return undefined;}\r\n  protected async handleEntryPulse(_pulse: EntryPulseMat, _from: AgentId): Promise<void> {}\r\n  protected async handleLinkPulse(_pulse: LinkPulseMat, _from: AgentId): Promise<void> {}\r\n\r\n\r\n  /** */\r\n  signalHandler?: AppSignalCb = this.mySignalHandler;\r\n\r\n\r\n  /** */\r\n  private mySignalHandler(appSignal: AppSignal): void {\r\n    const defaultZomeName = (this.constructor as typeof ZomeViewModelWithSignals).ZOME_PROXY.DEFAULT_ZOME_NAME;\r\n    console.log(\"mySignalHandler()\", appSignal, defaultZomeName);\r\n    if (appSignal.zome_name !== defaultZomeName) {\r\n      return;\r\n    }\r\n    const zomeSignal = appSignal.payload as ZomeSignal;\r\n    if (!(\"pulses\" in zomeSignal)) {\r\n      return;\r\n    }\r\n    /*await*/ this.handleSignal(zomeSignal);\r\n  }\r\n\r\n\r\n  /** */\r\n  private async handleSignal(signal: ZomeSignal): Promise<void> {\r\n    const from = new AgentId(signal.from);\r\n    let all = [];\r\n    for (let pulse of signal.pulses) {\r\n      /** -- Handle Signal according to type -- */\r\n      /** Change tip to Entry or Link signal */\r\n      if (ZomeSignalProtocolType.Tip in pulse) {\r\n        pulse = this.handleTip(pulse.Tip as TipProtocol, from)!;\r\n        if (!pulse) {\r\n          continue;\r\n        }\r\n      }\r\n      if (ZomeSignalProtocolType.Entry in pulse) {\r\n        const entryPulseMat = materializeEntryPulse(pulse.Entry as EntryPulse, (this.constructor as typeof ZomeViewModel).ENTRY_TYPES);\r\n        all.push(this.handleEntryPulse(entryPulseMat, from));\r\n        /** If new entry from this agent, broadcast to peers as tip */\r\n        if (entryPulseMat.isNew && from.b64 == this.cell.address.agentId.b64 && entryPulseMat.visibility == \"Public\") {\r\n          all.push(this.broadcastTip({Entry: pulse.Entry as EntryPulse}));\r\n        }\r\n        continue;\r\n      }\r\n      if (ZomeSignalProtocolType.Link in pulse) {\r\n        const linkPulseMat = materializeLinkPulse(pulse.Link as LinkPulse, (this.constructor as typeof ZomeViewModel).LINK_TYPES);\r\n        all.push(this.handleLinkPulse(linkPulseMat, from));\r\n        /** If new Link from this agent, broadcast to peers as tip */\r\n        if (linkPulseMat.isNew && from.b64 == this.cell.address.agentId.b64) {\r\n          all.push(this.broadcastTip({Link: pulse.Link as LinkPulse}));\r\n        }\r\n        continue;\r\n      }\r\n    }\r\n    await Promise.all(all);\r\n    this.notifySubscribers();\r\n  }\r\n\r\n\r\n  /** */\r\n  private handleTip(tip: TipProtocol, from: AgentId): ZomeSignalProtocol | undefined {\r\n    const type = Object.keys(tip)[0];\r\n    console.log(\"handleTip()\", type, from, tip);\r\n    /* Handle tip according to its type */\r\n    switch (type) {\r\n      case \"Ping\":\r\n      case \"Pong\":\r\n        break;\r\n      case \"Entry\": return {Entry: (tip as TipProtocolVariantEntry).Entry} as ZomeSignalProtocolVariantEntry; break;\r\n      case \"Link\": return {Link: (tip as TipProtocolVariantLink).Link} as ZomeSignalProtocolVariantLink; break;\r\n      case \"App\":\r\n        return this.handleAppTip((tip as TipProtocolVariantApp).App, from);\r\n        break;\r\n    }\r\n  }\r\n\r\n\r\n  /** */\r\n  async broadcastTip(tip: TipProtocol, agents?: Array<AgentId>): Promise<void> {\r\n    agents = agents? agents : this._dvmParent.livePeers;\r\n    /** Skip if no recipients or sending to self only */\r\n    const filtered = agents.filter((key) => key.b64 != this.cell.address.agentId.b64);\r\n    const tipType = Object.keys(tip)[0];\r\n    console.log(`broadcastTip() Sending Tip \"${tipType}\" to`, filtered, this.cell.address.agentId.short);\r\n    //if (!agents || agents.length == 1 && agents[0] === this._cellProxy.cell.agentPubKey) {\r\n    if (!filtered || filtered.length == 0) {\r\n      console.log(\"broadcastTip() aborted: No recipients\")\r\n      return;\r\n    }\r\n    /** Broadcast */\r\n    const peers = agents.map((key) => key.hash);\r\n    await this.zomeProxy.call('cast_tip', {tip, peers});\r\n    /** Log */\r\n    this._castLogs.push({ts: Date.now(), tip, peers: agents});\r\n  }\r\n\r\n\r\n  /** */\r\n  dumpCastLogs() {\r\n    console.warn(`Tips sent from zome \"${this.zomeName}\"`);\r\n    let appSignals: any[] = [];\r\n    this._castLogs.map((log) => {\r\n      const type = Object.keys(log.tip)[0];\r\n      const payload = (log.tip as any)[type];\r\n      appSignals.push({timestamp: prettyDate(new Date(log.ts)), type, payload, count: log.peers.length, first: log.peers[0]});\r\n    });\r\n    console.table(appSignals);\r\n  }\r\n\r\n\r\n  /** */\r\n  dumpSignalLogs(signalLogs: SignalLog[]) {\r\n    this.dumpCastLogs();\r\n    console.warn(`Signals received from zome \"${this.zomeName}\"`);\r\n    let appSignals: any[] = [];\r\n    signalLogs\r\n      .filter((log) => log.type == SignalType.Zome)\r\n      .map((log) => {\r\n        const signal = log.zomeSignal as ZomeSignal;\r\n        const pulses = signal.pulses as ZomeSignalProtocol[];\r\n        const timestamp = prettyDate(new Date(log.ts));\r\n        const from = enc64(signal.from) == this.cell.address.agentId.b64? \"self\" : new AgentId(signal.from);\r\n        for (const pulse of pulses) {\r\n          if (ZomeSignalProtocolType.Tip in pulse) {\r\n            const tip: TipProtocol = pulse.Tip;\r\n            const type = Object.keys(tip)[0];\r\n            appSignals.push({timestamp, from, pulse: ZomeSignalProtocolType.Tip, type, payload: anyToB64(tip)});\r\n          }\r\n          if (ZomeSignalProtocolType.Entry in pulse) {\r\n            const entryPulse = materializeEntryPulse(pulse.Entry, Object.values(this.zomeProxy.entryTypes));\r\n            const typedEntry = decode(entryPulse.bytes);\r\n            appSignals.push({timestamp, from, pulse: ZomeSignalProtocolType.Entry, state: prettyState(pulse.Entry.state), type: entryPulse.entryType, payload: anyToB64(typedEntry), ah_base: entryPulse.ah.short, eh_target: entryPulse.eh.short});\r\n          }\r\n          if (ZomeSignalProtocolType.Link in pulse) {\r\n            const linkPulse = materializeLinkPulse(pulse.Link, Object.values(this.zomeProxy.linkTypes));\r\n            appSignals.push({timestamp, from, pulse: ZomeSignalProtocolType.Link, state: prettyState(pulse.Link.state), type: linkPulse.link_type, payload: linkPulse.tag, ah_base: linkPulse.base.print(), eh_target: linkPulse.target.print()});\r\n          }\r\n        }\r\n      });\r\n    console.table(appSignals);\r\n  }\r\n}\r\n\r\n\r\n/** -- Materialze -- */\r\n\r\nexport interface EntryPulseMat {\r\n  ah: ActionId,\r\n  state: string,\r\n  isNew: boolean,\r\n  ts: Timestamp,\r\n  author: AgentId,\r\n  eh: EntryId,\r\n  entryType: string,\r\n  visibility: EntryVisibility,\r\n  bytes: Uint8Array,\r\n}\r\n\r\n\r\n/** */\r\nexport function materializeEntryPulse(entryPulse: EntryPulse, entryTypes: string[]): EntryPulseMat {\r\n  //console.log(\"materializeEntryPulse()\", entryTypes);\r\n  const stateStr = Object.keys(entryPulse.state)[0];\r\n  return {\r\n    ah: new ActionId(entryPulse.ah),\r\n    state: stateStr,\r\n    isNew: (entryPulse.state as any)[stateStr],\r\n    ts: entryPulse.ts,\r\n    author: new AgentId(entryPulse.author),\r\n    eh: new EntryId(entryPulse.eh),\r\n    entryType: entryTypes[entryPulse.def.entry_index],\r\n    visibility: entryPulse.def.visibility,\r\n    bytes: entryPulse.bytes,\r\n  }\r\n}\r\n\r\n\r\n/** */\r\nexport function dematerializeEntryPulse(pulse: EntryPulseMat, entryTypes: string[]): EntryPulse {\r\n  let state: Object = {};\r\n  state[pulse.state] = pulse.isNew;\r\n  //console.log(\"dematerializeEntryPulse()\", state, entryTypes);\r\n  /** */\r\n  return {\r\n    ah: new HoloHash(pulse.ah.hash),\r\n    state: state as StateChange,\r\n    ts: pulse.ts,\r\n    author: new HoloHash(pulse.author.hash),\r\n    eh: new HoloHash(pulse.eh.hash),\r\n    def: {\r\n      entry_index: getIndexByVariant(entryTypes, pulse.entryType),\r\n      zome_index: 42, // Should not be used\r\n      visibility: pulse.visibility,\r\n    },\r\n    bytes: pulse.bytes,\r\n  }\r\n}\r\n\r\n\r\n/** */\r\nexport interface LinkPulseMat {\r\n  author: AgentId,\r\n  base: LinkableId;\r\n  target: LinkableId,\r\n  timestamp: Timestamp,\r\n  zome_index: ZomeIndex,\r\n  link_type: string,\r\n  tag: Uint8Array,\r\n  create_link_hash: ActionId,\r\n  /** */\r\n  state: string,\r\n  isNew: Boolean,\r\n}\r\n\r\n/** */\r\nexport function materializeLinkPulse(linkPulse: LinkPulse, linkTypes: string[]): LinkPulseMat {\r\n  //console.log(\"materializeLinkPulse()\", linkTypes);\r\n  const stateStr = Object.keys(linkPulse.state)[0];\r\n  return {\r\n    author: new AgentId(linkPulse.link.author),\r\n    base: intoLinkableId(linkPulse.link.base),\r\n    target: intoLinkableId(linkPulse.link.target),\r\n    timestamp: linkPulse.link.timestamp,\r\n    zome_index: linkPulse.link.zome_index,\r\n    link_type: linkTypes[linkPulse.link.link_type],\r\n    tag: linkPulse.link.tag,\r\n    create_link_hash: new ActionId(linkPulse.link.create_link_hash),\r\n    state: Object.keys(linkPulse.state)[0],\r\n    isNew: (linkPulse.state as any)[stateStr],\r\n  }\r\n}\r\n\r\n/** */\r\nexport function dematerializeLinkPulse(pulse: LinkPulseMat, linkTypes: string[]): LinkPulse {\r\n  let state: Object = {};\r\n  state[pulse.state] = pulse.isNew;\r\n  //console.log(\"dematerializeLinkPulse()\", state);\r\n  /** */\r\n  return {\r\n    state: state as StateChange,\r\n    link: {\r\n      author: new HoloHash(pulse.author.hash),\r\n      base: new HoloHash(pulse.base.hash),\r\n      target: new HoloHash(pulse.target.hash),\r\n      timestamp: pulse.timestamp,\r\n      zome_index: pulse.zome_index,\r\n      link_type: getIndexByVariant(linkTypes, pulse.link_type),\r\n      tag: pulse.tag,\r\n      create_link_hash: new HoloHash(pulse.create_link_hash.hash),\r\n    }\r\n  }\r\n}\r\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ddd-qc/lit-happ",
-  "version": "0.26.6",
+  "version": "0.27.0",
   "description": "MVVM Framework for holochain apps using Lit",
   "main": "dist/index.js",
   "module": "dist/index.js",