@miso.ai/server-wordpress 0.6.3-beta.14 → 0.6.3-beta.16

package/cli/download.js

@@ -3,7 +3,7 @@ import { access, mkdir } from 'fs/promises';
 import { createGzip } from 'zlib';
 import { startOfDate, endOfDate, stream } from '@miso.ai/server-commons';
 import { WordPressClient } from '../src/index.js';
-import { getFirstPostDate, getLastPostDate, getYear, buildForEntities } from './utils.js';
+import { buildForEntities } from './utils.js';
 
 function build(yargs) {
   return buildForEntities(yargs);
@@ -16,12 +16,7 @@ async function run({
 } = {}) {
   const client = new WordPressClient(options);
 
-  const [firstPostDate, lastPostDate] = await Promise.all([
-    getFirstPostDate(client),
-    getLastPostDate(client),
-  ]);
-  const firstPostYear = getYear(firstPostDate);
-  const lastPostYear = getYear(lastPostDate);
+  const  [firstPostYear, lastPostYear] = await client.posts.yearRange();
 
   // divide into batches
   const batches = [];

package/cli/summarize.js

@@ -1,6 +1,5 @@
-import { startOfDate, endOfDate } from '@miso.ai/server-commons';
+import { startOfDate, endOfDate, getYear } from '@miso.ai/server-commons';
 import { WordPressClient } from '../src/index.js';
-import { getFirstPostDate, getLastPostDate, getYear } from './utils.js';
 
 function build(yargs) {
   return yargs;
@@ -8,10 +7,9 @@ function build(yargs) {
 
 async function run({ ...options } = {}) {
   const client = new WordPressClient(options);
-  const [total, firstPostDate, lastPostDate] = await Promise.all([
+  const [total, [firstPostDate, lastPostDate]] = await Promise.all([
     client.posts.count(options),
-    getFirstPostDate(client),
-    getLastPostDate(client),
+    client.posts.dateRange(),
   ]);
   const totalStrLength = `${total}`.length;
   console.log();

package/cli/utils.js

@@ -1,31 +1,18 @@
 import { startOfDate, endOfDate } from '@miso.ai/server-commons';
 
 export function normalizeOptions({ date, after, before, ids, include, ...options }) {
+  // TODO: should be able to turn this off, as it's covered by helper
   [after, before] = [startOfDate(date || after), endOfDate(date || before)];
   // TODO: rely on yargs to coerce to array
   ids = ids ? `${ids}`.split(',').map(s => s.trim()) : ids;
   return { ...options, after, before, ids };
 }
 
+/*
 export function parseDate(value) {
   return Date.parse(`${value}Z`);
 }
-
-export async function getFirstPostDate(client, options) {
-  return getPostDate(client, 'asc', options);
-}
-
-export async function getLastPostDate(client, options) {
-  return getPostDate(client, 'desc', options);
-}
-
-async function getPostDate(client, order, options = {}) {
-  return (await client.posts.getAll({ ...options, limit: 1, order, fields: ['date_gmt'] }))[0].date_gmt;
-}
-
-export function getYear(dateStr) {
-  return new Date(dateStr).getFullYear();
-}
+*/
 
 export function buildForEntities(yargs) {
   // TODO: make them mutually exclusive

package/package.json

@@ -17,9 +17,9 @@
     "simonpai <simon.pai@askmiso.com>"
   ],
   "dependencies": {
-    "@miso.ai/server-commons": "0.6.3-beta.14",
+    "@miso.ai/server-commons": "0.6.3-beta.16",
     "axios": "^1.6.2",
     "axios-retry": "^3.3.1"
   },
-  "version": "0.6.3-beta.14"
+  "version": "0.6.3-beta.16"
 }

package/src/entities/index.js

@@ -1,6 +1,6 @@
 import { join } from 'path';
 import { Transform } from 'stream';
-import { asArray, stream } from '@miso.ai/server-commons';
+import { asArray, stream, getYear } from '@miso.ai/server-commons';
 import EntityIndex from './entity-index.js';
 import EntityTransformStream from './transform.js';
 import EntityPresenceStream from './presence.js';
@@ -72,6 +72,10 @@ export default class Entities {
   }
 
   async getAll(options) {
+    return this.all(options);
+  }
+
+  async all(options) {
     return stream.collect(await this.stream(options));
   }
 
@@ -87,6 +91,18 @@ export default class Entities {
     return new EntityPresenceStream(this._client, this.name, options);
   }
 
+  async dateRange() {
+    // TODO: options?
+    return Promise.all([
+      getPostDate(this._client, 'asc'),
+      getPostDate(this._client, 'desc'),
+    ]);
+  }
+
+  async yearRange() {
+    return (await this.dateRange()).map(getYear);
+  }
+
   get index() {
     return this._index;
   }
@@ -101,15 +117,6 @@ export default class Entities {
 
 }
 
-function aggregateIds(records, propName) {
-  return Array.from(records.reduce((idSet, record) => {
-    for (const id of asArray(record[propName])) {
-      idSet.add(id);
-    }
-    return idSet;
-  }, new Set()));
-}
-
 async function getTransformFn(client, name, transform) {
   switch (transform) {
     case 'default':
@@ -133,3 +140,16 @@ async function getTransformFn(client, name, transform) {
   }
   return undefined;
 }
+
+function aggregateIds(records, propName) {
+  return Array.from(records.reduce((idSet, record) => {
+    for (const id of asArray(record[propName])) {
+      idSet.add(id);
+    }
+    return idSet;
+  }, new Set()));
+}
+
+async function getPostDate(client, order, options = {}) {
+  return (await client.posts.getAll({ ...options, limit: 1, order, fields: ['date_gmt'] }))[0].date_gmt;
+}

package/src/helpers.js

@@ -1,6 +1,6 @@
 import axios from 'axios';
 import axiosRetry from 'axios-retry';
-import { asNumber, splitObj, stream } from '@miso.ai/server-commons';
+import { asNumber, splitObj, stream, startOfDate, endOfDate } from '@miso.ai/server-commons';
 import DataSource from './source/index.js';
 import version from './version.js';
 
@@ -161,13 +161,27 @@ class Url {
 
   // modifiedAfter, modifiedBefore is supported since WordPress 5.7
   // https://make.wordpress.org/core/2021/02/23/rest-api-changes-in-wordpress-5-7/
-  async append(url, options = {}) {
-    const { after, before, modifiedAfter, modifiedBefore, order, orderBy, page, pageSize, offset, include, exclude } = options;
-    let { fields } = options;
+  async append(url, {
+    date,
+    after,
+    before,
+    modifiedAfter,
+    modifiedBefore,
+    order,
+    orderBy,
+    page,
+    pageSize,
+    offset,
+    include,
+    exclude,
+    fields,
+  } = {}) {
     const params = [];
 
     // TODO: support single id
 
+    [after, before] = [startOfDate(date || after), endOfDate(date || before)];
+
     // The date is compared against site's local time, not UTC, so we have to work on timezone offset
     if (has(after) || has(before) || has(modifiedAfter) || has(modifiedBefore)) {
       const utcOffset = await this._helpers.utcOffsetInMs();

package/src/version.js

@@ -1 +1 @@
-export default '0.6.3-beta.14';
+export default '0.6.3-beta.16';