shelving 1.86.2 → 1.86.3

package/firestore/client/FirestoreClientProvider.js

@@ -1,9 +1,8 @@
-import { orderBy as firestoreOrderBy, where as firestoreWhere, limit as firestoreLimit, increment as firestoreIncrement, arrayUnion as firestoreArrayUnion, arrayRemove as firestoreArrayRemove, deleteField as firestoreDeleteField, collection as firestoreCollection, doc as firestoreDocument, query as firestoreQuery, onSnapshot, addDoc, setDoc, updateDoc, deleteDoc, getDoc, getDocs, } from "firebase/firestore";
+import { documentId as firestoreDocumentId, orderBy as firestoreOrderBy, where as firestoreWhere, limit as firestoreLimit, increment as firestoreIncrement, arrayUnion as firestoreArrayUnion, arrayRemove as firestoreArrayRemove, deleteField as firestoreDeleteField, collection as firestoreCollection, doc as firestoreDocument, query as firestoreQuery, onSnapshot, addDoc, setDoc, updateDoc, deleteDoc, getDoc, getDocs, } from "firebase/firestore";
 import { LazyDeferredSequence } from "../../sequence/LazyDeferredSequence.js";
 import { ArrayUpdate, DataUpdate, Increment, DictionaryUpdate, Delete, Update } from "../../update/index.js";
 // Constants.
