fix(schema): type issues with generic native functions

packages/tusken-schema/src/extract/extractFuncs.ts

@@ -30,6 +30,7 @@ export async function extractNativeFuncs(client: Client, types: NativeTypes) {
   const orderedSetFuncs = ['mode', 'percentile_cont', 'percentile_disc']
   const ignoredFuncs = [...hypotheticalSetFuncs, ...orderedSetFuncs]
 
+  const anyArrayTypes = ['anyarray', 'anycompatiblearray']
   const elementTypes = ['anyelement', 'anycompatible']
 
   return nativeFuncs.filter(fn => {
@@ -51,11 +52,12 @@ export async function extractNativeFuncs(client: Client, types: NativeTypes) {
     }
 
     fn.argTypes = argTypes.map(t => t.jsType)
-    fn.returnType = types.byId[+fn.returnType].jsType
+    const returnType = types.byId[+fn.returnType]
+    fn.returnType = returnType.jsType
 
-    const hasGenericReturn = types.any.includes(fn.returnType)
-    const genericArrayArg = argTypes.find(
-      t => types.any.includes(t.name) && !elementTypes.includes(t.name)
+    const hasGenericReturn = types.any.includes(returnType.name)
+    const genericArrayArg = argTypes.find(argType =>
+      anyArrayTypes.includes(argType.name)
     )
 
     const newArgTypes = [...fn.argTypes]
@@ -64,7 +66,7 @@ export async function extractNativeFuncs(client: Client, types: NativeTypes) {
         newArgTypes[i] = elementTypes.includes(argType.name)
           ? genericArrayArg
             ? 't.elementof<T>'
-            : 'T | UnwrapType<T>'
+            : 'T'
           : 'T'
 
         return true
@@ -85,7 +87,7 @@ export async function extractNativeFuncs(client: Client, types: NativeTypes) {
             : 'T'
         }
       } else {
-        fn.typeParams = '<T extends Type = t.any>'
+        fn.typeParams = '<T extends t.any>'
         if (hasGenericReturn) {
           fn.returnType = elementTypes.includes(fn.returnType)
             ? 'T'

packages/tusken-schema/src/typescript/generateNativeFuncs.ts

@@ -8,7 +8,7 @@ export function generateNativeFuncs(
   docs: Record<string, string>
 ) {
   const imports = endent`
-    import { defineFunction, defineSetFunction, Aggregate, CallExpression, SetRef } from 'tusken'
+    import { defineFunction, defineSetFunction, Aggregate, CallExpression, Expression, SetRef, Type } from 'tusken'
     import * as t from './types'
   `
 
@@ -204,14 +204,15 @@ function renderInputs(fn: NativeFunc, isNullable?: boolean) {
   }
   const orNull = isNullable ? ' | t.null' : ''
   const argTypes = fn.argTypes.map(type => {
-    const needParamType = !fn.typeParams || /any\w*array\b/.test(fn.typeParams)
+    const needParamType =
+      !fn.typeParams || !/any\w*nonarray\b/.test(fn.typeParams)
 
     type += orNull
     return needParamType
       ? fn.kind == 'a'
         ? `t.aggParam<${type}>`
         : `t.param<${type}>`
-      : type
+      : `Expression<${type}>`
   })
   return fn.isVariadic && argTypes.length == 1
     ? `...args: ${argTypes[0]}[]`

packages/tusken-schema/src/typescript/generateNativeTypes.ts

@@ -68,7 +68,7 @@ export function generateNativeTypes(
 
   const types: string[] = []
   const runtimeTypes: string[] = ['const option = defineOptionalType']
-  
+
   for (const [nativeType, mappedType] of nativeTypeMap) {
     types.push(
       `type ${nativeType} = Type<"${nativeType}", ${mappedType}, ColumnCast<"${nativeType}">>`
@@ -104,7 +104,7 @@ export function generateNativeTypes(
   const specialTypes = [
     'type elementof<T extends Type> = T extends array<infer E> ? E : anyelement',
     'type param<T extends Type> = QueryInput<T extends Type<infer Native> ? T | ImplicitCast<Native> : never>',
-    'type aggParam<T extends Type> = T extends Type<infer Native> ? T | ImplicitCast<Native> | NULL : never',
+    'type aggParam<T extends Type> = Expression<T extends Type<infer Native> ? T | ImplicitCast<Native> | NULL : never>',
     'type record = Type<"record", { [key: string]: any }, never>',
   ]
 
@@ -114,6 +114,7 @@ export function generateNativeTypes(
         'defineOptionalType',
         'defineType',
         'tokenizeJson',
+        'Expression',
         'Interval',
         'Json',
         'QueryInput',