refactor: introduce anonymous InteractionOutput options parameter

eclipse-thingweb · May 9, 2024 · 8a05b90 · 8a05b90
1 parent 4708fe7
commit 8a05b90
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/core/src/consumed-thing.ts b/packages/core/src/consumed-thing.ts
@@ -584,7 +584,7 @@ export default class ConsumedThing extends TD.Thing implements IConsumedThing {
                 );
             }
         }
-        return new InteractionOutput(content, form, outputDataSchema, ignoreValidation);
+        return new InteractionOutput(content, form, outputDataSchema, { ignoreValidation: ignoreValidation ?? false });
     }
 
     async _readProperties(propertyNames: string[]): Promise<WoT.PropertyReadMap> {

diff --git a/packages/core/src/interaction-output.ts b/packages/core/src/interaction-output.ts
@@ -58,11 +58,11 @@ export class InteractionOutput implements WoT.InteractionOutput {
         return (this.#stream = ProtocolHelpers.toWoTStream(this.#content.body) as ReadableStream);
     }
 
-    constructor(content: Content, form?: WoT.Form, schema?: WoT.DataSchema, ignoreValidation?: boolean) {
+    constructor(content: Content, form?: WoT.Form, schema?: WoT.DataSchema, options = { ignoreValidation: false }) {
         this.#content = content;
         this.form = form;
         this.schema = schema;
-        this.ignoreValidation = ignoreValidation ?? false;
+        this.ignoreValidation = options.ignoreValidation ?? false;
         this.dataUsed = false;
     }
 

diff --git a/packages/core/test/InteractionOutputTest.ts b/packages/core/test/InteractionOutputTest.ts
@@ -126,7 +126,7 @@ class InteractionOutputTests {
         const stream = Readable.from(Buffer.from("not boolean", "utf-8"));
         const content = new Content("application/json", stream);
 
-        const out = new InteractionOutput(content, {}, { type: "boolean" }, true);
+        const out = new InteractionOutput(content, {}, { type: "boolean" }, { ignoreValidation: true });
         const result = await out.value();
         expect(result).to.eql("not boolean");
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                     );
                 }
             }
-            return new InteractionOutput(content, form, outputDataSchema, ignoreValidation);
+            return new InteractionOutput(content, form, outputDataSchema, { ignoreValidation: ignoreValidation ?? false });
         }
         async _readProperties(propertyNames: string[]): Promise<WoT.PropertyReadMap> {
@@ Expand Down @@