rwsdk 0.2.0-alpha.16-test.20250825032050 → 0.2.0-alpha.18

package/dist/vite/transformJsxScriptTagsPlugin.mjs

@@ -28,23 +28,18 @@ function hasJsxFunctions(text) {
         text.includes('jsxDEV("link"') ||
         text.includes("jsxDEV('link'"));
 }
-// Transform import statements in script content using ts-morph
 function transformScriptImports(scriptContent, manifest) {
     const scriptProject = new Project({ useInMemoryFileSystem: true });
     try {
-        // Wrap in a function to make it valid JavaScript
         const wrappedContent = `function __wrapper() {${scriptContent}}`;
         const scriptFile = scriptProject.createSourceFile("script.js", wrappedContent);
         let hasChanges = false;
         const entryPoints = [];
-        // Find all CallExpressions that look like import("path")
         scriptFile
             .getDescendantsOfKind(SyntaxKind.CallExpression)
             .forEach((callExpr) => {
             const expr = callExpr.getExpression();
-            // Check for both "import()" and "await import()" patterns
             const isImport = expr.getText() === "import";
-            // Check for await import pattern
             const isAwaitImport = expr.getKind() === SyntaxKind.PropertyAccessExpression &&
                 expr.getText().endsWith(".import");
             if (isImport || isAwaitImport) {
@@ -54,7 +49,7 @@ function transformScriptImports(scriptContent, manifest) {
                     if (importPath.startsWith("/")) {
                         log("Found dynamic import with root-relative path: %s", importPath);
                         entryPoints.push(importPath);
-                        const path = importPath.slice(1); // Remove leading slash
+                        const path = importPath.slice(1);
                         if (manifest[path]) {
                             const transformedSrc = `/${manifest[path].file}`;
                             args[0].setLiteralValue(transformedSrc);
@@ -65,19 +60,15 @@ function transformScriptImports(scriptContent, manifest) {
             }
         });
         if (hasChanges) {
-            // Extract the transformed content from inside the wrapper function
             const fullText = scriptFile.getFullText();
-            // Find content between the first { and the last }
             const startPos = fullText.indexOf("{") + 1;
             const endPos = fullText.lastIndexOf("}");
             const transformedContent = fullText.substring(startPos, endPos);
             return { content: transformedContent, hasChanges: true, entryPoints };
         }
-        // Return the original content when no changes are made
         return { content: scriptContent, hasChanges: false, entryPoints };
     }
     catch (error) {
-        // If parsing fails, fall back to the original content
         console.warn("Failed to parse inline script content:", error);
         return { content: undefined, hasChanges: false, entryPoints: [] };
     }
@@ -93,15 +84,12 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
     const modifications = [];
     const needsRequestInfoImportRef = { value: false };
     const entryPointsPerCallExpr = new Map();
-    // Check for existing imports up front
     let hasRequestInfoImport = false;
     let sdkWorkerImportDecl;
-    // Scan for imports only once
     sourceFile.getImportDeclarations().forEach((importDecl) => {
         const moduleSpecifier = importDecl.getModuleSpecifierValue();
         if (moduleSpecifier === "rwsdk/worker") {
             sdkWorkerImportDecl = importDecl;
-            // Check if requestInfo is already imported
             if (importDecl
                 .getNamedImports()
                 .some((namedImport) => namedImport.getName() === "requestInfo")) {
@@ -109,65 +97,52 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
             }
         }
     });
-    // Look for jsx function calls (jsx, jsxs, jsxDEV)
     sourceFile
         .getDescendantsOfKind(SyntaxKind.CallExpression)
         .forEach((callExpr) => {
         const expression = callExpr.getExpression();
         const expressionText = expression.getText();
-        // Only process jsx/jsxs/jsxDEV calls
         if (expressionText !== "jsx" &&
             expressionText !== "jsxs" &&
             expressionText !== "jsxDEV") {
             return;
         }
-        // Get arguments of the jsx call
         const args = callExpr.getArguments();
         if (args.length < 2)
             return;
-        // First argument should be the element type
         const elementType = args[0];
         if (!Node.isStringLiteral(elementType))
             return;
         const tagName = elementType.getLiteralValue();
         const entryPoints = [];
-        // Process script and link tags
         if (tagName === "script" || tagName === "link") {
-            // Second argument should be the props object
             const propsArg = args[1];
-            // Handle object literals with properties
             if (Node.isObjectLiteralExpression(propsArg)) {
                 const properties = propsArg.getProperties();
-                // Variables to track script attributes
                 let hasDangerouslySetInnerHTML = false;
                 let hasNonce = false;
                 let hasStringLiteralChildren = false;
                 let hasSrc = false;
-                // Variables to track link attributes
                 let isPreload = false;
                 let hrefValue = null;
                 for (const prop of properties) {
                     if (Node.isPropertyAssignment(prop)) {
                         const propName = prop.getName();
                         const initializer = prop.getInitializer();
-                        // Check for existing nonce
                         if (propName === "nonce") {
                             hasNonce = true;
                         }
-                        // Check for dangerouslySetInnerHTML
                         if (propName === "dangerouslySetInnerHTML") {
                             hasDangerouslySetInnerHTML = true;
                         }
-                        // Check for src attribute
                         if (tagName === "script" && propName === "src") {
                             hasSrc = true;
-                            // Also process src for manifest transformation if needed
                             if (Node.isStringLiteral(initializer) ||
                                 Node.isNoSubstitutionTemplateLiteral(initializer)) {
                                 const srcValue = initializer.getLiteralValue();
                                 if (srcValue.startsWith("/")) {
                                     entryPoints.push(srcValue);
-                                    const path = srcValue.slice(1); // Remove leading slash
+                                    const path = srcValue.slice(1);
                                     if (manifest[path]) {
                                         const transformedSrc = `/${manifest[path].file}`;
                                         modifications.push({
@@ -179,18 +154,15 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                                 }
                             }
                         }
-                        // Check for string literal children
                         if (tagName === "script" &&
                             propName === "children" &&
                             (Node.isStringLiteral(initializer) ||
                                 Node.isNoSubstitutionTemplateLiteral(initializer))) {
                             hasStringLiteralChildren = true;
                             const scriptContent = initializer.getLiteralValue();
-                            // Transform import statements in script content using ts-morph
                             const { content: transformedContent, hasChanges: contentHasChanges, entryPoints: dynamicEntryPoints, } = transformScriptImports(scriptContent, manifest);
                             entryPoints.push(...dynamicEntryPoints);
                             if (contentHasChanges && transformedContent) {
-                                // Get the raw text with quotes to determine the exact format
                                 const isTemplateLiteral = Node.isNoSubstitutionTemplateLiteral(initializer);
                                 const replacementText = isTemplateLiteral
                                     ? "`" + transformedContent + "`"
@@ -202,7 +174,6 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                                 });
                             }
                         }
-                        // For link tags, first check if it's a preload/modulepreload
                         if (tagName === "link") {
                             if (propName === "rel" &&
                                 (Node.isStringLiteral(initializer) ||
@@ -220,12 +191,10 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                         }
                     }
                 }
-                // Add nonce to script tags if needed
                 if (tagName === "script" &&
                     !hasNonce &&
                     !hasDangerouslySetInnerHTML &&
                     (hasStringLiteralChildren || hasSrc)) {
-                    // Collect nonce property addition
                     modifications.push({
                         type: "addProperty",
                         node: propsArg,
@@ -236,13 +205,12 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                         needsRequestInfoImportRef.value = true;
                     }
                 }
-                // Transform href if this is a preload link
                 if (tagName === "link" &&
                     isPreload &&
                     hrefValue &&
                     hrefValue.startsWith("/") &&
                     manifest[hrefValue.slice(1)]) {
-                    const path = hrefValue.slice(1); // Remove leading slash
+                    const path = hrefValue.slice(1);
                     for (const prop of properties) {
                         if (Node.isPropertyAssignment(prop) &&
                             prop.getName() === "href") {
@@ -255,7 +223,6 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                                 const quote = isTemplateLiteral
                                     ? "`"
                                     : originalText.charAt(0);
-                                // Preserve the original quote style and prepare replacement text
                                 let replacementText;
                                 if (isTemplateLiteral) {
                                     replacementText = `\`/${transformedHref}\``;
@@ -284,23 +251,18 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                 .join(",\n");
             const leadingCommentRanges = callExpr.getLeadingCommentRanges();
             const pureComment = leadingCommentRanges.find((r) => r.getText().includes("@__PURE__"));
-            // Store position and static data for later processing
             const wrapInfo = {
                 callExpr: callExpr,
                 sideEffects: sideEffects,
                 pureCommentText: pureComment?.getText(),
             };
-            // We'll collect the actual wrap modifications after simple modifications are applied
             if (!entryPointsPerCallExpr.has(callExpr)) {
                 entryPointsPerCallExpr.set(callExpr, wrapInfo);
             }
             needsRequestInfoImportRef.value = true;
         }
     });
-    // Apply all collected modifications
     if (modifications.length > 0 || entryPointsPerCallExpr.size > 0) {
-        // Apply modifications in the right order to avoid invalidating nodes
-        // Apply simple modifications first (these are less likely to invalidate other nodes)
         for (const mod of modifications) {
             if (mod.type === "literalValue") {
                 mod.node.setLiteralValue(mod.value);
@@ -315,15 +277,12 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                 });
             }
         }
-        // Apply CallExpr wrapping last (these can invalidate other nodes)
-        // Now collect the wrap modifications with fresh data after simple modifications
         const wrapModifications = [];
         for (const [callExpr, wrapInfo] of entryPointsPerCallExpr) {
             const fullStart = callExpr.getFullStart();
             const end = callExpr.getEnd();
             const callExprText = callExpr.getText();
             const fullText = callExpr.getFullText();
-            // Extract leading whitespace/newlines before the call expression
             const leadingWhitespace = fullText.substring(0, fullText.length - callExprText.length);
             let pureCommentText;
             let leadingTriviaText;
@@ -342,7 +301,6 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                 leadingWhitespace: leadingWhitespace,
             });
         }
-        // Sort by position in reverse order to avoid invalidating later nodes
         wrapModifications.sort((a, b) => b.fullStart - a.fullStart);
         for (const mod of wrapModifications) {
             if (mod.pureCommentText && mod.leadingTriviaText) {
@@ -351,13 +309,9 @@ ${mod.sideEffects},
 ${mod.pureCommentText} ${mod.callExprText}
 )`;
                 const newLeadingTriviaText = mod.leadingTriviaText.replace(mod.pureCommentText, "");
-                // By replacing from `getFullStart`, we remove the original node and all its leading trivia
-                // and replace it with our manually reconstructed string.
-                // This should correctly move the pure comment and preserve other comments and whitespace.
                 sourceFile.replaceText([mod.fullStart, mod.end], newLeadingTriviaText + newText);
             }
             else {
-                // Extract just the newlines and basic indentation, ignore extra padding
                 const leadingNewlines = mod.leadingWhitespace.match(/\n\s*/)?.[0] || "";
                 sourceFile.replaceText([mod.fullStart, mod.end], `${leadingNewlines}(
 ${mod.sideEffects},
@@ -365,16 +319,13 @@ ${mod.callExprText}
 )`);
             }
         }
-        // Add requestInfo import if needed and not already imported
         if (needsRequestInfoImportRef.value) {
             if (sdkWorkerImportDecl) {
-                // Module is imported but need to add requestInfo
                 if (!hasRequestInfoImport) {
                     sdkWorkerImportDecl.addNamedImport("requestInfo");
                 }
             }
             else {
-                // Add new import declaration
                 sourceFile.addImportDeclaration({
                     moduleSpecifier: "rwsdk/worker",
                     namedImports: ["requestInfo"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.2.0-alpha.16-test.20250825032050",
+  "version": "0.2.0-alpha.18",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {