squashing bugs: more clearly distinguish between when we're asking for the org, when we're asking for the base name of the package, and when we're asking for the fully qualified package name

also, bump the manifest version in create-neon so it recognizes prefixes

Author: dherman

package-lock.json

@@ -1,6 +1,6 @@
 
 {
-  "name": "{{options.name}}",
+  "name": "{{options.fullName}}",
   "version": "{{options.version}}",
   "main": "index.node",
   "scripts": {},

pkgs/create-neon/data/templates/manifest/base/default.json.hbs

@@ -1,6 +1,6 @@
 
 {
-  "name": "{{options.name}}",
+  "name": "{{options.fullName}}",
   "version": "{{options.version}}",
 {{#eq options.library.module compare="esm"}}
   "exports": {

pkgs/create-neon/data/templates/manifest/base/library.json.hbs

@@ -48,7 +48,7 @@
     "typescript": "^5.3.2"
   },
   "dependencies": {
-    "@neon-rs/manifest": "^0.1.0",
+    "@neon-rs/manifest": "^0.2.1",
     "chalk": "^5.3.0",
     "command-line-args": "^5.2.1",
     "command-line-usage": "^7.0.1",

pkgs/create-neon/package.json

@@ -40,12 +40,13 @@ try {
   }
 
   const [pkg] = opts._unknown;
-  const { org, name } = /^(@(?<org>[^/]+)\/)?(?<name>.*)/.exec(pkg)?.groups as {
+  const { org, basename } = /^((?<org>@[^/]+)\/)?(?<basename>.*)/.exec(pkg)?.groups as {
     org: string;
-    name: string;
+    basename: string;
   };
+  const fullName = org ? `${org}/${basename}` : basename;
   const platforms = parsePlatforms(opts.platform);
-  const cache = parseCache(opts.lib, opts.bins, name, org);
+  const cache = parseCache(opts.lib, opts.bins, basename, org);
   const ci = parseCI(opts.ci);
 
   if (opts.yes) {
@@ -54,7 +55,8 @@ try {
 
   createNeon({
     org,
-    name,
+    basename,
+    fullName,
     version: "0.1.0",
     library: opts.lib
       ? {
@@ -120,7 +122,7 @@ function parseCache(
   pkg: string,
   org: string | undefined
 ): Cache | undefined {
-  let prefix = org ? `${pkg}-` : "";
+  const defaultPrefix = org ? `${pkg}-` : "";
   org ??= `@${pkg}`;
 
   // CASE: npm create neon -- --app logos-r-us
@@ -140,7 +142,7 @@ function parseCache(
   //   - lib: `@acme/logo-generator`
   //   - bin: `@acme/logo-generator-darwin-arm64`
   if (bins === "none" || bins === "npm") {
-    return new NPM(org, prefix);
+    return new NPM(org, defaultPrefix);
   }
 
   // CASE: npm create neon -- --lib --bins=npm:acme logo-generator
@@ -156,8 +158,9 @@ function parseCache(
   //   bin: @acme-libs/logo-generator-darwin-arm64
   if (bins.startsWith("npm:")) {
     const split = bins.substring(4).split("/", 2);
-
-    return new NPM(split[0], split.length > 1 ? split[1] : prefix);
+    const org = split[0].replace(/^@?/, '@'); // don't care if they include the @ or not
+    const prefix = split.length > 1 ? split[1] : defaultPrefix;
+    return new NPM(org, prefix);
   }
 
   throw new Error(

pkgs/create-neon/src/bin/create-neon.ts

@@ -30,7 +30,8 @@ export type LibraryOptions = {
 
 export type ProjectOptions = {
   org?: string | undefined;
-  name: string;
+  basename: string;
+  fullName: string;
   version: string;
   library: LibraryOptions | null;
   app: boolean | null;
@@ -65,12 +66,12 @@ export abstract class Creator {
   async create(cx: Context): Promise<void> {
     try {
       this._temp = await mktemp();
-      this._tempPkg = path.join(this._temp, this._options.name);
+      this._tempPkg = path.join(this._temp, this._options.basename);
 
       await fs.mkdir(this._tempPkg);
     } catch (err: any) {
       await die(
-        `Could not create \`${this._options.name}\`: ${err.message}`,
+        `Could not create \`${this._options.basename}\`: ${err.message}`,
         this._temp
       );
     }
@@ -123,11 +124,11 @@ export abstract class Creator {
     await this.createNeonBoilerplate(cx);
 
     try {
-      await fs.rename(this._tempPkg, this._options.name);
+      await fs.rename(this._tempPkg, this._options.basename);
       await fs.rmdir(this._temp);
     } catch (err: any) {
       await die(
-        `Could not create \`${this._options.name}\`: ${err.message}`,
+        `Could not create \`${this._options.basename}\`: ${err.message}`,
         this._tempPkg
       );
     }

pkgs/create-neon/src/create/creator.ts

@@ -58,21 +58,21 @@ async function askProjectType(options: ProjectOptions) {
 
     const org =
       cache === "npm"
-        ? await dialog.ask({
+        ? (await dialog.ask({
             prompt: "cache org",
             parse: (v: string): string => v,
-            default: `@${options.org ?? options.name}`,
-          })
+            default: `@${options.org ?? options.basename}`,
+          })).replace(/^@?/, "@") // don't care if they include the @ or not
         : null;
 
     const prefix =
-      cache === "npm" && org === `@${options.name}`
+      cache === "npm" && org === `@${options.basename}`
         ? ""
         : cache === "npm"
         ? await dialog.ask({
             prompt: "cache prefix",
             parse: (v: string): string => v,
-            default: `${options.name}-`,
+            default: `${options.basename}-`,
           })
         : null;
 
@@ -99,9 +99,9 @@ async function askProjectType(options: ProjectOptions) {
 
 export async function createNeon(options: ProjectOptions): Promise<void> {
   try {
-    await assertCanMkdir(options.name);
+    await assertCanMkdir(options.basename);
   } catch (err: any) {
-    await die(`Could not create \`${options.name}\`: ${err.message}`);
+    await die(`Could not create \`${options.basename}\`: ${err.message}`);
   }
 
   const cx = new Context(options);
@@ -124,6 +124,6 @@ export async function createNeon(options: ProjectOptions): Promise<void> {
   await creator.create(cx);
 
   console.log(
-    `✨ Created Neon project \`${options.name}\`. Happy 🦀 hacking! ✨`
+    `✨ Created Neon project \`${options.fullName}\`. Happy 🦀 hacking! ✨`
   );
 }