Skip to content

Commit

Permalink
Merge branch 'master' into qa
Browse files Browse the repository at this point in the history
  • Loading branch information
Bridget Almas committed Jun 5, 2020
2 parents 8f53cc9 + b964e63 commit b265bc4
Show file tree
Hide file tree
Showing 95 changed files with 1,317 additions and 880 deletions.
4 changes: 4 additions & 0 deletions .github/FUNDING.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# These are supported funding model platforms

github: ['alpheios-project']
custom: ['https://www.paypal.me/alpheiosproject']
2 changes: 1 addition & 1 deletion package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 21 additions & 18 deletions packages/client-adapters/dist/alpheios-client-adapters.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15314,14 +15314,17 @@ class ArethusaTreebankAdapter extends _clAdapters_adapters_base_adapter__WEBPACK
__webpack_require__.r(__webpack_exports__);
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! axios */ "../../../node_modules/axios/index.js");
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var _clAdapters_errors_adapter_error__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @clAdapters/errors/adapter-error */ "./errors/adapter-error.js");
/* harmony import */ var _clAdapters_errors_remote_error_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @clAdapters/errors/remote-error.js */ "./errors/remote-error.js");
/* harmony import */ var _clAdapters_l10n_l10n__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @clAdapters/l10n/l10n */ "./l10n/l10n.js");
/* harmony import */ var _clAdapters_locales_locales_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @clAdapters/locales/locales.js */ "./locales/locales.js");
/* harmony import */ var _clAdapters_locales_en_us_messages_json__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @clAdapters/locales/en-us/messages.json */ "./locales/en-us/messages.json");
var _clAdapters_locales_en_us_messages_json__WEBPACK_IMPORTED_MODULE_5___namespace = /*#__PURE__*/__webpack_require__.t(/*! @clAdapters/locales/en-us/messages.json */ "./locales/en-us/messages.json", 1);
/* harmony import */ var _clAdapters_locales_en_gb_messages_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @clAdapters/locales/en-gb/messages.json */ "./locales/en-gb/messages.json");
var _clAdapters_locales_en_gb_messages_json__WEBPACK_IMPORTED_MODULE_6___namespace = /*#__PURE__*/__webpack_require__.t(/*! @clAdapters/locales/en-gb/messages.json */ "./locales/en-gb/messages.json", 1);
/* harmony import */ var alpheios_data_models__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! alpheios-data-models */ "alpheios-data-models");
/* harmony import */ var alpheios_data_models__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(alpheios_data_models__WEBPACK_IMPORTED_MODULE_1__);
/* harmony import */ var _clAdapters_errors_adapter_error__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @clAdapters/errors/adapter-error */ "./errors/adapter-error.js");
/* harmony import */ var _clAdapters_errors_remote_error_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @clAdapters/errors/remote-error.js */ "./errors/remote-error.js");
/* harmony import */ var _clAdapters_l10n_l10n__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @clAdapters/l10n/l10n */ "./l10n/l10n.js");
/* harmony import */ var _clAdapters_locales_locales_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @clAdapters/locales/locales.js */ "./locales/locales.js");
/* harmony import */ var _clAdapters_locales_en_us_messages_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @clAdapters/locales/en-us/messages.json */ "./locales/en-us/messages.json");
var _clAdapters_locales_en_us_messages_json__WEBPACK_IMPORTED_MODULE_6___namespace = /*#__PURE__*/__webpack_require__.t(/*! @clAdapters/locales/en-us/messages.json */ "./locales/en-us/messages.json", 1);
/* harmony import */ var _clAdapters_locales_en_gb_messages_json__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @clAdapters/locales/en-gb/messages.json */ "./locales/en-gb/messages.json");
var _clAdapters_locales_en_gb_messages_json__WEBPACK_IMPORTED_MODULE_7___namespace = /*#__PURE__*/__webpack_require__.t(/*! @clAdapters/locales/en-gb/messages.json */ "./locales/en-gb/messages.json", 1);




