feat: support indirect import

Author: dominykas

lib/travis/index.js

@@ -23,26 +23,33 @@ internals.toArray = (v) => {
 };
 
 
-internals.normalizeImports = (travisYaml) => {
+internals.normalizeImports = (travisYaml, { relativeTo }) => {
 
     return internals.toArray(travisYaml.import).map((entry) => {
 
         if (typeof entry === 'string') {
             entry = { source: entry };
         }
 
+        if (entry.source.startsWith('./')) {
+            const relativeParts = relativeTo.source.split('/');
+            relativeParts.pop();
+            relativeParts.push(entry.source.substring(2));
+            entry.source = relativeParts.join('/');
+        }
+
         return entry;
     });
 };
 
 
-internals.applyImports = async (yaml, { loadFile }) => {
+internals.applyImports = async (yaml, { loadFile, relativeTo }) => {
 
     if (!yaml.import) {
         return;
     }
 
-    const imports = internals.normalizeImports(yaml);
+    const imports = internals.normalizeImports(yaml, { relativeTo });
 
     for (const entry of imports) {
 
@@ -53,7 +60,14 @@ internals.applyImports = async (yaml, { loadFile }) => {
             json: true
         });
 
+        await internals.applyImports(imported, { loadFile, relativeTo: entry });
+
         for (const key in imported) {
+
+            if (key === 'import') {
+                continue;
+            }
+
             yaml[key] = imported[key];
         }
     }

test/fixtures/index.js

@@ -89,7 +89,11 @@ module.exports = class TestContext {
 
         if (partials) {
             Fs.mkdirSync(Path.join(this.path, 'partials'));
-            for (const fn of ['node-14.yml']) {
+            const partialYmls = [
+                'indirect-node-14.yml',
+                'node-14.yml'
+            ];
+            for (const fn of partialYmls) {
                 Fs.copyFileSync(Path.join(__dirname, 'travis-ymls', 'testing-imports', 'partials', fn), Path.join(this.path, 'partials', fn));
             }
         }

test/fixtures/travis-ymls/testing-imports/indirect.yml

@@ -0,0 +1,3 @@
+language: node_js
+import:
+  - source: partials/indirect-node-14.yml

test/fixtures/travis-ymls/testing-imports/partials/indirect-node-14.yml

@@ -0,0 +1,2 @@
+import:
+  - source: ./node-14.yml

test/travis.js

@@ -33,33 +33,52 @@ describe('.travis.yml parsing', () => {
         fixture.cleanup();
     });
 
-    describe('simple', () => {
+    for (const yml of ['simple-single-object', 'simple-single-string', 'simple-array-object', 'simple-array-string']) {
 
-        for (const yml of ['simple-single-object', 'simple-single-string', 'simple-array-object', 'simple-array-string']) {
+        // eslint-disable-next-line no-loop-func
+        it(`resolves simple local import (${yml})`, async () => {
 
-            // eslint-disable-next-line no-loop-func
-            it(`resolves simple local import (${yml})`, async () => {
-
-                await fixture.setupRepoFolder({
-                    partials: true,
-                    travisYml: `testing-imports/${yml}.yml`
-                });
+            await fixture.setupRepoFolder({
+                partials: true,
+                travisYml: `testing-imports/${yml}.yml`
+            });
 
-                const result = await NodeSupport.detect({ path: fixture.path });
+            const result = await NodeSupport.detect({ path: fixture.path });
 
-                internals.assertCommit(result);
+            internals.assertCommit(result);
 
-                expect(result).to.equal({
-                    name: 'test-module',
-                    version: '0.0.0-development',
-                    timestamp: 1580673602000,
-                    travis: {
-                        raw: ['14'],
-                        resolved: { '14': '14.3.0' }
-                    }
-                });
+            expect(result).to.equal({
+                name: 'test-module',
+                version: '0.0.0-development',
+                timestamp: 1580673602000,
+                travis: {
+                    raw: ['14'],
+                    resolved: { '14': '14.3.0' }
+                }
             });
-        }
+        });
+    }
+
+    it('resolves indirect imports', async () => {
+
+        await fixture.setupRepoFolder({
+            partials: true,
+            travisYml: `testing-imports/indirect.yml`
+        });
+
+        const result = await NodeSupport.detect({ path: fixture.path });
+
+        internals.assertCommit(result);
+
+        expect(result).to.equal({
+            name: 'test-module',
+            version: '0.0.0-development',
+            timestamp: 1580673602000,
+            travis: {
+                raw: ['14'],
+                resolved: { '14': '14.3.0' }
+            }
+        });
     });
 
 });