over-zero 0.0.35 → 0.0.37

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (141) hide show
  1. package/dist/cjs/cli.cjs +16 -10
  2. package/dist/cjs/cli.js +15 -8
  3. package/dist/cjs/cli.js.map +1 -1
  4. package/dist/cjs/cli.native.js +18 -10
  5. package/dist/cjs/cli.native.js.map +1 -1
  6. package/dist/cjs/createPermissions.cjs +7 -6
  7. package/dist/cjs/createPermissions.js +6 -6
  8. package/dist/cjs/createPermissions.js.map +1 -1
  9. package/dist/cjs/createPermissions.native.js +8 -6
  10. package/dist/cjs/createPermissions.native.js.map +1 -1
  11. package/dist/cjs/createUseQuery.cjs +18 -27
  12. package/dist/cjs/createUseQuery.js +18 -19
  13. package/dist/cjs/createUseQuery.js.map +1 -1
  14. package/dist/cjs/createUseQuery.native.js +19 -32
  15. package/dist/cjs/createUseQuery.native.js.map +1 -1
  16. package/dist/cjs/createZeroClient.cjs +38 -16
  17. package/dist/cjs/createZeroClient.js +40 -28
  18. package/dist/cjs/createZeroClient.js.map +2 -2
  19. package/dist/cjs/createZeroClient.native.js +45 -21
  20. package/dist/cjs/createZeroClient.native.js.map +1 -1
  21. package/dist/cjs/createZeroServer.cjs +16 -16
  22. package/dist/cjs/createZeroServer.js +15 -19
  23. package/dist/cjs/createZeroServer.js.map +2 -2
  24. package/dist/cjs/createZeroServer.native.js +19 -50
  25. package/dist/cjs/createZeroServer.native.js.map +1 -1
  26. package/dist/cjs/helpers/batchQuery.cjs +1 -1
  27. package/dist/cjs/helpers/batchQuery.js +1 -1
  28. package/dist/cjs/helpers/batchQuery.native.js +1 -1
  29. package/dist/cjs/helpers/batchQuery.native.js.map +1 -1
  30. package/dist/cjs/helpers/createMutators.cjs +1 -1
  31. package/dist/cjs/helpers/createMutators.js +1 -1
  32. package/dist/cjs/helpers/createMutators.js.map +1 -1
  33. package/dist/cjs/helpers/createMutators.native.js +1 -1
  34. package/dist/cjs/helpers/didRunPermissionCheck.cjs +1 -1
  35. package/dist/cjs/helpers/didRunPermissionCheck.js +1 -1
  36. package/dist/cjs/helpers/didRunPermissionCheck.native.js +1 -1
  37. package/dist/cjs/helpers/didRunPermissionCheck.native.js.map +1 -1
  38. package/dist/cjs/helpers/ensureLoggedIn.cjs +1 -1
  39. package/dist/cjs/helpers/ensureLoggedIn.js +1 -1
  40. package/dist/cjs/helpers/ensureLoggedIn.js.map +1 -1
  41. package/dist/cjs/helpers/ensureLoggedIn.native.js +1 -1
  42. package/dist/cjs/helpers/mutatorContext.cjs +1 -1
  43. package/dist/cjs/helpers/mutatorContext.js +1 -1
  44. package/dist/cjs/helpers/mutatorContext.native.js +1 -1
  45. package/dist/cjs/helpers/mutatorContext.native.js.map +1 -1
  46. package/dist/cjs/helpers/prettyFormatZeroQuery.cjs +1 -1
  47. package/dist/cjs/helpers/prettyFormatZeroQuery.js +1 -1
  48. package/dist/cjs/helpers/prettyFormatZeroQuery.native.js +1 -1
  49. package/dist/cjs/helpers/prettyFormatZeroQuery.native.js.map +1 -1
  50. package/dist/cjs/helpers/useZeroDebug.cjs +3 -3
  51. package/dist/cjs/helpers/useZeroDebug.js +2 -2
  52. package/dist/cjs/helpers/useZeroDebug.js.map +1 -1
  53. package/dist/cjs/helpers/useZeroDebug.native.js +5 -3
  54. package/dist/cjs/helpers/useZeroDebug.native.js.map +1 -1
  55. package/dist/cjs/where.cjs +1 -1
  56. package/dist/cjs/where.js +1 -1
  57. package/dist/cjs/where.js.map +1 -1
  58. package/dist/cjs/where.native.js +1 -1
  59. package/dist/cjs/where.native.js.map +1 -1
  60. package/dist/esm/cli.js +15 -8
  61. package/dist/esm/cli.js.map +1 -1
  62. package/dist/esm/cli.mjs +16 -10
  63. package/dist/esm/cli.mjs.map +1 -1
  64. package/dist/esm/cli.native.js +18 -10
  65. package/dist/esm/cli.native.js.map +1 -1
  66. package/dist/esm/createPermissions.js +5 -4
  67. package/dist/esm/createPermissions.js.map +1 -1
  68. package/dist/esm/createPermissions.mjs +5 -4
  69. package/dist/esm/createPermissions.mjs.map +1 -1
  70. package/dist/esm/createPermissions.native.js +6 -4
  71. package/dist/esm/createPermissions.native.js.map +1 -1
  72. package/dist/esm/createUseQuery.js +17 -19
  73. package/dist/esm/createUseQuery.js.map +1 -1
  74. package/dist/esm/createUseQuery.mjs +17 -26
  75. package/dist/esm/createUseQuery.mjs.map +1 -1
  76. package/dist/esm/createUseQuery.native.js +18 -31
  77. package/dist/esm/createUseQuery.native.js.map +1 -1
  78. package/dist/esm/createZeroClient.js +55 -30
  79. package/dist/esm/createZeroClient.js.map +2 -2
  80. package/dist/esm/createZeroClient.mjs +39 -17
  81. package/dist/esm/createZeroClient.mjs.map +1 -1
  82. package/dist/esm/createZeroClient.native.js +47 -23
  83. package/dist/esm/createZeroClient.native.js.map +1 -1
  84. package/dist/esm/createZeroServer.js +18 -20
  85. package/dist/esm/createZeroServer.js.map +1 -1
  86. package/dist/esm/createZeroServer.mjs +16 -16
  87. package/dist/esm/createZeroServer.mjs.map +1 -1
  88. package/dist/esm/createZeroServer.native.js +19 -50
  89. package/dist/esm/createZeroServer.native.js.map +1 -1
  90. package/dist/esm/helpers/batchQuery.js +1 -1
  91. package/dist/esm/helpers/batchQuery.mjs +1 -1
  92. package/dist/esm/helpers/batchQuery.native.js +1 -1
  93. package/dist/esm/helpers/createMutators.js +1 -1
  94. package/dist/esm/helpers/createMutators.mjs +1 -1
  95. package/dist/esm/helpers/createMutators.native.js +1 -1
  96. package/dist/esm/helpers/didRunPermissionCheck.js +1 -1
  97. package/dist/esm/helpers/didRunPermissionCheck.mjs +1 -1
  98. package/dist/esm/helpers/didRunPermissionCheck.native.js +1 -1
  99. package/dist/esm/helpers/ensureLoggedIn.js +1 -1
  100. package/dist/esm/helpers/ensureLoggedIn.mjs +1 -1
  101. package/dist/esm/helpers/ensureLoggedIn.native.js +1 -1
  102. package/dist/esm/helpers/mutatorContext.js +1 -1
  103. package/dist/esm/helpers/mutatorContext.mjs +1 -1
  104. package/dist/esm/helpers/mutatorContext.native.js +1 -1
  105. package/dist/esm/helpers/prettyFormatZeroQuery.js +1 -1
  106. package/dist/esm/helpers/prettyFormatZeroQuery.mjs +1 -1
  107. package/dist/esm/helpers/prettyFormatZeroQuery.native.js +1 -1
  108. package/dist/esm/helpers/useZeroDebug.js +2 -2
  109. package/dist/esm/helpers/useZeroDebug.js.map +1 -1
  110. package/dist/esm/helpers/useZeroDebug.mjs +3 -3
  111. package/dist/esm/helpers/useZeroDebug.mjs.map +1 -1
  112. package/dist/esm/helpers/useZeroDebug.native.js +5 -3
  113. package/dist/esm/helpers/useZeroDebug.native.js.map +1 -1
  114. package/dist/esm/where.js +1 -1
  115. package/dist/esm/where.mjs +1 -1
  116. package/dist/esm/where.native.js +1 -1
  117. package/package.json +2 -2
  118. package/readme.md +20 -6
  119. package/src/cli.ts +23 -22
  120. package/src/createPermissions.ts +6 -4
  121. package/src/createUseQuery.tsx +34 -69
  122. package/src/createZeroClient.tsx +81 -33
  123. package/src/createZeroServer.ts +27 -35
  124. package/src/helpers/batchQuery.ts +1 -1
  125. package/src/helpers/createMutators.ts +1 -1
  126. package/src/helpers/didRunPermissionCheck.ts +1 -1
  127. package/src/helpers/ensureLoggedIn.ts +1 -1
  128. package/src/helpers/mutatorContext.ts +1 -1
  129. package/src/helpers/prettyFormatZeroQuery.ts +1 -1
  130. package/src/helpers/useZeroDebug.ts +3 -3
  131. package/src/types.ts +2 -2
  132. package/src/where.ts +1 -1
  133. package/types/createPermissions.d.ts.map +1 -1
  134. package/types/createUseQuery.d.ts +7 -9
  135. package/types/createUseQuery.d.ts.map +1 -1
  136. package/types/createZeroClient.d.ts +5 -6
  137. package/types/createZeroClient.d.ts.map +1 -1
  138. package/types/createZeroServer.d.ts +69 -18
  139. package/types/createZeroServer.d.ts.map +1 -1
  140. package/types/types.d.ts +2 -2
  141. package/types/types.d.ts.map +1 -1
