accomadesc 0.3.30 → 0.3.31

package/dist/occuplan/OccuPlanAvailableInfo.svelte

@@ -1,15 +1,13 @@
 <script lang="ts">
   import { DateTime } from 'luxon';
   import { normalizeDate } from '../helpers/normalizeDate.js';
-  import { getContext, onMount, setContext, type Snippet } from 'svelte';
+  import { onMount, type Snippet } from 'svelte';
   import {
-    OCCUPATION_STATE,
     OccupationState,
     getOccupationState,
     type AvailableSpans,
   } from './state.svelte.js';
   import Spinner from '../basic/Spinner.svelte';
-  import { browser } from '$app/environment';
 
   let {
     url,
@@ -25,16 +23,13 @@
     children: Snippet<[AvailableSpans]>;
   } = $props();
 
-  const oStateID = `i-${url}-${OCCUPATION_STATE}`;
-  let occupationState: OccupationState = $state(getContext(oStateID));
-  onMount(() => {
-    if (!occupationState && browser) {
-      occupationState = getOccupationState(url, debug);
-      setContext(oStateID, occupationState);
-    }
-  });
+  let occupationState: OccupationState = getOccupationState(url, debug);
 
   let av = $derived(occupationState ? occupationState.calcAvailability(search, maxFutureDate) : {});
+
+  onMount(() => {
+    occupationState.loadOccupations();
+  });
 </script>
 
 {#if !occupationState || occupationState.loading}

package/dist/occuplan/OccuPlanGrid.svelte

@@ -4,7 +4,6 @@
     defaultMonthHeaderFormat,
     defaultMonthLabels,
     defaultWeekdayLabels,
-    OCCUPATION_STATE,
     OccupationState,
     getOccupationState,
     occupationTypeFormatting,
@@ -13,11 +12,10 @@
     type OccupationType,
     type OccuplanTranslations,
   } from './state.svelte.js';
-  import { getContext, onMount, setContext } from 'svelte';
   import Button from '../basic/Button.svelte';
-  import { browser } from '$app/environment';
   import Spinner from '../basic/Spinner.svelte';
   import { randomID } from '../names/gen.js';
+  import { onMount } from 'svelte';
 
   let {
     url,
@@ -51,14 +49,7 @@
 
   const id = randomID();
 
-  const oStateID = `i-${url}-${OCCUPATION_STATE}`;
-  let occupationState: OccupationState = $state(getContext(oStateID));
-  onMount(() => {
-    if (!occupationState && browser) {
-      occupationState = getOccupationState(url, debug);
-      setContext(oStateID, occupationState);
-    }
-  });
+  let occupationState: OccupationState = getOccupationState(url, debug);
 
   //let formatFun = $derived(Sqrl.compile(monthHeaderFormat, { useWith: true }));
   const monthHeader = (monthNum: MonthNumbers, year: number): string => {
@@ -153,6 +144,10 @@
       return res;
     }, [] as OccupationType[]),
   );
+
+  onMount(() => {
+    occupationState.loadOccupations();
+  });
 </script>
 
 {#if !occupationState || occupationState.loading}

package/dist/occuplan/OccuPlanPicker.svelte

@@ -4,15 +4,13 @@
     defaultMonthHeaderFormat,
     defaultMonthLabels,
     defaultWeekdayLabels,
-    OCCUPATION_STATE,
     OccupationState,
     getOccupationState,
     realFirstMonth,
     type OccuplanTranslations,
   } from './state.svelte.js';
-  import { getContext, onMount, setContext, untrack } from 'svelte';
+  import { onMount, untrack } from 'svelte';
   import Button from '../basic/Button.svelte';
-  import { browser } from '$app/environment';
   import Spinner from '../basic/Spinner.svelte';
   import { normalizeDate } from '../helpers/normalizeDate.js';
 
@@ -58,14 +56,7 @@
     dateSelected?: (arrival: DateTime, leave: DateTime) => void;
   } = $props();
 
