@jungvonmatt/contentful-ssg 1.7.0 → 1.7.4

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/dist/types.d.ts

@@ -7,6 +7,7 @@ import type { ListrTaskObject } from 'listr';
 import type { FileManager } from './lib/file-manager.js';
 import type { Stats } from './lib/stats.js';
 import type { HookManager } from './lib/hook-manager.js';
+export type { Ignore } from 'ignore';
 export declare type KeyValueMap<T = any> = Record<string, T>;
 export declare type Locale = ContentfulLocale;
 export declare type ContentType = ContentfulContentType;
@@ -152,12 +153,6 @@ export declare type TransformContext = LocalizedContent & {
 export declare type ObservableContext = Readonly<Pick<TransformContext, 'id' | 'contentTypeId' | 'entry' | 'content' | 'locale'> & {
     error?: Error;
 }>;
-export interface Ignore {
-    add(pattern: string | Ignore | string[] | Ignore[]): Ignore;
-    filter(paths: string[]): string[];
-    createFilter(): (path: string) => boolean;
-    ignores(pathname: string): boolean;
-}
 export interface StatsEntry extends KeyValueMap {
     id: string;
     contentTypeId: string;
@@ -201,4 +196,3 @@ export interface ErrorEntry {
     locale: Locale;
     missingFields: string[];
 }
-export {};

package/package.json

@@ -1,7 +1,14 @@
 {
   "name": "@jungvonmatt/contentful-ssg",
-  "version": "1.7.0",
+  "version": "1.7.4",
   "description": "",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jungvonmatt/contentful-ssg.git"
+  },
+  "bugs": {
+    "url": "https://github.com/jungvonmatt/contentful-ssg/issues"
+  },
   "main": "./dist/index.js",
   "type": "module",
   "typings": "./dist/types.d.ts",
@@ -156,5 +163,5 @@
       "module": "es2020"
     }
   },
-  "gitHead": "441c4188533375574d0bd461b3e043ba0c7d2655"
+  "gitHead": "d6529cec33cf6939f0cebf189437b6e65e6be7b4"
 }

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/);
+  });
 });

package/src/types.ts

@@ -17,6 +17,8 @@ import type { FileManager } from './lib/file-manager.js';
 import type { Stats } from './lib/stats.js';
 import type { HookManager } from './lib/hook-manager.js';
 
+export type { Ignore } from 'ignore';
+
 export type KeyValueMap<T = any> = Record<string, T>;
 
 export type Locale = ContentfulLocale;
@@ -227,12 +229,6 @@ export type ObservableContext = Readonly<
     error?: Error;
   }
 >;
-export interface Ignore {
-  add(pattern: string | Ignore | string[] | Ignore[]): Ignore;
-  filter(paths: string[]): string[];
-  createFilter(): (path: string) => boolean;
-  ignores(pathname: string): boolean;
-}
 
 export interface StatsEntry extends KeyValueMap {
   id: string;