fix: 'confTo.startsWith is not a function' (Fixes #186 )

Author: danielweck

packages/epub-utils/src/epub-parse.js

@@ -139,7 +139,7 @@ function parseMetadata(doc, select, epub) {
       refines = refines.trim();
       if (refines) {
         // isEPUB3 implied
-        if (md === "source-of" && meta.textContent === "pagination" && refines === dcSourceId) {
+        if (md === "source-of" && meta.textContent === "pagination" && dcSource && refines === dcSourceId) {
           dcSourceAdded = true;
           addMeta(`dc:source`, dcSource, result);
           return;
@@ -168,11 +168,37 @@ function parseMetadata(doc, select, epub) {
   });
 
   if (isEPUB3 && dcSource && !dcSourceAdded) {
-    // console.log(JSON.stringify(result));
-    const confTo = result["dcterms:conformsTo"] || epub.links && epub.links["dcterms:conformsTo"];
-    if (confTo && confTo.startsWith("http://www.idpf.org/epub/a11y/")) { // EPUB a11y 1.0
+    // console.log("LINKS:", JSON.stringify(epub.links, null, 4));
+    // console.log("METADATA 1:", JSON.stringify(result, null, 4));
+    const confTo = [];
+    if (result["dcterms:conformsTo"]) {
+      if (Array.isArray(result["dcterms:conformsTo"])) {
+        confTo.push(...result["dcterms:conformsTo"]);
+      } else {
+        confTo.push(result["dcterms:conformsTo"]);
+      }
+    }
+    if (epub.links && epub.links["dcterms:conformsTo"]) {
+      if (Array.isArray(epub.links["dcterms:conformsTo"])) {
+        confTo.push(...epub.links["dcterms:conformsTo"]);
+      } else {
+        confTo.push(epub.links["dcterms:conformsTo"]);
+      }
+    }
+    // console.log("confTo:", JSON.stringify(confTo, null, 4));
+    // check for EPUB a11y v1.0
+    if (
+    // confTo &&
+    // (
+    //   Array.isArray(confTo) && confTo.find((item) => item.startsWith("http://www.idpf.org/epub/a11y/"))
+    //   ||
+    //   !Array.isArray(confTo) && confTo.startsWith("http://www.idpf.org/epub/a11y/")
+    // )
+    confTo.find((item) => item.startsWith("http://www.idpf.org/epub/a11y/"))
+    ) {
       addMeta(`dc:source`, dcSource, result);
     }
+    // console.log("METADATA 2:", JSON.stringify(result, null, 4));
   }
 
   return result;

tests/__tests__/epub-rules.test.js

@@ -269,10 +269,12 @@ describe('accessibility metadata', () => {
       "schema:accessModeSufficient": "visual,textual",
       "schema:accessibilityControl": "fullKeyboardControl",
       "schema:accessibilityAPI": "AndroidAcessibility",
-      "dcterms:conformsTo": "EPUB-A11Y-11_WCAG-21-AA"
+      // "dc:source": "print-source",
+      "dcterms:conformsTo": ["EPUB-A11Y-11_WCAG-21-AA","EPUB-A11Y-11_WCAG-20-A"]
     });
     expect(report['earl:testSubject']['links']).toEqual({
       "a11y:certifierCredential": "http://GCA",
+      "dcterms:conformsTo": "xxhttp://www.idpf.org/epub/a11y/accessibility-20170105.html#wcag-aa",
     });
   });
   test('accessibilityAPI and accessibilityControl metadata are ignored when missing', async () => {
@@ -306,7 +308,8 @@ describe('accessibility metadata', () => {
       "dcterms:conformsTo": [
           "EPUB-A11Y-11_WCAG-21-A",
           "EPUB-A11Y-11_WCAG-20-AA"
-      ]
+      ],
+      "dc:source": "print-source"
     });
     expect(report['earl:testSubject']['links']).toEqual({
       "a11y:certifierReport": "http://www.example.com/report.html",

tests/data/epubrules-metadata-accessibilityAPI_Control-missing/EPUB/package.opf

@@ -7,19 +7,19 @@
   <meta property="dcterms:modified">2017-01-01T00:00:01Z</meta>
 
   <meta property="schema:accessMode">textual</meta>
-  
+
   <meta property="schema:accessibilityFeature">ARIA</meta>
-  
+
   <meta property="schema:accessibilityHazard">noFlashingHazard</meta>
-  
+
   <meta property="schema:accessibilitySummary">everything OK!</meta>
 
   <meta property="schema:accessModeSufficient">visual,textual</meta>
-<!-- 
+<!--
   <meta property="schema:accessibilityControl">fullKeyboardControl</meta>
-  
+
   <meta property="schema:accessibilityAPI">AndroidAcessibility</meta> -->
-  
+
   <meta name="a11y:certifiedBy" content="CERTBY" />
   <meta property="a11y:certifierCredential">CERTCRED</meta>
   <link rel="a11y:certifierReport" href="http://www.example.com/report.html"/>
@@ -31,6 +31,7 @@
     EPUB-A11Y-11_WCAG-21-A
   </meta>
   <meta property="dcterms:conformsTo">EPUB-A11Y-11_WCAG-20-AA</meta>
+  <dc:source>print-source</dc:source>
 </metadata>
 <manifest>
   <item id="nav"  href="nav.xhtml" media-type="application/xhtml+xml" properties="nav"/>

tests/data/epubrules-metadata-accessibilityAPI_Control-present/EPUB/package.opf

@@ -4,24 +4,30 @@
   <dc:title id="title">Minimal EPUB 3.0</dc:title>
   <dc:language>en</dc:language>
   <dc:identifier id="uid">NOID</dc:identifier>
+
   <meta property="dcterms:modified">2017-01-01T00:00:01Z</meta>
 
   <meta property="schema:accessMode">textual</meta>
-  
+
   <meta property="schema:accessibilityFeature">structuralNavigation</meta>
   <meta property="schema:accessibilityFeature">ARIA</meta>
-  
+
   <meta property="schema:accessibilityHazard">noFlashingHazard</meta>
-  
+
   <meta property="schema:accessibilitySummary">everything OK!</meta>
 
   <meta property="schema:accessModeSufficient">visual,textual</meta>
 
   <meta property="schema:accessibilityControl">fullKeyboardControl</meta>
-  
+
   <meta property="schema:accessibilityAPI" refines=" # ">AndroidAcessibility</meta>
-  
+
+  <dc:source>print-source</dc:source>
+
   <meta property="dcterms:conformsTo" id="conf">EPUB-A11Y-11_WCAG-21-AA</meta>
+  <meta property="dcterms:conformsTo" id="conf">EPUB-A11Y-11_WCAG-20-A</meta>
+  <!-- meta property="dcterms:conformsTo">http://www.idpf.org/epub/a11y/accessibility-20170105.html#wcag-aa</meta -->
+  <link rel="dcterms:conformsTo" href="xxhttp://www.idpf.org/epub/a11y/accessibility-20170105.html#wcag-aa" />
   <!-- meta property="dcterms:conformsTo" id="conf">EPUB Accessibility 1.1 - WCAG 2.1 Level AA</meta -->
 
   <meta property="a11y:certifiedBy" id="certifier" refines="#conf">Benetech</meta>