#5 Implement the isFile where statement

Author: FSou1

README.md

@@ -89,6 +89,14 @@ export interface IDirEntry {
 
 `select * from root where isDirectory <> false`
 
+`select * from root where isFile = true`
+
+`select * from root where isFile = false`
+
+`select * from root where isFile <> true`
+
+`select * from root where isFile <> false`
+
 ### TODO
 
 `select * from root where name = 'root.txt'`

mod_test.ts

@@ -65,4 +65,46 @@ Deno.test("if 'select * from root where isDirectory <> true' works", async () =>
   assertEquals(result[0].name, "root.txt");
   assertEquals(result[0].isDirectory, false);
   assertEquals(result[0].isFile, true);
+});
+
+Deno.test("if 'select * from root where isFile = true' works", async () => {
+  const result = await fsselect("select * from root where isFile = true");
+  assert(result.length === 1);
+  assertEquals(result[0].name, "root.txt");
+  assertEquals(result[0].isDirectory, false);
+  assertEquals(result[0].isFile, true);
+});
+
+Deno.test("if 'select * from root where isFile = false' works", async () => {
+  const result = await fsselect("select * from root where isFile = false");
+  assert(result.length === 3);
+
+  const names = result.map((i) => i.name as string);
+  const expectedNames = [
+    "test_folder_with_file",
+    "test_folder_with_files",
+    "test_folder_with_folder",
+  ];
+  assertArrayIncludes<string>(names, expectedNames);
+});
+
+Deno.test("if 'select * from root where isFile <> true' works", async () => {
+  const result = await fsselect("select * from root where isFile <> true");
+  assert(result.length === 3);
+
+  const names = result.map((i) => i.name as string);
+  const expectedNames = [
+    "test_folder_with_file",
+    "test_folder_with_files",
+    "test_folder_with_folder",
+  ];
+  assertArrayIncludes<string>(names, expectedNames);
+});
+
+Deno.test("if 'select * from root where isFile <> false' works", async () => {
+  const result = await fsselect("select * from root where isFile <> false");
+  assert(result.length === 1);
+  assertEquals(result[0].name, "root.txt");
+  assertEquals(result[0].isDirectory, false);
+  assertEquals(result[0].isFile, true);
 });

select_test.ts

@@ -1,7 +1,7 @@
 import {
   assert,
+  assertArrayIncludes,
   assertEquals,
-  assertArrayIncludes
 } from "https://deno.land/std@0.82.0/testing/asserts.ts";
 
 import { IQuery } from "./types.ts";
@@ -204,4 +204,108 @@ Deno.test("if 3 folders are returned when the where clause has isDirectory <> tr
   assertEquals(result[0].name, "root.txt");
   assertEquals(result[0].isDirectory, false);
   assertEquals(result[0].isFile, true);
-});
+});
+
+Deno.test("if 3 folders are returned when the where clause has isFile = true", async () => {
+  const query: IQuery = {
+    type: "select",
+    fields: ["*"],
+    from: "root",
+    where: {
+      conditions: [
+        {
+          left: "isFile",
+          op: "Equal",
+          right: "true",
+        },
+      ],
+    },
+  };
+
+  const result = await select(query);
+
+  assert(result.length === 1);
+  assertEquals(result[0].name, "root.txt");
+  assertEquals(result[0].isDirectory, false);
+  assertEquals(result[0].isFile, true);
+});
+
+Deno.test("if the 'root.txt' is returned when the where clause has isFile = false", async () => {
+  const query: IQuery = {
+    type: "select",
+    fields: ["*"],
+    from: "root",
+    where: {
+      conditions: [
+        {
+          left: "isFile",
+          op: "Equal",
+          right: "false",
+        },
+      ],
+    },
+  };
+
+  const result = await select(query);
+
+  assert(result.length === 3);
+  const names = result.map((i) => i.name as string);
+  const expectedNames = [
+    "test_folder_with_file",
+    "test_folder_with_files",
+    "test_folder_with_folder",
+  ];
+  assertArrayIncludes<string>(names, expectedNames);
+});
+
+Deno.test("if the 'root.txt' is returned when the where clause has isFile <> false", async () => {
+  const query: IQuery = {
+    type: "select",
+    fields: ["*"],
+    from: "root",
+    where: {
+      conditions: [
+        {
+          left: "isFile",
+          op: "Different",
+          right: "false",
+        },
+      ],
+    },
+  };
+
+  const result = await select(query);
+
+  assert(result.length === 1);
+  assertEquals(result[0].name, "root.txt");
+  assertEquals(result[0].isDirectory, false);
+  assertEquals(result[0].isFile, true);
+});
+
+Deno.test("if 3 folders are returned when the where clause has isFile <> true", async () => {
+  const query: IQuery = {
+    type: "select",
+    fields: ["*"],
+    from: "root",
+    where: {
+      conditions: [
+        {
+          left: "isFile",
+          op: "Different",
+          right: "true",
+        },
+      ],
+    },
+  };
+
+  const result = await select(query);
+
+  assert(result.length === 3);
+  const names = result.map((i) => i.name as string);
+  const expectedNames = [
+    "test_folder_with_file",
+    "test_folder_with_files",
+    "test_folder_with_folder",
+  ];
+  assertArrayIncludes<string>(names, expectedNames);
+});

where.ts

@@ -52,6 +52,23 @@ function meet(entry: IDirEntry, condition: IWhereCondition): boolean {
     }
 
     return operation(entry.isDirectory, JSON.parse(right as string));
+  } else if (left === "isFile") {
+    const operations = {
+      "GreaterThan": null,
+      "LessThan": null,
+      "Equal": equalBoolean,
+      "Different": differentBoolean,
+      "Like": null,
+    };
+
+    const operation = operations[op];
+    if (!operation) {
+      throw new Error(
+        `The operation '${op}' is not supported for the '${left}' property`,
+      );
+    }
+
+    return operation(entry.isFile, JSON.parse(right as string));
   }
 
   return false;