@kapeta/local-cluster-service 0.54.4 → 0.54.6

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [0.54.6](https://github.com/kapetacom/local-cluster-service/compare/v0.54.5...v0.54.6) (2024-06-21)
+
+
+### Bug Fixes
+
+* dont run codegen after moving block to dest folder ([#186](https://github.com/kapetacom/local-cluster-service/issues/186)) ([f0f4a36](https://github.com/kapetacom/local-cluster-service/commit/f0f4a363c32c20074fbf9aa333f87ceada4a81a2))
+
+## [0.54.5](https://github.com/kapetacom/local-cluster-service/compare/v0.54.4...v0.54.5) (2024-06-21)
+
+
+### Bug Fixes
+
+* enable filesToBeFixed inclusion list in codefix ([4eaf272](https://github.com/kapetacom/local-cluster-service/commit/4eaf2720bc49b5709c170f88a85614b1a1a8bb8b))
+* forward FILE_FAILED events from streams ([fc22b68](https://github.com/kapetacom/local-cluster-service/commit/fc22b68e129546166c117ea5d13efeebf4bd9d72))
+
 ## [0.54.4](https://github.com/kapetacom/local-cluster-service/compare/v0.54.3...v0.54.4) (2024-06-20)
 
 

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

@@ -195,6 +195,17 @@ class StormCodegen {
                     },
                 });
                 return true;
+            case 'FILE_FAILED':
+                this.out.emit('data', {
+                    ...data,
+                    payload: {
+                        ...data.payload,
+                        path: (0, path_2.join)(basePath, data.payload.filename),
+                        blockName,
+                        blockRef,
+                        instanceId,
+                    },
+                });
         }
         return false;
     }
@@ -428,8 +439,9 @@ class StormCodegen {
                     if (errors.size > 0) {
                         this.emitBlockStatus(blockUri, blockName, events_1.StormEventBlockStatusType.FIXING);
                         const promises = Array.from(errors.entries()).map(([filename, fileErrors]) => {
-                            // todo: only try to fix file if it is part of filesToBeFixed
-                            return this.tryToFixFile(blockUri, blockName, basePath, filename, fileErrors, allFiles, codeGenerator);
+                            if (filesToBeFixed.some((file) => file.filename === filename)) {
+                                return this.tryToFixFile(blockUri, blockName, basePath, filename, fileErrors, allFiles, codeGenerator);
+                            }
                         });
                         await Promise.all(promises);
                     }

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

@@ -200,6 +200,12 @@ export interface StormEventFileDone extends StormEventFileBase {
         content: string;
     };
 }
+export interface StormEventFileFailed extends StormEventFileBase {
+    type: 'FILE_FAILED';
+    payload: StormEventFileBasePayload & {
+        error: string;
+    };
+}
 export interface StormEventFileChunk extends StormEventFileBase {
     type: 'FILE_CHUNK';
     payload: StormEventFileBasePayload & {
@@ -259,4 +265,4 @@ export interface StormEventPhases {
         phaseType: StormEventPhaseType;
     };
 }
-export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFileLogical | StormEventFileState | StormEventFileDone | StormEventFileChunk | StormEventDone | StormEventDefinitionChange | StormEventErrorClassifier | StormEventCodeFix | StormEventErrorDetails | StormEventBlockReady | StormEventPhases | StormEventBlockStatus | StormEventCreateDSLRetry;
+export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFileLogical | StormEventFileState | StormEventFileDone | StormEventFileFailed | StormEventFileChunk | StormEventDone | StormEventDefinitionChange | StormEventErrorClassifier | StormEventCodeFix | StormEventErrorDetails | StormEventBlockReady | StormEventPhases | StormEventBlockStatus | StormEventCreateDSLRetry;

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

@@ -117,7 +117,9 @@ router.post('/block/create', async (req, res) => {
                 overwrite: true,
             });
         }
-        const [asset] = await assetManager_1.assetManager.createAsset(ymlPath, createRequest.definition);
+        // Create asset without running codegen if the asset already exists
+        const shouldCodegen = !isExisting;
+        const [asset] = await assetManager_1.assetManager.createAsset(ymlPath, createRequest.definition, 'user', shouldCodegen);
         res.send(asset);
     }
     catch (err) {

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

@@ -195,6 +195,17 @@ class StormCodegen {
                     },
                 });
                 return true;
+            case 'FILE_FAILED':
+                this.out.emit('data', {
+                    ...data,
+                    payload: {
+                        ...data.payload,
+                        path: (0, path_2.join)(basePath, data.payload.filename),
+                        blockName,
+                        blockRef,
+                        instanceId,
+                    },
+                });
         }
         return false;
     }
