@plumeria/turbopack-loader 18.5.3 → 18.5.4

package/dist/index.js

@@ -546,16 +546,25 @@ async function loader(source) {
         };
         const replacements = [];
         const deferredSources = [];
-        const deferSource = (node, stripObject = false) => {
+        const deferRange = (start, end) => {
             const token = `__plumeria_preserved_${deferredSources.length}__`;
-            deferredSources.push({
-                token,
-                start: node.span.start - baseByteOffset,
-                end: node.span.end - baseByteOffset,
-                stripObject,
-            });
+            deferredSources.push({ token, start, end });
             return token;
         };
+        const deferSource = (node) => deferRange(node.span.start - baseByteOffset, node.span.end - baseByteOffset);
+        const deferProperty = (property) => {
+            const node = property;
+            const range = node.spread && node.arguments
+                ? { start: node.spread.start, end: node.arguments.span.end }
+                : node.span
+                    ? { start: node.span.start, end: node.span.end }
+                    : node.key && node.value
+                        ? { start: node.key.span.start, end: node.value.span.end }
+                        : null;
+            return range
+                ? deferRange(range.start - baseByteOffset, range.end - baseByteOffset)
+                : null;
+        };
         const dynamicFnCalls = [];
         const processedDecls = new Set();
         const separatelyExported = new Set();
@@ -2289,8 +2298,11 @@ async function loader(source) {
                     if (styleAttrExisting.value?.type === 'JSXExpressionContainer') {
                         const innerExpr = styleAttrExisting.value?.expression;
                         if (innerExpr.type === 'ObjectExpression') {
-                            if (innerExpr.properties.length > 0)
-                                existingStyleParts.push(deferSource(innerExpr, true));
+                            for (const property of innerExpr.properties) {
+                                const token = deferProperty(property);
+                                if (token)
+                                    existingStyleParts.push(token);
+                            }
                         }
                         else {
                             existingStyleExpr = `...(${deferSource(innerExpr)})`;
@@ -2449,9 +2461,7 @@ async function loader(source) {
                 cursor = replacement.end;
             }
             pieces.push(sourceBuffer.subarray(cursor, deferred.end).toString('utf-8'));
-            let content = pieces.join('');
-            if (deferred.stripObject)
-                content = content.slice(1, -1).trim();
+            const content = pieces.join('');
             for (const replacement of replacements)
                 replacement.content = replacement.content.replaceAll(deferred.token, content);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/turbopack-loader",
-  "version": "18.5.3",
+  "version": "18.5.4",
   "description": "Plumeria Turbopack-loader",
   "author": "Refirst 11",
   "license": "MIT",
@@ -29,8 +29,8 @@
     "zero-virtual.css"
   ],
   "dependencies": {
-    "@plumeria/compiler": "^18.5.3",
-    "@plumeria/utils": "^18.5.3"
+    "@plumeria/compiler": "^18.5.4",
+    "@plumeria/utils": "^18.5.4"
   },
   "devDependencies": {
     "@swc/core": "1.15.47",