fix: Bad expansion for nested rules reference (#1596)

Author: ANGkeith

src/data-expander.ts

@@ -234,8 +234,13 @@ function normalizeGlobalVariables (gitlabData: any) {
 export function flattenLists (gitlabData: any) {
     traverse(gitlabData, ({parent, key, value, meta}) => {
         if (parent != null && key != null && Array.isArray(value)) {
-            parent[key] = value.flat(9);
-            assert(!parent[key].some(Array.isArray), chalk`This Gitlab CI configuration is invalid: {blueBright ${meta.nodePath}} config should be string or a nested array of strings up to 10 level deep`);
+            assert(!value.flat(9).some(Array.isArray), chalk`This Gitlab CI configuration is invalid: {blueBright ${meta.nodePath}} config should be string or a nested array of strings up to 10 level deep`);
         }
     }, {cycleHandling: true});
+
+    traverse(gitlabData, ({parent, key, value}) => {
+        if (parent != null && key != null && Array.isArray(value)) {
+            parent[key] = value.flat(9);
+        }
+    }, {cycleHandling: false});
 }

tests/test-cases/reference/.gitlab-ci-3.yml

@@ -0,0 +1,22 @@
+---
+.base_template:
+  variables:
+    MY_VAR: MY_VAL
+  rules:
+    - if: $MY_VAR == "MY_VAL"
+      when: always
+
+.job_template1:
+  extends: [.base_template]
+  rules: !reference [.base_template, rules]
+
+.job_template2:
+  extends: [.base_template]
+  rules:
+    - !reference [.base_template, rules]
+
+test-job:
+  extends: [.job_template2]
+  script:
+    - echo "hello world job"
+  rules: !reference [.job_template2, rules]

tests/test-cases/reference/integration.test.ts

@@ -205,3 +205,32 @@ test-job:
 
     expect(writeStreams.stdoutLines.join("\n")).toEqual(expected.trim());
 });
+
+it("should have a lower precedence than a local scope", async () => {
+    const writeStreams = new WriteStreamsMock();
+    await handler({
+        preview: true,
+        file: ".gitlab-ci-3.yml",
+        cwd: "tests/test-cases/reference",
+    }, writeStreams);
+
+    const expected = `
+---
+stages:
+  - .pre
+  - build
+  - test
+  - deploy
+  - .post
+test-job:
+  variables:
+    MY_VAR: MY_VAL
+  rules:
+    - if: $MY_VAR == "MY_VAL"
+      when: always
+  script:
+    - echo "hello world job"
+`;
+
+    expect(writeStreams.stdoutLines.join("\n")).toEqual(expected.trim());
+});