ts-arc 1.3.0 → 1.3.2

package/dist/loader.js

@@ -309,12 +309,7 @@ async function resolve2(specifier, context, nextResolve) {
     if (parentUrl.protocol === "file:") {
       parentPath = path.dirname(url.fileURLToPath(parentUrl));
     } else if (parentUrl.protocol === "copycat:") {
-      const as = parentUrl.searchParams.get("as");
-      if (as && typeof as === "string") {
-        parentPath = path.dirname(as);
-      } else {
-        parentPath = process.cwd();
-      }
+      parentPath = path.dirname(parentUrl.pathname);
     } else {
       parentPath = process.cwd();
     }
@@ -325,11 +320,11 @@ async function resolve2(specifier, context, nextResolve) {
     if (!real) {
       throw new Error("Copycat file URI is missing the `real` searchparam.");
     }
-    const realPath = path.resolve(real);
-    const out = new URL(specifier);
-    out.pathname = realPath;
-    out.searchParams.set("real", realPath);
+    const pretendPath = path.resolve(u.pathname);
+    const fileUrl = url.pathToFileURL(pretendPath).href;
+    const out = new URL(fileUrl);
     out.searchParams.set("copycat", "true");
+    out.searchParams.set("real", real);
     return {
       url: out.href,
       shortCircuit: true
@@ -396,11 +391,12 @@ async function load(urlStr, context, nextLoad) {
 function loadSync(urlStr, context, nextLoadSync) {
   const u = new URL(urlStr);
   if (u.searchParams.has("copycat")) {
-    const real = u.searchParams.get("real");
-    if (!real) {
+    const realEncoded = u.searchParams.get("real");
+    if (!realEncoded) {
       throw new Error("Copycat file URI is missing the `real` searchparam.");
     }
-    const code = fs.readFileSync(decodeURI(real), "utf8");
+    const realPath = decodeURIComponent(realEncoded);
+    const code = fs.readFileSync(realPath, "utf8");
     return {
       format: "module",
       source: code,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ts-arc",
-    "version": "1.3.0",
+    "version": "1.3.2",
     "type": "module",
     "description": "A simple typescript runtime.",
     "main": "dist/bin.js",