Fix view signature

Author: coolreader18

crates/bindings-typescript/src/lib/option.ts

@@ -1,10 +1,10 @@
 import { AlgebraicType } from './algebraic_type';
 
-export type OptionAlgebraicType = {
+export type OptionAlgebraicType<T extends AlgebraicType = AlgebraicType> = {
   tag: 'Sum';
   value: {
     variants: [
-      { name: 'some'; algebraicType: AlgebraicType },
+      { name: 'some'; algebraicType: T },
       {
         name: 'none';
         algebraicType: { tag: 'Product'; value: { elements: [] } };
@@ -14,9 +14,13 @@ export type OptionAlgebraicType = {
 };
 
 export const Option: {
-  getAlgebraicType(innerType: AlgebraicType): OptionAlgebraicType;
+  getAlgebraicType<T extends AlgebraicType = AlgebraicType>(
+    innerType: T
+  ): OptionAlgebraicType<T>;
 } = {
-  getAlgebraicType(innerType: AlgebraicType): OptionAlgebraicType {
+  getAlgebraicType<T extends AlgebraicType = AlgebraicType>(
+    innerType: T
+  ): OptionAlgebraicType<T> {
     return AlgebraicType.Sum({
       variants: [
         { name: 'some', algebraicType: innerType },

crates/bindings-typescript/src/server/type_builders.ts

@@ -1101,18 +1101,21 @@ export class ArrayBuilder<Element extends TypeBuilder<any, any>>
 export class OptionBuilder<Value extends TypeBuilder<any, any>>
   extends TypeBuilder<
     InferTypeOfTypeBuilder<Value> | undefined,
-    OptionAlgebraicType
+    OptionAlgebraicType<InferSpacetimeTypeOfTypeBuilder<Value>>
   >
   implements
-    Defaultable<InferTypeOfTypeBuilder<Value> | undefined, OptionAlgebraicType>
+    Defaultable<
+      InferTypeOfTypeBuilder<Value> | undefined,
+      OptionAlgebraicType<InferSpacetimeTypeOfTypeBuilder<Value>>
+    >
 {
   /**
    * The phantom value type of the option for TypeScript
    */
   readonly value!: Value;
 
   constructor(value: Value) {
-    let innerType: AlgebraicType;
+    let innerType: InferSpacetimeTypeOfTypeBuilder<Value>;
     if (value instanceof ColumnBuilder) {
       innerType = value.typeBuilder.algebraicType;
     } else {
@@ -2294,11 +2297,14 @@ export class OptionColumnBuilder<
   >
   extends ColumnBuilder<
     InferTypeOfTypeBuilder<Value> | undefined,
-    OptionAlgebraicType,
+    OptionAlgebraicType<InferSpacetimeTypeOfTypeBuilder<Value>>,
     M
   >
   implements
-    Defaultable<InferTypeOfTypeBuilder<Value> | undefined, OptionAlgebraicType>
+    Defaultable<
+      InferTypeOfTypeBuilder<Value> | undefined,
+      OptionAlgebraicType<InferSpacetimeTypeOfTypeBuilder<Value>>
+    >
 {
   default(
     value: InferTypeOfTypeBuilder<Value> | undefined

crates/bindings-typescript/src/server/views.ts

@@ -1,13 +1,21 @@
-import type {
+import {
   AlgebraicType,
-  AlgebraicTypeVariants,
-  ProductType,
+  type AlgebraicTypeVariants,
+  type ProductType,
 } from '../lib/algebraic_type';
 import type { Identity } from '../lib/identity';
+import type { OptionAlgebraicType } from '../lib/option';
 import type { ParamsObj } from './reducers';
 import { MODULE_DEF, type UntypedSchemaDef } from './schema';
 import type { ReadonlyTable } from './table';
-import type { Infer, InferTypeOfRow, TypeBuilder } from './type_builders';
+import type {
+  ArrayBuilder,
+  Infer,
+  InferTypeOfRow,
+  OptionBuilder,
+  ProductBuilder,
+  TypeBuilder,
+} from './type_builders';
 import { bsatnBaseSize } from './util';
 
 export type ViewCtx<S extends UntypedSchemaDef> = Readonly<{
@@ -35,11 +43,15 @@ export type AnonymousViewFn<
   Ret extends ViewReturnTypeBuilder,
 > = (ctx: AnonymousViewCtx<S>, params: InferTypeOfRow<Params>) => Infer<Ret>;
 
-export type ViewReturnTypeBuilder = TypeBuilder<
-  any,
-  | { tag: 'Array'; value: AlgebraicTypeVariants.Product }
-  | AlgebraicTypeVariants.Product
->;
+export type ViewReturnTypeBuilder =
+  | TypeBuilder<
+      readonly object[],
+      { tag: 'Array'; value: AlgebraicTypeVariants.Product }
+    >
+  | TypeBuilder<
+      object | undefined,
+      OptionAlgebraicType<AlgebraicTypeVariants.Product>
+    >;
 
 export function defineView<
   S extends UntypedSchemaDef,
@@ -73,11 +85,23 @@ export function defineView<
     },
   });
 
+  let returnType = ret.algebraicType;
+  if (returnType.tag == 'Sum') {
+    const originalFn = fn;
+    fn = ((ctx: ViewCtx<S>, args: InferTypeOfRow<Params>) => {
+      const ret = originalFn(ctx, args);
+      return ret == null ? [] : [ret];
+    }) as any;
+    returnType = AlgebraicType.Array(
+      returnType.value.variants[0].algebraicType
+    );
+  }
+
   (anon ? ANON_VIEWS : VIEWS).push({
     fn,
     params: paramType,
-    returnType: ret.algebraicType,
-    returnTypeBaseSize: bsatnBaseSize(MODULE_DEF.typespace, ret.algebraicType),
+    returnType,
+    returnTypeBaseSize: bsatnBaseSize(MODULE_DEF.typespace, returnType),
   });
 }