on-zero 0.7.10 → 0.8.0

package/dist/cjs/generate.native.js

@@ -35,8 +35,10 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 }), mod);
 var generate_exports = {};
 __export(generate_exports, {
+  deriveDataMembership: () => deriveDataMembership,
   generate: () => generate,
   generateDrizzleSchemaFile: () => generateDrizzleSchemaFile,
+  generateDrizzleSchemaInputFile: () => generateDrizzleSchemaInputFile,
   watch: () => watch
 });
 module.exports = __toCommonJS(generate_exports);
@@ -44,52 +46,77 @@ var import_crypto = require("crypto");
 var import_fs = require("fs");
 var import_path = require("path");
 var import_generate_helpers = require("./generate-helpers.native.js");
-var hash = function (s) {
+var import_generate_layout = require("./generate-layout.native.js");
+var hash = function hash2(s) {
   return (0, import_crypto.createHash)("sha256").update(s).digest("hex");
 };
-var GENERATOR_CACHE_VERSION = "1";
-var isGeneratorSourceFile = function (name) {
+var GENERATOR_CACHE_VERSION = "5";
+var isGeneratorSourceFile = function isGeneratorSourceFile2(name) {
   return name.endsWith(".ts") && !name.endsWith(".d.ts") && !name.endsWith(".test.ts") && !name.endsWith(".spec.ts");
 };
-function hashInputTree(baseDir, generatedDir) {
+function hashInputTree(sourceRoots, generatedDir) {
   var parts = [];
-  var walk = function (dir) {
+  var seen = /* @__PURE__ */new Set();
+  var walk = function walk1(dir) {
     if (!(0, import_fs.existsSync)(dir)) return;
     var entries = (0, import_fs.readdirSync)(dir, {
       withFileTypes: true
     }).sort(function (a, b) {
       return a.name < b.name ? -1 : 1;
     });
-    var _iteratorNormalCompletion = true,
-      _didIteratorError = false,
-      _iteratorError = void 0;
+    var _iteratorNormalCompletion2 = true,
+      _didIteratorError2 = false,
+      _iteratorError2 = void 0;
     try {
-      for (var _iterator = entries[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-        var entry = _step.value;
+      for (var _iterator2 = entries[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+        var entry = _step2.value;
         var full = (0, import_path.resolve)(dir, entry.name);
         if (entry.isDirectory()) {
-          if (entry.name === "node_modules" || full === generatedDir) continue;
+          if (entry.name === "node_modules" || entry.name === "generated" || full === generatedDir) continue;
           walk(full);
         } else if (entry.isFile() && isGeneratorSourceFile(entry.name)) {
+          if (seen.has(full)) continue;
+          seen.add(full);
           parts.push(`${full}\0${(0, import_fs.readFileSync)(full, "utf-8")}`);
         }
       }
     } catch (err) {
-      _didIteratorError = true;
-      _iteratorError = err;
+      _didIteratorError2 = true;
+      _iteratorError2 = err;
     } finally {
       try {
-        if (!_iteratorNormalCompletion && _iterator.return != null) {
-          _iterator.return();
+        if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+          _iterator2.return();
         }
       } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
+        if (_didIteratorError2) {
+          throw _iteratorError2;
         }
       }
     }
   };
-  walk(baseDir);
+  var _iteratorNormalCompletion = true,
+    _didIteratorError = false,
+    _iteratorError = void 0;
+  try {
+    for (var _iterator = sourceRoots[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var root = _step.value;
+      walk(root);
+    }
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
+  }
   return hash(parts.join("\0"));
 }
 var generateCache = {};
@@ -117,7 +144,7 @@ function loadCache() {
   generateCachePath = (0, import_path.resolve)(cacheDir, "generate-cache.json");
   try {
     generateCache = JSON.parse((0, import_fs.readFileSync)(generateCachePath, "utf-8"));
-  } catch (e) {
+  } catch (unused) {
     generateCache = {};
   }
 }
@@ -206,7 +233,7 @@ function createTypeResolver(ts, files, dir) {
     resolveType(node) {
       try {
         return checker.getTypeFromTypeNode(node);
-      } catch (e) {
+      } catch (unused) {
         return null;
       }
     },
@@ -505,7 +532,7 @@ function tsTypeToValibot(ts, checker, type, seen) {
     if (seen.has(type)) return "v.unknown()";
     seen.add(type);
   }
-  var recurse = function (t) {
+  var recurse = function recurse2(t) {
     return tsTypeToValibot(ts, checker, t, seen);
   };
   if (flags & ts.TypeFlags.String) return "v.string()";
@@ -517,9 +544,9 @@ function tsTypeToValibot(ts, checker, type, seen) {
   if (flags & ts.TypeFlags.Never) return "v.never()";
   if (flags & ts.TypeFlags.TemplateLiteral) return "v.string()";
   if (flags & ts.TypeFlags.Object && (((_checker_isArrayType = checker.isArrayType) === null || _checker_isArrayType === void 0 ? void 0 : _checker_isArrayType.call(checker, type)) || ((_checker_isArrayLikeType = checker.isArrayLikeType) === null || _checker_isArrayLikeType === void 0 ? void 0 : _checker_isArrayLikeType.call(checker, type)))) {
+    var _ref;
     var _checker_getTypeArguments, _type_getNumberIndexType;
-    var _checker_getTypeArguments1;
-    var typeArgs = (_checker_getTypeArguments1 = (_checker_getTypeArguments = checker.getTypeArguments) === null || _checker_getTypeArguments === void 0 ? void 0 : _checker_getTypeArguments.call(checker, type)) !== null && _checker_getTypeArguments1 !== void 0 ? _checker_getTypeArguments1 : [];
+    var typeArgs = (_ref = (_checker_getTypeArguments = checker.getTypeArguments) === null || _checker_getTypeArguments === void 0 ? void 0 : _checker_getTypeArguments.call(checker, type)) !== null && _ref !== void 0 ? _ref : [];
     var elementType = typeArgs.length === 1 ? typeArgs[0] : (_type_getNumberIndexType = type.getNumberIndexType) === null || _type_getNumberIndexType === void 0 ? void 0 : _type_getNumberIndexType.call(type);
     return `v.array(${elementType ? recurse(elementType) : "v.unknown()"})`;
   }
@@ -560,7 +587,7 @@ function tsTypeToValibot(ts, checker, type, seen) {
     if (hasUndefined) inner1 = `v.optional(${inner1})`;
     return inner1;
   }
-  var resolveSymbolType = function (parent, prop2) {
+  var resolveSymbolType = function resolveSymbolType2(parent, prop2) {
     var _prop_declarations;
     var instantiated = getInstantiatedPropertyType(checker, parent, prop2.getName());
     if (instantiated) return instantiated;
@@ -810,33 +837,146 @@ function generateDrizzleSchemaFile(schema) {
   lines.push(``);
   return lines.join("\n");
 }
+function dataMembershipFromLayout(layout) {
+  return {
+    instances: Object.fromEntries(layout.instances.map(function (instance) {
+      return [instance.name, {
+        tables: instance.namespaces.map(function (namespace) {
+          return namespace.name;
+        }).sort(),
+        syncTables: [...instance.syncTables],
+        supportTables: [...instance.supportTables],
+        scope: instance.scope
+      }];
+    })),
+    allTables: [...new Set(layout.instances.flatMap(function (instance) {
+      return [...instance.syncTables, ...instance.supportTables];
+    }))].sort()
+  };
+}
+async function deriveDataMembership(options) {
+  var ts = await import("typescript");
+  var layout = (0, import_generate_layout.discoverDataLayout)(ts, (0, import_path.resolve)(options.dir), options.config ? (0, import_path.resolve)(options.config) : void 0);
+  return dataMembershipFromLayout(layout);
+}
+async function generateDrizzleSchemaInputFile(options) {
+  var _layout_metadataPaths_find;
+  var ts = await import("typescript");
+  var baseDir = (0, import_path.resolve)(options.dir);
+  var layout = (0, import_generate_layout.discoverDataLayout)(ts, baseDir, options.config ? (0, import_path.resolve)(options.config) : void 0);
+  var tableNames = dataMembershipFromLayout(layout).allTables;
+  var relationsPath = (_layout_metadataPaths_find = layout.metadataPaths.find(function (path) {
+    return (0, import_path.basename)(path) === "relations.ts" && (0, import_path.dirname)(path) === (0, import_path.resolve)((0, import_path.dirname)(baseDir), "database");
+  })) !== null && _layout_metadataPaths_find !== void 0 ? _layout_metadataPaths_find : layout.metadataPaths.find(function (path) {
+    return (0, import_path.basename)(path) === "relations.ts";
+  });
+  var relationEntries = [];
+  if (relationsPath) {
+    var source = ts.createSourceFile(relationsPath, (0, import_fs.readFileSync)(relationsPath, "utf8"), ts.ScriptTarget.Latest, true);
+    var included = new Set(tableNames);
+    var visit = function visit1(node) {
+      if (!ts.isCallExpression(node) || node.expression.getText(source) !== "defineRelations") {
+        ts.forEachChild(node, visit);
+        return;
+      }
+      var factory = node.arguments[1];
+      if (!factory || !ts.isArrowFunction(factory) && !ts.isFunctionExpression(factory)) {
+        return;
+      }
+      var body = ts.isParenthesizedExpression(factory.body) ? factory.body.expression : factory.body;
+      if (!ts.isObjectLiteralExpression(body)) return;
+      var _iteratorNormalCompletion = true,
+        _didIteratorError = false,
+        _iteratorError = void 0;
+      try {
+        for (var _iterator = body.properties[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var tableProperty = _step.value;
+          if (!ts.isPropertyAssignment(tableProperty) || !ts.isObjectLiteralExpression(tableProperty.initializer)) {
+            continue;
+          }
+          var table = tableProperty.name.getText(source).replace(/^['"]|['"]$/g, "");
+          if (!included.has(table)) continue;
+          var relations = [];
+          var _iteratorNormalCompletion1 = true,
+            _didIteratorError1 = false,
+            _iteratorError1 = void 0;
+          try {
+            for (var _iterator1 = tableProperty.initializer.properties[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+              var relationProperty = _step1.value;
+              if (!ts.isPropertyAssignment(relationProperty) || !ts.isCallExpression(relationProperty.initializer) || !ts.isPropertyAccessExpression(relationProperty.initializer.expression)) {
+                continue;
+              }
+              var target = relationProperty.initializer.expression.name.text;
+              if (included.has(target)) relations.push(relationProperty.getText(source));
+            }
+          } catch (err) {
+            _didIteratorError1 = true;
+            _iteratorError1 = err;
+          } finally {
+            try {
+              if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                _iterator1.return();
+              }
+            } finally {
+              if (_didIteratorError1) {
+                throw _iteratorError1;
+              }
+            }
+          }
+          relationEntries.push(`  ${tableProperty.name.getText(source)}: {${relations.length ? `
+${relations.map(function (relation) {
+            return `    ${relation},`;
+          }).join("\n")}
+  ` : ""}},`);
+        }
+      } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+      } finally {
+        try {
+          if (!_iteratorNormalCompletion && _iterator.return != null) {
+            _iterator.return();
+          }
+        } finally {
+          if (_didIteratorError) {
+            throw _iteratorError;
+          }
+        }
+      }
+    };
+    visit(source);
+  }
+  var schemaImportPath = JSON.stringify(options.schemaImportPath);
+  return ["// auto-generated from the on-zero data layout", `import { defineRelations } from 'drizzle-orm'`, `import * as schema from ${schemaImportPath}`, "", `export { ${tableNames.join(", ")} } from ${schemaImportPath}`, `export const relations = defineRelations(schema, (r) => ({`, ...relationEntries, `}))`, ""].join("\n");
+}
 async function generate(options) {
   var {
     dir,
     after,
     silent,
-    force
+    force,
+    config
   } = options;
   var baseDir = (0, import_path.resolve)(dir);
-  var mutationsDir = (0, import_path.resolve)(baseDir, "mutations");
-  var usesMutationsDir = (0, import_fs.existsSync)(mutationsDir);
-  var modelsDir = usesMutationsDir ? mutationsDir : (0, import_path.resolve)(baseDir, "models");
-  var modelsDirName = usesMutationsDir ? "mutations" : "models";
   var generatedDir = (0, import_path.resolve)(baseDir, "generated");
-  var queriesDir = (0, import_path.resolve)(baseDir, "queries");
   if (!(0, import_fs.existsSync)(generatedDir)) {
     (0, import_fs.mkdirSync)(generatedDir, {
       recursive: true
     });
   }
   loadCache();
-  var inputHash = hashInputTree(baseDir, generatedDir);
+  var ts = await import("typescript");
+  var layout = (0, import_generate_layout.discoverDataLayout)(ts, baseDir, config ? (0, import_path.resolve)(config) : void 0);
+  var metadataHash = hash(layout.metadataPaths.map(function (path) {
+    return `${path}\0${(0, import_fs.readFileSync)(path, "utf8")}`;
+  }).join("\0"));
+  var inputHash = hash(`${hashInputTree(layout.sourceRoots, generatedDir)}\0${metadataHash}`);
   if (!force && generateCache.__generatorVersion === GENERATOR_CACHE_VERSION && generateCache.__inputHash === inputHash && (0, import_fs.existsSync)((0, import_path.resolve)(generatedDir, "models.ts"))) {
+    var _counts_modelCount, _counts_schemaCount, _counts_queryCount, _counts_mutationCount;
     var counts = {};
     try {
       counts = JSON.parse(generateCache.__counts || "{}");
-    } catch (e) {}
-    var _counts_modelCount, _counts_schemaCount, _counts_queryCount, _counts_mutationCount;
+    } catch (unused) {}
     return {
       filesChanged: 0,
       modelCount: (_counts_modelCount = counts.modelCount) !== null && _counts_modelCount !== void 0 ? _counts_modelCount : 0,
@@ -845,127 +985,161 @@ async function generate(options) {
       mutationCount: (_counts_mutationCount = counts.mutationCount) !== null && _counts_mutationCount !== void 0 ? _counts_mutationCount : 0
     };
   }
-  var allModelFiles = (0, import_fs.readdirSync)(modelsDir).filter(isGeneratorSourceFile).sort();
-  var filesWithSchema = allModelFiles.filter(function (f) {
-    return (0, import_fs.readFileSync)((0, import_path.resolve)(modelsDir, f), "utf-8").includes("export const schema = table(");
+  var modelNamespaces = layout.namespaces.filter(function (namespace2) {
+    return namespace2.modelPath !== null;
   });
-  var allModelNames = allModelFiles.map(function (f) {
-    return (0, import_path.basename)(f, ".ts");
+  var filesWithSchema = modelNamespaces.filter(function (namespace2) {
+    return (0, import_fs.readFileSync)(namespace2.modelPath, "utf-8").includes("export const schema = table(");
   });
-  var schemaModelNames = filesWithSchema.map(function (f) {
-    return (0, import_path.basename)(f, ".ts");
+  var modelModules = modelNamespaces.map(function (namespace2) {
+    return {
+      name: namespace2.name,
+      importPath: (0, import_generate_layout.namespaceImportPath)(baseDir, namespace2.modelPath)
+    };
   });
-  var writeResults = [writeFileIfChanged((0, import_path.resolve)(generatedDir, "models.ts"), (0, import_generate_helpers.generateModelsFile)(allModelNames, modelsDirName)),
+  var schemaModules = filesWithSchema.map(function (namespace2) {
+    return {
+      name: namespace2.name,
+      importPath: (0, import_generate_layout.namespaceImportPath)(baseDir, namespace2.modelPath)
+    };
+  });
+  var writeResults = [writeFileIfChanged((0, import_path.resolve)(generatedDir, "models.ts"), (0, import_generate_helpers.generateModelsFile)(modelModules)),
   // only generate types.ts and tables.ts when model files define schemas.
   // when using drizzle-zero CLI for schema generation, these files are
   // managed externally and should not be overwritten.
-  ...(filesWithSchema.length > 0 ? [writeFileIfChanged((0, import_path.resolve)(generatedDir, "types.ts"), (0, import_generate_helpers.generateTypesFile)(schemaModelNames)), writeFileIfChanged((0, import_path.resolve)(generatedDir, "tables.ts"), (0, import_generate_helpers.generateTablesFile)(schemaModelNames, modelsDirName))] : []), writeFileIfChanged((0, import_path.resolve)(generatedDir, "README.md"), (0, import_generate_helpers.generateReadmeFile)())];
+  ...(filesWithSchema.length > 0 ? [writeFileIfChanged((0, import_path.resolve)(generatedDir, "types.ts"), (0, import_generate_helpers.generateTypesFile)(schemaModules.map(function (module2) {
+    return module2.name;
+  }))), writeFileIfChanged((0, import_path.resolve)(generatedDir, "tables.ts"), (0, import_generate_helpers.generateTablesFile)(schemaModules))] : []), writeFileIfChanged((0, import_path.resolve)(generatedDir, "README.md"), (0, import_generate_helpers.generateReadmeFile)())];
   var filesChanged = writeResults.filter(Boolean).length;
   var queryCount = 0;
   var mutationCount = 0;
-  var ts = await import("typescript");
-  var typeToValibot = function (paramType) {
+  var typeToValibot = function typeToValibot2(paramType) {
     try {
       return (0, import_generate_helpers.parseTypeString)(paramType.trim());
-    } catch (e) {
+    } catch (unused) {
       return null;
     }
   };
-  if ((0, import_fs.existsSync)(queriesDir)) {
-    var queryFiles = (0, import_fs.readdirSync)(queriesDir).filter(isGeneratorSourceFile);
-    var allQueries = [];
-    var queryResolver = null;
-    var getQueryResolver = function () {
-      if (!queryResolver) {
-        var allFiles2 = (0, import_fs.readdirSync)(queriesDir).filter(isGeneratorSourceFile).map(function (f) {
-          return {
-            path: (0, import_path.resolve)(queriesDir, f),
-            content: (0, import_fs.readFileSync)((0, import_path.resolve)(queriesDir, f), "utf-8")
-          };
-        });
-        queryResolver = createTypeResolver(ts, allFiles2, queriesDir);
-      }
-      return queryResolver;
-    };
-    var _iteratorNormalCompletion = true,
-      _didIteratorError = false,
-      _iteratorError = void 0;
-    try {
-      var _loop = function () {
-        var file2 = _step.value;
-        var filePath2 = (0, import_path.resolve)(queriesDir, file2);
-        var fileBaseName2 = (0, import_path.basename)(file2, ".ts");
-        try {
-          var content2 = (0, import_fs.readFileSync)(filePath2, "utf-8");
-          var sourceFile2 = ts.createSourceFile(filePath2, content2, ts.ScriptTarget.Latest, true);
-          ts.forEachChild(sourceFile2, function (node) {
-            if (ts.isVariableStatement(node)) {
-              var _node_modifiers;
-              var 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(sourceFile2);
-              if (name === "permission") return;
-              if (declaration.initializer && ts.isArrowFunction(declaration.initializer)) {
-                var params = declaration.initializer.parameters;
-                var paramType = "void";
-                if (params.length > 0) {
-                  var _param_type;
-                  var param = params[0];
-                  paramType = ((_param_type = param.type) === null || _param_type === void 0 ? void 0 : _param_type.getText(sourceFile2)) || "unknown";
-                }
-                var valibotCode = typeToValibot(paramType);
-                if (!valibotCode && params.length > 0 && params[0].type) {
-                  var resolver = getQueryResolver();
-                  var resolverSourceFile = resolver.program.getSourceFile(filePath2);
-                  if (resolverSourceFile) {
-                    var resolvedType = resolveParamType(ts, resolver, resolverSourceFile, name, 0);
-                    if (resolvedType) {
-                      valibotCode = resolver.typeToValibot(resolvedType);
-                    }
+  var allQueries = [];
+  var queryResolver = null;
+  var getQueryResolver = function getQueryResolver2() {
+    if (!queryResolver) {
+      var allFiles2 = [...new Set(layout.namespaces.flatMap(function (namespace2) {
+        return namespace2.sourcePaths;
+      }))].map(function (path) {
+        return {
+          path,
+          content: (0, import_fs.readFileSync)(path, "utf-8")
+        };
+      });
+      queryResolver = createTypeResolver(ts, allFiles2, baseDir);
+    }
+    return queryResolver;
+  };
+  var _iteratorNormalCompletion = true,
+    _didIteratorError = false,
+    _iteratorError = void 0;
+  try {
+    var _loop = function () {
+      var namespace2 = _step.value;
+      var filePath2 = namespace2.queryPath;
+      try {
+        var content2 = (0, import_fs.readFileSync)(filePath2, "utf-8");
+        var sourceFile2 = ts.createSourceFile(filePath2, content2, ts.ScriptTarget.Latest, true);
+        ts.forEachChild(sourceFile2, function (node) {
+          if (ts.isVariableStatement(node)) {
+            var _node_modifiers;
+            var 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(sourceFile2);
+            if (["mutate", "permission", "schema", "where"].includes(name)) return;
+            if (declaration.initializer && ts.isArrowFunction(declaration.initializer)) {
+              var params = declaration.initializer.parameters;
+              var paramType = "void";
+              if (params.length > 0) {
+                var _param_type;
+                var param = params[0];
+                paramType = ((_param_type = param.type) === null || _param_type === void 0 ? void 0 : _param_type.getText(sourceFile2)) || "unknown";
+              }
+              var valibotCode = typeToValibot(paramType);
+              if (!valibotCode && params.length > 0 && params[0].type) {
+                var resolver = getQueryResolver();
+                var resolverSourceFile = resolver.program.getSourceFile(filePath2);
+                if (resolverSourceFile) {
+                  var resolvedType = resolveParamType(ts, resolver, resolverSourceFile, name, 0);
+                  if (resolvedType) {
+                    valibotCode = resolver.typeToValibot(resolvedType);
                   }
                 }
-                if (valibotCode) {
-                  allQueries.push({
-                    name,
-                    params: paramType,
-                    valibotCode,
-                    sourceFile: fileBaseName2
-                  });
-                } else if (!silent && paramType !== "void") {
-                  console.error(`\u2717 ${name}: could not resolve type "${paramType}"`);
-                }
+              }
+              if (valibotCode) {
+                allQueries.push({
+                  name,
+                  params: paramType,
+                  valibotCode,
+                  sourceFile: namespace2.name,
+                  importPath: (0, import_generate_layout.namespaceImportPath)(baseDir, filePath2)
+                });
+              } else if (!silent && paramType !== "void") {
+                console.error(`\u2717 ${name}: could not resolve type "${paramType}"`);
               }
             }
-          });
-        } catch (err) {
-          if (!silent) console.error(`Error processing ${file2}:`, err);
-        }
-      };
-      for (var _iterator = queryFiles[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) _loop();
-    } catch (err) {
-      _didIteratorError = true;
-      _iteratorError = err;
+          }
+        });
+      } catch (err) {
+        if (!silent) console.error(`Error processing ${filePath2}:`, err);
+      }
+    };
+    for (var _iterator = layout.namespaces.filter(function (namespace2) {
+        return namespace2.queryPath !== null;
+      })[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) _loop();
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
     } finally {
-      try {
-        if (!_iteratorNormalCompletion && _iterator.return != null) {
-          _iterator.return();
-        }
-      } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
-        }
+      if (_didIteratorError) {
+        throw _iteratorError;
       }
     }
-    queryCount = allQueries.length;
-    var groupedChanged = writeFileIfChanged((0, import_path.resolve)(generatedDir, "groupedQueries.ts"), (0, import_generate_helpers.generateGroupedQueriesFile)(allQueries));
-    var syncedChanged = writeFileIfChanged((0, import_path.resolve)(generatedDir, "syncedQueries.ts"), (0, import_generate_helpers.generateSyncedQueriesFile)(allQueries));
-    if (groupedChanged) filesChanged++;
-    if (syncedChanged) filesChanged++;
   }
+  queryCount = allQueries.length;
+  var groupedChanged = writeFileIfChanged((0, import_path.resolve)(generatedDir, "groupedQueries.ts"), (0, import_generate_helpers.generateGroupedQueriesFile)(allQueries));
+  var syncedChanged = writeFileIfChanged((0, import_path.resolve)(generatedDir, "syncedQueries.ts"), (0, import_generate_helpers.generateSyncedQueriesFile)(allQueries));
+  if (groupedChanged) filesChanged++;
+  if (syncedChanged) filesChanged++;
+  var instancesChanged = writeFileIfChanged((0, import_path.resolve)(generatedDir, "instances.ts"), (0, import_generate_helpers.generateInstancesFile)(layout.instances.map(function (instance) {
+    return {
+      name: instance.name,
+      scope: instance.scope,
+      queryNames: instance.namespaces.map(function (namespace2) {
+        return namespace2.name;
+      }).filter(function (name) {
+        return allQueries.some(function (query) {
+          return query.sourceFile === name;
+        });
+      }),
+      modelNames: instance.namespaces.filter(function (namespace2) {
+        return namespace2.modelPath;
+      }).map(function (namespace2) {
+        return namespace2.name;
+      }),
+      tables: instance.namespaces.map(function (namespace2) {
+        return namespace2.name;
+      }),
+      syncTables: instance.syncTables,
+      supportTables: instance.supportTables
+    };
+  })));
+  if (instancesChanged) filesChanged++;
   var allModelMutations = [];
   var mutationFiles = [];
   var unresolvedModels = [];
@@ -973,10 +1147,10 @@ async function generate(options) {
     _didIteratorError1 = false,
     _iteratorError1 = void 0;
   try {
-    for (var _iterator1 = allModelFiles[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
-      var file = _step1.value;
-      var filePath = (0, import_path.resolve)(modelsDir, file);
-      var fileBaseName = (0, import_path.basename)(file, ".ts");
+    for (var _iterator1 = modelNamespaces[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+      var namespace = _step1.value;
+      var filePath = namespace.modelPath;
+      var fileBaseName = namespace.name;
       try {
         var content = (0, import_fs.readFileSync)(filePath, "utf-8");
         mutationFiles.push({
@@ -1000,7 +1174,7 @@ async function generate(options) {
           }
         }
       } catch (err) {
-        if (!silent) console.error(`Error extracting mutations from ${file}:`, err);
+        if (!silent) console.error(`Error extracting mutations from ${filePath}:`, err);
       }
     }
   } catch (err) {
@@ -1018,7 +1192,7 @@ async function generate(options) {
     }
   }
   if (unresolvedModels.length > 0) {
-    var collectTsFiles = function (dir2) {
+    var collectTsFiles = function collectTsFiles1(dir2) {
       var results = [];
       var _iteratorNormalCompletion4 = true,
         _didIteratorError4 = false,
@@ -1054,7 +1228,9 @@ async function generate(options) {
       }
       return results;
     };
-    var allFiles = collectTsFiles(baseDir);
+    var allFiles = [...new Map(layout.sourceRoots.flatMap(collectTsFiles).map(function (file) {
+      return [file.path, file];
+    })).values()];
     var modelResolver = createTypeResolver(ts, allFiles, baseDir);
     var _iteratorNormalCompletion2 = true,
       _didIteratorError2 = false,
@@ -1127,7 +1303,7 @@ async function generate(options) {
     if (mutationsChanged) filesChanged++;
   }
   if (filesChanged > 0 && !silent) {
-    console.info(`\u2713 ${allModelFiles.length} models (${filesWithSchema.length} schemas)${queryCount ? `, ${queryCount} queries` : ""}${mutationCount ? `, ${mutationCount} mutations` : ""}`);
+    console.info(`\u2713 ${modelNamespaces.length} models (${filesWithSchema.length} schemas)${queryCount ? `, ${queryCount} queries` : ""}${mutationCount ? `, ${mutationCount} mutations` : ""}`);
   }
   if (filesChanged > 0 && after) {
     var {
@@ -1148,7 +1324,7 @@ async function generate(options) {
   generateCache.__generatorVersion = GENERATOR_CACHE_VERSION;
   generateCache.__inputHash = inputHash;
   generateCache.__counts = JSON.stringify({
-    modelCount: allModelFiles.length,
+    modelCount: modelNamespaces.length,
     schemaCount: filesWithSchema.length,
     queryCount,
     mutationCount
@@ -1156,7 +1332,7 @@ async function generate(options) {
   saveCache();
   return {
     filesChanged,
-    modelCount: allModelFiles.length,
+    modelCount: modelNamespaces.length,
     schemaCount: filesWithSchema.length,
     queryCount,
     mutationCount
@@ -1168,9 +1344,6 @@ async function watch(options) {
     debounce = 1e3
   } = options;
   var baseDir = (0, import_path.resolve)(dir);
-  var mutationsDir = (0, import_path.resolve)(baseDir, "mutations");
-  var modelsDir = (0, import_fs.existsSync)(mutationsDir) ? mutationsDir : (0, import_path.resolve)(baseDir, "models");
-  var queriesDir = (0, import_path.resolve)(baseDir, "queries");
   var generatedDir = (0, import_path.resolve)(baseDir, "generated");
   await generate({
     ...options,
@@ -1179,7 +1352,7 @@ async function watch(options) {
   console.info("\u{1F440} watching...\n");
   var chokidar = await import("chokidar");
   var debounceTimer = null;
-  var debouncedRegenerate = function (path, event) {
+  var debouncedRegenerate = function debouncedRegenerate2(path, event) {
     if (debounceTimer) clearTimeout(debounceTimer);
     console.info(`
 ${event} ${path}`);
@@ -1190,10 +1363,13 @@ ${event} ${path}`);
       });
     }, debounce);
   };
-  var watcher = chokidar.watch([modelsDir, queriesDir], {
+  var databaseDir = (0, import_path.resolve)((0, import_path.dirname)(baseDir), "database");
+  var ts = await import("typescript");
+  var layout = (0, import_generate_layout.discoverDataLayout)(ts, baseDir, options.config ? (0, import_path.resolve)(options.config) : void 0);
+  var watcher = chokidar.watch([... /* @__PURE__ */new Set([...layout.sourceRoots, ...((0, import_fs.existsSync)(databaseDir) ? [databaseDir] : [])])], {
     persistent: true,
     ignoreInitial: true,
-    ignored: [generatedDir]
+    ignored: [generatedDir, /node_modules/]
   });
   watcher.on("change", function (path) {
     return debouncedRegenerate(path, "\u{1F4DD}");