@jungvonmatt/contentful-ssg 1.7.1 → 1.7.3

package/dist/index.js

@@ -1,5 +1,5 @@
 import Listr from 'listr';
-import { BehaviorSubject } from 'rxjs';
+import { ReplaySubject } from 'rxjs';
 import chalk from 'chalk';
 import { getContentTypeId, getContentId } from './lib/contentful.js';
 import { setup } from './tasks/setup.js';
@@ -64,7 +64,7 @@ export const run = async (config) => {
                 const tasks = locales.map((locale) => ({
                     title: `${locale.code}`,
                     task: async () => {
-                        const subject = new BehaviorSubject(null);
+                        const subject = new ReplaySubject();
                         const observable = subject.asObservable();
                         const data = ctx.localized.get(locale.code);
                         const { entries = [] } = data || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jungvonmatt/contentful-ssg",
-  "version": "1.7.1",
+  "version": "1.7.3",
   "description": "",
   "repository": {
     "type": "git",
@@ -163,5 +163,5 @@
       "module": "es2020"
     }
   },
-  "gitHead": "4649238738f3f4cce24555f2a60c8ef07793b2e6"
+  "gitHead": "07c6810f528dc8cf51fad3f8e8cc6081facd9232"
 }

package/src/index.ts

@@ -7,7 +7,7 @@ import type {
   TransformHelper,
 } from './types.js';
 import Listr from 'listr';
-import { BehaviorSubject } from 'rxjs';
+import { ReplaySubject } from 'rxjs';
 import chalk from 'chalk';
 import { getContentTypeId, getContentId } from './lib/contentful.js';
 import { setup } from './tasks/setup.js';
@@ -91,7 +91,7 @@ export const run = async (config: Config): Promise<void> => {
           const tasks = locales.map((locale) => ({
             title: `${locale.code}`,
             task: async () => {
-              const subject = new BehaviorSubject<ObservableContext>(null);
+              const subject = new ReplaySubject<ObservableContext>();
               const observable = subject.asObservable();
               const data = ctx.localized.get(locale.code);
               const { entries = [] } = data || {};

package/src/lib/utils.test.ts

@@ -1,6 +1,6 @@
 import { Entry, TransformContext } from '../types.js';
 import { collect, collectParentValues, collectValues, waitFor } from './utils.js';
-import { BehaviorSubject } from 'rxjs';
+import { ReplaySubject } from 'rxjs';
 import { WrappedError } from './error.js';
 
 const data = new Map([
@@ -140,7 +140,7 @@ describe('Utils', () => {
   });
 
   test('waitFor', async () => {
-    const subject = new BehaviorSubject<TransformContext>(null);
+    const subject = new ReplaySubject<TransformContext>(null);
     const observable = subject.asObservable();
 
     // Throw error when waiting for the current entry
@@ -168,7 +168,7 @@ describe('Utils', () => {
   });
 
   test('waitFor error', async () => {
-    const subject = new BehaviorSubject<TransformContext>(null);
+    const subject = new ReplaySubject<TransformContext>(null);
     const observable = subject.asObservable();
     const entry = entryMap.get('3');
 
@@ -196,7 +196,7 @@ describe('Utils', () => {
   });
 
   test('detect cyclic dependency', async () => {
-    const subject = new BehaviorSubject<TransformContext>(null);
+    const subject = new ReplaySubject<TransformContext>(null);
     const observable = subject.asObservable();
 
     // let 9 finish regularly
@@ -244,4 +244,55 @@ describe('Utils', () => {
     expect(result[3]).toMatch(/Awaited entry 6 \(test-type\) errored/);
     expect(result[4]).toMatch('SUCCESS 3');
   });
+
+  test('handle subscriptions on postponed subscribe', async () => {
+    const subject = new ReplaySubject<TransformContext>();
+    const observable = subject.asObservable();
+
+    const finishSuccess = (id, time = 0) =>
+      setTimeout(() => {
+        subject.next({
+          ...transformContext,
+          entry: entryMap.get(id),
+          observable,
+        });
+      }, time);
+
+    const finishError = (id, time = 0) =>
+      setTimeout(() => {
+        subject.next({
+          ...transformContext,
+          entry: entryMap.get(id),
+          error: new Error(`Error on ${id}`),
+          observable,
+        });
+      }, time);
+
+    finishSuccess('2', 20);
+    finishSuccess('3', 40);
+    finishError('4', 30);
+    finishSuccess('5', 50);
+
+    const transFormMock = () =>
+      Promise.all([
+        waitFor({ ...transformContext, entry: entryMap.get('1'), observable })('2'),
+        waitFor({ ...transformContext, entry: entryMap.get('1'), observable })('3'),
+        waitFor({ ...transformContext, entry: entryMap.get('1'), observable })('4'),
+        waitFor({ ...transformContext, entry: entryMap.get('1'), observable })('5'),
+      ]);
+
+    const result = await new Promise((resolve) => {
+      setTimeout(async () => {
+        try {
+          const result = await transFormMock();
+          resolve(result);
+        } catch (error) {
+          resolve(error);
+        }
+      }, 500);
+    });
+
+    expect(result).toBeInstanceOf(WrappedError);
+    expect((result as WrappedError).message).toMatch(/Awaited entry 4 \(test-type\) errored/);
+  });
 });