create-sprint 0.0.56 → 0.0.58

package/dist/generators.js

@@ -117,35 +117,13 @@ export default defineConfig({
 export function getMainFile(language) {
     if (language === "typescript") {
         return `import Sprint from "sprint-es";
-import homeRouter from "./routes/home";
-import adminRouter from "./routes/admin";
-import authInternalMiddleware from "./middlewares/auth.internal";
-import authUserMiddleware from "./middlewares/auth.user";
 
 const app = new Sprint();
-
-app.use(authUserMiddleware);
-app.use(authInternalMiddleware);
-app.route("/", homeRouter);
-app.route("/admin", adminRouter);
-
-app.listen();
 `;
     }
     return `import Sprint from "sprint-es";
-import homeRouter from "./routes/home.js";
-import adminRouter from "./routes/admin.js";
-import authInternalMiddleware from "./middlewares/auth.internal.js";
-import authUserMiddleware from "./middlewares/auth.user.js";
 
 const app = new Sprint();
-
-app.use(authUserMiddleware);
-app.use(authInternalMiddleware);
-app.route("/", homeRouter);
-app.route("/admin", adminRouter);
-
-app.listen();
 `;
 }
 export function getHomeRoute(language) {
@@ -360,13 +338,13 @@ export const jwtGenerateSchema = defineRouteSchema({
 }
 export function getInternalAuthMiddleware(language) {
     if (language === "typescript") {
-        return `import { defineMiddleware } from "sprint-es";
+        return `import { defineMiddleware, SprintRequest, SprintResponse, NextFunction } from "sprint-es";
 
 export default defineMiddleware({
     name: "adminAuth",
     priority: 10,
     include: "/admin/**",
-    handler: (req, res, next) => {
+    handler: (req: SprintRequest, res: SprintResponse, next: NextFunction) => {
         const auth = req.sprint.getAuthorization();
         if (!auth) return res.status(401).json({ error: "No authorization header" });
 
@@ -400,7 +378,7 @@ export default defineMiddleware({
 }
 export function getUserAuthMiddleware(language) {
     if (language === "typescript") {
-        return `import { defineMiddleware } from "sprint-es";
+        return `import { defineMiddleware, SprintRequest, SprintResponse, NextFunction } from "sprint-es";
 import { verifyEncrypted, getJwtFromEnv } from "sprint-es/jwt";
 
 const { publicKey, encryptionSecret } = getJwtFromEnv();
@@ -410,7 +388,7 @@ export default defineMiddleware({
     priority: 10,
     include: "/**",
     exclude: "/admin/**",
-    handler: (req, res, next) => {
+    handler: (req: SprintRequest, res: SprintResponse, next: NextFunction) => {
         const auth = req.sprint.getAuthorization();
         if (!auth) return res.status(401).json({ error: "No authorization header" });
 

package/dist/index.js

@@ -68,15 +68,15 @@ export async function runCLI(args) {
     else if (!options.skipPrompts) {
         installDeps = await p.confirm({ message: "Install dependencies now?", initialValue: true });
     }
-    const npmCmd = process.platform === "win32" ? "npm.cmd" : "npm";
     if (installDeps) {
         const s2 = p.spinner();
         s2.start("Installing dependencies");
         try {
             await new Promise((resolve, reject) => {
-                const child = spawn(npmCmd, ["install"], {
+                const child = spawn("npm", ["install"], {
                     cwd: targetDir,
-                    stdio: "inherit"
+                    stdio: "inherit",
+                    shell: true
                 });
                 child.on("close", (code) => {
                     if (code === 0)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-sprint",
-    "version": "0.0.56",
+    "version": "0.0.58",
     "description": "Create a new Sprint API project",
     "type": "module",
     "bin": {

package/src/generators.ts

@@ -131,36 +131,14 @@ export default defineConfig({
 export function getMainFile(language: string) {
     if (language === "typescript") {
         return `import Sprint from "sprint-es";
-import homeRouter from "./routes/home";
-import adminRouter from "./routes/admin";
-import authInternalMiddleware from "./middlewares/auth.internal";
-import authUserMiddleware from "./middlewares/auth.user";
 
 const app = new Sprint();
-
-app.use(authUserMiddleware);
-app.use(authInternalMiddleware);
-app.route("/", homeRouter);
-app.route("/admin", adminRouter);
-
-app.listen();
 `;
     }
 
     return `import Sprint from "sprint-es";
-import homeRouter from "./routes/home.js";
-import adminRouter from "./routes/admin.js";
-import authInternalMiddleware from "./middlewares/auth.internal.js";
-import authUserMiddleware from "./middlewares/auth.user.js";
 
 const app = new Sprint();
-
-app.use(authUserMiddleware);
-app.use(authInternalMiddleware);
-app.route("/", homeRouter);
-app.route("/admin", adminRouter);
-
-app.listen();
 `;
 }
 
@@ -381,13 +359,13 @@ export const jwtGenerateSchema = defineRouteSchema({
 
 export function getInternalAuthMiddleware(language: string) {
     if (language === "typescript") {
-        return `import { defineMiddleware } from "sprint-es";
+        return `import { defineMiddleware, SprintRequest, SprintResponse, NextFunction } from "sprint-es";
 
 export default defineMiddleware({
     name: "adminAuth",
     priority: 10,
     include: "/admin/**",
-    handler: (req, res, next) => {
+    handler: (req: SprintRequest, res: SprintResponse, next: NextFunction) => {
         const auth = req.sprint.getAuthorization();
         if (!auth) return res.status(401).json({ error: "No authorization header" });
 
@@ -422,7 +400,7 @@ export default defineMiddleware({
 
 export function getUserAuthMiddleware(language: string) {
     if (language === "typescript") {
-        return `import { defineMiddleware } from "sprint-es";
+        return `import { defineMiddleware, SprintRequest, SprintResponse, NextFunction } from "sprint-es";
 import { verifyEncrypted, getJwtFromEnv } from "sprint-es/jwt";
 
 const { publicKey, encryptionSecret } = getJwtFromEnv();
@@ -432,7 +410,7 @@ export default defineMiddleware({
     priority: 10,
     include: "/**",
     exclude: "/admin/**",
-    handler: (req, res, next) => {
+    handler: (req: SprintRequest, res: SprintResponse, next: NextFunction) => {
         const auth = req.sprint.getAuthorization();
         if (!auth) return res.status(401).json({ error: "No authorization header" });
 

package/src/index.ts

@@ -103,16 +103,15 @@ export async function runCLI(args: string[]) {
         installDeps = await p.confirm({ message: "Install dependencies now?", initialValue: true }) as boolean;
     }
 
-    const npmCmd = process.platform === "win32" ? "npm.cmd" : "npm";
-
     if (installDeps) {
         const s2 = p.spinner();
         s2.start("Installing dependencies");
         try {
             await new Promise<void>((resolve, reject) => {
-                const child = spawn(npmCmd, ["install"], {
+                const child = spawn("npm", ["install"], {
                     cwd: targetDir,
-                    stdio: "inherit"
+                    stdio: "inherit",
+                    shell: true
                 });
                 child.on("close", (code) => {
                     if (code === 0) resolve();