Expand All @@ -15337,23 +15340,23 @@ class BaseAdapter {
*/
constructor () {
this.errors = []
this.l10n = new _clAdapters_l10n_l10n__WEBPACK_IMPORTED_MODULE_3__["default"]()
.addMessages(_clAdapters_locales_en_us_messages_json__WEBPACK_IMPORTED_MODULE_5__, _clAdapters_locales_locales_js__WEBPACK_IMPORTED_MODULE_4__["default"].en_US)
.addMessages(_clAdapters_locales_en_gb_messages_json__WEBPACK_IMPORTED_MODULE_6__, _clAdapters_locales_locales_js__WEBPACK_IMPORTED_MODULE_4__["default"].en_GB)
.setLocale(_clAdapters_locales_locales_js__WEBPACK_IMPORTED_MODULE_4__["default"].en_US)
this.l10n = new _clAdapters_l10n_l10n__WEBPACK_IMPORTED_MODULE_4__["default"]()
.addMessages(_clAdapters_locales_en_us_messages_json__WEBPACK_IMPORTED_MODULE_6__, _clAdapters_locales_locales_js__WEBPACK_IMPORTED_MODULE_5__["default"].en_US)
.addMessages(_clAdapters_locales_en_gb_messages_json__WEBPACK_IMPORTED_MODULE_7__, _clAdapters_locales_locales_js__WEBPACK_IMPORTED_MODULE_5__["default"].en_GB)
.setLocale(_clAdapters_locales_locales_js__WEBPACK_IMPORTED_MODULE_5__["default"].en_US)
}

/**
* This method is used for adding error meassage with additional data
* @param {String} message - message text for the error
*/
addError (message) {
const error = new _clAdapters_errors_adapter_error__WEBPACK_IMPORTED_MODULE_1__["default"](this.config.category, this.config.adapterName, this.config.method, message)
const error = new _clAdapters_errors_adapter_error__WEBPACK_IMPORTED_MODULE_2__["default"](this.config.category, this.config.adapterName, this.config.method, message)
this.errors.push(error)
}

addRemoteError (errorCode, message) {
const error = new _clAdapters_errors_remote_error_js__WEBPACK_IMPORTED_MODULE_2__["default"](this.config.category, this.config.adapterName, this.config.method, errorCode, message)
const error = new _clAdapters_errors_remote_error_js__WEBPACK_IMPORTED_MODULE_3__["default"](this.config.category, this.config.adapterName, this.config.method, errorCode, message)
this.errors.push(error)
}

Expand Down Expand Up @@ -15485,15 +15488,15 @@ class BaseAdapter {
if (error.response) {
// The request was made and the server responded with a status code
// that falls out of the range of 2xx
console.error('Alpheios error: unexpected response retrieving data from service', error)
alpheios_data_models__WEBPACK_IMPORTED_MODULE_1__["Logger"].getInstance().error('Alpheios error: unexpected response retrieving data from service', error)
} else if (error.request) {
// The request was made but no response was received
// `error.request` is an instance of XMLHttpRequest in the browser and an instance of
// http.ClientRequest in node.js
console.error('Alpheios error: no response from service', error)
alpheios_data_models__WEBPACK_IMPORTED_MODULE_1__["Logger"].getInstance().error('Alpheios error: no response from service', error)
} else {
// Something happened in setting up the request that triggered an Error
console.error('Alpheios error: unexpected error requesting data from service', error.message)
alpheios_data_models__WEBPACK_IMPORTED_MODULE_1__["Logger"].getInstance().error('Alpheios error: unexpected error requesting data from service', error.message)
}
}

Expand Down Expand Up @@ -18868,7 +18871,7 @@ class ImportMorphData {
// There are multiple values of this feature
for (const e of inputItem) {
if (featureName && featureName !== e[attributeName]) {
console.warn('Mutiple feature values with mismatching attribute value', inputElem)
alpheios_data_models__WEBPACK_IMPORTED_MODULE_0__["Logger"].getInstance().warn('Mutiple feature values with mismatching attribute value', inputElem)
}
featureName = e[attributeName]
values.push(...this.parseProperty(inputName, e.$, inputElem))
Expand Down
2 changes: 1 addition & 1 deletion packages/client-adapters/dist/alpheios-client-adapters.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/client-adapters/dist/alpheios-client-adapters.min.js
View file

Large diffs are not rendered by default.

39 changes: 21 additions & 18 deletions packages/client-adapters/dist/alpheios-client-adapters.node.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10506,14 +10506,17 @@ class ArethusaTreebankAdapter extends _clAdapters_adapters_base_adapter__WEBPACK
__webpack_require__.r(__webpack_exports__);
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! axios */ "../../../node_modules/axios/index.js");
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var _clAdapters_errors_adapter_error__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @clAdapters/errors/adapter-error */ "./errors/adapter-error.js");
/* harmony import */ var _clAdapters_errors_remote_error_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @clAdapters/errors/remote-error.js */ "./errors/remote-error.js");
/* harmony import */ var _clAdapters_l10n_l10n__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @clAdapters/l10n/l10n */ "./l10n/l10n.js");
/* harmony import */ var _clAdapters_locales_locales_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @clAdapters/locales/locales.js */ "./locales/locales.js");
/* harmony import */ var _clAdapters_locales_en_us_messages_json__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @clAdapters/locales/en-us/messages.json */ "./locales/en-us/messages.json");
var _clAdapters_locales_en_us_messages_json__WEBPACK_IMPORTED_MODULE_5___namespace = /*#__PURE__*/__webpack_require__.t(/*! @clAdapters/locales/en-us/messages.json */ "./locales/en-us/messages.json", 1);
/* harmony import */ var _clAdapters_locales_en_gb_messages_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @clAdapters/locales/en-gb/messages.json */ "./locales/en-gb/messages.json");
var _clAdapters_locales_en_gb_messages_json__WEBPACK_IMPORTED_MODULE_6___namespace = /*#__PURE__*/__webpack_require__.t(/*! @clAdapters/locales/en-gb/messages.json */ "./locales/en-gb/messages.json", 1);
/* harmony import */ var alpheios_data_models__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! alpheios-data-models */ "alpheios-data-models");
/* harmony import */ var alpheios_data_models__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(alpheios_data_models__WEBPACK_IMPORTED_MODULE_1__);
/* harmony import */ var _clAdapters_errors_adapter_error__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @clAdapters/errors/adapter-error */ "./errors/adapter-error.js");
/* harmony import */ var _clAdapters_errors_remote_error_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @clAdapters/errors/remote-error.js */ "./errors/remote-error.js");
/* harmony import */ var _clAdapters_l10n_l10n__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @clAdapters/l10n/l10n */ "./l10n/l10n.js");
/* harmony import */ var _clAdapters_locales_locales_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @clAdapters/locales/locales.js */ "./locales/locales.js");
/* harmony import */ var _clAdapters_locales_en_us_messages_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @clAdapters/locales/en-us/messages.json */ "./locales/en-us/messages.json");
var _clAdapters_locales_en_us_messages_json__WEBPACK_IMPORTED_MODULE_6___namespace = /*#__PURE__*/__webpack_require__.t(/*! @clAdapters/locales/en-us/messages.json */ "./locales/en-us/messages.json", 1);
/* harmony import */ var _clAdapters_locales_en_gb_messages_json__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @clAdapters/locales/en-gb/messages.json */ "./locales/en-gb/messages.json");
var _clAdapters_locales_en_gb_messages_json__WEBPACK_IMPORTED_MODULE_7___namespace = /*#__PURE__*/__webpack_require__.t(/*! @clAdapters/locales/en-gb/messages.json */ "./locales/en-gb/messages.json", 1);




