Merge 14fefb9 into 5bec25a

Author: irina060981

packages/client-adapters/dist/alpheios-client-adapters.js

@@ -9,7 +9,7 @@
     "test-no-coverage": "jest",
     "test-c": "jest tests/morph-fixture.test.js",
     "test-u": "jest tests/adapters/tufts/tufts-example.test.js",
-    "test-l": "jest tests/adapters/concordance/adapter.test.js",
+    "test-l": "jest tests/adapters/translations/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",

packages/client-adapters/dist/alpheios-client-adapters.js.map

@@ -13,6 +13,7 @@ class AlpheiosLemmaTranslationsAdapter extends BaseAdapter {
     this.config = this.uploadConfig(config, DefaultConfig)
     this.mapLangUri = {}
     this.provider = new ResourceProvider(this.config.url, this.config.rights)
+    this.sourceData = config.sourceData
   }
 
   /**
@@ -50,7 +51,12 @@ class AlpheiosLemmaTranslationsAdapter extends BaseAdapter {
       if (input && urlLang) {
         try {
           const url = urlLang + '?input=' + input
-          const translationsList = await this.fetch(url)
+          let translationsList
+          if (this.sourceData && this.sourceData.translations) {
+            translationsList = this.sourceData.translations
+          } else {
+            translationsList = await this.fetch(url)
+          }
           if (translationsList && translationsList.constructor.name === 'AdapterError') {
             return
           }
@@ -84,7 +90,14 @@ class AlpheiosLemmaTranslationsAdapter extends BaseAdapter {
   async getAvailableResLang (inLang, outLang) {
     if (this.mapLangUri[inLang] === undefined) {
       const urlAvaLangsRes = this.config.url + '/' + inLang + '/'
-      const unparsed = await this.fetch(urlAvaLangsRes)
+
+      let unparsed
+
+      if (!this.sourceData || !this.sourceData.langs) {
+        unparsed = await this.fetch(urlAvaLangsRes)
+      } else {
+        unparsed = this.sourceData.langs
+      }
 
       if (unparsed && unparsed.constructor.name === 'AdapterError') {
         return unparsed

packages/client-adapters/dist/alpheios-client-adapters.min.js

@@ -249,7 +249,8 @@ class ClientAdapters {
       category: 'lemmatranslation',
       adapterName: 'alpheios',
       method: options.method,
-      clientId: options.clientId
+      clientId: options.clientId,
+      sourceData: options.sourceData
     })
 
     if (options.method === 'fetchTranslations') {

packages/client-adapters/dist/alpheios-client-adapters.node.js

@@ -6,23 +6,30 @@ import AlpheiosLemmaTranslationsAdapter from '@clAdapters/adapters/translations/
 import ClientAdapters from '@clAdapters/client-adapters.js'
 import { LanguageModelFactory as LMF, Constants, Homonym, Lexeme, Lemma } from 'alpheios-data-models'
 
+import { Fixture, TranslationsFixture } from 'alpheios-fixtures'
+
 describe('lexicons/adapter.test.js', () => {
   console.error = function () {}
   console.log = function () {}
   console.warn = function () {}
 
   let testSuccessHomonym, testLangID
-
+  
   beforeAll(async () => {
     ClientAdapters.init()
     testLangID = Constants.LANG_LATIN
 
+    let sourceJson = Fixture.getFixtureRes({
+      langCode: 'lat', adapter: 'tufts', word: 'mare'
+    })
+
     let homonymRes1 = await ClientAdapters.maAdapter({
       method: 'getHomonym',
       params: {
         languageID: testLangID,
         word: 'mare'
-      }
+      },
+      sourceData: sourceJson
     })
     testSuccessHomonym = homonymRes1.result
   })
@@ -56,16 +63,19 @@ describe('lexicons/adapter.test.js', () => {
     expect(adapter.provider).toBeDefined()
   })
 
-  it.skip('2 AlpheiosLemmaTranslationsAdapter - getTranslationsList gets translations and adds no error', async () => {
+  it('2 AlpheiosLemmaTranslationsAdapter - getTranslationsList gets translations and adds no error', async () => {
     let adapter = new AlpheiosLemmaTranslationsAdapter({
       category: 'lexicon',
       adapterName: 'alpheios',
-      method: 'fetchTranslations'
+      method: 'fetchTranslations', 
+      sourceData: {
+        langs: TranslationsFixture.allLangs,
+        translations: TranslationsFixture.library['lat-spa-mare']
+      }
     })
 
     adapter.addError = jest.fn()
     await adapter.getTranslationsList(testSuccessHomonym, 'es')
-    let timeoutRes = await timeout(15000)
 
     let translationsCheck = [
       ['mar'], ['varón, macho; varonil, viril'], ['varón, macho; varonil, viril'], ['mar']
@@ -75,8 +85,6 @@ describe('lexicons/adapter.test.js', () => {
       expect(lexeme.lemma.translation).toBeDefined()
       expect(lexeme.lemma.translation.glosses).toEqual(translationsCheck[i])
     })
-
-    return timeoutRes
   }, 30000)
 
   it('3 AlpheiosLemmaTranslationsAdapter - prepareInput creates input string for url', async () => {
@@ -99,13 +107,16 @@ describe('lexicons/adapter.test.js', () => {
     let adapter = new AlpheiosLemmaTranslationsAdapter({
       category: 'lexicon',
       adapterName: 'alpheios',
-      method: 'fetchTranslations'
+      method: 'fetchTranslations', 
+      sourceData: {
+        langs: TranslationsFixture.allLangs
+      }
     })
 
-    let resSuccess = await adapter.getAvailableResLang('lat', 'spa')
+    let resSuccess = await adapter.getAvailableResLang('lat', 'spa', TranslationsFixture.allLangs)
     expect(resSuccess).toEqual('https://ats.alpheios.net/lat/spa')
 
-    let resFailed = await adapter.getAvailableResLang('lat', 'foo')
+    let resFailed = await adapter.getAvailableResLang('lat', 'foo', TranslationsFixture.allLangs)
     expect(resFailed).toBeUndefined()
   })