pastoria 1.0.8 → 1.0.9

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # pastoria
 
+## 1.0.9
+
+### Patch Changes
+
+- 60ab948: Add support for routing shorthands
+- 37afd6c: Add support for @serverRoute
+
 ## 1.0.8
 
 ### Patch Changes

package/dist/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,YAAY,EACZ,KAAK,uBAAuB,EAE7B,MAAM,MAAM,CAAC;AA0Gd,eAAO,MAAM,YAAY,EAAE,uBAK1B,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,uBAM1B,CAAC;AAEF,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,uBAAuB,GAChC,YAAY,CAyBd;AAED,wBAAsB,WAAW,kBAUhC"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,YAAY,EACZ,KAAK,uBAAuB,EAE7B,MAAM,MAAM,CAAC;AA8Id,eAAO,MAAM,YAAY,EAAE,uBAK1B,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,uBAM1B,CAAC;AAEF,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,uBAAuB,GAChC,YAAY,CAyBd;AAED,wBAAsB,WAAW,kBAUhC"}

package/dist/build.js

@@ -1,10 +1,9 @@
-import react from '@vitejs/plugin-react';
 import tailwindcss from '@tailwindcss/vite';
+import react from '@vitejs/plugin-react';
 import { access } from 'node:fs/promises';
-import * as path from 'node:path';
-import { cjsInterop } from 'vite-plugin-cjs-interop';
 import { build, } from 'vite';
