@mondaydotcomorg/atp-server 0.17.14 → 0.18.2

package/src/instrumentation/transformer.ts

@@ -2,8 +2,13 @@
  * Code Instrumentation Engine
  */
 import { parse } from '@babel/parser';
-import traverse from '@babel/traverse';
-import generate from '@babel/generator';
+import _traverse from '@babel/traverse';
+// @ts-ignore - CommonJS/ESM compatibility
+const traverse =
+	typeof (_traverse as any).default === 'function' ? (_traverse as any).default : _traverse;
+import _generate from '@babel/generator';
+// @ts-ignore - CommonJS/ESM compatibility
+const generate = (_generate as any).default || _generate;
 import * as t from '@babel/types';
 import type { InstrumentedCode, InstrumentationMetadata } from './types.js';
 
@@ -16,12 +21,26 @@ export class CodeInstrumentor {
 	instrument(code: string): InstrumentedCode {
 		this.statementId = 0;
 
-		const ast = parse(code, {
-			sourceType: 'module',
-			plugins: ['typescript'],
-			allowAwaitOutsideFunction: true,
-			allowReturnOutsideFunction: true,
-		});
+		let ast;
+		try {
+			ast = parse(code, {
+				sourceType: 'module',
+				plugins: ['typescript'],
+				allowAwaitOutsideFunction: true,
+				allowReturnOutsideFunction: true,
+			});
+		} catch (parseError) {
+			const error = parseError as Error;
+			const positionMatch = error.message.match(/\((\d+):(\d+)\)/);
+			const position =
+				positionMatch && positionMatch[1] && positionMatch[2]
+					? { line: parseInt(positionMatch[1], 10), column: parseInt(positionMatch[2], 10) }
+					: null;
+
+			throw new SyntaxError(
+				`Failed to parse code for instrumentation: ${error.message}${position ? ` at line ${position.line}, column ${position.column}` : ''}`
+			);
+		}
 
 		const metadata: InstrumentationMetadata = {
 			statements: [],
@@ -30,15 +49,15 @@ export class CodeInstrumentor {
 		};
 
 		traverse(ast, {
-			VariableDeclaration: (path) => {
-				path.node.declarations.forEach((decl) => {
+			VariableDeclaration: (path: any) => {
+				path.node.declarations.forEach((decl: any) => {
 					if (t.isIdentifier(decl.id)) {
 						metadata.variables.add(decl.id.name);
 					}
 				});
 			},
 
-			FunctionDeclaration: (path) => {
+			FunctionDeclaration: (path: any) => {
 				if (path.node.id) {
 					metadata.functions.push({
 						name: path.node.id.name,
@@ -47,7 +66,7 @@ export class CodeInstrumentor {
 				}
 			},
 
-			Statement: (path) => {
+			Statement: (path: any) => {
 				if (
 					t.isFunctionDeclaration(path.node) ||
 					t.isClassDeclaration(path.node) ||

package/src/openapi-loader.ts

@@ -180,8 +180,7 @@ export async function loadOpenAPI(
 	if (!baseURL) {
 		if (isOpenAPI3(spec) && spec.servers && spec.servers[0]) {
 			baseURL = spec.servers[0].url;
-		}
-		else if (isSwagger2(spec) && spec.host) {
+		} else if (isSwagger2(spec) && spec.host) {
 			const scheme = spec.schemes?.[0] || 'https';
 			const host = spec.host;
 			const basePath = spec.basePath || '';
@@ -462,7 +461,7 @@ function convertOperation(
 		const basePath = baseUrlObj.pathname.replace(/\/$/, '');
 		const fullPath = basePath + requestPath;
 		const url = new URL(fullPath, baseUrlObj.origin);
-		
+
 		for (const [key, value] of Object.entries(queryParams)) {
 			url.searchParams.append(key, value);
 		}

package/src/utils/context.ts

@@ -22,10 +22,14 @@ export function createContext(options: CreateContextOptions): RequestContext {
 	const clientId = (req.headers['x-client-id'] as string) || undefined;
 	const userId = (req.headers['x-user-id'] as string) || undefined;
 
+	const url = req.url || '/';
+	const queryIndex = url.indexOf('?');
+	const path = queryIndex === -1 ? url : url.substring(0, queryIndex);
+
 	return {
 		method: req.method || 'GET',
-		path: req.url || '/',
-		query: parseQuery(req.url || '/'),
+		path,
+		query: parseQuery(url),
 		headers: req.headers as Record<string, string>,
 		body: null,
 		status: 200,