shelving 1.68.3 → 1.68.4

package/firestore/client/FirestoreClientProvider.js

@@ -38,15 +38,15 @@ function getCollection(firestore, { collection }) {
 }
 /** Create a corresponding `QueryReference` from a Query. */
 function getQuery(firestore, ref) {
-    const { sorts, filters, limit } = ref;
-    const constraints = [];
+    return firestoreQuery(getCollection(firestore, ref), ...yieldQueryConstraints(ref));
+}
+function* yieldQueryConstraints({ sorts, filters, limit }) {
     for (const { key, direction } of sorts)
-        constraints.push(firestoreOrderBy(key === "id" ? ID : key, DIRECTIONS[direction]));
+        yield firestoreOrderBy(key === "id" ? ID : key, DIRECTIONS[direction]);
     for (const { operator, key, value } of filters)
-        constraints.push(firestoreWhere(key === "id" ? ID : key, OPERATORS[operator], value));
+        yield firestoreWhere(key === "id" ? ID : key, OPERATORS[operator], value);
     if (typeof limit === "number")
-        constraints.push(firestoreLimit(limit));
-    return firestoreQuery(getCollection(firestore, ref), ...constraints);
+        yield firestoreLimit(limit);
 }
 function getEntities(snapshot) {
     return snapshot.docs.map(getEntity);

package/firestore/lite/FirestoreLiteProvider.js

@@ -37,15 +37,15 @@ function getCollection(firestore, { collection }) {
 }
 /** Create a corresponding `QueryReference` from a Query. */
 function getQuery(firestore, ref) {
-    const { sorts, filters, limit } = ref;
-    const constraints = [];
+    return firestoreQuery(getCollection(firestore, ref), ...yieldQueryConstraints(ref));
+}
+function* yieldQueryConstraints({ sorts, filters, limit }) {
     for (const { key, direction } of sorts)
-        constraints.push(firestoreOrderBy(key === "id" ? ID : key, DIRECTIONS[direction]));
+        yield firestoreOrderBy(key === "id" ? ID : key, DIRECTIONS[direction]);
     for (const { operator, key, value } of filters)
-        constraints.push(firestoreWhere(key === "id" ? ID : key, OPERATORS[operator], value));
+        yield firestoreWhere(key === "id" ? ID : key, OPERATORS[operator], value);
     if (typeof limit === "number")
-        constraints.push(firestoreLimit(limit));
-    return firestoreQuery(getCollection(firestore, ref), ...constraints);
+        yield firestoreLimit(limit);
 }
 function getEntities(snapshot) {
     return snapshot.docs.map(getEntity);

package/markup/rules.js

@@ -12,7 +12,7 @@ const MATCH_INDENT = /^ {1,2}/gm;
  */
 export const HEADING_RULE = {
     regexp: getLineRegExp(`(#{1,6}) +(${MATCH_LINE.source})`),
-    render: ([, prefix = "", children = ""]) => ({ type: `h${prefix.length}`, key: null, props: { children } }),
+    render: ([, prefix = "", children = ""]) => ({ type: `h${prefix.length}`, key: null, ref: null, props: { children } }),
     contexts: ["block"],
     childContext: "inline",
 };
@@ -25,7 +25,7 @@ export const HEADING_RULE = {
  */
 export const HORIZONTAL_RULE = {
     regexp: getLineRegExp(`([${BULLETS}])(?: *\\1){2,}`),
-    render: () => ({ type: "hr", key: null, props: {} }),
+    render: () => ({ type: "hr", key: null, ref: null, props: {} }),
     contexts: ["block"],
 };
 /**
@@ -40,7 +40,7 @@ export const UNORDERED_LIST_RULE = {
     regexp: getBlockRegExp(`${UNORDERED}(${MATCH_BLOCK.source})`),
     render: ([, list = ""]) => {
         const children = list.split(SPLIT_UL_ITEMS).map(_mapUnorderedItem);
-        return { type: "ul", key: null, props: { children } };
+        return { type: "ul", key: null, ref: null, props: { children } };
     },
     contexts: ["block", "list"],
     childContext: "list",
@@ -48,7 +48,7 @@ export const UNORDERED_LIST_RULE = {
 const SPLIT_UL_ITEMS = new RegExp(`\\n+${UNORDERED}`, "g");
 const _mapUnorderedItem = (item, key) => {
     const children = item.replace(MATCH_INDENT, "");
-    return { type: "li", key, props: { children } };
+    return { type: "li", key, ref: null, props: { children } };
 };
 /**
  * Ordered list.
@@ -60,7 +60,7 @@ export const ORDERED_LIST_RULE = {
     regexp: getBlockRegExp(`(${ORDERED}${MATCH_BLOCK.source})`),
     render: ([, list = ""]) => {
         const children = list.split(SPLIT_OL_ITEMS).map(_mapOrderedItem);
-        return { type: "ol", key: null, props: { children } };
+        return { type: "ol", key: null, ref: null, props: { children } };
     },
     contexts: ["block", "list"],
     childContext: "list",
@@ -73,7 +73,7 @@ const _mapOrderedItem = (item, key) => {
         .slice(firstSpace + 1)
         .trimStart()
         .replace(MATCH_INDENT, "");
-    return { type: "li", key, props: { value, children } };
+    return { type: "li", key, ref: null, props: { value, children } };
 };
 /**
  * Blockquote block.
@@ -86,6 +86,7 @@ export const BLOCKQUOTE_RULE = {
     render: ([, quote = ""]) => ({
         type: "blockquote",
         key: null,
+        ref: null,
         props: { children: quote.replace(BLOCKQUOTE_LINES, "") },
     }),
     contexts: ["block", "list"],
@@ -105,10 +106,12 @@ export const FENCED_CODE_RULE = {
     render: ([, , file, children]) => ({
         type: "pre",
         key: null,
+        ref: null,
         props: {
             children: {
                 type: "code",
                 key: null,
+                ref: null,
                 props: { "data-file": file || undefined, children },
             },
         },
@@ -121,7 +124,7 @@ export const FENCED_CODE_RULE = {
  */
 export const PARAGRAPH_RULE = {
     regexp: getBlockRegExp(` *(${MATCH_BLOCK.source})`),
-    render: ([, children]) => ({ type: `p`, key: null, props: { children } }),
+    render: ([, children]) => ({ type: `p`, key: null, ref: null, props: { children } }),
     contexts: ["block"],
     childContext: "inline",
     priority: -10, // Lower precedence than other blocks so it matches last and paragraphs can be broken by other blocks.
@@ -152,6 +155,7 @@ export const LINK_RULE = {
     render: ([, title, href = ""], { rel }) => ({
         type: "a",
         key: null,
+        ref: null,
         props: { children: title || formatUrl(href), href, rel },
     }),
     contexts: ["inline", "list"],
@@ -182,6 +186,7 @@ export const AUTOLINK_RULE = {
     render: ([, href = "", title], { rel }) => ({
         type: "a",
         key: null,
+        ref: null,
         props: { children: title || formatUrl(href), href, rel },
     }),
     contexts: ["inline", "list"],
@@ -196,7 +201,7 @@ export const AUTOLINK_RULE = {
  */
 export const CODE_RULE = {
     regexp: getWrapRegExp("`+", MATCH_BLOCK.source),
-    render: ([, , children]) => ({ type: "code", key: null, props: { children } }),
+    render: ([, , children]) => ({ type: "code", key: null, ref: null, props: { children } }),
     contexts: ["inline", "list"],
     priority: 10, // Higher priority than other inlines so it matches first before e.g. `strong` or `em` (from CommonMark spec: "Code span backticks have higher precedence than any other inline constructs except HTML tags and autolinks.")
 };
@@ -210,7 +215,7 @@ export const CODE_RULE = {
  */
 export const STRONG_RULE = {
     regexp: getWrapRegExp("\\*+"),
-    render: ([, , children]) => ({ type: "strong", key: null, props: { children } }),
+    render: ([, , children]) => ({ type: "strong", key: null, ref: null, props: { children } }),
     contexts: ["inline", "list", "link"],
     childContext: "inline",
 };
@@ -224,7 +229,7 @@ export const STRONG_RULE = {
  */
 export const EMPHASIS_RULE = {
     regexp: getWrapRegExp("_+"),
-    render: ([, , children]) => ({ type: "em", key: null, props: { children } }),
+    render: ([, , children]) => ({ type: "em", key: null, ref: null, props: { children } }),
     contexts: ["inline", "list", "link"],
     childContext: "inline",
 };
@@ -238,7 +243,7 @@ export const EMPHASIS_RULE = {
  */
 export const INSERT_RULE = {
     regexp: getWrapRegExp("\\+\\++"),
-    render: ([, , children]) => ({ type: "ins", key: null, props: { children } }),
+    render: ([, , children]) => ({ type: "ins", key: null, ref: null, props: { children } }),
     contexts: ["inline", "list", "link"],
     childContext: "inline",
 };
@@ -252,7 +257,7 @@ export const INSERT_RULE = {
  */
 export const DELETE_RULE = {
     regexp: getWrapRegExp("--+|~~+"),
-    render: ([, , children]) => ({ type: "del", key: null, props: { children } }),
+    render: ([, , children]) => ({ type: "del", key: null, ref: null, props: { children } }),
     contexts: ["inline", "list", "link"],
     childContext: "inline",
 };
@@ -266,7 +271,7 @@ export const DELETE_RULE = {
  */
 export const LINEBREAK_RULE = {
     regexp: /\n/,
-    render: () => ({ type: "br", key: null, props: {} }),
+    render: () => ({ type: "br", key: null, ref: null, props: {} }),
     contexts: ["inline", "list", "link"],
     childContext: "inline",
 };

package/package.json

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

package/provider/DebugProvider.js

@@ -5,154 +5,154 @@ import { ThroughProvider } from "./ThroughProvider.js";
 /** Provider that logs its operations to the console for debugging purposes. */
 export class DebugProvider extends ThroughProvider {
     getDocument(ref) {
-        console.log(`Get "${ref}"`);
+        console.log(`Get ${ref}:`);
         try {
             const result = super.getDocument(ref);
             return isAsync(result)
                 ? result.then(undefined, reason => {
-                    console.error(`Error getting "${ref}"`, reason);
+                    console.error(`Error: Get ${ref}:`, reason);
                     throw reason;
                 })
                 : result;
         }
         catch (reason) {
-            console.error(`Error getting "${ref}"`, reason);
+            console.error(`Error: Get ${ref}:`, reason);
             throw reason;
         }
     }
     subscribeDocument(ref, observer) {
-        console.log(`Subscribe "${ref}"`);
+        console.log(`Subscribe ${ref}:`);
         return super.subscribeDocument(ref, new DatabaseDebugObserver(ref, observer));
     }
     addDocument(ref, data) {
-        console.log(`Add to "${ref}"`, data);
+        console.log(`Add ${ref}:`, data);
         try {
             const result = super.addDocument(ref, data);
             return isAsync(result)
                 ? result.then(undefined, reason => {
-                    console.error(`Error adding to "${ref}"`, reason);
+                    console.error(`Error: Add ${ref}:`, reason);
                     throw reason;
                 })
                 : result;
         }
         catch (reason) {
-            console.error(`Error adding to "${ref}"`, reason);
+            console.error(`Error: Add ${ref}:`, reason);
             throw reason;
         }
     }
     setDocument(ref, data) {
-        console.log(`Set "${ref}"`, data);
+        console.log(`Set ${ref}:`, data);
         try {
             const result = super.setDocument(ref, data);
             return isAsync(result)
                 ? result.then(undefined, reason => {
-                    console.error(`Error setting "${ref}"`, reason);
+                    console.error(`Error: Set ${ref}:`, reason);
                     throw reason;
                 })
                 : result;
         }
         catch (reason) {
-            console.error(`Error setting "${ref}"`, reason);
+            console.error(`Error: Set ${ref}:`, reason);
             throw reason;
         }
     }
     updateDocument(ref, update) {
-        console.log(`Update "${ref}"`, update.updates);
+        console.log(`Update ${ref}:`, update.updates);
         try {
             const result = super.updateDocument(ref, update);
             return isAsync(result)
                 ? result.then(undefined, reason => {
-                    console.error(`Error updating "${ref}"`, reason);
+                    console.error(`Error: Update ${ref}:`, reason);
                     throw reason;
                 })
                 : result;
         }
         catch (reason) {
-            console.error(`Error updating "${ref}"`, reason);
+            console.error(`Error: Update ${ref}:`, reason);
             throw reason;
         }
     }
     deleteDocument(ref) {
-        console.log(`Delete "${ref}"`);
+        console.log(`Delete ${ref}:`);
         try {
             const result = super.deleteDocument(ref);
             return isAsync(result)
                 ? result.then(undefined, reason => {
-                    console.error(`Error deleting "${ref}"`, reason);
+                    console.error(`Error: Delete ${ref}:`, reason);
                     throw reason;
                 })
                 : result;
         }
         catch (reason) {
-            console.error(`Error deleting "${ref}"`, reason);
+            console.error(`Error: Delete ${ref}:`, reason);
             throw reason;
         }
     }
     getQuery(ref) {
-        console.log(`Get "${ref}"`);
+        console.log(`Get ${ref}:`);
         try {
             const results = super.getQuery(ref);
             return isAsync(results)
                 ? results.then(undefined, reason => {
-                    console.error(`Error getting "${ref}"`, reason);
+                    console.error(`Error: Get ${ref}:`, reason);
                     throw reason;
                 })
                 : results;
         }
         catch (reason) {
-            console.error(`Error getting "${ref}"`, reason);
+            console.error(`Error: Get ${ref}:`, reason);
             throw reason;
         }
     }
     subscribeQuery(ref, observer) {
-        console.log(`Subscribe "${ref}"`);
+        console.log(`Subscribe ${ref}:`);
         return super.subscribeQuery(ref, new DatabaseDebugObserver(ref, observer));
     }
     setQuery(ref, data) {
-        console.log(`Set "${ref}"`, data);
+        console.log(`Set ${ref}:`, data);
         try {
             const result = super.setQuery(ref, data);
             return isAsync(result)
                 ? result.then(undefined, reason => {
-                    console.error(`Error setting "${ref}"`, reason);
+                    console.error(`Error: Set ${ref}:`, reason);
                     throw reason;
                 })
                 : result;
         }
         catch (reason) {
-            console.error(`Error setting "${ref}"`, reason);
+            console.error(`Error: Set ${ref}:`, reason);
             throw reason;
         }
     }
     updateQuery(ref, update) {
-        console.log(`Update "${ref}"`, update.updates);
+        console.log(`Update ${ref}:`, update.updates);
         try {
             const result = super.updateQuery(ref, update);
             return isAsync(result)
                 ? result.then(undefined, reason => {
-                    console.error(`Error updating "${ref}"`, reason);
+                    console.error(`Error: Update ${ref}:`, reason);
                     throw reason;
                 })
                 : result;
         }
         catch (reason) {
-            console.error(`Error updating "${ref}"`, reason);
+            console.error(`Error: Update ${ref}:`, reason);
             throw reason;
         }
     }
     deleteQuery(ref) {
-        console.log(`Delete "${ref}"`);
+        console.log(`Delete ${ref}:`);
         try {
             const result = super.deleteQuery(ref);
             return isAsync(result)
                 ? result.then(undefined, reason => {
-                    console.error(`Error writing "${ref}"`, reason);
+                    console.error(`Error: Delete ${ref}:`, reason);
                     throw reason;
                 })
                 : result;
         }
         catch (reason) {
-            console.error(`Error writing "${ref}"`, reason);
+            console.error(`Error: Delete ${ref}:`, reason);
             throw reason;
         }
     }

package/util/jsx.d.ts

@@ -11,6 +11,7 @@ export declare type JSXElement<P extends JSXProps = JSXProps> = {
     type: string | JSXElementCreator<P>;
     props: P;
     key: string | number | null;
+    ref: null;
     $$typeof?: symbol;
 };
 /** JSX node (similar to `React.ReactNode`) */