@ng-forge/dynamic-forms 1.3.0-next.3 → 1.3.0-next.4

package/fesm2022/ng-forge-dynamic-forms-internal.mjs

@@ -490,18 +490,19 @@ var AsyncConditionFunctionCacheService = class {
 	asyncConditionFunctionCache = /* @__PURE__ */ new Map();
 };
 function compareValues(actual, expected, operator) {
+	const empty = actual === null || actual === void 0 || actual === "";
 	switch (operator) {
 		case "equals": return actual === expected;
 		case "notEquals": return actual !== expected;
-		case "greater": return Number(actual) > Number(expected);
-		case "less": return Number(actual) < Number(expected);
-		case "greaterOrEqual": return Number(actual) >= Number(expected);
-		case "lessOrEqual": return Number(actual) <= Number(expected);
-		case "contains": return String(actual).includes(String(expected));
-		case "startsWith": return String(actual).startsWith(String(expected));
-		case "endsWith": return String(actual).endsWith(String(expected));
+		case "greater": return !empty && Number(actual) > Number(expected);
+		case "less": return !empty && Number(actual) < Number(expected);
+		case "greaterOrEqual": return !empty && Number(actual) >= Number(expected);
+		case "lessOrEqual": return !empty && Number(actual) <= Number(expected);
+		case "contains": return !empty && String(actual).includes(String(expected));
+		case "startsWith": return !empty && String(actual).startsWith(String(expected));
+		case "endsWith": return !empty && String(actual).endsWith(String(expected));
 		case "matches": try {
-			return toRegExp(String(expected)).test(String(actual));
+			return toRegExp(String(expected)).test(empty ? "" : String(actual));
 		} catch {
 			return false;
 		}
@@ -549,6 +550,7 @@ var TokenType;
 	TokenType["LESS_EQUAL"] = "LESS_EQUAL";
 	TokenType["AND"] = "AND";
 	TokenType["OR"] = "OR";
+	TokenType["NULLISH"] = "NULLISH";
 	TokenType["NOT"] = "NOT";
 	TokenType["DOT"] = "DOT";
 	TokenType["COMMA"] = "COMMA";
@@ -764,6 +766,13 @@ var Tokenizer = class {
 					value: "=>",
 					position: start
 				};
+			case "??":
+				this.position += 2;
+				return {
+					type: TokenType.NULLISH,
+					value: "??",
+					position: start
+				};
 			case "?.":
 				this.position += 2;
 				return {
@@ -893,7 +902,7 @@ var Parser = class {
 		return this.parseConditional();
 	}
 	parseConditional() {
-		const test = this.parseLogicalOr();
+		const test = this.parseShortCircuit();
 		if (!this.match(TokenType.QUESTION)) return test;
 		const consequent = this.parseExpression();
 		this.consume(TokenType.COLON, "Expected \":\" between ternary branches");
@@ -956,8 +965,28 @@ var Parser = class {
 		if (index < 0 || index >= this.tokens.length) return false;
 		return this.tokens[index].type === type;
 	}
-	parseLogicalOr() {
-		let node = this.parseLogicalAnd();
+	parseShortCircuit() {
+		const first = this.parseEquality();
+		if (!this.check(TokenType.NULLISH)) {
+			const node = this.parseLogicalOr(first);
+			if (this.check(TokenType.NULLISH)) this.throwMixedNullish();
+			return node;
+		}
+		let node = first;
+		while (this.match(TokenType.NULLISH)) node = {
+			type: "BinaryOp",
+			operator: "??",
+			left: node,
+			right: this.parseEquality()
+		};
+		if (this.check(TokenType.AND) || this.check(TokenType.OR)) this.throwMixedNullish();
+		return node;
+	}
+	throwMixedNullish() {
+		throw new ExpressionParserError("Cannot mix \"??\" with \"&&\" or \"||\" without parentheses", this.peek().position, this.expression);
+	}
+	parseLogicalOr(first) {
+		let node = this.parseLogicalAnd(first);
 		while (this.match(TokenType.OR)) {
 			const operator = this.previous().value;
 			const right = this.parseLogicalAnd();
@@ -970,8 +999,8 @@ var Parser = class {
 		}
 		return node;
 	}
-	parseLogicalAnd() {
-		let node = this.parseEquality();
+	parseLogicalAnd(first) {
+		let node = first ?? this.parseEquality();
 		while (this.match(TokenType.AND)) {
 			const operator = this.previous().value;
 			const right = this.parseEquality();
@@ -1298,6 +1327,7 @@ const SAFE_METHODS = {
 		"toUTCString"
 	])
 };
+const ALLOWED_METHOD_NAMES = new Set(Object.values(SAFE_METHODS).flatMap((methods) => [...methods]));
 const BLOCKED_PROPERTIES = /* @__PURE__ */ new Set([
 	"constructor",
 	"__proto__",
@@ -1357,6 +1387,7 @@ var Evaluator = class Evaluator {
 			const left = this.evaluate(node.left);
 			return left ? left : this.evaluate(node.right);
 		}
+		if (node.operator === "??") return this.evaluate(node.left) ?? this.evaluate(node.right);
 		const left = this.evaluate(node.left);
 		const right = this.evaluate(node.right);
 		switch (node.operator) {
@@ -2412,6 +2443,70 @@ function createDebouncedLogicFunction(expression, debounceMs) {
 	if (cacheable) cacheService.debouncedLogicFunctionCache.set(cacheKey, fn);
 	return fn;
 }
+const CONDITION_SCOPE_VARIABLES = /* @__PURE__ */ new Set([
+	"fieldValue",
+	"formValue",
+	"fieldPath",
+	"customFunctions",
+	"groupValue",
+	"rootFormValue",
+	"arrayIndex",
+	"arrayPath",
+	"externalData",
+	"fieldState",
+	"formFieldState"
+]);
+function findStaticExpressionProblems(ast, scope) {
+	const problems = /* @__PURE__ */ new Set();
+	const visit = (node, locals) => {
+		switch (node.type) {
+			case "Identifier":
+				if (!scope.has(node.name) && !locals.has(node.name)) problems.add(`'${node.name}' is not available in expressions`);
+				return;
+			case "MemberAccess":
+				visit(node.object, locals);
+				return;
+			case "ComputedMemberAccess":
+				visit(node.object, locals);
+				visit(node.property, locals);
+				return;
+			case "CallExpression":
+				if (node.callee.type === "MemberAccess") {
+					if (!ALLOWED_METHOD_NAMES.has(node.callee.property)) problems.add(`method '${node.callee.property}' is not allowed`);
+				} else problems.add(`'${describeCallee(node.callee)}(...)' is a direct function call; only allowed methods can be called`);
+				visit(node.callee.type === "MemberAccess" ? node.callee.object : node.callee, locals);
+				node.arguments.forEach((arg) => visit(arg, locals));
+				return;
+			case "BinaryOp":
+				visit(node.left, locals);
+				visit(node.right, locals);
+				return;
+			case "UnaryOp":
+				visit(node.operand, locals);
+				return;
+			case "Conditional":
+				visit(node.test, locals);
+				visit(node.consequent, locals);
+				visit(node.alternate, locals);
+				return;
+			case "ArrayLiteral":
+				node.elements.forEach((element) => visit(element, locals));
+				return;
+			case "ObjectLiteral":
+				node.properties.forEach((property) => visit(property.value, locals));
+				return;
+			case "ArrowFunction":
+				visit(node.body, /* @__PURE__ */ new Set([...locals, ...node.params]));
+				return;
+			case "Literal": return;
+		}
+	};
+	visit(ast, /* @__PURE__ */ new Set());
+	return [...problems];
+}
+function describeCallee(node) {
+	return node.type === "Identifier" ? node.name : "expression";
+}
 function getArrayLength(arrayFieldTree) {
 	const value = arrayFieldTree().value();
 	return Array.isArray(value) ? value.length : 0;
@@ -3667,6 +3762,6 @@ function provideFieldErrorDisplay(wrapper) {
 		useExisting: forwardRef(wrapper)
 	};
 }
-export { ADDON_ACTION_HANDLERS, ADDON_ACTION_REGISTRY, ADDON_TYPE_COMPONENT_CACHE, ADDON_TYPE_DEFINITIONS, ADDON_TYPE_REGISTRY, ARRAY_CONTEXT, AsyncConditionFunctionCacheService, ComponentInitializedEvent, DEFAULT_PROPS, DEFAULT_VALIDATION_MESSAGES, DEFAULT_WRAPPERS, DEPRECATION_WARNING_TRACKER, DF_FIELD_TEMPLATES, DfAddonSlot, DynamicFormError, DynamicFormLogger, DynamicTextPipe, DynamicValueFunctionCacheService, EMIT_FORM_VALUE_ON_EVENTS, EXTERNAL_DATA, EventBus, ExpressionParser, ExpressionParserError, FIELD_ERROR_DISPLAY, FIELD_REGISTRY, FIELD_SIGNAL_CONTEXT, FORM_ID_PREFIX, FORM_OPTIONS, FieldContextRegistryService, FieldErrorsWrapperBase, FunctionRegistryService, GROUP_CONTEXT, HTTP_CONDITION_CACHE, HttpConditionCache, HttpConditionFunctionCacheService, INITIALIZATION_TIMEOUT_MS, LogicFunctionCacheService, NoopLogger, READONLY_FIELD_TREE_CACHE, RootFormRegistryService, TokenType, WRAPPER_AUTO_ASSOCIATIONS, WRAPPER_COMPONENT_CACHE, WRAPPER_COMPONENT_LOAD_CACHE, WRAPPER_REGISTRY, applyMetaToElement, applyValidator, applyValidators, arrayFieldMapper, assertNever, baseFieldMapper, buildBaseInputs, buildClassName, compareValues, containerFieldMapper, createAddonActionRegistry, createDebouncedLogicFunction, createDefaultDerivationLogConfig, createDynamicValueFunction, createFieldValueProxy, createFormFieldStateMap, createFormStateLogicFunction, createInitializationTracker, createLogicFunction, createResolvedErrorsSignal, createWarningTracker, deepMergeDefaults, derivedFromDeferred, detectFormMode, dynamicTextToObservable, evaluateCondition, evaluateNonFieldDisabled, evaluateNonFieldHidden, extractExpressionDependencies, extractStringDependencies, getArrayLength, getChangedKeys, getChangedKeysWithin, getFieldValueHandling, getGridClassString, getNestedValue, groupFieldMapper, hasChildFields, hasCrossFieldWhenCondition, hasFormValue, hasNestedProperty, hasTargetProperty, injectAddonTypeRegistry, injectFieldErrors, injectFieldSignalContext, injectFieldsSupportingAddons, injectNonFieldEvaluationContext, interpolateParams, isArrayField, isCheckedField, isContainerField, isCrossFieldBuiltInValidator, isCrossFieldExpression, isCrossFieldSchema, isCrossFieldStateLogic, isCrossFieldValidator, isDerivationLogicConfig, isDisplayOnlyField, isEqual, isFieldBoundContext, isFormStateCondition, isFunctionHttpValidator, isGenericContainerField, isGroupField, isHiddenField, isLeafField, isNonPagedForm, isPageField, isPagedForm, isResourceBasedValidator, isRowField, isSimplifiedArrayField, isStateLogicConfig, isValidNonPagedForm, isValidPagedForm, isValueBearingField, isValueField, isWrapperTypeDefinition, keyBy, mapValues, memoize, normalizeFieldsArray, omit, pageFieldMapper, provideFieldErrorDisplay, readFieldStateInfo, resolveDynamicValue, resolveHttpRequest, resolveNextButtonDisabled, resolveNonFieldDisabled, resolveNonFieldHidden, resolveSubmitButtonDisabled, resolveTokens, rowError, rowFieldMapper, runPresetAction, setupInitializationTracking, shouldLog, shouldShowErrors, textFieldMapper, toReadonlyFieldTree, toReadonlyFieldTreeCached, validatePageNesting, withPreviousValue, writeToFieldValue };
+export { ADDON_ACTION_HANDLERS, ADDON_ACTION_REGISTRY, ADDON_TYPE_COMPONENT_CACHE, ADDON_TYPE_DEFINITIONS, ADDON_TYPE_REGISTRY, ARRAY_CONTEXT, AsyncConditionFunctionCacheService, CONDITION_SCOPE_VARIABLES, ComponentInitializedEvent, DEFAULT_PROPS, DEFAULT_VALIDATION_MESSAGES, DEFAULT_WRAPPERS, DEPRECATION_WARNING_TRACKER, DF_FIELD_TEMPLATES, DfAddonSlot, DynamicFormError, DynamicFormLogger, DynamicTextPipe, DynamicValueFunctionCacheService, EMIT_FORM_VALUE_ON_EVENTS, EXTERNAL_DATA, EventBus, ExpressionParser, ExpressionParserError, FIELD_ERROR_DISPLAY, FIELD_REGISTRY, FIELD_SIGNAL_CONTEXT, FORM_ID_PREFIX, FORM_OPTIONS, FieldContextRegistryService, FieldErrorsWrapperBase, FunctionRegistryService, GROUP_CONTEXT, HTTP_CONDITION_CACHE, HttpConditionCache, HttpConditionFunctionCacheService, INITIALIZATION_TIMEOUT_MS, LogicFunctionCacheService, NoopLogger, READONLY_FIELD_TREE_CACHE, RootFormRegistryService, TokenType, WRAPPER_AUTO_ASSOCIATIONS, WRAPPER_COMPONENT_CACHE, WRAPPER_COMPONENT_LOAD_CACHE, WRAPPER_REGISTRY, applyMetaToElement, applyValidator, applyValidators, arrayFieldMapper, assertNever, baseFieldMapper, buildBaseInputs, buildClassName, compareValues, containerFieldMapper, createAddonActionRegistry, createDebouncedLogicFunction, createDefaultDerivationLogConfig, createDynamicValueFunction, createFieldValueProxy, createFormFieldStateMap, createFormStateLogicFunction, createInitializationTracker, createLogicFunction, createResolvedErrorsSignal, createWarningTracker, deepMergeDefaults, derivedFromDeferred, detectFormMode, dynamicTextToObservable, evaluateCondition, evaluateNonFieldDisabled, evaluateNonFieldHidden, extractExpressionDependencies, extractStringDependencies, findStaticExpressionProblems, getArrayLength, getChangedKeys, getChangedKeysWithin, getFieldValueHandling, getGridClassString, getNestedValue, groupFieldMapper, hasChildFields, hasCrossFieldWhenCondition, hasFormValue, hasNestedProperty, hasTargetProperty, injectAddonTypeRegistry, injectFieldErrors, injectFieldSignalContext, injectFieldsSupportingAddons, injectNonFieldEvaluationContext, interpolateParams, isArrayField, isCheckedField, isContainerField, isCrossFieldBuiltInValidator, isCrossFieldExpression, isCrossFieldSchema, isCrossFieldStateLogic, isCrossFieldValidator, isDerivationLogicConfig, isDisplayOnlyField, isEqual, isFieldBoundContext, isFormStateCondition, isFunctionHttpValidator, isGenericContainerField, isGroupField, isHiddenField, isLeafField, isNonPagedForm, isPageField, isPagedForm, isResourceBasedValidator, isRowField, isSimplifiedArrayField, isStateLogicConfig, isValidNonPagedForm, isValidPagedForm, isValueBearingField, isValueField, isWrapperTypeDefinition, keyBy, mapValues, memoize, normalizeFieldsArray, omit, pageFieldMapper, provideFieldErrorDisplay, readFieldStateInfo, resolveDynamicValue, resolveHttpRequest, resolveNextButtonDisabled, resolveNonFieldDisabled, resolveNonFieldHidden, resolveSubmitButtonDisabled, resolveTokens, rowError, rowFieldMapper, runPresetAction, setupInitializationTracking, shouldLog, shouldShowErrors, textFieldMapper, toReadonlyFieldTree, toReadonlyFieldTreeCached, validatePageNesting, withPreviousValue, writeToFieldValue };
 
 //# sourceMappingURL=ng-forge-dynamic-forms-internal.mjs.map