@dereekb/dbx-form 13.11.1 → 13.11.2

package/fesm2022/dereekb-dbx-form.mjs

@@ -6,7 +6,7 @@ import { isPast, addSeconds, startOfDay, addMinutes, addDays, isBefore } from 'd
 import { map, of, shareReplay, switchMap, first, exhaustMap, catchError, delay, filter, combineLatest, distinctUntilChanged, BehaviorSubject, Subject, startWith, throttleTime, scan, timer, merge, EMPTY, skip, debounceTime, combineLatestWith, interval, tap, withLatestFrom, mergeMap } from 'rxjs';
 import * as i1$2 from '@dereekb/dbx-core';
 import { DbxActionContextStoreSourceInstance, cleanLockSet, cleanSubscription, completeOnDestroy, cleanWithLockSet, GetValuePipe, DateDistancePipe, TimeDistancePipe, DbxInjectionComponent, mergeDbxInjectionComponentConfigs } from '@dereekb/dbx-core';
-import { makeIsModifiedFunctionObservable, asObservable, LockSet, filterMaybe, switchMapFilterMaybe, scanCount, errorOnEmissionsInPeriod, asObservableFromGetter, tapLog, maybeValueFromObservableOrValue, valueFromFinishedLoadingState, switchMapMaybeDefault, skipAllInitialMaybe, successResult, startWithBeginLoading, skipUntilTimeElapsedAfterLastEmission, mapLoadingStateResults, isLoadingStateWithDefinedValue, isLoadingStateLoading, beginLoading, mapLoadingStateValueWithOperator, loadingStateContext, distinctUntilHasDifferentValues, SimpleLoadingContext, listLoadingStateContext, mapIsListLoadingStateWithEmptyValue, isLoadingStateInLoadingState, asyncPusherCache } from '@dereekb/rxjs';
+import { makeIsModifiedFunctionObservable, asObservable, LockSet, filterMaybe, switchMapFilterMaybe, scanCount, errorOnEmissionsInPeriod, asObservableFromGetter, maybeValueFromObservableOrValue, valueFromFinishedLoadingState, switchMapMaybeDefault, skipAllInitialMaybe, successResult, startWithBeginLoading, skipUntilTimeElapsedAfterLastEmission, mapLoadingStateResults, isLoadingStateWithDefinedValue, isLoadingStateLoading, beginLoading, mapLoadingStateValueWithOperator, loadingStateContext, distinctUntilHasDifferentValues, SimpleLoadingContext, listLoadingStateContext, mapIsListLoadingStateWithEmptyValue, isLoadingStateInLoadingState, asyncPusherCache } from '@dereekb/rxjs';
 import { toObservable, toSignal, rxResource } from '@angular/core/rxjs-interop';
 import { BooleanStringKeyArrayUtility, iterablesAreSetEquivalent, filterUndefinedValues, filterMaybeArrayValues, filterUniqueValues, areEqualPOJOValuesUsingPojoFilter, NOOP_MODIFIER, asArray, mergeArrays, filterNullAndUndefinedValues, objectHasNoKeys, mapMaybeFunction, isWebsiteUrlWithPrefix, websiteUrlDetails, transformStringFunction, US_STATE_CODE_STRING_REGEX, ZIP_CODE_STRING_REGEX, LAT_LNG_PATTERN, transformNumberFunction, DOLLAR_AMOUNT_PRECISION, stripObject, getValueFromGetter, asGetter, dateFromMinuteOfDay, dateToMinuteOfDay, isISO8601DayStringStart, mapIdentityFunction, isDate, MS_IN_MINUTE, isMonthDaySlashDate, filterFromPOJO, TIME_UNIT_SHORT_LABEL_MAP, timeUnitToMilliseconds, ALL_TIME_UNITS, minutesToHoursAndMinutes, millisecondsToTimeUnit, hoursAndMinutesToTimeUnit, isE164PhoneNumber as isE164PhoneNumber$1, isValidPhoneExtensionNumber, e164PhoneNumberExtensionPair, e164PhoneNumberFromE164PhoneNumberExtensionPair, mergeArraysIntoArray, convertMaybeToArray, lastValue, filterEmptyArrayValues, setContainsAllValues, addToSetCopy, setsAreEquivalent, makeValuesGroupMap, sortByStringFunction, separateValues, isSelectedDecisionFunctionFactory, readKeysFrom, hasDifferentValues, capitalizeFirstLetter, objectIsEmpty, mergeObjectsFunction, filterFromPOJOFunction, mergeObjects, addPlusPrefixToNumber, searchStringFilterFunction, caseInsensitiveFilterByIndexOfDecisionFactory, arrayToMap, firstValue, cachedGetter, makeGetter, asDecisionFunction, TIME_UNIT_LABEL_MAP, HAS_WEBSITE_DOMAIN_NAME_REGEX, KeyValueTypleValueFilter, valuesFromPOJO, allObjectsAreEqual, isNumberDivisibleBy, nearestDivisibleValues, concatArrays } from '@dereekb/util';
 import * as i1 from '@angular/forms';