-function generateClientEntry(hasAppRoot) {
+import { cjsInterop } from 'vite-plugin-cjs-interop';
+function generateClientEntry({ hasAppRoot }) {
     const appImport = hasAppRoot
         ? `import {App} from '#genfiles/router/app_root';`
         : '';
@@ -22,11 +21,17 @@ async function main() {
 main();
 `;
 }
-function generateServerEntry(hasAppRoot) {
+function generateServerEntry({ hasAppRoot, hasServerHandler, }) {
     const appImport = hasAppRoot
         ? `import {App} from '#genfiles/router/app_root';`
         : '';
     const appValue = hasAppRoot ? 'App' : 'null';
+    const serverHandlerImport = hasServerHandler
+        ? `import {router as serverHandler} from '#genfiles/router/server_handler';`
+        : '';
+    const serverHandlerUse = hasServerHandler
+        ? '  router.use(serverHandler)'
+        : '';
     return `// Generated by Pastoria.
 import {JSResource} from '#genfiles/router/js_resource';
 import {
@@ -37,6 +42,8 @@ import {
 import {getSchema} from '#genfiles/schema/schema';
 import {Context} from '#genfiles/router/context';
 ${appImport}
+${serverHandlerImport}
+import express from 'express';
 import {GraphQLSchema, specifiedDirectives} from 'graphql';
 import {PastoriaConfig} from 'pastoria-config';
 import {createRouterHandler} from 'pastoria-runtime/server';
@@ -53,7 +60,7 @@ export function createHandler(
   config: Required<PastoriaConfig>,
   manifest?: Manifest,
 ) {
-  return createRouterHandler(
+  const routeHandler = createRouterHandler(
     listRoutes(),
     JSResource.srcOfModuleId,
     router__loadEntryPoint,
@@ -65,9 +72,37 @@ export function createHandler(
     config,
     manifest,
   );
+
+  const router = express.Router();
+  router.use(routeHandler);
+  ${serverHandlerUse}
+
+  return router;
 }
 `;
 }
+async function determineCapabilities() {
+    const capabilities = {
+        hasAppRoot: false,
+        hasServerHandler: false,
+    };
+    async function hasAppRoot() {
+        try {
+            await access('__generated__/router/app_root.ts');
+            capabilities.hasAppRoot = true;
+        }
+        catch { }
+    }
+    async function hasServerHandler() {
+        try {
+            await access('__generated__/router/server_handler.ts');
+            capabilities.hasServerHandler = true;
+        }
+        catch { }
+    }
+    await Promise.all([hasAppRoot(), hasServerHandler()]);
+    return capabilities;
+}
 function pastoriaEntryPlugin() {
     const clientEntryModuleId = 'virtual:pastoria-entry-client.tsx';
     const serverEntryModuleId = 'virtual:pastoria-entry-server.tsx';
@@ -82,20 +117,12 @@ function pastoriaEntryPlugin() {
             }
         },
         async load(id) {
-            const appRootPath = path.join(process.cwd(), '__generated__/router/app_root.ts');
-            let hasAppRoot = false;
-            try {
-                await access(appRootPath);
-                hasAppRoot = true;
-            }
-            catch {
-                hasAppRoot = false;
-            }
+            const capabilities = await determineCapabilities();
             if (id === clientEntryModuleId) {
-                return generateClientEntry(hasAppRoot);
+                return generateClientEntry(capabilities);
             }
             else if (id === serverEntryModuleId) {
-                return generateServerEntry(hasAppRoot);
+                return generateServerEntry(capabilities);
             }
         },
     };

package/dist/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"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"}

package/dist/generate.d.ts

@@ -20,6 +20,7 @@
  * - Add @resource <resource-name> to exports for lazy loading
  * - Add @appRoot to a component to designate it as the application root wrapper
  * - Add @gqlContext to a class extending PastoriaRootContext to provide a custom GraphQL context
+ * - Add @serverRoute to functions to add an express handler
  *
  * The generator automatically creates Zod schemas for route parameters based on
  * TypeScript types, enabling runtime validation and type safety.

package/dist/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AA6OH,wBAAsB,yBAAyB,kBA6L9C"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAyoBH,wBAAsB,yBAAyB,kBAgB9C"}

package/dist/generate.js

@@ -20,21 +20,16 @@
  * - Add @resource <resource-name> to exports for lazy loading
  * - Add @appRoot to a component to designate it as the application root wrapper
  * - Add @gqlContext to a class extending PastoriaRootContext to provide a custom GraphQL context
+ * - Add @serverRoute to functions to add an express handler
  *
  * The generator automatically creates Zod schemas for route parameters based on
  * TypeScript types, enabling runtime validation and type safety.
  */
 import { readFile } from 'node:fs/promises';
 import * as path from 'node:path';
-import { default as pc } from 'picocolors';
-import { Project, SyntaxKind, ts, TypeFlags } from 'ts-morph';
-const JS_RESOURCE_FILENAME = '__generated__/router/js_resource.ts';
-const JS_RESOURCE_TEMPLATE = path.join(import.meta.dirname, '../templates/js_resource.ts');
-const ROUTER_FILENAME = '__generated__/router/router.tsx';
-const ROUTER_TEMPLATE = path.join(import.meta.dirname, '../templates/router.tsx');
-const APP_ROOT_FILENAME = '__generated__/router/app_root.ts';
-const CONTEXT_FILENAME = '__generated__/router/context.ts';
-async function loadRouterFiles(project) {
+import pc from 'picocolors';
+import { IndentationText, Project, SyntaxKind, ts, TypeFlags, } from 'ts-morph';
+async function loadRouterTemplates(project, filename) {
     async function loadSourceFile(fileName, templateFileName) {
         const template = await readFile(templateFileName, 'utf-8');
         const warningComment = `/*
@@ -47,17 +42,20 @@ async function loadRouterFiles(project) {
             overwrite: true,
         });
     }
-    const [jsResource, router] = await Promise.all([
-        loadSourceFile(JS_RESOURCE_FILENAME, JS_RESOURCE_TEMPLATE),
-        loadSourceFile(ROUTER_FILENAME, ROUTER_TEMPLATE),
-    ]);
-    return { jsResource, router };
+    const template = path.join(import.meta.dirname, '../templates', filename);
+    const output = path.join('__generated__/router', filename);
+    return loadSourceFile(output, template);
 }
 // Regex to quickly check if a file contains any Pastoria JSDoc tags
-const PASTORIA_TAG_REGEX = /@(route|resource|appRoot|param|gqlContext)\b/;
-function collectRouterNodes(project) {
-    const resources = [];
-    const routes = [];
+const PASTORIA_TAG_REGEX = /@(route|resource|appRoot|param|gqlContext|serverRoute)\b/;
+/**
+ *
+ * @query {abc} 123
+ */
+function collectPastoriaMetadata(project) {
+    const resources = new Map();
+    const routes = new Map();
+    const serverHandlers = new Map();
     let appRoot = null;
     let gqlContext = null;
     function visitRouterNodes(sourceFile) {
@@ -72,6 +70,8 @@ function collectRouterNodes(project) {
         }
         sourceFile.getExportSymbols().forEach((symbol) => {
             let routerResource = null;
+            const resourceQueries = new Map();
+            const resourceEntryPoints = new Map();
             let routerRoute = null;
             const routeParams = new Map();
             function visitJSDocTags(tag) {
@@ -89,26 +89,46 @@ function collectRouterNodes(project) {
                 else if (typeof tag.comment === 'string') {
                     switch (tag.tagName.getText()) {
                         case 'route': {
-                            routerRoute = {
-                                routeName: tag.comment,
-                                sourceFile,
-                                symbol,
-                                params: routeParams,
-                            };
+                            routerRoute = [
+                                tag.comment,
+                                { sourceFile, symbol, params: routeParams },
+                            ];
                             break;
                         }
                         case 'resource': {
-                            routerResource = {
-                                resourceName: tag.comment,
-                                sourceFile,
-                                symbol,
-                            };
+                            routerResource = [
+                                tag.comment,
+                                {
+                                    sourceFile,
+                                    symbol,
+                                    queries: resourceQueries,
+                                    entryPoints: resourceEntryPoints,
+                                },
+                            ];
+                            break;
+                        }
+                        case 'serverRoute': {
+                            serverHandlers.set(tag.comment, { sourceFile, symbol });
+                            break;
+                        }
+                        case 'query': {
+                            const match = tag.comment.match(/^\s*\{\s*(?<query>\w+)\s*\}\s+(?<name>\w+)\s*$/)?.groups;
+                            if (match && match.query && match.name) {
+                                resourceQueries.set(match.name, match.query);
+                            }
+                            break;
+                        }
+                        case 'entrypoint': {
+                            const match = tag.comment.match(/^\s*\{\s*(?<resource>[\w#]+)\s*\}\s+(?<name>\w+)\s*$/)?.groups;
+                            if (match && match.resource && match.name) {
+                                resourceEntryPoints.set(match.name, match.resource);
+                            }
                             break;
                         }
                     }
                 }
                 else {
-                    // Handle tags without comments (like @appRoot, @gqlContext)
+                    // Handle tags without comments (like @ExportedSymbol, @gqlContext)
                     switch (tag.tagName.getText()) {
                         case 'appRoot': {
                             if (appRoot != null) {
@@ -161,14 +181,16 @@ function collectRouterNodes(project) {
                 .getDeclarations()
                 .flatMap((decl) => ts.getJSDocCommentsAndTags(decl.compilerNode))
                 .forEach(visitJSDocTags);
-            if (routerRoute != null)
-                routes.push(routerRoute);
-            if (routerResource != null)
-                resources.push(routerResource);
+            if (routerRoute != null) {
+                routes.set(routerRoute[0], routerRoute[1]);
+            }
+            if (routerResource != null) {
+                resources.set(routerResource[0], routerResource[1]);
+            }
         });
     }
     project.getSourceFiles().forEach(visitRouterNodes);
-    return { resources, routes, appRoot, gqlContext };
+    return { resources, routes, appRoot, gqlContext, serverHandlers };
 }
 function zodSchemaOfType(tc, t) {
     if (t.getFlags() & TypeFlags.String) {
@@ -201,39 +223,177 @@ function zodSchemaOfType(tc, t) {
         return `z.any()`;
     }
 }
-export async function generatePastoriaArtifacts() {
-    const targetDir = process.cwd();
-    const project = new Project({
-        tsConfigFilePath: path.join(targetDir, 'tsconfig.json'),
+function writeEntryPoint(writer, metadata, consumedQueries, resourceName, resource, parseVars = true) {
+    writer.writeLine(`root: JSResource.fromModuleId('${resourceName}'),`);
+    writer
+        .write(`getPreloadProps(${parseVars ? '{params, schema}' : ''})`)
+        .block(() => {
+        if (parseVars) {
+            writer.writeLine('const variables = schema.parse(params);');
+        }
+        writer.write('return').block(() => {
+            writer
+                .write('queries:')
+                .block(() => {
+                for (const [queryRef, query] of resource.queries.entries()) {
+                    consumedQueries.add(query);
+                    writer
+                        .write(`${queryRef}:`)
+                        .block(() => {
+                        writer.writeLine(`parameters: ${query}Parameters,`);
+                        writer.writeLine(`variables`);
+                    })
+                        .write(',');
+                }
+            })
+                .writeLine(',');
+            writer.write('entryPoints:').block(() => {
+                for (const [epRef, subresourceName,] of resource.entryPoints.entries()) {
+                    const subresource = metadata.resources.get(subresourceName);
+                    if (subresource) {
+                        writer.write(`${epRef}:`).block(() => {
+                            writer.writeLine(`entryPointParams: {},`);
+                            writer.write('entryPoint:').block(() => {
+                                writeEntryPoint(writer, metadata, consumedQueries, subresourceName, subresource, false);
+                            });
+                        });
+                    }
+                }
+            });
+        });
     });
+}
+async function generateRouter(project, metadata) {
+    const routerTemplate = await loadRouterTemplates(project, 'router.tsx');
     const tc = project.getTypeChecker().compilerObject;
-    const routerFiles = await loadRouterFiles(project);
-    const routerNodes = collectRouterNodes(project);
-    // Generate app_root.ts if @appRoot tag is found
-    const appRoot = routerNodes.appRoot;
-    if (appRoot != null) {
-        const appRootSourceFile = appRoot.sourceFile;
-        const appRootSymbol = appRoot.symbol;
-        const filePath = path.relative(targetDir, appRootSourceFile.getFilePath());
-        const appRootFile = project.createSourceFile(APP_ROOT_FILENAME, '', {
-            overwrite: true,
+    const routerConf = routerTemplate
+        .getVariableDeclarationOrThrow('ROUTER_CONF')
+        .getInitializerIfKindOrThrow(SyntaxKind.AsExpression)
+        .getExpressionIfKindOrThrow(SyntaxKind.ObjectLiteralExpression);
+    routerConf.getPropertyOrThrow('noop').remove();
+    let entryPointImportIndex = 0;
+    for (const [routeName, { sourceFile, symbol, params },] of metadata.routes.entries()) {
+        const filePath = path.relative(process.cwd(), sourceFile.getFilePath());
+        let entryPointExpression;
+        // Resource-routes are combined declarations of a resource and a route
+        // where we should generate the entrypoint for the route.
+        const isResourceRoute = Array.from(metadata.resources.entries()).find(([, { symbol: resourceSymbol }]) => symbol === resourceSymbol);
+        if (isResourceRoute) {
+            const [resourceName, resource] = isResourceRoute;
+            const entryPointFunctionName = `entrypoint_${resourceName.replace(/\W/g, '__')}`;
+            routerTemplate.addImportDeclaration({
+                moduleSpecifier: './js_resource',
+                namedImports: ['JSResource', 'ModuleType'],
+            });
+            const consumedQueries = new Set();
+            routerTemplate.addFunction({
+                name: entryPointFunctionName,
+                returnType: `EntryPoint<ModuleType<'${resourceName}'>, EntryPointParams<'${routeName}'>>`,
+                statements: (writer) => {
+                    writer.write('return ').block(() => {
+                        writeEntryPoint(writer, metadata, consumedQueries, resourceName, resource);
+                    });
+                },
+            });
+            for (const query of consumedQueries) {
+                routerTemplate.addImportDeclaration({
+                    moduleSpecifier: `#genfiles/queries/${query}$parameters`,
+                    defaultImport: `${query}Parameters`,
+                });
+            }
+            entryPointExpression = entryPointFunctionName + '()';
+        }
+        else {
+            const importAlias = `e${entryPointImportIndex++}`;
+            const moduleSpecifier = routerTemplate.getRelativePathAsModuleSpecifierTo(sourceFile.getFilePath());
+            routerTemplate.addImportDeclaration({
+                moduleSpecifier,
+                namedImports: [
+                    {
+                        name: symbol.getName(),
+                        alias: importAlias,
+                    },
+                ],
+            });
+            entryPointExpression = importAlias;
+        }
+        routerConf.addPropertyAssignment({
+            name: `"${routeName}"`,
+            initializer: (writer) => {
+                writer
+                    .write('{')
+                    .indent(() => {
+                    writer.writeLine(`entrypoint: ${entryPointExpression},`);
+                    if (params.size === 0) {
+                        writer.writeLine(`schema: z.object({})`);
+                    }
+                    else {
+                        writer.writeLine(`schema: z.object({`);
+                        for (const [paramName, paramType] of Array.from(params)) {
+                            writer.writeLine(`  ${paramName}: ${zodSchemaOfType(tc, paramType)},`);
+                        }
+                        writer.writeLine('})');
+                    }
+                })
+                    .write('} as const');
+            },
+        });
+        console.log('Created route', pc.cyan(routeName), 'for', pc.green(symbol.getName()), 'exported from', pc.yellow(filePath));
+    }
+    await routerTemplate.save();
+}
+async function generateJsResource(project, metadata) {
+    const jsResourceTemplate = await loadRouterTemplates(project, 'js_resource.ts');
+    const resourceConf = jsResourceTemplate
+        .getVariableDeclarationOrThrow('RESOURCE_CONF')
+        .getInitializerIfKindOrThrow(SyntaxKind.AsExpression)
+        .getExpressionIfKindOrThrow(SyntaxKind.ObjectLiteralExpression);
+    resourceConf.getPropertyOrThrow('noop').remove();
+    for (const [resourceName, { sourceFile, symbol },] of metadata.resources.entries()) {
+        const filePath = path.relative(process.cwd(), sourceFile.getFilePath());
+        const moduleSpecifier = jsResourceTemplate.getRelativePathAsModuleSpecifierTo(sourceFile.getFilePath());
+        resourceConf.addPropertyAssignment({
+            name: `"${resourceName}"`,
+            initializer: (writer) => {
+                writer.block(() => {
+                    writer
+                        .writeLine(`src: "${filePath}",`)
+                        .writeLine(`loader: () => import("${moduleSpecifier}").then(m => m.${symbol.getName()})`);
+                });
+            },
         });
-        const moduleSpecifier = appRootFile.getRelativePathAsModuleSpecifierTo(appRootSourceFile.getFilePath());
-        appRootFile.addStatements(`/*
+        console.log('Created resource', pc.cyan(resourceName), 'for', pc.green(symbol.getName()), 'exported from', pc.yellow(filePath));
+    }
+    await jsResourceTemplate.save();
+}
+async function generateAppRoot(project, metadata) {
+    const targetDir = process.cwd();
+    const appRoot = metadata.appRoot;
+    if (appRoot == null) {
+        await project
+            .getSourceFile('__generated__/router/app_root.ts')
+            ?.deleteImmediately();
+        return;
+    }
+    const appRootSourceFile = appRoot.sourceFile;
+    const appRootSymbol = appRoot.symbol;
+    const filePath = path.relative(targetDir, appRootSourceFile.getFilePath());
+    const appRootFile = project.createSourceFile('__generated__/router/app_root.ts', '', { overwrite: true });
+    const moduleSpecifier = appRootFile.getRelativePathAsModuleSpecifierTo(appRootSourceFile.getFilePath());
+    appRootFile.addStatements(`/*
  * This file was generated by \`pastoria\`.
  * Do not modify this file directly.
  */
 
 export {${appRootSymbol.getName()} as App} from '${moduleSpecifier}';
 `);
-        await appRootFile.save();
-        console.log('Created app root for', pc.green(appRootSymbol.getName()), 'exported from', pc.yellow(filePath));
-    }
-    // Generate context.ts
-    const gqlContext = routerNodes.gqlContext;
-    const contextFile = project.createSourceFile(CONTEXT_FILENAME, '', {
-        overwrite: true,
-    });
+    await appRootFile.save();
+    console.log('Created app root for', pc.green(appRootSymbol.getName()), 'exported from', pc.yellow(filePath));
+}
+async function generateGraphqlContext(project, metadata) {
+    const targetDir = process.cwd();
+    const gqlContext = metadata.gqlContext;
+    const contextFile = project.createSourceFile('__generated__/router/context.ts', '', { overwrite: true });
     if (gqlContext != null) {
         const contextSourceFile = gqlContext.sourceFile;
         const contextSymbol = gqlContext.symbol;
@@ -264,68 +424,45 @@ export class Context extends PastoriaRootContext {}
         console.log('No @gqlContext found, generating default', pc.green('Context'));
     }
     await contextFile.save();
-    const resourceConf = routerFiles.jsResource
-        .getVariableDeclarationOrThrow('RESOURCE_CONF')
-        .getInitializerIfKindOrThrow(SyntaxKind.AsExpression)
-        .getExpressionIfKindOrThrow(SyntaxKind.ObjectLiteralExpression);
-    resourceConf.getPropertyOrThrow('noop').remove();
-    for (const { resourceName, sourceFile, symbol } of routerNodes.resources) {
-        const filePath = path.relative(process.cwd(), sourceFile.getFilePath());
-        const moduleSpecifier = routerFiles.jsResource.getRelativePathAsModuleSpecifierTo(sourceFile.getFilePath());
-        resourceConf.addPropertyAssignment({
-            name: `"${resourceName}"`,
-            initializer: (writer) => {
-                writer.block(() => {
-                    writer
-                        .writeLine(`src: "${filePath}",`)
-                        .writeLine(`loader: () => import("${moduleSpecifier}").then(m => m.${symbol.getName()})`);
-                });
-            },
-        });
-        console.log('Created resource', pc.cyan(resourceName), 'for', pc.green(symbol.getName()), 'exported from', pc.yellow(filePath));
+}
+async function generateServerHandler(project, metadata) {
+    if (metadata.serverHandlers.size === 0) {
+        await project
+            .getSourceFile('__generated__/router/server_handler.ts')
+            ?.deleteImmediately();
+        return;
     }
-    const routerConf = routerFiles.router
-        .getVariableDeclarationOrThrow('ROUTER_CONF')
-        .getInitializerIfKindOrThrow(SyntaxKind.AsExpression)
-        .getExpressionIfKindOrThrow(SyntaxKind.ObjectLiteralExpression);
-    routerConf.getPropertyOrThrow('noop').remove();
-    let entryPointImportIndex = 0;
-    for (const { routeName, sourceFile, symbol, params } of routerNodes.routes) {
-        const importAlias = `e${entryPointImportIndex++}`;
+    const sourceText = `import express from 'express';
+export const router = express.Router();
+`;
+    const serverHandlerTemplate = project.createSourceFile('__generated__/router/server_handler.ts', sourceText, { overwrite: true });
+    let serverHandlerImportIndex = 0;
+    for (const [routeName, { symbol, sourceFile },] of metadata.serverHandlers.entries()) {
+        const importAlias = `e${serverHandlerImportIndex++}`;
         const filePath = path.relative(process.cwd(), sourceFile.getFilePath());
-        const moduleSpecifier = routerFiles.router.getRelativePathAsModuleSpecifierTo(sourceFile.getFilePath());
-        routerFiles.router.addImportDeclaration({
+        const moduleSpecifier = serverHandlerTemplate.getRelativePathAsModuleSpecifierTo(sourceFile.getFilePath());
+        serverHandlerTemplate.addImportDeclaration({
             moduleSpecifier,
-            namedImports: [
-                {
-                    name: symbol.getName(),
-                    alias: importAlias,
-                },
-            ],
-        });
-        routerConf.addPropertyAssignment({
-            name: `"${routeName}"`,
-            initializer: (writer) => {
-                writer
-                    .write('{')
-                    .indent(() => {
-                    writer.writeLine(`entrypoint: ${importAlias},`);
-                    if (params.size === 0) {
-                        writer.writeLine(`schema: z.object({})`);
-                    }
-                    else {
-                        writer.writeLine(`schema: z.object({`);
-                        for (const [paramName, paramType] of Array.from(params)) {
-                            writer.writeLine(`  ${paramName}: ${zodSchemaOfType(tc, paramType)},`);
-                        }
-                        writer.writeLine('})');
-                    }
-                })
-                    .write('} as const');
-            },
+            namedImports: [{ name: symbol.getName(), alias: importAlias }],
         });
-        console.log('Created route', pc.cyan(routeName), 'for', pc.green(symbol.getName()), 'exported from', pc.yellow(filePath));
+        serverHandlerTemplate.addStatements(`router.use('${routeName}', ${importAlias})`);
+        console.log('Created server handler', pc.cyan(routeName), 'for', pc.green(symbol.getName()), 'exported from', pc.yellow(filePath));
     }
-    await Promise.all([routerFiles.jsResource.save(), routerFiles.router.save()]);
+    await serverHandlerTemplate.save();
+}
+export async function generatePastoriaArtifacts() {
+    const targetDir = process.cwd();
+    const project = new Project({
+        tsConfigFilePath: path.join(targetDir, 'tsconfig.json'),
+        manipulationSettings: {
+            indentationText: IndentationText.TwoSpaces,
+        },
+    });
+    const metadata = collectPastoriaMetadata(project);
+    await generateAppRoot(project, metadata);
+    await generateGraphqlContext(project, metadata);
+    await generateRouter(project, metadata);
+    await generateJsResource(project, metadata);
+    await generateServerHandler(project, metadata);
 }
 //# sourceMappingURL=generate.js.map