create-valaxy 0.14.61 → 0.15.1

package/bin/index.mjs

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+'use strict'
+
+import '../dist/index.mjs'

package/build.config.ts

@@ -0,0 +1,3 @@
+export default {
+  entries: ['./src/index'],
+}

package/dist/index.mjs

@@ -0,0 +1,275 @@
+import process from 'node:process';
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { execa } from 'execa';
+import { red, dim, gray, blue, yellow, bold, green, cyan, reset } from 'kolorist';
+import minimist from 'minimist';
+import prompts from 'prompts';
+
+const version = "0.15.1";
+
+function formatTargetDir(targetDir) {
+  return targetDir?.trim().replace(/\/+$/g, "");
+}
+function isEmpty(path2) {
+  const files = fs.readdirSync(path2);
+  return files.length === 0 || files.length === 1 && files[0] === ".git";
+}
+function copy(src, dest) {
+  const stat = fs.statSync(src);
+  if (stat.isDirectory())
+    copyDir(src, dest);
+  else
+    fs.copyFileSync(src, dest);
+}
+function copyDir(srcDir, destDir) {
+  fs.mkdirSync(destDir, { recursive: true });
+  for (const file of fs.readdirSync(srcDir)) {
+    const srcFile = path.resolve(srcDir, file);
+    const destFile = path.resolve(destDir, file);
+    copy(srcFile, destFile);
+  }
+}
+function emptyDir(dir) {
+  console.log(`
+  ${red(`Removing`)} ${dim(dir)}`);
+  if (!fs.existsSync(dir))
+    return;
+  for (const file of fs.readdirSync(dir)) {
+    if (file === ".git")
+      continue;
+    fs.rmSync(path.resolve(dir, file), { recursive: true, force: true });
+  }
+}
+function isValidPackageName(projectName) {
+  return /^(?:@[a-z\d\-*~][a-z\d\-*._~]*\/)?[a-z\d\-~][a-z\d\-._~]*$/.test(
+    projectName
+  );
+}
+function toValidPackageName(projectName) {
+  return projectName.trim().toLowerCase().replace(/\s+/g, "-").replace(/^[._]/, "").replace(/[^a-z\d\-~]+/g, "-");
+}
+function pkgFromUserAgent(userAgent) {
+  if (!userAgent)
+    return void 0;
+  const pkgSpec = userAgent.split(" ")[0];
+  const pkgSpecArr = pkgSpec.split("/");
+  return {
+    name: pkgSpecArr[0],
+    version: pkgSpecArr[1]
+  };
+}
+
+const starterTheme = {
+  name: "starter",
+  display: `Starter`,
+  repo: "https://github.com/valaxyjs/valaxy-theme-starter"
+};
+async function initTheme(options) {
+  const defaultThemeName = starterTheme.name;
+  let themeName = options.themeName || defaultThemeName;
+  if (!themeName) {
+    const { theme } = await prompts({
+      type: "text",
+      name: "theme",
+      message: "Theme name: valaxy-theme-",
+      initial: defaultThemeName
+    });
+    themeName = theme || defaultThemeName;
+  }
+  const targetDir = `valaxy-theme-${themeName.trim()}`;
+  console.log(`  ${dim("npx")} ${gray("degit")} ${blue(starterTheme.repo)} ${yellow(targetDir)}`);
+  await execa("npx", ["degit", starterTheme.repo, targetDir], { stdio: "inherit" });
+  console.log();
+  console.log(`  ${bold("Check it")}:`);
+  console.log();
+  console.log(`- Change ${bold("author")} name in ${yellow("LICENSE")} & ${green("package.json")} & ${blue(".github")}`);
+  console.log(`- Change ${blue("valaxy.config.ts")} theme: ${yellow("starter")} to ${cyan(`${themeName}`)}`);
+  console.log(`- Rename ${yellow(`valaxy-theme-${themeName}`)} to ${cyan(`valaxy-theme-${themeName}`)}`);
+  console.log();
+  console.log(`  ${cyan("\u2728")}`);
+  console.log();
+  return `valaxy-theme-${themeName}`;
+}
+
+const renameFiles = {
+  _gitignore: ".gitignore",
+  _npmrc: ".npmrc"
+};
+const TEMPLATES = [
+  {
+    name: "blog",
+    display: `Blog`,
+    desc: "For Most Users",
+    message: "Project name:",
+    initial: "valaxy-blog",
+    color: cyan
+  },
+  {
+    name: "theme",
+    display: `Theme`,
+    desc: "For Theme Developers",
+    message: "Theme name: valaxy-theme-",
+    initial: "starter",
+    prefix: "valaxy-theme-",
+    color: green,
+    customInit: async (options) => {
+      return initTheme(options).catch((e) => {
+        console.error(e);
+      });
+    }
+  },
+  {
+    name: "addon",
+    display: `Addon`,
+    desc: "For Addon Developers",
+    message: "Addon name: valaxy-addon-",
+    initial: "template",
+    prefix: "valaxy-addon-",
+    color: yellow
+  }
+];
+const TEMPLATE_CHOICES = TEMPLATES.map((template) => template.name);
+
+const argv = minimist(process.argv.slice(2));
+const cwd = process.cwd();
+const defaultTargetDir = "valaxy-blog";
+async function init() {
+  console.log();
+  console.log(`  ${bold("\u{1F30C} Valaxy")}  ${blue(`v${version}`)}`);
+  console.log();
+  const argTargetDir = formatTargetDir(argv._[0]);
+  const argTemplate = argv.template || argv.t;
+  let targetDir = argTargetDir || defaultTargetDir;
+  const getProjectName = () => targetDir === "." ? path.basename(path.resolve()) : targetDir;
+  let result;
+  const { template } = await prompts({
+    type: argTemplate && TEMPLATE_CHOICES.includes(argTemplate) ? null : "select",
+    name: "template",
+    message: typeof argTemplate === "string" && !TEMPLATE_CHOICES.includes(argTemplate) ? reset(
+      `"${argTemplate}" isn't a valid template. Please choose from below: `
+    ) : reset("Select a type:"),
+    initial: 0,
+    choices: TEMPLATES.map((template2) => {
+      const tColor = template2.color;
+      return {
+        title: tColor(template2.display || template2.name) + dim(` - ${template2.desc}`),
+        value: template2
+      };
+    })
+  });
+  try {
+    result = await prompts([
+      {
+        type: argTargetDir ? null : "text",
+        name: "projectName",
+        message: reset(template.message),
+        initial: template.initial,
+        onState: (state) => {
+          targetDir = formatTargetDir(template.prefix ? template.prefix + state.value : state.value) || template.initial;
+        }
+      },
+      {
+        type: () => !fs.existsSync(targetDir) || isEmpty(targetDir) ? null : "confirm",
+        name: "overwrite",
+        message: () => `${targetDir === "." ? "Current directory" : `Target directory "${targetDir}"`} is not empty. Remove existing files and continue?`
+      },
+      {
+        type: (_, { overwrite: overwrite2 }) => {
+          if (overwrite2 === false)
+            throw new Error(`${red("\u2716")} Operation cancelled`);
+          return null;
+        },
+        name: "overwriteChecker"
+      },
+      {
+        type: () => isValidPackageName(getProjectName()) ? null : "text",
+        name: "packageName",
+        message: reset("Package name:"),
+        initial: () => toValidPackageName(getProjectName()),
+        validate: (dir) => isValidPackageName(dir) || "Invalid package.json name"
+      }
+    ], {
+      onCancel: () => {
+        throw new Error(`${red("\u2716")} Operation cancelled`);
+      }
+    });
+  } catch (cancelled) {
+    console.log(cancelled.message);
+    return;
+  }
+  const { projectName, overwrite } = result;
+  const dirName = template.prefix ? template.prefix + projectName : projectName;
+  const root = path.join(cwd, dirName);
+  console.log(root, overwrite);
+  if (overwrite)
+    emptyDir(root);
+  else if (!fs.existsSync(root))
+    fs.mkdirSync(root, { recursive: true });
+  if (template.customInit) {
+    await template.customInit({ themeName: projectName });
+  } else {
+    const templateDir = path.resolve(fileURLToPath(new URL(".", import.meta.url)), "..", `template-${template.name}`);
+    const write = (filename, content) => {
+      const targetPath = renameFiles[filename] ? path.join(root, renameFiles[filename]) : path.join(root, filename);
+      if (content)
+        fs.writeFileSync(targetPath, content);
+      else
+        copy(path.join(templateDir, filename), targetPath);
+    };
+    const files = fs.readdirSync(templateDir);
+    for (const file of files.filter((f) => f !== "package.json"))
+      write(file);
+    const pkg = await import(path.join(templateDir, "package.json"));
+    pkg.name = projectName || getProjectName();
+    write("package.json", JSON.stringify(pkg, null, 2));
+  }
+  console.log(`  ${dim("\u{1F4C1}")} ${dim(root)}`);
+  console.log();
+  console.log(dim("  Scaffolding project in ") + targetDir + dim(" ..."));
+  const pkgInfo = pkgFromUserAgent(process.env.npm_config_user_agent);
+  const pkgManager = pkgInfo ? pkgInfo.name : "npm";
+  const related = path.relative(cwd, root);
+  console.log(green("  Done.\n"));
+  if (template.name === "addon")
+    return;
+  const { yes } = await prompts({
+    type: "confirm",
+    name: "yes",
+    initial: "Y",
+    message: "Install and start it now?"
+  });
+  if (yes) {
+    const { agent } = await prompts({
+      name: "agent",
+      type: "select",
+      message: "Choose the agent",
+      choices: ["npm", "yarn", "pnpm"].map((i) => ({ value: i, title: i }))
+    });
+    if (!agent)
+      return;
+    await execa(agent, ["install"], { stdio: "inherit", cwd: root });
+    await execa(agent, ["run", "dev"], { stdio: "inherit", cwd: root });
+  } else {
+    console.log(dim("\n  start it later by:\n"));
+    if (root !== cwd)
+      console.log(`  ${green("cd")} ${blue(related)}`);
+    switch (pkgManager) {
+      case "yarn":
+        console.log(`  ${green("yarn")}`);
+        console.log(`  ${green("yarn")} dev`);
+        break;
+      default:
+        console.log(`  ${green(pkgManager)} install`);
+        console.log(`  ${green(pkgManager)} run dev`);
+        break;
+    }
+    console.log();
+    console.log(`  ${cyan("\u2728")}`);
+  }
+}
+
+init().catch((e) => {
+  console.error(e);
+});

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "create-valaxy",
-  "version": "0.14.61",
+  "type": "module",
+  "version": "0.15.1",
   "description": "Create Starter Template for Valaxy",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -13,17 +14,23 @@
     "type": "git",
     "url": "https://github.com/YunYouJun/valaxy"
   },
