create-gasket-app 7.0.0-next.3 → 7.0.0-next.4

package/lib/commands/create.js

@@ -1,34 +1,27 @@
 /* eslint-disable max-statements */
-import ora from 'ora';
 import chalk from 'chalk';
 import { makeCreateContext } from '../scaffold/create-context.js';
 import { dumpErrorContext } from '../scaffold/dump-error-context.js';
+import { rm } from 'fs/promises';
+import { makeGasket } from '@gasket/core';
+import { defaultPlugins } from '../config/default-plugins.js';
 import {
-  applyPresetConfig,
-  cliVersion,
   createHooks,
   generateFiles,
   globalPrompts,
   installModules,
   linkModules,
-  loadPkgForDebug,
   loadPreset,
   mkDir,
   postCreateHooks,
   printReport,
   presetPromptHooks,
+  presetConfigHooks,
   promptHooks,
   setupPkg,
   writeGasketConfig,
   writePkg
 } from '../scaffold/actions/index.js';
-import path from 'path';
-import os from 'os';
-import { mkdtemp, rm } from 'fs/promises';
-import { default as gasketUtils } from '@gasket/utils';
-import { makeGasket } from '@gasket/core';
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
 
 /**
  * Parses comma separated option input to array
@@ -57,13 +50,6 @@ const createCommand = {
       Or other (multiple) custom presets (e.g. --presets my-gasket-preset@1.0.0.beta-1,nextjs@^1.0.0)`,
       parse: commasToArray
     },
-    {
-      name: 'plugins',
-      description: `Additional plugin(s) to install. Can be set as
-      multiple flags (e.g. --plugins jest --plugins zkconfig@^1.0.0)
-      comma-separated values: --plugins=jest,zkconfig^1.0.0`,
-      parse: commasToArray
-    },
     {
       name: 'package-manager',
       description: `Selects which package manager you would like to use during
@@ -75,18 +61,6 @@ const createCommand = {
       description: 'Require module(s) before Gasket is initialized',
       parse: commasToArray
     },
-    {
-      name: 'no-bootstrap',
-      description: '(INTERNAL) If provided, skip the bootstrap phase',
-      type: 'boolean',
-      hidden: true
-    },
-    {
-      name: 'no-generate',
-      description: '(INTERNAL) If provided, skip the generate phase',
-      type: 'boolean',
-      hidden: true
-    },
     {
       name: 'npm-link',
       description: `(INTERNAL) Local packages to be linked. Can be set as
@@ -122,312 +96,42 @@ const createCommand = {
   ]
 };
 
-async function wait(ms = 50) {
-  return new Promise(resolve => {
-    console.log('waiting...')
-    setTimeout(resolve, ms);
-  });
-}
-
-function evaluatePreset(preset) {
-  const parts = preset.split('@').filter(Boolean);
-  if (parts.length > 1) {
-    return {
-      name: `@${parts[0]}`,
-      version: parts[1]
-    };
-  } else if (parts.length === 1) {
-    return {
-      name: `@${parts[0]}`,
-      version: null
-    };
-  }
-
-  return preset;
-}
-
 createCommand.action = async function run(appname, options, command) {
-  // temp
-  process.env.GASKET_DEBUG_NPM = 'true';
-  // temp
   const context = makeCreateContext([appname], options);
-  const {
-    presets = [],
-    presetPath = [],
-  } = options;
-
-  const tmpDir = await mkdtemp(path.join(os.tmpdir(), `gasket-create-${context.appName}`));
-  const modPath = path.join(tmpDir, 'node_modules');
-  console.log(tmpDir);
-  await globalPrompts(context);
-
-  const pkgManager = new gasketUtils.PackageManager({ packageManager: context.packageManager, dest: tmpDir });
-  const pkgVerb = pkgManager.isYarn ? 'add' : 'install';
-
-  const remotePresets = await Promise.all(presets.map(async preset => {
-    await pkgManager.exec(pkgVerb, [preset]);
-    const pkgFile = require(path.join(modPath, preset, 'package.json'));
-    const presetMod = await import(pkgFile.name, { from: modPath });
-
-    const dependencies = Object.entries(pkgFile.dependencies || {})
-      .filter(([name]) => name.startsWith('@gasket'))
-      .map(([name, version]) => ({ name, version }));
-
-    const plugins = await Promise.all(dependencies.map(async ({ name }) => {
-      const mod = await import(name, { from: modPath });
-      return mod.default || mod;
-    }));
-
-    return {
-      pkgFile,
-      dependencies,
-      plugins: [
-        presetMod.default || presetMod,
-        ...plugins
-      ]
-    }
-  }));
-
-  const localPresets = await Promise.all(presetPath.map(async localPreset => {
-    await pkgManager.exec(pkgVerb, [localPreset]);
-    const pkgFile = require(path.join(localPreset, 'package.json'));
-    const presetMod = await import(pkgFile.name, { from: modPath });
-
-    const dependencies = Object.entries(pkgFile.dependencies || {})
-      .filter(([name]) => name.startsWith('@gasket'))
-      .map(([name, version]) => ({ name, version }));
-
-    const plugins = await Promise.all(dependencies.map(async ({ name }) => {
-      const mod = await import(name, { from: modPath });
-      return mod.default || mod;
-    }));
-
-    return {
-      module: presetMod.default || presetMod,
-      pkgFile,
-      dependencies,
-      plugins
-    };
-  }));
-
-
-  const configuredPresets = await Promise.all([
-    ...remotePresets,
-    ...localPresets
-  ]);
-
-  const presetPlugins = configuredPresets.reduce((acc, p) => {
-    return [
-      ...acc,
-      p.module
-    ];
-  }, []);
-
-  const presetGasket = makeGasket({
-    plugins: presetPlugins
-  });
-
-  console.log(presetGasket);
-
-  await presetPromptHooks(presetGasket, context);
-  console.log(context);
-  const presetConfig = await presetGasket.execWaterfall('presetConfig', context);
-
-  console.log(configuredPresets)
-  console.log(configuredPresets[0].dependencies)
-  console.log(configuredPresets[0].plugins)
-  console.log(presetConfig);
-
-  // Check preset plugins vs the plugins from the presetConfig
-
-
 
-  //   await globalPrompts(context);
-  // presetPrompt
-  // presetConfig
-
-  // const gasketPlugins = makeGasket({
-  //   // plugins
-  // })
-
-  // promptHooks
-
-
-  // applyPresetConfig(context);
-  // await globalPrompts(context);
-  // await mkDir(context);
-  // await setupPkg(context);
-  // await writePkg(context);
-  // await installModules(context);
-  // await linkModules(context);
-  // await promptHooks(gasketPlugins, context);
-  //   await createHooks(context);
-  //   await generateFiles(context);
-  //   await writeGasketConfig(context);
-  //   await writePkg.update(context);
-  //   await installModules.update(context);
-  //   await linkModules.update(context); // relink any that were messed up by re-install
-  //   await postCreateHooks(context);
-
-
-  // download preset to os temp dir
-  // import preset to CGA
-  // makeGasket with preset
-  // exec presetPrompt
-  // exec presetConfig
-  // makeGasket with presetConfig
-  // exec prompt
-  // exec create
-
-  // console.log('Deleting tmp dir...')
-  // await rm(tmpDir, { recursive: true });
+  try {
+    await loadPreset(null, context);
+    await globalPrompts(null, context);
+
+    const presetGasket = makeGasket({
+      plugins: context.presets
+    });
+
+    await presetPromptHooks(presetGasket, context);
+    await presetConfigHooks(presetGasket, context);
+
+    const pluginGasket = makeGasket({
+      ...context.presetConfig,
+      plugins: context.presets.concat(context.presetConfig.plugins, defaultPlugins)
+    });
+
+    await promptHooks(pluginGasket, context);
+    await mkDir(null, context);
+    await setupPkg(null, context);
+    await createHooks(pluginGasket, context);
+    await writePkg(null, context);
+    await generateFiles(null, context);
+    await writeGasketConfig(null, context);
+    await installModules(null, context);
+    await linkModules(null, context);
+    await postCreateHooks(pluginGasket, context);
+    await rm(context.tmpDir, { recursive: true });
+    printReport(context);
+  } catch (err) {
+    console.error(chalk.red('Exiting with errors.'));
+    dumpErrorContext(context, err);
+    throw err;
+  }
 }
 
-/**
- * bootstrap - Bootstrap the application
- * @param {CreateContext} context - Create context
- */
-// async function bootstrapHandler(context) {
-//   await loadPreset(context);
-//   cliVersion(context);
-//   applyPresetConfig(context);
-//   await globalPrompts(context);
-//   await mkDir(context);
-//   await setupPkg(context);
-//   await writePkg(context);
-//   await installModules(context);
-//   await linkModules(context);
-// }
-
-/**
- * generate - Generate the application
- * @param {CreateContext} context - Create context
- */
-// async function generateHandler(context) {
-//   await promptHooks(context);
-//   await createHooks(context);
-//   await generateFiles(context);
-//   await writeGasketConfig(context);
-//   await writePkg.update(context);
-//   await installModules.update(context);
-//   await linkModules.update(context); // relink any that were messed up by re-install
-//   await postCreateHooks(context);
-// }
-
-/**
- * createCommand action
- * @param {string} appname Required cmd arg - name of the app to create
- * @param {object} options cmd options
- * @param {Command} command - the command instance
- * @returns {Promise<void>} void
- */
-// createCommand.action = async function run(appname, options, command) {
-//   const argv = [appname];
-//   const { bootstrap = true, generate = true } = options;
-
-//   let context;
-//   try {
-//     context = makeCreateContext(argv, options);
-//   } catch (error) {
-//     console.error(chalk.red(error) + '\n');
-//     command.help();
-//   }
-
-//   try {
-//     if (bootstrap) {
-//       await bootstrapHandler(context);
-//     } else {
-//       ora('Bootstrap phase skipped.').warn();
-//       if (generate) {
-//         await loadPkgForDebug(context);
-//       }
-//     }
-
-//     if (generate) {
-//       await generateHandler(context);
-//     } else {
-//       ora('Generate phase skipped.').warn();
-//     }
-
-//     printReport(context);
-
-//   } catch (err) {
-//     console.error(chalk.red('Exiting with errors.'));
-//     dumpErrorContext(context, err);
-//     throw err;
-//   }
-// };
-
 export { createCommand };
