@pgsql/lint 18.2.0 → 18.2.1

package/README.md

@@ -62,8 +62,11 @@ request's base branch (`$GITHUB_BASE_REF`) and otherwise to the repository's
 default branch; the diff is taken against `git merge-base HEAD <base>`, so
 commits landed on the base branch afterwards don't widen the set. Uncommitted and
 untracked changes are included, deleted/renamed-away paths are dropped, and a
-shallow clone or detached checkout (no resolvable merge base) falls back to the
-working-tree diff against `HEAD`. Nothing changed is an exit-0 pass.
+shallow clone or detached checkout (no resolvable base) falls back to working-tree
+changes only. Nothing changed is an exit-0 pass.
+
+Detection is [`git-changed`](https://npmjs.com/package/git-changed), shared with
+`pgpm package --check`, so the two agree on what "changed" means.
 
 ### Config file
 

package/changed.d.ts

@@ -2,12 +2,12 @@
  * Changed-file detection for `--changed`, so a CI gate (or a human before a
  * commit) pays only for the SQL that a branch actually touched.
  *
- * Modelled on pgpm's bundle-drift check (`pgpm/core/src/packaging/check.ts` in
- * constructive): resolve a base ref (explicit → `origin/$GITHUB_BASE_REF` in a
- * PR → the repository's default branch), diff `HEAD` against the **merge base**
- * so unrelated commits on the base branch don't widen the set, and union that
- * with uncommitted/untracked working-tree changes. Deleted paths are dropped —
- * there is nothing left on disk to lint.
+ * The git plumbing — base resolution, merge-base diff, working-tree union,
+ * rename targets, dropping paths that no longer exist — lives in `git-changed`,
+ * which is shared with pgpm's bundle-drift check. This module is the `.sql`
+ * filter over it, and the place where "no base" stays non-fatal: a lint gate
+ * that refuses to run on a shallow clone lints nothing, which is worse than
+ * linting the working tree.
  */
 /**
  * Resolve the ref to diff against. An explicit `base` wins; otherwise the PR
@@ -26,9 +26,7 @@ export interface ChangedFilesResult {
 }
 /**
  * Collect the files that differ from `base` (via `git merge-base`) plus any
- * uncommitted/untracked working-tree changes. Falls back to `git diff HEAD`
- * when no base is resolvable or no merge base exists — a shallow clone or a
- * detached CI checkout — rather than failing the run.
+ * uncommitted/untracked working-tree changes.
  */
 export declare function changedFiles(options?: {
     cwd?: string;

package/changed.js

@@ -3,80 +3,18 @@
  * Changed-file detection for `--changed`, so a CI gate (or a human before a
  * commit) pays only for the SQL that a branch actually touched.
  *
- * Modelled on pgpm's bundle-drift check (`pgpm/core/src/packaging/check.ts` in
- * constructive): resolve a base ref (explicit → `origin/$GITHUB_BASE_REF` in a
- * PR → the repository's default branch), diff `HEAD` against the **merge base**
- * so unrelated commits on the base branch don't widen the set, and union that
- * with uncommitted/untracked working-tree changes. Deleted paths are dropped —
- * there is nothing left on disk to lint.
+ * The git plumbing — base resolution, merge-base diff, working-tree union,
+ * rename targets, dropping paths that no longer exist — lives in `git-changed`,
+ * which is shared with pgpm's bundle-drift check. This module is the `.sql`
+ * filter over it, and the place where "no base" stays non-fatal: a lint gate
+ * that refuses to run on a shallow clone lints nothing, which is worse than
+ * linting the working tree.
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveChangedBase = resolveChangedBase;
 exports.changedFiles = changedFiles;
 exports.changedSqlFiles = changedSqlFiles;
-const child_process_1 = require("child_process");
-const fs_1 = require("fs");
-const path = __importStar(require("path"));
-function git(args, cwd) {
-    return (0, child_process_1.execFileSync)('git', args, {
-        cwd,
-        encoding: 'utf-8',
-        stdio: ['ignore', 'pipe', 'ignore'],
-        maxBuffer: 64 * 1024 * 1024
-    });
-}
-function tryGit(args, cwd) {
-    try {
-        return git(args, cwd);
-    }
-    catch {
-        return null;
-    }
-}
-/** The repository's default branch as a remote-tracking ref, when discoverable. */
-function defaultBranch(cwd) {
-    const head = tryGit(['symbolic-ref', '--short', 'refs/remotes/origin/HEAD'], cwd);
-    if (head && head.trim())
-        return head.trim();
-    for (const candidate of ['origin/main', 'origin/master', 'main', 'master']) {
-        if (tryGit(['rev-parse', '--verify', '--quiet', candidate], cwd))
-            return candidate;
-    }
-    return undefined;
-}
+const git_changed_1 = require("git-changed");
 /**
  * Resolve the ref to diff against. An explicit `base` wins; otherwise the PR
  * base branch (`origin/$GITHUB_BASE_REF`) when running in GitHub Actions;
@@ -84,76 +22,23 @@ function defaultBranch(cwd) {
  * the caller falls back to working-tree changes only.
  */
 function resolveChangedBase(base, cwd = process.cwd()) {
-    if (base && base.trim())
-        return base.trim();
-    const prBase = process.env.GITHUB_BASE_REF;
-    if (prBase && prBase.trim()) {
-        const ref = `origin/${prBase.trim()}`;
-        if (tryGit(['rev-parse', '--verify', '--quiet', ref], cwd))
-            return ref;
-        return prBase.trim();
-    }
-    return defaultBranch(cwd);
+    return (0, git_changed_1.resolveBase)(base, cwd);
 }
-/** Parse `git status --porcelain` into paths (rename target wins). */
-function workingTreePaths(cwd) {
-    const out = [];
-    // `-uall` lists untracked *files*; the default collapses a new directory to
-    // the directory name, which would hide every file a new module adds.
-    const status = tryGit(['status', '--porcelain', '-uall'], cwd) ?? '';
-    for (const rawLine of status.split('\n')) {
-        const line = rawLine.trimEnd();
-        if (!line)
-            continue;
-        let p = line.slice(3);
-        const arrow = p.indexOf(' -> ');
-        if (arrow !== -1)
-            p = p.slice(arrow + 4);
-        p = p.replace(/^"|"$/g, '');
-        if (p)
-            out.push(p);
+function collect(cwd, base, ext) {
+    if (!(0, git_changed_1.isRepo)(cwd)) {
+        throw new Error(`--changed needs a git repository; ${cwd} is not inside one`);
     }
-    return out;
+    const result = (0, git_changed_1.changedFiles)({ cwd, base, ext });
+    return { files: result.paths, base: result.base, mergeBase: result.mergeBase };
 }
 /**
  * Collect the files that differ from `base` (via `git merge-base`) plus any
- * uncommitted/untracked working-tree changes. Falls back to `git diff HEAD`
- * when no base is resolvable or no merge base exists — a shallow clone or a
- * detached CI checkout — rather than failing the run.
+ * uncommitted/untracked working-tree changes.
  */
 function changedFiles(options = {}) {
-    const cwd = options.cwd ?? process.cwd();
-    if (!tryGit(['rev-parse', '--git-dir'], cwd)) {
-        throw new Error(`--changed needs a git repository; ${cwd} is not inside one`);
-    }
-    const files = new Set(workingTreePaths(cwd));
-    const base = resolveChangedBase(options.base, cwd);
-    let mergeBase;
-    if (base) {
-        const found = tryGit(['merge-base', 'HEAD', base], cwd);
-        mergeBase = found?.trim() || undefined;
-    }
-    // No base, or no common ancestor (shallow clone / detached checkout): the
-    // uncommitted diff against HEAD is all the history we can see.
-    const diffArgs = mergeBase
-        ? ['diff', '--name-only', '--diff-filter=ACMR', mergeBase, 'HEAD']
-        : ['diff', '--name-only', '--diff-filter=ACMR', 'HEAD'];
-    for (const rawLine of (tryGit(diffArgs, cwd) ?? '').split('\n')) {
-        const p = rawLine.trim();
-        if (p)
-            files.add(p);
-    }
-    const abs = [];
-    for (const rel of files) {
-        const full = path.resolve(cwd, rel);
-        // Deleted or renamed-away paths have nothing left to lint.
-        if ((0, fs_1.existsSync)(full) && (0, fs_1.statSync)(full).isFile())
-            abs.push(full);
-    }
-    return { files: abs.sort(), base, mergeBase };
+    return collect(options.cwd ?? process.cwd(), options.base);
 }
 /** {@link changedFiles}, narrowed to `.sql`. */
 function changedSqlFiles(options = {}) {
-    const result = changedFiles(options);
-    return { ...result, files: result.files.filter((f) => f.toLowerCase().endsWith('.sql')) };
+    return collect(options.cwd ?? process.cwd(), options.base, '.sql');
 }

package/esm/changed.js

@@ -2,43 +2,14 @@
  * Changed-file detection for `--changed`, so a CI gate (or a human before a
  * commit) pays only for the SQL that a branch actually touched.
  *
- * Modelled on pgpm's bundle-drift check (`pgpm/core/src/packaging/check.ts` in
- * constructive): resolve a base ref (explicit → `origin/$GITHUB_BASE_REF` in a
- * PR → the repository's default branch), diff `HEAD` against the **merge base**
- * so unrelated commits on the base branch don't widen the set, and union that
- * with uncommitted/untracked working-tree changes. Deleted paths are dropped —
- * there is nothing left on disk to lint.
+ * The git plumbing — base resolution, merge-base diff, working-tree union,
+ * rename targets, dropping paths that no longer exist — lives in `git-changed`,
+ * which is shared with pgpm's bundle-drift check. This module is the `.sql`
+ * filter over it, and the place where "no base" stays non-fatal: a lint gate
+ * that refuses to run on a shallow clone lints nothing, which is worse than
+ * linting the working tree.
  */
-import { execFileSync } from 'child_process';
-import { existsSync, statSync } from 'fs';
-import * as path from 'path';
-function git(args, cwd) {
-    return execFileSync('git', args, {
-        cwd,
-        encoding: 'utf-8',
-        stdio: ['ignore', 'pipe', 'ignore'],
-        maxBuffer: 64 * 1024 * 1024
-    });
-}
-function tryGit(args, cwd) {
-    try {
-        return git(args, cwd);
-    }
-    catch {
-        return null;
-    }
-}
-/** The repository's default branch as a remote-tracking ref, when discoverable. */
-function defaultBranch(cwd) {
-    const head = tryGit(['symbolic-ref', '--short', 'refs/remotes/origin/HEAD'], cwd);
-    if (head && head.trim())
-        return head.trim();
-    for (const candidate of ['origin/main', 'origin/master', 'main', 'master']) {
-        if (tryGit(['rev-parse', '--verify', '--quiet', candidate], cwd))
-            return candidate;
-    }
-    return undefined;
-}
+import { changedFiles as gitChangedFiles, isRepo, resolveBase } from 'git-changed';
 /**
  * Resolve the ref to diff against. An explicit `base` wins; otherwise the PR
  * base branch (`origin/$GITHUB_BASE_REF`) when running in GitHub Actions;
@@ -46,76 +17,23 @@ function defaultBranch(cwd) {
  * the caller falls back to working-tree changes only.
  */
 export function resolveChangedBase(base, cwd = process.cwd()) {
-    if (base && base.trim())
-        return base.trim();
-    const prBase = process.env.GITHUB_BASE_REF;
-    if (prBase && prBase.trim()) {
-        const ref = `origin/${prBase.trim()}`;
-        if (tryGit(['rev-parse', '--verify', '--quiet', ref], cwd))
-            return ref;
-        return prBase.trim();
-    }
-    return defaultBranch(cwd);
+    return resolveBase(base, cwd);
 }
-/** Parse `git status --porcelain` into paths (rename target wins). */
-function workingTreePaths(cwd) {
-    const out = [];
-    // `-uall` lists untracked *files*; the default collapses a new directory to
-    // the directory name, which would hide every file a new module adds.
-    const status = tryGit(['status', '--porcelain', '-uall'], cwd) ?? '';
-    for (const rawLine of status.split('\n')) {
-        const line = rawLine.trimEnd();
-        if (!line)
-            continue;
-        let p = line.slice(3);
-        const arrow = p.indexOf(' -> ');
-        if (arrow !== -1)
-            p = p.slice(arrow + 4);
-        p = p.replace(/^"|"$/g, '');
-        if (p)
-            out.push(p);
+function collect(cwd, base, ext) {
+    if (!isRepo(cwd)) {
+        throw new Error(`--changed needs a git repository; ${cwd} is not inside one`);
     }
-    return out;
+    const result = gitChangedFiles({ cwd, base, ext });
+    return { files: result.paths, base: result.base, mergeBase: result.mergeBase };
 }
 /**
  * Collect the files that differ from `base` (via `git merge-base`) plus any
- * uncommitted/untracked working-tree changes. Falls back to `git diff HEAD`
- * when no base is resolvable or no merge base exists — a shallow clone or a
- * detached CI checkout — rather than failing the run.
+ * uncommitted/untracked working-tree changes.
  */
 export function changedFiles(options = {}) {
-    const cwd = options.cwd ?? process.cwd();
-    if (!tryGit(['rev-parse', '--git-dir'], cwd)) {
-        throw new Error(`--changed needs a git repository; ${cwd} is not inside one`);
-    }
-    const files = new Set(workingTreePaths(cwd));
-    const base = resolveChangedBase(options.base, cwd);
-    let mergeBase;
-    if (base) {
-        const found = tryGit(['merge-base', 'HEAD', base], cwd);
-        mergeBase = found?.trim() || undefined;
-    }
-    // No base, or no common ancestor (shallow clone / detached checkout): the
-    // uncommitted diff against HEAD is all the history we can see.
-    const diffArgs = mergeBase
-        ? ['diff', '--name-only', '--diff-filter=ACMR', mergeBase, 'HEAD']
-        : ['diff', '--name-only', '--diff-filter=ACMR', 'HEAD'];
-    for (const rawLine of (tryGit(diffArgs, cwd) ?? '').split('\n')) {
-        const p = rawLine.trim();
-        if (p)
-            files.add(p);
-    }
-    const abs = [];
-    for (const rel of files) {
-        const full = path.resolve(cwd, rel);
-        // Deleted or renamed-away paths have nothing left to lint.
-        if (existsSync(full) && statSync(full).isFile())
-            abs.push(full);
-    }
-    return { files: abs.sort(), base, mergeBase };
+    return collect(options.cwd ?? process.cwd(), options.base);
 }
 /** {@link changedFiles}, narrowed to `.sql`. */
 export function changedSqlFiles(options = {}) {
-    const result = changedFiles(options);
-    return { ...result, files: result.files.filter((f) => f.toLowerCase().endsWith('.sql')) };
+    return collect(options.cwd ?? process.cwd(), options.base, '.sql');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgsql/lint",
-  "version": "18.2.0",
+  "version": "18.2.1",
   "author": "Constructive <developers@constructive.io>",
   "description": "Source-level SQL/PL/pgSQL convention linter: fully-qualified references, no search_path, no dynamic SQL, with ESLint-style inline waivers. Pure AST, no database.",
   "main": "index.js",
@@ -36,6 +36,7 @@
   "dependencies": {
     "@pgsql/traverse": "18.7.3",
     "chalk": "^4.1.0",
+    "git-changed": "^0.3.0",
     "libpg-query": "18.1.4",
     "minimist": "1.2.8",
     "pgsql-parser": "18.2.3"
@@ -56,5 +57,5 @@
     "search_path",
     "dynamic-sql"
   ],
-  "gitHead": "fa4ea3167cadd5eb0e9a216a2abfa564f6c62364"
+  "gitHead": "69cdce673db035fb1ee3b529480d39fac01512ab"
 }