@auto-engineer/narrative 1.139.0 → 1.140.1

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

@@ -48,14 +48,14 @@ describe('computeCrossModuleImports', () => {
   it('returns empty array for derived modules', () => {
     const model: Model = {
       variant: 'specs',
-      narratives: [],
+      scenes: [],
       messages: [],
       integrations: [],
       modules: [
         {
           sourceFile: 'derived.ts',
           isDerived: true,
-          contains: { narrativeIds: [] },
+          contains: { sceneIds: [] },
           declares: { messages: [] },
         },
       ],
@@ -69,11 +69,11 @@ describe('computeCrossModuleImports', () => {
   it('returns empty array when module declares all needed types', () => {
     const model: Model = {
       variant: 'specs',
-      narratives: [
+      scenes: [
         {
           name: 'Test',
           id: 'test-1',
-          slices: [
+          moments: [
             {
               name: 'test',
               type: 'command',
@@ -108,7 +108,7 @@ describe('computeCrossModuleImports', () => {
         {
           sourceFile: 'self-contained.ts',
           isDerived: false,
-          contains: { narrativeIds: ['test-1'] },
+          contains: { sceneIds: ['test-1'] },
           declares: { messages: [{ kind: 'command', name: 'DoSomething' }] },
         },
       ],
@@ -122,11 +122,11 @@ describe('computeCrossModuleImports', () => {
   it('returns empty array when needed type is not declared by any module', () => {
     const model: Model = {
       variant: 'specs',
-      narratives: [
+      scenes: [
         {
           name: 'Test',
           id: 'test-1',
-          slices: [
+          moments: [
             {
               name: 'test',
               type: 'command',
@@ -161,7 +161,7 @@ describe('computeCrossModuleImports', () => {
         {
           sourceFile: 'consumer.ts',
           isDerived: false,
-          contains: { narrativeIds: ['test-1'] },
+          contains: { sceneIds: ['test-1'] },
           declares: { messages: [] },
         },
       ],
@@ -175,12 +175,12 @@ describe('computeCrossModuleImports', () => {
   it('generates import when type is declared by another authored module', () => {
     const model: Model = {
       variant: 'specs',
-      narratives: [
-        { name: 'Shared', id: 'shared-1', slices: [] },
+      scenes: [
+        { name: 'Shared', id: 'shared-1', moments: [] },
         {
           name: 'Consumer',
           id: 'consumer-1',
-          slices: [
+          moments: [
             {
               name: 'test',
               type: 'command',
@@ -215,13 +215,13 @@ describe('computeCrossModuleImports', () => {
         {
           sourceFile: 'shared/types.ts',
           isDerived: false,
-          contains: { narrativeIds: ['shared-1'] },
+          contains: { sceneIds: ['shared-1'] },
           declares: { messages: [{ kind: 'event', name: 'SharedEvent' }] },
         },
         {
           sourceFile: 'features/consumer.ts',
           isDerived: false,
-          contains: { narrativeIds: ['consumer-1'] },
+          contains: { sceneIds: ['consumer-1'] },
           declares: { messages: [] },
         },
       ],
@@ -236,12 +236,12 @@ describe('computeCrossModuleImports', () => {
   it('groups multiple types from same module into single import', () => {
     const model: Model = {
       variant: 'specs',
-      narratives: [
-        { name: 'Shared', id: 'shared-1', slices: [] },
+      scenes: [
+        { name: 'Shared', id: 'shared-1', moments: [] },
         {
           name: 'Consumer',
           id: 'consumer-1',
-          slices: [
+          moments: [
             {
               name: 'test',
               type: 'command',
@@ -282,7 +282,7 @@ describe('computeCrossModuleImports', () => {
         {
           sourceFile: 'shared.ts',
           isDerived: false,
-          contains: { narrativeIds: ['shared-1'] },
+          contains: { sceneIds: ['shared-1'] },
           declares: {
             messages: [
               { kind: 'event', name: 'EventA' },
@@ -293,7 +293,7 @@ describe('computeCrossModuleImports', () => {
         {
           sourceFile: 'consumer.ts',
           isDerived: false,
-          contains: { narrativeIds: ['consumer-1'] },
+          contains: { sceneIds: ['consumer-1'] },
           declares: { messages: [] },
         },
       ],
@@ -309,11 +309,11 @@ describe('computeCrossModuleImports', () => {
   it('ignores types declared by derived modules', () => {
     const model: Model = {
       variant: 'specs',
-      narratives: [
+      scenes: [
         {
           name: 'Consumer',
           id: 'consumer-1',
-          slices: [
+          moments: [
             {
               name: 'test',
               type: 'command',
@@ -348,13 +348,13 @@ describe('computeCrossModuleImports', () => {
         {
           sourceFile: 'derived.ts',
           isDerived: true,
-          contains: { narrativeIds: [] },
+          contains: { sceneIds: [] },
           declares: { messages: [{ kind: 'event', name: 'DerivedEvent' }] },
         },
         {
           sourceFile: 'consumer.ts',
           isDerived: false,
-          contains: { narrativeIds: ['consumer-1'] },
+          contains: { sceneIds: ['consumer-1'] },
           declares: { messages: [] },
         },
       ],
@@ -369,13 +369,13 @@ describe('computeCrossModuleImports', () => {
   it('sorts imports by source path', () => {
     const model: Model = {
       variant: 'specs',
-      narratives: [
-        { name: 'Types1', id: 'types-1', slices: [] },
-        { name: 'Types2', id: 'types-2', slices: [] },
+      scenes: [
+        { name: 'Types1', id: 'types-1', moments: [] },
+        { name: 'Types2', id: 'types-2', moments: [] },
         {
           name: 'Consumer',
           id: 'consumer-1',
-          slices: [
+          moments: [
             {
               name: 'test',
               type: 'command',
@@ -416,19 +416,19 @@ describe('computeCrossModuleImports', () => {
         {
           sourceFile: 'z-types.ts',
           isDerived: false,
-          contains: { narrativeIds: ['types-1'] },
+          contains: { sceneIds: ['types-1'] },
           declares: { messages: [{ kind: 'event', name: 'ZEvent' }] },
         },
         {
           sourceFile: 'a-types.ts',
           isDerived: false,
-          contains: { narrativeIds: ['types-2'] },
+          contains: { sceneIds: ['types-2'] },
           declares: { messages: [{ kind: 'event', name: 'AEvent' }] },
         },
         {
           sourceFile: 'consumer.ts',
           isDerived: false,
-          contains: { narrativeIds: ['consumer-1'] },
+          contains: { sceneIds: ['consumer-1'] },
           declares: { messages: [] },
         },
       ],
@@ -445,14 +445,14 @@ describe('computeAllCrossModuleDependencies', () => {
   it('returns empty maps when no cross-module imports exist', () => {
     const model: Model = {
       variant: 'specs',
-      narratives: [{ name: 'Test', id: 'test-1', slices: [] }],
+      scenes: [{ name: 'Test', id: 'test-1', moments: [] }],
       messages: [{ type: 'event', source: 'internal', name: 'LocalEvent', fields: [] }],
       integrations: [],
       modules: [
         {
           sourceFile: 'self-contained.ts',
           isDerived: false,
-          contains: { narrativeIds: ['test-1'] },
+          contains: { sceneIds: ['test-1'] },
           declares: { messages: [{ kind: 'event', name: 'LocalEvent' }] },
         },
       ],
@@ -467,12 +467,12 @@ describe('computeAllCrossModuleDependencies', () => {
   it('computes imports and exports in a single pass', () => {
     const model: Model = {
       variant: 'specs',
-      narratives: [
-        { name: 'Shared', id: 'shared-1', slices: [] },
+      scenes: [
+        { name: 'Shared', id: 'shared-1', moments: [] },
         {
           name: 'Consumer',
           id: 'consumer-1',
-          slices: [
+          moments: [
             {
               name: 'test',
               type: 'command',
@@ -507,13 +507,13 @@ describe('computeAllCrossModuleDependencies', () => {
         {
           sourceFile: 'shared/types.ts',
           isDerived: false,
-          contains: { narrativeIds: ['shared-1'] },
+          contains: { sceneIds: ['shared-1'] },
           declares: { messages: [{ kind: 'event', name: 'SharedEvent' }] },
         },
         {
           sourceFile: 'features/consumer.ts',
           isDerived: false,
-          contains: { narrativeIds: ['consumer-1'] },
+          contains: { sceneIds: ['consumer-1'] },
           declares: { messages: [] },
         },
       ],
@@ -534,12 +534,12 @@ describe('computeAllCrossModuleDependencies', () => {
   it('aggregates exports from multiple importing modules', () => {
     const model: Model = {
       variant: 'specs',
-      narratives: [
-        { name: 'Shared', id: 'shared-1', slices: [] },
+      scenes: [
+        { name: 'Shared', id: 'shared-1', moments: [] },
         {
           name: 'Consumer1',
           id: 'consumer-1',
-          slices: [
+          moments: [
             {
               name: 'test',
               type: 'command',
@@ -565,7 +565,7 @@ describe('computeAllCrossModuleDependencies', () => {
         {
           name: 'Consumer2',
           id: 'consumer-2',
-          slices: [
+          moments: [
             {
               name: 'test',
               type: 'command',
@@ -598,7 +598,7 @@ describe('computeAllCrossModuleDependencies', () => {
         {
           sourceFile: 'shared.ts',
           isDerived: false,
-          contains: { narrativeIds: ['shared-1'] },
+          contains: { sceneIds: ['shared-1'] },
           declares: {
             messages: [
               { kind: 'event', name: 'EventA' },
@@ -609,13 +609,13 @@ describe('computeAllCrossModuleDependencies', () => {
         {
           sourceFile: 'consumer1.ts',
           isDerived: false,
-          contains: { narrativeIds: ['consumer-1'] },
+          contains: { sceneIds: ['consumer-1'] },
           declares: { messages: [] },
         },
         {
           sourceFile: 'consumer2.ts',
           isDerived: false,
-          contains: { narrativeIds: ['consumer-2'] },
+          contains: { sceneIds: ['consumer-2'] },
           declares: { messages: [] },
         },
       ],

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

@@ -1,7 +1,7 @@
 import type { Model, Module } from '../../index';
 import { basename, dirname, extname, join, relative } from '../../loader/fs-path';
 import { parseMessageKey, sortImportsBySource, toMessageKey } from './ordering';
-import { collectMessageKeysFromNarratives } from './spec-traversal';
+import { collectMessageKeysFromScenes } from './spec-traversal';
 import type { CrossModuleImport } from './types';
 
 export type { CrossModuleImport };
@@ -123,10 +123,10 @@ function convertToImports(fromSourceFile: string, dependencyMap: Map<string, str
 }
 
 function collectUsedMessageKeysForModule(module: Module, model: Model): Set<string> {
-  const narrativeIds = new Set(module.contains.narrativeIds);
-  const narratives = model.narratives.filter((n) => n.id && narrativeIds.has(n.id));
+  const sceneIds = new Set(module.contains.sceneIds);
+  const scenes = model.scenes.filter((n) => n.id && sceneIds.has(n.id));
 
-  const usedKeys = collectMessageKeysFromNarratives(narratives);
+  const usedKeys = collectMessageKeysFromScenes(scenes);
 
   const modelKeys = new Set(model.messages.map((m) => toMessageKey(m.type, m.name)));
   return new Set([...usedKeys].filter((k) => modelKeys.has(k)));

package/src/transformers/model-to-narrative/generators/compose.ts

@@ -10,7 +10,7 @@ import { buildTypeAliases } from './types';
 export function generateTypeScriptCode(schema: Model, opts: { flowImport: string; integrationImport: string }): string {
   const f = ts.factory;
   const messages = schema.messages ?? [];
-  const flows = schema.narratives ?? [];
+  const flows = schema.scenes ?? [];
   const integrations = schema.integrations ?? [];
 
   const allTypeIntegrationNames = extractTypeIntegrationNames(flows);
@@ -61,14 +61,14 @@ export function generateTypeScriptCode(schema: Model, opts: { flowImport: string
   const usedMessages = messages.filter((msg) => {
     const isImportedFromIntegration = usedTypeIntegrationNames.includes(msg.name);
     const isUsedInFlow = usageAnalysis.usedTypes.has(msg.name);
-    const hasEmptyFlowSlices = flows.length === 0 || flows.every((flow) => flow.slices.length === 0);
+    const hasEmptyFlowMoments = flows.length === 0 || flows.every((flow) => flow.moments.length === 0);
 
     // Don't generate local definitions for types imported from integrations
     if (isImportedFromIntegration) {
       return false;
     }
 
-    return isUsedInFlow || hasEmptyFlowSlices;
+    return isUsedInFlow || hasEmptyFlowMoments;
   });
 
   const statements = buildStatements(
@@ -94,7 +94,7 @@ function buildStatements(
   typeIntegrationNames: string[],
   valueIntegrationNames: string[],
   usedFlowFunctionNames: string[],
-  flows: Model['narratives'],
+  flows: Model['scenes'],
 ): ts.Statement[] {
   const statements: ts.Statement[] = [];
 

package/src/transformers/model-to-narrative/generators/flow.ts

@@ -1,11 +1,11 @@
 import type tsNS from 'typescript';
 import type { z } from 'zod';
 import type {
-  CommandSlice as CommandSliceType,
-  ExperienceSlice as ExperienceSliceType,
-  Narrative,
-  QuerySlice as QuerySliceType,
-  ReactSlice as ReactSliceType,
+  CommandMoment as CommandMomentType,
+  ExperienceMoment as ExperienceMomentType,
+  QueryMoment as QueryMomentType,
+  ReactMoment as ReactMomentType,
+  Scene,
 } from '../../../index';
 import type {
   ClientSpecNode,
@@ -19,17 +19,17 @@ import type {
 import { jsonToExpr } from '../ast/emit-helpers';
 import { buildConsolidatedGwtSpecBlock, type GWTBlock } from './gwt';
 
-type CommandSlice = CommandSliceType;
-type QuerySlice = QuerySliceType;
-type ReactSlice = ReactSliceType;
-type ExperienceSlice = ExperienceSliceType;
+type CommandMoment = CommandMomentType;
+type QueryMoment = QueryMomentType;
+type ReactMoment = ReactMomentType;
+type ExperienceMoment = ExperienceMomentType;
 type Example = z.infer<typeof ExampleSchema>;
 type DataSinkItem = z.infer<typeof DataSinkSchema>;
 type DataSourceItem = z.infer<typeof DataSourceSchema>;
 type DataTargetItem = z.infer<typeof DataTargetSchema>;
 type Destination = z.infer<typeof DestinationSchema>;
 type Origin = z.infer<typeof OriginSchema>;
-type Slice = CommandSlice | QuerySlice | ReactSlice | ExperienceSlice;
+type Moment = CommandMoment | QueryMoment | ReactMoment | ExperienceMoment;
 
 function buildClientSpecNode(
   ts: typeof import('typescript'),
@@ -400,7 +400,7 @@ function addClientToChain(
   ts: typeof import('typescript'),
   f: tsNS.NodeFactory,
   chain: tsNS.Expression,
-  slice: CommandSlice | QuerySlice | ReactSlice | ExperienceSlice,
+  slice: CommandMoment | QueryMoment | ReactMoment | ExperienceMoment,
 ): tsNS.Expression {
   if (
     'client' in slice &&
@@ -427,7 +427,7 @@ function addClientToChain(
 function addRequestToChain(
   f: tsNS.NodeFactory,
   chain: tsNS.Expression,
-  slice: CommandSlice | QuerySlice | ReactSlice | ExperienceSlice,
+  slice: CommandMoment | QueryMoment | ReactMoment | ExperienceMoment,
 ): tsNS.Expression {
   if ('request' in slice && slice.request !== null && slice.request !== undefined) {
     const gqlTpl = f.createNoSubstitutionTemplateLiteral(slice.request);
@@ -487,12 +487,12 @@ function processGivenStep(step: StepWithDocString, gwtBlock: GWTBlock): void {
 
 function processWhenStep(
   step: StepWithDocString,
-  sliceType: 'command' | 'query' | 'react' | 'experience',
+  momentType: 'command' | 'query' | 'react' | 'experience',
   gwtBlock: GWTBlock,
 ): void {
-  if (sliceType === 'command') {
+  if (momentType === 'command') {
     gwtBlock.when = { commandRef: step.text, exampleData: step.docString ?? {} };
-  } else if (sliceType === 'react' || sliceType === 'query') {
+  } else if (momentType === 'react' || momentType === 'query') {
     const eventData = { eventRef: step.text, exampleData: step.docString ?? {} };
     if (!gwtBlock.when) {
       gwtBlock.when = [eventData];
@@ -508,7 +508,7 @@ function processThenStep(step: StepWithDocString, gwtBlock: GWTBlock): void {
 
 function processStepsFormat(
   steps: Step[],
-  sliceType: 'command' | 'query' | 'react' | 'experience',
+  momentType: 'command' | 'query' | 'react' | 'experience',
   gwtBlock: GWTBlock,
 ): void {
   let effectiveKeyword: 'Given' | 'When' | 'Then' = 'Given';
@@ -526,7 +526,7 @@ function processStepsFormat(
     if (effectiveKeyword === 'Given') {
       processGivenStep(step, gwtBlock);
     } else if (effectiveKeyword === 'When') {
-      processWhenStep(step, sliceType, gwtBlock);
+      processWhenStep(step, momentType, gwtBlock);
     } else if (effectiveKeyword === 'Then') {
       processThenStep(step, gwtBlock);
     }
@@ -558,13 +558,13 @@ function processOldFormat(oldExample: OldFormatExample, gwtBlock: GWTBlock): voi
   }
 }
 
-function convertExampleToGWT(example: Example, sliceType: 'command' | 'query' | 'react' | 'experience'): GWTBlock {
+function convertExampleToGWT(example: Example, momentType: 'command' | 'query' | 'react' | 'experience'): GWTBlock {
   const gwtBlock: GWTBlock = { then: [] };
   const oldExample = example as OldFormatExample;
   (gwtBlock as { name?: string }).name = oldExample.name ?? oldExample.description;
 
   if (oldExample.steps !== undefined && oldExample.steps.length > 0) {
-    processStepsFormat(oldExample.steps, sliceType, gwtBlock);
+    processStepsFormat(oldExample.steps, momentType, gwtBlock);
   } else {
     processOldFormat(oldExample, gwtBlock);
   }
@@ -598,14 +598,14 @@ function buildConsolidatedRules(
   ts: typeof import('typescript'),
   f: tsNS.NodeFactory,
   ruleGroups: Map<string, RuleGroup>,
-  sliceType: 'command' | 'query' | 'react' | 'experience',
+  momentType: 'command' | 'query' | 'react' | 'experience',
   messages?: Array<{ type: string; name: string; fields: Array<{ name: string; type: string; required: boolean }> }>,
 ): tsNS.Statement[] {
   const allRuleStatements: tsNS.Statement[] = [];
 
   for (const { rule, examples } of ruleGroups.values()) {
     const gwtBlocks = examples.map((example) => {
-      const gwtBlock = convertExampleToGWT(example, sliceType);
+      const gwtBlock = convertExampleToGWT(example, momentType);
       const extendedGwtBlock = gwtBlock as GWTBlock & {
         ruleDescription?: string;
         exampleDescription?: string;
@@ -623,7 +623,7 @@ function buildConsolidatedRules(
     });
 
     allRuleStatements.push(
-      buildConsolidatedGwtSpecBlock(ts, f, { id: rule.id, description: rule.name }, gwtBlocks, sliceType, messages),
+      buildConsolidatedGwtSpecBlock(ts, f, { id: rule.id, description: rule.name }, gwtBlocks, momentType, messages),
     );
   }
 
@@ -634,11 +634,11 @@ function buildSingleSpecStatements(
   ts: typeof import('typescript'),
   f: tsNS.NodeFactory,
   spec: SpecType,
-  sliceType: 'command' | 'query' | 'react' | 'experience',
+  momentType: 'command' | 'query' | 'react' | 'experience',
   messages?: Array<{ type: string; name: string; fields: Array<{ name: string; type: string; required: boolean }> }>,
 ): tsNS.Statement {
   const ruleGroups = buildRuleGroups(spec.rules);
-  const allRuleStatements = buildConsolidatedRules(ts, f, ruleGroups, sliceType, messages);
+  const allRuleStatements = buildConsolidatedRules(ts, f, ruleGroups, momentType, messages);
 
   const arrowFunction = f.createArrowFunction(
     undefined,
@@ -681,8 +681,8 @@ function convertOldSpecToNewFormat(oldSpec: OldSpecFormat): SpecType | null {
 function buildServerStatements(
   ts: typeof import('typescript'),
   f: tsNS.NodeFactory,
-  server: CommandSlice['server'] | QuerySlice['server'] | ReactSlice['server'],
-  sliceType: 'command' | 'query' | 'react' | 'experience',
+  server: CommandMoment['server'] | QueryMoment['server'] | ReactMoment['server'],
+  momentType: 'command' | 'query' | 'react' | 'experience',
   messages?: Array<{ type: string; name: string; fields: Array<{ name: string; type: string; required: boolean }> }>,
 ): tsNS.Statement[] {
   const statements: tsNS.Statement[] = [];
@@ -700,12 +700,12 @@ function buildServerStatements(
   if (server.specs !== null && server.specs !== undefined) {
     if (Array.isArray(server.specs)) {
       for (const spec of server.specs as SpecType[]) {
-        statements.push(buildSingleSpecStatements(ts, f, spec, sliceType, messages));
+        statements.push(buildSingleSpecStatements(ts, f, spec, momentType, messages));
       }
     } else {
       const convertedSpec = convertOldSpecToNewFormat(server.specs as OldSpecFormat);
       if (convertedSpec !== null) {
-        statements.push(buildSingleSpecStatements(ts, f, convertedSpec, sliceType, messages));
+        statements.push(buildSingleSpecStatements(ts, f, convertedSpec, momentType, messages));
       }
     }
   }
@@ -717,16 +717,16 @@ function addServerToChain(
   ts: typeof import('typescript'),
   f: tsNS.NodeFactory,
   chain: tsNS.Expression,
-  slice: CommandSlice | QuerySlice | ReactSlice | ExperienceSlice,
+  slice: CommandMoment | QueryMoment | ReactMoment | ExperienceMoment,
   messages?: Array<{ type: string; name: string; fields: Array<{ name: string; type: string; required: boolean }> }>,
 ): tsNS.Expression {
   if ('server' in slice && slice.server !== null && slice.server !== undefined) {
-    const sliceType = slice.type as 'command' | 'query' | 'react' | 'experience';
+    const momentType = slice.type as 'command' | 'query' | 'react' | 'experience';
     const serverStatements = buildServerStatements(
       ts,
       f,
       slice.server,
-      sliceType === 'experience' ? 'react' : sliceType,
+      momentType === 'experience' ? 'react' : momentType,
       messages,
     );
 
@@ -744,10 +744,10 @@ function addServerToChain(
   return chain;
 }
 
-function buildSlice(
+function buildMoment(
   ts: typeof import('typescript'),
   f: tsNS.NodeFactory,
-  slice: CommandSlice | QuerySlice | ReactSlice | ExperienceSlice,
+  slice: CommandMoment | QueryMoment | ReactMoment | ExperienceMoment,
   messages?: Array<{ type: string; name: string; fields: Array<{ name: string; type: string; required: boolean }> }>,
 ): tsNS.Statement {
   const sliceCtor =
@@ -775,12 +775,12 @@ function buildSlice(
 
 export function buildFlowStatements(
   ts: typeof import('typescript'),
-  flow: Narrative,
+  flow: Scene,
   messages?: Array<{ type: string; name: string; fields: Array<{ name: string; type: string; required: boolean }> }>,
 ): tsNS.Statement[] {
   const f = ts.factory;
 
-  const body = (flow.slices ?? []).map((sl: Slice) => buildSlice(ts, f, sl, messages));
+  const body = (flow.moments ?? []).map((sl: Moment) => buildMoment(ts, f, sl, messages));
 
   const flowArgs: tsNS.Expression[] = [f.createStringLiteral(flow.name)];
   if (flow.id !== null && flow.id !== undefined) {
@@ -797,7 +797,7 @@ export function buildFlowStatements(
     ),
   );
 
-  const flowExpr = f.createCallExpression(f.createIdentifier('narrative'), undefined, flowArgs);
+  const flowExpr = f.createCallExpression(f.createIdentifier('scene'), undefined, flowArgs);
 
   return [f.createExpressionStatement(flowExpr)];
 }

package/src/transformers/model-to-narrative/generators/imports.ts

@@ -8,7 +8,7 @@ export const ALL_FLOW_FUNCTION_NAMES = [
   'experience',
   'gql',
   'it',
-  'narrative',
+  'scene',
   'query',
   'react',
   'rule',