fix: various types (#747)

Author: leonidaz

package.json

@@ -39,7 +39,8 @@
     "source-map": "catalog:default",
     "type-fest": "catalog:default",
     "vitest": "catalog:default",
-    "wait-on": "catalog:default"
+    "wait-on": "catalog:default",
+    "typescript": "catalog:default"
   },
   "dependencies": {
     "@types/eslint": "catalog:default"

packages/compat-react/package.json

@@ -20,6 +20,7 @@
     "ripple": "workspace:*"
   },
   "devDependencies": {
+    "@types/node": "catalog:default",
     "@types/react": "^19.2.2",
     "@types/react-dom": "^19.2.2",
     "typescript": "catalog:default"

packages/compat-react/tsconfig.json

@@ -23,5 +23,6 @@
     "./tests/**/*.test.ripple",
     "./tests/**/*.d.ts",
     "./tests/**/*.js"
-  ]
+  ],
+  "exclude": ["node_modules", "dist"]
 }

packages/eslint-parser/tsconfig.json

@@ -10,7 +10,6 @@
     "rootDir": "./src",
     "strict": true,
     "esModuleInterop": true,
-    "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "resolveJsonModule": true,
     "isolatedModules": true

packages/eslint-plugin/tsconfig.json

@@ -10,7 +10,6 @@
     "rootDir": "./src",
     "strict": true,
     "esModuleInterop": true,
-    "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "resolveJsonModule": true,
     "isolatedModules": true

packages/language-server/tsconfig.json

@@ -11,5 +11,6 @@
     "resolveJsonModule": true,
     "types": []
   },
-  "include": ["src/**/*.js", "index.js", "bin/**/*.js"]
+  "include": ["src/**/*.js", "index.js", "bin/**/*.js"],
+  "exclude": ["node_modules", "dist"]
 }

packages/prettier-plugin/tsconfig.json

@@ -12,5 +12,6 @@
     "noEmit": true,
     "types": ["vitest/globals"]
   },
-  "include": ["./*.js", "./src/", "vitest-extensions.d.ts"]
+  "include": ["./*.js", "./src/", "vitest-extensions.d.ts"],
+  "exclude": ["node_modules", "dist"]
 }

packages/ripple/src/compiler/phases/3-transform/client/index.js

@@ -1877,6 +1877,11 @@ const visitors = {
 			]),
 		);
 
+		func.metadata = {
+			...func.metadata,
+			is_component: true,
+		};
+
 		return func;
 	},
 
@@ -4748,7 +4753,7 @@ export function transform_client(filename, source, analysis, to_ts, minify_css,
 
 	const program = /** @type {AST.Program} */ (walk(analysis.ast, { ...state }, visitors));
 
-	/** @type {AST.Statement[]} */
+	/** @type {AST.RippleProgram['body']} */
 	let body = [];
 
 	for (const import_node of state.imports) {
@@ -4784,15 +4789,15 @@ export function transform_client(filename, source, analysis, to_ts, minify_css,
 		// Walk the body to find components and inject HMR wrapping.
 		// After the walk, Component nodes become FunctionExpression nodes
 		// (via b.function() which creates FunctionExpression).
-		/** @type {AST.Statement[]} */
+		/** @type {AST.RippleProgram['body']} */
 		const hmr_body = [];
 
 		for (const node of body) {
 			hmr_body.push(node);
 
 			if (node.type === 'ExportDefaultDeclaration') {
-				const decl = node.declaration;
-				if (decl.type === 'FunctionExpression' && decl.id && component_names.has(decl.id.name)) {
+				const decl = /** @type {AST.FunctionExpression} */ (node.declaration);
+				if (decl.metadata?.is_component && decl.id && component_names.has(decl.id.name)) {
 					const name = decl.id.name;
 					exported_components.push({ name, export_type: 'default' });
 					// Replace ExportDefaultDeclaration with plain FunctionExpression (printed as function declaration)
@@ -4803,13 +4808,8 @@ export function transform_client(filename, source, analysis, to_ts, minify_css,
 					hmr_body.push(b.export_default(b.id(name)));
 				}
 			} else if (node.type === 'ExportNamedDeclaration') {
-				const decl = node.declaration;
-				if (
-					decl &&
-					decl.type === 'FunctionExpression' &&
-					decl.id &&
-					component_names.has(decl.id.name)
-				) {
+				const decl = /** @type {AST.FunctionExpression | null | undefined} */ (node.declaration);
+				if (decl && decl.metadata?.is_component && decl.id && component_names.has(decl.id.name)) {
 					const name = decl.id.name;
 					exported_components.push({ name, export_type: 'named' });
 					// Replace ExportNamedDeclaration with plain FunctionExpression (printed as function declaration)
@@ -4830,6 +4830,7 @@ export function transform_client(filename, source, analysis, to_ts, minify_css,
 				}
 			} else if (
 				node.type === 'FunctionExpression' &&
+				node.metadata?.is_component &&
 				node.id &&
 				component_names.has(node.id.name)
 			) {
@@ -4859,7 +4860,7 @@ export function transform_client(filename, source, analysis, to_ts, minify_css,
 		body = hmr_body;
 	}
 
-	program.body = body;
+	/** @type {AST.RippleProgram['body']} */ (program.body) = body;
 
 	const language_handler = to_ts
 		? create_tsx_with_typescript_support(analysis.comments)

packages/ripple/src/compiler/phases/3-transform/server/index.js

@@ -418,16 +418,16 @@ const visitors = {
 
 		if (metadata.await) {
 			const parent = context.path.at(-1);
-			/** @type {any[] | null} */
+			/** @type {AST.RippleProgram['body'] | null} */
 			let body = null;
-			/** @type {any} */
+			/** @type {AST.Component | AST.ExportNamedDeclaration} */
 			let target_node = node;
 			if (parent?.type === 'Program' || parent?.type === 'BlockStatement') {
-				body = /** @type {AST.RippleProgram} */ (parent).body;
+				body = parent.body;
 			} else if (parent?.type === 'ExportNamedDeclaration') {
 				const grandparent = context.path.at(-2);
 				if (grandparent?.type === 'Program' || grandparent?.type === 'BlockStatement') {
-					body = /** @type {AST.RippleProgram} */ (grandparent).body;
+					body = grandparent.body;
 					target_node = parent;
 				}
 			}
@@ -1401,7 +1401,7 @@ const visitors = {
 				});
 				context.state.init?.push(
 					b.var(
-						b.id(pending_position_name),
+						b.id(/** @type {string} */ (pending_position_name)),
 						b.member(b.member(b.id('__output'), b.id('body')), b.id('length')),
 					),
 				);
@@ -1443,7 +1443,7 @@ const visitors = {
 							b.call(
 								b.member(b.member(b.id('__output'), b.id('body')), b.id('slice')),
 								b.literal(0),
-								b.id(pending_position_name),
+								b.id(/** @type {string} */ (pending_position_name)),
 							),
 						),
 					),

packages/ripple/src/compiler/types/index.d.ts

@@ -383,7 +383,7 @@ declare module 'estree' {
 	 * Ripple's extended Program with Component support
 	 */
 	interface RippleProgram extends Omit<Program, 'body'> {
-		body: (Program['body'][number] | Component)[];
+		body: (Program['body'][number] | Component | FunctionExpression)[];
 	}
 
 	interface RippleMethodDefinition extends Omit<AST.MethodDefinition, 'value'> {