@auto-engineer/narrative 0.26.0 → 0.26.2

package/package.json

@@ -23,9 +23,9 @@
     "typescript": "^5.9.2",
     "zod": "^3.22.4",
     "zod-to-json-schema": "^3.22.3",
-    "@auto-engineer/message-bus": "0.26.0",
-    "@auto-engineer/id": "0.26.0",
-    "@auto-engineer/file-store": "0.26.0"
+    "@auto-engineer/file-store": "0.26.2",
+    "@auto-engineer/message-bus": "0.26.2",
+    "@auto-engineer/id": "0.26.2"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
@@ -35,7 +35,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.26.0",
+  "version": "0.26.2",
   "scripts": {
     "build": "tsx scripts/build.ts",
     "test": "vitest run --reporter=dot",

package/src/id/addAutoIds.specs.ts

@@ -954,172 +954,4 @@ describe('addAutoIds', () => {
       }
     });
   });
-
-  describe('module ID generation', () => {
-    const AUTO_ID_REGEX = /^[A-Za-z0-9_]{9}$/;
-
-    it('should assign ID to derived module equal to sourceFile', () => {
-      const model: Model = {
-        variant: 'specs',
-        narratives: [],
-        messages: [],
-        integrations: [],
-        modules: [
-          {
-            id: '',
-            sourceFile: 'orders.narrative.ts',
-            isDerived: true,
-            contains: { narrativeIds: [] },
-            declares: { messages: [] },
-          },
-        ],
-      };
-
-      const result = addAutoIds(model);
-
-      expect(result.modules[0].id).toBe('orders.narrative.ts');
-    });
-
-    it('should generate auto ID for authored module without ID', () => {
-      const model: Model = {
-        variant: 'specs',
-        narratives: [],
-        messages: [],
-        integrations: [],
-        modules: [
-          {
-            id: '',
-            sourceFile: 'features/orders.ts',
-            isDerived: false,
-            contains: { narrativeIds: [] },
-            declares: { messages: [] },
-          },
-        ],
-      };
-
-      const result = addAutoIds(model);
-
-      expect(result.modules[0].id).toMatch(AUTO_ID_REGEX);
-    });
-
-    it('should preserve existing ID for authored module', () => {
-      const model: Model = {
-        variant: 'specs',
-        narratives: [],
-        messages: [],
-        integrations: [],
-        modules: [
-          {
-            id: 'EXISTING-MODULE-001',
-            sourceFile: 'features/orders.ts',
-            isDerived: false,
-            contains: { narrativeIds: [] },
-            declares: { messages: [] },
-          },
-        ],
-      };
-
-      const result = addAutoIds(model);
-
-      expect(result.modules[0].id).toBe('EXISTING-MODULE-001');
-    });
-
-    it('should not mutate original modules', () => {
-      const model: Model = {
-        variant: 'specs',
-        narratives: [],
-        messages: [],
-        integrations: [],
-        modules: [
-          {
-            id: '',
-            sourceFile: 'test.ts',
-            isDerived: false,
-            contains: { narrativeIds: [] },
-            declares: { messages: [] },
-          },
-        ],
-      };
-
-      const originalId = model.modules[0].id;
-      addAutoIds(model);
-
-      expect(model.modules[0].id).toBe(originalId);
-    });
-
-    it('should generate unique IDs for multiple authored modules', () => {
-      const model: Model = {
-        variant: 'specs',
-        narratives: [],
-        messages: [],
-        integrations: [],
-        modules: [
-          {
-            id: '',
-            sourceFile: 'orders.ts',
-            isDerived: false,
-            contains: { narrativeIds: [] },
-            declares: { messages: [] },
-          },
-          {
-            id: '',
-            sourceFile: 'users.ts',
-            isDerived: false,
-            contains: { narrativeIds: [] },
-            declares: { messages: [] },
-          },
-        ],
-      };
-
-      const result = addAutoIds(model);
-
-      expect(result.modules[0].id).toMatch(AUTO_ID_REGEX);
-      expect(result.modules[1].id).toMatch(AUTO_ID_REGEX);
-      expect(result.modules[0].id).not.toBe(result.modules[1].id);
-    });
-
-    it('should handle mixed derived and authored modules', () => {
-      const model: Model = {
-        variant: 'specs',
-        narratives: [],
-        messages: [],
-        integrations: [],
-        modules: [
-          {
-            id: '',
-            sourceFile: 'derived.narrative.ts',
-            isDerived: true,
-            contains: { narrativeIds: [] },
-            declares: { messages: [] },
-          },
-          {
-            id: '',
-            sourceFile: 'authored.ts',
-            isDerived: false,
-            contains: { narrativeIds: [] },
-            declares: { messages: [] },
-          },
-        ],
-      };
-
-      const result = addAutoIds(model);
-
-      expect(result.modules[0].id).toBe('derived.narrative.ts');
-      expect(result.modules[1].id).toMatch(AUTO_ID_REGEX);
-    });
-
-    it('should handle empty modules array', () => {
-      const model: Model = {
-        variant: 'specs',
-        narratives: [],
-        messages: [],
-        integrations: [],
-        modules: [],
-      };
-
-      const result = addAutoIds(model);
-
-      expect(result.modules).toEqual([]);
-    });
-  });
 });

