fix(#8, other-resolver): fix to fallback to other resolve if needed to

Author: Inerska

.gitignore

@@ -32,3 +32,5 @@ report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
 
 # Finder (MacOS) folder config
 .DS_Store
+
+examples/facetpack-uniwind-repro

bun.lock

@@ -15,7 +15,7 @@
     "@babel/core": "^7.24.0",
     "@babel/preset-react": "^7.24.0",
     "@babel/preset-typescript": "^7.24.0",
-    "@ecrindigital/facetpack-native": "^0.1.0",
+    "@ecrindigital/facetpack-native": "workspace:*",
     "enhanced-resolve": "^5.15.0",
     "terser": "^5.27.0"
   }

examples/benchmark/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "expo": "~54.0.30",
     "expo-status-bar": "~3.0.9",
-    "@ecrindigital/facetpack": "^latest",
-    "@ecrindigital/facetpack-native": "^latest",
+    "@ecrindigital/facetpack": "workspace:*",
+    "@ecrindigital/facetpack-native": "workspace:*",
     "react": "19.1.0",
     "react-native": "0.81.5"
   },

examples/expo-facetpack/package.json

@@ -1,4 +1,4 @@
-import { transformSync, JsxRuntime, resolveBatchSync } from '@ecrindigital/facetpack-native'
+import { transformSync, JsxRuntime, resolveBatchSync, parseSync } from '@ecrindigital/facetpack-native'
 import { parse } from '@babel/parser'
 import type { TransformParams, TransformResult, FacetpackOptions } from './types'
 import { setCachedResolutions } from './cache'
@@ -124,10 +124,22 @@ const BABEL_REQUIRED_PATTERNS = [
   /runOnJS/,
 ]
 
+const HERMES_COMPAT_PATTERNS = [
+  /\basync\s+function\b/,     
+  /\basync\s*\(/,             
+  /\basync\s+\w+\s*\(/,       
+  /=\s*async\s*\(/,           
+  /=\s*async\s+function\b/,   
+]
+
 function requiresBabelTransform(src: string): boolean {
   return BABEL_REQUIRED_PATTERNS.some(pattern => pattern.test(src))
 }
 
+function requiresHermesCompat(src: string): boolean {
+  return HERMES_COMPAT_PATTERNS.some(pattern => pattern.test(src))
+}
+
 function shouldTransform(filename: string, src: string, options: Required<FacetpackOptions>): boolean {
   if (isNodeModules(filename)) {
     return false
@@ -140,6 +152,13 @@ function shouldTransform(filename: string, src: string, options: Required<Facetp
     return false
   }
 
+  if (requiresHermesCompat(src)) {
+    if (process.env.FACETPACK_DEBUG) {
+      console.log(`[Facetpack] Babel required for async/await (Hermes compat): ${filename}`)
+    }
+    return false
+  }
+
   const ext = filename.split('.').pop()?.toLowerCase()
   if (!ext) return false
   return options.sourceExts.includes(ext)
@@ -165,6 +184,29 @@ export function transform(params: TransformParams): TransformResult {
   }
 
   try {
+    const parseResult = parseSync(filename, src)
+    if (parseResult.errors.length > 0 && parseResult.diagnostics.length > 0) {
+      const formattedErrors = parseResult.diagnostics
+        .map(d => {
+          let output = d.formatted || ''
+          if (!output && d.message) {
+            output = `\n  × ${d.message}\n`
+            if (d.snippet) {
+              output += `   ╭─[${d.filename}:${d.line}:${d.column}]\n`
+              output += ` ${d.line} │ ${d.snippet}\n`
+              output += `   ╰────\n`
+            }
+            if (d.help) {
+              output += `  help: ${d.help}\n`
+            }
+          }
+          return output
+        })
+        .join('\n')
+
+      throw new Error(`\n${formattedErrors}`)
+    }
+
     const isClassic = opts.jsxRuntime === 'classic'
     const result = transformSync(filename, src, {
       jsx: opts.jsx,

packages/facetpack/src/transformer.ts

@@ -48,7 +48,7 @@ export function withFacetpack(
     ? options.minifier
     : {}
 
-  const useTreeShake = options.treeShake !== false
+  const useTreeShake = options.treeShake === true
   const existingSerializer = (config as any).serializer?.customSerializer as CustomSerializer | undefined
   const customSerializer = useTreeShake
     ? createFacetpackSerializer(existingSerializer, { treeShake: true })
@@ -60,6 +60,8 @@ export function withFacetpack(
 
   storeTransformerOptions(options, fallbackTransformerPath)
 
+  const existingResolver = config.resolver?.resolveRequest
+
   return {
     ...config,
     transformer: {
@@ -97,16 +99,18 @@ export function withFacetpack(
         ]),
       ],
       resolveRequest: (context: any, moduleName: string, platform: string | null) => {
+        const fallbackResolver = existingResolver ?? context.resolveRequest
+
         if (context.originModulePath.includes('node_modules')) {
-          return context.resolveRequest(context, moduleName, platform)
+          return fallbackResolver(context, moduleName, platform)
         }
 
         const cached = getCachedResolution(context.originModulePath, moduleName)
         if (cached !== undefined) {
           if (cached) {
             return { type: 'sourceFile', filePath: cached }
           }
-          return context.resolveRequest(context, moduleName, platform)
+          return fallbackResolver(context, moduleName, platform)
         }
 
         const directory = context.originModulePath.substring(
@@ -124,7 +128,7 @@ export function withFacetpack(
           return { type: 'sourceFile', filePath: result.path }
         }
 
-        return context.resolveRequest(context, moduleName, platform)
+        return fallbackResolver(context, moduleName, platform)
       },
     },
     serializer: {