@wyw-in-js/transform 2.0.1 → 2.1.0

package/types/utils/oxcPreevalStage/types.d.ts

@@ -2,7 +2,7 @@ import type { StrictOptions } from '@wyw-in-js/shared';
 import type { EventEmitter } from '../EventEmitter';
 import type { WYWTransformMetadata } from '../TransformMetadata';
 import type { OxcStaticValueCandidate } from '../collectOxcTemplateDependencies';
-export type OxcPreevalOptions = Pick<StrictOptions, 'classNameSlug' | 'codeRemover' | 'displayName' | 'eval' | 'extensions' | 'features' | 'staticBindings' | 'tagResolver'> & {
+export type OxcPreevalOptions = Pick<StrictOptions, 'classNameSlug' | 'codeRemover' | 'displayName' | 'eval' | 'extensions' | 'features' | 'processors' | 'staticBindings' | 'tagResolver'> & {
     eventEmitter?: EventEmitter;
 };
 export type OxcPreevalResult = {

package/types/utils/parseOxc.js

@@ -7,6 +7,11 @@ import { parseSync } from 'oxc-parser';
 const MAX_PARSE_CACHE_ENTRIES = 1000;
 const parseCache = new Map();
 const getAstType = (filename) => filename.endsWith('.ts') || filename.endsWith('.tsx') ? 'ts' : 'js';
+const getJsxFallbackFilename = (filename) => {
+    if (filename.endsWith('.js'))
+        return `${filename}x`;
+    return null;
+};
 const makeCacheKey = (filename, code, sourceType) => `${sourceType}\0${filename}\0${code}`;
 const setCachedParse = (key, value) => {
     parseCache.set(key, value);
@@ -24,12 +29,22 @@ export const parseOxcCached = (filename, code, sourceType) => {
     if (cached) {
         return cached;
     }
-    const parsed = parseSync(filename, code, {
+    let parsed = parseSync(filename, code, {
         astType: getAstType(filename),
         range: true,
         sourceType,
     });
-    const fatalError = parsed.errors.find((error) => error.severity === 'Error');
+    let fatalError = parsed.errors.find((error) => error.severity === 'Error');
+    const jsxFallbackFilename = getJsxFallbackFilename(filename);
+    if (fatalError?.message.includes('JSX') && jsxFallbackFilename) {
+        // Some bundlers pass .js files with JSX to WyW before a later JSX transform.
+        parsed = parseSync(jsxFallbackFilename, code, {
+            astType: getAstType(jsxFallbackFilename),
+            range: true,
+            sourceType,
+        });
+        fatalError = parsed.errors.find((error) => error.severity === 'Error');
+    }
     if (fatalError) {
         throw new Error(fatalError.message);
     }