@payfit/nx-core 5.0.2-ephemeral-vibe-code-spacelift-stack-manager.4 → 5.0.2

package/dist/src/utils/common/oci.d.ts

@@ -1,22 +1,8 @@
-import { ArtifactType } from './enums';
 /**
- * Pushes Lambda, frontend function package.json as OCI artifact to ECR using ORAS.
+ * Pushes Lambda function package.json as OCI artifact to ECR using ORAS.
  *
  * @param ecrRepository - ECR repository name
  * @param tag - Version tag for the artifact
- * @param artifactPath - Path to artifact to package
- * @param type - Artifact type
- * @param ecrRegistry - ECR registry
+ * @param pathToPackageJson - Path to package.json file
  */
-export declare function pushImageToEcr(ecrRepository: string, tag: string, artifactPath: string, type: ArtifactType.LAMBDA | ArtifactType.FRONTEND, ecrRegistry: string): Promise<void>;
-/**
- * Pushes helm chart as OCI artifact to ECR using ORAS.
- *
- * @param ecrRepository - ECR repository name
- * @param tag - Version tag for the artifact
- * @param artifactPath - Path to artifact to package
- * @param type - Artifact type
- * @param ecrRegistry - ECR registry
- * @param chartConfigPath - Path to chart config file in JSON format
- */
-export declare function pushHelmOciToEcr(ecrRepository: string, tag: string, artifactPath: string, ecrRegistry: string, chartConfigPath: string): Promise<void>;
+export declare function pushImageToEcr(ecrRepository: string, tag: string, pathToPackageJson: string, type: 'lambda' | 'frontend', ecrRegistry: string): Promise<void>;

package/dist/src/utils/common/oci.js

@@ -1,57 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pushImageToEcr = pushImageToEcr;
-exports.pushHelmOciToEcr = pushHelmOciToEcr;
 const consola_1 = require("consola");
 const exec_1 = require("./exec");
 const github_1 = require("./github");
 /**
- * Pushes Lambda, frontend function package.json as OCI artifact to ECR using ORAS.
+ * Pushes Lambda function package.json as OCI artifact to ECR using ORAS.
  *
  * @param ecrRepository - ECR repository name
  * @param tag - Version tag for the artifact
- * @param artifactPath - Path to artifact to package
- * @param type - Artifact type
- * @param ecrRegistry - ECR registry
+ * @param pathToPackageJson - Path to package.json file
  */
