@trivago/prettier-plugin-sort-imports
Advanced tools
Comparing version 1.4.2 to 1.4.3
@@ -13,3 +13,3 @@ "use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.getCodeFromAst = exports.removeImportsFromOriginalCode = exports.getSortedNodes = void 0; | ||
exports.getCodeFromAst = exports.removeNodesFromOriginalCode = exports.getSortedNodes = void 0; | ||
// we do not have types for javascript-natural-sort | ||
@@ -65,3 +65,3 @@ //@ts-ignore | ||
])); | ||
// maintain a copy of th nodes to extract comments from | ||
// maintain a copy of the nodes to extract comments from | ||
var sortedNodesClone = allSortedNodes.map(lodash_1.clone); | ||
@@ -71,7 +71,9 @@ var firstNodesComments = nodes[0].leadingComments; | ||
allSortedNodes.forEach(types_1.removeComments); | ||
// insert comments other than the first commens | ||
allSortedNodes.forEach(function (importDeclaration, index) { | ||
types_1.addComments(importDeclaration, 'leading', sortedNodesClone[index].leadingComments || []); | ||
// insert comments other than the first comments | ||
allSortedNodes.forEach(function (node, index) { | ||
if (!lodash_1.isEqual(nodes[0].loc, node.loc)) { | ||
types_1.addComments(node, 'leading', sortedNodesClone[index].leadingComments || []); | ||
} | ||
}); | ||
if (firstNodesComments && !lodash_1.isEqual(nodes[0], allSortedNodes[0])) { | ||
if (firstNodesComments) { | ||
types_1.addComments(allSortedNodes[0], 'leading', firstNodesComments); | ||
@@ -84,5 +86,5 @@ } | ||
* @param code the whole file as text | ||
* @param nodes to be removd | ||
* @param nodes to be removed | ||
*/ | ||
exports.removeImportsFromOriginalCode = function (code, nodes) { | ||
exports.removeNodesFromOriginalCode = function (code, nodes) { | ||
var text = code; | ||
@@ -107,3 +109,3 @@ for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) { | ||
var commentAndImportsToRemoveFromCode = __spreadArrays(nodes, allCommentsFromImports); | ||
var codeWithoutImportDeclarations = exports.removeImportsFromOriginalCode(originalCode, commentAndImportsToRemoveFromCode); | ||
var codeWithoutImportDeclarations = exports.removeNodesFromOriginalCode(originalCode, commentAndImportsToRemoveFromCode); | ||
var newAST = types_1.file({ | ||
@@ -132,4 +134,3 @@ type: 'Program', | ||
if (Array.isArray(node.leadingComments) && | ||
node.leadingComments.length > 0 && | ||
types_1.isImportDeclaration(node)) { | ||
node.leadingComments.length > 0) { | ||
acc = __spreadArrays(acc, node.leadingComments); | ||
@@ -136,0 +137,0 @@ } |
{ | ||
"name": "@trivago/prettier-plugin-sort-imports", | ||
"version": "1.4.2", | ||
"version": "1.4.3", | ||
"description": "A prettier plugins to sort imports in provided RegEx order", | ||
@@ -5,0 +5,0 @@ "main": "lib/src/index.js", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
207
24367