Fetch and load extended presets during create

packages/gasket-cli/CHANGELOG.md

@@ -1,5 +1,6 @@
 # `@gasket/cli`
 
+- Fetch and load extended presets during create
 - Move app-level commands to plugins ([#74])
 - Move metrics to new plugin ([#74])
 - Check dependencies during create with .has

packages/gasket-cli/src/scaffold/actions/load-preset.js

@@ -8,20 +8,38 @@ const loader = new Loader();
 /**
  * Fetches the preset packages and loads PresetInfos
  *
- * @param {CreateContext} context - Create context
+ * @param {[String]} rawPresets - Presets names
+ * @param {String} cwd - Root path
+ * @param {Object} npmconfig - Config
+ * @param {String} from from
  * @returns {PresetInfo[]} loaded presetInfos
  * @private
  */
-async function remotePresets(context) {
-  const { cwd, npmconfig, rawPresets = [] } = context;
+async function remotePresets(rawPresets, cwd, npmconfig, from) {
   if (!rawPresets) { return []; }
 
-  return await Promise.all(rawPresets.map(async rawName => {
+  const allRemotePresets = await Promise.all(rawPresets.map(async rawName => {
     const packageName = presetIdentifier(rawName).full;
     const fetcher = new PackageFetcher({ cwd, npmconfig, packageName });
     const pkgPath = await fetcher.clone();
-    return loader.loadPreset(pkgPath, { from: 'cli', rawName }, { shallow: true });
+
+    const presetInfo = loader.loadPreset(pkgPath, { from: from, rawName }, { shallow: true });
+    const { name: presetName, dependencies } = presetInfo.package;
+    if (!dependencies) {
+      return presetInfo;
+    }
+
+    const presetDeps = Object.keys(dependencies).filter(k => presetIdentifier.isValidFullName(k));
+    const rawPresetsDeps = presetDeps.map(presetDep => `${presetDep}@${dependencies[presetDep]}`);
+
+    const presetInfoDeps = await remotePresets(rawPresetsDeps, cwd, npmconfig, presetName);
+    return {
+      ...presetInfo,
+      presets: presetInfoDeps
+    };
   }));
+
+  return allRemotePresets;
 }
 
 /**
@@ -38,7 +56,7 @@ function localPreset(context) {
   const presetInfos = [];
   localPresets.forEach(localPresetPath => {
     const pkgPath = path.resolve(cwd, localPresetPath);
-    const presetInfo = loader.loadPreset(pkgPath, { from: 'cli' }, { shallow: true });
+    const presetInfo = loader.loadPreset(pkgPath, { from: 'cli' }, { shallow: false });
     presetInfo.rawName = `${presetInfo.package.name}@file:${pkgPath}`;
     presetInfos.push(presetInfo);
   });
@@ -54,7 +72,8 @@ function localPreset(context) {
  * @returns {Promise} promise
  */
 async function loadPreset(context) {
-  let presetInfos = await remotePresets(context);
+  const { rawPresets = [], cwd, npmconfig } = context;
+  let presetInfos = await remotePresets(rawPresets, cwd, npmconfig, 'cli');
   presetInfos = presetInfos.concat(localPreset(context));
 
   const presets = presetInfos.map(p => presetIdentifier(p.rawName).shortName);

packages/gasket-cli/test/unit/scaffold/actions/load-preset.test.js

@@ -17,7 +17,8 @@ describe('loadPreset', () => {
           version: '1.2.3',
           dependencies: {
             '@gasket/bogus-plugin': '1.2.3',
-            'user-bogus-plugin': '3.2.1'
+            'user-bogus-plugin': '3.2.1',
+            '@gasket/some-preset': '1.0.1'
           }
         }
       },
@@ -30,6 +31,12 @@ describe('loadPreset', () => {
           }
         }
       },
+      '@gasket/some-preset@1.0.1': {
+        package: {
+          name: 'some',
+          version: '1.0.1'
+        }
+      },
       'local-preset': {
         package: {
           name: 'local-preset',
@@ -106,15 +113,28 @@ describe('loadPreset', () => {
       mockContext.localPresets = ['../../../fixtures/local-preset', '../../../fixtures/local-preset'];
 
       await loadPreset(mockContext);
-      console.log(mockContext);
       assume(mockContext).to.have
         .deep.property('rawPresets', ['@gasket/bogus-preset@^1.0.0', '@gasket/all-i-ever-wanted-preset@^2.0.0']);
       assume(mockContext).to.have
         .deep.property('localPresets', ['../../../fixtures/local-preset', '../../../fixtures/local-preset']);
-      assume(mockContext).to.have.deep.property('presets', ['bogus', 'all-i-ever-wanted', 'local-preset', 'local-preset']);
+      assume(mockContext).to.have.deep
+        .property('presets', ['bogus', 'all-i-ever-wanted', 'local-preset', 'local-preset']);
       assume(mockContext.presetInfos).to.lengthOf(4);
     });
 
+    it('supports preset extensions', async () => {
+      mockContext.rawPresets = ['@gasket/bogus-preset@^1.0.0', '@gasket/all-i-ever-wanted-preset@^2.0.0'];
+      mockContext.localPresets = ['../../../fixtures/local-preset', '../../../fixtures/local-preset'];
+
+      await loadPreset(mockContext);
+      assume(mockContext).to.have
+        .deep.property('rawPresets', ['@gasket/bogus-preset@^1.0.0', '@gasket/all-i-ever-wanted-preset@^2.0.0']);
+      assume(mockContext).to.have.deep
+        .property('localPresets', ['../../../fixtures/local-preset', '../../../fixtures/local-preset']);
+      assume(mockContext).to.have.deep
+        .property('presets', ['bogus', 'all-i-ever-wanted', 'local-preset', 'local-preset']);
+      assume(mockContext.presetInfos).to.lengthOf(4);
+    });
   });
 
   describe('local package', () => {
@@ -188,7 +208,8 @@ describe('loadPreset', () => {
     assume(mockContext).to.have.deep.property('presetInfos', [{
       ...mockPkgs['@gasket/bogus-preset@^1.0.0'],
       from: 'cli',
-      rawName: '@gasket/bogus-preset@^1.0.0'
+      rawName: '@gasket/bogus-preset@^1.0.0',
+      presets: [{ package: { name: 'some', version: '1.0.1' }, from: 'bogus', rawName: '@gasket/some-preset@1.0.1' }]
     }]);
   });
 });