@rust-js/build 0.0.1 → 0.0.2

package/build.js

@@ -161,16 +161,22 @@ export function createNativeBuilder({ root, rustJs = findCompiler(root), resourc
     return { flags, react };
   }
 
+  // The Rust a Cargo build runs: the compiler's, as it says it was built
+  // with, as an app in Cargo mode has no resources; without a compiler, the
+  // resources' pin, for the committed JS's fallback.
+  const toolchain = async () => (existsSync(rustJs) ? (await compilerIdentity()).toolchain : pinned());
+
   return {
-    /** A Cargo workspace's check (ADR 0101), with the pinned toolchain, this
-     * compiler, and the React the project has installed. */
+    /** A Cargo workspace's check (ADR 0101), with the compiler's toolchain,
+     * this compiler, and the React the project has installed. */
     async checkCargo(options) {
-      checkRuntime(root, (await compilerIdentity()).version);
-      return checkCargo({ ...options, toolchain: pinned(), compiler: rustJs, react: installedReact(root) ?? undefined });
+      const identity = await compilerIdentity();
+      checkRuntime(root, identity.version);
+      return checkCargo({ ...options, toolchain: identity.toolchain, compiler: rustJs, react: installedReact(root) ?? undefined });
     },
     /** The workspace of a Cargo manifest, and its target directory. */
-    cargoWorkspace(options) {
-      return cargoWorkspace({ ...options, toolchain: pinned() });
+    async cargoWorkspace(options) {
+      return cargoWorkspace({ ...options, toolchain: await toolchain() });
     },
     watchFiles: [...metadataInputs, ...(bindings.length ? [join(repo, "package.json")] : []), ...compilerInputs, ...Object.values(externs)],
     prepare,

package/cargo.js

@@ -5,7 +5,7 @@ import { execFile } from "node:child_process";
 import { createHash } from "node:crypto";
 import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
-import { dirname, join, relative, resolve, sep } from "node:path";
+import { basename, dirname, join, relative, resolve, sep } from "node:path";
 import { promisify } from "node:util";
 
 import { fingerprint } from "./publish.js";
@@ -195,15 +195,20 @@ export function writeInSource(manifests) {
   for (const { modules } of manifests) {
     for (const { file, map } of modules) {
       const to = moved.get(file);
-      const text = readFileSync(file, "utf8").replace(/((?:from|import)\s*\(?\s*)"(\.{1,2}\/[^"]+)"/g, (whole, lead, spec) => {
-        const target = moved.get(resolve(dirname(file), spec));
-        if (!target) return whole;
-        const path = relative(dirname(to), target);
-        return `${lead}"${path.startsWith(".") ? path : `./${path}`}"`;
-      });
+      const text = readFileSync(file, "utf8")
+        .replace(/((?:from|import)\s*\(?\s*)"(\.{1,2}\/[^"]+)"/g, (whole, lead, spec) => {
+          const target = moved.get(resolve(dirname(file), spec));
+          if (!target) return whole;
+          const path = relative(dirname(to), target);
+          return `${lead}"${path.startsWith(".") ? path : `./${path}`}"`;
+        })
+        // Its map is beside it, by its name now, where a root of another
+        // name, `src/App.rs`'s, was written as the build's `lib.js`.
+        .replace(/^\/\/# sourceMappingURL=\S+$/m, `//# sourceMappingURL=${basename(to)}.map`);
       write(to, text);
       if (map && existsSync(map)) {
         const json = JSON.parse(readFileSync(map, "utf8"));
+        json.file = basename(to);
         json.sources = (json.sources ?? []).map((path) => relative(dirname(to), resolve(dirname(map), path)));
         write(`${to}.map`, JSON.stringify(json));
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rust-js/build",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "type": "module",
   "description": "Build preparation, manifests, and publication for rust-js hosts.",
   "license": "MIT",