ripple 0.2.95 → 0.2.97

package/package.json

@@ -3,7 +3,7 @@
   "description": "Ripple is an elegant TypeScript UI framework",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.2.95",
+  "version": "0.2.97",
   "type": "module",
   "module": "src/runtime/index-client.js",
   "main": "src/runtime/index-client.js",

package/src/compiler/phases/2-analyze/index.js

@@ -140,6 +140,12 @@ const visitors = {
 	},
 
 	CallExpression(node, context) {
+		// bug in our acorn pasrer: it uses typeParameters instead of typeArguments
+		if (node.typeParameters) {
+			node.typeArguments = node.typeParameters;
+			delete node.typeParameters;
+		}
+
 		const callee = node.callee;
 
 		if (context.state.function_depth === 0 && is_ripple_track_call(callee, context)) {
@@ -497,9 +503,9 @@ const visitors = {
 					if (attr.name.type === 'Identifier') {
 						attribute_names.add(attr.name);
 					}
-          if (attr.value !== null) {
-					  visit(attr.value, state);
-          }
+					if (attr.value !== null) {
+						visit(attr.value, state);
+					}
 				} else if (attr.type === 'SpreadAttribute') {
 					visit(attr.argument, state);
 				} else if (attr.type === 'RefAttribute') {

package/src/compiler/phases/3-transform/client/index.js

@@ -1,3 +1,5 @@
+/** @import {Expression, FunctionExpression} from 'estree' */
+
 import { walk } from 'zimmerframe';
 import path from 'node:path';
 import { print } from 'esrap';
@@ -195,6 +197,9 @@ const visitors = {
 	},
 
 	CallExpression(node, context) {
+		if (!context.state.to_ts) {
+			delete node.typeArguments;
+		}
 		const callee = node.callee;
 		const parent = context.path.at(-1);
 
@@ -407,29 +412,13 @@ const visitors = {
 	},
 
 	VariableDeclaration(node, context) {
-		const declarations = [];
-
 		for (const declarator of node.declarations) {
-			const metadata = declarator.metadata;
-
-			if (declarator.id.type === 'Identifier') {
-				const binding = context.state.scope.get(declarator.id.name);
-
-				if (!context.state.to_ts) {
-					delete declarator.id.typeAnnotation;
-				}
-
-				declarations.push(context.visit(declarator));
-			} else {
-				if (!context.state.to_ts) {
-					delete declarator.id.typeAnnotation;
-				}
-
-				declarations.push(context.visit(declarator));
+			if (!context.state.to_ts) {
+				delete declarator.id.typeAnnotation;
 			}
 		}
 
-		return { ...node, declarations };
+		return context.next();
 	},
 
 	FunctionDeclaration(node, context) {

package/src/compiler/phases/3-transform/server/index.js

@@ -106,6 +106,45 @@ const visitors = {
 		);
 	},
 
+	CallExpression(node, context) {
+		if (!context.state.to_ts) {
+			delete node.typeArguments;
+		}
+		return context.next();
+	},
+
+	PropertyDefinition(node, context) {
+		if (!context.state.to_ts) {
+			delete node.typeAnnotation;
+		}
+		return context.next();
+	},
+
+	TSAsExpression(node, context) {
+		if (!context.state.to_ts) {
+			return context.visit(node.expression);
+		}
+		return context.next();
+	},
+
+	ExportNamedDeclaration(node, context) {
+		if (!context.state.to_ts && node.exportKind === 'type') {
+			return b.empty;
+		}
+
+		return context.next();
+	},
+
+	VariableDeclaration(node, context) {
+		for (const declarator of node.declarations) {
+			if (!context.state.to_ts) {
+				delete declarator.id.typeAnnotation;
+			}
+		}
+
+		return context.next();
+	},
+
 	Element(node, context) {
 		const { state, visit } = context;