package/src/id/addAutoIds.ts

@@ -1,4 +1,4 @@
-import type { ClientSpecNode, Example, Model, Module, Rule, Slice, Spec, Step } from '../index';
+import type { ClientSpecNode, Example, Model, Rule, Slice, Spec, Step } from '../index';
 import { generateAutoId } from './generators';
 
 function ensureId(item: { id?: string }): void {
@@ -110,18 +110,6 @@ function processSlice(slice: Slice): Slice {
   return sliceCopy;
 }
 
-function processModules(modules: Module[]): Module[] {
-  return modules.map((module) => {
-    const moduleCopy = { ...module };
-    if (module.isDerived) {
-      moduleCopy.id = module.sourceFile;
-    } else {
-      ensureId(moduleCopy);
-    }
-    return moduleCopy;
-  });
-}
-
 export function addAutoIds(specs: Model): Model {
   const result = structuredClone(specs);
   result.narratives = result.narratives.map((narrative) => {
@@ -130,8 +118,5 @@ export function addAutoIds(specs: Model): Model {
     narrativeCopy.slices = narrative.slices.map(processSlice);
     return narrativeCopy;
   });
-  if (result.modules) {
-    result.modules = processModules(result.modules);
-  }
   return result;
 }

package/src/id/hasAllIds.specs.ts

@@ -719,82 +719,4 @@ describe('hasAllIds', () => {
       expect(hasAllIds(model)).toBe(true);
     });
   });
-
-  describe('module ID validation', () => {
-    it('should return true when all modules have IDs', () => {
-      const model: Model = {
-        variant: 'specs',
-        narratives: [],
-        messages: [],
-        integrations: [],
-        modules: [
-          {
-            id: 'module-1',
-            sourceFile: 'test.ts',
-            isDerived: false,
-            contains: { narrativeIds: [] },
-            declares: { messages: [] },
-          },
-        ],
-      };
-      expect(hasAllIds(model)).toBe(true);
-    });
-
-    it('should return false when module has empty ID', () => {
-      const model: Model = {
-        variant: 'specs',
-        narratives: [],
-        messages: [],
-        integrations: [],
-        modules: [
-          {
-            id: '',
-            sourceFile: 'test.ts',
-            isDerived: false,
-            contains: { narrativeIds: [] },
-            declares: { messages: [] },
-          },
-        ],
-      };
-      expect(hasAllIds(model)).toBe(false);
-    });
-
-    it('should return false when any module is missing ID among valid narratives', () => {
-      const model: Model = {
-        variant: 'specs',
-        narratives: [{ name: 'Test', id: 'FLOW-001', slices: [] }],
-        messages: [],
-        integrations: [],
-        modules: [
-          {
-            id: '',
-            sourceFile: 'test.ts',
-            isDerived: true,
-            contains: { narrativeIds: ['FLOW-001'] },
-            declares: { messages: [] },
-          },
-        ],
-      };
-      expect(hasAllIds(model)).toBe(false);
-    });
-
-    it('should return true for derived module with valid ID', () => {
-      const model: Model = {
-        variant: 'specs',
-        narratives: [],
-        messages: [],
-        integrations: [],
-        modules: [
-          {
-            id: 'derived.ts',
-            sourceFile: 'derived.ts',
-            isDerived: true,
-            contains: { narrativeIds: [] },
-            declares: { messages: [] },
-          },
-        ],
-      };
-      expect(hasAllIds(model)).toBe(true);
-    });
-  });
 });

package/src/id/hasAllIds.ts

