over-zero 0.0.32 → 0.0.34

package/dist/cjs/cli.native.js

@@ -23,11 +23,11 @@ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
   value: mod,
   enumerable: !0
 }) : target, mod));
-var import_model = require("@sinclair/typebox-codegen/model"),
+var import_fs = require("fs"),
+  import_path = require("path"),
+  import_model = require("@sinclair/typebox-codegen/model"),
   import_typescript = require("@sinclair/typebox-codegen/typescript"),
   import_citty = require("citty"),
-  import_fs = require("fs"),
-  import_path = require("path"),
   ts = __toESM(require("typescript"), 1);
 function writeFileIfChanged(filePath, content) {
   try {
@@ -39,224 +39,226 @@ function writeFileIfChanged(filePath, content) {
   return (0, import_fs.writeFileSync)(filePath, content, "utf-8"), !0;
 }
 var generateQueries = (0, import_citty.defineCommand)({
-  meta: {
-    name: "generate-queries",
-    description: "Generate server-side query validators from TypeScript query functions"
-  },
-  args: {
-    dir: {
-      type: "positional",
-      description: "Directory containing query files",
-      required: !1,
-      default: "."
-    }
-  },
-  async run(param) {
-    var {
-        args
-      } = param,
-      dir = (0, import_path.resolve)(args.dir),
-      {
-        readdirSync: readdirSync2,
-        writeFileSync: writeFileSync2
-      } = await import("fs"),
-      files = readdirSync2(dir).filter(function (f) {
-        return f.endsWith(".ts");
-      }),
-      allQueries = [],
-      results = await Promise.all(files.map(async function (file) {
-        var filePath = (0, import_path.resolve)(dir, file),
-          queries = [];
-        try {
-          var content = (0, import_fs.readFileSync)(filePath, "utf-8"),
-            sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, !0);
-          ts.forEachChild(sourceFile, function (node) {
-            if (ts.isVariableStatement(node)) {
-              var _node_modifiers,
-                exportModifier = (_node_modifiers = node.modifiers) === null || _node_modifiers === void 0 ? void 0 : _node_modifiers.find(function (m) {
-                  return m.kind === ts.SyntaxKind.ExportKeyword;
-                });
-              if (!exportModifier) return;
-              var declaration = node.declarationList.declarations[0];
-              if (!declaration || !ts.isVariableDeclaration(declaration)) return;
-              var name = declaration.name.getText(sourceFile);
-              if (declaration.initializer && ts.isArrowFunction(declaration.initializer)) {
-                var params = declaration.initializer.parameters,
-                  paramType = "void";
-                if (params.length > 0) {
-                  var _param_type,
-                    _$param = params[0];
-                  paramType = ((_param_type = _$param.type) === null || _param_type === void 0 ? void 0 : _param_type.getText(sourceFile)) || "unknown";
-                }
-                try {
-                  var typeString = `type QueryParams = ${paramType}`,
-                    model = import_typescript.TypeScriptToModel.Generate(typeString),
-                    valibotCode = import_model.ModelToValibot.Generate(model);
-                  queries.push({
-                    name,
-                    params: paramType,
-                    valibotCode
+    meta: {
+      name: "generate-queries",
+      description: "Generate server-side query validators from TypeScript query functions"
+    },
+    args: {
+      dir: {
+        type: "positional",
+        description: "Directory containing query files",
+        required: !1,
+        default: "."
+      }
+    },
+    async run(param) {
+      var {
+          args
+        } = param,
+        dir = (0, import_path.resolve)(args.dir),
+        {
+          readdirSync: readdirSync2,
+          writeFileSync: writeFileSync2
+        } = await import("fs"),
+        files = readdirSync2(dir).filter(function (f) {
+          return f.endsWith(".ts");
+        }),
+        allQueries = [],
+        results = await Promise.all(files.map(async function (file) {
+          var filePath = (0, import_path.resolve)(dir, file),
+            queries = [];
+          try {
+            var content = (0, import_fs.readFileSync)(filePath, "utf-8"),
+              sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, !0);
+            ts.forEachChild(sourceFile, function (node) {
+              if (ts.isVariableStatement(node)) {
+                var _node_modifiers,
+                  exportModifier = (_node_modifiers = node.modifiers) === null || _node_modifiers === void 0 ? void 0 : _node_modifiers.find(function (m) {
+                    return m.kind === ts.SyntaxKind.ExportKeyword;
                   });
-                } catch (err) {
-                  console.error(`\u2717 ${name}: ${err}`);
+                if (!exportModifier) return;
+                var declaration = node.declarationList.declarations[0];
+                if (!declaration || !ts.isVariableDeclaration(declaration)) return;
+                var name = declaration.name.getText(sourceFile);
+                if (declaration.initializer && ts.isArrowFunction(declaration.initializer)) {
+                  var params = declaration.initializer.parameters,
+                    paramType = "void";
+                  if (params.length > 0) {
+                    var _param_type,
+                      _$param = params[0];
+                    paramType = ((_param_type = _$param.type) === null || _param_type === void 0 ? void 0 : _param_type.getText(sourceFile)) || "unknown";
+                  }
+                  try {
+                    var typeString = `type QueryParams = ${paramType}`,
+                      model = import_typescript.TypeScriptToModel.Generate(typeString),
+                      valibotCode = import_model.ModelToValibot.Generate(model);
+                    queries.push({
+                      name,
+                      params: paramType,
+                      valibotCode
+                    });
+                  } catch (err) {
+                    console.error(`\u2717 ${name}: ${err}`);
+                  }
                 }
               }
-            }
-          });
-        } catch (err) {
-          console.error(`Error processing ${file}:`, err);
-        }
-        return queries;
-      }));
-    allQueries.push(...results.flat()), console.info(`\u2713 ${allQueries.length} query validators`);
-  }
-});
-var generate = (0, import_citty.defineCommand)({
-  meta: {
-    name: "generate",
-    description: "Generate models, types, tables, and query validators"
-  },
-  args: {
-    dir: {
-      type: "positional",
-      description: "Base directory (defaults to src/data)",
-      required: !1,
-      default: "src/data"
+            });
+          } catch (err) {
+            console.error(`Error processing ${file}:`, err);
+          }
+          return queries;
+        }));
+      allQueries.push(...results.flat()), console.info(`\u2713 ${allQueries.length} query validators`);
+    }
+  }),
+  generate = (0, import_citty.defineCommand)({
+    meta: {
+      name: "generate",
+      description: "Generate models, types, tables, and query validators"
     },
-    watch: {
-      type: "boolean",
-      description: "Watch for changes and regenerate",
-      required: !1,
-      default: !1
+    args: {
+      dir: {
+        type: "positional",
+        description: "Base directory (defaults to src/data)",
+        required: !1,
+        default: "src/data"
+      },
+      watch: {
+        type: "boolean",
+        description: "Watch for changes and regenerate",
+        required: !1,
+        default: !1
+      },
+      after: {
+        type: "string",
+        description: "Command to run after generation completes",
+        required: !1
+      }
     },
-    after: {
-      type: "string",
-      description: "Command to run after generation completes",
-      required: !1
-    }
-  },
-  async run(param) {
-    var {
-        args
-      } = param,
-      baseDir = (0, import_path.resolve)(args.dir),
-      modelsDir = (0, import_path.resolve)(baseDir, "models"),
-      generatedDir = (0, import_path.resolve)(baseDir, "generated"),
-      queriesDir = (0, import_path.resolve)(baseDir, "queries"),
-      runGenerate = async function () {
-        (0, import_fs.existsSync)(generatedDir) || (0, import_fs.mkdirSync)(generatedDir, {
-          recursive: !0
-        });
-        var allModelFiles = (0, import_fs.readdirSync)(modelsDir).filter(function (f) {
-            return f.endsWith(".ts");
-          }).sort(),
-          schemaChecks = await Promise.all(allModelFiles.map(async function (f) {
-            return {
-              file: f,
-              hasSchema: (0, import_fs.readFileSync)((0, import_path.resolve)(modelsDir, f), "utf-8").includes("export const schema = table(")
-            };
-          })),
-          filesWithSchema = schemaChecks.filter(function (c) {
-            return c.hasSchema;
-          }).map(function (c) {
-            return c.file;
-          }),
-          [modelsOutput, typesOutput, tablesOutput, readmeOutput] = await Promise.all([Promise.resolve(generateModelsFile(allModelFiles)), Promise.resolve(generateTypesFile(filesWithSchema)), Promise.resolve(generateTablesFile(filesWithSchema)), Promise.resolve(generateReadmeFile())]),
-          writeResults = await Promise.all([Promise.resolve(writeFileIfChanged((0, import_path.resolve)(generatedDir, "models.ts"), modelsOutput)), Promise.resolve(writeFileIfChanged((0, import_path.resolve)(generatedDir, "types.ts"), typesOutput)), Promise.resolve(writeFileIfChanged((0, import_path.resolve)(generatedDir, "tables.ts"), tablesOutput)), Promise.resolve(writeFileIfChanged((0, import_path.resolve)(generatedDir, "README.md"), readmeOutput))]),
-          filesChanged = writeResults.filter(Boolean).length;
-        if (filesChanged > 0 && console.info(`  \u{1F4DD} Updated ${filesChanged} file(s)`), (0, import_fs.existsSync)(queriesDir)) {
-          var queryFiles = (0, import_fs.readdirSync)(queriesDir).filter(function (f) {
+    async run(param) {
+      var {
+          args
+        } = param,
+        baseDir = (0, import_path.resolve)(args.dir),
+        modelsDir = (0, import_path.resolve)(baseDir, "models"),
+        generatedDir = (0, import_path.resolve)(baseDir, "generated"),
+        queriesDir = (0, import_path.resolve)(baseDir, "queries"),
+        runGenerate = async function () {
+          (0, import_fs.existsSync)(generatedDir) || (0, import_fs.mkdirSync)(generatedDir, {
+            recursive: !0
+          });
+          var allModelFiles = (0, import_fs.readdirSync)(modelsDir).filter(function (f) {
               return f.endsWith(".ts");
+            }).sort(),
+            schemaChecks = await Promise.all(allModelFiles.map(async function (f) {
+              return {
+                file: f,
+                hasSchema: (0, import_fs.readFileSync)((0, import_path.resolve)(modelsDir, f), "utf-8").includes("export const schema = table(")
+              };
+            })),
+            filesWithSchema = schemaChecks.filter(function (c) {
+              return c.hasSchema;
+            }).map(function (c) {
+              return c.file;
             }),
-            queryResults = await Promise.all(queryFiles.map(async function (file) {
-              var filePath = (0, import_path.resolve)(queriesDir, file),
-                fileBaseName = (0, import_path.basename)(file, ".ts"),
-                queries = [];
-              try {
-                var content = (0, import_fs.readFileSync)(filePath, "utf-8"),
-                  sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, !0);
-                ts.forEachChild(sourceFile, function (node) {
-                  if (ts.isVariableStatement(node)) {
-                    var _node_modifiers,
-                      exportModifier = (_node_modifiers = node.modifiers) === null || _node_modifiers === void 0 ? void 0 : _node_modifiers.find(function (m) {
-                        return m.kind === ts.SyntaxKind.ExportKeyword;
-                      });
-                    if (!exportModifier) return;
-                    var declaration = node.declarationList.declarations[0];
-                    if (!declaration || !ts.isVariableDeclaration(declaration)) return;
-                    var name = declaration.name.getText(sourceFile);
-                    if (name === "permission") return;
-                    if (declaration.initializer && ts.isArrowFunction(declaration.initializer)) {
-                      var params = declaration.initializer.parameters,
-                        paramType = "void";
-                      if (params.length > 0) {
-                        var _param_type,
-                          _$param = params[0];
-                        paramType = ((_param_type = _$param.type) === null || _param_type === void 0 ? void 0 : _param_type.getText(sourceFile)) || "unknown";
-                      }
-                      try {
-                        var typeString = `type QueryParams = ${paramType}`,
-                          model = import_typescript.TypeScriptToModel.Generate(typeString),
-                          valibotCode = import_model.ModelToValibot.Generate(model);
-                        queries.push({
-                          name,
-                          params: paramType,
-                          valibotCode,
-                          sourceFile: fileBaseName
+            [modelsOutput, typesOutput, tablesOutput, readmeOutput] = await Promise.all([Promise.resolve(generateModelsFile(allModelFiles)), Promise.resolve(generateTypesFile(filesWithSchema)), Promise.resolve(generateTablesFile(filesWithSchema)), Promise.resolve(generateReadmeFile())]),
+            writeResults = await Promise.all([Promise.resolve(writeFileIfChanged((0, import_path.resolve)(generatedDir, "models.ts"), modelsOutput)), Promise.resolve(writeFileIfChanged((0, import_path.resolve)(generatedDir, "types.ts"), typesOutput)), Promise.resolve(writeFileIfChanged((0, import_path.resolve)(generatedDir, "tables.ts"), tablesOutput)), Promise.resolve(writeFileIfChanged((0, import_path.resolve)(generatedDir, "README.md"), readmeOutput))]),
+            filesChanged = writeResults.filter(Boolean).length;
+          if (filesChanged > 0 && console.info(`  \u{1F4DD} Updated ${filesChanged} file(s)`), (0, import_fs.existsSync)(queriesDir)) {
+            var queryFiles = (0, import_fs.readdirSync)(queriesDir).filter(function (f) {
+                return f.endsWith(".ts");
+              }),
+              queryResults = await Promise.all(queryFiles.map(async function (file) {
+                var filePath = (0, import_path.resolve)(queriesDir, file),
+                  fileBaseName = (0, import_path.basename)(file, ".ts"),
+                  queries = [];
+                try {
+                  var content = (0, import_fs.readFileSync)(filePath, "utf-8"),
+                    sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, !0);
+                  ts.forEachChild(sourceFile, function (node) {
+                    if (ts.isVariableStatement(node)) {
+                      var _node_modifiers,
+                        exportModifier = (_node_modifiers = node.modifiers) === null || _node_modifiers === void 0 ? void 0 : _node_modifiers.find(function (m) {
+                          return m.kind === ts.SyntaxKind.ExportKeyword;
                         });
-                      } catch (err) {
-                        console.error(`\u2717 ${name}: ${err}`);
+                      if (!exportModifier) return;
+                      var declaration = node.declarationList.declarations[0];
+                      if (!declaration || !ts.isVariableDeclaration(declaration)) return;
+                      var name = declaration.name.getText(sourceFile);
+                      if (name === "permission") return;
+                      if (declaration.initializer && ts.isArrowFunction(declaration.initializer)) {
+                        var params = declaration.initializer.parameters,
+                          paramType = "void";
+                        if (params.length > 0) {
+                          var _param_type,
+                            _$param = params[0];
+                          paramType = ((_param_type = _$param.type) === null || _param_type === void 0 ? void 0 : _param_type.getText(sourceFile)) || "unknown";
+                        }
+                        try {
+                          var typeString = `type QueryParams = ${paramType}`,
+                            model = import_typescript.TypeScriptToModel.Generate(typeString),
+                            valibotCode = import_model.ModelToValibot.Generate(model);
+                          queries.push({
+                            name,
+                            params: paramType,
+                            valibotCode,
+                            sourceFile: fileBaseName
+                          });
+                        } catch (err) {
+                          console.error(`\u2717 ${name}: ${err}`);
+                        }
                       }
                     }
-                  }
-                });
-              } catch (err) {
-                console.error(`Error processing ${file}:`, err);
-              }
-              return queries;
-            })),
-            allQueries = queryResults.flat(),
-            queriesOutput = generateQueriesFile(allQueries),
-            queriesChanged = writeFileIfChanged((0, import_path.resolve)(generatedDir, "queries.ts"), queriesOutput);
-          queriesChanged && console.info("  \u{1F4DD} Updated queries.ts"), console.info(`\u2713 ${allModelFiles.length} models (${filesWithSchema.length} schemas), ${allQueries.length} queries`);
-        } else console.info(`\u2713 ${allModelFiles.length} models (${filesWithSchema.length} schemas)`);
-        if (args.after) try {
-          var {
-            execSync
-          } = await import("child_process");
-          execSync(args.after, {
-            stdio: "inherit"
-          });
-        } catch (err) {
-          console.error(`Error running after command: ${err}`);
-        }
-      };
-    if (await runGenerate(), args.watch) {
-      console.info(`
+                  });
+                } catch (err) {
+                  console.error(`Error processing ${file}:`, err);
+                }
+                return queries;
+              })),
+              allQueries = queryResults.flat(),
+              groupedQueriesOutput = generateGroupedQueriesFile(allQueries),
+              syncedQueriesOutput = generateSyncedQueriesFile(allQueries),
+              groupedChanged = writeFileIfChanged((0, import_path.resolve)(generatedDir, "groupedQueries.ts"), groupedQueriesOutput),
+              syncedChanged = writeFileIfChanged((0, import_path.resolve)(generatedDir, "syncedQueries.ts"), syncedQueriesOutput);
+            groupedChanged && console.info("  \u{1F4DD} Updated groupedQueries.ts"), syncedChanged && console.info("  \u{1F4DD} Updated syncedQueries.ts"), console.info(`\u2713 ${allModelFiles.length} models (${filesWithSchema.length} schemas), ${allQueries.length} queries`);
+          } else console.info(`\u2713 ${allModelFiles.length} models (${filesWithSchema.length} schemas)`);
+          if (args.after) try {
+            var {
+              execSync
+            } = await import("child_process");
+            execSync(args.after, {
+              stdio: "inherit"
+            });
+          } catch (err) {
+            console.error(`Error running after command: ${err}`);
+          }
+        };
+      if (await runGenerate(), args.watch) {
+        console.info(`
 \u{1F440} watching...
 `);
-      var chokidar = await import("chokidar"),
-        debounceTimer = null,
-        debouncedRegenerate = function (path, event) {
-          debounceTimer && clearTimeout(debounceTimer), console.info(`
+        var chokidar = await import("chokidar"),
+          debounceTimer = null,
+          debouncedRegenerate = function (path, event) {
+            debounceTimer && clearTimeout(debounceTimer), console.info(`
 ${event} ${path}`), debounceTimer = setTimeout(function () {
-            runGenerate();
-          }, 1e3);
-        },
-        watcher = chokidar.watch([modelsDir, queriesDir], {
-          persistent: !0,
-          ignoreInitial: !0
-        });
-      watcher.on("change", function (path) {
-        return debouncedRegenerate(path, "\u{1F4DD}");
-      }), watcher.on("add", function (path) {
-        return debouncedRegenerate(path, "\u2795");
-      }), watcher.on("unlink", function (path) {
-        return debouncedRegenerate(path, "\u{1F5D1}\uFE0F ");
-      }), await new Promise(function () {});
+              runGenerate();
+            }, 1e3);
+          },
+          watcher = chokidar.watch([modelsDir, queriesDir], {
+            persistent: !0,
+            ignoreInitial: !0
+          });
+        watcher.on("change", function (path) {
+          return debouncedRegenerate(path, "\u{1F4DD}");
+        }), watcher.on("add", function (path) {
+          return debouncedRegenerate(path, "\u2795");
+        }), watcher.on("unlink", function (path) {
+          return debouncedRegenerate(path, "\u{1F5D1}\uFE0F ");
+        }), await new Promise(function () {});
+      }
     }
-  }
-});
+  });
 function generateModelsFile(modelFiles) {
   var modelNames = modelFiles.map(function (f) {
       return (0, import_path.basename)(f, ".ts");
@@ -322,16 +324,31 @@ function generateTablesFile(modelFiles) {
 ${exports}
 `;
 }
-function generateQueriesFile(queries) {
-  var sortedQueries = [...queries].sort(function (a, b) {
-      return a.name.localeCompare(b.name);
-    }),
-    queryByFile = /* @__PURE__ */new Map(),
+function generateGroupedQueriesFile(queries) {
+  var sortedFiles = [...new Set(queries.map(function (q) {
+      return q.sourceFile;
+    }))].sort(),
+    exports = sortedFiles.map(function (file) {
+      return `export * as ${file} from '../queries/${file}'`;
+    }).join(`
+`);
+  return `/**
+ * auto-generated by: over-zero generate
+ *
+ * grouped query re-exports for minification-safe query identity.
+ * this file re-exports all query modules - while this breaks tree-shaking,
+ * queries are typically small and few in number even in larger apps.
+ */
+${exports}
+`;
+}
+function generateSyncedQueriesFile(queries) {
+  var queryByFile = /* @__PURE__ */new Map(),
     _iteratorNormalCompletion = !0,
     _didIteratorError = !1,
     _iteratorError = void 0;
   try {
-    for (var _iterator = sortedQueries[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
+    for (var _iterator = queries[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
       var q = _step.value;
       queryByFile.has(q.sourceFile) || queryByFile.set(q.sourceFile, []), queryByFile.get(q.sourceFile).push(q);
     }
@@ -344,44 +361,49 @@ function generateQueriesFile(queries) {
       if (_didIteratorError) throw _iteratorError;
     }
   }
-  var queryImports = Array.from(queryByFile.keys()).sort().map(function (file) {
-      return `import * as ${file}Queries from '../queries/${file}'`;
-    }).join(`
-`),
-    imports = `import * as v from 'valibot'
+  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'
-${queryImports}
+import * as v from 'valibot'
+import * as Queries from './groupedQueries'
 `,
-    syncedQueries = sortedQueries.map(function (q2) {
-      var lines = q2.valibotCode.split(`
-`).filter(function (l) {
-          return l.trim();
-        }),
-        schemaLineIndex = lines.findIndex(function (l) {
-          return l.startsWith("export const QueryParams");
+    namespaceExports = sortedFiles.map(function (file) {
+      var fileQueries = queryByFile.get(file).sort(function (a, b) {
+          return a.name.localeCompare(b.name);
         }),
-        validatorDef = "v.void()";
-      if (schemaLineIndex !== -1) {
-        for (var schemaLines = [], openBraces = 0, started = !1, i = schemaLineIndex; i < lines.length; i++) {
-          var line = lines[i],
-            cleaned = started ? line : line.replace("export const QueryParams = ", "");
-          if (schemaLines.push(cleaned), started = !0, openBraces += (cleaned.match(/\{/g) || []).length, openBraces -= (cleaned.match(/\}/g) || []).length, openBraces += (cleaned.match(/\(/g) || []).length, openBraces -= (cleaned.match(/\)/g) || []).length, openBraces === 0 && schemaLines.length > 0) break;
-        }
-        validatorDef = schemaLines.join(`
+        queryDefs = fileQueries.map(function (q2) {
+          var lines = q2.valibotCode.split(`
+`).filter(function (l) {
+              return l.trim();
+            }),
+            schemaLineIndex = lines.findIndex(function (l) {
+              return l.startsWith("export const QueryParams");
+            }),
+            validatorDef = "v.void()";
+          if (schemaLineIndex !== -1) {
+            for (var schemaLines = [], openBraces = 0, started = !1, i = schemaLineIndex; i < lines.length; i++) {
+              var line = lines[i],
+                cleaned = started ? line : line.replace("export const QueryParams = ", "");
+              if (schemaLines.push(cleaned), started = !0, openBraces += (cleaned.match(/\{/g) || []).length, openBraces -= (cleaned.match(/\}/g) || []).length, openBraces += (cleaned.match(/\(/g) || []).length, openBraces -= (cleaned.match(/\)/g) || []).length, openBraces === 0 && schemaLines.length > 0) break;
+            }
+            validatorDef = schemaLines.join(`
 `);
-      }
-      var wrappedValidator = validatorDef === "v.void()" ? "v.parser(v.tuple([]))" : `v.parser(v.tuple([${validatorDef}]))`,
-        queryFn = validatorDef === "v.void()" ? `() => {
-  return ${q2.sourceFile}Queries.${q2.name}()
-}` : `(arg) => {
-  return ${q2.sourceFile}Queries.${q2.name}(arg)
+          }
+          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}),`;
+        }).join(`
+`);
+      return `export const ${file} = {
+${queryDefs}
 }`;
-      return `export const ${q2.name} = syncedQuery('${q2.name}', ${wrappedValidator}, ${queryFn})`;
     }).join(`
 
 `);
-  return imports + `
-` + syncedQueries + `
+  return `${imports}
+${namespaceExports}
 `;
 }
 function generateReadmeFile() {
@@ -394,7 +416,8 @@ this folder is auto-generated by over-zero. do not edit files here directly.
 - \`models.ts\` - exports all models from ../models
 - \`types.ts\` - typescript types derived from table schemas
 - \`tables.ts\` - exports table schemas for type inference
-- \`queries.ts\` - synced query definitions with validators
+- \`groupedQueries.ts\` - namespaced query re-exports for client setup
+- \`syncedQueries.ts\` - namespaced syncedQuery wrappers for server setup
 
 ## usage guidelines
 
@@ -402,16 +425,15 @@ this folder is auto-generated by over-zero. do not edit files here directly.
 
 ### queries
 
-don't import queries from this folder on the client. instead, import from \`../queries/\`:
+write your queries as plain functions in \`../queries/\` and import them directly:
 
 \`\`\`ts
-// \u274C bad - don't import from generated
-import { channelMessages } from '~/data/generated/queries'
-
 // \u2705 good - import from queries
 import { channelMessages } from '~/data/queries/message'
 \`\`\`
 
+the generated query files are only used internally by zero client/server setup.
+
 ### types
 
 you can import types from this folder, but prefer re-exporting from \`../types.ts\`: