@liascript/exporter 2.6.3--0.10.31 → 2.6.5--0.10.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liascript/exporter",
-  "version": "2.6.3--0.10.31",
+  "version": "2.6.5--0.10.31",
   "description": "A generic exporter for LiaScript",
   "main": "dist/index.js",
   "repository": {

package/src/export/project.ts

@@ -136,7 +136,6 @@ export async function exporter(
       }
 
       const itemListElement = {
-        '@context': 'http://schema.org',
         '@type': 'ItemList',
         itemListElement: subItemList,
       }
@@ -199,9 +198,9 @@ export async function exporter(
   }
 
   const jsonLD = {
-    '@context': 'http://schema.org',
+    '@context': 'http://schema.org/',
     '@type': 'ItemList',
-    itemList: itemList,
+    itemListElement: removeContext(itemList),
   }
 
   let title = json.title || 'LiaScript Course Index'
@@ -305,6 +304,18 @@ export async function exporter(
   helper.writeFile(output + '.html', helper.prettify(helper.prettify(html)))
 }
 
+function removeContext(obj) {
+  for (let key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      if (key === '@context') {
+        delete obj[key]
+      } else if (typeof obj[key] === 'object') {
+        removeContext(obj[key])
+      }
+    }
+  }
+  return obj
+}
 async function moveFile(oldPath, newPath) {
   // 1. Create the destination directory if it does not exist
   // Set the `recursive` option to `true` to create all the subdirectories

package/src/export/rdf.ts

@@ -50,7 +50,7 @@ export async function exporter(
   },
   json
 ) {
-  let doc = parse(argument, json)
+  let doc = await parse(argument, json)
 
   if (argument['rdf-format'] === 'n-quads') {
     const nquads = await jsonld.toRDF(doc, { format: 'application/n-quads' })
@@ -98,11 +98,19 @@ export async function script(
   },
   json
 ) {
+  let doc = await parse(argument, json)
+  doc = await jsonld.compact(doc, 'http://schema.org/')
+  doc = clean(doc)
+
   return `<script type="application/ld+json">
-    ${JSON.stringify(await parse(argument, json), null, 2)}
+    ${JSON.stringify(doc, null, 2)}
   </script>`
 }
 
+export async function compact(doc: any) {
+  return await jsonld.compact(doc, 'http://schema.org/')
+}
+
 export async function parse(
   argument: {
     input: string

package/src/index.ts

@@ -22,7 +22,7 @@ import fetch from 'node-fetch'
 
 // -------------------------------Main Execution-------------------------------
 if (argv.v || argv.version) {
-  console.log('version: 2.6.3--0.10.31')
+  console.log('version: 2.6.5--0.10.31')
 } else if (argv.h || argv.help) {
   help()
 } else if (argv.i || argv.input) {