refactor: move updateInteractionNameWithUriVariablePattern to core

eclipse-thingweb · Sep 11, 2023 · a6d62fa · a6d62fa
1 parent c8177c2
commit a6d62fa
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 38 deletions.
diff --git a/packages/binding-http/src/http-server.ts b/packages/binding-http/src/http-server.ts
@@ -261,40 +261,6 @@ export default class HttpServer implements ProtocolServer {
         }
     }
 
-    private updateInteractionNameWithUriVariablePattern(
-        interactionName: string,
-        uriVariables: PropertyElement["uriVariables"] = {},
-        thingVariables: PropertyElement["uriVariables"] = {}
-    ): string {
-        const variables = Object.assign({}, uriVariables, thingVariables);
-        if (Object.keys(variables).length > 0) {
-            let pattern = "{?";
-            let index = 0;
-            if (uriVariables) {
-                for (const key in uriVariables) {
-                    if (index !== 0) {
-                        pattern += ",";
-                    }
-                    pattern += encodeURIComponent(key);
-                    index++;
-                }
-            }
-            if (thingVariables) {
-                for (const key in thingVariables) {
-                    if (index !== 0) {
-                        pattern += ",";
-                    }
-                    pattern += encodeURIComponent(key);
-                    index++;
-                }
-            }
-            pattern += "}";
-            return encodeURIComponent(interactionName) + pattern;
-        } else {
-            return encodeURIComponent(interactionName);
-        }
-    }
-
     public async expose(thing: ExposedThing, tdTemplate: WoT.ExposedThingInit = {}): Promise<void> {
         let urlPath = slugify(thing.title, { lower: true });
 
@@ -400,7 +366,7 @@ export default class HttpServer implements ProtocolServer {
             }
 
             for (const propertyName in thing.properties) {
-                const propertyNamePattern = this.updateInteractionNameWithUriVariablePattern(
+                const propertyNamePattern = Helpers.updateInteractionNameWithUriVariablePattern(
                     propertyName,
                     thing.properties[propertyName].uriVariables,
                     thing.uriVariables
@@ -453,7 +419,7 @@ export default class HttpServer implements ProtocolServer {
             }
 
             for (const actionName in thing.actions) {
-                const actionNamePattern = this.updateInteractionNameWithUriVariablePattern(
+                const actionNamePattern = Helpers.updateInteractionNameWithUriVariablePattern(
                     actionName,
                     thing.actions[actionName].uriVariables,
                     thing.uriVariables
@@ -475,7 +441,7 @@ export default class HttpServer implements ProtocolServer {
             }
 
             for (const eventName in thing.events) {
-                const eventNamePattern = this.updateInteractionNameWithUriVariablePattern(
+                const eventNamePattern = Helpers.updateInteractionNameWithUriVariablePattern(
                     eventName,
                     thing.events[eventName].uriVariables,
                     thing.uriVariables

diff --git a/packages/core/src/helpers.ts b/packages/core/src/helpers.ts
@@ -38,7 +38,7 @@ import { DataSchemaValue, ExposedThingInit } from "wot-typescript-definitions";
 import { SomeJSONSchema } from "ajv/dist/types/json-schema";
 import { ThingInteraction, ThingModelHelpers } from "@node-wot/td-tools";
 import { Resolver } from "@node-wot/td-tools/src/resolver-interface";
-import { DataSchema } from "wot-thing-description-types";
+import { PropertyElement, DataSchema } from "wot-thing-description-types";
 import { createLoggers } from "./logger";
 
 const { debug, error, warn } = createLoggers("core", "helpers");
@@ -386,4 +386,38 @@ export default class Helpers implements Resolver {
 
         return params;
     }
+
+    public static updateInteractionNameWithUriVariablePattern(
+        interactionName: string,
+        uriVariables: PropertyElement["uriVariables"] = {},
+        thingVariables: PropertyElement["uriVariables"] = {}
+    ): string {
+        const variables = Object.assign({}, uriVariables, thingVariables);
+        if (Object.keys(variables).length > 0) {
+            let pattern = "{?";
+            let index = 0;
+            if (uriVariables) {
+                for (const key in uriVariables) {
+                    if (index !== 0) {
+                        pattern += ",";
+                    }
+                    pattern += encodeURIComponent(key);
+                    index++;
+                }
+            }
+            if (thingVariables) {
+                for (const key in thingVariables) {
+                    if (index !== 0) {
+                        pattern += ",";
+                    }
+                    pattern += encodeURIComponent(key);
+                    index++;
+                }
+            }
+            pattern += "}";
+            return encodeURIComponent(interactionName) + pattern;
+        } else {
+            return encodeURIComponent(interactionName);
+        }
+    }
 }