-  "main": "index.js",
+  "main": "bin/index.mjs",
   "bin": {
-    "create-valaxy": "index.js"
+    "create-valaxy": "bin/index.mjs"
   },
   "engines": {
     "node": "^14.18.0 || >=16.0.0"
   },
   "dependencies": {
-    "execa": "5.1.1",
+    "execa": "8.0.1",
     "kolorist": "^1.8.0",
     "minimist": "^1.2.8",
     "prompts": "^2.4.2"
+  },
+  "scripts": {
+    "build": "unbuild",
+    "dev": "unbuild --stub",
+    "start": "tsx src/index.ts",
+    "typecheck": "tsc --noEmit"
   }
 }

package/src/config.ts

@@ -0,0 +1,45 @@
+import { cyan, green, yellow } from 'kolorist'
+import { initTheme } from './theme'
+
+export const renameFiles: Record<string, string> = {
+  _gitignore: '.gitignore',
+  _npmrc: '.npmrc',
+}
+
+export const TEMPLATES = [
+  {
+    name: 'blog',
+    display: `Blog`,
+    desc: 'For Most Users',
+    message: 'Project name:',
+    initial: 'valaxy-blog',
+    color: cyan,
+  },
+  {
+    name: 'theme',
+    display: `Theme`,
+    desc: 'For Theme Developers',
+    message: 'Theme name: valaxy-theme-',
+    initial: 'starter',
+    prefix: 'valaxy-theme-',
+    color: green,
+    customInit: async (options: {
+      themeName?: string
+    }) => {
+      return initTheme(options).catch((e) => {
+        console.error(e)
+      })
+    },
+  },
+  {
+    name: 'addon',
+    display: `Addon`,
+    desc: 'For Addon Developers',
+    message: 'Addon name: valaxy-addon-',
+    initial: 'template',
+    prefix: 'valaxy-addon-',
+    color: yellow,
+  },
+]
+
+export const TEMPLATE_CHOICES = TEMPLATES.map(template => template.name)

