on-zero 0.16.9 → 0.16.10

package/dist/esm/useQuery.aggregate.zero.test.mjs.map

@@ -0,0 +1 @@
+{"version":3,"names":["createBuilder","createSchema","number","string","table","count","defineAggregates","sum","act","createRoot","afterEach","beforeEach","expect","test","createZeroClient","onMutationError","mutations","jsx","globalThis","IS_REACT_ACT_ENVIRONMENT","expense","columns","id","category","amount","primaryKey","categorySpend","expenseCount","spent","schema","tables","enableLegacyQueries","builder","aggregates","source","target","mode","groupBy","expenseMutations","insert","context","value","tx","mutate","categorySpendQuery","args","where","client","models","groupedQueries","instanceName","container","root","stopErrorSink","silentLogSink","log","document","createElement","activeZero","waitForZero","unmount","close","Promise","resolve","setTimeout","rows","Probe","useQuery","render","ProvideZero","server","userID","authData","logSink","children","Reflect","get","zero","expenseMutate","Error","result","apply","toEqual","objectContaining"],"sources":["../../src/useQuery.aggregate.zero.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/useQuery.aggregate.zero.test.native.js

@@ -0,0 +1,131 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { createBuilder, createSchema, number, string, table } from "@rocicorp/zero";
+import { count, defineAggregates, sum } from "orez-lite/aggregate";
+import { act } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeEach, expect, test } from "vitest";
+import { createZeroClient } from "./createZeroClient.native.js";
+import { onMutationError } from "./helpers/useMutation.native.js";
+import { mutations } from "./mutations.native.js";
+function _type_of(obj) {
+  "@swc/helpers - typeof";
+
+  return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
+globalThis.IS_REACT_ACT_ENVIRONMENT = true;
+var expense = table("expense").columns({
+  id: string(),
+  category: string(),
+  amount: number()
+}).primaryKey("id");
+var categorySpend = table("categorySpend").columns({
+  category: string(),
+  expenseCount: number(),
+  spent: number()
+}).primaryKey("category");
+var schema = createSchema({
+  tables: [expense, categorySpend],
+  enableLegacyQueries: true
+});
+var builder = createBuilder(schema);
+var aggregates = defineAggregates(schema, {
+  categorySpend: {
+    source: "expense",
+    target: "categorySpend",
+    mode: "materialized",
+    groupBy: {
+      category: "category"
+    },
+    columns: {
+      expenseCount: count(),
+      spent: sum("amount")
+    }
+  }
+});
+var expenseMutations = mutations(expense, function () {
+  return true;
+}, {
+  insert: async function insert(context, value) {
+    await context.tx.mutate.expense.insert(value);
+  }
+});
+var categorySpendQuery = function categorySpendQuery2(args) {
+  return builder.categorySpend.where("category", args.category);
+};
+var client = createZeroClient({
+  schema,
+  models: {
+    expense: {
+      mutate: expenseMutations
+    }
+  },
+  groupedQueries: {
+    expense: {
+      categorySpendQuery
+    }
+  },
+  aggregates,
+  instanceName: "aggregate-react-view-test"
+});
+var container;
+var root;
+var stopErrorSink;
+var silentLogSink = {
+  log() {}
+};
+beforeEach(function () {
+  stopErrorSink = onMutationError(function () {});
+  container = document.createElement("div");
+  root = createRoot(container);
+});
+afterEach(async function () {
+  var activeZero = await client.waitForZero();
+  act(function () {
+    return root.unmount();
+  });
+  await activeZero.close();
+  await new Promise(function (resolve) {
+    return setTimeout(resolve, 0);
+  });
+  stopErrorSink();
+});
+test("a mounted useQuery view updates after a custom mutation projects an aggregate", async function () {
+  var rows = [];
+  function Probe() {
+    ;
+    [rows] = client.useQuery(categorySpendQuery, {
+      category: "Food"
+    });
+    return null;
+  }
+  await act(async function () {
+    root.render(/* @__PURE__ */_jsx(client.ProvideZero, {
+      server: "https://on-zero-aggregate.test",
+      userID: "test-user",
+      authData: {},
+      logSink: silentLogSink,
+      children: /* @__PURE__ */_jsx(Probe, {})
+    }));
+  });
+  await act(async function () {
+    var mutate = Reflect.get(client.zero, "mutate");
+    var expenseMutate = Reflect.get(mutate, "expense");
+    var insert2 = Reflect.get(expenseMutate, "insert");
+    if (typeof insert2 !== "function") throw new Error("expense insert mutator is unavailable");
+    var result = Reflect.apply(insert2, expenseMutate, [{
+      id: "expense-1",
+      category: "Food",
+      amount: 4250
+    }]);
+    if (!result || (typeof result === "undefined" ? "undefined" : _type_of(result)) !== "object") {
+      throw new Error("expense insert did not return a mutation result");
+    }
+    await Reflect.get(result, "client");
+  });
+  expect(rows).toEqual([expect.objectContaining({
+    category: "Food",
+    expenseCount: 1,
+    spent: 4250
+  })]);
+});
+//# sourceMappingURL=useQuery.aggregate.zero.test.native.js.map

package/dist/esm/useQuery.aggregate.zero.test.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["jsx","_jsx","createBuilder","createSchema","number","string","table","count","defineAggregates","sum","act","createRoot","afterEach","beforeEach","expect","test","createZeroClient","onMutationError","mutations","_type_of","obj","Symbol","constructor","globalThis","IS_REACT_ACT_ENVIRONMENT","expense","columns","id","category","amount","primaryKey","categorySpend","expenseCount","spent","schema","tables","enableLegacyQueries","builder","aggregates","source","target","mode","groupBy","expenseMutations","insert","context","value","tx","mutate","categorySpendQuery","categorySpendQuery2","args","where","client","models","groupedQueries","instanceName","container","root","stopErrorSink","silentLogSink","log","document","createElement","activeZero","waitForZero","unmount","close","Promise","resolve","setTimeout"],"sources":["../../src/useQuery.aggregate.zero.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "on-zero",
-  "version": "0.16.9",
+  "version": "0.16.10",
   "description": "A typed layer over @rocicorp/zero with queries, mutations, and permissions",
   "sideEffects": false,
   "files": [
@@ -105,7 +105,7 @@
     "chokidar": "^4.0.3",
     "citty": "^0.1.6",
     "dequal": "^2.0.3",
-    "orez-lite": "0.16.9",
+    "orez-lite": "0.16.10",
     "valibot": "^1.1.0"
   },
   "peerDependencies": {

package/src/generate-layout.ts

@@ -692,6 +692,83 @@ function queriedTables(
   return reached
 }
 
+function aggregateTables(
+  ts: typeof import('typescript'),
+  namespace: DataNamespace
+): string[] {
+  if (!namespace.aggregatePath) return []
+  const source = ts.createSourceFile(
+    namespace.aggregatePath,
+    readFileSync(namespace.aggregatePath, 'utf8'),
+    ts.ScriptTarget.Latest,
+    true
+  )
+  const unwrap = (node: ts.Expression): ts.Expression => {
+    let current = node
+    while (
+      ts.isSatisfiesExpression(current) ||
+      ts.isAsExpression(current) ||
+      ts.isParenthesizedExpression(current)
+    ) {
+      current = current.expression
+    }
+    return current
+  }
+  const tables = new Set<string>()
+  for (const statement of source.statements) {
+    if (!ts.isVariableStatement(statement)) continue
+    if (
+      !statement.modifiers?.some(
+        (modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword
+      )
+    ) {
+      continue
+    }
+    for (const declaration of statement.declarationList.declarations) {
+      if (
+        !ts.isIdentifier(declaration.name) ||
+        declaration.name.text !== 'aggregates' ||
+        !declaration.initializer
+      ) {
+        continue
+      }
+      const definitions = unwrap(declaration.initializer)
+      if (!ts.isObjectLiteralExpression(definitions)) {
+        throw new Error(
+          `[on-zero] ${namespace.aggregatePath} must export aggregates as an object literal`
+        )
+      }
+      for (const property of definitions.properties) {
+        if (!ts.isPropertyAssignment(property)) {
+          throw new Error(
+            `[on-zero] ${namespace.aggregatePath} aggregate definitions must use explicit properties`
+          )
+        }
+        const definition = unwrap(property.initializer)
+        if (!ts.isObjectLiteralExpression(definition)) {
+          throw new Error(
+            `[on-zero] ${namespace.aggregatePath} aggregate ${property.name.getText(source)} must be an object literal`
+          )
+        }
+        for (const fieldName of ['source', 'target']) {
+          const field = definition.properties.find(
+            (candidate): candidate is ts.PropertyAssignment =>
+              ts.isPropertyAssignment(candidate) &&
+              propertyName(ts, candidate.name) === fieldName
+          )
+          if (!field || !ts.isStringLiteralLike(unwrap(field.initializer))) {
+            throw new Error(
+              `[on-zero] ${namespace.aggregatePath} aggregate ${property.name.getText(source)} ${fieldName} must be a string literal`
+            )
+          }
+          tables.add((unwrap(field.initializer) as ts.StringLiteralLike).text)
+        }
+      }
+    }
+  }
+  return [...tables].sort()
+}
+
 function mutationSupportTables(
   ts: typeof import('typescript'),
   baseDir: string,
@@ -890,6 +967,18 @@ export function discoverDataLayout(
     )
     const syncTables = new Set(tables)
     for (const namespace of instance.namespaces) {
+      for (const table of aggregateTables(ts, namespace)) {
+        const owner = tableOwners.get(table) ?? relatedOwners.get(table)
+        if (owner && owner !== instance.name) {
+          throw new Error(
+            `[on-zero] ${namespace.name} aggregates in instance '${instance.name}' reach ` +
+              `table '${table}' owned by instance '${owner}'`
+          )
+        }
+        relatedOwners.set(table, instance.name)
+        tables.add(table)
+        syncTables.add(table)
+      }
       for (const reached of queriedTables(ts, namespace, relations)) {
         const owner = tableOwners.get(reached.table) ?? relatedOwners.get(reached.table)
         if (owner && owner !== instance.name) {

package/src/generate-lite.test.ts

@@ -129,6 +129,16 @@ describe('generateLite', () => {
       dir: DIR,
       parse: makeParse({
         [`${DIR}/post/queries.ts`]: { mutations: [], queries: [] },
+        [`${DIR}/post/aggregates.ts`]: {
+          mutations: [],
+          queries: [],
+          aggregateTables: [],
+        },
+        [`${DIR}/order/aggregates.ts`]: {
+          mutations: [],
+          queries: [],
+          aggregateTables: [],
+        },
       }),
     })
 
@@ -222,6 +232,31 @@ describe('generateLite', () => {
     expect(result.instances[0]?.syncTables).toEqual(['expense'])
   })
 
+  test('derives aggregate source and target membership', () => {
+    const mutationsPath = `${DIR}/expense/mutations.ts`
+    const aggregatesPath = `${DIR}/expense/aggregates.ts`
+    const result = generateLite({
+      files: {
+        [mutationsPath]: '// mutations',
+        [aggregatesPath]: '// aggregates',
+      },
+      dir: DIR,
+      parse: makeParse({
+        [mutationsPath]: {
+          mutations: [{ modelName: 'expense', handlers: [], schema: null }],
+          queries: [],
+        },
+        [aggregatesPath]: {
+          mutations: [],
+          queries: [],
+          aggregateTables: ['expense', 'dashboardSummary'],
+        },
+      }),
+    })
+
+    expect(result.instances[0]?.syncTables).toEqual(['dashboardSummary', 'expense'])
+  })
+
   test('includes a fileless support table in every lite instance that uses it', () => {
     const files = {
       [`${DIR}/on-zero.config.ts`]: `export default defineConfig({ instances: { control: { dir: './planes/control', supportTables: ['manual'] }, project: { scope: 'projectId' } } })`,

package/src/generate-lite.ts

@@ -110,6 +110,8 @@ export type LiteParsedFile = {
   queries: LiteQueryExport[]
   relations?: LiteRelationInfo[]
   tables?: LiteTableInfo[]
+  // source and target table names declared by exported aggregate definitions.
+  aggregateTables?: string[]
   // static table names reached through tx.mutate.<table> or tx.query.<table>.
   // element access such as tx.mutate[name] is intentionally omitted.
   supportTables?: string[]
@@ -447,6 +449,17 @@ export function generateLite(opts: LiteGenerateOptions): LiteGenerateResult {
     (namespace): namespace is LiteNamespace & { modelPath: string } =>
       namespace.modelPath !== null
   )
+  const aggregateTables = new Map<string, string[]>()
+  for (const namespace of namespaces) {
+    if (!namespace.aggregatePath) continue
+    const parsed = parse(files[namespace.aggregatePath]!, namespace.aggregatePath)
+    if (parsed.parseError) {
+      throw new Error(
+        `[on-zero] unable to derive aggregate membership from ${namespace.aggregatePath}: ${parsed.parseError}`
+      )
+    }
+    aggregateTables.set(namespace.name, [...new Set(parsed.aggregateTables ?? [])])
+  }
   const relations = new Map<string, Map<string, string>>()
   const tableColumns = new Map<string, Set<string>>()
   for (const path of Object.keys(files).filter(
@@ -643,6 +656,18 @@ export function generateLite(opts: LiteGenerateOptions): LiteGenerateResult {
     )
     const synced = new Set(direct)
     for (const namespace of instance.namespaces) {
+      for (const table of aggregateTables.get(namespace.name) ?? []) {
+        const owner = owners.get(table) ?? relatedOwners.get(table)
+        if (owner && owner !== instance.name) {
+          throw new Error(
+            `[on-zero] ${namespace.name} aggregates in instance '${instance.name}' reach ` +
+              `table '${table}' owned by instance '${owner}'`
+          )
+        }
+        relatedOwners.set(table, instance.name)
+        direct.add(table)
+        synced.add(table)
+      }
       for (const query of queryPaths.get(namespace.name) ?? []) {
         const rootOwner =
           owners.get(query.rootTable) ?? relatedOwners.get(query.rootTable)

package/src/generate.test.ts

@@ -219,6 +219,37 @@ export async function writeAudit(tx: Transaction) {
     })
   })
 
+  test('derives aggregate source and target membership', async () => {
+    writeFileSync(
+      join(dataDir(), 'expense/mutations.ts'),
+      `export const mutate = mutations('expense', permissions, { save: async () => {} })`
+    )
+    writeFileSync(
+      join(dataDir(), 'expense/aggregates.ts'),
+      `export const aggregates = {
+        dashboardSummary: {
+          source: 'expense',
+          target: 'dashboardSummary',
+          mode: 'materialized',
+          groupBy: { userId: 'userId' },
+          columns: { expenseCount: count() },
+        },
+      } satisfies AggregateDefinitions<typeof schema>`
+    )
+
+    await expect(deriveDataMembership({ dir: dataDir() })).resolves.toEqual({
+      instances: {
+        default: {
+          tables: ['dashboardSummary', 'expense'],
+          syncTables: ['dashboardSummary', 'expense'],
+          supportTables: [],
+          scope: null,
+        },
+      },
+      allTables: ['dashboardSummary', 'expense'],
+    })
+  })
+
   test('includes a fileless support table in every instance that uses it', async () => {
     writeFileSync(
       join(dataDir(), 'control/account.ts'),

package/src/useQuery.aggregate.zero.test.tsx

@@ -0,0 +1,115 @@
+// @vitest-environment jsdom
+
+import { createBuilder, createSchema, number, string, table } from '@rocicorp/zero'
+import { count, defineAggregates, sum } from 'orez-lite/aggregate'
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, expect, test } from 'vitest'
+
+import { createZeroClient } from './createZeroClient'
+import { onMutationError } from './helpers/useMutation'
+import { mutations } from './mutations'
+
+import type { MutatorContext } from './types'
+
+declare global {
+  // eslint-disable-next-line no-var
+  var IS_REACT_ACT_ENVIRONMENT: boolean | undefined
+}
+globalThis.IS_REACT_ACT_ENVIRONMENT = true
+
+const expense = table('expense')
+  .columns({ id: string(), category: string(), amount: number() })
+  .primaryKey('id')
+const categorySpend = table('categorySpend')
+  .columns({ category: string(), expenseCount: number(), spent: number() })
+  .primaryKey('category')
+const schema = createSchema({
+  tables: [expense, categorySpend],
+  enableLegacyQueries: true,
+})
+const builder = createBuilder(schema)
+const aggregates = defineAggregates(schema, {
+  categorySpend: {
+    source: 'expense',
+    target: 'categorySpend',
+    mode: 'materialized',
+    groupBy: { category: 'category' },
+    columns: { expenseCount: count(), spent: sum('amount') },
+  },
+})
+const expenseMutations = mutations(expense, () => true, {
+  insert: async (
+    context: MutatorContext,
+    value: { id: string; category: string; amount: number }
+  ) => {
+    await context.tx.mutate.expense.insert(value)
+  },
+})
+const categorySpendQuery = (args: { category: string }) =>
+  builder.categorySpend.where('category', args.category)
+const client = createZeroClient({
+  schema,
+  models: { expense: { mutate: expenseMutations } },
+  groupedQueries: { expense: { categorySpendQuery } },
+  aggregates,
+  instanceName: 'aggregate-react-view-test',
+})
+
+let container: HTMLDivElement
+let root: Root
+let stopErrorSink: () => void
+const silentLogSink = { log() {} }
+
+beforeEach(() => {
+  stopErrorSink = onMutationError(() => {})
+  container = document.createElement('div')
+  root = createRoot(container)
+})
+
+afterEach(async () => {
+  const activeZero = await client.waitForZero()
+  act(() => root.unmount())
+  await activeZero.close()
+  await new Promise((resolve) => setTimeout(resolve, 0))
+  stopErrorSink()
+})
+
+test('a mounted useQuery view updates after a custom mutation projects an aggregate', async () => {
+  let rows: readonly { category: string; expenseCount: number; spent: number }[] = []
+  function Probe() {
+    ;[rows] = client.useQuery(categorySpendQuery, { category: 'Food' })
+    return null
+  }
+
+  await act(async () => {
+    root.render(
+      <client.ProvideZero
+        server="https://on-zero-aggregate.test"
+        userID="test-user"
+        authData={{}}
+        logSink={silentLogSink}
+      >
+        <Probe />
+      </client.ProvideZero>
+    )
+  })
+  await act(async () => {
+    const mutate = Reflect.get(client.zero, 'mutate')
+    const expenseMutate = Reflect.get(mutate, 'expense')
+    const insert = Reflect.get(expenseMutate, 'insert')
+    if (typeof insert !== 'function')
+      throw new Error('expense insert mutator is unavailable')
+    const result = Reflect.apply(insert, expenseMutate, [
+      { id: 'expense-1', category: 'Food', amount: 4250 },
+    ])
+    if (!result || typeof result !== 'object') {
+      throw new Error('expense insert did not return a mutation result')
+    }
+    await Reflect.get(result, 'client')
+  })
+
+  expect(rows).toEqual([
+    expect.objectContaining({ category: 'Food', expenseCount: 1, spent: 4250 }),
+  ])
+})

package/types/generate-layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-layout.d.ts","sourceRoot":"","sources":["../src/generate-layout.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,WAAW,EAAE,MAAM,EAAE,CAAA;CACtB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,UAAU,EAAE,aAAa,EAAE,CAAA;IAC3B,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,uDAAuD;IACvD,qBAAqB,EAAE,MAAM,EAAE,CAAA;CAChC,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,SAAS,EAAE,YAAY,EAAE,CAAA;IACzB,UAAU,EAAE,aAAa,EAAE,CAAA;IAC3B,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,WAAW,EAAE,MAAM,EAAE,CAAA;CACtB,CAAA;AAmxBD,wBAAgB,kBAAkB,CAChC,EAAE,EAAE,cAAc,YAAY,CAAC,EAC/B,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,GAClB,UAAU,CAwHZ;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAEzE"}
+{"version":3,"file":"generate-layout.d.ts","sourceRoot":"","sources":["../src/generate-layout.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,WAAW,EAAE,MAAM,EAAE,CAAA;CACtB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,UAAU,EAAE,aAAa,EAAE,CAAA;IAC3B,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,uDAAuD;IACvD,qBAAqB,EAAE,MAAM,EAAE,CAAA;CAChC,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,SAAS,EAAE,YAAY,EAAE,CAAA;IACzB,UAAU,EAAE,aAAa,EAAE,CAAA;IAC3B,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,WAAW,EAAE,MAAM,EAAE,CAAA;CACtB,CAAA;AAg2BD,wBAAgB,kBAAkB,CAChC,EAAE,EAAE,cAAc,YAAY,CAAC,EAC/B,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,GAClB,UAAU,CAoIZ;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAEzE"}

package/types/generate-lite.d.ts

@@ -41,6 +41,7 @@ export type LiteParsedFile = {
     queries: LiteQueryExport[];
     relations?: LiteRelationInfo[];
     tables?: LiteTableInfo[];
+    aggregateTables?: string[];
     supportTables?: string[];
     imports?: string[];
     dataConfig?: LiteDataConfig;

package/types/generate-lite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-lite.d.ts","sourceRoot":"","sources":["../src/generate-lite.ts"],"names":[],"mappings":"AAmCA,MAAM,MAAM,kBAAkB,GAAG;IAI/B,SAAS,EAAE,MAAM,CAAA;IAEjB,QAAQ,EAAE,KAAK,CAAC;QAEd,IAAI,EAAE,MAAM,CAAA;QAMZ,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;KAC7B,CAAC,CAAA;IAKF,MAAM,EAAE,cAAc,GAAG,IAAI,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,EAAE,CAAA;IAGrB,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACtD,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAE5B,IAAI,EAAE,MAAM,CAAA;IAIZ,SAAS,EAAE,MAAM,CAAA;IAIjB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;IAG5B,YAAY,EAAE,MAAM,EAAE,EAAE,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,MAAM,CACf,MAAM,EACN;QACE,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;KACzB,CACF,CAAA;CACF,CAAA;AAGD,MAAM,MAAM,cAAc,GAAG;IAG3B,SAAS,EAAE,kBAAkB,EAAE,CAAA;IAC/B,OAAO,EAAE,eAAe,EAAE,CAAA;IAC1B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAC9B,MAAM,CAAC,EAAE,aAAa,EAAE,CAAA;IAGxB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IAExB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAElB,UAAU,CAAC,EAAE,cAAc,CAAA;IAE3B,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAID,MAAM,MAAM,WAAW,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,cAAc,CAAA;AAElF,MAAM,MAAM,mBAAmB,GAAG;IAGhC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAG7B,GAAG,EAAE,MAAM,CAAA;IAEX,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,WAAW,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAG/B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAI7B,SAAS,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,EAAE,CAAC;QAAC,aAAa,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAA;IACjF,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,CAAA;IACrB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAgSD,wBAAgB,YAAY,CAAC,IAAI,EAAE,mBAAmB,GAAG,kBAAkB,CA6X1E"}
+{"version":3,"file":"generate-lite.d.ts","sourceRoot":"","sources":["../src/generate-lite.ts"],"names":[],"mappings":"AAmCA,MAAM,MAAM,kBAAkB,GAAG;IAI/B,SAAS,EAAE,MAAM,CAAA;IAEjB,QAAQ,EAAE,KAAK,CAAC;QAEd,IAAI,EAAE,MAAM,CAAA;QAMZ,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;KAC7B,CAAC,CAAA;IAKF,MAAM,EAAE,cAAc,GAAG,IAAI,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,EAAE,CAAA;IAGrB,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACtD,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAE5B,IAAI,EAAE,MAAM,CAAA;IAIZ,SAAS,EAAE,MAAM,CAAA;IAIjB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;IAG5B,YAAY,EAAE,MAAM,EAAE,EAAE,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,MAAM,CACf,MAAM,EACN;QACE,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;KACzB,CACF,CAAA;CACF,CAAA;AAGD,MAAM,MAAM,cAAc,GAAG;IAG3B,SAAS,EAAE,kBAAkB,EAAE,CAAA;IAC/B,OAAO,EAAE,eAAe,EAAE,CAAA;IAC1B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAC9B,MAAM,CAAC,EAAE,aAAa,EAAE,CAAA;IAExB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAA;IAG1B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IAExB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAElB,UAAU,CAAC,EAAE,cAAc,CAAA;IAE3B,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAID,MAAM,MAAM,WAAW,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,cAAc,CAAA;AAElF,MAAM,MAAM,mBAAmB,GAAG;IAGhC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAG7B,GAAG,EAAE,MAAM,CAAA;IAEX,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,WAAW,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAG/B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAI7B,SAAS,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,EAAE,CAAC;QAAC,aAAa,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAA;IACjF,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,CAAA;IACrB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAgSD,wBAAgB,YAAY,CAAC,IAAI,EAAE,mBAAmB,GAAG,kBAAkB,CAoZ1E"}

package/types/useQuery.aggregate.zero.test.d.ts

@@ -0,0 +1,5 @@
+declare global {
+    var IS_REACT_ACT_ENVIRONMENT: boolean | undefined;
+}
+export {};
+//# sourceMappingURL=useQuery.aggregate.zero.test.d.ts.map

package/types/useQuery.aggregate.zero.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useQuery.aggregate.zero.test.d.ts","sourceRoot":"","sources":["../src/useQuery.aggregate.zero.test.tsx"],"names":[],"mappings":"AAcA,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,wBAAwB,EAAE,OAAO,GAAG,SAAS,CAAA;CAClD"}