@larsgw/formica 0.5.2 → 0.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@larsgw/formica",
-  "version": "0.5.2",
+  "version": "0.6.1",
   "description": "SDK and tools for data from the Library of Identification Resources",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/catalog/value.ts

@@ -6,8 +6,8 @@ import ietfTagListFactory = require('ietf-language-tag-regex')
 const ietfTagList = ietfTagListFactory()
 
 export const FORMATS = {
-    ENTRY_TYPE: ['print', 'online', 'cd'],
-    KEY_TYPE: ['key', 'matrix', 'reference', 'gallery', 'checklist', 'supplement', 'collection'],
+    ENTRY_TYPE: ['print', 'online', 'cd', 'application'],
+    KEY_TYPE: ['key', 'matrix', 'reference', 'gallery', 'checklist', 'supplement', 'collection', 'algorithm'],
     COMPLETE: ['TRUE', 'FALSE'],
 
     ID: /^B\d+$/,

package/src/resources/parse-text.ts

@@ -245,8 +245,8 @@ function parseName (name: string, rank: Rank, parent: WorkingTaxon): WorkingTaxo
     }
 
     // Hybrids
-    if (rank === 'species' && /^x /.test(name)) {
-        name = '\u00D7' + name.slice(2)
+    if (rank === 'species' && /(^| )x /.test(name)) {
+        name = name.replace(/(^| )x /, '\u00D7')
     }
 
     // Divide the name into the main scientific name (only the epithet for taxa

package/test/resources.js

@@ -124,4 +124,16 @@ Microdynerus Thomson, 1874
 `, 'T1')
         assert.strictEqual(resource.taxa['T1:1:3'].scientificName, 'Microdynerus microdynerus (Dalla Torre, 1889)')
     })
+
+    await t.test('parses hybrids', (t) => {
+        const [resource] = resources.parseTextFile(`---
+levels: [species]
+---
+
+Rumex conglomeratus x maritimus
+Tilia x vulgaris
+`, 'T1')
+        assert.strictEqual(resource.taxa['T1:1:1'].scientificName, 'Rumex conglomeratus×maritimus')
+        assert.strictEqual(resource.taxa['T1:1:2'].scientificName, 'Tilia ×vulgaris')
+    })
 })