@granite-js/plugin-hermes 3.0.3 → 3.0.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @granite-js/plugin-hermes
 
+## 3.0.4
+
+### Patch Changes
+
+- 5cb1506: handle missing sourcemap locations
+  - @granite-js/plugin-core@3.0.4
+  - @granite-js/utils@3.0.4
+
 ## 3.0.3
 
 ### Patch Changes

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_resolveHermesBinaryPath = require('./resolveHermesBinaryPath-jlhzRycN.cjs');
+const require_resolveHermesBinaryPath = require('./resolveHermesBinaryPath-BH1a-HVW.cjs');
 let node_path = require("node:path");
 node_path = require_resolveHermesBinaryPath.__toESM(node_path);
 

package/dist/index.js

@@ -1,4 +1,4 @@
-import { n as writeComposedSourcemap, r as compileHbc, t as resolveHermesBinaryPath } from "./resolveHermesBinaryPath-DwwS_er8.js";
+import { n as writeComposedSourcemap, r as compileHbc, t as resolveHermesBinaryPath } from "./resolveHermesBinaryPath-g1hQbUmU.js";
 import * as path from "node:path";
 
 //#region src/next/index.ts

package/dist/mpack.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_resolveHermesBinaryPath = require('./resolveHermesBinaryPath-jlhzRycN.cjs');
+const require_resolveHermesBinaryPath = require('./resolveHermesBinaryPath-BH1a-HVW.cjs');
 let _granite_js_plugin_core = require("@granite-js/plugin-core");
 
 //#region src/hermesPlugin.ts

package/dist/mpack.js

@@ -1,4 +1,4 @@
-import { n as writeComposedSourcemap, r as compileHbc, t as resolveHermesBinaryPath } from "./resolveHermesBinaryPath-DwwS_er8.js";
+import { n as writeComposedSourcemap, r as compileHbc, t as resolveHermesBinaryPath } from "./resolveHermesBinaryPath-g1hQbUmU.js";
 import { isBuildSuccess } from "@granite-js/plugin-core";
 
 //#region src/hermesPlugin.ts

package/dist/{resolveHermesBinaryPath-jlhzRycN.cjs → resolveHermesBinaryPath-BH1a-HVW.cjs}

@@ -32,6 +32,7 @@ let execa = require("execa");
 execa = __toESM(execa);
 let fs_promises = require("fs/promises");
 fs_promises = __toESM(fs_promises);
+let _jridgewell_sourcemap_codec = require("@jridgewell/sourcemap-codec");
 let source_map = require("source-map");
 let node_fs = require("node:fs");
 node_fs = __toESM(node_fs);
@@ -76,11 +77,27 @@ async function writeComposedSourcemap(jsSourcemapPath, hbcSourcemapPath) {
 }
 async function composeSourcemap(jsSourcemapPath, hbcSourcemapPath) {
 	const [jsSourceMapContent, hbcSourceMapContent] = await Promise.all([fs_promises.readFile(jsSourcemapPath, "utf8"), fs_promises.readFile(hbcSourcemapPath, "utf8")]);
-	const jsMapConsumer = await new source_map.SourceMapConsumer(jsSourceMapContent);
-	const hermesMapConsumer = await new source_map.SourceMapConsumer(hbcSourceMapContent);
-	const generator = source_map.SourceMapGenerator.fromSourceMap(hermesMapConsumer);
-	generator.applySourceMap(jsMapConsumer, hermesMapConsumer.sources[0]);
-	return generator.toString();
+	return source_map.SourceMapConsumer.with(jsSourceMapContent, null, (jsMapConsumer) => source_map.SourceMapConsumer.with(normalizeHermesLocations(hbcSourceMapContent), null, (hermesMapConsumer) => {
+		const generator = source_map.SourceMapGenerator.fromSourceMap(hermesMapConsumer);
+		generator.applySourceMap(jsMapConsumer, hermesMapConsumer.sources[0]);
+		return generator.toString();
+	}));
+}
+function normalizeHermesLocations(content) {
+	const map = JSON.parse(content);
+	const mappings = (0, _jridgewell_sourcemap_codec.decode)(map.mappings);
+	let changed = false;
+	for (const line of mappings) for (let index = 0; index < line.length; index++) {
+		const segment = line[index];
+		if (segment.length === 4 && segment[1] >= 0 && segment[1] < map.sources.length && segment[2] === -1 && segment[3] === -1) {
+			line[index] = [segment[0]];
+			changed = true;
+		}
+	}
+	return changed ? JSON.stringify({
+		...map,
+		mappings: (0, _jridgewell_sourcemap_codec.encode)(mappings)
+	}) : content;
 }
 
 //#endregion

