@microlink/google 1.0.5 → 1.2.0

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@microlink/google",
   "description": "Structured Google data from 10 verticals through Microlink API",
-  "homepage": "https://github.com/microlinkhq/google",
-  "version": "1.0.5",
+  "homepage": "https://github.com/microlinkhq/microlink",
+  "version": "1.2.0",
   "exports": {
     "types": "./src/index.d.ts",
     "require": "./src/index.js",
@@ -21,46 +21,34 @@
     }
   ],
   "repository": {
+    "directory": "packages/search",
     "type": "git",
-    "url": "git+https://github.com/microlinkhq/google.git"
+    "url": "git+https://github.com/microlinkhq/microlink.git"
   },
   "bugs": {
-    "url": "https://github.com/microlinkhq/google/issues"
+    "url": "https://github.com/microlinkhq/microlink/issues"
   },
   "keywords": [
     "google",
     "integration",
     "microlink",
     "search",
-    "search",
     "serp"
   ],
   "dependencies": {
-    "@microlink/mql": "latest"
+    "@microlink/mql": "0.18.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "latest",
-    "@commitlint/config-conventional": "latest",
     "ava": "latest",
     "browser-sync": "latest",
-    "c8": "latest",
-    "ci-publish": "latest",
-    "conventional-changelog-cli": "latest",
     "cssnano": "latest",
     "cssnano-preset-advanced": "latest",
-    "finepack": "latest",
-    "git-authors-cli": "latest",
-    "github-generate-release": "latest",
     "gulp": "latest",
     "gulp-concat": "latest",
     "gulp-postcss": "latest",
     "gulp-uglify": "latest",
-    "nano-staged": "latest",
     "postcss-focus": "latest",
     "proxyquire": "latest",
-    "simple-git-hooks": "latest",
-    "standard": "latest",
-    "standard-version": "latest",
     "tinyrun": "latest",
     "tinyspawn": "latest"
   },
@@ -70,48 +58,12 @@
   "files": [
     "src"
   ],
+  "license": "MIT",
   "scripts": {
     "build": "gulp build",
-    "clean": "rm -rf node_modules",
-    "contributors": "(git-authors-cli && finepack && git add package.json && git commit -m 'build: contributors' --no-verify) || true",
-    "coverage": "c8 report --reporter=text-lcov > coverage/lcov.info",
     "dev": "tinyrun \"pnpm dev:src\" \"pnpm dev:server\"",
     "dev:server": "browser-sync start --server docs --files \"docs/index.html, docs/README.md, docs/static/**/*.(css|js)\"",
     "dev:src": "gulp",
-    "lint": "standard",
-    "postrelease": "pnpm release:tags && pnpm release:github && (ci-publish || pnpm publish --access=public)",
-    "pretest": "pnpm lint",
-    "release": "pnpm release:version && pnpm release:changelog && pnpm release:commit && pnpm release:tag",
-    "release:changelog": "conventional-changelog -p conventionalcommits -i CHANGELOG.md -s",
-    "release:commit": "git add package.json CHANGELOG.md && git commit -m \"chore(release): $(node -p \"require('./package.json').version\")\"",
-    "release:github": "github-generate-release",
-    "release:tag": "git tag -a v$(node -p \"require('./package.json').version\") -m \"v$(node -p \"require('./package.json').version\")\"",
-    "release:tags": "git push origin HEAD:master --follow-tags",
-    "release:version": "standard-version --skip.changelog --skip.commit --skip.tag",
     "test": "exit 0"
-  },
-  "license": "MIT",
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ],
-    "rules": {
-      "body-max-line-length": [
-        0
-      ]
-    }
-  },
-  "nano-staged": {
-    "*.js": [
-      "npx @kikobeats/prettier-standard",
-      "standard --fix"
-    ],
-    "package.json": [
-      "finepack"
-    ]
-  },
-  "simple-git-hooks": {
-    "commit-msg": "npx commitlint --edit",
-    "pre-commit": "npx nano-staged"
   }
-}
+}

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,8 +27,9 @@ const fetchDataField = async (url, mqlOpts, field, attr) => {
   return data[field]
 }
 
-const fetchPage = async (url, mqlOpts, offset, query) => {
-  url.searchParams.set('start', String(offset))
+const fetchPage = async (url, mqlOpts, page, query) => {
+  if (page > 1) url.searchParams.set('page', String(page))
+  else url.searchParams.delete('page')
   const { data } = await mql(url.toString(), mqlOpts)
   const { results, ...extra } = data
 
@@ -57,20 +59,30 @@ const fetchPage = async (url, mqlOpts, offset, query) => {
         })
       }
     }),
-    next: () =>
-      fetchPage(
-        new URL(url.toString()),
-        mqlOpts,
-        offset + results.length,
-        query
-      )
+    next: () => fetchPage(new URL(url.toString()), mqlOpts, page + 1, query)
   }
 }
 
+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)
+  return 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)
+    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
   }
 }