Add missing indexArray to server-side runtime.

solidjs · Oct 16, 2023 · 6167ca7 · 6167ca7
1 parent 4968fe2
commit 6167ca7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/.changeset/modern-oranges-own.md b/.changeset/modern-oranges-own.md
@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+Add missing `indexArray` to server-side runtime.
diff --git a/packages/solid/src/server/index.ts b/packages/solid/src/server/index.ts
@@ -24,6 +24,7 @@ export {
   equalFn,
   requestCallback,
   mapArray,
+  indexArray,
   observable,
   from,
   $PROXY,

diff --git a/packages/solid/src/server/reactive.ts b/packages/solid/src/server/reactive.ts
@@ -267,21 +267,29 @@ export function requestCallback(fn: () => void, options?: { timeout: number }):
 export function cancelCallback(task: Task) {}
 
 export function mapArray<T, U>(
-  list: () => T[],
-  mapFn: (v: T, i: () => number) => U,
-  options: { fallback?: () => any } = {}
+  list: Accessor<readonly T[] | undefined | null | false>,
+  mapFn: (v: T, i: Accessor<number>) => U,
+  options: { fallback?: Accessor<any> } = {}
 ): () => U[] {
-  const items = list();
+  const items = list() || [];
   let s: U[] = [];
   if (items.length) {
     for (let i = 0, len = items.length; i < len; i++) s.push(mapFn(items[i], () => i));
   } else if (options.fallback) s = [options.fallback()];
   return () => s;
 }
 
-function getSymbol() {
-  const SymbolCopy = Symbol as any;
-  return SymbolCopy.observable || "@@observable";
+export function indexArray<T, U>(
+  list: Accessor<readonly T[] | undefined | null | false>,
+  mapFn: (v: Accessor<T>, i: number) => U,
+  options: { fallback?: Accessor<any> } = {}
+): () => U[] {
+  const items = list() || [];
+  let s: U[] = [];
+  if (items.length) {
+    for (let i = 0, len = items.length; i < len; i++) s.push(mapFn(() => items[i], i));
+  } else if (options.fallback) s = [options.fallback()];
+  return () => s;
 }
 
 export type ObservableObserver<T> =