@catladder/pipeline 1.168.0 → 1.168.1

package/dist/build/base/createAppBuildJob.d.ts

@@ -1,7 +1,6 @@
 import type { BuildContextStandalone, ComponentContext, WorkspaceContext } from "../..";
-import type { JobDefintion } from "../../types/jobDefinition";
+import type { AppBuildJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-export type AppBuildJobDefinition = JobDefintion;
 export declare const createAppBuildJob: (context: ComponentContext<BuildContextStandalone> | WorkspaceContext, {
   script,
   variables,

package/dist/build/base/createBuildJobDefinition.d.ts

@@ -1,7 +1,6 @@
 import type { BuildConfigStandalone, WorkspaceBuildConfig } from "..";
-import type { Context } from "../../types";
-import type { JobDefintion } from "../../types/jobDefinition";
-export declare const createBuildJobDefinition: (context: Context, buildConfig: BuildConfigStandalone | WorkspaceBuildConfig, customize?: Pick<JobDefintion, "cache"> & {
+import type { AppBuildJobDefinition, Context } from "../../types";
+export declare const createBuildJobDefinition: (context: Context, buildConfig: BuildConfigStandalone | WorkspaceBuildConfig, customize?: Pick<AppBuildJobDefinition, "cache"> & {
   prescript?: string[];
   postscript?: string[];
-}) => JobDefintion | undefined;
+}) => AppBuildJobDefinition | undefined;

package/dist/build/base/index.d.ts

@@ -1,8 +1,7 @@
 import type { WorkspaceContext } from "../../types/context";
 import { type ComponentContext } from "../../types/context";
+import type { AppBuildJobDefinition, DockerBuildJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-import type { DockerBuildJobDefinition } from "../docker";
-import type { AppBuildJobDefinition } from "./createAppBuildJob";
 export declare const createComponentBuildJobs: (context: ComponentContext, definitions: {
   appBuild?: AppBuildJobDefinition;
   dockerBuild: DockerBuildJobDefinition;

package/dist/build/cache/createJobCache.d.ts

@@ -1,6 +1,7 @@
-import type { BuildConfigStandalone, CacheConfig, WorkspaceBuildConfig } from "..";
+import type { CacheConfig } from "..";
 import type { Context } from "../../types";
 import type { CatladderJobCache } from "../../types/jobs";
+import type { WithCacheConfig } from "../types";
 export declare const createJobCacheFromCacheConfigs: (context: Context, caches: CacheConfig[]) => CatladderJobCache[] | undefined;
 /** shortcut, used in some build types */
-export declare const createJobCacheFromConfig: (context: Context, buildConfig: BuildConfigStandalone | WorkspaceBuildConfig) => import("../../types").GitlabJobCache[] | undefined;
+export declare const createJobCacheFromConfig: (context: Context, configWithCache: WithCacheConfig) => import("../../types").GitlabJobCache[] | undefined;

package/dist/build/cache/createJobCache.js

@@ -103,7 +103,7 @@ var createJobCacheFromCacheConfigs = function (context, caches) {
 };
 exports.createJobCacheFromCacheConfigs = createJobCacheFromCacheConfigs;
 /** shortcut, used in some build types */
-var createJobCacheFromConfig = function (context, buildConfig) {
-  return (0, exports.createJobCacheFromCacheConfigs)(context, (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, buildConfig));
+var createJobCacheFromConfig = function (context, configWithCache) {
+  return (0, exports.createJobCacheFromCacheConfigs)(context, (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, configWithCache));
 };
 exports.createJobCacheFromConfig = createJobCacheFromConfig;

package/dist/build/cache/getAllCacheConfigsFromConfig.d.ts

@@ -1,3 +1,3 @@
 import type { Context } from "../../types";
-import type { BuildConfigStandalone, CacheConfig, WorkspaceBuildConfig } from "../types";
-export declare const getAllCacheConfigsFromConfig: (context: Context, buildConfig: BuildConfigStandalone | WorkspaceBuildConfig) => CacheConfig[];
+import type { CacheConfig, WithCacheConfig } from "../types";
+export declare const getAllCacheConfigsFromConfig: (context: Context, configWithCache: WithCacheConfig) => CacheConfig[];

package/dist/build/cache/getAllCacheConfigsFromConfig.js

@@ -47,12 +47,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.getAllCacheConfigsFromConfig = void 0;
 var index_1 = require("../../utils/index");
 var transformLegacyJobCache_1 = require("./transformLegacyJobCache");
-var getAllCacheConfigsFromConfig = function (context, buildConfig) {
-  return __spreadArray(__spreadArray(__spreadArray([], __read("jobCache" in buildConfig ? (0, transformLegacyJobCache_1.transformLegacyJobCache)(buildConfig.jobCache) : []), false), __read((0, index_1.ensureArray)(buildConfig.cache).map(function (c) {
-    return __assign(__assign({}, c), {
-      context: context
-    });
-  })), false), __read(context.type === "workspace" ?
+var getAllCacheConfigsFromConfig = function (context, configWithCache) {
+  return __spreadArray(__spreadArray(__spreadArray([], __read("jobCache" in configWithCache ? (0, transformLegacyJobCache_1.transformLegacyJobCache)(configWithCache.jobCache) : []), false), __read((0, index_1.ensureArray)(configWithCache.cache)), false), __read(context.type === "workspace" ?
   // also add cache configs of the components of that workspace
   context.components.flatMap(function (componentContext) {
     var _a;

package/dist/build/docker.d.ts

@@ -1,5 +1,5 @@
 import type { BuildConfigDocker } from ".";
-import type { ComponentContext, JobDefintion } from "../types";
+import type { ComponentContext, DockerBuildJobDefinition } from "../types";
 import type { CatladderJob } from "../types/jobs";
 export declare const getDockerImageVariables: (context: ComponentContext) => {
   DOCKER_IMAGE_TAG: string;
@@ -58,12 +58,11 @@ export declare const getDockerBuildVariables: (context: ComponentContext) => {
 };
 export declare const DOCKER_BUILD_JOB_NAME = "\uD83D\uDD28 docker";
 export declare const getDockerJobBaseProps: () => Pick<CatladderJob, "image" | "services" | "variables" | "runnerVariables">;
-export type DockerBuildJobDefinition = JobDefintion;
 export declare const createDockerBuildJobBase: (context: ComponentContext, {
   script,
   cache,
   ...def
-}: JobDefintion) => CatladderJob;
+}: DockerBuildJobDefinition) => CatladderJob;
 export declare const gitlabDockerLogin: (context: ComponentContext) => string[];
 export declare const getDockerBuildScriptWithBuiltInDockerFile: (context: ComponentContext, defaultType?: BuildConfigDocker["type"]) => (string | undefined)[];
 export declare const getDockerBuildDefaultScript: (context: ComponentContext, ensureDockerFileScript?: string | null) => (string | undefined)[];

package/dist/build/node/buildJob.d.ts

@@ -1,8 +1,7 @@
 import type { BuildContextStandalone, WorkspaceContext } from "../../types/context";
 import { type ComponentContext } from "../../types/context";
+import type { AppBuildJobDefinition, DockerBuildJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-import type { AppBuildJobDefinition } from "../base/createAppBuildJob";
-import type { DockerBuildJobDefinition } from "../docker";
 export declare const createNodeBuildJobs: (context: ComponentContext | WorkspaceContext) => CatladderJob[];
 export declare const createNodeBuildJobDefinition: (context: ComponentContext<BuildContextStandalone> | WorkspaceContext) => AppBuildJobDefinition | undefined;
 export declare const createNodeDockerJobDefinition: (context: ComponentContext) => DockerBuildJobDefinition;

package/dist/build/types.d.ts

@@ -41,6 +41,12 @@ export type BuildConfigArtifactsReports = {
 };
 export type WithCacheConfig = {
   cache?: CacheConfig | CacheConfig[];
+  /**
+   * customize cache for the job
+   *
+   * @deprecated use cache
+   */
+  jobCache?: CatladderJob["cache"];
 };
 export type TestJobCustom = {
   command?: string | string[];