@liascript/exporter 2.3.0--0.10.1 → 2.4.0--0.10.1

package/package.json

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

package/src/export/android.ts

@@ -19,6 +19,7 @@ export async function exporter(
     'android-icon'?: string
     'android-splash'?: string
     'android-splashDuration'?: number
+    'android-preview'?: boolean
   },
   json: any
 ) {
@@ -39,10 +40,23 @@ export async function exporter(
     path.join(tmpPath, '../resources')
   )
 
-  // copy base path or readme-directory into temp
-  await fs.copy(argument.path, path.join(tmpPath, './dist/'), {
-    filter: helper.filterHidden,
-  })
+  if (argument['android-preview']) {
+    // create a link, this way, the app can be updated interactively
+    await fs.symlink(
+      path.resolve(argument.path),
+      path.join(tmpPath, './dist/res'),
+      'dir'
+    )
+  } else {
+    // copy base path or readme-directory into temp
+    await fs.copy(
+      path.resolve(argument.path),
+      path.join(tmpPath, './dist/res'),
+      {
+        filter: helper.filterHidden,
+      }
+    )
+  }
 
   await helper.writeFile(
     path.join(tmpPath, '../capacitor.config.json'),
@@ -51,6 +65,8 @@ export async function exporter(
       "appName": "${argument['android-appName'] || json.lia.str_title}",
       "bundledWebRuntime": true,
       "webDir": "pro/dist",
+      "linuxAndroidStudioPath": "${argument['android-sdk']}",
+      "windowsAndroidStudioPath": "${argument['android-sdk']}",
       "plugins": {
         "SplashScreen": {
           "launchShowDuration": ${argument['android-splashDuration'] || 0}
@@ -80,7 +96,7 @@ export async function exporter(
   let index = fs.readFileSync(path.join(tmpPath, 'dist/index.html'), 'utf8')
 
   index = helper.inject(
-    `<script> if (!window.LIA) { window.LIA = {} } window.LIA.defaultCourseURL = "./${path.basename(
+    `<script> if (!window.LIA) { window.LIA = {} } window.LIA.defaultCourseURL = "./res/${path.basename(
       argument.readme
     )}"</script>`,
     index
@@ -106,19 +122,25 @@ export async function exporter(
     async function () {
       await sdk(tmpPath, argument['android-sdk'])
 
-      execute(
-        `cd ${tmpPath} && cd .. && cd android && ./gradlew assembleDebug`,
-        function () {
-          console.warn('DONE')
-          fs.copy(
-            path.join(
-              tmpPath,
-              '../android/app/build/outputs/apk/debug/app-debug.apk'
-            ),
-            argument.output + '.apk'
-          )
-        }
-      )
+      if (argument['android-preview']) {
+        execute(`cd ${tmpPath} && cd .. && npx cap open android`, () => {
+          console.log('ready')
+        })
+      } else {
+        execute(
+          `cd ${tmpPath} && cd .. && cd android && ./gradlew assembleDebug`,
+          function () {
+            console.warn('DONE')
+            fs.copy(
+              path.join(
+                tmpPath,
+                '../android/app/build/outputs/apk/debug/app-debug.apk'
+              ),
+              argument.output + '.apk'
+            )
+          }
+        )
+      }
     }
   )
 }

package/src/export/ios.ts

@@ -0,0 +1,149 @@
+import * as helper from './helper'
+
+const path = require('path')
+const fs = require('fs-extra')
+const { exec } = require('child_process')
+
+export async function exporter(
+  argument: {
+    input: string
+    readme: string
+    output: string
+    format: string
+    path: string
+    key?: string
+
+    'ios-appId'?: string
+    'ios-appName'?: string
+    'ios-icon'?: string
+    'ios-splash'?: string
+    'ios-splashDuration'?: number
+  },
+  json: any
+) {
+  // make temp folder
+  let tmp = await helper.tmpDir()
+
+  let tmpPath = path.join(tmp, 'pro')
+
+  // copy assets to temp/dist
+  await fs.copy(
+    path.join(__dirname, './assets/capacitor'),
+    path.join(tmpPath, './dist')
+  )
+
+  // copy logo and splash
+  await fs.copy(
+    path.join(__dirname, './resources'),
+    path.join(tmpPath, '../resources')
+  )
+
+  // copy base path or readme-directory into temp
+  await fs.copy(argument.path, path.join(tmpPath, './dist/'), {
+    filter: helper.filterHidden,
+  })
+
+  await helper.writeFile(
+    path.join(tmpPath, '../capacitor.config.json'),
+    `{
+      "appId": "${argument['ios-appId']}",
+      "appName": "${argument['ios-appName'] || json.lia.str_title}",
+      "bundledWebRuntime": true,
+      "webDir": "pro/dist",
+      "plugins": {
+        "SplashScreen": {
+          "launchShowDuration": ${argument['ios-splashDuration'] || 0}
+        }
+      }
+    }`
+  )
+
+  await helper.writeFile(
+    path.join(tmpPath, '../package.json'),
+    `{
+    "scripts": {
+      "build": "npx cap add ios"
+    },
+    "dependencies": {
+      "@capacitor-community/text-to-speech": "^1.1.2",
+      "@capacitor/cli": "^3.4.3",
+      "@capacitor/ios": "^3.4.1",
+      "capacitor-resources": "^2.0.5"
+    },
+    "engines": {
+      "node": ">= 12"
+    }
+  }`
+  )
+
+  let index = fs.readFileSync(path.join(tmpPath, 'dist/index.html'), 'utf8')
+
+  index = helper.inject(
+    `<script> if (!window.LIA) { window.LIA = {} } window.LIA.defaultCourseURL = "./${path.basename(
+      argument.readme
+    )}"</script>`,
+    index
+  )
+
+  try {
+    await helper.writeFile(path.join(tmpPath, 'dist/index.html'), index)
+  } catch (e) {
+    console.warn(e)
+    return
+  }
+
+  execute(
+    `cd ${tmpPath} && cd .. && npm i && npx cap add ios && npx capacitor-resources -p "ios" ${
+      argument['ios-icon'] ? '--icon ' + path.resolve(argument['ios-icon']) : ''
+    } ${
+      argument['ios-splash']
+        ? '--splash ' + path.resolve(argument['ios-splash'])
+        : ''
+    }`,
+    async function () {
+      // await sdk(tmpPath, argument['android-sdk'])
+
+      execute(
+        `cd ${tmpPath} && cd .. && cd ios && ./gradlew assembleDebug`,
+        function () {
+          console.warn('DONE')
+          fs.copy(
+            path.join(
+              tmpPath,
+              '../android/app/build/outputs/apk/debug/app-debug.apk'
+            ),
+            argument.output + '.apk'
+          )
+        }
+      )
+    }
+  )
+}
+
+async function sdk(tmpPath: string, uri?: string) {
+  if (!uri) return
+
+  try {
+    helper.writeFile(
+      path.join(tmpPath, '../android/local.properties'),
+      `sdk.dir=${uri}`
+    )
+  } catch (e) {
+    console.warn(e)
+    return
+  }
+}
+
+function execute(cmd: string, callback) {
+  exec(cmd, async (error, stdout, stderr) => {
+    if (error) {
+      console.log(`error: ${error.message}`)
+    }
+    if (stderr) {
+      console.log(`stderr: ${stderr}`)
+    }
+    console.log(`stdout: ${stdout}`)
+
+    callback()
+  })
+}

package/src/export/windows.ts

@@ -0,0 +1,151 @@
+import * as helper from './helper'
+
+const path = require('path')
+const fs = require('fs-extra')
+const { exec } = require('child_process')
+
+export async function exporter(
+  argument: {
+    input: string
+    readme: string
+    output: string
+    format: string
+    path: string
+    key?: string
+
+    'windows-appId'?: string
+    'windows-appName'?: string
+    'windows-icon'?: string
+    'windows-splash'?: string
+    'windows-splashDuration'?: number
+  },
+  json: any
+) {
+  // make temp folder
+  let tmp = await helper.tmpDir()
+
+  let tmpPath = path.join(tmp, 'pro')
+
+  // copy assets to temp/dist
+  await fs.copy(
+    path.join(__dirname, './assets/capacitor'),
+    path.join(tmpPath, './dist')
+  )
+
+  // copy logo and splash
+  await fs.copy(
+    path.join(__dirname, './resources'),
+    path.join(tmpPath, '../resources')
+  )
+
+  // copy base path or readme-directory into temp
+  await fs.copy(argument.path, path.join(tmpPath, './dist/'), {
+    filter: helper.filterHidden,
+  })
+
+  await helper.writeFile(
+    path.join(tmpPath, '../capacitor.config.json'),
+    `{
+      "appId": "${argument['windows-appId']}",
+      "appName": "${argument['windows-appName'] || json.lia.str_title}",
+      "bundledWebRuntime": true,
+      "webDir": "pro/dist",
+      "plugins": {
+        "SplashScreen": {
+          "launchShowDuration": ${argument['windows-splashDuration'] || 0}
+        }
+      }
+    }`
+  )
+
+  await helper.writeFile(
+    path.join(tmpPath, '../package.json'),
+    `{
+    "scripts": {
+      "build": "npx cap add android"
+    },
+    "dependencies": {
+      "@capacitor-community/text-to-speech": "^1.1.2",
+      "@capacitor/android": "^3.4.1",
+      "@capacitor/cli": "^3.4.3",
+      "capacitor-resources": "^2.0.5"
+    },
+    "engines": {
+      "node": ">= 12"
+    }
+  }`
+  )
+
+  let index = fs.readFileSync(path.join(tmpPath, 'dist/index.html'), 'utf8')
+
+  index = helper.inject(
+    `<script> if (!window.LIA) { window.LIA = {} } window.LIA.defaultCourseURL = "./${path.basename(
+      argument.readme
+    )}"</script>`,
+    index
+  )
+
+  try {
+    await helper.writeFile(path.join(tmpPath, 'dist/index.html'), index)
+  } catch (e) {
+    console.warn(e)
+    return
+  }
+
+  execute(
+    `cd ${tmpPath} && cd .. && npm i && npx cap add android && npx capacitor-resources -p "android" ${
+      argument['android-icon']
+        ? '--icon ' + path.resolve(argument['android-icon'])
+        : ''
+    } ${
+      argument['android-splash']
+        ? '--splash ' + path.resolve(argument['android-splash'])
+        : ''
+    }`,
+    async function () {
+      await sdk(tmpPath, argument['android-sdk'])
+
+      execute(
+        `cd ${tmpPath} && cd .. && cd android && ./gradlew assembleDebug`,
+        function () {
+          console.warn('DONE')
+          fs.copy(
+            path.join(
+              tmpPath,
+              '../android/app/build/outputs/apk/debug/app-debug.apk'
+            ),
+            argument.output + '.apk'
+          )
+        }
+      )
+    }
+  )
+}
+
+async function sdk(tmpPath: string, uri?: string) {
+  if (!uri) return
+
+  try {
+    helper.writeFile(
+      path.join(tmpPath, '../android/local.properties'),
+      `sdk.dir=${uri}`
+    )
+  } catch (e) {
+    console.warn(e)
+    return
+  }
+}
+
+function execute(cmd: string, callback) {
+  exec(cmd, async (error, stdout, stderr) => {
+    if (error) {
+      console.log(`error: ${error.message}`)
+    }
+    if (stderr) {
+      console.log(`stderr: ${stderr}`)
+    }
+    console.log(`stdout: ${stdout}`)
+
+    callback()
+  })
+}

package/src/index.ts

@@ -8,6 +8,7 @@ import * as PDF from './export/pdf'
 import * as helper from './export/helper'
 import * as IMS from './export/ims'
 import * as ANDROID from './export/android'
+// import * as IOS from './export/ios'
 
 global.XMLHttpRequest = require('xhr2')
 
@@ -71,6 +72,11 @@ function run(argument) {
         ANDROID.exporter(argument, JSON.parse(string))
         break
       }
+      /*
+      case 'ios': {
+        IOS.exporter(argument, JSON.parse(string))
+        break
+      }*/
       default: {
         console.warn('unknown output format', argument.format)
       }
@@ -86,7 +92,8 @@ function run(argument) {
       argument.format == 'pdf' ||
       argument.format == 'web' ||
       argument.format == 'ims' ||
-      argument.format == 'android'
+      argument.format == 'android' ||
+      argument.format == 'ios'
         ? 'fulljson'
         : argument.format
 
@@ -181,6 +188,7 @@ function help() {
   console.log(
     '--android-splashDuration   Duration for splash-screen default 0 milliseconds'
   )
+  console.log('--android-preview          Open course in Android-Studio')
 
   console.log('\nPDF settings:\n')
   console.log(
@@ -300,6 +308,7 @@ function parseArguments() {
     'android-icon': argv['android-icon'],
     'android-splash': argv['android-splash'],
     'android-splashDuration': argv['android-splashDuration'],
+    'android-preview': argv['android-preview'],
   }
 
   argument.format = argument.format.toLowerCase()