@dative-gpi/foundation-shared-services 1.1.24-unit-formatter → 1.1.24-unit-formatter-2

package/composables/index.ts

@@ -1,10 +1,10 @@
 export * from "./services";
 export * from "./app";
 
+export * from "./units";
 export * from "./useDateFormat";
 export * from "./useFiles";
 export * from "./useFoundationShared";
 export * from "./useRouting";
 export * from "./useDateExpression";
-export * from "./useTimeDuration";
-export * from "./useUnitFormat";
+export * from "./useTimeDuration";

package/composables/units/index.ts

@@ -0,0 +1,2 @@
+export * from "./units";
+export * from "./useUnitFormat";

package/composables/units/units.ts

@@ -0,0 +1,14 @@
+import { SI_PREFIXES } from "@/shared/foundation-shared-services/config";
+import type { ComputedRef } from "vue";
+
+export interface FormattedQuantity {
+  displayValue: ComputedRef<string>;
+  unit: ComputedRef<string>;
+  displayText: ComputedRef<string>;
+}
+
+export const NO_VALUE = "-";
+
+export const DECADES_PER_PREFIX = 3;
+export const SMALLEST_PREFIX_EXPONENT = Math.round(Math.log10(SI_PREFIXES[0].factor));
+export const BASE_PREFIX_INDEX = -SMALLEST_PREFIX_EXPONENT / DECADES_PER_PREFIX;

package/composables/units/useUnitFormat.ts

@@ -0,0 +1,66 @@
+import { computed, toValue, type MaybeRefOrGetter } from "vue";
+import { SI_PREFIXES } from "@dative-gpi/foundation-shared-services/config";
+import { BASE_PREFIX_INDEX, DECADES_PER_PREFIX, NO_VALUE, SMALLEST_PREFIX_EXPONENT, type FormattedQuantity } from "./units";
+
+import { useAppLanguageCode } from "../app";
+
+export const useUnitFormat = (precision?: MaybeRefOrGetter<number | undefined>) => {
+  const { languageCode } = useAppLanguageCode();
+
+  const numberFormatter = computed(() => {
+    const decimals = toValue(precision);
+    const locale = languageCode.value ?? "fr-FR";
+
+    return new Intl.NumberFormat(locale, {
+      minimumFractionDigits: decimals,
+      maximumFractionDigits: decimals,
+    });
+  });
+
+  const format = (rawValue: MaybeRefOrGetter<number>, baseUnit: MaybeRefOrGetter<string>): FormattedQuantity => {
+
+    const quantityWithPrefix = computed(() => {
+      const numericValue = toValue(rawValue);
+      if (!Number.isFinite(numericValue)) {
+        return null;
+      }
+      const prefix = (() => {
+        if (numericValue === 0) {
+          return SI_PREFIXES[BASE_PREFIX_INDEX];
+        }
+
+        const valueExponent = Math.floor(Math.log10(Math.abs(numericValue)));
+
+        const prefixExponent = Math.floor(valueExponent / DECADES_PER_PREFIX) * DECADES_PER_PREFIX;
+
+        const prefixIndex = (prefixExponent - SMALLEST_PREFIX_EXPONENT) / DECADES_PER_PREFIX;
+
+        const clampedPrefixIndex = Math.max(0, Math.min(prefixIndex, SI_PREFIXES.length - 1 ));
+
+        return SI_PREFIXES[clampedPrefixIndex];
+      })();
+      
+      return {
+        scaledValue: numericValue / prefix.factor,
+        unitSymbol: `${prefix.prefix}${toValue(baseUnit)}`,
+      };
+    });
+
+    const displayValue = computed(() => {
+      if (quantityWithPrefix.value === null) {
+        return NO_VALUE;
+      }
+      return numberFormatter.value.format(quantityWithPrefix.value.scaledValue);
+    });
+
+    const unit = computed(() => quantityWithPrefix.value?.unitSymbol ?? "");
+
+    const displayText = computed(() =>
+      quantityWithPrefix.value === null ? NO_VALUE : `${displayValue.value} ${unit.value}`
+    );
+
+    return { displayValue, unit, displayText };
+  };
+
+  return { format };
+};

package/package.json

@@ -4,7 +4,7 @@
     "url": "https://github.com/Dative-GPI/foundation-shared-ui.git"
   },
   "sideEffects": false,
