@data-fair/lib-vue 1.22.0 → 1.23.1

package/concept-filters.d.ts

@@ -1,2 +1,3 @@
+export declare function getConceptFilters(searchParams: Record<string, string>, datasetId?: string): Record<string, string>;
 export declare function useConceptFilters(reactiveSearchParams: Record<string, string>, datasetId?: string): Record<string, string>;
 export default useConceptFilters;

package/concept-filters.js

@@ -1,22 +1,26 @@
 // filter reactiveSearchParams to conceptFilters (params prefixed by _c_)
 import { reactive, watch } from 'vue';
+export function getConceptFilters(searchParams, datasetId) {
+    const conceptFilters = {};
+    const datasetFiltersPrefix = datasetId && `_d_${datasetId}_`;
+    for (const key of Object.keys(searchParams)) {
+        if (key.startsWith('_c_'))
+            conceptFilters[key] = searchParams[key];
+        if (datasetFiltersPrefix && key.startsWith(datasetFiltersPrefix)) {
+            conceptFilters[key.replace(datasetFiltersPrefix, '')] = searchParams[key];
+        }
+    }
+    return conceptFilters;
+}
 export function useConceptFilters(reactiveSearchParams, datasetId) {
     const conceptFilters = reactive({});
-    const datasetFiltersPrefix = datasetId && `_d_${datasetId}_`;
+    // we use a watch and mutations on a reactive to prevent triggering reactivity on unrelated changes in reactive search params
     watch(reactiveSearchParams, () => {
-        for (const key of Object.keys(reactiveSearchParams)) {
-            if (key.startsWith('_c_'))
-                conceptFilters[key] = reactiveSearchParams[key];
-            if (datasetFiltersPrefix && key.startsWith(datasetFiltersPrefix)) {
-                conceptFilters[key.replace(datasetFiltersPrefix, '')] = reactiveSearchParams[key];
-            }
-        }
+        const newConceptFilters = getConceptFilters(reactiveSearchParams, datasetId);
+        Object.assign(conceptFilters, newConceptFilters);
         for (const key of Object.keys(conceptFilters)) {
-            if (key.startsWith('_c_') && reactiveSearchParams[key] === undefined)
-                delete conceptFilters[key];
-            if (datasetFiltersPrefix && !key.startsWith('_c_') && reactiveSearchParams[datasetFiltersPrefix + key] === undefined) {
+            if (!(key in newConceptFilters))
                 delete conceptFilters[key];
-            }
         }
     }, { immediate: true });
     return conceptFilters;

package/format/bytes.js

@@ -1,20 +1,22 @@
 const locales = {
-  fr: [[0, 'octet'], [1, 'octets'], [1000, 'ko'], [1000 * 1000, 'Mo'], [1000 * 1000 * 1000, 'Go'], [1000 * 1000 * 1000 * 1000, 'To'], [1000 * 1000 * 1000 * 1000 * 1000, 'Po']],
-  en: [[0, 'byte'], [1, 'bytes'], [1000, 'kb'], [1000 * 1000, 'Mb'], [1000 * 1000 * 1000, 'Gb'], [1000 * 1000 * 1000 * 1000, 'Tb'], [1000 * 1000 * 1000 * 1000 * 1000, 'Pb']]
-}
-export function formatBytes (bytes, locale = 'fr') {
-  const bytesInt = Math.abs(typeof bytes === 'string' ? parseInt(bytes, 10) : bytes)
-  const def = locales[locale] ?? locales.en
-  for (let i = 0; i < def.length; i++) {
-    const step = def[i][0]
-    if (bytesInt < step || i === def.length - 1) {
-      const value = bytesInt / (def[i - 1][0] || 1)
-      let digits = 2
-      if (value > 1) { digits = 1 }
-      if (value > 10) { digits = 0 }
-      return value.toLocaleString(locale, { maximumFractionDigits: digits }) + ' ' + def[i - 1][1]
+    fr: [[0, 'octet'], [1, 'octets'], [1000, 'ko'], [1000 * 1000, 'Mo'], [1000 * 1000 * 1000, 'Go'], [1000 * 1000 * 1000 * 1000, 'To'], [1000 * 1000 * 1000 * 1000 * 1000, 'Po']],
+    en: [[0, 'byte'], [1, 'bytes'], [1000, 'kb'], [1000 * 1000, 'Mb'], [1000 * 1000 * 1000, 'Gb'], [1000 * 1000 * 1000 * 1000, 'Tb'], [1000 * 1000 * 1000 * 1000 * 1000, 'Pb']]
+};
+export function formatBytes(bytes, locale = 'fr') {
+    const bytesInt = Math.abs(typeof bytes === 'string' ? parseInt(bytes, 10) : bytes);
+    const def = locales[locale] ?? locales.en;
+    for (let i = 0; i < def.length; i++) {
+        const step = def[i][0];
+        if (bytesInt < step || i === def.length - 1) {
+            const value = bytesInt / (def[i - 1][0] || 1);
+            let digits = 2;
+            if (value > 1)
+                digits = 1;
+            if (value > 10)
+                digits = 0;
+            return value.toLocaleString(locale, { maximumFractionDigits: digits }) + ' ' + def[i - 1][1];
+        }
     }
-  }
-  return '' // this is only for strict typing, but the code cannot go there, the return in the loop is always called
+    return ''; // this is only for strict typing, but the code cannot go there, the return in the loop is always called
 }
-export default formatBytes
+export default formatBytes;

package/format/field.js

@@ -1,21 +1,28 @@
 // TODO: use locale-dayjs for localization of date formats
-import dayjs from 'dayjs'
-export function formatField (item, field) {
-  const value = item[field.key]
-  if (value === undefined || value === null || value === '') { return '' }
-  if (field['x-labels']?.['' + item[field.key]]) { return field['x-labels']['' + item[field.key]] }
-  if (field.type === 'number' || field.type === 'integer') { return value.toLocaleString('fr') }
-  if (typeof value === 'boolean') { return value ? 'Oui' : 'Non' }
-  if (typeof value === 'string') {
-    if (field['x-refersTo'] === 'http://schema.org/Date' ||
+import dayjs from 'dayjs';
+export function formatField(item, field) {
+    const value = item[field.key];
+    if (value === undefined || value === null || value === '')
+        return '';
+    if (field['x-labels']?.['' + item[field.key]])
+        return field['x-labels']['' + item[field.key]];
+    if (field.type === 'number' || field.type === 'integer')
+        return value.toLocaleString('fr');
+    if (typeof value === 'boolean')
+        return value ? 'Oui' : 'Non';
+    if (typeof value === 'string') {
+        if (field['x-refersTo'] === 'http://schema.org/Date' ||
             field['x-refersTo'] === 'https://schema.org/startDate' ||
             field['x-refersTo'] === 'https://schema.org/endDate' ||
             field['x-refersTo'] === 'http://schema.org/dateCreated') {
-      if (field.format === 'date-time') { return dayjs(value).format('DD/MM/YYYY, HH[h]mm') } else { return dayjs(value).format('DD/MM/YYYY') }
+            if (field.format === 'date-time')
+                return dayjs(value).format('DD/MM/YYYY, HH[h]mm');
+            else
+                return dayjs(value).format('DD/MM/YYYY');
+        }
     }
-  }
-  return '' + value
+    return '' + value;
 }
-export function getFieldLabel (field) {
-  return field.title || field['x-originalName'] || field.key
+export function getFieldLabel(field) {
+    return field.title || field['x-originalName'] || field.key;
 }

package/locale-dayjs.d.ts

@@ -1,7 +1,7 @@
 import type { App } from 'vue';
 import dayjs from 'dayjs';
-import 'dayjs/locale/fr';
-import 'dayjs/locale/en';
+import 'dayjs/locale/fr.js';
+import 'dayjs/locale/en.js';
 import { CreateDurationType } from 'dayjs/plugin/duration.js';
 export type { ConfigType as DayjsConfigType } from 'dayjs';
 declare module 'dayjs' {

package/locale-dayjs.js

@@ -1,7 +1,7 @@
 import { inject } from 'vue';
 import dayjs from 'dayjs';
-import 'dayjs/locale/fr';
-import 'dayjs/locale/en';
+import 'dayjs/locale/fr.js';
+import 'dayjs/locale/en.js';
 import localizedFormat from 'dayjs/plugin/localizedFormat.js';
 import relativeTime from 'dayjs/plugin/relativeTime.js';
 import duration from 'dayjs/plugin/duration.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-vue",
-  "version": "1.22.0",
+  "version": "1.23.1",
   "description": "Composables and other utilities for Vue applications in the data-fair stack.",
   "main": "index.js",
   "files": [