package/src/index.ts

@@ -1,204 +1,6 @@
-// #!/usr/bin/env node
-// /* eslint-disable @typescript-eslint/no-var-requires */
-// /* eslint-disable no-console */
+/* eslint-disable no-console */
+import { init } from './valaxy'
 
-// // @todo migrate to ts
-
-// import process from 'node:process'
-// import fs from 'node:fs'
-// import path from 'node:path'
-// import prompts from 'prompts'
-// import execa from 'execa'
-// import { blue, bold, cyan, dim, gray, green, red, yellow } from 'kolorist'
-// import minimist from 'minimist'
-// import { version } from '../package.json'
-
-// const argv = minimist(process.argv.slice(2))
-
-// const cwd = process.cwd()
-
-// const renameFiles = {
-//   _gitignore: '.gitignore',
-//   _npmrc: '.npmrc',
-// }
-
-// async function init() {
-//   console.log()
-//   console.log(`  ${bold('🌌 Valaxy')}  ${blue(`v${version}`)}`)
-//   console.log()
-
-//   let targetDir = argv._[0]
-//   if (!targetDir) {
-//     /**
-//      * @type {{ projectName: string }}
-//      */
-//     const { projectName } = await prompts({
-//       type: 'text',
-//       name: 'projectName',
-//       message: 'Project name:',
-//       initial: 'valaxy-blog',
-//     })
-//     targetDir = projectName.trim()
-
-//     const packageName = await getValidPackageName(targetDir)
-//     const root = path.join(cwd, targetDir)
-
-//     if (!fs.existsSync(root)) {
-//       fs.mkdirSync(root, { recursive: true })
-//     }
-//     else {
-//       const existing = fs.readdirSync(root)
-//       if (existing.length) {
-//         console.log(yellow(`  Target directory "${targetDir}" is not empty.`))
-//         /**
-//          * @type {{ yes: boolean }}
-//          */
-//         const { yes } = await prompts({
-//           type: 'confirm',
-//           name: 'yes',
-//           initial: 'Y',
-//           message: 'Remove existing files and continue?',
-//         })
-//         if (yes)
-//           emptyDir(root)
-
-//         else
-//           return
-//       }
-//     }
-
-//     console.log(`  ${dim('📁')} ${dim(root)}`)
-//     console.log()
-//     console.log(dim('  Scaffolding project in ') + targetDir + dim(' ...'))
-
-//     const templateDir = path.join(__dirname, 'template')
-//     const write = (file, content) => {
-//       const targetPath = renameFiles[file]
-//         ? path.join(root, renameFiles[file])
-//         : path.join(root, file)
-//       if (content)
-//         fs.writeFileSync(targetPath, content)
-
-//       else
-//         copy(path.join(templateDir, file), targetPath)
-//     }
-
-//     const files = fs.readdirSync(templateDir)
-//     for (const file of files.filter(f => f !== 'package.json'))
-//       write(file)
-
-//     // write pkg name & version
-//     // eslint-disable-next-line @typescript-eslint/no-require-imports
-//     const pkg = require(path.join(templateDir, 'package.json'))
-//     if (packageName)
-//       pkg.name = packageName
-//     pkg.version = version
-
-//     write('package.json', JSON.stringify(pkg, null, 2))
-
-//     const pkgManager = (/pnpm/.test(process.env.npm_execpath) || /pnpm/.test(process.env.npm_config_user_agent))
-//       ? 'pnpm'
-//       : /yarn/.test(process.env.npm_execpath) ? 'yarn' : 'npm'
-
-//     const related = path.relative(cwd, root)
-//     console.log(green('  Done.\n'))
-
-//     /**
-//      * @type {{ yes: boolean }}
-//      */
-//     const { yes } = await prompts({
-//       type: 'confirm',
-//       name: 'yes',
-//       initial: 'Y',
-//       message: 'Install and start it now?',
-//     })
-
-//     if (yes) {
-//       const { agent } = await prompts({
-//         name: 'agent',
-//         type: 'select',
-//         message: 'Choose the agent',
-//         choices: ['npm', 'yarn', 'pnpm'].map(i => ({ value: i, title: i })),
-//       })
-
-//       if (!agent)
-//         return
-
-//       await execa(agent, ['install'], { stdio: 'inherit', cwd: root })
-//       await execa(agent, ['run', 'dev'], { stdio: 'inherit', cwd: root })
-//     }
-//     else {
-//       console.log(dim('\n  start it later by:\n'))
-//       if (root !== cwd)
-//         console.log(blue(`  cd ${bold(related)}`))
-
-//       console.log(blue(`  ${pkgManager === 'yarn' ? 'yarn' : `${pkgManager} install`}`))
-//       console.log(blue(`  ${pkgManager === 'yarn' ? 'yarn dev' : `${pkgManager} run dev`}`))
-//       console.log()
-//       console.log(`  ${cyan('✨')}`)
-//       console.log()
-//     }
-//   }
-// }
-
-// function copy(src, dest) {
-//   const stat = fs.statSync(src)
-//   if (stat.isDirectory())
-//     copyDir(src, dest)
-
-//   else
-//     fs.copyFileSync(src, dest)
-// }
-
-// function copyDir(srcDir, destDir) {
-//   fs.mkdirSync(destDir, { recursive: true })
-//   for (const file of fs.readdirSync(srcDir)) {
-//     const srcFile = path.resolve(srcDir, file)
-//     const destFile = path.resolve(destDir, file)
-//     copy(srcFile, destFile)
-//   }
-// }
-
-// async function getValidPackageName(projectName) {
-//   projectName = path.basename(projectName)
-//   const packageNameRegExp = /^(?:@[a-z0-9-*~][a-z0-9-*._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/
-//   if (packageNameRegExp.test(projectName)) {
-//     return projectName
-//   }
-//   else {
-//     const suggestedPackageName = projectName
-//       .trim()
-//       .toLowerCase()
-//       .replace(/\s+/g, '-')
-//       .replace(/^[._]/, '')
-//       .replace(/[^a-z0-9-~]+/g, '-')
-
-//     /**
-//      * @type {{ inputPackageName: string }}
-//      */
-//     const { inputPackageName } = await prompts({
-//       type: 'text',
-//       name: 'inputPackageName',
-//       message: 'Package name:',
-//       initial: suggestedPackageName,
-//       // validate: input =>
-//       //   packageNameRegExp.test(input) ? true : 'Invalid package.json name',
-//     })
-//     return inputPackageName
-//   }
-// }
-
-// /**
-//  * @param {string} dir
-//  * @returns
-//  */
-// function emptyDir(dir) {
-//   if (!fs.existsSync(dir))
-//     return
-//   console.log(red('  Remove ') + gray(dir))
-//   fs.rmSync(dir, { recursive: true, force: true })
-// }
-
-// init().catch((e) => {
-//   console.error(e)
-// })
+init().catch((e) => {
+  console.error(e)
+})

