utilitas 1998.2.37 → 1998.2.39

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1998.2.37",
+    "version": "1998.2.39",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",

package/lib/shot.mjs

@@ -5,6 +5,7 @@ import { sha256 } from './encryption.mjs';
 import { distillHtml } from './web.mjs';
 
 import {
+    ensureInt,
     ensureString, extract, ignoreErrFunc, inBrowser, parseJson, parseVersion,
     throwError, which
 } from './utilitas.mjs';
@@ -160,66 +161,28 @@ const initSearch = (options) => {
 };
 
 const search = async (query, options) => {
+    const [key, cx, min, max]
+        = [options?.apiKey || googleApiKey, options?.cx || googleCx, 1, 10];
     assert(query, 'Query is required.');
-    const [GOOGLE, DUCKDUCKGO] = ['GOOGLE', 'DUCKDUCKGO'];
-    const provider = ensureString(
-        options?.provider || searchProvider || DUCKDUCKGO, { case: 'UP' }
-    );
-    let apiKey = options?.apiKey || googleApiKey, cx = options?.cx || googleCx,
-        url, parser;
-    switch (provider) {
-        case GOOGLE:
-            assert(apiKey, 'API key is required.');
-            assert(cx, 'CX is required.');
-            url = 'https://www.googleapis.com/customsearch/v1'
-                + `?key=${encodeURIComponent(apiKey)}`
-                + `&cx=${encodeURIComponent(cx)}`
-                + `&q=${encodeURIComponent(query)}`;
-            break;
-        case DUCKDUCKGO:
-            url = 'https://api.duckduckgo.com/'
-                + `?q=${encodeURIComponent(query)}&format=json&skip_disambig=1`;
-            parser = x => x.FirstURL ? {
-                title: x.FirstURL.replace(/^.*\/([^\/]*)$/, '$1').replace(/_/g, ' '),
-                link: x.FirstURL, snippet: x.Text,
-                image: `https://duckduckgo.com${x.Icon.URL}`, source: null,
-            } : null;
-            break;
-        default:
-            throwError(`Invalid provider: ${provider}.`);
-    }
+    assert(key, 'API key is required.');
+    assert(cx, 'CX is required.');
+    const num = ensureInt(options?.num || max, { min, max });
+    const start = ensureInt(options?.start || min, { min });
+    assert(start + num <= 100, 'Reached maximum search limit.');
+    const url = 'https://www.googleapis.com/customsearch/v1'
+        + `?key=${encodeURIComponent(key)}&cx=${encodeURIComponent(cx)}`
+        + `&q=${encodeURIComponent(query)}&num=${num}&start=${start}`
+        + (options?.image ? `&searchType=image` : '');
     const resp = await get(url, { encode: _JSON, ...options || {} });
-    let result = [];
-    if (options?.raw) {
-        result = resp.content;
-    } else if (provider === GOOGLE) {
-        result.push(...resp?.content?.items.map(x => ({
-            title: x.title, link: x.link, snippet: x.snippet,
-            image: x.pagemap?.cse_image?.[0]?.src || null,
-        })));
-    } else if (provider === DUCKDUCKGO) {
-        const cnt = resp?.content;
-        if (cnt?.Abstract) {
-            result.push({
-                title: cnt?.Heading + (cnt?.Entity ? ` (${cnt.Entity})` : ''),
-                link: cnt?.AbstractURL, snippet: cnt?.AbstractText,
-                image: cnt?.Image ? `https://duckduckgo.com${cnt.Image}` : null,
-                source: cnt?.AbstractSource,
-            });
-            if (cnt?.Results) {
-                result.push(...cnt.Results.map(x => ({
-                    title: x.Text, link: x.FirstURL, snippet: null,
-                    image: x.Icon ? `https://duckduckgo.com${x.Icon.URL}` : null,
-                    source: null,
-                })));
-            }
-        } else if (cnt?.RelatedTopics?.[0] && !options?.no_recurse) {
-            result = await search(cnt.RelatedTopics[0].FirstURL.replace(
-                /^.*\/([^\/]*)$/, '$1'
-            ).replace(/_/g, ' '), { ...options, no_recurse: true });
-        }
-    }
-    return result;
+    return options?.raw ? resp.content : {
+        totalResults: resp?.content?.searchInformation?.totalResults || 0,
+        startIndex: resp?.content?.queries?.request?.[0]?.startIndex || 1,
+        items: resp?.content?.items.map(x => ({
+            title: x.title, link: options?.image ? null : x.link,
+            snippet: x.snippet,
+            image: (options?.image ? x.link : x.pagemap?.cse_image?.[0]?.src) || null,
+        })),
+    };
 };
 
 export default get;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1998.2.37",
+    "version": "1998.2.39",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",