Merge branch 'incr-3.3.x' into qa

alpheios-project · Jan 15, 2021 · 293a45b · 293a45b
2 parents a20409f + 24d4126
commit 293a45b
Show file tree

Hide file tree

Showing 33 changed files with 10,951 additions and 5,524 deletions.
diff --git a/packages/client-adapters/dist/alpheios-client-adapters.js b/packages/client-adapters/dist/alpheios-client-adapters.js
@@ -2388,7 +2388,7 @@ class ArethusaTreebankAdapter extends _clAdapters_adapters_base_adapter__WEBPACK
  if (homonym && homonym.lexemes && homonym.lexemes.length === 1 &&
  homonym.lexemes[0].lemma.features[alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Feature.types.part].value === alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Constants.POFS_VERB &&
  homonym.lexemes[0].inflections.length === 1 &&
- homonym.lexemes[0].inflections[0][alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Feature.types.mood].value === alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Constants.MOOD_PARTICIPLE) {
+ languageModel.normalizeFeatureValue(alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Feature.types.mood,homonym.lexemes[0].inflections[0][alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Feature.types.mood].value) === alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Constants.MOOD_PARTICIPLE) {
  homonym.lexemes[0].inflections[0].addFeature(new alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Feature(alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Feature.types.part, alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Constants.POFS_VERB_PARTICIPLE, languageModel.languageID))
  }
  return homonym

diff --git a/packages/client-adapters/dist/alpheios-client-adapters.js.map b/packages/client-adapters/dist/alpheios-client-adapters.js.map
diff --git a/packages/client-adapters/dist/alpheios-client-adapters.min.js b/packages/client-adapters/dist/alpheios-client-adapters.min.js
diff --git a/packages/client-adapters/dist/alpheios-client-adapters.node.js b/packages/client-adapters/dist/alpheios-client-adapters.node.js
@@ -4134,7 +4134,7 @@ class ArethusaTreebankAdapter extends _clAdapters_adapters_base_adapter__WEBPACK
  if (homonym && homonym.lexemes && homonym.lexemes.length === 1 &&
  homonym.lexemes[0].lemma.features[alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Feature.types.part].value === alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Constants.POFS_VERB &&
  homonym.lexemes[0].inflections.length === 1 &&
- homonym.lexemes[0].inflections[0][alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Feature.types.mood].value === alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Constants.MOOD_PARTICIPLE) {
+ languageModel.normalizeFeatureValue(alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Feature.types.mood,homonym.lexemes[0].inflections[0][alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Feature.types.mood].value) === alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Constants.MOOD_PARTICIPLE) {
  homonym.lexemes[0].inflections[0].addFeature(new alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Feature(alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Feature.types.part, alpheios_data_models__WEBPACK_IMPORTED_MODULE_2__.Constants.POFS_VERB_PARTICIPLE, languageModel.languageID))
  }
  return homonym

diff --git a/packages/client-adapters/dist/alpheios-client-adapters.node.js.map b/packages/client-adapters/dist/alpheios-client-adapters.node.js.map
diff --git a/packages/client-adapters/dist/alpheios-client-adapters.node.min.js b/packages/client-adapters/dist/alpheios-client-adapters.node.min.js
diff --git a/packages/client-adapters/package.json b/packages/client-adapters/package.json
@@ -10,6 +10,7 @@
  "test-c": "jest tests/client-adapters.test.js",
  "test-u": "jest tests/adapters/tufts/tufts-example.test.js",
  "test-l": "jest tests/adapters/logeion/adapter.test.js",
+ "test-a": "jest tests/adapters/arethusa/adapter.test.js",
  "build": "npm run build-lib && npm run build-node",
  "build-lib": "eslint --fix src/**/*.js && node --experimental-modules ../../node_modules/alpheios-node-build/dist/build.mjs -m all -M all -p vue -c config.mjs",
  "build-node": "eslint --fix src/**/*.js && node --experimental-modules ../../node_modules/alpheios-node-build/dist/build.mjs -m all -M all -p node-lib -c config-node.mjs",

diff --git a/packages/client-adapters/src/adapters/arethusa/adapter.js b/packages/client-adapters/src/adapters/arethusa/adapter.js
@@ -115,7 +115,7 @@ class ArethusaTreebankAdapter extends BaseAdapter {
  if (homonym && homonym.lexemes && homonym.lexemes.length === 1 &&
  homonym.lexemes[0].lemma.features[Feature.types.part].value === Constants.POFS_VERB &&
  homonym.lexemes[0].inflections.length === 1 &&
- homonym.lexemes[0].inflections[0][Feature.types.mood].value === Constants.MOOD_PARTICIPLE) {
+ languageModel.normalizeFeatureValue(Feature.types.mood,homonym.lexemes[0].inflections[0][Feature.types.mood].value) === Constants.MOOD_PARTICIPLE) {
  homonym.lexemes[0].inflections[0].addFeature(new Feature(Feature.types.part, Constants.POFS_VERB_PARTICIPLE, languageModel.languageID))
  }
  return homonym

diff --git a/packages/client-adapters/tests/adapters/arethusa/adapter.test.js b/packages/client-adapters/tests/adapters/arethusa/adapter.test.js
@@ -69,4 +69,19 @@ describe('arethusa/adapter.test.js', () => {
  expect(res.lexemes[0].inflections[0]["part of speech"].value).toEqual('verb participle')
  expect(res.lexemes[0].lemma.features["part of speech"].value).toEqual('verb')
  })
+ it('4 ArethusaTreebankAdapter - getHomonym maps gerundives to participles properly', async () => {
+ const adapter = new ArethusaTreebankAdapter({
+ category: 'morphology',
+ adapterName: 'arethusaTreebank',
+ method: 'getHomonym'
+ })
+ // stub the service request
+ adapter._fetchArethusaData = ArethusaFixture.treebankServiceRequest
+ const res = await adapter.getHomonym(Constants.LANG_LATIN, 'fugiendo', 'http://example.org', '1', '3')
+ expect(adapter.errors.length).toEqual(0)
+ expect(res).toBeInstanceOf(Homonym)
+ expect(res.lexemes.length).toEqual(1)
+ expect(res.lexemes[0].inflections[0]["part of speech"].value).toEqual('verb participle')
+ expect(res.lexemes[0].lemma.features["part of speech"].value).toEqual('verb')
+ })
 })