vyriy 0.4.6 → 0.4.8

package/commands/check-env.js

@@ -2,6 +2,7 @@ import { exec as processExec } from 'node:child_process';
 import { promisify } from 'node:util';
 import packageJson from '../package.json' with { type: 'json' };
 const exec = promisify(processExec);
+const yarnStableHint = 'Try:\n  corepack enable\n  corepack prepare yarn@stable --activate';
 const node = () => {
     const majorVersion = Number.parseInt(process.versions.node.split('.')[0]);
     const minimumMajorVersion = Number.parseInt(packageJson.engines.node.match(/(\d+)/)?.[0]);
@@ -18,6 +19,39 @@ const node = () => {
         message: `Vyriy requires Node.js >= ${minimumMajorVersion}.\n\nCurrent version: ${process.versions.node}\n\nPlease upgrade Node.js and run the command again.`,
     };
 };
+const corepack = async () => {
+    let currentVersion;
+    try {
+        const { stdout } = await exec('corepack --version');
+        currentVersion = stdout.trim();
+    }
+    catch {
+        return {
+            ok: false,
+            message: `Corepack was not found.\n\nVyriy uses Corepack to install Yarn stable.\n\nInstall a Node.js distribution that includes Corepack and run the command again.`,
+        };
+    }
+    return {
+        ok: true,
+        message: `Corepack ${currentVersion}`,
+    };
+};
+const activateYarnStable = async () => {
+    try {
+        await exec('corepack enable');
+        await exec('corepack prepare yarn@stable --activate');
+    }
+    catch {
+        return {
+            ok: false,
+            message: `Corepack could not activate Yarn stable.\n\n${yarnStableHint}`,
+        };
+    }
+    return {
+        ok: true,
+        message: 'Yarn stable activated',
+    };
+};
 const yarn = async () => {
     const minimumMajorVersion = Number.parseInt(packageJson.packageManager.match(/(\d+)/)?.[0]);
     let currentVersion;
@@ -28,7 +62,7 @@ const yarn = async () => {
     catch {
         return {
             ok: false,
-            message: `Yarn was not found.\n\nVyriy requires Yarn >= ${minimumMajorVersion}.\n\nTry:\n  corepack enable\n  yarn set version stable`,
+            message: `Yarn was not found.\n\nVyriy requires Yarn >= ${minimumMajorVersion}.\n\n${yarnStableHint}`,
         };
     }
     const majorVersion = Number.parseInt(currentVersion.match(/(\d+)/)?.[0]);
@@ -40,7 +74,7 @@ const yarn = async () => {
     }
     return {
         ok: false,
-        message: `Vyriy requires Yarn >= ${minimumMajorVersion}.\n\nCurrent version: ${currentVersion}\n\nTry:\n  corepack enable\n  yarn set version stable`,
+        message: `Vyriy requires Yarn >= ${minimumMajorVersion}.\n\nCurrent version: ${currentVersion}\n\n${yarnStableHint}`,
     };
 };
 export const checkEnv = async () => {
@@ -53,7 +87,28 @@ export const checkEnv = async () => {
         console.error(nodeResults.message);
         return 1;
     }
-    const yarnResults = await yarn();
+    const corepackResults = await corepack();
+    if (corepackResults.ok) {
+        console.log(' ', corepackResults.message);
+    }
+    else {
+        console.error(corepackResults.message);
+        return 1;
+    }
+    let yarnResults = await yarn();
+    if (yarnResults.ok) {
+        console.log(' ', yarnResults.message);
+        return 0;
+    }
+    const yarnStableResults = await activateYarnStable();
+    if (yarnStableResults.ok) {
+        console.log(' ', yarnStableResults.message);
+    }
+    else {
+        console.error(yarnStableResults.message);
+        return 1;
+    }
+    yarnResults = await yarn();
     if (yarnResults.ok) {
         console.log(' ', yarnResults.message);
     }

package/commands/create/index.js

@@ -57,6 +57,18 @@ const writeFiles = (target, files, overwrite) => {
         }
     });
 };
