tsl-dx 0.7.2 → 0.8.0

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

@@ -1,6 +1,6 @@
 import { defineRule } from "tsl";
 import ts, { SyntaxKind } from "typescript";
-import { P, match } from "ts-pattern";
+import { match } from "ts-pattern";
 
 //#region src/rules/no-duplicate-exports.ts
 const messages$3 = { default: (p) => `Duplicate export from module ${p.source}.` };
@@ -37,7 +37,7 @@ const noDuplicateExports = defineRule(() => {
 				ctx.report({
 					node,
 					message: messages$3.default({ source }),
-					suggestions: buildSuggestions(duplicateExport, node)
+					suggestions: buildSuggestions$1(duplicateExport, node)
 				});
 				return;
 			}
@@ -45,7 +45,7 @@ const noDuplicateExports = defineRule(() => {
 		} }
 	};
 });
-function buildSuggestions(a, b) {
+function buildSuggestions$1(a, b) {
 	switch (true) {
 		case ts.isNamedExports(a.exportClause) && ts.isNamedExports(b.exportClause): {
 			const aElements = a.exportClause.elements.map((el) => el.getText());
@@ -69,10 +69,6 @@ function buildSuggestions(a, b) {
 //#endregion
 //#region ../../.pkgs/eff/dist/index.js
 /**
-* alias for `undefined`.
-*/
-const unit = void 0;
-/**
 * Creates a function that can be used in a data-last (aka `pipe`able) or
 * data-first style.
 *
@@ -211,64 +207,63 @@ const noDuplicateImports = defineRule(() => {
 	return {
 		name: "dx/no-duplicate-imports",
 		createData() {
-			return { imports: [
-				[],
-				[],
-				[]
-			] };
+			return { imports: new Map([
+				["value", []],
+				["type", []],
+				["defer", []]
+			]) };
 		},
 		visitor: { ImportDeclaration(ctx, node) {
 			if (node.importClause == null) return;
-			const importKind = getImportKind(node);
+			const importKind = match(node.importClause.phaseModifier).with(ts.SyntaxKind.TypeKeyword, () => "type").with(ts.SyntaxKind.DeferKeyword, () => "defer").otherwise(() => "value");
 			const importInfo = {
 				node,
 				source: node.moduleSpecifier.getText(),
 				kind: importKind,
-				...decodeImportClause(node.importClause)
+				defaultImport: node.importClause.name?.getText(),
+				bindings: match(node.importClause.namedBindings).with({ kind: ts.SyntaxKind.NamedImports }, (nb) => ({
+					kind: "named",
+					imports: nb.elements.map((el) => el.getText())
+				})).with({ kind: ts.SyntaxKind.NamespaceImport }, (nb) => ({
+					kind: "namespace",
+					name: nb.name.getText()
+				})).otherwise(() => ({
+					kind: "named",
+					imports: []
+				}))
 			};
-			const existingImports = ctx.data.imports[importKind];
+			const existingImports = ctx.data.imports.get(importKind);
 			const duplicateImport = existingImports.find((imp) => imp.source === importInfo.source);
-			if (duplicateImport != null) {
-				ctx.report({
-					node,
-					message: messages$2.default({ source: importInfo.source }),
-					suggestions: importKind > 1 ? [] : [{
-						message: "Merge duplicate imports",
-						changes: [{
-							node,
-							newText: ""
-						}, {
-							node: duplicateImport.node,
-							newText: buildMergedImport(duplicateImport, importInfo)
-						}]
-					}]
-				});
+			if (duplicateImport == null) {
+				existingImports.push(importInfo);
 				return;
 			}
-			existingImports.push(importInfo);
+			ctx.report({
+				node,
+				message: messages$2.default({ source: importInfo.source }),
+				suggestions: buildSuggestions(duplicateImport, importInfo)
+			});
 		} }
 	};
 });
-function getImportKind(node) {
-	return match(node.importClause?.phaseModifier).with(P.nullish, () => 0).with(ts.SyntaxKind.TypeKeyword, () => 1).with(ts.SyntaxKind.DeferKeyword, () => 2).otherwise(() => 0);
-}
-function decodeImportClause(node) {
-	const { name, namedBindings } = node;
-	return {
-		defaultImport: name?.getText(),
-		namedImports: namedBindings != null && ts.isNamedImports(namedBindings) ? namedBindings.elements.map((el) => el.getText()) : [],
-		namespaceImport: namedBindings != null && ts.isNamespaceImport(namedBindings) ? namedBindings.name.getText() : unit
-	};
-}
-function buildMergedImport(a, b) {
+function buildSuggestions(existing, incoming) {
+	if (incoming.kind === "defer" || incoming.bindings.kind === "namespace" || existing.bindings.kind === "namespace") return [];
 	const parts = [];
-	if (a.defaultImport != null) parts.push(a.defaultImport);
-	else if (b.defaultImport != null) parts.push(b.defaultImport);
-	if (a.namespaceImport != null) parts.push(`* as ${a.namespaceImport}`);
-	else if (b.namespaceImport != null) parts.push(`* as ${b.namespaceImport}`);
-	const namedImports = Array.from(new Set([...a.namedImports, ...b.namedImports]));
-	if (namedImports.length > 0) parts.push(`{ ${namedImports.join(", ")} }`);
-	return `${match(a.kind).with(0, () => "import").with(1, () => "import type").with(2, () => "import defer").exhaustive()} ${parts.join(", ")} from ${a.source};`;
+	const defaultImport = existing.defaultImport ?? incoming.defaultImport;
+	if (defaultImport != null) parts.push(defaultImport);
+	const mergedImports = Array.from(new Set([...existing.bindings.imports, ...incoming.bindings.imports]));
+	if (mergedImports.length > 0) parts.push(`{ ${mergedImports.join(", ")} }`);
+	const importKindPrefix = incoming.kind === "value" ? "import" : "import type";
+	return [{
+		message: "Merge duplicate imports",
+		changes: [{
+			node: incoming.node,
+			newText: ""
+		}, {
+			node: existing.node,
+			newText: `${importKindPrefix} ${parts.join(", ")} from ${existing.source};`
+		}]
+	}];
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsl-dx",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "A tsl plugin for better JavaScript/TypeScript DX.",
   "keywords": [
     "tsl",
@@ -24,6 +24,7 @@
     "ts-pattern": "^5.9.0"
   },
   "devDependencies": {
+    "@liautaud/typezod": "^2.0.0",
     "dedent": "^1.7.1",
     "tsdown": "^0.20.3",
     "tsl": "^1.0.29",