corebasic 1.0.267 → 1.0.269

package/dist/libs/features.js

@@ -54,13 +54,18 @@ function getLeaf(feature, req) {
     if (req) {
         for (let key in features) {
             const feature = features[key];
-            if (feature.featureless && feature.api === req.method.toUpperCase() + ' ' + req.path)
+            let api = feature.api;
+            if (feature.api.includes(':')) {
+                for (let key in req.params)
+                    api = api.replace(`:${key}`, decodeURIComponent(req.params[key] ?? ''));
+            }
+            if (feature.featureless && api === req.method.toUpperCase() + ' ' + req.path)
                 return key.split(/\.(query|command)\./)[0];
         }
-        return "NOLEAF"; // This code will never be reached as apiHandler()'s prior code ensures req is valid and there exists a feature. Included to silence ./tsc
+        throw new Error(`Invalid feature for extracting leaf in getLeaf()`);
     }
     else {
-        return "NOLEAF"; // This code will never be reached as apiHandler()'s prior code ensures req is valid and there exists a feature. Included to silence ./tsc
+        throw new Error(`Invalid feature for extracting leaf in getLeaf()`);
     }
 }
 const DEPLOY_TOKEN_SECRET = process.env.DEPLOY_TOKEN_SECRET || "MY_SECRET_DEPLOY_TOKEN";
@@ -165,7 +170,12 @@ function getFeaturelessFeature(req) {
     if (Session.ALLOWED_URLS.includes(req.path)) {
         for (let key in features) {
             const feature = features[key];
-            if (feature.featureless && feature.api === req.method.toUpperCase() + ' ' + req.path) {
+            let api = feature.api;
+            if (feature.api.includes(':')) {
+                for (let key in req.params)
+                    api = api.replace(`:${key}`, decodeURIComponent(req.params[key] ?? ''));
+            }
+            if (feature.featureless && api === req.method.toUpperCase() + ' ' + req.path) {
                 return getFeature(key);
             }
         }

package/libs/features.ts

@@ -163,12 +163,17 @@ function getLeaf(feature: string, req?: ExpressRequest): string {
     if (req) {
         for(let key in features) {
             const feature = features[key]!
-            if (feature.featureless && feature.api === req.method.toUpperCase() + ' ' + req.path)
+            let api = feature.api
+            if (feature.api.includes(':')) {
+                for (let key in req.params)
+                    api = api.replace(`:${key}`, decodeURIComponent(req.params[key] ?? ''))
+            }
+            if (feature.featureless && api === req.method.toUpperCase() + ' ' + req.path)
                 return key.split(/\.(query|command)\./)[0]!
         }
-        return "NOLEAF" // This code will never be reached as apiHandler()'s prior code ensures req is valid and there exists a feature. Included to silence ./tsc
+        throw new Error(`Invalid feature for extracting leaf in getLeaf()`)
     } else {
-        return "NOLEAF" // This code will never be reached as apiHandler()'s prior code ensures req is valid and there exists a feature. Included to silence ./tsc
+        throw new Error(`Invalid feature for extracting leaf in getLeaf()`)
     }
 }
 
@@ -286,7 +291,12 @@ function getFeaturelessFeature(req: ExpressRequest): FeatureEntry | undefined {
     if (Session.ALLOWED_URLS.includes(req.path)) {
         for(let key in features) {
             const feature = features[key]!
-            if (feature.featureless && feature.api === req.method.toUpperCase() + ' ' + req.path) {
+            let api = feature.api
+            if (feature.api.includes(':')) {
+                for (let key in req.params)
+                    api = api.replace(`:${key}`, decodeURIComponent(req.params[key] ?? ''))
+            }
+            if (feature.featureless && api === req.method.toUpperCase() + ' ' + req.path) {
                 return getFeature(key)
             }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "corebasic",
   "type": "module",
-  "version": "1.0.267",
+  "version": "1.0.269",
   "description": "",
   "main": "dist/index.js",
   "types": "./index.ts",