package/dist/{resolveHermesBinaryPath-DwwS_er8.js → resolveHermesBinaryPath-g1hQbUmU.js}

@@ -3,6 +3,7 @@ import * as path from "node:path";
 import { isNotNil } from "es-toolkit";
 import execa from "execa";
 import * as fs$1 from "fs/promises";
+import { decode, encode } from "@jridgewell/sourcemap-codec";
 import { SourceMapConsumer, SourceMapGenerator } from "source-map";
 import * as fs from "node:fs";
 import { getPackageRoot } from "@granite-js/utils";
@@ -50,11 +51,27 @@ async function writeComposedSourcemap(jsSourcemapPath, hbcSourcemapPath) {
 }
 async function composeSourcemap(jsSourcemapPath, hbcSourcemapPath) {
 	const [jsSourceMapContent, hbcSourceMapContent] = await Promise.all([fs$1.readFile(jsSourcemapPath, "utf8"), fs$1.readFile(hbcSourcemapPath, "utf8")]);
-	const jsMapConsumer = await new SourceMapConsumer(jsSourceMapContent);
-	const hermesMapConsumer = await new SourceMapConsumer(hbcSourceMapContent);
-	const generator = SourceMapGenerator.fromSourceMap(hermesMapConsumer);
-	generator.applySourceMap(jsMapConsumer, hermesMapConsumer.sources[0]);
-	return generator.toString();
+	return SourceMapConsumer.with(jsSourceMapContent, null, (jsMapConsumer) => SourceMapConsumer.with(normalizeHermesLocations(hbcSourceMapContent), null, (hermesMapConsumer) => {
+		const generator = SourceMapGenerator.fromSourceMap(hermesMapConsumer);
+		generator.applySourceMap(jsMapConsumer, hermesMapConsumer.sources[0]);
+		return generator.toString();
+	}));
+}
+function normalizeHermesLocations(content) {
+	const map = JSON.parse(content);
+	const mappings = decode(map.mappings);
+	let changed = false;
+	for (const line of mappings) for (let index = 0; index < line.length; index++) {
+		const segment = line[index];
+		if (segment.length === 4 && segment[1] >= 0 && segment[1] < map.sources.length && segment[2] === -1 && segment[3] === -1) {
+			line[index] = [segment[0]];
+			changed = true;
+		}
+	}
+	return changed ? JSON.stringify({
+		...map,
+		mappings: encode(mappings)
+	}) : content;
 }
 
 //#endregion

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@granite-js/plugin-hermes",
   "type": "module",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "Hermes compilation plugin for Granite",
   "scripts": {
     "prepack": "yarn build",
@@ -52,8 +52,9 @@
     "vitest": "^4.0.12"
   },
   "dependencies": {
-    "@granite-js/plugin-core": "3.0.3",
-    "@granite-js/utils": "3.0.3",
+    "@granite-js/plugin-core": "3.0.4",
+    "@granite-js/utils": "3.0.4",
+    "@jridgewell/sourcemap-codec": "^1.5.5",
     "es-toolkit": "^1.39.8",
     "execa": "^5",
     "source-map": "^0.8.0-beta.0"