@liascript/exporter 2.6.7--0.11.1 → 2.6.9--0.11.1

package/package.json

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

package/src/export/project.ts

@@ -125,14 +125,26 @@ export async function exporter(
       let subItemList: any[] = []
 
       for (let j = 0; j < course.collection.length; j++) {
-        let { html, json } = await toCard(argument, course.collection[j], true)
-        subCards += `<div class='col-sm-6 col-md-4 col-lg-3 ${
-          course.grid ? 'mb-3' : ''
-        }'>
+        if (course.collection[j].link) {
+          subCards += `<div class='col-sm-6 col-md-4 col-lg-3 ${
+            course.grid ? 'mb-3' : ''
+          }'>
+          ${toLinkCard(argument, course.collection[j], true)}
+          </div>`
+        } else {
+          let { html, json } = await toCard(
+            argument,
+            course.collection[j],
+            true
+          )
+          subCards += `<div class='col-sm-6 col-md-4 col-lg-3 ${
+            course.grid ? 'mb-3' : ''
+          }'>
           ${html}
           </div>`
 
-        subItemList.push(json)
+          subItemList.push(json)
+        }
       }
 
       const itemListElement = {
@@ -169,6 +181,8 @@ export async function exporter(
         </div>`
     } else if (course.html) {
       cards += "<div class='col-12'>" + course.html + '</div>'
+    } else if (course.link) {
+      cards += "<div class='col'>" + toLinkCard(argument, course) + '</div>'
     } else {
       let { html, json } = await toCard(argument, course)
       cards += "<div class='col'>" + html + '</div>'
@@ -362,6 +376,38 @@ function hash(url: string) {
   return value.startsWith('-') ? '0' + value.slice(1) : value
 }
 
+function toLinkCard(
+  argument: any,
+  course: any,
+  small: boolean = false
+): string {
+  if (course.arguments) {
+    argument = course.arguments.reduce((a, b) => {
+      return { ...a, ...b }
+    }, argument)
+  }
+
+  let tags = []
+
+  const tagList = course.tags || tags
+  for (let i = 0; i < tagList.length; i++) {
+    Categories.add(tagList[i].toLowerCase())
+  }
+
+  let comment = course.title ? course.comment : course.comment || course.link
+
+  return card(
+    small,
+    '',
+    course.title || '',
+    comment || '',
+    tagList,
+    {},
+    course.logo,
+    course.link
+  )
+}
+
 async function toCard(
   argument: any,
   course: any,
@@ -551,7 +597,8 @@ function card(
     ims?: string
     apk?: string
   },
-  img_url?: string
+  img_url?: string,
+  link?: string
 ): string {
   let image = ''
 
@@ -578,10 +625,10 @@ function card(
 
   if (tags.length > 0) {
     for (let i = 0; i < tags.length; i++) {
-      tag_list += `<span class="badge rounded-pill bg-light text-dark">${tags[i]}</span>`
+      tag_list += `<span style="display: inline; white-space: break-spaces;" class="badge rounded-pill bg-light text-dark">${tags[i]}</span>`
     }
 
-    tag_list = `<div class="d-flex align-items-center">${tag_list}</div>`
+    tag_list = `<p>${tag_list}</p>`
   }
 
   if (small && comment) {
@@ -644,7 +691,9 @@ function card(
     .join('|')}">
     ${image}
     <div class="card-body" style="transform: rotate(0);">
-        <a href="https://liascript.github.io/course/?${url}" target="_blank" class="link-dark stretched-link">
+        <a href="${link ? '' : 'https://liascript.github.io/course/?'}${
+    link || url
+  }" target="_blank" class="link-dark stretched-link">
             <h${small ? 6 : 5} class="card-title">${title}</h${small ? 6 : 5}>
         </a>
         <p class="card-text">${comment}</p>

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.7--0.11.1')
+  console.log('version: 2.6.9--0.11.1')
 } else if (argv.h || argv.help) {
   help()
 } else if (argv.i || argv.input) {
@@ -144,8 +144,14 @@ async function run(argument) {
 
       if (collection) {
         const next = PROJECT.getNext(collection)
-        console.warn('loading:', next)
-        app.ports.input.send([format, next])
+
+        if (next === null) {
+          PROJECT.exporter(argument, collection)
+        } else {
+          console.warn('loading:', next)
+
+          app.ports.input.send([format, next])
+        }
       }
     } else if (!helper.isURL(argument.input)) {
       const data = fs.readFileSync(argument.input, 'utf8')