@liascript/exporter 2.6.16--0.12.2 → 2.6.18--0.12.2

package/package.json

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

package/src/export/ims.ts

@@ -101,7 +101,7 @@ export async function exporter(
     argument.style
   )
 
-  helper.zip(tmpPath, argument.output)
+  await helper.zip(tmpPath, argument.output)
 }
 
 async function manifest(tmpPath: any, meta: any) {

package/src/export/project.ts

@@ -243,8 +243,6 @@ export async function exporter(
         : ''
     }
 
-    ${argument['project-no-meta'] ? '' : meta(json)}
-
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
 
     <script>
@@ -440,6 +438,16 @@ async function toCard(
   }
 
   let downloads = {}
+
+  if (argument['project-generate-pdf'])
+    downloads['pdf'] = 'assets/pdf/' + backupOutput + '.pdf'
+  if (argument['project-generate-ims'])
+    downloads['ims'] = 'assets/ims/' + backupOutput + '.zip'
+  if (argument['project-generate-scorm12'])
+    downloads['scorm12'] = 'assets/scorm12/' + backupOutput + '.zip'
+  if (argument['project-generate-scorm2004'])
+    downloads['scorm2004'] = 'assets/scorm2004/' + backupOutput + '.zip'
+
   if (argument['project-generate-pdf']) {
     argument.input = course.data.lia.readme
     argument.output = backupOutput
@@ -450,7 +458,7 @@ async function toCard(
       argument['project-generate-cache'] &&
       fs.existsSync(path.join(process.cwd(), 'assets/pdf/' + file))
     ) {
-      downloads['pdf'] = 'assets/pdf/' + file
+      console.log('using cached file of ', argument.input, ' -> ', file)
     } else {
       console.log('generate pdf of', argument.input, ' -> ', file)
 
@@ -458,7 +466,6 @@ async function toCard(
 
       if (fs.existsSync(file)) {
         await moveFile(file, 'assets/pdf/' + file)
-        downloads['pdf'] = 'assets/pdf/' + file
       }
     }
   }
@@ -488,22 +495,20 @@ async function toCard(
 
   // IMS
   if (repo && argument['project-generate-ims']) {
-    argument.output = backupOutput
+    argument.output = 'assets/ims/' + backupOutput
     const file = argument.output + '.zip'
-    const asset = argument.output + '.zip'
+
+    try {
+      execSync('mkdir assets/ims')
+    } catch (e) {}
 
     if (
       argument['project-generate-cache'] &&
-      fs.existsSync(path.join(process.cwd(), asset))
+      fs.existsSync(path.join(process.cwd(), file))
     ) {
-      downloads['ims'] = asset
+      console.log('using cached file of ', argument.input, ' -> ', file)
     } else {
       await IMS.exporter(argument, course.data)
-
-      if (fs.existsSync(asset)) {
-        await moveFile(file, 'assets/ims/' + file)
-        downloads['ims'] = asset
-      }
     }
   }
 
@@ -516,13 +521,9 @@ async function toCard(
       argument['project-generate-cache'] &&
       fs.existsSync(path.join(process.cwd(), asset))
     ) {
-      downloads['scorm12'] = asset
+      console.log('using cached file of ', argument.input, ' -> ', asset)
     } else {
       await SCORM12.exporter(argument, course.data)
-
-      if (fs.existsSync(asset)) {
-        downloads['scorm12'] = asset
-      }
     }
   }
 
@@ -536,13 +537,9 @@ async function toCard(
       argument['project-generate-cache'] &&
       fs.existsSync(path.join(process.cwd(), asset))
     ) {
-      downloads['scorm2004'] = asset
+      console.log('using cached file of ', argument.input, ' -> ', asset)
     } else {
       await SCORM2004.exporter(argument, course.data)
-
-      if (fs.existsSync(asset)) {
-        downloads['scorm2004'] = asset
-      }
     }
   }
 
@@ -698,7 +695,9 @@ function card(
     <div class="card-body" style="transform: rotate(0);">
         <a href="${link ? '' : 'https://liascript.github.io/course/?'}${
     link || url
-  }" target="_blank" class="link-dark stretched-link">
+  }" target="${
+    link && !link.startsWith('http') ? '_self' : '_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/export/scorm2004.ts

@@ -122,7 +122,7 @@ export async function exporter(
     },
   }
 
-  scormPackager(config, function (msg) {
+  await scormPackager(config, function (msg) {
     console.log(msg)
     process.exit(0)
   })

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.16--0.12.2')
+  console.log('version: 2.6.18--0.12.2')
 } else if (argv.h || argv.help) {
   help()
 } else if (argv.i || argv.input) {