ts-arc 1.2.8 → 1.3.0

package/dist/bin.js

@@ -120,7 +120,7 @@ async function loadModule(scriptUrl) {
   const scriptPath = url.fileURLToPath(scriptUrl);
   setArcTsConfig(path.dirname(scriptPath));
   registerLoader();
-  import(scriptUrl).catch((err) => {
+  await import(scriptUrl).catch((err) => {
     console.error(err);
     process.exit(1);
   });

package/dist/cli.js

@@ -1,20 +1,26 @@
 #!/usr/bin/env node
-
-// src/cli.ts
-import * as path2 from "node:path";
-import * as url2 from "node:url";
+var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __esm = (fn, res) => function __init() {
+  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+};
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 
 // src/bin.ts
+var bin_exports = {};
+__export(bin_exports, {
+  loadModule: () => loadModule,
+  registerLoader: () => registerLoader,
+  setArcTsConfig: () => setArcTsConfig
+});
 import * as fs from "node:fs";
 import { register } from "node:module";
 import { createRequire } from "node:module";
 import * as path from "node:path";
 import * as url from "node:url";
-var __filename = url.fileURLToPath(import.meta.url);
-var __dirname = path.dirname(__filename);
-var loaderPath = path.join(__dirname, "loader.js");
-var loaderUrl = url.pathToFileURL(loaderPath).href;
-var require2 = createRequire(import.meta.url);
 function stripJsonComments(input) {
   let output = "";
   let insideString = false;
@@ -86,25 +92,6 @@ function findTsConfig(dir) {
   }
   return null;
 }
-var tsArcConfig = {
-  baseUrl: null,
-  paths: {},
-  tsconfigDir: null,
-  emitDecoratorMetadata: false,
-  experimentalDecorators: false
-};
-var tsconfigPath = findTsConfig(process.cwd());
-if (tsconfigPath) {
-  const mergedConfig = loadConfig(tsconfigPath);
-  const compilerOptions = mergedConfig.compilerOptions || {};
-  const tsconfigDir = path.dirname(tsconfigPath);
-  const baseUrlStr = compilerOptions.baseUrl;
-  tsArcConfig.baseUrl = baseUrlStr ? path.resolve(tsconfigDir, baseUrlStr) : null;
-  tsArcConfig.paths = compilerOptions.paths || {};
-  tsArcConfig.tsconfigDir = tsconfigDir;
-  tsArcConfig.emitDecoratorMetadata = compilerOptions.emitDecoratorMetadata || false;
-  tsArcConfig.experimentalDecorators = compilerOptions.experimentalDecorators || false;
-}
 function registerLoader() {
   register(loaderPath, import.meta.url, { data: tsArcConfig });
 }
@@ -122,25 +109,100 @@ async function setArcTsConfig(directory) {
     tsArcConfig.experimentalDecorators = compilerOptions.experimentalDecorators || false;
   }
 }
-async function loadModule(scriptUrl2) {
-  const scriptPath2 = url.fileURLToPath(scriptUrl2);
-  setArcTsConfig(path.dirname(scriptPath2));
+async function loadModule(scriptUrl) {
+  const scriptPath = url.fileURLToPath(scriptUrl);
+  setArcTsConfig(path.dirname(scriptPath));
   registerLoader();
-  import(scriptUrl2).catch((err) => {
+  await import(scriptUrl).catch((err) => {
     console.error(err);
     process.exit(1);
   });
 }
+var __filename, __dirname, loaderPath, loaderUrl, require2, tsArcConfig, tsconfigPath;
+var init_bin = __esm({
+  "src/bin.ts"() {
+    __filename = url.fileURLToPath(import.meta.url);
+    __dirname = path.dirname(__filename);
+    loaderPath = path.join(__dirname, "loader.js");
+    loaderUrl = url.pathToFileURL(loaderPath).href;
+    require2 = createRequire(import.meta.url);
+    tsArcConfig = {
+      baseUrl: null,
+      paths: {},
+      tsconfigDir: null,
+      emitDecoratorMetadata: false,
+      experimentalDecorators: false
+    };
+    tsconfigPath = findTsConfig(process.cwd());
+    if (tsconfigPath) {
+      const mergedConfig = loadConfig(tsconfigPath);
+      const compilerOptions = mergedConfig.compilerOptions || {};
+      const tsconfigDir = path.dirname(tsconfigPath);
+      const baseUrlStr = compilerOptions.baseUrl;
+      tsArcConfig.baseUrl = baseUrlStr ? path.resolve(tsconfigDir, baseUrlStr) : null;
+      tsArcConfig.paths = compilerOptions.paths || {};
+      tsArcConfig.tsconfigDir = tsconfigDir;
+      tsArcConfig.emitDecoratorMetadata = compilerOptions.emitDecoratorMetadata || false;
+      tsArcConfig.experimentalDecorators = compilerOptions.experimentalDecorators || false;
+    }
+  }
+});
 
 // src/cli.ts
-var script = process.argv[2];
-if (!script) {
-  console.error("Usage: ts-arc <script.ts> [args...]");
-  process.exit(1);
+import * as path2 from "node:path";
+import * as url2 from "node:url";
+import * as child_process from "node:child_process";
+var __filename2 = url2.fileURLToPath(import.meta.url);
+var __dirname2 = path2.dirname(__filename2);
+var CHILD_ENV_VAR = "TS_ARC_IS_CHILD";
+if (process.env[CHILD_ENV_VAR] !== "1") {
+  const script = process.argv[2];
+  if (!script) {
+    console.error("Usage: ts-arc <script.ts> [args...]");
+    process.exit(1);
+  }
+  const loaderPath2 = path2.join(__dirname2, "loader.js");
+  const loaderUrl2 = url2.pathToFileURL(loaderPath2).href;
+  let childExecArgv = [...process.execArgv];
+  const enableSourceMapsFlag = "--enable-source-maps";
+  if (!childExecArgv.includes(enableSourceMapsFlag)) {
+    childExecArgv.unshift(enableSourceMapsFlag);
+  }
+  const childEnv = {
+    ...process.env,
+    [CHILD_ENV_VAR]: "1"
+  };
+  const spawnArgs = [
+    ...childExecArgv,
+    __filename2,
+    script,
+    ...process.argv.slice(3)
+  ];
+  const result = child_process.spawnSync(
+    process.execPath,
+    spawnArgs,
+    {
+      stdio: "inherit",
+      env: childEnv
+    }
+  );
+  if (result.signal) {
+    process.kill(process.pid, result.signal);
+  }
+  process.exit(result.status ?? 0);
 }
-var scriptPath = path2.resolve(script);
-var scriptUrl = url2.pathToFileURL(scriptPath).href;
-process.argv = [process.argv[0], script, ...process.argv.slice(3)];
 (async () => {
-  await loadModule(scriptUrl);
-})();
+  const script = process.argv[2];
+  if (!script) {
+    console.error("Usage: ts-arc <script.ts> [args...]");
+    process.exit(1);
+  }
+  const scriptPath = path2.resolve(script);
+  const scriptUrl = url2.pathToFileURL(scriptPath).href;
+  process.argv = [process.argv[0], script, ...process.argv.slice(3)];
+  const { loadModule: loadModule2 } = await Promise.resolve().then(() => (init_bin(), bin_exports));
+  await loadModule2(scriptUrl);
+})().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});

package/dist/loader.js

@@ -305,7 +305,19 @@ 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);

package/package.json

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