-  "version": "1.1.24-unit-formatter",
+  "version": "1.1.24-unit-formatter-2",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -13,14 +13,14 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.1.24-unit-formatter",
+    "@dative-gpi/foundation-shared-domain": "1.1.24-unit-formatter-2",
     "@vueuse/core": "^14.0.0"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
     "@microsoft/signalr": "^8.0.0",
-    "vue": "^3.4.38",
+    "vue": "3.5.26",
     "vue-router": "^4.3.0"
   },
-  "gitHead": "ac04fd5da2ebd73bfb31ff6ffc4f5ff54a872e9e"
+  "gitHead": "8e4e425fd5a9d635fd66121d110beb5745e337f3"
 }

package/tools/collectionTools.ts

@@ -0,0 +1,18 @@
+import { type AddOrUpdateCallback, type AllCallback, type DeleteCallback, type NotifyEvent } from "@dative-gpi/bones-ui";
+
+export const createCollectionHandler = <T>(
+  onCollectionChangedHandler: AllCallback<T>,
+  createElementHandler: (el: any) => T
+) => {
+  return (ev: NotifyEvent, el: any) => {
+    switch (ev) {
+      case "add":
+      case "update":
+        (onCollectionChangedHandler as AddOrUpdateCallback<T>)(ev, createElementHandler(el));
+        break;
+      case "delete":
+        (onCollectionChangedHandler as DeleteCallback)(ev, el);
+        break;
+    }
+  };
+};

package/tools/index.ts

@@ -1,2 +1,3 @@
+export * from "./collectionTools";
 export * from "./hubFactory";
 export * from "./translate";

package/composables/useUnitFormat.ts

@@ -1,66 +0,0 @@
-import { computed, toValue, type ComputedRef, type MaybeRefOrGetter } from "vue";
-import { SI_PREFIXES } from "@dative-gpi/foundation-shared-services/config/units";
-
-import { useAppLanguageCode } from "./app";
-
-const NO_VALUE = "-";
-
-const DECADES_PER_PREFIX = 3;
-const SMALLEST_PREFIX_EXPONENT = Math.round(Math.log10(SI_PREFIXES[0].factor));
-const BASE_PREFIX_INDEX = -SMALLEST_PREFIX_EXPONENT / DECADES_PER_PREFIX;
-
-export interface FormattedQuantity {
-  value: ComputedRef<string>;
-  unit: ComputedRef<string>;
-  formatted: ComputedRef<string>;
-}
-
-export const useUnitFormat = () => {
-  const { languageCode } = useAppLanguageCode();
-
-  const findBestPrefix = (numericValue: number) => {
-    if (numericValue === 0) {
-      return SI_PREFIXES[BASE_PREFIX_INDEX];
-    }
-    const magnitude = Math.floor(Math.log10(Math.abs(numericValue)) / DECADES_PER_PREFIX) * DECADES_PER_PREFIX;
-    const index = Math.floor((magnitude - SMALLEST_PREFIX_EXPONENT) / DECADES_PER_PREFIX);
-    return SI_PREFIXES[Math.max(0, Math.min(index, SI_PREFIXES.length - 1))];
-  };
-
-  const format = (rawValue: MaybeRefOrGetter<number>,baseUnit: MaybeRefOrGetter<string>,precision?: MaybeRefOrGetter<number | undefined>): FormattedQuantity => {
-
-    const prefixed = computed(() => {
-      const numericValue = toValue(rawValue);
-      if (!isFinite(numericValue)) {
-        return null;
-      }
-      const prefix = findBestPrefix(numericValue);
-      return {
-        scaledValue: numericValue / prefix.factor,
-        unitSymbol: `${prefix.prefix}${toValue(baseUnit)}`,
-      };
-    });
-
-    const value = computed(() => {
-      if (prefixed.value === null) {
-        return NO_VALUE;
-      }
-      const decimals = toValue(precision);
-      const locale = languageCode.value ?? "fr-FR";
-      return new Intl.NumberFormat(locale, {
-        minimumFractionDigits: decimals,
-        maximumFractionDigits: decimals,
-      }).format(prefixed.value.scaledValue);
-    });
-
-    const unit = computed(() => prefixed.value?.unitSymbol ?? "");
-
-    const formatted = computed(() =>
-      prefixed.value === null ? NO_VALUE : `${value.value} ${unit.value}`
-    );
-
-    return { value, unit, formatted };
-  };
-
-  return { format };
-};