@tscircuit/cli 0.1.183 → 0.1.184

package/dist/main.js

@@ -434909,7 +434909,7 @@ var getGlobalDepsInstallCommand = (packageManager, deps) => {
 import { execSync as execSync2 } from "node:child_process";
 var import_semver2 = __toESM2(require_semver2(), 1);
 // package.json
-var version = "0.1.182";
+var version = "0.1.183";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -438460,59 +438460,128 @@ import * as path16 from "node:path";
 // lib/shared/get-entrypoint.ts
 import * as fs12 from "node:fs";
 import * as path13 from "node:path";
+var ALLOWED_ENTRYPOINT_NAMES = Object.freeze([
+  "index.tsx",
+  "index.ts",
+  "index.circuit.tsx",
+  "main.tsx",
+  "main.circuit.tsx"
+]);
+var MAX_SEARCH_DEPTH = 3;
+var MAX_RESULTS = 100;
+var isValidDirectory = (dirPath, projectDir) => {
+  const resolvedDir = path13.resolve(dirPath);
+  const resolvedProject = path13.resolve(projectDir);
+  return resolvedDir.startsWith(resolvedProject) && !resolvedDir.includes("..");
+};
+var findEntrypointsRecursively = (dir, projectDir, maxDepth = MAX_SEARCH_DEPTH, fileNames = ALLOWED_ENTRYPOINT_NAMES) => {
+  if (maxDepth <= 0 || !isValidDirectory(dir, projectDir)) {
+    return [];
+  }
+  const results = [];
+  try {
+    const entries = fs12.readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (results.length >= MAX_RESULTS)
+        break;
+      if (entry.isFile() && fileNames.includes(entry.name)) {
+        const filePath = path13.resolve(dir, entry.name);
+        if (isValidDirectory(filePath, projectDir)) {
+          results.push(filePath);
+        }
+      }
+    }
+    for (const entry of entries) {
+      if (results.length >= MAX_RESULTS)
+        break;
+      if (entry.isDirectory() && !entry.name.startsWith(".") && entry.name !== "node_modules") {
+        const subdirPath = path13.resolve(dir, entry.name);
+        if (isValidDirectory(subdirPath, projectDir)) {
+          results.push(...findEntrypointsRecursively(subdirPath, projectDir, maxDepth - 1, fileNames));
+        }
+      }
+    }
+  } catch {
+    return [];
+  }
+  return results;
+};
+var validateProjectDir = (projectDir) => {
+  const resolvedDir = path13.resolve(projectDir);
+  if (!fs12.existsSync(resolvedDir)) {
+    throw new Error(`Project directory does not exist: ${projectDir}`);
+  }
+  return resolvedDir;
+};
+var validateFilePath = (filePath, projectDir) => {
+  const absolutePath = path13.resolve(projectDir, filePath);
+  if (!absolutePath.startsWith(path13.resolve(projectDir))) {
+    return null;
+  }
+  if (absolutePath.includes("..")) {
+    return null;
+  }
+  return fs12.existsSync(absolutePath) ? absolutePath : null;
+};
 var getEntrypoint = async ({
   filePath,
   projectDir = process.cwd(),
   onSuccess = (message) => console.log(message),
   onError = (message) => console.error(message)
 }) => {
-  if (filePath) {
-    const absolutePath = path13.resolve(projectDir, filePath);
-    if (fs12.existsSync(absolutePath)) {
-      onSuccess(`Using provided file: '${path13.relative(projectDir, absolutePath)}'`);
-      return absolutePath;
+  try {
+    const validatedProjectDir = validateProjectDir(projectDir);
+    if (filePath) {
+      const validatedPath = validateFilePath(filePath, validatedProjectDir);
+      if (validatedPath) {
+        const relativePath = path13.relative(validatedProjectDir, validatedPath);
+        onSuccess(`Using provided file: '${relativePath}'`);
+        return validatedPath;
+      }
+      onError(kleur_default.red(`File not found or invalid: '${filePath}'`));
+      return null;
     }
-    onError(kleur_default.red(`File not found: '${filePath}'`));
-    return null;
-  }
-  const projectConfig = loadProjectConfig(projectDir);
-  if (projectConfig?.mainEntrypoint) {
-    const configEntrypoint = path13.resolve(projectDir, projectConfig.mainEntrypoint);
-    if (fs12.existsSync(configEntrypoint)) {
-      onSuccess(`Using entrypoint from tscircuit.config.json: '${path13.relative(projectDir, configEntrypoint)}'`);
-      return configEntrypoint;
-    }
-  }
-  const possibleEntrypoints = [
-    path13.resolve(projectDir, "index.tsx"),
-    path13.resolve(projectDir, "index.ts"),
-    path13.resolve(projectDir, "index.circuit.tsx"),
-    path13.resolve(projectDir, "main.tsx"),
-    path13.resolve(projectDir, "main.circuit.tsx"),
-    path13.resolve(projectDir, "lib/index.tsx"),
-    path13.resolve(projectDir, "lib/index.ts"),
-    path13.resolve(projectDir, "lib/index.circuit.tsx"),
-    path13.resolve(projectDir, "lib/main.tsx"),
-    path13.resolve(projectDir, "lib/main.circuit.tsx"),
-    path13.resolve(projectDir, "src/index.tsx"),
-    path13.resolve(projectDir, "src/index.ts"),
-    path13.resolve(projectDir, "src/index.circuit.tsx"),
-    path13.resolve(projectDir, "src/main.tsx"),
-    path13.resolve(projectDir, "src/main.circuit.tsx")
-  ];
-  let detectedEntrypoint = null;
-  for (const entrypoint of possibleEntrypoints) {
-    if (fs12.existsSync(entrypoint)) {
-      detectedEntrypoint = entrypoint;
-      const relativePath = path13.relative(projectDir, entrypoint);
-      onSuccess(`Detected entrypoint: '${relativePath}'`);
-      break;
+    const projectConfig = loadProjectConfig(validatedProjectDir);
+    if (projectConfig?.mainEntrypoint && typeof projectConfig.mainEntrypoint === "string") {
+      const validatedConfigPath = validateFilePath(projectConfig.mainEntrypoint, validatedProjectDir);
+      if (validatedConfigPath) {
+        const relativePath = path13.relative(validatedProjectDir, validatedConfigPath);
+        onSuccess(`Using entrypoint from tscircuit.config.json: '${relativePath}'`);
+        return validatedConfigPath;
+      }
+    }
+    const commonLocations = [
+      "index.tsx",
+      "index.ts",
+      "index.circuit.tsx",
+      "main.tsx",
+      "main.circuit.tsx",
+      "lib/index.tsx",
+      "lib/index.ts",
+      "lib/index.circuit.tsx",
+      "lib/main.tsx",
+      "lib/main.circuit.tsx",
+      "src/index.tsx",
+      "src/index.ts",
+      "src/index.circuit.tsx",
+      "src/main.tsx",
+      "src/main.circuit.tsx"
+    ].map((location) => path13.resolve(validatedProjectDir, location));
+    const recursiveEntrypoints = findEntrypointsRecursively(validatedProjectDir, validatedProjectDir);
+    const possibleEntrypoints = [...commonLocations, ...recursiveEntrypoints];
+    for (const entrypoint of possibleEntrypoints) {
+      if (fs12.existsSync(entrypoint) && isValidDirectory(entrypoint, validatedProjectDir)) {
+        const relativePath = path13.relative(validatedProjectDir, entrypoint);
+        onSuccess(`Detected entrypoint: '${relativePath}'`);
+        return entrypoint;
+      }
     }
-  }
-  if (!detectedEntrypoint) {
     onError(kleur_default.red("No entrypoint found. Run 'tsci init' to bootstrap a basic project or specify a file with 'tsci push <file>'"));
+    return null;
+  } catch (error) {
+    onError(kleur_default.red(`Error detecting entrypoint: ${error instanceof Error ? error.message : "Unknown error"}`));
+    return null;
   }
-  return detectedEntrypoint;
 };
 
 // lib/utils/get-unscoped-package-name.ts
@@ -439339,11 +439408,12 @@ class DevServer {
   typesHandler;
   constructor({
     port,
-    componentFilePath
+    componentFilePath,
+    projectDir
   }) {
     this.port = port;
     this.componentFilePath = componentFilePath;
-    this.projectDir = path18.dirname(componentFilePath);
+    this.projectDir = projectDir ?? path18.dirname(componentFilePath);
     const projectConfig = loadProjectConfig(this.projectDir);
     this.ignoredFiles = projectConfig?.ignoredFiles ?? [];
     this.fsKy = distribution_default.create({
@@ -439565,7 +439635,8 @@ var registerDev = (program3) => {
     }
     const server2 = new DevServer({
       port,
-      componentFilePath: absolutePath
+      componentFilePath: absolutePath,
+      projectDir: process.cwd()
     });
     await server2.start();
     const timeToStart = Date.now() - startTime;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.183",
+  "version": "0.1.184",
   "main": "dist/main.js",
   "devDependencies": {
     "@babel/standalone": "^7.26.9",