-  const oStateID = `i-${url}-${OCCUPATION_STATE}`;
-  let occupationState: OccupationState = $state(getContext(oStateID));
-  onMount(() => {
-    if (!occupationState && browser) {
-      occupationState = getOccupationState(url, debug);
-      setContext(oStateID, occupationState);
-    }
-  });
+  let occupationState: OccupationState = getOccupationState(url, debug);
 
   const monthHeader = (monthNum: MonthNumbers, year: number): string => {
     const monthLabel = monthLabels[monthNum];
@@ -200,6 +191,10 @@
     let firstDayOfWeek = w.startOf('week');
     return lastDayOfMonth < firstDayOfWeek;
   };
+
+  onMount(() => {
+    occupationState.loadOccupations();
+  });
 </script>
 
 {#if !occupationState || occupationState.loading}

package/dist/occuplan/OccuPlanRows.svelte

@@ -8,16 +8,15 @@
     occupationTypeFormatting,
     type OccupationType,
     type OccuplanTranslations,
-    OCCUPATION_STATE,
     type DayHelper,
     type FirstMonth,
     realFirstMonth,
   } from './state.svelte.js';
   import Button from '../basic/Button.svelte';
   import { browser } from '$app/environment';
-  import { getContext, onMount, setContext } from 'svelte';
   import Spinner from '../basic/Spinner.svelte';
   import { randomID } from '../names/gen.js';
+  import { onMount } from 'svelte';
 
   let {
     url,
@@ -48,14 +47,7 @@
 
   const id = randomID();
 
-  const oStateID = `i-${url}-${OCCUPATION_STATE}`;
-  let occupationState: OccupationState = $state(getContext(oStateID));
-  onMount(() => {
-    if (!occupationState && browser) {
-      occupationState = getOccupationState(url, debug);
-      setContext(oStateID, occupationState);
-    }
-  });
+  let occupationState: OccupationState = getOccupationState(url, debug);
 
   let page: number = $state(0);
   let rfMonth: number | DateTime = $derived(realFirstMonth(firstMonth, numberOfMonth, page));
@@ -134,6 +126,10 @@
         }, [] as OccupationType[])
       : [],
   );
+
+  onMount(() => {
+    occupationState.loadOccupations();
+  });
 </script>
 
 {#if !occupationState || occupationState.loading}

package/dist/occuplan/state.svelte.d.ts

@@ -74,7 +74,7 @@ export declare class OccupationState {
     loading: boolean;
     debug: boolean;
     constructor(iCalURL: string, debug?: boolean);
-    private loadOccupations;
+    loadOccupations: () => Promise<boolean>;
     private eventsIncomingCallback;
     private dayKey;
     private updateOccupiedDays;

package/dist/occuplan/state.svelte.js

@@ -2,6 +2,7 @@ import { normalizeDate } from '../helpers/normalizeDate.js';
 import { getEvents } from '../helpers/readICS.js';
 import { DateTime } from 'luxon';
 import { DateTime as luxon } from 'luxon';
+import { getContext, setContext } from 'svelte';
 export const OCCUPATION_STATE = 'occupation-state';
 export const occupationTypeFormattingByOccupation = (o) => {
     return occupationTypeFormatting(o?.type);
@@ -185,7 +186,7 @@ export class OccupationState {
         if (this.debug)
             console.log('Constructing OState with CalUrl: ', iCalURL);
         this.iCalURL = iCalURL;
-        this.loadOccupations();
+        //this.loadOccupations();
     }
     loadOccupations = async () => {
         if (this.debug)
@@ -392,14 +393,13 @@ export class OccupationState {
       `;
     };
 }
-let _instances = {};
 export const getOccupationState = (url, debug = false) => {
     if (debug)
         console.log('Get OState /w url', url);
-    const currentInstance = _instances[url];
-    if (currentInstance)
-        return currentInstance;
-    const newInstance = new OccupationState(url, debug);
-    _instances[url] = newInstance;
-    return _instances[url];
+    const stateID = `i-${url}-${OCCUPATION_STATE}`;
+    let _instance = getContext(stateID);
+    if (_instance)
+        return _instance;
+    setContext(stateID, new OccupationState(url, debug));
+    return getContext(stateID);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "accomadesc",
-  "version": "0.3.30",
+  "version": "0.3.31",
   "files": [
     "dist",
     "!dist/**/*.test.*",