@tstdl/base 0.85.7 → 0.85.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.85.7",
+  "version": "0.85.9",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"

package/signals/index.d.ts

@@ -2,4 +2,5 @@ export * from './api.js';
 export * from './computed-with-dependencies.js';
 export * from './effect-with-dependencies.js';
 export * from './pipe.js';
+export * from './switch-map.js';
 export * from './types.js';

package/signals/index.js

@@ -19,4 +19,5 @@ __reExport(signals_exports, require("./api.js"), module.exports);
 __reExport(signals_exports, require("./computed-with-dependencies.js"), module.exports);
 __reExport(signals_exports, require("./effect-with-dependencies.js"), module.exports);
 __reExport(signals_exports, require("./pipe.js"), module.exports);
+__reExport(signals_exports, require("./switch-map.js"), module.exports);
 __reExport(signals_exports, require("./types.js"), module.exports);

package/signals/switch-map.d.ts

@@ -0,0 +1,2 @@
+import type { Signal } from './api.js';
+export declare function switchMap<T>(source: () => Signal<T>): Signal<T>;

package/signals/switch-map.js

@@ -0,0 +1,28 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var switch_map_exports = {};
+__export(switch_map_exports, {
+  switchMap: () => switchMap
+});
+module.exports = __toCommonJS(switch_map_exports);
+var import_api = require("./api.js");
+function switchMap(source) {
+  const outerSource = (0, import_api.computed)(() => source());
+  return (0, import_api.computed)(() => outerSource()());
+}

package/text/dynamic-text.model.js

@@ -28,51 +28,38 @@ __export(dynamic_text_model_exports, {
   resolveNestedDynamicTexts$: () => resolveNestedDynamicTexts$
 });
 module.exports = __toCommonJS(dynamic_text_model_exports);
+var import_rxjs = require("rxjs");
 var import_container = require("../container/index.js");
 var import_api = require("../signals/api.js");
-var import_to_observable = require("../signals/implementation/to-observable.js");
-var import_to_signal = require("../signals/implementation/to-signal.js");
-var import_type_guards = require("../utils/type-guards.js");
-var import_rxjs = require("rxjs");
+var import_switch_map = require("../signals/switch-map.js");
 var import_localization_service = require("./localization.service.js");
 const missingLocalizationKeyText = "[MISSING LOCALIZATION KEY]";
 function resolveDynamicText(text, localizationService) {
-  return (0, import_to_signal.toSignal)(resolveDynamicText$(text, localizationService), { initialValue: missingLocalizationKeyText });
+  const resolvedLocalizationService = localizationService ?? import_container.container.resolve(import_localization_service.LocalizationService);
+  const localizableText = (0, import_api.isSignal)(text) ? text : (0, import_rxjs.isObservable)(text) ? (0, import_api.toSignal)(text, { initialValue: missingLocalizationKeyText }) : (0, import_api.computed)(() => text);
+  return (0, import_switch_map.switchMap)(() => resolvedLocalizationService.localize(localizableText()));
 }
 function resolveDynamicText$(text, localizationService) {
-  const resolvedLocalizationService = localizationService ?? import_container.container.resolve(import_localization_service.LocalizationService);
-  if ((0, import_rxjs.isObservable)(text)) {
-    return text.pipe((0, import_rxjs.switchMap)((inner) => resolveDynamicText$(inner, localizationService)));
-  }
-  if ((0, import_api.isSignal)(text)) {
-    const text$ = (0, import_to_observable.toObservable)(text);
-    return resolveDynamicText$(text$, resolvedLocalizationService);
-  }
-  if ((0, import_type_guards.isString)(text)) {
-    return (0, import_rxjs.of)(text);
-  }
-  return resolvedLocalizationService.localize$(text);
+  return (0, import_api.toObservable)(resolveDynamicText(text, localizationService));
 }
 function resolveDynamicTexts(texts, localizationService) {
-  const initialValue = texts.map(() => missingLocalizationKeyText);
-  return (0, import_to_signal.toSignal)(resolveDynamicTexts$(texts, localizationService), { initialValue });
+  const signals = texts.map((text) => resolveDynamicText(text, localizationService));
+  return (0, import_api.computed)(() => signals.map((s) => s()));
 }
 function resolveDynamicTexts$(texts, localizationService) {
-  const resolvedLocalizationService = localizationService ?? import_container.container.resolve(import_localization_service.LocalizationService);
-  const resolvedTextObservables = texts.map((text) => resolveDynamicText$(text, resolvedLocalizationService));
-  return (0, import_rxjs.combineLatest)(resolvedTextObservables);
+  return (0, import_api.toObservable)(resolveDynamicTexts(texts, localizationService));
 }
 function resolveNestedDynamicText(item, key, localizationService) {
-  return (0, import_to_signal.toSignal)(resolveNestedDynamicText$(item, key, localizationService), { requireSync: true });
+  const result = resolveDynamicText(item[key], localizationService);
+  return (0, import_api.computed)(() => ({ ...item, [key]: result() }));
 }
 function resolveNestedDynamicText$(item, key, localizationService) {
-  return resolveDynamicText$(item[key], localizationService).pipe((0, import_rxjs.map)((resolvedText) => ({ ...item, [key]: resolvedText })));
+  return (0, import_api.toObservable)(resolveNestedDynamicText(item, key, localizationService));
 }
 function resolveNestedDynamicTexts(items, key, localizationService) {
-  return (0, import_to_signal.toSignal)(resolveNestedDynamicTexts$(items, key, localizationService), { requireSync: true });
+  const itemSignals = items.map((item) => resolveNestedDynamicText(item, key, localizationService));
+  return (0, import_api.computed)(() => itemSignals.map((s) => s()));
 }
 function resolveNestedDynamicTexts$(items, key, localizationService) {
-  const resolvedLocalizationService = localizationService ?? import_container.container.resolve(import_localization_service.LocalizationService);
-  const resolvedTextObservables = items.map((item) => resolveNestedDynamicText$(item, key, resolvedLocalizationService));
-  return (0, import_rxjs.combineLatest)(resolvedTextObservables);
+  return (0, import_api.toObservable)(resolveNestedDynamicTexts(items, key, localizationService));
 }