@@ -1,4 +1,4 @@
-import type { ClientSpecNode, Example, Model, Module, Rule, Slice, Spec, Step } from '../index';
+import type { ClientSpecNode, Example, Model, Rule, Slice, Spec, Step } from '../index';
 
 function hasValidId(item: { id?: string }): boolean {
   return item.id !== undefined && item.id !== '';
@@ -62,14 +62,6 @@ function hasSliceIds(slice: Slice): boolean {
   return hasValidId(slice) && hasServerSpecIds(slice) && hasClientSpecIds(slice) && hasDataIds(slice);
 }
 
-function hasModuleIds(modules: Module[]): boolean {
-  return modules.every(hasValidId);
-}
-
 export function hasAllIds(specs: Model): boolean {
-  const narrativesValid = specs.narratives.every(
-    (narrative) => hasValidId(narrative) && narrative.slices.every(hasSliceIds),
-  );
-  const modulesValid = hasModuleIds(specs.modules ?? []);
-  return narrativesValid && modulesValid;
+  return specs.narratives.every((narrative) => hasValidId(narrative) && narrative.slices.every(hasSliceIds));
 }

package/src/model-to-narrative.specs.ts

@@ -2562,14 +2562,12 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
         integrations: [],
         modules: [
           {
-            id: 'orders.narrative.ts',
             sourceFile: 'orders.narrative.ts',
             isDerived: true,
             contains: { narrativeIds: ['orders-flow'] },
             declares: { messages: [] },
           },
           {
-            id: 'users.narrative.ts',
             sourceFile: 'users.narrative.ts',
             isDerived: true,
             contains: { narrativeIds: ['users-flow'] },
@@ -2608,14 +2606,12 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
         integrations: [],
         modules: [
           {
-            id: 'a.narrative.ts',
             sourceFile: 'a.narrative.ts',
             isDerived: true,
             contains: { narrativeIds: ['flow-a'] },
             declares: { messages: [{ kind: 'event', name: 'SharedEvent' }] },
           },
           {
-            id: 'b.narrative.ts',
             sourceFile: 'b.narrative.ts',
             isDerived: true,
             contains: { narrativeIds: ['flow-b'] },
@@ -2690,14 +2686,12 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
         integrations: [],
         modules: [
           {
-            id: 'shared',
             sourceFile: 'shared/types.narrative.ts',
             isDerived: false,
             contains: { narrativeIds: ['shared-types'] },
             declares: { messages: [{ kind: 'event', name: 'OrderCreated' }] },
           },
           {
-            id: 'orders',
             sourceFile: 'features/orders.narrative.ts',
             isDerived: false,
             contains: { narrativeIds: ['orders-flow'] },
@@ -2766,14 +2760,12 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
         integrations: [],
         modules: [
           {
-            id: 'core',
             sourceFile: 'src/core/types.narrative.ts',
             isDerived: false,
             contains: { narrativeIds: ['core'] },
             declares: { messages: [{ kind: 'event', name: 'CoreEvent' }] },
           },
           {
-            id: 'feature',
             sourceFile: 'src/features/sub/feature.narrative.ts',
             isDerived: false,
             contains: { narrativeIds: ['feature'] },
@@ -2836,7 +2828,6 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
         integrations: [],
         modules: [
           {
-            id: 'shared',
             sourceFile: 'shared.narrative.ts',
             isDerived: false,
             contains: { narrativeIds: ['shared'] },
@@ -2848,7 +2839,6 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
             },
           },
           {
-            id: 'consumer',
             sourceFile: 'consumer.narrative.ts',
             isDerived: false,
             contains: { narrativeIds: ['consumer'] },
@@ -2914,21 +2904,18 @@ narrative('All Projection Types', 'ALL-PROJ', () => {
         integrations: [],
         modules: [
           {
-            id: 'z-types',
             sourceFile: 'z-types.narrative.ts',
             isDerived: false,
             contains: { narrativeIds: ['z-types'] },
             declares: { messages: [{ kind: 'event', name: 'ZEvent' }] },
           },
           {
-            id: 'a-types',
             sourceFile: 'a-types.narrative.ts',
             isDerived: false,
             contains: { narrativeIds: ['a-types'] },
             declares: { messages: [{ kind: 'event', name: 'AEvent' }] },
           },
           {
-            id: 'consumer',
             sourceFile: 'consumer.narrative.ts',
             isDerived: false,
             contains: { narrativeIds: ['consumer'] },

package/src/schema.ts

@@ -11,8 +11,7 @@ export const MessageRefSchema = z
 // Module schema for type ownership and file grouping
 export const ModuleSchema = z
   .object({
-    id: z.string().describe('Unique module identifier. For derived modules, equals sourceFile'),
-    sourceFile: z.string().describe('Output file path for this module'),
+    sourceFile: z.string().describe('Output file path for this module (also serves as unique identifier)'),
     isDerived: z.boolean().describe('True if auto-derived from sourceFile grouping, false if user-authored'),
     contains: z
       .object({

package/src/transformers/model-to-narrative/cross-module-imports.ts

@@ -70,7 +70,7 @@ function collectUsedMessageKeysForModule(module: Module, model: Model): Set<stri
 }
 
 function findDeclaringModule(messageKey: string, allModules: Module[], currentModule: Module): Module | undefined {
-  const authoredModules = allModules.filter((m) => !m.isDerived && m.id !== currentModule.id);
+  const authoredModules = allModules.filter((m) => !m.isDerived && m.sourceFile !== currentModule.sourceFile);
 
   for (const mod of authoredModules) {
     const declares = mod.declares.messages.some((m) => toMessageKey(m.kind, m.name) === messageKey);

package/src/transformers/model-to-narrative/modules.specs.ts

@@ -33,14 +33,12 @@ describe('module functionality', () => {
         integrations: [],
         modules: [
           {
-            id: 'orders.narrative.ts',
             sourceFile: 'orders.narrative.ts',
             isDerived: true,
             contains: { narrativeIds: ['orders-flow'] },
             declares: { messages: [{ kind: 'event', name: 'SharedEvent' }] },
           },
           {
-            id: 'users.narrative.ts',
             sourceFile: 'users.narrative.ts',
             isDerived: true,
             contains: { narrativeIds: ['users-flow'] },
@@ -132,7 +130,6 @@ describe('module functionality', () => {
         integrations: [],
         modules: [
           {
-            id: 'shared',
             sourceFile: 'shared/types.narrative.ts',
             isDerived: false,
             contains: { narrativeIds: ['shared-types'] },
@@ -141,7 +138,6 @@ describe('module functionality', () => {
             },
           },
           {
-            id: 'orders',
             sourceFile: 'features/orders.narrative.ts',
             isDerived: false,
             contains: { narrativeIds: ['orders-flow'] },
@@ -166,22 +162,20 @@ describe('module functionality', () => {
   });
 
   describe('validation', () => {
-    it('detects duplicate module IDs', () => {
+    it('detects duplicate sourceFiles', () => {
       const model: Model = {
         variant: 'specs',
         narratives: [],
         messages: [],
         modules: [
           {
-            id: 'same-id',
-            sourceFile: 'file1.ts',
+            sourceFile: 'same-file.ts',
             isDerived: false,
             contains: { narrativeIds: [] },
             declares: { messages: [] },
           },
           {
-            id: 'same-id',
-            sourceFile: 'file2.ts',
+            sourceFile: 'same-file.ts',
             isDerived: false,
             contains: { narrativeIds: [] },
             declares: { messages: [] },
@@ -192,30 +186,8 @@ describe('module functionality', () => {
       const errors = validateModules(model);
 
       expect(errors).toHaveLength(1);
-      expect(errors[0].type).toBe('duplicate_id');
-      expect(errors[0].message).toContain('same-id');
-    });
-
-    it('detects derived module ID not matching sourceFile', () => {
-      const model: Model = {
-        variant: 'specs',
-        narratives: [],
-        messages: [],
-        modules: [
-          {
-            id: 'wrong-id',
-            sourceFile: 'correct-path.ts',
-            isDerived: true,
-            contains: { narrativeIds: [] },
-            declares: { messages: [] },
-          },
-        ],
-      };
-
-      const errors = validateModules(model);
-
-      expect(errors).toHaveLength(1);
-      expect(errors[0].type).toBe('derived_id_mismatch');
+      expect(errors[0].type).toBe('duplicate_sourceFile');
+      expect(errors[0].message).toContain('same-file.ts');
     });
 
     it('detects narrative assigned to multiple authored modules', () => {
@@ -225,14 +197,12 @@ describe('module functionality', () => {
         messages: [],
         modules: [
           {
-            id: 'module-a',
             sourceFile: 'a.ts',
             isDerived: false,
             contains: { narrativeIds: ['test-narrative'] },
             declares: { messages: [] },
           },
           {
-            id: 'module-b',
             sourceFile: 'b.ts',
             isDerived: false,
             contains: { narrativeIds: ['test-narrative'] },
@@ -253,14 +223,12 @@ describe('module functionality', () => {
         messages: [{ type: 'event', source: 'internal', name: 'SharedEvent', fields: [] }],
         modules: [
           {
-            id: 'module-a',
             sourceFile: 'a.ts',
             isDerived: false,
             contains: { narrativeIds: [] },
             declares: { messages: [{ kind: 'event', name: 'SharedEvent' }] },
           },
           {
-            id: 'module-b',
             sourceFile: 'b.ts',
             isDerived: false,
             contains: { narrativeIds: [] },
@@ -281,14 +249,12 @@ describe('module functionality', () => {
         messages: [{ type: 'event', source: 'internal', name: 'SharedEvent', fields: [] }],
         modules: [
           {
-            id: 'file1.ts',
             sourceFile: 'file1.ts',
             isDerived: true,
             contains: { narrativeIds: [] },
             declares: { messages: [{ kind: 'event', name: 'SharedEvent' }] },
           },
           {
-            id: 'file2.ts',
             sourceFile: 'file2.ts',
             isDerived: true,
             contains: { narrativeIds: [] },
@@ -322,7 +288,6 @@ describe('module functionality', () => {
         messages: [],
         modules: [
           {
-            id: 'module-a',
             sourceFile: 'a.ts',
             isDerived: false,
             contains: { narrativeIds: ['nonexistent-narrative'] },
@@ -344,7 +309,6 @@ describe('module functionality', () => {
         messages: [],
         modules: [
           {
-            id: 'module-a',
             sourceFile: 'a.ts',
             isDerived: false,
             contains: { narrativeIds: [] },
@@ -366,7 +330,6 @@ describe('module functionality', () => {
         messages: [{ type: 'event', source: 'internal', name: 'UndeclaredEvent', fields: [] }],
         modules: [
           {
-            id: 'module-a',
             sourceFile: 'a.ts',
             isDerived: false,
             contains: { narrativeIds: [] },
@@ -382,7 +345,7 @@ describe('module functionality', () => {
     });
 
     it('throwOnValidationErrors throws when errors exist', () => {
-      const errors = [{ type: 'duplicate_id' as const, message: 'Test error' }];
+      const errors = [{ type: 'duplicate_sourceFile' as const, message: 'Test error' }];
 
       expect(() => throwOnValidationErrors(errors)).toThrow('Module validation failed');
       expect(() => throwOnValidationErrors(errors)).toThrow('Test error');
@@ -423,7 +386,6 @@ describe('module functionality', () => {
         integrations: [],
         modules: [
           {
-            id: 'orders.narrative.ts',
             sourceFile: 'orders.narrative.ts',
             isDerived: true,
             contains: { narrativeIds: ['orders-flow'] },
@@ -435,7 +397,6 @@ describe('module functionality', () => {
             },
           },
           {
-            id: 'users.narrative.ts',
             sourceFile: 'users.narrative.ts',
             isDerived: true,
             contains: { narrativeIds: ['users-flow'] },
@@ -479,14 +440,12 @@ describe('module functionality', () => {
         integrations: [],
         modules: [
           {
-            id: 'a.narrative.ts',
             sourceFile: 'a.narrative.ts',
             isDerived: true,
             contains: { narrativeIds: ['flow-a'] },
             declares: { messages: [{ kind: 'event', name: 'SharedEvent' }] },
           },
           {
-            id: 'b.narrative.ts',
             sourceFile: 'b.narrative.ts',
             isDerived: true,
             contains: { narrativeIds: ['flow-b'] },
@@ -554,14 +513,12 @@ describe('module functionality', () => {
         integrations: [],
         modules: [
           {
-            id: 'shared',
             sourceFile: 'shared/types.narrative.ts',
             isDerived: false,
             contains: { narrativeIds: ['shared-types'] },
             declares: { messages: [{ kind: 'event', name: 'OrderCreated' }] },
           },
           {
-            id: 'orders',
             sourceFile: 'features/orders.narrative.ts',
             isDerived: false,
             contains: { narrativeIds: ['orders-flow'] },
@@ -594,21 +551,18 @@ describe('module functionality', () => {
         integrations: [],
         modules: [
           {
-            id: 'z.narrative.ts',
             sourceFile: 'z.narrative.ts',
             isDerived: true,
             contains: { narrativeIds: ['z'] },
             declares: { messages: [] },
           },
           {
-            id: 'a.narrative.ts',
             sourceFile: 'a.narrative.ts',
             isDerived: true,
             contains: { narrativeIds: ['a'] },
             declares: { messages: [] },
           },
           {
-            id: 'm.narrative.ts',
             sourceFile: 'm.narrative.ts',
             isDerived: true,
             contains: { narrativeIds: ['m'] },