@xyo-network/archivist-indexeddb 2.87.0-rc.2 → 2.87.0-rc.3

package/dist/browser/Archivist.d.cts

@@ -1,5 +1,5 @@
 import { AbstractArchivist } from '@xyo-network/archivist-abstract';
-import { ArchivistModuleEventData, IndexDescription } from '@xyo-network/archivist-model';
+import { ArchivistModuleEventData } from '@xyo-network/archivist-model';
 import { Payload } from '@xyo-network/payload-model';
 import { IndexedDbArchivistParams } from './Params';
 export interface PayloadStore {
@@ -10,9 +10,10 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
     static readonly defaultDbName = "archivist";
     static readonly defaultDbVersion = 1;
     static readonly defaultStoreName = "payloads";
-    static readonly hashIndex: Required<IndexDescription>;
-    static readonly payloadSchemasIndex: Required<IndexDescription>;
-    static readonly schemaIndex: Required<IndexDescription>;
+    private static readonly hashIndex;
+    private static readonly schemaIndex;
+    static readonly hashIndexName: string;
+    static readonly schemaIndexName: string;
     private _db;
     /**
      * The database name. If not supplied via config, it defaults
@@ -26,10 +27,6 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
      * The database version. If not supplied via config, it defaults to 1.
      */
     get dbVersion(): number;
-    /**
-     * The database indexes.
-     */
-    get indexes(): IndexDescription[];
     get queries(): string[];
     /**
      * The name of the object store. If not supplied via config, it defaults
@@ -37,6 +34,7 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
      */
     get storeName(): string;
     private get db();
+    private get indexes();
     protected allHandler(): Promise<Payload[]>;
     protected clearHandler(): Promise<void>;
     protected deleteHandler(hashes: string[]): Promise<string[]>;

package/dist/browser/Archivist.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAKL,wBAAwB,EAExB,gBAAgB,EACjB,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAEnD,MAAM,WAAW,YAAY;IAC3B,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,qBACa,kBAAkB,CAC7B,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,EACnE,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAAC;IAC9C,OAAgB,aAAa,6CAAmC;IAChE,MAAM,CAAC,QAAQ,CAAC,aAAa,eAAc;IAC3C,MAAM,CAAC,QAAQ,CAAC,gBAAgB,KAAI;IACpC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,cAAa;IAC7C,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAA2E;IAChI,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAK9D;IACD,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAA8E;IAErI,OAAO,CAAC,GAAG,CAAwC;IAEnD;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;OAEG;IACH,IAAI,OAAO,uBAEV;IAED,IAAa,OAAO,aAEnB;IACD;;;OAGG;IACH,IAAI,SAAS,WAEZ;IAED,OAAO,KAAK,EAAE,GAEb;cAEwB,UAAU,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;cAOhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAI7B,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAgBlD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAKhD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAiBtD,YAAY;CA4BtC"}
+{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAKL,wBAAwB,EAGzB,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAEnD,MAAM,WAAW,YAAY;IAC3B,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,qBACa,kBAAkB,CAC7B,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,EACnE,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAAC;IAC9C,OAAgB,aAAa,6CAAmC;IAChE,MAAM,CAAC,QAAQ,CAAC,aAAa,eAAc;IAC3C,MAAM,CAAC,QAAQ,CAAC,gBAAgB,KAAI;IACpC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,cAAa;IAC7C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAA2E;IAC5G,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAA6E;IAEhH,MAAM,CAAC,QAAQ,CAAC,aAAa,SAAuD;IAEpF,MAAM,CAAC,QAAQ,CAAC,eAAe,SAAyD;IAExF,OAAO,CAAC,GAAG,CAAwC;IAEnD;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED,IAAa,OAAO,aAEnB;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;IAED,OAAO,KAAK,EAAE,GAEb;IAED,OAAO,KAAK,OAAO,GAElB;cAEwB,UAAU,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;cAOhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAI7B,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAgBlD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAKhD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAiBtD,YAAY;CA2BtC"}

package/dist/browser/Archivist.d.mts

@@ -1,5 +1,5 @@
 import { AbstractArchivist } from '@xyo-network/archivist-abstract';
-import { ArchivistModuleEventData, IndexDescription } from '@xyo-network/archivist-model';
+import { ArchivistModuleEventData } from '@xyo-network/archivist-model';
 import { Payload } from '@xyo-network/payload-model';
 import { IndexedDbArchivistParams } from './Params';
 export interface PayloadStore {
@@ -10,9 +10,10 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
     static readonly defaultDbName = "archivist";
     static readonly defaultDbVersion = 1;
     static readonly defaultStoreName = "payloads";
-    static readonly hashIndex: Required<IndexDescription>;
-    static readonly payloadSchemasIndex: Required<IndexDescription>;
-    static readonly schemaIndex: Required<IndexDescription>;
+    private static readonly hashIndex;
+    private static readonly schemaIndex;
+    static readonly hashIndexName: string;
+    static readonly schemaIndexName: string;
     private _db;
     /**
      * The database name. If not supplied via config, it defaults
@@ -26,10 +27,6 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
      * The database version. If not supplied via config, it defaults to 1.
      */
     get dbVersion(): number;
-    /**
-     * The database indexes.
-     */
-    get indexes(): IndexDescription[];
     get queries(): string[];
     /**
      * The name of the object store. If not supplied via config, it defaults
@@ -37,6 +34,7 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
      */
     get storeName(): string;
     private get db();
+    private get indexes();
     protected allHandler(): Promise<Payload[]>;
     protected clearHandler(): Promise<void>;
     protected deleteHandler(hashes: string[]): Promise<string[]>;

package/dist/browser/Archivist.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAKL,wBAAwB,EAExB,gBAAgB,EACjB,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAEnD,MAAM,WAAW,YAAY;IAC3B,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,qBACa,kBAAkB,CAC7B,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,EACnE,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAAC;IAC9C,OAAgB,aAAa,6CAAmC;IAChE,MAAM,CAAC,QAAQ,CAAC,aAAa,eAAc;IAC3C,MAAM,CAAC,QAAQ,CAAC,gBAAgB,KAAI;IACpC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,cAAa;IAC7C,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAA2E;IAChI,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAK9D;IACD,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAA8E;IAErI,OAAO,CAAC,GAAG,CAAwC;IAEnD;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;OAEG;IACH,IAAI,OAAO,uBAEV;IAED,IAAa,OAAO,aAEnB;IACD;;;OAGG;IACH,IAAI,SAAS,WAEZ;IAED,OAAO,KAAK,EAAE,GAEb;cAEwB,UAAU,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;cAOhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAI7B,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAgBlD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAKhD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAiBtD,YAAY;CA4BtC"}
+{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAKL,wBAAwB,EAGzB,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAEnD,MAAM,WAAW,YAAY;IAC3B,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,qBACa,kBAAkB,CAC7B,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,EACnE,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAAC;IAC9C,OAAgB,aAAa,6CAAmC;IAChE,MAAM,CAAC,QAAQ,CAAC,aAAa,eAAc;IAC3C,MAAM,CAAC,QAAQ,CAAC,gBAAgB,KAAI;IACpC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,cAAa;IAC7C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAA2E;IAC5G,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAA6E;IAEhH,MAAM,CAAC,QAAQ,CAAC,aAAa,SAAuD;IAEpF,MAAM,CAAC,QAAQ,CAAC,eAAe,SAAyD;IAExF,OAAO,CAAC,GAAG,CAAwC;IAEnD;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED,IAAa,OAAO,aAEnB;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;IAED,OAAO,KAAK,EAAE,GAEb;IAED,OAAO,KAAK,OAAO,GAElB;cAEwB,UAAU,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;cAOhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAI7B,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAgBlD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAKhD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAiBtD,YAAY;CA2BtC"}

package/dist/browser/Archivist.d.ts

@@ -1,5 +1,5 @@
 import { AbstractArchivist } from '@xyo-network/archivist-abstract';
-import { ArchivistModuleEventData, IndexDescription } from '@xyo-network/archivist-model';
+import { ArchivistModuleEventData } from '@xyo-network/archivist-model';
 import { Payload } from '@xyo-network/payload-model';
 import { IndexedDbArchivistParams } from './Params';
 export interface PayloadStore {
@@ -10,9 +10,10 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
     static readonly defaultDbName = "archivist";
     static readonly defaultDbVersion = 1;
     static readonly defaultStoreName = "payloads";
-    static readonly hashIndex: Required<IndexDescription>;
-    static readonly payloadSchemasIndex: Required<IndexDescription>;
-    static readonly schemaIndex: Required<IndexDescription>;
+    private static readonly hashIndex;
+    private static readonly schemaIndex;
+    static readonly hashIndexName: string;
+    static readonly schemaIndexName: string;
     private _db;
     /**
      * The database name. If not supplied via config, it defaults
@@ -26,10 +27,6 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
      * The database version. If not supplied via config, it defaults to 1.
      */
     get dbVersion(): number;
-    /**
-     * The database indexes.
-     */
-    get indexes(): IndexDescription[];
     get queries(): string[];
     /**
      * The name of the object store. If not supplied via config, it defaults
@@ -37,6 +34,7 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
      */
     get storeName(): string;
     private get db();
+    private get indexes();
     protected allHandler(): Promise<Payload[]>;
     protected clearHandler(): Promise<void>;
     protected deleteHandler(hashes: string[]): Promise<string[]>;

package/dist/browser/Archivist.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAKL,wBAAwB,EAExB,gBAAgB,EACjB,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAEnD,MAAM,WAAW,YAAY;IAC3B,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,qBACa,kBAAkB,CAC7B,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,EACnE,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAAC;IAC9C,OAAgB,aAAa,6CAAmC;IAChE,MAAM,CAAC,QAAQ,CAAC,aAAa,eAAc;IAC3C,MAAM,CAAC,QAAQ,CAAC,gBAAgB,KAAI;IACpC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,cAAa;IAC7C,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAA2E;IAChI,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAK9D;IACD,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAA8E;IAErI,OAAO,CAAC,GAAG,CAAwC;IAEnD;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;OAEG;IACH,IAAI,OAAO,uBAEV;IAED,IAAa,OAAO,aAEnB;IACD;;;OAGG;IACH,IAAI,SAAS,WAEZ;IAED,OAAO,KAAK,EAAE,GAEb;cAEwB,UAAU,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;cAOhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAI7B,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAgBlD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAKhD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAiBtD,YAAY;CA4BtC"}
+{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAKL,wBAAwB,EAGzB,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAEnD,MAAM,WAAW,YAAY;IAC3B,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,qBACa,kBAAkB,CAC7B,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,EACnE,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAAC;IAC9C,OAAgB,aAAa,6CAAmC;IAChE,MAAM,CAAC,QAAQ,CAAC,aAAa,eAAc;IAC3C,MAAM,CAAC,QAAQ,CAAC,gBAAgB,KAAI;IACpC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,cAAa;IAC7C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAA2E;IAC5G,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAA6E;IAEhH,MAAM,CAAC,QAAQ,CAAC,aAAa,SAAuD;IAEpF,MAAM,CAAC,QAAQ,CAAC,eAAe,SAAyD;IAExF,OAAO,CAAC,GAAG,CAAwC;IAEnD;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED,IAAa,OAAO,aAEnB;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;IAED,OAAO,KAAK,EAAE,GAEb;IAED,OAAO,KAAK,OAAO,GAElB;cAEwB,UAAU,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;cAOhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAI7B,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAgBlD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAKhD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAiBtD,YAAY;CA2BtC"}

package/dist/browser/index.cjs

@@ -69,25 +69,19 @@ var IndexedDbArchivist = class _IndexedDbArchivist extends import_archivist_abst
       _hash: 1
     },
     multiEntry: false,
-    name: "IX-_hash",
     unique: true
   };
-  static payloadSchemasIndex = {
-    key: {
-      payload_schemas: 1
-    },
-    multiEntry: false,
-    name: "IX-payload_schemas",
-    unique: false
-  };
   static schemaIndex = {
     key: {
       schema: 1
     },
     multiEntry: false,
-    name: "IX-schema",
     unique: false
   };
+  // eslint-disable-next-line @typescript-eslint/member-ordering
+  static hashIndexName = (0, import_archivist_model.buildStandardIndexName)(_IndexedDbArchivist.hashIndex);
+  // eslint-disable-next-line @typescript-eslint/member-ordering
+  static schemaIndexName = (0, import_archivist_model.buildStandardIndexName)(_IndexedDbArchivist.schemaIndex);
   _db;
   /**
   * The database name. If not supplied via config, it defaults
@@ -105,12 +99,6 @@ var IndexedDbArchivist = class _IndexedDbArchivist extends import_archivist_abst
   get dbVersion() {
     return this.config?.dbVersion ?? _IndexedDbArchivist.defaultDbVersion;
   }
-  /**
-  * The database indexes.
-  */
-  get indexes() {
-    return this.config?.storage?.indexes ?? [];
-  }
   get queries() {
     return [
       import_archivist_model.ArchivistAllQuerySchema,
@@ -130,6 +118,9 @@ var IndexedDbArchivist = class _IndexedDbArchivist extends import_archivist_abst
   get db() {
     return (0, import_assert.assertEx)(this._db, "DB not initialized");
   }
+  get indexes() {
+    return this.config?.storage?.indexes ?? [];
+  }
   async allHandler() {
     const payloads = await this.db.getAll(this.storeName);
     return payloads.map((payload) => import_hash.PayloadHasher.jsonPayload(payload));
@@ -144,7 +135,7 @@ var IndexedDbArchivist = class _IndexedDbArchivist extends import_archivist_abst
     const found = await Promise.all(distinctHashes.map(async (hash) => {
       let existing;
       do {
-        existing = await this.db.getKeyFromIndex(this.storeName, _IndexedDbArchivist.hashIndex.name, hash);
+        existing = await this.db.getKeyFromIndex(this.storeName, _IndexedDbArchivist.hashIndexName, hash);
         if (existing)
           await this.db.delete(this.storeName, existing);
       } while (!existing);
@@ -153,7 +144,7 @@ var IndexedDbArchivist = class _IndexedDbArchivist extends import_archivist_abst
     return found.filter(import_exists.exists);
   }
   async getHandler(hashes) {
-    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, _IndexedDbArchivist.hashIndex.name, hash)));
+    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, _IndexedDbArchivist.hashIndexName, hash)));
     return payloads.filter(import_exists.exists);
   }
   async insertHandler(payloads) {
@@ -161,7 +152,7 @@ var IndexedDbArchivist = class _IndexedDbArchivist extends import_archivist_abst
     const inserted = await Promise.all(pairs.map(async ([payload, _hash]) => {
       const tx = this.db.transaction(this.storeName, "readwrite");
       const store = tx.objectStore(this.storeName);
-      const existing = await store.index(_IndexedDbArchivist.hashIndex.name).get(_hash);
+      const existing = await store.index(_IndexedDbArchivist.hashIndexName).get(_hash);
       if (!existing) {
         await this.db.put(this.storeName, {
           ...payload,
@@ -174,7 +165,7 @@ var IndexedDbArchivist = class _IndexedDbArchivist extends import_archivist_abst
   }
   async startHandler() {
     await super.startHandler();
-    const { indexes, storeName, dbName, dbVersion } = this;
+    const { dbName, dbVersion, indexes, storeName } = this;
     this._db = await (0, import_idb.openDB)(dbName, dbVersion, {
       async upgrade(database) {
         await Promise.resolve();
@@ -184,15 +175,14 @@ var IndexedDbArchivist = class _IndexedDbArchivist extends import_archivist_abst
         });
         store.name = storeName;
         const indexesToCreate = [
-          ...indexes,
           _IndexedDbArchivist.hashIndex,
-          _IndexedDbArchivist.payloadSchemasIndex,
-          _IndexedDbArchivist.schemaIndex
+          _IndexedDbArchivist.schemaIndex,
+          ...indexes
         ];
-        for (const { key, multiEntry, name, unique } of indexesToCreate) {
+        for (const { key, multiEntry, unique } of indexesToCreate) {
           const indexKeys = Object.keys(key);
           const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys;
-          const indexName = name ?? (0, import_archivist_model.buildStandardIndexName)({
+          const indexName = (0, import_archivist_model.buildStandardIndexName)({
             key,
             unique
           });

package/dist/browser/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Archivist.ts","../../src/Schema.ts","../../src/Config.ts"],"sourcesContent":["export * from './Archivist'\nexport * from './Config'\nexport * from './Params'\nexport * from './Schema'\n","import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuerySchema,\n  ArchivistModuleEventData,\n  buildStandardIndexName,\n  IndexDescription,\n} from '@xyo-network/archivist-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { creatableModule } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { IDBPDatabase, openDB } from 'idb'\n\nimport { IndexedDbArchivistConfigSchema } from './Config'\nimport { IndexedDbArchivistParams } from './Params'\n\nexport interface PayloadStore {\n  [s: string]: Payload\n}\n\n@creatableModule()\nexport class IndexedDbArchivist<\n  TParams extends IndexedDbArchivistParams = IndexedDbArchivistParams,\n  TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n> extends AbstractArchivist<TParams, TEventData> {\n  static override configSchemas = [IndexedDbArchivistConfigSchema]\n  static readonly defaultDbName = 'archivist'\n  static readonly defaultDbVersion = 1\n  static readonly defaultStoreName = 'payloads'\n  static readonly hashIndex: Required<IndexDescription> = { key: { _hash: 1 }, multiEntry: false, name: 'IX-_hash', unique: true }\n  static readonly payloadSchemasIndex: Required<IndexDescription> = {\n    key: { payload_schemas: 1 },\n    multiEntry: false,\n    name: 'IX-payload_schemas',\n    unique: false,\n  }\n  static readonly schemaIndex: Required<IndexDescription> = { key: { schema: 1 }, multiEntry: false, name: 'IX-schema', unique: false }\n\n  private _db: IDBPDatabase<PayloadStore> | undefined\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the module name (not guaranteed to be unique) and if module\n   * name is not supplied, it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.name ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  /**\n   * The database indexes.\n   */\n  get indexes() {\n    return this.config?.storage?.indexes ?? []\n  }\n\n  override get queries() {\n    return [ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, ...super.queries]\n  }\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  private get db(): IDBPDatabase<PayloadStore> {\n    return assertEx(this._db, 'DB not initialized')\n  }\n\n  protected override async allHandler(): Promise<Payload[]> {\n    // Get all payloads from the store\n    const payloads = await this.db.getAll(this.storeName)\n    // Remove any metadata before returning to the client\n    return payloads.map((payload) => PayloadHasher.jsonPayload(payload))\n  }\n\n  protected override async clearHandler(): Promise<void> {\n    await this.db.clear(this.storeName)\n  }\n\n  protected override async deleteHandler(hashes: string[]): Promise<string[]> {\n    const distinctHashes = [...new Set(hashes)]\n    const found = await Promise.all(\n      distinctHashes.map(async (hash) => {\n        let existing: IDBValidKey | undefined\n        do {\n          existing = await this.db.getKeyFromIndex(this.storeName, IndexedDbArchivist.hashIndex.name, hash)\n          if (existing) await this.db.delete(this.storeName, existing)\n        } while (!existing)\n        return hash\n      }),\n    )\n    // Return hashes removed\n    return found.filter(exists)\n  }\n\n  protected override async getHandler(hashes: string[]): Promise<Payload[]> {\n    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, IndexedDbArchivist.hashIndex.name, hash)))\n    return payloads.filter(exists)\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n    const pairs = await PayloadHasher.hashPairs(payloads)\n    // Only return the payloads that were successfully inserted\n    const inserted = await Promise.all(\n      pairs.map(async ([payload, _hash]) => {\n        const tx = this.db.transaction(this.storeName, 'readwrite')\n        const store = tx.objectStore(this.storeName)\n        const existing = await store.index(IndexedDbArchivist.hashIndex.name).get(_hash)\n        if (!existing) {\n          await this.db.put(this.storeName, { ...payload, _hash })\n          return payload\n        }\n      }),\n    )\n    return inserted.filter(exists)\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: We could defer this creation to first access but we\n    // want to fail fast here in case something is wrong\n    const { indexes, storeName, dbName, dbVersion } = this\n    this._db = await openDB<PayloadStore>(dbName, dbVersion, {\n      async upgrade(database) {\n        await Promise.resolve() // Async to match spec\n        // Create the store\n        const store = database.createObjectStore(storeName, {\n          // If it isn't explicitly set, create a value by auto incrementing.\n          autoIncrement: true,\n        })\n        // Name the store\n        store.name = storeName\n        // Create an index on the hash\n        const indexesToCreate = [...indexes, IndexedDbArchivist.hashIndex, IndexedDbArchivist.payloadSchemasIndex, IndexedDbArchivist.schemaIndex]\n        for (const { key, multiEntry, name, unique } of indexesToCreate) {\n          const indexKeys = Object.keys(key)\n          const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys\n          const indexName = name ?? buildStandardIndexName({ key, unique })\n          store.createIndex(indexName, keys, { multiEntry, unique })\n        }\n      },\n    })\n\n    return true\n  }\n}\n","export type IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb'\nexport const IndexedDbArchivistSchema: IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb'\n","import { ArchivistConfig, IndexDescription } from '@xyo-network/archivist-model'\n\nimport { IndexedDbArchivistSchema } from './Schema'\n\nexport type IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\nexport const IndexedDbArchivistConfigSchema: IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\n\nexport type IndexedDbArchivistConfig = ArchivistConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbArchivistConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main archivist config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n"],"mappings":"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","names":["IndexedDbArchivistSchema","IndexedDbArchivistConfigSchema","IndexedDbArchivistSchema","IndexedDbArchivist","AbstractArchivist","configSchemas","IndexedDbArchivistConfigSchema","defaultDbName","defaultDbVersion","defaultStoreName","hashIndex","key","_hash","multiEntry","name","unique","payloadSchemasIndex","payload_schemas","schemaIndex","schema","_db","dbName","config","dbVersion","indexes","storage","queries","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","storeName","db","assertEx","allHandler","payloads","getAll","map","payload","PayloadHasher","jsonPayload","clearHandler","clear","deleteHandler","hashes","distinctHashes","Set","found","Promise","all","hash","existing","getKeyFromIndex","delete","filter","exists","getHandler","getFromIndex","insertHandler","pairs","hashPairs","inserted","tx","transaction","store","objectStore","index","get","put","startHandler","openDB","upgrade","database","resolve","createObjectStore","autoIncrement","indexesToCreate","indexKeys","Object","keys","length","indexName","buildStandardIndexName","createIndex","creatableModule"]}
+{"version":3,"sources":["../../src/index.ts","../../src/Archivist.ts","../../src/Schema.ts","../../src/Config.ts"],"sourcesContent":["export * from './Archivist'\nexport * from './Config'\nexport * from './Params'\nexport * from './Schema'\n","import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuerySchema,\n  ArchivistModuleEventData,\n  buildStandardIndexName,\n  IndexDescription,\n} from '@xyo-network/archivist-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { creatableModule } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { IDBPDatabase, openDB } from 'idb'\n\nimport { IndexedDbArchivistConfigSchema } from './Config'\nimport { IndexedDbArchivistParams } from './Params'\n\nexport interface PayloadStore {\n  [s: string]: Payload\n}\n\n@creatableModule()\nexport class IndexedDbArchivist<\n  TParams extends IndexedDbArchivistParams = IndexedDbArchivistParams,\n  TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n> extends AbstractArchivist<TParams, TEventData> {\n  static override configSchemas = [IndexedDbArchivistConfigSchema]\n  static readonly defaultDbName = 'archivist'\n  static readonly defaultDbVersion = 1\n  static readonly defaultStoreName = 'payloads'\n  private static readonly hashIndex: IndexDescription = { key: { _hash: 1 }, multiEntry: false, unique: true }\n  private static readonly schemaIndex: IndexDescription = { key: { schema: 1 }, multiEntry: false, unique: false }\n  // eslint-disable-next-line @typescript-eslint/member-ordering\n  static readonly hashIndexName = buildStandardIndexName(IndexedDbArchivist.hashIndex)\n  // eslint-disable-next-line @typescript-eslint/member-ordering\n  static readonly schemaIndexName = buildStandardIndexName(IndexedDbArchivist.schemaIndex)\n\n  private _db: IDBPDatabase<PayloadStore> | undefined\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the module name (not guaranteed to be unique) and if module\n   * name is not supplied, it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.name ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  override get queries() {\n    return [ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, ...super.queries]\n  }\n\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  private get db(): IDBPDatabase<PayloadStore> {\n    return assertEx(this._db, 'DB not initialized')\n  }\n\n  private get indexes() {\n    return this.config?.storage?.indexes ?? []\n  }\n\n  protected override async allHandler(): Promise<Payload[]> {\n    // Get all payloads from the store\n    const payloads = await this.db.getAll(this.storeName)\n    // Remove any metadata before returning to the client\n    return payloads.map((payload) => PayloadHasher.jsonPayload(payload))\n  }\n\n  protected override async clearHandler(): Promise<void> {\n    await this.db.clear(this.storeName)\n  }\n\n  protected override async deleteHandler(hashes: string[]): Promise<string[]> {\n    const distinctHashes = [...new Set(hashes)]\n    const found = await Promise.all(\n      distinctHashes.map(async (hash) => {\n        let existing: IDBValidKey | undefined\n        do {\n          existing = await this.db.getKeyFromIndex(this.storeName, IndexedDbArchivist.hashIndexName, hash)\n          if (existing) await this.db.delete(this.storeName, existing)\n        } while (!existing)\n        return hash\n      }),\n    )\n    // Return hashes removed\n    return found.filter(exists)\n  }\n\n  protected override async getHandler(hashes: string[]): Promise<Payload[]> {\n    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, IndexedDbArchivist.hashIndexName, hash)))\n    return payloads.filter(exists)\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n    const pairs = await PayloadHasher.hashPairs(payloads)\n    // Only return the payloads that were successfully inserted\n    const inserted = await Promise.all(\n      pairs.map(async ([payload, _hash]) => {\n        const tx = this.db.transaction(this.storeName, 'readwrite')\n        const store = tx.objectStore(this.storeName)\n        const existing = await store.index(IndexedDbArchivist.hashIndexName).get(_hash)\n        if (!existing) {\n          await this.db.put(this.storeName, { ...payload, _hash })\n          return payload\n        }\n      }),\n    )\n    return inserted.filter(exists)\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: We could defer this creation to first access but we\n    // want to fail fast here in case something is wrong\n    const { dbName, dbVersion, indexes, storeName } = this\n    this._db = await openDB<PayloadStore>(dbName, dbVersion, {\n      async upgrade(database) {\n        await Promise.resolve() // Async to match spec\n        // Create the store\n        const store = database.createObjectStore(storeName, {\n          // If it isn't explicitly set, create a value by auto incrementing.\n          autoIncrement: true,\n        })\n        // Name the store\n        store.name = storeName\n        // Create an index on the hash\n        const indexesToCreate = [IndexedDbArchivist.hashIndex, IndexedDbArchivist.schemaIndex, ...indexes]\n        for (const { key, multiEntry, unique } of indexesToCreate) {\n          const indexKeys = Object.keys(key)\n          const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys\n          const indexName = buildStandardIndexName({ key, unique })\n          store.createIndex(indexName, keys, { multiEntry, unique })\n        }\n      },\n    })\n    return true\n  }\n}\n","export type IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb'\nexport const IndexedDbArchivistSchema: IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb'\n","import { ArchivistConfig, IndexDescription } from '@xyo-network/archivist-model'\n\nimport { IndexedDbArchivistSchema } from './Schema'\n\nexport type IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\nexport const IndexedDbArchivistConfigSchema: IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\n\nexport type IndexedDbArchivistConfig = ArchivistConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbArchivistConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main archivist config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n"],"mappings":"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","names":["IndexedDbArchivistSchema","IndexedDbArchivistConfigSchema","IndexedDbArchivistSchema","IndexedDbArchivist","AbstractArchivist","configSchemas","IndexedDbArchivistConfigSchema","defaultDbName","defaultDbVersion","defaultStoreName","hashIndex","key","_hash","multiEntry","unique","schemaIndex","schema","hashIndexName","buildStandardIndexName","schemaIndexName","_db","dbName","config","name","dbVersion","queries","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","storeName","db","assertEx","indexes","storage","allHandler","payloads","getAll","map","payload","PayloadHasher","jsonPayload","clearHandler","clear","deleteHandler","hashes","distinctHashes","Set","found","Promise","all","hash","existing","getKeyFromIndex","delete","filter","exists","getHandler","getFromIndex","insertHandler","pairs","hashPairs","inserted","tx","transaction","store","objectStore","index","get","put","startHandler","openDB","upgrade","database","resolve","createObjectStore","autoIncrement","indexesToCreate","indexKeys","Object","keys","length","indexName","createIndex","creatableModule"]}

package/dist/browser/index.js

@@ -43,25 +43,19 @@ var IndexedDbArchivist = class _IndexedDbArchivist extends AbstractArchivist {
       _hash: 1
     },
     multiEntry: false,
-    name: "IX-_hash",
     unique: true
   };
-  static payloadSchemasIndex = {
-    key: {
-      payload_schemas: 1
-    },
-    multiEntry: false,
-    name: "IX-payload_schemas",
-    unique: false
-  };
   static schemaIndex = {
     key: {
       schema: 1
     },
     multiEntry: false,
-    name: "IX-schema",
     unique: false
   };
+  // eslint-disable-next-line @typescript-eslint/member-ordering
+  static hashIndexName = buildStandardIndexName(_IndexedDbArchivist.hashIndex);
+  // eslint-disable-next-line @typescript-eslint/member-ordering
+  static schemaIndexName = buildStandardIndexName(_IndexedDbArchivist.schemaIndex);
   _db;
   /**
   * The database name. If not supplied via config, it defaults
@@ -79,12 +73,6 @@ var IndexedDbArchivist = class _IndexedDbArchivist extends AbstractArchivist {
   get dbVersion() {
     return this.config?.dbVersion ?? _IndexedDbArchivist.defaultDbVersion;
   }
-  /**
-  * The database indexes.
-  */
-  get indexes() {
-    return this.config?.storage?.indexes ?? [];
-  }
   get queries() {
     return [
       ArchivistAllQuerySchema,
@@ -104,6 +92,9 @@ var IndexedDbArchivist = class _IndexedDbArchivist extends AbstractArchivist {
   get db() {
     return assertEx(this._db, "DB not initialized");
   }
+  get indexes() {
+    return this.config?.storage?.indexes ?? [];
+  }
   async allHandler() {
     const payloads = await this.db.getAll(this.storeName);
     return payloads.map((payload) => PayloadHasher.jsonPayload(payload));
@@ -118,7 +109,7 @@ var IndexedDbArchivist = class _IndexedDbArchivist extends AbstractArchivist {
     const found = await Promise.all(distinctHashes.map(async (hash) => {
       let existing;
       do {
-        existing = await this.db.getKeyFromIndex(this.storeName, _IndexedDbArchivist.hashIndex.name, hash);
+        existing = await this.db.getKeyFromIndex(this.storeName, _IndexedDbArchivist.hashIndexName, hash);
         if (existing)
           await this.db.delete(this.storeName, existing);
       } while (!existing);
@@ -127,7 +118,7 @@ var IndexedDbArchivist = class _IndexedDbArchivist extends AbstractArchivist {
     return found.filter(exists);
   }
   async getHandler(hashes) {
-    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, _IndexedDbArchivist.hashIndex.name, hash)));
+    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, _IndexedDbArchivist.hashIndexName, hash)));
     return payloads.filter(exists);
   }
   async insertHandler(payloads) {
@@ -135,7 +126,7 @@ var IndexedDbArchivist = class _IndexedDbArchivist extends AbstractArchivist {
     const inserted = await Promise.all(pairs.map(async ([payload, _hash]) => {
       const tx = this.db.transaction(this.storeName, "readwrite");
       const store = tx.objectStore(this.storeName);
-      const existing = await store.index(_IndexedDbArchivist.hashIndex.name).get(_hash);
+      const existing = await store.index(_IndexedDbArchivist.hashIndexName).get(_hash);
       if (!existing) {
         await this.db.put(this.storeName, {
           ...payload,
@@ -148,7 +139,7 @@ var IndexedDbArchivist = class _IndexedDbArchivist extends AbstractArchivist {
   }
   async startHandler() {
     await super.startHandler();
-    const { indexes, storeName, dbName, dbVersion } = this;
+    const { dbName, dbVersion, indexes, storeName } = this;
     this._db = await openDB(dbName, dbVersion, {
       async upgrade(database) {
         await Promise.resolve();
@@ -158,15 +149,14 @@ var IndexedDbArchivist = class _IndexedDbArchivist extends AbstractArchivist {
         });
         store.name = storeName;
         const indexesToCreate = [
-          ...indexes,
           _IndexedDbArchivist.hashIndex,
-          _IndexedDbArchivist.payloadSchemasIndex,
-          _IndexedDbArchivist.schemaIndex
+          _IndexedDbArchivist.schemaIndex,
+          ...indexes
         ];
-        for (const { key, multiEntry, name, unique } of indexesToCreate) {
+        for (const { key, multiEntry, unique } of indexesToCreate) {
           const indexKeys = Object.keys(key);
           const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys;
-          const indexName = name ?? buildStandardIndexName({
+          const indexName = buildStandardIndexName({
             key,
             unique
           });

package/dist/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Archivist.ts","../../src/Schema.ts","../../src/Config.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuerySchema,\n  ArchivistModuleEventData,\n  buildStandardIndexName,\n  IndexDescription,\n} from '@xyo-network/archivist-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { creatableModule } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { IDBPDatabase, openDB } from 'idb'\n\nimport { IndexedDbArchivistConfigSchema } from './Config'\nimport { IndexedDbArchivistParams } from './Params'\n\nexport interface PayloadStore {\n  [s: string]: Payload\n}\n\n@creatableModule()\nexport class IndexedDbArchivist<\n  TParams extends IndexedDbArchivistParams = IndexedDbArchivistParams,\n  TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n> extends AbstractArchivist<TParams, TEventData> {\n  static override configSchemas = [IndexedDbArchivistConfigSchema]\n  static readonly defaultDbName = 'archivist'\n  static readonly defaultDbVersion = 1\n  static readonly defaultStoreName = 'payloads'\n  static readonly hashIndex: Required<IndexDescription> = { key: { _hash: 1 }, multiEntry: false, name: 'IX-_hash', unique: true }\n  static readonly payloadSchemasIndex: Required<IndexDescription> = {\n    key: { payload_schemas: 1 },\n    multiEntry: false,\n    name: 'IX-payload_schemas',\n    unique: false,\n  }\n  static readonly schemaIndex: Required<IndexDescription> = { key: { schema: 1 }, multiEntry: false, name: 'IX-schema', unique: false }\n\n  private _db: IDBPDatabase<PayloadStore> | undefined\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the module name (not guaranteed to be unique) and if module\n   * name is not supplied, it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.name ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  /**\n   * The database indexes.\n   */\n  get indexes() {\n    return this.config?.storage?.indexes ?? []\n  }\n\n  override get queries() {\n    return [ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, ...super.queries]\n  }\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  private get db(): IDBPDatabase<PayloadStore> {\n    return assertEx(this._db, 'DB not initialized')\n  }\n\n  protected override async allHandler(): Promise<Payload[]> {\n    // Get all payloads from the store\n    const payloads = await this.db.getAll(this.storeName)\n    // Remove any metadata before returning to the client\n    return payloads.map((payload) => PayloadHasher.jsonPayload(payload))\n  }\n\n  protected override async clearHandler(): Promise<void> {\n    await this.db.clear(this.storeName)\n  }\n\n  protected override async deleteHandler(hashes: string[]): Promise<string[]> {\n    const distinctHashes = [...new Set(hashes)]\n    const found = await Promise.all(\n      distinctHashes.map(async (hash) => {\n        let existing: IDBValidKey | undefined\n        do {\n          existing = await this.db.getKeyFromIndex(this.storeName, IndexedDbArchivist.hashIndex.name, hash)\n          if (existing) await this.db.delete(this.storeName, existing)\n        } while (!existing)\n        return hash\n      }),\n    )\n    // Return hashes removed\n    return found.filter(exists)\n  }\n\n  protected override async getHandler(hashes: string[]): Promise<Payload[]> {\n    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, IndexedDbArchivist.hashIndex.name, hash)))\n    return payloads.filter(exists)\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n    const pairs = await PayloadHasher.hashPairs(payloads)\n    // Only return the payloads that were successfully inserted\n    const inserted = await Promise.all(\n      pairs.map(async ([payload, _hash]) => {\n        const tx = this.db.transaction(this.storeName, 'readwrite')\n        const store = tx.objectStore(this.storeName)\n        const existing = await store.index(IndexedDbArchivist.hashIndex.name).get(_hash)\n        if (!existing) {\n          await this.db.put(this.storeName, { ...payload, _hash })\n          return payload\n        }\n      }),\n    )\n    return inserted.filter(exists)\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: We could defer this creation to first access but we\n    // want to fail fast here in case something is wrong\n    const { indexes, storeName, dbName, dbVersion } = this\n    this._db = await openDB<PayloadStore>(dbName, dbVersion, {\n      async upgrade(database) {\n        await Promise.resolve() // Async to match spec\n        // Create the store\n        const store = database.createObjectStore(storeName, {\n          // If it isn't explicitly set, create a value by auto incrementing.\n          autoIncrement: true,\n        })\n        // Name the store\n        store.name = storeName\n        // Create an index on the hash\n        const indexesToCreate = [...indexes, IndexedDbArchivist.hashIndex, IndexedDbArchivist.payloadSchemasIndex, IndexedDbArchivist.schemaIndex]\n        for (const { key, multiEntry, name, unique } of indexesToCreate) {\n          const indexKeys = Object.keys(key)\n          const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys\n          const indexName = name ?? buildStandardIndexName({ key, unique })\n          store.createIndex(indexName, keys, { multiEntry, unique })\n        }\n      },\n    })\n\n    return true\n  }\n}\n","export type IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb'\nexport const IndexedDbArchivistSchema: IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb'\n","import { ArchivistConfig, IndexDescription } from '@xyo-network/archivist-model'\n\nimport { IndexedDbArchivistSchema } from './Schema'\n\nexport type IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\nexport const IndexedDbArchivistConfigSchema: IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\n\nexport type IndexedDbArchivistConfig = ArchivistConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbArchivistConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main archivist config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n"],"mappings":"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","names":["assertEx","exists","AbstractArchivist","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","buildStandardIndexName","PayloadHasher","creatableModule","openDB","IndexedDbArchivistSchema","IndexedDbArchivistConfigSchema","IndexedDbArchivistSchema","IndexedDbArchivist","AbstractArchivist","configSchemas","IndexedDbArchivistConfigSchema","defaultDbName","defaultDbVersion","defaultStoreName","hashIndex","key","_hash","multiEntry","name","unique","payloadSchemasIndex","payload_schemas","schemaIndex","schema","_db","dbName","config","dbVersion","indexes","storage","queries","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","storeName","db","assertEx","allHandler","payloads","getAll","map","payload","PayloadHasher","jsonPayload","clearHandler","clear","deleteHandler","hashes","distinctHashes","Set","found","Promise","all","hash","existing","getKeyFromIndex","delete","filter","exists","getHandler","getFromIndex","insertHandler","pairs","hashPairs","inserted","tx","transaction","store","objectStore","index","get","put","startHandler","openDB","upgrade","database","resolve","createObjectStore","autoIncrement","indexesToCreate","indexKeys","Object","keys","length","indexName","buildStandardIndexName","createIndex","creatableModule"]}
+{"version":3,"sources":["../../src/Archivist.ts","../../src/Schema.ts","../../src/Config.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuerySchema,\n  ArchivistModuleEventData,\n  buildStandardIndexName,\n  IndexDescription,\n} from '@xyo-network/archivist-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { creatableModule } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { IDBPDatabase, openDB } from 'idb'\n\nimport { IndexedDbArchivistConfigSchema } from './Config'\nimport { IndexedDbArchivistParams } from './Params'\n\nexport interface PayloadStore {\n  [s: string]: Payload\n}\n\n@creatableModule()\nexport class IndexedDbArchivist<\n  TParams extends IndexedDbArchivistParams = IndexedDbArchivistParams,\n  TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n> extends AbstractArchivist<TParams, TEventData> {\n  static override configSchemas = [IndexedDbArchivistConfigSchema]\n  static readonly defaultDbName = 'archivist'\n  static readonly defaultDbVersion = 1\n  static readonly defaultStoreName = 'payloads'\n  private static readonly hashIndex: IndexDescription = { key: { _hash: 1 }, multiEntry: false, unique: true }\n  private static readonly schemaIndex: IndexDescription = { key: { schema: 1 }, multiEntry: false, unique: false }\n  // eslint-disable-next-line @typescript-eslint/member-ordering\n  static readonly hashIndexName = buildStandardIndexName(IndexedDbArchivist.hashIndex)\n  // eslint-disable-next-line @typescript-eslint/member-ordering\n  static readonly schemaIndexName = buildStandardIndexName(IndexedDbArchivist.schemaIndex)\n\n  private _db: IDBPDatabase<PayloadStore> | undefined\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the module name (not guaranteed to be unique) and if module\n   * name is not supplied, it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.name ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  override get queries() {\n    return [ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, ...super.queries]\n  }\n\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  private get db(): IDBPDatabase<PayloadStore> {\n    return assertEx(this._db, 'DB not initialized')\n  }\n\n  private get indexes() {\n    return this.config?.storage?.indexes ?? []\n  }\n\n  protected override async allHandler(): Promise<Payload[]> {\n    // Get all payloads from the store\n    const payloads = await this.db.getAll(this.storeName)\n    // Remove any metadata before returning to the client\n    return payloads.map((payload) => PayloadHasher.jsonPayload(payload))\n  }\n\n  protected override async clearHandler(): Promise<void> {\n    await this.db.clear(this.storeName)\n  }\n\n  protected override async deleteHandler(hashes: string[]): Promise<string[]> {\n    const distinctHashes = [...new Set(hashes)]\n    const found = await Promise.all(\n      distinctHashes.map(async (hash) => {\n        let existing: IDBValidKey | undefined\n        do {\n          existing = await this.db.getKeyFromIndex(this.storeName, IndexedDbArchivist.hashIndexName, hash)\n          if (existing) await this.db.delete(this.storeName, existing)\n        } while (!existing)\n        return hash\n      }),\n    )\n    // Return hashes removed\n    return found.filter(exists)\n  }\n\n  protected override async getHandler(hashes: string[]): Promise<Payload[]> {\n    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, IndexedDbArchivist.hashIndexName, hash)))\n    return payloads.filter(exists)\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n    const pairs = await PayloadHasher.hashPairs(payloads)\n    // Only return the payloads that were successfully inserted\n    const inserted = await Promise.all(\n      pairs.map(async ([payload, _hash]) => {\n        const tx = this.db.transaction(this.storeName, 'readwrite')\n        const store = tx.objectStore(this.storeName)\n        const existing = await store.index(IndexedDbArchivist.hashIndexName).get(_hash)\n        if (!existing) {\n          await this.db.put(this.storeName, { ...payload, _hash })\n          return payload\n        }\n      }),\n    )\n    return inserted.filter(exists)\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: We could defer this creation to first access but we\n    // want to fail fast here in case something is wrong\n    const { dbName, dbVersion, indexes, storeName } = this\n    this._db = await openDB<PayloadStore>(dbName, dbVersion, {\n      async upgrade(database) {\n        await Promise.resolve() // Async to match spec\n        // Create the store\n        const store = database.createObjectStore(storeName, {\n          // If it isn't explicitly set, create a value by auto incrementing.\n          autoIncrement: true,\n        })\n        // Name the store\n        store.name = storeName\n        // Create an index on the hash\n        const indexesToCreate = [IndexedDbArchivist.hashIndex, IndexedDbArchivist.schemaIndex, ...indexes]\n        for (const { key, multiEntry, unique } of indexesToCreate) {\n          const indexKeys = Object.keys(key)\n          const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys\n          const indexName = buildStandardIndexName({ key, unique })\n          store.createIndex(indexName, keys, { multiEntry, unique })\n        }\n      },\n    })\n    return true\n  }\n}\n","export type IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb'\nexport const IndexedDbArchivistSchema: IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb'\n","import { ArchivistConfig, IndexDescription } from '@xyo-network/archivist-model'\n\nimport { IndexedDbArchivistSchema } from './Schema'\n\nexport type IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\nexport const IndexedDbArchivistConfigSchema: IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\n\nexport type IndexedDbArchivistConfig = ArchivistConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbArchivistConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main archivist config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n"],"mappings":"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","names":["assertEx","exists","AbstractArchivist","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","buildStandardIndexName","PayloadHasher","creatableModule","openDB","IndexedDbArchivistSchema","IndexedDbArchivistConfigSchema","IndexedDbArchivistSchema","IndexedDbArchivist","AbstractArchivist","configSchemas","IndexedDbArchivistConfigSchema","defaultDbName","defaultDbVersion","defaultStoreName","hashIndex","key","_hash","multiEntry","unique","schemaIndex","schema","hashIndexName","buildStandardIndexName","schemaIndexName","_db","dbName","config","name","dbVersion","queries","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","storeName","db","assertEx","indexes","storage","allHandler","payloads","getAll","map","payload","PayloadHasher","jsonPayload","clearHandler","clear","deleteHandler","hashes","distinctHashes","Set","found","Promise","all","hash","existing","getKeyFromIndex","delete","filter","exists","getHandler","getFromIndex","insertHandler","pairs","hashPairs","inserted","tx","transaction","store","objectStore","index","get","put","startHandler","openDB","upgrade","database","resolve","createObjectStore","autoIncrement","indexesToCreate","indexKeys","Object","keys","length","indexName","createIndex","creatableModule"]}

package/dist/node/Archivist.d.cts

@@ -1,5 +1,5 @@
 import { AbstractArchivist } from '@xyo-network/archivist-abstract';
-import { ArchivistModuleEventData, IndexDescription } from '@xyo-network/archivist-model';
+import { ArchivistModuleEventData } from '@xyo-network/archivist-model';
 import { Payload } from '@xyo-network/payload-model';
 import { IndexedDbArchivistParams } from './Params';
 export interface PayloadStore {
@@ -10,9 +10,10 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
     static readonly defaultDbName = "archivist";
     static readonly defaultDbVersion = 1;
     static readonly defaultStoreName = "payloads";
-    static readonly hashIndex: Required<IndexDescription>;
-    static readonly payloadSchemasIndex: Required<IndexDescription>;
-    static readonly schemaIndex: Required<IndexDescription>;
+    private static readonly hashIndex;
+    private static readonly schemaIndex;
+    static readonly hashIndexName: string;
+    static readonly schemaIndexName: string;
     private _db;
     /**
      * The database name. If not supplied via config, it defaults
@@ -26,10 +27,6 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
      * The database version. If not supplied via config, it defaults to 1.
      */
     get dbVersion(): number;
-    /**
-     * The database indexes.
-     */
-    get indexes(): IndexDescription[];
     get queries(): string[];
     /**
      * The name of the object store. If not supplied via config, it defaults
@@ -37,6 +34,7 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
      */
     get storeName(): string;
     private get db();
+    private get indexes();
     protected allHandler(): Promise<Payload[]>;
     protected clearHandler(): Promise<void>;
     protected deleteHandler(hashes: string[]): Promise<string[]>;

package/dist/node/Archivist.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAKL,wBAAwB,EAExB,gBAAgB,EACjB,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAEnD,MAAM,WAAW,YAAY;IAC3B,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,qBACa,kBAAkB,CAC7B,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,EACnE,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAAC;IAC9C,OAAgB,aAAa,6CAAmC;IAChE,MAAM,CAAC,QAAQ,CAAC,aAAa,eAAc;IAC3C,MAAM,CAAC,QAAQ,CAAC,gBAAgB,KAAI;IACpC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,cAAa;IAC7C,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAA2E;IAChI,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAK9D;IACD,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAA8E;IAErI,OAAO,CAAC,GAAG,CAAwC;IAEnD;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;OAEG;IACH,IAAI,OAAO,uBAEV;IAED,IAAa,OAAO,aAEnB;IACD;;;OAGG;IACH,IAAI,SAAS,WAEZ;IAED,OAAO,KAAK,EAAE,GAEb;cAEwB,UAAU,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;cAOhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAI7B,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAgBlD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAKhD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAiBtD,YAAY;CA4BtC"}
+{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAKL,wBAAwB,EAGzB,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAEnD,MAAM,WAAW,YAAY;IAC3B,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,qBACa,kBAAkB,CAC7B,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,EACnE,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAAC;IAC9C,OAAgB,aAAa,6CAAmC;IAChE,MAAM,CAAC,QAAQ,CAAC,aAAa,eAAc;IAC3C,MAAM,CAAC,QAAQ,CAAC,gBAAgB,KAAI;IACpC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,cAAa;IAC7C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAA2E;IAC5G,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAA6E;IAEhH,MAAM,CAAC,QAAQ,CAAC,aAAa,SAAuD;IAEpF,MAAM,CAAC,QAAQ,CAAC,eAAe,SAAyD;IAExF,OAAO,CAAC,GAAG,CAAwC;IAEnD;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED,IAAa,OAAO,aAEnB;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;IAED,OAAO,KAAK,EAAE,GAEb;IAED,OAAO,KAAK,OAAO,GAElB;cAEwB,UAAU,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;cAOhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAI7B,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAgBlD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAKhD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAiBtD,YAAY;CA2BtC"}

package/dist/node/Archivist.d.mts

@@ -1,5 +1,5 @@
 import { AbstractArchivist } from '@xyo-network/archivist-abstract';
-import { ArchivistModuleEventData, IndexDescription } from '@xyo-network/archivist-model';
+import { ArchivistModuleEventData } from '@xyo-network/archivist-model';
 import { Payload } from '@xyo-network/payload-model';
 import { IndexedDbArchivistParams } from './Params';
 export interface PayloadStore {
@@ -10,9 +10,10 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
     static readonly defaultDbName = "archivist";
     static readonly defaultDbVersion = 1;
     static readonly defaultStoreName = "payloads";
-    static readonly hashIndex: Required<IndexDescription>;
-    static readonly payloadSchemasIndex: Required<IndexDescription>;
-    static readonly schemaIndex: Required<IndexDescription>;
+    private static readonly hashIndex;
+    private static readonly schemaIndex;
+    static readonly hashIndexName: string;
+    static readonly schemaIndexName: string;
     private _db;
     /**
      * The database name. If not supplied via config, it defaults
@@ -26,10 +27,6 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
      * The database version. If not supplied via config, it defaults to 1.
      */
     get dbVersion(): number;
-    /**
-     * The database indexes.
-     */
-    get indexes(): IndexDescription[];
     get queries(): string[];
     /**
      * The name of the object store. If not supplied via config, it defaults
@@ -37,6 +34,7 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
      */
     get storeName(): string;
     private get db();
+    private get indexes();
     protected allHandler(): Promise<Payload[]>;
     protected clearHandler(): Promise<void>;
     protected deleteHandler(hashes: string[]): Promise<string[]>;

package/dist/node/Archivist.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAKL,wBAAwB,EAExB,gBAAgB,EACjB,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAEnD,MAAM,WAAW,YAAY;IAC3B,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,qBACa,kBAAkB,CAC7B,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,EACnE,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAAC;IAC9C,OAAgB,aAAa,6CAAmC;IAChE,MAAM,CAAC,QAAQ,CAAC,aAAa,eAAc;IAC3C,MAAM,CAAC,QAAQ,CAAC,gBAAgB,KAAI;IACpC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,cAAa;IAC7C,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAA2E;IAChI,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAK9D;IACD,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAA8E;IAErI,OAAO,CAAC,GAAG,CAAwC;IAEnD;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;OAEG;IACH,IAAI,OAAO,uBAEV;IAED,IAAa,OAAO,aAEnB;IACD;;;OAGG;IACH,IAAI,SAAS,WAEZ;IAED,OAAO,KAAK,EAAE,GAEb;cAEwB,UAAU,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;cAOhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAI7B,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAgBlD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAKhD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAiBtD,YAAY;CA4BtC"}
+{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAKL,wBAAwB,EAGzB,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAEnD,MAAM,WAAW,YAAY;IAC3B,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,qBACa,kBAAkB,CAC7B,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,EACnE,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAAC;IAC9C,OAAgB,aAAa,6CAAmC;IAChE,MAAM,CAAC,QAAQ,CAAC,aAAa,eAAc;IAC3C,MAAM,CAAC,QAAQ,CAAC,gBAAgB,KAAI;IACpC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,cAAa;IAC7C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAA2E;IAC5G,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAA6E;IAEhH,MAAM,CAAC,QAAQ,CAAC,aAAa,SAAuD;IAEpF,MAAM,CAAC,QAAQ,CAAC,eAAe,SAAyD;IAExF,OAAO,CAAC,GAAG,CAAwC;IAEnD;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED,IAAa,OAAO,aAEnB;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;IAED,OAAO,KAAK,EAAE,GAEb;IAED,OAAO,KAAK,OAAO,GAElB;cAEwB,UAAU,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;cAOhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAI7B,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAgBlD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAKhD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAiBtD,YAAY;CA2BtC"}

package/dist/node/Archivist.d.ts

@@ -1,5 +1,5 @@
 import { AbstractArchivist } from '@xyo-network/archivist-abstract';
-import { ArchivistModuleEventData, IndexDescription } from '@xyo-network/archivist-model';
+import { ArchivistModuleEventData } from '@xyo-network/archivist-model';
 import { Payload } from '@xyo-network/payload-model';
 import { IndexedDbArchivistParams } from './Params';
 export interface PayloadStore {
@@ -10,9 +10,10 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
     static readonly defaultDbName = "archivist";
     static readonly defaultDbVersion = 1;
     static readonly defaultStoreName = "payloads";
-    static readonly hashIndex: Required<IndexDescription>;
-    static readonly payloadSchemasIndex: Required<IndexDescription>;
-    static readonly schemaIndex: Required<IndexDescription>;
+    private static readonly hashIndex;
+    private static readonly schemaIndex;
+    static readonly hashIndexName: string;
+    static readonly schemaIndexName: string;
     private _db;
     /**
      * The database name. If not supplied via config, it defaults
@@ -26,10 +27,6 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
      * The database version. If not supplied via config, it defaults to 1.
      */
     get dbVersion(): number;
-    /**
-     * The database indexes.
-     */
-    get indexes(): IndexDescription[];
     get queries(): string[];
     /**
      * The name of the object store. If not supplied via config, it defaults
@@ -37,6 +34,7 @@ export declare class IndexedDbArchivist<TParams extends IndexedDbArchivistParams
      */
     get storeName(): string;
     private get db();
+    private get indexes();
     protected allHandler(): Promise<Payload[]>;
     protected clearHandler(): Promise<void>;
     protected deleteHandler(hashes: string[]): Promise<string[]>;

package/dist/node/Archivist.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAKL,wBAAwB,EAExB,gBAAgB,EACjB,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAEnD,MAAM,WAAW,YAAY;IAC3B,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,qBACa,kBAAkB,CAC7B,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,EACnE,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAAC;IAC9C,OAAgB,aAAa,6CAAmC;IAChE,MAAM,CAAC,QAAQ,CAAC,aAAa,eAAc;IAC3C,MAAM,CAAC,QAAQ,CAAC,gBAAgB,KAAI;IACpC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,cAAa;IAC7C,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAA2E;IAChI,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAK9D;IACD,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAA8E;IAErI,OAAO,CAAC,GAAG,CAAwC;IAEnD;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;OAEG;IACH,IAAI,OAAO,uBAEV;IAED,IAAa,OAAO,aAEnB;IACD;;;OAGG;IACH,IAAI,SAAS,WAEZ;IAED,OAAO,KAAK,EAAE,GAEb;cAEwB,UAAU,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;cAOhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAI7B,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAgBlD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAKhD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAiBtD,YAAY;CA4BtC"}
+{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAKL,wBAAwB,EAGzB,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAEnD,MAAM,WAAW,YAAY;IAC3B,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,qBACa,kBAAkB,CAC7B,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,EACnE,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAAC;IAC9C,OAAgB,aAAa,6CAAmC;IAChE,MAAM,CAAC,QAAQ,CAAC,aAAa,eAAc;IAC3C,MAAM,CAAC,QAAQ,CAAC,gBAAgB,KAAI;IACpC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,cAAa;IAC7C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAA2E;IAC5G,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAA6E;IAEhH,MAAM,CAAC,QAAQ,CAAC,aAAa,SAAuD;IAEpF,MAAM,CAAC,QAAQ,CAAC,eAAe,SAAyD;IAExF,OAAO,CAAC,GAAG,CAAwC;IAEnD;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED,IAAa,OAAO,aAEnB;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;IAED,OAAO,KAAK,EAAE,GAEb;IAED,OAAO,KAAK,OAAO,GAElB;cAEwB,UAAU,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;cAOhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAI7B,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAgBlD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAKhD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAiBtD,YAAY;CA2BtC"}

package/dist/node/index.cjs

@@ -79,13 +79,6 @@ var _IndexedDbArchivist = class _IndexedDbArchivist extends import_archivist_abs
     var _a;
     return ((_a = this.config) == null ? void 0 : _a.dbVersion) ?? _IndexedDbArchivist.defaultDbVersion;
   }
-  /**
-  * The database indexes.
-  */
-  get indexes() {
-    var _a, _b;
-    return ((_b = (_a = this.config) == null ? void 0 : _a.storage) == null ? void 0 : _b.indexes) ?? [];
-  }
   get queries() {
     return [
       import_archivist_model.ArchivistAllQuerySchema,
@@ -106,6 +99,10 @@ var _IndexedDbArchivist = class _IndexedDbArchivist extends import_archivist_abs
   get db() {
     return (0, import_assert.assertEx)(this._db, "DB not initialized");
   }
+  get indexes() {
+    var _a, _b;
+    return ((_b = (_a = this.config) == null ? void 0 : _a.storage) == null ? void 0 : _b.indexes) ?? [];
+  }
   async allHandler() {
     const payloads = await this.db.getAll(this.storeName);
     return payloads.map((payload) => import_hash.PayloadHasher.jsonPayload(payload));
@@ -120,7 +117,7 @@ var _IndexedDbArchivist = class _IndexedDbArchivist extends import_archivist_abs
     const found = await Promise.all(distinctHashes.map(async (hash) => {
       let existing;
       do {
-        existing = await this.db.getKeyFromIndex(this.storeName, _IndexedDbArchivist.hashIndex.name, hash);
+        existing = await this.db.getKeyFromIndex(this.storeName, _IndexedDbArchivist.hashIndexName, hash);
         if (existing)
           await this.db.delete(this.storeName, existing);
       } while (!existing);
@@ -129,7 +126,7 @@ var _IndexedDbArchivist = class _IndexedDbArchivist extends import_archivist_abs
     return found.filter(import_exists.exists);
   }
   async getHandler(hashes) {
-    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, _IndexedDbArchivist.hashIndex.name, hash)));
+    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, _IndexedDbArchivist.hashIndexName, hash)));
     return payloads.filter(import_exists.exists);
   }
   async insertHandler(payloads) {
@@ -137,7 +134,7 @@ var _IndexedDbArchivist = class _IndexedDbArchivist extends import_archivist_abs
     const inserted = await Promise.all(pairs.map(async ([payload, _hash]) => {
       const tx = this.db.transaction(this.storeName, "readwrite");
       const store = tx.objectStore(this.storeName);
-      const existing = await store.index(_IndexedDbArchivist.hashIndex.name).get(_hash);
+      const existing = await store.index(_IndexedDbArchivist.hashIndexName).get(_hash);
       if (!existing) {
         await this.db.put(this.storeName, {
           ...payload,
@@ -150,7 +147,7 @@ var _IndexedDbArchivist = class _IndexedDbArchivist extends import_archivist_abs
   }
   async startHandler() {
     await super.startHandler();
-    const { indexes, storeName, dbName, dbVersion } = this;
+    const { dbName, dbVersion, indexes, storeName } = this;
     this._db = await (0, import_idb.openDB)(dbName, dbVersion, {
       async upgrade(database) {
         await Promise.resolve();
@@ -160,15 +157,14 @@ var _IndexedDbArchivist = class _IndexedDbArchivist extends import_archivist_abs
         });
         store.name = storeName;
         const indexesToCreate = [
-          ...indexes,
           _IndexedDbArchivist.hashIndex,
-          _IndexedDbArchivist.payloadSchemasIndex,
-          _IndexedDbArchivist.schemaIndex
+          _IndexedDbArchivist.schemaIndex,
+          ...indexes
         ];
-        for (const { key, multiEntry, name, unique } of indexesToCreate) {
+        for (const { key, multiEntry, unique } of indexesToCreate) {
           const indexKeys = Object.keys(key);
           const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys;
-          const indexName = name ?? (0, import_archivist_model.buildStandardIndexName)({
+          const indexName = (0, import_archivist_model.buildStandardIndexName)({
             key,
             unique
           });
@@ -194,25 +190,19 @@ __publicField(_IndexedDbArchivist, "hashIndex", {
     _hash: 1
   },
   multiEntry: false,
-  name: "IX-_hash",
   unique: true
 });
-__publicField(_IndexedDbArchivist, "payloadSchemasIndex", {
-  key: {
-    payload_schemas: 1
-  },
-  multiEntry: false,
-  name: "IX-payload_schemas",
-  unique: false
-});
 __publicField(_IndexedDbArchivist, "schemaIndex", {
   key: {
     schema: 1
   },
   multiEntry: false,
-  name: "IX-schema",
   unique: false
 });
+// eslint-disable-next-line @typescript-eslint/member-ordering
+__publicField(_IndexedDbArchivist, "hashIndexName", (0, import_archivist_model.buildStandardIndexName)(_IndexedDbArchivist.hashIndex));
+// eslint-disable-next-line @typescript-eslint/member-ordering
+__publicField(_IndexedDbArchivist, "schemaIndexName", (0, import_archivist_model.buildStandardIndexName)(_IndexedDbArchivist.schemaIndex));
 var IndexedDbArchivist = _IndexedDbArchivist;
 IndexedDbArchivist = _ts_decorate([
   (0, import_module_model.creatableModule)()

package/dist/node/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Archivist.ts","../../src/Schema.ts","../../src/Config.ts"],"sourcesContent":["export * from './Archivist'\nexport * from './Config'\nexport * from './Params'\nexport * from './Schema'\n","import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuerySchema,\n  ArchivistModuleEventData,\n  buildStandardIndexName,\n  IndexDescription,\n} from '@xyo-network/archivist-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { creatableModule } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { IDBPDatabase, openDB } from 'idb'\n\nimport { IndexedDbArchivistConfigSchema } from './Config'\nimport { IndexedDbArchivistParams } from './Params'\n\nexport interface PayloadStore {\n  [s: string]: Payload\n}\n\n@creatableModule()\nexport class IndexedDbArchivist<\n  TParams extends IndexedDbArchivistParams = IndexedDbArchivistParams,\n  TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n> extends AbstractArchivist<TParams, TEventData> {\n  static override configSchemas = [IndexedDbArchivistConfigSchema]\n  static readonly defaultDbName = 'archivist'\n  static readonly defaultDbVersion = 1\n  static readonly defaultStoreName = 'payloads'\n  static readonly hashIndex: Required<IndexDescription> = { key: { _hash: 1 }, multiEntry: false, name: 'IX-_hash', unique: true }\n  static readonly payloadSchemasIndex: Required<IndexDescription> = {\n    key: { payload_schemas: 1 },\n    multiEntry: false,\n    name: 'IX-payload_schemas',\n    unique: false,\n  }\n  static readonly schemaIndex: Required<IndexDescription> = { key: { schema: 1 }, multiEntry: false, name: 'IX-schema', unique: false }\n\n  private _db: IDBPDatabase<PayloadStore> | undefined\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the module name (not guaranteed to be unique) and if module\n   * name is not supplied, it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.name ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  /**\n   * The database indexes.\n   */\n  get indexes() {\n    return this.config?.storage?.indexes ?? []\n  }\n\n  override get queries() {\n    return [ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, ...super.queries]\n  }\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  private get db(): IDBPDatabase<PayloadStore> {\n    return assertEx(this._db, 'DB not initialized')\n  }\n\n  protected override async allHandler(): Promise<Payload[]> {\n    // Get all payloads from the store\n    const payloads = await this.db.getAll(this.storeName)\n    // Remove any metadata before returning to the client\n    return payloads.map((payload) => PayloadHasher.jsonPayload(payload))\n  }\n\n  protected override async clearHandler(): Promise<void> {\n    await this.db.clear(this.storeName)\n  }\n\n  protected override async deleteHandler(hashes: string[]): Promise<string[]> {\n    const distinctHashes = [...new Set(hashes)]\n    const found = await Promise.all(\n      distinctHashes.map(async (hash) => {\n        let existing: IDBValidKey | undefined\n        do {\n          existing = await this.db.getKeyFromIndex(this.storeName, IndexedDbArchivist.hashIndex.name, hash)\n          if (existing) await this.db.delete(this.storeName, existing)\n        } while (!existing)\n        return hash\n      }),\n    )\n    // Return hashes removed\n    return found.filter(exists)\n  }\n\n  protected override async getHandler(hashes: string[]): Promise<Payload[]> {\n    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, IndexedDbArchivist.hashIndex.name, hash)))\n    return payloads.filter(exists)\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n    const pairs = await PayloadHasher.hashPairs(payloads)\n    // Only return the payloads that were successfully inserted\n    const inserted = await Promise.all(\n      pairs.map(async ([payload, _hash]) => {\n        const tx = this.db.transaction(this.storeName, 'readwrite')\n        const store = tx.objectStore(this.storeName)\n        const existing = await store.index(IndexedDbArchivist.hashIndex.name).get(_hash)\n        if (!existing) {\n          await this.db.put(this.storeName, { ...payload, _hash })\n          return payload\n        }\n      }),\n    )\n    return inserted.filter(exists)\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: We could defer this creation to first access but we\n    // want to fail fast here in case something is wrong\n    const { indexes, storeName, dbName, dbVersion } = this\n    this._db = await openDB<PayloadStore>(dbName, dbVersion, {\n      async upgrade(database) {\n        await Promise.resolve() // Async to match spec\n        // Create the store\n        const store = database.createObjectStore(storeName, {\n          // If it isn't explicitly set, create a value by auto incrementing.\n          autoIncrement: true,\n        })\n        // Name the store\n        store.name = storeName\n        // Create an index on the hash\n        const indexesToCreate = [...indexes, IndexedDbArchivist.hashIndex, IndexedDbArchivist.payloadSchemasIndex, IndexedDbArchivist.schemaIndex]\n        for (const { key, multiEntry, name, unique } of indexesToCreate) {\n          const indexKeys = Object.keys(key)\n          const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys\n          const indexName = name ?? buildStandardIndexName({ key, unique })\n          store.createIndex(indexName, keys, { multiEntry, unique })\n        }\n      },\n    })\n\n    return true\n  }\n}\n","export type IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb'\nexport const IndexedDbArchivistSchema: IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb'\n","import { ArchivistConfig, IndexDescription } from '@xyo-network/archivist-model'\n\nimport { IndexedDbArchivistSchema } from './Schema'\n\nexport type IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\nexport const IndexedDbArchivistConfigSchema: IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\n\nexport type IndexedDbArchivistConfig = ArchivistConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbArchivistConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main archivist config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n"],"mappings":"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","names":["IndexedDbArchivistSchema","IndexedDbArchivistConfigSchema","IndexedDbArchivistSchema","IndexedDbArchivist","AbstractArchivist","_db","dbName","config","name","defaultDbName","dbVersion","defaultDbVersion","indexes","storage","queries","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","storeName","defaultStoreName","db","assertEx","allHandler","payloads","getAll","map","payload","PayloadHasher","jsonPayload","clearHandler","clear","deleteHandler","hashes","distinctHashes","Set","found","Promise","all","hash","existing","getKeyFromIndex","hashIndex","delete","filter","exists","getHandler","getFromIndex","insertHandler","pairs","hashPairs","inserted","_hash","tx","transaction","store","objectStore","index","get","put","startHandler","openDB","upgrade","database","resolve","createObjectStore","autoIncrement","indexesToCreate","payloadSchemasIndex","schemaIndex","key","multiEntry","unique","indexKeys","Object","keys","length","indexName","buildStandardIndexName","createIndex","configSchemas","IndexedDbArchivistConfigSchema","payload_schemas","schema","creatableModule"]}
+{"version":3,"sources":["../../src/index.ts","../../src/Archivist.ts","../../src/Schema.ts","../../src/Config.ts"],"sourcesContent":["export * from './Archivist'\nexport * from './Config'\nexport * from './Params'\nexport * from './Schema'\n","import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuerySchema,\n  ArchivistModuleEventData,\n  buildStandardIndexName,\n  IndexDescription,\n} from '@xyo-network/archivist-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { creatableModule } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { IDBPDatabase, openDB } from 'idb'\n\nimport { IndexedDbArchivistConfigSchema } from './Config'\nimport { IndexedDbArchivistParams } from './Params'\n\nexport interface PayloadStore {\n  [s: string]: Payload\n}\n\n@creatableModule()\nexport class IndexedDbArchivist<\n  TParams extends IndexedDbArchivistParams = IndexedDbArchivistParams,\n  TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n> extends AbstractArchivist<TParams, TEventData> {\n  static override configSchemas = [IndexedDbArchivistConfigSchema]\n  static readonly defaultDbName = 'archivist'\n  static readonly defaultDbVersion = 1\n  static readonly defaultStoreName = 'payloads'\n  private static readonly hashIndex: IndexDescription = { key: { _hash: 1 }, multiEntry: false, unique: true }\n  private static readonly schemaIndex: IndexDescription = { key: { schema: 1 }, multiEntry: false, unique: false }\n  // eslint-disable-next-line @typescript-eslint/member-ordering\n  static readonly hashIndexName = buildStandardIndexName(IndexedDbArchivist.hashIndex)\n  // eslint-disable-next-line @typescript-eslint/member-ordering\n  static readonly schemaIndexName = buildStandardIndexName(IndexedDbArchivist.schemaIndex)\n\n  private _db: IDBPDatabase<PayloadStore> | undefined\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the module name (not guaranteed to be unique) and if module\n   * name is not supplied, it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.name ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  override get queries() {\n    return [ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, ...super.queries]\n  }\n\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  private get db(): IDBPDatabase<PayloadStore> {\n    return assertEx(this._db, 'DB not initialized')\n  }\n\n  private get indexes() {\n    return this.config?.storage?.indexes ?? []\n  }\n\n  protected override async allHandler(): Promise<Payload[]> {\n    // Get all payloads from the store\n    const payloads = await this.db.getAll(this.storeName)\n    // Remove any metadata before returning to the client\n    return payloads.map((payload) => PayloadHasher.jsonPayload(payload))\n  }\n\n  protected override async clearHandler(): Promise<void> {\n    await this.db.clear(this.storeName)\n  }\n\n  protected override async deleteHandler(hashes: string[]): Promise<string[]> {\n    const distinctHashes = [...new Set(hashes)]\n    const found = await Promise.all(\n      distinctHashes.map(async (hash) => {\n        let existing: IDBValidKey | undefined\n        do {\n          existing = await this.db.getKeyFromIndex(this.storeName, IndexedDbArchivist.hashIndexName, hash)\n          if (existing) await this.db.delete(this.storeName, existing)\n        } while (!existing)\n        return hash\n      }),\n    )\n    // Return hashes removed\n    return found.filter(exists)\n  }\n\n  protected override async getHandler(hashes: string[]): Promise<Payload[]> {\n    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, IndexedDbArchivist.hashIndexName, hash)))\n    return payloads.filter(exists)\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n    const pairs = await PayloadHasher.hashPairs(payloads)\n    // Only return the payloads that were successfully inserted\n    const inserted = await Promise.all(\n      pairs.map(async ([payload, _hash]) => {\n        const tx = this.db.transaction(this.storeName, 'readwrite')\n        const store = tx.objectStore(this.storeName)\n        const existing = await store.index(IndexedDbArchivist.hashIndexName).get(_hash)\n        if (!existing) {\n          await this.db.put(this.storeName, { ...payload, _hash })\n          return payload\n        }\n      }),\n    )\n    return inserted.filter(exists)\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: We could defer this creation to first access but we\n    // want to fail fast here in case something is wrong\n    const { dbName, dbVersion, indexes, storeName } = this\n    this._db = await openDB<PayloadStore>(dbName, dbVersion, {\n      async upgrade(database) {\n        await Promise.resolve() // Async to match spec\n        // Create the store\n        const store = database.createObjectStore(storeName, {\n          // If it isn't explicitly set, create a value by auto incrementing.\n          autoIncrement: true,\n        })\n        // Name the store\n        store.name = storeName\n        // Create an index on the hash\n        const indexesToCreate = [IndexedDbArchivist.hashIndex, IndexedDbArchivist.schemaIndex, ...indexes]\n        for (const { key, multiEntry, unique } of indexesToCreate) {\n          const indexKeys = Object.keys(key)\n          const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys\n          const indexName = buildStandardIndexName({ key, unique })\n          store.createIndex(indexName, keys, { multiEntry, unique })\n        }\n      },\n    })\n    return true\n  }\n}\n","export type IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb'\nexport const IndexedDbArchivistSchema: IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb'\n","import { ArchivistConfig, IndexDescription } from '@xyo-network/archivist-model'\n\nimport { IndexedDbArchivistSchema } from './Schema'\n\nexport type IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\nexport const IndexedDbArchivistConfigSchema: IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\n\nexport type IndexedDbArchivistConfig = ArchivistConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbArchivistConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main archivist config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n"],"mappings":"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","names":["IndexedDbArchivistSchema","IndexedDbArchivistConfigSchema","IndexedDbArchivistSchema","IndexedDbArchivist","AbstractArchivist","_db","dbName","config","name","defaultDbName","dbVersion","defaultDbVersion","queries","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","storeName","defaultStoreName","db","assertEx","indexes","storage","allHandler","payloads","getAll","map","payload","PayloadHasher","jsonPayload","clearHandler","clear","deleteHandler","hashes","distinctHashes","Set","found","Promise","all","hash","existing","getKeyFromIndex","hashIndexName","delete","filter","exists","getHandler","getFromIndex","insertHandler","pairs","hashPairs","inserted","_hash","tx","transaction","store","objectStore","index","get","put","startHandler","openDB","upgrade","database","resolve","createObjectStore","autoIncrement","indexesToCreate","hashIndex","schemaIndex","key","multiEntry","unique","indexKeys","Object","keys","length","indexName","buildStandardIndexName","createIndex","configSchemas","IndexedDbArchivistConfigSchema","schema","schemaIndexName","creatableModule"]}

package/dist/node/index.js

@@ -53,13 +53,6 @@ var _IndexedDbArchivist = class _IndexedDbArchivist extends AbstractArchivist {
     var _a;
     return ((_a = this.config) == null ? void 0 : _a.dbVersion) ?? _IndexedDbArchivist.defaultDbVersion;
   }
-  /**
-  * The database indexes.
-  */
-  get indexes() {
-    var _a, _b;
-    return ((_b = (_a = this.config) == null ? void 0 : _a.storage) == null ? void 0 : _b.indexes) ?? [];
-  }
   get queries() {
     return [
       ArchivistAllQuerySchema,
@@ -80,6 +73,10 @@ var _IndexedDbArchivist = class _IndexedDbArchivist extends AbstractArchivist {
   get db() {
     return assertEx(this._db, "DB not initialized");
   }
+  get indexes() {
+    var _a, _b;
+    return ((_b = (_a = this.config) == null ? void 0 : _a.storage) == null ? void 0 : _b.indexes) ?? [];
+  }
   async allHandler() {
     const payloads = await this.db.getAll(this.storeName);
     return payloads.map((payload) => PayloadHasher.jsonPayload(payload));
@@ -94,7 +91,7 @@ var _IndexedDbArchivist = class _IndexedDbArchivist extends AbstractArchivist {
     const found = await Promise.all(distinctHashes.map(async (hash) => {
       let existing;
       do {
-        existing = await this.db.getKeyFromIndex(this.storeName, _IndexedDbArchivist.hashIndex.name, hash);
+        existing = await this.db.getKeyFromIndex(this.storeName, _IndexedDbArchivist.hashIndexName, hash);
         if (existing)
           await this.db.delete(this.storeName, existing);
       } while (!existing);
@@ -103,7 +100,7 @@ var _IndexedDbArchivist = class _IndexedDbArchivist extends AbstractArchivist {
     return found.filter(exists);
   }
   async getHandler(hashes) {
-    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, _IndexedDbArchivist.hashIndex.name, hash)));
+    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, _IndexedDbArchivist.hashIndexName, hash)));
     return payloads.filter(exists);
   }
   async insertHandler(payloads) {
@@ -111,7 +108,7 @@ var _IndexedDbArchivist = class _IndexedDbArchivist extends AbstractArchivist {
     const inserted = await Promise.all(pairs.map(async ([payload, _hash]) => {
       const tx = this.db.transaction(this.storeName, "readwrite");
       const store = tx.objectStore(this.storeName);
-      const existing = await store.index(_IndexedDbArchivist.hashIndex.name).get(_hash);
+      const existing = await store.index(_IndexedDbArchivist.hashIndexName).get(_hash);
       if (!existing) {
         await this.db.put(this.storeName, {
           ...payload,
@@ -124,7 +121,7 @@ var _IndexedDbArchivist = class _IndexedDbArchivist extends AbstractArchivist {
   }
   async startHandler() {
     await super.startHandler();
-    const { indexes, storeName, dbName, dbVersion } = this;
+    const { dbName, dbVersion, indexes, storeName } = this;
     this._db = await openDB(dbName, dbVersion, {
       async upgrade(database) {
         await Promise.resolve();
@@ -134,15 +131,14 @@ var _IndexedDbArchivist = class _IndexedDbArchivist extends AbstractArchivist {
         });
         store.name = storeName;
         const indexesToCreate = [
-          ...indexes,
           _IndexedDbArchivist.hashIndex,
-          _IndexedDbArchivist.payloadSchemasIndex,
-          _IndexedDbArchivist.schemaIndex
+          _IndexedDbArchivist.schemaIndex,
+          ...indexes
         ];
-        for (const { key, multiEntry, name, unique } of indexesToCreate) {
+        for (const { key, multiEntry, unique } of indexesToCreate) {
           const indexKeys = Object.keys(key);
           const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys;
-          const indexName = name ?? buildStandardIndexName({
+          const indexName = buildStandardIndexName({
             key,
             unique
           });
@@ -168,25 +164,19 @@ __publicField(_IndexedDbArchivist, "hashIndex", {
     _hash: 1
   },
   multiEntry: false,
-  name: "IX-_hash",
   unique: true
 });
-__publicField(_IndexedDbArchivist, "payloadSchemasIndex", {
-  key: {
-    payload_schemas: 1
-  },
-  multiEntry: false,
-  name: "IX-payload_schemas",
-  unique: false
-});
 __publicField(_IndexedDbArchivist, "schemaIndex", {
   key: {
     schema: 1
   },
   multiEntry: false,
-  name: "IX-schema",
   unique: false
 });
+// eslint-disable-next-line @typescript-eslint/member-ordering
+__publicField(_IndexedDbArchivist, "hashIndexName", buildStandardIndexName(_IndexedDbArchivist.hashIndex));
+// eslint-disable-next-line @typescript-eslint/member-ordering
+__publicField(_IndexedDbArchivist, "schemaIndexName", buildStandardIndexName(_IndexedDbArchivist.schemaIndex));
 var IndexedDbArchivist = _IndexedDbArchivist;
 IndexedDbArchivist = _ts_decorate([
   creatableModule()

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Archivist.ts","../../src/Schema.ts","../../src/Config.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuerySchema,\n  ArchivistModuleEventData,\n  buildStandardIndexName,\n  IndexDescription,\n} from '@xyo-network/archivist-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { creatableModule } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { IDBPDatabase, openDB } from 'idb'\n\nimport { IndexedDbArchivistConfigSchema } from './Config'\nimport { IndexedDbArchivistParams } from './Params'\n\nexport interface PayloadStore {\n  [s: string]: Payload\n}\n\n@creatableModule()\nexport class IndexedDbArchivist<\n  TParams extends IndexedDbArchivistParams = IndexedDbArchivistParams,\n  TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n> extends AbstractArchivist<TParams, TEventData> {\n  static override configSchemas = [IndexedDbArchivistConfigSchema]\n  static readonly defaultDbName = 'archivist'\n  static readonly defaultDbVersion = 1\n  static readonly defaultStoreName = 'payloads'\n  static readonly hashIndex: Required<IndexDescription> = { key: { _hash: 1 }, multiEntry: false, name: 'IX-_hash', unique: true }\n  static readonly payloadSchemasIndex: Required<IndexDescription> = {\n    key: { payload_schemas: 1 },\n    multiEntry: false,\n    name: 'IX-payload_schemas',\n    unique: false,\n  }\n  static readonly schemaIndex: Required<IndexDescription> = { key: { schema: 1 }, multiEntry: false, name: 'IX-schema', unique: false }\n\n  private _db: IDBPDatabase<PayloadStore> | undefined\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the module name (not guaranteed to be unique) and if module\n   * name is not supplied, it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.name ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  /**\n   * The database indexes.\n   */\n  get indexes() {\n    return this.config?.storage?.indexes ?? []\n  }\n\n  override get queries() {\n    return [ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, ...super.queries]\n  }\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  private get db(): IDBPDatabase<PayloadStore> {\n    return assertEx(this._db, 'DB not initialized')\n  }\n\n  protected override async allHandler(): Promise<Payload[]> {\n    // Get all payloads from the store\n    const payloads = await this.db.getAll(this.storeName)\n    // Remove any metadata before returning to the client\n    return payloads.map((payload) => PayloadHasher.jsonPayload(payload))\n  }\n\n  protected override async clearHandler(): Promise<void> {\n    await this.db.clear(this.storeName)\n  }\n\n  protected override async deleteHandler(hashes: string[]): Promise<string[]> {\n    const distinctHashes = [...new Set(hashes)]\n    const found = await Promise.all(\n      distinctHashes.map(async (hash) => {\n        let existing: IDBValidKey | undefined\n        do {\n          existing = await this.db.getKeyFromIndex(this.storeName, IndexedDbArchivist.hashIndex.name, hash)\n          if (existing) await this.db.delete(this.storeName, existing)\n        } while (!existing)\n        return hash\n      }),\n    )\n    // Return hashes removed\n    return found.filter(exists)\n  }\n\n  protected override async getHandler(hashes: string[]): Promise<Payload[]> {\n    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, IndexedDbArchivist.hashIndex.name, hash)))\n    return payloads.filter(exists)\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n    const pairs = await PayloadHasher.hashPairs(payloads)\n    // Only return the payloads that were successfully inserted\n    const inserted = await Promise.all(\n      pairs.map(async ([payload, _hash]) => {\n        const tx = this.db.transaction(this.storeName, 'readwrite')\n        const store = tx.objectStore(this.storeName)\n        const existing = await store.index(IndexedDbArchivist.hashIndex.name).get(_hash)\n        if (!existing) {\n          await this.db.put(this.storeName, { ...payload, _hash })\n          return payload\n        }\n      }),\n    )\n    return inserted.filter(exists)\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: We could defer this creation to first access but we\n    // want to fail fast here in case something is wrong\n    const { indexes, storeName, dbName, dbVersion } = this\n    this._db = await openDB<PayloadStore>(dbName, dbVersion, {\n      async upgrade(database) {\n        await Promise.resolve() // Async to match spec\n        // Create the store\n        const store = database.createObjectStore(storeName, {\n          // If it isn't explicitly set, create a value by auto incrementing.\n          autoIncrement: true,\n        })\n        // Name the store\n        store.name = storeName\n        // Create an index on the hash\n        const indexesToCreate = [...indexes, IndexedDbArchivist.hashIndex, IndexedDbArchivist.payloadSchemasIndex, IndexedDbArchivist.schemaIndex]\n        for (const { key, multiEntry, name, unique } of indexesToCreate) {\n          const indexKeys = Object.keys(key)\n          const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys\n          const indexName = name ?? buildStandardIndexName({ key, unique })\n          store.createIndex(indexName, keys, { multiEntry, unique })\n        }\n      },\n    })\n\n    return true\n  }\n}\n","export type IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb'\nexport const IndexedDbArchivistSchema: IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb'\n","import { ArchivistConfig, IndexDescription } from '@xyo-network/archivist-model'\n\nimport { IndexedDbArchivistSchema } from './Schema'\n\nexport type IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\nexport const IndexedDbArchivistConfigSchema: IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\n\nexport type IndexedDbArchivistConfig = ArchivistConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbArchivistConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main archivist config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n"],"mappings":"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","names":["assertEx","exists","AbstractArchivist","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","buildStandardIndexName","PayloadHasher","creatableModule","openDB","IndexedDbArchivistSchema","IndexedDbArchivistConfigSchema","IndexedDbArchivistSchema","IndexedDbArchivist","AbstractArchivist","_db","dbName","config","name","defaultDbName","dbVersion","defaultDbVersion","indexes","storage","queries","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","storeName","defaultStoreName","db","assertEx","allHandler","payloads","getAll","map","payload","PayloadHasher","jsonPayload","clearHandler","clear","deleteHandler","hashes","distinctHashes","Set","found","Promise","all","hash","existing","getKeyFromIndex","hashIndex","delete","filter","exists","getHandler","getFromIndex","insertHandler","pairs","hashPairs","inserted","_hash","tx","transaction","store","objectStore","index","get","put","startHandler","openDB","upgrade","database","resolve","createObjectStore","autoIncrement","indexesToCreate","payloadSchemasIndex","schemaIndex","key","multiEntry","unique","indexKeys","Object","keys","length","indexName","buildStandardIndexName","createIndex","configSchemas","IndexedDbArchivistConfigSchema","payload_schemas","schema","creatableModule"]}
+{"version":3,"sources":["../../src/Archivist.ts","../../src/Schema.ts","../../src/Config.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuerySchema,\n  ArchivistModuleEventData,\n  buildStandardIndexName,\n  IndexDescription,\n} from '@xyo-network/archivist-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { creatableModule } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { IDBPDatabase, openDB } from 'idb'\n\nimport { IndexedDbArchivistConfigSchema } from './Config'\nimport { IndexedDbArchivistParams } from './Params'\n\nexport interface PayloadStore {\n  [s: string]: Payload\n}\n\n@creatableModule()\nexport class IndexedDbArchivist<\n  TParams extends IndexedDbArchivistParams = IndexedDbArchivistParams,\n  TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n> extends AbstractArchivist<TParams, TEventData> {\n  static override configSchemas = [IndexedDbArchivistConfigSchema]\n  static readonly defaultDbName = 'archivist'\n  static readonly defaultDbVersion = 1\n  static readonly defaultStoreName = 'payloads'\n  private static readonly hashIndex: IndexDescription = { key: { _hash: 1 }, multiEntry: false, unique: true }\n  private static readonly schemaIndex: IndexDescription = { key: { schema: 1 }, multiEntry: false, unique: false }\n  // eslint-disable-next-line @typescript-eslint/member-ordering\n  static readonly hashIndexName = buildStandardIndexName(IndexedDbArchivist.hashIndex)\n  // eslint-disable-next-line @typescript-eslint/member-ordering\n  static readonly schemaIndexName = buildStandardIndexName(IndexedDbArchivist.schemaIndex)\n\n  private _db: IDBPDatabase<PayloadStore> | undefined\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the module name (not guaranteed to be unique) and if module\n   * name is not supplied, it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.name ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  override get queries() {\n    return [ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, ...super.queries]\n  }\n\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  private get db(): IDBPDatabase<PayloadStore> {\n    return assertEx(this._db, 'DB not initialized')\n  }\n\n  private get indexes() {\n    return this.config?.storage?.indexes ?? []\n  }\n\n  protected override async allHandler(): Promise<Payload[]> {\n    // Get all payloads from the store\n    const payloads = await this.db.getAll(this.storeName)\n    // Remove any metadata before returning to the client\n    return payloads.map((payload) => PayloadHasher.jsonPayload(payload))\n  }\n\n  protected override async clearHandler(): Promise<void> {\n    await this.db.clear(this.storeName)\n  }\n\n  protected override async deleteHandler(hashes: string[]): Promise<string[]> {\n    const distinctHashes = [...new Set(hashes)]\n    const found = await Promise.all(\n      distinctHashes.map(async (hash) => {\n        let existing: IDBValidKey | undefined\n        do {\n          existing = await this.db.getKeyFromIndex(this.storeName, IndexedDbArchivist.hashIndexName, hash)\n          if (existing) await this.db.delete(this.storeName, existing)\n        } while (!existing)\n        return hash\n      }),\n    )\n    // Return hashes removed\n    return found.filter(exists)\n  }\n\n  protected override async getHandler(hashes: string[]): Promise<Payload[]> {\n    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, IndexedDbArchivist.hashIndexName, hash)))\n    return payloads.filter(exists)\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<Payload[]> {\n    const pairs = await PayloadHasher.hashPairs(payloads)\n    // Only return the payloads that were successfully inserted\n    const inserted = await Promise.all(\n      pairs.map(async ([payload, _hash]) => {\n        const tx = this.db.transaction(this.storeName, 'readwrite')\n        const store = tx.objectStore(this.storeName)\n        const existing = await store.index(IndexedDbArchivist.hashIndexName).get(_hash)\n        if (!existing) {\n          await this.db.put(this.storeName, { ...payload, _hash })\n          return payload\n        }\n      }),\n    )\n    return inserted.filter(exists)\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: We could defer this creation to first access but we\n    // want to fail fast here in case something is wrong\n    const { dbName, dbVersion, indexes, storeName } = this\n    this._db = await openDB<PayloadStore>(dbName, dbVersion, {\n      async upgrade(database) {\n        await Promise.resolve() // Async to match spec\n        // Create the store\n        const store = database.createObjectStore(storeName, {\n          // If it isn't explicitly set, create a value by auto incrementing.\n          autoIncrement: true,\n        })\n        // Name the store\n        store.name = storeName\n        // Create an index on the hash\n        const indexesToCreate = [IndexedDbArchivist.hashIndex, IndexedDbArchivist.schemaIndex, ...indexes]\n        for (const { key, multiEntry, unique } of indexesToCreate) {\n          const indexKeys = Object.keys(key)\n          const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys\n          const indexName = buildStandardIndexName({ key, unique })\n          store.createIndex(indexName, keys, { multiEntry, unique })\n        }\n      },\n    })\n    return true\n  }\n}\n","export type IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb'\nexport const IndexedDbArchivistSchema: IndexedDbArchivistSchema = 'network.xyo.archivist.indexeddb'\n","import { ArchivistConfig, IndexDescription } from '@xyo-network/archivist-model'\n\nimport { IndexedDbArchivistSchema } from './Schema'\n\nexport type IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\nexport const IndexedDbArchivistConfigSchema: IndexedDbArchivistConfigSchema = `${IndexedDbArchivistSchema}.config`\n\nexport type IndexedDbArchivistConfig = ArchivistConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbArchivistConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main archivist config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n"],"mappings":"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","names":["assertEx","exists","AbstractArchivist","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","buildStandardIndexName","PayloadHasher","creatableModule","openDB","IndexedDbArchivistSchema","IndexedDbArchivistConfigSchema","IndexedDbArchivistSchema","IndexedDbArchivist","AbstractArchivist","_db","dbName","config","name","defaultDbName","dbVersion","defaultDbVersion","queries","ArchivistAllQuerySchema","ArchivistClearQuerySchema","ArchivistDeleteQuerySchema","ArchivistInsertQuerySchema","storeName","defaultStoreName","db","assertEx","indexes","storage","allHandler","payloads","getAll","map","payload","PayloadHasher","jsonPayload","clearHandler","clear","deleteHandler","hashes","distinctHashes","Set","found","Promise","all","hash","existing","getKeyFromIndex","hashIndexName","delete","filter","exists","getHandler","getFromIndex","insertHandler","pairs","hashPairs","inserted","_hash","tx","transaction","store","objectStore","index","get","put","startHandler","openDB","upgrade","database","resolve","createObjectStore","autoIncrement","indexesToCreate","hashIndex","schemaIndex","key","multiEntry","unique","indexKeys","Object","keys","length","indexName","buildStandardIndexName","createIndex","configSchemas","IndexedDbArchivistConfigSchema","schema","schemaIndexName","creatableModule"]}

package/package.json

@@ -12,19 +12,19 @@
   "dependencies": {
     "@xylabs/assert": "^2.13.23",
     "@xylabs/exists": "^2.13.23",
-    "@xyo-network/archivist-abstract": "~2.87.0-rc.2",
-    "@xyo-network/archivist-model": "~2.87.0-rc.2",
-    "@xyo-network/hash": "~2.87.0-rc.2",
-    "@xyo-network/module-model": "~2.87.0-rc.2",
-    "@xyo-network/payload-model": "~2.87.0-rc.2",
+    "@xyo-network/archivist-abstract": "~2.87.0-rc.3",
+    "@xyo-network/archivist-model": "~2.87.0-rc.3",
+    "@xyo-network/hash": "~2.87.0-rc.3",
+    "@xyo-network/module-model": "~2.87.0-rc.3",
+    "@xyo-network/payload-model": "~2.87.0-rc.3",
     "idb": "^8.0.0"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^3.2.33",
     "@xylabs/tsconfig": "^3.2.33",
-    "@xyo-network/account": "~2.87.0-rc.2",
-    "@xyo-network/id-payload-plugin": "~2.87.0-rc.2",
-    "@xyo-network/payload-wrapper": "~2.87.0-rc.2",
+    "@xyo-network/account": "~2.87.0-rc.3",
+    "@xyo-network/id-payload-plugin": "~2.87.0-rc.3",
+    "@xyo-network/payload-wrapper": "~2.87.0-rc.3",
     "fake-indexeddb": "^5.0.2",
     "typescript": "^5.3.3"
   },
@@ -67,7 +67,7 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.87.0-rc.2",
+  "version": "2.87.0-rc.3",
   "type": "module",
   "stableVersion": "2.86.1"
 }

package/src/Archivist.ts

@@ -31,14 +31,12 @@ export class IndexedDbArchivist<
   static readonly defaultDbName = 'archivist'
   static readonly defaultDbVersion = 1
   static readonly defaultStoreName = 'payloads'
-  static readonly hashIndex: Required<IndexDescription> = { key: { _hash: 1 }, multiEntry: false, name: 'IX-_hash', unique: true }
-  static readonly payloadSchemasIndex: Required<IndexDescription> = {
-    key: { payload_schemas: 1 },
-    multiEntry: false,
-    name: 'IX-payload_schemas',
-    unique: false,
-  }
-  static readonly schemaIndex: Required<IndexDescription> = { key: { schema: 1 }, multiEntry: false, name: 'IX-schema', unique: false }
+  private static readonly hashIndex: IndexDescription = { key: { _hash: 1 }, multiEntry: false, unique: true }
+  private static readonly schemaIndex: IndexDescription = { key: { schema: 1 }, multiEntry: false, unique: false }
+  // eslint-disable-next-line @typescript-eslint/member-ordering
+  static readonly hashIndexName = buildStandardIndexName(IndexedDbArchivist.hashIndex)
+  // eslint-disable-next-line @typescript-eslint/member-ordering
+  static readonly schemaIndexName = buildStandardIndexName(IndexedDbArchivist.schemaIndex)
 
   private _db: IDBPDatabase<PayloadStore> | undefined
 
@@ -60,16 +58,10 @@ export class IndexedDbArchivist<
     return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion
   }
 
-  /**
-   * The database indexes.
-   */
-  get indexes() {
-    return this.config?.storage?.indexes ?? []
-  }
-
   override get queries() {
     return [ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, ...super.queries]
   }
+
   /**
    * The name of the object store. If not supplied via config, it defaults
    * to `payloads`.
@@ -82,6 +74,10 @@ export class IndexedDbArchivist<
     return assertEx(this._db, 'DB not initialized')
   }
 
+  private get indexes() {
+    return this.config?.storage?.indexes ?? []
+  }
+
   protected override async allHandler(): Promise<Payload[]> {
     // Get all payloads from the store
     const payloads = await this.db.getAll(this.storeName)
@@ -99,7 +95,7 @@ export class IndexedDbArchivist<
       distinctHashes.map(async (hash) => {
         let existing: IDBValidKey | undefined
         do {
-          existing = await this.db.getKeyFromIndex(this.storeName, IndexedDbArchivist.hashIndex.name, hash)
+          existing = await this.db.getKeyFromIndex(this.storeName, IndexedDbArchivist.hashIndexName, hash)
           if (existing) await this.db.delete(this.storeName, existing)
         } while (!existing)
         return hash
@@ -110,7 +106,7 @@ export class IndexedDbArchivist<
   }
 
   protected override async getHandler(hashes: string[]): Promise<Payload[]> {
-    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, IndexedDbArchivist.hashIndex.name, hash)))
+    const payloads = await Promise.all(hashes.map((hash) => this.db.getFromIndex(this.storeName, IndexedDbArchivist.hashIndexName, hash)))
     return payloads.filter(exists)
   }
 
@@ -121,7 +117,7 @@ export class IndexedDbArchivist<
       pairs.map(async ([payload, _hash]) => {
         const tx = this.db.transaction(this.storeName, 'readwrite')
         const store = tx.objectStore(this.storeName)
-        const existing = await store.index(IndexedDbArchivist.hashIndex.name).get(_hash)
+        const existing = await store.index(IndexedDbArchivist.hashIndexName).get(_hash)
         if (!existing) {
           await this.db.put(this.storeName, { ...payload, _hash })
           return payload
@@ -135,7 +131,7 @@ export class IndexedDbArchivist<
     await super.startHandler()
     // NOTE: We could defer this creation to first access but we
     // want to fail fast here in case something is wrong
-    const { indexes, storeName, dbName, dbVersion } = this
+    const { dbName, dbVersion, indexes, storeName } = this
     this._db = await openDB<PayloadStore>(dbName, dbVersion, {
       async upgrade(database) {
         await Promise.resolve() // Async to match spec
@@ -147,16 +143,15 @@ export class IndexedDbArchivist<
         // Name the store
         store.name = storeName
         // Create an index on the hash
-        const indexesToCreate = [...indexes, IndexedDbArchivist.hashIndex, IndexedDbArchivist.payloadSchemasIndex, IndexedDbArchivist.schemaIndex]
-        for (const { key, multiEntry, name, unique } of indexesToCreate) {
+        const indexesToCreate = [IndexedDbArchivist.hashIndex, IndexedDbArchivist.schemaIndex, ...indexes]
+        for (const { key, multiEntry, unique } of indexesToCreate) {
           const indexKeys = Object.keys(key)
           const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys
-          const indexName = name ?? buildStandardIndexName({ key, unique })
+          const indexName = buildStandardIndexName({ key, unique })
           store.createIndex(indexName, keys, { multiEntry, unique })
         }
       },
     })
-
     return true
   }
 }