-
-
-
-  // fire global prompts to inform pkgmanager
-
-  // const tmpDir = await mkdtemp(path.join(os.tmpdir(), `gasket-create-${context.appName}`));
-  // console.log(tmpDir);
-
-
-
-  // new PackageManager https://github.com/godaddy/gasket/blob/v7/packages/gasket-utils/lib/package-manager.js#L75
-  // const remotePresets = context.rawPresets.map(async preset => {
-  //   const { name: presetName, version: presetVersion } = evaluatePreset(preset)
-
-  //   // await runShellCommand('npm', ['i', `${presetName}@${presetVersion}`], { cwd: tmpDir }, true);
-  //   const modPath = path.join(tmpDir, 'node_modules');
-  //   const pkgFile = require(path.join(modPath, presetName, 'package.json'));
-  //   const presetMod = await import(presetName, { from: modPath });
-
-  //   const dependencies = Object.entries(pkgFile.dependencies || {})
-  //     .filter(([name]) => name.startsWith('@gasket'))
-  //     .map(([name, version]) => ({ name, version }));
-
-  //   const plugins = await Promise.all(dependencies.map(async ({ name }) => {
-  //     const mod = await import(name, { from: modPath });
-  //     return mod.default || mod;
-  //   }));
-
-  //   console.log(plugins)
-  //   return {
-  //     // module: await import(preset, { from: modPath }),
-  //     pkgFile,
-  //     dependencies,
-  //     plugins: [
-  //       presetMod.default || presetMod,
-  //       ...plugins
-  //     ]
-  //   }
-  // });
-
-  // const localPresets = context.localPresets.map(async localPreset => {
-  //   await runShellCommand('npm', ['i', localPreset], { cwd: tmpDir }, true);
-
-  //   const modPath = path.join(tmpDir, 'node_modules');
-  //   const pkgFile = require(path.join(localPreset, 'package.json'));
-  //   const presetMod = await import(pkgFile.name, { from: modPath });
-
-
-  //   const dependencies = Object.entries(pkgFile.dependencies || {})
-  //     .filter(([name]) => name.startsWith('@gasket'))
-  //     .map(([name, version]) => ({ name, version }));
-
-  //   const plugins = await Promise.all(dependencies.map(async ({ name }) => {
-  //     const mod = await import(name, { from: modPath });
-  //     return mod.default || mod;
-  //   }));
-
-  //   return {
-  //     // module: await import(preset, { from: modPath }),
-  //     pkgFile,
-  //     dependencies,
-  //     plugins: [
-  //       presetMod.default || presetMod,
-  //       ...plugins
-  //     ]
-  //   }
-  // });
-
-  // const presets = await Promise.all([
-  //   ...remotePresets,
-  //   ...localPresets
-  // ]);

