refactor: minor improvements

Rel1cx · Rel1cx · commit f605345adcc7 · 2025-01-14T09:24:47.000+08:00
diff --git a/package.json b/package.json
@@ -92,7 +92,7 @@
     "markdownlint": "^0.37.3",
     "ofetch": "^1.4.1",
     "picocolors": "^1.1.1",
-    "publint": "^0.3.1",
+    "publint": "^0.3.2",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "skott": "^0.35.4",
diff --git a/packages/plugins/eslint-plugin/src/configs/disable-debug.ts b/packages/plugins/eslint-plugin/src/configs/disable-debug.ts
@@ -1,4 +1,4 @@
-import { entries, fromEntries } from "@eslint-react/eff";
+import { entries, fromEntries } from "../utils";
 
 import { rules as debugRules } from "./debug";
 
diff --git a/packages/plugins/eslint-plugin/src/configs/disable-dom.ts b/packages/plugins/eslint-plugin/src/configs/disable-dom.ts
@@ -1,5 +1,4 @@
-import { entries, fromEntries } from "@eslint-react/eff";
-
+import { entries, fromEntries } from "../utils";
 import { rules as domRules } from "./dom";
 
 export const name = "@eslint-react/disable-dom";
diff --git a/packages/plugins/eslint-plugin/src/configs/disable-web-api.ts b/packages/plugins/eslint-plugin/src/configs/disable-web-api.ts
@@ -1,4 +1,4 @@
-import { entries, fromEntries } from "@eslint-react/eff";
+import { entries, fromEntries } from "../utils";
 
 import { rules as webApiRules } from "./web-api";
 
diff --git a/packages/plugins/eslint-plugin/src/configs/off.ts b/packages/plugins/eslint-plugin/src/configs/off.ts
@@ -1,4 +1,4 @@
-import { entries, fromEntries } from "@eslint-react/eff";
+import { entries, fromEntries } from "../utils";
 
 import { rules as allRules } from "./all";
 import { rules as disableTypeCheckedRules } from "./disable-type-checked";
diff --git a/packages/plugins/eslint-plugin/src/utils/entries.ts b/packages/plugins/eslint-plugin/src/utils/entries.ts
@@ -0,0 +1,54 @@
+import type { Pretty } from "@eslint-react/eff";
+
+// Ported from: https://github.com/remeda/remeda/blob/9d742036f6c9cdc216e2c771805051855e7e7ac4/src/entries.ts
+type EntriesEntryForKey<T, Key extends keyof T> = Key extends number | string ? [key: `${Key}`, value: Required<T>[Key]]
+  : never;
+type EntriesEntry<T> = Pretty<{ [P in keyof T]-?: EntriesEntryForKey<T, P> }[keyof T]>;
+export function entries<T extends {}>(data: T): Array<EntriesEntry<T>>;
+export function entries(): <T extends {}>(data: T) => Array<EntriesEntry<T>>;
+export function entries(...args: ReadonlyArray<unknown>): unknown {
+  return Object.entries(args);
+}
+
+// Ported from: https://github.com/remeda/remeda/blob/9d742036f6c9cdc216e2c771805051855e7e7ac4/src/fromEntries.ts
+type IterableContainer<T = unknown> = readonly [] | ReadonlyArray<T>;
+type FromEntriesEntry<Key extends PropertyKey = PropertyKey, Value = unknown> = readonly [
+  key: Key,
+  value: Value,
+];
+type FromEntries<Entries> = Entries extends readonly [
+  infer First,
+  ...infer Tail,
+] ? FromEntriesTuple<First, Tail>
+  : Entries extends readonly [...infer Head, infer Last] ? FromEntriesTuple<Last, Head>
+  : Entries extends IterableContainer<FromEntriesEntry> ? FromEntriesArray<Entries>
+  : "ERROR: Entries array-like could not be inferred";
+type FromEntriesTuple<E, Rest> = E extends FromEntriesEntry ? FromEntries<Rest> & Record<E[0], E[1]>
+  : "ERROR: Array-like contains a non-entry element";
+type FromEntriesArray<Entries extends IterableContainer<FromEntriesEntry>> = string extends AllKeys<Entries>
+  ? Record<string, Entries[number][1]>
+  : number extends AllKeys<Entries> ? Record<number, Entries[number][1]>
+  : symbol extends AllKeys<Entries> ? Record<symbol, Entries[number][1]>
+  : FromEntriesArrayWithLiteralKeys<Entries>;
+type FromEntriesArrayWithLiteralKeys<Entries extends IterableContainer<FromEntriesEntry>> = {
+  [P in AllKeys<Entries>]?: ValueForKey<Entries, P>;
+};
+type AllKeys<Entries extends IterableContainer<FromEntriesEntry>> = Extract<
+  Entries[number],
+  FromEntriesEntry
+>[0];
+type ValueForKey<
+  Entries extends IterableContainer<FromEntriesEntry>,
+  K extends PropertyKey,
+> = (Extract<Entries[number], FromEntriesEntry<K>> extends never ? Entries[number]
+  : Extract<Entries[number], FromEntriesEntry<K>>)[1];
+export function fromEntries<Entries extends IterableContainer<FromEntriesEntry>>(
+  entries: Entries,
+): Pretty<FromEntries<Entries>>;
+export function fromEntries(): <Entries extends IterableContainer<FromEntriesEntry>>(
+  entries: Entries,
+) => Pretty<FromEntries<Entries>>;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function fromEntries(...args: ReadonlyArray<any>): unknown {
+  return Object.fromEntries(args);
+}
diff --git a/packages/plugins/eslint-plugin/src/utils/index.ts b/packages/plugins/eslint-plugin/src/utils/index.ts
@@ -1,2 +1,4 @@
+export * from "./entries";
 export * from "./pad-keys-left";
 export * from "./transform-keys";
