@yourbright/emdash-analytics-plugin 0.1.7 → 0.1.9

package/dist/index.js

@@ -297,27 +297,6 @@ async function getManagedContentMap(siteOrigin) {
   void siteOrigin;
   return managed;
 }
-async function resolveManagedContent(collection, id, slug, siteOrigin) {
-  if (collection !== "posts") return null;
-  const ref = id || slug;
-  if (!ref) return null;
-  const result = await getEmDashEntry("posts", ref);
-  const entry = result.entry;
-  if (!entry) return null;
-  const entryId = typeof entry.id === "string" ? entry.id : ref;
-  const entrySlug = typeof entry.slug === "string" ? entry.slug : null;
-  const data = entry.data ?? {};
-  const urlPath = `/blog/${entrySlug || entryId}/`;
-  return {
-    collection: "posts",
-    id: entryId,
-    slug: entrySlug,
-    urlPath,
-    title: typeof data.title === "string" ? data.title : entrySlug || entryId,
-    excerpt: typeof data.excerpt === "string" ? data.excerpt : void 0,
-    seoDescription: typeof data.seo_description === "string" ? data.seo_description : void 0
-  };
-}
 function pageStorageId(urlPath) {
   return stableStorageId(urlPath);
 }
@@ -1073,15 +1052,7 @@ async function getContentContext(ctx, collection, id, slug) {
   if (!page) {
     throw new PluginRouteError("NOT_FOUND", "Analytics data not found for content", 404);
   }
-  const contentRef = await resolveContentRef(config.siteOrigin, page, collection, id, slug) || {
-    collection: "posts",
-    id: page.contentId || id || pageStorageId(page.urlPath),
-    slug: page.contentSlug || slug || null,
-    urlPath: page.urlPath,
-    title: page.title,
-    excerpt: void 0,
-    seoDescription: void 0
-  };
+  const contentRef = resolveStoredContentRef(page, collection, id, slug);
   const queries = await getFreshQueriesForPage(ctx, config, contentRef.urlPath);
   const windows = buildWindows();
   const score = scorePage(page, queries);
@@ -1215,49 +1186,23 @@ async function loadPage(ctx, urlPath) {
 async function findContentPage(ctx, collection, id, slug) {
   if (id) {
     const byId = await ctx.storage.pages.query({
-      where: {
-        contentCollection: collection,
-        contentId: id
-      },
-      limit: 1
+      where: { contentId: id },
+      limit: 20
     });
-    const match = byId.items[0]?.data;
+    const match = byId.items.map((item) => item.data).find((page) => page.contentCollection === collection);
     if (match) return match;
   }
   if (slug) {
     const bySlug = await ctx.storage.pages.query({
-      where: {
-        contentCollection: collection,
-        contentSlug: slug
-      },
-      limit: 1
+      where: { contentSlug: slug },
+      limit: 20
     });
-    const match = bySlug.items[0]?.data;
+    const match = bySlug.items.map((item) => item.data).find((page) => page.contentCollection === collection);
     if (match) return match;
   }
   return null;
 }
-async function resolveContentRef(siteOrigin, page, collection, id, slug) {
-  if (collection !== "posts") {
-    return {
-      collection: "posts",
-      id: page.contentId || id || pageStorageId(page.urlPath),
-      slug: page.contentSlug || slug || null,
-      urlPath: page.urlPath,
-      title: page.title,
-      excerpt: void 0,
-      seoDescription: void 0
-    };
-  }
-  const resolved = await resolveManagedContent(
-    collection,
-    page.contentId || id,
-    page.contentSlug || slug || void 0,
-    siteOrigin
-  );
-  if (resolved) {
-    return resolved;
-  }
+function resolveStoredContentRef(page, collection, id, slug) {
   return {
     collection: "posts",
     id: page.contentId || id || pageStorageId(page.urlPath),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yourbright/emdash-analytics-plugin",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Google Search Console and GA4 analytics plugin for EmDash",
   "type": "module",
   "main": "./dist/index.js",