chore: fix unification, improve empty

mikearnaldi · mikearnaldi · commit c296e8e84e97 · 2022-08-04T13:51:01.000+01:00
diff --git a/package.json b/package.json
@@ -31,26 +31,26 @@
   },
   "packageManager": "yarn@3.2.2",
   "devDependencies": {
-    "@babel/cli": "^7.18.9",
-    "@babel/core": "^7.18.9",
+    "@babel/cli": "^7.18.10",
+    "@babel/core": "^7.18.10",
     "@babel/plugin-transform-modules-commonjs": "^7.18.6",
     "@changesets/changelog-github": "^0.4.6",
     "@changesets/cli": "^2.24.1",
     "@effect-ts/build-utils": "0.40.3",
     "@effect-ts/core": "^0.60.2",
     "@repo-tooling/eslint-plugin-dprint": "^0.0.4",
-    "@tsplus/installer": "0.0.128",
-    "@types/node": "^18.6.2",
+    "@tsplus/installer": "0.0.132",
+    "@types/node": "^18.6.3",
     "@types/rimraf": "^3.0.2",
-    "@typescript-eslint/eslint-plugin": "^5.31.0",
-    "@typescript-eslint/parser": "^5.31.0",
+    "@typescript-eslint/eslint-plugin": "^5.32.0",
+    "@typescript-eslint/parser": "^5.32.0",
     "babel-plugin-annotate-pure-calls": "^0.4.0",
     "babel-plugin-replace-import-extension": "^1.1.3",
     "c8": "^7.12.0",
     "concurrently": "^7.3.0",
     "cpx": "^1.5.0",
-    "eslint": "^8.20.0",
-    "eslint-import-resolver-typescript": "^3.3.0",
+    "eslint": "^8.21.0",
+    "eslint-import-resolver-typescript": "^3.4.0",
     "eslint-plugin-codegen": "0.16.1",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
@@ -60,8 +60,8 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.7.4",
     "ultra-runner": "^3.10.5",
-    "vite": "^3.0.3",
-    "vitest": "0.19.1"
+    "vite": "^3.0.4",
+    "vitest": "0.20.3"
   },
   "resolutions": {
     "eslint-plugin-codegen": "patch:eslint-plugin-codegen@npm:0.16.1#.yarn/patches/eslint-plugin-codegen-npm-0.16.1-87770191cd"
diff --git a/packages/stdlib/_src/collections/Chunk/empty.ts b/packages/stdlib/_src/collections/Chunk/empty.ts
@@ -5,6 +5,6 @@ import { _Empty } from "@tsplus/stdlib/collections/Chunk/definition"
  *
  * @tsplus static Chunk.Ops empty
  */
-export function empty<A>(): Chunk<A> {
+export function empty<A = never>(): Chunk<A> {
   return _Empty
 }
diff --git a/packages/stdlib/_src/collections/HashMap/empty.ts b/packages/stdlib/_src/collections/HashMap/empty.ts
@@ -6,6 +6,6 @@ import { EmptyNode } from "@tsplus/stdlib/collections/HashMap/_internal/node"
  *
  * @tsplus static HashMap.Ops empty
  */
-export function empty<K, V>(): HashMap<K, V> {
+export function empty<K = never, V = never>(): HashMap<K, V> {
   return new HashMapInternal<K, V>(false, 0, new EmptyNode(), 0)
 }
diff --git a/packages/stdlib/_src/collections/HashMap/node.ts b/packages/stdlib/_src/collections/HashMap/node.ts
@@ -20,7 +20,7 @@ export { Node } from "@tsplus/stdlib/collections/HashMap/_internal/node"
 /**
  * @tsplus static HashMap.Node.Ops empty
  */
-export function emptyNode<K, V>(): Node<K, V> {
+export function emptyNode<K = never, V = never>(): Node<K, V> {
   return new EmptyNode()
 }
 
diff --git a/packages/stdlib/_src/collections/HashSet/empty.ts b/packages/stdlib/_src/collections/HashSet/empty.ts
@@ -3,6 +3,6 @@ import { HashSetInternal } from "@tsplus/stdlib/collections/HashSet/_internal/ha
 /**
  * @tsplus static HashSet.Ops empty
  */
-export function empty<A>(): HashSet<A> {
+export function empty<A = never>(): HashSet<A> {
   return new HashSetInternal(HashMap.empty<A, unknown>())
 }
diff --git a/packages/stdlib/_src/collections/ImmutableArray/empty.ts b/packages/stdlib/_src/collections/ImmutableArray/empty.ts
@@ -1,6 +1,6 @@
 /**
  * @tsplus static ImmutableArray.Ops empty
  */
-export function empty<A>(): ImmutableArray<A> {
+export function empty<A = never>(): ImmutableArray<A> {
   return new ImmutableArray([])
 }
diff --git a/packages/stdlib/_src/collections/ImmutableMap/empty.ts b/packages/stdlib/_src/collections/ImmutableMap/empty.ts
@@ -3,6 +3,6 @@
  *
  * @tsplus static ImmutableMap.Ops empty
  */
-export function empty<K, V>(): ImmutableMap<K, V> {
+export function empty<K = never, V = never>(): ImmutableMap<K, V> {
   return new ImmutableMap(new Map())
 }
diff --git a/packages/stdlib/_src/collections/ImmutableQueue/empty.ts b/packages/stdlib/_src/collections/ImmutableQueue/empty.ts
@@ -3,6 +3,6 @@ import { ImmutableQueueInternal } from "@tsplus/stdlib/collections/ImmutableQueu
 /**
  * @tsplus static ImmutableQueue.Ops empty
  */
-export function empty<A>(): ImmutableQueue<A> {
+export function empty<A = never>(): ImmutableQueue<A> {
   return new ImmutableQueueInternal(List.nil())
 }
diff --git a/packages/stdlib/_src/collections/List/empty.ts b/packages/stdlib/_src/collections/List/empty.ts
@@ -3,6 +3,6 @@
  *
  * @tsplus static List.Ops empty
  */
-export function empty<A>(): List<A> {
+export function empty<A = never>(): List<A> {
   return List.nil()
 }
diff --git a/packages/stdlib/_src/collections/Map/empty.ts b/packages/stdlib/_src/collections/Map/empty.ts
@@ -1,6 +1,6 @@
 /**
  * @tsplus static Map.Ops empty
  */
-export function empty<K, V>(): Map<K, V> {
+export function empty<K = never, V = never>(): Map<K, V> {
   return new Map<K, V>()
 }
diff --git a/packages/stdlib/_src/collections/ParSeq/definition.ts b/packages/stdlib/_src/collections/ParSeq/definition.ts
@@ -374,7 +374,7 @@ function hashCode(self: ParSeq<unknown>): number {
  *
  * @tsplus static ParSeq.Ops empty
  */
-export function empty<A>(): ParSeq<A> {
+export function empty<A = never>(): ParSeq<A> {
   return new Empty()
 }
 
diff --git a/packages/stdlib/_src/collections/RedBlackTree/empty.ts b/packages/stdlib/_src/collections/RedBlackTree/empty.ts
@@ -3,7 +3,7 @@ import { RedBlackTreeInternal } from "@tsplus/stdlib/collections/RedBlackTree/_i
 /**
  * @tsplus static RedBlackTree.Ops empty
  */
-export function empty<K, V>(
+export function empty<K, V = never>(
   ord: Ord<K>
 ): RedBlackTree<K, V> {
   return new RedBlackTreeInternal<K, V>(ord, undefined)
diff --git a/packages/stdlib/_src/collections/Set/empty.ts b/packages/stdlib/_src/collections/Set/empty.ts
@@ -1,6 +1,6 @@
 /**
  * @tsplus static Set.Ops empty
  */
-export function empty<A>(): Set<A> {
+export function empty<A = never>(): Set<A> {
   return new Set<A>()
 }
diff --git a/packages/stdlib/_src/collections/SortedMap/empty.ts b/packages/stdlib/_src/collections/SortedMap/empty.ts
@@ -3,6 +3,6 @@ import { SortedMapInternal } from "@tsplus/stdlib/collections/SortedMap/_interna
 /**
  * @tsplus static SortedMap.Ops empty
  */
-export function empty<K, V>(ord: Ord<K>): SortedMap<K, V> {
+export function empty<K, V = never>(ord: Ord<K>): SortedMap<K, V> {
   return new SortedMapInternal<K, V>(RedBlackTree.empty<K, V>(ord))
 }
diff --git a/packages/stdlib/_src/collections/mutable/Array/empty.ts b/packages/stdlib/_src/collections/mutable/Array/empty.ts
@@ -1,6 +1,6 @@
 /**
  * @tsplus static Array.Ops empty
  */
-export function empty<A>(): Array<A> {
+export function empty<A = never>(): Array<A> {
   return Array<A>()
 }
diff --git a/packages/stdlib/_src/collections/mutable/MutableHashMap/empty.ts b/packages/stdlib/_src/collections/mutable/MutableHashMap/empty.ts
@@ -3,6 +3,6 @@
  *
  * @tsplus static MutableHashMap.Ops empty
  */
-export function empty<K, V>() {
+export function empty<K = never, V = never>() {
   return new MutableHashMap<K, V>()
 }
diff --git a/packages/stdlib/_src/collections/mutable/MutableHashSet/empty.ts b/packages/stdlib/_src/collections/mutable/MutableHashSet/empty.ts
@@ -3,6 +3,6 @@
  *
  * @tsplus static MutableHashSet.Ops empty
  */
-export function empty<A>(): MutableHashSet<A> {
+export function empty<A = never>(): MutableHashSet<A> {
   return new MutableHashSet()
 }
diff --git a/packages/stdlib/_src/data/Maybe/definition.ts b/packages/stdlib/_src/data/Maybe/definition.ts
@@ -87,9 +87,9 @@ export const none: Maybe<never> = new None()
 /**
  * Constructs `None`.
  *
- * @tsplus static Maybe.Ops emptyOf
+ * @tsplus static Maybe.Ops empty
  */
-export function emptyOf<A>(): Maybe<A> {
+export function empty<A = never>(): Maybe<A> {
   return none
 }
 
diff --git a/packages/stdlib/_src/service/Patch.ts b/packages/stdlib/_src/service/Patch.ts
@@ -168,7 +168,7 @@ function patchLoop(
  *
  * @tsplus static Patch.Ops empty
  */
-export function empty<I, O>(): Patch<I, O> {
+export function empty<I = never, O = never>(): Patch<I, O> {
   return new Empty()
 }
 
diff --git a/packages/stdlib/_test/Maybe.test.ts b/packages/stdlib/_test/Maybe.test.ts
@@ -129,7 +129,7 @@ describe.concurrent("Maybe", () => {
     )
     assert.isTrue(
       Maybe.gen(function*($) {
-        const s = yield* $(Maybe.emptyOf<string>())
+        const s = yield* $(Maybe.empty<string>())
         return s.length
       }) == Maybe.none
     )
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ import { _Empty } from "@tsplus/stdlib/collections/Chunk/definition"`
`5`	`5`	`*`
`6`	`6`	`* @tsplus static Chunk.Ops empty`
`7`	`7`	`*/`
`8`		`-export function empty<A>(): Chunk<A> {`
	`8`	`+export function empty<A = never>(): Chunk<A> {`
`9`	`9`	`return _Empty`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ import { EmptyNode } from "@tsplus/stdlib/collections/HashMap/_internal/node"`
`6`	`6`	`*`
`7`	`7`	`* @tsplus static HashMap.Ops empty`
`8`	`8`	`*/`
`9`		`-export function empty<K, V>(): HashMap<K, V> {`
	`9`	`+export function empty<K = never, V = never>(): HashMap<K, V> {`
`10`	`10`	`return new HashMapInternal<K, V>(false, 0, new EmptyNode(), 0)`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ export { Node } from "@tsplus/stdlib/collections/HashMap/_internal/node"`
`20`	`20`	`/**`
`21`	`21`	`* @tsplus static HashMap.Node.Ops empty`
`22`	`22`	`*/`
`23`		`-export function emptyNode<K, V>(): Node<K, V> {`
	`23`	`+export function emptyNode<K = never, V = never>(): Node<K, V> {`
`24`	`24`	`return new EmptyNode()`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ import { HashSetInternal } from "@tsplus/stdlib/collections/HashSet/_internal/ha`
`3`	`3`	`/**`
`4`	`4`	`* @tsplus static HashSet.Ops empty`
`5`	`5`	`*/`
`6`		`-export function empty<A>(): HashSet<A> {`
	`6`	`+export function empty<A = never>(): HashSet<A> {`
`7`	`7`	`return new HashSetInternal(HashMap.empty<A, unknown>())`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/**`
`2`	`2`	`* @tsplus static ImmutableArray.Ops empty`
`3`	`3`	`*/`
`4`		`-export function empty<A>(): ImmutableArray<A> {`
	`4`	`+export function empty<A = never>(): ImmutableArray<A> {`
`5`	`5`	`return new ImmutableArray([])`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`*`
`4`	`4`	`* @tsplus static ImmutableMap.Ops empty`
`5`	`5`	`*/`
`6`		`-export function empty<K, V>(): ImmutableMap<K, V> {`
	`6`	`+export function empty<K = never, V = never>(): ImmutableMap<K, V> {`
`7`	`7`	`return new ImmutableMap(new Map())`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ import { ImmutableQueueInternal } from "@tsplus/stdlib/collections/ImmutableQueu`
`3`	`3`	`/**`
`4`	`4`	`* @tsplus static ImmutableQueue.Ops empty`
`5`	`5`	`*/`
`6`		`-export function empty<A>(): ImmutableQueue<A> {`
	`6`	`+export function empty<A = never>(): ImmutableQueue<A> {`
`7`	`7`	`return new ImmutableQueueInternal(List.nil())`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`*`
`4`	`4`	`* @tsplus static List.Ops empty`
`5`	`5`	`*/`
`6`		`-export function empty<A>(): List<A> {`
	`6`	`+export function empty<A = never>(): List<A> {`
`7`	`7`	`return List.nil()`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/**`
`2`	`2`	`* @tsplus static Map.Ops empty`
`3`	`3`	`*/`
`4`		`-export function empty<K, V>(): Map<K, V> {`
	`4`	`+export function empty<K = never, V = never>(): Map<K, V> {`
`5`	`5`	`return new Map<K, V>()`
`6`	`6`	`}`