@graffiti-garden/implementation-local 0.5.1 → 0.6.1

package/dist/cjs/utilities.js

@@ -21,15 +21,14 @@ __export(utilities_exports, {
   applyGraffitiPatch: () => applyGraffitiPatch,
   compileGraffitiObjectSchema: () => compileGraffitiObjectSchema,
   isActorAllowedGraffitiObject: () => isActorAllowedGraffitiObject,
-  isObjectNewer: () => isObjectNewer,
   maskGraffitiObject: () => maskGraffitiObject,
   randomBase64: () => randomBase64,
-  unpackLocationOrUri: () => unpackLocationOrUri
+  unpackObjectUrl: () => unpackObjectUrl
 });
 module.exports = __toCommonJS(utilities_exports);
 var import_api = require("@graffiti-garden/api");
-function unpackLocationOrUri(locationOrUri) {
-  return typeof locationOrUri === "string" ? locationOrUri : locationOrUri.url;
+function unpackObjectUrl(url) {
+  return typeof url === "string" ? url : url.url;
 }
 function randomBase64(numBytes = 24) {
   const bytes = new Uint8Array(numBytes);
@@ -37,9 +36,6 @@ function randomBase64(numBytes = 24) {
   const base64 = btoa(String.fromCodePoint(...bytes));
   return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/\=+$/, "");
 }
-function isObjectNewer(left, right) {
-  return left.lastModified > right.lastModified || left.lastModified === right.lastModified && !left.tombstone && right.tombstone;
-}
 function applyGraffitiPatch(apply, prop, patch, object) {
   const ops = patch[prop];
   if (!ops || !ops.length) return;

package/dist/cjs/utilities.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utilities.ts"],
-  "sourcesContent": ["import {\n  GraffitiErrorInvalidSchema,\n  GraffitiErrorInvalidUri,\n  GraffitiErrorPatchError,\n  GraffitiErrorPatchTestFailed,\n} from \"@graffiti-garden/api\";\nimport type {\n  GraffitiObject,\n  GraffitiObjectBase,\n  GraffitiPatch,\n  JSONSchema,\n  GraffitiSession,\n  GraffitiObjectUrl,\n} from \"@graffiti-garden/api\";\nimport type { Ajv } from \"ajv\";\nimport type { applyPatch } from \"fast-json-patch\";\n\nexport function unpackLocationOrUri(locationOrUri: GraffitiObjectUrl | string) {\n  return typeof locationOrUri === \"string\" ? locationOrUri : locationOrUri.url;\n}\n\nexport function randomBase64(numBytes: number = 24) {\n  const bytes = new Uint8Array(numBytes);\n  crypto.getRandomValues(bytes);\n  // Convert it to base64\n  const base64 = btoa(String.fromCodePoint(...bytes));\n  // Make sure it is url safe\n  return base64.replace(/\\+/g, \"-\").replace(/\\//g, \"_\").replace(/\\=+$/, \"\");\n}\n\nexport function isObjectNewer(\n  left: GraffitiObjectBase,\n  right: GraffitiObjectBase,\n) {\n  return (\n    left.lastModified > right.lastModified ||\n    (left.lastModified === right.lastModified &&\n      !left.tombstone &&\n      right.tombstone)\n  );\n}\n\nexport function applyGraffitiPatch<Prop extends keyof GraffitiPatch>(\n  apply: typeof applyPatch,\n  prop: Prop,\n  patch: GraffitiPatch,\n  object: GraffitiObjectBase,\n): void {\n  const ops = patch[prop];\n  if (!ops || !ops.length) return;\n  try {\n    object[prop] = apply(object[prop], ops, true, false).newDocument;\n  } catch (e) {\n    if (\n      typeof e === \"object\" &&\n      e &&\n      \"name\" in e &&\n      typeof e.name === \"string\" &&\n      \"message\" in e &&\n      typeof e.message === \"string\"\n    ) {\n      if (e.name === \"TEST_OPERATION_FAILED\") {\n        throw new GraffitiErrorPatchTestFailed(e.message);\n      } else {\n        throw new GraffitiErrorPatchError(e.name + \": \" + e.message);\n      }\n    } else {\n      throw e;\n    }\n  }\n}\n\nexport function compileGraffitiObjectSchema<Schema extends JSONSchema>(\n  ajv: Ajv,\n  schema: Schema,\n) {\n  try {\n    // Force the validation guard because\n    // it is too big for the type checker.\n    // Fortunately json-schema-to-ts is\n    // well tested against ajv.\n    return ajv.compile(schema) as (\n      data: GraffitiObjectBase,\n    ) => data is GraffitiObject<Schema>;\n  } catch (error) {\n    throw new GraffitiErrorInvalidSchema(\n      error instanceof Error ? error.message : undefined,\n    );\n  }\n}\n\nexport function maskGraffitiObject(\n  object: GraffitiObjectBase,\n  channels: string[],\n  session?: GraffitiSession | null,\n): void {\n  if (object.actor !== session?.actor) {\n    object.allowed = object.allowed && session ? [session.actor] : undefined;\n    object.channels = object.channels.filter((channel) =>\n      channels.includes(channel),\n    );\n  }\n}\nexport function isActorAllowedGraffitiObject(\n  object: GraffitiObjectBase,\n  session?: GraffitiSession | null,\n) {\n  return (\n    object.allowed === undefined ||\n    object.allowed === null ||\n    (!!session?.actor &&\n      (object.actor === session.actor ||\n        object.allowed.includes(session.actor)))\n  );\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAKO;AAYA,SAAS,oBAAoB,eAA2C;AAC7E,SAAO,OAAO,kBAAkB,WAAW,gBAAgB,cAAc;AAC3E;AAEO,SAAS,aAAa,WAAmB,IAAI;AAClD,QAAM,QAAQ,IAAI,WAAW,QAAQ;AACrC,SAAO,gBAAgB,KAAK;AAE5B,QAAM,SAAS,KAAK,OAAO,cAAc,GAAG,KAAK,CAAC;AAElD,SAAO,OAAO,QAAQ,OAAO,GAAG,EAAE,QAAQ,OAAO,GAAG,EAAE,QAAQ,QAAQ,EAAE;AAC1E;AAEO,SAAS,cACd,MACA,OACA;AACA,SACE,KAAK,eAAe,MAAM,gBACzB,KAAK,iBAAiB,MAAM,gBAC3B,CAAC,KAAK,aACN,MAAM;AAEZ;AAEO,SAAS,mBACd,OACA,MACA,OACA,QACM;AACN,QAAM,MAAM,MAAM,IAAI;AACtB,MAAI,CAAC,OAAO,CAAC,IAAI,OAAQ;AACzB,MAAI;AACF,WAAO,IAAI,IAAI,MAAM,OAAO,IAAI,GAAG,KAAK,MAAM,KAAK,EAAE;AAAA,EACvD,SAAS,GAAG;AACV,QACE,OAAO,MAAM,YACb,KACA,UAAU,KACV,OAAO,EAAE,SAAS,YAClB,aAAa,KACb,OAAO,EAAE,YAAY,UACrB;AACA,UAAI,EAAE,SAAS,yBAAyB;AACtC,cAAM,IAAI,wCAA6B,EAAE,OAAO;AAAA,MAClD,OAAO;AACL,cAAM,IAAI,mCAAwB,EAAE,OAAO,OAAO,EAAE,OAAO;AAAA,MAC7D;AAAA,IACF,OAAO;AACL,YAAM;AAAA,IACR;AAAA,EACF;AACF;AAEO,SAAS,4BACd,KACA,QACA;AACA,MAAI;AAKF,WAAO,IAAI,QAAQ,MAAM;AAAA,EAG3B,SAAS,OAAO;AACd,UAAM,IAAI;AAAA,MACR,iBAAiB,QAAQ,MAAM,UAAU;AAAA,IAC3C;AAAA,EACF;AACF;AAEO,SAAS,mBACd,QACA,UACA,SACM;AACN,MAAI,OAAO,UAAU,SAAS,OAAO;AACnC,WAAO,UAAU,OAAO,WAAW,UAAU,CAAC,QAAQ,KAAK,IAAI;AAC/D,WAAO,WAAW,OAAO,SAAS;AAAA,MAAO,CAAC,YACxC,SAAS,SAAS,OAAO;AAAA,IAC3B;AAAA,EACF;AACF;AACO,SAAS,6BACd,QACA,SACA;AACA,SACE,OAAO,YAAY,UACnB,OAAO,YAAY,QAClB,CAAC,CAAC,SAAS,UACT,OAAO,UAAU,QAAQ,SACxB,OAAO,QAAQ,SAAS,QAAQ,KAAK;AAE7C;",
+  "sourcesContent": ["import {\n  GraffitiErrorInvalidSchema,\n  GraffitiErrorInvalidUri,\n  GraffitiErrorPatchError,\n  GraffitiErrorPatchTestFailed,\n} from \"@graffiti-garden/api\";\nimport type {\n  GraffitiObject,\n  GraffitiObjectBase,\n  GraffitiPatch,\n  JSONSchema,\n  GraffitiSession,\n  GraffitiObjectUrl,\n} from \"@graffiti-garden/api\";\nimport type { Ajv } from \"ajv\";\nimport type { applyPatch } from \"fast-json-patch\";\n\nexport function unpackObjectUrl(url: string | GraffitiObjectUrl) {\n  return typeof url === \"string\" ? url : url.url;\n}\n\nexport function randomBase64(numBytes: number = 24) {\n  const bytes = new Uint8Array(numBytes);\n  crypto.getRandomValues(bytes);\n  // Convert it to base64\n  const base64 = btoa(String.fromCodePoint(...bytes));\n  // Make sure it is url safe\n  return base64.replace(/\\+/g, \"-\").replace(/\\//g, \"_\").replace(/\\=+$/, \"\");\n}\n\nexport function applyGraffitiPatch<Prop extends keyof GraffitiPatch>(\n  apply: typeof applyPatch,\n  prop: Prop,\n  patch: GraffitiPatch,\n  object: GraffitiObjectBase,\n): void {\n  const ops = patch[prop];\n  if (!ops || !ops.length) return;\n  try {\n    object[prop] = apply(object[prop], ops, true, false).newDocument;\n  } catch (e) {\n    if (\n      typeof e === \"object\" &&\n      e &&\n      \"name\" in e &&\n      typeof e.name === \"string\" &&\n      \"message\" in e &&\n      typeof e.message === \"string\"\n    ) {\n      if (e.name === \"TEST_OPERATION_FAILED\") {\n        throw new GraffitiErrorPatchTestFailed(e.message);\n      } else {\n        throw new GraffitiErrorPatchError(e.name + \": \" + e.message);\n      }\n    } else {\n      throw e;\n    }\n  }\n}\n\nexport function compileGraffitiObjectSchema<Schema extends JSONSchema>(\n  ajv: Ajv,\n  schema: Schema,\n) {\n  try {\n    // Force the validation guard because\n    // it is too big for the type checker.\n    // Fortunately json-schema-to-ts is\n    // well tested against ajv.\n    return ajv.compile(schema) as (\n      data: GraffitiObjectBase,\n    ) => data is GraffitiObject<Schema>;\n  } catch (error) {\n    throw new GraffitiErrorInvalidSchema(\n      error instanceof Error ? error.message : undefined,\n    );\n  }\n}\n\nexport function maskGraffitiObject(\n  object: GraffitiObjectBase,\n  channels: string[],\n  session?: GraffitiSession | null,\n): void {\n  if (object.actor !== session?.actor) {\n    object.allowed = object.allowed && session ? [session.actor] : undefined;\n    object.channels = object.channels.filter((channel) =>\n      channels.includes(channel),\n    );\n  }\n}\nexport function isActorAllowedGraffitiObject(\n  object: GraffitiObjectBase,\n  session?: GraffitiSession | null,\n) {\n  return (\n    object.allowed === undefined ||\n    object.allowed === null ||\n    (!!session?.actor &&\n      (object.actor === session.actor ||\n        object.allowed.includes(session.actor)))\n  );\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAKO;AAYA,SAAS,gBAAgB,KAAiC;AAC/D,SAAO,OAAO,QAAQ,WAAW,MAAM,IAAI;AAC7C;AAEO,SAAS,aAAa,WAAmB,IAAI;AAClD,QAAM,QAAQ,IAAI,WAAW,QAAQ;AACrC,SAAO,gBAAgB,KAAK;AAE5B,QAAM,SAAS,KAAK,OAAO,cAAc,GAAG,KAAK,CAAC;AAElD,SAAO,OAAO,QAAQ,OAAO,GAAG,EAAE,QAAQ,OAAO,GAAG,EAAE,QAAQ,QAAQ,EAAE;AAC1E;AAEO,SAAS,mBACd,OACA,MACA,OACA,QACM;AACN,QAAM,MAAM,MAAM,IAAI;AACtB,MAAI,CAAC,OAAO,CAAC,IAAI,OAAQ;AACzB,MAAI;AACF,WAAO,IAAI,IAAI,MAAM,OAAO,IAAI,GAAG,KAAK,MAAM,KAAK,EAAE;AAAA,EACvD,SAAS,GAAG;AACV,QACE,OAAO,MAAM,YACb,KACA,UAAU,KACV,OAAO,EAAE,SAAS,YAClB,aAAa,KACb,OAAO,EAAE,YAAY,UACrB;AACA,UAAI,EAAE,SAAS,yBAAyB;AACtC,cAAM,IAAI,wCAA6B,EAAE,OAAO;AAAA,MAClD,OAAO;AACL,cAAM,IAAI,mCAAwB,EAAE,OAAO,OAAO,EAAE,OAAO;AAAA,MAC7D;AAAA,IACF,OAAO;AACL,YAAM;AAAA,IACR;AAAA,EACF;AACF;AAEO,SAAS,4BACd,KACA,QACA;AACA,MAAI;AAKF,WAAO,IAAI,QAAQ,MAAM;AAAA,EAG3B,SAAS,OAAO;AACd,UAAM,IAAI;AAAA,MACR,iBAAiB,QAAQ,MAAM,UAAU;AAAA,IAC3C;AAAA,EACF;AACF;AAEO,SAAS,mBACd,QACA,UACA,SACM;AACN,MAAI,OAAO,UAAU,SAAS,OAAO;AACnC,WAAO,UAAU,OAAO,WAAW,UAAU,CAAC,QAAQ,KAAK,IAAI;AAC/D,WAAO,WAAW,OAAO,SAAS;AAAA,MAAO,CAAC,YACxC,SAAS,SAAS,OAAO;AAAA,IAC3B;AAAA,EACF;AACF;AACO,SAAS,6BACd,QACA,SACA;AACA,SACE,OAAO,YAAY,UACnB,OAAO,YAAY,QAClB,CAAC,CAAC,SAAS,UACT,OAAO,UAAU,QAAQ,SACxB,OAAO,QAAQ,SAAS,QAAQ,KAAK;AAE7C;",
   "names": []
 }

package/dist/database.d.ts

@@ -1,4 +1,5 @@
-import type { Graffiti, GraffitiObjectBase, GraffitiObjectUrl, JSONSchema, GraffitiSession } from "@graffiti-garden/api";
+import type { Graffiti, GraffitiObjectBase, GraffitiObjectUrl, JSONSchema, GraffitiSession, GraffitiObjectStreamContinue, GraffitiObjectStreamContinueEntry } from "@graffiti-garden/api";
+import { compileGraffitiObjectSchema } from "./utilities.js";
 import type Ajv from "ajv";
 import type { applyPatch } from "fast-json-patch";
 /**
@@ -15,18 +16,18 @@ export interface GraffitiLocalOptions {
     pouchDBOptions?: PouchDB.Configuration.DatabaseConfiguration;
     /**
      * Includes the scheme and other information (possibly domain name)
-     * to prefix prefixes all URIs put in the system. Defaults to `graffiti:local`.
+     * to prefix prefixes all URLs put in the system. Defaults to `graffiti:local`.
      */
     origin?: string;
     /**
-     * Whether to allow putting objects at arbtirary URIs, i.e.
-     * URIs that are *not* prefixed with the origin or not generated
+     * Whether to allow putting objects at arbtirary URLs, i.e.
+     * URLs that are *not* prefixed with the origin or not generated
      * by the system. Defaults to `false`.
      *
      * Allows this implementation to be used as a client-side cache
      * for remote sources.
      */
-    allowSettingArbitraryUris?: boolean;
+    allowSettingArbitraryUrls?: boolean;
     /**
      * Whether to allow the user to set the lastModified field
      * when putting objects. Defaults to `false`.
@@ -35,34 +36,34 @@ export interface GraffitiLocalOptions {
      * for remote sources.
      */
     allowSettinngLastModified?: boolean;
-    /**
-     * The time in milliseconds to keep tombstones before deleting them.
-     * See the {@link https://api.graffiti.garden/classes/Graffiti.html#discover | `discover` }
-     * documentation for more information.
-     */
-    tombstoneRetention?: number;
     /**
      * An optional Ajv instance to use for schema validation.
      * If not provided, an internal instance will be created.
      */
     ajv?: Ajv;
 }
+type GraffitiObjectWithTombstone = GraffitiObjectBase & {
+    tombstone: boolean;
+};
 /**
  * An implementation of only the database operations of the
  * GraffitiAPI without synchronization or session management.
  */
-export declare class GraffitiLocalDatabase implements Pick<Graffiti, "get" | "put" | "patch" | "delete" | "discover" | "recoverOrphans" | "channelStats"> {
-    protected db_: Promise<PouchDB.Database<GraffitiObjectBase>> | undefined;
+export declare class GraffitiLocalDatabase implements Omit<Graffiti, "login" | "logout" | "sessionEvents"> {
+    protected db_: Promise<PouchDB.Database<GraffitiObjectWithTombstone>> | undefined;
     protected applyPatch_: Promise<typeof applyPatch> | undefined;
     protected ajv_: Promise<Ajv> | undefined;
     protected readonly options: GraffitiLocalOptions;
     protected readonly origin: string;
-    get db(): Promise<PouchDB.Database<GraffitiObjectBase>>;
-    get applyPatch(): Promise<typeof applyPatch>;
-    get ajv(): Promise<Ajv>;
+    get db(): Promise<PouchDB.Database<GraffitiObjectWithTombstone>>;
+    protected get applyPatch(): Promise<typeof applyPatch>;
+    protected get ajv(): Promise<Ajv>;
+    protected extractGraffitiObject(object: GraffitiObjectWithTombstone): GraffitiObjectBase;
     constructor(options?: GraffitiLocalOptions);
-    protected allDocsAtLocation(locationOrUri: GraffitiObjectUrl | string): Promise<PouchDB.Core.ExistingDocument<GraffitiObjectBase & PouchDB.Core.AllDocsMeta>[]>;
-    protected docId(location: GraffitiObjectUrl): string;
+    protected allDocsAtLocation(objectUrl: string | GraffitiObjectUrl): Promise<PouchDB.Core.ExistingDocument<GraffitiObjectBase & {
+        tombstone: boolean;
+    } & PouchDB.Core.AllDocsMeta>[]>;
+    protected docId(objectUrl: GraffitiObjectUrl): string;
     get: Graffiti["get"];
     /**
      * Deletes all docs at a particular location.
@@ -72,19 +73,26 @@ export declare class GraffitiLocalDatabase implements Pick<Graffiti, "get" | "pu
      * timestamp, the one with the highest `_id` will be
      * spared.
      */
-    protected deleteAtLocation(locationOrUri: GraffitiObjectUrl | string, options?: {
+    protected deleteAtLocation(url: GraffitiObjectUrl | string, options?: {
         keepLatest?: boolean;
         session?: GraffitiSession;
     }): Promise<GraffitiObjectBase | undefined>;
     delete: Graffiti["delete"];
     put: Graffiti["put"];
     patch: Graffiti["patch"];
-    protected queryLastModifiedSuffixes(schema: JSONSchema): {
+    protected queryLastModifiedSuffixes(schema: JSONSchema, lastModified?: number): {
         startKeySuffix: string;
         endKeySuffix: string;
     };
+    protected streamObjects<Schema extends JSONSchema>(index: string, startkey: string, endkey: string, validate: ReturnType<typeof compileGraffitiObjectSchema<Schema>>, session: GraffitiSession | undefined | null, ifModifiedSince: number | undefined, channels?: string[], processedIds?: Set<string>): AsyncGenerator<GraffitiObjectStreamContinueEntry<Schema>>;
+    protected discoverMeta<Schema extends JSONSchema>(args: Parameters<typeof Graffiti.prototype.discover<Schema>>, ifModifiedSince?: number): AsyncGenerator<GraffitiObjectStreamContinueEntry<Schema>, number | undefined>;
+    protected recoverOrphansMeta<Schema extends JSONSchema>(args: Parameters<typeof Graffiti.prototype.recoverOrphans<Schema>>, ifModifiedSince?: number): AsyncGenerator<GraffitiObjectStreamContinueEntry<Schema>, number | undefined>;
+    protected discoverContinue<Schema extends JSONSchema>(args: Parameters<typeof Graffiti.prototype.discover<Schema>>, ifModifiedSince?: number): GraffitiObjectStreamContinue<Schema>;
     discover: Graffiti["discover"];
+    protected recoverContinue<Schema extends JSONSchema>(args: Parameters<typeof Graffiti.prototype.recoverOrphans<Schema>>, ifModifiedSince?: number): GraffitiObjectStreamContinue<Schema>;
     recoverOrphans: Graffiti["recoverOrphans"];
     channelStats: Graffiti["channelStats"];
+    continueObjectStream: Graffiti["continueObjectStream"];
 }
+export {};
 //# sourceMappingURL=database.d.ts.map

package/dist/database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../src/database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,kBAAkB,EAClB,iBAAiB,EACjB,UAAU,EACV,eAAe,EAChB,MAAM,sBAAsB,CAAC;AAiB9B,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,qBAAqB,CAAC;IAC7D;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;;OAOG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC;;;;;;OAMG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;OAGG;IACH,GAAG,CAAC,EAAE,GAAG,CAAC;CACX;AAKD;;;GAGG;AACH,qBAAa,qBACX,YACE,IAAI,CACF,QAAQ,EACN,KAAK,GACL,KAAK,GACL,OAAO,GACP,QAAQ,GACR,UAAU,GACV,gBAAgB,GAChB,cAAc,CACjB;IAEH,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,GAAG,SAAS,CAAC;IACzE,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,UAAU,CAAC,GAAG,SAAS,CAAC;IAC9D,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;IACzC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,oBAAoB,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAElC,IAAI,EAAE,kDA+EL;IAED,IAAI,UAAU,+BAQb;IAED,IAAI,GAAG,iBAUN;gBAEW,OAAO,CAAC,EAAE,oBAAoB;cAQ1B,iBAAiB,CAAC,aAAa,EAAE,iBAAiB,GAAG,MAAM;IAuB3E,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,iBAAiB;IAI3C,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,CA6BlB;IAEF;;;;;;;OAOG;cACa,gBAAgB,CAC9B,aAAa,EAAE,iBAAiB,GAAG,MAAM,EACzC,OAAO,GAAE;QACP,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,OAAO,CAAC,EAAE,eAAe,CAAC;KAG3B;IAsFH,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,CASxB;IAEF,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,CAmElB;IAEF,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,CA8EtB;IAEF,SAAS,CAAC,yBAAyB,CAAC,MAAM,EAAE,UAAU;;;;IA+CtD,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC,CAyD5B;IAEF,cAAc,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAwCxC;IAEF,YAAY,EAAE,QAAQ,CAAC,cAAc,CAAC,CA8BpC;CACH"}
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../src/database.ts"],"names":[],"mappings":"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"}

package/dist/esm/database.js

@@ -9,13 +9,11 @@ import {
   applyGraffitiPatch,
   maskGraffitiObject,
   isActorAllowedGraffitiObject,
-  isObjectNewer,
   compileGraffitiObjectSchema,
-  unpackLocationOrUri
+  unpackObjectUrl
 } from "./utilities.js";
-import { Repeater } from "@repeaterjs/repeater";
-const DEFAULT_TOMBSTONE_RETENTION = 864e5;
 const DEFAULT_ORIGIN = "graffiti:local:";
+const LAST_MODIFIED_BUFFER = 6e4;
 class GraffitiLocalDatabase {
   db_;
   applyPatch_;
@@ -96,6 +94,17 @@ class GraffitiLocalDatabase {
     }
     return this.ajv_;
   }
+  extractGraffitiObject(object) {
+    const { value, channels, allowed, url, actor, lastModified } = object;
+    return {
+      value,
+      channels,
+      allowed,
+      url,
+      actor,
+      lastModified
+    };
+  }
   constructor(options) {
     this.options = options ?? {};
     this.origin = this.options.origin ?? DEFAULT_ORIGIN;
@@ -103,11 +112,11 @@ class GraffitiLocalDatabase {
       this.origin += "/";
     }
   }
-  async allDocsAtLocation(locationOrUri) {
-    const uri = unpackLocationOrUri(locationOrUri) + "/";
+  async allDocsAtLocation(objectUrl) {
+    const url = unpackObjectUrl(objectUrl) + "/";
     const results = await (await this.db).allDocs({
-      startkey: uri,
-      endkey: uri + "\uFFFF",
+      startkey: url,
+      endkey: url + "\uFFFF",
       // \uffff is the last unicode character
       include_docs: true
     });
@@ -117,12 +126,12 @@ class GraffitiLocalDatabase {
     }, []);
     return docs;
   }
-  docId(location) {
-    return location.url + "/" + randomBase64();
+  docId(objectUrl) {
+    return objectUrl.url + "/" + randomBase64();
   }
   get = async (...args) => {
-    const [locationOrUri, schema, session] = args;
-    const docsAll = await this.allDocsAtLocation(locationOrUri);
+    const [urlObject, schema, session] = args;
+    const docsAll = await this.allDocsAtLocation(urlObject);
     const docs = docsAll.filter(
       (doc2) => isActorAllowedGraffitiObject(doc2, session)
     );
@@ -130,8 +139,15 @@ class GraffitiLocalDatabase {
       throw new GraffitiErrorNotFound(
         "The object you are trying to get either does not exist or you are not allowed to see it"
       );
-    const doc = docs.reduce((a, b) => isObjectNewer(a, b) ? a : b);
-    const { _id, _rev, _conflicts, _attachments, ...object } = doc;
+    const doc = docs.reduce(
+      (a, b) => a.lastModified > b.lastModified || a.lastModified === b.lastModified && !a.tombstone && b.tombstone ? a : b
+    );
+    if (doc.tombstone) {
+      throw new GraffitiErrorNotFound(
+        "The object you are trying to get either does not exist or you are not allowed to see it"
+      );
+    }
+    const object = this.extractGraffitiObject(doc);
     maskGraffitiObject(object, [], session);
     const validate = compileGraffitiObjectSchema(await this.ajv, schema);
     if (!validate(object)) {
@@ -147,10 +163,10 @@ class GraffitiLocalDatabase {
    * timestamp, the one with the highest `_id` will be
    * spared.
    */
-  async deleteAtLocation(locationOrUri, options = {
+  async deleteAtLocation(url, options = {
     keepLatest: false
   }) {
-    const docsAtLocationAll = await this.allDocsAtLocation(locationOrUri);
+    const docsAtLocationAll = await this.allDocsAtLocation(url);
     const docsAtLocationAllowed = options.session ? docsAtLocationAll.filter(
       (doc) => isActorAllowedGraffitiObject(doc, options.session)
     ) : docsAtLocationAll;
@@ -195,10 +211,8 @@ class GraffitiLocalDatabase {
         const { id } = resultOrError;
         const deletedDoc = docsToDelete.find((doc) => doc._id === id);
         if (deletedDoc) {
-          const { _id, _rev, _conflicts, _attachments, ...object } = deletedDoc;
           deletedObject = {
-            ...object,
-            tombstone: true,
+            ...this.extractGraffitiObject(deletedDoc),
             lastModified
           };
           break;
@@ -208,8 +222,8 @@ class GraffitiLocalDatabase {
     return deletedObject;
   }
   delete = async (...args) => {
-    const [locationOrUri, session] = args;
-    const deletedObject = await this.deleteAtLocation(locationOrUri, {
+    const [url, session] = args;
+    const deletedObject = await this.deleteAtLocation(url, {
       session
     });
     if (!deletedObject) {
@@ -230,7 +244,7 @@ class GraffitiLocalDatabase {
         oldObject = await this.get(objectPartial.url, {}, session);
       } catch (e) {
         if (e instanceof GraffitiErrorNotFound) {
-          if (!this.options.allowSettingArbitraryUris) {
+          if (!this.options.allowSettingArbitraryUrls) {
             throw new GraffitiErrorNotFound(
               "The object you are trying to replace does not exist or you are not allowed to see it"
             );
@@ -275,10 +289,10 @@ class GraffitiLocalDatabase {
     }
   };
   patch = async (...args) => {
-    const [patch, locationOrUri, session] = args;
+    const [patch, url, session] = args;
     let originalObject;
     try {
-      originalObject = await this.get(locationOrUri, {}, session);
+      originalObject = await this.get(url, {}, session);
     } catch (e) {
       if (e instanceof GraffitiErrorNotFound) {
         throw new GraffitiErrorNotFound(
@@ -292,10 +306,6 @@ class GraffitiLocalDatabase {
       throw new GraffitiErrorForbidden(
         "The object you are trying to patch is owned by another actor"
       );
-    } else if (originalObject.tombstone) {
-      throw new GraffitiErrorNotFound(
-        "The object you are trying to patch has been deleted"
-      );
     }
     const patchObject = { ...originalObject };
     for (const prop of ["value", "channels", "allowed"]) {
@@ -317,6 +327,7 @@ class GraffitiLocalDatabase {
     patchObject.lastModified = (/* @__PURE__ */ new Date()).getTime();
     await (await this.db).put({
       ...patchObject,
+      tombstone: false,
       _id: this.docId(patchObject)
     });
     await this.deleteAtLocation(patchObject, {
@@ -324,16 +335,15 @@ class GraffitiLocalDatabase {
     });
     return {
       ...originalObject,
-      tombstone: true,
       lastModified: patchObject.lastModified
     };
   };
-  queryLastModifiedSuffixes(schema) {
+  queryLastModifiedSuffixes(schema, lastModified) {
     let startKeySuffix = "";
     let endKeySuffix = "\uFFFF";
     if (typeof schema === "object" && schema.properties?.lastModified && typeof schema.properties.lastModified === "object") {
       const lastModifiedSchema = schema.properties.lastModified;
-      const minimum = lastModifiedSchema.minimum;
+      const minimum = lastModified && lastModifiedSchema.minimum ? Math.max(lastModified, lastModifiedSchema.minimum) : lastModified ?? lastModifiedSchema.minimum;
       const exclusiveMinimum = lastModifiedSchema.exclusiveMinimum;
       let intMinimum;
       if (exclusiveMinimum !== void 0) {
@@ -363,71 +373,150 @@ class GraffitiLocalDatabase {
       endKeySuffix
     };
   }
-  discover = (...args) => {
-    const [channels, schema, session] = args;
-    const { startKeySuffix, endKeySuffix } = this.queryLastModifiedSuffixes(schema);
-    const repeater = new Repeater(async (push, stop) => {
-      const validate = compileGraffitiObjectSchema(await this.ajv, schema);
-      const processedIds = /* @__PURE__ */ new Set();
-      for (const channel of channels) {
-        const keyPrefix = encodeURIComponent(channel) + "/";
-        const startkey = keyPrefix + startKeySuffix;
-        const endkey = keyPrefix + endKeySuffix;
-        const result = await (await this.db).query(
-          "indexes/objectsPerChannelAndLastModified",
-          { startkey, endkey, include_docs: true }
-        );
-        for (const row of result.rows) {
-          const doc = row.doc;
-          if (!doc) continue;
-          const { _id, _rev, ...object } = doc;
-          if (processedIds.has(_id)) continue;
-          processedIds.add(_id);
-          if (!isActorAllowedGraffitiObject(doc, session)) continue;
-          maskGraffitiObject(object, channels, session);
-          if (validate(object)) {
-            await push({ value: object });
-          }
-        }
-      }
-      stop();
-      return {
-        tombstoneRetention: this.options.tombstoneRetention ?? DEFAULT_TOMBSTONE_RETENTION
-      };
+  async *streamObjects(index, startkey, endkey, validate, session, ifModifiedSince, channels, processedIds) {
+    const showTombstones = ifModifiedSince !== void 0;
+    const result = await (await this.db).query(index, {
+      startkey,
+      endkey,
+      include_docs: true
     });
-    return repeater;
-  };
-  recoverOrphans = (schema, session) => {
-    const { startKeySuffix, endKeySuffix } = this.queryLastModifiedSuffixes(schema);
+    for (const row of result.rows) {
+      const doc = row.doc;
+      if (!doc) continue;
+      if (processedIds?.has(doc._id)) continue;
+      processedIds?.add(doc._id);
+      if (!showTombstones && doc.tombstone) continue;
+      const object = this.extractGraffitiObject(doc);
+      if (channels) {
+        if (!isActorAllowedGraffitiObject(object, session)) continue;
+        maskGraffitiObject(object, channels, session);
+      }
+      if (!validate(object)) continue;
+      yield doc.tombstone ? {
+        tombstone: true,
+        object: {
+          url: object.url,
+          lastModified: object.lastModified
+        }
+      } : { object };
+    }
+  }
+  async *discoverMeta(args, ifModifiedSince) {
+    const [channels, schema, session] = args;
+    const validate = compileGraffitiObjectSchema(await this.ajv, schema);
+    const { startKeySuffix, endKeySuffix } = this.queryLastModifiedSuffixes(
+      schema,
+      ifModifiedSince
+    );
+    const processedIds = /* @__PURE__ */ new Set();
+    const startTime = (/* @__PURE__ */ new Date()).getTime();
+    for (const channel of channels) {
+      const keyPrefix = encodeURIComponent(channel) + "/";
+      const startkey = keyPrefix + startKeySuffix;
+      const endkey = keyPrefix + endKeySuffix;
+      const iterator = this.streamObjects(
+        "indexes/objectsPerChannelAndLastModified",
+        startkey,
+        endkey,
+        validate,
+        session,
+        ifModifiedSince,
+        channels,
+        processedIds
+      );
+      for await (const result of iterator) yield result;
+    }
+    return startTime - LAST_MODIFIED_BUFFER;
+  }
+  async *recoverOrphansMeta(args, ifModifiedSince) {
+    const [schema, session] = args;
+    const { startKeySuffix, endKeySuffix } = this.queryLastModifiedSuffixes(
+      schema,
+      ifModifiedSince
+    );
     const keyPrefix = encodeURIComponent(session.actor) + "/";
     const startkey = keyPrefix + startKeySuffix;
     const endkey = keyPrefix + endKeySuffix;
-    const repeater = new Repeater(async (push, stop) => {
-      const validate = compileGraffitiObjectSchema(await this.ajv, schema);
-      const result = await (await this.db).query("indexes/orphansPerActorAndLastModified", {
-        startkey,
-        endkey,
-        include_docs: true
-      });
-      for (const row of result.rows) {
-        const doc = row.doc;
-        if (!doc) continue;
-        const { _id, _rev, ...object } = doc;
-        if (validate(object)) {
-          await push({ value: object });
+    const validate = compileGraffitiObjectSchema(await this.ajv, schema);
+    const startTime = (/* @__PURE__ */ new Date()).getTime();
+    const iterator = this.streamObjects(
+      "indexes/orphansPerActorAndLastModified",
+      startkey,
+      endkey,
+      validate,
+      session,
+      ifModifiedSince
+    );
+    for await (const result of iterator) yield result;
+    return startTime - LAST_MODIFIED_BUFFER;
+  }
+  async *discoverContinue(args, ifModifiedSince) {
+    const iterator = this.discoverMeta(args, ifModifiedSince);
+    while (true) {
+      const result = await iterator.next();
+      if (result.done) {
+        const ifModifiedSince2 = result.value;
+        return {
+          continue: () => this.discoverContinue(args, ifModifiedSince2),
+          cursor: ""
+        };
+      }
+      yield result.value;
+    }
+  }
+  discover = (...args) => {
+    const iterator = this.discoverMeta(args);
+    const this_ = this;
+    return async function* () {
+      while (true) {
+        const result = await iterator.next();
+        if (result.done) {
+          return {
+            continue: () => this_.discoverContinue(args, result.value),
+            cursor: ""
+          };
         }
+        if (result.value.tombstone) continue;
+        yield result.value;
       }
-      stop();
-      return {
-        tombstoneRetention: this.options.tombstoneRetention ?? DEFAULT_TOMBSTONE_RETENTION
-      };
-    });
-    return repeater;
+    }();
+  };
+  async *recoverContinue(args, ifModifiedSince) {
+    const iterator = this.recoverOrphansMeta(args, ifModifiedSince);
+    while (true) {
+      const result = await iterator.next();
+      if (result.done) {
+        const ifModifiedSince2 = result.value;
+        return {
+          continue: () => this.recoverContinue(args, ifModifiedSince2),
+          cursor: ""
+        };
+      }
+      yield result.value;
+    }
+  }
+  recoverOrphans = (...args) => {
+    const iterator = this.recoverOrphansMeta(args);
+    const this_ = this;
+    return async function* () {
+      while (true) {
+        const result = await iterator.next();
+        if (result.done) {
+          return {
+            continue: () => this_.recoverContinue(args, result.value),
+            cursor: ""
+          };
+        }
+        if (result.value.tombstone) continue;
+        yield result.value;
+      }
+    }();
   };
   channelStats = (session) => {
-    const repeater = new Repeater(async (push, stop) => {
+    const this_ = this;
+    return async function* () {
       const keyPrefix = encodeURIComponent(session.actor) + "/";
-      const result = await (await this.db).query("indexes/channelStatsPerActor", {
+      const result = await (await this_.db).query("indexes/channelStatsPerActor", {
         startkey: keyPrefix,
         endkey: keyPrefix + "\uFFFF",
         reduce: true,
@@ -439,17 +528,18 @@ class GraffitiLocalDatabase {
         const { count, max: lastModified } = row.value;
         if (typeof count !== "number" || typeof lastModified !== "number")
           continue;
-        await push({
+        yield {
           value: {
             channel: decodeURIComponent(channelEncoded),
             count,
             lastModified
           }
-        });
+        };
       }
-      stop();
-    });
-    return repeater;
+    }();
+  };
+  continueObjectStream = (cursor, session) => {
+    throw new GraffitiErrorNotFound("Cursor not found");
   };
 }
 export {