Renaming

Author: codenem

packages/cli-v3/e2e/compile.ts

@@ -66,8 +66,8 @@ export async function compile(options: CompileOptions) {
   }
 
   const e2eJsProject = new E2EJavascriptProject(config.projectDir, packageManager);
-  const directDependencies = await e2eJsProject.resolveDirectDependencies();
-  console.log("DIRECT DEPS", directDependencies);
+  const directDependenciesMeta = await e2eJsProject.extractDirectDependenciesMeta();
+  console.log("DIRECT DEPS", directDependenciesMeta);
 
   const result = await build({
     stdin: {
@@ -96,7 +96,7 @@ export async function compile(options: CompileOptions) {
       mockServerOnlyPlugin(),
       bundleDependenciesPlugin(
         "workerFacade",
-        directDependencies,
+        directDependenciesMeta,
         config.dependenciesToBundle,
         config.tsconfigPath
       ),
@@ -142,7 +142,7 @@ export async function compile(options: CompileOptions) {
     plugins: [
       bundleDependenciesPlugin(
         "entryPoint.ts",
-        directDependencies,
+        directDependenciesMeta,
         config.dependenciesToBundle,
         config.tsconfigPath
       ),

packages/cli-v3/src/commands/deploy.ts

@@ -1155,7 +1155,7 @@ async function compileProject(
       }
 
       const jsProject = new JavascriptProject(config.projectDir);
-      const directDependencies = await jsProject.resolveDirectDependencies();
+      const directDependenciesMeta = await jsProject.extractDirectDependenciesMeta();
 
       const result = await build({
         stdin: {
@@ -1184,7 +1184,7 @@ async function compileProject(
           mockServerOnlyPlugin(),
           bundleDependenciesPlugin(
             "workerFacade",
-            directDependencies,
+            directDependenciesMeta,
             config.dependenciesToBundle,
             config.tsconfigPath
           ),
@@ -1241,7 +1241,7 @@ async function compileProject(
         plugins: [
           bundleDependenciesPlugin(
             "entryPoint.ts",
-            directDependencies,
+            directDependenciesMeta,
             config.dependenciesToBundle,
             config.tsconfigPath
           ),

packages/cli-v3/src/utilities/build.ts

@@ -5,6 +5,7 @@ import { extname, isAbsolute } from "node:path";
 import tsConfigPaths from "tsconfig-paths";
 import { logger } from "./logger";
 import { escapeImportPath } from "./windows";
+import { DependencyMeta } from "./javascriptProject";
 
 export function mockServerOnlyPlugin(): Plugin {
   return {
@@ -106,13 +107,7 @@ export function workerSetupImportConfigPlugin(configPath?: string): Plugin {
 
 export function bundleDependenciesPlugin(
   buildIdentifier: string,
-  dependencies: Record<
-    string,
-    {
-      version: string;
-      external: boolean;
-    }
-  >,
+  dependencies: Record<string, DependencyMeta>,
   dependenciesToBundle?: Array<string | RegExp>,
   tsconfigPath?: string
 ): Plugin {

packages/cli-v3/src/utilities/javascriptProject.ts

@@ -11,6 +11,7 @@ import { recordSpanException } from "@trigger.dev/core/v3/otel";
 import { flattenAttributes } from "@trigger.dev/core/v3";
 
 export type ResolveOptions = { allowDev: boolean };
+export type DependencyMeta = { version: string; external: boolean };
 
 export class JavascriptProject {
   private _packageJson?: PackageJson;
@@ -94,31 +95,32 @@ export class JavascriptProject {
     }
   }
 
-  async resolveDirectDependencies(): Promise<
-    Record<string, { version: string; external: boolean }>
-  > {
-    return tracer.startActiveSpan("JavascriptProject.resolveInternal", async (span) => {
-      const command = await this.#getCommand();
-
-      span.setAttributes({
-        packageManager: command.name,
-      });
+  async extractDirectDependenciesMeta(): Promise<Record<string, DependencyMeta>> {
+    return tracer.startActiveSpan(
+      "JavascriptProject.extractDirectDependenciesMeta",
+      async (span) => {
+        const command = await this.#getCommand();
 
-      try {
-        return await command.resolveDirectDependencies({
-          cwd: this.projectPath,
+        span.setAttributes({
+          packageManager: command.name,
         });
-      } catch (error) {
-        recordSpanException(span, error);
-        span.end();
 
-        logger.debug(`Failed to resolve internal dependencies using ${command.name}`, {
-          error,
-        });
+        try {
+          return await command.extractDirectDependenciesMeta({
+            cwd: this.projectPath,
+          });
+        } catch (error) {
+          recordSpanException(span, error);
+          span.end();
 
-        throw error;
+          logger.debug(`Failed to resolve internal dependencies using ${command.name}`, {
+            error,
+          });
+
+          throw error;
+        }
       }
-    });
+    );
   }
 
   async resolveAll(
@@ -298,9 +300,9 @@ interface PackageManagerCommands {
 
   installDependencies(options: PackageManagerOptions): Promise<void>;
 
-  resolveDirectDependencies(
+  extractDirectDependenciesMeta(
     options: PackageManagerOptions
-  ): Promise<Record<string, { version: string; external: boolean }>>;
+  ): Promise<Record<string, DependencyMeta>>;
 
   resolveDependencyVersion(
     packageName: string,
@@ -368,12 +370,12 @@ class PNPMCommands implements PackageManagerCommands {
     return results;
   }
 
-  async resolveDirectDependencies(options: PackageManagerOptions) {
+  async extractDirectDependenciesMeta(options: PackageManagerOptions) {
     const result = await this.#listDirectDependencies(options);
 
-    logger.debug(`Resolving direct dependencies using ${this.name}`);
+    logger.debug(`Extracting direct dependencies metadata using ${this.name}`);
 
-    const results: Record<string, { version: string; external: boolean }> = {};
+    const results: Record<string, DependencyMeta> = {};
 
     for (const projectPkg of result) {
       results[projectPkg.name] = { version: projectPkg.version, external: false };
@@ -481,12 +483,12 @@ class NPMCommands implements PackageManagerCommands {
     return results;
   }
 
-  async resolveDirectDependencies(options: PackageManagerOptions) {
+  async extractDirectDependenciesMeta(options: PackageManagerOptions) {
     const result = await this.#listDirectDependencies(options);
 
-    logger.debug(`Resolving direct dependencies using ${this.name}`);
+    logger.debug(`Extracting direct dependencies metadata using ${this.name}`);
 
-    return this.#flattenDirectDependencies(result.dependencies);
+    return this.#flattenDependenciesMeta(result.dependencies);
   }
 
   async #listDirectDependencies(options: PackageManagerOptions) {
@@ -538,17 +540,17 @@ class NPMCommands implements PackageManagerCommands {
     }
   }
 
-  #flattenDirectDependencies(
+  #flattenDependenciesMeta(
     dependencies: Record<string, NpmDependency>
-  ): Record<string, { version: string; external: boolean }> {
-    let results: Record<string, { version: string; external: boolean }> = {};
+  ): Record<string, DependencyMeta> {
+    let results: Record<string, DependencyMeta> = {};
 
     for (const [name, dep] of Object.entries(dependencies)) {
       const { version, resolved, dependencies } = dep;
       results[name] = { version, external: !resolved.startsWith("file:") };
 
       if (dependencies) {
-        results = { ...results, ...this.#flattenDirectDependencies(dependencies) };
+        results = { ...results, ...this.#flattenDependenciesMeta(dependencies) };
       }
     }
 
@@ -612,13 +614,13 @@ class YarnCommands implements PackageManagerCommands {
     return results;
   }
 
-  async resolveDirectDependencies(options: PackageManagerOptions) {
+  async extractDirectDependenciesMeta(options: PackageManagerOptions) {
     const result = await this.#listDirectDependencies(options);
     console.log("LIST DIRECT DEPS", JSON.stringify(result, undefined, 2));
 
-    logger.debug(`Resolving direct dependencies using ${this.name}`);
+    logger.debug(`Extracting direct dependencies metadata using ${this.name}`);
 
-    const results: Record<string, { version: string; external: boolean }> = {};
+    const results: Record<string, DependencyMeta> = {};
 
     // TODO yarn