@auto-engineer/server-generator-apollo-emmett 1.107.0 → 1.108.0

package/package.json

@@ -32,8 +32,8 @@
     "uuid": "^13.0.0",
     "web-streams-polyfill": "^4.1.0",
     "zod": "^3.22.4",
-    "@auto-engineer/narrative": "1.107.0",
-    "@auto-engineer/message-bus": "1.107.0"
+    "@auto-engineer/narrative": "1.108.0",
+    "@auto-engineer/message-bus": "1.108.0"
   },
   "publishConfig": {
     "access": "public"
@@ -44,9 +44,9 @@
     "typescript": "^5.8.3",
     "vitest": "^3.2.4",
     "tsx": "^4.19.2",
-    "@auto-engineer/cli": "1.107.0"
+    "@auto-engineer/cli": "1.108.0"
   },
-  "version": "1.107.0",
+  "version": "1.108.0",
   "scripts": {
     "generate:server": "tsx src/cli/index.ts",
     "build": "tsc && tsx ../../scripts/fix-esm-imports.ts && rm -rf dist/src/codegen/templates && mkdir -p dist/src/codegen && cp -r src/codegen/templates dist/src/codegen/templates && cp src/server.ts dist/src && cp -r src/utils dist/src && cp -r src/domain dist/src",

package/src/commands/initialize-server-fallback.specs.ts

@@ -0,0 +1,76 @@
+import { mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import fs from 'fs-extra';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { applyTemplateFallback } from './initialize-server';
+
+describe('applyTemplateFallback', () => {
+  let tempDir: string;
+
+  beforeEach(async () => {
+    tempDir = await mkdtemp(join(tmpdir(), 'init-server-fallback-'));
+  });
+
+  afterEach(async () => {
+    await rm(tempDir, { recursive: true, force: true });
+  });
+
+  it('copies template to pkgPath when no existing package.json', async () => {
+    const templatePkg = {
+      name: 'generated-server',
+      version: '0.0.0',
+      scripts: { start: 'tsx src/server.ts' },
+      dependencies: { graphql: '^16.0.0' },
+      devDependencies: { typescript: '^5.0.0' },
+    };
+    const templatePath = join(tempDir, 'server-package.json');
+    await fs.writeJson(templatePath, templatePkg, { spaces: 2 });
+
+    const pkgPath = join(tempDir, 'output', 'package.json');
+    await fs.ensureDir(join(tempDir, 'output'));
+
+    await applyTemplateFallback(pkgPath, templatePath);
+
+    const result = await fs.readJson(pkgPath);
+    expect(result).toEqual(templatePkg);
+  });
+
+  it('merges template deps into existing package.json', async () => {
+    const templatePath = join(tempDir, 'server-package.json');
+    await fs.writeJson(
+      templatePath,
+      {
+        name: 'generated-server',
+        dependencies: { graphql: '^16.0.0', zod: '^3.0.0' },
+        devDependencies: { typescript: '^5.0.0' },
+      },
+      { spaces: 2 },
+    );
+
+    const pkgPath = join(tempDir, 'package.json');
+    await fs.writeJson(pkgPath, { name: 'my-server', dependencies: { 'custom-dep': '1.0.0' } }, { spaces: 2 });
+
+    await applyTemplateFallback(pkgPath, templatePath);
+
+    const result = await fs.readJson(pkgPath);
+    expect(result).toEqual({
+      name: 'my-server',
+      dependencies: {
+        'custom-dep': '1.0.0',
+        graphql: '^16.0.0',
+        zod: '^3.0.0',
+      },
+      devDependencies: { typescript: '^5.0.0' },
+    });
+  });
+
+  it('throws when template path does not exist', async () => {
+    const pkgPath = join(tempDir, 'package.json');
+    const missingTemplate = join(tempDir, 'nonexistent.json');
+
+    await expect(applyTemplateFallback(pkgPath, missingTemplate)).rejects.toThrow(
+      'Cannot resolve package root and no template fallback available',
+    );
+  });
+});

package/src/commands/initialize-server.ts

@@ -87,50 +87,78 @@ function resolvePackageRoot(): string {
   return resolve(__dirname, '../../..');
 }
 
-async function writeOrUpdatePackageJson(serverDir: string): Promise<void> {
-  const pkgPath = join(serverDir, 'package.json');
-
-  const packageRoot = resolvePackageRoot();
-  const localPkgPath = resolve(packageRoot, 'package.json');
-  const rootPkgPath = resolve(packageRoot, '../../package.json');
+const TEMPLATE_SERVER_PKG = '/app/.templates/server-package.json';
 
-  const localPkg = (await fs.readJson(localPkgPath)) as {
+export async function applyTemplateFallback(pkgPath: string, templatePath: string): Promise<void> {
+  if (!(await fs.pathExists(templatePath))) {
+    throw new Error('Cannot resolve package root and no template fallback available');
+  }
+  const template = (await fs.readJson(templatePath)) as {
     dependencies?: Record<string, string>;
     devDependencies?: Record<string, string>;
   };
+  if (await fs.pathExists(pkgPath)) {
+    const existing = await fs.readJson(pkgPath);
+    existing.dependencies = { ...existing.dependencies, ...template.dependencies };
+    existing.devDependencies = { ...existing.devDependencies, ...template.devDependencies };
+    await fs.writeJson(pkgPath, existing, { spaces: 2 });
+  } else {
+    await fs.copy(templatePath, pkgPath);
+  }
+}
 
-  const rootPkg = (await fs.readJson(rootPkgPath).catch(() => ({}))) as {
-    dependencies?: Record<string, string>;
-    devDependencies?: Record<string, string>;
-  };
+async function writeOrUpdatePackageJson(serverDir: string): Promise<void> {
+  const pkgPath = join(serverDir, 'package.json');
+
+  let resolvedDeps: Record<string, string>;
+  let resolvedDevDeps: Record<string, string>;
+
+  try {
+    const packageRoot = resolvePackageRoot();
+    const localPkgPath = resolve(packageRoot, 'package.json');
+    const rootPkgPath = resolve(packageRoot, '../../package.json');
 
-  const getDepVersion = (dep: string): string | undefined =>
-    localPkg.dependencies?.[dep] ??
-    localPkg.devDependencies?.[dep] ??
-    rootPkg.dependencies?.[dep] ??
-    rootPkg.devDependencies?.[dep];
-
-  const resolveDeps = (deps: string[]): Record<string, string> =>
-    deps.reduce<Record<string, string>>((acc, dep) => {
-      const version = getDepVersion(dep);
-      if (typeof version === 'string') acc[dep] = version;
-      return acc;
-    }, {});
-
-  const resolvedDeps = resolveDeps([
-    '@event-driven-io/emmett',
-    '@event-driven-io/emmett-sqlite',
-    'type-graphql',
-    'graphql-type-json',
-    'graphql',
-    'fast-glob',
-    'reflect-metadata',
-    'zod',
-    'apollo-server',
-    'uuid',
-    'sqlite3',
-  ]);
-  const resolvedDevDeps = resolveDeps(['typescript', 'vitest', 'tsx']);
+    const localPkg = (await fs.readJson(localPkgPath)) as {
+      dependencies?: Record<string, string>;
+      devDependencies?: Record<string, string>;
+    };
+
+    const rootPkg = (await fs.readJson(rootPkgPath).catch(() => ({}))) as {
+      dependencies?: Record<string, string>;
+      devDependencies?: Record<string, string>;
+    };
+
+    const getDepVersion = (dep: string): string | undefined =>
+      localPkg.dependencies?.[dep] ??
+      localPkg.devDependencies?.[dep] ??
+      rootPkg.dependencies?.[dep] ??
+      rootPkg.devDependencies?.[dep];
+
+    const resolveDeps = (deps: string[]): Record<string, string> =>
+      deps.reduce<Record<string, string>>((acc, dep) => {
+        const version = getDepVersion(dep);
+        if (typeof version === 'string') acc[dep] = version;
+        return acc;
+      }, {});
+
+    resolvedDeps = resolveDeps([
+      '@event-driven-io/emmett',
+      '@event-driven-io/emmett-sqlite',
+      'type-graphql',
+      'graphql-type-json',
+      'graphql',
+      'fast-glob',
+      'reflect-metadata',
+      'zod',
+      'apollo-server',
+      'uuid',
+      'sqlite3',
+    ]);
+    resolvedDevDeps = resolveDeps(['typescript', 'vitest', 'tsx']);
+  } catch {
+    await applyTemplateFallback(pkgPath, TEMPLATE_SERVER_PKG);
+    return;
+  }
 
   if (await fs.pathExists(pkgPath)) {
     const existing = await fs.readJson(pkgPath);