package/src/theme.ts

@@ -0,0 +1,46 @@
+/* eslint-disable no-console */
+import prompts from 'prompts'
+import { execa } from 'execa'
+import { blue, bold, cyan, dim, gray, green, yellow } from 'kolorist'
+
+const starterTheme = {
+  name: 'starter',
+  display: `Starter`,
+  repo: 'https://github.com/valaxyjs/valaxy-theme-starter',
+}
+
+export async function initTheme(options: {
+  themeName?: string
+}) {
+  const defaultThemeName = starterTheme.name
+  let themeName = options.themeName || defaultThemeName
+  if (!themeName) {
+    /**
+     * @type {{ theme: string }}
+     */
+    const { theme } = await prompts({
+      type: 'text',
+      name: 'theme',
+      message: 'Theme name: valaxy-theme-',
+      initial: defaultThemeName,
+    })
+    themeName = theme || defaultThemeName
+  }
+
+  const targetDir = `valaxy-theme-${themeName!.trim()}`
+
+  console.log(`  ${dim('npx')} ${gray('degit')} ${blue(starterTheme.repo)} ${yellow(targetDir)}`)
+  await execa('npx', ['degit', starterTheme.repo, targetDir], { stdio: 'inherit' })
+
+  console.log()
+  console.log(`  ${bold('Check it')}:`)
+  console.log()
+  console.log(`- Change ${bold('author')} name in ${yellow('LICENSE')} & ${green('package.json')} & ${blue('.github')}`)
+  console.log(`- Change ${blue('valaxy.config.ts')} theme: ${yellow('starter')} to ${cyan(`${themeName}`)}`)
+  console.log(`- Rename ${yellow(`valaxy-theme-${themeName}`)} to ${cyan(`valaxy-theme-${themeName}`)}`)
+  console.log()
+  console.log(`  ${cyan('✨')}`)
+  console.log()
+
+  return `valaxy-theme-${themeName}`
+}

