ripple 0.2.96 → 0.2.98

package/package.json

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

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;
 

package/src/runtime/index-client.js

@@ -40,7 +40,7 @@ export function mount(component, options) {
 	};
 }
 
-export { create_context as createContext } from './internal/client/context.js';
+export { Context } from './internal/client/context.js';
 
 export {
 	flush_sync as flushSync,

package/src/runtime/index-server.js

@@ -4,7 +4,7 @@ import { DERIVED, TRACKED, UNINITIALIZED } from './internal/client/constants.js'
 import { is_tracked_object } from './internal/client/utils.js';
 import { active_component } from './internal/server/index.js';
 
-export { create_context as createContext } from './internal/server/context.js';
+export { Context } from './internal/server/context.js';
 
 export function effect() {
 	// NO-OP
@@ -44,4 +44,3 @@ export function track(v, get, set) {
 		v,
 	};
 }
-

package/src/runtime/internal/client/context.js

@@ -58,12 +58,3 @@ export class Context {
     current_context.set(context, value);
   }
 }
-
-/**
- * @template T
- * @param {T} initial_value
- * @returns {Context<T>}
- */
-export function create_context(initial_value) {
-  return new Context(initial_value);
-}

package/src/runtime/internal/server/context.js

@@ -58,12 +58,3 @@ export class Context {
     current_context.set(context, value);
   }
 }
-
-/**
- * @template T
- * @param {T} initial_value
- * @returns {Context<T>}
- */
-export function create_context(initial_value) {
-  return new Context(initial_value);
-}

package/tests/client/context.test.ripple

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { mount, createContext, flushSync, track } from 'ripple';
+import { mount, Context, flushSync, track } from 'ripple';
 
 describe('context', () => {
 	let container;
@@ -20,7 +20,7 @@ describe('context', () => {
 	});
 
 	it('creates a reactive ref with initial value', () => {
-		const MyContext = createContext(null);
+		const MyContext = new Context(null);
 
 		component Child() {
 			const value = MyContext.get();
@@ -42,8 +42,8 @@ describe('context', () => {
 	});
 
 	it('handles context captured inside a computed tracked', () => {
-		
-		const MyContext = createContext(null)
+
+		const MyContext = new Context(null)
 
 		const doubleContext = () => {
 			const value = MyContext.get()
@@ -52,7 +52,7 @@ describe('context', () => {
 
 		component App() {
 			MyContext.set(4)
-				
+
 			<h3>{MyContext.get()}</h3>
 
 			<h4>{'2x:'} {doubleContext()}</h4>

package/types/index.d.ts

@@ -24,12 +24,12 @@ export interface TrackedArray<T> extends Array<T> { }
 
 export declare const TrackedArray: TrackedArrayConstructor;
 
-export type Context<T> = {
-	get(): T;
-	set(value: T): void;
-};
-
-export declare function createContext<T>(initialValue: T): Context<T>;
+export declare class Context<T> {
+	constructor(initial_value: T);
+  get(): T;
+  set(value: T): void;
+	#private;
+}
 
 export declare class TrackedSet<T> extends Set<T> {
 	isDisjointFrom(other: TrackedSet<T> | Set<T>): boolean;