create-sprint 0.0.46 → 0.0.48

package/dist/generators.js

@@ -1,11 +1,11 @@
-import { generateKeyPairSync } from "node:crypto";
+import * as crypto from "node:crypto";
 export function generateJWTKeys() {
-    const { publicKey, privateKey } = generateKeyPairSync("ec", {
+    const keys = crypto.generateKeyPairSync("ec", {
         namedCurve: "prime256v1",
         publicKeyEncoding: { type: "spki", format: "pem" },
         privateKeyEncoding: { type: "pkcs8", format: "pem" }
     });
-    return { publicKey, privateKey };
+    return keys;
 }
 export function getTypeScriptPackageJson(name, telemetry) {
     const deps = {
@@ -153,28 +153,28 @@ export default router;
 export function getAdminRoute(language) {
     if (language === "typescript") {
         return `import { Router } from "sprint-es";
-import { adminSchema } from "@/schemas/admin";
+import { adminSchema, jwtGenerateSchema } from "@/schemas/admin";
 import { adminController, adminUsersController, jwtGenerateController, jwtValidateController } from "@/controllers/admin";
 
 const router = Router();
 
 router.get("/", adminSchema, adminController);
 router.get("/users", adminSchema, adminUsersController);
-router.post("/jwt/generate", jwtGenerateController);
+router.post("/jwt/generate", jwtGenerateSchema, jwtGenerateController);
 router.post("/jwt/validate", jwtValidateController);
 
 export default router;
 `;
     }
     return `import { Router } from "sprint-es";
-import { adminSchema } from "../schemas/admin.js";
+import { adminSchema, jwtGenerateSchema } from "../schemas/admin.js";
 import { adminController, adminUsersController, jwtGenerateController, jwtValidateController } from "../controllers/admin.js";
 
 const router = Router();
 
 router.get("/", adminSchema, adminController);
 router.get("/users", adminSchema, adminUsersController);
-router.post("/jwt/generate", jwtGenerateController);
+router.post("/jwt/generate", jwtGenerateSchema, jwtGenerateController);
 router.post("/jwt/validate", jwtValidateController);
 
 export default router;
@@ -226,10 +226,6 @@ export const adminUsersController: Handler = (req, res) => {
 export const jwtGenerateController: Handler = (req, res) => {
     const { userId, role } = req.body || {};
     
-    if (!userId) {
-        return res.status(400).json({ error: "userId is required" });
-    }
-
     try {
         const { privateKey } = getJwtFromEnv();
         const payload = { userId, role: role || "user" };
@@ -284,10 +280,6 @@ export const adminUsersController = (req, res) => {
 export const jwtGenerateController = (req, res) => {
     const { userId, role } = req.body || {};
     
-    if (!userId) {
-        return res.status(400).json({ error: "userId is required" });
-    }
-
     try {
         const { privateKey } = getJwtFromEnv();
         const payload = { userId, role: role || "user" };
@@ -345,6 +337,13 @@ export const adminSchema = defineRouteSchema({
         email: z.string().email().optional()
     })
 });
+
+export const jwtGenerateSchema = defineRouteSchema({
+    body: z.object({
+        userId: z.string().min(1),
+        role: z.string().optional()
+    })
+});
 `;
     }
     return `import { z, defineRouteSchema } from "sprint-es/schemas";
@@ -358,6 +357,13 @@ export const adminSchema = defineRouteSchema({
         email: z.string().email().optional()
     })
 });
+
+export const jwtGenerateSchema = defineRouteSchema({
+    body: z.object({
+        userId: z.string().min(1),
+        role: z.string().optional()
+    })
+});
 `;
 }
 export function getAuthMiddleware(language) {
@@ -580,7 +586,7 @@ initTelemetry({
     return config;
 }
 export function getEnvExample(telemetry) {
-    let env = `PORT=3000
+    let env = `PORT=5000
 
 # Development: npm run dev (NODE_ENV=development)
 # Production: npm start (NODE_ENV=production)
@@ -599,12 +605,15 @@ DISCORD_WEBHOOK_URL=
     }
     return env;
 }
+function envKey(key) {
+    return key;
+}
 export function getEnvDevelopment(telemetry) {
-    const { publicKey, privateKey } = generateJWTKeys();
+    const keys = generateJWTKeys();
     let env = `NODE_ENV=development
-PORT=3000
-JWT_PUBLIC_KEY=${publicKey.replace(/\n/g, "\\n")}
-JWT_PRIVATE_KEY=${privateKey.replace(/\n/g, "\\n")}
+PORT=5000
+JWT_PUBLIC_KEY='${keys.publicKey}'
+JWT_PRIVATE_KEY='${keys.privateKey}'
 `;
     if (telemetry === "sentry" || telemetry === "glitchtip") {
         env += `
@@ -621,11 +630,11 @@ DISCORD_WEBHOOK_URL=
     return env;
 }
 export function getEnvProduction(telemetry) {
-    const { publicKey, privateKey } = generateJWTKeys();
+    const keys = generateJWTKeys();
     let env = `NODE_ENV=production
-PORT=3000
-JWT_PUBLIC_KEY=${publicKey.replace(/\n/g, "\\n")}
-JWT_PRIVATE_KEY=${privateKey.replace(/\n/g, "\\n")}
+PORT=5000
+JWT_PUBLIC_KEY='${keys.publicKey}'
+JWT_PRIVATE_KEY='${keys.privateKey}'
 `;
     if (telemetry === "sentry" || telemetry === "glitchtip") {
         env += `

package/dist/index.js

@@ -1,10 +1,16 @@
 import { spawn } from "child_process";
 import { existsSync } from "fs";
-import { mkdir, writeFile } from "fs/promises";
+import { mkdir, writeFile as fsWriteFile } from "fs/promises";
 import { join } from "path";
 import * as p from "@clack/prompts";
 import { validateProjectName } from "./validators.js";
 import { getTypeScriptPackageJson, getJavaScriptPackageJson, getTsConfig, getViteConfig, getMainFile, getHomeRoute, getAdminRoute, getHomeController, getAdminController, getAuthMiddleware, 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();
+    await fsWriteFile(path, content, options);
+}
+;
 export async function runCLI(args) {
     const options = parseArgs(args);
     p.intro("Sprint — Quickly API Framework");

package/package.json

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

package/src/generators.ts

@@ -1,4 +1,4 @@
-import { generateKeyPairSync } from "node:crypto";
+import * as crypto from "node:crypto";
 
 export interface JWTKeys {
     publicKey: string;
@@ -6,12 +6,12 @@ export interface JWTKeys {
 }
 
 export function generateJWTKeys(): JWTKeys {
-    const { publicKey, privateKey } = generateKeyPairSync("ec", {
+    const keys = crypto.generateKeyPairSync("ec", {
         namedCurve: "prime256v1",
         publicKeyEncoding: { type: "spki", format: "pem" },
         privateKeyEncoding: { type: "pkcs8", format: "pem" }
-    });
-    return { publicKey, privateKey };
+    }) as unknown as { publicKey: string; privateKey: string };
+    return keys;
 }
 
 export function getTypeScriptPackageJson(name: string, telemetry: string) {
@@ -170,28 +170,28 @@ export default router;
 export function getAdminRoute(language: string) {
     if (language === "typescript") {
         return `import { Router } from "sprint-es";
-import { adminSchema } from "@/schemas/admin";
+import { adminSchema, jwtGenerateSchema } from "@/schemas/admin";
 import { adminController, adminUsersController, jwtGenerateController, jwtValidateController } from "@/controllers/admin";
 
 const router = Router();
 
 router.get("/", adminSchema, adminController);
 router.get("/users", adminSchema, adminUsersController);
-router.post("/jwt/generate", jwtGenerateController);
+router.post("/jwt/generate", jwtGenerateSchema, jwtGenerateController);
 router.post("/jwt/validate", jwtValidateController);
 
 export default router;
 `;
     }
     return `import { Router } from "sprint-es";
-import { adminSchema } from "../schemas/admin.js";
+import { adminSchema, jwtGenerateSchema } from "../schemas/admin.js";
 import { adminController, adminUsersController, jwtGenerateController, jwtValidateController } from "../controllers/admin.js";
 
 const router = Router();
 
 router.get("/", adminSchema, adminController);
 router.get("/users", adminSchema, adminUsersController);
-router.post("/jwt/generate", jwtGenerateController);
+router.post("/jwt/generate", jwtGenerateSchema, jwtGenerateController);
 router.post("/jwt/validate", jwtValidateController);
 
 export default router;
@@ -245,10 +245,6 @@ export const adminUsersController: Handler = (req, res) => {
 export const jwtGenerateController: Handler = (req, res) => {
     const { userId, role } = req.body || {};
     
-    if (!userId) {
-        return res.status(400).json({ error: "userId is required" });
-    }
-
     try {
         const { privateKey } = getJwtFromEnv();
         const payload = { userId, role: role || "user" };
@@ -303,10 +299,6 @@ export const adminUsersController = (req, res) => {
 export const jwtGenerateController = (req, res) => {
     const { userId, role } = req.body || {};
     
-    if (!userId) {
-        return res.status(400).json({ error: "userId is required" });
-    }
-
     try {
         const { privateKey } = getJwtFromEnv();
         const payload = { userId, role: role || "user" };
@@ -366,6 +358,13 @@ export const adminSchema = defineRouteSchema({
         email: z.string().email().optional()
     })
 });
+
+export const jwtGenerateSchema = defineRouteSchema({
+    body: z.object({
+        userId: z.string().min(1),
+        role: z.string().optional()
+    })
+});
 `;
     }
     return `import { z, defineRouteSchema } from "sprint-es/schemas";
@@ -379,6 +378,13 @@ export const adminSchema = defineRouteSchema({
         email: z.string().email().optional()
     })
 });
+
+export const jwtGenerateSchema = defineRouteSchema({
+    body: z.object({
+        userId: z.string().min(1),
+        role: z.string().optional()
+    })
+});
 `;
 }
 
@@ -611,7 +617,7 @@ initTelemetry({
 }
 
 export function getEnvExample(telemetry: string) {
-    let env = `PORT=3000
+    let env = `PORT=5000
 
 # Development: npm run dev (NODE_ENV=development)
 # Production: npm start (NODE_ENV=production)
@@ -632,12 +638,16 @@ DISCORD_WEBHOOK_URL=
     return env;
 }
 
+function envKey(key: any): string {
+    return key;
+}
+
 export function getEnvDevelopment(telemetry: string) {
-    const { publicKey, privateKey } = generateJWTKeys();
+    const keys = generateJWTKeys();
     let env = `NODE_ENV=development
-PORT=3000
-JWT_PUBLIC_KEY=${publicKey.replace(/\n/g, "\\n")}
-JWT_PRIVATE_KEY=${privateKey.replace(/\n/g, "\\n")}
+PORT=5000
+JWT_PUBLIC_KEY='${keys.publicKey}'
+JWT_PRIVATE_KEY='${keys.privateKey}'
 `;
 
     if (telemetry === "sentry" || telemetry === "glitchtip") {
@@ -656,11 +666,11 @@ DISCORD_WEBHOOK_URL=
 }
 
 export function getEnvProduction(telemetry: string) {
-    const { publicKey, privateKey } = generateJWTKeys();
+    const keys = generateJWTKeys();
     let env = `NODE_ENV=production
-PORT=3000
-JWT_PUBLIC_KEY=${publicKey.replace(/\n/g, "\\n")}
-JWT_PRIVATE_KEY=${privateKey.replace(/\n/g, "\\n")}
+PORT=5000
+JWT_PUBLIC_KEY='${keys.publicKey}'
+JWT_PRIVATE_KEY='${keys.privateKey}'
 `;
 
     if (telemetry === "sentry" || telemetry === "glitchtip") {

package/src/index.ts

@@ -1,6 +1,6 @@
 import { spawn } from "child_process";
-import { existsSync } from "fs";
-import { mkdir, writeFile } from "fs/promises";
+import { existsSync, writeFileSync } from "fs";
+import { mkdir, writeFile as fsWriteFile } from "fs/promises";
 import { join } from "path";
 import * as p from "@clack/prompts";
 import { validateProjectName } from "./validators.js";
@@ -15,6 +15,11 @@ export interface CLIOptions {
     skipPrompts?: boolean;
 }
 
+export async function writeFile(path: string, content: string, options?: any) {
+    if (typeof content === "string") content = content.trimEnd();
+    await fsWriteFile(path, content, options);
+};
+
 export async function runCLI(args: string[]) {
     const options = parseArgs(args);