package/src/utils.ts

@@ -0,0 +1,73 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import { dim, red } from 'kolorist'
+
+/**
+ * remove trailing slash
+ */
+export function formatTargetDir(targetDir: string | undefined) {
+  return targetDir?.trim().replace(/\/+$/g, '')
+}
+
+export function isEmpty(path: string) {
+  const files = fs.readdirSync(path)
+  return files.length === 0 || (files.length === 1 && files[0] === '.git')
+}
+
+export function copy(src: string, dest: string) {
+  const stat = fs.statSync(src)
+  if (stat.isDirectory())
+    copyDir(src, dest)
+
+  else
+    fs.copyFileSync(src, dest)
+}
+
+export function copyDir(srcDir: string, destDir: string) {
+  fs.mkdirSync(destDir, { recursive: true })
+  for (const file of fs.readdirSync(srcDir)) {
+    const srcFile = path.resolve(srcDir, file)
+    const destFile = path.resolve(destDir, file)
+    copy(srcFile, destFile)
+  }
+}
+
+export function emptyDir(dir: string) {
+  // eslint-disable-next-line no-console
+  console.log(`\n  ${red(`Removing`)} ${dim(dir)}`)
+  if (!fs.existsSync(dir))
+    return
+
+  for (const file of fs.readdirSync(dir)) {
+    if (file === '.git')
+      continue
+
+    fs.rmSync(path.resolve(dir, file), { recursive: true, force: true })
+  }
+}
+
+export function isValidPackageName(projectName: string) {
+  return /^(?:@[a-z\d\-*~][a-z\d\-*._~]*\/)?[a-z\d\-~][a-z\d\-._~]*$/.test(
+    projectName,
+  )
+}
+
+export function toValidPackageName(projectName: string) {
+  return projectName
+    .trim()
+    .toLowerCase()
+    .replace(/\s+/g, '-')
+    .replace(/^[._]/, '')
+    .replace(/[^a-z\d\-~]+/g, '-')
+}
+
+export function pkgFromUserAgent(userAgent: string | undefined) {
+  if (!userAgent)
+    return undefined
+  const pkgSpec = userAgent.split(' ')[0]
+  const pkgSpecArr = pkgSpec.split('/')
+  return {
+    name: pkgSpecArr[0],
+    version: pkgSpecArr[1],
+  }
+}