@@ -428,8 +439,9 @@ class StormCodegen {
                     if (errors.size > 0) {
                         this.emitBlockStatus(blockUri, blockName, events_1.StormEventBlockStatusType.FIXING);
                         const promises = Array.from(errors.entries()).map(([filename, fileErrors]) => {
-                            // todo: only try to fix file if it is part of filesToBeFixed
-                            return this.tryToFixFile(blockUri, blockName, basePath, filename, fileErrors, allFiles, codeGenerator);
+                            if (filesToBeFixed.some((file) => file.filename === filename)) {
+                                return this.tryToFixFile(blockUri, blockName, basePath, filename, fileErrors, allFiles, codeGenerator);
+                            }
                         });
                         await Promise.all(promises);
                     }

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

@@ -200,6 +200,12 @@ export interface StormEventFileDone extends StormEventFileBase {
         content: string;
     };
 }
+export interface StormEventFileFailed extends StormEventFileBase {
+    type: 'FILE_FAILED';
+    payload: StormEventFileBasePayload & {
+        error: string;
+    };
+}
 export interface StormEventFileChunk extends StormEventFileBase {
     type: 'FILE_CHUNK';
     payload: StormEventFileBasePayload & {
@@ -259,4 +265,4 @@ export interface StormEventPhases {
         phaseType: StormEventPhaseType;
     };
 }
-export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFileLogical | StormEventFileState | StormEventFileDone | StormEventFileChunk | StormEventDone | StormEventDefinitionChange | StormEventErrorClassifier | StormEventCodeFix | StormEventErrorDetails | StormEventBlockReady | StormEventPhases | StormEventBlockStatus | StormEventCreateDSLRetry;
+export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFileLogical | StormEventFileState | StormEventFileDone | StormEventFileFailed | StormEventFileChunk | StormEventDone | StormEventDefinitionChange | StormEventErrorClassifier | StormEventCodeFix | StormEventErrorDetails | StormEventBlockReady | StormEventPhases | StormEventBlockStatus | StormEventCreateDSLRetry;

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

@@ -117,7 +117,9 @@ router.post('/block/create', async (req, res) => {
                 overwrite: true,
             });
         }
-        const [asset] = await assetManager_1.assetManager.createAsset(ymlPath, createRequest.definition);
+        // Create asset without running codegen if the asset already exists
+        const shouldCodegen = !isExisting;
+        const [asset] = await assetManager_1.assetManager.createAsset(ymlPath, createRequest.definition, 'user', shouldCodegen);
         res.send(asset);
     }
     catch (err) {

package/package.json

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

package/src/storm/codegen.ts

@@ -217,6 +217,17 @@ export class StormCodegen {
                     },
                 });
                 return true;
+            case 'FILE_FAILED':
+                this.out.emit('data', {
+                    ...data,
+                    payload: {
+                        ...data.payload,
+                        path: join(basePath, data.payload.filename),
+                        blockName,
+                        blockRef,
+                        instanceId,
+                    },
+                });
         }
 
         return false;
@@ -524,16 +535,17 @@ export class StormCodegen {
                         this.emitBlockStatus(blockUri, blockName, StormEventBlockStatusType.FIXING);
 
                         const promises = Array.from(errors.entries()).map(([filename, fileErrors]) => {
-                            // todo: only try to fix file if it is part of filesToBeFixed
-                            return this.tryToFixFile(
-                                blockUri,
-                                blockName,
-                                basePath,
-                                filename,
-                                fileErrors,
-                                allFiles,
-                                codeGenerator
-                            );
+                            if (filesToBeFixed.some((file) => file.filename === filename)) {
+                                return this.tryToFixFile(
+                                    blockUri,
+                                    blockName,
+                                    basePath,
+                                    filename,
+                                    fileErrors,
+                                    allFiles,
+                                    codeGenerator
+                                );
+                            }
                         });
 
                         await Promise.all(promises);

package/src/storm/events.ts

@@ -241,6 +241,13 @@ export interface StormEventFileDone extends StormEventFileBase {
     };
 }
 
+export interface StormEventFileFailed extends StormEventFileBase {
+    type: 'FILE_FAILED';
+    payload: StormEventFileBasePayload & {
+        error: string;
+    };
+}
+
 export interface StormEventFileChunk extends StormEventFileBase {
     type: 'FILE_CHUNK';
     payload: StormEventFileBasePayload & {
@@ -322,6 +329,7 @@ export type StormEvent =
     | StormEventFileLogical
     | StormEventFileState
     | StormEventFileDone
+    | StormEventFileFailed
     | StormEventFileChunk
     | StormEventDone
     | StormEventDefinitionChange

package/src/storm/routes.ts

@@ -153,7 +153,9 @@ router.post('/block/create', async (req: KapetaBodyRequest, res: Response) => {
                 overwrite: true,
             });
         }
-        const [asset] = await assetManager.createAsset(ymlPath, createRequest.definition);
+        // Create asset without running codegen if the asset already exists
+        const shouldCodegen = !isExisting;
+        const [asset] = await assetManager.createAsset(ymlPath, createRequest.definition, 'user', shouldCodegen);
         res.send(asset);
     } catch (err: any) {
         res.status(500).send({ error: err.message });