@npflared/cli 0.0.1 → 0.0.2

package/.turbo/turbo-lint.log

@@ -0,0 +1,29 @@
+
+
+> @npflared/cli@0.0.1 lint /Users/thomascogez--allix/Developer/npflared/apps/cli
+> biome check
+
+/Users/thomascogez--allix/Developer/npflared/apps/cli/package.json format ━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  ✖ Formatter would have printed the following content:
+  
+    11 11 │   		"npflared": "./dist/index.js"
+    12 12 │   	},
+    13    │ - → "keywords":·[
+    14    │ - → → "npm",
+    15    │ - → → "registry",
+    16    │ - → → "npflared"
+    17    │ - → ],
+       13 │ + → "keywords":·["npm",·"registry",·"npflared"],
+    18 14 │   	"license": "ISC",
+    19 15 │   	"devDependencies": {
+  
+
+Checked 9 files in 33ms. No fixes applied.
+Found 1 error.
+check ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  ✖ Some errors were emitted while running checks.
+  
+
+ ELIFECYCLE  Command failed with exit code 1.

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @npflared/cli
 
+## 0.0.2
+
+### Patch Changes
+
+- b31f2c5: Create d1 database name id was not correctly bind in generated wrangler config
+
 ## 0.0.1
 
 ### Patch Changes

package/dist/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import{hideBin as lt}from"yargs/helpers";import mt from"yargs/yargs";import{randomUUID as q}from"node:crypto";import{rmSync as z}from"node:fs";import{mkdir as G,mkdtemp as L,readFile as C,rename as W,writeFile as T}from"node:fs/promises";import{homedir as K,tmpdir as X}from"node:os";import{join as l}from"node:path";import{confirm as A,intro as Y,isCancel as m,log as y,outro as H,select as x,spinner as Q,text as D}from"@clack/prompts";import d from"chalk";import Z from"dedent";import tt from"degit";import{encode as et}from"uuid-b32";import{$ as at}from"zx";import{z as c}from"zod";import{$ as p,ProcessOutput as u}from"zx";var J=c.object({d1_databases:c.array(c.object({binding:c.string(),database_name:c.string(),database_id:c.string()})).min(1)}),U=c.object({r2_buckets:c.array(c.object({binding:c.string(),bucket_name:c.string()})).min(1)}),$=async()=>{try{let e=(await p({quiet:!0})`npx -y wrangler whoami`).stdout.match(/([0-9a-f]{32})/),[a]=e??[];return a}catch(t){throw t instanceof u?new Error(t.stderr||t.stdout):t}},v=async()=>{try{let t=[],a=(await p({quiet:!0})`npx -y wrangler d1 list`).stdout.matchAll(/│(.*)│(.*)│(.*)│(.*)│(.*)│(.*)│/gm);for(let o of a){let[,i,s,r,g,w,f]=o;(i||s||r||g||w||f)&&t.push({id:i.trim(),name:s.trim(),createdAt:r.trim(),version:g.trim(),numberOfTables:Number.parseInt(w),size:Number.parseInt(f)})}return t}catch(t){throw t instanceof u?new Error(t.stderr||t.stdout):t}},N=async()=>{try{let e=(await p({quiet:!0})`npx -y wrangler r2 bucket list`).stdout.matchAll(/name:(.*)\ncreation_date:(.*)/gim),a=[];for(let o of e){let[,i,s]=o;(i||s)&&a.push({name:i.trim(),createdAt:s.trim()})}return a}catch(t){throw t instanceof u?new Error(t.stderr||t.stdout):t}},_=async t=>{try{let a=(await p({quiet:!0})`npx -y wrangler r2 bucket create ${t}`).stdout.match(/\{(?:[^{}]*|\{(?:[^{}]*|\{[^{}]*\})*\})*\}/gim),o=U.safeParse(JSON.parse(a?.[0]??""));if(!o.success)throw new Error("Could not properly retrieve R2 bucket binding");return o.data}catch(e){throw e instanceof u?new Error(e.stderr||e.stdout):e}},R=async t=>{try{let a=(await p({quiet:!0})`npx -y wrangler d1 create ${t}`).stdout.match(/\{(?:[^{}]*|\{(?:[^{}]*|\{[^{}]*\})*\})*\}/gim),o=J.safeParse(JSON.parse(a?.[0]??""));if(!o.success)throw new Error("Could not properly retrieve D1 database binding");return o.data}catch(e){throw e instanceof u?new Error(e.stderr||e.stdout):e}},S=async(t,e={})=>{try{await p({cwd:e.cwd})`npx -y wrangler d1 migrations apply ${t} --remote --config wrangler.json`}catch(a){throw a instanceof u?new Error(a.stderr||a.stdout):a}},B=async(t={})=>{try{let a=(await p({quiet:!0,cwd:t.cwd})`npx -y wrangler deploy --config wrangler.json`).stdout.match(/([a-z0-9-]+\.[a-z0-9-]+\.workers\.dev)/i);return a?`https://${a[0]}`:"<unknown>"}catch(e){throw e instanceof u?new Error(e.stderr||e.stdout):e}};import{access as V}from"node:fs/promises";var b=async t=>{try{return await V(t),!0}catch(e){if(e?.code==="ENOENT")return!1;throw e}};var rt=".npflared",k=l(K(),rt),n=Q(),nt=async()=>{try{await G(k,{recursive:!0})}catch(t){if(t?.code!=="EEXIST")throw t}},ot=async()=>{let t=await A({message:"Use an existing D1 database?"});if(m(t)&&process.exit(1),t){n.start("Retrieving D1 databases...");let i=await v();n.stop();let s=await x({message:"Select a D1 database:",options:i.map(r=>({value:{name:r.name,id:r.id},label:`${r.name.padEnd(30)} (${r.id}) - Created at: ${r.createdAt}`}))});return m(s)&&process.exit(1),{name:s.name,id:s.id}}let e=await D({initialValue:"npflared",message:"Enter a name for your D1 database:",validate(i){if(i.length===0)return"Please enter a name for your D1 database"}});m(e)&&process.exit(1),n.start(`Creating D1 database ${e}...`);let a=await R(e);n.stop();let[o]=a.d1_databases;return o||(console.log(d.red(`Could not create D1 database ${e}`)),process.exit(1)),{name:o.database_id,id:o.database_name}},st=async()=>{let t=await A({message:"Use an existing R2 bucket?"});if(m(t)&&process.exit(1),t){n.start("Retrieving R2 buckets...");let i=await N();n.stop();let s=await x({message:"Select a R2 bucket:",options:i.map(r=>({value:{name:r.name},label:`${r.name.padEnd(30)} - Created at: ${r.createdAt}`}))});return m(s)&&process.exit(1),{name:s.name}}let e=await D({initialValue:"npflared",message:"Enter a name for your R2 bucket:",validate(i){if(i.length===0)return"Please enter a name for your R2 bucket"}});m(e)&&process.exit(1),n.start(`Creating R2 bucket ${e}...`);let a=await _(e);n.stop();let[o]=a.r2_buckets;return o||(console.log(d.red(`Could not create R2 bucket ${e}`)),process.exit(1)),{name:o.bucket_name}},it=async()=>{let t=await x({message:"Install dependencies with:",options:[{value:"npm",label:"npm"},{value:"pnpm",label:"pnpm"},{value:"yarn",label:"yarn"},{value:"bun",label:"bun"}]});return m(t)&&process.exit(1),t},ct=async()=>{let t=await D({initialValue:"npflared",message:"Enter a name for your worker:",validate(e){if(e.length===0)return"Please enter a name for your worker"}});return m(t)&&process.exit(1),t},dt=async t=>{n.start("Generating admin token...");let a=l(t,"migrations","9999_admin-token.sql");if(!await b(a)){let r=et(q()),g=Date.now();return await T(a,`INSERT INTO token (token, name, scopes, created_at, updated_at) VALUES ('${r}', 'admin-token', '[{"type": "token:read+write", "values": ["*"]}, {"type": "user:read+write", "values": ["*"]}, {"type": "package:read+write", "values": ["*"]}]', ${g}, ${g});`),n.stop(`Admin token migration file generated at ${a}`),r}let i=await C(a,"utf-8");return n.stop(`Admin token migration file already exists at ${a}`),i.match(/INSERT INTO token \(token, name, scopes, created_at, updated_at\) VALUES \('([^']+)'/)?.[0]??""},I=async()=>{let t=await L(l(X(),"npflared-")),e=()=>{t&&z(t,{recursive:!0,force:!0})};process.on("exit",e),process.on("SIGINT",e),process.on("SIGTERM",e);try{Y("npflared");let a=tt("Thomascogez/npflared/apps/api");n.start("Cloning npflared..."),await a.clone(t);let o=l(t,"package.json"),s=JSON.parse(await C(o,"utf-8")).version;await nt();let r=l(k,s);await b(r)||await W(t,l(k,s)),n.stop(`Successfully cloned npflared (v${s})`);let w=await ct(),f=await it();n.start(`Installing dependencies using ${f}...`),await at({quiet:!0,cwd:r})`npx -y ${f} install`,n.stop(`Successfully installed dependencies using ${f}`),n.start("Retrieving Cloudflare account id...");let E=await $();n.stop(),E?y.info(d.green(`Using cloudflare account id: ${d.bold.white(E)}`)):(y.error(d.red(`Could not retrieve Cloudflare account id, please login with ${d.bold.white("wrangler login")}`)),process.exit(1));let h=await ot(),P=await st();n.start("Generating wrangler configuration...");let O={name:w,main:"src/index.ts",compatibility_date:"2024-11-24",compatibility_flags:["nodejs_compat"],d1_databases:[{binding:"DB",database_name:h.name,database_id:h.id}],r2_buckets:[{binding:"BUCKET",bucket_name:P.name}]},j=l(r,"wrangler.json");await T(l(r,"wrangler.json"),JSON.stringify(O,null,2)),n.stop(`Wrangler configuration generated at ${j}`);let M=await dt(r);n.start("Applying D1 migrations..."),await S(h.name,{cwd:r}),n.stop("Successfully applied D1 migrations"),n.start("Deploying...");let F=await B({cwd:r});n.stop(),y.info(d.green(Z`
+import{hideBin as lt}from"yargs/helpers";import mt from"yargs/yargs";import{randomUUID as q}from"node:crypto";import{rmSync as z}from"node:fs";import{mkdir as G,mkdtemp as L,readFile as C,rename as W,writeFile as T}from"node:fs/promises";import{homedir as K,tmpdir as X}from"node:os";import{join as l}from"node:path";import{confirm as A,intro as Y,isCancel as m,log as y,outro as H,select as x,spinner as Q,text as D}from"@clack/prompts";import d from"chalk";import Z from"dedent";import tt from"degit";import{encode as et}from"uuid-b32";import{$ as at}from"zx";import{z as c}from"zod";import{$ as p,ProcessOutput as u}from"zx";var J=c.object({d1_databases:c.array(c.object({binding:c.string(),database_name:c.string(),database_id:c.string()})).min(1)}),U=c.object({r2_buckets:c.array(c.object({binding:c.string(),bucket_name:c.string()})).min(1)}),$=async()=>{try{let e=(await p({quiet:!0})`npx -y wrangler whoami`).stdout.match(/([0-9a-f]{32})/),[a]=e??[];return a}catch(t){throw t instanceof u?new Error(t.stderr||t.stdout):t}},v=async()=>{try{let t=[],a=(await p({quiet:!0})`npx -y wrangler d1 list`).stdout.matchAll(/│(.*)│(.*)│(.*)│(.*)│(.*)│(.*)│/gm);for(let o of a){let[,i,s,r,g,w,f]=o;(i||s||r||g||w||f)&&t.push({id:i.trim(),name:s.trim(),createdAt:r.trim(),version:g.trim(),numberOfTables:Number.parseInt(w),size:Number.parseInt(f)})}return t}catch(t){throw t instanceof u?new Error(t.stderr||t.stdout):t}},N=async()=>{try{let e=(await p({quiet:!0})`npx -y wrangler r2 bucket list`).stdout.matchAll(/name:(.*)\ncreation_date:(.*)/gim),a=[];for(let o of e){let[,i,s]=o;(i||s)&&a.push({name:i.trim(),createdAt:s.trim()})}return a}catch(t){throw t instanceof u?new Error(t.stderr||t.stdout):t}},_=async t=>{try{let a=(await p({quiet:!0})`npx -y wrangler r2 bucket create ${t}`).stdout.match(/\{(?:[^{}]*|\{(?:[^{}]*|\{[^{}]*\})*\})*\}/gim),o=U.safeParse(JSON.parse(a?.[0]??""));if(!o.success)throw new Error("Could not properly retrieve R2 bucket binding");return o.data}catch(e){throw e instanceof u?new Error(e.stderr||e.stdout):e}},R=async t=>{try{let a=(await p({quiet:!0})`npx -y wrangler d1 create ${t}`).stdout.match(/\{(?:[^{}]*|\{(?:[^{}]*|\{[^{}]*\})*\})*\}/gim),o=J.safeParse(JSON.parse(a?.[0]??""));if(!o.success)throw new Error("Could not properly retrieve D1 database binding");return o.data}catch(e){throw e instanceof u?new Error(e.stderr||e.stdout):e}},S=async(t,e={})=>{try{await p({cwd:e.cwd})`npx -y wrangler d1 migrations apply ${t} --remote --config wrangler.json`}catch(a){throw a instanceof u?new Error(a.stderr||a.stdout):a}},B=async(t={})=>{try{let a=(await p({quiet:!0,cwd:t.cwd})`npx -y wrangler deploy --config wrangler.json`).stdout.match(/([a-z0-9-]+\.[a-z0-9-]+\.workers\.dev)/i);return a?`https://${a[0]}`:"<unknown>"}catch(e){throw e instanceof u?new Error(e.stderr||e.stdout):e}};import{access as V}from"node:fs/promises";var b=async t=>{try{return await V(t),!0}catch(e){if(e?.code==="ENOENT")return!1;throw e}};var rt=".npflared",k=l(K(),rt),n=Q(),nt=async()=>{try{await G(k,{recursive:!0})}catch(t){if(t?.code!=="EEXIST")throw t}},ot=async()=>{let t=await A({message:"Use an existing D1 database?"});if(m(t)&&process.exit(1),t){n.start("Retrieving D1 databases...");let i=await v();n.stop();let s=await x({message:"Select a D1 database:",options:i.map(r=>({value:{name:r.name,id:r.id},label:`${r.name.padEnd(30)} (${r.id}) - Created at: ${r.createdAt}`}))});return m(s)&&process.exit(1),{name:s.name,id:s.id}}let e=await D({initialValue:"npflared",message:"Enter a name for your D1 database:",validate(i){if(i.length===0)return"Please enter a name for your D1 database"}});m(e)&&process.exit(1),n.start(`Creating D1 database ${e}...`);let a=await R(e);n.stop();let[o]=a.d1_databases;return o||(console.log(d.red(`Could not create D1 database ${e}`)),process.exit(1)),{name:o.database_name,id:o.database_id}},st=async()=>{let t=await A({message:"Use an existing R2 bucket?"});if(m(t)&&process.exit(1),t){n.start("Retrieving R2 buckets...");let i=await N();n.stop();let s=await x({message:"Select a R2 bucket:",options:i.map(r=>({value:{name:r.name},label:`${r.name.padEnd(30)} - Created at: ${r.createdAt}`}))});return m(s)&&process.exit(1),{name:s.name}}let e=await D({initialValue:"npflared",message:"Enter a name for your R2 bucket:",validate(i){if(i.length===0)return"Please enter a name for your R2 bucket"}});m(e)&&process.exit(1),n.start(`Creating R2 bucket ${e}...`);let a=await _(e);n.stop();let[o]=a.r2_buckets;return o||(console.log(d.red(`Could not create R2 bucket ${e}`)),process.exit(1)),{name:o.bucket_name}},it=async()=>{let t=await x({message:"Install dependencies with:",options:[{value:"npm",label:"npm"},{value:"pnpm",label:"pnpm"},{value:"yarn",label:"yarn"},{value:"bun",label:"bun"}]});return m(t)&&process.exit(1),t},ct=async()=>{let t=await D({initialValue:"npflared",message:"Enter a name for your worker:",validate(e){if(e.length===0)return"Please enter a name for your worker"}});return m(t)&&process.exit(1),t},dt=async t=>{n.start("Generating admin token...");let a=l(t,"migrations","9999_admin-token.sql");if(!await b(a)){let r=et(q()),g=Date.now();return await T(a,`INSERT INTO token (token, name, scopes, created_at, updated_at) VALUES ('${r}', 'admin-token', '[{"type": "token:read+write", "values": ["*"]}, {"type": "user:read+write", "values": ["*"]}, {"type": "package:read+write", "values": ["*"]}]', ${g}, ${g});`),n.stop(`Admin token migration file generated at ${a}`),r}let i=await C(a,"utf-8");return n.stop(`Admin token migration file already exists at ${a}`),i.match(/INSERT INTO token \(token, name, scopes, created_at, updated_at\) VALUES \('([^']+)'/)?.[0]??""},I=async()=>{let t=await L(l(X(),"npflared-")),e=()=>{t&&z(t,{recursive:!0,force:!0})};process.on("exit",e),process.on("SIGINT",e),process.on("SIGTERM",e);try{Y("npflared");let a=tt("Thomascogez/npflared/apps/api");n.start("Cloning npflared..."),await a.clone(t);let o=l(t,"package.json"),s=JSON.parse(await C(o,"utf-8")).version;await nt();let r=l(k,s);await b(r)||await W(t,l(k,s)),n.stop(`Successfully cloned npflared (v${s})`);let w=await ct(),f=await it();n.start(`Installing dependencies using ${f}...`),await at({quiet:!0,cwd:r})`npx -y ${f} install`,n.stop(`Successfully installed dependencies using ${f}`),n.start("Retrieving Cloudflare account id...");let E=await $();n.stop(),E?y.info(d.green(`Using cloudflare account id: ${d.bold.white(E)}`)):(y.error(d.red(`Could not retrieve Cloudflare account id, please login with ${d.bold.white("wrangler login")}`)),process.exit(1));let h=await ot(),P=await st();n.start("Generating wrangler configuration...");let O={name:w,main:"src/index.ts",compatibility_date:"2024-11-24",compatibility_flags:["nodejs_compat"],d1_databases:[{binding:"DB",database_name:h.name,database_id:h.id}],r2_buckets:[{binding:"BUCKET",bucket_name:P.name}]},j=l(r,"wrangler.json");await T(l(r,"wrangler.json"),JSON.stringify(O,null,2)),n.stop(`Wrangler configuration generated at ${j}`);let M=await dt(r);n.start("Applying D1 migrations..."),await S(h.name,{cwd:r}),n.stop("Successfully applied D1 migrations"),n.start("Deploying...");let F=await B({cwd:r});n.stop(),y.info(d.green(Z`
 			🔥 npflared is now ready to use!
 			🔗 Deployed to: ${d.bold.white(F)}
 			👮 Admin token: ${d.bold.white(M)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npflared/cli",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "type": "module",
   "bin": {
     "npflared": "./dist/index.js"

package/src/commands/install.ts

@@ -88,7 +88,7 @@ const promptD1Database = async (): Promise<{ name: string; id: string }> => {
 		process.exit(1);
 	}
 
-	return { name: d1Binding.database_id, id: d1Binding.database_name };
+	return { name: d1Binding.database_name, id: d1Binding.database_id };
 };
 
 const promptR2Bucket = async (): Promise<{ name: string }> => {