@lsproxy/polyfill 0.2.0 → 0.3.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024-present Pradeep Mouli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/fix-all.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fix-all.d.ts","sourceRoot":"","sources":["../src/fix-all.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAoDrD,eAAO,MAAM,MAAM,EAAE,kBA8DpB,CAAC"}
+{"version":3,"file":"fix-all.d.ts","sourceRoot":"","sources":["../src/fix-all.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AA2BrD,eAAO,MAAM,MAAM,EAAE,kBA8BpB,CAAC"}

package/dist/fix-all.js

@@ -1,3 +1,4 @@
+import { aggregateQuickFixes, isCodeAction } from './quickfix-aggregation.js';
 function hasDiagnosticProvider(capabilities) {
     return Boolean(capabilities.diagnosticProvider);
 }
@@ -13,32 +14,10 @@ function requestsFixAll(params) {
         return false;
     return only.some((kind) => kind === 'source.fixAll' || kind === 'source');
 }
-function isCodeAction(item) {
-    return typeof item.command !== 'string';
-}
 function pickFix(candidates) {
     const actions = candidates.filter(isCodeAction);
     return actions.find((a) => a.isPreferred) ?? actions[0];
 }
-function supportsResolve(capabilities) {
-    const provider = capabilities.codeActionProvider;
-    return typeof provider === 'object' && provider.resolveProvider === true;
-}
-function comparePositions(a, b) {
-    return a.line !== b.line ? a.line - b.line : a.character - b.character;
-}
-function rangesOverlap(a, b) {
-    return comparePositions(a.start, b.end) < 0 && comparePositions(b.start, a.end) < 0;
-}
-function mergeEdits(existing, incoming) {
-    const merged = [...existing];
-    for (const edit of incoming) {
-        if (merged.some((m) => rangesOverlap(m.range, edit.range)))
-            continue;
-        merged.push(edit);
-    }
-    return merged;
-}
 export const fixAll = {
     id: 'fix-all',
     appliesTo(capabilities) {
@@ -49,33 +28,12 @@ export const fixAll = {
     async augmentCodeActions(actions, params, backend) {
         if (!requestsFixAll(params))
             return actions;
-        const report = (await backend.sendRequest('textDocument/diagnostic', { textDocument: params.textDocument }));
-        const diagnostics = report.kind === 'full' ? (report.items ?? []) : [];
-        const capabilities = backend.getServerCapabilities() ?? {};
-        const changes = {};
-        let mergedCount = 0;
-        for (const diagnostic of diagnostics) {
-            const candidates = (await backend.sendRequest('textDocument/codeAction', {
-                textDocument: params.textDocument,
-                range: diagnostic.range,
-                context: { diagnostics: [diagnostic], only: ['quickfix'] }
-            }));
-            let fix = candidates ? pickFix(candidates) : undefined;
-            if (fix && !fix.edit?.changes && fix.command && supportsResolve(capabilities)) {
-                fix = (await backend.sendRequest('codeAction/resolve', fix));
-            }
-            if (!fix?.edit?.changes)
-                continue;
-            let mergedAny = false;
-            for (const [uri, edits] of Object.entries(fix.edit.changes)) {
-                if (edits.length === 0)
-                    continue;
-                changes[uri] = mergeEdits(changes[uri] ?? [], edits);
-                mergedAny = true;
-            }
-            if (mergedAny)
-                mergedCount += 1;
-        }
+        // The backend may implement source.fixAll without advertising it in
+        // codeActionKinds (e.g. codeActionProvider: true with no explicit kind
+        // list) — if it already returned one, don't synthesize a duplicate.
+        if (actions.some((a) => a.kind === 'source.fixAll'))
+            return actions;
+        const { changes, mergedCount } = await aggregateQuickFixes(params, backend, pickFix);
         if (mergedCount === 0)
             return actions;
         return [

package/dist/fix-all.js.map

@@ -1 +1 @@
-{"version":3,"file":"fix-all.js","sourceRoot":"","sources":["../src/fix-all.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fix-all.js","sourceRoot":"","sources":["../src/fix-all.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9E,SAAS,qBAAqB,CAAC,YAAgC;IAC7D,OAAO,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,uBAAuB,CAAC,YAAgC;IAC/D,MAAM,QAAQ,GAAG,YAAY,CAAC,kBAAkB,CAAC;IACjD,OAAO,CACL,OAAO,QAAQ,KAAK,QAAQ;QAC5B,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;QACvC,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,eAAwB,CAAC,CAC5D,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,MAAwB;IAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;IACjC,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IACxB,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,eAAe,IAAI,IAAI,KAAK,QAAQ,CAAC,CAAC;AAC5E,CAAC;AAED,SAAS,OAAO,CAAC,UAAoC;IACnD,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAChD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAuB;IACxC,EAAE,EAAE,SAAS;IAEb,SAAS,CAAC,YAAY;QACpB,OAAO,CACL,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC;YACxC,qBAAqB,CAAC,YAAY,CAAC;YACnC,CAAC,uBAAuB,CAAC,YAAY,CAAC,CACvC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAkB;QAC1D,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;YAAE,OAAO,OAAO,CAAC;QAC5C,oEAAoE;QACpE,uEAAuE;QACvE,oEAAoE;QACpE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC;YAAE,OAAO,OAAO,CAAC;QAEpE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACrF,IAAI,WAAW,KAAK,CAAC;YAAE,OAAO,OAAO,CAAC;QAEtC,OAAO;YACL,GAAG,OAAO;YACV;gBACE,KAAK,EAAE,+BAA+B;gBACtC,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,EAAE,OAAO,EAAE;aAClB;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export type { CodeActionPolyfill } from './types.js';
 export { resolveBackfill } from './resolve-backfill.js';
 export { fixAll } from './fix-all.js';
+export { organizeImports } from './organize-imports.js';
 export { BUILTIN_POLYFILLS, applicablePolyfills } from './registry.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC"}

package/dist/index.js

@@ -1,4 +1,5 @@
 export { resolveBackfill } from './resolve-backfill.js';
 export { fixAll } from './fix-all.js';
+export { organizeImports } from './organize-imports.js';
 export { BUILTIN_POLYFILLS, applicablePolyfills } from './registry.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC"}

package/dist/organize-imports.d.ts

@@ -0,0 +1,3 @@
+import type { CodeActionPolyfill } from './types.js';
+export declare const organizeImports: CodeActionPolyfill;
+//# sourceMappingURL=organize-imports.d.ts.map

package/dist/organize-imports.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"organize-imports.d.ts","sourceRoot":"","sources":["../src/organize-imports.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAiCrD,eAAO,MAAM,eAAe,EAAE,kBA8B7B,CAAC"}

package/dist/organize-imports.js

@@ -0,0 +1,53 @@
+import { aggregateQuickFixes, isCodeAction } from './quickfix-aggregation.js';
+function hasDiagnosticProvider(capabilities) {
+    return Boolean(capabilities.diagnosticProvider);
+}
+function alreadyAdvertisesOrganizeImports(capabilities) {
+    const provider = capabilities.codeActionProvider;
+    return (typeof provider === 'object' &&
+        Array.isArray(provider.codeActionKinds) &&
+        provider.codeActionKinds.includes('source.organizeImports'));
+}
+function requestsOrganizeImports(params) {
+    const only = params.context.only;
+    if (!only)
+        return false;
+    return only.some((kind) => kind === 'source.organizeImports' || kind === 'source');
+}
+const IMPORT_FIX_TITLE = /import/i;
+function isImportRelatedFix(action) {
+    return IMPORT_FIX_TITLE.test(action.title);
+}
+function pickImportFix(candidates) {
+    const actions = candidates.filter(isCodeAction).filter(isImportRelatedFix);
+    return actions.find((a) => a.isPreferred) ?? actions[0];
+}
+export const organizeImports = {
+    id: 'organize-imports',
+    appliesTo(capabilities) {
+        return (Boolean(capabilities.codeActionProvider) &&
+            hasDiagnosticProvider(capabilities) &&
+            !alreadyAdvertisesOrganizeImports(capabilities));
+    },
+    async augmentCodeActions(actions, params, backend) {
+        if (!requestsOrganizeImports(params))
+            return actions;
+        // The backend may implement source.organizeImports without advertising
+        // it in codeActionKinds (e.g. codeActionProvider: true with no explicit
+        // kind list) — if it already returned one, don't synthesize a duplicate.
+        if (actions.some((a) => a.kind === 'source.organizeImports'))
+            return actions;
+        const { changes, mergedCount } = await aggregateQuickFixes(params, backend, pickImportFix);
+        if (mergedCount === 0)
+            return actions;
+        return [
+            ...actions,
+            {
+                title: 'Organize imports',
+                kind: 'source.organizeImports',
+                edit: { changes }
+            }
+        ];
+    }
+};
+//# sourceMappingURL=organize-imports.js.map

package/dist/organize-imports.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"organize-imports.js","sourceRoot":"","sources":["../src/organize-imports.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9E,SAAS,qBAAqB,CAAC,YAAgC;IAC7D,OAAO,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,gCAAgC,CAAC,YAAgC;IACxE,MAAM,QAAQ,GAAG,YAAY,CAAC,kBAAkB,CAAC;IACjD,OAAO,CACL,OAAO,QAAQ,KAAK,QAAQ;QAC5B,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;QACvC,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,wBAAiC,CAAC,CACrE,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAAC,MAAwB;IACvD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;IACjC,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IACxB,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,wBAAwB,IAAI,IAAI,KAAK,QAAQ,CAAC,CAAC;AACrF,CAAC;AAED,MAAM,gBAAgB,GAAG,SAAS,CAAC;AAEnC,SAAS,kBAAkB,CAAC,MAAkB;IAC5C,OAAO,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,aAAa,CAAC,UAAoC;IACzD,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;IAC3E,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAuB;IACjD,EAAE,EAAE,kBAAkB;IAEtB,SAAS,CAAC,YAAY;QACpB,OAAO,CACL,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC;YACxC,qBAAqB,CAAC,YAAY,CAAC;YACnC,CAAC,gCAAgC,CAAC,YAAY,CAAC,CAChD,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAkB;QAC1D,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC;YAAE,OAAO,OAAO,CAAC;QACrD,uEAAuE;QACvE,wEAAwE;QACxE,yEAAyE;QACzE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,wBAAwB,CAAC;YAAE,OAAO,OAAO,CAAC;QAE7E,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QAC3F,IAAI,WAAW,KAAK,CAAC;YAAE,OAAO,OAAO,CAAC;QAEtC,OAAO;YACL,GAAG,OAAO;YACV;gBACE,KAAK,EAAE,kBAAkB;gBACzB,IAAI,EAAE,wBAAwB;gBAC9B,IAAI,EAAE,EAAE,OAAO,EAAE;aAClB;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}

package/dist/quickfix-aggregation.d.ts

@@ -0,0 +1,18 @@
+import type { CodeAction, CodeActionParams, Command, Position, TextEdit } from '@lspeasy/core';
+import type { LSPClient } from '@lspeasy/client';
+export declare function isCodeAction(item: Command | CodeAction): item is CodeAction;
+export declare function comparePositions(a: Position, b: Position): number;
+export declare function rangesOverlap(a: TextEdit['range'], b: TextEdit['range']): boolean;
+export declare function mergeEdits(existing: TextEdit[], incoming: TextEdit[]): TextEdit[];
+export interface AggregationResult {
+    changes: Record<string, TextEdit[]>;
+    mergedCount: number;
+}
+/**
+ * Fetches diagnostics for the document, requests a `quickfix` for each one,
+ * lets `selectFix` choose which candidate (if any) to keep, resolves
+ * command-only fixes via `codeAction/resolve` when the backend supports it,
+ * and merges every chosen fix's edits into one non-overlapping edit map.
+ */
+export declare function aggregateQuickFixes(params: CodeActionParams, backend: LSPClient, selectFix: (candidates: (Command | CodeAction)[]) => CodeAction | undefined): Promise<AggregationResult>;
+//# sourceMappingURL=quickfix-aggregation.d.ts.map

package/dist/quickfix-aggregation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"quickfix-aggregation.d.ts","sourceRoot":"","sources":["../src/quickfix-aggregation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,UAAU,EACV,gBAAgB,EAChB,OAAO,EAIP,QAAQ,EAKR,QAAQ,EAET,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,IAAI,IAAI,UAAU,CAE3E;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,GAAG,MAAM,CAEjE;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,OAAO,CAEjF;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,QAAQ,EAAE,CAOjF;AAkDD,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACpC,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,SAAS,EAClB,SAAS,EAAE,CAAC,UAAU,EAAE,CAAC,OAAO,GAAG,UAAU,CAAC,EAAE,KAAK,UAAU,GAAG,SAAS,GAC1E,OAAO,CAAC,iBAAiB,CAAC,CAwC5B"}

package/dist/quickfix-aggregation.js

@@ -0,0 +1,92 @@
+export function isCodeAction(item) {
+    return typeof item.command !== 'string';
+}
+export function comparePositions(a, b) {
+    return a.line !== b.line ? a.line - b.line : a.character - b.character;
+}
+export function rangesOverlap(a, b) {
+    return comparePositions(a.start, b.end) < 0 && comparePositions(b.start, a.end) < 0;
+}
+export function mergeEdits(existing, incoming) {
+    const merged = [...existing];
+    for (const edit of incoming) {
+        if (merged.some((m) => rangesOverlap(m.range, edit.range)))
+            continue;
+        merged.push(edit);
+    }
+    return merged;
+}
+function supportsResolve(capabilities) {
+    const provider = capabilities.codeActionProvider;
+    return typeof provider === 'object' && provider.resolveProvider === true;
+}
+function isTextDocumentEdit(entry) {
+    return 'edits' in entry;
+}
+function isPlainTextEdit(edit) {
+    return 'newText' in edit;
+}
+/**
+ * Merges a WorkspaceEdit's edits into one per-URI map, reading both the
+ * legacy `changes` field and the newer `documentChanges` field (many modern
+ * servers — rust-analyzer, newer tsserver-based tooling — return edits
+ * exclusively via the latter). Resource operations (create/rename/delete)
+ * and snippet edits are intentionally skipped: neither can be represented
+ * as a plain `TextEdit` in the synthesized composite action.
+ */
+function collectEditsByUri(edit) {
+    const byUri = {};
+    for (const [uri, edits] of Object.entries(edit?.changes ?? {})) {
+        if (edits.length === 0)
+            continue;
+        byUri[uri] = [...(byUri[uri] ?? []), ...edits];
+    }
+    for (const entry of edit?.documentChanges ?? []) {
+        if (!isTextDocumentEdit(entry))
+            continue;
+        const textEdits = entry.edits.filter(isPlainTextEdit);
+        if (textEdits.length === 0)
+            continue;
+        const uri = entry.textDocument.uri;
+        byUri[uri] = [...(byUri[uri] ?? []), ...textEdits];
+    }
+    return byUri;
+}
+function isEditEmpty(edit) {
+    return Object.keys(collectEditsByUri(edit)).length === 0;
+}
+/**
+ * Fetches diagnostics for the document, requests a `quickfix` for each one,
+ * lets `selectFix` choose which candidate (if any) to keep, resolves
+ * command-only fixes via `codeAction/resolve` when the backend supports it,
+ * and merges every chosen fix's edits into one non-overlapping edit map.
+ */
+export async function aggregateQuickFixes(params, backend, selectFix) {
+    const report = (await backend.sendRequest('textDocument/diagnostic', { textDocument: params.textDocument }));
+    const diagnostics = report.kind === 'full' ? (report.items ?? []) : [];
+    const capabilities = backend.getServerCapabilities() ?? {};
+    const changes = {};
+    let mergedCount = 0;
+    for (const diagnostic of diagnostics) {
+        const candidates = (await backend.sendRequest('textDocument/codeAction', {
+            textDocument: params.textDocument,
+            range: diagnostic.range,
+            context: { diagnostics: [diagnostic], only: ['quickfix'] }
+        }));
+        let fix = candidates ? selectFix(candidates) : undefined;
+        if (fix && isEditEmpty(fix.edit) && fix.command && supportsResolve(capabilities)) {
+            fix = (await backend.sendRequest('codeAction/resolve', fix));
+        }
+        if (!fix)
+            continue;
+        const editsByUri = collectEditsByUri(fix.edit);
+        if (Object.keys(editsByUri).length === 0)
+            continue;
+        for (const [uri, edits] of Object.entries(editsByUri)) {
+            changes[uri] = mergeEdits(changes[uri] ?? [], edits);
+        }
+        mergedCount += 1;
+    }
+    return { changes, mergedCount };
+}
+//# sourceMappingURL=quickfix-aggregation.js.map

package/dist/quickfix-aggregation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"quickfix-aggregation.js","sourceRoot":"","sources":["../src/quickfix-aggregation.ts"],"names":[],"mappings":"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"}

package/dist/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAIrD,eAAO,MAAM,iBAAiB,EAAE,SAAS,kBAAkB,EAA8B,CAAC;AAE1F,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,kBAAkB,GAAG,kBAAkB,EAAE,CAE1F"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAKrD,eAAO,MAAM,iBAAiB,EAAE,SAAS,kBAAkB,EAI1D,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,kBAAkB,GAAG,kBAAkB,EAAE,CAE1F"}

package/dist/registry.js

@@ -1,6 +1,11 @@
 import { resolveBackfill } from './resolve-backfill.js';
 import { fixAll } from './fix-all.js';
-export const BUILTIN_POLYFILLS = [resolveBackfill, fixAll];
+import { organizeImports } from './organize-imports.js';
+export const BUILTIN_POLYFILLS = [
+    resolveBackfill,
+    fixAll,
+    organizeImports
+];
 export function applicablePolyfills(capabilities) {
     return BUILTIN_POLYFILLS.filter((p) => p.appliesTo(capabilities));
 }

package/dist/registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,MAAM,CAAC,MAAM,iBAAiB,GAAkC,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;AAE1F,MAAM,UAAU,mBAAmB,CAAC,YAAgC;IAClE,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;AACpE,CAAC"}
+{"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,CAAC,MAAM,iBAAiB,GAAkC;IAC9D,eAAe;IACf,MAAM;IACN,eAAe;CAChB,CAAC;AAEF,MAAM,UAAU,mBAAmB,CAAC,YAAgC;IAClE,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;AACpE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lsproxy/polyfill",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "CodeAction capability polyfills for lsproxy backends that don't natively support them",
   "private": false,
   "keywords": [
@@ -18,7 +18,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/pradeepmouli/lspeasy.git",
-    "directory": "apps/polyfill"
+    "directory": "packages/polyfill"
   },
   "type": "module",
   "exports": {
@@ -36,19 +36,19 @@
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "build": "tsgo --build",
-    "clean": "rm -rf dist tsconfig.tsbuildinfo",
-    "type-check": "tsgo --noEmit"
-  },
   "dependencies": {
-    "@lspeasy/client": "workspace:*",
-    "@lspeasy/core": "workspace:*"
+    "@lspeasy/client": "3.1.6",
+    "@lspeasy/core": "2.6.1"
   },
   "devDependencies": {
     "typescript": "^6.0.3"
   },
   "engines": {
     "node": ">=22.0.0"
+  },
+  "scripts": {
+    "build": "tsgo --build",
+    "clean": "rm -rf dist tsconfig.tsbuildinfo",
+    "type-check": "tsgo --noEmit"
   }
-}
+}