package/dist/cjs/cli.cjs CHANGED
@@ -273,17 +273,17 @@ function generateSyncedQueriesFile(queries) {
273
273
  for (const q of queries) queryByFile.has(q.sourceFile) || queryByFile.set(q.sourceFile, []), queryByFile.get(q.sourceFile).push(q);
274
274
  const sortedFiles = Array.from(queryByFile.keys()).sort(),
275
275
  imports = `// auto-generated by: over-zero generate
276
- // server-side syncedQuery wrappers with validators
277
- import { syncedQuery } from '@rocicorp/zero'
276
+ // server-side query definitions with validators
277
+ import { defineQuery, defineQueries } from '@rocicorp/zero'
278
278
  import * as v from 'valibot'
279
279
  import * as Queries from './groupedQueries'
280
280
  `,
281
- namespaceExports = sortedFiles.map(file => {
281
+ namespaceDefs = sortedFiles.map(file => {
282
282
  const queryDefs = queryByFile.get(file).sort((a, b) => a.name.localeCompare(b.name)).map(q => {
283
283
  const lines = q.valibotCode.split(`
284
284
  `).filter(l => l.trim()),
285
285
  schemaLineIndex = lines.findIndex(l => l.startsWith("export const QueryParams"));
286
- let validatorDef = "v.void()";
286
+ let validatorDef = "";
287
287
  if (schemaLineIndex !== -1) {
288
288
  const schemaLines = [];
289
289
  let openBraces = 0,
@@ -296,20 +296,26 @@ import * as Queries from './groupedQueries'
296
296
  validatorDef = schemaLines.join(`
297
297
  `);
298
298
  }
299
- const wrappedValidator = validatorDef === "v.void()" ? "v.parser(v.tuple([]))" : `v.parser(v.tuple([${validatorDef}]))`,
300
- namespacedName = `${q.sourceFile}.${q.name}`,
301
- queryFn = validatorDef === "v.void()" ? `() => Queries.${file}.${q.name}()` : `(arg) => Queries.${file}.${q.name}(arg)`;
302
- return ` ${q.name}: syncedQuery('${namespacedName}', ${wrappedValidator}, ${queryFn}),`;
299
+ return validatorDef ? ` ${q.name}: defineQuery(
300
+ ${validatorDef},
301
+ ({ args }) => Queries.${file}.${q.name}(args),
302
+ ),` : ` ${q.name}: defineQuery(() => Queries.${file}.${q.name}()),`;
303
303
  }).join(`
304
304
  `);
305
- return `export const ${file} = {
305
+ return `const ${file} = {
306
306
  ${queryDefs}
307
307
  }`;
308
308
  }).join(`
309
309
 
310
+ `),
311
+ queriesObject = sortedFiles.map(file => ` ${file},`).join(`
310
312
  `);
311
313
  return `${imports}
312
- ${namespaceExports}
314
+ ${namespaceDefs}
315
+
316
+ export const queries = defineQueries({
317
+ ${queriesObject}
318
+ })
313
319
  `;
314
320
  }
315
321
  function generateReadmeFile() {
package/dist/cjs/cli.js CHANGED
@@ -272,17 +272,17 @@ function generateSyncedQueriesFile(queries) {
272
272
  for (const q of queries)
273
273
  queryByFile.has(q.sourceFile) || queryByFile.set(q.sourceFile, []), queryByFile.get(q.sourceFile).push(q);
274
274
  const sortedFiles = Array.from(queryByFile.keys()).sort(), imports = `// auto-generated by: over-zero generate
275
- // server-side syncedQuery wrappers with validators
276
- import { syncedQuery } from '@rocicorp/zero'
275
+ // server-side query definitions with validators
276
+ import { defineQuery, defineQueries } from '@rocicorp/zero'
277
277
  import * as v from 'valibot'
278
278
  import * as Queries from './groupedQueries'
279
- `, namespaceExports = sortedFiles.map((file) => {
279
+ `, namespaceDefs = sortedFiles.map((file) => {
280
280
  const queryDefs = queryByFile.get(file).sort((a, b) => a.name.localeCompare(b.name)).map((q) => {
281
281
  const lines = q.valibotCode.split(`
282
282
  `).filter((l) => l.trim()), schemaLineIndex = lines.findIndex(
283
283
  (l) => l.startsWith("export const QueryParams")
284
284
  );
285
- let validatorDef = "v.void()";
285
+ let validatorDef = "";
286
286
  if (schemaLineIndex !== -1) {
287
287
  const schemaLines = [];
288
288
  let openBraces = 0, started = !1;
@@ -294,18 +294,25 @@ import * as Queries from './groupedQueries'
294
294
  validatorDef = schemaLines.join(`
295
295
  `);
296
296
  }
297
- const wrappedValidator = validatorDef === "v.void()" ? "v.parser(v.tuple([]))" : `v.parser(v.tuple([${validatorDef}]))`, namespacedName = `${q.sourceFile}.${q.name}`, queryFn = validatorDef === "v.void()" ? `() => Queries.${file}.${q.name}()` : `(arg) => Queries.${file}.${q.name}(arg)`;
298
- return ` ${q.name}: syncedQuery('${namespacedName}', ${wrappedValidator}, ${queryFn}),`;
297
+ return validatorDef ? ` ${q.name}: defineQuery(
298
+ ${validatorDef},
299
+ ({ args }) => Queries.${file}.${q.name}(args),
300
+ ),` : ` ${q.name}: defineQuery(() => Queries.${file}.${q.name}()),`;
299
301
  }).join(`
300
302
  `);
301
- return `export const ${file} = {
303
+ return `const ${file} = {
302
304
  ${queryDefs}
303
305
  }`;
304
306
  }).join(`
305
307
 
308
+ `), queriesObject = sortedFiles.map((file) => ` ${file},`).join(`
306
309
  `);
307
310
  return `${imports}
308
- ${namespaceExports}
311
+ ${namespaceDefs}
312
+
313
+ export const queries = defineQueries({
314
+ ${queriesObject}
315
+ })
309
316
  `;
310
317
  }
311
318
  function generateReadmeFile() {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/cli.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["readdirSync", "writeFileSync"]
6
6
  }
@@ -363,12 +363,12 @@ function generateSyncedQueriesFile(queries) {
363
363
  }
364
364
  var sortedFiles = Array.from(queryByFile.keys()).sort(),
365
365
  imports = `// auto-generated by: over-zero generate
366
- // server-side syncedQuery wrappers with validators
367
- import { syncedQuery } from '@rocicorp/zero'
366
+ // server-side query definitions with validators
367
+ import { defineQuery, defineQueries } from '@rocicorp/zero'
368
368
  import * as v from 'valibot'
369
369
  import * as Queries from './groupedQueries'
370
370
  `,
371
- namespaceExports = sortedFiles.map(function (file) {
371
+ namespaceDefs = sortedFiles.map(function (file) {
372
372
  var fileQueries = queryByFile.get(file).sort(function (a, b) {
373
373
  return a.name.localeCompare(b.name);
374
374
  }),
@@ -380,7 +380,7 @@ import * as Queries from './groupedQueries'
380
380
  schemaLineIndex = lines.findIndex(function (l) {
381
381
  return l.startsWith("export const QueryParams");
382
382
  }),
383
- validatorDef = "v.void()";
383
+ validatorDef = "";
384
384
  if (schemaLineIndex !== -1) {
385
385
  for (var schemaLines = [], openBraces = 0, started = !1, i = schemaLineIndex; i < lines.length; i++) {
386
386
  var line = lines[i],
@@ -390,20 +390,28 @@ import * as Queries from './groupedQueries'
390
390
  validatorDef = schemaLines.join(`
391
391
  `);
392
392
  }
393
- var wrappedValidator = validatorDef === "v.void()" ? "v.parser(v.tuple([]))" : `v.parser(v.tuple([${validatorDef}]))`,
394
- namespacedName = `${q2.sourceFile}.${q2.name}`,
395
- queryFn = validatorDef === "v.void()" ? `() => Queries.${file}.${q2.name}()` : `(arg) => Queries.${file}.${q2.name}(arg)`;
396
- return ` ${q2.name}: syncedQuery('${namespacedName}', ${wrappedValidator}, ${queryFn}),`;
393
+ return validatorDef ? ` ${q2.name}: defineQuery(
394
+ ${validatorDef},
395
+ ({ args }) => Queries.${file}.${q2.name}(args),
396
+ ),` : ` ${q2.name}: defineQuery(() => Queries.${file}.${q2.name}()),`;
397
397
  }).join(`
398
398
  `);
399
- return `export const ${file} = {
399
+ return `const ${file} = {
400
400
  ${queryDefs}
401
401
  }`;
402
402
  }).join(`
403
403
 
404
+ `),
405
+ queriesObject = sortedFiles.map(function (file) {
406
+ return ` ${file},`;
407
+ }).join(`
404
408
  `);
405
409
  return `${imports}
406
- ${namespaceExports}
410
+ ${namespaceDefs}
411
+
412
+ export const queries = defineQueries({
413
+ ${queriesObject}
414
+ })
407
415
  `;
408
416
  }
409
417
  function generateReadmeFile() {
@@ -1 +1 @@
1
- {"version":3,"names":["import_fs","require","import_path","import_model","import_typescript","import_citty","ts","__toESM","writeFileIfChanged","filePath","content","existsSync","existingContent","readFileSync","writeFileSync","generateQueries","defineCommand","meta","name","description","args","dir","type","required","default","run","param","resolve","readdirSync","readdirSync2","writeFileSync2","files","filter","f","endsWith","allQueries","results","Promise","all","map","file","queries","sourceFile","createSourceFile","ScriptTarget","Latest","forEachChild","node","isVariableStatement","_node_modifiers","exportModifier","modifiers","find","m","kind","SyntaxKind","ExportKeyword","declaration","declarationList","declarations","isVariableDeclaration","getText","initializer","isArrowFunction","params","parameters","paramType","length","_param_type","_$param","typeString","model","TypeScriptToModel","Generate","valibotCode","ModelToValibot","push","err","console","error","flat","info","generate","watch","after","baseDir","modelsDir","generatedDir","queriesDir","runGenerate","mkdirSync","recursive","allModelFiles","sort","schemaChecks","hasSchema","includes","filesWithSchema","c","modelsOutput","typesOutput","tablesOutput","readmeOutput","generateModelsFile","generateTypesFile","generateTablesFile","generateReadmeFile","writeResults","filesChanged","Boolean","queryFiles","queryResults","fileBaseName","basename","groupedQueriesOutput","generateGroupedQueriesFile","syncedQueriesOutput","generateSyncedQueriesFile","groupedChanged","syncedChanged","execSync","stdio","chokidar","debounceTimer","debouncedRegenerate","path","event","clearTimeout","setTimeout","watcher","persistent","ignoreInitial","on","modelFiles","modelNames","getImportName","imports","importName","join","sortedByImportName","a","b","localeCompare","modelsObj","getSchemaName","typeExports","pascalName","charAt","toUpperCase","slice","schemaName","getExportName","exports","sortedFiles","Set","q","queryByFile","Map","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","value","has","set","get","return","Array","from","keys","namespaceExports","fileQueries","queryDefs","q2","lines","split","l","trim","schemaLineIndex","findIndex","startsWith","validatorDef","schemaLines","openBraces","started","i","line","cleaned","replace","match","wrappedValidator","namespacedName","queryFn"],"sources":["../../src/cli.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["import_fs","require","import_path","import_model","import_typescript","import_citty","ts","__toESM","writeFileIfChanged","filePath","content","existsSync","existingContent","readFileSync","writeFileSync","generateQueries","defineCommand","meta","name","description","args","dir","type","required","default","run","param","resolve","readdirSync","readdirSync2","writeFileSync2","files","filter","f","endsWith","allQueries","results","Promise","all","map","file","queries","sourceFile","createSourceFile","ScriptTarget","Latest","forEachChild","node","isVariableStatement","_node_modifiers","exportModifier","modifiers","find","m","kind","SyntaxKind","ExportKeyword","declaration","declarationList","declarations","isVariableDeclaration","getText","initializer","isArrowFunction","params","parameters","paramType","length","_param_type","_$param","typeString","model","TypeScriptToModel","Generate","valibotCode","ModelToValibot","push","err","console","error","flat","info","generate","watch","after","baseDir","modelsDir","generatedDir","queriesDir","runGenerate","mkdirSync","recursive","allModelFiles","sort","schemaChecks","hasSchema","includes","filesWithSchema","c","modelsOutput","typesOutput","tablesOutput","readmeOutput","generateModelsFile","generateTypesFile","generateTablesFile","generateReadmeFile","writeResults","filesChanged","Boolean","queryFiles","queryResults","fileBaseName","basename","groupedQueriesOutput","generateGroupedQueriesFile","syncedQueriesOutput","generateSyncedQueriesFile","groupedChanged","syncedChanged","execSync","stdio","chokidar","debounceTimer","debouncedRegenerate","path","event","clearTimeout","setTimeout","watcher","persistent","ignoreInitial","on","modelFiles","modelNames","getImportName","imports","importName","join","sortedByImportName","a","b","localeCompare","modelsObj","getSchemaName","typeExports","pascalName","charAt","toUpperCase","slice","schemaName","getExportName","exports","sortedFiles","Set","q","queryByFile","Map","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","value","has","set","get","return","Array","from","keys","namespaceDefs","fileQueries","queryDefs","q2","lines","split","l","trim","schemaLineIndex","findIndex","startsWith","validatorDef","schemaLines","openBraces","started","i","line","cleaned","replace","match","queriesObject"],"sources":["../../src/cli.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -3,8 +3,8 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
3
3
  var __getOwnPropNames = Object.getOwnPropertyNames;
4
4
  var __hasOwnProp = Object.prototype.hasOwnProperty;
5
5
  var __export = (target, all) => {
6
- for (var name2 in all) __defProp(target, name2, {
7
- get: all[name2],
6
+ for (var name in all) __defProp(target, name, {
7
+ get: all[name],
8
8
  enumerable: !0
9
9
  });
10
10
  },
@@ -23,10 +23,11 @@ __export(createPermissions_exports, {
23
23
  createPermissions: () => createPermissions
24
24
  });
25
25
  module.exports = __toCommonJS(createPermissions_exports);
26
- var import_helpers = require("@vxrn/helpers"),
26
+ var import_helpers = require("@take-out/helpers"),
27
27
  import_didRunPermissionCheck = require("./helpers/didRunPermissionCheck.cjs"),
28
28
  import_mutatorContext = require("./helpers/mutatorContext.cjs"),
29
29
  import_prettyFormatZeroQuery = require("./helpers/prettyFormatZeroQuery.cjs"),
30
+ import_state = require("./state.cjs"),
30
31
  import_where = require("./where.cjs");
31
32
  function createPermissions({
32
33
  environment,
@@ -59,12 +60,12 @@ function createPermissions({
59
60
  };
60
61
  async function ensurePermission(tx, authData, tableName, where, obj) {
61
62
  if (authData?.role === "admin") return;
62
- const queryBase = tx.query[tableName];
63
+ const queryBase = (0, import_state.getZQL)()[tableName];
63
64
  let query = null;
64
65
  try {
65
- query = queryBase.where(eb => buildPermissionQuery(authData, eb, where, obj)).one(), (0, import_helpers.ensure)(await query);
66
+ query = queryBase.where(eb => buildPermissionQuery(authData, eb, where, obj)).one(), (0, import_helpers.ensure)(await tx.run(query));
66
67
  } catch (err) {
67
- const errorTitle = `${name} with auth id: ${authData?.id}`;
68
+ const errorTitle = `${tableName} with auth id: ${authData?.id}`;
68
69
  if (err instanceof import_helpers.EnsureError) {
69
70
  let msg = `[permission] \u{1F6AB} Not Allowed: ${errorTitle}`;
70
71
  throw process.env.NODE_ENV === "development" && query && (msg += `
@@ -3,8 +3,8 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
3
3
  var __getOwnPropNames = Object.getOwnPropertyNames;
4
4
  var __hasOwnProp = Object.prototype.hasOwnProperty;
5
5
  var __export = (target, all) => {
6
- for (var name2 in all)
7
- __defProp(target, name2, { get: all[name2], enumerable: !0 });
6
+ for (var name in all)
7
+ __defProp(target, name, { get: all[name], enumerable: !0 });
8
8
  }, __copyProps = (to, from, except, desc) => {
9
9
  if (from && typeof from == "object" || typeof from == "function")
10
10
  for (let key of __getOwnPropNames(from))
@@ -17,7 +17,7 @@ __export(createPermissions_exports, {
17
17
  createPermissions: () => createPermissions
18
18
  });
19
19
  module.exports = __toCommonJS(createPermissions_exports);
20
- var import_helpers = require("@vxrn/helpers"), import_didRunPermissionCheck = require("./helpers/didRunPermissionCheck"), import_mutatorContext = require("./helpers/mutatorContext"), import_prettyFormatZeroQuery = require("./helpers/prettyFormatZeroQuery"), import_where = require("./where");
20
+ var import_helpers = require("@take-out/helpers"), import_didRunPermissionCheck = require("./helpers/didRunPermissionCheck"), import_mutatorContext = require("./helpers/mutatorContext"), import_prettyFormatZeroQuery = require("./helpers/prettyFormatZeroQuery"), import_state = require("./state"), import_where = require("./where");
21
21
  function createPermissions({
22
22
  environment,
23
23
  schema
@@ -54,12 +54,12 @@ function createPermissions({
54
54
  async function ensurePermission(tx, authData, tableName, where, obj) {
55
55
  if (authData?.role === "admin")
56
56
  return;
57
- const queryBase = tx.query[tableName];
57
+ const queryBase = (0, import_state.getZQL)()[tableName];
58
58
  let query = null;
59
59
  try {
60
- query = queryBase.where((eb) => buildPermissionQuery(authData, eb, where, obj)).one(), (0, import_helpers.ensure)(await query);
60
+ query = queryBase.where((eb) => buildPermissionQuery(authData, eb, where, obj)).one(), (0, import_helpers.ensure)(await tx.run(query));
61
61
  } catch (err) {
62
- const errorTitle = `${name} with auth id: ${authData?.id}`;
62
+ const errorTitle = `${tableName} with auth id: ${authData?.id}`;
63
63
  if (err instanceof import_helpers.EnsureError) {
64
64
  let msg = `[permission] \u{1F6AB} Not Allowed: ${errorTitle}`;
65
65
  throw process.env.NODE_ENV === "development" && query && (msg += `
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/createPermissions.ts"],
4
- "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAoC,0BAEpC,+BAAyC,4CACzC,wBAA+B,qCAC/B,+BAAsC,4CACtC,eAAkC;AAU3B,SAAS,kBAA6C;AAAA,EAC3D;AAAA,EACA;AACF,GAGG;AAQD,WAAS,qBACP,UACA,IACA,iBAEA,SACA;AACA,UAAM,gBAAY,gCAAkB,eAAe;AAEnD,QAAI,CAAC;AACH,YAAM,IAAI,MAAM,mDAAmD;AAGrE,UAAM,cAAc,OAAO,OAAO,SAAS;AAE3C,QAAI,CAAC;AACH,YAAM,IAAI,MAAM,YAAY;AAG9B,UAAM,cAAc,YAAY,YAC1B,mBAAmB,gBAAgB,IAAI,QAAQ;AAErD,QAAI,oBAAoB;AACtB,YAAM,IAAI,MAAM,6BAA6B,SAAS,EAAE;AAG1D,QAAI,qBAAqB;AACvB,aAAO,GAAG,OAAO,IAAM,KAAK,EAAI;AAGlC,QAAI,qBAAqB;AACvB,aAAO,GAAG,OAAO,IAAM,KAAK,EAAK;AAGnC,UAAM,mBAAgC,CAAC;AAEvC,eAAW,OAAO,aAAa;AAC7B,YAAM,QAAQ,OAAO,WAAY,WAAW,UAAU,QAAQ,GAAG;AACjE,uBAAiB,KAAK,GAAG,IAAI,KAAY,KAAK,CAAC;AAAA,IACjD;AAEA,WAAO,GAAG,IAAI,kBAAkB,GAAG,gBAAgB;AAAA,EACrD;AAEA,QAAM,MAAW,OAAO,OAAO,QAAQ;AAErC,QAAI,gBAAgB,UAAU;AAC5B,YAAM,UAAM,sCAAe,GACrB,gBAAY,gCAAkB,KAAK;AACzC,UAAI,CAAC;AACH,cAAM,IAAI,MAAM,sDAAsD;AAExE,YAAM,iBAAiB,IAAI,IAAI,IAAI,UAAU,WAAW,OAAO,GAAG,OAClE,uDAAyB,GAAG;AAAA,IAC9B;AAAA,EACF;AAEA,iBAAe,iBACb,IACA,UACA,WACA,OACA,KACe;AACf,QAAI,UAAU,SAAS;AAErB;AAGF,UAAM,YAAY,GAAG,MAAM,SAAS;AACpC,QAAI,QAAqC;AAEzC,QAAI;AACF,cAAQ,UACL,MAAM,CAAC,OACC,qBAAqB,UAAU,IAAI,OAAO,GAAG,CACrD,EACA,IAAI,OAEP,uBAAO,MAAM,KAAK;AAAA,IACpB,SAAS,KAAK;AACZ,YAAM,aAAa,GAAG,IAAI,kBAAkB,UAAU,EAAE;AAExD,UAAI,eAAe,4BAAa;AAC9B,YAAI,MAAM,uCAAgC,UAAU;AACpD,cAAI,QAAQ,IAAI,aAAa,iBAAiB,UAC5C,OAAO;AAAA,OAAM,oDAAsB,KAAK,CAAC,KAErC,IAAI,MAAM,GAAG;AAAA,MACrB;AAEA,YAAM,IAAI,MAAM,4BAA4B,UAAU;AAAA,EAAK,GAAG,EAAE;AAAA,IAClE;AAAA,EACF;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;",
4
+ "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAoC,8BAEpC,+BAAyC,4CACzC,wBAA+B,qCAC/B,+BAAsC,4CACtC,eAAuB,oBACvB,eAAkC;AAU3B,SAAS,kBAA6C;AAAA,EAC3D;AAAA,EACA;AACF,GAGG;AAQD,WAAS,qBACP,UACA,IACA,iBAEA,SACA;AACA,UAAM,gBAAY,gCAAkB,eAAe;AAEnD,QAAI,CAAC;AACH,YAAM,IAAI,MAAM,mDAAmD;AAGrE,UAAM,cAAc,OAAO,OAAO,SAAS;AAE3C,QAAI,CAAC;AACH,YAAM,IAAI,MAAM,YAAY;AAG9B,UAAM,cAAc,YAAY,YAC1B,mBAAmB,gBAAgB,IAAI,QAAQ;AAErD,QAAI,oBAAoB;AACtB,YAAM,IAAI,MAAM,6BAA6B,SAAS,EAAE;AAG1D,QAAI,qBAAqB;AACvB,aAAO,GAAG,OAAO,IAAM,KAAK,EAAI;AAGlC,QAAI,qBAAqB;AACvB,aAAO,GAAG,OAAO,IAAM,KAAK,EAAK;AAGnC,UAAM,mBAAgC,CAAC;AAEvC,eAAW,OAAO,aAAa;AAC7B,YAAM,QAAQ,OAAO,WAAY,WAAW,UAAU,QAAQ,GAAG;AACjE,uBAAiB,KAAK,GAAG,IAAI,KAAY,KAAK,CAAC;AAAA,IACjD;AAEA,WAAO,GAAG,IAAI,kBAAkB,GAAG,gBAAgB;AAAA,EACrD;AAEA,QAAM,MAAW,OAAO,OAAO,QAAQ;AAErC,QAAI,gBAAgB,UAAU;AAC5B,YAAM,UAAM,sCAAe,GACrB,gBAAY,gCAAkB,KAAK;AACzC,UAAI,CAAC;AACH,cAAM,IAAI,MAAM,sDAAsD;AAExE,YAAM,iBAAiB,IAAI,IAAI,IAAI,UAAU,WAAW,OAAO,GAAG,OAClE,uDAAyB,GAAG;AAAA,IAC9B;AAAA,EACF;AAEA,iBAAe,iBACb,IACA,UACA,WACA,OACA,KACe;AACf,QAAI,UAAU,SAAS;AAErB;AAIF,UAAM,gBADa,qBAAO,EACG,SAAS;AACtC,QAAI,QAAqC;AAEzC,QAAI;AACF,cAAQ,UACL,MAAM,CAAC,OACC,qBAAqB,UAAU,IAAI,OAAO,GAAG,CACrD,EACA,IAAI,OAEP,uBAAO,MAAM,GAAG,IAAI,KAAK,CAAC;AAAA,IAC5B,SAAS,KAAK;AACZ,YAAM,aAAa,GAAG,SAAS,kBAAkB,UAAU,EAAE;AAE7D,UAAI,eAAe,4BAAa;AAC9B,YAAI,MAAM,uCAAgC,UAAU;AACpD,cAAI,QAAQ,IAAI,aAAa,iBAAiB,UAC5C,OAAO;AAAA,OAAM,oDAAsB,KAAK,CAAC,KAErC,IAAI,MAAM,GAAG;AAAA,MACrB;AAEA,YAAM,IAAI,MAAM,4BAA4B,UAAU;AAAA,EAAK,GAAG,EAAE;AAAA,IAClE;AAAA,EACF;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;",
5
5
  "names": []
6
6
  }
@@ -5,8 +5,8 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
5
5
  var __getOwnPropNames = Object.getOwnPropertyNames;
6
6
  var __hasOwnProp = Object.prototype.hasOwnProperty;
7
7
  var __export = (target, all) => {
8
- for (var name2 in all) __defProp(target, name2, {
9
- get: all[name2],
8
+ for (var name in all) __defProp(target, name, {
9
+ get: all[name],
10
10
  enumerable: !0
11
11
  });
12
12
  },
@@ -25,10 +25,11 @@ __export(createPermissions_exports, {
25
25
  createPermissions: () => createPermissions
26
26
  });
27
27
  module.exports = __toCommonJS(createPermissions_exports);
28
- var import_helpers = require("@vxrn/helpers"),
28
+ var import_helpers = require("@take-out/helpers"),
29
29
  import_didRunPermissionCheck = require("./helpers/didRunPermissionCheck.native.js"),
30
30
  import_mutatorContext = require("./helpers/mutatorContext.native.js"),
31
31
  import_prettyFormatZeroQuery = require("./helpers/prettyFormatZeroQuery.native.js"),
32
+ import_state = require("./state.native.js"),
32
33
  import_where = require("./where.native.js");
33
34
  function _instanceof(left, right) {
34
35
  return right != null && typeof Symbol < "u" && right[Symbol.hasInstance] ? !!right[Symbol.hasInstance](left) : left instanceof right;
@@ -79,14 +80,15 @@ function createPermissions(param) {
79
80
  };
80
81
  async function ensurePermission(tx, authData, tableName, where, obj) {
81
82
  if (authData?.role !== "admin") {
82
- var queryBase = tx.query[tableName],
83
+ var zqlBuilder = (0, import_state.getZQL)(),
84
+ queryBase = zqlBuilder[tableName],
83
85
  query = null;
84
86
  try {
85
87
  query = queryBase.where(function (eb) {
86
88
  return buildPermissionQuery(authData, eb, where, obj);
87
- }).one(), (0, import_helpers.ensure)(await query);
89
+ }).one(), (0, import_helpers.ensure)(await tx.run(query));
88
90
  } catch (err) {
89
- var errorTitle = `${name} with auth id: ${authData?.id}`;
91
+ var errorTitle = `${tableName} with auth id: ${authData?.id}`;
90
92
  if (_instanceof(err, import_helpers.EnsureError)) {
91
93
  var msg = `[permission] \u{1F6AB} Not Allowed: ${errorTitle}`;
92
94
  throw process.env.NODE_ENV === "development" && query && (msg += `
@@ -1 +1 @@
1
- {"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createPermissions_exports","__export","createPermissions","module","exports","import_helpers","require","import_didRunPermissionCheck","import_mutatorContext","import_prettyFormatZeroQuery","import_where","_instanceof","left","right","Symbol","hasInstance","param","environment","schema","buildPermissionQuery","authData","eb","permissionWhere","objOrId","tableName","getWhereTableName","Error","tableSchema","tables","primaryKeys","primaryKey","permissionReturn","cmpLit","primaryKeyWheres","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","iterator","_step","next","done","key","push","cmp","err","return","and","can","where","obj","ctx","mutatorContext","ensurePermission","tx","setDidRunPermissionCheck","role","queryBase","query","one","ensure","errorTitle","name","id","EnsureError"],"sources":["../../src/createPermissions.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createPermissions_exports","__export","createPermissions","module","exports","import_helpers","require","import_didRunPermissionCheck","import_mutatorContext","import_prettyFormatZeroQuery","import_state","import_where","_instanceof","left","right","Symbol","hasInstance","param","environment","schema","buildPermissionQuery","authData","eb","permissionWhere","objOrId","tableName","getWhereTableName","Error","tableSchema","tables","primaryKeys","primaryKey","permissionReturn","cmpLit","primaryKeyWheres","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","iterator","_step","next","done","key","push","cmp","err","return","and","can","where","obj","ctx","mutatorContext","ensurePermission","tx","setDidRunPermissionCheck","role","zqlBuilder","getZQL","queryBase","query","one","ensure","run","errorTitle","id","EnsureError"],"sources":["../../src/createPermissions.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -23,48 +23,39 @@ __export(createUseQuery_exports, {
23
23
  createUseQuery: () => createUseQuery
24
24
  });
25
25
  module.exports = __toCommonJS(createUseQuery_exports);
26
- var import_zero = require("@rocicorp/zero"),
27
- import_react = require("@rocicorp/zero/react"),
26
+ var import_react = require("@rocicorp/zero/react"),
28
27
  import_react2 = require("react"),
29
28
  import_useZeroDebug = require("./helpers/useZeroDebug.cjs"),
30
29
  import_queryRegistry = require("./queryRegistry.cjs");
31
30
  function createUseQuery({
32
31
  DisabledContext,
33
- disableInlineQueries = !1
32
+ customQueries
34
33
  }) {
35
- const queryCache = /* @__PURE__ */new Map(),
36
- parseAny = x => [x[0]];
37
34
  function useQuery(...args) {
38
35
  const disabled = (0, import_react2.use)(DisabledContext),
39
- [queryOrFn, paramsOrOptions, optionsArg] = args,
40
- isPlainFunction = typeof queryOrFn == "function" && !("queryName" in queryOrFn),
36
+ [fn, paramsOrOptions, optionsArg] = args,
41
37
  {
42
- actualQuery,
38
+ queryRequest,
43
39
  options
44
40
  } = (0, import_react2.useMemo)(() => {
45
- if (!isPlainFunction) return {
46
- actualQuery: queryOrFn,
47
- options: paramsOrOptions
48
- };
49
- const fn = queryOrFn,
50
- queryName = (0, import_queryRegistry.getQueryName)(fn);
51
- if (!queryName) throw new Error("No query name?");
41
+ const queryName = (0, import_queryRegistry.getQueryName)(fn);
42
+ if (!queryName) {
43
+ const fnName = fn?.name || "anonymous";
44
+ throw new Error(`Query function '${fnName}' not registered. Ensure it is exported from a queries file and passed to createZeroClient via groupedQueries.`);
45
+ }
52
46
  const hasParams = optionsArg !== void 0 || paramsOrOptions && typeof paramsOrOptions == "object" && !("enabled" in paramsOrOptions) && !("ttl" in paramsOrOptions),
53
47
  params = hasParams ? paramsOrOptions : void 0,
54
- opts = hasParams ? optionsArg : paramsOrOptions;
55
- let synced = queryCache.get(queryName);
56
- return synced || (synced = (0, import_zero.syncedQuery)(queryName, parseAny, arg => fn(arg)), queryCache.set(queryName, synced)), {
57
- actualQuery: params !== void 0 ? synced(params) : synced,
48
+ opts = hasParams ? optionsArg : paramsOrOptions,
49
+ [namespace, name] = queryName.split(".", 2),
50
+ customQuery = customQueries[namespace]?.[name];
51
+ if (!customQuery) throw new Error(`CustomQuery '${queryName}' not found. Check that the query is exported and the namespace/name matches.`);
52
+ return {
53
+ queryRequest: params !== void 0 ? customQuery(params) : customQuery(),
58
54
  options: opts
59
55
  };
60
- }, [queryOrFn, paramsOrOptions, optionsArg, isPlainFunction]);
61
- console.info("running", {
62
- actualQuery,
63
- options,
64
- queryOrFn
65
- });
66
- const out = (0, import_react.useQuery)(actualQuery, options);
67
- return process.env.NODE_ENV === "development" && (0, import_useZeroDebug.useZeroDebug)(actualQuery, options, out), disabled ? [null, {
56
+ }, [fn, paramsOrOptions, optionsArg]),
57
+ out = (0, import_react.useQuery)(queryRequest, options);
58
+ return process.env.NODE_ENV === "development" && (0, import_useZeroDebug.useZeroDebug)(queryRequest, options, out), disabled ? [null, {
68
59
  type: "unknown"
69
60
  }] : out;
70
61
  }
@@ -17,29 +17,28 @@ __export(createUseQuery_exports, {
17
17
  createUseQuery: () => createUseQuery
18
18
  });
19
19
  module.exports = __toCommonJS(createUseQuery_exports);
20
- var import_zero = require("@rocicorp/zero"), import_react = require("@rocicorp/zero/react"), import_react2 = require("react"), import_useZeroDebug = require("./helpers/useZeroDebug"), import_queryRegistry = require("./queryRegistry");
20
+ var import_react = require("@rocicorp/zero/react"), import_react2 = require("react"), import_useZeroDebug = require("./helpers/useZeroDebug"), import_queryRegistry = require("./queryRegistry");
21
21
  function createUseQuery({
22
22
  DisabledContext,
23
- disableInlineQueries = !1
23
+ customQueries
24
24
  }) {
25
- const queryCache = /* @__PURE__ */ new Map(), parseAny = (x) => [x[0]];
26
25
  function useQuery(...args) {
27
- const disabled = (0, import_react2.use)(DisabledContext), [queryOrFn, paramsOrOptions, optionsArg] = args, isPlainFunction = typeof queryOrFn == "function" && !("queryName" in queryOrFn), { actualQuery, options } = (0, import_react2.useMemo)(() => {
28
- if (!isPlainFunction)
29
- return {
30
- actualQuery: queryOrFn,
31
- options: paramsOrOptions
32
- };
33
- const fn = queryOrFn, queryName = (0, import_queryRegistry.getQueryName)(fn);
34
- if (!queryName)
35
- throw new Error("No query name?");
36
- const hasParams = optionsArg !== void 0 || paramsOrOptions && typeof paramsOrOptions == "object" && !("enabled" in paramsOrOptions) && !("ttl" in paramsOrOptions), params = hasParams ? paramsOrOptions : void 0, opts = hasParams ? optionsArg : paramsOrOptions;
37
- let synced = queryCache.get(queryName);
38
- return synced || (synced = (0, import_zero.syncedQuery)(queryName, parseAny, (arg) => fn(arg)), queryCache.set(queryName, synced)), { actualQuery: params !== void 0 ? synced(params) : synced, options: opts };
39
- }, [queryOrFn, paramsOrOptions, optionsArg, isPlainFunction]);
40
- console.info("running", { actualQuery, options, queryOrFn });
41
- const out = (0, import_react.useQuery)(actualQuery, options);
42
- return process.env.NODE_ENV === "development" && (0, import_useZeroDebug.useZeroDebug)(actualQuery, options, out), disabled ? [null, { type: "unknown" }] : out;
26
+ const disabled = (0, import_react2.use)(DisabledContext), [fn, paramsOrOptions, optionsArg] = args, { queryRequest, options } = (0, import_react2.useMemo)(() => {
27
+ const queryName = (0, import_queryRegistry.getQueryName)(fn);
28
+ if (!queryName) {
29
+ const fnName = fn?.name || "anonymous";
30
+ throw new Error(
31
+ `Query function '${fnName}' not registered. Ensure it is exported from a queries file and passed to createZeroClient via groupedQueries.`
32
+ );
33
+ }
34
+ const hasParams = optionsArg !== void 0 || paramsOrOptions && typeof paramsOrOptions == "object" && !("enabled" in paramsOrOptions) && !("ttl" in paramsOrOptions), params = hasParams ? paramsOrOptions : void 0, opts = hasParams ? optionsArg : paramsOrOptions, [namespace, name] = queryName.split(".", 2), customQuery = customQueries[namespace]?.[name];
35
+ if (!customQuery)
36
+ throw new Error(
37
+ `CustomQuery '${queryName}' not found. Check that the query is exported and the namespace/name matches.`
38
+ );
39
+ return { queryRequest: params !== void 0 ? customQuery(params) : customQuery(), options: opts };
40
+ }, [fn, paramsOrOptions, optionsArg]), out = (0, import_react.useQuery)(queryRequest, options);
41
+ return process.env.NODE_ENV === "development" && (0, import_useZeroDebug.useZeroDebug)(queryRequest, options, out), disabled ? [null, { type: "unknown" }] : out;
43
42
  }
44
43
  return useQuery;
45
44
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/createUseQuery.tsx"],
4
- "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA4B,2BAC5B,eAAyC,iCACzCA,gBAA2C,kBAE3C,sBAA6B,mCAC7B,uBAA6B;AAyDtB,SAAS,eAGd;AAAA,EACA;AAAA,EACA,uBAAuB;AACzB,GAGwC;AACtC,QAAM,aAAa,oBAAI,IAAkD,GACnE,WAAW,CAAC,MAAsC,CAAC,EAAE,CAAC,CAAsB;AAElF,WAAS,YAAY,MAAkB;AACrC,UAAM,eAAW,mBAAI,eAAe,GAC9B,CAAC,WAAW,iBAAiB,UAAU,IAAI,MAG3C,kBAAkB,OAAO,aAAc,cAAc,EAAE,eAAe,YAEtE,EAAE,aAAa,QAAQ,QAAI,uBAAQ,MAAM;AAC7C,UAAI,CAAC;AAEH,eAAO;AAAA,UACL,aAAa;AAAA,UACb,SAAS;AAAA,QACX;AAGF,YAAM,KAAK,WACL,gBAAY,mCAAa,EAAE;AAEjC,UAAI,CAAC;AACH,cAAM,IAAI,MAAM,gBAAgB;AAIlC,YAAM,YACJ,eAAe,UACd,mBACC,OAAO,mBAAoB,YAC3B,EAAE,aAAa,oBACf,EAAE,SAAS,kBAET,SAAS,YAAY,kBAAkB,QACvC,OAAO,YAAY,aAAa;AAEtC,UAAI,SAAS,WAAW,IAAI,SAAS;AACrC,aAAK,WACH,aAAS,yBAAY,WAAW,UAAU,CAAC,QAClC,GAAG,GAAG,CACd,GACD,WAAW,IAAI,WAAW,MAAM,IAM3B,EAAE,aAFK,WAAW,SAAa,OAAe,MAAM,IAAI,QAElC,SAAS,KAAK;AAAA,IAC7C,GAAG,CAAC,WAAW,iBAAiB,YAAY,eAAe,CAAC;AAE5D,YAAQ,KAAK,WAAW,EAAE,aAAa,SAAS,UAAU,CAAC;AAE3D,UAAM,UAAM,aAAAC,UAAa,aAAa,OAAO;AAO7C,WALI,QAAQ,IAAI,aAAa,qBAE3B,kCAAa,aAAa,SAAS,GAAG,GAGpC,WACK,CAAC,MAAM,EAAE,MAAM,UAAU,CAAC,IAG5B;AAAA,EACT;AAEA,SAAO;AACT;",
4
+ "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAyC,iCACzCA,gBAA2C,kBAE3C,sBAA6B,mCAC7B,uBAA6B;AAqCtB,SAAS,eAA0C;AAAA,EACxD;AAAA,EACA;AACF,GAGyB;AACvB,WAAS,YAAY,MAAkB;AACrC,UAAM,eAAW,mBAAI,eAAe,GAC9B,CAAC,IAAI,iBAAiB,UAAU,IAAI,MAEpC,EAAE,cAAc,QAAQ,QAAI,uBAAQ,MAAM;AAC9C,YAAM,gBAAY,mCAAa,EAAE;AACjC,UAAI,CAAC,WAAW;AACd,cAAM,SAAS,IAAI,QAAQ;AAC3B,cAAM,IAAI;AAAA,UACR,mBAAmB,MAAM;AAAA,QAE3B;AAAA,MACF;AAGA,YAAM,YACJ,eAAe,UACd,mBACC,OAAO,mBAAoB,YAC3B,EAAE,aAAa,oBACf,EAAE,SAAS,kBAET,SAAS,YAAY,kBAAkB,QACvC,OAAO,YAAY,aAAa,iBAIhC,CAAC,WAAW,IAAI,IAAI,UAAU,MAAM,KAAK,CAAC,GAC1C,cAAe,cAAsB,SAAS,IAAI,IAAI;AAE5D,UAAI,CAAC;AACH,cAAM,IAAI;AAAA,UACR,gBAAgB,SAAS;AAAA,QAE3B;AAKF,aAAO,EAAE,cAFY,WAAW,SAAY,YAAY,MAAM,IAAI,YAAY,GAEvD,SAAS,KAAK;AAAA,IACvC,GAAG,CAAC,IAAI,iBAAiB,UAAU,CAAC,GAE9B,UAAM,aAAAC,UAAa,cAAqB,OAAO;AAOrD,WALI,QAAQ,IAAI,aAAa,qBAE3B,kCAAa,cAAqB,SAAS,GAAG,GAG5C,WACK,CAAC,MAAM,EAAE,MAAM,UAAU,CAAC,IAG5B;AAAA,EACT;AAEA,SAAO;AACT;",
5
5
  "names": ["import_react", "zeroUseQuery"]
6
6
  }