@kapeta/local-cluster-service 0.40.2 → 0.40.4

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.40.4](https://github.com/kapetacom/local-cluster-service/compare/v0.40.3...v0.40.4) (2024-04-04)
+
+
+### Bug Fixes
+
+* Add assets/issues endpoint + bump cluster-config ([#134](https://github.com/kapetacom/local-cluster-service/issues/134)) ([121b510](https://github.com/kapetacom/local-cluster-service/commit/121b510c00525e5f65b88a9d5ccdc00ee642cff4))
+
+## [0.40.3](https://github.com/kapetacom/local-cluster-service/compare/v0.40.2...v0.40.3) (2024-03-26)
+
+
+### Bug Fixes
+
+* codegen for 'core/block-type.*' regexp ([8e544b0](https://github.com/kapetacom/local-cluster-service/commit/8e544b0ca91acf0b467e60ee0249a5a96ece6393))
+
 ## [0.40.2](https://github.com/kapetacom/local-cluster-service/compare/v0.40.1...v0.40.2) (2024-03-11)
 
 

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

@@ -162,4 +162,13 @@ router.put('/install', async (req, res) => {
         res.status(400).send({ error: err.message });
     }
 });
+router.get('/issues', async (req, res) => {
+    try {
+        const issues = await definitionsManager_1.definitionsManager.getDefinitionErrors();
+        res.send(issues);
+    }
+    catch (err) {
+        res.status(500).send({ error: err.message });
+    }
+});
 exports.default = router;

package/dist/cjs/src/codeGeneratorManager.js

@@ -15,7 +15,7 @@ const assetManager_1 = require("./assetManager");
 const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const repositoryManager_1 = require("./repositoryManager");
 const TARGET_KIND = 'core/language-target';
-const BLOCK_TYPE_KIND = 'core/block-type';
+const BLOCK_TYPE_REGEX = /^core\/block-type.*/;
 class CodeGeneratorManager {
     async ensureLanguageTargetInRegistry(path, version, definition) {
         const key = `${definition.metadata.name}:${version}`;
@@ -63,7 +63,7 @@ class CodeGeneratorManager {
             return false;
         }
         const kindUri = (0, nodejs_utils_1.parseKapetaUri)(yamlContent.kind);
-        const blockTypes = await definitionsManager_1.definitionsManager.getDefinitions(BLOCK_TYPE_KIND);
+        const blockTypes = await definitionsManager_1.definitionsManager.getDefinitions([BLOCK_TYPE_REGEX]);
         const blockTypeKinds = blockTypes.map((blockType) => (0, nodejs_utils_1.parseKapetaUri)(blockType.definition.metadata.name).fullName);
         return blockTypeKinds.includes(kindUri.fullName);
     }

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

@@ -8,9 +8,10 @@ declare class DefinitionsManager {
     private resolveDefinitionsAndSamples;
     private prepareSample;
     private applyFilters;
-    getDefinitions(kindFilter?: string | string[]): Promise<DefinitionInfo[]>;
+    getDefinitions(kindFilter?: string | (string | RegExp)[]): Promise<DefinitionInfo[]>;
     exists(ref: string): Promise<boolean>;
     getProviderDefinitions(): Promise<DefinitionInfo[]>;
+    getDefinitionErrors(): Promise<import("@kapeta/local-cluster-config").DefinitionError[]>;
     getDefinition(ref: string): Promise<DefinitionInfo | undefined>;
     getLatestDefinition(name: string): Promise<DefinitionInfo | undefined>;
     getVersions(assetName: string): Promise<DefinitionInfo[]>;

package/dist/cjs/src/definitionsManager.js

@@ -38,7 +38,7 @@ function normalizeFilters(kindFilter) {
             resolvedFilters = [kindFilter];
         }
     }
-    return resolvedFilters.map((k) => k.toLowerCase());
+    return resolvedFilters;
 }
 class DefinitionsManager {
     async resolveDefinitionsAndSamples() {
@@ -120,7 +120,15 @@ class DefinitionsManager {
             return definitions;
         }
         return definitions.filter((d) => {
-            return kindFilter.includes(d.definition.kind.toLowerCase());
+            const kind = d.definition.kind.toLowerCase();
+            return kindFilter.some((filter) => {
+                if (filter instanceof RegExp) {
+                    return filter.test(kind);
+                }
+                else {
+                    return kind === filter.toLowerCase();
+                }
+            });
         });
     }
     async getDefinitions(kindFilter) {
@@ -134,6 +142,9 @@ class DefinitionsManager {
     async getProviderDefinitions() {
         return (0, cacheManager_1.doCached)('definitionsManager:providers', () => local_cluster_config_1.default.getProviderDefinitions());
     }
+    async getDefinitionErrors() {
+        return local_cluster_config_1.default.getDefinitionErrors();
+    }
     async getDefinition(ref) {
         const uri = (0, nodejs_utils_1.parseKapetaUri)(ref);
         const definitions = await this.getDefinitions();

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

@@ -162,4 +162,13 @@ router.put('/install', async (req, res) => {
         res.status(400).send({ error: err.message });
     }
 });
+router.get('/issues', async (req, res) => {
+    try {
+        const issues = await definitionsManager_1.definitionsManager.getDefinitionErrors();
+        res.send(issues);
+    }
+    catch (err) {
+        res.status(500).send({ error: err.message });
+    }
+});
 exports.default = router;

package/dist/esm/src/codeGeneratorManager.js

@@ -15,7 +15,7 @@ const assetManager_1 = require("./assetManager");
 const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const repositoryManager_1 = require("./repositoryManager");
 const TARGET_KIND = 'core/language-target';
-const BLOCK_TYPE_KIND = 'core/block-type';
+const BLOCK_TYPE_REGEX = /^core\/block-type.*/;
 class CodeGeneratorManager {
     async ensureLanguageTargetInRegistry(path, version, definition) {
         const key = `${definition.metadata.name}:${version}`;
@@ -63,7 +63,7 @@ class CodeGeneratorManager {
             return false;
         }
         const kindUri = (0, nodejs_utils_1.parseKapetaUri)(yamlContent.kind);
-        const blockTypes = await definitionsManager_1.definitionsManager.getDefinitions(BLOCK_TYPE_KIND);
+        const blockTypes = await definitionsManager_1.definitionsManager.getDefinitions([BLOCK_TYPE_REGEX]);
         const blockTypeKinds = blockTypes.map((blockType) => (0, nodejs_utils_1.parseKapetaUri)(blockType.definition.metadata.name).fullName);
         return blockTypeKinds.includes(kindUri.fullName);
     }

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

@@ -8,9 +8,10 @@ declare class DefinitionsManager {
     private resolveDefinitionsAndSamples;
     private prepareSample;
     private applyFilters;
-    getDefinitions(kindFilter?: string | string[]): Promise<DefinitionInfo[]>;
+    getDefinitions(kindFilter?: string | (string | RegExp)[]): Promise<DefinitionInfo[]>;
     exists(ref: string): Promise<boolean>;
     getProviderDefinitions(): Promise<DefinitionInfo[]>;
+    getDefinitionErrors(): Promise<import("@kapeta/local-cluster-config").DefinitionError[]>;
     getDefinition(ref: string): Promise<DefinitionInfo | undefined>;
     getLatestDefinition(name: string): Promise<DefinitionInfo | undefined>;
     getVersions(assetName: string): Promise<DefinitionInfo[]>;

package/dist/esm/src/definitionsManager.js

@@ -38,7 +38,7 @@ function normalizeFilters(kindFilter) {
             resolvedFilters = [kindFilter];
         }
     }
-    return resolvedFilters.map((k) => k.toLowerCase());
+    return resolvedFilters;
 }
 class DefinitionsManager {
     async resolveDefinitionsAndSamples() {
@@ -120,7 +120,15 @@ class DefinitionsManager {
             return definitions;
         }
         return definitions.filter((d) => {
-            return kindFilter.includes(d.definition.kind.toLowerCase());
+            const kind = d.definition.kind.toLowerCase();
+            return kindFilter.some((filter) => {
+                if (filter instanceof RegExp) {
+                    return filter.test(kind);
+                }
+                else {
+                    return kind === filter.toLowerCase();
+                }
+            });
         });
     }
     async getDefinitions(kindFilter) {
@@ -134,6 +142,9 @@ class DefinitionsManager {
     async getProviderDefinitions() {
         return (0, cacheManager_1.doCached)('definitionsManager:providers', () => local_cluster_config_1.default.getProviderDefinitions());
     }
+    async getDefinitionErrors() {
+        return local_cluster_config_1.default.getDefinitionErrors();
+    }
     async getDefinition(ref) {
         const uri = (0, nodejs_utils_1.parseKapetaUri)(ref);
         const definitions = await this.getDefinitions();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.40.2",
+    "version": "0.40.4",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {
@@ -49,7 +49,8 @@
     "homepage": "https://github.com/kapetacom/local-cluster-service#readme",
     "dependencies": {
         "@kapeta/codegen": "^1.3.0",
-        "@kapeta/local-cluster-config": "^0.4.0",
+        "@kapeta/config-mapper": "^1.1.1",
+        "@kapeta/local-cluster-config": "^0.4.1",
         "@kapeta/nodejs-api-client": ">=0.2.0 <2",
         "@kapeta/nodejs-process": "^1.2.0",
         "@kapeta/nodejs-registry-utils": ">=0.11.1 <2",
@@ -78,8 +79,7 @@
         "stream-json": "^1.8.0",
         "tar-stream": "^3.1.6",
         "typescript": "^5.1.6",
-        "yaml": "^1.6.0",
-        "@kapeta/config-mapper": "^1.1.1"
+        "yaml": "^1.6.0"
     },
     "devDependencies": {
         "@kapeta/eslint-config": "^0.7.0",

package/src/assets/routes.ts

@@ -180,4 +180,13 @@ router.put('/install', async (req: Request, res: Response) => {
     }
 });
 
+router.get('/issues', async (req: Request, res: Response) => {
+    try {
+        const issues = await definitionsManager.getDefinitionErrors();
+        res.send(issues);
+    } catch (err: any) {
+        res.status(500).send({ error: err.message });
+    }
+});
+
 export default router;

package/src/codeGeneratorManager.ts

@@ -13,7 +13,7 @@ import { normalizeKapetaUri, parseKapetaUri } from '@kapeta/nodejs-utils';
 import { repositoryManager } from './repositoryManager';
 
 const TARGET_KIND = 'core/language-target';
-const BLOCK_TYPE_KIND = 'core/block-type';
+const BLOCK_TYPE_REGEX = /^core\/block-type.*/;
 
 class CodeGeneratorManager {
     private async ensureLanguageTargetInRegistry(path: string, version: string, definition: Definition) {
@@ -68,7 +68,7 @@ class CodeGeneratorManager {
 
         const kindUri = parseKapetaUri(yamlContent.kind);
 
-        const blockTypes = await definitionsManager.getDefinitions(BLOCK_TYPE_KIND);
+        const blockTypes = await definitionsManager.getDefinitions([BLOCK_TYPE_REGEX]);
         const blockTypeKinds = blockTypes.map(
             (blockType) => parseKapetaUri(blockType.definition.metadata.name).fullName
         );

package/src/definitionsManager.ts

@@ -27,8 +27,8 @@ function applyHandleChange(definition: DefinitionInfo, targetHandle: string) {
     return definition;
 }
 
-function normalizeFilters(kindFilter?: string | string[]) {
-    let resolvedFilters: string[] = [];
+function normalizeFilters(kindFilter?: string | (string | RegExp)[]) {
+    let resolvedFilters: any[] = [];
 
     if (kindFilter) {
         if (Array.isArray(kindFilter)) {
@@ -38,7 +38,7 @@ function normalizeFilters(kindFilter?: string | string[]) {
         }
     }
 
-    return resolvedFilters.map((k) => k.toLowerCase());
+    return resolvedFilters;
 }
 
 class DefinitionsManager {
@@ -138,17 +138,24 @@ class DefinitionsManager {
         console.log('Rewrite done for sample plan');
     }
 
-    private applyFilters(definitions: DefinitionInfo[], kindFilter: string[]): DefinitionInfo[] {
+    private applyFilters(definitions: DefinitionInfo[], kindFilter: (string | RegExp)[]): DefinitionInfo[] {
         if (kindFilter.length === 0) {
             return definitions;
         }
 
         return definitions.filter((d) => {
-            return kindFilter.includes(d.definition.kind.toLowerCase());
+            const kind = d.definition.kind.toLowerCase();
+            return kindFilter.some((filter) => {
+                if (filter instanceof RegExp) {
+                    return filter.test(kind);
+                } else {
+                    return kind === filter.toLowerCase();
+                }
+            });
         });
     }
 
-    public async getDefinitions(kindFilter?: string | string[]): Promise<DefinitionInfo[]> {
+    public async getDefinitions(kindFilter?: string | (string | RegExp)[]): Promise<DefinitionInfo[]> {
         kindFilter = normalizeFilters(kindFilter);
 
         const definitions = await doCached<Promise<DefinitionInfo[]>>('definitionsManager:all', () =>
@@ -168,6 +175,10 @@ class DefinitionsManager {
         );
     }
 
+    public async getDefinitionErrors() {
+        return ClusterConfiguration.getDefinitionErrors();
+    }
+
     public async getDefinition(ref: string) {
         const uri = parseKapetaUri(ref);
         const definitions = await this.getDefinitions();