[solid] Typings

Author: jamesgpearce

src/common/solid.ts

@@ -6,7 +6,9 @@ import {isFunction, isUndefined} from './other.ts';
 
 export type DependencyList = ReadonlyArray<unknown>;
 
-export const getValue = <Value>(value: Value | (() => Value)): Value =>
+export type MaybeAccessor<Value> = Value | (() => Value);
+
+export const getValue = <Value>(value: MaybeAccessor<Value>): Value =>
   (isFunction(value) ? (value as () => Value)() : value) as Value;
 
 export const getProps = <Props extends {[key: string]: any}>(

src/ui-solid/CellView.tsx

@@ -1,24 +1,26 @@
 /* @jsxImportSource solid-js */
+import type {JSXElement} from 'solid-js';
 import type {
   CellProps,
 } from '../@types/ui-solid/index.d.ts';
 import {getValue} from '../common/solid.ts';
 import {EMPTY_STRING} from '../common/strings.ts';
-import {wrap} from './common/wrap.tsx';
+import {renderView, wrap} from './common/wrap.tsx';
 import {useCell} from './hooks.ts';
 
-export const CellView = (props: CellProps): any => {
+export const CellView = (props: CellProps): JSXElement => {
   const cell = useCell(
-    (() => props.tableId) as any,
-    (() => props.rowId) as any,
-    (() => props.cellId) as any,
-    (() => props.store) as any,
-  ) as any;
-  return () =>
+    () => props.tableId,
+    () => props.rowId,
+    () => props.cellId,
+    () => props.store,
+  );
+  return renderView(() =>
     wrap(
-      EMPTY_STRING + ((getValue(cell) as any) ?? EMPTY_STRING),
+      EMPTY_STRING + (getValue(cell) ?? EMPTY_STRING),
       undefined,
       props.debugIds,
       props.cellId,
-    );
+    ),
+  );
 };

src/ui-solid/CheckpointView.tsx

@@ -1,22 +1,24 @@
 /* @jsxImportSource solid-js */
+import type {JSXElement} from 'solid-js';
 import type {
   CheckpointProps,
 } from '../@types/ui-solid/index.d.ts';
 import {getValue} from '../common/solid.ts';
 import {EMPTY_STRING} from '../common/strings.ts';
-import {wrap} from './common/wrap.tsx';
+import {renderView, wrap} from './common/wrap.tsx';
 import {useCheckpoint} from './hooks.ts';
 
-export const CheckpointView = (props: CheckpointProps): any => {
+export const CheckpointView = (props: CheckpointProps): JSXElement => {
   const checkpoint = useCheckpoint(
-    (() => props.checkpointId) as any,
-    (() => props.checkpoints) as any,
-  ) as any;
-  return () =>
+    () => props.checkpointId,
+    () => props.checkpoints,
+  );
+  return renderView(() =>
     wrap(
-      (getValue(checkpoint) as any) ?? EMPTY_STRING,
+      getValue(checkpoint) ?? EMPTY_STRING,
       undefined,
       props.debugIds,
       props.checkpointId,
-    );
+    ),
+  );
 };

src/ui-solid/IndexView.tsx

@@ -1,20 +1,21 @@
 /* @jsxImportSource solid-js */
+import type {JSXElement} from 'solid-js';
 import type {
   IndexProps,
 } from '../@types/ui-solid/index.d.ts';
 import type {Id} from '../@types/index.d.ts';
 import {arrayMap} from '../common/array.ts';
 import {getProps, getValue} from '../common/solid.ts';
-import {wrap} from './common/wrap.tsx';
+import {renderView, wrap} from './common/wrap.tsx';
 import {useSliceIds} from './hooks.ts';
 import {SliceView} from './SliceView.tsx';
 
