@auto-engineer/narrative 0.12.1 → 0.13.1

package/dist/src/id/hasAllIds.specs.js

@@ -1,231 +1,158 @@
-import { describe, expect, it, beforeEach } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { hasAllIds, addAutoIds } from './index.js';
-import { getNarratives } from '../getNarratives.js';
-import { InMemoryFileStore } from '@auto-engineer/file-store';
-import * as flowApi from '../narrative.js';
-import * as fluent from '../fluent-builder.js';
-import * as dataBuilders from '../data-narrative-builders.js';
-import * as typesApi from '../types.js';
-import gql from 'graphql-tag';
-const importMap = {
-    '../flow': flowApi,
-    '../fluent-builder': fluent,
-    '../data-flow-builders': dataBuilders,
-    '../types': typesApi,
-    'graphql-tag': gql,
-};
 describe('hasAllIds', () => {
-    let vfs;
-    const root = '/test';
-    beforeEach(async () => {
-        vfs = new InMemoryFileStore();
-        const flowWithoutIds = `
-import { flow, specs, rule, example } from '../narrative.js';
-import { command } from '../fluent-builder.js';
-
-flow('Test Flow Without IDs', () => {
-  command('Test slice without ID')
-    .server(() => {
-      specs('Test specs', () => {
-        rule('Test rule without ID', () => {
-          example('Test example')
-            .when({ test: 'data' })
-            .then({ result: 'success' });
-        });
-      });
-    });
-});`;
-        const flowWithIds = `
-import { flow, specs, rule, example } from '../narrative.js';
-import { command } from '../fluent-builder.js';
-
-flow('Test Flow with IDs', 'FLOW-001', () => {
-  command('Test slice with ID', 'SLICE-001')
-    .server(() => {
-      specs('Test specs', () => {
-        rule('Test rule with ID', 'RULE-001', () => {
-          example('Test example')
-            .when({ test: 'data' })
-            .then({ result: 'success' });
-        });
-      });
-    });
-});`;
-        const multipleFlowsSameSource = `
-import { flow, specs, it } from '../narrative.js';
-import { experience } from '../fluent-builder.js';
-
-flow('Home Screen', 'AUTO-aifPcU3hw', () => {
-  experience('Active Surveys Summary', 'AUTO-slice1').client(() => {
-    specs(() => {
-      it('show active surveys summary');
-    });
-  });
-});
-
-flow('Create Survey', 'AUTO-MPviTMrQC', () => {
-  experience('Create Survey Form', 'AUTO-slice2').client(() => {
-    specs(() => {
-      it('allow entering survey title');
-    });
-  });
-});
-
-flow('Response Analytics', 'AUTO-eME978Euk', () => {
-  experience('Response Rate Charts', 'AUTO-slice3').client(() => {
-    specs(() => {
-      it('show daily response rate charts');
-    });
-  });
-});`;
-        const multipleFlowsIncomplete = `
-import { flow, specs, it } from '../narrative.js';
-import { experience } from '../fluent-builder.js';
-
-flow('Home Screen', 'AUTO-aifPcU3hw', () => {
-  experience('Active Surveys Summary', 'AUTO-slice1').client(() => {
-    specs(() => {
-      it('show active surveys summary');
-    });
-  });
-});
-
-flow('Create Survey', () => {
-  experience('Create Survey Form', 'AUTO-slice2').client(() => {
-    specs(() => {
-      it('allow entering survey title');
-    });
-  });
-});
-
-flow('Response Analytics', 'AUTO-eME978Euk', () => {
-  experience('Response Rate Charts', 'AUTO-slice3').client(() => {
-    specs(() => {
-      it('show daily response rate charts');
-    });
-  });
-});`;
-        const multipleFlowsSliceMissing = `
-import { flow, specs, it } from '../narrative.js';
-import { experience } from '../fluent-builder.js';
-
-flow('Home Screen', 'AUTO-aifPcU3hw', () => {
-  experience('Active Surveys Summary', 'AUTO-slice1').client(() => {
-    specs(() => {
-      it('show active surveys summary');
-    });
-  });
-});
-
-flow('Create Survey', 'AUTO-MPviTMrQC', () => {
-  experience('Create Survey Form').client(() => {
-    specs(() => {
-      it('allow entering survey title');
-    });
-  });
-});
-
-flow('Response Analytics', 'AUTO-eME978Euk', () => {
-  experience('Response Rate Charts', 'AUTO-slice3').client(() => {
-    specs(() => {
-      it('show daily response rate charts');
-    });
-  });
-});`;
-        const flowContent1 = new TextEncoder().encode(flowWithoutIds);
-        const flowContent2 = new TextEncoder().encode(flowWithIds);
-        const flowContent3 = new TextEncoder().encode(multipleFlowsSameSource);
-        const flowContent4 = new TextEncoder().encode(multipleFlowsIncomplete);
-        const flowContent5 = new TextEncoder().encode(multipleFlowsSliceMissing);
-        await vfs.write('/test/flow-without-ids.narrative.ts', flowContent1);
-        await vfs.write('/test/flow-with-ids.narrative.ts', flowContent2);
-        await vfs.write('/test/homepage.narrative.ts', flowContent3);
-        await vfs.write('/test/homepage-incomplete.narrative.ts', flowContent4);
-        await vfs.write('/test/homepage-slice-missing.narrative.ts', flowContent5);
-    });
-    it('should return false for models without IDs', async () => {
-        const result = await getNarratives({ vfs, root, pattern: /\.(narrative)\.(ts)$/, fastFsScan: true, importMap });
-        const model = result.toModel();
-        const flowWithoutIds = model.narratives.find((f) => f.name === 'Test Flow Without IDs');
-        expect(flowWithoutIds).toBeDefined();
-        if (flowWithoutIds) {
-            const modelWithoutIds = { ...model, narratives: [flowWithoutIds] };
-            expect(hasAllIds(modelWithoutIds)).toBe(false);
-        }
-    });
-    it('should return true for models with complete IDs', async () => {
-        const result = await getNarratives({ vfs, root, pattern: /\.(narrative)\.(ts)$/, fastFsScan: true, importMap });
-        const model = result.toModel();
+    const createModelWithoutIds = () => ({
+        variant: 'specs',
+        narratives: [
+            {
+                name: 'Test Flow Without IDs',
+                slices: [
+                    {
+                        type: 'command',
+                        name: 'Test slice without ID',
+                        client: { specs: [] },
+                        server: {
+                            description: 'Test server',
+                            specs: [
+                                {
+                                    type: 'gherkin',
+                                    feature: 'Test specs',
+                                    rules: [
+                                        {
+                                            name: 'Test rule without ID',
+                                            examples: [],
+                                        },
+                                    ],
+                                },
+                            ],
+                        },
+                    },
+                ],
+            },
+        ],
+        messages: [],
+        integrations: [],
+    });
+    const createModelWithIds = () => ({
+        variant: 'specs',
+        narratives: [
+            {
+                name: 'Test Flow with IDs',
+                id: 'FLOW-001',
+                slices: [
+                    {
+                        type: 'command',
+                        name: 'Test slice with ID',
+                        id: 'SLICE-001',
+                        client: { specs: [] },
+                        server: {
+                            description: 'Test server',
+                            specs: [
+                                {
+                                    type: 'gherkin',
+                                    feature: 'Test specs',
+                                    rules: [
+                                        {
+                                            id: 'RULE-001',
+                                            name: 'Test rule with ID',
+                                            examples: [],
+                                        },
+                                    ],
+                                },
+                            ],
+                        },
+                    },
+                ],
+            },
+        ],
+        messages: [],
+        integrations: [],
+    });
+    const createMultipleFlowsModel = (includeAllIds, includeAllSliceIds) => ({
+        variant: 'specs',
+        narratives: [
+            {
+                name: 'Home Screen',
+                id: 'aifPcU3hw',
+                sourceFile: '/path/to/homepage.narrative.ts',
+                slices: [
+                    {
+                        name: 'Active Surveys Summary',
+                        id: 'slice1',
+                        type: 'experience',
+                        client: { specs: [{ type: 'it', title: 'show active surveys summary' }] },
+                    },
+                ],
+            },
+            {
+                name: 'Create Survey',
+                id: includeAllIds ? 'MPviTMrQC' : undefined,
+                sourceFile: '/path/to/homepage.narrative.ts',
+                slices: [
+                    {
+                        name: 'Create Survey Form',
+                        id: includeAllSliceIds ? 'slice2' : undefined,
+                        type: 'experience',
+                        client: { specs: [{ type: 'it', title: 'allow entering survey title' }] },
+                    },
+                ],
+            },
+            {
+                name: 'Response Analytics',
+                id: 'eME978Euk',
+                sourceFile: '/path/to/homepage.narrative.ts',
+                slices: [
+                    {
+                        name: 'Response Rate Charts',
+                        id: 'slice3',
+                        type: 'experience',
+                        client: { specs: [{ type: 'it', title: 'show daily response rate charts' }] },
+                    },
+                ],
+            },
+        ],
+        messages: [],
+        integrations: [],
+    });
+    it('should return false for models without IDs', () => {
+        const model = createModelWithoutIds();
+        expect(hasAllIds(model)).toBe(false);
+    });
+    it('should return true for models with complete IDs', () => {
+        const model = createModelWithoutIds();
         const modelWithIds = addAutoIds(model);
         expect(hasAllIds(modelWithIds)).toBe(true);
     });
-    it('should return true for flows that already have IDs', async () => {
-        const result = await getNarratives({ vfs, root, pattern: /\.(narrative)\.(ts)$/, fastFsScan: true, importMap });
-        const model = result.toModel();
-        const testFlowWithIds = model.narratives.find((f) => f.name === 'Test Flow with IDs');
-        expect(testFlowWithIds).toBeDefined();
-        if (testFlowWithIds) {
-            const modelWithExistingIds = { ...model, narratives: [testFlowWithIds] };
-            expect(hasAllIds(modelWithExistingIds)).toBe(true);
-        }
+    it('should return true for flows that already have IDs', () => {
+        const model = createModelWithIds();
+        expect(hasAllIds(model)).toBe(true);
     });
-    it('should return false if any slice is missing an ID', async () => {
-        const result = await getNarratives({ vfs, root, pattern: /\.(narrative)\.(ts)$/, fastFsScan: true, importMap });
-        const model = result.toModel();
-        const modelWithIds = addAutoIds(model);
-        expect(modelWithIds.narratives.length).toBeGreaterThan(0);
-        expect(modelWithIds.narratives[0].slices.length).toBeGreaterThan(0);
-        const modifiedModel = structuredClone(modelWithIds);
+    it('should return false if any slice is missing an ID', () => {
+        const model = createModelWithIds();
+        const modifiedModel = structuredClone(model);
         modifiedModel.narratives[0].slices[0].id = '';
         expect(hasAllIds(modifiedModel)).toBe(false);
     });
-    it('should return false if any rule is missing an ID', async () => {
-        const result = await getNarratives({ vfs, root, pattern: /\.(narrative)\.(ts)$/, fastFsScan: true, importMap });
-        const model = result.toModel();
-        const modelWithIds = addAutoIds(model);
-        let found = false;
-        for (const flow of modelWithIds.narratives) {
-            for (const slice of flow.slices) {
-                if ('server' in slice && slice.server?.specs?.rules !== undefined && slice.server.specs.rules.length > 0) {
-                    const modifiedModel = structuredClone(modelWithIds);
-                    const modifiedFlow = modifiedModel.narratives.find((f) => f.name === flow.name);
-                    const modifiedSlice = modifiedFlow?.slices.find((s) => s.name === slice.name);
-                    if (modifiedSlice && 'server' in modifiedSlice && modifiedSlice.server?.specs?.rules !== undefined) {
-                        modifiedSlice.server.specs.rules[0].id = '';
-                        expect(hasAllIds(modifiedModel)).toBe(false);
-                        found = true;
-                        break;
-                    }
-                }
-            }
-            if (found)
-                break;
+    it('should return false if any rule is missing an ID', () => {
+        const model = createModelWithIds();
+        const modifiedModel = structuredClone(model);
+        const slice = modifiedModel.narratives[0].slices[0];
+        if ('server' in slice && slice.server?.specs !== undefined && Array.isArray(slice.server.specs)) {
+            slice.server.specs[0].rules[0].id = '';
         }
-        expect(found).toBe(true);
+        expect(hasAllIds(modifiedModel)).toBe(false);
     });
-    it('should return true when multiple flows with same sourceFile all have IDs', async () => {
-        const result = await getNarratives({ vfs, root, pattern: /\.(narrative)\.(ts)$/, fastFsScan: true, importMap });
-        const model = result.toModel();
-        const homepageFlows = model.narratives.filter((f) => f.sourceFile !== undefined && f.sourceFile.includes('homepage.narrative.ts'));
-        expect(homepageFlows.length).toBe(3);
-        const homepageModel = { ...model, narratives: homepageFlows };
-        expect(hasAllIds(homepageModel)).toBe(true);
+    it('should return true when multiple flows with same sourceFile all have IDs', () => {
+        const model = createMultipleFlowsModel(true, true);
+        expect(hasAllIds(model)).toBe(true);
     });
-    it('should return false when any flow in multiple flows with same sourceFile is missing ID', async () => {
-        const result = await getNarratives({ vfs, root, pattern: /\.(narrative)\.(ts)$/, fastFsScan: true, importMap });
-        const model = result.toModel();
-        const homepageFlows = model.narratives.filter((f) => f.sourceFile !== undefined && f.sourceFile.includes('homepage-incomplete.narrative.ts'));
-        expect(homepageFlows.length).toBe(3);
-        const homepageModel = { ...model, narratives: homepageFlows };
-        expect(hasAllIds(homepageModel)).toBe(false);
+    it('should return false when any flow in multiple flows with same sourceFile is missing ID', () => {
+        const model = createMultipleFlowsModel(false, true);
+        expect(hasAllIds(model)).toBe(false);
     });
-    it('should return false when any slice in multiple flows with same sourceFile is missing ID', async () => {
-        const result = await getNarratives({ vfs, root, pattern: /\.(narrative)\.(ts)$/, fastFsScan: true, importMap });
-        const model = result.toModel();
-        const homepageFlows = model.narratives.filter((f) => f.sourceFile !== undefined && f.sourceFile.includes('homepage-slice-missing.narrative.ts'));
-        expect(homepageFlows.length).toBe(3);
-        const homepageModel = { ...model, narratives: homepageFlows };
-        expect(hasAllIds(homepageModel)).toBe(false);
+    it('should return false when any slice in multiple flows with same sourceFile is missing ID', () => {
+        const model = createMultipleFlowsModel(true, false);
+        expect(hasAllIds(model)).toBe(false);
     });
 });
 //# sourceMappingURL=hasAllIds.specs.js.map

package/dist/src/id/hasAllIds.specs.js.map

@@ -1 +1 @@
-{"version":3,"file":"hasAllIds.specs.js","sourceRoot":"","sources":["../../../src/id/hasAllIds.specs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAmB,MAAM,2BAA2B,CAAC;AAC/E,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,YAAY,MAAM,4BAA4B,CAAC;AAC3D,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AACrC,OAAO,GAAG,MAAM,aAAa,CAAC;AAE9B,MAAM,SAAS,GAAG;IAChB,SAAS,EAAE,OAAO;IAClB,mBAAmB,EAAE,MAAM;IAC3B,uBAAuB,EAAE,YAAY;IACrC,UAAU,EAAE,QAAQ;IACpB,aAAa,EAAE,GAAG;CACnB,CAAC;AAEF,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,IAAI,GAAe,CAAC;IACpB,MAAM,IAAI,GAAG,OAAO,CAAC;IAErB,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,GAAG,GAAG,IAAI,iBAAiB,EAAE,CAAC;QAE9B,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;IAevB,CAAC;QAED,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;IAepB,CAAC;QAED,MAAM,uBAAuB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;IA0BhC,CAAC;QAED,MAAM,uBAAuB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;IA0BhC,CAAC;QAED,MAAM,yBAAyB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;IA0BlC,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAC9D,MAAM,YAAY,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC3D,MAAM,YAAY,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;QACvE,MAAM,YAAY,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;QACvE,MAAM,YAAY,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC;QACzE,MAAM,GAAG,CAAC,KAAK,CAAC,qCAAqC,EAAE,YAAY,CAAC,CAAC;QACrE,MAAM,GAAG,CAAC,KAAK,CAAC,kCAAkC,EAAE,YAAY,CAAC,CAAC;QAClE,MAAM,GAAG,CAAC,KAAK,CAAC,6BAA6B,EAAE,YAAY,CAAC,CAAC;QAC7D,MAAM,GAAG,CAAC,KAAK,CAAC,wCAAwC,EAAE,YAAY,CAAC,CAAC;QACxE,MAAM,GAAG,CAAC,KAAK,CAAC,2CAA2C,EAAE,YAAY,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,sBAAsB,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAChH,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAE/B,MAAM,cAAc,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,uBAAuB,CAAC,CAAC;QACxF,MAAM,CAAC,cAAc,CAAC,CAAC,WAAW,EAAE,CAAC;QAErC,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,eAAe,GAAG,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC;YACnE,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;QAC/D,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,sBAAsB,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAChH,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAE/B,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAClE,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,sBAAsB,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAChH,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAE/B,MAAM,eAAe,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,oBAAoB,CAAC,CAAC;QACtF,MAAM,CAAC,eAAe,CAAC,CAAC,WAAW,EAAE,CAAC;QAEtC,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM,oBAAoB,GAAG,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;YACzE,MAAM,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;QACjE,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,sBAAsB,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAChH,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAE/B,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAC1D,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAEpE,MAAM,aAAa,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;QACpD,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC;QAC9C,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,sBAAsB,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAChH,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAE/B,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QAEvC,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;YAC3C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChC,IAAI,QAAQ,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACzG,MAAM,aAAa,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;oBACpD,MAAM,YAAY,GAAG,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;oBAChF,MAAM,aAAa,GAAG,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC9E,IAAI,aAAa,IAAI,QAAQ,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,SAAS,EAAE,CAAC;wBACnG,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC;wBAC5C,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;wBAC7C,KAAK,GAAG,IAAI,CAAC;wBACb,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC;YACD,IAAI,KAAK;gBAAE,MAAM;QACnB,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0EAA0E,EAAE,KAAK,IAAI,EAAE;QACxF,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,sBAAsB,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAChH,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAE/B,MAAM,aAAa,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAC3C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,SAAS,IAAI,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CACpF,CAAC;QACF,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAErC,MAAM,aAAa,GAAG,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC;QAC9D,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wFAAwF,EAAE,KAAK,IAAI,EAAE;QACtG,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,sBAAsB,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAChH,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAE/B,MAAM,aAAa,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAC3C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,SAAS,IAAI,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,kCAAkC,CAAC,CAC/F,CAAC;QACF,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAErC,MAAM,aAAa,GAAG,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC;QAC9D,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yFAAyF,EAAE,KAAK,IAAI,EAAE;QACvG,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,sBAAsB,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAChH,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAE/B,MAAM,aAAa,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAC3C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,SAAS,IAAI,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,qCAAqC,CAAC,CAClG,CAAC;QACF,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAErC,MAAM,aAAa,GAAG,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC;QAC9D,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"hasAllIds.specs.js","sourceRoot":"","sources":["../../../src/id/hasAllIds.specs.ts"],"names":[],"mappings":"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"}

package/dist/src/index.d.ts

@@ -9,21 +9,19 @@ export { command, query, react, experience, decide, evolve } from './fluent-buil
 export { sink, source } from './data-narrative-builders';
 export type { FieldSelector } from './data-narrative-builders';
 export { narrative, narrative as flow } from './narrative';
-export { client, server, specs, describe, it, should, request, data, rule, example } from './narrative';
+export { client, server, specs, describe, it, should, request, data, rule, example, thenError } from './narrative';
+export type { ExampleBuilder, GivenBuilder, WhenBuilder, ThenBuilder } from './narrative';
 export type { SliceTypeValueInterface } from './narrative';
 export { SliceType } from './narrative';
 export { getNarratives } from './getNarratives';
 export { modelToNarrative } from './transformers/model-to-narrative';
-export { createNarrativeSpec, given, when } from './testing';
-export { NarrativeNamesSchema as NarrativeNamesSystemSchema, SliceNamesSchema as SliceNamesSystemSchema, ClientServerNamesSchema as ClientServerNamesSystemSchema, modelSchema as SpecsSystemSchema, MessageFieldSchema, MessageSchema, CommandSchema, EventSchema, StateSchema, IntegrationSchema, CommandSliceSchema, QuerySliceSchema, ReactSliceSchema, ExperienceSliceSchema, SliceSchema, NarrativeSchema, modelSchema, EventExampleSchema, CommandExampleSchema, ExampleSchema, RuleSchema, SpecSchema, } from './schema';
-import { CommandExampleSchema, ErrorExampleSchema, EventExampleSchema, NarrativeSchema, SliceSchema, modelSchema, StateExampleSchema, QuerySliceSchema, ReactSliceSchema, ExperienceSliceSchema, MessageSchema, MessageFieldSchema, CommandSliceSchema, ExampleSchema, RuleSchema, SpecSchema } from './schema';
+export type { ExportSchemaEvents } from './commands/export-schema';
+export { createNarrativeSpec, given as testGiven, when as testWhen } from './testing';
+export { NarrativeNamesSchema as NarrativeNamesSystemSchema, SliceNamesSchema as SliceNamesSystemSchema, ClientServerNamesSchema as ClientServerNamesSystemSchema, modelSchema as SpecsSystemSchema, MessageFieldSchema, MessageSchema, CommandSchema, EventSchema, StateSchema, IntegrationSchema, CommandSliceSchema, QuerySliceSchema, ReactSliceSchema, ExperienceSliceSchema, SliceSchema, NarrativeSchema, modelSchema, ExampleSchema, RuleSchema, SpecSchema, StepSchema, StepErrorSchema, StepWithDocStringSchema, StepWithErrorSchema, } from './schema';
+import { NarrativeSchema, SliceSchema, modelSchema, QuerySliceSchema, ReactSliceSchema, ExperienceSliceSchema, MessageSchema, MessageFieldSchema, CommandSliceSchema, ExampleSchema, RuleSchema, SpecSchema, StepSchema } from './schema';
 export type Model = z.infer<typeof modelSchema>;
 export type Narrative = z.infer<typeof NarrativeSchema>;
-export type CommandExample = z.infer<typeof CommandExampleSchema>;
-export type EventExample = z.infer<typeof EventExampleSchema>;
 export type Slice = z.infer<typeof SliceSchema>;
-export type StateExample = z.infer<typeof StateExampleSchema>;
-export type ErrorExample = z.infer<typeof ErrorExampleSchema>;
 export type QuerySlice = z.infer<typeof QuerySliceSchema>;
 export type ReactSlice = z.infer<typeof ReactSliceSchema>;
 export type CommandSlice = z.infer<typeof CommandSliceSchema>;
@@ -33,6 +31,7 @@ export type Example = z.infer<typeof ExampleSchema>;
 export type MessageField = z.infer<typeof MessageFieldSchema>;
 export type Rule = z.infer<typeof RuleSchema>;
 export type Spec = z.infer<typeof SpecSchema>;
+export type Step = z.infer<typeof StepSchema>;
 export type { ClientSpecNode } from './schema';
 export { addAutoIds, hasAllIds } from './id';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,YAAY,EACV,WAAW,EACX,QAAQ,EACR,UAAU,EACV,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,aAAa,EACb,WAAW,EACX,MAAM,EACN,KAAK,EACL,OAAO,EACP,KAAK,GACN,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAG5C,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAGlC,eAAO,MAAM,GAAG,GAAI,SAAS,oBAAoB,EAAE,GAAG,QAAQ,OAAO,EAAE,WAKtE,CAAC;AAGF,YAAY,EACV,yBAAyB,EACzB,uBAAuB,EACvB,0BAA0B,EAC1B,4BAA4B,GAC7B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAGrF,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACzD,YAAY,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAG/D,OAAO,EAAE,SAAS,EAAE,SAAS,IAAI,IAAI,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACxG,YAAY,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAGrE,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAG7D,OAAO,EACL,oBAAoB,IAAI,0BAA0B,EAClD,gBAAgB,IAAI,sBAAsB,EAC1C,uBAAuB,IAAI,6BAA6B,EACxD,WAAW,IAAI,iBAAiB,EAChC,kBAAkB,EAClB,aAAa,EACb,aAAa,EACb,WAAW,EACX,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACrB,WAAW,EACX,eAAe,EACf,WAAW,EACX,kBAAkB,EAClB,oBAAoB,EACpB,aAAa,EACb,UAAU,EACV,UAAU,GACX,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,kBAAkB,EAClB,eAAe,EACf,WAAW,EACX,WAAW,EACX,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACrB,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,aAAa,EACb,UAAU,EACV,UAAU,EACX,MAAM,UAAU,CAAC;AAClB,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAChD,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AACxD,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAClE,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAC9D,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAChD,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAC9D,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAC9D,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAC1D,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAC1D,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAC9D,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACpE,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AACpD,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AACpD,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAC9D,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAC;AAC9C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAC;AAC9C,YAAY,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAG/C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/dist/src/index.js

@@ -14,15 +14,15 @@ export { command, query, react, experience, decide, evolve } from './fluent-buil
 export { sink, source } from './data-narrative-builders.js';
 // Narrative language functions
 export { narrative, narrative as flow } from './narrative.js';
-export { client, server, specs, describe, it, should, request, data, rule, example } from './narrative.js';
+export { client, server, specs, describe, it, should, request, data, rule, example, thenError } from './narrative.js';
 export { SliceType } from './narrative.js';
 // Narrative conversion utilities
 export { getNarratives } from './getNarratives.js';
 export { modelToNarrative } from './transformers/model-to-narrative/index.js';
 // Testing helpers
-export { createNarrativeSpec, given, when } from './testing.js';
+export { createNarrativeSpec, given as testGiven, when as testWhen } from './testing.js';
 // Schema definitions for progressive narrative creation
-export { NarrativeNamesSchema as NarrativeNamesSystemSchema, SliceNamesSchema as SliceNamesSystemSchema, ClientServerNamesSchema as ClientServerNamesSystemSchema, modelSchema as SpecsSystemSchema, MessageFieldSchema, MessageSchema, CommandSchema, EventSchema, StateSchema, IntegrationSchema, CommandSliceSchema, QuerySliceSchema, ReactSliceSchema, ExperienceSliceSchema, SliceSchema, NarrativeSchema, modelSchema, EventExampleSchema, CommandExampleSchema, ExampleSchema, RuleSchema, SpecSchema, } from './schema.js';
+export { NarrativeNamesSchema as NarrativeNamesSystemSchema, SliceNamesSchema as SliceNamesSystemSchema, ClientServerNamesSchema as ClientServerNamesSystemSchema, modelSchema as SpecsSystemSchema, MessageFieldSchema, MessageSchema, CommandSchema, EventSchema, StateSchema, IntegrationSchema, CommandSliceSchema, QuerySliceSchema, ReactSliceSchema, ExperienceSliceSchema, SliceSchema, NarrativeSchema, modelSchema, ExampleSchema, RuleSchema, SpecSchema, StepSchema, StepErrorSchema, StepWithDocStringSchema, StepWithErrorSchema, } from './schema.js';
 // ID assignment utilities
 export { addAutoIds, hasAllIds } from './id/index.js';
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C,iBAAiB;AACjB,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,qCAAqC;AACrC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,OAA6B,EAAE,GAAG,MAAiB,EAAE,EAAE;IACzE,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE;QACvC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,OAAO,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACrF,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC,CAAC;AASF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAErF,0BAA0B;AAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAGzD,+BAA+B;AAC/B,OAAO,EAAE,SAAS,EAAE,SAAS,IAAI,IAAI,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAExG,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,iCAAiC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAErE,kBAAkB;AAClB,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAE7D,wDAAwD;AACxD,OAAO,EACL,oBAAoB,IAAI,0BAA0B,EAClD,gBAAgB,IAAI,sBAAsB,EAC1C,uBAAuB,IAAI,6BAA6B,EACxD,WAAW,IAAI,iBAAiB,EAChC,kBAAkB,EAClB,aAAa,EACb,aAAa,EACb,WAAW,EACX,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACrB,WAAW,EACX,eAAe,EACf,WAAW,EACX,kBAAkB,EAClB,oBAAoB,EACpB,aAAa,EACb,UAAU,EACV,UAAU,GACX,MAAM,UAAU,CAAC;AAsClB,0BAA0B;AAC1B,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C,iBAAiB;AACjB,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,qCAAqC;AACrC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,OAA6B,EAAE,GAAG,MAAiB,EAAE,EAAE;IACzE,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE;QACvC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,OAAO,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACrF,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC,CAAC;AASF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAErF,0BAA0B;AAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAGzD,+BAA+B;AAC/B,OAAO,EAAE,SAAS,EAAE,SAAS,IAAI,IAAI,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGnH,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,iCAAiC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAIrE,kBAAkB;AAClB,OAAO,EAAE,mBAAmB,EAAE,KAAK,IAAI,SAAS,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,WAAW,CAAC;AAEtF,wDAAwD;AACxD,OAAO,EACL,oBAAoB,IAAI,0BAA0B,EAClD,gBAAgB,IAAI,sBAAsB,EAC1C,uBAAuB,IAAI,6BAA6B,EACxD,WAAW,IAAI,iBAAiB,EAChC,kBAAkB,EAClB,aAAa,EACb,aAAa,EACb,WAAW,EACX,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACrB,WAAW,EACX,eAAe,EACf,WAAW,EACX,aAAa,EACb,UAAU,EACV,UAAU,EACV,UAAU,EACV,eAAe,EACf,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,UAAU,CAAC;AAgClB,0BAA0B;AAC1B,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC"}

package/dist/src/loader/graph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../src/loader/graph.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EASL,QAAQ,EACT,MAAM,YAAY,CAAC;AAyIpB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChD,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC;CACrE,CAAC;AAEF,wBAAsB,UAAU,CAC9B,UAAU,EAAE,MAAM,EAAE,EACpB,GAAG,EAAE,UAAU,EACf,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CAoN3B"}
+{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../src/loader/graph.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAUL,QAAQ,EACT,MAAM,YAAY,CAAC;AAyIpB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChD,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC;CACrE,CAAC;AAEF,wBAAsB,UAAU,CAC9B,UAAU,EAAE,MAAM,EAAE,EACpB,GAAG,EAAE,UAAU,EACf,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CAoO3B"}

package/dist/src/loader/graph.js

@@ -1,5 +1,5 @@
 import createDebug from 'debug';
-import { parseImports, parseTypeDefinitions, parseIntegrationExports, parseIntegrationImports, parseGivenTypeArguments, parseWhenTypeArguments, patchImportMeta, transpileToCjs, } from './ts-utils.js';
+import { parseImports, parseTypeDefinitions, parseIntegrationExports, parseIntegrationImports, parseGivenTypeArguments, parseWhenTypeArguments, parseThenTypeArguments, patchImportMeta, transpileToCjs, } from './ts-utils.js';
 import { toPosix } from './fs-path.js';
 import { resolveSpecifier } from './resolver.js';
 import { integrationExportRegistry } from '../integration-export-registry.js';
@@ -248,6 +248,7 @@ export async function buildGraph(entryFiles, vfs, importMap, rootDir) {
     }
     function extractTypeInfoFromProgram(program, checker) {
         const whenTypesByFile = new Map();
+        const thenTypesByFile = new Map();
         for (const sourceFile of program.getSourceFiles()) {
             const posixPath = toPosix(sourceFile.fileName);
             if (!sourceFiles.has(posixPath) || posixPath.endsWith('.d.ts'))
@@ -255,16 +256,21 @@ export async function buildGraph(entryFiles, vfs, importMap, rootDir) {
             const fileTypeMap = typesByFile.get(posixPath) || new Map();
             const extractedGivenTypes = parseGivenTypeArguments(ts, checker, sourceFile, fileTypeMap, typesByFile);
             const extractedWhenTypes = parseWhenTypeArguments(ts, checker, sourceFile, fileTypeMap, typesByFile);
+            const extractedThenTypes = parseThenTypeArguments(ts, checker, sourceFile, fileTypeMap, typesByFile);
             if (extractedGivenTypes.length > 0) {
                 givenTypesByFile.set(posixPath, extractedGivenTypes);
-                debug('[given-types] extracted %d .given<T>() calls from %s', extractedGivenTypes.length, posixPath);
+                debug('[given-types] extracted %d given<T>() calls from %s', extractedGivenTypes.length, posixPath);
             }
             if (extractedWhenTypes.length > 0) {
                 whenTypesByFile.set(posixPath, extractedWhenTypes);
-                debug('[when-types] extracted %d .when<T>() calls from %s: %o', extractedWhenTypes.length, posixPath, extractedWhenTypes.map((t) => ({ typeName: t.typeName, classification: t.classification })));
+                debug('[when-types] extracted %d when<T>() calls from %s: %o', extractedWhenTypes.length, posixPath, extractedWhenTypes.map((t) => ({ typeName: t.typeName, classification: t.classification })));
+            }
+            if (extractedThenTypes.length > 0) {
+                thenTypesByFile.set(posixPath, extractedThenTypes);
+                debug('[then-types] extracted %d then<T>() calls from %s: %o', extractedThenTypes.length, posixPath, extractedThenTypes.map((t) => ({ typeName: t.typeName, classification: t.classification })));
             }
         }
-        return whenTypesByFile;
+        return { whenTypes: whenTypesByFile, thenTypes: thenTypesByFile };
     }
     for (const entry of entryFiles) {
         await buildRec(toPosix(entry));
@@ -273,8 +279,9 @@ export async function buildGraph(entryFiles, vfs, importMap, rootDir) {
     await loadTypingFiles(pkgTypings);
     const program = ts.createProgram([...sourceFiles.keys()], compilerOptions, host);
     const checker = program.getTypeChecker();
-    const whenTypesByFile = extractTypeInfoFromProgram(program, checker);
-    givenTypesByFile.set('__whenTypes', whenTypesByFile);
+    const { whenTypes, thenTypes } = extractTypeInfoFromProgram(program, checker);
+    givenTypesByFile.set('__whenTypes', whenTypes);
+    givenTypesByFile.set('__thenTypes', thenTypes);
     const result = {
         graph,
         vfsFiles: [...vfsFiles].sort(),