accomadesc 0.4.14 → 0.4.16

package/dist/Pricing.svelte

@@ -49,7 +49,10 @@
   const formatAdditionalPersonPrice = (price: number, termsRef: string | undefined): string => {
     if (formatFunc && translateFunc) {
       let terms = '';
-      if (termsRef) terms = translateFunc(termsRef);
+      if (termsRef) {
+        terms = translateFunc(termsRef);
+        if (!terms) terms = termsRef;
+      }
       let formattedPrice = formatMoneyFunc?.(price);
       return formatFunc('additionalPersonPrice', {
         price: formattedPrice,
@@ -124,13 +127,13 @@
   const formatExtraPersonCol = (entry: PricingEntry): string => {
     let result = '<div style="display:flex; column-gap: 2rem; padding-left:1rem;flex-wrap: wrap;">';
 
-    if (entry.additionalPersonPrice1) {
+    if (entry.additionalPersonPrice1 && entry.additionalPersonText1) {
       result += `<span>${formatAdditionalPersonPrice(entry.additionalPersonPrice1, entry.additionalPersonText1)}</span>`;
     }
-    if (entry.additionalPersonPrice2) {
+    if (entry.additionalPersonPrice2 && entry.additionalPersonText2) {
       result += `<span>${formatAdditionalPersonPrice(entry.additionalPersonPrice2, entry.additionalPersonText2)}</span>`;
     }
-    if (entry.additionalPersonPrice3) {
+    if (entry.additionalPersonPrice3 && entry.additionalPersonText3) {
       result += `<span>${formatAdditionalPersonPrice(entry.additionalPersonPrice3, entry.additionalPersonText3)}</span>`;
     }
     result += '</div>';

package/dist/SiteState.svelte.d.ts

@@ -8,6 +8,7 @@ interface FullTranslation {
     site: Record<string, string>;
 }
 export declare class SiteState implements I18nFacade {
+    #private;
     _getSiteConfigFn: () => SiteConfig;
     get fullTranslations(): Record<string, FullTranslation>;
     get calendarTranslations(): Record<string, OccuplanTranslations>;
@@ -22,11 +23,12 @@ export declare class SiteState implements I18nFacade {
     get formats(): Record<string, FormatSpec>;
     selectedTheme: 'light' | 'dark';
     selectedThemeInitialized: boolean;
-    constructor(getSiteConfig: () => SiteConfig, lang: string | undefined);
+    constructor(getSiteConfig: () => SiteConfig, lang: string | undefined, defaultFormats?: Record<string, FormatSpec>);
     updateCurrentLang: (lang: string) => string;
     translateFunc: (ref: string) => string;
     formatFunc: (ref: string, props: Record<string, unknown>) => string;
     formatDateFunc: (d: DateTime | string) => string;
+    formatMoneyFunc: (value: number) => string;
     translateWithLangFunc: (ref: string, lang: string) => string;
 }
 export {};

package/dist/SiteState.svelte.js

@@ -1,5 +1,6 @@
 import { DateTime } from 'luxon';
 import { format } from './helpers/format.js';
+import { MoneyFormats } from './helpers/moneyFormats.js';
 export class SiteState {
     _getSiteConfigFn;
     //fullTranslations: Record<string, FullTranslation> = $derived(this._getSiteConfigFn().lang.translations);
@@ -46,10 +47,12 @@ export class SiteState {
     get formats() {
         return this._getSiteConfigFn().lang.formats;
     }
+    #defaultFormats;
     selectedTheme = $state('light');
     selectedThemeInitialized = $state(false);
-    constructor(getSiteConfig, lang) {
+    constructor(getSiteConfig, lang, defaultFormats) {
         this._getSiteConfigFn = getSiteConfig;
+        this.#defaultFormats = defaultFormats;
         if (!lang || !getSiteConfig().lang.supportedLangs.includes(lang)) {
             this.currentLang = getSiteConfig().lang.defaultLang;
         }
@@ -71,11 +74,8 @@ export class SiteState {
     };
     formatFunc = (ref, props) => {
         const langFormats = this.formats[this.currentLang];
-        if (!langFormats) {
-            console.warn(`[Missing format language: ${this.currentLang}]`);
-            return '[UNDEF]';
-        }
-        const fString = langFormats[ref];
+        const defaultLangFormats = this.#defaultFormats?.[this.currentLang];
+        const fString = langFormats?.[ref] ?? defaultLangFormats?.[ref];
         if (!fString) {
             console.warn(`[Missing formatFunc: ${ref}]`);
             return '[UNDEF]';
@@ -87,12 +87,14 @@ export class SiteState {
         if (!d)
             return this.translateFunc('invalid');
         const formatSpecs = this.formats[this.currentLang];
-        if (!formatSpecs) {
+        const defaultFormatSpecs = this.#defaultFormats?.[this.currentLang];
+        const effectiveFormat = formatSpecs ?? defaultFormatSpecs;
+        if (!effectiveFormat) {
             return this.translateFunc('invalid');
         }
         let f = 'yyyy-MM-dd';
-        if (formatSpecs.dateFormat) {
-            f = formatSpecs.dateFormat;
+        if (effectiveFormat.dateFormat) {
+            f = effectiveFormat.dateFormat;
         }
         let date;
         if (typeof d === 'string')
@@ -101,7 +103,15 @@ export class SiteState {
             date = d;
         if (!date.isValid)
             return this.translateFunc('invalid');
-        return date.setLocale(formatSpecs.locale).toFormat(f);
+        return date.setLocale(effectiveFormat.locale).toFormat(f);
+    };
+    formatMoneyFunc = (value) => {
+        const scaled = value / 100.0;
+        const fmt = MoneyFormats[this.currentLang] ?? MoneyFormats['en'];
+        if (!fmt) {
+            return String(scaled);
+        }
+        return fmt.format(scaled);
     };
     translateWithLangFunc = (ref, lang) => {
         const translation = this.translations[lang];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "accomadesc",
-  "version": "0.4.14",
+  "version": "0.4.16",
   "files": [
     "dist",
     "!dist/**/*.test.*",
@@ -25,31 +25,31 @@
   },
   "devDependencies": {
     "@playwright/test": "^1.59.1",
-    "@sveltejs/adapter-auto": "^3.3.1",
+    "@sveltejs/adapter-auto": "^7.0.1",
     "@sveltejs/adapter-static": "^3.0.10",
-    "@sveltejs/kit": "^2.57.1",
+    "@sveltejs/kit": "^2.58.0",
     "@sveltejs/package": "^2.5.7",
-    "@sveltejs/vite-plugin-svelte": "^5.1.1",
+    "@sveltejs/vite-plugin-svelte": "^7.0.0",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/svelte": "^5.3.1",
     "@types/luxon": "^3.7.1",
     "@types/node": "^25.6.0",
-    "@vitest/ui": "^4.1.4",
+    "@vitest/ui": "^4.1.5",
     "gdpr-cooco-banner": "^0.0.13",
-    "jsdom": "^27.4.0",
-    "prettier": "^3.8.2",
+    "jsdom": "^29.0.2",
+    "prettier": "^3.8.3",
     "prettier-plugin-svelte": "^3.5.1",
     "publint": "^0.3.18",
-    "svelte": "^5.55.2",
+    "svelte": "^5.55.5",
     "svelte-check": "^4.4.6",
-    "typescript": "^5.9.3",
-    "vite": "^6.4.2",
-    "vitest": "^4.1.4"
+    "typescript": "^6.0.3",
+    "vite": "^8.0.10",
+    "vitest": "^4.1.5"
   },
   "dependencies": {
     "@fontsource/raleway": "^5.2.8",
-    "@twicpics/components": "^0.31.4",
+    "@twicpics/components": "^0.33.0",
     "@types/leaflet": "^1.9.21",
     "leaflet": "^1.9.4",
     "luxon": "^3.7.2"