Fixed to useQuery

Author: tonsky

client/packages/core/src/instaql.js

@@ -730,7 +730,7 @@ function formatPageInfo(pageInfo) {
 
 export default function query({ store, pageInfo, aggregate }, q) {
   const data = Object.keys(q).reduce(function reduceResult(res, k) {
-    if (aggregate?.[k]) {
+    if (aggregate?.[k] || '$$ruleParams' === k) {
       // Aggregate doesn't return any join rows and has no children,
       // so don't bother querying further
       return res;

client/packages/react/src/InstantReactAbstractDatabase.ts

@@ -11,6 +11,7 @@ import {
   type PresenceResponse,
   type RoomSchemaShape,
   type InstaQLParams,
+  type InstaQLOptions,
   type InstantConfig,
   type PageInfoResponse,
   InstantCoreDatabase,
@@ -155,8 +156,9 @@ export default abstract class InstantReactAbstractDatabase<
    */
   useQuery = <Q extends InstaQLParams<Schema>>(
     query: null | Q,
+    opts?: InstaQLOptions,
   ): InstaQLLifecycleState<Schema, Q> => {
-    return useQueryInternal(this._core, query).state;
+    return useQueryInternal(this._core, query, opts).state;
   };
 
   /**

client/sandbox/react-nextjs/pages/play/ruleParams.tsx

@@ -0,0 +1,92 @@
+import { i, id, init, tx } from '@instantdb/react';
+import { useEffect } from 'react';
+import config from '../../config';
+
+const schema = i.schema({
+  entities: {
+    playDocs: i.entity({
+      title: i.string(),
+      secret: i.string(),
+    }),
+  },
+});
+
+const db = init({ ...config, schema });
+
+const secrets = ['one', 'two', 'three'];
+
+function randInt(min: number, max: number) {
+  return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+
+function addDoc() {
+  return db.transact(
+    tx.playDocs[id()].update({
+      title: 'doc ' + randInt(10000, 99999),
+      secret: secrets[randInt(0, 2)],
+    }),
+  );
+}
+
+function DocList({ q }) {
+  if (q.isLoading) {
+    return <div>Loading...</div>;
+  }
+
+  if (q.error) {
+    return <div>Error: {q.error.message}</div>;
+  }
+
+  return (
+    <ul className="pl-4 list-disk">
+      {q.data.playDocs.map((doc) => {
+        return (
+          <li className="list-disk">
+            '{doc.title}', secret: '{doc.secret}'
+          </li>
+        );
+      })}
+    </ul>
+  );
+}
+
+function Main() {
+  const queries = secrets.map((secret) => [
+    secret,
+    db.useQuery({ playDocs: {} }, { ruleParams: { secret } }),
+  ]);
+
+  return (
+    <div className="p-1">
+      <button
+        className="px-4 py-2 bg-slate-500 text-white rounded"
+        onClick={addDoc}
+      >
+        New doc
+      </button>
+      {queries.map(([secret, q]) => {
+        return (
+          <>
+            <div>Docs for {secret}:</div>
+            <DocList q={q} />
+          </>
+        );
+      })}
+    </div>
+  );
+}
+
+function App() {
+  return <Main />;
+}
+
+export default App;
+
+// copy this to dashboard
+const rules = {
+  playDocs: {
+    allow: {
+      view: 'ruleParams.secret == data.secret',
+    },
+  },
+};

server/src/tool.clj

@@ -262,7 +262,7 @@
                   form))
               form)]
     (locking p-lock
-      (println (str "#p " form " " position "\n=> " (pprint res))))
+      (println (str "\033[90m#p " form " " position "\n=>\033[0m " (pprint res))))
     res))
 
 (defn p