@catladder/pipeline 1.146.0 → 1.146.2

package/src/pipeline/createJobsForComponent.ts

@@ -1,14 +1,18 @@
 import { isFunction } from "lodash";
 import { BUILD_TYPES } from "../build";
-import type { CreateContextContext } from "../context";
-import { createContext } from "../context";
+import type { CreateComponentContextContext } from "../context";
+import { createComponentContext } from "../context";
 import { DEPLOY_TYPES } from "../deploy";
-import type { CatladderJobWithContext, Context } from "../types/context";
+import type {
+  CatladderJobWithContext,
+  ComponentContext,
+  Context,
+} from "../types/context";
 import type { CatladderJob } from "../types/jobs";
 import { getPackageManagerInfo } from "./packageManager";
 
 const injectDefaultVarsInCustomJobs = (
-  context: Context,
+  context: ComponentContext,
   jobs: CatladderJob[],
 ) =>
   jobs.map(({ variables, ...job }) => ({
@@ -18,7 +22,7 @@ const injectDefaultVarsInCustomJobs = (
     },
     ...job,
   }));
-const getCustomJobs = (context: Context) => {
+const getCustomJobs = (context: ComponentContext) => {
   if (!context.componentConfig.customJobs) {
     return [];
   }
@@ -40,14 +44,14 @@ const createRawJobs = (context: Context): CatladderJob[] => {
 };
 
 export const createJobsForComponent = async (
-  contextContext: Omit<CreateContextContext, "packageManagerInfo">,
+  contextContext: Omit<CreateComponentContextContext, "packageManagerInfo">,
 ): Promise<Array<CatladderJobWithContext>> => {
   const packageManagerInfo = await getPackageManagerInfo(
     contextContext.config,
     contextContext.componentName,
   );
 
-  const context = await createContext({
+  const context = await createComponentContext({
     ...contextContext,
     packageManagerInfo,
   });

package/src/pipeline/generatePipelineFiles.ts

@@ -11,19 +11,28 @@ export async function generatePipelineFiles<T extends PipelineType>(
   if (mode === "childpipeline") {
     const trigger = getPipelineTriggerForGitlabChildPipeline();
 
-    const { jobs, ...mainPipeline } = await createChildPipeline(
-      pipelineType,
-      trigger,
-      config,
-    );
+    const { jobs, image, stages, variables, workflow, ...mainPipeline } =
+      await createChildPipeline(pipelineType, trigger, config);
     // need to spread out the jobs, forgot why
-    await writeYamlfile(`__pipeline.yml`, { ...jobs, ...mainPipeline });
+    await writeYamlfile(`__pipeline.yml`, {
+      image,
+      stages,
+      variables,
+      workflow,
+      ...mainPipeline,
+      ...jobs,
+    });
   } else {
-    const { jobs, ...mainPipeline } = await createMainPipeline(
-      pipelineType,
-      config,
-    );
+    const { jobs, image, stages, variables, workflow, ...mainPipeline } =
+      await createMainPipeline(pipelineType, config);
     // need to spread out the jobs, forgot why
-    await writeYamlfile(`.gitlab-ci.yml`, { ...jobs, ...mainPipeline });
+    await writeYamlfile(`.gitlab-ci.yml`, {
+      image,
+      stages,
+      variables,
+      workflow,
+      ...mainPipeline,
+      ...jobs,
+    });
   }
 }

package/src/pipeline/gitlab/createGitlabJobs.ts

@@ -3,7 +3,7 @@ import { getInjectVarsScript } from "../../bash/getInjectVarsScript";
 import { BASE_RETRY } from "../../defaults";
 import type {
   CatladderJobWithContext,
-  Context,
+  ComponentContext,
   GitlabJobDef,
   GitlabRule,
 } from "../../types";
@@ -203,7 +203,7 @@ export const makeGitlabJob = (
 };
 
 const addGitlabEnvironment = (
-  context: Context,
+  context: ComponentContext,
   environment: CatladderJob["environment"],
   job: GitlabJobDef,
   componentName: string,

package/src/types/config.ts

@@ -2,7 +2,7 @@ import type { BuildConfig } from "../build/types";
 import type { DeployConfig } from "../deploy/types";
 
 import type { CatladderJob } from "./jobs";
-import type { Context } from "./context";
+import type { ComponentContext } from "./context";
 import type { PartialDeep } from "./utils";
 import type { PipelineType } from "..";
 
@@ -151,7 +151,7 @@ export type ComponentConfig<C extends ConfigProps = never> = {
    * to let us know about why you need to use custom jobs.
    * This feedback will help us to generalize use cases
    */
-  customJobs?: CatladderJob[] | ((context: Context) => CatladderJob[]);
+  customJobs?: CatladderJob[] | ((context: ComponentContext) => CatladderJob[]);
 
   /**
    * whether to create a .env

package/src/types/context.ts

@@ -1,4 +1,5 @@
 import type { StringOrBashExpression } from "../bash/BashExpression";
+import type { BuildConfig } from "../build";
 import type { PredefinedVariables, SecretEnvVar } from "../context";
 import type {
   PipelineTrigger,
@@ -82,17 +83,32 @@ export type ContextBeforeConfig = {
   fullConfig: Config;
   packageManagerInfo?: PackageManagerInfo;
 };
-export type Context = {
+
+export type BuildContext = {
+  dir: string;
+  packageManagerInfo?: PackageManagerInfo;
+  config: BuildConfig;
+};
+export type ComponentContext = {
   componentName: string;
   componentConfig: ComponentConfig;
+  buildContext: BuildContext;
   fullConfig: Config;
   environment: Environment;
 
   trigger?: PipelineTrigger;
   pipelineType?: PipelineType;
+  /**
+   * @deprecated use buildContext.packageManagerInfo instead
+   */
   packageManagerInfo?: PackageManagerInfo;
 };
 
+/**
+ * @deprecated use ComponentContext instead
+ */
+export type Context = ComponentContext;
+
 export type CatladderJobWithContext<S = BaseStage> = CatladderJob<S> & {
-  context: Context;
+  context: ComponentContext;
 };