@catladder/pipeline 1.149.1 → 1.149.3

package/src/context/createComponentContext.ts

@@ -0,0 +1,96 @@
+import { isFunction } from "lodash";
+import { BUILD_TYPES } from "../build";
+import type { BuildConfig, BuildConfigType } from "../build/types";
+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 } 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;
+  componentName: string;
+  env: string;
+  pipelineType?: PipelineType;
+  trigger?: PipelineTrigger;
+};
+
+export const createComponentContext = async (
+  ctx: CreateComponentContextContext,
+): Promise<ComponentContext> => {
+  if (!/^[a-z0-9-]+$/.test(ctx.componentName)) {
+    throw new Error(
+      "componentName may only contain lower case letters, numbers and -",
+    );
+  }
+
+  const packageManagerInfo = await getPackageManagerInfo(
+    ctx.config,
+    ctx.componentName,
+  );
+
+  const envContext = getEnvironmentContext(ctx);
+
+  const componentConfigWithoutDefaults = envContext.envConfigRaw;
+  const defaults: {
+    build: PartialDeep<BuildConfig>;
+    deploy: PartialDeep<DeployConfig>;
+  } = componentConfigWithoutDefaults.deploy
+    ? {
+        build:
+          BUILD_TYPES[
+            componentConfigWithoutDefaults.build.type as BuildConfigType
+          ].defaults(envContext),
+        deploy: DEPLOY_TYPES[
+          componentConfigWithoutDefaults.deploy.type as DeployConfigType
+        ].defaults(envContext as any),
+      }
+    : {
+        build: {},
+        deploy: {},
+      };
+  const componentConfig = mergeWithMergingArrays(
+    defaults,
+    componentConfigWithoutDefaults,
+  );
+
+  const environment = await getEnvironment(ctx);
+  const { deploy, build, customJobs, dir } = componentConfig;
+  const context: Omit<ComponentContext, "customJobs"> = {
+    fullConfig: ctx.config,
+    componentConfig,
+
+    build: {
+      dir: dir,
+      packageManagerInfo: packageManagerInfo,
+      config: build,
+    },
+    deploy: deploy
+      ? {
+          config: deploy,
+        }
+      : null,
+    componentName: ctx.componentName,
+    environment,
+    packageManagerInfo: packageManagerInfo,
+    pipelineType: ctx.pipelineType,
+    trigger: ctx.trigger,
+  };
+  const resolvedCustomJobs = isFunction(customJobs)
+    ? customJobs(context)
+    : customJobs;
+  return {
+    ...context,
+    customJobs: resolvedCustomJobs,
+  };
+};
+
+/**
+ * @deprecated use createComponentContext instead
+ */
+export const createContext = createComponentContext;

package/src/context/index.ts

@@ -1,94 +1,3 @@
-import { isFunction } from "lodash";
-import { BUILD_TYPES } from "../build";
-import type { BuildConfig, BuildConfigType } from "../build/types";
-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 { PartialDeep } from "../types/utils";
-import { mergeWithMergingArrays } from "../utils";
-import { getEnvironment } from "./getEnvironment";
-import { getEnvironmentContext } from "./getEnvironmentContext";
-
+export * from "./createComponentContext";
 export * from "./getEnvironment";
 export * from "./getEnvironmentVariables";
-
-export type CreateComponentContextContext = {
-  config: Config;
-  componentName: string;
-  env: string;
-  pipelineType?: PipelineType;
-  trigger?: PipelineTrigger;
-  packageManagerInfo?: PackageManagerInfo;
-};
-
-export const createComponentContext = async (
-  ctx: CreateComponentContextContext,
-): Promise<ComponentContext> => {
-  if (!/^[a-z0-9-]+$/.test(ctx.componentName)) {
-    throw new Error(
-      "componentName may only contain lower case letters, numbers and -",
-    );
-  }
-
-  const envContext = getEnvironmentContext(ctx);
-
-  const componentConfigWithoutDefaults = envContext.envConfigRaw;
-  const defaults: {
-    build: PartialDeep<BuildConfig>;
-    deploy: PartialDeep<DeployConfig>;
-  } = componentConfigWithoutDefaults.deploy
-    ? {
-        build:
-          BUILD_TYPES[
-            componentConfigWithoutDefaults.build.type as BuildConfigType
-          ].defaults(envContext),
-        deploy: DEPLOY_TYPES[
-          componentConfigWithoutDefaults.deploy.type as DeployConfigType
-        ].defaults(envContext as any),
-      }
-    : {
-        build: {},
-        deploy: {},
-      };
-  const componentConfig = mergeWithMergingArrays(
-    defaults,
-    componentConfigWithoutDefaults,
-  );
-
-  const environment = await getEnvironment(ctx);
-  const { deploy, build, customJobs, dir } = componentConfig;
-  const context: Omit<ComponentContext, "customJobs"> = {
-    fullConfig: ctx.config,
-    componentConfig,
-
-    build: {
-      dir: dir,
-      packageManagerInfo: ctx.packageManagerInfo,
-      config: build,
-    },
-    deploy: deploy
-      ? {
-          config: deploy,
-        }
-      : null,
-    componentName: ctx.componentName,
-    environment,
-    packageManagerInfo: ctx.packageManagerInfo,
-    pipelineType: ctx.pipelineType,
-    trigger: ctx.trigger,
-  };
-  const resolvedCustomJobs = isFunction(customJobs)
-    ? customJobs(context)
-    : customJobs;
-  return {
-    ...context,
-    customJobs: resolvedCustomJobs,
-  };
-};
-
-/**
- * @deprecated use createComponentContext instead
- */
-export const createContext = createComponentContext;

package/src/pipeline/createJobsForComponent.ts

@@ -1,4 +1,3 @@
-import { isFunction } from "lodash";
 import { BUILD_TYPES } from "../build";
 import type { CreateComponentContextContext } from "../context";
 import { createComponentContext } from "../context";
@@ -9,7 +8,6 @@ import type {
   Context,
 } from "../types/context";
 import type { CatladderJob } from "../types/jobs";
-import { getPackageManagerInfo } from "./packageManager";
 
 const injectDefaultVarsInCustomJobs = (
   context: ComponentContext,
@@ -40,16 +38,8 @@ const createRawJobs = (context: Context): CatladderJob[] => {
 };
 
 export const createJobsForComponent = async (
-  contextContext: Omit<CreateComponentContextContext, "packageManagerInfo">,
+  contextContext: CreateComponentContextContext,
 ): Promise<Array<CatladderJobWithContext>> => {
-  const packageManagerInfo = await getPackageManagerInfo(
-    contextContext.config,
-    contextContext.componentName,
-  );
-
-  const context = await createComponentContext({
-    ...contextContext,
-    packageManagerInfo,
-  });
+  const context = await createComponentContext(contextContext);
   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[];
 };