src/core/$reflect.ts

@@ -1,11 +0,0 @@
-export function $reflect<T>(arg: T, types?: string) : T {
-  // TODO: implement typed-function for real
-  if (!types) {
-    console.error('types should be resolved with runtime type information by the TypeScript plugin')
-  }
-
-  console.log(`INFER: Creating function with types ${types}`)
-
-  // TODO: here we can now turn the inputs into a real typed-function with a signature
-  return arg
-}

src/core/typed.ts

@@ -0,0 +1,11 @@
+export function typed<T>(name: string, types: string, arg: T) : T {
+  // TODO: implement typed-function for real
+  if (types === '__infer__') {
+    console.error('__infer__ should be replaced with runtime type information by the TypeScript plugin')
+  }
+
+  console.log(`TYPED-FUNCTION: Creating function "${name}" with types ${types}`)
+
+  // TODO: here we can now turn the inputs into a real typed-function with a signature
+  return arg
+}

src/experiment/arithmeticInfer.ts

@@ -1,6 +1,6 @@
-import { $reflect } from '../core/$reflect.js'
+import { typed } from '../core/typed.js'
 
-export const square = $reflect(<T>(dep: {
+export const square = typed('square', '__infer__', <T>(dep: {
   multiply: (a: T, b: T) => T,
   unaryMinus: (x: T) => T, // just for the experiment
 }): (a: T) => T =>

src/plugins/typeInferPlugin.ts

@@ -7,16 +7,19 @@ const transformer: ts.TransformerFactory<ts.SourceFile> = context => {
 
   return sourceFile => {
     const visitor = (node: ts.Node): ts.Node => {
-      // we're looking for a function call like $reflect(deps => ...)
       // @ts-ignore
-      if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && node.expression.escapedText === '$reflect') {
-        console.log('PLUGIN: FOUND AN OCCURRENCE OF $reflect')
+      if (ts.isStringLiteral(node) && node.text === '__infer__') {
+        console.log('PLUGIN: FOUND AN OCCURRENCE OF __infer__')
+
+        // we're looking for a function call like typed('name', '__infer__', deps => ...)
+        const parentNode = node.parent
+        if (ts.isCallExpression(parentNode) && ts.isIdentifier(parentNode.expression) && parentNode.expression.escapedText === 'typed') {
           // console.log('PARENT')
-        // console.log(node)
+          // console.log(parentNode)
 
           // TODO: validate that argNode is an ArrowFunction
           // @ts-ignore
-        const argNode = node.arguments[0]
+          const argNode = parentNode.arguments[2]
           // @ts-ignore
           const returnType = argNode.type.getText(sourceFile)
           console.log('PLUGIN: RETURN TYPE')
@@ -39,11 +42,8 @@ const transformer: ts.TransformerFactory<ts.SourceFile> = context => {
 
           const depsAndReturnType = `{ deps: ${paramType}; return: ${returnType} }`
 
-        // Now we insert a second argument to the $reflect function call: a string with the types
-        // @ts-ignore
-        node.arguments.push(ts.factory.createStringLiteral(depsAndReturnType))
-
-        return node
+          return ts.factory.createStringLiteral(depsAndReturnType)
+        }
       }
 
       return ts.visitEachChild(node, visitor, context)