@knighted/jsx 1.9.1 → 1.9.2

package/dist/cjs/transpile.cjs

@@ -250,6 +250,7 @@ const collectRootJsxNodes = (root) => {
     walk(root, false);
     return nodes;
 };
+const MAX_TYPESCRIPT_STRIP_PASSES = 5;
 const hasStringProperty = (value, key) => isObjectRecord(value) && typeof value[key] === 'string';
 const hasSourceAndExpressionRanges = (value) => isObjectRecord(value) &&
     typeof value.type === 'string' &&
@@ -356,6 +357,46 @@ const applyStripEdits = (magic, edits) => {
     });
     return changed;
 };
+const stripTypeScriptSyntax = (source, sourceType) => {
+    let currentCode = source;
+    let changed = false;
+    let reachedStripPassLimit = true;
+    for (let pass = 0; pass < MAX_TYPESCRIPT_STRIP_PASSES; pass += 1) {
+        const parsed = (0, oxc_parser_1.parseSync)('transpile-jsx-source.tsx', currentCode, createModuleParserOptions(sourceType));
+        const error = parsed.errors[0];
+        if (error) {
+            throw new Error(formatParserError(error));
+        }
+        const edits = collectTypeScriptStripEdits(currentCode, parsed.program);
+        if (!edits.length) {
+            reachedStripPassLimit = false;
+            break;
+        }
+        const magic = new magic_string_1.default(currentCode);
+        const passChanged = applyStripEdits(magic, edits);
+        if (!passChanged) {
+            reachedStripPassLimit = false;
+            break;
+        }
+        currentCode = magic.toString();
+        changed = true;
+    }
+    if (reachedStripPassLimit) {
+        const parsed = (0, oxc_parser_1.parseSync)('transpile-jsx-source.tsx', currentCode, createModuleParserOptions(sourceType));
+        const error = parsed.errors[0];
+        if (error) {
+            throw new Error(formatParserError(error));
+        }
+        const remainingEdits = collectTypeScriptStripEdits(currentCode, parsed.program);
+        if (remainingEdits.length) {
+            throw new Error(`[jsx] TypeScript strip did not converge after ${MAX_TYPESCRIPT_STRIP_PASSES} passes (${remainingEdits.length} removable TypeScript nodes remain).`);
+        }
+    }
+    return {
+        code: currentCode,
+        changed,
+    };
+};
 function transpileJsxSource(source, options = {}) {
     const sourceType = options.sourceType ?? 'module';
     const createElementRef = options.createElement ?? 'React.createElement';
@@ -366,23 +407,25 @@ function transpileJsxSource(source, options = {}) {
     if (firstError) {
         throw new Error(formatParserError(firstError));
     }
-    const magic = new magic_string_1.default(source);
-    const stripChanged = typescriptMode === 'strip'
-        ? applyStripEdits(magic, collectTypeScriptStripEdits(source, parsed.program))
-        : false;
     const jsxRoots = collectRootJsxNodes(parsed.program);
-    if (!jsxRoots.length) {
+    const jsxMagic = new magic_string_1.default(source);
+    if (jsxRoots.length) {
+        const builder = new SourceJsxReactBuilder(source, createElementRef, fragmentRef, typescriptMode === 'strip');
+        jsxRoots.sort(compareByRangeStartDesc).forEach(node => {
+            jsxMagic.overwrite(node.range[0], node.range[1], builder.compile(node));
+        });
+    }
+    const jsxCode = jsxRoots.length ? jsxMagic.toString() : source;
+    const jsxChanged = jsxRoots.length > 0;
+    if (typescriptMode !== 'strip') {
         return {
-            code: stripChanged ? magic.toString() : source,
-            changed: stripChanged,
+            code: jsxCode,
+            changed: jsxChanged,
         };
     }
-    const builder = new SourceJsxReactBuilder(source, createElementRef, fragmentRef, typescriptMode === 'strip');
-    jsxRoots.sort(compareByRangeStartDesc).forEach(node => {
-        magic.overwrite(node.range[0], node.range[1], builder.compile(node));
-    });
+    const stripResult = stripTypeScriptSyntax(jsxCode, sourceType);
     return {
-        code: magic.toString(),
-        changed: true,
+        code: stripResult.code,
+        changed: jsxChanged || stripResult.changed,
     };
 }

package/dist/transpile.js

@@ -244,6 +244,7 @@ const collectRootJsxNodes = (root) => {
     walk(root, false);
     return nodes;
 };
+const MAX_TYPESCRIPT_STRIP_PASSES = 5;
 const hasStringProperty = (value, key) => isObjectRecord(value) && typeof value[key] === 'string';
 const hasSourceAndExpressionRanges = (value) => isObjectRecord(value) &&
     typeof value.type === 'string' &&
@@ -350,6 +351,46 @@ const applyStripEdits = (magic, edits) => {
     });
     return changed;
 };
