over-zero 0.0.36 → 0.0.38

package/dist/esm/cli.js

@@ -258,17 +258,17 @@ function generateSyncedQueriesFile(queries) {
   for (const q of queries)
     queryByFile.has(q.sourceFile) || queryByFile.set(q.sourceFile, []), queryByFile.get(q.sourceFile).push(q);
   const sortedFiles = Array.from(queryByFile.keys()).sort(), imports = `// auto-generated by: over-zero generate
-// server-side syncedQuery wrappers with validators
-import { syncedQuery } from '@rocicorp/zero'
+// server-side query definitions with validators
+import { defineQuery, defineQueries } from '@rocicorp/zero'
 import * as v from 'valibot'
 import * as Queries from './groupedQueries'
-`, namespaceExports = sortedFiles.map((file) => {
+`, namespaceDefs = sortedFiles.map((file) => {
     const queryDefs = queryByFile.get(file).sort((a, b) => a.name.localeCompare(b.name)).map((q) => {
       const lines = q.valibotCode.split(`
 `).filter((l) => l.trim()), schemaLineIndex = lines.findIndex(
         (l) => l.startsWith("export const QueryParams")
       );
-      let validatorDef = "v.void()";
+      let validatorDef = "";
       if (schemaLineIndex !== -1) {
         const schemaLines = [];
         let openBraces = 0, started = !1;
@@ -280,18 +280,25 @@ import * as Queries from './groupedQueries'
         validatorDef = schemaLines.join(`
 `);
       }
-      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)`;
-      return `  ${q.name}: syncedQuery('${namespacedName}', ${wrappedValidator}, ${queryFn}),`;
+      return validatorDef ? `  ${q.name}: defineQuery(
+    ${validatorDef},
+    ({ args }) => Queries.${file}.${q.name}(args),
+  ),` : `  ${q.name}: defineQuery(() => Queries.${file}.${q.name}()),`;
     }).join(`
 `);
-    return `export const ${file} = {
+    return `const ${file} = {
 ${queryDefs}
 }`;
   }).join(`
 
+`), queriesObject = sortedFiles.map((file) => `  ${file},`).join(`
 `);
   return `${imports}
-${namespaceExports}
+${namespaceDefs}
+
+export const queries = defineQueries({
+${queriesObject}
+})
 `;
 }
 function generateReadmeFile() {

package/dist/esm/cli.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/cli.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["readdirSync", "writeFileSync"]
 }

package/dist/esm/cli.mjs

@@ -251,17 +251,17 @@ function generateSyncedQueriesFile(queries) {
   for (const q of queries) queryByFile.has(q.sourceFile) || queryByFile.set(q.sourceFile, []), queryByFile.get(q.sourceFile).push(q);
   const sortedFiles = Array.from(queryByFile.keys()).sort(),
     imports = `// auto-generated by: over-zero generate
-// server-side syncedQuery wrappers with validators
-import { syncedQuery } from '@rocicorp/zero'
+// server-side query definitions with validators
+import { defineQuery, defineQueries } from '@rocicorp/zero'
 import * as v from 'valibot'
 import * as Queries from './groupedQueries'
 `,
-    namespaceExports = sortedFiles.map(file => {
+    namespaceDefs = sortedFiles.map(file => {
       const queryDefs = queryByFile.get(file).sort((a, b) => a.name.localeCompare(b.name)).map(q => {
         const lines = q.valibotCode.split(`
 `).filter(l => l.trim()),
           schemaLineIndex = lines.findIndex(l => l.startsWith("export const QueryParams"));
-        let validatorDef = "v.void()";
+        let validatorDef = "";
         if (schemaLineIndex !== -1) {
           const schemaLines = [];
           let openBraces = 0,
@@ -274,20 +274,26 @@ import * as Queries from './groupedQueries'
           validatorDef = schemaLines.join(`
 `);
         }
-        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)`;
-        return `  ${q.name}: syncedQuery('${namespacedName}', ${wrappedValidator}, ${queryFn}),`;
+        return validatorDef ? `  ${q.name}: defineQuery(
+    ${validatorDef},
+    ({ args }) => Queries.${file}.${q.name}(args),
+  ),` : `  ${q.name}: defineQuery(() => Queries.${file}.${q.name}()),`;
       }).join(`
 `);
-      return `export const ${file} = {
+      return `const ${file} = {
 ${queryDefs}
 }`;
     }).join(`
 
+`),
+    queriesObject = sortedFiles.map(file => `  ${file},`).join(`
 `);
   return `${imports}
-${namespaceExports}
+${namespaceDefs}
+
+export const queries = defineQueries({
+${queriesObject}
+})
 `;
 }
 function generateReadmeFile() {

package/dist/esm/cli.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["existsSync","mkdirSync","readFileSync","readdirSync","writeFileSync","basename","resolve","ModelToValibot","TypeScriptToModel","defineCommand","runMain","ts","writeFileIfChanged","filePath","content","generateQueries","meta","name","description","args","dir","type","required","default","run","readdirSync2","writeFileSync2","files","filter","f","endsWith","allQueries","results","Promise","all","map","file","queries","sourceFile","createSourceFile","ScriptTarget","Latest","forEachChild","node","isVariableStatement","modifiers","find","m","kind","SyntaxKind","ExportKeyword","declaration","declarationList","declarations","isVariableDeclaration","getText","initializer","isArrowFunction","params","parameters","paramType","length","typeString","model","Generate","valibotCode","push","err","console","error","flat","info","generate","watch","after","baseDir","modelsDir","generatedDir","queriesDir","runGenerate","recursive","allModelFiles","sort","filesWithSchema","hasSchema","includes","c","modelsOutput","typesOutput","tablesOutput","readmeOutput","generateModelsFile","generateTypesFile","generateTablesFile","generateReadmeFile","filesChanged","Boolean","queryFiles","fileBaseName","groupedQueriesOutput","generateGroupedQueriesFile","syncedQueriesOutput","generateSyncedQueriesFile","groupedChanged","syncedChanged","execSync","stdio","chokidar","debounceTimer","debouncedRegenerate","path","event","clearTimeout","setTimeout","watcher","persistent","ignoreInitial","on","modelFiles","modelNames","getImportName","imports","join","modelsObj","a","b","localeCompare","getSchemaName","pascalName","charAt","toUpperCase","slice","schemaName","getExportName","Set","q","queryByFile","Map","has","set","get","sortedFiles","Array","from","keys","namespaceExports","queryDefs","lines","split","l","trim","schemaLineIndex","findIndex","startsWith","validatorDef","schemaLines","openBraces","started","i","line","cleaned","replace","match","wrappedValidator","namespacedName","queryFn","main","subCommands"],"sources":["../../src/cli.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["existsSync","mkdirSync","readFileSync","readdirSync","writeFileSync","basename","resolve","ModelToValibot","TypeScriptToModel","defineCommand","runMain","ts","writeFileIfChanged","filePath","content","generateQueries","meta","name","description","args","dir","type","required","default","run","readdirSync2","writeFileSync2","files","filter","f","endsWith","allQueries","results","Promise","all","map","file","queries","sourceFile","createSourceFile","ScriptTarget","Latest","forEachChild","node","isVariableStatement","modifiers","find","m","kind","SyntaxKind","ExportKeyword","declaration","declarationList","declarations","isVariableDeclaration","getText","initializer","isArrowFunction","params","parameters","paramType","length","typeString","model","Generate","valibotCode","push","err","console","error","flat","info","generate","watch","after","baseDir","modelsDir","generatedDir","queriesDir","runGenerate","recursive","allModelFiles","sort","filesWithSchema","hasSchema","includes","c","modelsOutput","typesOutput","tablesOutput","readmeOutput","generateModelsFile","generateTypesFile","generateTablesFile","generateReadmeFile","filesChanged","Boolean","queryFiles","fileBaseName","groupedQueriesOutput","generateGroupedQueriesFile","syncedQueriesOutput","generateSyncedQueriesFile","groupedChanged","syncedChanged","execSync","stdio","chokidar","debounceTimer","debouncedRegenerate","path","event","clearTimeout","setTimeout","watcher","persistent","ignoreInitial","on","modelFiles","modelNames","getImportName","imports","join","modelsObj","a","b","localeCompare","getSchemaName","pascalName","charAt","toUpperCase","slice","schemaName","getExportName","Set","q","queryByFile","Map","has","set","get","sortedFiles","Array","from","keys","namespaceDefs","queryDefs","lines","split","l","trim","schemaLineIndex","findIndex","startsWith","validatorDef","schemaLines","openBraces","started","i","line","cleaned","replace","match","queriesObject","main","subCommands"],"sources":["../../src/cli.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/cli.native.js

@@ -339,12 +339,12 @@ function generateSyncedQueriesFile(queries) {
   }
   var sortedFiles = Array.from(queryByFile.keys()).sort(),
     imports = `// auto-generated by: over-zero generate
-// server-side syncedQuery wrappers with validators
-import { syncedQuery } from '@rocicorp/zero'
+// server-side query definitions with validators
+import { defineQuery, defineQueries } from '@rocicorp/zero'
 import * as v from 'valibot'
 import * as Queries from './groupedQueries'
 `,
-    namespaceExports = sortedFiles.map(function (file) {
+    namespaceDefs = sortedFiles.map(function (file) {
       var fileQueries = queryByFile.get(file).sort(function (a, b) {
           return a.name.localeCompare(b.name);
         }),
@@ -356,7 +356,7 @@ import * as Queries from './groupedQueries'
             schemaLineIndex = lines.findIndex(function (l) {
               return l.startsWith("export const QueryParams");
             }),
-            validatorDef = "v.void()";
+            validatorDef = "";
           if (schemaLineIndex !== -1) {
             for (var schemaLines = [], openBraces = 0, started = !1, i = schemaLineIndex; i < lines.length; i++) {
               var line = lines[i],
@@ -366,20 +366,28 @@ import * as Queries from './groupedQueries'
             validatorDef = schemaLines.join(`
 `);
           }
-          var wrappedValidator = validatorDef === "v.void()" ? "v.parser(v.tuple([]))" : `v.parser(v.tuple([${validatorDef}]))`,
-            namespacedName = `${q2.sourceFile}.${q2.name}`,
-            queryFn = validatorDef === "v.void()" ? `() => Queries.${file}.${q2.name}()` : `(arg) => Queries.${file}.${q2.name}(arg)`;
-          return `  ${q2.name}: syncedQuery('${namespacedName}', ${wrappedValidator}, ${queryFn}),`;
+          return validatorDef ? `  ${q2.name}: defineQuery(
+    ${validatorDef},
+    ({ args }) => Queries.${file}.${q2.name}(args),
+  ),` : `  ${q2.name}: defineQuery(() => Queries.${file}.${q2.name}()),`;
         }).join(`
 `);
-      return `export const ${file} = {
+      return `const ${file} = {
 ${queryDefs}
 }`;
     }).join(`
 
+`),
+    queriesObject = sortedFiles.map(function (file) {
+      return `  ${file},`;
+    }).join(`
 `);
   return `${imports}
-${namespaceExports}
+${namespaceDefs}
+
+export const queries = defineQueries({
+${queriesObject}
+})
 `;
 }
 function generateReadmeFile() {

package/dist/esm/cli.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["existsSync","mkdirSync","readFileSync","readdirSync","writeFileSync","basename","resolve","ModelToValibot","TypeScriptToModel","defineCommand","runMain","ts","writeFileIfChanged","filePath","content","existingContent","generateQueries","meta","name","description","args","dir","type","required","default","run","param","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","Generate","valibotCode","push","err","console","error","flat","info","generate","watch","after","baseDir","modelsDir","generatedDir","queriesDir","runGenerate","recursive","allModelFiles","sort","schemaChecks","hasSchema","includes","filesWithSchema","c","modelsOutput","typesOutput","tablesOutput","readmeOutput","generateModelsFile","generateTypesFile","generateTablesFile","generateReadmeFile","writeResults","filesChanged","Boolean","queryFiles","queryResults","fileBaseName","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":";AACA,SAASA,UAAA,EAAYC,SAAA,EAAWC,YAAA,EAAcC,WAAA,EAAaC,aAAA,QAAqB;AAChF,SAASC,QAAA,EAAUC,OAAA,QAAe;AAElC,SAASC,cAAA,QAAsB;AAC/B,SAASC,iBAAA,QAAyB;AAClC,SAASC,aAAA,EAAeC,OAAA,QAAe;AACvC,YAAYC,EAAA,MAAQ;AAMpB,SAASC,mBAAmBC,QAAA,EAAkBC,OAAA,EAA0B;EACtE,IAAI;IACF,IAAId,UAAA,CAAWa,QAAQ;MAGnB,IAAAE,eAAO,GAAAb,YAAA,CAAAW,QAAA;MAGb,IAAQE,eAAA,KAAAD,OAAA,EAER;IAEA;EAEF,SAEA;EACE,OAAMV,aAAA,CAAAS,QAAA,EAAAC,OAAA;AAAA;AACE,IACNE,eAAa,GAAAP,aAAA;IACfQ,IAAA;MACAC,IAAM;MACJC,WAAK;IAAA;IACGC,IACN;MAAaC,GACb;QACAC,IAAA,cAAS;QACXH,WAAA;QACFI,QAAA;QACAC,OAAU,EAAE;MACV;IAS8B;IAE1B,MAAAC,IAAAC,KAAM;MAGN;UAAAN;QAAI,IAAAM,KAAA;QAAAL,GAAA,GAAAf,OAAA,CAAAc,IAAA,CAAAC,GAAA;QAAA;UAAAlB,WAAA,EAAAwB,YAAA;UAAAvB,aAAA,EAAAwB;QAAA;QAAAC,KAAA,GAAAF,YAAA,CAAAN,GAAA,EAAAS,MAAA,WAAAC,CAAA;UACF,OAAAA,CAAA,CAAAC,QAAM,MAAU;QAEM;QAAAC,UACpB;QAAAC,OAAA,SAAAC,OAAA,CAAAC,GAAA,CAAAP,KAAA,CAAAQ,GAAA,iBAAAC,IAAA;UAAA,IAAAzB,QACA,GAAAP,OAAA,CAAAe,GAAA,EAAAiB,IAAA;YAAAC,OAAA;UAAA;YACgB,IAChBzB,OAAA,GAAAZ,YAAA,CAAAW,QAAA;cAAA2B,UAAA,GAAA7B,EAAA,CAAA8B,gBAAA,CAAA5B,QAAA,EAAAC,OAAA,EAAAH,EAAA,CAAA+B,YAAA,CAAAC,MAAA;YAAAhC,EACF,CAAAiC,YAAA,CAAAJ,UAAA,YAAAK,IAAA;cAEA,IAAGlC,EAAA,CAAAmC,mBAAa,CAAAD,IAAa;gBAC3B,IAAIE,eAAG;kBAAAC,cAA2B,IAAAD,eAAA,GAAAF,IAAA,CAAAI,SAAA,cAAAF,eAAA,uBAAAA,eAAA,CAAAG,IAAA,WAAAC,CAAA;oBAIhC,OAHuBA,CAAA,CAAAC,IAAK,KAAAzC,EAAA,CAAW0C,UAAA,CAAAC,aAAA;kBAAA;gBACL,IAEb,CAAAN,cAAA;gBAErB,IAAAO,WAAM,GAAAV,IAAc,CAAAW,eAAK,CAAAC,YAAgB;gBACzC,KAAAF,WAAK,KAAA5C,EAAgB,CAAA+C,qBAAG,CAAAH,WAAsB,GAAW;gBAEzD,IAAArC,IAAM,GAAAqC,WAAO,CAAArC,IAAY,CAAAyC,OAAK,CAAAnB,UAAQ;gBAEtC,IAAAe,WACE,CAAAK,WAAY,IAAAjD,EACZ,CAAAkD,eAAG,CAAAN,WAAgB,CAAAK,WAAY,GAAW;kBAE1C,IAAAE,MAAM,GAAAP,WAAS,CAAAK,WAAY,CAAAG,UAAY;oBAAAC,SAAA;kBACvC,IAAAF,MAAI,CAAAG,MAAA,GAAY;oBAEZ,IAAAC,WAAO;sBAASC,OAElB,GAAAL,MAAA,CADc;oBAIhBE,SAAI,KAAAE,WAAA,GAAAC,OAAA,CAAA7C,IAAA,cAAA4C,WAAA,uBAAAA,WAAA,CAAAP,OAAA,CAAAnB,UAAA;kBACF;kBAIA;oBACF,IAAA4B,UAAc,yBAAAJ,SAAA;sBAAAK,KAAA,GAAA7D,iBAAA,CAAA8D,QAAA,CAAAF,UAAA;sBAAAG,WAAA,GAAAhE,cAAA,CAAA+D,QAAA,CAAAD,KAAA;oBACZ9B,OAAA,CAAAiC,IAAQ;sBACVtD,IAAA;sBACF4C,MAAA,EAAAE,SAAA;sBACFO;oBACD;kBACH,SAAcE,GAAA;oBACZC,OAAQ,CAAMC,KAAA,WAAAzD,IAAoB,KAAIuD,GAAA,EAAK;kBAC7C;gBAEA;cACD;YACH;UAEA,SAAWA,GAAA,EAAK;YAElBC,OAAA,CAAAC,KAAA,qBAAArC,IAAA,KAAAmC,GAAA;UAGI;UACJ,OAAMlC,OAAA;QACJ;MACAN,UAAA,CAAAuC,IAAa,IAAAtC,OAAA,CAAA0C,IAAA,KAAAF,OAAA,CAAAG,IAAA,WAAA5C,UAAA,CAAAgC,MAAA;IACf;EAAA,EACA;EAAAa,QAAM,GAAArE,aAAA;IAAAQ,IACJ;MAAKC,IACH,YAAM;MAAAC,WACN;IAAa;IACHC,IACV;MACFC,GAAA;QACAC,IAAA,EAAO;QACLH,WAAM;QACNI,QAAA;QACAC,OAAA;MAAU;MAEZuD,KAAA;QACAzD,IAAA,EAAO;QACLH,WAAM;QACNI,QAAA;QACAC,OAAA,GAAU;MACZ;MACFwD,KAAA;QACA1D,IAAM,EAAI,QAAO;QACfH,WAAM,6CACoB;QAMnBI,QAAA,GAAW;MAKhB;IAImC;IACD,MAAAE,GAC9BA,CAAAC,KAAM;MAAA;UACNN;QAAA,IAAAM,KAAW;QAAAuD,OAAA,GAAa3E,OAAQ,CAAAc,IAAA,CAAAC,GAAA,CAAW;QAAC6D,SAAU,GAAE5E,OAAA,CAAA2E,OAAA;QAAAE,YAAA,GAAA7E,OAAA,CAAA2E,OAAA;QAAAG,UAAA,GAAA9E,OAAA,CAAA2E,OAAA;QAAAI,WAAA,kBAAAA,CAAA;UAAArF,UACtD,CAAAmF,YAAA,KAAAlF,SAAA,CAAAkF,YAAA;YAAAG,SACF;UAAA,EACF;UACF,IAEqCC,aAAc,GAAEpF,WAAW,CAAA+E,SAAW,EAAEpD,MAAI,CAG3E,UAACC,CAAA;cACL,OAAAA,CAAQ,CAAAC,QAAQ;YAAiC,EACjD,CAAAwD,IAAA;YAAQC,YAAQ,SAAAtD,OAAkB,CAAAC,GAAA,CAAAmD,aAAgB,CAAAlD,GAAA,iBAAAN,CAAA;cAClD;gBACAO,IAAA,EAAQP,CAAA;gBAmBJ2D,SAAA,EAAAxF,YAfqB,CAAAI,OAAQ,CAAA4E,SAAI,EAAAnD,CAAA,YAAA4D,QAAA;cACrC;YAAQ;YACNC,eAAA,GAAmBH,YAAQ,CAAA3D,MAAA,WAAc+D,CAAA;cAC3C,OAAAA,CAAA,CAAAH,SAAA;YAAA,EACA,CAAArD,GAAA,WAAQwD,CAAA;cAAA,OACNA,CAAA,CAAAvD,IAAA;YAAiE,EACnE;YAAA,CAAAwD,YAAA,EAAAC,WAAA,EAAAC,YAAA,EAAAC,YAAA,UAAA9D,OAAA,CAAAC,GAAA,EACAD,OAAA,CAAQ7B,OAAA,CAAA4F,kBAAA,CAAAX,aAAA,IAAApD,OACN,CAAA7B,OAAA,CAAA6F,iBAA2B,CAAAP,eAAc,IAC3CzD,OAAA,CAAA7B,OAAA,CAAA8F,kBAAA,CAAAR,eAAA,IACAzD,OAAA,CAAQ7B,OAAA,CAAA+F,kBAAA;YACNC,YAAA,SAAmBnE,OAAQ,CAAAC,GAAA,EAC7BD,OAAA,CAAA7B,OAAA,CAAAM,kBAAA,CAAAN,OAAA,CAAA6E,YAAA,gBAAAW,YAAA,IACD3D,OAEiC,CAAA7B,OAAO,CAAOM,kBAAE,CAAAN,OAAA,CAAA6E,YAAA,eAAAY,WAAA,IAMlD5D,OALI,CAAA7B,OAAA,CAAAM,kBACM,CAAKN,OAAA,CAAA6E,YAAA,aAAgB,GAAYa,YAIvC,IACF7D,OAAM,CAAA7B,OAAA,CAAAM,kBAAyB,CAAAN,OAAU,CAAE6E,YAAQ,EAAM,WAAW,GAAAc,YA4E9D,GAzE6B;YACjCM,YAAW,GAAID,YAAO,CAAAxE,MAAS,CAAA0E,OAAA,EAAAvC,MAAA;UAC7B,IAAAsC,YAAM,QAAW7B,OAAQ,CAAAG,IAAA,wBACnB0B,YAAe,UAAe,GAAKvG,UACnC,CAAAoF,UAKA;YAEN,IAAAqB,UAAI,GAAAtG,WAAA,CAAAiF,UAAA,EAAAtD,MAAA,WAAAC,CAAA;gBACF,OAAAA,CAAA,CAAAC,QAAM,MAAU;cAEM;cAAA0E,YACpB,SAAAvE,OAAA,CAAAC,GAAA,CAAAqE,UAAA,CAAApE,GAAA,iBAAAC,IAAA;gBAAA,IAAAzB,QACA,GAAAP,OAAA,CAAA8E,UAAA,EAAA9C,IAAA;kBAAAqE,YAAA,GAAAtG,QAAA,CAAAiC,IAAA;kBAAAC,OAAA;gBAAA;kBACgB,IAChBzB,OAAA,GAAAZ,YAAA,CAAAW,QAAA;oBAAA2B,UAAA,GAAA7B,EAAA,CAAA8B,gBAAA,CAAA5B,QAAA,EAAAC,OAAA,EAAAH,EAAA,CAAA+B,YAAA,CAAAC,MAAA;kBAAAhC,EACF,CAAAiC,YAAA,CAAAJ,UAAA,YAAAK,IAAA;oBAEA,IAAGlC,EAAA,CAAAmC,mBAAa,CAAAD,IAAa;sBAC3B,IAAIE,eAAG;wBAAAC,cAA2B,IAAAD,eAAA,GAAAF,IAAA,CAAAI,SAAA,cAAAF,eAAA,uBAAAA,eAAA,CAAAG,IAAA,WAAAC,CAAA;0BAIhC,OAHuBA,CAAA,CAAAC,IAAK,KAAAzC,EAAA,CAAW0C,UAAA,CAAAC,aAAA;wBAAA;sBACL,IAEb,CAAAN,cAAA;sBAErB,IAAAO,WAAM,GAAAV,IAAc,CAAAW,eAAK,CAAAC,YAAgB;sBACzC,KAAAF,WAAK,KAAA5C,EAAgB,CAAA+C,qBAAG,CAAAH,WAAsB,GAAW;sBAEzD,IAAArC,IAAM,GAAAqC,WAAO,CAAArC,IAAY,CAAAyC,OAAK,CAAAnB,UAAQ;sBAGtC,IAAAtB,IAAI,iBAAS;sBAEb,IAAAqC,WACE,CAAAK,WAAY,IAAAjD,EACZ,CAAAkD,eAAG,CAAAN,WAAgB,CAAAK,WAAY,GAAW;wBAE1C,IAAAE,MAAM,GAAAP,WAAS,CAAAK,WAAY,CAAAG,UAAY;0BAAAC,SAAA;wBACvC,IAAAF,MAAI,CAAAG,MAAA,GAAY;0BAEZ,IAAAC,WAAO;4BAASC,OAElB,GAAAL,MAAA,CADc;0BAIhBE,SAAI,KAAAE,WAAA,GAAAC,OAAA,CAAA7C,IAAA,cAAA4C,WAAA,uBAAAA,WAAA,CAAAP,OAAA,CAAAnB,UAAA;wBACF;wBAIA;0BAAa,IACX4B,UAAA,yBAAAJ,SAAA;4BAAAK,KAAA,GAAA7D,iBAAA,CAAA8D,QAAA,CAAAF,UAAA;4BAAAG,WAAA,GAAAhE,cAAA,CAAA+D,QAAA,CAAAD,KAAA;0BAAA9B,OACA,CAAAiC,IAAQ;4BAAAtD,IACR;4BAAA4C,MACA,EAAAE,SAAY;4BACdO,WAAC;4BACH/B,UAAS,EAAKmE;0BACZ;wBAAiC,EACnC,OAAAlC,GAAA;0BACFC,OAAA,CAAAC,KAAA,WAAAzD,IAAA,KAAAuD,GAAA;wBACF;sBACD;oBACH;kBACE;gBAA8C,EAChD,OAAAA,GAAA;kBAEAC,OAAO,CAAAC,KAAA,qBAAArC,IAAA,KAAAmC,GAAA;gBACT;gBACF,OAEqClC,OAC/B;cAGiB,EACrB;cAAAN,UAAQ,GAAAyE,YAAc,CAAA9B,IAAA;cAAAgC,oBAAmB,GAAAC,0BAAA,CAAA5E,UAAA;cAAA6E,mBAAA,GAAAC,yBAAA,CAAA9E,UAAA;cAAA+E,cAAA,GAAApG,kBAAA,CAAAN,OAAA,CAAA6E,YAAA,wBAAAyB,oBAAA;cAAAK,aAAA,GAAArG,kBAAA,CAAAN,OAAA,CAAA6E,YAAA,uBAAA2B,mBAAA;YAAAE,cACzC,IAAAtC,OAAA,CAAAG,IAAA,2CAAAoC,aAAA,IAAAvC,OAAA,CAAAG,IAAA,0CAAAH,OAAA,CAAAG,IAAA,WAAAU,aAAA,CAAAtB,MAAA,YAAA2B,eAAA,CAAA3B,MAAA,cAAAhC,UAAA,CAAAgC,MAAA;UAAA,OAEoBS,OACpB,CAAAG,IAAQ,WAAAU,aAAc,CAAAtB,MAAkB,YAAA2B,eAAA,CAAA3B,MAAA;UAAA,IACxC7C,IAAA,CAAA4D,KAAA,EACF;YAEI;cAAAkC;YAAA,CACF,SAAQ,MAAK;YAObA,QAAA,CAAA9F,IAAK,CAAA4D,KAAA;cACPmC,KAAA;YACF;UACE,SAAQ1C,GAAA;YACNC,OAAA,CAAAC,KAAK,iCAAgCF,GAAA;UACvC;QAIF;MACE,UAAIY,WAAA,IAAAjE,IAAA,CAAA2D,KAAA;QACFL,OAAA,CAAAG,IAAQ;AACR;AAAyC;QAEzC,IAAAuC,QAAQ,SAAM;UAAAC,aAAmC,GAAE;UAAAC,mBAAA,YAAAA,CAAAC,IAAA,EAAAC,KAAA;YACrDH,aAAA,IAAAI,YAAA,CAAAJ,aAAA,GAAA3C,OAAA,CAAAG,IAAA;AAAA,EAAA2C,KAEJ,IAAAD,IAAA,KAAAF,aAAA,GAAAK,UAAA;cAGArC,WAAM;YAIJ,MAAQ;UAAK;UAAAsC,OAAA,GAAAP,QAAA,CAAArC,KAAA,EAAoBG,SAAA,EACjCE,UAAM,CAEN;YAEAwC,UAAM;YACAC,aAAA;UAIc,CAAK;QAGrBF,OAAA,CAAAG,EAAA,SAAY,YAAAP,IAAA;UACd,OAAOD,mBAAA,CAAAC,IAAA;QACT,IAEMI,OAAA,CAAAG,EAAU,QAAS,UAAOP,IAAA;UAC9B,OAAAD,mBAAY,CAAAC,IAAA;QAAA,EACZ,EAAAI,OAAA,CAAAG,EAAA,SAAe,YAAAP,IAAA;UAChB,OAAAD,mBAAA,CAAAC,IAAA;QAED,UAAQ,IAAGpF,OAAU,CAAC,YAAS,CAKN,CAAC;MAC5B;IACF;EACF,CAAC;AAED,SAAS+D,mBAAmB6B,UAAA,EAAsB;EAChD,IAAAC,UAAM,GAAAD,UAAa,CAAA1F,GAAW,WAAWN,CAAA;MAiBnC,OAAA1B,QAAY,CAAA0B,CAAA;IAHS,CAAC,EAAAyD,IAAG;IAAAyC,aAAY,YAAAA,CAAA/G,IAAA;MAAK,OAAIA,IAClD,cAAe,YAAE,GAAAA,IAAc;IACjC;IACiEgH,OAAK,GAAAF,UAAc,CAAA3F,GAAA,WAAcnB,IAAK,EAAG;MAAY,IAAAiH,UAAA,GAAAF,aAAA,CAAA/G,IAAA;MAAA,sBAAAiH,UAAA,oBAAAjH,IAAA;IAEtH,GAAAkH,IAAO;AAAA,EAA6C;IAAAC,kBAAO,OAAAL,UAAA,CAAO,CAAAxC,IAAA,WAAS8C,CAAA,EAAAC,CAAA;MAAA,OAAAN,aAAA,CAAAK,CAAA,EAAAE,aAAA,CAAAP,aAAA,CAAAM,CAAA;IAC7E;IAAAE,SAAA;AAEA,EAAAJ,kBAAS,CAAAhG,GAAA,WAAkBnB,IAAA,EAAsB;MAC/C,OAAM,KAAA+G,aAAa,CAAA/G,IAAW,IAAK;IAcnC,GAAAkH,IAAO;AAAA;AAAA;EARa;AAEhB,EAAAF,OAAA;AAEA;AAA6E,EAAAO,SAAA;AAA+E;AAExJ;AAAA,SAEyHtC,kBAAA4B,UAAA;EAAA,IAAAC,UAAA,GAAAD,UAAA,CAAA1F,GAAA,WAAAN,CAAA;MACnI,OAAA1B,QAAA,CAAA0B,CAAA;IAEA,GAAAyD,IAAS;IAAAkD,aAAA,GAAmB,SAAAA,CAAAxH,IAAsB;MAChD,OAAMA,IAAA,WAAa,eAAgB,GAAMA,IAAA;IAUzC;IAAAyH,WAAO,GAAAX,UAAA,CAAA3F,GAAA,WAAAnB,IAAA;MAAA,IAAA0H,UAAA,GAAA1H,IAAA,CAAA2H,MAAA,IAAAC,WAAA,KAAA5H,IAAA,CAAA6H,KAAA;QAAAC,UAAA,GAAAN,aAAA,CAAAxH,IAAA;MAAA,sBAAA0H,UAAA,mCAAAI,UAAA;AAAA,cAHJJ,UAAK,yCAA6CI,UAAK;IAGmF,GAAAZ,IAAA;AAAA;AAC/I;EAEA,OAAS;AAgBP;AAAO;AAAA,EAAAO,WAAA;AAAA;AAAA;AAAA,SAAAvC,mBAAA2B,UAAA;EAAA,IAAAC,UAAA,GAAAD,UAAA,CAAA1F,GAAA,WAAAN,CAAA;MAPc,OAAO1B,QAAI,CAAA0B,CAAA,EAAQ,KAAK;IActC,GAAAyD,IAAA;IAAAyD,aAAA,YAAAA,CAAA/H,IAAA;MAAA,OAAAA,IAAA,6BAAAA,IAAA;IAET;IAAAgI,OAAA,GAAAlB,UAAA,CAAA3F,GAAA,WAAAnB,IAAA;MAEA,OAAS,sBAAA+H,aAOP,CAAA/H,IAAA,uBAAAA,IAAA;IAEA,GAAAkH,IAAM;AACN;EACE,OAAK;AAOP;AAEgB;AAAA,EAAAc,OAAA;AAAA;AAAA;AAAA,SAQVrC,0BACHA,CAAAtE,OAAK;EAKJ,IAAA4G,WAAM,IAGF,OAAAC,GAAM,CAAA7G,OAAU,CAAAF,GAAA,WAAYgH,CAAA;MAAY,OAAQA,CAAA,CAAA7G,UAAc;IAChC,IACW,CAAAgD,IACzC;IAAA0D,OAAA,GAAAC,WAAA,CAAA9G,GAAA,WAAAC,IAAA;MAEA,OAAI,eAAeA,IAAA,qBAAAA,IAAA;IACnB,GAAA8F,IAAA,CAAI;AACF;EACA;AAGA;AACE;AAYA;AACE;AAAA;AAGJ;AAAgC,EAAIc,OAAA;AAAA;AAItC;AAcA,SAAAnC,yBAAkBA,CAAAxE,OAAkB;EAAgD,IACrF+G,WACK,sBAAAC,GAAA;IAAAC,yBAAA;IAAAC,iBAAA;IAAAC,cAAA;EAAI;IAEZ,SAAOC,SAAA,GAAApH,OAAoB,CAAAqH,MAAA,CAAAC,QAAA,KAAAC,KAAA,IAAAN,yBAAA,IAAAM,KAAA,GAAAH,SAAA,CAAAI,IAAA,IAAAC,IAAA,GAAAR,yBAAA;MAAS,IAAAH,CAAS,GAAAS,KAAA,CAAAG,KAAA;MAAAX,WAAA,CAAAY,GAAA,CAAAb,CAAA,CAAA7G,UAAA,KAAA8G,WAAA,CAAAa,GAAA,CAAAd,CAAA,CAAA7G,UAAA,OAAA8G,WAAA,CAAAc,GAAA,CAAAf,CAAA,CAAA7G,UAAA,EAAAgC,IAAA,CAAA6E,CAAA;IAC9C;EACK,SAAA5E,GAAA;IAAMgF,iBAAA,OAAAC,cAAA,GAAAjF,GAAA;EAEd,UAAU;IACV;MAAgB,CAAA+E,yBAAA,IAAAG,SAAA,CAAAU,MAAA,YAAAV,SAAA,CAAAU,MAAA;IAElB;MAEA,IAASZ,iBAAA,EACP,MAAOC,cAAA;IAAA;EAAA;EAAA,IAAAP,WAAA,GAAAmB,KAAA,CAAAC,IAAA,CAAAjB,WAAA,CAAAkB,IAAA,IAAAhF,IAAA;IAAA0C,OAAA;AAAA;AAAA;AAAA;AAAA;AAAA;IAAAuC,gBAAA,GAAAtB,WAAA,CAAA9G,GAAA,WAAAC,IAAA;MAAA,IAAAoI,WAAA,GAAApB,WAAA,CAAAc,GAAA,CAAA9H,IAAA,EAAAkD,IAAA,WAAA8C,CAAA,EAAAC,CAAA;UAAA,OAAAD,CAAA,CAAApH,IAAA,CAAAsH,aAAA,CAAAD,CAAA,CAAArH,IAAA;QAAA;QAAAyJ,SAAA,GAAAD,WAAA,CAAArI,GAAA,WAAAuI,EAAA;UAAA,IAAAC,KAAA,GAAAD,EAAA,CAAArG,WAAA,CAAAuG,KAAA;AAAA,GAAAhJ,MAAA,WAAAiJ,CAAA;cAAA,OAAAA,CAAA,CAAAC,IAAA;YAAA;YAAAC,eAAA,GAAAJ,KAAA,CAAAK,SAAA,WAAAH,CAAA;cAAA,OAAAA,CAAA,CAAAI,UAAA;YAAA;YAAAC,YAAA;UAAA,IAAAH,eAAA;YAAA,SAAAI,WAAA,OAAAC,UAAA,MAAAC,OAAA,OAAAC,CAAA,GAAAP,eAAA,EAAAO,CAAA,GAAAX,KAAA,CAAA5G,MAAA,EAAAuH,CAAA;cAAA,IAAAC,IAAA,GAAAZ,KAAA,CAAAW,CAAA;gBAAAE,OAAA,GAAAH,OAAA,GAAAE,IAAA,GAAAA,IAAA,CAAAE,OAAA;cAAA,IAAAN,WAAA,CAAA7G,IAAA,CAAAkH,OAAA,GAAAH,OAAA,OAAAD,UAAA,KAAAI,OAAA,CAAAE,KAAA,eAAA3H,MAAA,EAAAqH,UAAA,KAAAI,OAAA,CAAAE,KAAA,eAAA3H,MAAA,EAAAqH,UAAA,KAAAI,OAAA,CAAAE,KAAA,eAAA3H,MAAA,EAAAqH,UAAA,KAAAI,OAAA,CAAAE,KAAA,eAAA3H,MAAA,EAAAqH,UAAA,UAAAD,WAAA,CAAApH,MAAA;YAAA;YAAAmH,YAAA,GAAAC,WAAA,CAAAjD,IAAA;AAAA;UAAA;UAAA,IAAAyD,gBAAA,GAAAT,YAAA,iEAAAA,YAAA;YAAAU,cAAA,MAAAlB,EAAA,CAAApI,UAAA,IAAAoI,EAAA,CAAA1J,IAAA;YAAA6K,OAAA,GAAAX,YAAA,mCAAA9I,IAAA,IAAAsI,EAAA,CAAA1J,IAAA,2BAAAoB,IAAA,IAAAsI,EAAA,CAAA1J,IAAA;UAAA,YAAA0J,EAAA,CAAA1J,IAAA,kBAAA4K,cAAA,MAAAD,gBAAA,KAAAE,OAAA;QAAA,GAAA3D,IAAA;AAAA;MAAA,uBAAA9F,IAAA;AAAA,EAAAqI,SAAA;AAAA;IAAA,GAAAvC,IAAA;AAAA;AAAA;EAAA,UAAAF,OAAA;AAAA,EAAAuC,gBAAA;AAAA;AAAA;AAAA,SAAApE,mBAAA;EAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAyDT;AAEA;AAA2B;AACnB;AACE;AACO;AACf;AACa;AACX;AACoB;AAExB;AAEA","ignoreList":[]}
+{"version":3,"names":["existsSync","mkdirSync","readFileSync","readdirSync","writeFileSync","basename","resolve","ModelToValibot","TypeScriptToModel","defineCommand","runMain","ts","writeFileIfChanged","filePath","content","existingContent","generateQueries","meta","name","description","args","dir","type","required","default","run","param","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","Generate","valibotCode","push","err","console","error","flat","info","generate","watch","after","baseDir","modelsDir","generatedDir","queriesDir","runGenerate","recursive","allModelFiles","sort","schemaChecks","hasSchema","includes","filesWithSchema","c","modelsOutput","typesOutput","tablesOutput","readmeOutput","generateModelsFile","generateTypesFile","generateTablesFile","generateReadmeFile","writeResults","filesChanged","Boolean","queryFiles","queryResults","fileBaseName","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":[]}

package/dist/esm/createPermissions.js

@@ -1,7 +1,8 @@
-import { ensure, EnsureError } from "@vxrn/helpers";
+import { ensure, EnsureError } from "@take-out/helpers";
 import { setDidRunPermissionCheck } from "./helpers/didRunPermissionCheck";
 import { mutatorContext } from "./helpers/mutatorContext";
 import { prettyFormatZeroQuery } from "./helpers/prettyFormatZeroQuery";
+import { getZQL } from "./state";
 import { getWhereTableName } from "./where";
 function createPermissions({
   environment,
@@ -39,12 +40,12 @@ function createPermissions({
   async function ensurePermission(tx, authData, tableName, where, obj) {
     if (authData?.role === "admin")
       return;
-    const queryBase = tx.query[tableName];
+    const queryBase = getZQL()[tableName];
     let query = null;
     try {
-      query = queryBase.where((eb) => buildPermissionQuery(authData, eb, where, obj)).one(), ensure(await query);
+      query = queryBase.where((eb) => buildPermissionQuery(authData, eb, where, obj)).one(), ensure(await tx.run(query));
     } catch (err) {
-      const errorTitle = `${name} with auth id: ${authData?.id}`;
+      const errorTitle = `${tableName} with auth id: ${authData?.id}`;
       if (err instanceof EnsureError) {
         let msg = `[permission] \u{1F6AB} Not Allowed: ${errorTitle}`;
         throw process.env.NODE_ENV === "development" && query && (msg += `

package/dist/esm/createPermissions.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/createPermissions.ts"],
-  "mappings": "AAAA,SAAS,QAAQ,mBAAmB;AAEpC,SAAS,gCAAgC;AACzC,SAAS,sBAAsB;AAC/B,SAAS,6BAA6B;AACtC,SAAS,yBAAyB;AAU3B,SAAS,kBAA6C;AAAA,EAC3D;AAAA,EACA;AACF,GAGG;AAQD,WAAS,qBACP,UACA,IACA,iBAEA,SACA;AACA,UAAM,YAAY,kBAAkB,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,MAAM,eAAe,GACrB,YAAY,kBAAkB,KAAK;AACzC,UAAI,CAAC;AACH,cAAM,IAAI,MAAM,sDAAsD;AAExE,YAAM,iBAAiB,IAAI,IAAI,IAAI,UAAU,WAAW,OAAO,GAAG,GAClE,yBAAyB,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,GAEP,OAAO,MAAM,KAAK;AAAA,IACpB,SAAS,KAAK;AACZ,YAAM,aAAa,GAAG,IAAI,kBAAkB,UAAU,EAAE;AAExD,UAAI,eAAe,aAAa;AAC9B,YAAI,MAAM,uCAAgC,UAAU;AACpD,cAAI,QAAQ,IAAI,aAAa,iBAAiB,UAC5C,OAAO;AAAA,GAAM,sBAAsB,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;",
+  "mappings": "AAAA,SAAS,QAAQ,mBAAmB;AAEpC,SAAS,gCAAgC;AACzC,SAAS,sBAAsB;AAC/B,SAAS,6BAA6B;AACtC,SAAS,cAAc;AACvB,SAAS,yBAAyB;AAU3B,SAAS,kBAA6C;AAAA,EAC3D;AAAA,EACA;AACF,GAGG;AAQD,WAAS,qBACP,UACA,IACA,iBAEA,SACA;AACA,UAAM,YAAY,kBAAkB,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,MAAM,eAAe,GACrB,YAAY,kBAAkB,KAAK;AACzC,UAAI,CAAC;AACH,cAAM,IAAI,MAAM,sDAAsD;AAExE,YAAM,iBAAiB,IAAI,IAAI,IAAI,UAAU,WAAW,OAAO,GAAG,GAClE,yBAAyB,GAAG;AAAA,IAC9B;AAAA,EACF;AAEA,iBAAe,iBACb,IACA,UACA,WACA,OACA,KACe;AACf,QAAI,UAAU,SAAS;AAErB;AAIF,UAAM,YADa,OAAO,EACG,SAAS;AACtC,QAAI,QAAqC;AAEzC,QAAI;AACF,cAAQ,UACL,MAAM,CAAC,OACC,qBAAqB,UAAU,IAAI,OAAO,GAAG,CACrD,EACA,IAAI,GAEP,OAAO,MAAM,GAAG,IAAI,KAAK,CAAC;AAAA,IAC5B,SAAS,KAAK;AACZ,YAAM,aAAa,GAAG,SAAS,kBAAkB,UAAU,EAAE;AAE7D,UAAI,eAAe,aAAa;AAC9B,YAAI,MAAM,uCAAgC,UAAU;AACpD,cAAI,QAAQ,IAAI,aAAa,iBAAiB,UAC5C,OAAO;AAAA,GAAM,sBAAsB,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;",
   "names": []
 }

package/dist/esm/createPermissions.mjs

@@ -1,7 +1,8 @@
-import { ensure, EnsureError } from "@vxrn/helpers";
+import { ensure, EnsureError } from "@take-out/helpers";
 import { setDidRunPermissionCheck } from "./helpers/didRunPermissionCheck.mjs";
 import { mutatorContext } from "./helpers/mutatorContext.mjs";
 import { prettyFormatZeroQuery } from "./helpers/prettyFormatZeroQuery.mjs";
+import { getZQL } from "./state.mjs";
 import { getWhereTableName } from "./where.mjs";
 function createPermissions({
   environment,
@@ -34,12 +35,12 @@ function createPermissions({
   };
   async function ensurePermission(tx, authData, tableName, where, obj) {
     if (authData?.role === "admin") return;
-    const queryBase = tx.query[tableName];
+    const queryBase = getZQL()[tableName];
     let query = null;
     try {
-      query = queryBase.where(eb => buildPermissionQuery(authData, eb, where, obj)).one(), ensure(await query);
+      query = queryBase.where(eb => buildPermissionQuery(authData, eb, where, obj)).one(), ensure(await tx.run(query));
     } catch (err) {
-      const errorTitle = `${name} with auth id: ${authData?.id}`;
+      const errorTitle = `${tableName} with auth id: ${authData?.id}`;
       if (err instanceof EnsureError) {
         let msg = `[permission] \u{1F6AB} Not Allowed: ${errorTitle}`;
         throw process.env.NODE_ENV === "development" && query && (msg += `

package/dist/esm/createPermissions.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["ensure","EnsureError","setDidRunPermissionCheck","mutatorContext","prettyFormatZeroQuery","getWhereTableName","createPermissions","environment","schema","buildPermissionQuery","authData","eb","permissionWhere","objOrId","tableName","Error","tableSchema","tables","primaryKeys","primaryKey","permissionReturn","cmpLit","primaryKeyWheres","key","value","push","cmp","and","can","where","obj","ctx","ensurePermission","tx","role","queryBase","query","one","err","errorTitle","name","id","msg","process","env","NODE_ENV"],"sources":["../../src/createPermissions.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["ensure","EnsureError","setDidRunPermissionCheck","mutatorContext","prettyFormatZeroQuery","getZQL","getWhereTableName","createPermissions","environment","schema","buildPermissionQuery","authData","eb","permissionWhere","objOrId","tableName","Error","tableSchema","tables","primaryKeys","primaryKey","permissionReturn","cmpLit","primaryKeyWheres","key","value","push","cmp","and","can","where","obj","ctx","ensurePermission","tx","role","queryBase","query","one","run","err","errorTitle","id","msg","process","env","NODE_ENV"],"sources":["../../src/createPermissions.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/createPermissions.native.js

@@ -1,7 +1,8 @@
-import { ensure, EnsureError } from "@vxrn/helpers";
+import { ensure, EnsureError } from "@take-out/helpers";
 import { setDidRunPermissionCheck } from "./helpers/didRunPermissionCheck.native.js";
 import { mutatorContext } from "./helpers/mutatorContext.native.js";
 import { prettyFormatZeroQuery } from "./helpers/prettyFormatZeroQuery.native.js";
+import { getZQL } from "./state.native.js";
 import { getWhereTableName } from "./where.native.js";
 function _instanceof(left, right) {
   return right != null && typeof Symbol < "u" && right[Symbol.hasInstance] ? !!right[Symbol.hasInstance](left) : left instanceof right;
@@ -52,14 +53,15 @@ function createPermissions(param) {
   };
   async function ensurePermission(tx, authData, tableName, where, obj) {
     if (authData?.role !== "admin") {
-      var queryBase = tx.query[tableName],
+      var zqlBuilder = getZQL(),
+        queryBase = zqlBuilder[tableName],
         query = null;
       try {
         query = queryBase.where(function (eb) {
           return buildPermissionQuery(authData, eb, where, obj);
-        }).one(), ensure(await query);
+        }).one(), ensure(await tx.run(query));
       } catch (err) {
-        var errorTitle = `${name} with auth id: ${authData?.id}`;
+        var errorTitle = `${tableName} with auth id: ${authData?.id}`;
         if (_instanceof(err, EnsureError)) {
           var msg = `[permission] \u{1F6AB} Not Allowed: ${errorTitle}`;
           throw process.env.NODE_ENV === "development" && query && (msg += `

package/dist/esm/createPermissions.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["ensure","EnsureError","setDidRunPermissionCheck","mutatorContext","prettyFormatZeroQuery","getWhereTableName","_instanceof","left","right","Symbol","hasInstance","createPermissions","param","environment","schema","buildPermissionQuery","authData","eb","permissionWhere","objOrId","tableName","Error","tableSchema","tables","primaryKeys","primaryKey","permissionReturn","cmpLit","primaryKeyWheres","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","iterator","_step","next","done","key","value","push","cmp","err","return","and","can","where","obj","ctx","ensurePermission","tx","role","queryBase","query","one","errorTitle","name","id","msg"],"sources":["../../src/createPermissions.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["ensure","EnsureError","setDidRunPermissionCheck","mutatorContext","prettyFormatZeroQuery","getZQL","getWhereTableName","_instanceof","left","right","Symbol","hasInstance","createPermissions","param","environment","schema","buildPermissionQuery","authData","eb","permissionWhere","objOrId","tableName","Error","tableSchema","tables","primaryKeys","primaryKey","permissionReturn","cmpLit","primaryKeyWheres","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","iterator","_step","next","done","key","value","push","cmp","err","return","and","can","where","obj","ctx","ensurePermission","tx","role","zqlBuilder","queryBase","query","one","run","errorTitle","id","msg"],"sources":["../../src/createPermissions.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/createUseQuery.js

@@ -1,30 +1,28 @@
-import { syncedQuery } from "@rocicorp/zero";
 import { useQuery as zeroUseQuery } from "@rocicorp/zero/react";
 import { use, useMemo } from "react";
 import { useZeroDebug } from "./helpers/useZeroDebug";
 import { getQueryName } from "./queryRegistry";
 function createUseQuery({
   DisabledContext,
-  disableInlineQueries = !1
+  customQueries
 }) {
-  const queryCache = /* @__PURE__ */ new Map(), parseAny = (x) => [x[0]];
   function useQuery(...args) {
-    const disabled = use(DisabledContext), [queryOrFn, paramsOrOptions, optionsArg] = args, isPlainFunction = typeof queryOrFn == "function" && !("queryName" in queryOrFn), { actualQuery, options } = useMemo(() => {
-      if (!isPlainFunction)
-        return {
-          actualQuery: queryOrFn,
-          options: paramsOrOptions
-        };
-      const fn = queryOrFn, queryName = getQueryName(fn);
-      if (!queryName)
-        throw new Error("No query name?");
-      const hasParams = optionsArg !== void 0 || paramsOrOptions && typeof paramsOrOptions == "object" && !("enabled" in paramsOrOptions) && !("ttl" in paramsOrOptions), params = hasParams ? paramsOrOptions : void 0, opts = hasParams ? optionsArg : paramsOrOptions;
-      let synced = queryCache.get(queryName);
-      return synced || (synced = syncedQuery(queryName, parseAny, (arg) => fn(arg)), queryCache.set(queryName, synced)), { actualQuery: params !== void 0 ? synced(params) : synced, options: opts };
-    }, [queryOrFn, paramsOrOptions, optionsArg, isPlainFunction]);
-    console.info("running", { actualQuery, options, queryOrFn });
-    const out = zeroUseQuery(actualQuery, options);
-    return process.env.NODE_ENV === "development" && useZeroDebug(actualQuery, options, out), disabled ? [null, { type: "unknown" }] : out;
+    const disabled = use(DisabledContext), [fn, paramsOrOptions, optionsArg] = args, { queryRequest, options } = useMemo(() => {
+      const queryName = getQueryName(fn);
+      if (!queryName) {
+        const fnName = fn?.name || "anonymous";
+        throw new Error(
+          `Query function '${fnName}' not registered. Ensure it is exported from a queries file and passed to createZeroClient via groupedQueries.`
+        );
+      }
+      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];
+      if (!customQuery)
+        throw new Error(
+          `CustomQuery '${queryName}' not found. Check that the query is exported and the namespace/name matches.`
+        );
+      return { queryRequest: params !== void 0 ? customQuery(params) : customQuery(), options: opts };
+    }, [fn, paramsOrOptions, optionsArg]), out = zeroUseQuery(queryRequest, options);
+    return process.env.NODE_ENV === "development" && useZeroDebug(queryRequest, options, out), disabled ? [null, { type: "unknown" }] : out;
   }
   return useQuery;
 }

package/dist/esm/createUseQuery.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/createUseQuery.tsx"],
-  "mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,YAAY,oBAAoB;AACzC,SAAS,KAAK,eAA6B;AAE3C,SAAS,oBAAoB;AAC7B,SAAS,oBAAoB;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,WAAW,IAAI,eAAe,GAC9B,CAAC,WAAW,iBAAiB,UAAU,IAAI,MAG3C,kBAAkB,OAAO,aAAc,cAAc,EAAE,eAAe,YAEtE,EAAE,aAAa,QAAQ,IAAI,QAAQ,MAAM;AAC7C,UAAI,CAAC;AAEH,eAAO;AAAA,UACL,aAAa;AAAA,UACb,SAAS;AAAA,QACX;AAGF,YAAM,KAAK,WACL,YAAY,aAAa,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,SAAS,YAAY,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,MAAM,aAAa,aAAa,OAAO;AAO7C,WALI,QAAQ,IAAI,aAAa,iBAE3B,aAAa,aAAa,SAAS,GAAG,GAGpC,WACK,CAAC,MAAM,EAAE,MAAM,UAAU,CAAC,IAG5B;AAAA,EACT;AAEA,SAAO;AACT;",
+  "mappings": "AAAA,SAAS,YAAY,oBAAoB;AACzC,SAAS,KAAK,eAA6B;AAE3C,SAAS,oBAAoB;AAC7B,SAAS,oBAAoB;AAqCtB,SAAS,eAA0C;AAAA,EACxD;AAAA,EACA;AACF,GAGyB;AACvB,WAAS,YAAY,MAAkB;AACrC,UAAM,WAAW,IAAI,eAAe,GAC9B,CAAC,IAAI,iBAAiB,UAAU,IAAI,MAEpC,EAAE,cAAc,QAAQ,IAAI,QAAQ,MAAM;AAC9C,YAAM,YAAY,aAAa,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,MAAM,aAAa,cAAqB,OAAO;AAOrD,WALI,QAAQ,IAAI,aAAa,iBAE3B,aAAa,cAAqB,SAAS,GAAG,GAG5C,WACK,CAAC,MAAM,EAAE,MAAM,UAAU,CAAC,IAG5B;AAAA,EACT;AAEA,SAAO;AACT;",
   "names": []
 }