@@ -1166,6 +1166,11 @@ function isEmptyFormValue(val) {
  * from a form value object. Also removes keys whose values become empty objects
  * `{}` after recursive stripping.
  *
+ * Arrays are recursed into so that empties inside nested objects are stripped,
+ * but array length and item indices are preserved — primitive empty values
+ * (e.g. `NaN`, `''`) inside an array stay in place, since shifting indices would
+ * change the semantics of chip/list-style array fields.
+ *
  * This normalizes ng-forge output to match ngx-formly behavior, where the model
  * only includes keys that have been explicitly set by the user.
  *
@@ -1176,6 +1181,9 @@ function isEmptyFormValue(val) {
  *
  * stripEmptyForgeValues({ section: { a: "", b: "" } })
  * // → {}
+ *
+ * stripEmptyForgeValues({ items: [{ amount: NaN, name: 'a' }, { amount: 5 }] })
+ * // → { items: [{ name: 'a' }, { amount: 5 }] }
  * ```
  *
  * @param value - The form value object to clean
@@ -1183,18 +1191,24 @@ function isEmptyFormValue(val) {
  */
 function stripEmptyForgeValues(value) {
     let result;
-    if (value == null || typeof value !== 'object' || Array.isArray(value)) {
+    if (value == null || typeof value !== 'object' || value instanceof Date) {
         result = value;
     }
+    else if (Array.isArray(value)) {
+        result = value.map((item) => stripEmptyForgeValues(item));
+    }
     else {
         const stripped = {};
         for (const [key, val] of Object.entries(value)) {
             if (isEmptyFormValue(val)) {
                 continue;
             }
-            if (typeof val === 'object' && !Array.isArray(val) && !(val instanceof Date)) {
+            if (typeof val === 'object' && !(val instanceof Date)) {
                 const cleaned = stripEmptyForgeValues(val);
-                if (cleaned != null && Object.keys(cleaned).length > 0) {
+                if (Array.isArray(cleaned)) {
+                    stripped[key] = cleaned;
+                }
+                else if (cleaned != null && Object.keys(cleaned).length > 0) {
                     stripped[key] = cleaned;
                 }
             }
@@ -1236,7 +1250,7 @@ class DbxForgeFormContext {
      */
     stripInternalKeys = true;
     /**
-     * When true (default), keys whose values are empty (`null`, `undefined`, or `""`)
+     * When true (default), keys whose values are empty (`null`, `undefined`, `""`, or `NaN`)
      * are stripped from the form value before emission. This normalizes ng-forge output
      * to match ngx-formly behavior, where the model only includes keys that have been
      * explicitly set by the user.
@@ -1323,7 +1337,7 @@ class DbxForgeFormContext {
     _isValid = new BehaviorSubject(false);
     _setValue = new BehaviorSubject(undefined);
     _reset = new BehaviorSubject(new Date());
-    _internalConfig$ = this._config.pipe(tapLog('internal config'), scan((acc, config) => {
+    _internalConfig$ = this._config.pipe(scan((acc, config) => {
         let result;
         if (config) {
             if (acc?.input !== config) {
@@ -1337,8 +1351,8 @@ class DbxForgeFormContext {
             result = undefined;
         }
         return result;
-    }, undefined), tapLog('internal config result'), shareReplay(1));
-    config$ = this._internalConfig$.pipe(filterMaybe(), map(({ config }) => config), tapLog('config'), shareReplay(1));
+    }, undefined), shareReplay(1));
+    config$ = this._internalConfig$.pipe(filterMaybe(), map(({ config }) => config), shareReplay(1));
     /**
      * Form event stream that restarts on each reset, mirroring the formly form's
      * switchMap-on-reset pattern. This ensures that each resetForm() produces a fresh
@@ -1577,7 +1591,7 @@ class DbxForgeFormComponent {
     _disabledSub = cleanSubscription();
     dynamicForm = viewChild(DynamicForm, ...(ngDevMode ? [{ debugName: "dynamicForm" }] : /* istanbul ignore next */ []));
     formValue = signal({}, { ...(ngDevMode ? { debugName: "formValue" } : /* istanbul ignore next */ {}), equal: (a, b) => _forgeFormValueEqual(a, b, this._context) });
-    configSignal = toSignal(this._context.config$.pipe(tapLog('forge.config')), { initialValue: undefined });
+    configSignal = toSignal(this._context.config$, { initialValue: undefined });
     _changesCount = signal(0, ...(ngDevMode ? [{ debugName: "_changesCount" }] : /* istanbul ignore next */ []));
     _lastResetAt = signal(new Date(), ...(ngDevMode ? [{ debugName: "_lastResetAt" }] : /* istanbul ignore next */ []));
     _isReset = signal(true, ...(ngDevMode ? [{ debugName: "_isReset" }] : /* istanbul ignore next */ []));
@@ -1996,8 +2010,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.11", ngImpo
 class DbxFormLoggerDirective {
     form = inject(DbxForm, { host: true });
     constructor() {
-        cleanSubscription(this.form.stream$.subscribe((event) => {
-            console.log('dbxFormLogger - stream: ', event);
+        cleanSubscription(combineLatest([this.form.getValue(), this.form.stream$]).subscribe(([currentValue, event]) => {
+            console.log('dbxFormLogger - stream: ', { currentValue, event });
         }));
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.11", ngImport: i0, type: DbxFormLoggerDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
@@ -8105,8 +8119,8 @@ class DbxForgeValueSelectionFieldComponent {
     addClearOptionSignal = computed(() => this.props()?.addClearOption, ...(ngDevMode ? [{ debugName: "addClearOptionSignal" }] : /* istanbul ignore next */ []));
     addClearOption$ = toObservable(this.addClearOptionSignal).pipe(distinctUntilChanged());
     inputOptionsSignal = computed(() => this.props()?.options, ...(ngDevMode ? [{ debugName: "inputOptionsSignal" }] : /* istanbul ignore next */ []));
-    inputOptions$ = toObservable(this.inputOptionsSignal).pipe(tapLog('yyy'), maybeValueFromObservableOrValue());
-    resolvedOptions$ = combineLatest([this.inputOptions$, this.addClearOption$]).pipe(tapLog('xxxx'), map(([options, addClearOption]) => resolveForgeSelectionOptions(options ?? [], addClearOption ?? false)));
+    inputOptions$ = toObservable(this.inputOptionsSignal).pipe(maybeValueFromObservableOrValue());
+    resolvedOptions$ = combineLatest([this.inputOptions$, this.addClearOption$]).pipe(map(([options, addClearOption]) => resolveForgeSelectionOptions(options ?? [], addClearOption ?? false)));
     resolvedOptionsSignal = toSignal(this.resolvedOptions$);
     multipleSignal = computed(() => this.props()?.multiple ?? false, ...(ngDevMode ? [{ debugName: "multipleSignal" }] : /* istanbul ignore next */ []));
     effectiveAppearance = computed(() => this.props()?.appearance ?? this.materialConfig?.appearance ?? 'outline', ...(ngDevMode ? [{ debugName: "effectiveAppearance" }] : /* istanbul ignore next */ []));