package/lib/config/default-plugins.js

@@ -1,7 +1,7 @@
-import pluginMetadata from '@gasket/plugin-metadata';
 import pluginGit from '@gasket/plugin-git';
+import pluginLogger from '@gasket/plugin-logger';
 
 export const defaultPlugins = [
-  pluginMetadata,
+  pluginLogger,
   pluginGit
 ];

package/lib/index.d.ts

@@ -62,6 +62,12 @@ export interface ConfigBuilder<Config> {
     value: Config[Key],
     options?: { force?: boolean }
   ): void;
+
+  // TODO Document
+  addPlugin(pluginImport: string, pluginName: string): void;
+  addImport(importName: string, importPath: string, isDefault?: boolean): ConfigBuilder;
+  useImport(configPath: string, importName: string): void;
+
 }
 
 export interface PackageJsonBuilder extends ConfigBuilder<PackageJson> {

package/lib/scaffold/actions/create-hooks.js

@@ -10,14 +10,13 @@ import { Files } from '../files.js';
  * @param {CreateContext} context - Create context
  * @returns {Promise} promise
  */
-async function createHooks(context) {
+async function createHooks(gasket, context) {
   const { dest, presets = [], plugins = [], warnings } = context;
 
   const files = new Files();
-  const gasketConfig = ConfigBuilder.create({}, { orderBy: ['plugins'], warnings });
+  const gasketConfig = ConfigBuilder.create({}, { orderBy: ['plugins'], warnings, plugins });
   Object.assign(context, { files, gasketConfig });
 
-  const gasket = await createEngine(plugins);
   await gasket.execApply('create', async function applyCreate(plugin, handler) {
     await handler(context.runWith(plugin));
   });

package/lib/scaffold/actions/generate-files.js

@@ -164,7 +164,7 @@ async function performGenerate(context, descriptors) {
  * @param {Spinner} spinner - Spinner
  * @returns {Promise} promise
  */
-async function generateFiles(context, spinner) {
+async function generateFiles(gasket, context, spinner) {
   const { files } = context;
 
   if (!files.globSets.length) {

package/lib/scaffold/actions/global-prompts.js

@@ -75,16 +75,17 @@ async function chooseTestPlugin(context, prompt) {
   const { presetInfos = [], plugins = [] } = context;
 
   // Flatten all plugins from presets and concat short names with cli plugins
-  const allPlugins = flattenPresets(presetInfos)
-    .map((presetInfo) => presetInfo.plugins || [])
-    .reduce((acc, arr) => acc.concat(arr), [])
-    .map((pluginInfo) => pluginIdentifier(pluginInfo.name).shortName)
-    .concat(plugins);
+  // const allPlugins = flattenPresets(presetInfos)
+  //   .map((presetInfo) => presetInfo.plugins || [])
+  //   .reduce((acc, arr) => acc.concat(arr), [])
+  //   .map((pluginInfo) => pluginIdentifier(pluginInfo.name).shortName)
+  //   .concat(plugins);
 
-  const knownTestPlugins = { mocha: '@gasket/mocha', jest: '@gasket/jest', cypress: '@gasket/cypress' };
+  const knownTestPlugins = { mocha: '@gasket/plugin-mocha', jest: '@gasket/plugin-jest', cypress: '@gasket/plugin-cypress' };
 
   if (!('testPlugin' in context)) {
-    let testPlugin = Object.values(knownTestPlugins).find((p) => allPlugins.includes(p));
+    // let testPlugin = Object.values(knownTestPlugins).find((p) => allPlugins.includes(p));
+    let testPlugin;
 
     if ('testSuite' in  context) {
       testPlugin = knownTestPlugins[context.testSuite];
@@ -98,16 +99,16 @@ async function chooseTestPlugin(context, prompt) {
           type: 'list',
           choices: [
             { name: 'none (not recommended)', value: 'none' },
-            { name: 'mocha + nyc + sinon + chai', value: '@gasket/mocha' },
-            { name: 'jest', value: '@gasket/jest' },
-            { name: 'cypress', value: '@gasket/cypress' }
+            { name: 'mocha + nyc + sinon + chai', value: '@gasket/plugin-mocha' },
+            { name: 'jest', value: '@gasket/plugin-jest' },
+            { name: 'cypress', value: '@gasket/plugin-cypress' }
           ]
         }
       ]));
     }
 
     if (testPlugin && testPlugin !== 'none') {
-      addPluginsToContext([testPlugin], context);
+      // addPluginsToContext([testPlugin], context);
       Object.assign(context, { testPlugin });
     }
   }
@@ -150,7 +151,7 @@ export const questions = [
  * @param {CreateContext} context - Create context
  * @returns {Promise} promise
  */
-async function globalPrompts(context) {
+async function globalPrompts(gasket, context) {
   const prompt = context.prompts ? inquirer.prompt : () => ({});
   for (var fn of questions) {
     await fn(context, prompt);

package/lib/scaffold/actions/index.js

@@ -9,6 +9,7 @@ import linkModules, { linkModulesUpdate } from './link-modules.js';
 import writeGasketConfig from './write-gasket-config.js';
 import loadPkgForDebug from './load-pkg-for-debug.js';
 import presetPromptHooks from './preset-prompt-hooks.js';
+import presetConfigHooks from './preset-config-hooks.js';
 import promptHooks from './prompt-hooks.js';
 import createHooks from './create-hooks.js';
 import generateFiles from './generate-files.js';
@@ -31,6 +32,7 @@ export {
   writeGasketConfig,
   loadPkgForDebug,
   presetPromptHooks,
+  presetConfigHooks,
   promptHooks,
   createHooks,
   postCreateHooks,

package/lib/scaffold/actions/install-modules.js

@@ -6,7 +6,7 @@ import action from '../action-wrapper.js';
  * @param {CreateContext} context - Create context
  * @returns {Promise} promise
  */
-async function installModules(context) {
+async function installModules(gasket, context) {
   const { pkgManager } = context;
 
   await pkgManager.install();

package/lib/scaffold/actions/link-modules.js

@@ -7,7 +7,7 @@ import action from '../action-wrapper.js';
  * @param {Spinner} spinner - Spinner
  * @returns {Promise} promise
  */
-async function linkModules(context, spinner) {
+async function linkModules(gasket, context, spinner) {
   const { pkgLinks, pkgManager } = context;
 
   if (pkgLinks && pkgLinks.length) {

package/lib/scaffold/actions/load-preset.js

@@ -1,83 +1,36 @@
 import path from 'path';
+import os from 'os';
 import action from '../action-wrapper.js';
-import { PackageFetcher } from '../fetcher.js';
-import { presetIdentifier, Loader } from '@gasket/resolve';
-
-const loader = new Loader();
-
-/**
- * Fetches the preset packages and loads PresetInfos
- *
- * @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(rawPresets, cwd, npmconfig, from) {
-  if (!rawPresets) { return []; }
-
-  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();
-
-    const presetInfo = await 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;
-}
-
-/**
- * Loads PresetInfo from local preset package
- *
- * @param {CreateContext} context - Create context
- * @returns {PresetInfo[]} loaded presetInfos
- * @private
- */
-function localPreset(context) {
-  const { cwd, localPresets = [] } = context;
-  if (!localPresets) { return []; }
-
-  const presetInfos = [];
-  localPresets.forEach(async localPresetPath => {
-    const pkgPath = path.resolve(cwd, localPresetPath);
-    const presetInfo = await loader.loadPreset(pkgPath, { from: 'cli' }, { shallow: false });
-    presetInfo.rawName = `${presetInfo.package.name}@file:${pkgPath}`;
-    presetInfos.push(presetInfo);
+import { default as gasketUtils } from '@gasket/utils';
+import { mkdtemp } from 'fs/promises';
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+async function loadPresets(gasket, context) {
+  const tmpDir = await mkdtemp(path.join(os.tmpdir(), `gasket-create-${context.appName}`));
+  context.tmpDir = tmpDir;
+
+  const modPath = path.join(tmpDir, 'node_modules');
+  const pkgManager = new gasketUtils.PackageManager({ packageManager: context.packageManager, dest: tmpDir });
+  const pkgVerb = pkgManager.isYarn ? 'add' : 'install';
+
+  const remotePresets = context.rawPresets.map(async preset => {
+    const parts = /@([0-9]\.|[0-9]).+/.test(preset) && preset.split('@').filter(Boolean);
+    const name = parts ? `@${parts[0]}` : preset;
+    const version = parts ? `@${parts[1]}` : '@latest';
+    await pkgManager.exec(pkgVerb, [`${name}${version}`]);
+    const mod = await import(name, { from: modPath });
+    return mod.default || mod;
   });
 
-  return presetInfos;
-}
-
-/**
- * Downloads the target preset package and adds the package.json
- * contents and plugins dependencies to context.
- *
- * @param {CreateContext} context - Create context
- * @returns {Promise} promise
- */
-async function loadPreset(context) {
-  const { rawPresets = [], cwd, npmconfig } = context;
-  let presetInfos = await remotePresets(rawPresets, cwd, npmconfig, 'cli');
-  presetInfos = presetInfos.concat(localPreset(context));
+  const localPresets = context.localPresets.map(async localPresetPath => {
+    await pkgManager.exec(pkgVerb, [localPresetPath]);
+    const pkgFile = require(path.join(localPresetPath, 'package.json'));
+    const mod = await import(pkgFile.name, { from: modPath });
+    return mod.default || mod;
+  });
 
-  const presets = presetInfos.map(p => presetIdentifier(p.rawName).shortName);
-  Object.assign(context, { presets, presetInfos });
+  context.presets = await Promise.all([...remotePresets, ...localPresets]);
 }
 
-export default action('Load presets', loadPreset);
+export default action('Load presets', loadPresets);

package/lib/scaffold/actions/mkdir.js

@@ -10,7 +10,7 @@ import action from '../action-wrapper.js';
  * @param {Spinner} spinner - Spinner
  * @returns {Promise} promise
  */
-async function mkDir(context, spinner) {
+async function mkDir(gasket, context, spinner) {
   const { dest, relDest, extant, destOverride } = context;
 
   // At this point, either the directory does not exist, or the user has

package/lib/scaffold/actions/post-create-hooks.js

@@ -8,7 +8,7 @@ import { runShellCommand } from '@gasket/utils';
  * @param {CreateContext} context - Create context
  * @returns {Promise} promise
  */
-async function postCreateHooks(context) {
+async function postCreateHooks(gasket, context) {
   const { dest, presets = [], plugins = [] } = context;
 
   /**
@@ -25,8 +25,6 @@ async function postCreateHooks(context) {
    * in future is easy.
    */
   const utils = { runScript };
-
-  const gasket = await createEngine(plugins);
   await gasket.exec('postCreate', context, utils);
 }
 

package/lib/scaffold/actions/preset-config-hooks.js

@@ -0,0 +1,13 @@
+import action from '../action-wrapper.js';
+
+async function presetConfigHooks(gasket, context) {
+  if (!context.presetConig) {
+    context.presetConfig = {};
+  }
+
+  const config = await gasket.execWaterfall('presetConfig', context);
+
+  Object.assign(context.presetConfig, config);
+}
+
+export default action('Preset Config', presetConfigHooks, { startSpinner: false });

package/lib/scaffold/actions/preset-prompt-hooks.js

@@ -3,7 +3,6 @@ import action from '../action-wrapper.js';
 
 
 async function presetPromptHooks(gasket, context) {
-  console.log(context.prompts)
   const prompt = context.prompts ? inquirer.createPromptModule() : () => ({});
 
   const nextContext = await gasket.execWaterfall('presetPrompt', context, { prompt });

package/lib/scaffold/actions/prompt-hooks.js

@@ -53,10 +53,7 @@ const createAddPlugins = context => {
  * @returns {Promise} promise
  * @private
  */
-async function execPluginPrompts(context, plugins = [], presets = []) {
-  const { dest } = context;
-  const gasket = await createEngine({ dest, presets, plugins });
-
+async function execPluginPrompts(gasket, context, plugins = [], presets = []) {
   //
   // @see: https://github.com/SBoudrias/Inquirer.js/#inquirercreatepromptmodule---prompt-function
   //
@@ -82,8 +79,8 @@ async function promptHooks(gasket, context) {
   // Because `execPluginPrompts` is recursively, we need to start it
   // with the processPlugins and presets from our initial context
   //
-  const { presets, plugins } = context;
-  await execPluginPrompts(context, plugins, presets);
+  const { plugins } = context;
+  await execPluginPrompts(gasket, context, plugins);
 }
 
 export default action('Plugin prompts', promptHooks, { startSpinner: false });

package/lib/scaffold/actions/setup-pkg.js

@@ -10,7 +10,7 @@ import { presetIdentifier } from '@gasket/resolve';
  * @param {CreateContext} context - Create context
  * @returns {Promise} promise
  */
-async function setupPkg(context) {
+async function setupPkg(gasket, context) {
   // console.log(context);
   // throw new Error('Not implemented');
   const { appName, appDescription, presetInfos = [], rawPlugins = [], cliVersionRequired, warnings } = context;
@@ -19,21 +19,21 @@ async function setupPkg(context) {
     name: appName,
     version: '0.0.0',
     description: appDescription,
-    // type: 'module' // commented out for now
+    type: context.typescript ? 'commonjs' : 'module'
   }, { warnings });
 
   // The preset package itself must be included in the dependencies
   // of the `pkg` to be bootstrapped.
-  pkg.add('dependencies', presetInfos.reduce((acc, presetInfo) => {
-    // Use rawName in case version or file path was set in cli args
-    // Otherwise fallback to resolved version
-    const { fullName, version } = presetIdentifier(presetInfo.rawName).withVersion(`^${presetInfo.version}`);
+  // pkg.add('dependencies', presetInfos.reduce((acc, presetInfo) => {
+  //   // Use rawName in case version or file path was set in cli args
+  //   // Otherwise fallback to resolved version
+  //   const { fullName, version } = presetIdentifier(presetInfo.rawName).withVersion(`^${presetInfo.version}`);
 
-    acc[fullName] = version;
-    return acc;
-  }, {
-    '@gasket/cli': cliVersionRequired
-  }));
+  //   acc[fullName] = version;
+  //   return acc;
+  // }, {
+  //   // '@gasket/cli': cliVersionRequired
+  // }));
 
   const pkgManager = new gasketUtils.PackageManager(context);
   const pluginIds = await getPluginsWithVersions(rawPlugins, pkgManager);

package/lib/scaffold/actions/write-gasket-config.js

@@ -3,27 +3,81 @@ import path from 'path';
 import { writeFile } from 'fs/promises';
 import action from '../action-wrapper.js';
 
+function writePluginImports(plugins) {
+  return plugins.reduce((acc, cur, index) => {
+    acc += `\t\t${cur}${index < plugins.length - 1 ? ',\n' : ''}`;
+    return acc;
+  }, '');
+}
+
+function writeImports(imports) {
+  if (!imports) return '';
+  return `${Object.entries(imports).map(([importDef, path]) => `import ${importDef} from '${path}';`).join('\n')}\n`;
+}
+
+function createInjectionAssignments(config, assignments) {
+  if (!assignments) return '';
+  Object.keys(assignments).forEach((key) => {
+    const keys = key.split('.');
+
+    keys.reduce((acc, cur, index) => {
+      if (index === keys.length - 1) {
+        acc[cur] = `${key}_INJECTION_ASSIGNMENT_REPLACE`;
+        return;
+      }
+      return acc[cur];
+    }, config);
+  });
+}
+
+function replaceInjectionAssignments(content, assignments) {
+  if (!assignments) return '';
+  Object.keys(assignments).forEach((key) => {
+    content = content.replace(`\'${key}_INJECTION_ASSIGNMENT_REPLACE\'`, assignments[key]);
+  });
+
+  return content;
+}
+
+function writeExpressions(expressions) {
+  if (!expressions) return '';
+  return `${expressions.map((expression) => `${expression}`).join('\n')}\n`;
+}
+
+function cleanupFields(config) {
+  delete config.fields.imports;
+  delete config.fields.pluginImports;
+  delete config.fields.expressions;
+  delete config.fields.injectionAssignments;
+}
+
 /**
  * Writes the contents of `pkg` to the app's package.json.
  *
  * @param {CreateContext} context - Create context
  * @returns {Promise} promise
  */
-async function writeGasketConfig(context) {
-  const { dest, gasketConfig, presets, plugins, generatedFiles } = context;
-  const fileName = 'gasket.config.js';
+async function writeGasketConfig(gasket, context) {
+  const { dest, gasketConfig, generatedFiles } = context;
+  const fileName = context.typescript ? 'gasket.ts' : 'gasket.js';
   const filePath = path.join(dest, fileName);
+  const plugins = gasketConfig.fields.plugins;
+  const assignments = gasketConfig.fields.injectionAssignments || null;
+  const expressions = gasketConfig.fields.expressions || null;
+  gasketConfig.fields.plugins = 'PLUGIN_REPLACE';
 
-  gasketConfig.add('plugins', {
-    presets,
-    ...(plugins && plugins.length ? { add: plugins } : {})
-  });
+  let contents = '';
+  contents += `import { makeGasket } from '@gasket/core';\n`;
+  contents += writeImports(gasketConfig.fields.pluginImports);
+  contents += writeImports(gasketConfig.fields.imports);
+  contents += writeExpressions(expressions);
+  createInjectionAssignments(gasketConfig.fields, assignments);
+  cleanupFields(gasketConfig);
 
-  //
-  // Use JSON5 to stringify the config and add export for CommonJS
-  //
-  const contents = 'module.exports = ' +
-    JSON5.stringify(gasketConfig, null, 2) + ';\n';
+  const pluginImports = `[\n${writePluginImports(plugins)}\n\t]`;
+  contents += `\nexport default makeGasket(${JSON5.stringify(gasketConfig.fields, null, 2)});\n`;
+  contents = contents.replace('\'PLUGIN_REPLACE\'', pluginImports);
+  contents = replaceInjectionAssignments(contents, assignments);
 
   await writeFile(filePath, contents, 'utf8');
   generatedFiles.add(fileName);

package/lib/scaffold/actions/write-pkg.js

@@ -9,7 +9,7 @@ import action from '../action-wrapper.js';
  * @param {Boolean} update - Is an update step
  * @returns {Promise} promise
  */
-async function writePkg(context) {
+async function writePkg(gasket, context) {
   const { dest, pkg, generatedFiles } = context;
   const fileName = 'package.json';
   const filePath = path.join(dest, fileName);

package/lib/scaffold/config-builder.js

@@ -190,19 +190,19 @@ export class ConfigBuilder {
         throw new Error(`${key} must be an object. Received ${value}`);
       }
 
-      // if (Array.isArray(this.semverFields) && this.semverFields.includes(key)) {
-      //   if (!existing) this.fields[key] = {};
+      if (Array.isArray(this.semverFields) && this.semverFields.includes(key)) {
+        if (!existing) this.fields[key] = {};
 
-      //   this.semanticMerge({
-      //     key,
-      //     value,
-      //     existing: this.fields[key],
-      //     name,
-      //     ...options
-      //   });
+        this.semanticMerge({
+          key,
+          value,
+          existing: this.fields[key],
+          name,
+          ...options
+        });
 
-      //   return;
-      // }
+        return;
+      }
 
       if (!existing) {
         this.fields[key] = Object.assign({}, value);
@@ -227,6 +227,26 @@ export class ConfigBuilder {
     }
   }
 
+  /** TODO document */
+  addPlugin(pluginImport, pluginName) {
+    this.add('plugins', [`${pluginImport}`]);
+    this.add('pluginImports', { [pluginImport]: pluginName });
+  }
+
+  addImport(importName, importPath) {
+    this.add('imports', { [importName]: importPath });
+    return this;
+  }
+
+  addExpression(expression) {
+    this.add('expressions', [expression.trim()]);
+    return this;
+  }
+
+  injectValue(configKey, injectedValue) {
+    this.add('injectionAssignments', { [configKey]: injectedValue });
+  }
+
   /**
    * Checks if a dependency has been already added
    * @param  {String} key Dependency bucket

package/lib/scaffold/create-context.js

@@ -61,7 +61,7 @@ function flatten(acc, values) {
  *
  * @type {CreateContext}
  *
- * -- Added by command args and flags
+ * -- Added by command args and options
  *
  * @property {String} appName - Short name of the app
  * @property {String} cwd - Current work directory
@@ -70,7 +70,7 @@ function flatten(acc, values) {
  * @property {Boolean} extant - Whether or not target directory already exists
  * @property {[String]} localPresets - paths to the local presets packages
  * @property {PresetDesc[]} rawPresets - Raw preset desc from args. Can include version constraint. Added by load-preset if using localPresets.
- * @property {PluginDesc[]} rawPlugins - Raw plugin desc from flags, prompts, etc. Can include constraints.
+ * @property {PluginDesc[]} rawPlugins - Raw plugin desc from options, prompts, etc. Can include constraints.
  * @property {PluginName[]} plugins - Short names of plugins
  * @property {String[]} pkgLinks - Local packages that should be linked
  * @property {String} npmconfig - Path to npmconfig file
@@ -127,28 +127,25 @@ export class CreateContext {
  * Makes the initial context used through the create command flow.
  *
  * @param {String[]} argv - Commands args
- * @param {Object} flags - Command flags
+ * @param {Object} options - Command options
  * @returns {CreateContext} context
  */
-export function makeCreateContext(argv = [], flags = {}) {
+export function makeCreateContext(argv = [], options = {}) {
   const appName = argv[0] || 'templated-app';
   const {
-    // npmconfig,
-    // plugins = [],
-    // presets = [],
+    presets = [],
     npmLink = [],
-    // presetPath = [],
+    presetPath = [],
     packageManager,
     prompts,
     config,
     configFile
-  } = flags;
+  } = options;
 
   // Flatten the array of array created by the plugins flag – it
   // supports both multiple instances as well as comma-separated lists.
-  // const rawPresets = presets.reduce(flatten, []);
-  // const localPresets = presetPath.reduce(flatten, []);
-  // const rawPlugins = plugins.reduce(flatten, []);
+  const rawPresets = presets.reduce(flatten, []);
+  const localPresets = presetPath.reduce(flatten, []);
   const pkgLinks = npmLink.reduce(flatten, []);
   const cwd = process.cwd();
   const dest = path.join(cwd, appName);
@@ -169,8 +166,8 @@ export function makeCreateContext(argv = [], flags = {}) {
     extant,
     // npmconfig: npmconfig && ensureAbsolute(npmconfig),
     pkgLinks,
-    // localPresets,
-    // rawPresets,
+    localPresets,
+    rawPresets,
     messages: [],
     warnings: [],
     errors: [],
@@ -188,8 +185,6 @@ export function makeCreateContext(argv = [], flags = {}) {
     context.appName = appName;
   }
 
-  // addPluginsToContext(rawPlugins, context);
-
   return context;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-gasket-app",
-  "version": "7.0.0-next.3",
+  "version": "7.0.0-next.4",
   "description": "starter pack for creating a gasket app",
   "main": "lib",
   "bin": {
@@ -32,14 +32,14 @@
   },
   "homepage": "https://github.com/godaddy/gasket/tree/main/packages/create-gasket-app",
   "dependencies": {
-    "@gasket/engine": "^7.0.0-next.3",
-    "@gasket/plugin-git": "^7.0.0-next.3",
-    "@gasket/plugin-lifecycle": "^7.0.0-next.3",
-    "@gasket/plugin-logger": "^7.0.0-next.3",
-    "@gasket/plugin-metadata": "^7.0.0-next.3",
-    "@gasket/plugin-start": "^7.0.0-next.3",
-    "@gasket/resolve": "^7.0.0-next.3",
-    "@gasket/utils": "^7.0.0-next.3",
+    "@gasket/engine": "^7.0.0-next.4",
+    "@gasket/plugin-git": "^7.0.0-next.4",
+    "@gasket/plugin-lifecycle": "^7.0.0-next.4",
+    "@gasket/plugin-logger": "^7.0.0-next.4",
+    "@gasket/plugin-metadata": "^7.0.0-next.4",
+    "@gasket/plugin-start": "^7.0.0-next.4",
+    "@gasket/resolve": "^7.0.0-next.4",
+    "@gasket/utils": "^7.0.0-next.4",
     "commander": "^12.0.0",
     "deepmerge": "^4.3.1",
     "handlebars": "^4.7.8",
@@ -78,5 +78,5 @@
   "eslintIgnore": [
     "test/fixtures"
   ],
-  "gitHead": "f4849afd9241977ad5b485cdb6a8fec9c44fc402"
+  "gitHead": "5a76c18917da4d37c2aa2f9b9a70e2514ee81398"
 }