@catladder/cli 0.0.0-main-49cf4dd9 → 0.0.0-main-ee0fff9f

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (26) hide show
  1. package/dist/bundles/catenv/index.js +54 -12
  2. package/dist/bundles/cli/index.js +54 -12
  3. package/dist/pipeline/src/build/custom/testJob.js +0 -1
  4. package/dist/pipeline/src/build/custom/testJob.js.map +1 -1
  5. package/dist/pipeline/src/build/node/testJob.js +0 -1
  6. package/dist/pipeline/src/build/node/testJob.js.map +1 -1
  7. package/dist/pipeline/src/build/node/yarn.js +3 -1
  8. package/dist/pipeline/src/build/node/yarn.js.map +1 -1
  9. package/dist/pipeline/src/build/rails/test.js +0 -1
  10. package/dist/pipeline/src/build/rails/test.js.map +1 -1
  11. package/dist/pipeline/src/deploy/types/googleCloudRun.d.ts +1 -1
  12. package/dist/pipeline/src/pipeline/agent/createAgentReviewJob.js +1 -0
  13. package/dist/pipeline/src/pipeline/agent/createAgentReviewJob.js.map +1 -1
  14. package/dist/pipeline/src/pipeline/agent/shared.d.ts +1 -1
  15. package/dist/pipeline/src/pipeline/agent/shared.js +0 -1
  16. package/dist/pipeline/src/pipeline/agent/shared.js.map +1 -1
  17. package/dist/pipeline/src/pipeline/createMainPipeline.js +1 -0
  18. package/dist/pipeline/src/pipeline/createMainPipeline.js.map +1 -1
  19. package/dist/pipeline/src/pipeline/gitlab/cache.d.ts +9 -0
  20. package/dist/pipeline/src/pipeline/gitlab/cache.js +36 -0
  21. package/dist/pipeline/src/pipeline/gitlab/cache.js.map +1 -0
  22. package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js +6 -7
  23. package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js.map +1 -1
  24. package/dist/pipeline/src/types/jobs.d.ts +2 -3
  25. package/dist/tsconfig.tsbuildinfo +1 -1
  26. package/package.json +1 -1
@@ -1750,7 +1750,6 @@ const createCustomTestJobs = (context) => {
1750
1750
  cache: (0, createJobCache_1.createJobCacheFromConfig)(context, buildConfig),
1751
1751
  stage: "test",
1752
1752
  needs: [],
1753
- envMode: "none",
1754
1753
  };
1755
1754
  const auditJob = buildConfig.audit