-export const IndexView = (props: IndexProps): any => {
+export const IndexView = (props: IndexProps): JSXElement => {
   const sliceIds = useSliceIds(
-    (() => props.indexId) as any,
-    (() => props.indexes) as any,
-  ) as any;
-  return () => {
+    () => props.indexId,
+    () => props.indexes,
+  );
+  return renderView(() => {
     const Slice = props.sliceComponent ?? SliceView;
     return wrap(
       arrayMap(getValue(sliceIds) as Id[], (sliceId: Id) => (
@@ -30,5 +31,5 @@ export const IndexView = (props: IndexProps): any => {
       props.debugIds,
       props.indexId,
     );
-  };
+  });
 };

src/ui-solid/LinkedRowsView.tsx

@@ -1,4 +1,5 @@
 /* @jsxImportSource solid-js */
+import type {JSXElement} from 'solid-js';
 import type {
   LinkedRowsProps,
 } from '../@types/ui-solid/index.d.ts';
@@ -7,5 +8,5 @@ import {useLinkedRowIds} from './hooks.ts';
 
 export const LinkedRowsView = (
   props: LinkedRowsProps,
-): any =>
-  useComponentPerRow(props as any, useLinkedRowIds as any, () => props.firstRowId);
+): JSXElement =>
+  useComponentPerRow(props, useLinkedRowIds, () => props.firstRowId);

src/ui-solid/LocalRowsView.tsx

@@ -1,4 +1,5 @@
 /* @jsxImportSource solid-js */
+import type {JSXElement} from 'solid-js';
 import type {
   LocalRowsProps,
 } from '../@types/ui-solid/index.d.ts';
@@ -7,5 +8,5 @@ import {useLocalRowIds} from './hooks.ts';
 
 export const LocalRowsView = (
   props: LocalRowsProps,
-): any =>
-  useComponentPerRow(props as any, useLocalRowIds as any, () => props.remoteRowId);
+): JSXElement =>
+  useComponentPerRow(props, useLocalRowIds, () => props.remoteRowId);

src/ui-solid/MetricView.tsx

@@ -1,22 +1,24 @@
 /* @jsxImportSource solid-js */
+import type {JSXElement} from 'solid-js';
 import type {
   MetricProps,
 } from '../@types/ui-solid/index.d.ts';
 import {getValue} from '../common/solid.ts';
 import {EMPTY_STRING} from '../common/strings.ts';
-import {wrap} from './common/wrap.tsx';
+import {renderView, wrap} from './common/wrap.tsx';
 import {useMetric} from './hooks.ts';
 
-export const MetricView = (props: MetricProps): any => {
+export const MetricView = (props: MetricProps): JSXElement => {
   const metric = useMetric(
-    (() => props.metricId) as any,
-    (() => props.metrics) as any,
-  ) as any;
-  return () =>
+    () => props.metricId,
+    () => props.metrics,
+  );
+  return renderView(() =>
     wrap(
-      (getValue(metric) as any) ?? EMPTY_STRING,
+      getValue(metric) ?? EMPTY_STRING,
       undefined,
       props.debugIds,
       props.metricId,
-    );
+    ),
+  );
 };

src/ui-solid/Provider.tsx

@@ -4,7 +4,7 @@ import {createMemo, createSignal, useContext} from 'solid-js';
 import type {Id} from '../@types/index.d.ts';
 import type {ProviderProps} from '../@types/ui-solid/index.d.ts';
 import {arrayNew, arrayWith} from '../common/array.ts';
-import {objDel, objGet, objHas} from '../common/obj.ts';
+import {IdObj, objDel, objGet, objHas} from '../common/obj.ts';
 import {ExtraThingsById, ThingsById} from './common/index.tsx';
 import {Context, ContextValue, ThingsByOffset} from './context.ts';
 
@@ -47,7 +47,7 @@ const EMPTY_CONTEXT = () => [] as ContextValue;
 
 export const Provider = (
   props: ProviderProps & {readonly children: JSXElement},
-): any => {
+): JSXElement => {
   const parentValue =
     useContext(Context) ?? (EMPTY_CONTEXT as Accessor<ContextValue>);
   const [extraThingsById, setExtraThingsById] = createSignal<ExtraThingsById>(
@@ -60,12 +60,17 @@ export const Provider = (
     thing: ThingsByOffset[Offset],
   ): void => {
     setExtraThingsById((extraThingsById) =>
-      objGet(extraThingsById[thingOffset] as any, id) == thing
+      objGet(
+        extraThingsById[thingOffset] as IdObj<ThingsByOffset[Offset]>,
+        id,
+      ) == thing
         ? extraThingsById
         : (arrayWith(extraThingsById, thingOffset, {
-            ...extraThingsById[thingOffset],
+            ...(extraThingsById[thingOffset] as IdObj<
+              ThingsByOffset[Offset]
+            >),
             [id]: thing,
-          } as any) as ExtraThingsById),
+          } as ThingsById<ThingsByOffset>[Offset]) as ExtraThingsById),
     );
   };
 
