@quilted/create 0.1.67 → 0.1.69

package/build/esm/package.mjs

@@ -20,7 +20,7 @@ import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/oneLi
 import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/inlineLists/inlineLists.mjs';
 import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/oneLineInlineLists/oneLineInlineLists.mjs';
 import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/stripIndents/stripIndents.mjs';
-import parseArguments from './node_modules/.pnpm/arg@5.0.2/node_modules/arg/index.mjs';
+import arg from './node_modules/.pnpm/arg@5.0.2/node_modules/arg/index.mjs';
 import { prompt } from './packages/cli-kit/source/prompt.mjs';
 import { cyan as cyan_1, dim as dim_1, bold as bold_1, underline as underline_1, magenta as magenta_1 } from './node_modules/.pnpm/colorette@2.0.19/node_modules/colorette/index.mjs';
 
@@ -276,7 +276,7 @@ async function createProject() {
 // Argument handling
 
 function getArguments() {
-  const args = parseArguments({
+  const args = arg({
     '--yes': Boolean,
     '-y': '--yes',
     '--name': String,

package/build/esm/packages/cli-kit/source/prompt.mjs

@@ -1,5 +1,5 @@
 import prompts from '../../../node_modules/.pnpm/prompts@2.4.2/node_modules/prompts/index.mjs';
-import { AbortError } from '../../events/source/abort.mjs';
+import { AbortError } from '../../events/source/abort/AbortError.mjs';
 
 async function prompt(prompt) {
   const result = await prompts({

package/build/esm/packages/events/source/{abort.mjs → abort/AbortError.mjs}

@@ -1,4 +1,10 @@
 // @see https://github.com/nodejs/node/blob/master/lib/internal/errors.js#L822-L834
+/**
+ * An `Error` that indicates that an operation was aborted before
+ * it finished.
+ *
+ * @see https://github.com/nodejs/node/blob/5c65565108c626884c5c722bb512c7c1e5c1c809/lib/internal/errors.js#L843-L855
+ */
 class AbortError extends Error {
   static test(error) {
     return error != null && error.code === 'ABORT_ERR';

package/build/esm/service.mjs

@@ -0,0 +1,276 @@
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import arg from './node_modules/.pnpm/arg@5.0.2/node_modules/arg/index.mjs';
+import { cyan as cyan_1, dim as dim_1, underline as underline_1, magenta as magenta_1, bold as bold_1 } from './node_modules/.pnpm/colorette@2.0.19/node_modules/colorette/index.mjs';
+import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/TemplateTag/TemplateTag.mjs';
+import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/commaLists/commaLists.mjs';
+import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/commaListsAnd/commaListsAnd.mjs';
+import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/commaListsOr/commaListsOr.mjs';
+import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/html/html.mjs';
+import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/safeHtml/safeHtml.mjs';
+import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/oneLine/oneLine.mjs';
+import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/oneLineTrim/oneLineTrim.mjs';
+import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/oneLineCommaLists/oneLineCommaLists.mjs';
+import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/oneLineCommaListsOr/oneLineCommaListsOr.mjs';
+import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/oneLineCommaListsAnd/oneLineCommaListsAnd.mjs';
+import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/inlineLists/inlineLists.mjs';
+import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/oneLineInlineLists/oneLineInlineLists.mjs';
+import stripIndent from './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/stripIndent/stripIndent.mjs';
+import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/stripIndents/stripIndents.mjs';
+import { printHelp } from './help.mjs';
+import { toValidPackageName, emptyDirectory, relativeDirectoryForDisplay, format, mergeWorkspaceAndProjectPackageJsons, loadTemplate, isEmpty, createOutputTarget } from './shared.mjs';
+import { getInWorkspace, getCreateAsMonorepo, getExtrasToSetup, getShouldInstall, getPackageManager } from './shared/prompts.mjs';
+import { addToTsConfig } from './shared/tsconfig.mjs';
+import { addToPackageManagerWorkspaces } from './shared/package-manager.mjs';
+import { prompt } from './packages/cli-kit/source/prompt.mjs';
+
+async function createService() {
+  const argv = getArgv();
+  if (argv['--help']) {
+    printHelp({
+      kind: 'service',
+      packageManager: argv['--package-manager']?.toLowerCase()
+    });
+    return;
+  }
+  const inWorkspace = await getInWorkspace(argv);
+  const name = await getName(argv);
+  const directory = await getDirectory(argv, {
+    name
+  });
+  const entry = await getEntry(argv, {
+    name
+  });
+  const createAsMonorepo = !inWorkspace && (await getCreateAsMonorepo(argv, {
+    type: 'service',
+    default: false
+  }));
+  const setupExtras = await getExtrasToSetup(argv, {
+    inWorkspace
+  });
+  const shouldInstall = await getShouldInstall(argv);
+  const packageManager = await getPackageManager(argv, {
+    root: directory
+  });
+  const partOfMonorepo = inWorkspace || createAsMonorepo;
+  const serviceDirectory = createAsMonorepo ? path.join(directory, toValidPackageName(name)) : directory;
+  if (fs.existsSync(directory)) {
+    await emptyDirectory(directory);
+    if (serviceDirectory !== directory) {
+      fs.mkdirSync(serviceDirectory, {
+        recursive: true
+      });
+    }
+  } else {
+    fs.mkdirSync(serviceDirectory, {
+      recursive: true
+    });
+  }
+  const rootDirectory = inWorkspace ? process.cwd() : directory;
+  const outputRoot = createOutputTarget(rootDirectory);
+  const serviceTemplate = loadTemplate('service-basic');
+  const workspaceTemplate = loadTemplate('workspace');
+
+  // If we aren’t already in a workspace, copy the workspace files over, which
+  // are needed if we are making a monorepo or not.
+  if (!inWorkspace) {
+    await workspaceTemplate.copy(directory, file => {
+      // When this is a single project, we use the project’s Quilt  configuration as the base.
+      if (file === 'quilt.workspace.ts') return createAsMonorepo;
+
+      // We need to make some adjustments to the root package.json
+      if (file === 'package.json') return false;
+      return true;
+    });
+
+    // If we are creating a monorepo, we need to add the root package.json and
+    // package manager workspace configuration.
+    if (createAsMonorepo) {
+      const serviceRelativeToRoot = relativeDirectoryForDisplay(path.relative(directory, serviceDirectory));
+      const workspacePackageJson = JSON.parse(await workspaceTemplate.read('package.json'));
+      workspacePackageJson.name = toValidPackageName(name);
+      workspacePackageJson.workspaces = [serviceRelativeToRoot, './packages/*'];
+      if (packageManager.type === 'pnpm') {
+        await outputRoot.write('pnpm-workspace.yaml', await format(`
+              packages:
+              - '${serviceRelativeToRoot}'
+              - './packages/*'
+            `, {
+          as: 'yaml'
+        }));
+      }
+      await outputRoot.write('package.json', await format(JSON.stringify(workspacePackageJson), {
+        as: 'json-stringify'
+      }));
+    } else {
+      const [projectPackageJson, projectTSConfig, workspacePackageJson] = await Promise.all([serviceTemplate.read('package.json').then(content => JSON.parse(content)), serviceTemplate.read('tsconfig.json').then(content => JSON.parse(content)), workspaceTemplate.read('package.json').then(content => JSON.parse(content))]);
+      const combinedPackageJson = mergeWorkspaceAndProjectPackageJsons(projectPackageJson, workspacePackageJson);
+      adjustPackageJson(combinedPackageJson, {
+        name,
+        entry
+      });
+      delete combinedPackageJson.workspaces;
+      let quiltProject = await serviceTemplate.read('quilt.project.ts');
+      quiltProject = quiltProject.replace('quiltService', 'quiltWorkspace, quiltService').replace('quiltService(', 'quiltWorkspace(), quiltService(').replace('service.ts', entry.replace(/^\.[/]/, ''));
+      await outputRoot.write('quilt.project.ts', await format(quiltProject, {
+        as: 'typescript'
+      }));
+      await outputRoot.write('package.json', await format(JSON.stringify(combinedPackageJson), {
+        as: 'json-stringify'
+      }));
+      await outputRoot.write('tsconfig.json', await format(JSON.stringify(projectTSConfig), {
+        as: 'json'
+      }));
+    }
+    if (setupExtras.has('github')) {
+      await loadTemplate('github').copy(directory);
+    }
+    if (setupExtras.has('vscode')) {
+      await loadTemplate('vscode').copy(directory);
+    }
+  }
+  await serviceTemplate.copy(serviceDirectory, file => {
+    // If we are in a monorepo, we can use all the template files as they are
+    if (file === 'tsconfig.json') {
+      return partOfMonorepo;
+    }
+
+    // We will adjust the entry file and quilt project file
+    if (file === 'service.ts' || file === 'quilt.project.ts') {
+      return false;
+    }
+
+    // We need to make some adjustments the project’s package.json
+    return file !== 'package.json';
+  });
+  await outputRoot.write(path.join(serviceDirectory, entry), await serviceTemplate.read('service.ts'));
+  let quiltProject = await serviceTemplate.read('quilt.project.ts');
+  quiltProject = quiltProject.replace('service.ts', entry.replace(/^\.[/]/, ''));
+  await outputRoot.write(path.join(serviceDirectory, 'quilt.project.ts'), await format(quiltProject, {
+    as: 'typescript'
+  }));
+  if (partOfMonorepo) {
+    // Write the app’s package.json (the root one was already created)
+    const projectPackageJson = JSON.parse(await serviceTemplate.read('package.json'));
+    adjustPackageJson(projectPackageJson, {
+      name,
+      entry
+    });
+    await outputRoot.write(path.join(serviceDirectory, 'package.json'), await format(JSON.stringify(projectPackageJson), {
+      as: 'json-stringify'
+    }));
+    await Promise.all([addToTsConfig(serviceDirectory, outputRoot), addToPackageManagerWorkspaces(serviceDirectory, outputRoot, packageManager.type)]);
+  }
+  if (shouldInstall) {
+    console.log();
+    // TODO: better loading, handle errors
+    await packageManager.install();
+  }
+  const commands = [];
+  if (!inWorkspace && directory !== process.cwd()) {
+    commands.push(`cd ${cyan_1(relativeDirectoryForDisplay(path.relative(process.cwd(), directory)))} ${dim_1('# Move into your new service’s directory')}`);
+  }
+  if (!shouldInstall) {
+    commands.push(`${packageManager.commands.install()} ${dim_1('# Install all your dependencies')}`);
+  }
+  if (commands.length === 0) {
+    console.log();
+    console.log('Your new service is ready to go!');
+  } else {
+    const whatsNext = stripIndent`
+      Your new service is ready to go! There’s just ${commands.length > 1 ? 'a few more steps' : 'one more step'} you’ll need to take
+      in order to start developing:
+    `;
+    console.log();
+    console.log(whatsNext);
+    console.log();
+    console.log(commands.map(command => `  ${command}`).join('\n'));
+  }
+  const followUp = stripIndent`
+    Quilt can also help you build, develop, test, lint, and type-check your new service.
+    You can learn more about building services with Quilt by reading the documentation:
+    ${underline_1(magenta_1('https://github.com/lemonmade/quilt/tree/main/documentation'))}
+
+    Have fun! 🎉
+  `;
+  console.log();
+  console.log(followUp);
+}
+
+// Argument handling
+
+function getArgv() {
+  const argv = arg({
+    '--yes': Boolean,
+    '-y': '--yes',
+    '--name': String,
+    '--directory': String,
+    '--entry': String,
+    '--install': Boolean,
+    '--no-install': Boolean,
+    '--monorepo': Boolean,
+    '--no-monorepo': Boolean,
+    '--package-manager': String,
+    '--extras': [String],
+    '--no-extras': Boolean,
+    '--help': Boolean,
+    '-h': '--help'
+  }, {
+    permissive: true
+  });
+  return argv;
+}
+async function getName(argv) {
+  let {
+    '--name': name
+  } = argv;
+  if (name == null) {
+    name = await prompt({
+      type: 'text',
+      message: 'What would you like to name your new service?',
+      initial: 'my-service'
+    });
+  }
+  return name;
+}
+async function getEntry(argv, {
+  name
+}) {
+  if (argv['--entry']) {
+    return argv['--entry'];
+  }
+  return `${toValidPackageName(name)}.ts`;
+}
+async function getDirectory(argv, {
+  name
+}) {
+  let directory = path.resolve(argv['--directory'] ?? toValidPackageName(name));
+  while (!argv['--yes']) {
+    if (fs.existsSync(directory) && !(await isEmpty(directory))) {
+      const relativeDirectory = path.relative(process.cwd(), directory);
+      const empty = await prompt({
+        type: 'confirm',
+        message: `Directory ${bold_1(relativeDirectoryForDisplay(relativeDirectory))} is not empty, is it safe to empty it?`,
+        initial: true
+      });
+      if (empty) break;
+      const promptDirectory = await prompt({
+        type: 'text',
+        message: 'What directory do you want to create your new service in?'
+      });
+      directory = path.resolve(promptDirectory);
+    } else {
+      break;
+    }
+  }
+  return directory;
+}
+function adjustPackageJson(packageJson, {
+  name
+}) {
+  packageJson.name = name;
+  packageJson.main = `./build/runtime/runtime.js`;
+  return packageJson;
+}
+
+export { createService };

package/build/esm/shared.mjs

@@ -106,13 +106,9 @@ async function format(content, {
   const [{
     format: rootFormat,
     default: prettier
-  }, {
-    default: babel
-  }, {
-    default: typescript
-  }, {
-    default: yaml
-  }] = await Promise.all([import('./node_modules/.pnpm/prettier@3.0.0/node_modules/prettier/standalone.mjs').then(function (n) { return n.s; }), import('./node_modules/.pnpm/prettier@3.0.0/node_modules/prettier/plugins/babel.mjs').then(function (n) { return n.b; }), import('./node_modules/.pnpm/prettier@3.0.0/node_modules/prettier/plugins/typescript.mjs').then(function (n) { return n.t; }), import('./node_modules/.pnpm/prettier@3.0.0/node_modules/prettier/plugins/yaml.mjs').then(function (n) { return n.y; })]);
+  }, babel, typescript, yaml, estree] = await Promise.all([import('./node_modules/.pnpm/prettier@3.0.0/node_modules/prettier/standalone.mjs').then(function (n) { return n.s; }), import('./node_modules/.pnpm/prettier@3.0.0/node_modules/prettier/plugins/babel.mjs').then(function (n) { return n.b; }), import('./node_modules/.pnpm/prettier@3.0.0/node_modules/prettier/plugins/typescript.mjs').then(function (n) { return n.t; }), import('./node_modules/.pnpm/prettier@3.0.0/node_modules/prettier/plugins/yaml.mjs').then(function (n) { return n.y; }),
+  // @ts-expect-error Types are not generated correctly for this entry
+  import('./node_modules/.pnpm/prettier@3.0.0/node_modules/prettier/plugins/estree.mjs').then(function (n) { return n.e; })]);
 
   // CJS workaround
   const format = rootFormat ?? prettier.format;
@@ -122,7 +118,7 @@ async function format(content, {
     singleQuote: true,
     trailingComma: 'all',
     parser,
-    plugins: [babel, typescript, yaml]
+    plugins: [babel, typescript, yaml, estree]
   });
 }
 function mergeDependencies(first = {}, second = {}) {

package/build/esnext/_virtual/estree.esnext

@@ -0,0 +1,3 @@
+var estree = {exports: {}};
+
+export { estree as __module };

package/build/esnext/module.esnext

@@ -18,7 +18,7 @@ import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/oneLi
 import stripIndent from './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/stripIndent/stripIndent.esnext';
 import './node_modules/.pnpm/common-tags@1.8.2/node_modules/common-tags/es/stripIndents/stripIndents.esnext';
 import { printHelp } from './help.esnext';
-import { emptyDirectory, relativeDirectoryForDisplay, toValidPackageName, format, mergeWorkspaceAndProjectPackageJsons, loadTemplate, isEmpty, createOutputTarget } from './shared.esnext';
+import { toValidPackageName, emptyDirectory, relativeDirectoryForDisplay, format, mergeWorkspaceAndProjectPackageJsons, loadTemplate, isEmpty, createOutputTarget } from './shared.esnext';
 import { getInWorkspace, getCreateAsMonorepo, getExtrasToSetup, getShouldInstall, getPackageManager } from './shared/prompts.esnext';
 import { addToTsConfig } from './shared/tsconfig.esnext';
 import { addToPackageManagerWorkspaces } from './shared/package-manager.esnext';
@@ -54,7 +54,7 @@ async function createModule() {
     root: directory
   });
   const partOfMonorepo = inWorkspace || createAsMonorepo;
-  const moduleDirectory = createAsMonorepo ? path.join(directory, 'app') : directory;
+  const moduleDirectory = createAsMonorepo ? path.join(directory, toValidPackageName(name)) : directory;
   if (fs.existsSync(directory)) {
     await emptyDirectory(directory);
     if (moduleDirectory !== directory) {