@microlink/google 1.0.6 → 1.2.1

package/package.json

@@ -2,7 +2,7 @@
   "name": "@microlink/google",
   "description": "Structured Google data from 10 verticals through Microlink API",
   "homepage": "https://github.com/microlinkhq/microlink",
-  "version": "1.0.6",
+  "version": "1.2.1",
   "exports": {
     "types": "./src/index.d.ts",
     "require": "./src/index.js",
@@ -36,7 +36,7 @@
     "serp"
   ],
   "dependencies": {
-    "@microlink/mql": "0.18.0"
+    "@microlink/mql": "0.18.1"
   },
   "devDependencies": {
     "ava": "latest",
@@ -66,5 +66,5 @@
     "test": "exit 0"
   },
   "license": "MIT",
-  "gitHead": "13e0818cc80bca85a19f16837095bd7d6b31f76a"
+  "gitHead": "755abe6066dfc709e3c7bff2ddf08377902fd42e"
 }

package/src/index.d.ts

@@ -56,6 +56,9 @@ interface Options {
   limit?: number
   location?: Location
   period?: Period
+  page?: number
+  html?: boolean
+  markdown?: boolean
 }
 
 interface Sitelink {
@@ -315,6 +318,7 @@ export declare function buildUrl(
     location?: string
     type?: Type
     period?: Period
+    page?: number
   }
 ): URL
 

package/src/index.js

@@ -9,10 +9,11 @@ const buildPath = (query, limit, location) =>
     .filter(v => v !== undefined)
     .join('/')
 
-const buildUrl = (query, { limit, location, type, period } = {}) => {
+const buildUrl = (query, { limit, location, type, period, page } = {}) => {
   const url = new URL(`https://${DOMAIN}/${buildPath(query, limit, location)}`)
   if (type) url.searchParams.set('type', type)
   if (period) url.searchParams.set('period', period)
+  if (page > 1) url.searchParams.set('page', String(page))
   return url
 }
 
@@ -26,9 +27,11 @@ const fetchDataField = async (url, mqlOpts, field, attr) => {
   return data[field]
 }
 
-const fetchPage = async (url, mqlOpts, offset, query) => {
-  url.searchParams.set('start', String(offset))
-  const { data } = await mql(url.toString(), mqlOpts)
+const fetchPage = async (url, mqlOpts, page, query, last) => {
+  if (page > 1) url.searchParams.set('page', String(page))
+  else url.searchParams.delete('page')
+  const { data, response } = await mql(url.toString(), mqlOpts)
+  last.response = response
   const { results, ...extra } = data
 
   return {
@@ -58,20 +61,40 @@ const fetchPage = async (url, mqlOpts, offset, query) => {
       }
     }),
     next: () =>
-      fetchPage(
-        new URL(url.toString()),
-        mqlOpts,
-        offset + results.length,
-        query
-      )
+      fetchPage(new URL(url.toString()), mqlOpts, page + 1, query, last)
   }
 }
 
+const resolve = async (item, key) => {
+  if (typeof item[key] === 'function') item[key] = await item[key]()
+}
+
 const createGoogleClient = ctxOpts => {
-  return async (query, { limit, location, type, period, ...opts } = {}) => {
-    const url = buildUrl(query, { limit, location, type, period })
-    return fetchPage(url, { ...ctxOpts, ...opts }, 0, query)
+  const last = {}
+  const client = async (
+    query,
+    { limit, location, type, period, html, markdown, page = 1, ...opts } = {}
+  ) => {
+    const url = buildUrl(query, { limit, location, type, period, page })
+    const result = await fetchPage(
+      url,
+      { ...ctxOpts, ...opts },
+      page,
+      query,
+      last
+    )
+    if (html) {
+      await resolve(result, 'html')
+      await Promise.all(result.results.map(item => resolve(item, 'html')))
+    }
+    if (markdown) {
+      await resolve(result, 'markdown')
+      await Promise.all(result.results.map(item => resolve(item, 'markdown')))
+    }
+    return result
   }
+  Object.defineProperty(client, 'last', { value: last })
+  return client
 }
 
 module.exports = createGoogleClient