@auto-engineer/server-generator-apollo-emmett 0.8.5 → 0.8.7

package/package.json

@@ -5,8 +5,8 @@
   "types": "./dist/src/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
+      "types": "./dist/src/index.d.ts",
+      "import": "./dist/src/index.js"
     }
   },
   "dependencies": {
@@ -25,10 +25,11 @@
     "reflect-metadata": "^0.2.2",
     "type-fest": "^4.41.0",
     "type-graphql": "^2.0.0-rc.2",
+    "graphql-type-json": "^0.3.2",
     "uuid": "^10.0.0",
     "web-streams-polyfill": "^4.1.0",
-    "@auto-engineer/flow": "0.8.5",
-    "@auto-engineer/message-bus": "0.8.5"
+    "@auto-engineer/message-bus": "0.8.7",
+    "@auto-engineer/flow": "0.8.7"
   },
   "publishConfig": {
     "access": "public"
@@ -36,12 +37,12 @@
   "devDependencies": {
     "@types/ejs": "^3.1.5",
     "@types/fs-extra": "^11.0.4",
-    "@auto-engineer/cli": "0.8.5"
+    "@auto-engineer/cli": "0.8.7"
   },
-  "version": "0.8.5",
+  "version": "0.8.7",
   "scripts": {
     "generate:server": "tsx src/cli/index.ts",
-    "build": "tsc && tsx ../../scripts/fix-esm-imports.ts && rm -rf dist/codegen/templates && mkdir -p dist/codegen && cp -r src/codegen/templates dist/codegen/templates && cp src/server.ts dist/ && cp -r src/utils dist/ && cp -r src/domain dist/",
+    "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",
     "test": "vitest run --reporter=dot",
     "type-check": "tsc --noEmit --project tsconfig.json",
     "lint": "eslint 'src/**/*.ts' --ignore-pattern '**/*.specs.ts' --ignore-pattern '**/.tmp/**' --max-warnings 0 --config ../../eslint.config.ts",

package/src/codegen/scaffoldFromSchema.ts

@@ -6,7 +6,7 @@ import ejs from 'ejs';
 import { ensureDirExists, ensureDirPath, toKebabCase } from './utils/path';
 import { camelCase, pascalCase } from 'change-case';
 import prettier from 'prettier';
-import { Flow, Slice, SpecsSchemaType } from '@auto-engineer/flow';
+import { Flow, Slice, Model } from '@auto-engineer/flow';
 import createDebug from 'debug';
 
 const debug = createDebug('emmett:scaffold');
@@ -59,28 +59,56 @@ async function renderTemplate(templatePath: string, data: Record<string, unknown
   });
   debugTemplate('Template compiled successfully');
 
-  const graphqlType = (tsType: string): string => {
-    debugTemplate('Converting TS type to GraphQL: %s', tsType);
-    if (!tsType) return 'String';
-    if (tsType === 'ID') return 'ID';
-    if (tsType === 'string') return 'String';
-    if (tsType === 'number') return 'Number';
-    if (tsType === 'boolean') return 'Boolean';
-    if (tsType === 'Date') return 'Date';
-    if (tsType === 'object') return 'Object';
-    if (tsType.endsWith('[]')) {
-      const inner = tsType.slice(0, -2);
-      return `[${graphqlType(inner)}]`;
-    }
+  const isInlineObject = (s: string) => /^\{[\s\S]*\}$/.test(s.trim());
+  const isStringLiteralUnion = (s: string) => /^"(?:[^"]+)"\s*(\|\s*"(?:[^"]+)")+$/.test(s.trim());
+  const convertPrimitiveType = (base: string): string => {
+    // GraphQL-native scalars
+    if (base === 'ID') return 'ID';
+    if (base === 'Int') return 'Int';
+    if (base === 'Float') return 'Float';
+    // TS primitives
+    if (base === 'string') return 'String';
+    if (base === 'number') return 'Float';
+    if (base === 'boolean') return 'Boolean';
+    if (base === 'Date') return 'GraphQLISODateTime';
     return 'String';
   };
 
+  const graphqlType = (rawTs: string): string => {
+    const t = (rawTs ?? '').trim();
+    if (!t) return 'String';
+    const base = t.replace(/\s*\|\s*null\b/g, '').trim();
+    // arrays
+    const arr1 = base.match(/^Array<(.*)>$/);
+    const arr2 = base.match(/^(.*)\[\]$/);
+    if (arr1) return `[${graphqlType(arr1[1].trim())}]`;
+    if (arr2) return `[${graphqlType(arr2[1].trim())}]`;
+    // JSON
+    if (base === 'unknown' || base === 'any') return 'GraphQLJSON';
+    if (base === 'object') return 'JSON';
+    if (isInlineObject(base)) return 'JSON';
+    if (isStringLiteralUnion(base)) return 'String';
+    return convertPrimitiveType(base);
+  };
+
+  const toTsFieldType = (ts: string): string => {
+    if (!ts) return 'string';
+    const t = ts.trim();
+    const arr = t.match(/^Array<(.*)>$/);
+    if (arr) return `${arr[1].trim()}[]`;
+    return t;
+  };
+
+  const isNullable = (rawTs: string): boolean => /\|\s*null\b/.test(rawTs);
+
   const result = await template({
     ...data,
     pascalCase,
     toKebabCase,
     camelCase,
     graphqlType,
+    isNullable,
+    toTsFieldType,
     formatTsValue,
     formatDataObject,
     messages: data.messages,
@@ -201,7 +229,7 @@ async function prepareTemplateData(
   commandSchemasByName: Record<string, Message>,
   projectionIdField: string | undefined,
   allMessages?: MessageDefinition[],
-  integrations?: SpecsSchemaType['integrations'],
+  integrations?: Model['integrations'],
 ): Promise<Record<string, unknown>> {
   debug('Preparing template data for slice: %s (flow: %s)', slice.name, flow.name);
   debug('  Commands: %d', commands.length);
@@ -226,12 +254,16 @@ async function prepareTemplateData(
   const uniqueCommands = Array.from(new Map(commands.map((c) => [c.type, c])).values());
   debug('  Unique commands: %d', uniqueCommands.length);
 
+  const allowedForSlice = new Set(Object.keys(gwtMapping));
+  const filteredCommands =
+    allowedForSlice.size > 0 ? uniqueCommands.filter((c) => allowedForSlice.has(c.type)) : uniqueCommands;
+
   return {
     flowName: flow.name,
     sliceName: slice.name,
     slice,
     stream: { pattern: streamPattern, id: streamId },
-    commands: uniqueCommands,
+    commands: filteredCommands,
     events,
     states,
     gwtMapping,
@@ -343,7 +375,7 @@ async function generateFilesForSlice(
   sliceDir: string,
   messages: MessageDefinition[],
   flows: Flow[],
-  integrations?: SpecsSchemaType['integrations'],
+  integrations?: Model['integrations'],
 ): Promise<FilePlan[]> {
   debugSlice('Generating files for slice: %s (type: %s)', slice.name, slice.type);
   debugSlice('  Flow: %s', flow.name);
@@ -391,8 +423,8 @@ async function generateFilesForSlice(
 
 export async function generateScaffoldFilePlans(
   flows: Flow[],
-  messages: SpecsSchemaType['messages'],
-  integrations?: SpecsSchemaType['integrations'],
+  messages: Model['messages'],
+  integrations?: Model['integrations'],
   baseDir = 'src/domain/flows',
 ): Promise<FilePlan[]> {
   debug('Generating scaffold file plans');
@@ -445,7 +477,7 @@ export async function writeScaffoldFilePlans(plans: FilePlan[]) {
 
 export async function scaffoldFromSchema(
   flows: Flow[],
-  messages: SpecsSchemaType['messages'],
+  messages: Model['messages'],
   baseDir = 'src/domain/flows',
 ): Promise<void> {
   debug('Starting scaffold from schema');

package/src/codegen/templates/command/commands.specs.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { SpecsSchemaType as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/flow';
 import { generateScaffoldFilePlans } from '../../scaffoldFromSchema';
 
 describe('commands.ts.ejs', () => {
@@ -15,7 +15,6 @@ describe('commands.ts.ejs', () => {
               name: 'Create listing',
               client: {
                 description: 'test',
-                specs: [],
               },
               server: {
                 description: 'test',

package/src/codegen/templates/command/decide.specs.specs.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { SpecsSchemaType as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/flow';
 import { generateScaffoldFilePlans } from '../../scaffoldFromSchema';
 
 describe('spec.ts.ejs', () => {
@@ -13,7 +13,7 @@ describe('spec.ts.ejs', () => {
             {
               type: 'command',
               name: 'Create listing',
-              client: { description: '', specs: [] },
+              client: { description: '' },
               server: {
                 description: '',
                 specs: {
@@ -153,7 +153,7 @@ describe('spec.ts.ejs', () => {
             {
               type: 'command',
               name: 'Remove listing',
-              client: { description: '', specs: [] },
+              client: { description: '' },
               server: {
                 description: '',
                 specs: {

package/src/codegen/templates/command/decide.specs.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { SpecsSchemaType as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/flow';
 import { generateScaffoldFilePlans } from '../../scaffoldFromSchema';
 
 describe('decide.ts.ejs', () => {
@@ -15,7 +15,6 @@ describe('decide.ts.ejs', () => {
               name: 'Create listing',
               client: {
                 description: 'test',
-                specs: [],
               },
               server: {
                 description: 'test',
@@ -126,7 +125,6 @@ describe('decide.ts.ejs', () => {
               name: 'Remove listing',
               client: {
                 description: 'test',
-                specs: [],
               },
               server: {
                 description: 'test',
@@ -252,7 +250,6 @@ describe('decide.ts.ejs', () => {
               name: 'Create listing',
               client: {
                 description: 'test',
-                specs: [],
               },
               server: {
                 description: 'test',
@@ -398,7 +395,6 @@ describe('decide.ts.ejs', () => {
               stream: 'session-${sessionId}',
               client: {
                 description: 'test',
-                specs: [],
               },
               server: {
                 description: '',

package/src/codegen/templates/command/events.specs.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { SpecsSchemaType as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/flow';
 import { generateScaffoldFilePlans } from '../../scaffoldFromSchema';
 
 describe('events.ts.ejs', () => {
@@ -15,7 +15,6 @@ describe('events.ts.ejs', () => {
               name: 'Create listing',
               client: {
                 description: 'test',
-                specs: [],
               },
               server: {
                 description: 'test',

package/src/codegen/templates/command/evolve.specs.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { SpecsSchemaType as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/flow';
 import { generateScaffoldFilePlans } from '../../scaffoldFromSchema';
 
 describe('evolve.ts.ejs', () => {
@@ -15,7 +15,6 @@ describe('evolve.ts.ejs', () => {
               name: 'Create listing',
               client: {
                 description: 'test',
-                specs: [],
               },
               server: {
                 description: 'test',

package/src/codegen/templates/command/handle.specs.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
 import { generateScaffoldFilePlans } from '../../scaffoldFromSchema';
-import { SpecsSchemaType as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/flow';
 
 describe('generateScaffoldFilePlans', () => {
   it('should generate a valid handle file', async () => {
@@ -16,7 +16,6 @@ describe('generateScaffoldFilePlans', () => {
               stream: 'listing-${propertyId}',
               client: {
                 description: 'test',
-                specs: [],
               },
               server: {
                 description: 'test',
@@ -142,7 +141,6 @@ describe('generateScaffoldFilePlans', () => {
               stream: 'session-${sessionId}',
               client: {
                 description: 'test',
-                specs: [],
               },
               server: {
                 description: '',

package/src/codegen/templates/command/mutation.resolver.specs.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
 import { generateScaffoldFilePlans } from '../../scaffoldFromSchema';
-import { SpecsSchemaType as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/flow';
 
 describe('mutation.resolver.ts.ejs', () => {
   it('should generate a valid mutation resolver file', async () => {
@@ -15,7 +15,6 @@ describe('mutation.resolver.ts.ejs', () => {
               name: 'Create listing',
               client: {
                 description: 'A form that allows users to add a new listing',
-                specs: [],
               },
               server: {
                 description: 'Handles listing creation',
@@ -77,30 +76,40 @@ describe('mutation.resolver.ts.ejs', () => {
     const mutationFile = plans.find((p) => p.outputPath.endsWith('mutation.resolver.ts'));
 
     expect(mutationFile?.contents).toMatchInlineSnapshot(`
-      "import { Mutation, Resolver, Arg, Ctx, Field, InputType } from 'type-graphql';
+      "import { Mutation, Resolver, Arg, Ctx, Field, InputType, GraphQLISODateTime } from 'type-graphql';
+      import { GraphQLJSON } from 'graphql-type-json';
       import { type GraphQLContext, sendCommand, MutationResponse } from '../../../shared';
 
       @InputType()
       export class CreateListingInput {
         @Field(() => String)
         propertyId!: string;
+
         @Field(() => String)
         title!: string;
-        @Field(() => Number)
+
+        @Field(() => Float)
         pricePerNight!: number;
-        @Field(() => Number)
+
+        @Field(() => Float)
         maxGuests!: number;
+
         @Field(() => [String])
         amenities!: string[];
+
         @Field(() => Boolean)
         available!: boolean;
+
         @Field(() => [String])
         tags!: string[];
-        @Field(() => Number)
+
+        @Field(() => Float)
         rating!: number;
-        @Field(() => Object)
+
+        @Field(() => JSON)
         metadata!: object;
-        @Field(() => Date)
+
+        @Field(() => GraphQLISODateTime)
         listedAt!: Date;
       }
 
@@ -121,4 +130,234 @@ describe('mutation.resolver.ts.ejs', () => {
       "
     `);
   });
+
+  it('should generate the mutation resolver for AnswerQuestion', async () => {
+    const spec: SpecsSchema = {
+      variant: 'specs',
+      flows: [
+        {
+          name: 'Questionnaires',
+          slices: [
+            {
+              name: 'submits a questionnaire answer',
+              type: 'command',
+              client: {
+                description: '',
+                specs: {
+                  name: '',
+                  rules: [
+                    'display a success message when the answer is submitted',
+                    'display an error message when the answer submission is rejected',
+                  ],
+                },
+              },
+              request:
+                'mutation AnswerQuestion($input: AnswerQuestionInput!) {\\n  answerQuestion(input: $input) {\\n    success\\n  }\\n}',
+              server: {
+                description: '',
+                data: [
+                  {
+                    target: { type: 'Event', name: 'QuestionAnswered' },
+                    destination: { type: 'stream', pattern: 'questionnaire-participantId' },
+                  },
+                  {
+                    target: { type: 'Event', name: 'QuestionnaireEditRejected' },
+                    destination: { type: 'stream', pattern: 'questionnaire-participantId' },
+                  },
+                ],
+                specs: {
+                  name: '',
+                  rules: [
+                    {
+                      description: 'answers are allowed while the questionnaire has not been submitted',
+                      examples: [
+                        {
+                          description: 'no questions have been answered yet',
+                          when: {
+                            commandRef: 'AnswerQuestion',
+                            exampleData: {
+                              questionnaireId: 'q-001',
+                              participantId: 'participant-abc',
+                              questionId: 'q1',
+                              answer: 'Yes',
+                            },
+                          },
+                          then: [
+                            {
+                              eventRef: 'QuestionAnswered',
+                              exampleData: {
+                                questionnaireId: 'q-001',
+                                participantId: 'participant-abc',
+                                questionId: 'q1',
+                                answer: 'Yes',
+                                savedAt: '2030-01-01T09:05:00.000Z',
+                              },
+                            },
+                          ],
+                        },
+                      ],
+                    },
+                  ],
+                },
+              },
+            },
+          ],
+        },
+      ],
+      messages: [
+        {
+          type: 'command',
+          name: 'AnswerQuestion',
+          fields: [
+            { name: 'questionnaireId', type: 'string', required: true },
+            { name: 'participantId', type: 'string', required: true },
+            { name: 'questionId', type: 'string', required: true },
+            { name: 'answer', type: 'unknown', required: true },
+          ],
+          metadata: { version: 1 },
+        },
+      ],
+      integrations: [],
+    };
+
+    const plans = await generateScaffoldFilePlans(spec.flows, spec.messages, undefined, 'src/domain/flows');
+    const mutationFile = plans.find(
+      (p) =>
+        p.outputPath.endsWith('mutation.resolver.ts') && p.contents.includes('export class AnswerQuestionResolver'),
+    );
+
+    expect(mutationFile?.contents).toMatchInlineSnapshot(`
+      "import { Mutation, Resolver, Arg, Ctx, Field, InputType } from 'type-graphql';
+      import { GraphQLJSON } from 'graphql-type-json';
+      import { type GraphQLContext, sendCommand, MutationResponse } from '../../../shared';
+
+      @InputType()
+      export class AnswerQuestionInput {
+        @Field(() => String)
+        questionnaireId!: string;
+
+        @Field(() => String)
+        participantId!: string;
+
+        @Field(() => String)
+        questionId!: string;
+
+        @Field(() => GraphQLJSON)
+        answer!: unknown;
+      }
+
+      @Resolver()
+      export class AnswerQuestionResolver {
+        @Mutation(() => MutationResponse)
+        async answerQuestion(
+          @Arg('input', () => AnswerQuestionInput) input: AnswerQuestionInput,
+          @Ctx() ctx: GraphQLContext,
+        ): Promise<MutationResponse> {
+          return await sendCommand(ctx.messageBus, {
+            type: 'AnswerQuestion',
+            kind: 'Command',
+            data: { ...input },
+          });
+        }
+      }
+      "
+    `);
+  });
+
+  it('generates nested input types for inline object arrays in a mutation', async () => {
+    const spec: SpecsSchema = {
+      variant: 'specs',
+      flows: [
+        {
+          name: 'Cart',
+          slices: [
+            {
+              type: 'command',
+              name: 'Add items to cart',
+              client: { description: '' },
+              server: {
+                description: '',
+                specs: {
+                  name: '',
+                  rules: [
+                    {
+                      description: 'add items',
+                      examples: [
+                        {
+                          description: 'happy path',
+                          when: {
+                            commandRef: 'AddItemsToCart',
+                            exampleData: {
+                              sessionId: 's-1',
+                              items: [{ productId: 'p1', quantity: 2 }],
+                            },
+                          },
+                          then: [],
+                        },
+                      ],
+                    },
+                  ],
+                },
+              },
+            },
+          ],
+        },
+      ],
+      messages: [
+        {
+          type: 'command',
+          name: 'AddItemsToCart',
+          fields: [
+            { name: 'sessionId', type: 'string', required: true },
+            { name: 'items', type: 'Array<{ productId: string; quantity: number }>', required: true },
+          ],
+        },
+      ],
+    };
+
+    const plans = await generateScaffoldFilePlans(spec.flows, spec.messages, undefined, 'src/domain/flows');
+    const mutationFile = plans.find(
+      (p) =>
+        p.outputPath.endsWith('mutation.resolver.ts') && p.contents.includes('export class AddItemsToCartResolver'),
+    );
+
+    expect(mutationFile?.contents).toMatchInlineSnapshot(`
+"import { Mutation, Resolver, Arg, Ctx, Field, InputType } from 'type-graphql';
+import { type GraphQLContext, sendCommand, MutationResponse } from '../../../shared';
+
+@InputType()
+export class AddItemsToCartItemsInput {
+  @Field(() => String)
+  productId!: string;
+
+  @Field(() => Float)
+  quantity!: number;
+}
+
+@InputType()
+export class AddItemsToCartInput {
+  @Field(() => String)
+  sessionId!: string;
+
+  @Field(() => [AddItemsToCartItemsInput])
+  items!: AddItemsToCartItemsInput[];
+}
+
+@Resolver()
+export class AddItemsToCartResolver {
+  @Mutation(() => MutationResponse)
+  async addItemsToCart(
+    @Arg('input', () => AddItemsToCartInput) input: AddItemsToCartInput,
+    @Ctx() ctx: GraphQLContext,
+  ): Promise<MutationResponse> {
+    return await sendCommand(ctx.messageBus, {
+      type: 'AddItemsToCart',
+      kind: 'Command',
+      data: { ...input },
+    });
+  }
+}
+"
+`);
+  });
 });