create-sprint 0.0.78 → 0.0.82

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, getEnvExample, 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, getGraphQLFiles } from "./generators.js";
 export async function writeFile(path, content, options) {
     if (typeof content === "string")
         content = content.trimEnd();
@@ -175,6 +175,9 @@ async function createProject(projectName, language, telemetry, swagger, graphql,
     await mkdir(join(srcDir, "cronjobs"), { recursive: true });
     await mkdir(join(srcDir, "config"), { recursive: true });
     await mkdir(join(srcDir, "services"), { recursive: true });
+    if (graphql) {
+        await mkdir(join(srcDir, "graphql"), { recursive: true });
+    }
     if (language === "typescript") {
         await writeFile(join(srcDir, "config", "index.ts"), "");
         await writeFile(join(srcDir, "config", "clients.ts"), "");
@@ -194,6 +197,13 @@ async function createProject(projectName, language, telemetry, swagger, graphql,
     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));
+    if (graphql) {
+        const graphqlFiles = getGraphQLFiles(language);
+        const ext = language === "typescript" ? "ts" : "js";
+        await writeFile(join(srcDir, "graphql", `types.${ext}`), graphqlFiles["types.ts"]);
+        await writeFile(join(srcDir, "graphql", `resolvers.${ext}`), graphqlFiles["resolvers.ts"]);
+        await writeFile(join(srcDir, "graphql", `schema.${ext}`), graphqlFiles["schema.ts"]);
+    }
     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));

package/dist/templates/configFiles.js