+export * from "./type-of";
diff --git a/packages/utilities/eff/docs/README.md b/packages/utilities/eff/docs/README.md
@@ -22,10 +22,8 @@
 
 - [birecord](functions/birecord.md)
 - [dual](functions/dual.md)
-- [entries](functions/entries.md)
 - [flip](functions/flip.md)
 - [flow](functions/flow.md)
-- [fromEntries](functions/fromEntries.md)
 - [getOrUpdate](functions/getOrUpdate.md)
 - [identity](functions/identity.md)
 - [isArray](functions/isArray.md)
diff --git a/packages/utilities/eff/docs/functions/entries.md b/packages/utilities/eff/docs/functions/entries.md
diff --git a/packages/utilities/eff/docs/functions/fromEntries.md b/packages/utilities/eff/docs/functions/fromEntries.md
diff --git a/packages/utilities/eff/docs/functions/isArray.md b/packages/utilities/eff/docs/functions/isArray.md
@@ -20,7 +20,7 @@ A function that checks if the passed parameter is an Array and narrows its type
 
 The variable to check.
 
-`ArrayLike`\<`unknown`\> | `T`
+`T` | `ArrayLike`\<`unknown`\>
 
 ## Returns
 
diff --git a/packages/utilities/eff/docs/type-aliases/NarrowedTo.md b/packages/utilities/eff/docs/type-aliases/NarrowedTo.md
@@ -6,7 +6,7 @@
 
 # Type Alias: NarrowedTo\<T, Base\>
 
-> **NarrowedTo**\<`T`, `Base`\>: `Extract`\<`T`, `Base`\> *extends* `never` ? `Base` : `IsAny`\<`T`\> *extends* `true` ? `Base` : `Extract`\<`T`, `Base`\>
+> **NarrowedTo**\<`T`, `Base`\>: `Extract`\<`T`, `Base`\> *extends* `never` ? `Base` : `0` *extends* `1` & `NoInfer`\<`T`\> ? `Base` : `Extract`\<`T`, `Base`\>
 
 An extension of Extract for type predicates which falls back to the base
 in order to narrow the `unknown` case.
diff --git a/packages/utilities/eff/src/collection.ts b/packages/utilities/eff/src/collection.ts
@@ -12,8 +12,6 @@
 //   return result;
 // }
 
-import type { Pretty } from "./type";
-
 // /**
 //  * Creates a new array with `element` interspersed in between each element of `input`
 //  * if there is more than 1 value in `input`. Otherwise, returns the existing array.
@@ -104,58 +102,3 @@ export class BiRecord<const T extends Record<any, any>> {
   }
 }
 /* eslint-enable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return */
