@catladder/cli 0.0.0-next-71c49b28 → 0.0.0-next-5dc1f907

package/dist/bundles/catenv/index.js

@@ -737,7 +737,7 @@ var __importDefault = this && this.__importDefault || function (mod) {
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.upsertAllVariables = exports.clearBackups = exports.getVariableValueByRawName = exports.getAllVariables = exports.getProjectInfo = exports.doGitlabRequest = exports.getGitlabToken = exports.setupGitlabToken = exports.hasGitlabToken = void 0;
+exports.upsertAllVariables = exports.clearBackups = exports.getVariableValueByRawName = exports.getAllVariables = exports.getProjectInfo = exports.doGitlabRequestAllPages = exports.doGitlabRequest = exports.getGitlabToken = exports.setupGitlabToken = exports.hasGitlabToken = void 0;
 const pipeline_1 = __nccwpck_require__(60241);
 const lodash_es_1 = __nccwpck_require__(64284);
 const memoizee_1 = __importDefault(__nccwpck_require__(57009));
@@ -808,6 +808,24 @@ const doGitlabRequest = async (io, path, data = undefined, method = "GET") => {
   throw new Error(`Could not send request to gitlab api ${path}: ${result.status} "${result.statusText}".\nResponse: ${JSON.stringify(await result.json(), null, 2)}`);
 };
 exports.doGitlabRequest = doGitlabRequest;
+/**
+ * GET a list endpoint across ALL pages (gitlab returns 20 items per
+ * page by default — long-lived projects easily exceed that, e.g.
+ * rotated access tokens accumulate one entry per rotation)
+ */
+const doGitlabRequestAllPages = async (io, path) => {
+  const PER_PAGE = 100;
+  const separator = path.includes("?") ? "&" : "?";
+  const all = [];
+  for (let page = 1;; page++) {
+    const items = await (0, exports.doGitlabRequest)(io, `${path}${separator}per_page=${PER_PAGE}&page=${page}`);
+    if (!(items === null || items === void 0 ? void 0 : items.length)) break;
+    all.push(...items);
+    if (items.length < PER_PAGE) break;
+  }
+  return all;
+};
+exports.doGitlabRequestAllPages = doGitlabRequestAllPages;
 const getProjectInfo = async io => {
   const {
     gitRemotePath
@@ -1890,13 +1908,25 @@ const resolveGithubNeeds = (context, job, allJobs, extraNeeds = []) => {
   return [...new Map(resolved.map(n => [n.id, n])).values()].sort((a, b) => a.id.localeCompare(b.id));
 };
 exports.resolveGithubNeeds = resolveGithubNeeds;
+/** step id of a referenceable cache restore step (see `cacheId`) */
+const cacheStepId = cacheId => `cache-${cacheId.replace(/[^a-zA-Z0-9_-]/g, "-")}`;
 const createCacheSteps = (context, job) => {
   var _a, _b;
   if (!((_a = job.caches) === null || _a === void 0 ? void 0 : _a.length)) {
     return [];
   }
-  const lowered = (_b = (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, job.caches)) !== null && _b !== void 0 ? _b : [];
-  return (0, utils_1.ensureArray)(lowered).map(cache => {
+  const lowered = (0, utils_1.ensureArray)((_b = (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, job.caches)) !== null && _b !== void 0 ? _b : []);
+  // caches marked redundantOnExactHitOf skip their (expensive) restore
+  // when the referenced sibling cache hit its exact key — e.g. the yarn
+  // zip cache is never read when node_modules restored for the same
+  // lockfile. The referenced cache's step must come first (its
+  // `cache-hit` output drives the `if`), so providers are emitted
+  // before dependents; the reorder is github-only and does not affect
+  // the gitlab cache list.
+  const referencedIds = new Set(lowered.map(cache => cache.redundantOnExactHitOf).filter(id => !!id));
+  const providedIds = new Set(lowered.map(cache => cache.cacheId).filter(id => !!id));
+  const ordered = [...lowered.filter(cache => !cache.redundantOnExactHitOf), ...lowered.filter(cache => cache.redundantOnExactHitOf)];
+  return ordered.map(cache => {
     var _a, _b, _c, _d, _e, _f, _g;
     const paths = (0, utils_1.ensureArray)((_a = cache.paths) !== null && _a !== void 0 ? _a : []);
     const key = cache.key;
@@ -1921,8 +1951,18 @@ const createCacheSteps = (context, job) => {
       restoreKeyPrefix: `${(_e = key.prefix) !== null && _e !== void 0 ? _e : "files"}-`,
       label: (_f = key.prefix) !== null && _f !== void 0 ? _f : ((_g = key.files) !== null && _g !== void 0 ? _g : []).join(",")
     };
+    // the sibling-hit condition only applies when the referenced cache
+    // is actually part of this job — otherwise restore unconditionally
+    const skipCondition = cache.redundantOnExactHitOf && providedIds.has(cache.redundantOnExactHitOf) ? `\${{ steps.${cacheStepId(cache.redundantOnExactHitOf)}.outputs.cache-hit != 'true' }}` : undefined;
     return {
       name: `Cache ${label}`,
+      // referenced caches carry an id so dependents can read cache-hit
+      ...(cache.cacheId && referencedIds.has(cache.cacheId) ? {
+        id: cacheStepId(cache.cacheId)
+      } : {}),
+      ...(skipCondition ? {
+        if: skipCondition
+      } : {}),
       // pull-only caches are restored but never saved
       uses: cache.policy === "pull" ? "actions/cache/restore@v4" : "actions/cache@v4",
       with: {
@@ -2697,15 +2737,16 @@ const makeGitlabJob = (context, job, allJobs, images, baseRules) => {
   const when = jobWhen !== null && jobWhen !== void 0 ? jobWhen : gate ? gate === "manual" ? "manual" : "on_success" : undefined;
   const allow_failure = jobAllowFailure !== null && jobAllowFailure !== void 0 ? jobAllowFailure : gate ? gate === "manual" : undefined;
   // the neutral `caches` declarations resolve to gitlab cache configs;
-  // an explicitly set gitlab `cache` takes precedence. `keyFiles` is a
-  // github-only content-key hint and must not leak into the gitlab yaml
-  const stripKeyFiles = resolved => Array.isArray(resolved) ? resolved.map(({
+  // an explicitly set gitlab `cache` takes precedence. keyFiles /
+  // cacheId / redundantOnExactHitOf are github-only hints (content
+  // keys, conditional restore) and must not leak into the gitlab yaml
+  const stripGithubCacheHints = ({
     keyFiles: _keyFiles,
+    cacheId: _cacheId,
+    redundantOnExactHitOf: _redundantOnExactHitOf,
     ...cacheRest
-  }) => cacheRest) : (({
-    keyFiles: _keyFiles,
-    ...cacheRest
-  }) => cacheRest)(resolved);
+  }) => cacheRest;
+  const stripKeyFiles = resolved => Array.isArray(resolved) ? resolved.map(stripGithubCacheHints) : stripGithubCacheHints(resolved);
   const resolvedCaches = caches && context.type !== "agent" ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, caches) : undefined;
   const cache = jobCache !== null && jobCache !== void 0 ? jobCache : resolvedCaches && stripKeyFiles(resolvedCaches);
   const stage = envMode === "stagePerEnv" && context.type !== "agent" ? `${job.stage} ${context.env}` : job.stage;
@@ -3999,6 +4040,8 @@ const createJobCacheFromCacheConfigs = (context, caches) => {
     pathMode,
     buildDir,
     keyFiles,
+    cacheId,
+    redundantOnExactHitOf,
     ...rest
   }) => {
     var _a;
@@ -4015,6 +4058,12 @@ const createJobCacheFromCacheConfigs = (context, caches) => {
       ...((keyFiles === null || keyFiles === void 0 ? void 0 : keyFiles.length) ? {
         keyFiles: keyFiles.map(f => pathMode === "absolute" ? f : (0, path_1.join)(baseDir, f))
       } : {}),
+      ...(cacheId ? {
+        cacheId
+      } : {}),
+      ...(redundantOnExactHitOf ? {
+        redundantOnExactHitOf
+      } : {}),
       ...rest
     };
   });
@@ -4558,6 +4607,12 @@ exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void
 const lodash_es_1 = __nccwpck_require__(64284);
 const path_1 = __nccwpck_require__(16928);
 const slugify_1 = __importDefault(__nccwpck_require__(54206));
+/**
+ * stable reference between the two node caches: the yarn (zip) cache
+ * declares itself redundant when the node_modules cache scored an
+ * exact-lockfile hit (github skips the ~0.6GB download on warm runs)
+ */
+const NODE_MODULES_CACHE_ID = "node-modules";
 const getYarnCache = async (context, policy = "pull-push") => {
   const packageManagerInfo = await context.packageManagerInfo;
   const componentIsInWorkspace = context.type === "component" && "componentIsInWorkspace" in packageManagerInfo && packageManagerInfo.componentIsInWorkspace;
@@ -4569,7 +4624,12 @@ const getYarnCache = async (context, policy = "pull-push") => {
     paths: [".yarn"],
     // content-key for immutable-cache backends (github); the lockfile
     // decides whether the cached content could have changed
-    keyFiles: ["yarn.lock"]
+    keyFiles: ["yarn.lock"],
+    // the .yarn zips (~hundreds of MB) are only read when yarn has to
+    // (re)install packages. When the node_modules cache hit for the
+    // same lockfile, install verifies via install-state.gz and never
+    // opens a zip — so github skips downloading this cache entirely
+    redundantOnExactHitOf: NODE_MODULES_CACHE_ID
   }];
 };
 exports.getYarnCache = getYarnCache;
@@ -4593,6 +4653,9 @@ const getNodeModulesCache = async (context, policy = "pull-push") => {
     // decides whether the cached content could have changed (absolute
     // pathMode: resolve the standalone component's lockfile explicitly)
     keyFiles: [componentIsInWorkspace ? "yarn.lock" : (0, path_1.join)(context.build.dir, "yarn.lock")],
+    // referenced by the yarn cache: an exact hit here makes the yarn
+    // zips unnecessary (see redundantOnExactHitOf on getYarnCache)
+    cacheId: NODE_MODULES_CACHE_ID,
     policy,
     paths: [...(componentIsInWorkspace ? (0, lodash_es_1.uniq)(["node_modules", ...((_a = workspaces.map(w => (0, path_1.join)(w.location, "node_modules"))) !== null && _a !== void 0 ? _a : []), ...(!isClassic ? [".yarn/install-state.gz", ...((_b = workspaces.map(w => (0, path_1.join)(w.location, ".yarn/install-state.gz"))) !== null && _b !== void 0 ? _b : [])] : [])]) : [(0, path_1.join)(context.build.dir, "node_modules"), ...(!isClassic ? [(0, path_1.join)(context.build.dir, ".yarn/install-state.gz")] : [])])]
   }];
@@ -5280,7 +5343,7 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "next-71c49b28" || 0;
+exports.PIPELINE_IMAGE_TAG = "next-5dc1f907" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),