@@ -53,21 +53,24 @@ export default defineConfig({
 }
 ;
 export function getSprintConfigFile(language, telemetry, swagger, graphql) {
+    const swaggerEnabled = swagger ? "true" : "false";
+    const graphqlEnabled = graphql ? "true" : "false";
+    const graphiqlEnabled = graphql ? '["development"]' : "false";
     if (language === "typescript") {
         let config = `import type { SprintOptions } from "sprint-es";
 
 export const config: SprintOptions = {
     openapi: {
-        enabled: ${swagger},
-        generateOnBuild: ${swagger},
+        enabled: ${swaggerEnabled},
+        generateOnBuild: ${swaggerEnabled},
         swaggerUi: {
-            enabled: ${swagger}
+            enabled: ${swaggerEnabled}
         }
     },
     graphql: {
-        enabled: ${graphql},
+        enabled: ${graphqlEnabled},
         graphiql: {
-            enabled: ${graphql}
+            enabled: ${graphiqlEnabled}
         }
     }
 };
@@ -99,16 +102,16 @@ initTelemetry({
     }
     let config = `export const config = {
     openapi: {
-        enabled: ${swagger},
-        generateOnBuild: ${swagger},
+        enabled: ${swaggerEnabled},
+        generateOnBuild: ${swaggerEnabled},
         swaggerUi: {
-            enabled: ${swagger}
+            enabled: ${swaggerEnabled}
         }
     },
     graphql: {
-        enabled: ${graphql},
+        enabled: ${graphqlEnabled},
         graphiql: {
-            enabled: ${graphql}
+            enabled: ${graphiqlEnabled}
         }
     }
 };

package/dist/templates/graphql.js

@@ -0,0 +1,73 @@
+export function getGraphQLFiles(language) {
+    const isTs = language === "typescript";
+    const ext = isTs ? "" : ".js";
+    return {
+        "types.ts": `import { GraphQLObjectType, GraphQLString, GraphQLList, GraphQLNonNull } from "graphql";
+
+export const UserType = new GraphQLObjectType({
+    name: "User",
+    fields: {
+        id: { type: new GraphQLNonNull(GraphQLString) },
+        name: { type: GraphQLString },
+        email: { type: GraphQLString }
+    }
+});
+`,
+        "resolvers.ts": `import { GraphQLString, GraphQLList, GraphQLNonNull } from "graphql";
+import { UserType } from "./types${ext}";
+
+export const users = [
+    { id: "1", name: "John Doe", email: "john@example.com" },
+    { id: "2", name: "Jane Smith", email: "jane@example.com" }
+];
+
+export const queries = {
+    hello: {
+        type: GraphQLString,
+        resolve: () => "Hello, GraphQL!"
+    },
+    users: {
+        type: new GraphQLList(UserType),
+        resolve: () => users
+    },
+    user: {
+        type: UserType,
+        args: {
+            id: { type: new GraphQLNonNull(GraphQLString) }
+        },
+        resolve: (_, args) => users.find(u => u.id === args.id)
+    }
+};
+
+export const mutations = {
+    createUser: {
+        type: UserType,
+        args: {
+            name: { type: new GraphQLNonNull(GraphQLString) },
+            email: { type: new GraphQLNonNull(GraphQLString) }
+        },
+        resolve: (_, args) => {
+            const newUser = { id: String(users.length + 1), name: args.name, email: args.email };
+            users.push(newUser);
+            return newUser;
+        }
+    }
+};
+`,
+        "schema.ts": `import { GraphQLSchema, GraphQLObjectType } from "graphql";
+import { queries, mutations } from "./resolvers${ext}";
+
+const Query = new GraphQLObjectType({
+    name: "Query",
+    fields: queries
+});
+
+const Mutation = new GraphQLObjectType({
+    name: "Mutation",
+    fields: mutations
+});
+
+export const graphqlSchema = new GraphQLSchema({ query: Query, mutation: Mutation });
+`
+    };
+}

package/dist/templates/index.js

@@ -16,5 +16,7 @@ export { getHomeSchema, getAdminSchema } from "./schemas.js";
 export { getExampleCronJob } from "./cronjobs.js";
 // Docker
 export { getDockerfile, getDockerCompose } from "./docker.js";
+// GraphQL
+export { getGraphQLFiles } from "./graphql.js";
 // Misc
 export { getGitignore, getDockerIgnore } from "./misc.js";

package/dist/templates/packageJson.js

@@ -10,7 +10,7 @@ export function generateJWTKeys() {
 ;
 export function getTypeScriptPackageJson(name, telemetry, swagger, graphql) {
     const deps = {
-        "sprint-es": "^0.0.82"
+        "sprint-es": "^0.0.84"
     };
     const devDeps = {
         "@types/node": "^22.0.0",
@@ -49,7 +49,7 @@ export function getTypeScriptPackageJson(name, telemetry, swagger, graphql) {
 ;
 export function getJavaScriptPackageJson(name, telemetry, swagger, graphql) {
     const deps = {
-        "sprint-es": "^0.0.82"
+        "sprint-es": "^0.0.84"
     };
     if (telemetry === "sentry" || telemetry === "glitchtip")
         deps["@sentry/node"] = "^8.0.0";

package/dist/templates/routes.js

@@ -1,66 +1,12 @@
 export function getMainFile(language, graphql = false) {
-    if (language === "typescript") {
+    const isTs = language === "typescript";
+    const ext = isTs ? "" : ".js";
+    if (isTs) {
         if (graphql) {
             return `import Sprint from "sprint-es";
-import { config } from "./sprint.config.js";
-import { GraphQLSchema, GraphQLObjectType, GraphQLString, GraphQLList, GraphQLNonNull } from "graphql";
-
-const users = [
-    { id: "1", name: "John Doe", email: "john@example.com" },
-    { id: "2", name: "Jane Smith", email: "jane@example.com" }
-];
-
-const UserType = new GraphQLObjectType({
-    name: "User",
-    fields: {
-        id: { type: new GraphQLNonNull(GraphQLString) },
-        name: { type: GraphQLString },
-        email: { type: GraphQLString }
-    }
-});
-
-const Query = new GraphQLObjectType({
-    name: "Query",
-    fields: {
-        hello: {
-            type: GraphQLString,
-            resolve: () => "Hello, GraphQL!"
-        },
-        users: {
-            type: new GraphQLList(UserType),
-            resolve: () => users
-        },
-        user: {
-            type: UserType,
-            args: {
-                id: { type: new GraphQLNonNull(GraphQLString) }
-            },
-            resolve: (_, args) => users.find(u => u.id === args.id)
-        }
-    }
-});
-
-const Mutation = new GraphQLObjectType({
-    name: "Mutation",
-    fields: {
-        createUser: {
-            type: UserType,
-            args: {
-                name: { type: new GraphQLNonNull(GraphQLString) },
-                email: { type: new GraphQLNonNull(GraphQLString) }
-            },
-            resolve: (_, args) => {
-                const newUser = { id: String(users.length + 1), name: args.name, email: args.email };
-                users.push(newUser);
-                return newUser;
-            }
-        }
-    }
-});
+import { graphqlSchema } from "./graphql/schema";
 
-const graphqlSchema = new GraphQLSchema({ query: Query, mutation: Mutation });
-
-const app = new Sprint(config);
+const app = new Sprint();
 app.setGraphQLSchema(graphqlSchema);
 `;
         }
@@ -71,65 +17,9 @@ const app = new Sprint();
     }
     if (graphql) {
         return `import Sprint from "sprint-es";
-import { config } from "./sprint.config.js";
-import { GraphQLSchema, GraphQLObjectType, GraphQLString, GraphQLList, GraphQLNonNull } from "graphql";
-
-const users = [
-    { id: "1", name: "John Doe", email: "john@example.com" },
-    { id: "2", name: "Jane Smith", email: "jane@example.com" }
-];
-
-const UserType = new GraphQLObjectType({
-    name: "User",
-    fields: {
-        id: { type: new GraphQLNonNull(GraphQLString) },
-        name: { type: GraphQLString },
-        email: { type: GraphQLString }
-    }
-});
-
-const Query = new GraphQLObjectType({
-    name: "Query",
-    fields: {
-        hello: {
-            type: GraphQLString,
-            resolve: () => "Hello, GraphQL!"
-        },
-        users: {
-            type: new GraphQLList(UserType),
-            resolve: () => users
-        },
-        user: {
-            type: UserType,
-            args: {
-                id: { type: new GraphQLNonNull(GraphQLString) }
-            },
-            resolve: (_, args) => users.find(u => u.id === args.id)
-        }
-    }
-});
-
-const Mutation = new GraphQLObjectType({
-    name: "Mutation",
-    fields: {
-        createUser: {
-            type: UserType,
-            args: {
-                name: { type: new GraphQLNonNull(GraphQLString) },
-                email: { type: new GraphQLNonNull(GraphQLString) }
-            },
-            resolve: (_, args) => {
-                const newUser = { id: String(users.length + 1), name: args.name, email: args.email };
-                users.push(newUser);
-                return newUser;
-            }
-        }
-    }
-});
-
-const graphqlSchema = new GraphQLSchema({ query: Query, mutation: Mutation });
+import { graphqlSchema } from "./graphql/schema.js";
 
-const app = new Sprint(config);
+const app = new Sprint();
 app.setGraphQLSchema(graphqlSchema);
 `;
     }

package/package.json

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

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, getEnvExample, 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, getGraphQLFiles } from "./generators.js";
 
 export interface CLIOptions {
     projectName?: string;
@@ -224,6 +224,10 @@ async function createProject(
     await mkdir(join(srcDir, "cronjobs"), { recursive: true });
     await mkdir(join(srcDir, "config"), { recursive: true });
     await mkdir(join(srcDir, "services"), { recursive: true });
+    
+    if (graphql) {
+        await mkdir(join(srcDir, "graphql"), { recursive: true });
+    }
 
     if (language === "typescript") {
         await writeFile(join(srcDir, "config", "index.ts"), "");
@@ -251,6 +255,15 @@ async function createProject(
 
     await writeFile(join(srcDir, "cronjobs", "example." + (language === "typescript" ? "ts" : "js")), getExampleCronJob(language));
 
+    if (graphql) {
+        const graphqlFiles = getGraphQLFiles(language);
+        const ext = language === "typescript" ? "ts" : "js";
+        
+        await writeFile(join(srcDir, "graphql", `types.${ext}`), graphqlFiles["types.ts"]);
+        await writeFile(join(srcDir, "graphql", `resolvers.${ext}`), graphqlFiles["resolvers.ts"]);
+        await writeFile(join(srcDir, "graphql", `schema.${ext}`), graphqlFiles["schema.ts"]);
+    }
+
     await writeFile(join(targetDir, ".env.development.example"), getEnvExample(telemetry));
     await writeFile(join(targetDir, ".env.production.example"), getEnvExample(telemetry));
 

package/src/templates/configFiles.ts

@@ -53,21 +53,25 @@ export default defineConfig({
 };
 
 export function getSprintConfigFile(language: string, telemetry: string, swagger: boolean, graphql: boolean) {
+    const swaggerEnabled = swagger ? "true" : "false";
+    const graphqlEnabled = graphql ? "true" : "false";
+    const graphiqlEnabled = graphql ? '["development"]' : "false";
+    
     if (language === "typescript") {
         let config = `import type { SprintOptions } from "sprint-es";
 
 export const config: SprintOptions = {
     openapi: {
-        enabled: ${swagger},
-        generateOnBuild: ${swagger},
+        enabled: ${swaggerEnabled},
+        generateOnBuild: ${swaggerEnabled},
         swaggerUi: {
-            enabled: ${swagger}
+            enabled: ${swaggerEnabled}
         }
     },
     graphql: {
-        enabled: ${graphql},
+        enabled: ${graphqlEnabled},
         graphiql: {
-            enabled: ${graphql}
+            enabled: ${graphiqlEnabled}
         }
     }
 };
@@ -101,16 +105,16 @@ initTelemetry({
 
     let config = `export const config = {
     openapi: {
-        enabled: ${swagger},
-        generateOnBuild: ${swagger},
+        enabled: ${swaggerEnabled},
+        generateOnBuild: ${swaggerEnabled},
         swaggerUi: {
-            enabled: ${swagger}
+            enabled: ${swaggerEnabled}
         }
     },
     graphql: {
-        enabled: ${graphql},
+        enabled: ${graphqlEnabled},
         graphiql: {
-            enabled: ${graphql}
+            enabled: ${graphiqlEnabled}
         }
     }
 };

package/src/templates/graphql.ts

@@ -0,0 +1,74 @@
+export function getGraphQLFiles(language: string) {
+    const isTs = language === "typescript";
+    const ext = isTs ? "" : ".js";
+    
+    return {
+        "types.ts": `import { GraphQLObjectType, GraphQLString, GraphQLList, GraphQLNonNull } from "graphql";
+
+export const UserType = new GraphQLObjectType({
+    name: "User",
+    fields: {
+        id: { type: new GraphQLNonNull(GraphQLString) },
+        name: { type: GraphQLString },
+        email: { type: GraphQLString }
+    }
+});
+`,
+        "resolvers.ts": `import { GraphQLString, GraphQLList, GraphQLNonNull } from "graphql";
+import { UserType } from "./types${ext}";
+
+export const users = [
+    { id: "1", name: "John Doe", email: "john@example.com" },
+    { id: "2", name: "Jane Smith", email: "jane@example.com" }
+];
+
+export const queries = {
+    hello: {
+        type: GraphQLString,
+        resolve: () => "Hello, GraphQL!"
+    },
+    users: {
+        type: new GraphQLList(UserType),
+        resolve: () => users
+    },
+    user: {
+        type: UserType,
+        args: {
+            id: { type: new GraphQLNonNull(GraphQLString) }
+        },
+        resolve: (_, args) => users.find(u => u.id === args.id)
+    }
+};
+
+export const mutations = {
+    createUser: {
+        type: UserType,
+        args: {
+            name: { type: new GraphQLNonNull(GraphQLString) },
+            email: { type: new GraphQLNonNull(GraphQLString) }
+        },
+        resolve: (_, args) => {
+            const newUser = { id: String(users.length + 1), name: args.name, email: args.email };
+            users.push(newUser);
+            return newUser;
+        }
+    }
+};
+`,
+        "schema.ts": `import { GraphQLSchema, GraphQLObjectType } from "graphql";
+import { queries, mutations } from "./resolvers${ext}";
+
+const Query = new GraphQLObjectType({
+    name: "Query",
+    fields: queries
+});
+
+const Mutation = new GraphQLObjectType({
+    name: "Mutation",
+    fields: mutations
+});
+
+export const graphqlSchema = new GraphQLSchema({ query: Query, mutation: Mutation });
+`
+    };
+}

package/src/templates/index.ts

@@ -25,5 +25,8 @@ export { getExampleCronJob } from "./cronjobs.js";
 // Docker
 export { getDockerfile, getDockerCompose } from "./docker.js";
 
+// GraphQL
+export { getGraphQLFiles } from "./graphql.js";
+
 // Misc
 export { getGitignore, getDockerIgnore } from "./misc.js";

package/src/templates/packageJson.ts

@@ -16,7 +16,7 @@ export function generateJWTKeys(): JWTKeys {
 
 export function getTypeScriptPackageJson(name: string, telemetry: string, swagger: boolean, graphql: boolean) {
     const deps: Record<string, string> = {
-        "sprint-es": "^0.0.82"
+        "sprint-es": "^0.0.84"
     };
 
     const devDeps: Record<string, string> = {
@@ -56,7 +56,7 @@ export function getTypeScriptPackageJson(name: string, telemetry: string, swagge
 
 export function getJavaScriptPackageJson(name: string, telemetry: string, swagger: boolean, graphql: boolean) {
     const deps: Record<string, string> = {
-        "sprint-es": "^0.0.82"
+        "sprint-es": "^0.0.84"
     };
 
     if (telemetry === "sentry" || telemetry === "glitchtip") deps["@sentry/node"] = "^8.0.0";

package/src/templates/routes.ts

@@ -1,66 +1,13 @@
 export function getMainFile(language: string, graphql: boolean = false) {
-    if (language === "typescript") {
+    const isTs = language === "typescript";
+    const ext = isTs ? "" : ".js";
+    
+    if (isTs) {
         if (graphql) {
             return `import Sprint from "sprint-es";
-import { config } from "./sprint.config.js";
-import { GraphQLSchema, GraphQLObjectType, GraphQLString, GraphQLList, GraphQLNonNull } from "graphql";
-
-const users = [
-    { id: "1", name: "John Doe", email: "john@example.com" },
-    { id: "2", name: "Jane Smith", email: "jane@example.com" }
-];
-
-const UserType = new GraphQLObjectType({
-    name: "User",
-    fields: {
-        id: { type: new GraphQLNonNull(GraphQLString) },
-        name: { type: GraphQLString },
-        email: { type: GraphQLString }
-    }
-});
-
-const Query = new GraphQLObjectType({
-    name: "Query",
-    fields: {
-        hello: {
-            type: GraphQLString,
-            resolve: () => "Hello, GraphQL!"
-        },
-        users: {
-            type: new GraphQLList(UserType),
-            resolve: () => users
-        },
-        user: {
-            type: UserType,
-            args: {
-                id: { type: new GraphQLNonNull(GraphQLString) }
-            },
-            resolve: (_, args) => users.find(u => u.id === args.id)
-        }
-    }
-});
-
-const Mutation = new GraphQLObjectType({
-    name: "Mutation",
-    fields: {
-        createUser: {
-            type: UserType,
-            args: {
-                name: { type: new GraphQLNonNull(GraphQLString) },
-                email: { type: new GraphQLNonNull(GraphQLString) }
-            },
-            resolve: (_, args) => {
-                const newUser = { id: String(users.length + 1), name: args.name, email: args.email };
-                users.push(newUser);
-                return newUser;
-            }
-        }
-    }
-});
+import { graphqlSchema } from "./graphql/schema";
 
-const graphqlSchema = new GraphQLSchema({ query: Query, mutation: Mutation });
-
-const app = new Sprint(config);
+const app = new Sprint();
 app.setGraphQLSchema(graphqlSchema);
 `;
         }
@@ -72,65 +19,9 @@ const app = new Sprint();
 
     if (graphql) {
         return `import Sprint from "sprint-es";
-import { config } from "./sprint.config.js";
-import { GraphQLSchema, GraphQLObjectType, GraphQLString, GraphQLList, GraphQLNonNull } from "graphql";
-
-const users = [
-    { id: "1", name: "John Doe", email: "john@example.com" },
-    { id: "2", name: "Jane Smith", email: "jane@example.com" }
-];
-
-const UserType = new GraphQLObjectType({
-    name: "User",
-    fields: {
-        id: { type: new GraphQLNonNull(GraphQLString) },
-        name: { type: GraphQLString },
-        email: { type: GraphQLString }
-    }
-});
-
-const Query = new GraphQLObjectType({
-    name: "Query",
-    fields: {
-        hello: {
-            type: GraphQLString,
-            resolve: () => "Hello, GraphQL!"
-        },
-        users: {
-            type: new GraphQLList(UserType),
-            resolve: () => users
-        },
-        user: {
-            type: UserType,
-            args: {
-                id: { type: new GraphQLNonNull(GraphQLString) }
-            },
-            resolve: (_, args) => users.find(u => u.id === args.id)
-        }
-    }
-});
-
-const Mutation = new GraphQLObjectType({
-    name: "Mutation",
-    fields: {
-        createUser: {
-            type: UserType,
-            args: {
-                name: { type: new GraphQLNonNull(GraphQLString) },
-                email: { type: new GraphQLNonNull(GraphQLString) }
-            },
-            resolve: (_, args) => {
-                const newUser = { id: String(users.length + 1), name: args.name, email: args.email };
-                users.push(newUser);
-                return newUser;
-            }
-        }
-    }
-});
-
-const graphqlSchema = new GraphQLSchema({ query: Query, mutation: Mutation });
+import { graphqlSchema } from "./graphql/schema.js";
 
-const app = new Sprint(config);
+const app = new Sprint();
 app.setGraphQLSchema(graphqlSchema);
 `;
     }