Expand All @@ -10529,23 +10532,23 @@ class BaseAdapter {
*/
constructor () {
this.errors = []
this.l10n = new _clAdapters_l10n_l10n__WEBPACK_IMPORTED_MODULE_3__["default"]()
.addMessages(_clAdapters_locales_en_us_messages_json__WEBPACK_IMPORTED_MODULE_5__, _clAdapters_locales_locales_js__WEBPACK_IMPORTED_MODULE_4__["default"].en_US)
.addMessages(_clAdapters_locales_en_gb_messages_json__WEBPACK_IMPORTED_MODULE_6__, _clAdapters_locales_locales_js__WEBPACK_IMPORTED_MODULE_4__["default"].en_GB)
.setLocale(_clAdapters_locales_locales_js__WEBPACK_IMPORTED_MODULE_4__["default"].en_US)
this.l10n = new _clAdapters_l10n_l10n__WEBPACK_IMPORTED_MODULE_4__["default"]()
.addMessages(_clAdapters_locales_en_us_messages_json__WEBPACK_IMPORTED_MODULE_6__, _clAdapters_locales_locales_js__WEBPACK_IMPORTED_MODULE_5__["default"].en_US)
.addMessages(_clAdapters_locales_en_gb_messages_json__WEBPACK_IMPORTED_MODULE_7__, _clAdapters_locales_locales_js__WEBPACK_IMPORTED_MODULE_5__["default"].en_GB)
.setLocale(_clAdapters_locales_locales_js__WEBPACK_IMPORTED_MODULE_5__["default"].en_US)
}

/**
* This method is used for adding error meassage with additional data
* @param {String} message - message text for the error
*/
addError (message) {
const error = new _clAdapters_errors_adapter_error__WEBPACK_IMPORTED_MODULE_1__["default"](this.config.category, this.config.adapterName, this.config.method, message)
const error = new _clAdapters_errors_adapter_error__WEBPACK_IMPORTED_MODULE_2__["default"](this.config.category, this.config.adapterName, this.config.method, message)
this.errors.push(error)
}

addRemoteError (errorCode, message) {
const error = new _clAdapters_errors_remote_error_js__WEBPACK_IMPORTED_MODULE_2__["default"](this.config.category, this.config.adapterName, this.config.method, errorCode, message)
const error = new _clAdapters_errors_remote_error_js__WEBPACK_IMPORTED_MODULE_3__["default"](this.config.category, this.config.adapterName, this.config.method, errorCode, message)
this.errors.push(error)
}

Expand Down Expand Up @@ -10677,15 +10680,15 @@ class BaseAdapter {
if (error.response) {
// The request was made and the server responded with a status code
// that falls out of the range of 2xx
console.error('Alpheios error: unexpected response retrieving data from service', error)
alpheios_data_models__WEBPACK_IMPORTED_MODULE_1__["Logger"].getInstance().error('Alpheios error: unexpected response retrieving data from service', error)
} else if (error.request) {
// The request was made but no response was received
// `error.request` is an instance of XMLHttpRequest in the browser and an instance of
// http.ClientRequest in node.js
console.error('Alpheios error: no response from service', error)
alpheios_data_models__WEBPACK_IMPORTED_MODULE_1__["Logger"].getInstance().error('Alpheios error: no response from service', error)
} else {
// Something happened in setting up the request that triggered an Error
console.error('Alpheios error: unexpected error requesting data from service', error.message)
alpheios_data_models__WEBPACK_IMPORTED_MODULE_1__["Logger"].getInstance().error('Alpheios error: unexpected error requesting data from service', error.message)
}
}

Expand Down Expand Up @@ -14060,7 +14063,7 @@ class ImportMorphData {
// There are multiple values of this feature
for (const e of inputItem) {
if (featureName && featureName !== e[attributeName]) {
console.warn('Mutiple feature values with mismatching attribute value', inputElem)
alpheios_data_models__WEBPACK_IMPORTED_MODULE_0__["Logger"].getInstance().warn('Mutiple feature values with mismatching attribute value', inputElem)
}
featureName = e[attributeName]
values.push(...this.parseProperty(inputName, e.$, inputElem))
Expand Down
2 changes: 1 addition & 1 deletion packages/client-adapters/dist/alpheios-client-adapters.node.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/client-adapters/dist/alpheios-client-adapters.node.min.js
View file

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions packages/client-adapters/src/adapters/base-adapter.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import axios from 'axios'
import { Logger } from 'alpheios-data-models'
import AdapterError from '@clAdapters/errors/adapter-error'
import RemoteError from '@clAdapters/errors/remote-error.js'

Expand Down Expand Up @@ -161,15 +162,15 @@ class BaseAdapter {
if (error.response) {
// The request was made and the server responded with a status code
// that falls out of the range of 2xx
console.error('Alpheios error: unexpected response retrieving data from service', error)
Logger.getInstance().error('Alpheios error: unexpected response retrieving data from service', error)
} else if (error.request) {
// The request was made but no response was received
// `error.request` is an instance of XMLHttpRequest in the browser and an instance of
// http.ClientRequest in node.js
console.error('Alpheios error: no response from service', error)
Logger.getInstance().error('Alpheios error: no response from service', error)
} else {
// Something happened in setting up the request that triggered an Error
console.error('Alpheios error: unexpected error requesting data from service', error.message)
Logger.getInstance().error('Alpheios error: unexpected error requesting data from service', error.message)
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/client-adapters/src/transformers/import-morph-data.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Objects of a morphology analyzer's library
*/
import { Feature, Lemma, FeatureImporter, Definition, Constants } from 'alpheios-data-models'
import { Feature, Lemma, FeatureImporter, Definition, Constants, Logger } from 'alpheios-data-models'

/**
* Holds all information required to transform from morphological analyzer's grammatical feature values to the
Expand Down Expand Up @@ -230,7 +230,7 @@ class ImportMorphData {
// There are multiple values of this feature
for (const e of inputItem) {
if (featureName && featureName !== e[attributeName]) {
console.warn('Mutiple feature values with mismatching attribute value', inputElem)
Logger.getInstance().warn('Mutiple feature values with mismatching attribute value', inputElem)
}
featureName = e[attributeName]
values.push(...this.parseProperty(inputName, e.$, inputElem))
Expand Down
Loading

0 comments on commit b265bc4

Please sign in to comment.