create-ponder 0.4.6 → 0.4.7

package/dist/index.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { writeFileSync as writeFileSync3 } from "node:fs";
+import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync3 } from "node:fs";
 import path4 from "node:path";
 import { fileURLToPath } from "node:url";
 import { cac } from "cac";
 import cpy from "cpy";
 import { execa } from "execa";
-import fs2 from "fs-extra";
+import fs from "fs-extra";
 import { oraPromise } from "ora";
 import pico5 from "picocolors";
 import prettier3 from "prettier";
@@ -16,7 +16,7 @@ import { default as prompts } from "prompts";
 // package.json
 var package_default = {
   name: "create-ponder",
-  version: "0.4.6",
+  version: "0.4.7",
   type: "module",
   description: "A CLI tool to create Ponder apps",
   license: "MIT",
@@ -58,6 +58,7 @@ var package_default = {
     "@types/validate-npm-package-name": "^4.0.2",
     abitype: "^0.10.2",
     dotenv: "^16.3.1",
+    rimraf: "^5.0.5",
     tsup: "^8.0.1",
     vitest: "^1.0.2"
   },
@@ -401,12 +402,11 @@ You can update by running: ${pico3.cyan(updateMessage)}
 
 // src/helpers/validate.ts
 import path2 from "path";
-import fs from "fs-extra";
+import { pathExists } from "fs-extra";
 import pico4 from "picocolors";
 import validatePackageName from "validate-npm-package-name";
 async function validateProjectName({
-  projectName,
-  projectPath
+  projectName
 }) {
   const nameValidation = validatePackageName(projectName);
   if (!nameValidation.validForNewPackages) {
@@ -420,11 +420,20 @@ async function validateProjectName({
       problems: problems.map((problem) => `\u{1F449} ${problem}`).join("\n")
     };
   }
-  const targetPath = path2.join(process.cwd(), projectPath);
-  if (await fs.pathExists(targetPath))
+  return {
+    valid: true
+  };
+}
+async function validateProjectPath({
+  projectPath
+}) {
+  if (await pathExists(projectPath))
     return {
       valid: false,
-      message: `\u{1F648} the directory "${projectPath}" already exists.`,
+      message: `\u{1F648} the directory "${path2.relative(
+        process.cwd(),
+        projectPath
+      )}" already exists.`,
       problems: "\u{1F449} choose another name or delete the directory."
     };
   return {
@@ -695,8 +704,13 @@ async function run({
   let projectPath;
   if (args[0]) {
     projectPath = args[0].trim();
-    const splitPath = projectPath.split("/");
+    if (!path4.isAbsolute(projectPath))
+      projectPath = path4.resolve(projectPath);
+    const splitPath = projectPath.split(path4.sep);
     projectName = splitPath[splitPath.length - 1]?.trim() || "";
+    const nameValidation = await validateProjectName({ projectName });
+    if (!nameValidation.valid)
+      throw new ValidationError(nameValidation);
     log2(pico5.green("\u2714"), pico5.bold("Using project name:"), projectName);
   } else {
     const res = await prompts({
@@ -705,24 +719,19 @@ async function run({
       message: "What's the name of your project?",
       type: "text",
       async validate(projectName2) {
-        const validation = await validateProjectName({
-          projectName: projectName2,
-          projectPath: projectName2
-        });
+        const validation = await validateProjectName({ projectName: projectName2 });
         if (!validation.valid)
           return validation.message;
         return true;
       }
     });
     projectName = res.projectName?.trim();
-    projectPath = projectName;
+    projectPath = path4.resolve(projectName);
   }
-  const nameValidation = await validateProjectName({
-    projectName,
-    projectPath
-  });
-  if (!nameValidation.valid)
-    throw new ValidationError(nameValidation);
+  const pathValidation = await validateProjectPath({ projectPath });
+  if (!pathValidation.valid)
+    throw new ValidationError(pathValidation);
+  mkdirSync3(projectPath, { recursive: true });
   if (options.etherscan && !templateId)
     templateId = "etherscan";
   if (options.subgraph && !templateId)
@@ -748,7 +757,6 @@ async function run({
   if (!templateValidation.valid)
     throw new ValidationError(templateValidation);
   let config;
-  const targetPath = path4.join(process.cwd(), projectPath);
   let url = options.etherscan;
   if (templateMeta.id === "etherscan") {
     if (!url) {
@@ -782,7 +790,7 @@ async function run({
     const host = new URL(url).host;
     const result = await oraPromise(
       fromEtherscan({
-        rootDir: targetPath,
+        rootDir: projectPath,
         etherscanLink: url,
         etherscanApiKey: options.etherscanApiKey
       }),
@@ -799,7 +807,7 @@ async function run({
   }
   if (templateMeta.id === "subgraph") {
     const result = await oraPromise(
-      fromSubgraphId({ rootDir: targetPath, subgraphId: subgraph }),
+      fromSubgraphId({ rootDir: projectPath, subgraphId: subgraph }),
       {
         text: "Fetching subgraph metadata. This may take a few seconds.",
         failText: "Failed to fetch subgraph metadata.",
@@ -810,7 +818,7 @@ async function run({
     warnings.push(...result.warnings);
   }
   const templatePath = path4.join(templatesPath, templateMeta.id);
-  await cpy(path4.join(templatePath, "**", "*"), targetPath, {
+  await cpy(path4.join(templatePath, "**", "*"), projectPath, {
     rename: (name) => name.replace(/^_dot_/, ".")
   });
   if (config) {
@@ -847,7 +855,7 @@ async function run({
       });
     `;
     writeFileSync3(
-      path4.join(targetPath, "ponder.config.ts"),
+      path4.join(projectPath, "ponder.config.ts"),
       await prettier3.format(configContent, { parser: "typescript" })
     );
     for (const [name, contract] of Object.entries(config.contracts)) {
@@ -867,19 +875,19 @@ async function run({
       ).join("\n")}
     `;
       writeFileSync3(
-        path4.join(targetPath, `./src/${name}.ts`),
+        path4.join(projectPath, "src", `${name}.ts`),
         await prettier3.format(indexingFunctionFileContents, {
           parser: "typescript"
         })
       );
     }
   }
-  const packageJson = await fs2.readJSON(path4.join(targetPath, "package.json"));
+  const packageJson = await fs.readJSON(path4.join(projectPath, "package.json"));
   packageJson.name = projectName;
   packageJson.dependencies["@ponder/core"] = `^${package_default.version}`;
   packageJson.devDependencies["eslint-config-ponder"] = `^${package_default.version}`;
-  await fs2.writeFile(
-    path4.join(targetPath, "package.json"),
+  await fs.writeFile(
+    path4.join(projectPath, "package.json"),
     JSON.stringify(packageJson, null, 2)
   );
   const packageManager = getPackageManager({ options });
@@ -889,7 +897,7 @@ async function run({
   ];
   await oraPromise(
     execa(packageManager, installArgs, {
-      cwd: targetPath,
+      cwd: projectPath,
       env: {
         ...process.env,
         ADBLOCK: "1",
@@ -910,8 +918,8 @@ async function run({
   if (!options.skipGit) {
     await oraPromise(
       async () => {
-        await execa("git", ["init"], { cwd: targetPath });
-        await execa("git", ["add", "."], { cwd: targetPath });
+        await execa("git", ["init"], { cwd: projectPath });
+        await execa("git", ["add", "."], { cwd: projectPath });
         await execa(
           "git",
           [
@@ -920,7 +928,7 @@ async function run({
             "--message",
             "chore: initial commit from create-ponder"
           ],
-          { cwd: targetPath }
+          { cwd: projectPath }
         );
       },
       {
@@ -945,7 +953,7 @@ async function run({
   log2();
   log2(
     `To start your app, run ${pico5.bold(
-      pico5.cyan(`cd ${projectPath}`)
+      pico5.cyan(`cd ${path4.relative(process.cwd(), projectPath)}`)
     )} and then ${pico5.bold(
       pico5.cyan(
         `${packageManager}${packageManager === "npm" || packageManager === "bun" ? " run" : ""} dev`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ponder",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "type": "module",
   "description": "A CLI tool to create Ponder apps",
   "license": "MIT",
@@ -37,6 +37,7 @@
     "@types/validate-npm-package-name": "^4.0.2",
     "abitype": "^0.10.2",
     "dotenv": "^16.3.1",
+    "rimraf": "^5.0.5",
     "tsup": "^8.0.1",
     "vitest": "^1.0.2"
   },