@miso.ai/client-sdk-core 1.7.2 → 1.7.3-beta.1

package/dist/cjs/api/ask.js

@@ -6,78 +6,79 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _commons = require("@miso.ai/commons");
 var _base = _interopRequireDefault(require("./base"));
-const _excluded = ["iterable"],
-  _excluded2 = ["pollingInternal"];
+const _excluded = ["pollingInternal"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 class Ask extends _base.default {
   constructor(api) {
     super(api, 'ask');
   }
-  questions(payload) {
-    let _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    let {
-        iterable = false
-      } = _ref,
-      options = _objectWithoutPropertiesLoose(_ref, _excluded);
-    // TODO: it's possible to merge _iterator and _answer
-    return typeof payload === 'string' ? this._get(payload, options) : iterable ? this._iterator(payload, options) : this._questions(payload, options);
+  async questions(payload) {
+    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    const response = await this._run('questions', payload, options);
+    return new Answer(this, response);
   }
   async _questions(payload, options) {
     return this._run('questions', payload, options);
   }
-  async _get(answerId, options) {
-    return this._run(`questions/${answerId}/answer`, undefined, Object.assign({}, options, {
+  async _get(questionId, options) {
+    return this._run(`questions/${questionId}/answer`, undefined, Object.assign({}, options, {
       method: 'GET'
     }));
   }
-  _iterator(payload) {
-    try {
-      var _this = this;
-      let _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      return async function* () {
-        let {
-            pollingInternal = 500
-          } = _ref2,
-          options = _objectWithoutPropertiesLoose(_ref2, _excluded2);
-        const response = await _this._questions(payload, options);
-        yield response;
-        const {
-          question_id,
-          finished
-        } = response;
-        if (finished) {
-          return;
+  _iterable(questionId) {
+    let _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    let {
+        pollingInternal = 500
+      } = _ref,
+      options = _objectWithoutPropertiesLoose(_ref, _excluded);
+    // TODO: abort signal
+    let apiErrorCount = 0;
+    const buffer = new _commons.ValueBuffer();
+    const intervalId = setInterval(async () => {
+      let response;
+      try {
+        response = await this._get(questionId, options);
+      } catch (error) {
+        apiErrorCount++;
+        if (apiErrorCount > 10) {
+          clearInterval(intervalId);
+          // TODO: cascade to buffer and user
         }
-        let apiErrorCount = 0;
-        const buffer = new _commons.ValueBuffer();
-        const intervalId = setInterval(async () => {
-          let response;
-          try {
-            response = await _this._get(question_id, options);
-          } catch (error) {
-            apiErrorCount++;
-            if (apiErrorCount > 10) {
-              clearInterval(intervalId);
-              // TODO: cascade to buffer and user
-            }
 
-            console.error(error); // TODO
-            return;
-          }
-          const {
-            finished
-          } = response;
-          buffer.update(response, finished);
-          if (response.finished) {
-            clearInterval(intervalId);
-          }
-        }, pollingInternal);
-        yield* buffer;
-      }();
-    } catch (e) {
-      return Promise.reject(e);
-    }
+        console.error(error); // TODO
+        return;
+      }
+      const {
+        finished
+      } = response;
+      buffer.update(response, finished);
+      if (response.finished) {
+        clearInterval(intervalId);
+      }
+    }, pollingInternal);
+    return buffer;
   }
 }
-exports.default = Ask;
+exports.default = Ask;
+class Answer {
+  constructor(api, _ref2) {
+    let {
+      question_id
+    } = _ref2;
+    let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    this._api = api;
+    this._id = question_id;
+    this._options = options;
+  }
+  get id() {
+    return this._id;
+  }
+  async get(options) {
+    options = Object.assign({}, this._options, options);
+    return this._api._get(this._id, options);
+  }
+  [Symbol.asyncIterator]() {
+    return this._api._iterable(this._id, this._options)[Symbol.asyncIterator]();
+  }
+}

package/dist/cjs/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _default = '1.7.2';
+var _default = '1.7.3-beta.1';
 exports.default = _default;

package/dist/es/api/ask.js

@@ -1,5 +1,4 @@
-const _excluded = ["iterable"],
-  _excluded2 = ["pollingInternal"];
+const _excluded = ["pollingInternal"];
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { ValueBuffer } from '@miso.ai/commons';
 import ApiBase from './base';
@@ -7,69 +6,71 @@ export default class Ask extends ApiBase {
   constructor(api) {
     super(api, 'ask');
   }
-  questions(payload) {
-    let _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    let {
-        iterable = false
-      } = _ref,
-      options = _objectWithoutPropertiesLoose(_ref, _excluded);
-    // TODO: it's possible to merge _iterator and _answer
-    return typeof payload === 'string' ? this._get(payload, options) : iterable ? this._iterator(payload, options) : this._questions(payload, options);
+  async questions(payload) {
+    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    const response = await this._run('questions', payload, options);
+    return new Answer(this, response);
   }
   async _questions(payload, options) {
     return this._run('questions', payload, options);
   }
-  async _get(answerId, options) {
-    return this._run(`questions/${answerId}/answer`, undefined, Object.assign({}, options, {
+  async _get(questionId, options) {
+    return this._run(`questions/${questionId}/answer`, undefined, Object.assign({}, options, {
       method: 'GET'
     }));
   }
-  _iterator(payload) {
-    try {
-      var _this = this;
-      let _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      return async function* () {
-        let {
-            pollingInternal = 500
-          } = _ref2,
-          options = _objectWithoutPropertiesLoose(_ref2, _excluded2);
-        const response = await _this._questions(payload, options);
-        yield response;
-        const {
-          question_id,
-          finished
-        } = response;
-        if (finished) {
-          return;
+  _iterable(questionId) {
+    let _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    let {
+        pollingInternal = 500
+      } = _ref,
+      options = _objectWithoutPropertiesLoose(_ref, _excluded);
+    // TODO: abort signal
+    let apiErrorCount = 0;
+    const buffer = new ValueBuffer();
+    const intervalId = setInterval(async () => {
+      let response;
+      try {
+        response = await this._get(questionId, options);
+      } catch (error) {
+        apiErrorCount++;
+        if (apiErrorCount > 10) {
+          clearInterval(intervalId);
+          // TODO: cascade to buffer and user
         }
-        let apiErrorCount = 0;
-        const buffer = new ValueBuffer();
-        const intervalId = setInterval(async () => {
-          let response;
-          try {
-            response = await _this._get(question_id, options);
-          } catch (error) {
-            apiErrorCount++;
-            if (apiErrorCount > 10) {
-              clearInterval(intervalId);
-              // TODO: cascade to buffer and user
-            }
 
-            console.error(error); // TODO
-            return;
-          }
-          const {
-            finished
-          } = response;
-          buffer.update(response, finished);
-          if (response.finished) {
-            clearInterval(intervalId);
-          }
-        }, pollingInternal);
-        yield* buffer;
-      }();
-    } catch (e) {
-      return Promise.reject(e);
-    }
+        console.error(error); // TODO
+        return;
+      }
+      const {
+        finished
+      } = response;
+      buffer.update(response, finished);
+      if (response.finished) {
+        clearInterval(intervalId);
+      }
+    }, pollingInternal);
+    return buffer;
+  }
+}
+class Answer {
+  constructor(api, _ref2) {
+    let {
+      question_id
+    } = _ref2;
+    let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    this._api = api;
+    this._id = question_id;
+    this._options = options;
+  }
+  get id() {
+    return this._id;
+  }
+  async get(options) {
+    options = Object.assign({}, this._options, options);
+    return this._api._get(this._id, options);
+  }
+  [Symbol.asyncIterator]() {
+    return this._api._iterable(this._id, this._options)[Symbol.asyncIterator]();
   }
 }

package/dist/es/version.js

@@ -1 +1 @@
-export default '1.7.2';
+export default '1.7.3-beta.1';

package/package.json

@@ -29,7 +29,7 @@
     "url": "https://github.com/MisoAI/miso-client-js-sdk/issues"
   },
   "dependencies": {
-    "@miso.ai/commons": "1.7.2"
+    "@miso.ai/commons": "1.7.3-beta.1"
   },
-  "version": "1.7.2"
+  "version": "1.7.3-beta.1"
 }