@secure-exec/typescript 0.1.1-rc.3 → 0.2.0-rc.1

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-import type { NodeRuntimeDriverFactory, SystemDriver } from "secure-exec";
+import type { NodeRuntimeDriverFactory } from "secure-exec";
+import type { SystemDriver } from "@secure-exec/core";
 export interface TypeScriptDiagnostic {
     code: number;
     category: "error" | "warning" | "suggestion" | "message";

package/dist/index.js

@@ -1,26 +1,27 @@
 import { NodeRuntime } from "secure-exec";
 const DEFAULT_COMPILER_RUNTIME_MEMORY_LIMIT = 512;
 const COMPILER_RUNTIME_FILE_PATH = "/root/__secure_exec_typescript_compiler__.js";
+const DEFAULT_COMPILER_SPECIFIER = "/root/node_modules/typescript/lib/typescript.js";
 export function createTypeScriptTools(options) {
     return {
         typecheckProject: async (requestOptions = {}) => runCompilerRequest(options, {
             kind: "typecheckProject",
-            compilerSpecifier: options.compilerSpecifier ?? "typescript",
+            compilerSpecifier: options.compilerSpecifier ?? DEFAULT_COMPILER_SPECIFIER,
             options: requestOptions,
         }),
         compileProject: async (requestOptions = {}) => runCompilerRequest(options, {
             kind: "compileProject",
-            compilerSpecifier: options.compilerSpecifier ?? "typescript",
+            compilerSpecifier: options.compilerSpecifier ?? DEFAULT_COMPILER_SPECIFIER,
             options: requestOptions,
         }),
         typecheckSource: async (requestOptions) => runCompilerRequest(options, {
             kind: "typecheckSource",
-            compilerSpecifier: options.compilerSpecifier ?? "typescript",
+            compilerSpecifier: options.compilerSpecifier ?? DEFAULT_COMPILER_SPECIFIER,
             options: requestOptions,
         }),
         compileSource: async (requestOptions) => runCompilerRequest(options, {
             kind: "compileSource",
-            compilerSpecifier: options.compilerSpecifier ?? "typescript",
+            compilerSpecifier: options.compilerSpecifier ?? DEFAULT_COMPILER_SPECIFIER,
             options: requestOptions,
         }),
     };
@@ -88,7 +89,28 @@ function buildCompilerRuntimeSource(request) {
 function compilerRuntimeMain(request) {
     const fs = require("node:fs");
     const path = require("node:path");
-    const ts = require(request.compilerSpecifier);
+    const ts = loadCompiler(request.compilerSpecifier);
+    function loadCompiler(compilerSpecifier) {
+        const candidates = new Set([compilerSpecifier]);
+        if (compilerSpecifier === "typescript") {
+            candidates.add("/root/node_modules/typescript/lib/typescript.js");
+        }
+        if (compilerSpecifier === "/root/node_modules/typescript/lib/typescript.js") {
+            candidates.add("typescript");
+        }
+        let lastError;
+        for (const candidate of candidates) {
+            try {
+                return require(candidate);
+            }
+            catch (error) {
+                lastError = error;
+            }
+        }
+        throw lastError instanceof Error
+            ? lastError
+            : new Error(`Cannot load TypeScript compiler from '${compilerSpecifier}'`);
+    }
     function toDiagnostic(diagnostic) {
         const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n").trim();
         const result = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@secure-exec/typescript",
-  "version": "0.1.1-rc.3",
+  "version": "0.2.0-rc.1",
   "type": "module",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
@@ -12,7 +12,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/rivet-dev/secure-exec.git",
-    "directory": "packages/secure-exec-typescript"
+    "directory": "packages/typescript"
   },
   "exports": {
     ".": {
@@ -22,7 +22,8 @@
   },
   "dependencies": {
     "typescript": "^5.9.3",
-    "secure-exec": "0.1.1-rc.3"
+    "@secure-exec/core": "0.2.0-rc.1",
+    "secure-exec": "0.2.0-rc.1"
   },
   "devDependencies": {
     "@types/node": "^22.10.2",