package/src/valaxy.ts

@@ -0,0 +1,200 @@
+/* eslint-disable no-console */
+import process from 'node:process'
+import fs from 'node:fs'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { execa } from 'execa'
+import { blue, bold, cyan, dim, green, red, reset } from 'kolorist'
+import minimist from 'minimist'
+import prompts from 'prompts'
+import { version } from '../package.json'
+import { copy, emptyDir, formatTargetDir, isEmpty, isValidPackageName, pkgFromUserAgent, toValidPackageName } from './utils'
+import { TEMPLATES, TEMPLATE_CHOICES, renameFiles } from './config'
+
+const argv = minimist(process.argv.slice(2))
+
+const cwd = process.cwd()
+const defaultTargetDir = 'valaxy-blog'
+
+export async function init() {
+  console.log()
+  console.log(`  ${bold('🌌 Valaxy')}  ${blue(`v${version}`)}`)
+  console.log()
+
+  const argTargetDir = formatTargetDir(argv._[0])
+  const argTemplate = argv.template || argv.t
+
+  let targetDir = argTargetDir || defaultTargetDir
+  const getProjectName = () =>
+    targetDir === '.' ? path.basename(path.resolve()) : targetDir
+
+  let result: prompts.Answers<
+    'projectName' | 'overwrite' | 'packageName'
+    >
+
+  // get template
+  const { template } = await prompts({
+    type:
+            argTemplate && TEMPLATE_CHOICES.includes(argTemplate) ? null : 'select',
+    name: 'template',
+    message:
+            typeof argTemplate === 'string' && !TEMPLATE_CHOICES.includes(argTemplate)
+              ? reset(
+                  `"${argTemplate}" isn't a valid template. Please choose from below: `,
+              )
+              : reset('Select a type:'),
+    initial: 0,
+    choices: TEMPLATES.map((template) => {
+      const tColor = template.color
+      return {
+        title: tColor(template.display || template.name) + dim(` - ${template.desc}`),
+        value: template,
+      }
+    }),
+  })
+
+  try {
+    result = await prompts([
+      {
+        type: argTargetDir ? null : 'text',
+        name: 'projectName',
+        message: reset(template.message),
+        initial: template.initial,
+        onState: (state) => {
+          targetDir = formatTargetDir(template.prefix ? template.prefix + state.value : state.value) || (template.initial)
+        },
+      },
+      {
+        type: () =>
+          !fs.existsSync(targetDir) || isEmpty(targetDir) ? null : 'confirm',
+        name: 'overwrite',
+        message: () =>
+          `${targetDir === '.'
+              ? 'Current directory'
+              : `Target directory "${targetDir}"`
+            } is not empty. Remove existing files and continue?`,
+      },
+      {
+        type: (_, { overwrite }: { overwrite?: boolean }) => {
+          if (overwrite === false)
+            throw new Error(`${red('✖')} Operation cancelled`)
+
+          return null
+        },
+        name: 'overwriteChecker',
+      },
+      {
+        type: () => (isValidPackageName(getProjectName()) ? null : 'text'),
+        name: 'packageName',
+        message: reset('Package name:'),
+        initial: () => toValidPackageName(getProjectName()),
+        validate: dir =>
+          isValidPackageName(dir) || 'Invalid package.json name',
+      },
+    ], {
+      onCancel: () => {
+        throw new Error(`${red('✖')} Operation cancelled`)
+      },
+    })
+  }
+  catch (cancelled: any) {
+    console.log(cancelled.message)
+    return
+  }
+
+  const { projectName, overwrite } = result
+  const dirName = template.prefix ? template.prefix + projectName : projectName
+  const root = path.join(cwd, dirName)
+
+  console.log(root, overwrite)
+
+  if (overwrite)
+    emptyDir(root)
+  else if (!fs.existsSync(root))
+    fs.mkdirSync(root, { recursive: true })
+
+  // custom
+  if (template.customInit) {
+    await template.customInit({ themeName: projectName })
+  }
+  else {
+    const templateDir = path.resolve(fileURLToPath(new URL('.', import.meta.url)), '..', `template-${template.name}`)
+    const write = (filename: string, content?: string) => {
+      const targetPath = renameFiles[filename]
+        ? path.join(root, renameFiles[filename])
+        : path.join(root, filename)
+
+      if (content)
+        fs.writeFileSync(targetPath, content)
+      else
+        copy(path.join(templateDir, filename), targetPath)
+    }
+
+    const files = fs.readdirSync(templateDir)
+    for (const file of files.filter(f => f !== 'package.json'))
+      write(file)
+
+    // write pkg name & version
+    const pkg = await import(path.join(templateDir, 'package.json'))
+    pkg.name = projectName || getProjectName()
+
+    write('package.json', JSON.stringify(pkg, null, 2))
+  }
+
+  console.log(`  ${dim('📁')} ${dim(root)}`)
+  console.log()
+  console.log(dim('  Scaffolding project in ') + targetDir + dim(' ...'))
+
+  const pkgInfo = pkgFromUserAgent(process.env.npm_config_user_agent)
+  const pkgManager = pkgInfo ? pkgInfo.name : 'npm'
+
+  const related = path.relative(cwd, root)
+  console.log(green('  Done.\n'))
+
+  // addon not start
+  if (template.name === 'addon')
+    return
+
+  /**
+   * @type {{ yes: boolean }}
+   */
+  const { yes } = await prompts({
+    type: 'confirm',
+    name: 'yes',
+    initial: 'Y',
+    message: 'Install and start it now?',
+  })
+
+  if (yes) {
+    const { agent } = await prompts({
+      name: 'agent',
+      type: 'select',
+      message: 'Choose the agent',
+      choices: ['npm', 'yarn', 'pnpm'].map(i => ({ value: i, title: i })),
+    })
+
+    if (!agent)
+      return
+
+    await execa(agent, ['install'], { stdio: 'inherit', cwd: root })
+    await execa(agent, ['run', 'dev'], { stdio: 'inherit', cwd: root })
+  }
+  else {
+    console.log(dim('\n  start it later by:\n'))
+    if (root !== cwd)
+      console.log(`  ${green('cd')} ${blue(related)}`)
+
+    switch (pkgManager) {
+      case 'yarn':
+        console.log(`  ${green('yarn')}`)
+        console.log(`  ${green('yarn')} dev`)
+        break
+      default:
+        console.log(`  ${green(pkgManager)} install`)
+        console.log(`  ${green(pkgManager)} run dev`)
+        break
+    }
+    console.log()
+    console.log(`  ${cyan('✨')}`)
+  }
+}

