refactor: update TypeScript SDK path and improve type inference in combine functions

Author: crimx

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-  "typescript.tsdk": "node_modules/typescript/lib",
+  "js/ts.tsdk.path": "node_modules/typescript/lib",
   "cSpell.enabled": true,
   "eslint.enable": true,
   "prettier.enable": true,

src/combine.ts

@@ -11,7 +11,9 @@ export interface Combine {
    * @param deps An array of {@link ReadableLike}s to combine.
    * @returns A {@link Readable} with the combined values.
    */
-  <TDeps extends readonly ReadableLike[] = ReadableLike[]>(deps: TDeps): OwnedReadable<MapReadablesToValues<TDeps>>;
+  <TDeps extends readonly ReadableLike[] = ReadableLike[]>(
+    deps: [...TDeps],
+  ): OwnedReadable<MapReadablesToValues<TDeps>>;
   /**
    * Combines an array of {@link ReadableLike}s into a single {@link Readable} with transformed value.
    * @param deps - An array of {@link ReadableLike}s to combine.
@@ -20,7 +22,7 @@ export interface Combine {
    * @returns A {@link Readable} with the transformed values.
    */
   <TDeps extends readonly ReadableLike[] = ReadableLike[], TValue = any>(
-    deps: TDeps,
+    deps: [...TDeps],
     transform: (...deps: MapReadablesToValues<TDeps>) => TValue,
     config?: Config<TValue>,
   ): OwnedReadable<TValue>;
@@ -47,10 +49,10 @@ export interface Combine {
  * const v2$ = writable(0);
  *
  * const combined$ = combine([v1$, v2$], (v1, v2) => v1 + v2);
- * ```
+ * ````
  */
 export const combine: Combine = <TDeps extends readonly ReadableLike[], TValue = any>(
-  deps: TDeps,
+  deps: [...TDeps],
   transform?: (...deps: MapReadablesToValues<TDeps>) => TValue,
   config?: Config<TValue>,
 ) =>

src/react/useCombine.ts

@@ -60,7 +60,7 @@ export interface UseCombine {
  * ```
  */
 export const useCombine: UseCombine = <TDeps extends readonly ReadableLike[], TValue>(
-  deps: TDeps,
+  deps: [...TDeps],
   transform?: (...deps: MapReadablesToValues<TDeps>) => TValue,
   config?: Config<TValue>,
 ): OwnedReadable<TValue> => {

src/readable.ts

@@ -35,7 +35,7 @@ export interface CreateReadable {
    *
    * @returns A tuple with the Readonly and a function to set the value.
    */
-  <TValue = any>(): [OwnedReadable<NoInfer<TValue> | undefined>, SetValue<NoInfer<TValue> | undefined>];
+  <TValue = any>(): [OwnedReadable<TValue | undefined>, SetValue<TValue | undefined>];
   /**
    * Creates a Readonly with the given value.
    *
@@ -51,7 +51,7 @@ export interface CreateReadable {
    * @param config Optional custom config.
    * @returns A tuple with the Readonly and a function to set the value.
    */
-  <TValue = any>(value: TValue, config?: Config<TValue>): [OwnedReadable<NoInfer<TValue>>, SetValue<NoInfer<TValue>>];
+  <TValue = any>(value: TValue, config?: Config<TValue>): [OwnedReadable<TValue>, SetValue<TValue>];
   /**
    * Creates a Readonly with the given value.
    *
@@ -62,7 +62,7 @@ export interface CreateReadable {
   <TValue = any>(
     value?: TValue,
     config?: Config<TValue>,
-  ): [OwnedReadable<NoInfer<TValue | undefined>>, SetValue<NoInfer<TValue | undefined>>];
+  ): [OwnedReadable<TValue | undefined>, SetValue<TValue | undefined>];
 }
 
 /** @internal */
@@ -354,7 +354,7 @@ export class ReadableImpl<TValue = any> implements BatchTask {
 export const readable: CreateReadable = <TValue = any>(
   value?: TValue,
   config?: Config<TValue | undefined>,
-): [OwnedReadable<NoInfer<TValue> | undefined>, SetValue<NoInfer<TValue> | undefined>] => {
+): [OwnedReadable<TValue | undefined>, SetValue<TValue | undefined>] => {
   let currentValue = value;
 
   const get = () => currentValue;
@@ -428,4 +428,4 @@ export interface CreateWritable {
 export const writable: CreateWritable = <TValue = any>(
   value?: TValue,
   config?: Config<TValue>,
-): OwnedWritable<NoInfer<TValue | undefined>> => toWritable(...readable(value, config));
+): OwnedWritable<TValue | undefined> => toWritable(...readable(value, config));

test/combine.test.ts

@@ -24,4 +24,14 @@ describe("combine", () => {
     dep1$.value = 3;
     expect(combined$.value).toBe(5);
   });
+
+  it("should infer type correctly", () => {
+    const dep1$ = writable(1);
+    const dep2$ = writable("str");
+    const passNumber = (n: number): number => n;
+    const passString = (s: string): string => s;
+    const combined$ = combine([dep1$, dep2$], (v1, v2) => [passNumber(v1), passString(v2)]);
+
+    expect(combined$.value).toEqual([dep1$.value, dep2$.value]);
+  });
 });

tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "ignoreDeprecations": "6.0",
     "baseUrl": ".",
     "declaration": true,
     "esModuleInterop": true,
@@ -11,7 +12,7 @@
     "noFallthroughCasesInSwitch": true,
     "noImplicitOverride": true,
     "noUnusedParameters": true,
-    "outDir": "dist",
+    "types": ["node"],
     "paths": {
       "@embra/reactivity": ["src"],
       "@embra/reactivity/debug": ["src/debug"]
@@ -21,6 +22,5 @@
     "strict": true,
     "stripInternal": true,
     "target": "ESNext"
-  },
-  "include": ["src/**/*"]
+  }
 }