Remove redundant ../.. traversal test and unused schemaDir param

Author: nervetattoo

packages/generate/src/queries.ts

@@ -5,7 +5,7 @@ import { type CommandOptions } from "./commandutil";
 import { headerComment } from "./genutil";
 import type { Target } from "./genutil";
 
-const { walk, readFileUtf8 } = systemUtils;
+const { readFileUtf8 } = systemUtils;
 
 // generate per-file queries
 // generate queries in a single file
@@ -42,7 +42,6 @@ currently supported.`);
   console.log(`Detected schema directory: ${params.schemaDir}`);
   const matches = await getMatches(
     root,
-    params.schemaDir,
     params.options.patterns,
   );
   if (matches.length === 0) {
@@ -97,8 +96,7 @@ currently supported.`);
     );
     if (!wasError) {
       console.log(
-        `Generating query file${
-          Object.keys(filesByExtension).length > 1 ? "s" : ""
+        `Generating query file${Object.keys(filesByExtension).length > 1 ? "s" : ""
         }...`,
       );
       for (const [extension, file] of Object.entries(filesByExtension)) {
@@ -113,7 +111,7 @@ currently supported.`);
         await fs.writeFile(
           filePath,
           headerComment +
-            `${stringifyImports(file.imports)}\n\n${file.contents}`,
+          `${stringifyImports(file.imports)}\n\n${file.contents}`,
         );
       }
     }
@@ -167,39 +165,28 @@ export function stringifyImports(imports: ImportMap) {
 
 async function getMatches(
   root: string,
-  schemaDir: string,
   patterns?: string[],
 ) {
-  if (patterns && patterns.length > 0) {
-    // Use globby to match files with the provided patterns
-    const { globby } = await import("globby");
-
-    const allFiles = await globby(patterns, {
-      cwd: process.cwd(),
-      absolute: true,
-      onlyFiles: true,
-      expandDirectories: {
-        extensions: ["edgeql"],
-      },
-      ignore: [
-        "node_modules/**",
-        `${schemaDir}/migrations/**`,
-        `${schemaDir}/fixups/**`,
-      ],
-    });
-
-    return allFiles;
-  }
-
-  // Default behavior - walk all files
-  return walk(root, {
-    match: [/[^/]\.edgeql$/],
-    skip: [
-      /node_modules/,
-      RegExp(`${schemaDir}\\${path.sep}migrations`),
-      RegExp(`${schemaDir}\\${path.sep}fixups`),
+  // Single code path using globby for both cases
+  const { globby } = await import("globby");
+
+  const searchPatterns = patterns && patterns.length > 0 ? patterns : ["."];
+
+  const allFiles = await globby(searchPatterns, {
+    cwd: root,
+    absolute: true,
+    onlyFiles: true,
+    expandDirectories: {
+      extensions: ["edgeql"],
+    },
+    ignore: [
+      "node_modules/**",
+      `**/migrations/**`,
+      `**/fixups/**`,
     ],
   });
+
+  return allFiles;
 }
 
 // const targetToExtension: {[k in Target]: string} = {

packages/generate/test/cli.test.ts

@@ -157,54 +157,6 @@ describe("cli", () => {
     }
   });
 
-  test("pattern traversal up excludes schema directories", () => {
-    const cleanup = (file: string) => {
-      try {
-        fs.unlinkSync(file);
-      } catch (e) {}
-    };
-
-    const cleanupDir = (dir: string) => {
-      try {
-        fs.rmSync(dir, { recursive: true, force: true });
-      } catch (e) {}
-    };
-
-    // Create subdirectory structure
-    const subDir = path.resolve(QBDIR, "apps", "backend");
-    fs.mkdirSync(subDir, { recursive: true });
-
-    // Create schema files at project root that should be ignored
-    const schemaDir = path.resolve(QBDIR, "dbschema");
-    const migrationsDir = path.resolve(schemaDir, "migrations");
-    fs.mkdirSync(migrationsDir, { recursive: true });
-
-    const migrationFile = path.resolve(migrationsDir, "bad.edgeql");
-    const goodFile = path.resolve(QBDIR, "good2.edgeql");
-
-    fs.writeFileSync(migrationFile, "CREATE TYPE Bad;");
-    fs.writeFileSync(goodFile, "SELECT 123;");
-
-    try {
-      // Run from subdirectory with "../.." pattern - should ignore schema
-      const cliPath = path.resolve(QBDIR, "dist", "cli.js");
-      execSync(`"${cliPath}" queries "../.."`, {
-        stdio: "inherit",
-        cwd: subDir,
-      });
-
-      // Verify good file processed, schema file ignored
-      assert.ok(fs.existsSync(path.resolve(QBDIR, "good2.query.ts")));
-      assert.ok(!fs.existsSync(path.resolve(migrationsDir, "bad.query.ts")));
-    } finally {
-      // Cleanup
-      [migrationFile, goodFile, path.resolve(QBDIR, "good2.query.ts")].forEach(
-        cleanup,
-      );
-      [migrationsDir, path.resolve(QBDIR, "apps")].forEach(cleanupDir);
-    }
-  });
-
   test("absolute pattern paths work correctly", () => {
     // Create temp directory with test files
     const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "gel-test-"));