tsl-dx 0.5.1 → 0.5.3

package/dist/index.d.ts

@@ -42,6 +42,6 @@ declare const noDuplicateImports: (options?: "off" | undefined) => tsl.Rule<unkn
 declare const noMultilineTemplateExpressionsWithoutAutoDedent: (options?: "off" | undefined) => tsl.Rule<unknown>;
 //#endregion
 //#region src/rules/nullish.d.ts
-declare const nullish: (options?: "off" | undefined) => tsl.Rule<unknown>;
+declare const nullish: (options?: Record<string, unknown> | "off" | undefined) => tsl.Rule<unknown>;
 //#endregion
 export { noDuplicateExports, noDuplicateImports, noMultilineTemplateExpressionsWithoutAutoDedent, nullish };

package/dist/index.js

@@ -297,9 +297,31 @@ const messages = {
 	useLooseNullishComparison: (p) => `Use '${p.op}' for nullish comparison.`
 };
 const suggestions = { replaceWithExpression: (p) => `Replace with '${p.expr}'.` };
-const nullish = defineRule(() => ({
+const nullish = defineRule((options) => ({
 	name: "dx/nullish",
+	createData(ctx) {
+		return { runtimeLibrary: options?.runtimeLibrary ?? "@local/eff" };
+	},
 	visitor: {
+		Identifier(ctx, node) {
+			if (node.getSourceFile().isDeclarationFile) return;
+			if (node.parent.kind === SyntaxKind.BinaryExpression || node.text !== "undefined") return;
+			ctx.report({
+				node,
+				message: messages.useUnitForUndefined,
+				suggestions: [{
+					message: suggestions.replaceWithExpression({ expr: "unit" }),
+					changes: [{
+						node,
+						newText: "unit"
+					}, {
+						start: 0,
+						end: 0,
+						newText: `import { unit } from '${ctx.data.runtimeLibrary}';\n`
+					}]
+				}]
+			});
+		},
 		UndefinedKeyword(ctx, node) {
 			if (node.getSourceFile().isDeclarationFile) return;
 			ctx.report({
@@ -313,18 +335,19 @@ const nullish = defineRule(() => ({
 					}, {
 						start: 0,
 						end: 0,
-						newText: "import { unit } from '@local/eff';\n"
+						newText: `import type { unit } from '${ctx.data.runtimeLibrary}';\n`
 					}]
 				}]
 			});
 		},
 		BinaryExpression(ctx, node) {
+			if (node.getSourceFile().isDeclarationFile) return;
 			const newOperatorText = match(node.operatorToken.kind).with(SyntaxKind.EqualsEqualsEqualsToken, () => "==").with(SyntaxKind.ExclamationEqualsEqualsToken, () => "!=").otherwise(() => null);
 			if (newOperatorText == null) return;
 			const offendingChild = [node.left, node.right].find((n) => {
 				switch (n.kind) {
 					case SyntaxKind.NullKeyword: return true;
-					case SyntaxKind.Identifier: return n.escapedText === "undefined";
+					case SyntaxKind.Identifier: return n.text === "unit" || n.text === "undefined";
 					default: return false;
 				}
 			});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsl-dx",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "A tsl plugin for better JavaScript/TypeScript DX.",
   "keywords": [
     "tsl",