@catladder/pipeline 1.149.2 → 1.149.4

package/src/context/createComponentContext.ts

@@ -5,11 +5,12 @@ import { DEPLOY_TYPES } from "../deploy";
 import type { DeployConfig, DeployConfigType } from "../deploy/types";
 import type { PipelineType } from "../types";
 import type { Config, PipelineTrigger } from "../types/config";
-import type { ComponentContext, PackageManagerInfo } from "../types/context";
+import type { ComponentContext } from "../types/context";
 import type { PartialDeep } from "../types/utils";
 import { mergeWithMergingArrays } from "../utils";
 import { getEnvironment } from "./getEnvironment";
 import { getEnvironmentContext } from "./getEnvironmentContext";
+import { getPackageManagerInfo } from "../pipeline/packageManager";
 
 export type CreateComponentContextContext = {
   config: Config;
@@ -17,7 +18,6 @@ export type CreateComponentContextContext = {
   env: string;
   pipelineType?: PipelineType;
   trigger?: PipelineTrigger;
-  packageManagerInfo?: PackageManagerInfo;
 };
 
 export const createComponentContext = async (
@@ -29,6 +29,11 @@ export const createComponentContext = async (
     );
   }
 
+  const packageManagerInfo = await getPackageManagerInfo(
+    ctx.config,
+    ctx.componentName,
+  );
+
   const envContext = getEnvironmentContext(ctx);
 
   const componentConfigWithoutDefaults = envContext.envConfigRaw;
@@ -62,7 +67,7 @@ export const createComponentContext = async (
 
     build: {
       dir: dir,
-      packageManagerInfo: ctx.packageManagerInfo,
+      packageManagerInfo: packageManagerInfo,
       config: build,
     },
     deploy: deploy
@@ -72,7 +77,7 @@ export const createComponentContext = async (
       : null,
     componentName: ctx.componentName,
     environment,
-    packageManagerInfo: ctx.packageManagerInfo,
+    packageManagerInfo: packageManagerInfo,
     pipelineType: ctx.pipelineType,
     trigger: ctx.trigger,
   };

package/src/pipeline/createAllJobs.ts

@@ -1,11 +1,13 @@
 import { getAllEnvsByTrigger } from "../config";
+import { createComponentContext } from "../context";
 import type {
   CatladderJobWithContext,
+  ComponentContext,
   Config,
   PipelineTrigger,
   PipelineType,
 } from "../types";
-import { createJobsForComponent } from "./createJobsForComponent";
+import { createJobsForComponentContext } from "./createJobsForComponent";
 
 export type AllCatladderJobs = {
   [componentName: string]: {
@@ -19,11 +21,17 @@ export type AllJobsContext = {
   pipelineType: PipelineType;
 };
 
-export const createAllJobs = async ({
+type AllComponentContext = {
+  [componentName: string]: {
+    [env: string]: ComponentContext;
+  };
+};
+
+const createAllComponentContext = async ({
   config,
   trigger,
   pipelineType,
-}: AllJobsContext): Promise<AllCatladderJobs> => {
+}: AllJobsContext): Promise<AllComponentContext> => {
   return Object.fromEntries(
     await Promise.all(
       Object.keys(config.components).map(async (componentName) => {
@@ -32,17 +40,17 @@ export const createAllJobs = async ({
           componentName,
           Object.fromEntries(
             await Promise.all(
-              envs.map(async (env) => [
-                env,
-
-                await createJobsForComponent({
+              envs.map(async (env) => {
+                const context = await createComponentContext({
                   config,
                   componentName,
                   env,
                   trigger,
                   pipelineType,
-                }),
-              ]),
+                });
+
+                return [env, context];
+              }),
             ),
           ),
         ];
@@ -50,3 +58,30 @@ export const createAllJobs = async ({
     ),
   );
 };
+
+export const createAllJobs = async ({
+  config,
+  trigger,
+  pipelineType,
+}: AllJobsContext): Promise<AllCatladderJobs> => {
+  const allComponentContext = await createAllComponentContext({
+    config,
+    trigger,
+    pipelineType,
+  });
+
+  return Object.fromEntries(
+    Object.entries(allComponentContext).map(([componentName, envs]) => [
+      componentName,
+      Object.fromEntries(
+        Object.entries(envs).map(([env, context]) => [
+          env,
+          createJobsForComponentContext(context).map((job) => ({
+            ...job,
+            context,
+          })),
+        ]),
+      ),
+    ]),
+  );
+};

package/src/pipeline/createJobsForComponent.ts

@@ -1,15 +1,7 @@
-import { isFunction } from "lodash";
 import { BUILD_TYPES } from "../build";
-import type { CreateComponentContextContext } from "../context";
-import { createComponentContext } from "../context";
 import { DEPLOY_TYPES } from "../deploy";
-import type {
-  CatladderJobWithContext,
-  ComponentContext,
-  Context,
-} from "../types/context";
+import type { ComponentContext } from "../types/context";
 import type { CatladderJob } from "../types/jobs";
-import { getPackageManagerInfo } from "./packageManager";
 
 const injectDefaultVarsInCustomJobs = (
   context: ComponentContext,
@@ -29,7 +21,9 @@ const getCustomJobs = (context: ComponentContext) => {
   const rawJobs = context.customJobs;
   return injectDefaultVarsInCustomJobs(context, rawJobs);
 };
-const createRawJobs = (context: Context): CatladderJob[] => {
+export const createJobsForComponentContext = (
+  context: ComponentContext,
+): CatladderJob[] => {
   const buildJobs = BUILD_TYPES[context.build.config.type].jobs(context);
   const deployJobs = context.deploy?.config
     ? DEPLOY_TYPES[context.deploy?.config.type].jobs(context)
@@ -38,18 +32,3 @@ const createRawJobs = (context: Context): CatladderJob[] => {
   const customJobs = getCustomJobs(context);
   return [...buildJobs, ...deployJobs, ...customJobs];
 };
-
-export const createJobsForComponent = async (
-  contextContext: Omit<CreateComponentContextContext, "packageManagerInfo">,
-): Promise<Array<CatladderJobWithContext>> => {
-  const packageManagerInfo = await getPackageManagerInfo(
-    contextContext.config,
-    contextContext.componentName,
-  );
-
-  const context = await createComponentContext({
-    ...contextContext,
-    packageManagerInfo,
-  });
-  return createRawJobs(context).map((job) => ({ ...job, context }));
-};

package/src/types/context.ts

@@ -87,7 +87,7 @@ export type ContextBeforeConfig = {
 
 export type BuildContext = {
   dir: string;
-  packageManagerInfo?: PackageManagerInfo;
+  packageManagerInfo: PackageManagerInfo;
   config: BuildConfig;
 };
 
@@ -114,7 +114,7 @@ export type ComponentContext = {
   /**
    * @deprecated use buildContext.packageManagerInfo instead
    */
-  packageManagerInfo?: PackageManagerInfo;
+  packageManagerInfo: PackageManagerInfo;
 
   customJobs?: CatladderJob[];
 };