fix(create-rslib): support repeatable —tools flag

Author: fi3ework

packages/create-rslib/package.json

@@ -29,7 +29,7 @@
     "test": "rstest"
   },
   "dependencies": {
-    "create-rstack": "1.7.4"
+    "create-rstack": "1.7.6"
   },
   "devDependencies": {
     "@rslib/tsconfig": "workspace:*",

packages/create-rslib/src/index.ts

@@ -4,6 +4,7 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import {
   type Argv,
+  BUILTIN_TOOLS,
   checkCancel,
   create,
   type ESLintTemplateName,
@@ -16,15 +17,20 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 type TemplateName = 'react' | 'node' | 'vue';
 
-async function getTemplateName({ template }: Argv) {
-  if (typeof template === 'string') {
-    const pair = template.split('-');
-    const lang = pair[pair.length - 1];
-    if (lang && ['js', 'ts'].includes(lang)) {
-      return template;
-    }
-    // default to ts
-    return `${template}-ts`;
+async function getTemplateName(argv: Argv) {
+  if (typeof argv.template === 'string') {
+    const pair = argv.template.split('-');
+    const lang = pair[pair.length - 1] ?? 'ts';
+    const rest = pair.slice(0, pair.length - 1).join('-');
+    const tools = (
+      typeof argv.tools === 'string' ? [argv.tools] : (argv.tools ?? [])
+    ).filter((tool) => !BUILTIN_TOOLS.includes(tool));
+
+    return composeTemplateName({
+      template: rest,
+      lang: lang as Lang,
+      tools,
+    });
   }
 
   const templateName = checkCancel<TemplateName>(

packages/create-rslib/test/helper.ts

@@ -3,22 +3,7 @@ import { existsSync } from 'node:fs';
 import path from 'node:path';
 import { expect } from '@rstest/core';
 import fse from 'fs-extra';
-
-export const decomposeTemplateName = (
-  name: string,
-): {
-  template: string;
-  tools: string[];
-  lang: string;
-} => {
-  const [template, tools, lang] = name.split('-');
-  const trimBrackets = (str: string) => str.replace(/^\[|\]$/g, '');
-  return {
-    template: trimBrackets(template)!,
-    tools: tools === '[]' ? [] : trimBrackets(tools).split(','),
-    lang: lang!,
-  } as const;
-};
+import type { Lang } from '../src/helpers';
 
 export const expectPackageJson = (
   pkgJson: Record<string, any>,
@@ -30,12 +15,19 @@ export const expectPackageJson = (
   expect(pkgJson.devDependencies['@rslib/core']).toBeTruthy();
 };
 
+export interface TemplateCase {
+  template: string;
+  lang: Lang;
+  tools: string[];
+  label: string;
+}
+
 export const createAndValidate = (
   cwd: string,
-  template: string,
+  templateCase: TemplateCase,
   {
-    name = `test-temp-${template}`,
-    tools = [],
+    name = `test-temp-${templateCase.label}`,
+    tools: additionalTools = [],
     clean = true,
   }: {
     name?: string;
@@ -46,9 +38,19 @@ export const createAndValidate = (
   const dir = path.join(cwd, name);
   fse.removeSync(dir);
 
-  let command = `node ../dist/index.js -d ${name} -t ${template}`;
-  if (tools.length) {
-    const toolsCmd = tools.map((tool) => `--tools ${tool}`).join(' ');
+  const templateArg = `${templateCase.template}-${templateCase.lang}`;
+
+  let command = `node ../dist/index.js --dir ${name} --template ${templateArg}`;
+
+  if (templateCase.tools.length) {
+    const templateToolsCmd = templateCase.tools
+      .map((tool) => `--tools ${tool}`)
+      .join(' ');
+    command += ` ${templateToolsCmd}`;
+  }
+
+  if (additionalTools.length) {
+    const toolsCmd = additionalTools.map((tool) => `--tools ${tool}`).join(' ');
     command += ` ${toolsCmd}`;
   }
 
@@ -57,33 +59,31 @@ export const createAndValidate = (
   const pkgJson = fse.readJSONSync(path.join(dir, 'package.json'));
   expectPackageJson(pkgJson, path.basename(name));
 
-  const templateData = decomposeTemplateName(template);
-
   // tsconfig
-  if (templateData.lang === 'ts') {
+  if (templateCase.lang === 'ts') {
     expect(pkgJson.devDependencies.typescript).toBeTruthy();
     expect(existsSync(path.join(dir, 'tsconfig.json'))).toBeTruthy();
   }
 
   // tool - Vitest
-  if (templateData.tools.includes('vitest')) {
+  if (templateCase.tools.includes('vitest')) {
     for (const file of [
-      `vitest.config.${templateData.lang}`,
-      `tests/index.test.${templateData.lang}${templateData.template === 'react' ? 'x' : ''}`,
+      `vitest.config.${templateCase.lang}`,
+      `tests/index.test.${templateCase.lang}${templateCase.template === 'react' ? 'x' : ''}`,
     ]) {
       expect(existsSync(path.join(dir, file))).toBeTruthy();
     }
     expect(pkgJson.devDependencies.vitest).toBeTruthy();
-    if (templateData.template === 'react') {
+    if (templateCase.template === 'react') {
       expect(pkgJson.devDependencies['@testing-library/react']).toBeTruthy();
     }
   }
 
   // tool - Storybook
-  if (templateData.tools.includes('storybook')) {
+  if (templateCase.tools.includes('storybook')) {
     for (const file of [
-      `.storybook/main.${templateData.lang}`,
-      `.storybook/preview.${templateData.lang}`,
+      `.storybook/main.${templateCase.lang}`,
+      `.storybook/preview.${templateCase.lang}`,
     ]) {
       expect(existsSync(path.join(dir, file))).toBeTruthy();
     }