jekyll-client-search 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8289b785b9591674a7c171eea4ac3a3500765d79dd6679793a5c693879d7ed1
-  data.tar.gz: 2cc203750200af25356f75ca4e272747f39763f7abcfd9bedc9eff2ee9332b24
+  metadata.gz: 60acab6161a3d4eafb265742c337c86bbc26e444bc0ce202a02e5ce80049c3f0
+  data.tar.gz: bf05aa7d4945bb3e82acd8ab5127ab2e84bb457eb9868f79d235a8a5ce701a53
 SHA512:
-  metadata.gz: 9ffd9295cb6e23c001c8c88acbdeb5fa8252a47dd646c58ef5f09b4a0233fe88b026cea4c5f8a4b0cc9b03e2907377e6b070af3066c2b266752ad1e49163beaf
-  data.tar.gz: 90261e2e563cf3649913211bcded60669fe55abec5a9e5caf1fa049e4342874d4a33e2ff058b72c35817ed96fed92b88a10c94731c2f7c7467940413f4444211
+  metadata.gz: cc8c5846be7c3a812a94c59aea41ecbb58c9672fa5948b4a306193e6d5914fc18f7104263f9a0ec84a1d405099dbc72dfc6c38c84cc3135133111b3f1c199ab8
+  data.tar.gz: e5eb813ed9b6dc1ba7abf34a96bbefa1c353453d8596d79dbf0f04290c7b502f18306419f4b5adc33712a8a18896def5fe0389293ffe43f7f7fbed2622083d6c

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 0.3.3 — 2026-09-11
+
+### Refactored
+- Extract duplicated `normalize` function from `client-search-base.js` and `client-search-dropdown.js` into new shared module `assets/client-search-shared.js` (exposes `window.ClientSearchShared.normalize` and `window.ClientSearchShared.coreFields`) — eliminates CodeFactor duplicate-code finding and ensures consistent normalization across both runtimes
+
 ## 0.3.2 — 2026-09-10
 
 ### Added

data/assets/client-search-base.js

@@ -58,48 +58,8 @@
                 return;
             }
 
