rpc4next-cli 0.1.3 → 0.1.5

package/dist/index.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
-import{Command as jt}from"commander";import $t from"path";var A=["page.tsx","route.ts"],O=0,P=1,F=1,w=20,W="\u2192";import M from"path";var Z=(t,r)=>{let e=x(M.relative(M.dirname(t),r)).replace(/\.tsx?$/,"");return e.startsWith("../")||(e="./"+e),e},x=t=>t.replace(/\\/g,"/"),_=t=>M.relative(process.cwd(),t);import yt from"fs";import Yt from"path";var tt=["Query"];var Y="Endpoint",U="QueryKey",j="ParamsKey",et=[Y,j,U],rt="rpc4next/client";import lt from"fs";import v from"path";import{CATCH_ALL_PREFIX as Dt,DYNAMIC_PREFIX as Ot,HTTP_METHODS_EXCLUDE_OPTIONS as Ft,OPTIONAL_CATCH_ALL_PREFIX as wt}from"rpc4next-shared";import H from"path";var E=new Map,C=new Map,ot=(t,r)=>{let e=H.resolve(r);[...t.keys()].forEach(o=>{let n=H.resolve(o);(n===e||e.startsWith(n+H.sep))&&t.delete(o)})},nt=t=>{ot(E,t)},st=t=>{ot(C,t)};import vt from"fs";import Lt from"crypto";var it=(t,r)=>{let e=Lt.createHash("md5").update(`${t}::${r}`).digest("hex").slice(0,16);return`${r}_${e}`};var R=(t,r)=>!t||!r?"":`Record<${t}, ${r}>`,b=t=>t.length===0||t.some(({name:r,type:e})=>!r||!e)?"":`{ ${t.map(({name:r,type:e})=>`"${r}": ${e}`).join(`${";"} `)}${t.length>1?";":""} }`,L=(t,r,e)=>!t||!r?"":e?`import type { ${t} as ${e} } from "${r}"${";"}`:`import type { ${t} } from "${r}"${";"}`;var pt=(t,r,e,o)=>{let n=vt.readFileSync(r,"utf8"),i=e(n);if(!i)return;let s=Z(t,r),p=it(s,i);return{importName:p,importPath:s,importStatement:L(i,s,p),type:o(i,p)}},ct=(t,r)=>pt(t,r,e=>tt.find(o=>new RegExp(`export (interface ${o} ?{|type ${o} ?=)`).test(e)),(e,o)=>R(U,o)),mt=(t,r,e)=>pt(t,r,o=>[e].find(n=>new RegExp(`export (async )?(function ${n} ?\\(|const ${n} ?=|\\{[^}]*\\b${n}\\b[^}]*\\} ?=|const \\{[^}]*\\b${n}\\b[^}]*\\} ?=|\\{[^}]*\\b${n}\\b[^}]*\\} from)`).test(o)),(o,n)=>b([{name:`$${o.toLowerCase()}`,type:`typeof ${n}`}]));var ut=new Set(A),ft=t=>{if(E.has(t))return E.get(t);let r=lt.readdirSync(t,{withFileTypes:!0});for(let e of r){let{name:o}=e,n=v.join(t,o);if(o==="node_modules"||o.startsWith("_")||o.startsWith("(.)")||o.startsWith("(..)")||o.startsWith("(...)"))return E.set(t,!1),!1;if(e.isFile()&&ut.has(o))return E.set(t,!0),!0;if(e.isDirectory()&&ft(n))return E.set(t,!0),!0}return E.set(t,!1),!1},Wt=(t,{isDynamic:r,isCatchAll:e,isOptionalCatchAll:o})=>{let n=t;return r&&(n=n.replace(/^\[+|\]+$/g,"")),(e||o)&&(n=n.replace(/^\.{3}/,"")),{paramName:n,keyName:`${o?wt:e?Dt:r?Ot:""}${n}`}},X=(t,r,e="",o=[])=>{if(C.has(r))return C.get(r);let n=e,i=e+"  ",s=[],p=[],a=[],m=[],c=[...o],$=lt.readdirSync(r,{withFileTypes:!0}).filter(y=>{if(y.isDirectory()){let S=v.join(r,y.name);return ft(S)}return ut.has(y.name)}).sort();for(let y of $){let S=x(v.join(r,y.name));if(y.isDirectory()){let l=y.name,h=l.startsWith("(")&&l.endsWith(")"),u=l.startsWith("@"),f=l.startsWith("[[...")&&l.endsWith("]]"),g=l.startsWith("[...")&&l.endsWith("]"),d=l.startsWith("[")&&l.endsWith("]"),{paramName:Nt,keyName:It}=Wt(l,{isDynamic:d,isCatchAll:g,isOptionalCatchAll:f}),At=d||g||f?[...c,{paramName:Nt,routeType:{isDynamic:d,isCatchAll:g,isOptionalCatchAll:f,isGroup:h,isParallel:u}}]:c,q=h||u,{pathStructure:z,imports:Rt,paramsTypes:bt}=X(t,S,q?n:i,At);if(p.push(...Rt),m.push(...bt),q){let J=z.match(/^\s*\{([\s\S]*)\}\s*$/);J&&s.push(`${i}${J[1].trim()}`)}else s.push(`${i}"${It}": ${z}`)}else{let l=ct(t,S);if(l){let{importStatement:h,importPath:u,type:f}=l;p.push({statement:h,path:u}),a.push(f)}if(Ft.forEach(h=>{let u=mt(t,S,h);if(u){let{importStatement:f,importPath:g,type:d}=u;p.push({statement:f,path:g}),a.push(d)}}),a.push(Y),c.length>0){let h=c.map(({paramName:f,routeType:g})=>{let d=g.isCatchAll?"string[]":g.isOptionalCatchAll?"string[] | undefined":"string";return{name:f,type:d}}),u=b(h);m.push({paramsType:u,dirPath:v.dirname(S)}),a.push(R(j,u))}}}let I=a.join(" & "),D=s.length>0?`{${`
+import{Command as Ht}from"commander";import Pt from"path";var A=["page.tsx","route.ts"],w=0,P=1,F=1,W=20,M="\u2192";import Y from"path";var tt=(t,r)=>{let e=x(Y.relative(Y.dirname(t),r)).replace(/\.tsx?$/,"");return e.startsWith("../")||(e="./"+e),e},x=t=>t.replace(/\\/g,"/"),_=t=>Y.relative(process.cwd(),t);import yt from"fs";import Ut from"path";var et=["Query"];var U="Endpoint",j="QueryKey",H="ParamsKey",rt=[U,H,j],ot="rpc4next/client";import ut from"fs";import v from"path";import{CATCH_ALL_PREFIX as Ot,DYNAMIC_PREFIX as wt,HTTP_METHODS_EXCLUDE_OPTIONS as Ft,OPTIONAL_CATCH_ALL_PREFIX as Wt}from"rpc4next-shared";import G from"path";var E=new Map,C=new Map,nt=(t,r)=>{let e=G.resolve(r);[...t.keys()].forEach(o=>{let n=G.resolve(o);(n===e||e.startsWith(n+G.sep))&&t.delete(o)})},st=t=>{nt(E,t)},it=t=>{nt(C,t)};import Dt from"fs";import vt from"crypto";var at=(t,r)=>{let e=vt.createHash("md5").update(`${t}::${r}`).digest("hex").slice(0,16);return`${r}_${e}`};var R=(t,r)=>!t||!r?"":`Record<${t}, ${r}>`,b=t=>t.length===0||t.some(({name:r,type:e})=>!r||!e)?"":`{ ${t.map(({name:r,type:e})=>`"${r}": ${e}`).join(`${";"} `)}${t.length>1?";":""} }`,L=(t,r,e)=>!t||!r?"":e?`import type { ${t} as ${e} } from "${r}"${";"}`:`import type { ${t} } from "${r}"${";"}`;var ct=(t,r,e,o)=>{let n=Dt.readFileSync(r,"utf8"),i=e(n);if(!i)return;let s=tt(t,r),p=at(s,i);return{importName:p,importPath:s,importStatement:L(i,s,p),type:o(i,p)}},mt=(t,r)=>ct(t,r,e=>et.find(o=>new RegExp(`export (interface ${o} ?{|type ${o} ?=)`).test(e)),(e,o)=>R(j,o)),lt=(t,r,e)=>ct(t,r,o=>[e].find(n=>new RegExp(`export (async )?(function ${n} ?\\(|const ${n} ?=|\\{[^}]*\\b${n}\\b[^}]*\\} ?=|const \\{[^}]*\\b${n}\\b[^}]*\\} ?=|\\{[^}]*\\b${n}\\b[^}]*\\} from)`).test(o)),(o,n)=>b([{name:`$${o.toLowerCase()}`,type:`typeof ${n}`}]));var ft=new Set(A),ht=t=>{if(E.has(t))return E.get(t);let r=ut.readdirSync(t,{withFileTypes:!0});for(let e of r){let{name:o}=e,n=v.join(t,o);if(o==="node_modules"||o.startsWith("_")||o.startsWith("(.)")||o.startsWith("(..)")||o.startsWith("(...)"))return E.set(t,!1),!1;if(e.isFile()&&ft.has(o))return E.set(t,!0),!0;if(e.isDirectory()&&ht(n))return E.set(t,!0),!0}return E.set(t,!1),!1},Mt=(t,{isDynamic:r,isCatchAll:e,isOptionalCatchAll:o})=>{let n=t;return r&&(n=n.replace(/^\[+|\]+$/g,"")),(e||o)&&(n=n.replace(/^\.{3}/,"")),{paramName:n,keyName:`${o?Wt:e?Ot:r?wt:""}${n}`}},k=(t,r,e="",o=[])=>{if(C.has(r))return C.get(r);let n=e,i=e+"  ",s=[],p=[],a=[],m=[],c=[...o],$=ut.readdirSync(r,{withFileTypes:!0}).filter(d=>{if(d.isDirectory()){let y=v.join(r,d.name);return ht(y)}return ft.has(d.name)}).sort();for(let d of $){let y=x(v.join(r,d.name));if(d.isDirectory()){let l=d.name,h=l.startsWith("(")&&l.endsWith(")"),u=l.startsWith("@"),f=l.startsWith("[[...")&&l.endsWith("]]"),g=l.startsWith("[...")&&l.endsWith("]"),S=l.startsWith("[")&&l.endsWith("]"),{paramName:It,keyName:At}=Mt(l,{isDynamic:S,isCatchAll:g,isOptionalCatchAll:f}),Rt=S||g||f?[...c,{paramName:It,routeType:{isDynamic:S,isCatchAll:g,isOptionalCatchAll:f,isGroup:h,isParallel:u}}]:c,z=h||u,{pathStructure:O,imports:bt,paramsTypes:Lt}=k(t,y,z?n:i,Rt);if(p.push(...bt),m.push(...Lt),z){let J=O.match(/^\s*\{([\s\S]*)\}\s*$/),Z=O.trim();if(J)s.push(`${i}${J[1].trim()}`);else if(Z)a.push(Z);else throw new Error(`Invalid empty child path structure in grouped/parallel route: ${y}`)}else s.push(`${i}"${At}": ${O}`)}else{let l=mt(t,y);if(l){let{importStatement:h,importPath:u,type:f}=l;p.push({statement:h,path:u}),a.push(f)}if(Ft.forEach(h=>{let u=lt(t,y,h);if(u){let{importStatement:f,importPath:g,type:S}=u;p.push({statement:f,path:g}),a.push(S)}}),a.push(U),c.length>0){let h=c.map(({paramName:f,routeType:g})=>{let S=g.isCatchAll?"string[]":g.isOptionalCatchAll?"string[] | undefined":"string";return{name:f,type:S}}),u=b(h);m.push({paramsType:u,dirPath:v.dirname(y)}),a.push(R(H,u))}}}let I=a.join(" & "),D=s.length>0?`{${`
 `}${s.join(`,${`
 `}`)}${`
-`}${n}}`:"",V={pathStructure:I&&D?`${I} & ${D}`:I||D,imports:p,paramsTypes:m};return C.set(r,V),V};var ht=(t,r)=>{let{pathStructure:e,imports:o,paramsTypes:n}=X(t,r),i=`export type PathStructure = ${e}${";"}`,s=o.length?`${o.sort((c,$)=>c.path.localeCompare($.path,void 0,{numeric:!0})).map(c=>c.statement).join(`
-`)}`:"",p=et.filter(c=>e.includes(c)),a=L(p.join(" ,"),rt),m=n.map(({paramsType:c,dirPath:$})=>({paramsType:`export type Params = ${c}${";"}`,dirPath:$}));return{pathStructure:`${a}${`
+`}${n}}`:"",q={pathStructure:I&&D?`${I} & ${D}`:I||D,imports:p,paramsTypes:m};return C.set(r,q),q};var gt=(t,r)=>{let{pathStructure:e,imports:o,paramsTypes:n}=k(t,r),i=`export type PathStructure = ${e}${";"}`,s=o.length?`${o.sort((c,$)=>c.path.localeCompare($.path,void 0,{numeric:!0})).map(c=>c.statement).join(`
+`)}`:"",p=rt.filter(c=>e.includes(c)),a=L(p.join(" ,"),ot),m=n.map(({paramsType:c,dirPath:$})=>({paramsType:`export type Params = ${c}${";"}`,dirPath:$}));return{pathStructure:`${a}${`
 `}${s}${`
 `}${`
-`}${i}`,paramsTypes:m}};var Mt=()=>!!process.stdout?.isTTY;var k=t=>r=>Mt()?`\x1B[${t}m${r}\x1B[0m`:r,gt=k(36),Et=k(32),K=k(31);var B=(t,r,e="\u2192",o=24)=>t.padEnd(o)+` ${e} ${r}`,Q=(t=0)=>"  ".repeat(t),Tt=()=>({info:(t,r={})=>{let{indentLevel:e=0,event:o}=r,n=o?`${gt(`[${o}]`)} `:"";console.log(`${Q(e)}${n}${t}`)},success:(t,r={})=>{let{indentLevel:e=0}=r;console.log(`${Q(e)}${Et("\u2713")} ${t}`)},error:(t,r={})=>{let{indentLevel:e=0}=r;console.error(`${Q(e)}${K("\u2717")} ${K(t)}`)}});var dt=({baseDir:t,outputPath:r,paramsFileName:e,logger:o})=>{o.info("Generating types...",{event:"generate"});let{pathStructure:n,paramsTypes:i}=ht(r,t);yt.writeFileSync(r,n),o.success(B("Path structure type",_(r),W,w),{indentLevel:F}),e&&(i.forEach(({paramsType:s,dirPath:p})=>{let a=Yt.join(p,e);yt.writeFileSync(a,s)}),o.success(B("Params types",e,W,w),{indentLevel:F}))};import Ut from"chokidar";var St=(t,r)=>{let e=null,o=!1,n=null,i=async(...s)=>{o=!0;try{await t(...s)}finally{if(o=!1,n){let p=n;n=null,i(...p)}}};return(...s)=>{e&&clearTimeout(e),e=setTimeout(()=>{if(o){n=s;return}i(...s)},r)}};var xt=(t,r,e)=>{e.info(`${_(t)}`,{event:"watch"});let o=a=>A.some(m=>a.endsWith(m)),n=new Set,i=St(()=>{n.forEach(a=>{nt(a),st(a)}),n.clear(),r()},300),s=Ut.watch(t,{ignoreInitial:!0,ignored:(a,m)=>!!m?.isFile()&&!o(a)});s.on("ready",()=>{i(),s.on("all",(a,m)=>{if(o(m)){let c=_(m);e.info(c,{event:a}),n.add(m),i()}})}),s.on("error",a=>{a instanceof Error?e.error(`Watcher error: ${a.message}`):e.error(`Unknown watcher error: ${String(a)}`)});let p=()=>{s.close().then(()=>{e.info("Watcher closed.",{event:"watch"})}).catch(a=>{e.error(`Failed to close watcher: ${a.message}`)})};process.on("SIGINT",p),process.on("SIGTERM",p)};var Pt=(t,r,e,o)=>{try{return dt({baseDir:t,outputPath:r,paramsFileName:e,logger:o}),O}catch(n){return n instanceof Error?o.error(`Failed to generate: ${n.message}`):o.error(`Unknown error occurred during generate: ${String(n)}`),P}},_t=(t,r,e,o)=>{let n=x($t.resolve(t)),i=x($t.resolve(r)),s=typeof e.paramsFile=="string"?e.paramsFile:null;return e.paramsFile!==void 0&&!s?(o.error("Error: --params-file requires a filename."),P):e.watch?(xt(n,()=>{Pt(n,i,s,o)},o),O):Pt(n,i,s,o)};var Ct=(t,r=Tt())=>{let e=new jt;e.description("Generate RPC client type definitions based on the Next.js path structure.").argument("<baseDir>","Base directory containing Next.js paths for type generation").argument("<outputPath>","Output path for the generated type definitions").option("-w, --watch","Watch mode: regenerate on file changes").option("-p, --params-file [filename]","Generate params types file with specified filename").action(async(o,n,i)=>{try{let s=await _t(o,n,i,r);i.watch||process.exit(s)}catch(s){r.error(`Unexpected error occurred:${s instanceof Error?s.message:String(s)}`),process.exit(P)}}),e.parse(t)};Ct(process.argv);
+`}${i}`,paramsTypes:m}};var Yt=()=>!!process.stdout?.isTTY;var K=t=>r=>Yt()?`\x1B[${t}m${r}\x1B[0m`:r,Et=K(36),Tt=K(32),Q=K(31);var V=(t,r,e="\u2192",o=24)=>t.padEnd(o)+` ${e} ${r}`,B=(t=0)=>"  ".repeat(t),dt=()=>({info:(t,r={})=>{let{indentLevel:e=0,event:o}=r,n=o?`${Et(`[${o}]`)} `:"";console.log(`${B(e)}${n}${t}`)},success:(t,r={})=>{let{indentLevel:e=0}=r;console.log(`${B(e)}${Tt("\u2713")} ${t}`)},error:(t,r={})=>{let{indentLevel:e=0}=r;console.error(`${B(e)}${Q("\u2717")} ${Q(t)}`)}});var St=({baseDir:t,outputPath:r,paramsFileName:e,logger:o})=>{o.info("Generating types...",{event:"generate"});let{pathStructure:n,paramsTypes:i}=gt(r,t);yt.writeFileSync(r,n),o.success(V("Path structure type",_(r),M,W),{indentLevel:F}),e&&(i.forEach(({paramsType:s,dirPath:p})=>{let a=Ut.join(p,e);yt.writeFileSync(a,s)}),o.success(V("Params types",e,M,W),{indentLevel:F}))};import jt from"chokidar";var xt=(t,r)=>{let e=null,o=!1,n=null,i=async(...s)=>{o=!0;try{await t(...s)}finally{if(o=!1,n){let p=n;n=null,i(...p)}}};return(...s)=>{e&&clearTimeout(e),e=setTimeout(()=>{if(o){n=s;return}i(...s)},r)}};var $t=(t,r,e)=>{e.info(`${_(t)}`,{event:"watch"});let o=a=>A.some(m=>a.endsWith(m)),n=new Set,i=xt(()=>{n.forEach(a=>{st(a),it(a)}),n.clear(),r()},300),s=jt.watch(t,{ignoreInitial:!0,ignored:(a,m)=>!!m?.isFile()&&!o(a)});s.on("ready",()=>{i(),s.on("all",(a,m)=>{if(o(m)){let c=_(m);e.info(c,{event:a}),n.add(m),i()}})}),s.on("error",a=>{a instanceof Error?e.error(`Watcher error: ${a.message}`):e.error(`Unknown watcher error: ${String(a)}`)});let p=()=>{s.close().then(()=>{e.info("Watcher closed.",{event:"watch"})}).catch(a=>{e.error(`Failed to close watcher: ${a.message}`)})};process.on("SIGINT",p),process.on("SIGTERM",p)};var _t=(t,r,e,o)=>{try{return St({baseDir:t,outputPath:r,paramsFileName:e,logger:o}),w}catch(n){return n instanceof Error?o.error(`Failed to generate: ${n.message}`):o.error(`Unknown error occurred during generate: ${String(n)}`),P}},Ct=(t,r,e,o)=>{let n=x(Pt.resolve(t)),i=x(Pt.resolve(r)),s=typeof e.paramsFile=="string"?e.paramsFile:null;return e.paramsFile!==void 0&&!s?(o.error("Error: --params-file requires a filename."),P):e.watch?($t(n,()=>{_t(n,i,s,o)},o),w):_t(n,i,s,o)};var Nt=(t,r=dt())=>{let e=new Ht;e.description("Generate RPC client type definitions based on the Next.js path structure.").argument("<baseDir>","Base directory containing Next.js paths for type generation").argument("<outputPath>","Output path for the generated type definitions").option("-w, --watch","Watch mode: regenerate on file changes").option("-p, --params-file [filename]","Generate params types file with specified filename").action(async(o,n,i)=>{try{let s=await Ct(o,n,i,r);i.watch||process.exit(s)}catch(s){r.error(`Unexpected error occurred:${s instanceof Error?s.message:String(s)}`),process.exit(P)}}),e.parse(t)};Nt(process.argv);
 /*!
  * Inspired by pathpida (https://github.com/aspida/pathpida),
  * especially the design and UX of its CLI.

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "rpc4next-cli",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Command line interface for rpc4next. Generates RPC client type definitions from Next.js routes.",
   "author": "watanabe-1",
   "license": "MIT",
+  "homepage": "https://github.com/watanabe-1/rpc4next#readme",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/watanabe-1/rpc4next.git",
     "directory": "packages/rpc4next-cli"
   },
-  "homepage": "https://github.com/watanabe-1/rpc4next#readme",
   "publishConfig": {
     "access": "public"
   },
@@ -27,14 +27,14 @@
     "test:coverage": "vitest run --coverage.enabled true",
     "test:ui": "vitest --ui --coverage.enabled true",
     "test:watch": "vitest --watch",
-    "lint": "eslint \"src/**/*.ts\"",
-    "lint:fix": "eslint \"src/**/*.ts\" --fix",
+    "lint": "eslint src",
+    "lint:fix": "eslint src --fix",
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "chokidar": "^4.0.3",
-    "commander": "^14.0.1",
-    "rpc4next-shared": "^0.1.3"
+    "chokidar": "^5.0.0",
+    "commander": "^14.0.3",
+    "rpc4next-shared": "^0.1.5"
   },
   "peerDependencies": {
     "next": "^14.0.0 || ^15.0.0"