Multiple Conditions

README.md

@@ -62,7 +62,7 @@ const client = createFeatureFlagClient({
 
 ### Add properties to client
 
-Secondly we want add some attributes we can use in the condition in each of the feature flags we are creating later. You are allowed to use `string`, `number` or `boolean` types as a property
+Secondly we want add some attributes we can use in the condition(s) in each of the feature flags we are creating later. You are allowed to use `string`, `number` or `boolean` types as a property
 
 ```ts
 import { createFeatureFlagClient } from "toggle-kit";
@@ -82,7 +82,7 @@ const client = createFeatureFlagClient({
 
 ### Create feature flag
 
-Last but not least, we want to create our first flag. Here we specify a name for the feature flag and select the type of condition we want to evaluate upon. Then we select the property we want to evaluate, and an expected value.
+Last but not least, we want to create our first flag. Here we specify a name for the feature flag and select the type of condition(s) we want to evaluate upon. Then we select the property we want to evaluate, and an expected value.
 
 ```ts
 import { createFeatureFlagClient } from "toggle-kit";
@@ -97,11 +97,13 @@ const client = createFeatureFlagClient({
   flags: [
     {
       name: "secret-page",
-      condition: {
-        type: "equal",
-        attribute: "email",
-        expectedValue: "test@example.com",
-      },
+      conditions: [
+        {
+          type: "equal",
+          attribute: "email",
+          expectedValue: "test@example.com",
+        },
+      ],
     },
   ],
 });
@@ -124,11 +126,13 @@ const client = createFeatureFlagClient({
   flags: [
     {
       name: "secret-page",
-      condition: {
-        type: "equal",
-        attribute: "email",
-        expectedValue: "test@example.com",
-      },
+      conditions: [
+        {
+          type: "equal",
+          attribute: "email",
+          expectedValue: "test@example.com",
+        },
+      ],
     },
   ],
 });

docs/conditions/contains.md

@@ -13,19 +13,23 @@ const client = createFeatureFlagClient({
   flags: [
     {
       name: "is-admin",
-      condition: {
-        type: "contains",
-        attribute: "roles",
-        expectedValue: "admin",
-      },
+      conditions: [
+        {
+          type: "contains",
+          attribute: "roles",
+          expectedValue: "admin",
+        },
+      ],
     },
     {
       name: "is-gmail",
-      condition: {
-        type: "contains",
-        attribute: "email",
-        expectedValue: "@gmail.com",
-      },
+      conditions: [
+        {
+          type: "contains",
+          attribute: "email",
+          expectedValue: "@gmail.com",
+        },
+      ],
     },
   ],
 });

docs/conditions/endsWith.md

@@ -12,19 +12,23 @@ const client = createFeatureFlagClient({
   flags: [
     {
       name: "is-example-mail",
-      condition: {
-        type: "endsWith",
-        attribute: "email",
-        expectedValue: "@example.com",
-      },
+      conditions: [
+        {
+          type: "endsWith",
+          attribute: "email",
+          expectedValue: "@example.com",
+        },
+      ],
     },
     {
       name: "is-google-mail",
-      condition: {
-        type: "endsWith",
-        attribute: "email",
-        expectedValue: "@gmail.com",
-      },
+      conditions: [
+        {
+          type: "endsWith",
+          attribute: "email",
+          expectedValue: "@gmail.com",
+        },
+      ],
     },
   ],
 });

docs/conditions/equal.md

@@ -12,19 +12,23 @@ const client = createFeatureFlagClient({
   flags: [
     {
       name: "is-john",
-      condition: {
-        type: "equal",
-        attribute: "username",
-        expectedValue: "JohnDoe",
-      },
+      conditions: [
+        {
+          type: "equal",
+          attribute: "username",
+          expectedValue: "JohnDoe",
+        },
+      ],
     },
     {
       name: "is-jane",
-      condition: {
-        type: "equal",
-        attribute: "username",
-        expectedValue: "JaneDoe",
-      },
+      conditions: [
+        {
+          type: "equal",
+          attribute: "username",
+          expectedValue: "JaneDoe",
+        },
+      ],
     },
   ],
 });

docs/conditions/greaterThan.md

@@ -12,11 +12,13 @@ const client = createFeatureFlagClient({
   flags: [
     {
       name: "is-adult",
-      condition: {
-        type: "greaterThan",
-        attribute: "age",
-        expectedValue: 20,
-      },
+      conditions: [
+        {
+          type: "greaterThan",
+          attribute: "age",
+          expectedValue: 20,
+        },
+      ],
     },
   ],
 });

docs/conditions/lessThan.md

@@ -12,11 +12,13 @@ const client = createFeatureFlagClient({
   flags: [
     {
       name: "is-child",
-      condition: {
-        type: "lessThan",
-        attribute: "age",
-        expectedValue: 21,
-      },
+      conditions: [
+        {
+          type: "lessThan",
+          attribute: "age",
+          expectedValue: 21,
+        },
+      ],
     },
   ],
 });

docs/conditions/percentage.md

@@ -12,11 +12,13 @@ const client = createFeatureFlagClient({
   flags: [
     {
       name: "is-lucky",
-      condition: {
-        type: "percentage",
-        attribute: "userId",
-        expectedValue: 50,
-      },
+      conditions: [
+        {
+          type: "percentage",
+          attribute: "userId",
+          expectedValue: 50,
+        },
+      ],
     },
   ],
 });

docs/conditions/regex.md

@@ -12,11 +12,13 @@ const client = createFeatureFlagClient({
   flags: [
     {
       name: "is-gmail",
-      condition: {
-        type: "regex",
-        attribute: "email",
-        expectedValue: /.+@gmail\.com/,
-      },
+      conditions: [
+        {
+          type: "regex",
+          attribute: "email",
+          expectedValue: /.+@gmail\.com/,
+        },
+      ],
     },
   ],
 });

docs/conditions/startsWith.md

@@ -12,11 +12,13 @@ const client = createFeatureFlagClient({
   flags: [
     {
       name: "is-john",
-      condition: {
-        type: "startsWith",
-        attribute: "username",
-        expectedValue: "john",
-      },
+      conditions: [
+        {
+          type: "startsWith",
+          attribute: "username",
+          expectedValue: "john",
+        },
+      ],
     },
   ],
 });

docs/usages/simple.md

@@ -15,11 +15,13 @@ const client = createFeatureFlagClient({
   flags: [
     {
       name: "secret-page", // No autocompletion
-      condition: {
-        type: "equal",
-        attribute: "email", // No autocompletion
-        expectedValue: "test@example.com",
-      },
+      conditions: [
+        {
+          type: "equal",
+          attribute: "email", // No autocompletion
+          expectedValue: "test@example.com",
+        },
+      ],
     },
   ],
 });

docs/usages/structured.md

@@ -39,11 +39,13 @@ type FlagNames = "secret-page";
 const flags: FeatureFlag<PropertyNames, FlagNames>[] = [
   {
     name: "secret-page", // <--- Autocompletion
-    condition: {
-      type: "equal",
-      attribute: "email", // <--- Autocompletion
-      expectedValue: "test@example.com",
-    },
+    conditions: [
+      {
+        type: "equal",
+        attribute: "email", // <--- Autocompletion
+        expectedValue: "test@example.com",
+      },
+    ],
   },
 ];
 

docs/usages/typed.md

@@ -28,7 +28,7 @@ const client = createFeatureFlagClient<PropertyNames, FlagNames>({
   flags: [
     {
       name: "secret-page", // <--- Autocompletion
-      condition: {
+      conditions: {
         type: "equal",
         attribute: "email", // <--- Autocompletion
         expectedValue: "test@example.com",
@@ -62,7 +62,7 @@ const client = createFeatureFlagClient<string, FlagNames>({
   flags: [
     {
       name: "secret-page", // <--- Autocompletion
-      condition: {
+      conditions: {
         type: "equal",
         attribute: "email", // <--- No Autocompletion
         expectedValue: "test@example.com",
@@ -94,7 +94,7 @@ const client = createFeatureFlagClient<string, string>({
   flags: [
     {
       name: "secret-page", // <--- No Autocompletion
-      condition: {
+      conditions: {
         type: "equal",
         attribute: "email", // <--- No Autocompletion
         expectedValue: "test@example.com",

src/conditions/contains/contains.test.ts

@@ -28,11 +28,13 @@ describe("Condition - Contains", () => {
       flags: [
         {
           name: "admin-dashboard",
-          condition: {
-            type: "contains",
-            attribute: "roles",
-            expectedValue: "admin",
-          },
+          conditions: [
+            {
+              type: "contains",
+              attribute: "roles",
+              expectedValue: "admin",
+            },
+          ],
         },
       ],
     });

src/conditions/endsWith/endsWith.test.ts

@@ -28,11 +28,13 @@ describe("Condition - Ends With", () => {
       flags: [
         {
           name: "example-emails",
-          condition: {
-            type: "endsWith",
-            attribute: "email",
-            expectedValue: "example.com",
-          },
+          conditions: [
+            {
+              type: "endsWith",
+              attribute: "email",
+              expectedValue: "example.com",
+            },
+          ],
         },
       ],
     });

src/conditions/equal/equal.test.ts

@@ -28,11 +28,13 @@ describe("Condition - Equal", () => {
       flags: [
         {
           name: "is-admin",
-          condition: {
-            type: "equal",
-            attribute: "isAdmin",
-            expectedValue: true,
-          },
+          conditions: [
+            {
+              type: "equal",
+              attribute: "isAdmin",
+              expectedValue: true,
+            },
+          ],
         },
       ],
     });

src/conditions/greaterThan/greaterThan.test.ts

@@ -36,11 +36,13 @@ describe("Condition - Greater Than", () => {
       flags: [
         {
           name: "is-adult",
-          condition: {
-            type: "greaterThan",
-            attribute: "age",
-            expectedValue: 21,
-          },
+          conditions: [
+            {
+              type: "greaterThan",
+              attribute: "age",
+              expectedValue: 21,
+            },
+          ],
         },
       ],
     });