package/{template → template-blog}/package.json

@@ -11,8 +11,8 @@
     "serve": "vite preview"
   },
   "dependencies": {
-    "valaxy": "0.14.61",
-    "valaxy-theme-yun": "0.14.61"
+    "valaxy": "0.15.1",
+    "valaxy-theme-yun": "0.15.1"
   },
   "devDependencies": {
     "typescript": "^5.2.2"

package/{template → template-blog}/tsconfig.json

@@ -1,21 +1,21 @@
 {
   "compilerOptions": {
-    "baseUrl": ".",
-    "module": "ESNext",
     "target": "ESNext",
     "lib": ["DOM", "ESNext"],
-    "strict": true,
-    "esModuleInterop": true,
     "jsx": "preserve",
-    "skipLibCheck": true,
+    "module": "ESNext",
     "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "noUnusedLocals": true,
-    "strictNullChecks": true,
-    "forceConsistentCasingInFileNames": true,
+    "baseUrl": ".",
     "paths": {
       "~/*": ["./*"]
-    }
+    },
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "strictNullChecks": true,
+    "noUnusedLocals": true,
+    "skipLibCheck": true
   },
   "exclude": ["dist", "node_modules"]
 }

package/template-theme/README.md

@@ -0,0 +1,17 @@
+# create-valaxy-theme
+
+Theme template generator.
+
+> Make a valaxy theme is so easy!
+
+```bash
+npx degit valaxyjs/valaxy-theme-starter valaxy-theme-name
+```
+
+## FAQ
+
+If you want to create a valaxy theme, you should use the theme name as prefix of components to avoid conflicts.
+
+For example:
+
+`valaxy-theme-yun` component name is `YunComponent`, `YunPost`, etc.

package/index.js

