@manyducks.co/dolla 0.69.4 → 0.70.0

package/lib/app.d.ts

@@ -49,13 +49,18 @@ export interface StoreRegistration<O = any> {
     instance?: ReturnType<typeof initStore>;
 }
 interface ConfigureContext {
+    /**
+     * Returns the shared instance of `store`.
+     */
+    getStore<T extends Store<any, any>>(store: T): ReturnType<T>;
+    /**
+     * Returns the shared instance of a built-in store.
+     */
+    getStore<N extends keyof BuiltInStores>(name: N): BuiltInStores[N];
 }
 type ConfigureCallback = (ctx: ConfigureContext) => void | Promise<void>;
 export interface IApp {
     readonly isConnected: boolean;
-    /**
-     * Makes this store accessible from any other component in the app, except for stores registered before this one.
-     */
     /**
      * Runs `callback` after app-level stores are connected to the app, but before views are connected to the DOM.
      * Use this function to run async configuration code before displaying content to the user.

package/lib/index.js

@@ -2195,10 +2195,65 @@ function RenderStore(ctx) {
   };
 }
 
-// src/app.ts
-function DefaultRootView(_, ctx) {
+// src/views/default-crash-page.ts
+function DefaultCrashPage({ message, error, componentName }) {
+  return m(
+    "div",
+    {
+      style: {
+        backgroundColor: "#880000",
+        color: "#fff",
+        padding: "2rem",
+        position: "fixed",
+        inset: 0,
+        fontSize: "20px"
+      }
+    },
+    m("h1", { style: { marginBottom: "0.5rem" } }, "The app has crashed"),
+    m(
+      "p",
+      { style: { marginBottom: "0.25rem" } },
+      m("span", { style: { fontFamily: "monospace" } }, componentName),
+      " says:"
+    ),
+    m(
+      "blockquote",
+      {
+        style: {
+          backgroundColor: "#991111",
+          padding: "0.25em",
+          borderRadius: "6px",
+          fontFamily: "monospace",
+          marginBottom: "1rem"
+        }
+      },
+      m(
+        "span",
+        {
+          style: {
+            display: "inline-block",
+            backgroundColor: "red",
+            padding: "0.1em 0.4em",
+            marginRight: "0.5em",
+            borderRadius: "4px",
+            fontSize: "0.9em",
+            fontWeight: "bold"
+          }
+        },
+        error.name
+      ),
+      message
+    ),
+    m("p", {}, "Please see the browser console for details.")
+  );
+}
+
+// src/views/default-view.ts
+function DefaultView(_, ctx) {
   return ctx.outlet();
 }
+
+// src/app.ts
 function isAppOptions(value) {
   return isObject(value);
 }
@@ -2207,7 +2262,7 @@ function App(options) {
     throw new TypeError(`App options must be an object. Got: ${options}`);
   }
   let isConnected = false;
-  let mainView = m(options?.view ?? DefaultRootView);
+  let mainView = m(options?.view ?? DefaultView);
   let configureCallback;
   const settings = merge(
     {
@@ -2290,14 +2345,42 @@ function App(options) {
       if (configureCallback) {
         await configureCallback({
           // TODO: Add context methods
+          getStore(store) {
+            let name;
+            if (typeof store === "string") {
+              name = store;
+            } else {
+              name = store.name;
+            }
+            if (typeof store !== "string") {
+              let ec = elementContext;
+              while (ec) {
+                if (ec.stores.has(store)) {
+                  return ec.stores.get(store)?.instance.exports;
+                }
+                ec = ec.parent;
+              }
+            }
+            if (appContext.stores.has(store)) {
+              const _store = appContext.stores.get(store);
+              if (!_store.instance) {
+                appContext.crashCollector.crash({
+                  componentName: "@manyducks.co/dolla/App",
+                  error: new Error(`Store '${name}' is not registered on this app.`)
+                });
+              }
+              return _store.instance.exports;
+            }
+            appContext.crashCollector.crash({
+              componentName: "@manyducks.co/dolla/App",
+              error: new Error(`Store '${name}' is not registered on this app.`)
+            });
+          }
         });
       }
-      const done = () => {
-        appContext.rootView.connect(appContext.rootElement);
-        isConnected = true;
-        resolve2();
-      };
-      done();
+      appContext.rootView.connect(appContext.rootElement);
+      isConnected = true;
+      resolve2();
     });
   }
   async function disconnect() {
@@ -2324,54 +2407,6 @@ function App(options) {
     get isConnected() {
       return isConnected;
     },
-    //     language(tag: string, config: LanguageConfig) {
-    //       languages.set(tag, config);
-    //
-    //       return app;
-    //     },
-    //
-    //     setLanguage(tag: string, fallback?: string) {
-    //       if (tag === "auto") {
-    //         let tags = [];
-    //
-    //         if (typeof navigator === "object") {
-    //           const nav = navigator as any;
-    //
-    //           if (nav.languages?.length > 0) {
-    //             tags.push(...nav.languages);
-    //           } else if (nav.language) {
-    //             tags.push(nav.language);
-    //           } else if (nav.browserLanguage) {
-    //             tags.push(nav.browserLanguage);
-    //           } else if (nav.userLanguage) {
-    //             tags.push(nav.userLanguage);
-    //           }
-    //         }
-    //
-    //         for (const tag of tags) {
-    //           if (languages.has(tag)) {
-    //             // Found a matching language.
-    //             currentLanguage = tag;
-    //             return this;
-    //           }
-    //         }
-    //
-    //         if (!currentLanguage && fallback) {
-    //           if (languages.has(fallback)) {
-    //             currentLanguage = fallback;
-    //           }
-    //         }
-    //       } else {
-    //         // Tag is the actual tag to set.
-    //         if (languages.has(tag)) {
-    //           currentLanguage = tag;
-    //         } else {
-    //           throw new Error(`Language '${tag}' has not been added to this app yet.`);
-    //         }
-    //       }
-    //
-    //       return app;
-    //     },
     configure(callback) {
       if (configureCallback !== void 0) {
         debugChannel.warn(`Configure callback is already defined. Only the final configure call will take effect.`);
@@ -2382,57 +2417,6 @@ function App(options) {
   };
   return app;
 }
-function DefaultCrashPage({ message, error, componentName }) {
-  return m(
-    "div",
-    {
-      style: {
-        backgroundColor: "#880000",
-        color: "#fff",
-        padding: "2rem",
-        position: "fixed",
-        inset: 0,
-        fontSize: "20px"
-      }
-    },
-    m("h1", { style: { marginBottom: "0.5rem" } }, "The app has crashed"),
-    m(
-      "p",
-      { style: { marginBottom: "0.25rem" } },
-      m("span", { style: { fontFamily: "monospace" } }, componentName),
-      " says:"
-    ),
-    m(
-      "blockquote",
-      {
-        style: {
-          backgroundColor: "#991111",
-          padding: "0.25em",
-          borderRadius: "6px",
-          fontFamily: "monospace",
-          marginBottom: "1rem"
-        }
-      },
-      m(
-        "span",
-        {
-          style: {
-            display: "inline-block",
-            backgroundColor: "red",
-            padding: "0.1em 0.4em",
-            marginRight: "0.5em",
-            borderRadius: "4px",
-            fontSize: "0.9em",
-            fontWeight: "bold"
-          }
-        },
-        error.name
-      ),
-      message
-    ),
-    m("p", {}, "Please see the browser console for details.")
-  );
-}
 
 // src/views/fragment.ts
 function Fragment(_, ctx) {
@@ -3122,9 +3106,7 @@ function patternToFragments(pattern) {
     const part = parts[i];
     if (part === "*") {
       if (i !== parts.length - 1) {
-        throw new Error(
-          `Wildcard must be at the end of a pattern. Received: ${pattern}`
-        );
+        throw new Error(`Wildcard must be at the end of a pattern. Received: ${pattern}`);
       }
       fragments.push({
         type: 3 /* Wildcard */,
@@ -3149,7 +3131,6 @@ function patternToFragments(pattern) {
 }
 
 // src/stores/router.ts
-var DefaultView = (_, ctx) => ctx.outlet();
 function RouterStore(ctx) {
   ctx.name = "dolla/router";
   const { appContext, elementContext } = getStoreSecrets(ctx);
@@ -3488,37 +3469,71 @@ function LanguageStore(ctx) {
     }
     return template;
   }
-  const currentLanguage = ctx.options.default ? languages.get(ctx.options.default) : languages.get([...languages.keys()][0]);
-  if (currentLanguage == null) {
-    $$isLoaded.set(true);
-  } else {
-    ctx.info(`Current language is '${currentLanguage.name}'.`);
-    getTranslation(currentLanguage).then((translation) => {
-      $$language.set(currentLanguage.name);
+  async function setLanguage(tag) {
+    let realTag;
+    if (tag === "auto") {
+      let tags = [];
+      if (typeof navigator === "object") {
+        const nav = navigator;
+        if (nav.languages?.length > 0) {
+          tags.push(...nav.languages);
+        } else if (nav.language) {
+          tags.push(nav.language);
+        } else if (nav.browserLanguage) {
+          tags.push(nav.browserLanguage);
+        } else if (nav.userLanguage) {
+          tags.push(nav.userLanguage);
+        }
+      }
+      for (const tag2 of tags) {
+        if (languages.has(tag2)) {
+          realTag = tag2;
+        }
+      }
+    } else {
+      if (languages.has(tag)) {
+        realTag = tag;
+      }
+    }
+    if (realTag == null) {
+      const firstLanguage = ctx.options.languages[0];
+      if (firstLanguage) {
+        realTag = firstLanguage.name;
+      }
+    }
+    if (!realTag || !languages.has(realTag)) {
+      throw new Error(`Language '${tag}' is not configured for this app.`);
+    }
+    const lang = languages.get(realTag);
+    try {
+      const translation = await getTranslation(lang);
       $$translation.set(translation);
-      $$isLoaded.set(true);
-    });
+      $$language.set(realTag);
+      ctx.info("set language to " + realTag);
+    } catch (error) {
+      if (error instanceof Error) {
+        ctx.crash(error);
+      }
+    }
   }
+  setLanguage(ctx.options.defaultLanguage ?? "auto").then(() => {
+    $$isLoaded.set(true);
+  });
   return {
+    loaded: new Promise((resolve2, reject) => {
+      const stop = observe($$isLoaded, (isLoaded) => {
+        if (isLoaded) {
+          setTimeout(() => {
+            stop();
+            resolve2();
+          }, 0);
+        }
+      });
+    }),
     $isLoaded: $($$isLoaded),
     $currentLanguage: $($$language),
     supportedLanguages: [...languages.keys()],
-    async setLanguage(tag) {
-      if (!languages.has(tag)) {
-        throw new Error(`Language '${tag}' is not supported.`);
-      }
-      const lang = languages.get(tag);
-      try {
-        const translation = await getTranslation(lang);
-        $$translation.set(translation);
-        $$language.set(tag);
-        ctx.info("set language to " + tag);
-      } catch (error) {
-        if (error instanceof Error) {
-          ctx.crash(error);
-        }
-      }
-    },
+    setLanguage,
     /**
          * Returns a Readable of the translated value.