+const stripTypeScriptSyntax = (source, sourceType) => {
+    let currentCode = source;
+    let changed = false;
+    let reachedStripPassLimit = true;
+    for (let pass = 0; pass < MAX_TYPESCRIPT_STRIP_PASSES; pass += 1) {
+        const parsed = parseSync('transpile-jsx-source.tsx', currentCode, createModuleParserOptions(sourceType));
+        const error = parsed.errors[0];
+        if (error) {
+            throw new Error(formatParserError(error));
+        }
+        const edits = collectTypeScriptStripEdits(currentCode, parsed.program);
+        if (!edits.length) {
+            reachedStripPassLimit = false;
+            break;
+        }
+        const magic = new MagicString(currentCode);
+        const passChanged = applyStripEdits(magic, edits);
+        if (!passChanged) {
+            reachedStripPassLimit = false;
+            break;
+        }
+        currentCode = magic.toString();
+        changed = true;
+    }
+    if (reachedStripPassLimit) {
+        const parsed = parseSync('transpile-jsx-source.tsx', currentCode, createModuleParserOptions(sourceType));
+        const error = parsed.errors[0];
+        if (error) {
+            throw new Error(formatParserError(error));
+        }
+        const remainingEdits = collectTypeScriptStripEdits(currentCode, parsed.program);
+        if (remainingEdits.length) {
+            throw new Error(`[jsx] TypeScript strip did not converge after ${MAX_TYPESCRIPT_STRIP_PASSES} passes (${remainingEdits.length} removable TypeScript nodes remain).`);
+        }
+    }
+    return {
+        code: currentCode,
+        changed,
+    };
+};
 export function transpileJsxSource(source, options = {}) {
     const sourceType = options.sourceType ?? 'module';
     const createElementRef = options.createElement ?? 'React.createElement';
@@ -360,23 +401,25 @@ export function transpileJsxSource(source, options = {}) {
     if (firstError) {
         throw new Error(formatParserError(firstError));
     }
-    const magic = new MagicString(source);
-    const stripChanged = typescriptMode === 'strip'
-        ? applyStripEdits(magic, collectTypeScriptStripEdits(source, parsed.program))
-        : false;
     const jsxRoots = collectRootJsxNodes(parsed.program);
-    if (!jsxRoots.length) {
+    const jsxMagic = new MagicString(source);
+    if (jsxRoots.length) {
+        const builder = new SourceJsxReactBuilder(source, createElementRef, fragmentRef, typescriptMode === 'strip');
+        jsxRoots.sort(compareByRangeStartDesc).forEach(node => {
+            jsxMagic.overwrite(node.range[0], node.range[1], builder.compile(node));
+        });
+    }
+    const jsxCode = jsxRoots.length ? jsxMagic.toString() : source;
+    const jsxChanged = jsxRoots.length > 0;
+    if (typescriptMode !== 'strip') {
         return {
-            code: stripChanged ? magic.toString() : source,
-            changed: stripChanged,
+            code: jsxCode,
+            changed: jsxChanged,
         };
     }
-    const builder = new SourceJsxReactBuilder(source, createElementRef, fragmentRef, typescriptMode === 'strip');
-    jsxRoots.sort(compareByRangeStartDesc).forEach(node => {
-        magic.overwrite(node.range[0], node.range[1], builder.compile(node));
-    });
+    const stripResult = stripTypeScriptSyntax(jsxCode, sourceType);
     return {
-        code: magic.toString(),
-        changed: true,
+        code: stripResult.code,
+        changed: jsxChanged || stripResult.changed,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/jsx",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "Runtime JSX tagged template that renders DOM or React trees anywhere with or without a build step.",
   "keywords": [
     "jsx runtime",