@kapeta/local-cluster-service 0.55.1 → 0.55.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.55.3](https://github.com/kapetacom/local-cluster-service/compare/v0.55.2...v0.55.3) (2024-07-12)
+
+
+### Bug Fixes
+
+* ensure versions on predefined blocks are the latest ([0a841bc](https://github.com/kapetacom/local-cluster-service/commit/0a841bc221cfac09cac41992a06385be1da24197))
+
+## [0.55.2](https://github.com/kapetacom/local-cluster-service/compare/v0.55.1...v0.55.2) (2024-07-12)
+
+
+### Bug Fixes
+
+* recurring create-block events will not overwrite types, apis or models ([f07b2da](https://github.com/kapetacom/local-cluster-service/commit/f07b2da0e0fc286e3eb06af2efcd1746808f2ba9))
+
 ## [0.55.1](https://github.com/kapetacom/local-cluster-service/compare/v0.55.0...v0.55.1) (2024-07-12)
 
 

package/definitions.d.ts

@@ -47,4 +47,4 @@ declare module 'download-git-repo' {
     ): void;
 
     export = download;
-}
+}

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

@@ -39,6 +39,7 @@ export interface StormOptions {
     desktopKind: string;
     desktopLanguage: string;
     gatewayKind: string;
+    [key: string]: string;
 }
 export declare function createPhaseStartEvent(type: StormEventPhaseType): StormEventPhases;
 export declare function createPhaseEndEvent(type: StormEventPhaseType): StormEventPhases;
@@ -66,7 +67,7 @@ export declare class StormEventParser {
     getEvents(): StormEvent[];
     isValid(): boolean;
     getError(): string;
-    toResult(handle: string): Promise<StormDefinitions>;
+    toResult(handle: string, warn?: boolean): Promise<StormDefinitions>;
     toBlockDefinitions(handle: string): Promise<{
         [key: string]: BlockDefinitionInfo;
     }>;

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

@@ -170,11 +170,14 @@ class StormEventParser {
                 this.planDescription = evt.payload.description;
                 break;
             case 'CREATE_BLOCK':
+                const apis = this.blocks[evt.payload.name]?.apis;
+                const models = this.blocks[evt.payload.name]?.models;
+                const types = this.blocks[evt.payload.name]?.types;
                 this.blocks[evt.payload.name] = {
                     ...evt.payload,
-                    apis: [],
-                    models: [],
-                    types: [],
+                    apis: apis ?? [],
+                    models: models ?? [],
+                    types: types ?? [],
                 };
                 evt.payload.blockRef = StormEventParser.toRef(handle, evt.payload.name).toNormalizedString();
                 evt.payload.instanceId = StormEventParser.toInstanceIdFromRef(evt.payload.blockRef);
@@ -241,7 +244,7 @@ class StormEventParser {
     getError() {
         return this.error;
     }
-    async toResult(handle) {
+    async toResult(handle, warn = false) {
         const planRef = StormEventParser.toRef(handle, this.planName || 'undefined');
         const blockDefinitions = await this.toBlockDefinitions(handle);
         const refIdMap = {};
@@ -281,7 +284,9 @@ class StormEventParser {
             }
             const apiResource = apiProviderBlock.content.spec.providers?.find((p) => p.kind === this.options.apiKind && p.metadata.name === apiConnection.fromResource);
             if (!apiResource) {
-                console.warn('API resource not found: %s on %s', apiConnection.fromResource, apiProviderRef.toNormalizedString(), apiConnection);
+                if (warn) {
+                    console.warn('API resource not found: %s on %s', apiConnection.fromResource, apiProviderRef.toNormalizedString(), apiConnection);
+                }
                 return;
             }
             const clientResource = clientConsumerBlock.content.spec.consumers?.find((clientResource) => {
@@ -292,7 +297,9 @@ class StormEventParser {
                 return clientResource.metadata.name === apiConnection.toResource;
             });
             if (!clientResource) {
-                console.warn('Client resource not found: %s on %s', apiConnection.toResource, clientConsumerRef.toNormalizedString(), apiConnection);
+                if (warn) {
+                    console.warn('Client resource not found: %s on %s', apiConnection.toResource, clientConsumerRef.toNormalizedString(), apiConnection);
+                }
                 return;
             }
             if (apiProviderBlock.content.spec.entities?.source?.value) {
@@ -337,7 +344,7 @@ class StormEventParser {
                     blockId: refIdMap[fromRef.toNormalizedString()],
                     resourceName: connection.fromResource,
                 },
-                mapping: this.toConnectionMapping(handle, connection, blockDefinitions),
+                mapping: this.toConnectionMapping(handle, connection, blockDefinitions, warn),
             };
         });
         const plan = {
@@ -365,7 +372,7 @@ class StormEventParser {
             const blockRef = StormEventParser.toRef(handle, blockInfo.name);
             let blockDefinitionInfo;
             if (blockInfo.archetype) {
-                blockDefinitionInfo = await this.resolveArchetypeBlockDefinition(blockRef, blockInfo);
+                blockDefinitionInfo = await this.resolveArchetypeBlockDefinition(blockRef, blockInfo, handle);
             }
             else {
                 blockDefinitionInfo = this.createBlockDefinitionInfo(blockRef, blockInfo, handle);
@@ -530,7 +537,7 @@ class StormEventParser {
                     firstEntry.spec.source.value += api + '\n\n';
                 }
                 else {
-                    console.warn('Unable to find resource for API', api);
+                    // this might be ok as we might receive api and types before resources from the ai-service
                 }
             }
         });
@@ -593,7 +600,7 @@ class StormEventParser {
         }
         return '';
     }
-    toConnectionMapping(handle, connection, blockDefinitions) {
+    toConnectionMapping(handle, connection, blockDefinitions, warn) {
         if (connection.fromResourceType !== 'API') {
             return;
         }
@@ -605,7 +612,9 @@ class StormEventParser {
         }
         const apiResource = apiProviderBlock.content.spec.providers?.find((p) => p.kind === this.options.apiKind && p.metadata.name === connection.fromResource);
         if (!apiResource) {
-            console.warn('API resource not found: %s on %s', connection.fromResource, fromRef.toNormalizedString(), connection);
+            if (warn) {
+                console.warn('API resource not found: %s on %s', connection.fromResource, fromRef.toNormalizedString(), connection);
+            }
             return;
         }
         const apiMethods = kaplang_core_1.DSLConverters.toSchemaMethods(kaplang_core_1.DSLAPIParser.parse(apiResource.spec?.source?.value ?? '', {
@@ -678,14 +687,36 @@ class StormEventParser {
         }
         return undefined;
     }
-    async resolveArchetypeBlockDefinition(blockRef, blockInfo) {
+    async resolveArchetypeBlockDefinition(blockRef, blockInfo, handle) {
         const predefinedBlock = predefined_1.PREDEFINED_BLOCKS.get(blockInfo.archetype);
         if (!predefinedBlock) {
             throw new Error('Predefined block not found for archetype [' + blockInfo.archetype + ']');
         }
+        const target = this.toBlockTarget(handle, blockInfo.type);
         const blockDefinition = await predefinedBlock.getBlockDefinition();
         lodash_1.default.set(blockDefinition, ['metadata', 'name'], blockRef.fullName);
         lodash_1.default.set(blockDefinition, ['metadata', 'title'], blockRef.name);
+        lodash_1.default.set(blockDefinition, ['spec', 'target', 'options'], target?.options);
+        const options = this.options;
+        function getKind(kind) {
+            for (const prop in options) {
+                if (options.hasOwnProperty(prop)) {
+                    const value = options[prop];
+                    if (value.startsWith(kind)) {
+                        return value;
+                    }
+                }
+            }
+        }
+        blockDefinition.kind = getKind((0, nodejs_utils_1.parseKapetaUri)(blockDefinition.kind).fullName) ?? blockDefinition.kind;
+        for (const provider of blockDefinition.spec.providers ?? []) {
+            provider.kind = getKind((0, nodejs_utils_1.parseKapetaUri)(provider.kind).fullName) ?? provider.kind;
+        }
+        for (const consumer of blockDefinition.spec.consumers ?? []) {
+            consumer.kind = getKind((0, nodejs_utils_1.parseKapetaUri)(consumer.kind).fullName) ?? consumer.kind;
+        }
+        blockDefinition.spec.target.kind =
+            getKind((0, nodejs_utils_1.parseKapetaUri)(blockDefinition.spec.target.kind).fullName) ?? blockDefinition.spec.target.kind;
         return {
             uri: blockRef.toNormalizedString(),
             aiName: blockInfo.name,

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

@@ -82,7 +82,7 @@ router.post('/:handle/all', async (req, res) => {
             res.end();
             return;
         }
-        const result = await eventParser.toResult(handle);
+        const result = await eventParser.toResult(handle, true);
         if (metaStream.isAborted()) {
             return;
         }