LukeParke/unicorn-utterances
1
0
Fork 0
mirror of https://github.com/LukeHagar/unicorn-utterances.git synced 2025-12-06 04:21:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix search api imports, move unicornProfilePicMap to json fetch

Browse Source
This commit is contained in:
James Fenn
2023-02-12 00:14:15 -05:00
parent ca8e0e12bf
commit 43db01ca5c
8 changed files with 1982 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
searchIndex.json

1936
api/package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

10
api/package.json Normal file
View File

@@ -0,0 +1,10 @@
{
"name": "unicorn-utterances-api",
"type": "module",
"devDependencies": {
"@vercel/node": "^2.9.2"
},
"dependencies": {
"fuse.js": "^6.6.2"
}
}

33
api/search.ts
View File

@@ -1,19 +1,16 @@
import type { VercelRequest, VercelResponse } from "@vercel/node";
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import exportedIndex from "../public/searchIndex";
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import unicornProfilePicMap from "../public/unicorn-profile-pic-map";
import Fuse from "fuse.js";
import type { PostInfo } from "../src/types/PostInfo";
import { createRequire } from "node:module";
const myIndex = Fuse.parseIndex(exportedIndex.index);
import type { PostInfo } from "types/PostInfo";
const posts = exportedIndex.posts;
const require = createRequire(import.meta.url);
const searchIndex = require("./searchIndex.json");
const index = Fuse.parseIndex(searchIndex.index);
const fuse = new Fuse(
const posts = searchIndex.posts;
const fuse = new Fuse<PostInfo>(
posts,
{
threshold: 0.3,
@@ -21,26 +18,18 @@ const fuse = new Fuse(
includeScore: true,
ignoreFieldNorm: true,
},
myIndex
index
);
const unicornProfilePicObj = {};
for (const picMapItem of unicornProfilePicMap) {
unicornProfilePicObj[picMapItem.id] = picMapItem;
}
export default async (req: VercelRequest, res: VercelResponse) => {
// TODO: `pickdeep` only required fields
const searchStr = req?.query?.query as string;
const authorStr = req?.query?.authorId as string;
if (!searchStr) return [];
if (Array.isArray(searchStr)) return [];
let posts = fuse.search(searchStr).map((item) => item.item as PostInfo);
let posts = fuse.search(searchStr).map((item) => item.item);
if (authorStr) {
posts = posts.filter((post) => post.authors.includes(authorStr));
}
const unicornProfilePicMap = posts.flatMap((post) =>
post.authorsMeta.map((authorMeta) => unicornProfilePicObj[authorMeta.id])
);
res.send({ posts, totalPosts: posts.length, unicornProfilePicMap });
res.send({ posts, totalPosts: posts.length });
};

11
build-scripts/search-index.ts
View File

@@ -40,13 +40,6 @@ export const createIndex = async () => {
};
createIndex().then((index) => {
const js = `const index = {
index: ${JSON.stringify(index)},
posts: ${JSON.stringify(posts)}
}
export default index;
`;
fs.writeFileSync(path.resolve(process.cwd(), "./public/searchIndex.js"), js);
const json = JSON.stringify({ index, posts });
fs.writeFileSync(path.resolve(process.cwd(), "./api/searchIndex.json"), json);
});

2
package.json
View File

@@ -30,7 +30,7 @@
"format": "prettier -w . --cache --plugin-search-dir=.",
"lint": "eslint . --ext .js,.ts,.astro",
"search-index": "tsx build-scripts/search-index.ts",
"social-previews:prebuild": "tsc -p tsconfig.script.json",
"social-previews:prebuild": "tsc -p tsconfig.script.json",
"social-previews:build": "npm run social-previews:prebuild && node node_modules/puppeteer-core/install.js && tsx --tsconfig tsconfig.script.json build-scripts/social-previews/index.ts",
"social-previews:dev": "npm run social-previews:prebuild && tsx --tsconfig tsconfig.script.json build-scripts/social-previews/live-server.ts",
"epub": "tsx --tsconfig tsconfig.script.json build-scripts/generate-epubs.ts",

32
src/components/filter-search-bar/filter-search-bar.astro
View File

@@ -87,23 +87,21 @@ import SearchField from "./search-field/search-field.astro";
{ signal: abortController.signal }
)
.then((res) => res.json())
.then(
(serverVal: {
posts: PostInfo[];
totalPosts: number;
unicornProfilePicMap: ProfilePictureMap;
}) => {
const SearchCardHandler = createElement(SearchBarHandler, {
unicornProfilePicMap: serverVal.unicornProfilePicMap,
posts: serverVal.posts,
totalPosts: serverVal.totalPosts,
});
render(SearchCardHandler, searchPostList);
loadingEl && loadingEl.remove();
loadingEl = undefined;
abortController = undefined;
}
);
.then(async (serverVal: { posts: PostInfo[]; totalPosts: number }) => {
const unicornProfilePicMap: ProfilePictureMap = await fetch(
"/unicorns/unicornProfilePicMap.json",
{ cache: "force-cache" }
).then((res) => res.json());
const SearchCardHandler = createElement(SearchBarHandler, {
unicornProfilePicMap,
posts: serverVal.posts,
totalPosts: serverVal.totalPosts,
});
render(SearchCardHandler, searchPostList);
loadingEl && loadingEl.remove();
loadingEl = undefined;
abortController = undefined;
});
}
const debounceDoSearch = debounce(doSearch, 1000, false);

6
src/pages/unicorns/unicornProfilePicMap.json.ts Normal file
View File

@@ -0,0 +1,6 @@
import { getUnicornProfilePicMap } from "utils/get-unicorn-profile-pic-map";
export const get = async () => {
const unicornProfilePicMap = await getUnicornProfilePicMap();
return { body: JSON.stringify(unicornProfilePicMap) };
};