improved and optimised

Author: iqbal-rashed

README.md

@@ -20,46 +20,46 @@ The `rswitch` function takes a key and an object containing cases and actions. I
 rswitch(key, casesObj, options);
 ```
 
--   `key` : The value to evaluate against the cases.
--   `casesObj` : An object containing cases and their actions.
--   `options` : (Optional) An object to customize the behavior of the rswitch function.
-    -   `returnFunction` (optional, default: false): If set to `false`, the `rswitch` function will call actions that are functions and return their values. If set to `true`, the function will return the functions as is.
+- `key` : The value to evaluate against the cases.
+- `casesObj` : An object containing cases and their actions.
+- `options` : (Optional) An object to customize the behavior of the rswitch function.
+  - `returnFn` (optional, default: false): If set to `false`, the `rswitch` function will call actions that are functions and return their values. If set to `true`, the function will return the functions as is.
 
 ### Example
 
 ```javascript
-import { rswitch } from "rswitch";
+import rswitch from "rswitch";
 // const {rswitch} = require("rswitch") // commonjs
 
 const result = rswitch(
-    "dev",
-    {
-        designer: "Designer",
-        "dev, web": "Freelancer",
-        "": () => {
-            console.log("Hello");
-        },
+  "dev",
+  {
+    designer: "Designer",
+    "dev, web": "Developer",
+    "": () => {
+      console.log("Hello");
     },
-    {
-        returnFunction: true,
-    }
+  },
+  {
+    returnFn: true,
+  }
 );
 
 console.log(result);
-// Output: Freelancer
+// Output: Developer
 ```
 
-In this example, the `rswitch` function evaluates the key `'dev'` against the cases defined in `casesObj`. Since it matches the case `'dev, web'`, the corresponding action `'Freelancer'` is returned and assigned to the `result` variable. Finally, the value of `result` is logged to the console.
+In this example, the `rswitch` function evaluates the key `'dev'` against the cases defined in `casesObj`. Since it matches the case `'dev, web'`, the corresponding action `'Developer'` is returned and assigned to the `result` variable. Finally, the value of `result` is logged to the console.
 
 ### Case Definitions
 
 Cases are defined as key-value pairs in the `casesObj` object.
 
--   Single Case: `{ caseKey: action }`
--   Multiple Cases: `{ 'case1, case2, case3': action }`
--   Default Case: `{ '': action }`
+- Single Case: `{ caseKey: action }`
+- Multiple Cases: `{ 'case1, case2, case3': action }`
+- Default Case: `{ '': action }`
 
-> Actions can be any value or a function that returns a value. If the action is a function, and the `options` object has `returnFunction` set to `false`, it is called, and the returned value is returned.
+> Actions can be any value or a function that returns a value. If the action is a function, and the `options` object has `returnFn` set to `false`, it is called, and the returned value is returned.
 
 If no cases match the evaluated key, the `rswitch` function checks for a default case. If a default case is defined, its corresponding action is performed. If no default case is defined or its action is not provided, `undefined` is returned.
 

jest.config.js

@@ -0,0 +1,5 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+};

package.json

@@ -1,7 +1,7 @@
 {
   "name": "rswitch",
   "description": "The rswitch library provides a compact and flexible way to implement switch-like functionality in JavaScript. It allows you to define cases and their corresponding actions using an object literal syntax.",
-  "version": "0.2.0",
+  "version": "0.7.0-beta",
   "author": "Rashed Iqbal",
   "files": [
     "dist"
@@ -17,7 +17,8 @@
   "module": "./dist/rswitch.es.js",
   "types": "./dist/index.d.ts",
   "scripts": {
-    "build": "tsc && vite build"
+    "build": "tsc && vite build",
+    "test": "jest --verbose false"
   },
   "repository": {
     "type": "git",
@@ -35,7 +36,10 @@
   "homepage": "https://github.com/iqbal-rashed/rswitch",
   "license": "MIT",
   "devDependencies": {
+    "@types/jest": "^29.5.12",
     "@types/node": "^20.4.5",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.2",
     "typescript": "^5.0.2",
     "vite": "^4.4.5",
     "vite-plugin-dts": "^3.4.0",

src/index.ts

@@ -3,32 +3,33 @@ type RSwitch = {
 };
 
 type Options = {
-  returnFunction?: boolean;
+  returnFn?: boolean;
 };
 
-function rswitch(
-  key: string | undefined,
-  rswitch: RSwitch,
+export function rswitch<T = any>(
+  rcase: string | number | undefined | null,
+  rs: RSwitch,
   options?: Options
-): any {
-  const fnCall = options?.returnFunction || false;
-
-  const value = rswitch[key!];
-
-  const filtered = Object.keys(rswitch).filter((v) => v.includes(","));
-
-  const keys = filtered.flatMap((v) => v.split(",")).map((v) => v.trim());
-  if (!value) {
-    if (keys.includes(key!)) {
-      const findKey = filtered.find((v) => v.includes(key!));
-      const multiValue = rswitch[findKey!];
-      return typeof multiValue === "function" && !fnCall
-        ? multiValue()
-        : multiValue;
+): T | undefined {
+  for (const [key, value] of Array.isArray(rs) ? rs : Object.entries(rs)) {
+    if (key.includes(",")) {
+      let spiltKey = key.split(",").map((v: string) => v.trim());
+      if (spiltKey.includes(String(rcase))) {
+        return returnFunction(value, options);
+      }
+    }
+    if (key === String(rcase)) {
+      return returnFunction(value, options);
+    }
+    if (key === "") {
+      return returnFunction(value, options);
     }
-    const _default = rswitch[""];
-    return typeof _default === "function" && !fnCall ? _default() : _default;
-  } else {
-    return typeof value === "function" && !fnCall ? value() : value;
   }
 }
+
+function returnFunction(value: any, options?: Options) {
+  const returnFn = options?.returnFn || false;
+  return typeof value === "function" ? (!returnFn ? value() : value) : value;
+}
+
+export default rswitch;

tests/index.test.ts

@@ -0,0 +1,39 @@
+import { rswitch } from "../src/index";
+
+test("first try", () => {
+  expect(rswitch(1, { "1": () => "Hello", "2": "World" })).toBe("Hello");
+});
+
+test("check default value", () => {
+  expect(
+    rswitch("default", { "1": "one", "2": "two", "3": "three", "": "default" })
+  ).toBe("default");
+});
+
+test("check null key", () => {
+  expect(
+    rswitch(null, { "1": "one", "2": "two", "3": "three", "": "default" })
+  ).toBe("default");
+});
+
+test("check undefined key", () => {
+  expect(
+    rswitch(undefined, { "1": "one", "2": "two", "3": "three", "": "default" })
+  ).toBe("default");
+});
+
+test("check number key", () => {
+  expect(
+    rswitch(2, { "1": "one", "2": "two", "3": "three", "": "default" })
+  ).toBe("two");
+});
+
+test("check mulitple case", () => {
+  expect(
+    rswitch("2", {
+      "1": "one",
+      "hello, 2": "two",
+      "": "default",
+    })
+  ).toBe("two");
+});