@intentius/chant-lexicon-gitlab 0.106.1 → 0.106.3

package/dist/integrity.json

@@ -1,7 +1,7 @@
 {
   "algorithm": "sha256",
   "artifacts": {
-    "manifest.json": "47ce6b5b8e35b2dd162ab80d25122abeadf6c896bc1ecca0ae585b3c7cbb6c31",
+    "manifest.json": "fb4d145f385ac1702b9084aa87ef84069138eff4010d2a8d0b61d50ce64e235f",
     "meta.json": "931fc3246a55645b1493080bbeb160e5d205e42349e8bdca96ca243adb5f0da3",
     "types/index.d.ts": "5cd2e99f135a929b72bdd822d00d780d39b1cd407ba0cfb3d511c7ac9d667b58",
     "rules/artifact-no-expiry.ts": "3f3cabf9792cbf8207e53a25f506715466b19ec25e9c3b4d0d77fed6b2eb4542",
@@ -55,5 +55,5 @@
     "skills/chant-gitlab-migrate.md": "4853d04980560b379e5b0f7267dcb0a1e5d5879cb9e9931681ce76b2a5fe69d8",
     "skills/chant-gitlab-patterns.md": "6d9a44e9e8de4c3820be9d65381b0d2ede4cb3626aaaf0011e21838a9fbf556e"
   },
-  "composite": "a5370ff33eed54ef2099b3cb8454208518b7a5005cf5ca8249b2a127a997023c"
+  "composite": "b4573669289f773787b3da6c76e8d20c8adf55482914d721749f627b308b7d11"
 }

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "gitlab",
-  "version": "0.106.1",
+  "version": "0.106.3",
   "chantVersion": ">=0.1.0",
   "namespace": "GitLab",
   "intrinsics": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant-lexicon-gitlab",
-  "version": "0.106.1",
+  "version": "0.106.3",
   "description": "GitLab CI lexicon for chant — declarative IaC in TypeScript",
   "license": "Apache-2.0",
   "homepage": "https://intentius.io/chant",
@@ -67,8 +67,8 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@intentius/chant": "^0.106.1",
-    "@intentius/chant-lexicon-github": "^0.106.1",
+    "@intentius/chant": "^0.106.3",
+    "@intentius/chant-lexicon-github": "^0.106.3",
     "typescript": "^5.9.3"
   },
   "peerDependenciesMeta": {

package/src/components/generate-pipeline.member.test.ts

@@ -31,7 +31,7 @@ describe("generateGitlabPipeline for a workspace member", () => {
   test("jobs take the member's name, run in its directory and only on its changes", () => {
     const result = generateGitlabPipeline(components, { env: "staging", member: api });
     const doc = parseYAML(result.yaml) as Record<string, unknown>;
-    expect(doc.workflow).toEqual({ name: "chant-components-api-staging" });
+    expect(doc.workflow).toEqual({ name: "chant-components.api.staging" });
     expect(doc["shared-alb"]).toBeUndefined();
 
     const job = doc["api-api"] as Job;

package/src/components/generate-pipeline.ts

@@ -305,7 +305,9 @@ function prLoopGitlabPipeline(
   const script = (job: typeof plan): string[] => [...prLoopSetup(image), ...enter, ...beforeScript, ...(job.setup ?? []), job.command, ...extraScript];
   const stages = ["plan", "apply"];
   const doc: Record<string, unknown> = {
-    workflow: { name: member ? `chant-pr-${member.name}-${env}` : `chant-pr-${env}`, rules: [{ if: onMergeRequest }, { if: onMerge }] },
+    // Included files merge their top-level keys, so a member's file carries
+    // the rules every member shares and no name: two names would collide.
+    workflow: { ...(member ? {} : { name: `chant-pr-${env}` }), rules: [{ if: onMergeRequest }, { if: onMerge }] },
     stages,
     variables: { ...options.variables, CHANT_ENV: env, GIT_DEPTH: "0" },
     [planJob]: {
@@ -382,6 +384,6 @@ function scopeToMember(
     job.jobName = renamed.get(job.jobName)!;
     job.needs = job.needs.map((n) => renamed.get(n) ?? n);
   }
-  doc.workflow = { name: `chant-components-${member.name}-${env}` };
+  doc.workflow = { name: `chant-components.${member.name}.${env}` };
   return promoteJob ? renamed.get(promoteJob) : undefined;
 }

package/src/components/generate-pr-pipeline.test.ts

@@ -97,12 +97,14 @@ describe("the GitLab merge-request pipeline", () => {
   });
 
   test("inside a workspace member: member-named jobs that cd into the member, with no changes rule (#3465)", () => {
-    const member = { name: "network", dir: "infra/network", file: ".gitlab/ci/chant-pr-network-prod.gitlab-ci.yml" };
+    const member = { name: "network", dir: "infra/network", file: ".gitlab/ci/chant-pr.network.prod.gitlab-ci.yml" };
     const scoped = generateGitlabPipeline(ESTATE, { env: "prod", prLoop: {}, member });
-    const mdoc = parseYAML(scoped.yaml) as Record<string, unknown> & { workflow: { name: string } };
+    const mdoc = parseYAML(scoped.yaml) as Record<string, unknown> & { workflow: { name?: string; rules: unknown[] } };
     expect(scoped.jobs.map((j) => j.jobName)).toEqual(["network-plan", "network-apply"]);
     expect(mdoc.plan).toBeUndefined();
-    expect(mdoc.workflow.name).toBe("chant-pr-network-prod");
+    // Included files merge top-level keys: no name, so members do not collide on it.
+    expect(mdoc.workflow.name).toBeUndefined();
+    expect(mdoc.workflow.rules).toHaveLength(2);
     const plan = mdoc["network-plan"] as Job;
     const apply = mdoc["network-apply"] as Job;
     expect(plan.script).toContain("cd infra/network");
@@ -111,9 +113,9 @@ describe("the GitLab merge-request pipeline", () => {
     expect(apply.script.find((l) => l.includes("pr-apply"))).toContain("--member network");
     // A change outside the member can reach it, so the jobs keep only their pipeline-source rules.
     expect(plan.rules).toEqual([{ if: '$CI_PIPELINE_SOURCE == "merge_request_event"' }]);
-    expect(apply.resource_group).toBe("chant-apply-network-prod");
+    expect(apply.resource_group).toBe("chant-apply.network.prod");
     expect(plan.artifacts).toEqual({ when: "always", paths: ["infra/network/.chant/pr"] });
     expect(apply.artifacts).toEqual({ when: "always", paths: ["infra/network/.chant/pr"] });
-    expect(apply.cache).toEqual({ key: "chant-apply-network-prod-$CI_COMMIT_SHA", paths: ["infra/network/.chant/pr-resume/pr-apply.json"], when: "always" });
+    expect(apply.cache).toEqual({ key: "chant-apply.network.prod-$CI_COMMIT_SHA", paths: ["infra/network/.chant/pr-resume/pr-apply.json"], when: "always" });
   });
 });