-// const ID = "__name__"; // DH: `__name__` is the entire path of the document. `__id__` is just ID.
-const ID = "__id__"; // Internal way Firestore Queries can reference the ID of the current document.
+const ID = firestoreDocumentId();
 // Map `Filter.types` to `WhereFilterOp`
 const OPERATORS = {
     IS: "==",

package/firestore/lite/FirestoreLiteProvider.js

@@ -1,9 +1,10 @@
-import { orderBy as firestoreOrderBy, where as firestoreWhere, limit as firestoreLimit, increment as firestoreIncrement, arrayUnion as firestoreArrayUnion, arrayRemove as firestoreArrayRemove, deleteField as firestoreDeleteField, collection as firestoreCollection, doc as firestoreDocument, query as firestoreQuery, setDoc, addDoc, updateDoc, deleteDoc, getDoc, getDocs, } from "firebase/firestore/lite";
+import { documentId as firestoreDocumentId, orderBy as firestoreOrderBy, where as firestoreWhere, limit as firestoreLimit, increment as firestoreIncrement, arrayUnion as firestoreArrayUnion, arrayRemove as firestoreArrayRemove, deleteField as firestoreDeleteField, collection as firestoreCollection, doc as firestoreDocument, query as firestoreQuery, setDoc, addDoc, updateDoc, deleteDoc, getDoc, getDocs, } from "firebase/firestore/lite";
 import { UnsupportedError } from "../../error/UnsupportedError.js";
 import { ArrayUpdate, DataUpdate, Increment, DictionaryUpdate, Delete, Update } from "../../update/index.js";
 // Constants.
 // const ID = "__name__"; // DH: `__name__` is the entire path of the document. `__id__` is just ID.
-const ID = "__id__"; // Internal way Firestore Queries can reference the ID of the current document.
+// const ID = "__id__"; // Internal way Firestore Queries can reference the ID of the current document.
+const ID = firestoreDocumentId();
 // Map `Filter.types` to `WhereFilterOp`
 const OPERATORS = {
     IS: "==",

package/firestore/server/FirestoreServerProvider.js

@@ -1,9 +1,8 @@
-import { Firestore, FieldValue as FirestoreFieldValue } from "@google-cloud/firestore";
+import { Firestore, FieldValue, FieldPath } from "@google-cloud/firestore";
 import { LazyDeferredSequence } from "../../sequence/LazyDeferredSequence.js";
 import { ArrayUpdate, DataUpdate, Increment, DictionaryUpdate, Delete, Update } from "../../update/index.js";
 // Constants.
-// const ID = "__name__"; // DH: `__name__` is the entire path of the document. `__id__` is just ID.
-const ID = "__id__"; // Internal way Firestore Queries can reference the ID of the current document.
+const ID = FieldPath.documentId();
 // Map `Filter.types` to `WhereFilterOp`
 const OPERATORS = {
     IS: "==",
@@ -53,11 +52,11 @@ function* _getFieldValues(updates, prefix = "") {
         else if (update instanceof ArrayUpdate) {
             if (update.adds.length) {
                 yield `${prefix}${key}`;
-                yield FirestoreFieldValue.arrayUnion(...update.adds);
+                yield FieldValue.arrayUnion(...update.adds);
             }
             if (update.deletes.length) {
                 yield `${prefix}${key}`;
-                yield FirestoreFieldValue.arrayRemove(...update.deletes);
+                yield FieldValue.arrayRemove(...update.deletes);
             }
         }
         else {
@@ -65,9 +64,9 @@ function* _getFieldValues(updates, prefix = "") {
             if (!(update instanceof Update))
                 yield update;
             else if (update instanceof Delete)
-                yield FirestoreFieldValue.delete();
+                yield FieldValue.delete();
             else if (update instanceof Increment)
-                yield FirestoreFieldValue.increment(update.amount);
+                yield FieldValue.increment(update.amount);
             else
                 yield update.transform();
         }

package/markup/rule.d.ts

@@ -36,35 +36,33 @@ export declare abstract class MarkupRule {
     abstract render(props: Data | undefined, options: MarkupOptions): JSXElement;
 }
 export declare class RegExpMarkupRule extends MarkupRule {
-    private readonly _regexp;
-    private readonly _render;
-    constructor(_regexp: RegExp, //
-    _render: (props: Data, options: MarkupOptions) => JSXElement, contexts: ImmutableArray<string>, subcontext?: string | null, priority?: number);
+    readonly regexp: RegExp;
+    readonly render: (props: Data, options: MarkupOptions) => JSXElement;
+    constructor(regexp: RegExp, //
+    render: (props: Data, options: MarkupOptions) => JSXElement, contexts: ImmutableArray<string>, subcontext?: string | null, priority?: number);
     match(input: string): MarkupRuleMatch | null;
-    render(props: Data, options: MarkupOptions): JSXElement;
 }
 export declare class NamedRegExpMarkupRule<T extends NamedRegExpData> extends MarkupRule {
-    private readonly _regexp;
-    private readonly _render;
-    constructor(_regexp: NamedRegExp<T>, //
-    _render: (props: T, options: MarkupOptions) => JSXElement, contexts: ImmutableArray<string>, subcontext?: string | null, priority?: number);
+    readonly regexp: NamedRegExp<T>;
+    readonly render: (props: T, options: MarkupOptions) => JSXElement;
+    constructor(regexp: NamedRegExp<T>, //
+    render: (props: T, options: MarkupOptions) => JSXElement, contexts: ImmutableArray<string>, subcontext?: string | null, priority?: number);
     match(input: string): NamedRegExpArray<T> | null;
-    render(props: T, options: MarkupOptions): JSXElement;
 }
 export declare class LinkRegExpMarkupRule extends MarkupRule {
-    readonly _regexp: NamedRegExp<{
+    readonly regexp: NamedRegExp<{
         title?: string;
         href: string;
     }>;
-    readonly _render: (props: {
+    readonly render: (props: {
         title: string;
         href: string;
     }, options: MarkupOptions) => JSXElement;
-    constructor(_regexp: NamedRegExp<{
+    constructor(regexp: NamedRegExp<{
         title?: string;
         href: string;
     }>, //
-    _render: (props: {
+    render: (props: {
         title: string;
         href: string;
     }, options: MarkupOptions) => JSXElement, contexts: ImmutableArray<string>, subcontext?: string | null, priority?: number);
@@ -72,9 +70,5 @@ export declare class LinkRegExpMarkupRule extends MarkupRule {
         title: string;
         href: string;
     }> | null;
-    render(props: {
-        title: string;
-        href: string;
-    }, options: MarkupOptions): JSXElement<import("../util/jsx.js").JSXProps>;
 }
 export type MarkupRules = MarkupRule[];

package/markup/rule.js

@@ -8,45 +8,39 @@ export class MarkupRule {
     }
 }
 export class RegExpMarkupRule extends MarkupRule {
-    constructor(_regexp, //
-    _render, contexts, subcontext, priority) {
+    constructor(regexp, //
+    render, contexts, subcontext, priority) {
         super(contexts, subcontext, priority);
-        this._regexp = _regexp;
-        this._render = _render;
+        this.regexp = regexp;
+        this.render = render;
     }
     match(input) {
-        return this._regexp.exec(input);
-    }
-    render(props, options) {
-        return this._render(props, options);
+        return this.regexp.exec(input);
     }
 }
 export class NamedRegExpMarkupRule extends MarkupRule {
-    constructor(_regexp, //
-    _render, contexts, subcontext, priority) {
+    constructor(regexp, //
+    render, contexts, subcontext, priority) {
         super(contexts, subcontext, priority);
-        this._regexp = _regexp;
-        this._render = _render;
+        this.regexp = regexp;
+        this.render = render;
     }
     match(input) {
-        return this._regexp.exec(input);
-    }
-    render(props, options) {
-        return this._render(props, options);
+        return this.regexp.exec(input);
     }
 }
 export class LinkRegExpMarkupRule extends MarkupRule {
-    constructor(_regexp, //
-    _render, contexts, subcontext, priority) {
+    constructor(regexp, //
+    render, contexts, subcontext, priority) {
         super(contexts, subcontext, priority);
-        this._regexp = _regexp;
-        this._render = _render;
+        this.regexp = regexp;
+        this.render = render;
     }
     // Validates that the link is a valid URL (using `getOptionalURL()` to resolve relative links relative to `options.url`).
     // Validates that the link's URL scheme is in the `options.schemes` whitelist (defaults to `http` and `https`).
     // Generates a default title for the link using `formatURL()` (e.g. `shax.com/my/dir`).
     match(input, { schemes, url: base }) {
-        const match = this._regexp.exec(input);
+        const match = this.regexp.exec(input);
         if (match) {
             const { 0: first, index, groups } = match;
             const { href, title } = groups;
@@ -57,7 +51,4 @@ export class LinkRegExpMarkupRule extends MarkupRule {
         }
         return null;
     }
-    render(props, options) {
-        return this._render(props, options);
-    }
 }

package/markup/rules.d.ts

@@ -1,5 +1,4 @@
 import type { JSXElement } from "../util/jsx.js";
-import { NamedRegExp } from "../util/regexp.js";
 import type { MarkupOptions } from "./options.js";
 import { LinkRegExpMarkupRule, MarkupRules, NamedRegExpMarkupRule, RegExpMarkupRule } from "./rule.js";
 /**
@@ -60,10 +59,6 @@ export declare function renderLinkRule({ href, title }: {
  * - If link is not valid (using `new URL(url)` then unparsed text will be returned.
  * - For security only schemes that appear in `options.schemes` will match (defaults to `http:` and `https:`).
  */
-export declare const URL_REGEXP: NamedRegExp<{
-    title?: string;
-    href: string;
-}>;
 export declare const URL_RULE: LinkRegExpMarkupRule;
 /**
  * Markdown-style link.
@@ -73,10 +68,6 @@ export declare const URL_RULE: LinkRegExpMarkupRule;
  * - If link is not valid (using `new URL(url)` then unparsed text will be returned.
  * - For security only `http://` or `https://` links will work (if invalid the unparsed text will be returned).
  */
-export declare const LINK_REGEXP: NamedRegExp<{
-    title: string;
-    href: string;
-}>;
 export declare const LINK_RULE: LinkRegExpMarkupRule;
 /**
  * Inline code.

package/markup/rules.js

@@ -150,8 +150,8 @@ export function renderLinkRule({ href, title }, { rel }) {
  * - If link is not valid (using `new URL(url)` then unparsed text will be returned.
  * - For security only schemes that appear in `options.schemes` will match (defaults to `http:` and `https:`).
  */
-export const URL_REGEXP = getRegExp(/(?<href>[a-z]+:[-$_@.&!*,=;/#?:%a-zA-Z0-9]+)(?: +(?:\((?<title>[^)]*?)\)))?/);
-export const URL_RULE = new LinkRegExpMarkupRule(URL_REGEXP, renderLinkRule, ["inline", "list"], "link");
+export const URL_RULE = new LinkRegExpMarkupRule(getRegExp(/(?<href>[a-z]+:[-$_@.&!*,=;/#?:%a-zA-Z0-9]+)(?: +(?:\((?<title>[^)]*?)\)))?/), //
+renderLinkRule, ["inline", "list"], "link");
 /**
  * Markdown-style link.
  * - Link in standard Markdown format, e.g. `[Google Maps](http://google.com/maps)`
@@ -160,8 +160,8 @@ export const URL_RULE = new LinkRegExpMarkupRule(URL_REGEXP, renderLinkRule, ["i
  * - If link is not valid (using `new URL(url)` then unparsed text will be returned.
  * - For security only `http://` or `https://` links will work (if invalid the unparsed text will be returned).
  */
-export const LINK_REGEXP = getRegExp(/\[(?<title>[^\]]*?)\]\((?<href>[^)]*?)\)/);
-export const LINK_RULE = new LinkRegExpMarkupRule(LINK_REGEXP, renderLinkRule, ["inline", "list"], "link");
+export const LINK_RULE = new LinkRegExpMarkupRule(getRegExp(/\[(?<title>[^\]]*?)\]\((?<href>[^)]*?)\)/), //
+renderLinkRule, ["inline", "list"], "link");
 /**
  * Inline code.
  * - Text surrounded by one or more "`" backtick tilde characters.

package/package.json

@@ -11,7 +11,7 @@
 		"state-management",
 		"query-builder"
 	],
-	"version": "1.86.2",
+	"version": "1.86.3",
 	"repository": "https://github.com/dhoulb/shelving",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"license": "0BSD",

package/react/useQuery.js

@@ -70,7 +70,7 @@ export class QueryState extends State {
         this.busy.set(true);
         try {
             const items = await this.ref.value;
-            this._hasMore = items.length < this.limit;
+            this._hasMore = items.length >= this.limit; // If the query returned {limit} or more items, we can assume there are more items waiting to be queried.
             this.set(items);
         }
         catch (thrown) {
@@ -92,9 +92,11 @@ export class QueryState extends State {
     async _loadMore() {
         this.busy.set(true);
         try {
-            const items = await this.ref.after(this.lastData).value;
+            const last = this.lastValue;
+            const query = last ? this.ref.after(last) : this.ref;
+            const items = await query.value;
             this.set([...this.value, ...items]);
-            this._hasMore = items.length < this.limit;
+            this._hasMore = items.length >= this.limit; // If the query returned {limit} or more items, we can assume there are more items waiting to be queried.
         }
         catch (thrown) {
             this.next.reject(thrown);

package/util/class.d.ts

@@ -4,9 +4,8 @@ export type Constructor<T, A extends Arguments> = new (...args: A) => T;
 /** Any function arguments (designed for use with `extends Arguments` guards). */
 export type AnyConstructor = new (...args: any) => any;
 /** Class prototype that can be used with `instanceof` (string name, as per `Function`, and a prototype field matching the object). */
-export type Class<T = unknown> = Omit<Function, "prototype"> & {
-    prototype: T;
-};
+export type Class<T> = new (...args: any) => T;
+export declare const abc: Class<String>;
 /** Is a given value a class constructor? */
 export declare const isConstructor: <T extends AnyConstructor>(v: unknown) => v is T;
 /** Is a value an instance of a class? */

package/util/class.js

@@ -2,6 +2,7 @@
 import { AssertionError } from "../error/AssertionError.js";
 import { assertFunction } from "./function.js";
 import { debug } from "./debug.js";
+export const abc = String;
 /** Is a given value a class constructor? */
 export const isConstructor = (v) => typeof v === "function" && v.toString().startsWith("class");
 /** Is a value an instance of a class? */

package/util/hydrate.d.ts

@@ -5,7 +5,7 @@ import { Transformable } from "./transform.js";
  * A set of hydrations describes a set of string keys and the class constructor to be dehydrated and rehydrated.
  * - We can't use `class.name` because we don't know that the name of the class will survive minification.
  */
-export type Hydrations = ImmutableDictionary<Class>;
+export type Hydrations = ImmutableDictionary<Class<unknown>>;
 /**
  * Deeply dehydrate a class instance based on a set of `Hydrations`
  * - Dehydration allows you to pass class instances from a server back to a client.