@knighted/jsx 1.5.1 → 1.6.0

package/dist/runtime/shared.js

@@ -1,27 +1,29 @@
+export { formatTaggedTemplateParserError } from '../internal/template-diagnostics.js';
 const OPEN_TAG_RE = /<\s*$/;
 const CLOSE_TAG_RE = /<\/\s*$/;
 export const PLACEHOLDER_PREFIX = '__KX_EXPR__';
 export const placeholderPattern = new RegExp(`${PLACEHOLDER_PREFIX}\\d+_\\d+__`, 'g');
 let invocationCounter = 0;
-export const parserOptions = {
-    lang: 'jsx',
-    sourceType: 'module',
-    range: true,
-    preserveParens: true,
-};
 export const formatParserError = (error) => {
     let message = `[oxc-parser] ${error.message}`;
-    if (error.labels?.length) {
-        const label = error.labels[0];
-        if (label.message) {
-            message += `\n${label.message}`;
-        }
+    const primaryLabel = error.labels?.[0];
+    if (primaryLabel?.message) {
+        message += `\n${primaryLabel.message}`;
     }
     if (error.codeframe) {
         message += `\n${error.codeframe}`;
     }
+    if (error.helpMessage) {
+        message += `\n${error.helpMessage}`;
+    }
     return message;
 };
+export const parserOptions = {
+    lang: 'jsx',
+    sourceType: 'module',
+    range: true,
+    preserveParens: true,
+};
 export const extractRootNode = (program) => {
     for (const statement of program.body) {
         if (statement.type === 'ExpressionStatement') {
@@ -171,23 +173,39 @@ export const buildTemplate = (strings, values) => {
     let source = raw[0] ?? '';
     const templateId = invocationCounter++;
     let placeholderIndex = 0;
+    const expressionRanges = [];
     for (let idx = 0; idx < values.length; idx++) {
         const chunk = raw[idx] ?? '';
         const nextChunk = raw[idx + 1] ?? '';
         const value = values[idx];
         const isTagNamePosition = OPEN_TAG_RE.test(chunk) || CLOSE_TAG_RE.test(chunk);
+        let insertion;
         if (isTagNamePosition && typeof value === 'function') {
             const binding = ensureBinding(value, bindings, bindingLookup);
-            source += binding.name + nextChunk;
-            continue;
+            insertion = binding.name;
         }
-        if (isTagNamePosition && typeof value === 'string') {
-            source += value + nextChunk;
-            continue;
+        else if (isTagNamePosition && typeof value === 'string') {
+            insertion = value;
         }
-        const placeholder = `${PLACEHOLDER_PREFIX}${templateId}_${placeholderIndex++}__`;
-        placeholders.set(placeholder, value);
-        source += placeholder + nextChunk;
-    }
-    return { source, placeholders, bindings };
+        else {
+            const placeholder = `${PLACEHOLDER_PREFIX}${templateId}_${placeholderIndex++}__`;
+            placeholders.set(placeholder, value);
+            insertion = placeholder;
+        }
+        const sourceStart = source.length;
+        source += insertion;
+        const sourceEnd = source.length;
+        expressionRanges.push({
+            index: idx,
+            sourceStart,
+            sourceEnd,
+        });
+        source += nextChunk;
+    }
+    return {
+        source,
+        placeholders,
+        bindings,
+        diagnostics: { expressionRanges },
+    };
 };

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@knighted/jsx",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "Runtime JSX tagged template that renders DOM or React trees anywhere without a build step.",
   "keywords": [
     "jsx runtime",
-    "jsx template literal",
     "tagged template",
     "no-build jsx",
-    "dom runtime",
-    "react runtime",
+    "dom rendering",
+    "react rendering",
     "ssr",
-    "lit",
+    "rspack loader",
     "webpack loader",
-    "oxc parser"
+    "wasm parser",
+    "typescript plugin"
   ],
   "type": "module",
   "main": "./dist/index.js",
@@ -36,11 +36,31 @@
       "import": "./dist/jsx-runtime.js",
       "default": "./dist/jsx-runtime.js"
     },
+    "./debug": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/debug/index.js",
+      "default": "./dist/debug/index.js"
+    },
+    "./debug-tools": {
+      "types": "./dist/debug/diagnostics.d.ts",
+      "import": "./dist/debug/diagnostics.js",
+      "default": "./dist/debug/diagnostics.js"
+    },
     "./lite": {
       "types": "./dist/index.d.ts",
       "import": "./dist/lite/index.js",
       "default": "./dist/lite/index.js"
     },
+    "./lite/debug": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/lite/debug/index.js",
+      "default": "./dist/lite/debug/index.js"
+    },
+    "./lite/debug-tools": {
+      "types": "./dist/debug/diagnostics.d.ts",
+      "import": "./dist/lite/debug/diagnostics.js",
+      "default": "./dist/lite/debug/diagnostics.js"
+    },
     "./react": {
       "types": "./dist/react/index.d.ts",
       "import": "./dist/react/index.js",
@@ -56,11 +76,21 @@
       "import": "./dist/node/index.js",
       "default": "./dist/node/index.js"
     },
+    "./node/debug": {
+      "types": "./dist/node/index.d.ts",
+      "import": "./dist/node/debug/index.js",
+      "default": "./dist/node/debug/index.js"
+    },
     "./node/lite": {
       "types": "./dist/node/index.d.ts",
       "import": "./dist/lite/node/index.js",
       "default": "./dist/lite/node/index.js"
     },
+    "./node/lite/debug": {
+      "types": "./dist/node/index.d.ts",
+      "import": "./dist/lite/node/debug/index.js",
+      "default": "./dist/lite/node/debug/index.js"
+    },
     "./node/react": {
       "types": "./dist/node/react/index.d.ts",
       "import": "./dist/node/react/index.js",
@@ -85,9 +115,10 @@
     "build": "duel && npm run build:lite && npm run build:cli",
     "prepare": "husky",
     "precheck-types": "npm run build",
-    "check-types": "npm run check-types:lib && npm run check-types:demo",
+    "check-types": "npm run check-types:lib && npm run check-types:demo && npm run check-types:test",
     "check-types:lib": "tsc --noEmit --project tsconfig.json",
     "check-types:demo": "tsc --noEmit --project examples/browser/tsconfig.json",
+    "check-types:test": "tsc --noEmit --project tsconfig.vitest.json",
     "lint": "eslint src test",
     "cycles": "madge src --circular --extensions ts,tsx,js,jsx --ts-config tsconfig.json",
     "prettier": "prettier -w .",
@@ -103,6 +134,7 @@
     "build:lite": "tsup --config tsup.config.ts",
     "build:cli": "tsup --config tsup.cli.config.ts",
     "setup:wasm": "node scripts/setup-wasm.mjs",
+    "sizecheck": "node scripts/sizecheck.mjs",
     "prepack": "npm run build"
   },
   "devDependencies": {
@@ -162,7 +194,7 @@
   "optionalDependencies": {
     "@oxc-parser/binding-darwin-arm64": "^0.105.0",
     "@oxc-parser/binding-linux-x64-gnu": "^0.105.0",
-    "@oxc-parser/binding-wasm32-wasi": "0.105.0"
+    "@oxc-parser/binding-wasm32-wasi": "^0.105.0"
   },
   "overrides": {
     "module-lookup-amd": {