-
-// #region Object Helpers
-
-// Ported from: https://github.com/remeda/remeda/blob/9d742036f6c9cdc216e2c771805051855e7e7ac4/src/entries.ts
-type EntriesEntryForKey<T, Key extends keyof T> = Key extends number | string ? [key: `${Key}`, value: Required<T>[Key]]
-  : never;
-type EntriesEntry<T> = Pretty<{ [P in keyof T]-?: EntriesEntryForKey<T, P> }[keyof T]>;
-export function entries<T extends {}>(data: T): Array<EntriesEntry<T>>;
-export function entries(): <T extends {}>(data: T) => Array<EntriesEntry<T>>;
-export function entries(...args: ReadonlyArray<unknown>): unknown {
-  return Object.entries(args);
-}
-
-// Ported from: https://github.com/remeda/remeda/blob/9d742036f6c9cdc216e2c771805051855e7e7ac4/src/fromEntries.ts
-type IterableContainer<T = unknown> = readonly [] | ReadonlyArray<T>;
-type FromEntriesEntry<Key extends PropertyKey = PropertyKey, Value = unknown> = readonly [
-  key: Key,
-  value: Value,
-];
-type FromEntries<Entries> = Entries extends readonly [
-  infer First,
-  ...infer Tail,
-] ? FromEntriesTuple<First, Tail>
-  : Entries extends readonly [...infer Head, infer Last] ? FromEntriesTuple<Last, Head>
-  : Entries extends IterableContainer<FromEntriesEntry> ? FromEntriesArray<Entries>
-  : "ERROR: Entries array-like could not be inferred";
-type FromEntriesTuple<E, Rest> = E extends FromEntriesEntry ? FromEntries<Rest> & Record<E[0], E[1]>
-  : "ERROR: Array-like contains a non-entry element";
-type FromEntriesArray<Entries extends IterableContainer<FromEntriesEntry>> = string extends AllKeys<Entries>
-  ? Record<string, Entries[number][1]>
-  : number extends AllKeys<Entries> ? Record<number, Entries[number][1]>
-  : symbol extends AllKeys<Entries> ? Record<symbol, Entries[number][1]>
-  : FromEntriesArrayWithLiteralKeys<Entries>;
-type FromEntriesArrayWithLiteralKeys<Entries extends IterableContainer<FromEntriesEntry>> = {
-  [P in AllKeys<Entries>]?: ValueForKey<Entries, P>;
-};
-type AllKeys<Entries extends IterableContainer<FromEntriesEntry>> = Extract<
-  Entries[number],
-  FromEntriesEntry
->[0];
-type ValueForKey<
-  Entries extends IterableContainer<FromEntriesEntry>,
-  K extends PropertyKey,
-> = (Extract<Entries[number], FromEntriesEntry<K>> extends never ? Entries[number]
-  : Extract<Entries[number], FromEntriesEntry<K>>)[1];
-export function fromEntries<Entries extends IterableContainer<FromEntriesEntry>>(
-  entries: Entries,
-): Pretty<FromEntries<Entries>>;
-export function fromEntries(): <Entries extends IterableContainer<FromEntriesEntry>>(
-  entries: Entries,
-) => Pretty<FromEntries<Entries>>;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function fromEntries(...args: ReadonlyArray<any>): unknown {
-  return Object.fromEntries(args);
-}
diff --git a/packages/utilities/eff/src/function.ts b/packages/utilities/eff/src/function.ts
@@ -10,6 +10,35 @@
 /* eslint-disable @typescript-eslint/unified-signatures */
 /* eslint-disable jsdoc/require-param */
 /* eslint-disable prefer-rest-params */
+
+/**
+ * Returns its argument.
+ */
+export function identity<T>(x: T): T {
+  return x;
+}
+
+/**
+ * Do nothing and return false
+ */
+export function returnFalse(): false {
+  return false;
+}
+
+/**
+ * Do nothing and return true
+ */
+export function returnTrue(): true {
+  return true;
+}
+
+/**
+ * Do nothing and return undefined
+ */
+export function returnVoid(): undefined {
+  return undefined;
+}
+
 // Ported from https://github.com/Effect-TS/effect/blob/main/packages/effect/src/Function.ts
 /**
  * Creates a function that can be used in a data-last (aka `pipe`able) or
diff --git a/packages/utilities/eff/src/index.ts b/packages/utilities/eff/src/index.ts
@@ -1,4 +1,14 @@
 export * from "./collection";
 export * from "./function";
-export * from "./lang";
-export type * from "./type";
+export * from "./predicate";
+export type * from "./ts";
+
+/**
+ * 1-byte version undefined, produces fewer bytes than `undefined` or `void 0` in the minified output dts.
+ */
+export type _ = undefined; // eslint-disable-line local/no-shadow-underscore
+
+/**
+ * 1-byte version undefined, produces fewer bytes than `undefined` or `void 0` in the minified output js.
+ */
+export const _ = undefined; // eslint-disable-line local/no-shadow-underscore
diff --git a/packages/utilities/eff/src/predicate.ts b/packages/utilities/eff/src/predicate.ts
@@ -1,45 +1,6 @@
-/* eslint-disable jsdoc/require-param */
 /* eslint-disable local/prefer-eqeq-nullish-comparison */
 
-import type { NarrowedTo } from "./type";
-
-/**
- * 1-byte version undefined, produces fewer bytes than `undefined` or `void 0` in the minified output dts.
- */
-export type _ = undefined; // eslint-disable-line local/no-shadow-underscore
-
-/**
- * 1-byte version undefined, produces fewer bytes than `undefined` or `void 0` in the minified output js.
- */
-export const _ = undefined; // eslint-disable-line local/no-shadow-underscore
-
-/**
- * Do nothing and return false
- */
-export function returnFalse(): false {
-  return false;
-}
-
-/**
- * Do nothing and return true
- */
-export function returnTrue(): true {
-  return true;
-}
-
-/**
- * Do nothing and return undefined
- */
-export function returnVoid(): undefined {
-  return undefined;
-}
-
-/**
- * Returns its argument.
- */
-export function identity<T>(x: T): T {
-  return x;
-}
+import type { NarrowedTo } from "./ts";
 
 /**
  * A function that takes a guard function as predicate and returns a guard that negates it.
diff --git a/packages/utilities/eff/src/ts.ts b/packages/utilities/eff/src/ts.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { entries, fromEntries } from "@eslint-react/eff";`
	`1`	`+import { entries, fromEntries } from "../utils";`
`2`	`2`
`3`	`3`	`import { rules as debugRules } from "./debug";`
`4`	`4`