@@ -1,198 +0,0 @@
-#!/usr/bin/env node
-/* eslint-disable no-console */
-
-const process = require('node:process')
-const fs = require('node:fs')
-const path = require('node:path')
-const argv = require('minimist')(process.argv.slice(2))
-const prompts = require('prompts')
-const execa = require('execa')
-const { bold, dim, blue, yellow, green, cyan, red, gray } = require('kolorist')
-const { version } = require('./package.json')
-
-const cwd = process.cwd()
-
-const renameFiles = {
-  _gitignore: '.gitignore',
-  _npmrc: '.npmrc',
-}
-
-async function init() {
-  console.log()
-  console.log(`  ${bold('🌌 Valaxy')}  ${blue(`v${version}`)}`)
-  console.log()
-
-  let targetDir = argv._[0]
-  if (!targetDir) {
-    /**
-     * @type {{ projectName: string }}
-     */
-    const { projectName } = await prompts({
-      type: 'text',
-      name: 'projectName',
-      message: 'Project name:',
-      initial: 'valaxy-blog',
-    })
-    targetDir = projectName.trim()
-
-    const packageName = await getValidPackageName(targetDir)
-    const root = path.join(cwd, targetDir)
-
-    if (!fs.existsSync(root)) {
-      fs.mkdirSync(root, { recursive: true })
-    }
-    else {
-      const existing = fs.readdirSync(root)
-      if (existing.length) {
-        console.log(yellow(`  Target directory "${targetDir}" is not empty.`))
-        /**
-         * @type {{ yes: boolean }}
-         */
-        const { yes } = await prompts({
-          type: 'confirm',
-          name: 'yes',
-          initial: 'Y',
-          message: 'Remove existing files and continue?',
-        })
-        if (yes)
-          emptyDir(root)
-
-        else
-          return
-      }
-    }
-
-    console.log(`  ${dim('📁')} ${dim(root)}`)
-    console.log()
-    console.log(dim('  Scaffolding project in ') + targetDir + dim(' ...'))
-
-    const templateDir = path.join(__dirname, 'template')
-    const write = (file, content) => {
-      const targetPath = renameFiles[file]
-        ? path.join(root, renameFiles[file])
-        : path.join(root, file)
-      if (content)
-        fs.writeFileSync(targetPath, content)
-
-      else
-        copy(path.join(templateDir, file), targetPath)
-    }
-
-    const files = fs.readdirSync(templateDir)
-    for (const file of files.filter(f => f !== 'package.json'))
-      write(file)
-
-    // write pkg name & version
-    const pkg = require(path.join(templateDir, 'package.json'))
-    if (packageName)
-      pkg.name = packageName
-    pkg.version = version
-
-    write('package.json', JSON.stringify(pkg, null, 2))
-
-    const pkgManager = (/pnpm/.test(process.env.npm_execpath) || /pnpm/.test(process.env.npm_config_user_agent))
-      ? 'pnpm'
-      : /yarn/.test(process.env.npm_execpath) ? 'yarn' : 'npm'
-
-    const related = path.relative(cwd, root)
-    console.log(green('  Done.\n'))
-
-    /**
-     * @type {{ yes: boolean }}
-     */
-    const { yes } = await prompts({
-      type: 'confirm',
-      name: 'yes',
-      initial: 'Y',
-      message: 'Install and start it now?',
-    })
-
-    if (yes) {
-      const { agent } = await prompts({
-        name: 'agent',
-        type: 'select',
-        message: 'Choose the agent',
-        choices: ['npm', 'yarn', 'pnpm'].map(i => ({ value: i, title: i })),
-      })
-
-      if (!agent)
-        return
-
-      await execa(agent, ['install'], { stdio: 'inherit', cwd: root })
-      await execa(agent, ['run', 'dev'], { stdio: 'inherit', cwd: root })
-    }
-    else {
-      console.log(dim('\n  start it later by:\n'))
-      if (root !== cwd)
-        console.log(blue(`  cd ${bold(related)}`))
-
-      console.log(blue(`  ${pkgManager === 'yarn' ? 'yarn' : `${pkgManager} install`}`))
-      console.log(blue(`  ${pkgManager === 'yarn' ? 'yarn dev' : `${pkgManager} run dev`}`))
-      console.log()
-      console.log(`  ${cyan('✨')}`)
-      console.log()
-    }
-  }
-}
-
-function copy(src, dest) {
-  const stat = fs.statSync(src)
-  if (stat.isDirectory())
-    copyDir(src, dest)
-
-  else
-    fs.copyFileSync(src, dest)
-}
-
-function copyDir(srcDir, destDir) {
-  fs.mkdirSync(destDir, { recursive: true })
-  for (const file of fs.readdirSync(srcDir)) {
-    const srcFile = path.resolve(srcDir, file)
-    const destFile = path.resolve(destDir, file)
-    copy(srcFile, destFile)
-  }
-}
-
-async function getValidPackageName(projectName) {
-  projectName = path.basename(projectName)
-  const packageNameRegExp = /^(?:@[a-z0-9-*~][a-z0-9-*._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/
-  if (packageNameRegExp.test(projectName)) {
-    return projectName
-  }
-  else {
-    const suggestedPackageName = projectName
-      .trim()
-      .toLowerCase()
-      .replace(/\s+/g, '-')
-      .replace(/^[._]/, '')
-      .replace(/[^a-z0-9-~]+/g, '-')
-
-    /**
-     * @type {{ inputPackageName: string }}
-     */
-    const { inputPackageName } = await prompts({
-      type: 'text',
-      name: 'inputPackageName',
-      message: 'Package name:',
-      initial: suggestedPackageName,
-      // validate: input =>
-      //   packageNameRegExp.test(input) ? true : 'Invalid package.json name',
-    })
-    return inputPackageName
-  }
-}
-
-/**
- * @param {string} dir
- * @returns
- */
-function emptyDir(dir) {
-  if (!fs.existsSync(dir))
-    return
-  console.log(red('  Remove ') + gray(dir))
-  fs.rmSync(dir, { recursive: true, force: true })
-}
-
-init().catch((e) => {
-  console.error(e)
-})