create-pnpm-cli 0.0.12 → 0.0.13

package/lib/cli.cjs

@@ -35,7 +35,7 @@ __export(cli_exports, {
 module.exports = __toCommonJS(cli_exports);
 
 // package.json
-var version = "0.0.11";
+var version = "0.0.13";
 
 // src/constants.ts
 var import_path = __toESM(require("path"), 1);
@@ -54,6 +54,7 @@ var PACKAGE_MAP = {
 
 // src/utils.ts
 var import_child_process = require("child_process");
+var import_fast_glob = __toESM(require("fast-glob"), 1);
 var import_fs_extra = __toESM(require("fs-extra"), 1);
 var import_os = __toESM(require("os"), 1);
 var import_path2 = __toESM(require("path"), 1);
@@ -74,47 +75,73 @@ function cloneRepository(repoUrl, targetPath) {
     }
   );
 }
-async function fetchTemplateFromRepo(repoUrl, templateName) {
+function getRepoTempPath(repoUrl) {
   const tempDir = getTempDir();
   const [gitRepoUrl] = repoUrl.split("#");
-  const repoTempPath = import_path2.default.join(
+  return import_path2.default.join(
     tempDir,
     gitRepoUrl.split("/").pop()?.replace(".git", "") || "unknown"
   );
-  const templateTempPath = import_path2.default.join(repoTempPath, "templates", templateName);
-  await import_fs_extra.default.ensureDir(tempDir);
+}
+async function fetchRepository(repoUrl) {
+  const repoTempPath = getRepoTempPath(repoUrl);
+  await import_fs_extra.default.ensureDir(import_path2.default.dirname(repoTempPath));
   if (await import_fs_extra.default.pathExists(repoTempPath)) {
     await import_fs_extra.default.remove(repoTempPath);
   }
   try {
+    const [gitRepoUrl] = repoUrl.split("#");
     cloneRepository(gitRepoUrl, repoTempPath);
-    if (!await import_fs_extra.default.pathExists(templateTempPath)) {
-      throw new Error(
-        `\u6A21\u677F\u76EE\u5F55\u4E0D\u5B58\u5728: templates/${templateName}\uFF0C\u8BF7\u68C0\u67E5\u4ED3\u5E93\u4E2D\u662F\u5426\u5B58\u5728\u8BE5\u6A21\u677F`
-      );
-    }
-    return templateTempPath;
+    return repoTempPath;
   } catch (err) {
     const errorMessage = err instanceof Error ? err.message : String(err);
-    throw new Error(`\u4ECE\u4ED3\u5E93\u62C9\u53D6\u6A21\u677F\u5931\u8D25: ${repoUrl}\u3002\u9519\u8BEF\u4FE1\u606F: ${errorMessage}`);
+    throw new Error(`\u4ECE\u4ED3\u5E93\u62C9\u53D6\u5931\u8D25: ${repoUrl}\u3002\u9519\u8BEF\u4FE1\u606F: ${errorMessage}`);
+  }
+}
+async function getTemplateNames(repoTempPath) {
+  const templatesPath = import_path2.default.join(repoTempPath, "templates");
+  if (!await import_fs_extra.default.pathExists(templatesPath)) {
+    throw new Error("\u4ED3\u5E93\u4E2D\u4E0D\u5B58\u5728 templates \u76EE\u5F55");
   }
+  const names = await (0, import_fast_glob.default)(`**`, {
+    deep: 1,
+    cwd: templatesPath,
+    onlyFiles: false
+  });
+  return names;
+}
+function getTemplatePath(repoTempPath, templateName) {
+  return import_path2.default.join(repoTempPath, "templates", templateName);
 }
 
 // src/cli.ts
 var import_prompts = require("@inquirer/prompts");
 var import_commander = require("commander");
-var import_fast_glob = __toESM(require("fast-glob"), 1);
 var import_fs_extra2 = __toESM(require("fs-extra"), 1);
 var import_package_manager_install = __toESM(require("package-manager-install"), 1);
 var import_path3 = __toESM(require("path"), 1);
 var cli = import_commander.program;
 cli.name("create-pnpm-cli").version(version);
 cli.command("create", { isDefault: true }).description("create pnpm cli").argument("[path]", "path to mkdir", "./").action(async (targetPath) => {
-  const names = await (0, import_fast_glob.default)(`**`, {
-    deep: 1,
-    cwd: TEMPLATE_PATH,
-    onlyFiles: false
-  });
+  console.log("\u6B63\u5728\u4ECE\u4ED3\u5E93\u62C9\u53D6\u6A21\u677F...");
+  let repoTempPath;
+  try {
+    repoTempPath = await fetchRepository(TEMPLATE_REPO_URL);
+  } catch (err) {
+    handleError(err, "\u62C9\u53D6\u4ED3\u5E93\u5931\u8D25");
+    return;
+  }
+  let names;
+  try {
+    names = await getTemplateNames(repoTempPath);
+  } catch (err) {
+    handleError(err, "\u8BFB\u53D6\u6A21\u677F\u5217\u8868\u5931\u8D25");
+    return;
+  }
+  if (names.length === 0) {
+    handleError(new Error("\u672A\u627E\u5230\u4EFB\u4F55\u6A21\u677F"), "\u6A21\u677F\u5217\u8868\u4E3A\u7A7A");
+    return;
+  }
   const template = await (0, import_prompts.select)({
     message: "\u8BF7\u9009\u62E9\u6A21\u677F",
     choices: names.map((item) => ({ name: item, value: item }))
@@ -123,18 +150,8 @@ cli.command("create", { isDefault: true }).description("create pnpm cli").argume
     message: "\u8BF7\u8F93\u5165\u5305\u540D",
     default: template
   });
-  console.log("\u6B63\u5728\u4ECE\u4ED3\u5E93\u62C9\u53D6\u6A21\u677F...");
-  let templateTempPath;
-  try {
-    templateTempPath = await fetchTemplateFromRepo(
-      TEMPLATE_REPO_URL,
-      template
-    );
-  } catch (err) {
-    handleError(err, "\u62C9\u53D6\u6A21\u677F\u5931\u8D25");
-    return;
-  }
   const target = import_path3.default.join(targetPath, name);
+  const templateTempPath = getTemplatePath(repoTempPath, template);
   await import_fs_extra2.default.ensureDir(target).catch((err) => handleError(err, "\u521B\u5EFA\u6587\u4EF6\u5939\u5931\u8D25"));
   console.log("\u6B63\u5728\u62F7\u8D1D\u6587\u4EF6...");
   await import_fs_extra2.default.copy(templateTempPath, target).catch((err) => handleError(err, "\u62F7\u8D1D\u6587\u4EF6\u9519\u8BEF"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-pnpm-cli",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "create pnpm cli",
   "scripts": {
     "dev": "tsup ./src/cli.ts --dts --clean --shims --format=cjs --platform=node --outDir=./lib --watch",