@websolutespa/payload-plugin-seo 0.1.3 → 2.0.0

package/CHANGELOG.md

@@ -1,55 +1,67 @@
-# @websolutespa/payload-plugin-seo
-
-## 0.1.3
-
-### Patch Changes
-
-- - Add rules field localization
-
-## 0.1.2
-
-### Patch Changes
-
-- 0b4e928: Modified: translations
-- Updated dependencies [0b4e928]
-- Updated dependencies [e921c43]
-- Updated dependencies [e921c43]
-  - @websolutespa/payload-utils@0.0.3
-
-## 0.1.1
-
-### Patch Changes
-
-- 15ad595: Modified: payload local api consolidated overrideAccess
-
-## 0.1.0
-
-### Minor Changes
-
-- 8475b68: Added: external dependency payload-utils
-- 946a81f: Updating: dependency payload 2.28.0
-
-### Patch Changes
-
-- Updated dependencies [8475b68]
-  - @websolutespa/payload-utils@0.0.1
-
-## 0.0.3
-
-### Patch Changes
-
-- Fixing: utility functions exports
-
-## 0.0.2
-
-### Patch Changes
-
-- 882a9be: add token autocomplete
-  add readme
-- 8696866: add new tests
-
-## 0.0.1
-
-### Patch Changes
-
-- 06a3127: Initial release
+# @websolutespa/payload-plugin-seo
+
+## 2.0.0
+
+### Major Changes
+
+- Release: Bom 2.0
+
+## 0.1.4
+
+### Patch Changes
+
+- - Improved rules evaluation performance
+
+## 0.1.3
+
+### Patch Changes
+
+- - Add rules field localization
+
+## 0.1.2
+
+### Patch Changes
+
+- 0b4e928: Modified: translations
+- Updated dependencies [0b4e928]
+- Updated dependencies [e921c43]
+- Updated dependencies [e921c43]
+  - @websolutespa/payload-utils@0.0.3
+
+## 0.1.1
+
+### Patch Changes
+
+- 15ad595: Modified: payload local api consolidated overrideAccess
+
+## 0.1.0
+
+### Minor Changes
+
+- 8475b68: Added: external dependency payload-utils
+- 946a81f: Updating: dependency payload 2.28.0
+
+### Patch Changes
+
+- Updated dependencies [8475b68]
+  - @websolutespa/payload-utils@0.0.1
+
+## 0.0.3
+
+### Patch Changes
+
+- Fixing: utility functions exports
+
+## 0.0.2
+
+### Patch Changes
+
+- 882a9be: add token autocomplete
+  add readme
+- 8696866: add new tests
+
+## 0.0.1
+
+### Patch Changes
+
+- 06a3127: Initial release

package/dist/index.js

@@ -311,6 +311,33 @@ var MetatagsRule = {
   ]
 };
 
