@kapeta/local-cluster-service 0.5.9 → 0.5.11

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.5.11](https://github.com/kapetacom/local-cluster-service/compare/v0.5.10...v0.5.11) (2023-06-20)
+
+
+### Bug Fixes
+
+* Improve path template parser. ([#36](https://github.com/kapetacom/local-cluster-service/issues/36)) ([b655da1](https://github.com/kapetacom/local-cluster-service/commit/b655da1e97740ff2b4fe0f2bcd7f75b04003753e))
+
+## [0.5.10](https://github.com/kapetacom/local-cluster-service/compare/v0.5.9...v0.5.10) (2023-06-19)
+
+
+### Bug Fixes
+
+* delete asset via ref ([6b5a968](https://github.com/kapetacom/local-cluster-service/commit/6b5a968a029753baea3a651a0538468086cda665))
+
 ## [0.5.9](https://github.com/kapetacom/local-cluster-service/compare/v0.5.8...v0.5.9) (2023-06-18)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kapeta/local-cluster-service",
-  "version": "0.5.9",
+  "version": "0.5.11",
   "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
   "main": "index.js",
   "repository": {

package/src/assetManager.js

@@ -1,14 +1,14 @@
-const Path = require("node:path");
+const Path = require('node:path');
 const FS = require('node:fs');
 const FSExtra = require('fs-extra');
 const YAML = require('yaml');
 const ClusterConfiguration = require('@kapeta/local-cluster-config').default;
-const {Actions} = require('@kapeta/nodejs-registry-utils');
+const { Actions } = require('@kapeta/nodejs-registry-utils');
 const codeGeneratorManager = require('./codeGeneratorManager');
 const progressListener = require('./progressListener');
-const {parseKapetaUri} = require("@kapeta/nodejs-utils");
-const repositoryManager = require("./repositoryManager");
-const NodeCache = require("node-cache");
+const { parseKapetaUri } = require('@kapeta/nodejs-utils');
+const repositoryManager = require('./repositoryManager');
+const NodeCache = require('node-cache');
 
 function enrichAsset(asset) {
     return {
@@ -19,8 +19,8 @@ function enrichAsset(asset) {
         kind: asset.definition.kind,
         data: asset.definition,
         path: asset.path,
-        ymlPath: asset.ymlPath
-    }
+        ymlPath: asset.ymlPath,
+    };
 }
 
 function compareRefs(a, b) {
@@ -30,29 +30,21 @@ function compareRefs(a, b) {
     return aProtocol === bProtocol && aId === bId;
 }
 function parseRef(ref) {
-    let out = ref.split(/:\/\//,2);
+    let out = ref.split(/:\/\//, 2);
 
     if (out.length === 1) {
-        return [
-            'kapeta',
-            ref.toLowerCase()
-        ]
+        return ['kapeta', ref.toLowerCase()];
     }
-    return [
-        out[0].toLowerCase(),
-        out[1].toLowerCase()
-    ];
+    return [out[0].toLowerCase(), out[1].toLowerCase()];
 }
 
 class AssetManager {
-
     constructor() {
         this.cache = new NodeCache({
             stdTTL: 60 * 60, // 1 hour
-        })
+        });
     }
 
-
     /**
      *
      * @param {string[]} [assetKinds]
@@ -62,10 +54,10 @@ class AssetManager {
         if (!assetKinds) {
             const blockTypeProviders = ClusterConfiguration.getDefinitions([
                 'core/block-type',
-                'core/block-type-operator'
+                'core/block-type-operator',
             ]);
-            assetKinds = blockTypeProviders.map(p => {
-                return `${p.definition.metadata.name}:${p.version}`
+            assetKinds = blockTypeProviders.map((p) => {
+                return `${p.definition.metadata.name}:${p.version}`;
             });
             assetKinds.push('core/plan');
         }
@@ -80,7 +72,6 @@ class AssetManager {
     }
 
     async getPlan(ref, noCache = false) {
-
         const asset = await this.getAsset(ref, noCache);
 
         if ('core/plan' !== asset.kind) {
@@ -100,7 +91,7 @@ class AssetManager {
 
         let asset = ClusterConfiguration.getDefinitions()
             .map(enrichAsset)
-            .find(a => parseKapetaUri(a.ref).equals(uri));
+            .find((a) => parseKapetaUri(a.ref).equals(uri));
 
         if (!asset) {
             throw new Error('Asset not found: ' + ref);
@@ -149,7 +140,10 @@ class AssetManager {
         if (codeGeneratorManager.canGenerateCode(yaml)) {
             await codeGeneratorManager.generate(asset.ymlPath, yaml);
         } else {
-            console.log('Could not generate code for %s', yaml.kind ? yaml.kind : 'unknown yaml');
+            console.log(
+                'Could not generate code for %s',
+                yaml.kind ? yaml.kind : 'unknown yaml'
+            );
         }
     }
 
@@ -162,15 +156,20 @@ class AssetManager {
             throw new Error('File not found: ' + filePath);
         }
 
-        const assetInfos = YAML.parseAllDocuments(FS.readFileSync(filePath).toString())
-            .map(doc => doc.toJSON());
+        const assetInfos = YAML.parseAllDocuments(
+            FS.readFileSync(filePath).toString()
+        ).map((doc) => doc.toJSON());
 
         await Actions.link(progressListener, Path.dirname(filePath));
 
         const version = 'local';
-        const refs = assetInfos.map(assetInfo => `kapeta://${assetInfo.metadata.name}:${version}`);
+        const refs = assetInfos.map(
+            (assetInfo) => `kapeta://${assetInfo.metadata.name}:${version}`
+        );
         this.cache.flushAll();
-        return this.getAssets().filter(a => refs.some(ref => compareRefs(ref, a.ref)));
+        return this.getAssets().filter((a) =>
+            refs.some((ref) => compareRefs(ref, a.ref))
+        );
     }
 
     async unregisterAsset(ref) {
@@ -179,7 +178,7 @@ class AssetManager {
             throw new Error('Asset does not exists: ' + ref);
         }
         this.cache.flushAll();
-        await Actions.uninstall(progressListener, asset.path);
+        await Actions.uninstall(progressListener, [asset.ref]);
     }
 }
 

package/src/utils/pathTemplateParser.js

@@ -2,6 +2,17 @@
 const TYPE_VARIABLE = 'variable';
 const TYPE_PATH = 'path';
 
+/**
+ * A path template is a string that can be used to match a path and extract variables from it.
+ *
+ * E.g. /foo/{bar}/baz
+ *
+ * Would match /foo/123/baz and extract bar=123
+ *
+ * You can also specify a regex for the variable:
+ *  /foo/{bar:[0-9]+}/baz
+ *
+ */
 class PathTemplate {
     constructor(pathTemplate) {
         if (!pathTemplate.startsWith('/')) {
@@ -9,33 +20,41 @@ class PathTemplate {
         }
         this._path = pathTemplate;
 
-        this._parts = pathTemplate.split(/{/g).map((part) => {
-            if (part.endsWith('}')) {
-                let regex,
-                    value = part.substr(0, part.length -  1);
-
-                [value, regex] = value.split(/:/, 2);
+        const variableRegex = /{([^}]+)}/g;
+        let match, offset = 0;
+        this._parts = [];
+        while((match = variableRegex.exec(pathTemplate)) !== null) {
+            if (match.index > offset) {
+                this._parts.push({
+                    type: TYPE_PATH,
+                    value: pathTemplate.substring(offset, match.index)
+                });
+            }
 
-                if (regex) {
-                    regex = new RegExp('^' + regex);
-                } else {
-                    regex = /^[^\/]+/
-                }
+            let regex;
+            let value = match[1];
+            [value, regex] = value.split(/:/, 2);
 
-                return {
-                    type: TYPE_VARIABLE,
-                    value,
-                    regex
-                };
+            if (regex) {
+                regex = new RegExp('^' + regex);
+            } else {
+                regex = /^[^\/]+/
             }
 
-            return {
-                type: TYPE_PATH,
-                value: part
-            };
-        });
-
+            this._parts.push({
+                type: TYPE_VARIABLE,
+                value,
+                regex
+            });
+            offset = match.index + match[0].length;
+        }
 
+        if (offset < pathTemplate.length) {
+            this._parts.push({
+                type: TYPE_PATH,
+                value: pathTemplate.substring(offset)
+            });
+        }
     }
 
     get path() {
@@ -61,7 +80,7 @@ class PathTemplate {
                         return null;
                     }
 
-                    path = path.substr(part.value.length);
+                    path = path.substring(part.value.length);
                     break;
                 case TYPE_VARIABLE:
                     if (!part.regex.test(path)) {