@query-doctor/core 0.10.5 → 0.10.6

package/dist/index.cjs

@@ -6,6 +6,7 @@ const require_nudges = require("./sql/nudges.cjs");
 const require_analyzer = require("./sql/analyzer.cjs");
 const require_database = require("./sql/database.cjs");
 const require_display_query = require("./sql/display-query.cjs");
+const require_normalized_fingerprint = require("./sql/normalized-fingerprint.cjs");
 const require_indexes = require("./sql/indexes.cjs");
 const require_builder = require("./sql/builder.cjs");
 const require_genalgo = require("./optimizer/genalgo.cjs");
@@ -72,4 +73,5 @@ exports.ignoredIdentifier = require_analyzer.ignoredIdentifier;
 exports.indexCovers = require_index_coverage.indexCovers;
 exports.isIndexProbablyDroppable = require_indexes.isIndexProbablyDroppable;
 exports.isIndexSupported = require_indexes.isIndexSupported;
+exports.normalizedFingerprint = require_normalized_fingerprint.normalizedFingerprint;
 exports.parseNudges = require_nudges.parseNudges;

package/dist/index.d.cts

@@ -9,6 +9,7 @@ import { IndexIdentifier, IndexOptimizer, IndexToCreate, OptimizeResult, PROCEED
 import { Nudge, parseNudges } from "./sql/nudges.cjs";
 import { AnalysisResult, Analyzer, DatabaseDriver, DiscoveredColumnReference, JsonbOperator, Parser, SQLCommenterExtraction, SQLCommenterTag, SortContext, StatementType, TableReference, ignoredIdentifier } from "./sql/analyzer.cjs";
 import { CompactSelectListOptions, compactSelectList } from "./sql/display-query.cjs";
+import { FingerprintFn, normalizedFingerprint } from "./sql/normalized-fingerprint.cjs";
 import { DuplicateIndexGroup, groupDuplicateIndexes, isIndexProbablyDroppable, isIndexSupported } from "./sql/indexes.cjs";
 import { CombinedExport, ExportedQuery, QuerySource, combinedDumpSql, dumpQueriesSql } from "./optimizer/dump.cjs";
 import { PssRewriter } from "./optimizer/pss-rewriter.cjs";
@@ -19,4 +20,4 @@ import { ActionPlanNudgeQuery, ActionableStep, AffectedQueryCost, CostReduction,
 import { deriveSentryEnvironment } from "./sentry.cjs";
 import { ClientApi, ConnectionMode, ExtensionPresence, IndexDefinition, RepoConfig, ServerApi, UnauthenticatedServerApi } from "./websocket-server.cjs";
 import { QueryFinding, QueryFindingCode, QueryFindingSeverity, analyzeQueryFindings } from "./findings/query-findings.cjs";
-export { ActionPlanNudgeQuery, ActionPlanQuery, ActionableStep, AffectedQueryCost, AggregatedIndexRecommendation, AnalysisResult, Analyzer, ClientApi, ColumnMetadata, CombinedExport, CompactSelectListOptions, ComputedColumnStats, ComputedReltuples, ComputedStats, ConnectionMode, CostReduction, DUMP_STATS_SQL, DatabaseDriver, DiscoveredColumnReference, DomainLabel, DuplicateIndexGroup, ExportedQuery, ExportedStats, ExportedStatsColumns, ExportedStatsIndex, ExportedStatsStatistics, ExportedStatsV1, ExtensionPresence, FullSchema, FullSchemaColumn, FullSchemaCompositeAttribute, FullSchemaConstraint, FullSchemaExtension, FullSchemaFunction, FullSchemaIncludedColumn, FullSchemaIndex, FullSchemaKeyColumn, FullSchemaTable, FullSchemaTrigger, FullSchemaType, FullSchemaTypeConstraint, FullSchemaView, IndexAction, IndexDefinition, IndexGroup, IndexIdentifier, IndexOptimizer, IndexRecommendation, IndexToCreate, JsonbOperator, LiveQueryOptimization, Nudge, NudgeFinding, OptimizationResult, OptimizeResult, OptimizedQuery, PROCEED, Parameter, Parser, Path, PermutedIndexCandidate, PgIdentifier, Postgres, PostgresConnectionInput, PostgresExplainResult, PostgresExplainStage, PostgresExplainStageCommon, PostgresExplainStageSchema, PostgresFactory, PostgresQueryBuilder, PostgresQueryBuilderCommand, PostgresStage, PostgresStageId, PostgresTransaction, PostgresVersion, PssRewriter, QueryFinding, QueryFindingCode, QueryFindingSeverity, QueryHash, QuerySource, RecentQuery, RegressionBreach, RepoConfig, RootIndexCandidate, SKIP, SQLCommenterExtraction, SQLCommenterTag, SerializeResult, ServerApi, SortContext, StatementType, Statistics, StatisticsMode, StatisticsSource, TableMetadata, TableReference, TableStats, UnauthenticatedServerApi, aggregateIndexRecommendations, analyzeQueryFindings, buildActionPlan, combinedDumpSql, compactSelectList, deriveSentryEnvironment, dropIndex, dumpQueriesSql, dumpSchema, groupDuplicateIndexes, groupIndexesByCoverage, ignoredIdentifier, indexCovers, isIndexProbablyDroppable, isIndexSupported, parseNudges };
+export { ActionPlanNudgeQuery, ActionPlanQuery, ActionableStep, AffectedQueryCost, AggregatedIndexRecommendation, AnalysisResult, Analyzer, ClientApi, ColumnMetadata, CombinedExport, CompactSelectListOptions, ComputedColumnStats, ComputedReltuples, ComputedStats, ConnectionMode, CostReduction, DUMP_STATS_SQL, DatabaseDriver, DiscoveredColumnReference, DomainLabel, DuplicateIndexGroup, ExportedQuery, ExportedStats, ExportedStatsColumns, ExportedStatsIndex, ExportedStatsStatistics, ExportedStatsV1, ExtensionPresence, FingerprintFn, FullSchema, FullSchemaColumn, FullSchemaCompositeAttribute, FullSchemaConstraint, FullSchemaExtension, FullSchemaFunction, FullSchemaIncludedColumn, FullSchemaIndex, FullSchemaKeyColumn, FullSchemaTable, FullSchemaTrigger, FullSchemaType, FullSchemaTypeConstraint, FullSchemaView, IndexAction, IndexDefinition, IndexGroup, IndexIdentifier, IndexOptimizer, IndexRecommendation, IndexToCreate, JsonbOperator, LiveQueryOptimization, Nudge, NudgeFinding, OptimizationResult, OptimizeResult, OptimizedQuery, PROCEED, Parameter, Parser, Path, PermutedIndexCandidate, PgIdentifier, Postgres, PostgresConnectionInput, PostgresExplainResult, PostgresExplainStage, PostgresExplainStageCommon, PostgresExplainStageSchema, PostgresFactory, PostgresQueryBuilder, PostgresQueryBuilderCommand, PostgresStage, PostgresStageId, PostgresTransaction, PostgresVersion, PssRewriter, QueryFinding, QueryFindingCode, QueryFindingSeverity, QueryHash, QuerySource, RecentQuery, RegressionBreach, RepoConfig, RootIndexCandidate, SKIP, SQLCommenterExtraction, SQLCommenterTag, SerializeResult, ServerApi, SortContext, StatementType, Statistics, StatisticsMode, StatisticsSource, TableMetadata, TableReference, TableStats, UnauthenticatedServerApi, aggregateIndexRecommendations, analyzeQueryFindings, buildActionPlan, combinedDumpSql, compactSelectList, deriveSentryEnvironment, dropIndex, dumpQueriesSql, dumpSchema, groupDuplicateIndexes, groupIndexesByCoverage, ignoredIdentifier, indexCovers, isIndexProbablyDroppable, isIndexSupported, normalizedFingerprint, parseNudges };

package/dist/index.d.mts

@@ -9,6 +9,7 @@ import { IndexIdentifier, IndexOptimizer, IndexToCreate, OptimizeResult, PROCEED
 import { Nudge, parseNudges } from "./sql/nudges.mjs";
 import { AnalysisResult, Analyzer, DatabaseDriver, DiscoveredColumnReference, JsonbOperator, Parser, SQLCommenterExtraction, SQLCommenterTag, SortContext, StatementType, TableReference, ignoredIdentifier } from "./sql/analyzer.mjs";
 import { CompactSelectListOptions, compactSelectList } from "./sql/display-query.mjs";
+import { FingerprintFn, normalizedFingerprint } from "./sql/normalized-fingerprint.mjs";
 import { DuplicateIndexGroup, groupDuplicateIndexes, isIndexProbablyDroppable, isIndexSupported } from "./sql/indexes.mjs";
 import { CombinedExport, ExportedQuery, QuerySource, combinedDumpSql, dumpQueriesSql } from "./optimizer/dump.mjs";
 import { PssRewriter } from "./optimizer/pss-rewriter.mjs";
@@ -19,4 +20,4 @@ import { ActionPlanNudgeQuery, ActionableStep, AffectedQueryCost, CostReduction,
 import { deriveSentryEnvironment } from "./sentry.mjs";
 import { ClientApi, ConnectionMode, ExtensionPresence, IndexDefinition, RepoConfig, ServerApi, UnauthenticatedServerApi } from "./websocket-server.mjs";
 import { QueryFinding, QueryFindingCode, QueryFindingSeverity, analyzeQueryFindings } from "./findings/query-findings.mjs";
-export { ActionPlanNudgeQuery, ActionPlanQuery, ActionableStep, AffectedQueryCost, AggregatedIndexRecommendation, AnalysisResult, Analyzer, ClientApi, ColumnMetadata, CombinedExport, CompactSelectListOptions, ComputedColumnStats, ComputedReltuples, ComputedStats, ConnectionMode, CostReduction, DUMP_STATS_SQL, DatabaseDriver, DiscoveredColumnReference, DomainLabel, DuplicateIndexGroup, ExportedQuery, ExportedStats, ExportedStatsColumns, ExportedStatsIndex, ExportedStatsStatistics, ExportedStatsV1, ExtensionPresence, FullSchema, FullSchemaColumn, FullSchemaCompositeAttribute, FullSchemaConstraint, FullSchemaExtension, FullSchemaFunction, FullSchemaIncludedColumn, FullSchemaIndex, FullSchemaKeyColumn, FullSchemaTable, FullSchemaTrigger, FullSchemaType, FullSchemaTypeConstraint, FullSchemaView, IndexAction, IndexDefinition, IndexGroup, IndexIdentifier, IndexOptimizer, IndexRecommendation, IndexToCreate, JsonbOperator, LiveQueryOptimization, Nudge, NudgeFinding, OptimizationResult, OptimizeResult, OptimizedQuery, PROCEED, Parameter, Parser, Path, PermutedIndexCandidate, PgIdentifier, Postgres, PostgresConnectionInput, PostgresExplainResult, PostgresExplainStage, PostgresExplainStageCommon, PostgresExplainStageSchema, PostgresFactory, PostgresQueryBuilder, PostgresQueryBuilderCommand, PostgresStage, PostgresStageId, PostgresTransaction, PostgresVersion, PssRewriter, QueryFinding, QueryFindingCode, QueryFindingSeverity, QueryHash, QuerySource, RecentQuery, RegressionBreach, RepoConfig, RootIndexCandidate, SKIP, SQLCommenterExtraction, SQLCommenterTag, SerializeResult, ServerApi, SortContext, StatementType, Statistics, StatisticsMode, StatisticsSource, TableMetadata, TableReference, TableStats, UnauthenticatedServerApi, aggregateIndexRecommendations, analyzeQueryFindings, buildActionPlan, combinedDumpSql, compactSelectList, deriveSentryEnvironment, dropIndex, dumpQueriesSql, dumpSchema, groupDuplicateIndexes, groupIndexesByCoverage, ignoredIdentifier, indexCovers, isIndexProbablyDroppable, isIndexSupported, parseNudges };
+export { ActionPlanNudgeQuery, ActionPlanQuery, ActionableStep, AffectedQueryCost, AggregatedIndexRecommendation, AnalysisResult, Analyzer, ClientApi, ColumnMetadata, CombinedExport, CompactSelectListOptions, ComputedColumnStats, ComputedReltuples, ComputedStats, ConnectionMode, CostReduction, DUMP_STATS_SQL, DatabaseDriver, DiscoveredColumnReference, DomainLabel, DuplicateIndexGroup, ExportedQuery, ExportedStats, ExportedStatsColumns, ExportedStatsIndex, ExportedStatsStatistics, ExportedStatsV1, ExtensionPresence, FingerprintFn, FullSchema, FullSchemaColumn, FullSchemaCompositeAttribute, FullSchemaConstraint, FullSchemaExtension, FullSchemaFunction, FullSchemaIncludedColumn, FullSchemaIndex, FullSchemaKeyColumn, FullSchemaTable, FullSchemaTrigger, FullSchemaType, FullSchemaTypeConstraint, FullSchemaView, IndexAction, IndexDefinition, IndexGroup, IndexIdentifier, IndexOptimizer, IndexRecommendation, IndexToCreate, JsonbOperator, LiveQueryOptimization, Nudge, NudgeFinding, OptimizationResult, OptimizeResult, OptimizedQuery, PROCEED, Parameter, Parser, Path, PermutedIndexCandidate, PgIdentifier, Postgres, PostgresConnectionInput, PostgresExplainResult, PostgresExplainStage, PostgresExplainStageCommon, PostgresExplainStageSchema, PostgresFactory, PostgresQueryBuilder, PostgresQueryBuilderCommand, PostgresStage, PostgresStageId, PostgresTransaction, PostgresVersion, PssRewriter, QueryFinding, QueryFindingCode, QueryFindingSeverity, QueryHash, QuerySource, RecentQuery, RegressionBreach, RepoConfig, RootIndexCandidate, SKIP, SQLCommenterExtraction, SQLCommenterTag, SerializeResult, ServerApi, SortContext, StatementType, Statistics, StatisticsMode, StatisticsSource, TableMetadata, TableReference, TableStats, UnauthenticatedServerApi, aggregateIndexRecommendations, analyzeQueryFindings, buildActionPlan, combinedDumpSql, compactSelectList, deriveSentryEnvironment, dropIndex, dumpQueriesSql, dumpSchema, groupDuplicateIndexes, groupIndexesByCoverage, ignoredIdentifier, indexCovers, isIndexProbablyDroppable, isIndexSupported, normalizedFingerprint, parseNudges };

package/dist/index.mjs

@@ -5,6 +5,7 @@ import { parseNudges } from "./sql/nudges.mjs";
 import { Analyzer, ignoredIdentifier } from "./sql/analyzer.mjs";
 import { PostgresExplainStageSchema, PostgresVersion, dropIndex } from "./sql/database.mjs";
 import { compactSelectList } from "./sql/display-query.mjs";
+import { normalizedFingerprint } from "./sql/normalized-fingerprint.mjs";
 import { groupDuplicateIndexes, isIndexProbablyDroppable, isIndexSupported } from "./sql/indexes.mjs";
 import { PostgresQueryBuilder } from "./sql/builder.mjs";
 import { IndexOptimizer, PROCEED, SKIP } from "./optimizer/genalgo.mjs";
@@ -17,4 +18,4 @@ import { buildActionPlan } from "./action-plan/build-action-plan.mjs";
 import { deriveSentryEnvironment } from "./sentry.mjs";
 import { OptimizedQuery, RecentQuery } from "./query.mjs";
 import { analyzeQueryFindings } from "./findings/query-findings.mjs";
-export { Analyzer, CombinedExport, ComputedColumnStats, ComputedReltuples, ComputedStats, DUMP_STATS_SQL, ExportedQuery, ExportedStats, ExportedStatsColumns, ExportedStatsIndex, ExportedStatsStatistics, ExportedStatsV1, FullSchema, FullSchemaColumn, FullSchemaCompositeAttribute, FullSchemaConstraint, FullSchemaExtension, FullSchemaFunction, FullSchemaIncludedColumn, FullSchemaIndex, FullSchemaKeyColumn, FullSchemaTable, FullSchemaTrigger, FullSchemaType, FullSchemaTypeConstraint, FullSchemaView, IndexOptimizer, OptimizedQuery, PROCEED, PgIdentifier, PostgresExplainStageSchema, PostgresQueryBuilder, PostgresVersion, PssRewriter, RecentQuery, SKIP, Statistics, StatisticsMode, StatisticsSource, aggregateIndexRecommendations, analyzeQueryFindings, buildActionPlan, combinedDumpSql, compactSelectList, deriveSentryEnvironment, dropIndex, dumpQueriesSql, dumpSchema, groupDuplicateIndexes, groupIndexesByCoverage, ignoredIdentifier, indexCovers, isIndexProbablyDroppable, isIndexSupported, parseNudges };
+export { Analyzer, CombinedExport, ComputedColumnStats, ComputedReltuples, ComputedStats, DUMP_STATS_SQL, ExportedQuery, ExportedStats, ExportedStatsColumns, ExportedStatsIndex, ExportedStatsStatistics, ExportedStatsV1, FullSchema, FullSchemaColumn, FullSchemaCompositeAttribute, FullSchemaConstraint, FullSchemaExtension, FullSchemaFunction, FullSchemaIncludedColumn, FullSchemaIndex, FullSchemaKeyColumn, FullSchemaTable, FullSchemaTrigger, FullSchemaType, FullSchemaTypeConstraint, FullSchemaView, IndexOptimizer, OptimizedQuery, PROCEED, PgIdentifier, PostgresExplainStageSchema, PostgresQueryBuilder, PostgresVersion, PssRewriter, RecentQuery, SKIP, Statistics, StatisticsMode, StatisticsSource, aggregateIndexRecommendations, analyzeQueryFindings, buildActionPlan, combinedDumpSql, compactSelectList, deriveSentryEnvironment, dropIndex, dumpQueriesSql, dumpSchema, groupDuplicateIndexes, groupIndexesByCoverage, ignoredIdentifier, indexCovers, isIndexProbablyDroppable, isIndexSupported, normalizedFingerprint, parseNudges };

package/dist/sql/normalized-fingerprint.cjs

@@ -0,0 +1,69 @@
+"use client";
+require("../_virtual/_rolldown/runtime.cjs");
+const require_ast_utils = require("./ast-utils.cjs");
+const require_walker = require("./walker.cjs");
+let pgsql_deparser = require("pgsql-deparser");
+//#region src/sql/normalized-fingerprint.ts
+const SELECT_LIST_PLACEHOLDER = { ResTarget: {
+	val: { A_Const: {
+		ival: { ival: 1 },
+		location: -1
+	} },
+	location: -1
+} };
+/**
+* A "bare column" target: any `ColumnRef`, including `a`, qualified `t.a`, and
+* the wildcards `*` and `t.*`. `count(*)`, `a + b`, literals, and `AS` aliases
+* are not column refs and survive normalization.
+*/
+function isBareColumn(target) {
+	if (!require_ast_utils.is(target, "ResTarget")) return false;
+	const val = target.ResTarget.val;
+	if (!val) return false;
+	return require_ast_utils.is(val, "ColumnRef");
+}
+/**
+* Set-operation arms (`larg`/`rarg`) are inlined `SelectStmt` bodies rather
+* than wrapped `{ SelectStmt }` nodes, so `Walker.traverse` never emits them.
+* Drill into them explicitly; they can nest (`a UNION b UNION c`).
+*/
+function normalizeSelect(select) {
+	const targetList = select.targetList;
+	if (targetList) {
+		const survivors = targetList.filter((t) => !isBareColumn(t));
+		if (survivors.length > 1) {
+			const keyed = survivors.map((t) => ({
+				key: (0, pgsql_deparser.deparseSync)(t),
+				t
+			}));
+			keyed.sort((a, b) => a.key < b.key ? -1 : a.key > b.key ? 1 : 0);
+			select.targetList = keyed.map((k) => k.t);
+		} else select.targetList = survivors.length ? survivors : [SELECT_LIST_PLACEHOLDER];
+	}
+	if (select.larg) normalizeSelect(select.larg);
+	if (select.rarg) normalizeSelect(select.rarg);
+}
+/**
+* Fingerprint a query while normalizing every SELECT target list in the tree
+* so that the presence and order of bare column references don't affect the
+* result. Applies to the top-level SELECT as well as SELECTs nested in CTEs,
+* subqueries, and set-operation arms. A change to the set of
+* aggregates/expressions, the WHERE, the FROM, etc. still moves it.
+*
+* Takes the already-parsed AST and an injected {@link FingerprintFn} so core
+* needs no parser or fingerprint runtime. The AST is cloned before mutation.
+*/
+async function normalizedFingerprint(ast, fingerprint) {
+	const cloned = JSON.parse(JSON.stringify(ast));
+	for (const raw of cloned.stmts ?? []) {
+		if (!raw.stmt) continue;
+		require_walker.Walker.traverse(raw.stmt, (node) => {
+			if (require_ast_utils.is(node, "SelectStmt")) normalizeSelect(node.SelectStmt);
+		});
+	}
+	return fingerprint((0, pgsql_deparser.deparseSync)(cloned));
+}
+//#endregion
+exports.normalizedFingerprint = normalizedFingerprint;
+
+//# sourceMappingURL=normalized-fingerprint.cjs.map

package/dist/sql/normalized-fingerprint.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalized-fingerprint.cjs","names":["is"],"sources":["../../src/sql/normalized-fingerprint.ts"],"sourcesContent":["import type { Node, ParseResult } from \"@pgsql/types\";\nimport { deparseSync } from \"pgsql-deparser\";\nimport { is } from \"./ast-utils.js\";\nimport { Walker } from \"./walker.js\";\n\n/**\n * A function that fingerprints a SQL string. Injected so this module stays\n * free of a fingerprint runtime dependency, mirroring how `Analyzer` accepts\n * an injected parser. In practice this is `fingerprint` from\n * `@libpg-query/parser`.\n */\nexport type FingerprintFn = (query: string) => Promise<string>;\n\ntype SelectStmt = Extract<Node, { SelectStmt: unknown }>[\"SelectStmt\"];\n\nconst SELECT_LIST_PLACEHOLDER: Node = {\n  ResTarget: {\n    val: { A_Const: { ival: { ival: 1 }, location: -1 } },\n    location: -1,\n  },\n};\n\n/**\n * A \"bare column\" target: any `ColumnRef`, including `a`, qualified `t.a`, and\n * the wildcards `*` and `t.*`. `count(*)`, `a + b`, literals, and `AS` aliases\n * are not column refs and survive normalization.\n */\nfunction isBareColumn(target: Node): boolean {\n  if (!is(target, \"ResTarget\")) return false;\n  const val = target.ResTarget.val;\n  if (!val) return false;\n  return is(val, \"ColumnRef\");\n}\n\n/**\n * Set-operation arms (`larg`/`rarg`) are inlined `SelectStmt` bodies rather\n * than wrapped `{ SelectStmt }` nodes, so `Walker.traverse` never emits them.\n * Drill into them explicitly; they can nest (`a UNION b UNION c`).\n */\nfunction normalizeSelect(select: SelectStmt): void {\n  const targetList = select.targetList;\n  if (targetList) {\n    const survivors = targetList.filter((t) => !isBareColumn(t));\n    if (survivors.length > 1) {\n      const keyed = survivors.map((t) => ({ key: deparseSync(t), t }));\n      keyed.sort((a, b) => (a.key < b.key ? -1 : a.key > b.key ? 1 : 0));\n      select.targetList = keyed.map((k) => k.t);\n    } else {\n      select.targetList = survivors.length ? survivors : [SELECT_LIST_PLACEHOLDER];\n    }\n  }\n  if (select.larg) normalizeSelect(select.larg);\n  if (select.rarg) normalizeSelect(select.rarg);\n}\n\n/**\n * Fingerprint a query while normalizing every SELECT target list in the tree\n * so that the presence and order of bare column references don't affect the\n * result. Applies to the top-level SELECT as well as SELECTs nested in CTEs,\n * subqueries, and set-operation arms. A change to the set of\n * aggregates/expressions, the WHERE, the FROM, etc. still moves it.\n *\n * Takes the already-parsed AST and an injected {@link FingerprintFn} so core\n * needs no parser or fingerprint runtime. The AST is cloned before mutation.\n */\nexport async function normalizedFingerprint(\n  ast: ParseResult,\n  fingerprint: FingerprintFn,\n): Promise<string> {\n  const cloned: ParseResult = JSON.parse(JSON.stringify(ast));\n\n  for (const raw of cloned.stmts ?? []) {\n    if (!raw.stmt) continue;\n    Walker.traverse(raw.stmt, (node) => {\n      if (is(node, \"SelectStmt\")) {\n        normalizeSelect(node.SelectStmt);\n      }\n    });\n  }\n\n  return fingerprint(deparseSync(cloned));\n}\n"],"mappings":";;;;;;AAeA,MAAM,0BAAgC,EACpC,WAAW;CACT,KAAK,EAAE,SAAS;EAAE,MAAM,EAAE,MAAM,GAAG;EAAE,UAAU;EAAI,EAAE;CACrD,UAAU;CACX,EACF;;;;;;AAOD,SAAS,aAAa,QAAuB;AAC3C,KAAI,CAACA,kBAAAA,GAAG,QAAQ,YAAY,CAAE,QAAO;CACrC,MAAM,MAAM,OAAO,UAAU;AAC7B,KAAI,CAAC,IAAK,QAAO;AACjB,QAAOA,kBAAAA,GAAG,KAAK,YAAY;;;;;;;AAQ7B,SAAS,gBAAgB,QAA0B;CACjD,MAAM,aAAa,OAAO;AAC1B,KAAI,YAAY;EACd,MAAM,YAAY,WAAW,QAAQ,MAAM,CAAC,aAAa,EAAE,CAAC;AAC5D,MAAI,UAAU,SAAS,GAAG;GACxB,MAAM,QAAQ,UAAU,KAAK,OAAO;IAAE,MAAA,GAAA,eAAA,aAAiB,EAAE;IAAE;IAAG,EAAE;AAChE,SAAM,MAAM,GAAG,MAAO,EAAE,MAAM,EAAE,MAAM,KAAK,EAAE,MAAM,EAAE,MAAM,IAAI,EAAG;AAClE,UAAO,aAAa,MAAM,KAAK,MAAM,EAAE,EAAE;QAEzC,QAAO,aAAa,UAAU,SAAS,YAAY,CAAC,wBAAwB;;AAGhF,KAAI,OAAO,KAAM,iBAAgB,OAAO,KAAK;AAC7C,KAAI,OAAO,KAAM,iBAAgB,OAAO,KAAK;;;;;;;;;;;;AAa/C,eAAsB,sBACpB,KACA,aACiB;CACjB,MAAM,SAAsB,KAAK,MAAM,KAAK,UAAU,IAAI,CAAC;AAE3D,MAAK,MAAM,OAAO,OAAO,SAAS,EAAE,EAAE;AACpC,MAAI,CAAC,IAAI,KAAM;AACf,iBAAA,OAAO,SAAS,IAAI,OAAO,SAAS;AAClC,OAAIA,kBAAAA,GAAG,MAAM,aAAa,CACxB,iBAAgB,KAAK,WAAW;IAElC;;AAGJ,QAAO,aAAA,GAAA,eAAA,aAAwB,OAAO,CAAC"}

package/dist/sql/normalized-fingerprint.d.cts

@@ -0,0 +1,26 @@
+'use client';
+
+import { ParseResult } from "@pgsql/types";
+
+//#region src/sql/normalized-fingerprint.d.ts
+/**
+ * A function that fingerprints a SQL string. Injected so this module stays
+ * free of a fingerprint runtime dependency, mirroring how `Analyzer` accepts
+ * an injected parser. In practice this is `fingerprint` from
+ * `@libpg-query/parser`.
+ */
+type FingerprintFn = (query: string) => Promise<string>;
+/**
+ * Fingerprint a query while normalizing every SELECT target list in the tree
+ * so that the presence and order of bare column references don't affect the
+ * result. Applies to the top-level SELECT as well as SELECTs nested in CTEs,
+ * subqueries, and set-operation arms. A change to the set of
+ * aggregates/expressions, the WHERE, the FROM, etc. still moves it.
+ *
+ * Takes the already-parsed AST and an injected {@link FingerprintFn} so core
+ * needs no parser or fingerprint runtime. The AST is cloned before mutation.
+ */
+declare function normalizedFingerprint(ast: ParseResult, fingerprint: FingerprintFn): Promise<string>;
+//#endregion
+export { FingerprintFn, normalizedFingerprint };
+//# sourceMappingURL=normalized-fingerprint.d.cts.map

package/dist/sql/normalized-fingerprint.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalized-fingerprint.d.cts","names":[],"sources":["../../src/sql/normalized-fingerprint.ts"],"mappings":";;;;;;;;AAWA;;;KAAY,aAAA,IAAiB,KAAA,aAAkB,OAAA;;AAsD/C;;;;;;;;;iBAAsB,qBAAA,CACpB,GAAA,EAAK,WAAA,EACL,WAAA,EAAa,aAAA,GACZ,OAAA"}

package/dist/sql/normalized-fingerprint.d.mts

@@ -0,0 +1,26 @@
+'use client';
+
+import { ParseResult } from "@pgsql/types";
+
+//#region src/sql/normalized-fingerprint.d.ts
+/**
+ * A function that fingerprints a SQL string. Injected so this module stays
+ * free of a fingerprint runtime dependency, mirroring how `Analyzer` accepts
+ * an injected parser. In practice this is `fingerprint` from
+ * `@libpg-query/parser`.
+ */
+type FingerprintFn = (query: string) => Promise<string>;
+/**
+ * Fingerprint a query while normalizing every SELECT target list in the tree
+ * so that the presence and order of bare column references don't affect the
+ * result. Applies to the top-level SELECT as well as SELECTs nested in CTEs,
+ * subqueries, and set-operation arms. A change to the set of
+ * aggregates/expressions, the WHERE, the FROM, etc. still moves it.
+ *
+ * Takes the already-parsed AST and an injected {@link FingerprintFn} so core
+ * needs no parser or fingerprint runtime. The AST is cloned before mutation.
+ */
+declare function normalizedFingerprint(ast: ParseResult, fingerprint: FingerprintFn): Promise<string>;
+//#endregion
+export { FingerprintFn, normalizedFingerprint };
+//# sourceMappingURL=normalized-fingerprint.d.mts.map

package/dist/sql/normalized-fingerprint.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalized-fingerprint.d.mts","names":[],"sources":["../../src/sql/normalized-fingerprint.ts"],"mappings":";;;;;;;;AAWA;;;KAAY,aAAA,IAAiB,KAAA,aAAkB,OAAA;;AAsD/C;;;;;;;;;iBAAsB,qBAAA,CACpB,GAAA,EAAK,WAAA,EACL,WAAA,EAAa,aAAA,GACZ,OAAA"}

package/dist/sql/normalized-fingerprint.mjs

@@ -0,0 +1,68 @@
+"use client";
+import { is } from "./ast-utils.mjs";
+import { Walker } from "./walker.mjs";
+import { deparseSync } from "pgsql-deparser";
+//#region src/sql/normalized-fingerprint.ts
+const SELECT_LIST_PLACEHOLDER = { ResTarget: {
+	val: { A_Const: {
+		ival: { ival: 1 },
+		location: -1
+	} },
+	location: -1
+} };
+/**
+* A "bare column" target: any `ColumnRef`, including `a`, qualified `t.a`, and
+* the wildcards `*` and `t.*`. `count(*)`, `a + b`, literals, and `AS` aliases
+* are not column refs and survive normalization.
+*/
+function isBareColumn(target) {
+	if (!is(target, "ResTarget")) return false;
+	const val = target.ResTarget.val;
+	if (!val) return false;
+	return is(val, "ColumnRef");
+}
+/**
+* Set-operation arms (`larg`/`rarg`) are inlined `SelectStmt` bodies rather
+* than wrapped `{ SelectStmt }` nodes, so `Walker.traverse` never emits them.
+* Drill into them explicitly; they can nest (`a UNION b UNION c`).
+*/
+function normalizeSelect(select) {
+	const targetList = select.targetList;
+	if (targetList) {
+		const survivors = targetList.filter((t) => !isBareColumn(t));
+		if (survivors.length > 1) {
+			const keyed = survivors.map((t) => ({
+				key: deparseSync(t),
+				t
+			}));
+			keyed.sort((a, b) => a.key < b.key ? -1 : a.key > b.key ? 1 : 0);
+			select.targetList = keyed.map((k) => k.t);
+		} else select.targetList = survivors.length ? survivors : [SELECT_LIST_PLACEHOLDER];
+	}
+	if (select.larg) normalizeSelect(select.larg);
+	if (select.rarg) normalizeSelect(select.rarg);
+}
+/**
+* Fingerprint a query while normalizing every SELECT target list in the tree
+* so that the presence and order of bare column references don't affect the
+* result. Applies to the top-level SELECT as well as SELECTs nested in CTEs,
+* subqueries, and set-operation arms. A change to the set of
+* aggregates/expressions, the WHERE, the FROM, etc. still moves it.
+*
+* Takes the already-parsed AST and an injected {@link FingerprintFn} so core
+* needs no parser or fingerprint runtime. The AST is cloned before mutation.
+*/
+async function normalizedFingerprint(ast, fingerprint) {
+	const cloned = JSON.parse(JSON.stringify(ast));
+	for (const raw of cloned.stmts ?? []) {
+		if (!raw.stmt) continue;
+		Walker.traverse(raw.stmt, (node) => {
+			if (is(node, "SelectStmt")) normalizeSelect(node.SelectStmt);
+		});
+	}
+	return fingerprint(deparseSync(cloned));
+}
+//#endregion
+export { normalizedFingerprint };
+
+//# sourceMappingURL=normalized-fingerprint.mjs.map

package/dist/sql/normalized-fingerprint.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalized-fingerprint.mjs","names":[],"sources":["../../src/sql/normalized-fingerprint.ts"],"sourcesContent":["import type { Node, ParseResult } from \"@pgsql/types\";\nimport { deparseSync } from \"pgsql-deparser\";\nimport { is } from \"./ast-utils.js\";\nimport { Walker } from \"./walker.js\";\n\n/**\n * A function that fingerprints a SQL string. Injected so this module stays\n * free of a fingerprint runtime dependency, mirroring how `Analyzer` accepts\n * an injected parser. In practice this is `fingerprint` from\n * `@libpg-query/parser`.\n */\nexport type FingerprintFn = (query: string) => Promise<string>;\n\ntype SelectStmt = Extract<Node, { SelectStmt: unknown }>[\"SelectStmt\"];\n\nconst SELECT_LIST_PLACEHOLDER: Node = {\n  ResTarget: {\n    val: { A_Const: { ival: { ival: 1 }, location: -1 } },\n    location: -1,\n  },\n};\n\n/**\n * A \"bare column\" target: any `ColumnRef`, including `a`, qualified `t.a`, and\n * the wildcards `*` and `t.*`. `count(*)`, `a + b`, literals, and `AS` aliases\n * are not column refs and survive normalization.\n */\nfunction isBareColumn(target: Node): boolean {\n  if (!is(target, \"ResTarget\")) return false;\n  const val = target.ResTarget.val;\n  if (!val) return false;\n  return is(val, \"ColumnRef\");\n}\n\n/**\n * Set-operation arms (`larg`/`rarg`) are inlined `SelectStmt` bodies rather\n * than wrapped `{ SelectStmt }` nodes, so `Walker.traverse` never emits them.\n * Drill into them explicitly; they can nest (`a UNION b UNION c`).\n */\nfunction normalizeSelect(select: SelectStmt): void {\n  const targetList = select.targetList;\n  if (targetList) {\n    const survivors = targetList.filter((t) => !isBareColumn(t));\n    if (survivors.length > 1) {\n      const keyed = survivors.map((t) => ({ key: deparseSync(t), t }));\n      keyed.sort((a, b) => (a.key < b.key ? -1 : a.key > b.key ? 1 : 0));\n      select.targetList = keyed.map((k) => k.t);\n    } else {\n      select.targetList = survivors.length ? survivors : [SELECT_LIST_PLACEHOLDER];\n    }\n  }\n  if (select.larg) normalizeSelect(select.larg);\n  if (select.rarg) normalizeSelect(select.rarg);\n}\n\n/**\n * Fingerprint a query while normalizing every SELECT target list in the tree\n * so that the presence and order of bare column references don't affect the\n * result. Applies to the top-level SELECT as well as SELECTs nested in CTEs,\n * subqueries, and set-operation arms. A change to the set of\n * aggregates/expressions, the WHERE, the FROM, etc. still moves it.\n *\n * Takes the already-parsed AST and an injected {@link FingerprintFn} so core\n * needs no parser or fingerprint runtime. The AST is cloned before mutation.\n */\nexport async function normalizedFingerprint(\n  ast: ParseResult,\n  fingerprint: FingerprintFn,\n): Promise<string> {\n  const cloned: ParseResult = JSON.parse(JSON.stringify(ast));\n\n  for (const raw of cloned.stmts ?? []) {\n    if (!raw.stmt) continue;\n    Walker.traverse(raw.stmt, (node) => {\n      if (is(node, \"SelectStmt\")) {\n        normalizeSelect(node.SelectStmt);\n      }\n    });\n  }\n\n  return fingerprint(deparseSync(cloned));\n}\n"],"mappings":";;;;;AAeA,MAAM,0BAAgC,EACpC,WAAW;CACT,KAAK,EAAE,SAAS;EAAE,MAAM,EAAE,MAAM,GAAG;EAAE,UAAU;EAAI,EAAE;CACrD,UAAU;CACX,EACF;;;;;;AAOD,SAAS,aAAa,QAAuB;AAC3C,KAAI,CAAC,GAAG,QAAQ,YAAY,CAAE,QAAO;CACrC,MAAM,MAAM,OAAO,UAAU;AAC7B,KAAI,CAAC,IAAK,QAAO;AACjB,QAAO,GAAG,KAAK,YAAY;;;;;;;AAQ7B,SAAS,gBAAgB,QAA0B;CACjD,MAAM,aAAa,OAAO;AAC1B,KAAI,YAAY;EACd,MAAM,YAAY,WAAW,QAAQ,MAAM,CAAC,aAAa,EAAE,CAAC;AAC5D,MAAI,UAAU,SAAS,GAAG;GACxB,MAAM,QAAQ,UAAU,KAAK,OAAO;IAAE,KAAK,YAAY,EAAE;IAAE;IAAG,EAAE;AAChE,SAAM,MAAM,GAAG,MAAO,EAAE,MAAM,EAAE,MAAM,KAAK,EAAE,MAAM,EAAE,MAAM,IAAI,EAAG;AAClE,UAAO,aAAa,MAAM,KAAK,MAAM,EAAE,EAAE;QAEzC,QAAO,aAAa,UAAU,SAAS,YAAY,CAAC,wBAAwB;;AAGhF,KAAI,OAAO,KAAM,iBAAgB,OAAO,KAAK;AAC7C,KAAI,OAAO,KAAM,iBAAgB,OAAO,KAAK;;;;;;;;;;;;AAa/C,eAAsB,sBACpB,KACA,aACiB;CACjB,MAAM,SAAsB,KAAK,MAAM,KAAK,UAAU,IAAI,CAAC;AAE3D,MAAK,MAAM,OAAO,OAAO,SAAS,EAAE,EAAE;AACpC,MAAI,CAAC,IAAI,KAAM;AACf,SAAO,SAAS,IAAI,OAAO,SAAS;AAClC,OAAI,GAAG,MAAM,aAAa,CACxB,iBAAgB,KAAK,WAAW;IAElC;;AAGJ,QAAO,YAAY,YAAY,OAAO,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@query-doctor/core",
-  "version": "0.10.5",
+  "version": "0.10.6",
   "private": false,
   "description": "Core logic for Query Doctor",
   "license": "",