+// src/utils/cache.ts
+var CACHE_ = /* @__PURE__ */ new Map();
+async function fromCache(callback, key, duration = 5 * 60) {
+  const now = (/* @__PURE__ */ new Date()).getTime() / 1e3;
+  const cachedItem = CACHE_.get(key);
+  const executeCallback = /* @__PURE__ */ __name(async () => {
+    const expire = now + duration;
+    const t = await callback();
+    CACHE_.set(key, {
+      data: t,
+      expire
+    });
+    return t;
+  }, "executeCallback");
+  if (cachedItem) {
+    if (now < cachedItem.expire) {
+      return cachedItem.data;
+    } else {
+      CACHE_.delete(key);
+      return await executeCallback();
+    }
+  } else {
+    return await executeCallback();
+  }
+}
+__name(fromCache, "fromCache");
+
 // src/seo.ts
 var replaceTokens = /* @__PURE__ */ __name(async (req, collection, doc, str, locale) => {
   const tokens = str.match(/\[(.*?)\]/g) || [];
@@ -362,7 +389,11 @@ var replaceTokens = /* @__PURE__ */ __name(async (req, collection, doc, str, loc
                     str = str.replace(token, titleFieldValue);
                   } else {
                     const titleFieldValue = findVal(fieldValue, titleField.name);
-                    str = str.replace(token, locale && titleField?.localized ? titleFieldValue[locale.code] ?? titleFieldValue[defaultLocale2] : titleFieldValue);
+                    if (!titleFieldValue || Object.keys(titleFieldValue).length === 0) {
+                      str = str.replace(token, "");
+                    } else {
+                      str = str.replace(token, locale && titleField?.localized ? titleFieldValue[locale.code] ?? titleFieldValue[defaultLocale2] : titleFieldValue);
+                    }
                   }
                 } else {
                   str = str.replace(token, "");
@@ -379,28 +410,34 @@ var replaceTokens = /* @__PURE__ */ __name(async (req, collection, doc, str, loc
   }
   return str;
 }, "replaceTokens");
-var setCollectionMetatags = /* @__PURE__ */ __name(({ req, doc, query }) => async (collection) => {
+var setDocMetatags = /* @__PURE__ */ __name(async ({
+  req,
+  doc,
+  collection
+}) => {
   try {
-    if (req.query[options.qsMetatagsRules] === void 0) {
-      return doc;
-    }
     const { payload: payload2 } = req;
     const defaultLocale2 = req.payload.config.localization ? req.payload.config.localization.defaultLocale : "en";
-    const result = await payload2.find({
-      collection: options.slug.metatagsRule,
-      where: {
-        or: [
-          { collections: { equals: "" } },
-          { collections: { equals: [] } },
-          { collections: { equals: null } },
-          { collections: { exists: false } },
-          { collections: { contains: collection.slug } }
-        ]
-      },
-      pagination: false,
-      overrideAccess: true,
-      locale: "all"
-    });
+    const result = await fromCache(
+      async () => await payload2.find({
+        collection: options.slug.metatagsRule,
+        where: {
+          or: [
+            { collections: { equals: "" } },
+            { collections: { equals: [] } },
+            { collections: { equals: null } },
+            { collections: { exists: false } },
+            { collections: { contains: collection.slug } }
+          ]
+        },
+        pagination: false,
+        overrideAccess: true,
+        locale: "all"
+      }),
+      "metatags-rules-" + collection.slug,
+      60
+      // TODO: add to plugin options
+    );
     let rules = result.docs;
     rules = rules.sort((a, b) => a.collections.length === 0 ? 1 : b.collections.length === 0 ? -1 : 0);
     const metaFields = ["title", "description", "keywords", ...options.additionalFields.map((field) => field.name)];
@@ -437,6 +474,40 @@ var setCollectionMetatags = /* @__PURE__ */ __name(({ req, doc, query }) => asyn
     console.error(`Error while setting seo metatags: ${error}`);
   }
   return doc;
+}, "setDocMetatags");
+var setCollectionMetatags = /* @__PURE__ */ __name(async ({
+  args,
+  operation,
+  result
+}) => {
+  const { req, collection } = args;
+  if (req?.query && req.query[options.qsMetatagsRules] === void 0) {
+    return result;
+  }
+  if (operation !== "find") {
+    if (result && typeof result === "object" && !Array.isArray(result) && !("docs" in result)) {
+      const updatedDoc = await setDocMetatags({
+        req,
+        doc: result,
+        collection: collection.config
+      });
+      return updatedDoc;
+    }
+  } else if (operation === "find" && req?.path === "/store") {
+    if (result && typeof result === "object" && "docs" in result && Array.isArray(result.docs)) {
+      const documentPromises = result.docs.map(async (doc) => {
+        return await setDocMetatags({
+          req,
+          doc,
+          collection: collection.config
+        });
+      });
+      const updatedDocs = await Promise.all(documentPromises);
+      result.docs = updatedDocs;
+      return result;
+    }
+  }
+  return result;
 }, "setCollectionMetatags");
 var seo = /* @__PURE__ */ __name((sourceOptions) => (sourceConfig) => {
   options.collections = sourceOptions.collections ? Object.assign(options.collections, sourceOptions.collections) : Object.assign(options.collections, sourceConfig.collections?.map((x) => x.slug));
@@ -447,7 +518,10 @@ var seo = /* @__PURE__ */ __name((sourceOptions) => (sourceConfig) => {
   collections?.forEach((collection) => {
     collection.hooks = {
       ...collection.hooks,
-      afterRead: [...collection.hooks?.afterRead || [], (args) => setCollectionMetatags(args)(collection)]
+      afterOperation: [
+        ...collection.hooks?.afterOperation || [],
+        setCollectionMetatags
+      ]
     };
   });
   const targetConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/payload-plugin-seo",
-  "version": "0.1.3",
+  "version": "2.0.0",
   "description": "SEO plugin for PayloadCms",
   "keywords": [
     "payload",
@@ -27,7 +27,7 @@
   },
   "peerDependencies": {
     "@payloadcms/db-mongodb": ">= 1.2.0",
-    "@websolutespa/payload-utils": "*",
+    "@websolutespa/payload-utils": "^2.0.0",
     "payload": ">= 2.28.0 < 3",
     "react": ">= 18.2.0",
     "uuid": ">= 9.0.1"
@@ -35,13 +35,13 @@
   "devDependencies": {
     "@types/express": "^4.17.15",
     "@types/uuid": "^9.0.2",
-    "@websolutespa/bom-cli": "*",
-    "@websolutespa/bom-env": "*",
-    "@websolutespa/test": "*",
-    "@websolutespa/tsconfig": "*",
+    "@websolutespa/bom-cli": "^2.0.0",
+    "@websolutespa/bom-env": "^2.0.0",
+    "@websolutespa/test": "^2.0.0",
+    "@websolutespa/tsconfig": "^2.0.0",
     "esbuild-sass-plugin": "^2.10.0",
     "eslint": "^8.56.0",
-    "eslint-config-websolute": "*",
+    "eslint-config-websolute": "^2.0.0",
     "mongodb-memory-server": "^8.13.0",
     "react": "^18.2.0",
     "ts-node": "^10.9.2",