@@ -76,7 +81,12 @@ export const Provider = (
         : (arrayWith(
             extraThingsById,
             thingOffset,
-            objDel(extraThingsById[thingOffset] as any, id),
+            objDel(
+              extraThingsById[thingOffset] as IdObj<
+                ThingsByOffset[typeof thingOffset]
+              >,
+              id,
+            ),
           ) as ExtraThingsById),
     );
   };

src/ui-solid/RemoteRowView.tsx

@@ -1,4 +1,5 @@
 /* @jsxImportSource solid-js */
+import type {JSXElement} from 'solid-js';
 import type {Id} from '../@types/index.d.ts';
 import type {
   RemoteRowProps,
@@ -9,23 +10,23 @@ import {
   getRelationshipsStoreTableIds,
   getValue,
 } from '../common/solid.ts';
-import {wrap} from './common/wrap.tsx';
+import {renderView, wrap} from './common/wrap.tsx';
 import {useRelationshipsOrRelationshipsById, useRemoteRowId} from './hooks.ts';
 import {RowView} from './RowView.tsx';
 
-export const RemoteRowView = (props: RemoteRowProps): any => {
+export const RemoteRowView = (props: RemoteRowProps): JSXElement => {
   const resolvedRelationships =
-    useRelationshipsOrRelationshipsById((() => props.relationships) as any);
+    useRelationshipsOrRelationshipsById(() => props.relationships);
   const rowId = useRemoteRowId(
-    (() => props.relationshipId) as any,
-    (() => props.localRowId) as any,
-    resolvedRelationships as any,
-  ) as any;
-  return () => {
+    () => props.relationshipId,
+    () => props.localRowId,
+    resolvedRelationships,
+  );
+  return renderView(() => {
     const Row = props.rowComponent ?? RowView;
     const [_relationshipsValue, store, , remoteTableId] =
       getRelationshipsStoreTableIds(
-        getValue(resolvedRelationships as any),
+        getValue(resolvedRelationships),
         props.relationshipId,
       );
     const remoteRowId = getValue(rowId) as Id | undefined;
@@ -43,5 +44,5 @@ export const RemoteRowView = (props: RemoteRowProps): any => {
       props.debugIds,
       props.localRowId,
     );
-  };
+  });
 };

src/ui-solid/ResultCellView.tsx

@@ -1,24 +1,26 @@
 /* @jsxImportSource solid-js */
+import type {JSXElement} from 'solid-js';
 import type {
   ResultCellProps,
 } from '../@types/ui-solid/index.d.ts';
 import {getValue} from '../common/solid.ts';
 import {EMPTY_STRING} from '../common/strings.ts';
-import {wrap} from './common/wrap.tsx';
+import {renderView, wrap} from './common/wrap.tsx';
 import {useResultCell} from './hooks.ts';
 
-export const ResultCellView = (props: ResultCellProps): any => {
+export const ResultCellView = (props: ResultCellProps): JSXElement => {
   const resultCell = useResultCell(
-    (() => props.queryId) as any,
-    (() => props.rowId) as any,
-    (() => props.cellId) as any,
-    (() => props.queries) as any,
-  ) as any;
-  return () =>
+    () => props.queryId,
+    () => props.rowId,
+    () => props.cellId,
+    () => props.queries,
+  );
+  return renderView(() =>
     wrap(
-      EMPTY_STRING + ((getValue(resultCell) as any) ?? EMPTY_STRING),
+      EMPTY_STRING + (getValue(resultCell) ?? EMPTY_STRING),
       undefined,
       props.debugIds,
       props.cellId,
-    );
+    ),
+  );
 };