create-sprint 0.0.56 → 0.0.60

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) {
@@ -255,11 +233,12 @@ export const adminUsersController: Handler = (req: SprintRequest, res: SprintRes
     });
 };
 
+const { privateKey, encryptionSecret } = getJwtFromEnv();
+
 export const jwtGenerateController: Handler = (req: SprintRequest, res: SprintResponse) => {
     const { userId, role } = req.body || {};
     
     try {
-        const { privateKey, encryptionSecret } = getJwtFromEnv();
         const payload = { userId, role: role || "user" };
         const token = signEncrypted(payload, privateKey, encryptionSecret, { expiresIn: "1h" });
         res.json({ token });
@@ -289,11 +268,12 @@ export const adminUsersController = (req: SprintRequest, res: SprintResponse) =>
     });
 };
 
+const { privateKey, encryptionSecret } = getJwtFromEnv();
+
 export const jwtGenerateController = (req: SprintRequest, res: SprintResponse) => {
     const { userId, role } = req.body || {};
     
     try {
-        const { privateKey, encryptionSecret } = getJwtFromEnv();
         const payload = { userId, role: role || "user" };
         const token = signEncrypted(payload, privateKey, encryptionSecret, { expiresIn: "1h" });
         res.json({ token });
@@ -360,13 +340,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 +380,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 +390,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" });
 
@@ -625,19 +605,23 @@ initTelemetry({
 export function getEnvExample(telemetry) {
     let env = `PORT=5000
 
+JWT_PUBLIC_KEY=""
+JWT_PRIVATE_KEY=""
+JWT_ENCRYPTION_SECRET=""
+
 # Development: npm run dev (NODE_ENV=development)
 # Production: npm start (NODE_ENV=production)
 `;
     if (telemetry === "sentry" || telemetry === "glitchtip") {
         env += `
 # Sentry / GlitchTip (use GlitchTip DSN for self-hosted)
-SENTRY_DSN=
+SENTRY_DSN=""
 `;
     }
     else if (telemetry === "discord") {
         env += `
 # Discord Webhook URL for error notifications
-DISCORD_TELEMETRY_WEBHOOK_URL=
+DISCORD_TELEMETRY_WEBHOOK_URL=""
 `;
     }
     return env;
@@ -656,13 +640,13 @@ JWT_ENCRYPTION_SECRET='${crypto.randomBytes(32).toString("hex")}'
     if (telemetry === "sentry" || telemetry === "glitchtip") {
         env += `
 # Sentry / GlitchTip
-SENTRY_DSN=
+SENTRY_DSN=""
 `;
     }
     else if (telemetry === "discord") {
         env += `
 # Discord Webhook URL
-DISCORD_TELEMETRY_WEBHOOK_URL=
+DISCORD_TELEMETRY_WEBHOOK_URL=""
 `;
     }
     return env;

package/dist/index.js

@@ -5,7 +5,7 @@ import { join } from "path";
 import color from "picocolors";
 import * as p from "@clack/prompts";
 import { validateProjectName } from "./validators.js";
-import { getTypeScriptPackageJson, getJavaScriptPackageJson, getTsConfig, getViteConfig, getMainFile, getHomeRoute, getAdminRoute, getHomeController, getAdminController, getInternalAuthMiddleware, getUserAuthMiddleware, getHomeSchema, getAdminSchema, getDockerfile, getDockerCompose, getGitignore, getDockerIgnore, getSprintConfigFile, getEnvDevelopment, getEnvProduction, getExampleCronJob } from "./generators.js";
+import { getTypeScriptPackageJson, getJavaScriptPackageJson, getTsConfig, getViteConfig, getMainFile, getHomeRoute, getAdminRoute, getHomeController, getAdminController, getEnvExample, getInternalAuthMiddleware, getUserAuthMiddleware, getHomeSchema, getAdminSchema, getDockerfile, getDockerCompose, getGitignore, getDockerIgnore, getSprintConfigFile, getEnvDevelopment, getEnvProduction, getExampleCronJob } from "./generators.js";
 export async function writeFile(path, content, options) {
     if (typeof content === "string")
         content = content.trimEnd();
@@ -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)
@@ -184,8 +184,8 @@ async function createProject(projectName, language, telemetry, useDocker) {
     await writeFile(join(srcDir, "schemas", "home." + (language === "typescript" ? "ts" : "js")), getHomeSchema(language));
     await writeFile(join(srcDir, "schemas", "admin." + (language === "typescript" ? "ts" : "js")), getAdminSchema(language));
     await writeFile(join(srcDir, "cronjobs", "example." + (language === "typescript" ? "ts" : "js")), getExampleCronJob(language));
-    await writeFile(join(targetDir, ".env.development.example"), getEnvDevelopment(telemetry));
-    await writeFile(join(targetDir, ".env.production.example"), getEnvProduction(telemetry));
+    await writeFile(join(targetDir, ".env.development.example"), getEnvExample(telemetry));
+    await writeFile(join(targetDir, ".env.production.example"), getEnvExample(telemetry));
     await writeFile(join(targetDir, ".env.development"), getEnvDevelopment(telemetry));
     await writeFile(join(targetDir, ".env.production"), getEnvProduction(telemetry));
     await writeFile(join(targetDir, ".gitignore"), getGitignore());

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-sprint",
-    "version": "0.0.56",
+    "version": "0.0.60",
     "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();
 `;
 }
 
@@ -274,11 +252,12 @@ export const adminUsersController: Handler = (req: SprintRequest, res: SprintRes
     });
 };
 
+const { privateKey, encryptionSecret } = getJwtFromEnv();
+
 export const jwtGenerateController: Handler = (req: SprintRequest, res: SprintResponse) => {
     const { userId, role } = req.body || {};
     
     try {
-        const { privateKey, encryptionSecret } = getJwtFromEnv();
         const payload = { userId, role: role || "user" };
         const token = signEncrypted(payload, privateKey, encryptionSecret, { expiresIn: "1h" });
         res.json({ token });
@@ -307,11 +286,12 @@ export const adminUsersController = (req: SprintRequest, res: SprintResponse) =>
     });
 };
 
+const { privateKey, encryptionSecret } = getJwtFromEnv();
+
 export const jwtGenerateController = (req: SprintRequest, res: SprintResponse) => {
     const { userId, role } = req.body || {};
     
     try {
-        const { privateKey, encryptionSecret } = getJwtFromEnv();
         const payload = { userId, role: role || "user" };
         const token = signEncrypted(payload, privateKey, encryptionSecret, { expiresIn: "1h" });
         res.json({ token });
@@ -381,13 +361,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 +402,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 +412,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" });
 
@@ -656,6 +636,10 @@ initTelemetry({
 export function getEnvExample(telemetry: string) {
     let env = `PORT=5000
 
+JWT_PUBLIC_KEY=""
+JWT_PRIVATE_KEY=""
+JWT_ENCRYPTION_SECRET=""
+
 # Development: npm run dev (NODE_ENV=development)
 # Production: npm start (NODE_ENV=production)
 `;
@@ -663,12 +647,12 @@ export function getEnvExample(telemetry: string) {
     if (telemetry === "sentry" || telemetry === "glitchtip") {
         env += `
 # Sentry / GlitchTip (use GlitchTip DSN for self-hosted)
-SENTRY_DSN=
+SENTRY_DSN=""
 `;
     } else if (telemetry === "discord") {
         env += `
 # Discord Webhook URL for error notifications
-DISCORD_TELEMETRY_WEBHOOK_URL=
+DISCORD_TELEMETRY_WEBHOOK_URL=""
 `;
     }
 
@@ -691,12 +675,12 @@ JWT_ENCRYPTION_SECRET='${crypto.randomBytes(32).toString("hex")}'
     if (telemetry === "sentry" || telemetry === "glitchtip") {
         env += `
 # Sentry / GlitchTip
-SENTRY_DSN=
+SENTRY_DSN=""
 `;
     } else if (telemetry === "discord") {
         env += `
 # Discord Webhook URL
-DISCORD_TELEMETRY_WEBHOOK_URL=
+DISCORD_TELEMETRY_WEBHOOK_URL=""
 `;
     }
 

package/src/index.ts

@@ -5,7 +5,7 @@ import { join } from "path";
 import color from "picocolors";
 import * as p from "@clack/prompts";
 import { validateProjectName } from "./validators.js";
-import { getTypeScriptPackageJson, getJavaScriptPackageJson, getTsConfig, getViteConfig, getMainFile, getHomeRoute, getAdminRoute, getHomeController, getAdminController, getInternalAuthMiddleware, getUserAuthMiddleware, getHomeSchema, getAdminSchema, getDockerfile, getDockerCompose, getGitignore, getDockerIgnore, getSprintConfigFile, getEnvDevelopment, getEnvProduction, getExampleCronJob } from "./generators.js";
+import { getTypeScriptPackageJson, getJavaScriptPackageJson, getTsConfig, getViteConfig, getMainFile, getHomeRoute, getAdminRoute, getHomeController, getAdminController, getEnvExample, getInternalAuthMiddleware, getUserAuthMiddleware, getHomeSchema, getAdminSchema, getDockerfile, getDockerCompose, getGitignore, getDockerIgnore, getSprintConfigFile, getEnvDevelopment, getEnvProduction, getExampleCronJob } from "./generators.js";
 
 export interface CLIOptions {
     projectName?: string;
@@ -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();
@@ -236,8 +235,8 @@ async function createProject(
 
     await writeFile(join(srcDir, "cronjobs", "example." + (language === "typescript" ? "ts" : "js")), getExampleCronJob(language));
 
-    await writeFile(join(targetDir, ".env.development.example"), getEnvDevelopment(telemetry));
-    await writeFile(join(targetDir, ".env.production.example"), getEnvProduction(telemetry));
+    await writeFile(join(targetDir, ".env.development.example"), getEnvExample(telemetry));
+    await writeFile(join(targetDir, ".env.production.example"), getEnvExample(telemetry));
 
     await writeFile(join(targetDir, ".env.development"), getEnvDevelopment(telemetry));
     await writeFile(join(targetDir, ".env.production"), getEnvProduction(telemetry));