@auto-engineer/narrative 1.5.1 → 1.5.3

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @auto-engineer/narrative@1.5.1 build /home/runner/work/auto-engineer/auto-engineer/packages/narrative
+> @auto-engineer/narrative@1.5.3 build /home/runner/work/auto-engineer/auto-engineer/packages/narrative
 > tsx scripts/build.ts
 
 Running: tsc

package/.turbo/turbo-test.log

@@ -1,14 +1,14 @@
 
-> @auto-engineer/narrative@1.5.1 test /home/runner/work/auto-engineer/auto-engineer/packages/narrative
+> @auto-engineer/narrative@1.5.3 test /home/runner/work/auto-engineer/auto-engineer/packages/narrative
 > vitest run --reporter=dot
 
 
  RUN  v3.2.4 /home/runner/work/auto-engineer/auto-engineer/packages/narrative
 
-·····························································································································································································································
+································································································································································································································
 
  Test Files  15 passed (15)
-      Tests  221 passed (221)
-   Start at  13:34:33
-   Duration  13.42s (transform 4.27s, setup 0ms, collect 17.96s, tests 11.86s, environment 4ms, prepare 4.13s)
+      Tests  224 passed (224)
+   Start at  14:59:43
+   Duration  12.78s (transform 2.80s, setup 0ms, collect 15.73s, tests 11.01s, environment 4ms, prepare 4.50s)
 

package/.turbo/turbo-type-check.log

@@ -1,4 +1,4 @@
 
-> @auto-engineer/narrative@1.5.1 type-check /home/runner/work/auto-engineer/auto-engineer/packages/narrative
+> @auto-engineer/narrative@1.5.3 type-check /home/runner/work/auto-engineer/auto-engineer/packages/narrative
 > tsc --noEmit
 

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @auto-engineer/flow
 
