@auto-engineer/server-generator-apollo-emmett 0.11.10 → 0.11.12

package/src/codegen/templates/query/query.resolver.specs.ts

@@ -1,12 +1,12 @@
 import { describe, it, expect } from 'vitest';
 import { generateScaffoldFilePlans } from '../../scaffoldFromSchema';
-import { Model as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/narrative';
 
 describe('query.resolver.ts.ejs', () => {
   it('should generate a valid query resolver from request field', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'listing-flow',
           slices: [
@@ -63,7 +63,7 @@ describe('query.resolver.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.flows, spec.messages, undefined, 'src/domain/flows');
+    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const resolverFile = plans.find((p) => p.outputPath.endsWith('query.resolver.ts'));
 
     expect(resolverFile?.contents).toMatchInlineSnapshot(`
@@ -129,7 +129,7 @@ describe('query.resolver.ts.ejs', () => {
   it('should generate a valid query resolver with array of inline object field', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'assistant-flow',
           slices: [
@@ -187,7 +187,7 @@ describe('query.resolver.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.flows, spec.messages, undefined, 'src/domain/flows');
+    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const resolverFile = plans.find((p) => p.outputPath.endsWith('query.resolver.ts'));
 
     expect(resolverFile?.contents).toMatchInlineSnapshot(`
@@ -254,7 +254,7 @@ describe('query.resolver.ts.ejs', () => {
   it('should generate the query resolver for "views the questionnaire"', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Questionnaires',
           slices: [
@@ -354,7 +354,7 @@ describe('query.resolver.ts.ejs', () => {
       integrations: [],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.flows, spec.messages, undefined, 'src/domain/flows');
+    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const queryFile = plans.find(
       (p) => p.outputPath.endsWith('query.resolver.ts') && p.contents.includes('ViewsTheQuestionnaireQueryResolver'),
     );
@@ -429,7 +429,7 @@ describe('query.resolver.ts.ejs', () => {
   it('should import Float when Float fields are used', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'product-flow',
           slices: [
@@ -482,7 +482,7 @@ describe('query.resolver.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.flows, spec.messages, undefined, 'src/domain/flows');
+    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const resolverFile = plans.find((p) => p.outputPath.endsWith('query.resolver.ts'));
 
     expect(resolverFile?.contents).toContain(
@@ -493,7 +493,7 @@ describe('query.resolver.ts.ejs', () => {
   it('should import Float when array of numbers is used', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'stats-flow',
           slices: [
@@ -544,7 +544,7 @@ describe('query.resolver.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.flows, spec.messages, undefined, 'src/domain/flows');
+    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const resolverFile = plans.find((p) => p.outputPath.endsWith('query.resolver.ts'));
 
     expect(resolverFile?.contents).toContain('Float');
@@ -553,7 +553,7 @@ describe('query.resolver.ts.ejs', () => {
   it('should import Float when Float query arg is used', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'search-flow',
           slices: [
@@ -604,7 +604,7 @@ describe('query.resolver.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.flows, spec.messages, undefined, 'src/domain/flows');
+    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const resolverFile = plans.find((p) => p.outputPath.endsWith('query.resolver.ts'));
 
     expect(resolverFile?.contents).toContain('Float');

package/src/codegen/templates/query/state.specs.ts

@@ -1,12 +1,12 @@
 import { describe, it, expect } from 'vitest';
 import { generateScaffoldFilePlans } from '../../scaffoldFromSchema';
-import { Model as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/narrative';
 
 describe('state.ts.ejs', () => {
   it('should generate a valid state definition file for a query slice with a state message', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Inventory management',
           slices: [
@@ -52,7 +52,7 @@ describe('state.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.flows, spec.messages, undefined, 'src/domain/flows');
+    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const stateFile = plans.find((p) => p.outputPath.endsWith('state.ts'));
 
     expect(stateFile?.contents).toMatchInlineSnapshot(`

package/src/codegen/templates/react/react.specs.specs.ts

@@ -1,12 +1,12 @@
 import { describe, it, expect } from 'vitest';
-import { Model as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/narrative';
 import { generateScaffoldFilePlans } from '../../scaffoldFromSchema';
 
 describe('react.specs.ts.ejs (react slice)', () => {
   it('should generate correct react.specs.ts', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'manage bookings',
           slices: [
@@ -161,7 +161,7 @@ describe('react.specs.ts.ejs (react slice)', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.flows, spec.messages, undefined, 'src/domain/flows');
+    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
 
     const specFile = plans.find((p) => p.outputPath.endsWith('react.specs.ts'));
     expect(specFile?.contents).toMatchInlineSnapshot(`

package/src/codegen/templates/react/react.specs.ts

@@ -1,12 +1,12 @@
 import { describe, it, expect } from 'vitest';
-import { Model as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/narrative';
 import { generateScaffoldFilePlans } from '../../scaffoldFromSchema';
 
 describe('handle.ts.ejs (react slice)', () => {
   it('should generate correct react.ts', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'manage bookings',
           slices: [
@@ -215,7 +215,7 @@ describe('handle.ts.ejs (react slice)', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.flows, spec.messages, undefined, 'src/domain/flows');
+    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const handleFile = plans.find((p) => p.outputPath.endsWith('react.ts'));
 
     expect(handleFile?.contents).toMatchInlineSnapshot(`

package/src/codegen/templates/react/register.specs.ts

@@ -1,12 +1,12 @@
 import { describe, it, expect } from 'vitest';
-import { Model as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/narrative';
 import { generateScaffoldFilePlans } from '../../scaffoldFromSchema';
 
 describe('register.ts.ejs (react slice)', () => {
   it('should generate correct register.ts', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'manage bookings',
           slices: [
@@ -215,7 +215,7 @@ describe('register.ts.ejs (react slice)', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.flows, spec.messages, undefined, 'src/domain/flows');
+    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const registerFile = plans.find((p) => p.outputPath.endsWith('send-notification-to-host/register.ts'));
 
     expect(registerFile?.contents).toMatchInlineSnapshot(`

package/src/codegen/test-data/specVariant1.ts

@@ -1,8 +1,8 @@
-import { Model as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/narrative';
 
 const specVariant1: SpecsSchema = {
   variant: 'specs',
-  flows: [
+  narratives: [
     {
       name: 'Add item',
       description: 'Flow to add items to a system',

package/src/codegen/types.ts

@@ -1,4 +1,4 @@
-import { CommandExample, EventExample, StateExample } from '@auto-engineer/flow';
+import { CommandExample, EventExample, StateExample } from '@auto-engineer/narrative';
 
 export interface Message {
   type: string;

package/src/commands/generate-server.ts

@@ -5,7 +5,7 @@ import { resolve, join } from 'path';
 import { existsSync } from 'fs';
 import { generateScaffoldFilePlans, writeScaffoldFilePlans } from '../codegen/scaffoldFromSchema';
 import { ensureDirExists, ensureDirPath, toKebabCase } from '../codegen/utils/path';
-import { Model } from '@auto-engineer/flow';
+import { Model } from '@auto-engineer/narrative';
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
 import { execa } from 'execa';
@@ -123,7 +123,7 @@ async function readAndParseModel(absModel: string): Promise<Model> {
   const spec = JSON.parse(content) as Model;
 
   debugModel('Parsed model:');
-  debugModel('  Flows: %d', spec.flows?.length || 0);
+  debugModel('  Flows: %d', spec.narratives?.length || 0);
   debugModel('  Messages: %d', spec.messages?.length || 0);
   debugModel('  Integrations: %d', spec.integrations?.length ?? 0);
 
@@ -132,12 +132,12 @@ async function readAndParseModel(absModel: string): Promise<Model> {
 }
 
 function logFlowDetails(spec: Model): void {
-  if (spec.flows !== undefined && spec.flows.length > 0) {
+  if (spec.narratives !== undefined && spec.narratives.length > 0) {
     debugModel(
       'Flow names: %o',
-      spec.flows.map((f) => f.name),
+      spec.narratives.map((f) => f.name),
     );
-    spec.flows.forEach((flow) => {
+    spec.narratives.forEach((flow) => {
       debugModel('  Flow "%s" has %d slices', flow.name, flow.slices?.length || 0);
       flow.slices?.forEach((slice) => {
         debugModel('    Slice: %s (type: %s)', slice.name, slice.type);
@@ -177,9 +177,9 @@ async function generateAndWriteScaffold(spec: Model, serverDir: string): Promise
   const domainFlowsPath = join(serverDir, 'src', 'domain', 'flows');
   debugScaffold('Generating scaffold file plans');
   debugScaffold('  Domain flows path: %s', domainFlowsPath);
-  debugScaffold('  Number of flows: %d', spec.flows?.length || 0);
+  debugScaffold('  Number of flows: %d', spec.narratives?.length || 0);
 
-  const filePlans = await generateScaffoldFilePlans(spec.flows, spec.messages, spec.integrations, domainFlowsPath);
+  const filePlans = await generateScaffoldFilePlans(spec.narratives, spec.messages, spec.integrations, domainFlowsPath);
 
   debugScaffold('Generated %d file plans', filePlans.length);
   if (filePlans.length > 0) {
@@ -285,6 +285,10 @@ export async function handleGenerateServerCommandInternal(
     debug('Server directory: %s', serverDir);
     debug('🔄 Generating server... %s', serverDir);
 
+    debug('Clearing existing server directory if it exists');
+    await fs.remove(serverDir);
+    debug('Server directory cleared');
+
     await ensureDirExists(serverDir);
     debugFiles('Created server directory: %s', serverDir);
 
@@ -292,8 +296,8 @@ export async function handleGenerateServerCommandInternal(
 
     await generateAndWriteScaffold(spec, serverDir);
 
-    if (Array.isArray(spec.flows) && spec.flows.length > 0) {
-      for (const flow of spec.flows) {
+    if (Array.isArray(spec.narratives) && spec.narratives.length > 0) {
+      for (const flow of spec.narratives) {
         if (Array.isArray(flow.slices) && flow.slices.length > 0) {
           for (const slice of flow.slices) {
             if (slice.type === 'experience') continue; // skip experience slices