@kapeta/local-cluster-service 0.56.0 → 0.56.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.56.2](https://github.com/kapetacom/local-cluster-service/compare/v0.56.1...v0.56.2) (2024-07-19)
+
+
+### Bug Fixes
+
+* missing pural on MODEL RETRY ([ca33bdd](https://github.com/kapetacom/local-cluster-service/commit/ca33bdd5e47b0c601d19ddf4149de5e925aa0040))
+
+## [0.56.1](https://github.com/kapetacom/local-cluster-service/compare/v0.56.0...v0.56.1) (2024-07-17)
+
+
+### Bug Fixes
+
+* fix way of checking for kind ([495fdfa](https://github.com/kapetacom/local-cluster-service/commit/495fdfa13267bdd425e2486ec02f0a9922eca4ab))
+
 # [0.56.0](https://github.com/kapetacom/local-cluster-service/compare/v0.55.3...v0.56.0) (2024-07-15)
 
 

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

@@ -263,11 +263,14 @@ class StormCodegen {
         }
         const kapetaYaml = yaml_1.default.stringify(block.content);
         const blockDefinition = block.content;
+        const basePath = this.getBasePath(blockDefinition.metadata.name);
         // Generate the code for the block using the standard codegen templates
         const generatedResult = await this.generateBlock(blockDefinition);
         if (!generatedResult) {
             return;
         }
+        const kapetaYmlPath = (0, path_2.join)(basePath, 'kapeta.yml');
+        await (0, promises_1.writeFile)(kapetaYmlPath, kapetaYaml);
         const allFiles = this.toStormFiles(generatedResult);
         // Send all the non-ai files to the stream
         await this.emitStaticFiles((0, nodejs_utils_1.parseKapetaUri)(block.uri), block.aiName, allFiles);
@@ -357,7 +360,6 @@ class StormCodegen {
         if (this.isAborted()) {
             return;
         }
-        const basePath = this.getBasePath(blockDefinition.metadata.name);
         const screenFilesConverted = screenFiles.map((screenFile) => {
             return {
                 filename: screenFile.payload.filename,
@@ -397,8 +399,6 @@ class StormCodegen {
             const filePath = (0, path_2.join)(basePath, webRouterFile.filename);
             await (0, promises_1.writeFile)(filePath, webRouterFile.content);
         }
-        const kapetaYmlPath = (0, path_2.join)(basePath, 'kapeta.yml');
-        await (0, promises_1.writeFile)(kapetaYmlPath, kapetaYaml);
         const blockRef = block.uri;
         this.emitBlockStatus(blockUri, block.aiName, events_1.StormEventBlockStatusType.QA);
         /* TODO: temporarily disabled - enable again when codegen is more stable

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

@@ -224,7 +224,7 @@ class StormEventParser {
                     block.apis = [];
                 });
                 break;
-            case 'MODEL_RETRY':
+            case 'MODELS_RETRY':
                 Object.values(this.blocks).forEach((block) => {
                     block.models = [];
                 });
@@ -282,7 +282,11 @@ class StormEventParser {
                 console.warn('Client consumer not found: %s', apiConnection.toComponent, apiConnection);
                 return;
             }
-            const apiResource = apiProviderBlock.content.spec.providers?.find((p) => p.kind === this.options.apiKind && p.metadata.name === apiConnection.fromResource);
+            const apiResource = apiProviderBlock.content.spec.providers?.find((p) => {
+                const pKind = (0, nodejs_utils_1.normalizeKapetaUri)(p.kind);
+                const apiKind = (0, nodejs_utils_1.normalizeKapetaUri)(this.options.apiKind);
+                return pKind === apiKind && p.metadata.name === apiConnection.fromResource;
+            });
             if (!apiResource) {
                 if (warn) {
                     console.warn('API resource not found: %s on %s', apiConnection.fromResource, apiProviderRef.toNormalizedString(), apiConnection);
@@ -610,7 +614,11 @@ class StormEventParser {
             console.warn('Provider block not found: %s', connection.fromComponent, connection);
             return;
         }
-        const apiResource = apiProviderBlock.content.spec.providers?.find((p) => p.kind === this.options.apiKind && p.metadata.name === connection.fromResource);
+        const apiResource = apiProviderBlock.content.spec.providers?.find((p) => {
+            const pKind = (0, nodejs_utils_1.normalizeKapetaUri)(p.kind);
+            const apiKind = (0, nodejs_utils_1.normalizeKapetaUri)(this.options.apiKind);
+            return pKind === apiKind && p.metadata.name === connection.fromResource;
+        });
         if (!apiResource) {
             if (warn) {
                 console.warn('API resource not found: %s on %s', connection.fromResource, fromRef.toNormalizedString(), connection);

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

@@ -94,7 +94,7 @@ export interface StormEventCreateDSLResource extends Omit<StormEventCreateDSL, '
     };
 }
 export interface StormEventCreateDSLRetry {
-    type: 'API_RETRY' | 'MODEL_RETRY';
+    type: 'API_RETRY' | 'MODELS_RETRY';
     reason: string;
     created: number;
     payload: {

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

@@ -263,11 +263,14 @@ class StormCodegen {
         }
         const kapetaYaml = yaml_1.default.stringify(block.content);
         const blockDefinition = block.content;
+        const basePath = this.getBasePath(blockDefinition.metadata.name);
         // Generate the code for the block using the standard codegen templates
         const generatedResult = await this.generateBlock(blockDefinition);
         if (!generatedResult) {
             return;
         }
+        const kapetaYmlPath = (0, path_2.join)(basePath, 'kapeta.yml');
+        await (0, promises_1.writeFile)(kapetaYmlPath, kapetaYaml);
         const allFiles = this.toStormFiles(generatedResult);
         // Send all the non-ai files to the stream
         await this.emitStaticFiles((0, nodejs_utils_1.parseKapetaUri)(block.uri), block.aiName, allFiles);
@@ -357,7 +360,6 @@ class StormCodegen {
         if (this.isAborted()) {
             return;
         }
-        const basePath = this.getBasePath(blockDefinition.metadata.name);
         const screenFilesConverted = screenFiles.map((screenFile) => {
             return {
                 filename: screenFile.payload.filename,
@@ -397,8 +399,6 @@ class StormCodegen {
             const filePath = (0, path_2.join)(basePath, webRouterFile.filename);
             await (0, promises_1.writeFile)(filePath, webRouterFile.content);
         }
-        const kapetaYmlPath = (0, path_2.join)(basePath, 'kapeta.yml');
-        await (0, promises_1.writeFile)(kapetaYmlPath, kapetaYaml);
         const blockRef = block.uri;
         this.emitBlockStatus(blockUri, block.aiName, events_1.StormEventBlockStatusType.QA);
         /* TODO: temporarily disabled - enable again when codegen is more stable

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

@@ -224,7 +224,7 @@ class StormEventParser {
                     block.apis = [];
                 });
                 break;
-            case 'MODEL_RETRY':
+            case 'MODELS_RETRY':
                 Object.values(this.blocks).forEach((block) => {
                     block.models = [];
                 });
@@ -282,7 +282,11 @@ class StormEventParser {
                 console.warn('Client consumer not found: %s', apiConnection.toComponent, apiConnection);
                 return;
             }
-            const apiResource = apiProviderBlock.content.spec.providers?.find((p) => p.kind === this.options.apiKind && p.metadata.name === apiConnection.fromResource);
+            const apiResource = apiProviderBlock.content.spec.providers?.find((p) => {
+                const pKind = (0, nodejs_utils_1.normalizeKapetaUri)(p.kind);
+                const apiKind = (0, nodejs_utils_1.normalizeKapetaUri)(this.options.apiKind);
+                return pKind === apiKind && p.metadata.name === apiConnection.fromResource;
+            });
             if (!apiResource) {
                 if (warn) {
                     console.warn('API resource not found: %s on %s', apiConnection.fromResource, apiProviderRef.toNormalizedString(), apiConnection);
@@ -610,7 +614,11 @@ class StormEventParser {
             console.warn('Provider block not found: %s', connection.fromComponent, connection);
             return;
         }
-        const apiResource = apiProviderBlock.content.spec.providers?.find((p) => p.kind === this.options.apiKind && p.metadata.name === connection.fromResource);
+        const apiResource = apiProviderBlock.content.spec.providers?.find((p) => {
+            const pKind = (0, nodejs_utils_1.normalizeKapetaUri)(p.kind);
+            const apiKind = (0, nodejs_utils_1.normalizeKapetaUri)(this.options.apiKind);
+            return pKind === apiKind && p.metadata.name === connection.fromResource;
+        });
         if (!apiResource) {
             if (warn) {
                 console.warn('API resource not found: %s on %s', connection.fromResource, fromRef.toNormalizedString(), connection);

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

@@ -94,7 +94,7 @@ export interface StormEventCreateDSLResource extends Omit<StormEventCreateDSL, '
     };
 }
 export interface StormEventCreateDSLRetry {
-    type: 'API_RETRY' | 'MODEL_RETRY';
+    type: 'API_RETRY' | 'MODELS_RETRY';
     reason: string;
     created: number;
     payload: {

package/package.json

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

package/src/storm/codegen.ts

@@ -299,6 +299,7 @@ export class StormCodegen {
 
         const kapetaYaml = YAML.stringify(block.content);
         const blockDefinition = block.content;
+        const basePath = this.getBasePath(blockDefinition.metadata.name);
 
         // Generate the code for the block using the standard codegen templates
         const generatedResult = await this.generateBlock(blockDefinition);
@@ -306,6 +307,9 @@ export class StormCodegen {
             return;
         }
 
+        const kapetaYmlPath = join(basePath, 'kapeta.yml');
+        await writeFile(kapetaYmlPath, kapetaYaml);
+
         const allFiles = this.toStormFiles(generatedResult);
 
         // Send all the non-ai files to the stream
@@ -421,7 +425,6 @@ export class StormCodegen {
         if (this.isAborted()) {
             return;
         }
-        const basePath = this.getBasePath(blockDefinition.metadata.name);
 
         const screenFilesConverted = screenFiles.map((screenFile) => {
             return {
@@ -485,8 +488,6 @@ export class StormCodegen {
             await writeFile(filePath, webRouterFile.content);
         }
 
-        const kapetaYmlPath = join(basePath, 'kapeta.yml');
-        await writeFile(kapetaYmlPath, kapetaYaml);
 
         const blockRef = block.uri;
 

package/src/storm/event-parser.ts

@@ -340,7 +340,7 @@ export class StormEventParser {
                     block.apis = [];
                 });
                 break;
-            case 'MODEL_RETRY':
+            case 'MODELS_RETRY':
                 Object.values(this.blocks).forEach((block) => {
                     block.models = [];
                 });
@@ -406,7 +406,11 @@ export class StormEventParser {
                 }
 
                 const apiResource = apiProviderBlock.content.spec.providers?.find(
-                    (p) => p.kind === this.options.apiKind && p.metadata.name === apiConnection.fromResource
+                    (p) => {
+                        const pKind = normalizeKapetaUri(p.kind);
+                        const apiKind = normalizeKapetaUri(this.options.apiKind);
+                        return pKind === apiKind && p.metadata.name === apiConnection.fromResource
+                    }
                 );
 
                 if (!apiResource) {
@@ -791,8 +795,12 @@ export class StormEventParser {
         }
 
         const apiResource = apiProviderBlock.content.spec.providers?.find(
-            (p) => p.kind === this.options.apiKind && p.metadata.name === connection.fromResource
-        );
+            (p) => {
+                const pKind = normalizeKapetaUri(p.kind);
+                const apiKind = normalizeKapetaUri(this.options.apiKind);
+                return pKind === apiKind && p.metadata.name === connection.fromResource
+            }
+            );
 
         if (!apiResource) {
             if (warn) {

package/src/storm/events.ts

@@ -120,7 +120,7 @@ export interface StormEventCreateDSLResource extends Omit<StormEventCreateDSL, '
 }
 
 export interface StormEventCreateDSLRetry {
-    type: 'API_RETRY' | 'MODEL_RETRY';
+    type: 'API_RETRY' | 'MODELS_RETRY';
     reason: string;
     created: number;
     payload: {