Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/flag-evaluation/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bucketco/flag-evaluation",
"version": "0.1.4",
"version": "0.1.5",
"license": "MIT",
"repository": {
"type": "git",
Expand Down
56 changes: 39 additions & 17 deletions packages/flag-evaluation/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -203,25 +203,43 @@ export interface Rule<T extends RuleValue> {
* @return {Record<string, string>} A flattened JSON object with "stringified" keys and values.
*/
export function flattenJSON(data: object): Record<string, string> {
if (Object.keys(data).length === 0) return {};
const result: Record<string, any> = {};
function recurse(cur: any, prop: string) {
if (Object(cur) !== cur) {
result[prop] = cur;
} else if (Array.isArray(cur)) {
const l = cur.length;
for (let i = 0; i < l; i++)
recurse(cur[i], prop ? prop + "." + i : "" + i);
if (l == 0) result[prop] = [];
const result: Record<string, string> = {};

if (Object.keys(data).length === 0) {
return result;
}

function recurse(value: any, prop: string) {
if (value === undefined) {
return;
}

if (value === null) {
result[prop] = "";
} else if (typeof value !== "object") {
result[prop] = String(value);
} else if (Array.isArray(value)) {
if (value.length === 0) {
result[prop] = "";
}

for (let i = 0; i < value.length; i++) {
recurse(value[i], prop ? prop + "." + i : "" + i);
}
} else {
let isEmpty = true;
for (const p in cur) {

for (const p in value) {
isEmpty = false;
recurse(cur[p], prop ? prop + "." + p : p);
recurse(value[p], prop ? prop + "." + p : p);
}

if (isEmpty) {
result[prop] = "";
}
if (isEmpty) result[prop] = {};
}
}

recurse(data, "");
return result;
}
Expand Down Expand Up @@ -325,9 +343,9 @@ export function evaluate(
: fieldValueDate < daysAgo.getTime();
}
case "SET":
return fieldValue != "";
return fieldValue !== "";
case "NOT_SET":
return fieldValue == "";
return fieldValue === "";
case "IS":
return fieldValue === value;
case "IS_NOT":
Expand Down Expand Up @@ -357,13 +375,17 @@ function evaluateRecursively(
case "constant":
return filter.value;
case "context":
if (!(filter.field in context)) {
if (
!(filter.field in context) &&
filter.operator !== "SET" &&
filter.operator !== "NOT_SET"
) {
missingContextFieldsSet.add(filter.field);
return false;
}

return evaluate(
context[filter.field],
context[filter.field] ?? "",
filter.operator,
filter.values || [],
filter.valueSet,
Expand Down
Loading