@kapeta/local-cluster-service 0.48.2 → 0.48.4

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.48.4](https://github.com/kapetacom/local-cluster-service/compare/v0.48.3...v0.48.4) (2024-06-03)
+
+
+### Bug Fixes
+
+* Also prettify the kaplang on the event itself ([#158](https://github.com/kapetacom/local-cluster-service/issues/158)) ([63c27d2](https://github.com/kapetacom/local-cluster-service/commit/63c27d2e026b3e8ad4fbe1c181c402c42f7dec95))
+
+## [0.48.3](https://github.com/kapetacom/local-cluster-service/compare/v0.48.2...v0.48.3) (2024-06-03)
+
+
+### Bug Fixes
+
+* Added missing instance and block refs ([dc77a7c](https://github.com/kapetacom/local-cluster-service/commit/dc77a7c480d4ed70e1dc8dc5c1b13093d739e20c))
+
 ## [0.48.2](https://github.com/kapetacom/local-cluster-service/compare/v0.48.1...v0.48.2) (2024-06-03)
 
 

package/dist/cjs/src/storm/codegen.js

@@ -34,6 +34,7 @@ exports.StormCodegen = void 0;
 const codegen_1 = require("@kapeta/codegen");
 const codeGeneratorManager_1 = require("../codeGeneratorManager");
 const stormClient_1 = require("./stormClient");
+const event_parser_1 = require("./event-parser");
 const stream_1 = require("./stream");
 const promises_1 = require("fs/promises");
 const path_1 = __importStar(require("path"));
@@ -70,6 +71,7 @@ class StormCodegen {
     handleUiOutput(blockUri, aiName, data) {
         switch (data.type) {
             case 'SCREEN':
+                const ref = blockUri.toNormalizedString();
                 this.out.emit('data', {
                     type: 'SCREEN',
                     reason: data.reason,
@@ -77,6 +79,8 @@ class StormCodegen {
                     payload: {
                         ...data.payload,
                         blockName: aiName,
+                        blockRef: ref,
+                        instanceId: event_parser_1.StormEventParser.toInstanceIdFromRef(ref),
                     },
                 });
             case 'FILE':
@@ -86,6 +90,7 @@ class StormCodegen {
     handleFileOutput(blockUri, aiName, data) {
         switch (data.type) {
             case 'FILE':
+                const ref = blockUri.toNormalizedString();
                 this.emitFile(blockUri, aiName, data.payload.filename, data.payload.content, data.reason);
                 return {
                     type: 'FILE',
@@ -93,6 +98,8 @@ class StormCodegen {
                     payload: {
                         filename: data.payload.filename,
                         content: data.payload.content,
+                        blockRef: ref,
+                        instanceId: event_parser_1.StormEventParser.toInstanceIdFromRef(ref),
                     },
                 };
         }
@@ -171,6 +178,7 @@ class StormCodegen {
     }
     emitFile(uri, blockName, filename, content, reason = 'File generated') {
         const basePath = this.getBasePath(uri.fullName);
+        const ref = uri.toNormalizedString();
         this.out.emit('data', {
             type: 'FILE',
             reason,
@@ -180,7 +188,8 @@ class StormCodegen {
                 path: (0, path_1.join)(basePath, filename),
                 content: content,
                 blockName,
-                blockRef: uri.toNormalizedString(),
+                blockRef: ref,
+                instanceId: event_parser_1.StormEventParser.toInstanceIdFromRef(ref),
             },
         });
     }

package/dist/cjs/src/storm/event-parser.d.ts

@@ -41,6 +41,10 @@ export interface StormOptions {
 }
 export declare function resolveOptions(): Promise<StormOptions>;
 export declare class StormEventParser {
+    static toInstanceId(handle: string, blockName: string): string;
+    static toInstanceIdFromRef(ref: string): string;
+    static toSafeName(name: string): string;
+    static toRef(handle: string, name: string): KapetaURI;
     private events;
     private planName;
     private planDescription;
@@ -58,11 +62,7 @@ export declare class StormEventParser {
     getEvents(): StormEvent[];
     isValid(): boolean;
     getError(): string;
-    private toInstanceId;
-    private toInstanceIdFromRef;
     toResult(handle: string): StormDefinitions;
-    private toSafeName;
-    private toRef;
     toBlockDefinitions(handle: string): {
         [key: string]: BlockDefinitionInfo;
     };

package/dist/cjs/src/storm/event-parser.js

@@ -105,6 +105,19 @@ async function resolveOptions() {
 }
 exports.resolveOptions = resolveOptions;
 class StormEventParser {
+    static toInstanceId(handle, blockName) {
+        const ref = this.toRef(handle, blockName);
+        return this.toInstanceIdFromRef(ref.toNormalizedString());
+    }
+    static toInstanceIdFromRef(ref) {
+        return (0, uuid_1.v5)((0, nodejs_utils_1.normalizeKapetaUri)(ref), uuid_1.v5.URL);
+    }
+    static toSafeName(name) {
+        return name.toLowerCase().replace(/[^0-9a-z-]/gi, '');
+    }
+    static toRef(handle, name) {
+        return (0, nodejs_utils_1.parseKapetaUri)(handle + '/' + this.toSafeName(name) + ':local');
+    }
     events = [];
     planName = '';
     planDescription = '';
@@ -141,8 +154,8 @@ class StormEventParser {
                     models: [],
                     types: [],
                 };
-                evt.payload.blockRef = this.toRef(handle, evt.payload.name).toNormalizedString();
-                evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                evt.payload.blockRef = StormEventParser.toRef(handle, evt.payload.name).toNormalizedString();
+                evt.payload.instanceId = StormEventParser.toInstanceIdFromRef(evt.payload.blockRef);
                 break;
             case 'PLAN_RETRY':
                 this.reset();
@@ -153,28 +166,31 @@ class StormEventParser {
                 break;
             case 'CREATE_API':
                 blockInfo = this.blocks[evt.payload.blockName];
-                blockInfo.apis.push(prettifyKaplang(evt.payload.content));
-                evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
-                evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                evt.payload.content = prettifyKaplang(evt.payload.content);
+                blockInfo.apis.push(evt.payload.content);
+                evt.payload.blockRef = StormEventParser.toRef(handle, evt.payload.blockName).toNormalizedString();
+                evt.payload.instanceId = StormEventParser.toInstanceIdFromRef(evt.payload.blockRef);
                 const api = blockInfo.resources.find((r) => r.type == 'API');
                 evt.payload.resourceName = api?.name;
                 break;
             case 'CREATE_MODEL':
                 blockInfo = this.blocks[evt.payload.blockName];
-                blockInfo.models.push(prettifyKaplang(evt.payload.content));
-                evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
-                evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                evt.payload.content = prettifyKaplang(evt.payload.content);
+                blockInfo.models.push(evt.payload.content);
+                evt.payload.blockRef = StormEventParser.toRef(handle, evt.payload.blockName).toNormalizedString();
+                evt.payload.instanceId = StormEventParser.toInstanceIdFromRef(evt.payload.blockRef);
                 const database = blockInfo.resources.find((r) => r.type == 'DATABASE');
                 evt.payload.resourceName = database?.name;
                 break;
             case 'CREATE_TYPE':
-                this.blocks[evt.payload.blockName].types.push(prettifyKaplang(evt.payload.content));
-                evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
-                evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                evt.payload.content = prettifyKaplang(evt.payload.content);
+                this.blocks[evt.payload.blockName].types.push(evt.payload.content);
+                evt.payload.blockRef = StormEventParser.toRef(handle, evt.payload.blockName).toNormalizedString();
+                evt.payload.instanceId = StormEventParser.toInstanceIdFromRef(evt.payload.blockRef);
                 break;
             case 'CREATE_CONNECTION':
-                evt.payload.fromBlockId = this.toInstanceId(handle, evt.payload.fromComponent);
-                evt.payload.toBlockId = this.toInstanceId(handle, evt.payload.toComponent);
+                evt.payload.fromBlockId = StormEventParser.toInstanceId(handle, evt.payload.fromComponent);
+                evt.payload.toBlockId = StormEventParser.toInstanceId(handle, evt.payload.toComponent);
                 this.connections.push(evt.payload);
                 break;
             default:
@@ -196,20 +212,13 @@ class StormEventParser {
     getError() {
         return this.error;
     }
-    toInstanceId(handle, blockName) {
-        const ref = this.toRef(handle, blockName);
-        return this.toInstanceIdFromRef(ref.toNormalizedString());
-    }
-    toInstanceIdFromRef(ref) {
-        return (0, uuid_1.v5)((0, nodejs_utils_1.normalizeKapetaUri)(ref), uuid_1.v5.URL);
-    }
     toResult(handle) {
-        const planRef = this.toRef(handle, this.planName ?? 'undefined');
+        const planRef = StormEventParser.toRef(handle, this.planName ?? 'undefined');
         const blockDefinitions = this.toBlockDefinitions(handle);
         const refIdMap = {};
         const blocks = Object.entries(blockDefinitions).map(([ref, block]) => {
             // Create a deterministic uuid
-            const id = this.toInstanceIdFromRef(ref);
+            const id = StormEventParser.toInstanceIdFromRef(ref);
             refIdMap[ref] = id;
             return {
                 id,
@@ -229,8 +238,8 @@ class StormEventParser {
         this.connections
             .filter((connection) => connection.fromResourceType === 'API' && connection.toResourceType === 'CLIENT')
             .forEach((apiConnection) => {
-            const apiProviderRef = this.toRef(handle, apiConnection.fromComponent);
-            const clientConsumerRef = this.toRef(handle, apiConnection.toComponent);
+            const apiProviderRef = StormEventParser.toRef(handle, apiConnection.fromComponent);
+            const clientConsumerRef = StormEventParser.toRef(handle, apiConnection.toComponent);
             const apiProviderBlock = blockDefinitions[apiProviderRef.toNormalizedString()];
             if (!apiProviderBlock) {
                 console.warn('API provider not found: %s', apiConnection.fromComponent, apiConnection);
@@ -283,8 +292,8 @@ class StormEventParser {
             clientResource.spec.source = apiResource.spec.source;
         });
         const connections = this.connections.map((connection) => {
-            const fromRef = this.toRef(handle, connection.fromComponent);
-            const toRef = this.toRef(handle, connection.toComponent);
+            const fromRef = StormEventParser.toRef(handle, connection.fromComponent);
+            const toRef = StormEventParser.toRef(handle, connection.toComponent);
             return {
                 port: {
                     type: this.toPortType(connection.fromResourceType),
@@ -317,16 +326,10 @@ class StormEventParser {
             blocks: Object.values(blockDefinitions),
         };
     }
-    toSafeName(name) {
-        return name.toLowerCase().replace(/[^0-9a-z-]/gi, '');
-    }
-    toRef(handle, name) {
-        return (0, nodejs_utils_1.parseKapetaUri)(handle + '/' + this.toSafeName(name) + ':local');
-    }
     toBlockDefinitions(handle) {
         const result = {};
         Object.entries(this.blocks).forEach(([, blockInfo]) => {
-            const blockRef = this.toRef(handle, blockInfo.name);
+            const blockRef = StormEventParser.toRef(handle, blockInfo.name);
             const blockDefinitionInfo = {
                 uri: blockRef,
                 aiName: blockInfo.name,
@@ -530,7 +533,7 @@ class StormEventParser {
         if (connection.fromResourceType !== 'API') {
             return;
         }
-        const fromRef = this.toRef(handle, connection.fromComponent);
+        const fromRef = StormEventParser.toRef(handle, connection.fromComponent);
         const apiProviderBlock = blockDefinitions[fromRef.toNormalizedString()];
         if (!apiProviderBlock) {
             console.warn('Provider block not found: %s', connection.fromComponent, connection);
@@ -585,8 +588,8 @@ class StormEventParser {
         }
         let options = {};
         if (kind.includes('java')) {
-            const groupId = `ai.${this.toSafeName(handle)}`;
-            const artifactId = this.toSafeName(this.planName);
+            const groupId = `ai.${StormEventParser.toSafeName(handle)}`;
+            const artifactId = StormEventParser.toSafeName(this.planName);
             options = {
                 groupId,
                 artifactId,

package/dist/cjs/src/storm/events.d.ts

@@ -112,6 +112,8 @@ export interface StormEventScreen {
     created: number;
     payload: {
         blockName: string;
+        blockRef?: string;
+        instanceId?: string;
         name: string;
         template: string;
         description: string;
@@ -138,6 +140,7 @@ export interface StormEventFile {
         content: string;
         blockName: string;
         blockRef: string;
+        instanceId: string;
     };
 }
 export interface StormEventDone {

package/dist/esm/src/storm/codegen.js

@@ -34,6 +34,7 @@ exports.StormCodegen = void 0;
 const codegen_1 = require("@kapeta/codegen");
 const codeGeneratorManager_1 = require("../codeGeneratorManager");
 const stormClient_1 = require("./stormClient");
+const event_parser_1 = require("./event-parser");
 const stream_1 = require("./stream");
 const promises_1 = require("fs/promises");
 const path_1 = __importStar(require("path"));
@@ -70,6 +71,7 @@ class StormCodegen {
     handleUiOutput(blockUri, aiName, data) {
         switch (data.type) {
             case 'SCREEN':
+                const ref = blockUri.toNormalizedString();
                 this.out.emit('data', {
                     type: 'SCREEN',
                     reason: data.reason,
@@ -77,6 +79,8 @@ class StormCodegen {
                     payload: {
                         ...data.payload,
                         blockName: aiName,
+                        blockRef: ref,
+                        instanceId: event_parser_1.StormEventParser.toInstanceIdFromRef(ref),
                     },
                 });
             case 'FILE':
@@ -86,6 +90,7 @@ class StormCodegen {
     handleFileOutput(blockUri, aiName, data) {
         switch (data.type) {
             case 'FILE':
+                const ref = blockUri.toNormalizedString();
                 this.emitFile(blockUri, aiName, data.payload.filename, data.payload.content, data.reason);
                 return {
                     type: 'FILE',
@@ -93,6 +98,8 @@ class StormCodegen {
                     payload: {
                         filename: data.payload.filename,
                         content: data.payload.content,
+                        blockRef: ref,
+                        instanceId: event_parser_1.StormEventParser.toInstanceIdFromRef(ref),
                     },
                 };
         }
@@ -171,6 +178,7 @@ class StormCodegen {
     }
     emitFile(uri, blockName, filename, content, reason = 'File generated') {
         const basePath = this.getBasePath(uri.fullName);
+        const ref = uri.toNormalizedString();
         this.out.emit('data', {
             type: 'FILE',
             reason,
@@ -180,7 +188,8 @@ class StormCodegen {
                 path: (0, path_1.join)(basePath, filename),
                 content: content,
                 blockName,
-                blockRef: uri.toNormalizedString(),
+                blockRef: ref,
+                instanceId: event_parser_1.StormEventParser.toInstanceIdFromRef(ref),
             },
         });
     }

package/dist/esm/src/storm/event-parser.d.ts

@@ -41,6 +41,10 @@ export interface StormOptions {
 }
 export declare function resolveOptions(): Promise<StormOptions>;
 export declare class StormEventParser {
+    static toInstanceId(handle: string, blockName: string): string;
+    static toInstanceIdFromRef(ref: string): string;
+    static toSafeName(name: string): string;
+    static toRef(handle: string, name: string): KapetaURI;
     private events;
     private planName;
     private planDescription;
@@ -58,11 +62,7 @@ export declare class StormEventParser {
     getEvents(): StormEvent[];
     isValid(): boolean;
     getError(): string;
-    private toInstanceId;
-    private toInstanceIdFromRef;
     toResult(handle: string): StormDefinitions;
-    private toSafeName;
-    private toRef;
     toBlockDefinitions(handle: string): {
         [key: string]: BlockDefinitionInfo;
     };

package/dist/esm/src/storm/event-parser.js

@@ -105,6 +105,19 @@ async function resolveOptions() {
 }
 exports.resolveOptions = resolveOptions;
 class StormEventParser {
+    static toInstanceId(handle, blockName) {
+        const ref = this.toRef(handle, blockName);
+        return this.toInstanceIdFromRef(ref.toNormalizedString());
+    }
+    static toInstanceIdFromRef(ref) {
+        return (0, uuid_1.v5)((0, nodejs_utils_1.normalizeKapetaUri)(ref), uuid_1.v5.URL);
+    }
+    static toSafeName(name) {
+        return name.toLowerCase().replace(/[^0-9a-z-]/gi, '');
+    }
+    static toRef(handle, name) {
+        return (0, nodejs_utils_1.parseKapetaUri)(handle + '/' + this.toSafeName(name) + ':local');
+    }
     events = [];
     planName = '';
     planDescription = '';
@@ -141,8 +154,8 @@ class StormEventParser {
                     models: [],
                     types: [],
                 };
-                evt.payload.blockRef = this.toRef(handle, evt.payload.name).toNormalizedString();
-                evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                evt.payload.blockRef = StormEventParser.toRef(handle, evt.payload.name).toNormalizedString();
+                evt.payload.instanceId = StormEventParser.toInstanceIdFromRef(evt.payload.blockRef);
                 break;
             case 'PLAN_RETRY':
                 this.reset();
@@ -153,28 +166,31 @@ class StormEventParser {
                 break;
             case 'CREATE_API':
                 blockInfo = this.blocks[evt.payload.blockName];
-                blockInfo.apis.push(prettifyKaplang(evt.payload.content));
-                evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
-                evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                evt.payload.content = prettifyKaplang(evt.payload.content);
+                blockInfo.apis.push(evt.payload.content);
+                evt.payload.blockRef = StormEventParser.toRef(handle, evt.payload.blockName).toNormalizedString();
+                evt.payload.instanceId = StormEventParser.toInstanceIdFromRef(evt.payload.blockRef);
                 const api = blockInfo.resources.find((r) => r.type == 'API');
                 evt.payload.resourceName = api?.name;
                 break;
             case 'CREATE_MODEL':
                 blockInfo = this.blocks[evt.payload.blockName];
-                blockInfo.models.push(prettifyKaplang(evt.payload.content));
-                evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
-                evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                evt.payload.content = prettifyKaplang(evt.payload.content);
+                blockInfo.models.push(evt.payload.content);
+                evt.payload.blockRef = StormEventParser.toRef(handle, evt.payload.blockName).toNormalizedString();
+                evt.payload.instanceId = StormEventParser.toInstanceIdFromRef(evt.payload.blockRef);
                 const database = blockInfo.resources.find((r) => r.type == 'DATABASE');
                 evt.payload.resourceName = database?.name;
                 break;
             case 'CREATE_TYPE':
-                this.blocks[evt.payload.blockName].types.push(prettifyKaplang(evt.payload.content));
-                evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
-                evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                evt.payload.content = prettifyKaplang(evt.payload.content);
+                this.blocks[evt.payload.blockName].types.push(evt.payload.content);
+                evt.payload.blockRef = StormEventParser.toRef(handle, evt.payload.blockName).toNormalizedString();
+                evt.payload.instanceId = StormEventParser.toInstanceIdFromRef(evt.payload.blockRef);
                 break;
             case 'CREATE_CONNECTION':
-                evt.payload.fromBlockId = this.toInstanceId(handle, evt.payload.fromComponent);
-                evt.payload.toBlockId = this.toInstanceId(handle, evt.payload.toComponent);
+                evt.payload.fromBlockId = StormEventParser.toInstanceId(handle, evt.payload.fromComponent);
+                evt.payload.toBlockId = StormEventParser.toInstanceId(handle, evt.payload.toComponent);
                 this.connections.push(evt.payload);
                 break;
             default:
@@ -196,20 +212,13 @@ class StormEventParser {
     getError() {
         return this.error;
     }
-    toInstanceId(handle, blockName) {
-        const ref = this.toRef(handle, blockName);
-        return this.toInstanceIdFromRef(ref.toNormalizedString());
-    }
-    toInstanceIdFromRef(ref) {
-        return (0, uuid_1.v5)((0, nodejs_utils_1.normalizeKapetaUri)(ref), uuid_1.v5.URL);
-    }
     toResult(handle) {
-        const planRef = this.toRef(handle, this.planName ?? 'undefined');
+        const planRef = StormEventParser.toRef(handle, this.planName ?? 'undefined');
         const blockDefinitions = this.toBlockDefinitions(handle);
         const refIdMap = {};
         const blocks = Object.entries(blockDefinitions).map(([ref, block]) => {
             // Create a deterministic uuid
-            const id = this.toInstanceIdFromRef(ref);
+            const id = StormEventParser.toInstanceIdFromRef(ref);
             refIdMap[ref] = id;
             return {
                 id,
@@ -229,8 +238,8 @@ class StormEventParser {
         this.connections
             .filter((connection) => connection.fromResourceType === 'API' && connection.toResourceType === 'CLIENT')
             .forEach((apiConnection) => {
-            const apiProviderRef = this.toRef(handle, apiConnection.fromComponent);
-            const clientConsumerRef = this.toRef(handle, apiConnection.toComponent);
+            const apiProviderRef = StormEventParser.toRef(handle, apiConnection.fromComponent);
+            const clientConsumerRef = StormEventParser.toRef(handle, apiConnection.toComponent);
             const apiProviderBlock = blockDefinitions[apiProviderRef.toNormalizedString()];
             if (!apiProviderBlock) {
                 console.warn('API provider not found: %s', apiConnection.fromComponent, apiConnection);
@@ -283,8 +292,8 @@ class StormEventParser {
             clientResource.spec.source = apiResource.spec.source;
         });
         const connections = this.connections.map((connection) => {
-            const fromRef = this.toRef(handle, connection.fromComponent);
-            const toRef = this.toRef(handle, connection.toComponent);
+            const fromRef = StormEventParser.toRef(handle, connection.fromComponent);
+            const toRef = StormEventParser.toRef(handle, connection.toComponent);
             return {
                 port: {
                     type: this.toPortType(connection.fromResourceType),
@@ -317,16 +326,10 @@ class StormEventParser {
             blocks: Object.values(blockDefinitions),
         };
     }
-    toSafeName(name) {
-        return name.toLowerCase().replace(/[^0-9a-z-]/gi, '');
-    }
-    toRef(handle, name) {
-        return (0, nodejs_utils_1.parseKapetaUri)(handle + '/' + this.toSafeName(name) + ':local');
-    }
     toBlockDefinitions(handle) {
         const result = {};
         Object.entries(this.blocks).forEach(([, blockInfo]) => {
-            const blockRef = this.toRef(handle, blockInfo.name);
+            const blockRef = StormEventParser.toRef(handle, blockInfo.name);
             const blockDefinitionInfo = {
                 uri: blockRef,
                 aiName: blockInfo.name,
@@ -530,7 +533,7 @@ class StormEventParser {
         if (connection.fromResourceType !== 'API') {
             return;
         }
-        const fromRef = this.toRef(handle, connection.fromComponent);
+        const fromRef = StormEventParser.toRef(handle, connection.fromComponent);
         const apiProviderBlock = blockDefinitions[fromRef.toNormalizedString()];
         if (!apiProviderBlock) {
             console.warn('Provider block not found: %s', connection.fromComponent, connection);
@@ -585,8 +588,8 @@ class StormEventParser {
         }
         let options = {};
         if (kind.includes('java')) {
-            const groupId = `ai.${this.toSafeName(handle)}`;
-            const artifactId = this.toSafeName(this.planName);
+            const groupId = `ai.${StormEventParser.toSafeName(handle)}`;
+            const artifactId = StormEventParser.toSafeName(this.planName);
             options = {
                 groupId,
                 artifactId,

package/dist/esm/src/storm/events.d.ts

@@ -112,6 +112,8 @@ export interface StormEventScreen {
     created: number;
     payload: {
         blockName: string;
+        blockRef?: string;
+        instanceId?: string;
         name: string;
         template: string;
         description: string;
@@ -138,6 +140,7 @@ export interface StormEventFile {
         content: string;
         blockName: string;
         blockRef: string;
+        instanceId: string;
     };
 }
 export interface StormEventDone {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.48.2",
+    "version": "0.48.4",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {

package/src/storm/codegen.ts

@@ -9,7 +9,7 @@ import { BlockDefinition } from '@kapeta/schemas';
 import { codeGeneratorManager } from '../codeGeneratorManager';
 import { STORM_ID, stormClient } from './stormClient';
 import { StormEvent, StormEventFile } from './events';
-import { BlockDefinitionInfo } from './event-parser';
+import { BlockDefinitionInfo, StormEventParser } from './event-parser';
 import { ConversationItem, StormFileImplementationPrompt, StormFileInfo, StormStream } from './stream';
 import { KapetaURI } from '@kapeta/nodejs-utils';
 import { writeFile } from 'fs/promises';
@@ -56,6 +56,7 @@ export class StormCodegen {
     private handleUiOutput(blockUri: KapetaURI, aiName: string, data: StormEvent) {
         switch (data.type) {
             case 'SCREEN':
+                const ref = blockUri.toNormalizedString();
                 this.out.emit('data', {
                     type: 'SCREEN',
                     reason: data.reason,
@@ -63,6 +64,8 @@ export class StormCodegen {
                     payload: {
                         ...data.payload,
                         blockName: aiName,
+                        blockRef: ref,
+                        instanceId: StormEventParser.toInstanceIdFromRef(ref),
                     },
                 });
             case 'FILE':
@@ -73,6 +76,7 @@ export class StormCodegen {
     private handleFileOutput(blockUri: KapetaURI, aiName: string, data: StormEvent) {
         switch (data.type) {
             case 'FILE':
+                const ref = blockUri.toNormalizedString();
                 this.emitFile(blockUri, aiName, data.payload.filename, data.payload.content, data.reason);
                 return {
                     type: 'FILE',
@@ -80,6 +84,8 @@ export class StormCodegen {
                     payload: {
                         filename: data.payload.filename,
                         content: data.payload.content,
+                        blockRef: ref,
+                        instanceId: StormEventParser.toInstanceIdFromRef(ref),
                     },
                 } as StormEventFile;
         }
@@ -192,7 +198,7 @@ export class StormCodegen {
         reason: string = 'File generated'
     ) {
         const basePath = this.getBasePath(uri.fullName);
-
+        const ref = uri.toNormalizedString();
         this.out.emit('data', {
             type: 'FILE',
             reason,
@@ -202,7 +208,8 @@ export class StormCodegen {
                 path: join(basePath, filename),
                 content: content,
                 blockName,
-                blockRef: uri.toNormalizedString(),
+                blockRef: ref,
+                instanceId: StormEventParser.toInstanceIdFromRef(ref),
             },
         } satisfies StormEventFile);
     }

package/src/storm/event-parser.ts

@@ -201,6 +201,23 @@ export async function resolveOptions(): Promise<StormOptions> {
 }
 
 export class StormEventParser {
+    public static toInstanceId(handle: string, blockName: string) {
+        const ref = this.toRef(handle, blockName);
+        return this.toInstanceIdFromRef(ref.toNormalizedString());
+    }
+
+    public static toInstanceIdFromRef(ref: string) {
+        return uuid(normalizeKapetaUri(ref), uuid.URL);
+    }
+
+    public static toSafeName(name: string): string {
+        return name.toLowerCase().replace(/[^0-9a-z-]/gi, '');
+    }
+
+    public static toRef(handle: string, name: string) {
+        return parseKapetaUri(handle + '/' + this.toSafeName(name) + ':local');
+    }
+
     private events: StormEvent[] = [];
     private planName: string = '';
     private planDescription: string = '';
@@ -240,8 +257,8 @@ export class StormEventParser {
                     models: [],
                     types: [],
                 };
-                evt.payload.blockRef = this.toRef(handle, evt.payload.name).toNormalizedString();
-                evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                evt.payload.blockRef = StormEventParser.toRef(handle, evt.payload.name).toNormalizedString();
+                evt.payload.instanceId = StormEventParser.toInstanceIdFromRef(evt.payload.blockRef);
                 break;
             case 'PLAN_RETRY':
                 this.reset();
@@ -252,31 +269,34 @@ export class StormEventParser {
                 break;
             case 'CREATE_API':
                 blockInfo = this.blocks[evt.payload.blockName];
-                blockInfo.apis.push(prettifyKaplang(evt.payload.content));
-                evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
-                evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                evt.payload.content = prettifyKaplang(evt.payload.content);
+                blockInfo.apis.push(evt.payload.content);
+                evt.payload.blockRef = StormEventParser.toRef(handle, evt.payload.blockName).toNormalizedString();
+                evt.payload.instanceId = StormEventParser.toInstanceIdFromRef(evt.payload.blockRef);
 
                 const api = blockInfo.resources.find((r) => r.type == 'API');
                 evt.payload.resourceName = api?.name;
                 break;
             case 'CREATE_MODEL':
                 blockInfo = this.blocks[evt.payload.blockName];
-                blockInfo.models.push(prettifyKaplang(evt.payload.content));
-                evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
-                evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                evt.payload.content = prettifyKaplang(evt.payload.content);
+                blockInfo.models.push(evt.payload.content);
+                evt.payload.blockRef = StormEventParser.toRef(handle, evt.payload.blockName).toNormalizedString();
+                evt.payload.instanceId = StormEventParser.toInstanceIdFromRef(evt.payload.blockRef);
 
                 const database = blockInfo.resources.find((r) => r.type == 'DATABASE');
                 evt.payload.resourceName = database?.name;
                 break;
 
             case 'CREATE_TYPE':
-                this.blocks[evt.payload.blockName].types.push(prettifyKaplang(evt.payload.content));
-                evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
-                evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                evt.payload.content = prettifyKaplang(evt.payload.content);
+                this.blocks[evt.payload.blockName].types.push(evt.payload.content);
+                evt.payload.blockRef = StormEventParser.toRef(handle, evt.payload.blockName).toNormalizedString();
+                evt.payload.instanceId = StormEventParser.toInstanceIdFromRef(evt.payload.blockRef);
                 break;
             case 'CREATE_CONNECTION':
-                evt.payload.fromBlockId = this.toInstanceId(handle, evt.payload.fromComponent);
-                evt.payload.toBlockId = this.toInstanceId(handle, evt.payload.toComponent);
+                evt.payload.fromBlockId = StormEventParser.toInstanceId(handle, evt.payload.fromComponent);
+                evt.payload.toBlockId = StormEventParser.toInstanceId(handle, evt.payload.toComponent);
                 this.connections.push(evt.payload);
                 break;
 
@@ -304,22 +324,13 @@ export class StormEventParser {
         return this.error;
     }
 
-    private toInstanceId(handle: string, blockName: string) {
-        const ref = this.toRef(handle, blockName);
-        return this.toInstanceIdFromRef(ref.toNormalizedString());
-    }
-
-    private toInstanceIdFromRef(ref: string) {
-        return uuid(normalizeKapetaUri(ref), uuid.URL);
-    }
-
     public toResult(handle: string): StormDefinitions {
-        const planRef = this.toRef(handle, this.planName ?? 'undefined');
+        const planRef = StormEventParser.toRef(handle, this.planName ?? 'undefined');
         const blockDefinitions = this.toBlockDefinitions(handle);
         const refIdMap: { [key: string]: string } = {};
         const blocks = Object.entries(blockDefinitions).map(([ref, block]) => {
             // Create a deterministic uuid
-            const id = this.toInstanceIdFromRef(ref);
+            const id = StormEventParser.toInstanceIdFromRef(ref);
             refIdMap[ref] = id;
             return {
                 id,
@@ -340,8 +351,8 @@ export class StormEventParser {
         this.connections
             .filter((connection) => connection.fromResourceType === 'API' && connection.toResourceType === 'CLIENT')
             .forEach((apiConnection) => {
-                const apiProviderRef = this.toRef(handle, apiConnection.fromComponent);
-                const clientConsumerRef = this.toRef(handle, apiConnection.toComponent);
+                const apiProviderRef = StormEventParser.toRef(handle, apiConnection.fromComponent);
+                const clientConsumerRef = StormEventParser.toRef(handle, apiConnection.toComponent);
                 const apiProviderBlock = blockDefinitions[apiProviderRef.toNormalizedString()];
                 if (!apiProviderBlock) {
                     console.warn('API provider not found: %s', apiConnection.fromComponent, apiConnection);
@@ -418,8 +429,8 @@ export class StormEventParser {
             });
 
         const connections: Connection[] = this.connections.map((connection) => {
-            const fromRef = this.toRef(handle, connection.fromComponent);
-            const toRef = this.toRef(handle, connection.toComponent);
+            const fromRef = StormEventParser.toRef(handle, connection.fromComponent);
+            const toRef = StormEventParser.toRef(handle, connection.toComponent);
 
             return {
                 port: {
@@ -456,19 +467,11 @@ export class StormEventParser {
         };
     }
 
-    private toSafeName(name: string): string {
-        return name.toLowerCase().replace(/[^0-9a-z-]/gi, '');
-    }
-
-    private toRef(handle: string, name: string) {
-        return parseKapetaUri(handle + '/' + this.toSafeName(name) + ':local');
-    }
-
     public toBlockDefinitions(handle: string): { [key: string]: BlockDefinitionInfo } {
         const result: { [key: string]: BlockDefinitionInfo } = {};
 
         Object.entries(this.blocks).forEach(([, blockInfo]) => {
-            const blockRef = this.toRef(handle, blockInfo.name);
+            const blockRef = StormEventParser.toRef(handle, blockInfo.name);
 
             const blockDefinitionInfo: BlockDefinitionInfo = {
                 uri: blockRef,
@@ -690,7 +693,7 @@ export class StormEventParser {
             return;
         }
 
-        const fromRef = this.toRef(handle, connection.fromComponent);
+        const fromRef = StormEventParser.toRef(handle, connection.fromComponent);
 
         const apiProviderBlock = blockDefinitions[fromRef.toNormalizedString()];
         if (!apiProviderBlock) {
@@ -771,8 +774,8 @@ export class StormEventParser {
         let options: { [key: string]: any } = {};
 
         if (kind.includes('java')) {
-            const groupId = `ai.${this.toSafeName(handle)}`;
-            const artifactId = this.toSafeName(this.planName);
+            const groupId = `ai.${StormEventParser.toSafeName(handle)}`;
+            const artifactId = StormEventParser.toSafeName(this.planName);
             options = {
                 groupId,
                 artifactId,

package/src/storm/events.ts

@@ -140,6 +140,8 @@ export interface StormEventScreen {
     created: number;
     payload: {
         blockName: string;
+        blockRef?: string;
+        instanceId?: string;
         name: string;
         template: string;
         description: string;
@@ -168,6 +170,7 @@ export interface StormEventFile {
         content: string;
         blockName: string;
         blockRef: string;
+        instanceId: string;
     };
 }