+const verifyProject = async (target) => {
+    console.log('Running checks...');
+    try {
+        await exec(`yarn --cwd ${target} check`);
+    }
+    catch {
+        console.log('Running fixes...');
+        await exec(`yarn --cwd ${target} fix`);
+        console.log('Running checks...');
+        await exec(`yarn --cwd ${target} check`);
+    }
+};
 export const create = async (options) => {
     const { directory, dryRun, overwrite, skipExisting, install, verify } = options;
     const checkEnvCode = await checkEnv();
@@ -107,8 +119,7 @@ export const create = async (options) => {
             return 0;
         }
         if (verify) {
-            console.log('Running checks...');
-            await exec(`yarn --cwd ${target} check`);
+            await verifyProject(target);
         }
         else {
             console.log('Running checks... SKIPPED');

package/commands/create/plan/plan.d.ts

@@ -2,7 +2,7 @@ export declare const plan: (dirName: string, appPath: string) => Promise<{
     name: string;
     description: string;
     target: string;
-    preset: "ssr" | "base" | "rest" | "api" | "library" | "ssg" | "spa";
+    preset: "ssr" | "base" | "rest" | "api" | "library" | "gql" | "ssg" | "spa";
     scope: string | undefined;
     ci: import("../preset/types.js").CiProvider | undefined;
     deploy: import("../preset/types.js").DeployProvider | undefined;

package/commands/create/preset/api.js

@@ -48,7 +48,6 @@ export const api = {
                 '@vyriy/storybook-config': `^${packageJson.version}`,
                 storybook: packageJson.peerDependencies.storybook,
                 '@vyriy/path': `^${packageJson.version}`,
-                vyriy: `^${packageJson.version}`,
                 husky: packageJson.peerDependencies.husky,
                 'npm-run-all2': packageJson.peerDependencies['npm-run-all2'],
                 'cross-env': packageJson.peerDependencies['cross-env'],
@@ -57,7 +56,6 @@ export const api = {
                 '@vyriy/handler': `^${packageJson.version}`,
                 '@vyriy/server': `^${packageJson.version}`,
                 tsx: packageJson.peerDependencies.tsx,
-                webpack: packageJson.peerDependencies.webpack,
                 'webpack-cli': packageJson.peerDependencies['webpack-cli'],
             },
         }, null, 2) + '\n',

package/commands/create/preset/gql.js

@@ -1,16 +1,750 @@
+import packageJson from '../../../package.json' with { type: 'json' };
 import { base } from './base.js';
 export const gql = {
     files: (options) => ({
         ...base.files(options),
+        'package.json': JSON.stringify({
+            name: options.name,
+            version: '0.0.0',
+            description: options.description,
+            private: true,
+            type: 'module',
+            agents: './AGENTS.md',
+            packageManager: packageJson.packageManager,
+            engines: {
+                node: packageJson.engines.node,
+            },
+            workspaces: [
+                'packages/*',
+                'workspaces/*',
+            ],
+            scripts: {
+                storybook: 'cross-env STORYBOOK_DISABLE_TELEMETRY=1 storybook dev -p 6006 --disable-telemetry',
+                check: 'run-s lint build test',
+                fix: "run-s 'fix:*'",
+                start: "run-p 'start:*'",
+                lint: "run-s 'lint:*'",
+                build: "run-s 'build:*'",
+                test: "run-s 'test:*'",
+                'fix:prettier': 'prettier . --write',
+                'fix:eslint': 'eslint . --fix',
+                'start:graphql': 'sh workspaces/graphql/bin/start.sh',
+                'lint:ts': 'tsc',
+                'lint:prettier': 'prettier . --check',
+                'lint:eslint': 'eslint .',
+                'build:graphql': 'rimraf dist && sh workspaces/graphql/bin/build.sh',
+                'build:storybook': 'cross-env STORYBOOK_DISABLE_TELEMETRY=1 storybook build --quiet --disable-telemetry',
+                'test:jest': 'jest',
+                postinstall: 'husky',
+            },
+            dependencies: {
+                '@vyriy/typescript-config': `^${packageJson.version}`,
+                typescript: packageJson.peerDependencies.typescript,
+                '@vyriy/prettier-config': `^${packageJson.version}`,
+                prettier: packageJson.peerDependencies.prettier,
+                '@vyriy/eslint-config': `^${packageJson.version}`,
+                eslint: packageJson.peerDependencies.eslint,
+                '@vyriy/jest-config': `^${packageJson.version}`,
+                jest: packageJson.peerDependencies.jest,
+                '@vyriy/storybook-config': `^${packageJson.version}`,
+                storybook: packageJson.peerDependencies.storybook,
+                '@vyriy/path': `^${packageJson.version}`,
+                husky: packageJson.peerDependencies.husky,
+                'npm-run-all2': packageJson.peerDependencies['npm-run-all2'],
+                'cross-env': packageJson.peerDependencies['cross-env'],
+                rimraf: packageJson.peerDependencies.rimraf,
+                '@vyriy/webpack-config': `^${packageJson.version}`,
+                '@vyriy/handler': `^${packageJson.version}`,
+                '@vyriy/server': `^${packageJson.version}`,
+                '@vyriy/router': `^${packageJson.version}`,
+                tsx: packageJson.peerDependencies.tsx,
+                'webpack-cli': packageJson.peerDependencies['webpack-cli'],
+                graphql: packageJson.peerDependencies.graphql,
+                '@vyriy/html': `^${packageJson.version}`,
+            },
+        }, null, 2) + '\n',
+        'packages/graphql/doc.mdx': `import { Meta, Markdown } from '@storybook/addon-docs/blocks';
+import ReadMe from './README.md?raw';
+
+<Meta title="Packages/GraphQL" />
+
+<Markdown>{ReadMe}</Markdown>
+`,
+        'packages/graphql/graphiql.test.ts': `import { describe, expect, it } from '@jest/globals';
+
+import { graphiql } from './graphiql.js';
+
+describe('packages/graphql/graphiql.ts', () => {
+  it('returns the embedded GraphiQL HTML page', () => {
+    const page = graphiql();
+
+    expect(page).toContain('<html lang="en">');
+    expect(page).toContain('<title>GraphiQL</title>');
+    expect(page).toContain('<meta charset="UTF-8"');
+    expect(page).toContain('<div id="graphiql"><div class="loading">Loading');
+    expect(page).toContain('https://esm.sh/graphiql@5.2.2/dist/style.css');
+    expect(page).toContain('https://esm.sh/@graphiql/plugin-explorer@5.1.1/dist/style.css');
+    expect(page).toContain('<script type="importmap">');
+    expect(page).toContain('"graphiql": "https://esm.sh/graphiql@5.2.2?standalone');
+    expect(page).toContain('const fetcher = createGraphiQLFetcher({');
+    expect(page).toContain("url: 'http://localhost:3000'");
+    expect(page).toContain('root.render(React.createElement(App));');
+  });
+});
+`,
+        'packages/graphql/graphiql.ts': `import { html, minify } from '@vyriy/html';
+
+export const graphiql = () =>
+  minify(
+    html({
+      htmlAttributes: 'lang="en"',
+      title: '<title>GraphiQL</title>',
+      meta: '<meta charset="UTF-8" /><meta name="viewport" content="width=device-width, initial-scale=1.0" />',
+      link: [
+        \`<link
+          rel="stylesheet"
+          href="https://esm.sh/graphiql@5.2.2/dist/style.css"
+          integrity="sha384-f6GHLfCwoa4MFYUMd3rieGOsIVAte/evKbJhMigNdzUf52U9bV2JQBMQLke0ua+2"
+          crossorigin="anonymous"
+        />\`,
+        \`<link
+          rel="stylesheet"
+          href="https://esm.sh/@graphiql/plugin-explorer@5.1.1/dist/style.css"
+          integrity="sha384-vTFGj0krVqwFXLB7kq/VHR0/j2+cCT/B63rge2mULaqnib2OX7DVLUVksTlqvMab"
+          crossorigin="anonymous"
+        />\`,
+      ].join(''),
+      style: \`<style>
+          body {
+            margin: 0;
+          }
+
+          #graphiql {
+            height: 100dvh;
+          }
+
+          .loading {
+            height: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 4rem;
+          }
+        </style>\`,
+      script: [
+        \`<script type="importmap">
+          {
+            "imports": {
+              "react": "https://esm.sh/react@19.2.5",
+              "react/": "https://esm.sh/react@19.2.5/",
+              "react-dom": "https://esm.sh/react-dom@19.2.5",
+              "react-dom/": "https://esm.sh/react-dom@19.2.5/",
+              "graphiql": "https://esm.sh/graphiql@5.2.2?standalone&external=react,react-dom,@graphiql/react,graphql",
+              "graphiql/": "https://esm.sh/graphiql@5.2.2/",
+              "@graphiql/plugin-explorer": "https://esm.sh/@graphiql/plugin-explorer@5.1.1?standalone&external=react,@graphiql/react,graphql",
+              "@graphiql/react": "https://esm.sh/@graphiql/react@0.37.3?standalone&external=react,react-dom,graphql,@graphiql/toolkit,@emotion/is-prop-valid",
+              "@graphiql/toolkit": "https://esm.sh/@graphiql/toolkit@0.11.3?standalone&external=graphql",
+              "graphql": "https://esm.sh/graphql@16.13.2",
+              "@emotion/is-prop-valid": "data:text/javascript,"
+            },
+            "integrity": {
+              "https://esm.sh/react@19.2.5": "sha384-ZNmUQ9QQgyl95nnD/FJTBQn2ZEPTbWtMuWCXTKWNuF6Si7nC+6bvSgk5LWu+ELHn",
+              "https://esm.sh/react-dom@19.2.5": "sha384-qtNxBzn9gBs3CmJItMuvIVyjW3VIU0/rzGhCm9MippVU1BpR/c4VgaFYDIg/FrY2",
+              "https://esm.sh/graphiql@5.2.2": "sha384-MBVZMq1pmz8DwpwIWPWLk2tmS6tGiSi6WwbXvy9NhuDYASAAWd2m96xbxLqszig9",
+              "https://esm.sh/graphiql@5.2.2?standalone&external=react,react-dom,@graphiql/react,graphql": "sha384-SzHBEbcQfhvmwqh5Vtat9k7b/kIzmdVO3KMzQiAYwcxCA9x7vZwFRUgjzN1AeV3q",
+              "https://esm.sh/@graphiql/plugin-explorer@5.1.1": "sha384-83REbLb9KtIhL/6J1n91SLoP0648KOKZLIDdHRx/a0E7T3ajq6PzKz+815SCfN52",
+              "https://esm.sh/@graphiql/react@0.37.3?standalone&external=react,react-dom,graphql,@graphiql/toolkit,@emotion/is-prop-valid": "sha384-iZsbTy9B0VcX2BOTdqMuX0uJ9Hff5GbG2QeOt4OeMp0GHza76dwQaYQYNYkZkIVq",
+              "https://esm.sh/@graphiql/toolkit@0.11.3?standalone&external=graphql": "sha384-ZsnupyYmzpNjF1Z/81zwi4nV352n4P7vm0JOFKiYnAwVGOf9twnEMnnxmxabMBXe",
+              "https://esm.sh/graphql@16.13.2": "sha384-TQg9alwG3P9fzBErDW011vKuyTnrwpBZsl3SdMAh6DwBcv9ezFOl0djGI/68VOyy"
+            }
+          }
+        </script>\`,
+        \`<script type="module">
+          import React from 'react';
+          import ReactDOM from 'react-dom/client';
+          import { GraphiQL, HISTORY_PLUGIN } from 'graphiql';
+          import { createGraphiQLFetcher } from '@graphiql/toolkit';
+          import { explorerPlugin } from '@graphiql/plugin-explorer';
+          import 'graphiql/setup-workers/esm.sh';
+
+          const fetcher = createGraphiQLFetcher({
+            url: 'http://localhost:3000',
+          });
+          const plugins = [HISTORY_PLUGIN, explorerPlugin()];
+
+          function App() {
+            return React.createElement(GraphiQL, {
+              fetcher,
+              plugins,
+              defaultEditorToolsVisibility: true,
+            });
+          }
+
+          const container = document.getElementById('graphiql');
+          const root = ReactDOM.createRoot(container);
+          root.render(React.createElement(App));
+        </script>\`,
+      ].join(''),
+      body: '<div id="graphiql"><div class="loading">Loading…</div></div>',
     }),
-    ci: {
-        github: {
-            '.gitlab-ci.yml': 'code',
+  );
+`,
+        'packages/graphql/index.test.ts': `import { describe, expect, it } from '@jest/globals';
+
+import { router } from './router.js';
+
+describe('packages/graphql/index.ts', () => {
+  it('re-exports the GraphQL router', async () => {
+    await expect(import('./index.js')).resolves.toMatchObject({
+      router,
+    });
+  });
+});
+`,
+        'packages/graphql/index.ts': "export * from './router.js';\n",
+        'packages/graphql/package.json': `{
+  "name": "@p/graphql",
+  "type": "module",
+  "private": true
+}
+`,
+        'packages/graphql/README.md': `# @p/graphql
+
+Reusable GraphQL API package for the application.
+
+## Exports
+
+- \`router\` - an \`@vyriy/router\` instance that serves the GraphiQL page and GraphQL HTTP requests.
+
+## Routes
+
+### \`GET /\`
+
+Returns an embedded GraphiQL page for exploring the schema in a browser.
+
+### \`POST /\`
+
+The router expects a JSON body with a GraphQL request:
+
+\`\`\`json
+{
+  "query": "{ hello }",
+  "variables": {},
+  "operationName": "Hello"
+}
+\`\`\`
+
+Invalid JSON or an empty body returns \`400\` with \`Invalid JSON body\`. A body without \`query\` returns \`400\` with \`Missing GraphQL query\`.
+
+## Schema
+
+The package schema currently supports:
+
+- \`hello: String\`
+- \`test: Test\`
+- \`ping(message: String): String\`
+
+Example mutation:
+
+\`\`\`graphql
+mutation Ping($message: String) {
+  ping(message: $message)
+}
+\`\`\`
+`,
+        'packages/graphql/router.test.ts': `import { describe, expect, it } from '@jest/globals';
+import type { APIGatewayProxyEvent, APIGatewayProxyResult } from '@vyriy/router';
+
+import { router } from './router.js';
+
+type GraphQLBody = {
+  data?: Record<string, unknown> | null;
+  errors?: Array<{
+    message: string;
+  }>;
+};
+
+const getPostEvent = (
+  body: string | null,
+  headers: APIGatewayProxyEvent['headers'] | null = {
+    authorization: 'Bearer token',
+  },
+): APIGatewayProxyEvent =>
+  ({
+    body,
+    headers,
+    httpMethod: 'POST',
+    path: '/',
+    pathParameters: null,
+    queryStringParameters: null,
+  }) as unknown as APIGatewayProxyEvent;
+
+const getEvent = (path = '/'): APIGatewayProxyEvent =>
+  ({
+    body: null,
+    headers: {},
+    httpMethod: 'GET',
+    path,
+    pathParameters: null,
+    queryStringParameters: null,
+  }) as unknown as APIGatewayProxyEvent;
+
+const parseBody = <Value>(response: APIGatewayProxyResult): Value => JSON.parse(response.body) as Value;
+
+describe('packages/graphql/router.ts', () => {
+  it('serves the embedded GraphiQL page', async () => {
+    const response = await router.route(getEvent());
+
+    expect(response.statusCode).toBe(200);
+    expect(response.headers).toEqual({
+      'Content-Type': 'text/html; charset=UTF-8',
+    });
+    expect(response.body).toContain('<title>GraphiQL</title>');
+    expect(response.body).toContain('<div id="graphiql">');
+  });
+
+  it('executes GraphQL requests', async () => {
+    const response = await router.route(
+      getPostEvent(
+        JSON.stringify({
+          query: 'query Hello { hello }',
+          operationName: 'Hello',
+        }),
+      ),
+    );
+
+    expect(response.statusCode).toBe(200);
+    expect(parseBody<GraphQLBody>(response)).toEqual({
+      data: {
+        hello: 'Hello from GraphQL',
+      },
+    });
+  });
+
+  it('passes variables to GraphQL execution', async () => {
+    const response = await router.route(
+      getPostEvent(
+        JSON.stringify({
+          query: 'mutation Ping($message: String) { ping(message: $message) }',
+          variables: {
+            message: 'from router',
+          },
+        }),
+      ),
+    );
+
+    expect(response.statusCode).toBe(200);
+    expect(parseBody<GraphQLBody>(response)).toEqual({
+      data: {
+        ping: 'pong: from router',
+      },
+    });
+  });
+
+  it('executes GraphQL requests without request headers', async () => {
+    const response = await router.route(
+      getPostEvent(
+        JSON.stringify({
+          query: '{ test { ok message } }',
+        }),
+        null,
+      ),
+    );
+
+    expect(response.statusCode).toBe(200);
+    expect(parseBody<GraphQLBody>(response)).toEqual({
+      data: {
+        test: {
+          ok: true,
+          message: 'GraphQL works',
+        },
+      },
+    });
+  });
+
+  it('rejects missing bodies', async () => {
+    await expect(router.route(getPostEvent(null))).resolves.toEqual({
+      body: JSON.stringify({
+        errors: [{ message: 'Invalid JSON body' }],
+      }),
+      statusCode: 400,
+    });
+  });
+
+  it('rejects invalid JSON bodies', async () => {
+    await expect(router.route(getPostEvent('{'))).resolves.toEqual({
+      body: JSON.stringify({
+        errors: [{ message: 'Invalid JSON body' }],
+      }),
+      statusCode: 400,
+    });
+  });
+
+  it('rejects bodies without a GraphQL query', async () => {
+    await expect(router.route(getPostEvent(JSON.stringify({ variables: {} })))).resolves.toEqual({
+      body: JSON.stringify({
+        errors: [{ message: 'Missing GraphQL query' }],
+      }),
+      statusCode: 400,
+    });
+  });
+});
+`,
+        'packages/graphql/router.ts': `import { createRouter } from '@vyriy/router';
+
+import { graphql } from 'graphql';
+
+import { graphiql } from './graphiql.js';
+import { schema } from './schema.js';
+
+export const router = createRouter();
+
+router.get('/', () => ({
+  headers: {
+    'Content-Type': 'text/html; charset=UTF-8',
+  },
+  body: graphiql(),
+}));
+
+router.post('/', async (params) => {
+  let payload: {
+    query?: string;
+    variables?: Record<string, unknown>;
+    operationName?: string;
+  };
+
+  if (!params.body) {
+    return {
+      statusCode: 400,
+      body: JSON.stringify({
+        errors: [{ message: 'Invalid JSON body' }],
+      }),
+    };
+  }
+
+  try {
+    payload = JSON.parse(params.body) as typeof payload;
+  } catch {
+    return {
+      statusCode: 400,
+      body: JSON.stringify({
+        errors: [{ message: 'Invalid JSON body' }],
+      }),
+    };
+  }
+
+  if (!payload.query) {
+    return {
+      statusCode: 400,
+      body: JSON.stringify({
+        errors: [{ message: 'Missing GraphQL query' }],
+      }),
+    };
+  }
+
+  return {
+    body: JSON.stringify(
+      await graphql({
+        schema,
+        source: payload.query,
+        variableValues: payload.variables,
+        operationName: payload.operationName,
+        contextValue: {
+          event: params.event,
+          headers: params.headers ?? {},
+        },
+      }),
+    ),
+  };
+});
+`,
+        'packages/graphql/schema.test.ts': `import { describe, expect, it } from '@jest/globals';
+import { graphql } from 'graphql';
+
+import { schema } from './schema.js';
+
+describe('packages/graphql/schema.ts', () => {
+  it('resolves query fields', async () => {
+    await expect(
+      graphql({
+        schema,
+        source: '{ hello test { ok message } }',
+      }),
+    ).resolves.toEqual({
+      data: {
+        hello: 'Hello from GraphQL',
+        test: {
+          ok: true,
+          message: 'GraphQL works',
+        },
+      },
+    });
+  });
+
+  it('resolves the ping mutation', async () => {
+    await expect(
+      graphql({
+        schema,
+        source: 'mutation Ping($message: String) { ping(message: $message) }',
+        variableValues: {
+          message: 'hello',
+        },
+      }),
+    ).resolves.toEqual({
+      data: {
+        ping: 'pong: hello',
+      },
+    });
+  });
+});
+`,
+        'packages/graphql/schema.ts': `import { GraphQLSchema, GraphQLObjectType, GraphQLString, GraphQLBoolean } from 'graphql';
+
+const TestType = new GraphQLObjectType({
+  name: 'Test',
+  fields: {
+    ok: {
+      type: GraphQLBoolean,
+    },
+    message: {
+      type: GraphQLString,
+    },
+  },
+});
+
+const QueryType = new GraphQLObjectType({
+  name: 'Query',
+  fields: {
+    hello: {
+      type: GraphQLString,
+      resolve: () => 'Hello from GraphQL',
+    },
+
+    test: {
+      type: TestType,
+      resolve: () => ({
+        ok: true,
+        message: 'GraphQL works',
+      }),
+    },
+  },
+});
+
+const MutationType = new GraphQLObjectType({
+  name: 'Mutation',
+  fields: {
+    ping: {
+      type: GraphQLString,
+      args: {
+        message: {
+          type: GraphQLString,
         },
+      },
+      resolve: (_source, args: { message: string }) => {
+        return \`pong: \${args.message}\`;
+      },
     },
-    deploy: {
-        docker: {
-            Dockerfile: 'code',
+  },
+});
+
+export const schema = new GraphQLSchema({
+  query: QueryType,
+  mutation: MutationType,
+});
+`,
+        'workspaces/graphql/bin/build.sh': `#!/usr/bin/env sh
+
+set -e
+
+scriptdir="$PWD/workspaces/graphql";
+distdir="dist/graphql";
+
+NODE_ENV=production npx webpack --config $scriptdir/webpack.config.ts
+
+cp $scriptdir/package.json $distdir/package.json
+npm pkg delete "type" --prefix $distdir
+npm pkg delete "private" --prefix $distdir
+`,
+        'workspaces/graphql/bin/start.sh': `#!/usr/bin/env sh
+
+set -e
+
+scriptdir="$PWD/workspaces/graphql";
+
+NODE_ENV=production LOG_LEVEL=info tsx $scriptdir/index.ts
+`,
+        'workspaces/graphql/doc.mdx': `import { Meta, Markdown } from '@storybook/addon-docs/blocks';
+import ReadMe from './README.md?raw';
+
+<Meta title="Workspaces/Graphql" />
+
+<Markdown>{ReadMe}</Markdown>
+`,
+        'workspaces/graphql/index.test.ts': `import { describe, expect, it, jest } from '@jest/globals';
+import type { APIGatewayProxyEvent } from '@vyriy/router';
+
+const apiMock = jest.fn((handler) => ({
+  handler,
+}));
+const serverMock = jest.fn();
+
+jest.mock('@vyriy/handler', () => ({
+  api: apiMock,
+}));
+
+jest.mock('@vyriy/server', () => ({
+  server: serverMock,
+}));
+
+describe('workspaces/graphql/index.ts', () => {
+  const getPostEvent = (body: string | null, path = '/'): APIGatewayProxyEvent =>
+    ({
+      body,
+      headers: {},
+      httpMethod: 'POST',
+      path,
+      pathParameters: null,
+      queryStringParameters: null,
+    }) as unknown as APIGatewayProxyEvent;
+
+  const getEvent = (path = '/'): APIGatewayProxyEvent =>
+    ({
+      body: null,
+      headers: {},
+      httpMethod: 'GET',
+      path,
+      pathParameters: null,
+      queryStringParameters: null,
+    }) as unknown as APIGatewayProxyEvent;
+
+  it('starts the server with the API router handler', async () => {
+    await import('./index.js');
+
+    expect(apiMock).toHaveBeenCalledTimes(1);
+    expect(serverMock).toHaveBeenCalledTimes(1);
+    expect(serverMock).toHaveBeenCalledWith(apiMock.mock.results[0]?.value);
+
+    const handler = apiMock.mock.calls[0]?.[0] as (event: APIGatewayProxyEvent) => Promise<{
+      body: string;
+      headers?: Record<string, string>;
+      statusCode: number;
+    }>;
+
+    await expect(
+      handler(
+        getPostEvent(
+          JSON.stringify({
+            query: '{ hello test { ok message } }',
+          }),
+        ),
+      ),
+    ).resolves.toEqual({
+      body: JSON.stringify({
+        data: {
+          hello: 'Hello from GraphQL',
+          test: {
+            ok: true,
+            message: 'GraphQL works',
+          },
         },
+      }),
+      statusCode: 200,
+    });
+
+    const graphiqlResponse = await handler(getEvent());
+
+    expect(graphiqlResponse).toEqual({
+      body: expect.stringContaining('<title>GraphiQL</title>'),
+      headers: {
+        'Content-Type': 'text/html; charset=UTF-8',
+      },
+      statusCode: 200,
+    });
+
+    await expect(handler(getEvent('/healthcheck'))).resolves.toEqual({
+      body: JSON.stringify({
+        message: 'Not Found',
+      }),
+      statusCode: 404,
+    });
+  });
+});
+`,
+        'workspaces/graphql/index.ts': `import { server } from '@vyriy/server';
+import { api } from '@vyriy/handler';
+
+import { router } from '@p/graphql';
+
+server(api(async (event) => router.route(event)));
+`,
+        'workspaces/graphql/package.json': `{
+  "name": "@w/graphql",
+  "type": "module",
+  "private": true
+}
+`,
+        'workspaces/graphql/README.md': `# @w/graphql
+
+GraphQL runtime workspace for the application.
+
+This workspace starts the HTTP server and mounts the reusable \`@p/graphql\` router through \`@vyriy/handler\` and \`@vyriy/server\`.
+
+## Routes
+
+- \`GET /\` - serves the embedded GraphiQL page.
+- \`POST /\` - executes GraphQL requests against the package schema.
+
+Example request body:
+
+\`\`\`json
+{
+  "query": "{ hello test { ok message } }"
+}
+\`\`\`
+
+## Development
+
+Start the local GraphQL server:
+
+\`\`\`bash
+yarn start:graphql
+\`\`\`
+
+Build the deployable bundle:
+
+\`\`\`bash
+yarn build:graphql
+\`\`\`
+
+The build output is written to \`dist/graphql\`.
+
+## Implementation
+
+The workspace entrypoint is \`index.ts\`. It wraps the shared router with \`api()\` and passes it to \`server()\`:
+
+\`\`\`ts
+server(api(async (event) => router.route(event)));
+\`\`\`
+`,
+        'workspaces/graphql/webpack.config.ts': `import { path } from '@vyriy/path';
+import { ssr, external } from '@vyriy/webpack-config';
+
+export default ssr(
+  '@w/graphql',
+  {
+    path: path('dist', 'graphql'),
+    filename: 'index.js',
+    library: { type: 'commonjs2' },
+  },
+  (config) => ({
+    ...config,
+    externals: [external({ allowlist: [/^@p/, /^@w/, /^@vyriy/] })],
+  }),
+);
+`,
+    }),
+    ci: {
+        ...base.ci,
     },
+    deploy: {},
 };

package/commands/create/preset/index.d.ts

@@ -34,4 +34,9 @@ export declare const presets: {
         description: string;
         preset: import("./types.js").Preset;
     };
+    gql: {
+        name: string;
+        description: string;
+        preset: import("./types.js").Preset;
+    };
 };

package/commands/create/preset/index.js

@@ -5,6 +5,7 @@ import { ssr } from './ssr.js';
 import { ssg } from './ssg.js';
 import { spa } from './spa.js';
 import { rest } from './rest.js';
+import { gql } from './gql.js';
 export const presets = {
     base: {
         name: 'Base',
@@ -41,4 +42,9 @@ export const presets = {
         description: 'Preset for simple REST API',
         preset: rest,
     },
+    gql: {
+        name: 'GraphQL',
+        description: 'Preset for GraphQL API',
+        preset: gql,
+    },
 };

package/commands/create/preset/rest.js

@@ -48,7 +48,6 @@ export const rest = {
                 '@vyriy/storybook-config': `^${packageJson.version}`,
                 storybook: packageJson.peerDependencies.storybook,
                 '@vyriy/path': `^${packageJson.version}`,
-                vyriy: `^${packageJson.version}`,
                 husky: packageJson.peerDependencies.husky,
                 'npm-run-all2': packageJson.peerDependencies['npm-run-all2'],
                 'cross-env': packageJson.peerDependencies['cross-env'],
@@ -57,7 +56,6 @@ export const rest = {
                 '@vyriy/handler': `^${packageJson.version}`,
                 '@vyriy/server': `^${packageJson.version}`,
                 tsx: packageJson.peerDependencies.tsx,
-                webpack: packageJson.peerDependencies.webpack,
                 'webpack-cli': packageJson.peerDependencies['webpack-cli'],
                 '@vyriy/router': `^${packageJson.version}`,
                 '@vyriy/html': `^${packageJson.version}`,

package/commands/create/preset/spa.js

@@ -51,14 +51,12 @@ export const spa = {
                 '@vyriy/storybook-config': `^${packageJson.version}`,
                 storybook: packageJson.peerDependencies.storybook,
                 '@vyriy/path': `^${packageJson.version}`,
-                vyriy: `^${packageJson.version}`,
                 husky: packageJson.peerDependencies.husky,
                 'npm-run-all2': packageJson.peerDependencies['npm-run-all2'],
                 'cross-env': packageJson.peerDependencies['cross-env'],
                 rimraf: packageJson.peerDependencies.rimraf,
                 '@vyriy/webpack-config': `^${packageJson.version}`,
                 tsx: packageJson.peerDependencies.tsx,
-                webpack: packageJson.peerDependencies.webpack,
                 'webpack-cli': packageJson.peerDependencies['webpack-cli'],
                 react: packageJson.peerDependencies.react,
                 'react-dom': packageJson.peerDependencies['react-dom'],

package/commands/create/preset/ssg.js

@@ -51,7 +51,6 @@ export const ssg = {
                 '@vyriy/storybook-config': `^${packageJson.version}`,
                 storybook: packageJson.peerDependencies.storybook,
                 '@vyriy/path': `^${packageJson.version}`,
-                vyriy: `^${packageJson.version}`,
                 husky: packageJson.peerDependencies.husky,
                 'npm-run-all2': packageJson.peerDependencies['npm-run-all2'],
                 'cross-env': packageJson.peerDependencies['cross-env'],
@@ -59,7 +58,6 @@ export const ssg = {
                 '@vyriy/webpack-config': `^${packageJson.version}`,
                 '@vyriy/script': `^${packageJson.version}`,
                 tsx: packageJson.peerDependencies.tsx,
-                webpack: packageJson.peerDependencies.webpack,
                 'webpack-cli': packageJson.peerDependencies['webpack-cli'],
                 react: packageJson.peerDependencies.react,
                 'react-dom': packageJson.peerDependencies['react-dom'],

package/commands/create/preset/ssr.js

@@ -51,7 +51,6 @@ export const ssr = {
                 '@vyriy/storybook-config': `^${packageJson.version}`,
                 storybook: packageJson.peerDependencies.storybook,
                 '@vyriy/path': `^${packageJson.version}`,
-                vyriy: `^${packageJson.version}`,
                 husky: packageJson.peerDependencies.husky,
                 'npm-run-all2': packageJson.peerDependencies['npm-run-all2'],
                 'cross-env': packageJson.peerDependencies['cross-env'],
@@ -60,7 +59,6 @@ export const ssr = {
                 '@vyriy/handler': `^${packageJson.version}`,
                 '@vyriy/server': `^${packageJson.version}`,
                 tsx: packageJson.peerDependencies.tsx,
-                webpack: packageJson.peerDependencies.webpack,
                 'webpack-cli': packageJson.peerDependencies['webpack-cli'],
                 react: packageJson.peerDependencies.react,
                 'react-dom': packageJson.peerDependencies['react-dom'],

package/commands/types.d.ts

@@ -1,12 +1,11 @@
 export type Command = () => Promise<number>;
-export type Node = () => {
+export type EnvironmentCheckResult = {
     ok: boolean;
     message: string;
 };
-export type Yarn = () => Promise<{
-    ok: boolean;
-    message: string;
-}>;
+export type Node = () => EnvironmentCheckResult;
+export type Corepack = () => Promise<EnvironmentCheckResult>;
+export type Yarn = () => Promise<EnvironmentCheckResult>;
 export type CreateOptions = {
     readonly directory: string;
     readonly dryRun: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vyriy",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "Interactive project master for calm cloud-ready applications.",
   "type": "module",
   "bin": "./bin/vyriy.js",
@@ -13,6 +13,7 @@
     "@types/react-dom": "^19.2.3",
     "cross-env": "^10.1.0",
     "eslint": "^10.4.0",
+    "graphql": "^16.14.0",
     "husky": "^9.1.7",
     "jest": "^30.4.2",
     "npm-run-all2": "^9.0.1",
@@ -25,8 +26,7 @@
     "stylelint": "^17.12.0",
     "tsx": "^4.22.3",
     "typescript": "^6.0.3",
-    "webpack": "^5.107.2",
-    "webpack-cli": "^7.0.2"
+    "webpack-cli": "^7.0.3"
   },
   "peerDependenciesMeta": {
     "@types/react": {
@@ -41,6 +41,9 @@
     "eslint": {
       "optional": true
     },
+    "graphql": {
+      "optional": true
+    },
     "husky": {
       "optional": true
     },
@@ -77,9 +80,6 @@
     "typescript": {
       "optional": true
     },
-    "webpack": {
-      "optional": true
-    },
     "webpack-cli": {
       "optional": true
     }