feat: enable non-array values in "match" method (#81)

Author: luckasnix

docs/object-graph.doc.md

@@ -137,4 +137,4 @@ Returns all nodes that match with the provided shape.
 
 | Name | Type | Default | Description |
 | --- | --- | --- | --- |
-| shape | `Partial<Record<keyof NodeValue, Array<unknown>>>` | - | __Required.__ The shape of the nodes to return from the object graph. |
+| shape | `Partial<Record<keyof NodeValue, unknown>>` | - | __Required.__ The shape of the nodes to return from the object graph. |

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@kasnix/structured-objects",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/luckasnix/structured-objects.git"

package.json

@@ -204,18 +204,23 @@ export class ObjectGraph<NodeValue extends Record<string, unknown>> {
    * @description Returns all nodes that match with the provided shape.
    * @since 1.0.0
    */
-  public match(shape: Partial<Record<keyof NodeValue, Array<unknown>>>): Array<NodeValue> {
+  public match(shape: Partial<Record<keyof NodeValue, unknown>>): Array<NodeValue> {
     if (!shape) {
       throw new Error("Provide a value for the 'shape' parameter");
     }
     const matchedNodes: Array<NodeValue> = new Array();
     for (const [_, nodeValue] of this.nodes) {
-      const shapeEntries = Object.entries(shape) as Array<[keyof NodeValue, Array<unknown>]>;
+      const shapeEntries = Object.entries(shape) as Array<[keyof NodeValue, unknown]>;
       const hasMatched = shapeEntries.every((shapeEntry) => {
-        if (shapeEntry[1] === undefined) {
+        const shapePropKey = shapeEntry[0];
+        const shapePropValue = shapeEntry[1];
+        if (shapePropValue === undefined) {
           return true;
         }
-        return shapeEntry[1].includes(nodeValue[shapeEntry[0]]);
+        const shapePropValueArray: Array<unknown> = Array.isArray(shapePropValue)
+          ? shapePropValue
+          : [shapePropValue];
+        return shapePropValueArray.includes(nodeValue[shapePropKey]);
       });
       if (hasMatched) {
         matchedNodes.push(nodeValue);

src/object-graph.ts

@@ -236,7 +236,7 @@ describe("valuesOf()", () => {
 });
 
 describe("match()", () => {
-  test("gets all nodes that match with the provided shape", () => {
+  test("gets all nodes that match the provided shape", () => {
     const colorsToMatch: Color[] = ["red", "blue"];
     const sizesToMatch: Size[] = ["small", "medium"];
     const shirtsGraph = new ObjectGraph<Shirt>(shirtsMock, (shirt) => shirt.sku);
@@ -253,6 +253,19 @@ describe("match()", () => {
     }
   });
 
+  test("gets all nodes that match a shape with non-array values", () => {
+    const shirtsGraph = new ObjectGraph<Shirt>(shirtsMock, (shirt) => shirt.sku);
+
+    const matchedShirts = shirtsGraph.match({
+      color: "red",
+      size: "small",
+    });
+
+    expect(matchedShirts).toHaveLength(1);
+    expect(matchedShirts[0].color).toBe("red");
+    expect(matchedShirts[0].size).toBe("small");
+  });
+
   test("gets matched nodes ignoring undefined value in the shape", () => {
     const colorsToMatch: Color[] = ["yellow", "green"];
     const shirtsGraph = new ObjectGraph<Shirt>(shirtsMock, (shirt) => shirt.sku);