chore: move zone wait function to utils folder

analogjs · Jan 29, 2023 · fa9faf8 · fa9faf8
1 parent 09ba6e7
commit fa9faf8
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 23 deletions.
diff --git a/packages/content/src/lib/content.ts b/packages/content/src/lib/content.ts
@@ -8,6 +8,7 @@ import { Observable, of } from 'rxjs';
 
 import { ContentFile } from './content-file';
 import { CONTENT_FILES_TOKEN } from './content-files-token';
+import { waitFor } from './utils/zone-wait-for';
 
 /**
  * Retrieves the static content using the provided param
@@ -38,21 +39,14 @@ export function injectContent<
       }
 
       return new Promise<string>((resolve) => {
+        const contentResolver = contentFile();
+
         if (import.meta.env.SSR === true) {
-          const macroTask = (globalThis as any)[
-            'Zone'
-          ].current.scheduleMacroTask(
-            `AnalogResolveContent-${Math.random()}`,
-            () => {},
-            {},
-            () => {}
-          );
-          contentFile().then((content) => {
-            macroTask.invoke();
+          waitFor(contentResolver).then((content) => {
             resolve(content);
           });
         } else {
-          contentFile().then((content) => {
+          contentResolver.then((content) => {
             resolve(content);
           });
         }

diff --git a/packages/content/src/lib/markdown.component.ts b/packages/content/src/lib/markdown.component.ts
@@ -15,6 +15,7 @@ import { catchError, map, mergeMap, switchMap } from 'rxjs/operators';
 
 import { ContentRenderer } from './content-renderer';
 import { AnchorNavigationDirective } from './anchor-navigation.directive';
+import { waitFor } from './utils/zone-wait-for';
 
 @Component({
   selector: 'analog-markdown',
@@ -53,18 +54,7 @@ export default class AnalogMarkdownComponent
           return of(this.content);
         } else {
           if (import.meta.env.SSR === true) {
-            const macroTask = (globalThis as any)[
-              'Zone'
-            ].current.scheduleMacroTask(
-              `AnalogResolveMarkdown-${Math.random()}`,
-              () => {},
-              {},
-              () => {}
-            );
-            return contentResolver().then((content) => {
-              macroTask.invoke();
-              return content;
-            });
+            return waitFor(contentResolver());
           } else {
             return contentResolver();
           }

diff --git a/packages/content/src/lib/utils/zone-wait-for.ts b/packages/content/src/lib/utils/zone-wait-for.ts
@@ -0,0 +1,19 @@
+import { firstValueFrom, isObservable, Observable } from 'rxjs';
+
+declare const Zone: any;
+
+export async function waitFor<T>(prom: Promise<T> | Observable<T>): Promise<T> {
+  if (isObservable(prom)) {
+    prom = firstValueFrom(prom);
+  }
+  const macroTask = Zone.current.scheduleMacroTask(
+    `AnalogContentResolve-${Math.random()}`,
+    () => {},
+    {},
+    () => {}
+  );
+  return prom.then((p: T) => {
+    macroTask.invoke();
+    return p;
+  });
+}