1756
1755
  ? {
@@ -2315,7 +2314,6 @@ const createNodeTestJobs = (context) => {
2315
2314
  runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
2316
2315
  stage: "test",
2317
2316
  needs: [],
2318
- envMode: "none",
2319
2317
  };
2320
2318
  const buildConfig = context.build.config;
2321
2319
  const yarnInstall = (0, yarn_1.getYarnInstall)(context);
@@ -2391,7 +2389,8 @@ const getYarnInstallCommand = (context) => {
2391
2389
  if (context.packageManagerInfo.isClassic) {
2392
2390
  return YARN_INSTALL_CLASSIC;
2393
2391
  }
2394
- return `yarn install --immutable`;
2392
+ // inline builds make debugging easier as it prints it out in the logs, instead of writing it in temp files
2393
+ return `yarn install --immutable --inline-builds`;
2395
2394
  };
2396
2395
  const ensureNodeVersion = (context) => (0, gitlab_1.collapseableSection)("nodeinstall", "Ensure node version")([
2397
2396
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
@@ -2431,6 +2430,7 @@ RUN ${YARN_INSTALL_CLASSIC} --production
2431
2430
  // copy first everything and then install
2432
2431
  // rebuild first does not work as it will run postinstall and that might require files in the app
2433
2432
  return new BashExpression_1.BashExpression(`
2433
+ ENV YARN_ENABLE_INLINE_BUILDS=1
2434
2434
  ${DOCKER_COPY_FILES}
2435
2435
  ${maybeAddWorkspaceToolsCommand}
2436
2436
  RUN ${YARN_BERRY_PROD_REBUILD}
@@ -2545,7 +2545,6 @@ const createRailsTestJobs = (context) => {
2545
2545
  },
2546
2546
  stage: "test",
2547
2547
  needs: [],
2548
- envMode: "none",
2549
2548
  };
2550
2549
  const defaultImage = "docker.io/ruby";
2551
2550
  const bundlerCacheDir = "tmp/cache";
@@ -6041,6 +6040,7 @@ const createAgentReviewJob = (context) => {
6041
6040
  }));
6042
6041
  return {
6043
6042
  ...baseJob,
6043
+ envMode: "jobPerEnv",
6044
6044
  name: context.name + "-agent-review",
6045
6045
  allow_failure: true, // make it optional
6046
6046
  rules: [
@@ -6371,7 +6371,6 @@ const bashEscape_1 = __nccwpck_require__(2463);
6371
6371
  const runner_1 = __nccwpck_require__(4058);
6372
6372
  const createBaseAgentJob = (context) => ({
6373
6373
  stage: "agents",
6374
- envMode: "none",
6375
6374
  // image: "node:24-alpine3.21",
6376
6375
  image: (0, runner_1.getRunnerImage)("agent-claude"),
6377
6376
  variables: {
@@ -6588,6 +6587,7 @@ const createMainPipeline = async (pipelineType, config) => {
6588
6587
  var _a, _b;
6589
6588
  // merge jobs, if a job is already there, merge the rules
6590
6589
  // this is currently needed because of envMode: "none", which creates the same job for all triggers, so it can appear multiple times
6590
+ // NOTICE: envNode none has been removed and this may no longer be needed
6591
6591
  if (acc[name]) {
6592
6592
  acc[name].gitlabJob.rules = [
6593
6593
  ...((_a = acc[name].gitlabJob.rules) !== null && _a !== void 0 ? _a : []),
@@ -6752,6 +6752,49 @@ exports.getPipelineStages = getPipelineStages;
6752
6752
 
6753
6753
  /***/ }),
6754
6754
 
6755
+ /***/ 4025:
6756
+ /***/ ((__unused_webpack_module, exports) => {
6757
+
6758
+ "use strict";
6759
+
6760
+ Object.defineProperty(exports, "__esModule", ({ value: true }));
6761
+ exports.addCacheFallback = exports.getCacheKeyWithFallbackForMR = void 0;
6762
+ const getCacheKeyWithFallbackForMR = (baseKey, context) => {
6763
+ // if its a branch, create a key with the branch name with fallback to the base key
6764
+ if (context.trigger === "mr") {
6765
+ return {
6766
+ key: baseKey + "-mr$CI_MERGE_REQUEST_IID",
6767
+ fallback_keys: [baseKey],
6768
+ };
6769
+ }
6770
+ return {
6771
+ key: baseKey,
6772
+ };
6773
+ };
6774
+ exports.getCacheKeyWithFallbackForMR = getCacheKeyWithFallbackForMR;
6775
+ const addCacheFallback = (cache, context) => {
6776
+ if (context.type !== "agent" && context.trigger === "mr") {
6777
+ if (Array.isArray(cache)) {
6778
+ return cache.map((c) => addCacheFallbackToSingleCacheForMR(c, context));
6779
+ }
6780
+ return addCacheFallbackToSingleCacheForMR(cache, context);
6781
+ }
6782
+ return cache;
6783
+ };
6784
+ exports.addCacheFallback = addCacheFallback;
6785
+ const addCacheFallbackToSingleCacheForMR = (cache, context) => {
6786
+ if (typeof cache.key === "string") {
6787
+ return {
6788
+ ...cache,
6789
+ ...(0, exports.getCacheKeyWithFallbackForMR)(cache.key, context),
6790
+ };
6791
+ }
6792
+ return cache; // as is
6793
+ };
6794
+ //# sourceMappingURL=cache.js.map
6795
+
6796
+ /***/ }),
6797
+
6755
6798
  /***/ 8862:
6756
6799
  /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
6757
6800
 
@@ -6766,6 +6809,7 @@ const utils_1 = __nccwpck_require__(2497);
6766
6809
  const gitlab_1 = __nccwpck_require__(8490);
6767
6810
  const removeUndefined_1 = __nccwpck_require__(1073);
6768
6811
  const BashExpression_1 = __nccwpck_require__(2376);
6812
+ const cache_1 = __nccwpck_require__(4025);
6769
6813
  exports.GITLAB_ENVIRONMENT_URL_VARIABLE = "CL_GITLAB_ENVIRONMENT_URL";
6770
6814
  const getFullJobName = ({ type, name, baseName, allJobs, env, }) => {
6771
6815
  const shouldAddIcon = allJobs.workspaces.length > 0;
@@ -6783,12 +6827,11 @@ const getFullReferencedJobNameFromComponent = (referencedJobName, componentName,
6783
6827
  if (!referencedJob) {
6784
6828
  throw new Error(`unknown job referenced: '${referencedJobName}' from '${env}:${componentName}'`);
6785
6829
  }
6786
- const envToSet = referencedJob.envMode !== "none" ? env : null;
6787
6830
  return getFullJobName({
6788
6831
  type: "component",
6789
6832
  name: referencedJobName,
6790
6833
  baseName: componentName,
6791
- env: envToSet,
6834
+ env,
6792
6835
  allJobs,
6793
6836
  });
6794
6837
  };
@@ -6799,19 +6842,18 @@ const getFullReferencedJobNameFromWorkspace = (referencedJobName, workspaceName,
6799
6842
  if (!referencedJob) {
6800
6843
  throw new Error(`unknown job referenced: '${referencedJobName}' from workspace ${env}:${workspaceName}'`);
6801
6844
  }
6802
- const envToSet = referencedJob.envMode !== "none" ? env : null;
6803
6845
  return getFullJobName({
6804
6846
  type: "workspace",
6805
6847
  name: referencedJobName,
6806
6848
  baseName: workspaceName,
6807
- env: envToSet,
6849
+ env,
6808
6850
  allJobs,
6809
6851
  });
6810
6852
  };
6811
6853
  const getJobName = (need) => (0, lodash_1.isObject)(need) ? need.job : need;
6812
6854
  const makeGitlabJob = (context, job, allJobs, baseRules) => {
6813
6855
  var _a, _b;
6814
- const { environment, envMode, needsStages, name, needs, jobTags, script, variables, runnerVariables, when, ...rest } = job;
6856
+ const { environment, envMode, needsStages, name, needs, jobTags, script, variables, runnerVariables, when, cache, ...rest } = job;
6815
6857
  const stage = envMode === "stagePerEnv" && context.type !== "agent"
6816
6858
  ? `${job.stage} ${context.env}`
6817
6859
  : job.stage;
@@ -6820,7 +6862,7 @@ const makeGitlabJob = (context, job, allJobs, baseRules) => {
6820
6862
  type: context.type,
6821
6863
  name,
6822
6864
  baseName: context.name,
6823
- env: envMode !== "none" && context.type !== "agent" ? context.env : undefined,
6865
+ env: context.type !== "agent" ? context.env : undefined,
6824
6866
  allJobs,
6825
6867
  });
6826
6868
  // backwards compatibility, some may still use KUBERNETES_CPU_REQUEST, KUBERNETES_MEMORY_REQUEST, etc. in variables.
@@ -6856,6 +6898,7 @@ const makeGitlabJob = (context, job, allJobs, baseRules) => {
6856
6898
  retry: defaults_1.BASE_RETRY,
6857
6899
  interruptible: true,
6858
6900
  ...rest,
6901
+ cache: cache ? (0, cache_1.addCacheFallback)(cache, context) : undefined,
6859
6902
  rules: rules.length > 0 ? rules : undefined,
6860
6903
  variables: {
6861
6904
  ...legacyRunnerVariables,
@@ -6918,7 +6961,6 @@ const addGitlabEnvironment = (context, catladderJobEnvironment, job, allJobs) =>
6918
6961
  };
6919
6962
  };
6920
6963
  const createGitlabJobs = async (allJobs, baseRules) => {
6921
- // TODO: add workspace jobs
6922
6964
  return [
6923
6965
  ...allJobs.workspaces,
6924
6966
  ...allJobs.components,
@@ -5002,7 +5002,6 @@ const createCustomTestJobs = (context) => {
5002
5002
  cache: (0, createJobCache_1.createJobCacheFromConfig)(context, buildConfig),
5003
5003
  stage: "test",
5004
5004
  needs: [],
5005
- envMode: "none",
5006
5005
  };
5007
5006
  const auditJob = buildConfig.audit
5008
5007
  ? {
@@ -5567,7 +5566,6 @@ const createNodeTestJobs = (context) => {
5567
5566
  runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
5568
5567
  stage: "test",
5569
5568
  needs: [],
5570
- envMode: "none",
5571
5569
  };
5572
5570
  const buildConfig = context.build.config;
5573
5571
  const yarnInstall = (0, yarn_1.getYarnInstall)(context);
@@ -5643,7 +5641,8 @@ const getYarnInstallCommand = (context) => {
5643
5641
  if (context.packageManagerInfo.isClassic) {
5644
5642
  return YARN_INSTALL_CLASSIC;
5645
5643
  }
5646
- return `yarn install --immutable`;
5644
+ // inline builds make debugging easier as it prints it out in the logs, instead of writing it in temp files
5645
+ return `yarn install --immutable --inline-builds`;
5647
5646
  };
5648
5647
  const ensureNodeVersion = (context) => (0, gitlab_1.collapseableSection)("nodeinstall", "Ensure node version")([
5649
5648
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
@@ -5683,6 +5682,7 @@ RUN ${YARN_INSTALL_CLASSIC} --production
5683
5682
  // copy first everything and then install
5684
5683
  // rebuild first does not work as it will run postinstall and that might require files in the app
5685
5684
  return new BashExpression_1.BashExpression(`
5685
+ ENV YARN_ENABLE_INLINE_BUILDS=1
5686
5686
  ${DOCKER_COPY_FILES}
5687
5687
  ${maybeAddWorkspaceToolsCommand}
5688
5688
  RUN ${YARN_BERRY_PROD_REBUILD}
@@ -5797,7 +5797,6 @@ const createRailsTestJobs = (context) => {
5797
5797
  },
5798
5798
  stage: "test",
5799
5799
  needs: [],
5800
- envMode: "none",
5801
5800
  };
5802
5801
  const defaultImage = "docker.io/ruby";
5803
5802
  const bundlerCacheDir = "tmp/cache";
@@ -9293,6 +9292,7 @@ const createAgentReviewJob = (context) => {
9293
9292
  }));
9294
9293
  return {
9295
9294
  ...baseJob,
9295
+ envMode: "jobPerEnv",
9296
9296
  name: context.name + "-agent-review",
9297
9297
  allow_failure: true, // make it optional
9298
9298
  rules: [
@@ -9623,7 +9623,6 @@ const bashEscape_1 = __nccwpck_require__(12463);
9623
9623
  const runner_1 = __nccwpck_require__(4058);
9624
9624
  const createBaseAgentJob = (context) => ({
9625
9625
  stage: "agents",
9626
- envMode: "none",
9627
9626
  // image: "node:24-alpine3.21",
9628
9627
  image: (0, runner_1.getRunnerImage)("agent-claude"),
9629
9628
  variables: {
@@ -9840,6 +9839,7 @@ const createMainPipeline = async (pipelineType, config) => {
9840
9839
  var _a, _b;
9841
9840
  // merge jobs, if a job is already there, merge the rules
9842
9841
  // this is currently needed because of envMode: "none", which creates the same job for all triggers, so it can appear multiple times
9842
+ // NOTICE: envNode none has been removed and this may no longer be needed
9843
9843
  if (acc[name]) {
9844
9844
  acc[name].gitlabJob.rules = [
9845
9845
  ...((_a = acc[name].gitlabJob.rules) !== null && _a !== void 0 ? _a : []),
@@ -10004,6 +10004,49 @@ exports.getPipelineStages = getPipelineStages;
10004
10004
 
10005
10005
  /***/ }),
10006
10006
 
10007
+ /***/ 94025:
10008
+ /***/ ((__unused_webpack_module, exports) => {
10009
+
10010
+ "use strict";
10011
+
10012
+ Object.defineProperty(exports, "__esModule", ({ value: true }));
10013
+ exports.addCacheFallback = exports.getCacheKeyWithFallbackForMR = void 0;
10014
+ const getCacheKeyWithFallbackForMR = (baseKey, context) => {
10015
+ // if its a branch, create a key with the branch name with fallback to the base key
10016
+ if (context.trigger === "mr") {
10017
+ return {
10018
+ key: baseKey + "-mr$CI_MERGE_REQUEST_IID",
10019
+ fallback_keys: [baseKey],
10020
+ };
10021
+ }
10022
+ return {
10023
+ key: baseKey,
10024
+ };
10025
+ };
10026
+ exports.getCacheKeyWithFallbackForMR = getCacheKeyWithFallbackForMR;
10027
+ const addCacheFallback = (cache, context) => {
10028
+ if (context.type !== "agent" && context.trigger === "mr") {
10029
+ if (Array.isArray(cache)) {
10030
+ return cache.map((c) => addCacheFallbackToSingleCacheForMR(c, context));
10031
+ }
10032
+ return addCacheFallbackToSingleCacheForMR(cache, context);
10033
+ }
10034
+ return cache;
10035
+ };
10036
+ exports.addCacheFallback = addCacheFallback;
10037
+ const addCacheFallbackToSingleCacheForMR = (cache, context) => {
10038
+ if (typeof cache.key === "string") {
10039
+ return {
10040
+ ...cache,
10041
+ ...(0, exports.getCacheKeyWithFallbackForMR)(cache.key, context),
10042
+ };
10043
+ }
10044
+ return cache; // as is
10045
+ };
10046
+ //# sourceMappingURL=cache.js.map
10047
+
10048
+ /***/ }),
10049
+
10007
10050
  /***/ 58862:
10008
10051
  /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
10009
10052
 
@@ -10018,6 +10061,7 @@ const utils_1 = __nccwpck_require__(32497);
10018
10061
  const gitlab_1 = __nccwpck_require__(38490);
10019
10062
  const removeUndefined_1 = __nccwpck_require__(61073);
10020
10063
  const BashExpression_1 = __nccwpck_require__(42376);
10064
+ const cache_1 = __nccwpck_require__(94025);
10021
10065
  exports.GITLAB_ENVIRONMENT_URL_VARIABLE = "CL_GITLAB_ENVIRONMENT_URL";
10022
10066
  const getFullJobName = ({ type, name, baseName, allJobs, env, }) => {
10023
10067
  const shouldAddIcon = allJobs.workspaces.length > 0;
@@ -10035,12 +10079,11 @@ const getFullReferencedJobNameFromComponent = (referencedJobName, componentName,
10035
10079
  if (!referencedJob) {
10036
10080
  throw new Error(`unknown job referenced: '${referencedJobName}' from '${env}:${componentName}'`);
10037
10081
  }
10038
- const envToSet = referencedJob.envMode !== "none" ? env : null;
10039
10082
  return getFullJobName({
10040
10083
  type: "component",
10041
10084
  name: referencedJobName,
10042
10085
  baseName: componentName,
10043
- env: envToSet,
10086
+ env,
10044
10087
  allJobs,
10045
10088
  });
10046
10089
  };
@@ -10051,19 +10094,18 @@ const getFullReferencedJobNameFromWorkspace = (referencedJobName, workspaceName,
10051
10094
  if (!referencedJob) {
10052
10095
  throw new Error(`unknown job referenced: '${referencedJobName}' from workspace ${env}:${workspaceName}'`);
10053
10096
  }
10054
- const envToSet = referencedJob.envMode !== "none" ? env : null;
10055
10097
  return getFullJobName({
10056
10098
  type: "workspace",
10057
10099
  name: referencedJobName,
10058
10100
  baseName: workspaceName,
10059
- env: envToSet,
10101
+ env,
10060
10102
  allJobs,
10061
10103
  });
10062
10104
  };
10063
10105
  const getJobName = (need) => (0, lodash_1.isObject)(need) ? need.job : need;
10064
10106
  const makeGitlabJob = (context, job, allJobs, baseRules) => {
10065
10107
  var _a, _b;
10066
- const { environment, envMode, needsStages, name, needs, jobTags, script, variables, runnerVariables, when, ...rest } = job;
10108
+ const { environment, envMode, needsStages, name, needs, jobTags, script, variables, runnerVariables, when, cache, ...rest } = job;
10067
10109
  const stage = envMode === "stagePerEnv" && context.type !== "agent"
10068
10110
  ? `${job.stage} ${context.env}`
10069
10111
  : job.stage;
@@ -10072,7 +10114,7 @@ const makeGitlabJob = (context, job, allJobs, baseRules) => {
10072
10114
  type: context.type,
10073
10115
  name,
10074
10116
  baseName: context.name,
10075
- env: envMode !== "none" && context.type !== "agent" ? context.env : undefined,
10117
+ env: context.type !== "agent" ? context.env : undefined,
10076
10118
  allJobs,
10077
10119
  });
10078
10120
  // backwards compatibility, some may still use KUBERNETES_CPU_REQUEST, KUBERNETES_MEMORY_REQUEST, etc. in variables.
@@ -10108,6 +10150,7 @@ const makeGitlabJob = (context, job, allJobs, baseRules) => {
10108
10150
  retry: defaults_1.BASE_RETRY,
10109
10151
  interruptible: true,
10110
10152
  ...rest,
10153
+ cache: cache ? (0, cache_1.addCacheFallback)(cache, context) : undefined,
10111
10154
  rules: rules.length > 0 ? rules : undefined,
10112
10155
  variables: {
10113
10156
  ...legacyRunnerVariables,
@@ -10170,7 +10213,6 @@ const addGitlabEnvironment = (context, catladderJobEnvironment, job, allJobs) =>
10170
10213
  };
10171
10214
  };
10172
10215
  const createGitlabJobs = async (allJobs, baseRules) => {
10173
- // TODO: add workspace jobs
10174
10216
  return [
10175
10217
  ...allJobs.workspaces,
10176
10218
  ...allJobs.components,
@@ -31,7 +31,6 @@ const createCustomTestJobs = (context) => {
31
31
  cache: (0, createJobCache_1.createJobCacheFromConfig)(context, buildConfig),
32
32
  stage: "test",
33
33
  needs: [],
34
- envMode: "none",
35
34
  };
36
35
  const auditJob = buildConfig.audit
37
36
  ? {
@@ -1 +1 @@
1
- {"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/testJob.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/testJob.ts"],"names":[],"mappings":"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"}
@@ -34,7 +34,6 @@ const createNodeTestJobs = (context) => {
34
34
  runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
35
35
  stage: "test",
36
36
  needs: [],
37
- envMode: "none",
38
37
  };
39
38
  const buildConfig = context.build.config;
40
39
  const yarnInstall = (0, yarn_1.getYarnInstall)(context);
@@ -1 +1 @@
1
- {"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/testJob.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/testJob.ts"],"names":[],"mappings":"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"}
@@ -11,7 +11,8 @@ const getYarnInstallCommand = (context) => {
11
11
  if (context.packageManagerInfo.isClassic) {
12
12
  return YARN_INSTALL_CLASSIC;
13
13
  }
14
- return `yarn install --immutable`;
14
+ // inline builds make debugging easier as it prints it out in the logs, instead of writing it in temp files
15
+ return `yarn install --immutable --inline-builds`;
15
16
  };
16
17
  const ensureNodeVersion = (context) => (0, gitlab_1.collapseableSection)("nodeinstall", "Ensure node version")([
17
18
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
@@ -51,6 +52,7 @@ RUN ${YARN_INSTALL_CLASSIC} --production
51
52
  // copy first everything and then install
52
53
  // rebuild first does not work as it will run postinstall and that might require files in the app
53
54
  return new BashExpression_1.BashExpression(`
55
+ ENV YARN_ENABLE_INLINE_BUILDS=1
54
56
  ${DOCKER_COPY_FILES}
55
57
  ${maybeAddWorkspaceToolsCommand}
56
58
  RUN ${YARN_BERRY_PROD_REBUILD}
@@ -1 +1 @@
1
- {"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/yarn.ts"],"names":[],"mappings":";;;AAAA,8DAA2D;AAE3D,uCAA0C;AAC1C,+CAAyD;AAEzD,MAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAE9D,8CAA8C;AAC9C,MAAM,uBAAuB,GAAG,oDAAoD,CAAC;AAErF,MAAM,qBAAqB,GAAG,CAAC,OAAgB,EAAE,EAAE;IACjD,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,OAAO,0BAA0B,CAAC;AACpC,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,CAAC,OAAgB,EAAE,EAAE,CACpD,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC;IACA,yDAAyD;IACzD,yEAAyE;CAC1E,CAAC,CAAC;AAPQ,QAAA,iBAAiB,qBAOzB;AAEE,MAAM,cAAc,GAAG,CAC5B,OAAgB,EAChB,OAEC,EACD,EAAE;IACF,MAAM,WAAW,GACf,OAAO,CAAC,IAAI,KAAK,WAAW;QAC5B,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU;QACjC,aAAa,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM;QACnC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW;QAClC,CAAC,CAAC,IAAI,CAAC;IACX,OAAO;QACL,GAAG,IAAA,yBAAiB,EAAC,OAAO,CAAC;QAC7B,GAAG,IAAA,4BAAmB,EACpB,aAAa,EACb,cAAc,CACf,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;QACnC,GAAG,CAAC,WAAW,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,CAAA;YAC9C,CAAC,CAAC,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC,IAAA,mBAAW,EAAC,WAAW,CAAC,CAAC;YAC7B,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,cAAc,kBAyBzB;AAEF,MAAM,iBAAiB,GAAG,mCAAmC,CAAC;AAEvD,MAAM,8BAA8B,GAAG,CAAC,OAAgB,EAAE,EAAE;IACjE,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,IAAI,+BAAc,CACvB;MACA,oBAAoB;EACxB,iBAAiB;MACb,oBAAoB;KACrB,CAAC,IAAI,EAAE,CACP,CAAC;IACJ,CAAC;IAED,wFAAwF;IACxF,8CAA8C;IAC9C,MAAM,6BAA6B,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1D,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CACjD,CAAC;IACF,MAAM,6BAA6B,GAAG,6BAA6B;QACjE,CAAC,CAAC,wCAAwC;QAC1C,CAAC,CAAC,EAAE,CAAC;IAEP,yCAAyC;IACzC,iGAAiG;IACjG,OAAO,IAAI,+BAAc,CACvB;EACF,iBAAiB;EACjB,6BAA6B;MACzB,uBAAuB;;KAExB,CAAC,IAAI,EAAE,CACT,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,8BAA8B,kCA8BzC"}
1
+ {"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/yarn.ts"],"names":[],"mappings":";;;AAAA,8DAA2D;AAE3D,uCAA0C;AAC1C,+CAAyD;AAEzD,MAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAE9D,8CAA8C;AAC9C,MAAM,uBAAuB,GAAG,oDAAoD,CAAC;AAErF,MAAM,qBAAqB,GAAG,CAAC,OAAgB,EAAE,EAAE;IACjD,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IACD,2GAA2G;IAC3G,OAAO,0CAA0C,CAAC;AACpD,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,CAAC,OAAgB,EAAE,EAAE,CACpD,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC;IACA,yDAAyD;IACzD,yEAAyE;CAC1E,CAAC,CAAC;AAPQ,QAAA,iBAAiB,qBAOzB;AAEE,MAAM,cAAc,GAAG,CAC5B,OAAgB,EAChB,OAEC,EACD,EAAE;IACF,MAAM,WAAW,GACf,OAAO,CAAC,IAAI,KAAK,WAAW;QAC5B,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU;QACjC,aAAa,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM;QACnC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW;QAClC,CAAC,CAAC,IAAI,CAAC;IACX,OAAO;QACL,GAAG,IAAA,yBAAiB,EAAC,OAAO,CAAC;QAC7B,GAAG,IAAA,4BAAmB,EACpB,aAAa,EACb,cAAc,CACf,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;QACnC,GAAG,CAAC,WAAW,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,CAAA;YAC9C,CAAC,CAAC,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC,IAAA,mBAAW,EAAC,WAAW,CAAC,CAAC;YAC7B,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,cAAc,kBAyBzB;AAEF,MAAM,iBAAiB,GAAG,mCAAmC,CAAC;AAEvD,MAAM,8BAA8B,GAAG,CAAC,OAAgB,EAAE,EAAE;IACjE,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,IAAI,+BAAc,CACvB;MACA,oBAAoB;EACxB,iBAAiB;MACb,oBAAoB;KACrB,CAAC,IAAI,EAAE,CACP,CAAC;IACJ,CAAC;IAED,wFAAwF;IACxF,8CAA8C;IAC9C,MAAM,6BAA6B,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1D,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CACjD,CAAC;IACF,MAAM,6BAA6B,GAAG,6BAA6B;QACjE,CAAC,CAAC,wCAAwC;QAC1C,CAAC,CAAC,EAAE,CAAC;IAEP,yCAAyC;IACzC,iGAAiG;IACjG,OAAO,IAAI,+BAAc,CACvB;;EAEF,iBAAiB;EACjB,6BAA6B;MACzB,uBAAuB;;KAExB,CAAC,IAAI,EAAE,CACT,CAAC;AACJ,CAAC,CAAC;AA/BW,QAAA,8BAA8B,kCA+BzC"}
@@ -21,7 +21,6 @@ const createRailsTestJobs = (context) => {
21
21
  },
22
22
  stage: "test",
23
23
  needs: [],
24
- envMode: "none",
25
24
  };
26
25
  const defaultImage = "docker.io/ruby";
27
26
  const bundlerCacheDir = "tmp/cache";
@@ -1 +1 @@
1
- {"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/test.ts"],"names":[],"mappings":"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"}
@@ -422,7 +422,7 @@ export type DeployConfigCloudRunExecuteHttp = {
422
422
  /**
423
423
  * the http-method to use. Defaults to "POST" (as specified by google cloud scheduler)
424
424
  */
425
- method?: "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
425
+ method?: "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "PURGE";
426
426
  /**
427
427
  * the body to send
428
428
  */
@@ -24,6 +24,7 @@ const createAgentReviewJob = (context) => {
24
24
  }));
25
25
  return {
26
26
  ...baseJob,
27
+ envMode: "jobPerEnv",
27
28
  name: context.name + "-agent-review",
28
29
  allow_failure: true, // make it optional
29
30
  rules: [
@@ -1 +1 @@
1
- {"version":3,"file":"createAgentReviewJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/agent/createAgentReviewJob.ts"],"names":[],"mappings":";;;AAAA,uCAAoD;AAEpD,uCAAkD;AAClD,qCAA2E;AAC3E,mCAA2C;AAEpC,MAAM,oBAAoB,GAAG,CAAC,OAAqB,EAAgB,EAAE;IAC1E,MAAM,OAAO,GAAG,IAAA,2BAAkB,EAAC,OAAO,CAAC,CAAC;IAE5C,MAAM,aAAa,GAAG,IAAA,wBAAgB,EAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,KAAK,GACT,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,eAAe;QACxC,CAAC,CAAC;YACE;gBACE,GAAG,6BAAqB;gBACxB,IAAI,EAAE,QAAQ;aACf;SACF;QACH,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;aACnC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC;aACzC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;YACpB,yEAAyE;YACzE,EAAE,EAAE,GAAG,6BAAqB,CAAC,EAAE,8BAA8B,QAAQ,GAAG;YACxE,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC,CAAC;IAEZ,OAAO;QACL,GAAG,OAAO;QACV,IAAI,EAAE,OAAO,CAAC,IAAI,GAAG,eAAe;QACpC,aAAa,EAAE,IAAI,EAAE,mBAAmB;QACxC,KAAK,EAAE;YACL,GAAG,KAAK;YACR;gBACE,GAAG,6BAAqB;gBACxB,IAAI,EAAE,QAAQ;aACf;YACD;gBACE,IAAI,EAAE,OAAO;aACd;SACF;QACD,MAAM,EAAE;YACN,GAAG,wBAAe;YAClB,GAAG,IAAA,mBAAU,EAAC;gBACZ,MAAM,EAAE,IAAA,+BAAqB,EAAC;oBAC5B,aAAa,EAAE,aAAa;iBAC7B,CAAC;aACH,CAAC;SACH;KACF,CAAC;AACJ,CAAC,CAAC;AA5CW,QAAA,oBAAoB,wBA4C/B"}
1
+ {"version":3,"file":"createAgentReviewJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/agent/createAgentReviewJob.ts"],"names":[],"mappings":";;;AAAA,uCAAoD;AAEpD,uCAAkD;AAClD,qCAA2E;AAC3E,mCAA2C;AAEpC,MAAM,oBAAoB,GAAG,CAAC,OAAqB,EAAgB,EAAE;IAC1E,MAAM,OAAO,GAAG,IAAA,2BAAkB,EAAC,OAAO,CAAC,CAAC;IAE5C,MAAM,aAAa,GAAG,IAAA,wBAAgB,EAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,KAAK,GACT,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,eAAe;QACxC,CAAC,CAAC;YACE;gBACE,GAAG,6BAAqB;gBACxB,IAAI,EAAE,QAAQ;aACf;SACF;QACH,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;aACnC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC;aACzC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;YACpB,yEAAyE;YACzE,EAAE,EAAE,GAAG,6BAAqB,CAAC,EAAE,8BAA8B,QAAQ,GAAG;YACxE,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC,CAAC;IAEZ,OAAO;QACL,GAAG,OAAO;QACV,OAAO,EAAE,WAAW;QACpB,IAAI,EAAE,OAAO,CAAC,IAAI,GAAG,eAAe;QACpC,aAAa,EAAE,IAAI,EAAE,mBAAmB;QACxC,KAAK,EAAE;YACL,GAAG,KAAK;YACR;gBACE,GAAG,6BAAqB;gBACxB,IAAI,EAAE,QAAQ;aACf;YACD;gBACE,IAAI,EAAE,OAAO;aACd;SACF;QACD,MAAM,EAAE;YACN,GAAG,wBAAe;YAClB,GAAG,IAAA,mBAAU,EAAC;gBACZ,MAAM,EAAE,IAAA,+BAAqB,EAAC;oBAC5B,aAAa,EAAE,aAAa;iBAC7B,CAAC;aACH,CAAC;SACH;KACF,CAAC;AACJ,CAAC,CAAC;AA7CW,QAAA,oBAAoB,wBA6C/B"}
@@ -1,5 +1,5 @@
1
1
  import type { AgentContext, CatladderJob } from "../../types";
2
- export declare const createBaseAgentJob: (context: AgentContext) => Omit<CatladderJob, "name" | "rules" | "script">;
2
+ export declare const createBaseAgentJob: (context: AgentContext) => Omit<CatladderJob, "name" | "rules" | "script" | "envMode">;
3
3
  export declare const baseSetupScript: string[];
4
4
  export declare const callClaude: ({ prompt }: {
5
5
  prompt: string;
@@ -5,7 +5,6 @@ const bashEscape_1 = require("../../bash/bashEscape");
5
5
  const runner_1 = require("../../runner");
6
6
  const createBaseAgentJob = (context) => ({
7
7
  stage: "agents",
8
- envMode: "none",
9
8
  // image: "node:24-alpine3.21",
10
9
  image: (0, runner_1.getRunnerImage)("agent-claude"),
11
10
  variables: {
@@ -1 +1 @@
1
- {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/agent/shared.ts"],"names":[],"mappings":";;;AAAA,sDAI+B;AAC/B,yCAA8C;AAGvC,MAAM,kBAAkB,GAAG,CAChC,OAAqB,EAC4B,EAAE,CAAC,CAAC;IACrD,KAAK,EAAE,QAAQ;IACf,OAAO,EAAE,MAAM;IACf,+BAA+B;IAC/B,KAAK,EAAE,IAAA,uBAAc,EAAC,cAAc,CAAC;IACrC,SAAS,EAAE;QACT,qBAAqB,EAAE,OAAO;QAC9B,4BAA4B,EAAE,qCAAqC,EAAE,0DAA0D;QAC/H,cAAc,EAAE,gBAAgB;KACjC;CACF,CAAC,CAAC;AAZU,QAAA,kBAAkB,sBAY5B;AAEU,QAAA,eAAe,GAAG;IAC7B,sCAAsC;IACtC,gBAAgB;IAChB,sCAAsC;IACtC,6CAA6C;IAC7C,sLAAsL;CACvL,CAAC;AAEK,MAAM,UAAU,GAAG,CAAC,EAAE,MAAM,EAAsB,EAAE,EAAE;IAC3D,OAAO;QACL,kBAAkB,IAAA,2BAAc,EAC9B,IAAA,+BAAkB,EAAC,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC,CAC5C,GAAG;QACJ,mBAAmB;QACnB,gIAAgI;KACjI,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,UAAU,cAQrB"}
1
+ {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/agent/shared.ts"],"names":[],"mappings":";;;AAAA,sDAI+B;AAC/B,yCAA8C;AAGvC,MAAM,kBAAkB,GAAG,CAChC,OAAqB,EACwC,EAAE,CAAC,CAAC;IACjE,KAAK,EAAE,QAAQ;IAEf,+BAA+B;IAC/B,KAAK,EAAE,IAAA,uBAAc,EAAC,cAAc,CAAC;IACrC,SAAS,EAAE;QACT,qBAAqB,EAAE,OAAO;QAC9B,4BAA4B,EAAE,qCAAqC,EAAE,0DAA0D;QAC/H,cAAc,EAAE,gBAAgB;KACjC;CACF,CAAC,CAAC;AAZU,QAAA,kBAAkB,sBAY5B;AAEU,QAAA,eAAe,GAAG;IAC7B,sCAAsC;IACtC,gBAAgB;IAChB,sCAAsC;IACtC,6CAA6C;IAC7C,sLAAsL;CACvL,CAAC;AAEK,MAAM,UAAU,GAAG,CAAC,EAAE,MAAM,EAAsB,EAAE,EAAE;IAC3D,OAAO;QACL,kBAAkB,IAAA,2BAAc,EAC9B,IAAA,+BAAkB,EAAC,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC,CAC5C,GAAG;QACJ,mBAAmB;QACnB,gIAAgI;KACjI,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,UAAU,cAQrB"}
@@ -42,6 +42,7 @@ const createMainPipeline = async (pipelineType, config) => {
42
42
  var _a, _b;
43
43
  // merge jobs, if a job is already there, merge the rules
44
44
  // this is currently needed because of envMode: "none", which creates the same job for all triggers, so it can appear multiple times
45
+ // NOTICE: envNode none has been removed and this may no longer be needed
45
46
  if (acc[name]) {
46
47
  acc[name].gitlabJob.rules = [
47
48
  ...((_a = acc[name].gitlabJob.rules) !== null && _a !== void 0 ? _a : []),
@@ -1 +1 @@
1
- {"version":3,"file":"createMainPipeline.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createMainPipeline.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createMainPipeline.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createMainPipeline.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,9 @@
1
+ import type { AgentContext, Context, GitlabJobCache } from "../../types";
2
+ export declare const getCacheKeyWithFallbackForMR: (baseKey: string, context: Context) => {
3
+ key: string;
4
+ fallback_keys: string[];
5
+ } | {
6
+ key: string;
7
+ fallback_keys?: undefined;
8
+ };
9
+ export declare const addCacheFallback: (cache: GitlabJobCache | GitlabJobCache[], context: Context | AgentContext) => GitlabJobCache | GitlabJobCache[];
@@ -0,0 +1,36 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.addCacheFallback = exports.getCacheKeyWithFallbackForMR = void 0;
4
+ const getCacheKeyWithFallbackForMR = (baseKey, context) => {
5
+ // if its a branch, create a key with the branch name with fallback to the base key
6
+ if (context.trigger === "mr") {
7
+ return {
8
+ key: baseKey + "-mr$CI_MERGE_REQUEST_IID",
9
+ fallback_keys: [baseKey],
10
+ };
11
+ }
12
+ return {
13
+ key: baseKey,
14
+ };
15
+ };
16
+ exports.getCacheKeyWithFallbackForMR = getCacheKeyWithFallbackForMR;
17
+ const addCacheFallback = (cache, context) => {
18
+ if (context.type !== "agent" && context.trigger === "mr") {
19
+ if (Array.isArray(cache)) {
20
+ return cache.map((c) => addCacheFallbackToSingleCacheForMR(c, context));
21
+ }
22
+ return addCacheFallbackToSingleCacheForMR(cache, context);
23
+ }
24
+ return cache;
25
+ };
26
+ exports.addCacheFallback = addCacheFallback;
27
+ const addCacheFallbackToSingleCacheForMR = (cache, context) => {
28
+ if (typeof cache.key === "string") {
29
+ return {
30
+ ...cache,
31
+ ...(0, exports.getCacheKeyWithFallbackForMR)(cache.key, context),
32
+ };
33
+ }
34
+ return cache; // as is
35
+ };
36
+ //# sourceMappingURL=cache.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/cache.ts"],"names":[],"mappings":";;;AAOO,MAAM,4BAA4B,GAAG,CAC1C,OAAe,EACf,OAAgB,EAChB,EAAE;IACF,mFAAmF;IACnF,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;QAC7B,OAAO;YACL,GAAG,EAAE,OAAO,GAAG,0BAA0B;YACzC,aAAa,EAAE,CAAC,OAAO,CAAC;SACzB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG,EAAE,OAAO;KACb,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,4BAA4B,gCAevC;AAEK,MAAM,gBAAgB,GAAG,CAC9B,KAAwC,EACxC,OAA+B,EAC/B,EAAE;IACF,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;QACzD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kCAAkC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QAC1E,CAAC;QACD,OAAO,kCAAkC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAXW,QAAA,gBAAgB,oBAW3B;AAEF,MAAM,kCAAkC,GAAG,CACzC,KAAwB,EACxB,OAAgB,EAChB,EAAE;IACF,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;QAClC,OAAO;YACL,GAAG,KAAK;YACR,GAAG,IAAA,oCAA4B,EAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC;SACpD,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC,CAAC,QAAQ;AACxB,CAAC,CAAC"}