itty-packager 1.0.9 → 1.0.10

package/lib/builder.js

@@ -192,9 +192,37 @@ async function injectSnippet(snippetName, outDir) {
     return
   }
 
-  const transformCode = code => code
-    .replace(/^let\s+(\w+)\s*=/, `let ${snippetName}=`)
-    .replace(/;export\s*{[^}]+};?\s*$/, ';')
+  const transformCode = code => {
+    // Find the exported variable name from the export statement
+    const exportMatch = code.match(/;export\s*{\s*(\w+)(?:\s+as\s+\w+)?\s*};?\s*$/)
+    if (!exportMatch) {
+      // Fallback to original logic if no export found
+      return code
+        .replace(/^let\s+(\w+)\s*=/, `let ${snippetName}=`)
+        .replace(/;export\s*{[^}]+};?\s*$/, ';')
+    }
+    
+    const exportedVar = exportMatch[1]
+    
+    // Find the final assignment to the exported variable (usually at module level)
+    // Look for patterns like "exportedVar=someFunction()" at the end before export
+    const finalAssignmentRegex = new RegExp(`(\\b${exportedVar}\\s*=\\s*[^;]+);export`)
+    const assignmentMatch = code.match(finalAssignmentRegex)
+    
+    if (assignmentMatch) {
+      // Replace the final assignment
+      const oldAssignment = assignmentMatch[1]
+      const newAssignment = oldAssignment.replace(new RegExp(`\\b${exportedVar}\\s*=`), `${snippetName}=`)
+      return code
+        .replace(oldAssignment, newAssignment)
+        .replace(/;export\s*{[^}]+};?\s*$/, ';')
+    }
+    
+    // If no final assignment found, fall back to first declaration replacement
+    return code
+      .replace(/^let\s+(\w+)\s*=/, `let ${snippetName}=`)
+      .replace(/;export\s*{[^}]+};?\s*$/, ';')
+  }
 
   const snippet = await fs.readFile(snippetPath, 'utf-8')
   const transformed = transformCode(snippet).trim()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itty-packager",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Universal build tool for itty libraries",
   "type": "module",
   "bin": {