@posx/core 5.5.339 → 5.5.350

package/build/index.js

@@ -3035,24 +3035,53 @@ const inArray = function(value, ...args) {
 	const options = args.pop();
 	return getValue(args.includes(value), this, options);
 };
+const getByPath = (obj, path) => {
+	if (!obj || !path) return void 0;
+	return path.split(".").reduce((o, k) => o?.[k], obj);
+};
+const parseConditions = (args) => {
+	const conditions = [];
+	for (let i = 0; i < args.length - 1; i += 2) if (typeof args[i] === "string" && !isOptions(args[i + 1])) conditions.push({
+		prop: args[i],
+		value: args[i + 1]
+	});
+	return conditions;
+};
+/**
+* Find first object matching ALL conditions (AND logic)
+* {{findAnd categories "name" "Topping" "active" true}}
+*/
+const findAnd = function(collection, ...args) {
+	if (!Array.isArray(collection)) return null;
+	const conditions = parseConditions(args);
+	return collection.find((item) => conditions.every((c) => getByPath(item, c.prop) === c.value)) || null;
+};
 /**
-* Find first object in array by property, returns the object for chaining
-* {{findBy modifiers "category_uid" "imc_xxx"}} - returns first matching object
-* {{lookup (findBy modifiers "category_uid" "imc_xxx") "name"}} - get name of found object
+* Find first object matching ANY condition (OR logic)
+* {{findOr categories "name" "Topping" "name" "Topping one"}}
 */
-const findBy = function(collection, prop, value) {
+const findOr = function(collection, ...args) {
 	if (!Array.isArray(collection)) return null;
-	return collection.find((item) => item && item[prop] === value) || null;
+	const conditions = parseConditions(args);
+	return collection.find((item) => conditions.some((c) => getByPath(item, c.prop) === c.value)) || null;
+};
+/**
+* Filter array matching ALL conditions (AND logic)
+* {{filterAnd modifiers "item.category_uid" "imc_xxx" "price" 0}}
+*/
+const filterAnd = function(collection, ...args) {
+	if (!Array.isArray(collection)) return [];
+	const conditions = parseConditions(args);
+	return collection.filter((item) => conditions.every((c) => getByPath(item, c.prop) === c.value));
 };
 /**
-* Filter array by property value, returns array for indexing
-* {{filterBy modifiers "category_uid" "imc_xxx"}} - returns matching array
-* {{lookup (filterBy modifiers "category_uid" "imc_xxx") 0}} - get first match
-* {{lookup (lookup (filterBy modifiers "category_uid" "imc_xxx") 0) "name"}} - get name of first match
+* Filter array matching ANY condition (OR logic)
+* {{filterOr modifiers "name" "Topping" "name" "Topping one"}}
 */
-const filterBy = function(collection, prop, value) {
+const filterOr = function(collection, ...args) {
 	if (!Array.isArray(collection)) return [];
-	return collection.filter((item) => item && item[prop] === value);
+	const conditions = parseConditions(args);
+	return collection.filter((item) => conditions.some((c) => getByPath(item, c.prop) === c.value));
 };
 /**
 * Returns the first truthy value, or default
@@ -3106,8 +3135,10 @@ const comparisonHelpers = {
 	contains,
 	includes,
 	in: inArray,
-	findBy,
-	filterBy,
+	findAnd,
+	findOr,
+	filterAnd,
+	filterOr,
 	default: defaultValue,
 	neither,
 	ifEven,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posx/core",
-  "version": "5.5.339",
+  "version": "5.5.350",
   "description": "POSX core libraries",
   "main": "./build/index.js",
   "author": "Steven Lee",

package/package.publish.json

@@ -1,6 +1,6 @@
 {
   "name": "@posx/core",
-  "version": "5.5.339",
+  "version": "5.5.350",
   "description": "POSX core libraries",
   "type": "module",
   "main": "./build/index.js",