tsl-dx 0.9.0 → 0.10.2

package/dist/index.d.ts

@@ -88,6 +88,6 @@ type nullishOptions = {
  * if (x == null) { }
  * ```
  */
-declare const nullish: (options?: "off" | nullishOptions | undefined) => tsl.Rule<unknown>;
+declare const nullish: (options?: nullishOptions | "off" | undefined) => tsl.Rule<unknown>;
 //#endregion
 export { noDuplicateExports, noDuplicateImports, noMultilineTemplateExpressionWithoutAutoDedent, nullish };

package/dist/index.js

@@ -45,20 +45,21 @@ const noDuplicateExports = defineRule(() => {
 		} }
 	};
 });
-function buildSuggestions$1(a, b) {
+function buildSuggestions$1(existing, incoming) {
 	switch (true) {
-		case ts.isNamedExports(a.exportClause) && ts.isNamedExports(b.exportClause): {
-			const aElements = a.exportClause.elements.map((el) => el.getText());
-			const bElements = b.exportClause.elements.map((el) => el.getText());
-			const parts = Array.from(new Set([...aElements, ...bElements]));
+		case ts.isNamedExports(existing.exportClause) && ts.isNamedExports(incoming.exportClause): {
+			const existingElements = existing.exportClause.elements.map((el) => el.getText());
+			const incomingElements = incoming.exportClause.elements.map((el) => el.getText());
+			const parts = Array.from(new Set([...existingElements, ...incomingElements]));
 			return [{
 				message: "Merge duplicate exports",
 				changes: [{
-					node: a,
+					start: incoming.getFullStart(),
+					end: incoming.getEnd(),
 					newText: ""
 				}, {
-					node: b,
-					newText: `export ${a.isTypeOnly ? "type " : ""}{ ${parts.join(", ")} } from ${a.moduleSpecifier.getText()};`
+					node: existing,
+					newText: `export ${existing.isTypeOnly ? "type " : ""}{ ${parts.join(", ")} } from ${existing.moduleSpecifier.getText()};`
 				}]
 			}];
 		}
@@ -129,7 +130,11 @@ const noDuplicateImports = defineRule(() => {
 	};
 });
 function buildSuggestions(existing, incoming) {
-	if (incoming.kind === "defer" || incoming.bindings.kind === "namespace" || existing.bindings.kind === "namespace") return [];
+	switch (true) {
+		case incoming.kind === "defer" || incoming.bindings.kind === "namespace" || existing.bindings.kind === "namespace": return [];
+		case existing.defaultImport != null && incoming.defaultImport != null && existing.defaultImport !== incoming.defaultImport: return [];
+		default: break;
+	}
 	const parts = [];
 	const defaultImport = existing.defaultImport ?? incoming.defaultImport;
 	if (defaultImport != null) parts.push(defaultImport);
@@ -139,7 +144,8 @@ function buildSuggestions(existing, incoming) {
 	return [{
 		message: "Merge duplicate imports",
 		changes: [{
-			node: incoming.node,
+			start: incoming.node.getFullStart(),
+			end: incoming.node.getEnd(),
 			newText: ""
 		}, {
 			node: existing.node,
@@ -148,13 +154,6 @@ function buildSuggestions(existing, incoming) {
 	}];
 }
 
-//#endregion
-//#region src/utils/source-file.ts
-function getLine(node) {
-	const sourceFile = node.getSourceFile();
-	return [sourceFile.getLineAndCharacterOfPosition(node.getStart()).line, sourceFile.getLineAndCharacterOfPosition(node.getEnd()).line];
-}
-
 //#endregion
 //#region src/rules/no-multiline-template-expression-without-auto-dedent.ts
 const messages$1 = {
@@ -186,6 +185,10 @@ const messages$1 = {
 const noMultilineTemplateExpressionWithoutAutoDedent = defineRule((options) => {
 	const dedentTagNames = options?.dedentTagNames ?? ["dedent"];
 	const dedentTagImportCallback = options?.dedentTagImportCallback ?? ((name) => `import ${name} from "dedent";\n`);
+	function getLine(node) {
+		const sourceFile = node.getSourceFile();
+		return [sourceFile.getLineAndCharacterOfPosition(node.getStart()).line, sourceFile.getLineAndCharacterOfPosition(node.getEnd()).line];
+	}
 	return {
 		name: "dx/no-multiline-template-expression-without-auto-dedent",
 		visitor: { NoSubstitutionTemplateLiteral(ctx, node) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsl-dx",
-  "version": "0.9.0",
+  "version": "0.10.2",
   "description": "A tsl plugin for better JavaScript/TypeScript DX.",
   "keywords": [
     "tsl",
@@ -25,15 +25,15 @@
   },
   "devDependencies": {
     "@liautaud/typezod": "^2.0.0",
-    "dedent": "^1.7.1",
-    "tsdown": "^0.21.0-beta.2",
+    "dedent": "^1.7.2",
+    "tsdown": "^0.21.4",
     "tsl": "^1.0.29",
-    "vitest": "^4.0.18",
+    "vitest": "^4.1.0",
     "@local/configs": "0.0.0",
     "@local/eff": "0.2.9"
   },
   "peerDependencies": {
-    "tsl": "^1.0.28",
+    "tsl": "^1.0.29",
     "typescript": "*"
   },
   "publishConfig": {