+## 1.5.3
+
+### Patch Changes
+
+- [`6a7fa7f`](https://github.com/BeOnAuto/auto-engineer/commit/6a7fa7f848f45bad2b2e97e39404155d8987623d) Thanks [@rami-hatoum](https://github.com/rami-hatoum)! - - Fixed Date fields not being properly converted when nested inside objects and arrays
+
+- [`d7f22bb`](https://github.com/BeOnAuto/auto-engineer/commit/d7f22bbe745dc14ebd273d4ffa24ffe62adb95c0) Thanks [@github-actions[bot]](https://github.com/github-actions%5Bbot%5D)! - - **narrative**: export cross-module types and improve Date field handling
+  - **global**: version packages
+  - **global**: add changeset
+- Updated dependencies [[`6a7fa7f`](https://github.com/BeOnAuto/auto-engineer/commit/6a7fa7f848f45bad2b2e97e39404155d8987623d), [`d7f22bb`](https://github.com/BeOnAuto/auto-engineer/commit/d7f22bbe745dc14ebd273d4ffa24ffe62adb95c0)]:
+  - @auto-engineer/file-store@1.5.3
+  - @auto-engineer/id@1.5.3
+  - @auto-engineer/message-bus@1.5.3
+
+## 1.5.2
+
+### Patch Changes
+
+- [`02f70b8`](https://github.com/BeOnAuto/auto-engineer/commit/02f70b8e3be0655ab340c53e2ac2082a3ddc10ef) Thanks [@github-actions[bot]](https://github.com/github-actions%5Bbot%5D)! - - **narrative**: use browser-compatible path utilities in cross-module-imports
+  - **global**: version packages
+  - **global**: add changeset
+
+- [`e5883d0`](https://github.com/BeOnAuto/auto-engineer/commit/e5883d0db038d1f95645a46ce528cbd153bde277) Thanks [@rami-hatoum](https://github.com/rami-hatoum)! - - Exported cross-module types for better integration between modules
+  - Improved Date field handling in the narrative package
+- Updated dependencies [[`02f70b8`](https://github.com/BeOnAuto/auto-engineer/commit/02f70b8e3be0655ab340c53e2ac2082a3ddc10ef), [`e5883d0`](https://github.com/BeOnAuto/auto-engineer/commit/e5883d0db038d1f95645a46ce528cbd153bde277)]:
+  - @auto-engineer/file-store@1.5.2
+  - @auto-engineer/id@1.5.2
+  - @auto-engineer/message-bus@1.5.2
+
 ## 1.5.1
 
 ### Patch Changes

package/dist/src/transformers/model-to-narrative/ast/emit-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emit-helpers.d.ts","sourceRoot":"","sources":["../../../../../src/transformers/model-to-narrative/ast/emit-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,YAAY,CAAC;AAEnC;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B;AAUD;;GAEG;AACH,wBAAgB,UAAU,CACxB,EAAE,EAAE,cAAc,YAAY,CAAC,EAC/B,CAAC,EAAE,IAAI,CAAC,WAAW,EACnB,CAAC,EAAE,OAAO,EACV,QAAQ,CAAC,EAAE,aAAa,GACvB,IAAI,CAAC,UAAU,CAmDjB;AAgFD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,EAAE,EAAE,cAAc,YAAY,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,QAAQ,CAiB7G"}
+{"version":3,"file":"emit-helpers.d.ts","sourceRoot":"","sources":["../../../../../src/transformers/model-to-narrative/ast/emit-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,YAAY,CAAC;AAEnC;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B;AAsGD;;GAEG;AACH,wBAAgB,UAAU,CACxB,EAAE,EAAE,cAAc,YAAY,CAAC,EAC/B,CAAC,EAAE,IAAI,CAAC,WAAW,EACnB,CAAC,EAAE,OAAO,EACV,QAAQ,CAAC,EAAE,aAAa,GACvB,IAAI,CAAC,UAAU,CAiCjB;AAiED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,EAAE,EAAE,cAAc,YAAY,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,QAAQ,CAiB7G"}

package/dist/src/transformers/model-to-narrative/ast/emit-helpers.js

@@ -1,9 +1,76 @@
-/**
- * Check if a string is a valid ISO date string
- */
-function isISODateString(str) {
-    const isoDateRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{3})?(?:Z|[+-]\d{2}:\d{2})?$/;
-    return isoDateRegex.test(str);
+const ARRAY_TYPE_REGEX = /^Array<(.+)>$/;
+const VALID_IDENTIFIER_REGEX = /^[A-Za-z_]\w*$/;
+function createDateNewExpr(f, dateStr) {
+    return f.createNewExpression(f.createIdentifier('Date'), undefined, [f.createStringLiteral(dateStr)]);
+}
+function parseObjectTypeFields(typeStr) {
+    const trimmed = typeStr.trim();
+    if (!trimmed.startsWith('{') || !trimmed.endsWith('}')) {
+        return undefined;
+    }
+    const inner = trimmed.slice(1, -1).trim();
+    if (inner.length === 0) {
+        return [];
+    }
+    const result = [];
+    const parts = splitTopLevel(inner, ',');
+    for (const p of parts) {
+        const colonIdx = p.indexOf(':');
+        if (colonIdx === -1)
+            continue;
+        const name = p.slice(0, colonIdx).trim();
+        const type = p.slice(colonIdx + 1).trim();
+        if (name.length === 0 || type.length === 0)
+            continue;
+        result.push({ name, type });
+    }
+    return result;
+}
+function parseObjectTypeInfo(typeStr) {
+    const fields = parseObjectTypeFields(typeStr);
+    if (!fields)
+        return undefined;
+    const result = {};
+    for (const { name, type } of fields) {
+        result[name] = type;
+    }
+    return result;
+}
+function parseArrayElementType(typeStr) {
+    const match = ARRAY_TYPE_REGEX.exec(typeStr.trim());
+    return match ? match[1] : undefined;
+}
+function convertDateValue(f, x) {
+    if (typeof x === 'string')
+        return createDateNewExpr(f, x);
+    if (x instanceof Date)
+        return createDateNewExpr(f, x.toISOString());
+    return undefined;
+}
+function convertArrayField(ts, f, arr, fieldType) {
+    const elementType = parseArrayElementType(fieldType);
+    if (elementType === 'Date') {
+        return f.createArrayLiteralExpression(arr.map((elem) => convertDateValue(f, elem) ?? jsonToExpr(ts, f, elem)));
+    }
+    const elementTypeInfo = elementType ? parseObjectTypeInfo(elementType) : undefined;
+    return f.createArrayLiteralExpression(arr.map((elem) => jsonToExpr(ts, f, elem, elementTypeInfo)));
+}
+function convertObjectField(ts, f, obj, fieldType) {
+    const nestedTypeInfo = parseObjectTypeInfo(fieldType);
+    return jsonToExpr(ts, f, obj, nestedTypeInfo);
+}
+function computeFieldExpr(ts, f, x, fieldType, typeInfo) {
+    if (fieldType === 'Date') {
+        const dateExpr = convertDateValue(f, x);
+        if (dateExpr)
+            return dateExpr;
+    }
+    if (fieldType && typeof x === 'object' && x !== null) {
+        if (Array.isArray(x))
+            return convertArrayField(ts, f, x, fieldType);
+        return convertObjectField(ts, f, x, fieldType);
+    }
+    return jsonToExpr(ts, f, x, typeInfo);
 }
 /**
  * Emit a TS expression from a plain JSON-like value with optional type information for Date handling.
@@ -23,34 +90,13 @@ export function jsonToExpr(ts, f, v, typeInfo) {
             return v ? f.createTrue() : f.createFalse();
         case 'object': {
             if (v instanceof Date) {
-                // Generate new Date('...') for Date objects
-                return f.createNewExpression(f.createIdentifier('Date'), undefined, [f.createStringLiteral(v.toISOString())]);
+                return createDateNewExpr(f, v.toISOString());
             }
             if (Array.isArray(v)) {
                 return f.createArrayLiteralExpression(v.map((x) => jsonToExpr(ts, f, x, typeInfo)));
             }
             const entries = Object.entries(v);
-            return f.createObjectLiteralExpression(entries.map(([k, x]) => {
-                // Check if this field should be a Date
-                const fieldType = typeInfo?.[k];
-                let valueExpr;
-                if (fieldType === 'Date' && typeof x === 'string' && isISODateString(x)) {
-                    // Generate new Date('...') for Date fields
-                    valueExpr = f.createNewExpression(f.createIdentifier('Date'), undefined, [f.createStringLiteral(x)]);
-                }
-                else if (fieldType === 'Date' && x instanceof Date) {
-                    // Generate new Date('...') for Date objects
-                    valueExpr = f.createNewExpression(f.createIdentifier('Date'), undefined, [
-                        f.createStringLiteral(x.toISOString()),
-                    ]);
-                }
-                else {
-                    valueExpr = jsonToExpr(ts, f, x, typeInfo);
-                }
-                return f.createPropertyAssignment(
-                // use identifier if safe, else quoted string
-                /^[A-Za-z_]\w*$/.test(k) ? f.createIdentifier(k) : f.createStringLiteral(k), valueExpr);
-            }), false);
+            return f.createObjectLiteralExpression(entries.map(([k, x]) => f.createPropertyAssignment(VALID_IDENTIFIER_REGEX.test(k) ? f.createIdentifier(k) : f.createStringLiteral(k), computeFieldExpr(ts, f, x, typeInfo?.[k], typeInfo))), false);
         }
         default:
             return f.createIdentifier('undefined');
@@ -79,7 +125,7 @@ function createPrimitiveTypeNode(ts, f, trimmed) {
  * Creates array type node if the type is Array<...>
  */
 function createArrayTypeNode(ts, f, trimmed) {
-    const arrayMatch = /^Array<(.+)>$/.exec(trimmed);
+    const arrayMatch = ARRAY_TYPE_REGEX.exec(trimmed);
     if (arrayMatch) {
         const inner = typeFromString(ts, f, arrayMatch[1]);
         return f.createArrayTypeNode(inner);
@@ -90,23 +136,10 @@ function createArrayTypeNode(ts, f, trimmed) {
  * Creates object literal type node for {prop: type, ...} syntax
  */
 function createObjectLiteralTypeNode(ts, f, trimmed) {
-    if (!trimmed.startsWith('{') || !trimmed.endsWith('}')) {
+    const fields = parseObjectTypeFields(trimmed);
+    if (!fields)
         return null;
-    }
-    const inner = trimmed.slice(1, -1).trim();
-    const members = [];
-    if (inner.length > 0) {
-        const parts = splitTopLevel(inner, ',');
-        for (const p of parts) {
-            const [rawName, ...rest] = p.split(':');
-            const name = rawName.trim();
-            const rhs = rest.join(':').trim();
-            if (name.length === 0 || rhs.length === 0)
-                continue;
-            const typeNode = typeFromString(ts, f, rhs);
-            members.push(f.createPropertySignature(undefined, /^[A-Za-z_]\w*$/.test(name) ? f.createIdentifier(name) : f.createStringLiteral(name), undefined, typeNode));
-        }
-    }
+    const members = fields.map(({ name, type }) => f.createPropertySignature(undefined, VALID_IDENTIFIER_REGEX.test(name) ? f.createIdentifier(name) : f.createStringLiteral(name), undefined, typeFromString(ts, f, type)));
     return f.createTypeLiteralNode(members);
 }
 /**

package/dist/src/transformers/model-to-narrative/ast/emit-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"emit-helpers.js","sourceRoot":"","sources":["../../../../../src/transformers/model-to-narrative/ast/emit-helpers.ts"],"names":[],"mappings":"AASA;;GAEG;AACH,SAAS,eAAe,CAAC,GAAW;IAClC,MAAM,YAAY,GAAG,yEAAyE,CAAC;IAC/F,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CACxB,EAA+B,EAC/B,CAAmB,EACnB,CAAU,EACV,QAAwB;IAExB,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;IACtC,QAAQ,OAAO,CAAC,EAAE,CAAC;QACjB,KAAK,QAAQ;YACX,OAAO,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;QAClC,KAAK,QAAQ;YACX,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBACV,OAAO,CAAC,CAAC,2BAA2B,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9G,CAAC;YACD,OAAO,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,KAAK,SAAS;YACZ,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QAC9C,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;gBACtB,4CAA4C;gBAC5C,OAAO,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;YAChH,CAAC;YACD,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrB,OAAO,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;YACtF,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAA4B,CAAC,CAAC;YAC7D,OAAO,CAAC,CAAC,6BAA6B,CACpC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;gBACrB,uCAAuC;gBACvC,MAAM,SAAS,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;gBAChC,IAAI,SAA0B,CAAC;gBAE/B,IAAI,SAAS,KAAK,MAAM,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;oBACxE,2CAA2C;oBAC3C,SAAS,GAAG,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACvG,CAAC;qBAAM,IAAI,SAAS,KAAK,MAAM,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;oBACrD,4CAA4C;oBAC5C,SAAS,GAAG,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE;wBACvE,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;qBACvC,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACN,SAAS,GAAG,UAAU,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;gBAC7C,CAAC;gBAED,OAAO,CAAC,CAAC,wBAAwB;gBAC/B,6CAA6C;gBAC7C,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAC3E,SAAS,CACV,CAAC;YACJ,CAAC,CAAC,EACF,KAAK,CACN,CAAC;QACJ,CAAC;QACD;YACE,OAAO,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAC3C,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,uBAAuB,CAC9B,EAA+B,EAC/B,CAAmB,EACnB,OAAe;IAEf,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,QAAQ;YACX,OAAO,CAAC,CAAC,qBAAqB,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QAC9D,KAAK,QAAQ;YACX,OAAO,CAAC,CAAC,qBAAqB,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QAC9D,KAAK,SAAS;YACZ,OAAO,CAAC,CAAC,qBAAqB,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QAC/D,KAAK,SAAS;YACZ,OAAO,CAAC,CAAC,qBAAqB,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QAC/D,KAAK,MAAM;YACT,OAAO,CAAC,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAC3C;YACE,OAAO,IAAI,CAAC;IAChB,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,mBAAmB,CAC1B,EAA+B,EAC/B,CAAmB,EACnB,OAAe;IAEf,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,KAAK,GAAG,cAAc,CAAC,EAAE,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACnD,OAAO,CAAC,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,SAAS,2BAA2B,CAClC,EAA+B,EAC/B,CAAmB,EACnB,OAAe;IAEf,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACvD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC1C,MAAM,OAAO,GAAuB,EAAE,CAAC;IAEvC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACxC,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACtB,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;YAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAClC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;gBAAE,SAAS;YAEpD,MAAM,QAAQ,GAAG,cAAc,CAAC,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;YAC5C,OAAO,CAAC,IAAI,CACV,CAAC,CAAC,uBAAuB,CACvB,SAAS,EACT,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,EACpF,SAAS,EACT,QAAQ,CACT,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;AAC1C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,EAA+B,EAAE,CAAmB,EAAE,CAAS;IAC5F,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IAEzB,sBAAsB;IACtB,MAAM,SAAS,GAAG,uBAAuB,CAAC,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,SAAS;QAAE,OAAO,SAAS,CAAC;IAEhC,kBAAkB;IAClB,MAAM,SAAS,GAAG,mBAAmB,CAAC,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;IACtD,IAAI,SAAS;QAAE,OAAO,SAAS,CAAC;IAEhC,2BAA2B;IAC3B,MAAM,UAAU,GAAG,2BAA2B,CAAC,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;IAC/D,IAAI,UAAU;QAAE,OAAO,UAAU,CAAC;IAElC,iCAAiC;IACjC,OAAO,CAAC,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC;AAED,2EAA2E;AAC3E,SAAS,aAAa,CAAC,KAAa,EAAE,KAAgB;IACpD,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,EAAE,KAAK,GAAG;YAAE,UAAU,EAAE,CAAC;aACxB,IAAI,EAAE,KAAK,GAAG;YAAE,UAAU,EAAE,CAAC;aAC7B,IAAI,EAAE,KAAK,GAAG;YAAE,UAAU,EAAE,CAAC;aAC7B,IAAI,EAAE,KAAK,GAAG;YAAE,UAAU,EAAE,CAAC;QAClC,IAAI,EAAE,KAAK,KAAK,IAAI,UAAU,KAAK,CAAC,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;YACzD,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YACrB,GAAG,GAAG,EAAE,CAAC;QACX,CAAC;aAAM,CAAC;YACN,GAAG,IAAI,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IACD,IAAI,GAAG,CAAC,IAAI,EAAE;QAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IACrC,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"emit-helpers.js","sourceRoot":"","sources":["../../../../../src/transformers/model-to-narrative/ast/emit-helpers.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,18 @@
 import type { Model, Module } from '../../index';
 import type { CrossModuleImport } from './types';
 export type { CrossModuleImport };
+/**
+ * Computes cross-module imports for a single module.
+ * Returns the list of imports needed (with relative paths).
+ */
 export declare function computeCrossModuleImports(module: Module, allModules: Module[], model: Model): CrossModuleImport[];
+/**
+ * Computes cross-module imports for all modules and derives which types need to be exported.
+ * Returns both the imports per module and the exports per module in a single pass.
+ */
+export declare function computeAllCrossModuleDependencies(modules: Module[], model: Model): {
+    importsPerModule: Map<string, CrossModuleImport[]>;
+    exportsPerModule: Map<string, Set<string>>;
+};
 export declare function resolveRelativeImport(fromPath: string, toPath: string): string;
 //# sourceMappingURL=cross-module-imports.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"cross-module-imports.d.ts","sourceRoot":"","sources":["../../../../src/transformers/model-to-narrative/cross-module-imports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEjD,YAAY,EAAE,iBAAiB,EAAE,CAAC;AAElC,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,GAAG,iBAAiB,EAAE,CAmCjH;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAc9E"}
+{"version":3,"file":"cross-module-imports.d.ts","sourceRoot":"","sources":["../../../../src/transformers/model-to-narrative/cross-module-imports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEjD,YAAY,EAAE,iBAAiB,EAAE,CAAC;AAElC;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,GAAG,iBAAiB,EAAE,CAMjH;AAED;;;GAGG;AACH,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,MAAM,EAAE,EACjB,KAAK,EAAE,KAAK,GACX;IACD,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAC;IACnD,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;CAC5C,CA2BA;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAc9E"}

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

@@ -1,48 +1,96 @@
 import { basename, dirname, extname, join, relative } from '../../loader/fs-path.js';
 import { parseMessageKey, sortImportsBySource, toMessageKey } from './ordering.js';
 import { collectMessageKeysFromNarratives } from './spec-traversal.js';
+/**
+ * Computes cross-module imports for a single module.
+ * Returns the list of imports needed (with relative paths).
+ */
 export function computeCrossModuleImports(module, allModules, model) {
-    if (module.isDerived) {
+    const dependencyMap = computeModuleDependencies(module, allModules, model);
+    if (!dependencyMap) {
         return [];
     }
+    return convertToImports(module.sourceFile, dependencyMap);
+}
+/**
+ * Computes cross-module imports for all modules and derives which types need to be exported.
+ * Returns both the imports per module and the exports per module in a single pass.
+ */
+export function computeAllCrossModuleDependencies(modules, model) {
+    const importsPerModule = new Map();
+    const exportsPerModule = new Map();
+    for (const module of modules) {
+        const dependencyMap = computeModuleDependencies(module, modules, model);
+        if (!dependencyMap) {
+            importsPerModule.set(module.sourceFile, []);
+            continue;
+        }
+        // Convert to imports with relative paths
+        importsPerModule.set(module.sourceFile, convertToImports(module.sourceFile, dependencyMap));
+        // Track which types need to be exported from each declaring module
+        for (const [declaringSourceFile, typeNames] of dependencyMap) {
+            if (!exportsPerModule.has(declaringSourceFile)) {
+                exportsPerModule.set(declaringSourceFile, new Set());
+            }
+            for (const typeName of typeNames) {
+                exportsPerModule.get(declaringSourceFile).add(typeName);
+            }
+        }
+    }
+    return { importsPerModule, exportsPerModule };
+}
+export function resolveRelativeImport(fromPath, toPath) {
+    const fromDir = dirname(fromPath);
+    const toDir = dirname(toPath);
+    const toFile = basename(toPath, extname(toPath));
+    const relativePath = relative(fromDir, toDir);
+    if (relativePath === '') {
+        return `./${toFile}`;
+    }
+    if (!relativePath.startsWith('.')) {
+        return `./${relativePath}/${toFile}`;
+    }
+    return join(relativePath, toFile);
+}
+/**
+ * Core logic: computes which types a module needs from other modules.
+ * Returns a map of declaringModuleSourceFile -> typeNames[], or null if no dependencies.
+ */
+function computeModuleDependencies(module, allModules, model) {
+    if (module.isDerived) {
+        return null;
+    }
     const declaredKeys = new Set(module.declares.messages.map((m) => toMessageKey(m.kind, m.name)));
     const usedKeys = collectUsedMessageKeysForModule(module, model);
     const neededKeys = new Set([...usedKeys].filter((k) => !declaredKeys.has(k)));
     if (neededKeys.size === 0) {
-        return [];
+        return null;
     }
-    const importsByModule = new Map();
+    const dependencyMap = new Map();
     for (const msgKey of neededKeys) {
         const { name } = parseMessageKey(msgKey);
         const declaringModule = findDeclaringModule(msgKey, allModules, module);
         if (declaringModule) {
             const modulePath = declaringModule.sourceFile;
-            if (!importsByModule.has(modulePath)) {
-                importsByModule.set(modulePath, []);
+            if (!dependencyMap.has(modulePath)) {
+                dependencyMap.set(modulePath, []);
             }
-            importsByModule.get(modulePath).push(name);
+            dependencyMap.get(modulePath).push(name);
         }
     }
+    return dependencyMap.size > 0 ? dependencyMap : null;
+}
+/**
+ * Converts a dependency map (absolute paths) to CrossModuleImport[] (relative paths).
+ */
+function convertToImports(fromSourceFile, dependencyMap) {
     const imports = [];
-    for (const [modulePath, typeNames] of importsByModule) {
-        const relativePath = resolveRelativeImport(module.sourceFile, modulePath);
+    for (const [modulePath, typeNames] of dependencyMap) {
+        const relativePath = resolveRelativeImport(fromSourceFile, modulePath);
         imports.push({ fromPath: relativePath, typeNames });
     }
     return sortImportsBySource(imports);
 }
-export function resolveRelativeImport(fromPath, toPath) {
-    const fromDir = dirname(fromPath);
-    const toDir = dirname(toPath);
-    const toFile = basename(toPath, extname(toPath));
-    const relativePath = relative(fromDir, toDir);
-    if (relativePath === '') {
-        return `./${toFile}`;
-    }
-    if (!relativePath.startsWith('.')) {
-        return `./${relativePath}/${toFile}`;
-    }
-    return join(relativePath, toFile);
-}
 function collectUsedMessageKeysForModule(module, model) {
     const narrativeIds = new Set(module.contains.narrativeIds);
     const narratives = model.narratives.filter((n) => n.id && narrativeIds.has(n.id));

package/dist/src/transformers/model-to-narrative/cross-module-imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"cross-module-imports.js","sourceRoot":"","sources":["../../../../src/transformers/model-to-narrative/cross-module-imports.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cross-module-imports.js","sourceRoot":"","sources":["../../../../src/transformers/model-to-narrative/cross-module-imports.ts"],"names":[],"mappings":"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"}

package/dist/src/transformers/model-to-narrative/generators/module-code.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module-code.d.ts","sourceRoot":"","sources":["../../../../../src/transformers/model-to-narrative/generators/module-code.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAU,MAAM,gBAAgB,CAAC;AAKpD,OAAO,KAAK,EAAqB,aAAa,EAAE,MAAM,UAAU,CAAC;AAOjE,UAAU,yBAAyB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,YAAY,EAAE,aAAa,EAAE,CAAC;AAE9B,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,yBAAyB,GAAG,aAAa,EAAE,CAgBrG"}
+{"version":3,"file":"module-code.d.ts","sourceRoot":"","sources":["../../../../../src/transformers/model-to-narrative/generators/module-code.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAU,MAAM,gBAAgB,CAAC;AAKpD,OAAO,KAAK,EAAqB,aAAa,EAAE,MAAM,UAAU,CAAC;AAOjE,UAAU,yBAAyB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,YAAY,EAAE,aAAa,EAAE,CAAC;AAE9B,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,yBAAyB,GAAG,aAAa,EAAE,CAoBrG"}

package/dist/src/transformers/model-to-narrative/generators/module-code.js

@@ -1,7 +1,7 @@
 import ts from 'typescript';
 import { deriveModules } from '../../narrative-to-model/derive-modules.js';
 import { analyzeCodeUsage } from '../analysis/usage.js';
-import { computeCrossModuleImports } from '../cross-module-imports.js';
+import { computeAllCrossModuleDependencies } from '../cross-module-imports.js';
 import { sortFilesByPath } from '../ordering.js';
 import { extractTypeIntegrationNames } from '../utils/integration-extractor.js';
 import { integrationNameToPascalCase } from '../utils/strings.js';
@@ -10,10 +10,13 @@ import { ALL_FLOW_FUNCTION_NAMES, buildImports } from './imports.js';
 import { buildTypeAliases } from './types.js';
 export function generateAllModulesCode(model, opts) {
     const modules = model.modules && model.modules.length > 0 ? model.modules : deriveModules(model.narratives, model.messages);
+    // Compute all cross-module dependencies in a single pass
+    const { importsPerModule, exportsPerModule } = computeAllCrossModuleDependencies(modules, model);
     const files = [];
     for (const module of modules) {
-        const crossModuleImports = computeCrossModuleImports(module, modules, model);
-        const code = generateModuleCode(module, model, opts, crossModuleImports);
+        const crossModuleImports = importsPerModule.get(module.sourceFile) ?? [];
+        const exportedTypes = exportsPerModule.get(module.sourceFile);
+        const code = generateModuleCode(module, model, opts, crossModuleImports, exportedTypes);
         files.push({
             path: module.sourceFile,
             code,
@@ -31,7 +34,7 @@ function getNarrativesForModule(module, model) {
     const narrativeIds = new Set(module.contains.narrativeIds);
     return model.narratives.filter((n) => n.id && narrativeIds.has(n.id));
 }
-function generateModuleCode(module, model, opts, crossModuleImports) {
+function generateModuleCode(module, model, opts, crossModuleImports, exportedTypes) {
     const f = ts.factory;
     const narratives = getNarrativesForModule(module, model);
     const declaredMessageKeys = new Set(module.declares.messages.map((m) => `${m.kind}:${m.name}`));
@@ -70,11 +73,11 @@ function generateModuleCode(module, model, opts, crossModuleImports) {
         const hasEmptyFlowSlices = narratives.length === 0 || narratives.every((flow) => flow.slices.length === 0);
         return isUsedInFlow || hasEmptyFlowSlices;
     });
-    const statements = buildStatements(ts, opts, usedMessages, usedTypeIntegrationNames, usedValueIntegrationNames, usedFlowFunctionNames, narratives, crossModuleImports);
+    const statements = buildStatements(ts, opts, usedMessages, usedTypeIntegrationNames, usedValueIntegrationNames, usedFlowFunctionNames, narratives, crossModuleImports, exportedTypes);
     const file = f.createSourceFile(statements, f.createToken(ts.SyntaxKind.EndOfFileToken), ts.NodeFlags.None);
     return printer.printFile(file);
 }
-function buildStatements(tsModule, opts, messages, typeIntegrationNames, valueIntegrationNames, usedFlowFunctionNames, flows, crossModuleImports) {
+function buildStatements(tsModule, opts, messages, typeIntegrationNames, valueIntegrationNames, usedFlowFunctionNames, flows, crossModuleImports, exportedTypes) {
     const f = tsModule.factory;
     const statements = [];
     const imports = buildImports(tsModule, opts, messages, typeIntegrationNames, valueIntegrationNames, usedFlowFunctionNames);
@@ -101,7 +104,7 @@ function buildStatements(tsModule, opts, messages, typeIntegrationNames, valueIn
             required: field.required,
         })),
     }));
-    statements.push(...buildTypeAliases(tsModule, adaptedMessages));
+    statements.push(...buildTypeAliases(tsModule, adaptedMessages, exportedTypes));
     for (const flow of flows) {
         statements.push(...buildFlowStatements(tsModule, flow, messages));
     }

package/dist/src/transformers/model-to-narrative/generators/module-code.js.map

@@ -1 +1 @@
-{"version":3,"file":"module-code.js","sourceRoot":"","sources":["../../../../../src/transformers/model-to-narrative/generators/module-code.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module-code.js","sourceRoot":"","sources":["../../../../../src/transformers/model-to-narrative/generators/module-code.ts"],"names":[],"mappings":"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"}

package/dist/src/transformers/model-to-narrative/generators/types.d.ts

@@ -8,6 +8,6 @@ type Message = {
         required: boolean;
     }[];
 };
-export declare function buildTypeAliases(ts: typeof tsNS, messages: Message[]): tsNS.Statement[];
+export declare function buildTypeAliases(ts: typeof tsNS, messages: Message[], exportedTypes?: Set<string>): tsNS.Statement[];
 export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/src/transformers/model-to-narrative/generators/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/transformers/model-to-narrative/generators/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,YAAY,CAAC;AAGnC,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,SAAS,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,EAAE,CAAC;CAC7D,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,OAAO,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,CAqCvF"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/transformers/model-to-narrative/generators/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,YAAY,CAAC;AAGnC,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,SAAS,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,EAAE,CAAC;CAC7D,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,OAAO,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE,CAmCpH"}

package/dist/src/transformers/model-to-narrative/generators/types.js

@@ -1,5 +1,5 @@
 import { typeFromString } from '../ast/emit-helpers.js';
-export function buildTypeAliases(ts, messages) {
+export function buildTypeAliases(ts, messages, exportedTypes) {
     const f = ts.factory;
     const mkK = (s) => f.createLiteralTypeNode(f.createStringLiteral(s, true));
     return messages.map((m) => {
@@ -16,8 +16,9 @@ export function buildTypeAliases(ts, messages) {
         const name = f.createIdentifier(m.name);
         const baseTypeName = m.type === 'event' ? 'Event' : m.type === 'command' ? 'Command' : m.type === 'query' ? 'Query' : 'State';
         const rhs = f.createTypeReferenceNode(baseTypeName, typeArgs);
-        return f.createTypeAliasDeclaration(undefined, // No export keyword
-        name, [], rhs);
+        // Add export modifier if this type is imported by other modules
+        const modifiers = exportedTypes?.has(m.name) ? [f.createModifier(ts.SyntaxKind.ExportKeyword)] : undefined;
+        return f.createTypeAliasDeclaration(modifiers, name, [], rhs);
     });
 }
 //# sourceMappingURL=types.js.map

package/dist/src/transformers/model-to-narrative/generators/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/transformers/model-to-narrative/generators/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAQrD,MAAM,UAAU,gBAAgB,CAAC,EAAe,EAAE,QAAmB;IACnE,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC;IAErB,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;IAEnF,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACxB,MAAM,QAAQ,GAAoB;YAChC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;YACX,sBAAsB;YACtB,CAAC,GAAG,EAAE;gBACJ,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACnC,CAAC,CAAC,uBAAuB,CACvB,SAAS,EACT,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,EACtG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EACrE,cAAc,CAAC,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,CAChC,CACF,CAAC;gBACF,MAAM,GAAG,GAAG,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;gBAC7C,6BAA6B;gBAC7B,OAAO,GAAG,CAAC;YACb,CAAC,CAAC,EAAE;SACL,CAAC;QAEF,MAAM,IAAI,GAAG,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAExC,MAAM,YAAY,GAChB,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;QAC3G,MAAM,GAAG,GAAG,CAAC,CAAC,uBAAuB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAE9D,OAAO,CAAC,CAAC,0BAA0B,CACjC,SAAS,EAAE,oBAAoB;QAC/B,IAAI,EACJ,EAAE,EACF,GAAG,CACJ,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/transformers/model-to-narrative/generators/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAQrD,MAAM,UAAU,gBAAgB,CAAC,EAAe,EAAE,QAAmB,EAAE,aAA2B;IAChG,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC;IAErB,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;IAEnF,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACxB,MAAM,QAAQ,GAAoB;YAChC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;YACX,sBAAsB;YACtB,CAAC,GAAG,EAAE;gBACJ,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACnC,CAAC,CAAC,uBAAuB,CACvB,SAAS,EACT,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,EACtG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EACrE,cAAc,CAAC,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,CAChC,CACF,CAAC;gBACF,MAAM,GAAG,GAAG,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;gBAC7C,6BAA6B;gBAC7B,OAAO,GAAG,CAAC;YACb,CAAC,CAAC,EAAE;SACL,CAAC;QAEF,MAAM,IAAI,GAAG,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAExC,MAAM,YAAY,GAChB,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;QAC3G,MAAM,GAAG,GAAG,CAAC,CAAC,uBAAuB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAE9D,gEAAgE;QAChE,MAAM,SAAS,GAAG,aAAa,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE3G,OAAO,CAAC,CAAC,0BAA0B,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;AACL,CAAC"}