npm - @kapeta/local-cluster-service - Versions diffs - 0.48.1 → 0.48.3 - Mend

@kapeta/local-cluster-service 0.48.1 → 0.48.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/CHANGELOG.md +14 -0
package/dist/cjs/src/storm/codegen.d.ts +2 -0
package/dist/cjs/src/storm/codegen.js +19 -3
package/dist/cjs/src/storm/event-parser.d.ts +4 -4
package/dist/cjs/src/storm/event-parser.js +45 -37
package/dist/cjs/src/storm/events.d.ts +18 -2
package/dist/esm/src/storm/codegen.d.ts +2 -0
package/dist/esm/src/storm/codegen.js +19 -3
package/dist/esm/src/storm/event-parser.d.ts +4 -4
package/dist/esm/src/storm/event-parser.js +45 -37
package/dist/esm/src/storm/events.d.ts +18 -2
package/package.json +1 -1
package/src/storm/codegen.ts +20 -4
package/src/storm/event-parser.ts +52 -41
package/src/storm/events.ts +19 -1

package/CHANGELOG.md CHANGED Viewed

@@ -1,3 +1,17 @@
+## [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)
+### Bug Fixes
+* Include resource name for api and model ([#157](https://github.com/kapetacom/local-cluster-service/issues/157)) ([b79a704](https://github.com/kapetacom/local-cluster-service/commit/b79a704b74d11cb0ec0fc8346e29ed754b39fb12))
 ## [0.48.1](https://github.com/kapetacom/local-cluster-service/compare/v0.48.0...v0.48.1) (2024-06-03)

package/dist/cjs/src/storm/codegen.d.ts CHANGED Viewed

@@ -10,12 +10,14 @@ export declare class StormCodegen {
     private readonly blocks;
     private readonly out;
     private readonly events;
+    private readonly tmpDir;
     constructor(userPrompt: string, blocks: BlockDefinitionInfo[], events: StormEvent[]);
     process(): Promise<void>;
     getStream(): StormStream;
     private handleTemplateFileOutput;
     private handleUiOutput;
     private handleFileOutput;
+    private getBasePath;
     /**
      * Generates the code for a block and sends it to the AI
      */

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

@@ -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"));
@@ -43,10 +44,12 @@ class StormCodegen {
     blocks;
     out = new stream_1.StormStream();
     events;
+    tmpDir;
     constructor(userPrompt, blocks, events) {
         this.userPrompt = userPrompt;
         this.blocks = blocks;
         this.events = events;
+        this.tmpDir = node_os_1.default.tmpdir();
     }
     async process() {
         for (const block of this.blocks) {
@@ -68,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,
@@ -75,6 +79,8 @@ class StormCodegen {
                     payload: {
                         ...data.payload,
                         blockName: aiName,
+                        blockRef: ref,
+                        instanceId: event_parser_1.StormEventParser.toInstanceIdFromRef(ref),
                     },
                 });
             case 'FILE':
@@ -84,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',
@@ -91,10 +98,15 @@ class StormCodegen {
                     payload: {
                         filename: data.payload.filename,
                         content: data.payload.content,
+                        blockRef: ref,
+                        instanceId: event_parser_1.StormEventParser.toInstanceIdFromRef(ref),
                     },
                 };
         }
     }
+    getBasePath(blockName) {
+        return path_1.default.join(this.tmpDir, blockName);
+    }
     /**
      * Generates the code for a block and sends it to the AI
      */
@@ -129,7 +141,7 @@ class StormCodegen {
         if (serviceFiles.length > 0) {
             await this.processTemplates(block.uri, block.aiName, stormClient_1.stormClient.createServiceImplementation.bind(stormClient_1.stormClient), serviceFiles, contextFiles);
         }
-        const basePath = path_1.default.join(node_os_1.default.tmpdir(), block.content.metadata.name);
+        const basePath = this.getBasePath(block.content.metadata.name);
         for (const serviceFile of serviceFiles) {
             const filePath = (0, path_1.join)(basePath, serviceFile.filename);
             await (0, promises_1.writeFile)(filePath, serviceFile.content);
@@ -165,15 +177,19 @@ 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,
             created: Date.now(),
             payload: {
                 filename: filename,
+                path: (0, path_1.join)(basePath, filename),
                 content: content,
                 blockName,
-                blockRef: uri.toNormalizedString(),
+                blockRef: ref,
+                instanceId: event_parser_1.StormEventParser.toInstanceIdFromRef(ref),
             },
         });
     }
@@ -245,7 +261,7 @@ class StormCodegen {
         if (!(await codeGeneratorManager_1.codeGeneratorManager.ensureTarget(yamlContent.spec.target?.kind))) {
             return;
         }
-        const basePath = path_1.default.join(node_os_1.default.tmpdir(), yamlContent.metadata.name);
+        const basePath = this.getBasePath(yamlContent.metadata.name);
         const codeGenerator = new codegen_1.BlockCodeGenerator(yamlContent);
         codeGenerator.withOption('AIContext', stormClient_1.STORM_ID);
         const generatedResult = await codeGenerator.generate();

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

@@ -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 CHANGED Viewed

@@ -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 = '';
@@ -126,7 +139,9 @@ class StormEventParser {
      * Builds plan and block definitions - and enriches events with relevant refs and ids
      */
     processEvent(handle, evt) {
+        let blockInfo;
         this.events.push(evt);
+        console.log('Processing event: %s', evt.type);
         switch (evt.type) {
             case 'CREATE_PLAN_PROPERTIES':
                 this.planName = evt.payload.name;
@@ -139,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();
@@ -150,23 +165,29 @@ class StormEventParser {
                 this.error = evt.payload.error;
                 break;
             case 'CREATE_API':
-                this.blocks[evt.payload.blockName].apis.push(prettifyKaplang(evt.payload.content));
-                evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
-                evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                blockInfo = this.blocks[evt.payload.blockName];
+                blockInfo.apis.push(prettifyKaplang(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 = 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);
-                break;
-            case 'CREATE_MODEL':
-                this.blocks[evt.payload.blockName].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.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:
@@ -188,20 +209,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,
@@ -221,8 +235,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);
@@ -275,8 +289,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),
@@ -309,16 +323,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,
@@ -522,7 +530,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);
@@ -577,8 +585,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 CHANGED Viewed

@@ -70,7 +70,7 @@ export interface StormEventPlanRetry {
     };
 }
 export interface StormEventCreateDSL {
-    type: 'CREATE_API' | 'CREATE_TYPE' | 'CREATE_MODEL';
+    type: 'CREATE_TYPE';
     reason: string;
     created: number;
     payload: {
@@ -80,6 +80,18 @@ export interface StormEventCreateDSL {
         instanceId?: string;
     };
 }
+export interface StormEventCreateDSLResource extends Omit<StormEventCreateDSL, 'type'> {
+    type: 'CREATE_API' | 'CREATE_MODEL';
+    reason: string;
+    created: number;
+    payload: {
+        blockName: string;
+        content: string;
+        blockRef?: string;
+        instanceId?: string;
+        resourceName?: string;
+    };
+}
 export interface StormEventError {
     type: 'INVALID_RESPONSE' | 'ERROR_INTERNAL';
     reason: string;
@@ -100,6 +112,8 @@ export interface StormEventScreen {
     created: number;
     payload: {
         blockName: string;
+        blockRef?: string;
+        instanceId?: string;
         name: string;
         template: string;
         description: string;
@@ -122,9 +136,11 @@ export interface StormEventFile {
     created: number;
     payload: {
         filename: string;
+        path: string;
         content: string;
         blockName: string;
         blockRef: string;
+        instanceId: string;
     };
 }
 export interface StormEventDone {
@@ -137,4 +153,4 @@ export interface StormEventDefinitionChange {
     created: number;
     payload: StormDefinitions;
 }
-export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFile | StormEventDone | StormEventDefinitionChange;
+export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFile | StormEventDone | StormEventDefinitionChange;

package/dist/esm/src/storm/codegen.d.ts CHANGED Viewed

@@ -10,12 +10,14 @@ export declare class StormCodegen {
     private readonly blocks;
     private readonly out;
     private readonly events;
+    private readonly tmpDir;
     constructor(userPrompt: string, blocks: BlockDefinitionInfo[], events: StormEvent[]);
     process(): Promise<void>;
     getStream(): StormStream;
     private handleTemplateFileOutput;
     private handleUiOutput;
     private handleFileOutput;
+    private getBasePath;
     /**
      * Generates the code for a block and sends it to the AI
      */

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

@@ -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"));
@@ -43,10 +44,12 @@ class StormCodegen {
     blocks;
     out = new stream_1.StormStream();
     events;
+    tmpDir;
     constructor(userPrompt, blocks, events) {
         this.userPrompt = userPrompt;
         this.blocks = blocks;
         this.events = events;
+        this.tmpDir = node_os_1.default.tmpdir();
     }
     async process() {
         for (const block of this.blocks) {
@@ -68,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,
@@ -75,6 +79,8 @@ class StormCodegen {
                     payload: {
                         ...data.payload,
                         blockName: aiName,
+                        blockRef: ref,
+                        instanceId: event_parser_1.StormEventParser.toInstanceIdFromRef(ref),
                     },
                 });
             case 'FILE':
@@ -84,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',
@@ -91,10 +98,15 @@ class StormCodegen {
                     payload: {
                         filename: data.payload.filename,
                         content: data.payload.content,
+                        blockRef: ref,
+                        instanceId: event_parser_1.StormEventParser.toInstanceIdFromRef(ref),
                     },
                 };
         }
     }
+    getBasePath(blockName) {
+        return path_1.default.join(this.tmpDir, blockName);
+    }
     /**
      * Generates the code for a block and sends it to the AI
      */
@@ -129,7 +141,7 @@ class StormCodegen {
         if (serviceFiles.length > 0) {
             await this.processTemplates(block.uri, block.aiName, stormClient_1.stormClient.createServiceImplementation.bind(stormClient_1.stormClient), serviceFiles, contextFiles);
         }
-        const basePath = path_1.default.join(node_os_1.default.tmpdir(), block.content.metadata.name);
+        const basePath = this.getBasePath(block.content.metadata.name);
         for (const serviceFile of serviceFiles) {
             const filePath = (0, path_1.join)(basePath, serviceFile.filename);
             await (0, promises_1.writeFile)(filePath, serviceFile.content);
@@ -165,15 +177,19 @@ 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,
             created: Date.now(),
             payload: {
                 filename: filename,
+                path: (0, path_1.join)(basePath, filename),
                 content: content,
                 blockName,
-                blockRef: uri.toNormalizedString(),
+                blockRef: ref,
+                instanceId: event_parser_1.StormEventParser.toInstanceIdFromRef(ref),
             },
         });
     }
@@ -245,7 +261,7 @@ class StormCodegen {
         if (!(await codeGeneratorManager_1.codeGeneratorManager.ensureTarget(yamlContent.spec.target?.kind))) {
             return;
         }
-        const basePath = path_1.default.join(node_os_1.default.tmpdir(), yamlContent.metadata.name);
+        const basePath = this.getBasePath(yamlContent.metadata.name);
         const codeGenerator = new codegen_1.BlockCodeGenerator(yamlContent);
         codeGenerator.withOption('AIContext', stormClient_1.STORM_ID);
         const generatedResult = await codeGenerator.generate();

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

@@ -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 CHANGED Viewed

@@ -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 = '';
@@ -126,7 +139,9 @@ class StormEventParser {
      * Builds plan and block definitions - and enriches events with relevant refs and ids
      */
     processEvent(handle, evt) {
+        let blockInfo;
         this.events.push(evt);
+        console.log('Processing event: %s', evt.type);
         switch (evt.type) {
             case 'CREATE_PLAN_PROPERTIES':
                 this.planName = evt.payload.name;
@@ -139,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();
@@ -150,23 +165,29 @@ class StormEventParser {
                 this.error = evt.payload.error;
                 break;
             case 'CREATE_API':
-                this.blocks[evt.payload.blockName].apis.push(prettifyKaplang(evt.payload.content));
-                evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
-                evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                blockInfo = this.blocks[evt.payload.blockName];
+                blockInfo.apis.push(prettifyKaplang(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 = 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);
-                break;
-            case 'CREATE_MODEL':
-                this.blocks[evt.payload.blockName].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.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:
@@ -188,20 +209,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,
@@ -221,8 +235,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);
@@ -275,8 +289,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),
@@ -309,16 +323,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,
@@ -522,7 +530,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);
@@ -577,8 +585,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 CHANGED Viewed

@@ -70,7 +70,7 @@ export interface StormEventPlanRetry {
     };
 }
 export interface StormEventCreateDSL {
-    type: 'CREATE_API' | 'CREATE_TYPE' | 'CREATE_MODEL';
+    type: 'CREATE_TYPE';
     reason: string;
     created: number;
     payload: {
@@ -80,6 +80,18 @@ export interface StormEventCreateDSL {
         instanceId?: string;
     };
 }
+export interface StormEventCreateDSLResource extends Omit<StormEventCreateDSL, 'type'> {
+    type: 'CREATE_API' | 'CREATE_MODEL';
+    reason: string;
+    created: number;
+    payload: {
+        blockName: string;
+        content: string;
+        blockRef?: string;
+        instanceId?: string;
+        resourceName?: string;
+    };
+}
 export interface StormEventError {
     type: 'INVALID_RESPONSE' | 'ERROR_INTERNAL';
     reason: string;
@@ -100,6 +112,8 @@ export interface StormEventScreen {
     created: number;
     payload: {
         blockName: string;
+        blockRef?: string;
+        instanceId?: string;
         name: string;
         template: string;
         description: string;
@@ -122,9 +136,11 @@ export interface StormEventFile {
     created: number;
     payload: {
         filename: string;
+        path: string;
         content: string;
         blockName: string;
         blockRef: string;
+        instanceId: string;
     };
 }
 export interface StormEventDone {
@@ -137,4 +153,4 @@ export interface StormEventDefinitionChange {
     created: number;
     payload: StormDefinitions;
 }
-export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFile | StormEventDone | StormEventDefinitionChange;
+export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFile | StormEventDone | StormEventDefinitionChange;

package/package.json CHANGED Viewed

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

package/src/storm/codegen.ts CHANGED Viewed

@@ -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';
@@ -23,11 +23,13 @@ export class StormCodegen {
     private readonly blocks: BlockDefinitionInfo[];
     private readonly out = new StormStream();
     private readonly events: StormEvent[];
+    private readonly tmpDir: string;
     constructor(userPrompt: string, blocks: BlockDefinitionInfo[], events: StormEvent[]) {
         this.userPrompt = userPrompt;
         this.blocks = blocks;
         this.events = events;
+        this.tmpDir = os.tmpdir();
     }
     public async process() {
@@ -54,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,
@@ -61,6 +64,8 @@ export class StormCodegen {
                     payload: {
                         ...data.payload,
                         blockName: aiName,
+                        blockRef: ref,
+                        instanceId: StormEventParser.toInstanceIdFromRef(ref),
                     },
                 });
             case 'FILE':
@@ -71,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',
@@ -78,11 +84,17 @@ export class StormCodegen {
                     payload: {
                         filename: data.payload.filename,
                         content: data.payload.content,
+                        blockRef: ref,
+                        instanceId: StormEventParser.toInstanceIdFromRef(ref),
                     },
                 } as StormEventFile;
         }
     }
+    private getBasePath(blockName: string) {
+        return path.join(this.tmpDir, blockName);
+    }
     /**
      * Generates the code for a block and sends it to the AI
      */
@@ -135,7 +147,7 @@ export class StormCodegen {
             );
         }
-        const basePath = path.join(os.tmpdir(), block.content.metadata.name);
+        const basePath = this.getBasePath(block.content.metadata.name);
         for (const serviceFile of serviceFiles) {
             const filePath = join(basePath, serviceFile.filename);
@@ -185,15 +197,19 @@ export class StormCodegen {
         content: string,
         reason: string = 'File generated'
     ) {
+        const basePath = this.getBasePath(uri.fullName);
+        const ref = uri.toNormalizedString();
         this.out.emit('data', {
             type: 'FILE',
             reason,
             created: Date.now(),
             payload: {
                 filename: filename,
+                path: join(basePath, filename),
                 content: content,
                 blockName,
-                blockRef: uri.toNormalizedString(),
+                blockRef: ref,
+                instanceId: StormEventParser.toInstanceIdFromRef(ref),
             },
         } satisfies StormEventFile);
     }
@@ -283,7 +299,7 @@ export class StormCodegen {
         if (!(await codeGeneratorManager.ensureTarget(yamlContent.spec.target?.kind))) {
             return;
         }
-        const basePath = path.join(os.tmpdir(), yamlContent.metadata.name);
+        const basePath = this.getBasePath(yamlContent.metadata.name);
         const codeGenerator = new BlockCodeGenerator(yamlContent as BlockDefinition);
         codeGenerator.withOption('AIContext', STORM_ID);

package/src/storm/event-parser.ts CHANGED Viewed

@@ -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 = '';
@@ -225,7 +242,9 @@ export class StormEventParser {
      * Builds plan and block definitions - and enriches events with relevant refs and ids
      */
     public processEvent(handle: string, evt: StormEvent): StormDefinitions {
+        let blockInfo;
         this.events.push(evt);
+        console.log('Processing event: %s', evt.type);
         switch (evt.type) {
             case 'CREATE_PLAN_PROPERTIES':
                 this.planName = evt.payload.name;
@@ -238,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();
@@ -249,23 +268,32 @@ export class StormEventParser {
                 this.error = evt.payload.error;
                 break;
             case 'CREATE_API':
-                this.blocks[evt.payload.blockName].apis.push(prettifyKaplang(evt.payload.content));
-                evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
-                evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                blockInfo = this.blocks[evt.payload.blockName];
+                blockInfo.apis.push(prettifyKaplang(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 = 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);
-                break;
-            case 'CREATE_MODEL':
-                this.blocks[evt.payload.blockName].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.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;
@@ -293,22 +321,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,
@@ -329,8 +348,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);
@@ -407,8 +426,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: {
@@ -445,19 +464,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,
@@ -679,7 +690,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) {
@@ -760,8 +771,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 CHANGED Viewed

@@ -94,7 +94,7 @@ export interface StormEventPlanRetry {
 }
 export interface StormEventCreateDSL {
-    type: 'CREATE_API' | 'CREATE_TYPE' | 'CREATE_MODEL';
+    type: 'CREATE_TYPE';
     reason: string;
     created: number;
     payload: {
@@ -105,6 +105,19 @@ export interface StormEventCreateDSL {
     };
 }
+export interface StormEventCreateDSLResource extends Omit<StormEventCreateDSL, 'type'> {
+    type: 'CREATE_API' | 'CREATE_MODEL';
+    reason: string;
+    created: number;
+    payload: {
+        blockName: string;
+        content: string;
+        blockRef?: string;
+        instanceId?: string;
+        resourceName?: string;
+    };
+}
 export interface StormEventError {
     type: 'INVALID_RESPONSE' | 'ERROR_INTERNAL';
     reason: string;
@@ -127,6 +140,8 @@ export interface StormEventScreen {
     created: number;
     payload: {
         blockName: string;
+        blockRef?: string;
+        instanceId?: string;
         name: string;
         template: string;
         description: string;
@@ -151,9 +166,11 @@ export interface StormEventFile {
     created: number;
     payload: {
         filename: string;
+        path: string;
         content: string;
         blockName: string;
         blockRef: string;
+        instanceId: string;
     };
 }
@@ -176,6 +193,7 @@ export type StormEvent =
     | StormEventInvalidResponse
     | StormEventPlanRetry
     | StormEventCreateDSL
+    | StormEventCreateDSLResource
     | StormEventError
     | StormEventScreen
     | StormEventScreenCandidate