feat: check for matches

10up · Jul 22, 2023 · 8c6e2f1 · 8c6e2f1
1 parent 90c17a4
commit 8c6e2f1
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 42 deletions.
diff --git a/packages/core/src/data/strategies/PostOrPostsFetchStrategy.ts b/packages/core/src/data/strategies/PostOrPostsFetchStrategy.ts
@@ -44,6 +44,8 @@ export class PostOrPostsFetchStrategy<
 	P extends PostOrPostsParams,
 	R extends PostOrPostsFetchStrategyResult<T>,
 > extends AbstractFetchStrategy<T[], P, R> {
+	urlParams: Partial<P> = {};
+
 	postStrategy: SinglePostFetchStrategy = new SinglePostFetchStrategy(this.baseURL);
 
 	postsStrategy: PostsArchiveFetchStrategy = new PostsArchiveFetchStrategy(this.baseURL);
@@ -53,41 +55,42 @@ export class PostOrPostsFetchStrategy<
 	}
 
 	getParamsFromURL(path: string, params: Partial<P> = {}): Partial<P> {
-		console.log(
-			'PostsOrPosts - path',
-			path,
-			this.postStrategy.getParamsFromURL(path, params.single),
-		);
-		return {
+		this.urlParams = {
 			single: this.postStrategy.getParamsFromURL(path, params.single),
 			archive: this.postsStrategy.getParamsFromURL(path, params.archive),
 		} as P;
+
+		return this.urlParams;
 	}
 
 	async fetcher(
 		url: string,
 		params: Partial<P>,
 		options?: Partial<FetchOptions>,
 	): Promise<FetchResponse<R>> {
-		if (params.priority === 'single') {
-			try {
-				const results = await this.postStrategy.fetcher(
-					this.postStrategy.buildEndpointURL(params.single ?? {}),
-					params.single ?? {},
-					options,
-				);
+		const didMatchSingle = Object.keys(this.urlParams?.single ?? {}).length > 0;
+		const didMatchArchive = Object.keys(this.urlParams?.archive ?? {}).length > 0;
 
-				return {
-					...results,
-					result: {
-						isArchive: false,
-						isSingle: true,
-						data: results.result,
-					} as R,
-				};
-			} catch (e) {
-				console.log(e);
-				// do nothing
+		if (params.priority === 'single') {
+			if (didMatchSingle) {
+				try {
+					const results = await this.postStrategy.fetcher(
+						this.postStrategy.buildEndpointURL(params.single ?? {}),
+						params.single ?? {},
+						options,
+					);
+
+					return {
+						...results,
+						result: {
+							isArchive: false,
+							isSingle: true,
+							data: results.result,
+						} as R,
+					};
+				} catch (e) {
+					// do nothing
+				}
 			}
 
 			// TODO: capture potentiall error and throw a better error message
@@ -108,24 +111,25 @@ export class PostOrPostsFetchStrategy<
 			};
 		}
 
-		try {
-			const results = await this.postsStrategy.fetcher(
-				this.postsStrategy.buildEndpointURL(params.archive ?? {}),
-				params.archive ?? {},
-				options,
-			);
+		if (didMatchArchive) {
+			try {
+				const results = await this.postsStrategy.fetcher(
+					this.postsStrategy.buildEndpointURL(params.archive ?? {}),
+					params.archive ?? {},
+					options,
+				);
 
-			return {
-				...results,
-				result: {
-					isArchive: true,
-					isSingle: false,
-					data: results.result,
-				} as R,
-			};
-		} catch (e) {
-			console.log('archive not found', e);
-			// do nothing
+				return {
+					...results,
+					result: {
+						isArchive: true,
+						isSingle: false,
+						data: results.result,
+					} as R,
+				};
+			} catch (e) {
+				// do nothing
+			}
 		}
 
 		const results = await this.postStrategy.fetcher(

diff --git a/packages/next/src/data/hooks/usePostOrPosts.ts b/packages/next/src/data/hooks/usePostOrPosts.ts
@@ -23,7 +23,6 @@ export function usePostOrPosts<
 ) {
 	const useFetchArguments = usePrepareFetch(params, options);
 
-	console.log('usePostOrPosts', useFetchArguments);
 	return useFetchPostOrPosts<T, P>(
 		useFetchArguments.params,
 		useFetchArguments.options,

diff --git a/...cts/wp-nextjs/src/pages/blog/[...path].js → ...s/wp-nextjs/src/pages/blog/[[...path]].js b/...cts/wp-nextjs/src/pages/blog/[...path].js → ...s/wp-nextjs/src/pages/blog/[[...path]].js