-            var coreFields = [
-                "id", "title", "url", "excerpt", "content",
-                "categories", "tags", "categoriesText", "tagsText",
-                "date", "date_timestamp", "embedding"
-            ];
-
-            function normalize(entry) {
-                var id = entry.id || entry.url;
-                if (!id) {
-                    return null;
-                }
-                var categories = Array.isArray(entry.categories) ? entry.categories : [];
-                var tags = Array.isArray(entry.tags) ? entry.tags : [];
-                var normalized = {
-                    id: id,
-                    title: entry.title || "Untitled",
-                    url: entry.url || "#",
-                    excerpt: entry.excerpt || "",
-                    content: entry.content || "",
-                    date: entry.date || "",
-                    date_timestamp: Number(entry.date_timestamp) || 0,
-                    categories: categories,
-                    tags: tags,
-                    categoriesText: categories.join(" "),
-                    tagsText: tags.join(" ")
-                };
-                if (entry.source) {
-                    normalized.source = entry.source;
-                }
-                if (Array.isArray(entry.embedding) && entry.embedding.length > 0) {
-                    normalized.embedding = entry.embedding;
-                }
-                Object.keys(entry).forEach(function (key) {
-                    if (coreFields.indexOf(key) === -1 && key !== "source" && !(key in normalized)) {
-                        var value = entry[key];
-                        if (value !== null && value !== undefined && value !== "") {
-                            normalized[key] = value;
-                        }
-                    }
-                });
-                return normalized;
-            }
+            var normalize = window.ClientSearchShared.normalize;
+            var coreFields = window.ClientSearchShared.coreFields;
 
             function buildIndex(data) {
                 if (!Array.isArray(data)) {

data/assets/client-search-dropdown.js

@@ -41,39 +41,7 @@
         return key.replace(/_([a-z])/g, function (_, char) { return char.toUpperCase(); });
     }
 
-    function normalize(entry) {
-        var id = entry.id || entry.url;
-        if (!id) {
-            return null;
-        }
-        var categories = Array.isArray(entry.categories) ? entry.categories : [];
-        var tags = Array.isArray(entry.tags) ? entry.tags : [];
-        var normalized = {
-            id: id,
-            title: entry.title || "Untitled",
-            url: entry.url || "#",
-            excerpt: entry.excerpt || "",
-            content: entry.content || "",
-            date: entry.date || "",
-            date_timestamp: Number(entry.date_timestamp) || 0,
-            categories: categories,
-            tags: tags,
-            categoriesText: categories.join(" "),
-            tagsText: tags.join(" ")
-        };
-        if (entry.source) {
-            normalized.source = entry.source;
-        }
-        Object.keys(entry).forEach(function (key) {
-            if (!(key in normalized) && key !== "embedding") {
-                var value = entry[key];
-                if (value !== null && value !== undefined && value !== "") {
-                    normalized[key] = value;
-                }
-            }
-        });
-        return normalized;
-    }
+    var normalize = window.ClientSearchShared.normalize;
 
     function loadIndex(config) {
         if (sharedIndex && sharedDocuments) {

data/assets/client-search-shared.js

@@ -0,0 +1,57 @@
+(function () {
+    "use strict";
+
+    /**
+     * ClientSearch shared utilities — used by the base runtime and the
+     * dropdown runtime to normalize search index entries into a uniform
+     * document format.
+     *
+     * Loaded before client-search-base.js and client-search-dropdown.js.
+     * Exposes window.ClientSearchShared.normalize(entry).
+     */
+
+    var CORE_FIELDS = [
+        "id", "title", "url", "excerpt", "content",
+        "categories", "tags", "categoriesText", "tagsText",
+        "date", "date_timestamp", "embedding"
+    ];
+
+    function normalize(entry) {
+        var id = entry.id || entry.url;
+        if (!id) {
+            return null;
+        }
+        var categories = Array.isArray(entry.categories) ? entry.categories : [];
+        var tags = Array.isArray(entry.tags) ? entry.tags : [];
+        var normalized = {
+            id: id,
+            title: entry.title || "Untitled",
+            url: entry.url || "#",
+            excerpt: entry.excerpt || "",
+            content: entry.content || "",
+            date: entry.date || "",
+            date_timestamp: Number(entry.date_timestamp) || 0,
+            categories: categories,
+            tags: tags,
+            categoriesText: categories.join(" "),
+            tagsText: tags.join(" ")
+        };
+        if (entry.source) {
+            normalized.source = entry.source;
+        }
+        if (Array.isArray(entry.embedding) && entry.embedding.length > 0) {
+            normalized.embedding = entry.embedding;
+        }
+        Object.keys(entry).forEach(function (key) {
+            if (CORE_FIELDS.indexOf(key) === -1 && key !== "source" && !(key in normalized)) {
+                var value = entry[key];
+                if (value !== null && value !== undefined && value !== "") {
+                    normalized[key] = value;
+                }
+            }
+        });
+        return normalized;
+    }
+
+    window.ClientSearchShared = { normalize: normalize, coreFields: CORE_FIELDS };
+})();

data/lib/jekyll/client_search/configuration.rb

@@ -105,7 +105,7 @@ module Jekyll
       end
 
       def runtime_assets
-        assets = ["assets/client-search-base.js", "assets/adapters/#{engine}.js"]
+        assets = ["assets/client-search-shared.js", "assets/client-search-base.js", "assets/adapters/#{engine}.js"]
         assets.concat(query_embedder_assets) if engine == "semantic" && embedding_enabled?
         assets << "assets/client-search-related.js" if related_enabled?
         assets << "assets/client-search-dropdown.js" if dropdown_enabled?

data/lib/jekyll/client_search/dropdown_tag.rb

@@ -90,24 +90,30 @@ module Jekyll
 
       def build_scripts(configuration, prefix)
         scripts = []
-        engine = configuration.engine_url
-        if engine
-          attrs = ["src=\"#{CGI.escapeHTML(engine)}\""]
-          if configuration.engine_crossorigin
-            crossorigin = CGI.escapeHTML(configuration.engine_crossorigin)
-            attrs << "crossorigin=\"#{crossorigin}\""
-          end
-          if configuration.engine_sri
-            integrity = CGI.escapeHTML(configuration.engine_sri)
-            attrs << "integrity=\"#{integrity}\""
-          end
-          scripts << "<script #{attrs.join(' ')}></script>"
-        end
+        engine = engine_script(configuration)
+        scripts << engine if engine
         scripts << "<script src=\"#{prefix}/assets/search-runtime-config.js\"></script>"
+        scripts << "<script src=\"#{prefix}/assets/client-search-shared.js\"></script>"
         scripts << "<script src=\"#{prefix}/assets/client-search-dropdown.js\"></script>"
         scripts << "<script src=\"#{prefix}/assets/adapters/#{configuration.engine}.js\"></script>"
         scripts.map { |script| "  #{script}" }.join("\n")
       end
+
+      def engine_script(configuration)
+        url = configuration.engine_url
+        return nil unless url
+
+        attrs = ["src=\"#{CGI.escapeHTML(url)}\""]
+        if configuration.engine_crossorigin
+          crossorigin = CGI.escapeHTML(configuration.engine_crossorigin)
+          attrs << "crossorigin=\"#{crossorigin}\""
+        end
+        if configuration.engine_sri
+          integrity = CGI.escapeHTML(configuration.engine_sri)
+          attrs << "integrity=\"#{integrity}\""
+        end
+        "<script #{attrs.join(' ')}></script>"
+      end
     end
   end
 end

data/lib/jekyll/client_search/search_tag.rb

@@ -69,6 +69,7 @@ module Jekyll
         scripts << engine if engine
         scripts << "<script src=\"#{prefix}/assets/search-runtime-config.js\"></script>"
         scripts.concat(embedder_scripts(configuration, prefix))
+        scripts << "<script src=\"#{prefix}/assets/client-search-shared.js\"></script>"
         scripts << "<script src=\"#{prefix}/assets/client-search-base.js\"></script>"
         scripts << "<script src=\"#{prefix}/assets/adapters/#{configuration.engine}.js\"></script>"
         scripts.map { |script| "  #{script}" }.join("\n")

data/lib/jekyll/client_search/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module ClientSearch
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-client-search
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Svend Gundestrup
@@ -48,6 +48,7 @@ files:
 - assets/client-search-base.js
 - assets/client-search-dropdown.js
 - assets/client-search-related.js
+- assets/client-search-shared.js
 - assets/includes/related-articles.html
 - assets/layouts/post-with-related.html
 - assets/query-embedders/ollama-api.js