accomadesc 0.3.36 → 0.3.38

package/dist/NavItem.svelte

@@ -36,13 +36,7 @@
         </a>
       </div>
     {:else}
-      <a
-        href={path}
-        {onclick}
-        data-sveltekit-keepfocus
-        data-sveltekit-noscroll
-        class:disabled={gs.disableLinks}
-      >
+      <a href={path} {onclick} class:disabled={gs.disableLinks}>
         {translateFunc ? translateFunc(n.key) : ''}
       </a>
     {/if}

package/dist/Section.svelte

@@ -66,7 +66,7 @@
       gridTemplateColumns = '1fr 1fr';
       padding = originalPadding;
     } else {
-      if (!!columnCount && columnCount > 1) {
+      if (!!columnCount) {
         gridTemplateColumns = `repeat(${columnCount}, 1fr)`;
       }
       padding = originalPadding;

package/dist/SiteState.svelte.d.ts

@@ -1,31 +1,32 @@
-import { type I18nFacade, type OccuplanTranslations } from 'accomadesc';
 import type { CookieSelection, Translation as CookieTranslation } from 'gdpr-cooco-banner';
 import { DateTime } from 'luxon';
-import type { SiteConfig } from './types.ts';
+import type { FormatSpec, I18nFacade, SiteConfig } from './types.ts';
+import type { OccuplanTranslations } from './occuplan/state.svelte.ts';
 interface FullTranslation {
     calendar: OccuplanTranslations;
     cookies: CookieTranslation;
     site: Record<string, string>;
 }
 export declare class SiteState implements I18nFacade {
-    fullTranslations: Record<string, FullTranslation>;
-    calendarTranslations: Record<string, OccuplanTranslations>;
-    cookieTranslations: Record<string, CookieTranslation>;
-    siteTranslations: Record<string, Record<string, string>>;
-    supportedLangs: string[];
-    isMenuOpen: boolean;
+    _getSiteConfigFn: () => SiteConfig;
+    get fullTranslations(): Record<string, FullTranslation>;
+    get calendarTranslations(): Record<string, OccuplanTranslations>;
+    get cookieTranslations(): Record<string, CookieTranslation>;
+    get siteTranslations(): Record<string, Record<string, string>>;
+    get supportedLangs(): string[];
     cookieSelection: CookieSelection;
     currentLang: string;
-    translations: Record<string, Record<string, string>>;
-    calendarTranslation: OccuplanTranslations;
-    cookieTranslation: CookieTranslation;
-    formats: Record<string, Record<string, any>>;
+    get translations(): Record<string, Record<string, string>>;
+    get calendarTranslation(): OccuplanTranslations;
+    get cookieTranslation(): CookieTranslation;
+    get formats(): Record<string, FormatSpec>;
     selectedTheme: 'light' | 'dark';
     selectedThemeInitialized: boolean;
-    constructor(siteConfig: SiteConfig, lang: string | undefined);
+    constructor(getSiteConfig: () => SiteConfig, lang: string | undefined);
     updateCurrentLang: (lang: string) => string;
     translateFunc: (ref: string) => string;
     formatFunc: (ref: string, props: Record<string, any>) => string;
     formatDateFunc: (d: DateTime | string) => string;
+    translateWithLangFunc: (ref: string, lang: string) => string;
 }
 export {};

package/dist/SiteState.svelte.js

@@ -1,12 +1,33 @@
-import { format } from 'accomadesc';
 import { DateTime } from 'luxon';
+import { format } from './helpers/format.ts';
 export class SiteState {
-    fullTranslations = {};
-    calendarTranslations = {};
-    cookieTranslations = {};
-    siteTranslations = {};
-    supportedLangs = $state(['en']);
-    isMenuOpen = $state(false);
+    _getSiteConfigFn;
+    //fullTranslations: Record<string, FullTranslation> = $derived(this._getSiteConfigFn().lang.translations);
+    get fullTranslations() {
+        return this._getSiteConfigFn().lang.translations;
+    }
+    get calendarTranslations() {
+        return Object.entries(this.fullTranslations).reduce((s, e) => {
+            s[e[0]] = e[1].calendar;
+            return s;
+        }, {});
+    }
+    ;
+    get cookieTranslations() {
+        return Object.entries(this.fullTranslations).reduce((s, e) => {
+            s[e[0]] = e[1].cookies;
+            return s;
+        }, {});
+    }
+    get siteTranslations() {
+        return Object.entries(this.fullTranslations).reduce((s, e) => {
+            s[e[0]] = e[1].site;
+            return s;
+        }, {});
+    }
+    get supportedLangs() {
+        return this._getSiteConfigFn().lang.supportedLangs;
+    }
     cookieSelection = $state({
         analytics: false,
         marketing: false,
@@ -14,32 +35,33 @@ export class SiteState {
         necessary: true,
     });
     currentLang = $state('en');
-    translations = $state(this.siteTranslations);
-    calendarTranslation = $derived(this.calendarTranslations[this.currentLang]);
-    cookieTranslation = $state(this.cookieTranslations[this.currentLang]);
-    formats = $state({});
+    get translations() {
+        return this.siteTranslations;
+    }
+    get calendarTranslation() {
+        return this.calendarTranslations[this.currentLang];
+    }
+    get cookieTranslation() {
+        return this.cookieTranslations[this.currentLang];
+    }
+    get formats() {
+        return this._getSiteConfigFn().lang.formats;
+    }
     selectedTheme = $state('light');
     selectedThemeInitialized = $state(false);
-    constructor(siteConfig, lang) {
-        if (!lang || !siteConfig.lang.supportedLangs.includes(lang)) {
-            this.currentLang = siteConfig.lang.defaultLang;
+    constructor(getSiteConfig, lang) {
+        this._getSiteConfigFn = getSiteConfig;
+        if (!lang || !getSiteConfig().lang.supportedLangs.includes(lang)) {
+            this.currentLang = getSiteConfig().lang.defaultLang;
         }
         else {
             this.currentLang = lang;
         }
-        this.fullTranslations = siteConfig.lang.translations;
-        for (const lang in this.fullTranslations) {
-            this.calendarTranslations[lang] = this.fullTranslations[lang].calendar;
-            this.siteTranslations[lang] = this.fullTranslations[lang].site;
-            this.cookieTranslations[lang] = this.fullTranslations[lang].cookies;
-        }
-        this.supportedLangs = siteConfig.lang.supportedLangs;
-        this.formats = siteConfig.lang.formats;
     }
     updateCurrentLang = (lang) => (this.currentLang = lang);
     translateFunc = (ref) => {
         if (!ref)
-            return 'UNDEF';
+            return '[UNDEF]';
         const current = this.translations[this.currentLang];
         if (!current[ref])
             return '';
@@ -48,22 +70,44 @@ export class SiteState {
     formatFunc = (ref, props) => {
         const fString = this.formats[this.currentLang][ref];
         if (!fString) {
-            console.log('missing formatFunc', ref);
-            return '';
+            console.warn(`[Missing formatFunc: ${ref}]`);
+            return '[UNDEF]';
         }
         let formatted = format(fString, props);
         return formatted;
     };
     formatDateFunc = (d) => {
+        if (!d)
+            return this.translateFunc("invalid");
+        const formatSpecs = this.formats[this.currentLang];
         let f = 'yyyy-MM-dd';
-        if (this.formats[this.currentLang]?.dateFormat) {
-            f = this.formats[this.currentLang].dateFormat;
+        if (formatSpecs?.dateFormat) {
+            f = formatSpecs.dateFormat;
         }
         let date;
         if (typeof d === 'string')
             date = DateTime.fromISO(d);
         else
             date = d;
-        return date.toFormat(f);
+        // if d was invalid to begin with or 
+        // translformation from ISO didn't yield a valid DateTime object
+        if (date.isValid)
+            return this.translateFunc("invalid");
+        return date.setLocale(formatSpecs.locale).toFormat(f);
+    };
+    translateWithLangFunc = (ref, lang) => {
+        const translation = this.translations[lang];
+        if (!translation) {
+            console.error(`[Tried to access unknown translation: ${lang}]`);
+            return "[UNDEF]";
+        }
+        const res = translation[ref];
+        if (res === undefined) {
+            console.warn(`[Missing Translation for: ${ref}]`);
+            return '[UNDEF]';
+        }
+        else {
+            return res;
+        }
     };
 }

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { randomName, randomID } from './names/gen.js';
 import { format } from './helpers/format.js';
 import { MoneyFormats } from './helpers/moneyFormats.js';
+import { SiteState } from './SiteState.svelte.js';
 import Avatar from './basic/Avatar.svelte';
 import Button from './basic/Button.svelte';
 import Icon from './basic/Icon.svelte';
@@ -28,4 +29,4 @@ import PageComponent from './PageComponent.svelte';
 export type { OccuplanTranslations } from './occuplan/state.svelte';
 export type { GridPhoto, LeafletMap as LeafletMapI, LeafletMapContent, Calendar as CalendarI, CalendarContent, CalendarAvailable as CalendarAvailableI, CalendarAvailableContent, CalendarGrid as CalendarGridI, CalendarGridContent, CalendarRows as CalendarRowsI, CalendarRowsContent, Text as TextI, TextContent, Weather as WeatherI, WeatherContent, Photo as PhotoI, PhotoContent, PhotoGallery as PhotoGalleryI, PhotoGalleryContent, Pricing as PricingI, PricingContent, PricingShort as PricingShortI, PricingShortContent, PricingEntry, PricingRange, PricingColumn, StaticRangeDate, StaticPricingRange, AmenitiesCore as AmenitiesCoreI, AmenitiesCoreContent, AccoCard as AccoCardI, AccoCardContent, ContactForm as ContactFormI, ContactFormContent, BookingRequest as BookingRequestI, BookingRequestContent, AccoDescription as AccoDescriptionI, AccoDescriptionContent, Section as SectionI, I18nFacade, AccoBlock, Block, PageProps, PageConfig, Nav as NavI, Style, NavItem, FormatSpec, FormatTemplateName, SiteConfig, LangConfig, CookieConfig, SiteFonts, SiteTranslation, FontSpec, Hero, } from './types.js';
 export { PRICING_COLUMNS, BLOCK_KINDS, isAccoCard, isText, isPhoto, isGallery, isLeafletMap, isWeather, isAmenitiesCore, isCalendarAvailable, isCalendar, isCalendarGrid, isCalendarRows, isPricing, isPricingShort, isAccoDescription, isBookingRequest, isContactForm, isAccoBlock, } from './types.js';
-export { randomID, randomName, format, MoneyFormats, Avatar, Button, Icon, Spinner, TextInput, AccoCard, AccoDescription, AmenitiesCore, Calendar, CalendarAvailable, LeafletMap, Photo, PhotoGallery, Pricing, PricingShort, Section, Text, Weather, BookingRequest, ContactForm, CalendarRows, CalendarGrid, Notes, PageComponent, };
+export { randomID, randomName, format, MoneyFormats, Avatar, Button, Icon, Spinner, TextInput, AccoCard, AccoDescription, AmenitiesCore, Calendar, CalendarAvailable, LeafletMap, Photo, PhotoGallery, Pricing, PricingShort, Section, Text, Weather, BookingRequest, ContactForm, CalendarRows, CalendarGrid, Notes, PageComponent, SiteState, };

package/dist/index.js

@@ -2,6 +2,7 @@
 import { randomName, randomID } from './names/gen.js';
 import { format } from './helpers/format.js';
 import { MoneyFormats } from './helpers/moneyFormats.js';
+import { SiteState } from './SiteState.svelte.js';
 import Avatar from './basic/Avatar.svelte';
 import Button from './basic/Button.svelte';
 import Icon from './basic/Icon.svelte';
@@ -27,4 +28,4 @@ import Text from './Text.svelte';
 import Weather from './Weather.svelte';
 import PageComponent from './PageComponent.svelte';
 export { PRICING_COLUMNS, BLOCK_KINDS, isAccoCard, isText, isPhoto, isGallery, isLeafletMap, isWeather, isAmenitiesCore, isCalendarAvailable, isCalendar, isCalendarGrid, isCalendarRows, isPricing, isPricingShort, isAccoDescription, isBookingRequest, isContactForm, isAccoBlock, } from './types.js';
-export { randomID, randomName, format, MoneyFormats, Avatar, Button, Icon, Spinner, TextInput, AccoCard, AccoDescription, AmenitiesCore, Calendar, CalendarAvailable, LeafletMap, Photo, PhotoGallery, Pricing, PricingShort, Section, Text, Weather, BookingRequest, ContactForm, CalendarRows, CalendarGrid, Notes, PageComponent, };
+export { randomID, randomName, format, MoneyFormats, Avatar, Button, Icon, Spinner, TextInput, AccoCard, AccoDescription, AmenitiesCore, Calendar, CalendarAvailable, LeafletMap, Photo, PhotoGallery, Pricing, PricingShort, Section, Text, Weather, BookingRequest, ContactForm, CalendarRows, CalendarGrid, Notes, PageComponent, SiteState, };

package/dist/occuplan/defaultTranslations.d.ts

@@ -0,0 +1,157 @@
+export declare const DefaultCalTranslations: {
+    es: {
+        weekdayLabels: {
+            1: string;
+            2: string;
+            3: string;
+            4: string;
+            5: string;
+            6: string;
+            7: string;
+        };
+        monthLabels: {
+            1: string;
+            2: string;
+            3: string;
+            4: string;
+            5: string;
+            6: string;
+            7: string;
+            8: string;
+            9: string;
+            10: string;
+            11: string;
+            12: string;
+        };
+        weekendLabel: string;
+        typeLabels: {
+            one: string;
+            two: string;
+            three: string;
+        };
+    };
+    fr: {
+        weekdayLabels: {
+            1: string;
+            2: string;
+            3: string;
+            4: string;
+            5: string;
+            6: string;
+            7: string;
+        };
+        monthLabels: {
+            1: string;
+            2: string;
+            3: string;
+            4: string;
+            5: string;
+            6: string;
+            7: string;
+            8: string;
+            9: string;
+            10: string;
+            11: string;
+            12: string;
+        };
+        weekendLabel: string;
+        typeLabels: {
+            one: string;
+            two: string;
+            three: string;
+        };
+    };
+    pl: {
+        weekdayLabels: {
+            1: string;
+            2: string;
+            3: string;
+            4: string;
+            5: string;
+            6: string;
+            7: string;
+        };
+        monthLabels: {
+            1: string;
+            2: string;
+            3: string;
+            4: string;
+            5: string;
+            6: string;
+            7: string;
+            8: string;
+            9: string;
+            10: string;
+            11: string;
+            12: string;
+        };
+        weekendLabel: string;
+        typeLabels: {
+            one: string;
+            two: string;
+            three: string;
+        };
+    };
+    en: {
+        weekdayLabels: {
+            1: string;
+            2: string;
+            3: string;
+            4: string;
+            5: string;
+            6: string;
+            7: string;
+        };
+        monthLabels: {
+            1: string;
+            2: string;
+            3: string;
+            4: string;
+            5: string;
+            6: string;
+            7: string;
+            8: string;
+            9: string;
+            10: string;
+            11: string;
+            12: string;
+        };
+        weekendLabel: string;
+        typeLabels: {
+            one: string;
+            two: string;
+            three: string;
+        };
+    };
+    de: {
+        weekdayLabels: {
+            1: string;
+            2: string;
+            3: string;
+            4: string;
+            5: string;
+            6: string;
+            7: string;
+        };
+        monthLabels: {
+            1: string;
+            2: string;
+            3: string;
+            4: string;
+            5: string;
+            6: string;
+            7: string;
+            8: string;
+            9: string;
+            10: string;
+            11: string;
+            12: string;
+        };
+        weekendLabel: string;
+        typeLabels: {
+            one: string;
+            two: string;
+            three: string;
+        };
+    };
+};

package/dist/occuplan/defaultTranslations.js

@@ -0,0 +1,157 @@
+export const DefaultCalTranslations = {
+    es: {
+        weekdayLabels: {
+            1: 'Lu',
+            2: 'Ma',
+            3: 'Mi',
+            4: 'Ju',
+            5: 'Vi',
+            6: 'Sa',
+            7: 'Do',
+        },
+        monthLabels: {
+            1: 'Ene',
+            2: 'Feb',
+            3: 'Mar',
+            4: 'Abr',
+            5: 'May',
+            6: 'Jun',
+            7: 'Jul',
+            8: 'Ago',
+            9: 'Sep',
+            10: 'Oct',
+            11: 'Nov',
+            12: 'Dic',
+        },
+        weekendLabel: 'Fin de Semana',
+        typeLabels: {
+            one: 'Ocupado',
+            two: 'Ocupade',
+            three: '',
+        },
+    },
+    fr: {
+        weekdayLabels: {
+            1: 'Lu',
+            2: 'Ma',
+            3: 'Me',
+            4: 'Je',
+            5: 'Ve',
+            6: 'Sa',
+            7: 'Di',
+        },
+        monthLabels: {
+            1: 'Jan',
+            2: 'Fév',
+            3: 'Mar',
+            4: 'Avr',
+            5: 'Mai',
+            6: 'Juin',
+            7: 'Juil',
+            8: 'Août',
+            9: 'Sept',
+            10: 'Oct',
+            11: 'Nov',
+            12: 'Déc',
+        },
+        weekendLabel: 'Week-end',
+        typeLabels: {
+            one: 'Occupé',
+            two: 'Occupé',
+            three: '',
+        },
+    },
+    pl: {
+        weekdayLabels: {
+            1: 'Pon',
+            2: 'Wt',
+            3: 'Śr',
+            4: 'Czw',
+            5: 'Pt',
+            6: 'Sob',
+            7: 'Ndz',
+        },
+        monthLabels: {
+            1: 'Sty',
+            2: 'Lut',
+            3: 'Mar',
+            4: 'Kwi',
+            5: 'Maj',
+            6: 'Cze',
+            7: 'Lip',
+            8: 'Sie',
+            9: 'Wrz',
+            10: 'Paź',
+            11: 'Lis',
+            12: 'Gru',
+        },
+        weekendLabel: 'Weekend',
+        typeLabels: {
+            one: 'Zajęty',
+            two: 'Zajęty',
+            three: '',
+        },
+    },
+    en: {
+        weekdayLabels: {
+            1: 'Mo',
+            2: 'Tu',
+            3: 'We',
+            4: 'Th',
+            5: 'Fr',
+            6: 'Sa',
+            7: 'Su',
+        },
+        monthLabels: {
+            1: 'Jan',
+            2: 'Feb',
+            3: 'Mar',
+            4: 'Apr',
+            5: 'May',
+            6: 'Jun',
+            7: 'Jul',
+            8: 'Aug',
+            9: 'Sep',
+            10: 'Oct',
+            11: 'Nov',
+            12: 'Dec',
+        },
+        weekendLabel: 'Weekend',
+        typeLabels: {
+            one: 'Occupied',
+            two: 'Blocked',
+            three: 'Requested',
+        },
+    },
+    de: {
+        weekdayLabels: {
+            1: 'Mo',
+            2: 'Di',
+            3: 'Mi',
+            4: 'Do',
+            5: 'Fr',
+            6: 'Sa',
+            7: 'So',
+        },
+        monthLabels: {
+            1: 'Jan',
+            2: 'Feb',
+            3: 'Mär',
+            4: 'Apr',
+            5: 'Mai',
+            6: 'Jun',
+            7: 'Jul',
+            8: 'Aug',
+            9: 'Sep',
+            10: 'Okt',
+            11: 'Nov',
+            12: 'Dez',
+        },
+        weekendLabel: 'Wochenende',
+        typeLabels: {
+            one: 'Belegt',
+            two: 'Geblockt',
+            three: 'Anfrage',
+        },
+    },
+};

package/dist/occuplan/state.svelte.js

@@ -411,7 +411,7 @@ export class OccupationState {
 export const getOccupationState = (url, debug = false) => {
     if (debug)
         console.log('Get OState /w url', url);
-    const stateID = Symbol(`i-${url}-${OCCUPATION_STATE}`);
+    const stateID = `i-${url}-${OCCUPATION_STATE}`;
     let _instance = getContext(stateID);
     if (_instance)
         return _instance;

package/dist/types.d.ts

@@ -396,6 +396,7 @@ export interface I18nFacade {
     supportedLangs?: string[];
     calendarTranslation?: OccuplanTranslations;
     translateFunc?: (ref: string) => string;
+    translateWithLangFunc?: (ref: string, lang: string) => string;
     formatFunc?: (formatter: string, props: Record<string, any>) => string;
     formatMoneyFunc?: (d: number) => string;
     formatDateFunc?: (d: DateTime | string) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "accomadesc",
-  "version": "0.3.36",
+  "version": "0.3.38",
   "files": [
     "dist",
     "!dist/**/*.test.*",
@@ -30,7 +30,7 @@
     "@sveltejs/package": "^2.5.7",
     "@sveltejs/vite-plugin-svelte": "^5.1.1",
     "@types/luxon": "^3.7.1",
-    "gdpr-cooco-banner": "^0.0.11",
+    "gdpr-cooco-banner": "^0.0.12",
     "prettier": "^3.7.4",
     "prettier-plugin-svelte": "^3.4.1",
     "publint": "^0.3.16",