Merge pull request #69 from stencila/code

Conversion of source code nodes

package.json

@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@stencila/logga": "^1.0.0",
-    "@stencila/schema": "^0.12.2",
+    "@stencila/schema": "^0.13.1",
     "ajv": "^6.10.0",
     "axios": "^0.19.0",
     "better-ajv-errors": "^0.6.4",
@@ -59,6 +59,7 @@
     "remark-generic-extensions": "^1.4.0",
     "remark-parse": "^6.0.3",
     "remark-stringify": "^6.0.4",
+    "tempy": "^0.3.0",
     "to-vfile": "^6.0.0",
     "unified": "^7.1.0",
     "unist-util-filter": "^1.0.2",
@@ -98,7 +99,6 @@
     "prettier": "^1.17.1",
     "semantic-release": "^15.13.12",
     "tar": "^4.4.9",
-    "tempy": "^0.3.0",
     "ts-jest": "^24.0.1",
     "ts-node": "^8.2.0",
     "tslint": "^5.17.0",

src/html.ts

@@ -519,8 +519,6 @@ function decodeLink(elem: HTMLAnchorElement): stencila.Link {
     content: decodeInlineChildNodes(elem)
   }
   const meta = decodeDataAttrs(elem)
-  // TODO: remove ts-ignore
-  // @ts-ignore
   if (meta) link.meta = meta
   return link
 }
@@ -531,8 +529,6 @@ function decodeLink(elem: HTMLAnchorElement): stencila.Link {
 function encodeLink(link: stencila.Link): HTMLAnchorElement {
   let attrs = {
     href: link.target,
-    // TODO: remove ts-ignores
-    // @ts-ignore
     ...encodeDataAttrs(link.meta || {})
   }
   return h('a', attrs, link.content.map(encodeNode))
@@ -568,8 +564,6 @@ function decodeCode(elem: HTMLElement): stencila.Code {
     }
   }
   const meta = decodeDataAttrs(elem)
-  // TODO: remove ts-ignore
-  // @ts-ignore
   if (meta) code.meta = meta
   return code
 }
@@ -584,8 +578,6 @@ function encodeCode(
   return h('code', {
     class: code.language ? `language-${code.language}` : undefined,
     innerHTML: escape(code.value),
-    // TODO: remove ts-ignore
-    // @ts-ignore
     ...(dataAttrs ? encodeDataAttrs(code.meta || {}) : {})
   })
 }

src/index.ts

@@ -1,11 +1,12 @@
-import stencila from '@stencila/schema'
+import * as stencila from '@stencila/schema'
 import mime from 'mime'
 import path from 'path'
 import * as csv from './csv'
 import * as demoMagic from './demo-magic'
 import * as docx from './docx'
 import * as gdoc from './gdoc'
 import * as html from './html'
+import * as ipynb from './ipynb'
 import * as jats from './jats'
 import * as json from './json'
 import * as json5 from './json5'
@@ -17,6 +18,7 @@ import * as pandoc from './pandoc'
 import * as pdf from './pdf'
 import * as rpng from './rpng'
 import * as tdp from './tdp'
+import * as txt from './txt'
 import * as vfile from './vfile'
 import * as xlsx from './xlsx'
 import * as yaml from './yaml'
@@ -42,11 +44,13 @@ export const codecList: Array<Codec> = [
   docx,
   gdoc,
   html,
+  ipynb,
   jats,
   latex,
   md,
   odt,
   pdf,
+  txt,
 
   // Scripts
   demoMagic,
@@ -154,7 +158,10 @@ export async function match(content?: string, format?: string): Promise<Codec> {
   // If the content is a path then begin with derived values
   if (content && vfile.isPath(content)) {
     fileName = path.basename(content)
-    extName = path.extname(content).slice(1)
+    extName = path
+      .extname(content)
+      .slice(1)
+      .toLowerCase()
     mediaType = mime.getType(content) || undefined
   }
   // But override with supplied format (if any) assuming that