@openrewrite/rewrite 8.69.0-20251207-160255 → 8.69.0-20251207-214914

package/dist/recipe/order-imports.js

@@ -1,213 +0,0 @@
-"use strict";
-/*
- * Copyright 2025 the original author or authors.
- * <p>
- * Licensed under the Moderne Source Available License (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://docs.moderne.io/licensing/moderne-source-available-license
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OrderImports = void 0;
-const recipe_1 = require("../recipe");
-const visitor_1 = require("../visitor");
-const javascript_1 = require("../javascript");
-const java_1 = require("../java");
-const immer_1 = require("immer");
-const format_1 = require("../javascript/format");
-class OrderImports extends recipe_1.Recipe {
-    constructor() {
-        super(...arguments);
-        this.name = "org.openrewrite.OrderImports";
-        this.displayName = "Order imports";
-        this.description = "Sort top-level imports alphabetically within groups: no qualifier, asterisk, multiple, single.";
-    }
-    editor() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new class extends javascript_1.JavaScriptVisitor {
-                visitJsCompilationUnit(cu, p) {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        const importCount = this.countImports(cu);
-                        const imports = cu.statements.slice(0, importCount);
-                        const originalImportPosition = Object.fromEntries(imports.map((item, i) => [item.element.id, i]));
-                        const restStatements = cu.statements.slice(importCount);
-                        const sortedImports = yield this.sortNamesWithinEachLine(imports);
-                        sortedImports.sort((aPadded, bPadded) => {
-                            const a = aPadded.element;
-                            const b = bPadded.element;
-                            const noSpecifier = (a.importClause == undefined ? 1 : 0) - (b.importClause == undefined ? 1 : 0);
-                            if (noSpecifier != 0) {
-                                return -noSpecifier;
-                            }
-                            const asterisk = this.isAsteriskImport(a) - this.isAsteriskImport(b);
-                            if (asterisk != 0) {
-                                return -asterisk;
-                            }
-                            const multipleImport = this.isMultipleImport(a) - this.isMultipleImport(b);
-                            if (multipleImport != 0) {
-                                return -multipleImport;
-                            }
-                            const comparedSpecifiers = this.compareStringArrays(this.extractImportSpecifierNames(a), this.extractImportSpecifierNames(b));
-                            if (comparedSpecifiers != 0) {
-                                return comparedSpecifiers;
-                            }
-                            // Tiebreaker, keep the sort stable
-                            return originalImportPosition[aPadded.element.id] - originalImportPosition[bPadded.element.id];
-                        });
-                        const cuWithImportsSorted = yield (0, visitor_1.produceAsync)(cu, (draft) => __awaiter(this, void 0, void 0, function* () {
-                            draft.statements = [...sortedImports, ...restStatements];
-                        }));
-                        return (0, immer_1.produce)(cuWithImportsSorted, draft => {
-                            for (let i = 0; i < importCount; i++) {
-                                draft.statements[i].element.prefix.whitespace = i > 0 ? "\n" : "";
-                            }
-                            // TODO deal with comments in the whitespace around imports
-                        });
-                    });
-                }
-                isAsteriskImport(import_) {
-                    if (import_.importClause != undefined) {
-                        if (import_.importClause.namedBindings != undefined) {
-                            if (import_.importClause.namedBindings.kind == javascript_1.JS.Kind.Alias) {
-                                return import_.importClause.namedBindings.propertyName.element.simpleName == "*" ? 1 : 0;
-                            }
-                        }
-                    }
-                    return 0;
-                }
-                isMultipleImport(import_) {
-                    if (import_.importClause != undefined) {
-                        if (import_.importClause.namedBindings != undefined) {
-                            if (import_.importClause.namedBindings.kind == javascript_1.JS.Kind.NamedImports) {
-                                const namedImports = import_.importClause.namedBindings;
-                                if (namedImports.elements.kind == java_1.J.Kind.Container) {
-                                    return namedImports.elements.elements.length > 1 ? 1 : 0;
-                                }
-                            }
-                        }
-                    }
-                    return 0;
-                }
-                extractImportSpecifierNames(import_) {
-                    const names = [];
-                    if (import_.importClause != undefined) {
-                        if (import_.importClause.namedBindings != undefined) {
-                            if (import_.importClause.namedBindings.kind == javascript_1.JS.Kind.NamedImports) {
-                                const namedImports = import_.importClause.namedBindings;
-                                if (namedImports.elements.kind == java_1.J.Kind.Container) {
-                                    const elements = namedImports.elements.elements;
-                                    for (let i = 0; i < elements.length; i++) {
-                                        const importSpecifier = elements[i].element;
-                                        if (importSpecifier.specifier.kind == java_1.J.Kind.Identifier) {
-                                            names.push(importSpecifier.specifier.simpleName);
-                                        }
-                                        else if (importSpecifier.specifier.kind == javascript_1.JS.Kind.Alias) {
-                                            names.push(importSpecifier.specifier.propertyName.element.simpleName);
-                                        }
-                                        else {
-                                            throw new Error("Unknown kind " + elements[i].kind);
-                                        }
-                                    }
-                                }
-                            }
-                            else if (import_.importClause.namedBindings.kind == javascript_1.JS.Kind.Alias) {
-                                const alias = import_.importClause.namedBindings;
-                                names.push(alias.propertyName.element.simpleName);
-                                if (alias.alias.kind == java_1.J.Kind.Identifier) {
-                                    names.push(alias.alias.simpleName);
-                                }
-                            }
-                        }
-                    }
-                    return names;
-                }
-                compareStringArrays(a, b) {
-                    let i = 0;
-                    while (i < a.length && i < b.length) {
-                        const comparison = a[i].localeCompare(b[i]);
-                        if (comparison !== 0) {
-                            return comparison;
-                        }
-                        i++;
-                    }
-                    if (i < a.length) {
-                        return 1;
-                    }
-                    else if (i < b.length) {
-                        return -1;
-                    }
-                    return 0;
-                }
-                countImports(cu) {
-                    let i = 0;
-                    while ((i < cu.statements.length) && (cu.statements[i].element.kind === javascript_1.JS.Kind.Import)) {
-                        i++;
-                    }
-                    return i;
-                }
-                sortNamesWithinEachLine(imports) {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        const ret = [];
-                        for (const importPadded of imports) {
-                            const import_ = importPadded.element;
-                            if (this.isMultipleImport(import_) == 1) {
-                                const importSorted = (0, immer_1.produce)(import_, draft => {
-                                    var _a;
-                                    let elements = draft.importClause.namedBindings.elements.elements;
-                                    const trailingComma = elements.length > 0 && ((_a = elements[elements.length - 1].markers) === null || _a === void 0 ? void 0 : _a.markers.find(m => m.kind === java_1.J.Markers.TrailingComma));
-                                    if (trailingComma) {
-                                        elements[elements.length - 1].markers.markers = elements[elements.length - 1].markers.markers.filter(m => m.kind !== java_1.J.Markers.TrailingComma);
-                                    }
-                                    elements.sort((a, b) => {
-                                        const namesExtracted = [a.element, b.element].map(expr => {
-                                            const is = expr;
-                                            if (is.specifier.kind == javascript_1.JS.Kind.Alias) {
-                                                return is.specifier.propertyName.element.simpleName;
-                                            }
-                                            else if (is.specifier.kind == java_1.J.Kind.Identifier) {
-                                                return is.specifier.simpleName;
-                                            }
-                                            else {
-                                                throw new Error("Unsupported kind " + expr.kind);
-                                            }
-                                        });
-                                        return namesExtracted[0].localeCompare(namesExtracted[1]);
-                                    });
-                                    if (trailingComma && elements.length > 0 && !elements[elements.length - 1].markers.markers.find(m => m.kind === java_1.J.Markers.TrailingComma)) {
-                                        elements[elements.length - 1].markers.markers.push(trailingComma);
-                                    }
-                                });
-                                const formatted = yield new format_1.AutoformatVisitor().visit(importSorted, {});
-                                ret.push((0, immer_1.produce)(importPadded, draft => {
-                                    draft.element = formatted;
-                                }));
-                            }
-                            else {
-                                ret.push(importPadded);
-                            }
-                        }
-                        return ret;
-                    });
-                }
-            };
-        });
-    }
-}
-exports.OrderImports = OrderImports;
-//# sourceMappingURL=order-imports.js.map

package/dist/recipe/order-imports.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"order-imports.js","sourceRoot":"","sources":["../../src/recipe/order-imports.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;AAEH,sCAAiC;AACjC,wCAAqD;AAErD,8CAAoD;AACpD,kCAA0B;AAC1B,iCAAqC;AACrC,iDAAuD;AAEvD,MAAa,YAAa,SAAQ,eAAM;IAAxC;;QACI,SAAI,GAAG,8BAA8B,CAAC;QACtC,gBAAW,GAAG,eAAe,CAAC;QAC9B,gBAAW,GAAG,gGAAgG,CAAC;IAuKnH,CAAC;IApKS,MAAM;;YACR,OAAO,IAAI,KAAM,SAAQ,8BAAmC;gBAExC,sBAAsB,CAAC,EAAsB,EAAE,CAAmB;;wBAC9E,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;wBAC1C,MAAM,OAAO,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAA+B,CAAC;wBAClF,MAAM,sBAAsB,GAAG,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;wBAClG,MAAM,cAAc,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;wBACxD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;wBAClE,aAAa,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;4BACpC,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;4BAC1B,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;4BAE1B,MAAM,WAAW,GAAG,CAAC,CAAC,CAAC,YAAY,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;4BAClG,IAAI,WAAW,IAAI,CAAC,EAAE,CAAC;gCACnB,OAAO,CAAC,WAAW,CAAC;4BACxB,CAAC;4BACD,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;4BACrE,IAAI,QAAQ,IAAI,CAAC,EAAE,CAAC;gCAChB,OAAO,CAAC,QAAQ,CAAC;4BACrB,CAAC;4BACD,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;4BAC3E,IAAI,cAAc,IAAI,CAAC,EAAE,CAAC;gCACtB,OAAO,CAAC,cAAc,CAAC;4BAC3B,CAAC;4BACD,MAAM,kBAAkB,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,CAAC;4BAC9H,IAAI,kBAAkB,IAAI,CAAC,EAAE,CAAC;gCAC1B,OAAO,kBAAkB,CAAC;4BAC9B,CAAC;4BACD,mCAAmC;4BACnC,OAAO,sBAAsB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,sBAAsB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;wBACnG,CAAC,CAAC,CAAC;wBACH,MAAM,mBAAmB,GAAG,MAAM,IAAA,sBAAY,EAAC,EAAE,EAAE,CAAM,KAAK,EAAC,EAAE;4BAC7D,KAAK,CAAC,UAAU,GAAG,CAAC,GAAG,aAAa,EAAE,GAAG,cAAc,CAAC,CAAC;wBAC7D,CAAC,CAAA,CAAC,CAAC;wBACH,OAAO,IAAA,eAAO,EAAC,mBAAoB,EAAE,KAAK,CAAC,EAAE;4BACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC;gCACpC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;4BACrE,CAAC;4BACD,2DAA2D;wBAC/D,CAAC,CAAC,CAAC;oBACP,CAAC;iBAAA;gBAEO,gBAAgB,CAAC,OAAkB;oBACvC,IAAI,OAAO,CAAC,YAAY,IAAI,SAAS,EAAE,CAAC;wBACpC,IAAI,OAAO,CAAC,YAAY,CAAC,aAAa,IAAI,SAAS,EAAE,CAAC;4BAClD,IAAI,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,IAAI,eAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;gCAC3D,OAAQ,OAAO,CAAC,YAAY,CAAC,aAA0B,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;4BAC3G,CAAC;wBACL,CAAC;oBACL,CAAC;oBACD,OAAO,CAAC,CAAC;gBACb,CAAC;gBAEO,gBAAgB,CAAC,OAAkB;oBACvC,IAAI,OAAO,CAAC,YAAY,IAAI,SAAS,EAAE,CAAC;wBACpC,IAAI,OAAO,CAAC,YAAY,CAAC,aAAa,IAAI,SAAS,EAAE,CAAC;4BAClD,IAAI,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,IAAI,eAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gCAClE,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,aAAgC,CAAC;gCAC3E,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,IAAI,QAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;oCACjD,OAAO,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gCAC7D,CAAC;4BACL,CAAC;wBACL,CAAC;oBACL,CAAC;oBACD,OAAO,CAAC,CAAC;gBACb,CAAC;gBAEO,2BAA2B,CAAC,OAAkB;oBAClD,MAAM,KAAK,GAAa,EAAE,CAAC;oBAC3B,IAAI,OAAO,CAAC,YAAY,IAAI,SAAS,EAAE,CAAC;wBACpC,IAAI,OAAO,CAAC,YAAY,CAAC,aAAa,IAAI,SAAS,EAAE,CAAC;4BAClD,IAAI,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,IAAI,eAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gCAClE,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,aAAgC,CAAC;gCAC3E,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,IAAI,QAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;oCACjD,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC;oCAChD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wCACvC,MAAM,eAAe,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,OAA6B,CAAC;wCAClE,IAAI,eAAe,CAAC,SAAS,CAAC,IAAI,IAAI,QAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;4CACtD,KAAK,CAAC,IAAI,CAAE,eAAe,CAAC,SAA0B,CAAC,UAAU,CAAC,CAAC;wCACvE,CAAC;6CAAM,IAAI,eAAe,CAAC,SAAS,CAAC,IAAI,IAAI,eAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;4CACzD,KAAK,CAAC,IAAI,CAAE,eAAe,CAAC,SAAsB,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;wCACxF,CAAC;6CAAM,CAAC;4CACJ,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;wCACxD,CAAC;oCACL,CAAC;gCACL,CAAC;4BACL,CAAC;iCAAM,IAAI,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,IAAI,eAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;gCAClE,MAAM,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC,aAAyB,CAAC;gCAC7D,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gCAClD,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,QAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;oCACxC,KAAK,CAAC,IAAI,CAAE,KAAK,CAAC,KAAsB,CAAC,UAAU,CAAC,CAAA;gCACxD,CAAC;4BACL,CAAC;wBACL,CAAC;oBACL,CAAC;oBACD,OAAO,KAAK,CAAC;gBACjB,CAAC;gBAEO,mBAAmB,CAAC,CAAW,EAAE,CAAW;oBAChD,IAAI,CAAC,GAAG,CAAC,CAAC;oBACV,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;wBAClC,MAAM,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC5C,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;4BACnB,OAAO,UAAU,CAAC;wBACtB,CAAC;wBACD,CAAC,EAAE,CAAC;oBACR,CAAC;oBACD,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;wBACf,OAAO,CAAC,CAAC;oBACb,CAAC;yBAAM,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;wBACtB,OAAO,CAAC,CAAC,CAAC;oBACd,CAAC;oBACD,OAAO,CAAC,CAAC;gBACb,CAAC;gBAEO,YAAY,CAAC,EAAsB;oBACvC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACV,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,eAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;wBACtF,CAAC,EAAE,CAAC;oBACR,CAAC;oBACD,OAAO,CAAC,CAAC;gBACb,CAAC;gBAEa,uBAAuB,CAAC,OAAmC;;wBACrE,MAAM,GAAG,GAAG,EAAE,CAAC;wBACf,KAAK,MAAM,YAAY,IAAI,OAAO,EAAE,CAAC;4BACjC,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;4BACrC,IAAI,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gCACtC,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,OAAO,EAAE,KAAK,CAAC,EAAE;;oCAC1C,IAAI,QAAQ,GAAI,KAAK,CAAC,YAAa,CAAC,aAAwC,CAAC,QAAQ,CAAC,QAAQ,CAAC;oCAC/F,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,KAAI,MAAA,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,0CAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA,CAAC;oCAC1I,IAAI,aAAa,EAAE,CAAC;wCAChB,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;oCAClJ,CAAC;oCACD,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;wCACnB,MAAM,cAAc,GAAa,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;4CAC/D,MAAM,EAAE,GAAG,IAA0B,CAAC;4CACtC,IAAI,EAAE,CAAC,SAAS,CAAC,IAAI,IAAI,eAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;gDACrC,OAAQ,EAAE,CAAC,SAAsB,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC;4CACtE,CAAC;iDAAM,IAAI,EAAE,CAAC,SAAS,CAAC,IAAI,IAAI,QAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;gDAChD,OAAQ,EAAE,CAAC,SAA0B,CAAC,UAAU,CAAC;4CACrD,CAAC;iDAAM,CAAC;gDACJ,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;4CACrD,CAAC;wCACL,CAAC,CAAC,CAAC;wCACH,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;oCAC9D,CAAC,CAAC,CAAC;oCACH,IAAI,aAAa,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;wCACvI,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oCACtE,CAAC;gCACL,CAAC,CAAC,CAAC;gCACH,MAAM,SAAS,GAAG,MAAM,IAAI,0BAAiB,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,CAAc,CAAC;gCACrF,GAAG,CAAC,IAAI,CAAC,IAAA,eAAO,EAAC,YAAY,EAAE,KAAK,CAAC,EAAE;oCACpC,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;gCAC7B,CAAC,CAAC,CAAC,CAAC;4BACR,CAAC;iCAAM,CAAC;gCACJ,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;4BAC3B,CAAC;wBACL,CAAC;wBACD,OAAO,GAAG,CAAC;oBACf,CAAC;iBAAA;aACJ,CAAA;QACL,CAAC;KAAA;CACJ;AA1KD,oCA0KC"}

package/src/recipe/index.ts

@@ -1,17 +0,0 @@
-/*
- * Copyright 2025 the original author or authors.
- * <p>
- * Licensed under the Moderne Source Available License (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://docs.moderne.io/licensing/moderne-source-available-license
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export {OrderImports} from "./order-imports";

package/src/recipe/order-imports.ts

@@ -1,195 +0,0 @@
-/*
- * Copyright 2025 the original author or authors.
- * <p>
- * Licensed under the Moderne Source Available License (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://docs.moderne.io/licensing/moderne-source-available-license
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {Recipe} from "../recipe";
-import {produceAsync, TreeVisitor} from "../visitor";
-import {ExecutionContext} from "../execution";
-import {JavaScriptVisitor, JS} from "../javascript";
-import {J} from "../java";
-import {Draft, produce} from "immer";
-import {AutoformatVisitor} from "../javascript/format";
-
-export class OrderImports extends Recipe {
-    name = "org.openrewrite.OrderImports";
-    displayName = "Order imports";
-    description = "Sort top-level imports alphabetically within groups: no qualifier, asterisk, multiple, single.";
-
-
-    async editor(): Promise<TreeVisitor<any, ExecutionContext>> {
-        return new class extends JavaScriptVisitor<ExecutionContext> {
-
-            protected async visitJsCompilationUnit(cu: JS.CompilationUnit, p: ExecutionContext): Promise<J | undefined> {
-                const importCount = this.countImports(cu);
-                const imports = cu.statements.slice(0, importCount) as J.RightPadded<JS.Import>[];
-                const originalImportPosition = Object.fromEntries(imports.map((item, i) => [item.element.id, i]));
-                const restStatements = cu.statements.slice(importCount);
-                const sortedImports = await this.sortNamesWithinEachLine(imports);
-                sortedImports.sort((aPadded, bPadded) => {
-                    const a = aPadded.element;
-                    const b = bPadded.element;
-
-                    const noSpecifier = (a.importClause == undefined ? 1 : 0) - (b.importClause == undefined ? 1 : 0);
-                    if (noSpecifier != 0) {
-                        return -noSpecifier;
-                    }
-                    const asterisk = this.isAsteriskImport(a) - this.isAsteriskImport(b);
-                    if (asterisk != 0) {
-                        return -asterisk;
-                    }
-                    const multipleImport = this.isMultipleImport(a) - this.isMultipleImport(b);
-                    if (multipleImport != 0) {
-                        return -multipleImport;
-                    }
-                    const comparedSpecifiers = this.compareStringArrays(this.extractImportSpecifierNames(a), this.extractImportSpecifierNames(b));
-                    if (comparedSpecifiers != 0) {
-                        return comparedSpecifiers;
-                    }
-                    // Tiebreaker, keep the sort stable
-                    return originalImportPosition[aPadded.element.id] - originalImportPosition[bPadded.element.id];
-                });
-                const cuWithImportsSorted = await produceAsync(cu, async draft => {
-                    draft.statements = [...sortedImports, ...restStatements];
-                });
-                return produce(cuWithImportsSorted!, draft => {
-                    for (let i = 0; i < importCount; i++) {
-                       draft.statements[i].element.prefix.whitespace = i > 0 ? "\n" : "";
-                    }
-                    // TODO deal with comments in the whitespace around imports
-                });
-            }
-
-            private isAsteriskImport(import_: JS.Import): 0 | 1 {
-                if (import_.importClause != undefined) {
-                    if (import_.importClause.namedBindings != undefined) {
-                        if (import_.importClause.namedBindings.kind == JS.Kind.Alias) {
-                            return (import_.importClause.namedBindings as JS.Alias).propertyName.element.simpleName == "*" ? 1 : 0;
-                        }
-                    }
-                }
-                return 0;
-            }
-
-            private isMultipleImport(import_: JS.Import): 0 | 1 {
-                if (import_.importClause != undefined) {
-                    if (import_.importClause.namedBindings != undefined) {
-                        if (import_.importClause.namedBindings.kind == JS.Kind.NamedImports) {
-                            const namedImports = import_.importClause.namedBindings as JS.NamedImports;
-                            if (namedImports.elements.kind == J.Kind.Container) {
-                                return namedImports.elements.elements.length > 1 ? 1 : 0;
-                            }
-                        }
-                    }
-                }
-                return 0;
-            }
-
-            private extractImportSpecifierNames(import_: JS.Import): string[] {
-                const names: string[] = [];
-                if (import_.importClause != undefined) {
-                    if (import_.importClause.namedBindings != undefined) {
-                        if (import_.importClause.namedBindings.kind == JS.Kind.NamedImports) {
-                            const namedImports = import_.importClause.namedBindings as JS.NamedImports;
-                            if (namedImports.elements.kind == J.Kind.Container) {
-                                const elements = namedImports.elements.elements;
-                                for (let i = 0; i < elements.length; i++) {
-                                    const importSpecifier = elements[i].element as JS.ImportSpecifier;
-                                    if (importSpecifier.specifier.kind == J.Kind.Identifier) {
-                                        names.push((importSpecifier.specifier as J.Identifier).simpleName);
-                                    } else if (importSpecifier.specifier.kind == JS.Kind.Alias) {
-                                        names.push((importSpecifier.specifier as JS.Alias).propertyName.element.simpleName);
-                                    } else {
-                                        throw new Error("Unknown kind " + elements[i].kind);
-                                    }
-                                }
-                            }
-                        } else if (import_.importClause.namedBindings.kind == JS.Kind.Alias) {
-                            const alias = import_.importClause.namedBindings as JS.Alias;
-                            names.push(alias.propertyName.element.simpleName);
-                            if (alias.alias.kind == J.Kind.Identifier) {
-                                names.push((alias.alias as J.Identifier).simpleName)
-                            }
-                        }
-                    }
-                }
-                return names;
-            }
-
-            private compareStringArrays(a: string[], b: string[]): number {
-                let i = 0;
-                while (i < a.length && i < b.length) {
-                    const comparison = a[i].localeCompare(b[i]);
-                    if (comparison !== 0) {
-                        return comparison;
-                    }
-                    i++;
-                }
-                if (i < a.length) {
-                    return 1;
-                } else if (i < b.length) {
-                    return -1;
-                }
-                return 0;
-            }
-
-            private countImports(cu: JS.CompilationUnit): number {
-                let i = 0;
-                while ((i < cu.statements.length) && (cu.statements[i].element.kind === JS.Kind.Import)) {
-                    i++;
-                }
-                return i;
-            }
-
-            private async sortNamesWithinEachLine(imports: J.RightPadded<JS.Import>[]): Promise<J.RightPadded<JS.Import>[]> {
-                const ret = [];
-                for (const importPadded of imports) {
-                    const import_ = importPadded.element;
-                    if (this.isMultipleImport(import_) == 1) {
-                        const importSorted = produce(import_, draft => {
-                            let elements = (draft.importClause!.namedBindings as Draft<JS.NamedImports>).elements.elements;
-                            const trailingComma = elements.length > 0 && elements[elements.length - 1].markers?.markers.find(m => m.kind === J.Markers.TrailingComma);
-                            if (trailingComma) {
-                                elements[elements.length - 1].markers.markers = elements[elements.length - 1].markers.markers.filter(m => m.kind !== J.Markers.TrailingComma);
-                            }
-                            elements.sort((a, b) => {
-                                const namesExtracted: string[] = [a.element, b.element].map(expr => {
-                                    const is = expr as JS.ImportSpecifier;
-                                    if (is.specifier.kind == JS.Kind.Alias) {
-                                        return (is.specifier as JS.Alias).propertyName.element.simpleName;
-                                    } else if (is.specifier.kind == J.Kind.Identifier) {
-                                        return (is.specifier as J.Identifier).simpleName;
-                                    } else {
-                                        throw new Error("Unsupported kind " + expr.kind);
-                                    }
-                                });
-                                return namesExtracted[0].localeCompare(namesExtracted[1]);
-                            });
-                            if (trailingComma && elements.length > 0 && !elements[elements.length - 1].markers.markers.find(m => m.kind === J.Markers.TrailingComma)) {
-                                elements[elements.length - 1].markers.markers.push(trailingComma);
-                            }
-                        });
-                        const formatted = await new AutoformatVisitor().visit(importSorted, {}) as JS.Import;
-                        ret.push(produce(importPadded, draft => {
-                           draft.element = formatted;
-                        }));
-                    } else {
-                        ret.push(importPadded);
-                    }
-                }
-                return ret;
-            }
-        }
-    }
-}