ts-arc 1.2.7 → 1.2.9

package/dist/loader.js

@@ -305,18 +305,31 @@ function addMetadataDecorators(code) {
 async function resolve2(specifier, context, nextResolve) {
   let parentPath = process.cwd();
   if (context.parentURL) {
-    parentPath = path.dirname(url.fileURLToPath(context.parentURL));
+    const parentUrl = new URL(context.parentURL);
+    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();
+      }
+    } else {
+      parentPath = process.cwd();
+    }
   }
   if (specifier.startsWith("copycat://")) {
     const u = new URL(specifier);
-    const as = u.searchParams.get("as");
-    if (!as) {
-      throw new Error("Copycat file URI is missing the `as` searchparam.");
+    const real = u.searchParams.get("real");
+    if (!real) {
+      throw new Error("Copycat file URI is missing the `real` searchparam.");
     }
-    const asPath = path.resolve(as);
+    const realPath = path.resolve(real);
     const out = new URL(specifier);
-    out.pathname = asPath;
-    out.searchParams.set("as", asPath);
+    out.pathname = realPath;
+    out.searchParams.set("real", realPath);
+    out.searchParams.set("copycat", "true");
     return {
       url: out.href,
       shortCircuit: true
@@ -381,19 +394,18 @@ async function load(urlStr, context, nextLoad) {
   });
 }
 function loadSync(urlStr, context, nextLoadSync) {
-  {
-    const u = new URL(urlStr);
-    const isCopycat = u.searchParams.get("copycat") === "1";
-    const asPath = u.searchParams.get("as");
-    const filePath = url.fileURLToPath(u.origin + u.pathname);
-    const code = fs.readFileSync(filePath, "utf8");
-    if (isCopycat) {
-      return {
-        format: "module",
-        source: code,
-        shortCircuit: true
-      };
+  const u = new URL(urlStr);
+  if (u.searchParams.has("copycat")) {
+    const real = u.searchParams.get("real");
+    if (!real) {
+      throw new Error("Copycat file URI is missing the `real` searchparam.");
     }
+    const code = fs.readFileSync(decodeURI(real), "utf8");
+    return {
+      format: "module",
+      source: code,
+      shortCircuit: true
+    };
   }
   if (urlStr.endsWith(".ts") || urlStr.endsWith(".tsx")) {
     const esbuildLoader = urlStr.endsWith(".tsx") ? "tsx" : "ts";

package/package.json

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