-async function pushImageToEcr(ecrRepository, tag, artifactPath, type, ecrRegistry) {
-    consola_1.consola.log(`OCI: Pushing image to ECR: ${ecrRegistry}/${ecrRepository}:${tag}`);
+async function pushImageToEcr(ecrRepository, tag, pathToPackageJson, type, ecrRegistry) {
     const commitSha = await (0, github_1.getCurrentGitCommitSha)();
     const gitRepoUrl = await (0, github_1.getSanitizedCurrentGitRepoUrl)();
-    const artifactType = `application/vnd.payfit.${type}.manifest`;
     const orasPushCommand = [
         `oras push ${ecrRegistry}/${ecrRepository}:${tag}`,
         `--annotation "org.opencontainers.image.source=${gitRepoUrl}"`,
         `--annotation "org.opencontainers.image.revision=${commitSha}"`,
         `--disable-path-validation`,
-        `--artifact-type ${artifactType} ${artifactPath}`,
-    ].join(' ');
-    const uploadToOci = await (0, exec_1.exec)(orasPushCommand, {
-        throwOnError: true,
-    });
-    consola_1.consola.log(uploadToOci.stdout);
-}
-/**
- * Pushes helm chart as OCI artifact to ECR using ORAS.
- *
- * @param ecrRepository - ECR repository name
- * @param tag - Version tag for the artifact
- * @param artifactPath - Path to artifact to package
- * @param type - Artifact type
- * @param ecrRegistry - ECR registry
- * @param chartConfigPath - Path to chart config file in JSON format
- */
-async function pushHelmOciToEcr(ecrRepository, tag, artifactPath, ecrRegistry, chartConfigPath) {
-    consola_1.consola.log(`OCI: Pushing image to ECR: ${ecrRegistry}/${ecrRepository}:${tag}`);
-    const commitSha = await (0, github_1.getCurrentGitCommitSha)();
-    const gitRepoUrl = await (0, github_1.getSanitizedCurrentGitRepoUrl)();
-    const orasPushCommand = [
-        `oras push ${ecrRegistry}/${ecrRepository}:${tag}`,
-        `--annotation "org.opencontainers.image.source=${gitRepoUrl}"`,
-        `--annotation "org.opencontainers.image.revision=${commitSha}"`,
-        `--disable-path-validation`,
-        `--config ${chartConfigPath}:application/vnd.cncf.helm.config.v1+json`,
-        `${artifactPath}:application/vnd.cncf.helm.chart.content.v1.tar+gzip`,
+        `--artifact-type application/vnd.payfit.${type}.manifest ${pathToPackageJson}`,
     ].join(' ');
     const uploadToOci = await (0, exec_1.exec)(orasPushCommand, {
         throwOnError: true,

package/dist/src/utils/common/oci.js.map

@@ -1 +1 @@
-{"version":3,"file":"oci.js","sourceRoot":"","sources":["../../../../src/utils/common/oci.ts"],"names":[],"mappings":";;AAeA,wCAwBC;AAYD,4CAwBC;AA3ED,qCAAiC;AAGjC,iCAA6B;AAC7B,qCAAgF;AAEhF;;;;;;;;GAQG;AACI,KAAK,UAAU,cAAc,CAClC,aAAqB,EACrB,GAAW,EACX,YAAoB,EACpB,IAAiD,EACjD,WAAmB;IAEnB,iBAAO,CAAC,GAAG,CACT,8BAA8B,WAAW,IAAI,aAAa,IAAI,GAAG,EAAE,CACpE,CAAA;IACD,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAsB,GAAE,CAAA;IAChD,MAAM,UAAU,GAAG,MAAM,IAAA,sCAA6B,GAAE,CAAA;IACxD,MAAM,YAAY,GAAG,0BAA0B,IAAI,WAAW,CAAA;IAC9D,MAAM,eAAe,GAAG;QACtB,aAAa,WAAW,IAAI,aAAa,IAAI,GAAG,EAAE;QAClD,iDAAiD,UAAU,GAAG;QAC9D,mDAAmD,SAAS,GAAG;QAC/D,2BAA2B;QAC3B,mBAAmB,YAAY,IAAI,YAAY,EAAE;KAClD,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACX,MAAM,WAAW,GAAG,MAAM,IAAA,WAAI,EAAC,eAAe,EAAE;QAC9C,YAAY,EAAE,IAAI;KACnB,CAAC,CAAA;IACF,iBAAO,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;AACjC,CAAC;AAED;;;;;;;;;GASG;AACI,KAAK,UAAU,gBAAgB,CACpC,aAAqB,EACrB,GAAW,EACX,YAAoB,EACpB,WAAmB,EACnB,eAAuB;IAEvB,iBAAO,CAAC,GAAG,CACT,8BAA8B,WAAW,IAAI,aAAa,IAAI,GAAG,EAAE,CACpE,CAAA;IACD,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAsB,GAAE,CAAA;IAChD,MAAM,UAAU,GAAG,MAAM,IAAA,sCAA6B,GAAE,CAAA;IACxD,MAAM,eAAe,GAAG;QACtB,aAAa,WAAW,IAAI,aAAa,IAAI,GAAG,EAAE;QAClD,iDAAiD,UAAU,GAAG;QAC9D,mDAAmD,SAAS,GAAG;QAC/D,2BAA2B;QAC3B,YAAY,eAAe,2CAA2C;QACtE,GAAG,YAAY,sDAAsD;KACtE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACX,MAAM,WAAW,GAAG,MAAM,IAAA,WAAI,EAAC,eAAe,EAAE;QAC9C,YAAY,EAAE,IAAI;KACnB,CAAC,CAAA;IACF,iBAAO,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;AACjC,CAAC"}
+{"version":3,"file":"oci.js","sourceRoot":"","sources":["../../../../src/utils/common/oci.ts"],"names":[],"mappings":";;AAYA,wCAoBC;AAhCD,qCAAiC;AAEjC,iCAA6B;AAC7B,qCAAgF;AAEhF;;;;;;GAMG;AACI,KAAK,UAAU,cAAc,CAClC,aAAqB,EACrB,GAAW,EACX,iBAAyB,EACzB,IAA2B,EAC3B,WAAmB;IAEnB,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAsB,GAAE,CAAA;IAChD,MAAM,UAAU,GAAG,MAAM,IAAA,sCAA6B,GAAE,CAAA;IACxD,MAAM,eAAe,GAAG;QACtB,aAAa,WAAW,IAAI,aAAa,IAAI,GAAG,EAAE;QAClD,iDAAiD,UAAU,GAAG;QAC9D,mDAAmD,SAAS,GAAG;QAC/D,2BAA2B;QAC3B,0CAA0C,IAAI,aAAa,iBAAiB,EAAE;KAC/E,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACX,MAAM,WAAW,GAAG,MAAM,IAAA,WAAI,EAAC,eAAe,EAAE;QAC9C,YAAY,EAAE,IAAI;KACnB,CAAC,CAAA;IACF,iBAAO,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;AACjC,CAAC"}

package/dist/src/utils/docker.d.ts

@@ -10,8 +10,8 @@ import { Result } from 'tinyexec';
  * @param registry - Docker registry URL
  * @param extraTags - Optional additional tags for the image
  * @param appName
+ * @param disableEcrCache
  * @param buildArgs - Optional build arguments for the Docker build
- * @param isCI - Are we running this in a CI context, enabling caching & pushing. Default to true as we only need it within the docker-build executor
  * @return {Promise<Result>}
  */
-export declare function buildAndPushDockerImage(imageName: string, dockerfilePath: string, version: string, gitRepoUrl: string, commitSha: string, registry: string, extraTags: string[], appName: string, buildArgs?: string, isCI?: boolean): Promise<Result>;
+export declare function buildAndPushDockerImage(imageName: string, dockerfilePath: string, version: string, gitRepoUrl: string, commitSha: string, registry: string, extraTags: string[], appName: string, disableEcrCache: boolean, buildArgs?: string): Promise<Result>;

package/dist/src/utils/docker.js

@@ -44,29 +44,31 @@ async function setupDockerBuilder(appName) {
  * @param registry - Docker registry URL
  * @param extraTags - Optional additional tags for the image
  * @param appName
+ * @param disableEcrCache
  * @param buildArgs - Optional build arguments for the Docker build
- * @param isCI - Are we running this in a CI context, enabling caching & pushing. Default to true as we only need it within the docker-build executor
  * @return {Promise<Result>}
  */
-async function buildAndPushDockerImage(imageName, dockerfilePath, version, gitRepoUrl, commitSha, registry, extraTags = [], appName, buildArgs = undefined, isCI = true) {
+async function buildAndPushDockerImage(imageName, dockerfilePath, version, gitRepoUrl, commitSha, registry, extraTags = [], appName, disableEcrCache, buildArgs = undefined) {
     appName = appName.replaceAll('@', '-').replaceAll('/', '-');
     const buildContextName = await setupDockerBuilder(appName);
     // Build all tags including base version and extra tags
     const tagArgs = [`${version}`, ...extraTags]
-        .map(tag => isCI ? `-t ${registry}/${imageName}:${tag}` : `-t ${imageName}:${tag}`)
+        .map(tag => `-t ${registry}/${imageName}:${tag}`)
         .join(' ');
     // Setup registry cache (skip for public ECR which doesn't support BuildKit cache backend)
     const isPublicEcr = registry.includes('public.ecr.aws');
     const cacheArgParts = [];
-    if (!isPublicEcr && isCI) {
+    if (!isPublicEcr) {
         const branch = await (0, github_1.getSanitizedCurrentGitBranch)();
         const branchCacheRef = `${registry}/${imageName}:cache-build-${branch}`;
         const mainCacheRef = `${registry}/${imageName}:cache-build-main`;
-        cacheArgParts.push(`--cache-from type=registry,ref=${branchCacheRef}`);
-        if (!(await (0, github_1.isDefaultBranch)(branch))) {
-            cacheArgParts.push(`--cache-from type=registry,ref=${mainCacheRef}`);
+        if (!disableEcrCache) {
+            cacheArgParts.push(`--cache-from type=registry,ref=${branchCacheRef}`);
+            if (!(await (0, github_1.isDefaultBranch)(branch))) {
+                cacheArgParts.push(`--cache-from type=registry,ref=${mainCacheRef}`);
+            }
+            cacheArgParts.push(`--cache-to type=registry,ref=${branchCacheRef},mode=max`);
         }
-        cacheArgParts.push(`--cache-to type=registry,ref=${branchCacheRef},mode=max`);
     }
     const buildArgsParts = [];
     if (buildArgs) {
@@ -85,7 +87,7 @@ async function buildAndPushDockerImage(imageName, dockerfilePath, version, gitRe
         `--builder ${buildContextName}`,
         `-f ${dockerfilePath}`,
         `--secret id=NPM_TOKEN`,
-        `${isCI ? '--push' : '--load'}`,
+        `--push`,
         `--provenance=false`,
         ...cacheArgParts,
         `--annotation org.opencontainers.image.source=${gitRepoUrl}`,

package/dist/src/utils/docker.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../src/utils/docker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../src/utils/docker.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/helm.d.ts

@@ -60,5 +60,5 @@ export declare function pushPackagedHelm(packagedHelmChartFilePath: string, pack
  * @param packagedHelmChartFilePath
  * @param ecrRepositoryPath
  */
-export declare function pushOciPackagedHelm(packagedHelmChartFilePath: string, ecrRepositoryPath: string, version: string, chartConfigPath: string): Promise<void>;
+export declare function pushOciPackagedHelm(packagedHelmChartFilePath: string, ecrRepositoryPath: string): Promise<import("tinyexec").Output>;
 export {};

package/dist/src/utils/helm.js

@@ -15,7 +15,6 @@ const aws_auth_1 = require("./common/aws-auth");
 const ecr_1 = require("./common/ecr");
 const exec_1 = require("./common/exec");
 const logger_1 = require("./common/logger");
-const oci_1 = require("./common/oci");
 const tshProxy = 'http://localhost';
 /**
  * Read & parse the Helm chart.yaml file
@@ -52,11 +51,11 @@ async function resetTeleportProxyHelmChartFile(helmFolderPath, tshPort) {
 async function installHelmRepo(helmFolderPath) {
     const chartConfig = await getHelmChartFile(helmFolderPath);
     if (chartConfig.dependencies) {
-        for (const dep of chartConfig.dependencies) {
+        for (let i = 0; i < chartConfig.dependencies.length; i++) {
+            const dep = chartConfig.dependencies[i];
             const repoName = `tsh-${dep.name}-${dep.alias}`;
             // check if the repository is our private payfit repo or a public one
-            const isPrivateRepo = dep.repository.includes(tshProxy);
-            if (isPrivateRepo) {
+            if (dep.repository.includes(tshProxy)) {
                 // if  it's our repo, we need the username and password to authenticate
                 if (!process.env.CHARTMUSEUM_USERNAME ||
                     !process.env.CHARTMUSEUM_PASSWORD)
@@ -152,14 +151,10 @@ async function pushPackagedHelm(packagedHelmChartFilePath, packagedHelmChartName
  * @param packagedHelmChartFilePath
  * @param ecrRepositoryPath
  */
-async function pushOciPackagedHelm(packagedHelmChartFilePath, ecrRepositoryPath, version, chartConfigPath) {
+async function pushOciPackagedHelm(packagedHelmChartFilePath, ecrRepositoryPath) {
     // Login to ECR
     await (0, aws_auth_1.loginToEcr)((0, ecr_1.getAwsEcrRegistry)());
-    const [ecrRegistry, ecrRepository] = ecrRepositoryPath.split(/\/(.*)/s);
-    // config file should be pushed to OCI in JSON format
-    const chartConfig = YAML.parse(fs.readFileSync(chartConfigPath, 'utf8'));
-    fs.writeFileSync('Chart.json', JSON.stringify(chartConfig, null, 2));
-    //Push the Helm chart to ECR using OCI format
-    await (0, oci_1.pushHelmOciToEcr)(ecrRepository, version, packagedHelmChartFilePath, ecrRegistry, 'Chart.json');
+    // Push the Helm chart to ECR using OCI format
+    return (0, exec_1.exec)(`helm push ${packagedHelmChartFilePath} oci://${ecrRepositoryPath}`);
 }
 //# sourceMappingURL=helm.js.map

package/dist/src/utils/helm.js.map

@@ -1 +1 @@
-{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../src/utils/helm.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../src/utils/helm.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/helm.mock.d.ts

@@ -0,0 +1,85 @@
+export declare const mockValuesConfigPath = "/tmp/values.yaml";
+export declare const mockChartConfigPath = "/tmp/Chart.yaml";
+export declare const mockVersion = "1.2.3";
+export declare const mockChart1SvcConfig: {
+    dependencies: {
+        name: string;
+        alias: string;
+        repository: string;
+    }[];
+};
+export declare const mockChart2SvcConfig: {
+    dependencies: {
+        name: string;
+        alias: string;
+        repository: string;
+    }[];
+};
+export declare const mockChartPublicConfig: {
+    dependencies: {
+        name: string;
+        alias: string;
+        repository: string;
+    }[];
+};
+export declare const mockValues2SvcWithDbMigration: {
+    service1Alias: {
+        image: {
+            tag: string;
+        };
+        dbMigration: {
+            image: {
+                tag: string;
+            };
+        };
+    };
+    service2Alias: {
+        image: {
+            tag: string;
+        };
+    };
+};
+export declare const expectedValuesConfig2SvcWithDbMigration: {
+    service1Alias: {
+        image: {
+            tag: string;
+        };
+        dbMigration: {
+            image: {
+                tag: string;
+            };
+        };
+    };
+    service2Alias: {
+        image: {
+            tag: string;
+        };
+    };
+};
+export declare const mockValues1Svc: {
+    service1Alias: {
+        image: {
+            tag: string;
+        };
+    };
+};
+export declare const mockValuesGlobalTag: {
+    service1Alias: {
+        image: {
+            tag: string;
+        };
+    };
+    image: {
+        tag: string;
+    };
+};
+export declare const mockValuesWithoutImageTag: {
+    service1Alias: {
+        someOtherConfig: string;
+    };
+};
+export declare const mockValuesOnlyGlobalTag: {
+    image: {
+        tag: string;
+    };
+};

package/dist/src/utils/helm.mock.js

@@ -0,0 +1,100 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mockValuesOnlyGlobalTag = exports.mockValuesWithoutImageTag = exports.mockValuesGlobalTag = exports.mockValues1Svc = exports.expectedValuesConfig2SvcWithDbMigration = exports.mockValues2SvcWithDbMigration = exports.mockChartPublicConfig = exports.mockChart2SvcConfig = exports.mockChart1SvcConfig = exports.mockVersion = exports.mockChartConfigPath = exports.mockValuesConfigPath = void 0;
+exports.mockValuesConfigPath = '/tmp/values.yaml';
+exports.mockChartConfigPath = '/tmp/Chart.yaml';
+exports.mockVersion = '1.2.3';
+exports.mockChart1SvcConfig = {
+    dependencies: [
+        {
+            name: 'service1',
+            alias: 'service1Alias',
+            repository: 'http://localhost:8080',
+        },
+    ],
+};
+exports.mockChart2SvcConfig = {
+    dependencies: [
+        {
+            name: 'service1',
+            alias: 'service1Alias',
+            repository: 'http://localhost:8080',
+        },
+        {
+            name: 'service2',
+            alias: 'service2Alias',
+            repository: 'http://localhost:8080',
+        },
+    ],
+};
+exports.mockChartPublicConfig = {
+    dependencies: [
+        {
+            name: 'service1',
+            alias: 'service1Alias',
+            repository: 'https://public-repo.example.com',
+        },
+    ],
+};
+exports.mockValues2SvcWithDbMigration = {
+    service1Alias: {
+        image: {
+            tag: 'old-tag',
+        },
+        dbMigration: {
+            image: {
+                tag: 'old-tag',
+            },
+        },
+    },
+    service2Alias: {
+        image: {
+            tag: 'old-tag',
+        },
+    },
+};
+exports.expectedValuesConfig2SvcWithDbMigration = {
+    service1Alias: {
+        image: {
+            tag: exports.mockVersion,
+        },
+        dbMigration: {
+            image: {
+                tag: exports.mockVersion,
+            },
+        },
+    },
+    service2Alias: {
+        image: {
+            tag: exports.mockVersion,
+        },
+    },
+};
+exports.mockValues1Svc = {
+    service1Alias: {
+        image: {
+            tag: 'old-tag',
+        },
+    },
+};
+exports.mockValuesGlobalTag = {
+    service1Alias: {
+        image: {
+            tag: 'old-tag',
+        },
+    },
+    image: {
+        tag: 'old-global-tag',
+    },
+};
+exports.mockValuesWithoutImageTag = {
+    service1Alias: {
+        someOtherConfig: 'value',
+    },
+};
+exports.mockValuesOnlyGlobalTag = {
+    image: {
+        tag: 'old-global-tag',
+    },
+};
+//# sourceMappingURL=helm.mock.js.map

package/dist/src/utils/helm.mock.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"helm.mock.js","sourceRoot":"","sources":["../../../src/utils/helm.mock.ts"],"names":[],"mappings":";;;AAAa,QAAA,oBAAoB,GAAG,kBAAkB,CAAA;AACzC,QAAA,mBAAmB,GAAG,iBAAiB,CAAA;AACvC,QAAA,WAAW,GAAG,OAAO,CAAA;AAErB,QAAA,mBAAmB,GAAG;IACjC,YAAY,EAAE;QACZ;YACE,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,eAAe;YACtB,UAAU,EAAE,uBAAuB;SACpC;KACF;CACF,CAAA;AAEY,QAAA,mBAAmB,GAAG;IACjC,YAAY,EAAE;QACZ;YACE,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,eAAe;YACtB,UAAU,EAAE,uBAAuB;SACpC;QACD;YACE,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,eAAe;YACtB,UAAU,EAAE,uBAAuB;SACpC;KACF;CACF,CAAA;AAEY,QAAA,qBAAqB,GAAG;IACnC,YAAY,EAAE;QACZ;YACE,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,eAAe;YACtB,UAAU,EAAE,iCAAiC;SAC9C;KACF;CACF,CAAA;AAEY,QAAA,6BAA6B,GAAG;IAC3C,aAAa,EAAE;QACb,KAAK,EAAE;YACL,GAAG,EAAE,SAAS;SACf;QACD,WAAW,EAAE;YACX,KAAK,EAAE;gBACL,GAAG,EAAE,SAAS;aACf;SACF;KACF;IACD,aAAa,EAAE;QACb,KAAK,EAAE;YACL,GAAG,EAAE,SAAS;SACf;KACF;CACF,CAAA;AAEY,QAAA,uCAAuC,GAAG;IACrD,aAAa,EAAE;QACb,KAAK,EAAE;YACL,GAAG,EAAE,mBAAW;SACjB;QACD,WAAW,EAAE;YACX,KAAK,EAAE;gBACL,GAAG,EAAE,mBAAW;aACjB;SACF;KACF;IACD,aAAa,EAAE;QACb,KAAK,EAAE;YACL,GAAG,EAAE,mBAAW;SACjB;KACF;CACF,CAAA;AAEY,QAAA,cAAc,GAAG;IAC5B,aAAa,EAAE;QACb,KAAK,EAAE;YACL,GAAG,EAAE,SAAS;SACf;KACF;CACF,CAAA;AAEY,QAAA,mBAAmB,GAAG;IACjC,aAAa,EAAE;QACb,KAAK,EAAE;YACL,GAAG,EAAE,SAAS;SACf;KACF;IACD,KAAK,EAAE;QACL,GAAG,EAAE,gBAAgB;KACtB;CACF,CAAA;AAEY,QAAA,yBAAyB,GAAG;IACvC,aAAa,EAAE;QACb,eAAe,EAAE,OAAO;KACzB;CACF,CAAA;AAEY,QAAA,uBAAuB,GAAG;IACrC,KAAK,EAAE;QACL,GAAG,EAAE,gBAAgB;KACtB;CACF,CAAA"}

package/dist/src/utils/spacelift/lib/__generated__/gql.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.gql = gql;
-const documents = {};
+const documents = [];
 function gql(source) {
     return documents[source] ?? {};
 }