@kapeta/local-cluster-service 0.24.1 → 0.24.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.24.3](https://github.com/kapetacom/local-cluster-service/compare/v0.24.2...v0.24.3) (2023-10-28)
+
+
+### Bug Fixes
+
+* Handle renaming of local assets ([#92](https://github.com/kapetacom/local-cluster-service/issues/92)) ([2a8d278](https://github.com/kapetacom/local-cluster-service/commit/2a8d2785ae45f548333d6a177ed6b6096fa39c3c))
+
+## [0.24.2](https://github.com/kapetacom/local-cluster-service/compare/v0.24.1...v0.24.2) (2023-10-27)
+
+
+### Bug Fixes
+
+* Do not ensure when unregistering ([#91](https://github.com/kapetacom/local-cluster-service/issues/91)) ([3957d51](https://github.com/kapetacom/local-cluster-service/commit/3957d513ce3fd9064a36cea438967ae5a0a50720))
+
 ## [0.24.1](https://github.com/kapetacom/local-cluster-service/compare/v0.24.0...v0.24.1) (2023-10-27)
 
 

package/dist/cjs/src/RepositoryWatcher.d.ts

@@ -16,6 +16,7 @@ export declare class RepositoryWatcher extends EventEmitter {
     unwatch(): Promise<void>;
     private getAssetIdentity;
     private handleFileChange;
+    private getRepositoryPath;
     private checkForChange;
     private exists;
     private removeSymlinkTarget;

package/dist/cjs/src/RepositoryWatcher.js

@@ -14,6 +14,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const socketManager_1 = require("./socketManager");
 const cacheManager_1 = require("./cacheManager");
 const node_events_1 = require("node:events");
+const assetManager_1 = require("./assetManager");
 const KAPETA_YML_RX = /^kapeta.ya?ml$/;
 class RepositoryWatcher extends node_events_1.EventEmitter {
     watcher;
@@ -134,11 +135,11 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
         if (!path) {
             return;
         }
-        const assetIdentity = await this.getAssetIdentity(path);
-        if (!assetIdentity) {
+        if (this.disabled) {
             return;
         }
-        if (this.disabled) {
+        const assetIdentity = await this.getAssetIdentity(path);
+        if (!assetIdentity) {
             return;
         }
         // If this is false it's because we're watching a symlink target
@@ -156,13 +157,31 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
                 await this.updateSymlinkTarget(path);
             }
         }
+        const repoPath = this.getRepositoryPath(assetIdentity);
+        if (eventName === 'change' &&
+            !withinRepo &&
+            assetIdentity.version === 'local' &&
+            node_path_1.default.basename(path) === 'kapeta.yml' &&
+            (await this.exists(path)) &&
+            !(await this.exists(repoPath))) {
+            // This happens when a local asset is renamed
+            const oldPath = lodash_1.default.findKey(this.symbolicLinks, (link) => link === path);
+            if (oldPath) {
+                await fs_extra_1.default.unlink(oldPath);
+                await assetManager_1.assetManager.importFile(path);
+                return;
+            }
+        }
         const sourceOfChange = this.sourceOfChange.get(path) ?? 'filesystem';
         await this.checkForChange(assetIdentity, sourceOfChange);
         // We consume the sourceOfChange when the file is changed
         this.sourceOfChange.delete(path);
     }
+    getRepositoryPath(assetIdentity) {
+        return node_path_1.default.join(this.baseDir, assetIdentity.handle, assetIdentity.name, assetIdentity.version);
+    }
     async checkForChange(assetIdentity, sourceOfChange) {
-        const ymlPath = node_path_1.default.join(this.baseDir, assetIdentity.handle, assetIdentity.name, assetIdentity.version, 'kapeta.yml');
+        const ymlPath = node_path_1.default.join(this.getRepositoryPath(assetIdentity), 'kapeta.yml');
         const newDefinitions = local_cluster_config_1.default.getDefinitions();
         const newDefinition = newDefinitions.find((d) => d.ymlPath === ymlPath);
         let currentDefinition = this.allDefinitions.find((d) => d.ymlPath === ymlPath);
@@ -187,7 +206,6 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
         }
         else {
             if (currentDefinition) {
-                const ref = (0, nodejs_utils_1.parseKapetaUri)(`${currentDefinition.definition.metadata.name}:${currentDefinition.version}`).id;
                 //Something was removed
                 type = 'removed';
             }

package/dist/cjs/src/assetManager.d.ts

@@ -23,7 +23,7 @@ declare class AssetManager {
     getBlockInstance(systemId: string, instanceId: string): Promise<BlockInstance>;
     getAsset(ref: string, noCache?: boolean, autoFetch?: boolean): Promise<EnrichedAsset | undefined>;
     createAsset(path: string, yaml: BlockDefinition, sourceOfChange?: SourceOfChange): Promise<EnrichedAsset[]>;
-    updateAsset(ref: string, yaml: BlockDefinition, sourceOfChange?: SourceOfChange): Promise<void>;
+    updateAsset(ref: string, yaml: Definition, sourceOfChange?: SourceOfChange): Promise<void>;
     importFile(filePath: string): Promise<EnrichedAsset[]>;
     unregisterAsset(ref: string): Promise<void>;
     installAsset(ref: string, wait?: boolean): Promise<import("./taskManager").Task<void>[] | undefined>;

package/dist/cjs/src/assetManager.js

@@ -166,7 +166,7 @@ class AssetManager {
         return assets.filter((a) => refs.some((ref) => compareRefs(ref, a.ref)));
     }
     async unregisterAsset(ref) {
-        const asset = await this.getAsset(ref, true);
+        const asset = await this.getAsset(ref, true, false);
         if (!asset) {
             throw new Error('Asset does not exists: ' + ref);
         }

package/dist/cjs/src/codeGeneratorManager.d.ts

@@ -1,10 +1,10 @@
-import { BlockDefinition } from '@kapeta/schemas';
+import { Definition } from '@kapeta/local-cluster-config';
 declare class CodeGeneratorManager {
     private ensureLanguageTargetInRegistry;
     reload(): Promise<void>;
     initialize(): Promise<void>;
-    canGenerateCode(yamlContent: BlockDefinition): Promise<boolean>;
-    generate(yamlFile: string, yamlContent: BlockDefinition): Promise<void>;
+    canGenerateCode(yamlContent: Definition): Promise<boolean>;
+    generate(yamlFile: string, yamlContent: Definition): Promise<void>;
 }
 export declare const codeGeneratorManager: CodeGeneratorManager;
 export {};

package/dist/esm/src/RepositoryWatcher.d.ts

@@ -16,6 +16,7 @@ export declare class RepositoryWatcher extends EventEmitter {
     unwatch(): Promise<void>;
     private getAssetIdentity;
     private handleFileChange;
+    private getRepositoryPath;
     private checkForChange;
     private exists;
     private removeSymlinkTarget;

package/dist/esm/src/RepositoryWatcher.js

@@ -14,6 +14,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const socketManager_1 = require("./socketManager");
 const cacheManager_1 = require("./cacheManager");
 const node_events_1 = require("node:events");
+const assetManager_1 = require("./assetManager");
 const KAPETA_YML_RX = /^kapeta.ya?ml$/;
 class RepositoryWatcher extends node_events_1.EventEmitter {
     watcher;
@@ -134,11 +135,11 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
         if (!path) {
             return;
         }
-        const assetIdentity = await this.getAssetIdentity(path);
-        if (!assetIdentity) {
+        if (this.disabled) {
             return;
         }
-        if (this.disabled) {
+        const assetIdentity = await this.getAssetIdentity(path);
+        if (!assetIdentity) {
             return;
         }
         // If this is false it's because we're watching a symlink target
@@ -156,13 +157,31 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
                 await this.updateSymlinkTarget(path);
             }
         }
+        const repoPath = this.getRepositoryPath(assetIdentity);
+        if (eventName === 'change' &&
+            !withinRepo &&
+            assetIdentity.version === 'local' &&
+            node_path_1.default.basename(path) === 'kapeta.yml' &&
+            (await this.exists(path)) &&
+            !(await this.exists(repoPath))) {
+            // This happens when a local asset is renamed
+            const oldPath = lodash_1.default.findKey(this.symbolicLinks, (link) => link === path);
+            if (oldPath) {
+                await fs_extra_1.default.unlink(oldPath);
+                await assetManager_1.assetManager.importFile(path);
+                return;
+            }
+        }
         const sourceOfChange = this.sourceOfChange.get(path) ?? 'filesystem';
         await this.checkForChange(assetIdentity, sourceOfChange);
         // We consume the sourceOfChange when the file is changed
         this.sourceOfChange.delete(path);
     }
+    getRepositoryPath(assetIdentity) {
+        return node_path_1.default.join(this.baseDir, assetIdentity.handle, assetIdentity.name, assetIdentity.version);
+    }
     async checkForChange(assetIdentity, sourceOfChange) {
-        const ymlPath = node_path_1.default.join(this.baseDir, assetIdentity.handle, assetIdentity.name, assetIdentity.version, 'kapeta.yml');
+        const ymlPath = node_path_1.default.join(this.getRepositoryPath(assetIdentity), 'kapeta.yml');
         const newDefinitions = local_cluster_config_1.default.getDefinitions();
         const newDefinition = newDefinitions.find((d) => d.ymlPath === ymlPath);
         let currentDefinition = this.allDefinitions.find((d) => d.ymlPath === ymlPath);
@@ -187,7 +206,6 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
         }
         else {
             if (currentDefinition) {
-                const ref = (0, nodejs_utils_1.parseKapetaUri)(`${currentDefinition.definition.metadata.name}:${currentDefinition.version}`).id;
                 //Something was removed
                 type = 'removed';
             }

package/dist/esm/src/assetManager.d.ts

@@ -23,7 +23,7 @@ declare class AssetManager {
     getBlockInstance(systemId: string, instanceId: string): Promise<BlockInstance>;
     getAsset(ref: string, noCache?: boolean, autoFetch?: boolean): Promise<EnrichedAsset | undefined>;
     createAsset(path: string, yaml: BlockDefinition, sourceOfChange?: SourceOfChange): Promise<EnrichedAsset[]>;
-    updateAsset(ref: string, yaml: BlockDefinition, sourceOfChange?: SourceOfChange): Promise<void>;
+    updateAsset(ref: string, yaml: Definition, sourceOfChange?: SourceOfChange): Promise<void>;
     importFile(filePath: string): Promise<EnrichedAsset[]>;
     unregisterAsset(ref: string): Promise<void>;
     installAsset(ref: string, wait?: boolean): Promise<import("./taskManager").Task<void>[] | undefined>;

package/dist/esm/src/assetManager.js

@@ -166,7 +166,7 @@ class AssetManager {
         return assets.filter((a) => refs.some((ref) => compareRefs(ref, a.ref)));
     }
     async unregisterAsset(ref) {
-        const asset = await this.getAsset(ref, true);
+        const asset = await this.getAsset(ref, true, false);
         if (!asset) {
             throw new Error('Asset does not exists: ' + ref);
         }

package/dist/esm/src/codeGeneratorManager.d.ts

@@ -1,10 +1,10 @@
-import { BlockDefinition } from '@kapeta/schemas';
+import { Definition } from '@kapeta/local-cluster-config';
 declare class CodeGeneratorManager {
     private ensureLanguageTargetInRegistry;
     reload(): Promise<void>;
     initialize(): Promise<void>;
-    canGenerateCode(yamlContent: BlockDefinition): Promise<boolean>;
-    generate(yamlFile: string, yamlContent: BlockDefinition): Promise<void>;
+    canGenerateCode(yamlContent: Definition): Promise<boolean>;
+    generate(yamlFile: string, yamlContent: Definition): Promise<void>;
 }
 export declare const codeGeneratorManager: CodeGeneratorManager;
 export {};

package/package.json

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

package/src/RepositoryWatcher.ts

@@ -9,6 +9,7 @@ import { socketManager } from './socketManager';
 import { SourceOfChange, WatchEventName } from './types';
 import { cacheManager } from './cacheManager';
 import { EventEmitter } from 'node:events';
+import { assetManager } from './assetManager';
 
 interface AssetIdentity {
     handle: string;
@@ -143,12 +144,12 @@ export class RepositoryWatcher extends EventEmitter {
             return;
         }
 
-        const assetIdentity = await this.getAssetIdentity(path);
-        if (!assetIdentity) {
+        if (this.disabled) {
             return;
         }
 
-        if (this.disabled) {
+        const assetIdentity = await this.getAssetIdentity(path);
+        if (!assetIdentity) {
             return;
         }
 
@@ -170,6 +171,25 @@ export class RepositoryWatcher extends EventEmitter {
             }
         }
 
+        const repoPath = this.getRepositoryPath(assetIdentity);
+
+        if (
+            eventName === 'change' &&
+            !withinRepo &&
+            assetIdentity.version === 'local' &&
+            Path.basename(path) === 'kapeta.yml' &&
+            (await this.exists(path)) &&
+            !(await this.exists(repoPath))
+        ) {
+            // This happens when a local asset is renamed
+            const oldPath = _.findKey(this.symbolicLinks, (link) => link === path);
+            if (oldPath) {
+                await FS.unlink(oldPath);
+                await assetManager.importFile(path);
+                return;
+            }
+        }
+
         const sourceOfChange = this.sourceOfChange.get(path) ?? 'filesystem';
         await this.checkForChange(assetIdentity, sourceOfChange);
 
@@ -177,18 +197,17 @@ export class RepositoryWatcher extends EventEmitter {
         this.sourceOfChange.delete(path);
     }
 
+    private getRepositoryPath(assetIdentity: AssetIdentity) {
+        return Path.join(this.baseDir, assetIdentity.handle, assetIdentity.name, assetIdentity.version);
+    }
+
     private async checkForChange(assetIdentity: AssetIdentity, sourceOfChange: SourceOfChange) {
-        const ymlPath = Path.join(
-            this.baseDir,
-            assetIdentity.handle,
-            assetIdentity.name,
-            assetIdentity.version,
-            'kapeta.yml'
-        );
+        const ymlPath = Path.join(this.getRepositoryPath(assetIdentity), 'kapeta.yml');
         const newDefinitions = ClusterConfiguration.getDefinitions();
         const newDefinition = newDefinitions.find((d) => d.ymlPath === ymlPath);
         let currentDefinition = this.allDefinitions.find((d) => d.ymlPath === ymlPath);
         const ymlExists = await this.exists(ymlPath);
+
         let type;
         if (ymlExists) {
             if (currentDefinition) {
@@ -206,9 +225,6 @@ export class RepositoryWatcher extends EventEmitter {
             }
         } else {
             if (currentDefinition) {
-                const ref = parseKapetaUri(
-                    `${currentDefinition.definition.metadata.name}:${currentDefinition.version}`
-                ).id;
                 //Something was removed
                 type = 'removed';
             } else {

package/src/assetManager.ts

@@ -171,7 +171,7 @@ class AssetManager {
         return asset;
     }
 
-    async updateAsset(ref: string, yaml: BlockDefinition, sourceOfChange: SourceOfChange = 'filesystem') {
+    async updateAsset(ref: string, yaml: Definition, sourceOfChange: SourceOfChange = 'filesystem') {
         ref = normalizeKapetaUri(ref);
         const asset = await this.getAsset(ref, true, false);
         if (!asset) {
@@ -227,7 +227,7 @@ class AssetManager {
     }
 
     async unregisterAsset(ref: string) {
-        const asset = await this.getAsset(ref, true);
+        const asset = await this.getAsset(ref, true, false);
         if (!asset) {
             throw new Error('Asset does not exists: ' + ref);
         }
@@ -253,7 +253,7 @@ class AssetManager {
         return await repositoryManager.ensureAsset(uri.handle, uri.name, uri.version, wait);
     }
 
-    private async maybeGenerateCode(ref: string, ymlPath: string, block: BlockDefinition) {
+    private async maybeGenerateCode(ref: string, ymlPath: string, block: Definition) {
         ref = normalizeKapetaUri(ref);
         if (await codeGeneratorManager.canGenerateCode(block)) {
             const assetTitle = block.metadata.title ? block.metadata.title : parseKapetaUri(block.metadata.name).name;

package/src/codeGeneratorManager.ts

@@ -55,7 +55,7 @@ class CodeGeneratorManager {
         });
     }
 
-    async canGenerateCode(yamlContent: BlockDefinition): Promise<boolean> {
+    async canGenerateCode(yamlContent: Definition): Promise<boolean> {
         if (!yamlContent.spec.target?.kind) {
             //Not all block types have targets
             return false;
@@ -68,7 +68,7 @@ class CodeGeneratorManager {
         return !!(yamlContent && yamlContent.kind && blockTypeKinds.indexOf(yamlContent.kind.toLowerCase()) > -1);
     }
 
-    async generate(yamlFile: string, yamlContent: BlockDefinition) {
+    async generate(yamlFile: string, yamlContent: Definition) {
         if (!yamlContent.spec.target?.kind) {
             //Not all block types have targets
             return;
@@ -87,7 +87,7 @@ class CodeGeneratorManager {
         await this.ensureLanguageTargetInRegistry(targetAsset?.path, targetAsset?.version, targetAsset?.data);
         const baseDir = Path.dirname(yamlFile);
         console.log('Generating code for path: %s', baseDir);
-        const codeGenerator = new BlockCodeGenerator(yamlContent);
+        const codeGenerator = new BlockCodeGenerator(yamlContent as BlockDefinition);
 
         const output = await codeGenerator.generate();
         const writer = new CodeWriter(baseDir, {});