@nxtedition/lib 14.0.14 → 14.0.16

package/ass.js

@@ -2,35 +2,23 @@ const fp = require('lodash/fp')
 
 module.exports = { encodeASS }
 
-function encodeASS(events, { styles = {}, ...options } = {}) {
-  return [
-    encASSHeader(options),
-    encASSStyles(styles),
-    encASSEvents(
-      events.map((event) => {
-        // NOTE: :subtitle uses `end`, :event uses `duration`
-        if (event.end == null) {
-          return { ...event, end: event.duration != null ? event.start + event.duration : null }
-        }
-        return event
-      })
-    ),
-  ].join('\n')
+function encodeASS(events, { styles = {}, width = 1920, height = 1080 } = {}) {
+  return [encASSHeader({ width, height }), encASSStyles(styles), encASSEvents(events)].join('\n')
 }
 
-const formatDialogues = fp.pipe(
-  fp.filter(fp.conformsTo({ start: fp.isFinite })),
-  fp.sortBy('start'),
-  fp.reduce((s, event) => {
-    const { start, end, text, style } = event
-    return (
-      s +
-      `Dialogue: 0,${formatASSTime(start) || '0:00:00.00'},${formatASSTime(end) || '9:59:59.00'},${
-        style || 'nxt-default'
-      },,0000,0000,0000,,${(text || '').replace(/\\n|\n/, '\\N')}\n`
-    )
-  }, '')
-)
+function formatDialogues(events) {
+  let s = ''
+  for (const { start, duration, end = duration != null ? start + duration : null, text, style } of [
+    ...events,
+  ].sort((a, b) => a.start - b.start)) {
+    if (typeof text === 'string' && text.length > 0 && Number.isFinite(start)) {
+      s += `Dialogue: 0,${formatASSTime(start) || '0:00:00.00'},${
+        formatASSTime(end) || '9:59:59.00'
+      },${style || 'nxt-default'},,0000,0000,0000,,${(text || '').replace(/\\n|\n/, '\\N')}\n`
+    }
+  }
+  return s
+}
 
 function encASSEvents(events) {
   return `[Events]
@@ -100,7 +88,7 @@ Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour,
 ${formatStyles(styles)}`
 }
 
-function encASSHeader({ width, height } = {}) {
+function encASSHeader({ width, height }) {
   // WrapStyle
   // 0: smart wrapping, lines are evenly broken
   // 1: end-of-line word wrapping, only \N breaks
@@ -114,19 +102,26 @@ WrapStyle: 1
 `
 }
 
-function pad0(rep, x) {
-  return String(x || 0).padStart(rep, '0')
-}
-
 function formatASSTime(seconds) {
   if (seconds == null) {
     return ''
   }
-  const h = Math.floor(seconds / 3.6e3)
-  seconds -= h * 3.6e3
+
+  const h = Math.floor(seconds / 3600)
+  seconds -= h * 3600
   const m = Math.floor(seconds / 60)
   seconds -= m * 60
   const s = Math.floor(seconds)
   const cs = Math.floor((seconds - s) * 100)
-  return `${pad0(1, h)}:${pad0(2, m)}:${pad0(2, s)}.${pad0(2, cs)}`
+
+  return (
+    h +
+    ':' +
+    (m === 0 ? '00' : m < 10 ? '0' + m : m) +
+    ':' +
+    (s === 0 ? '00' : s < 10 ? '0' + s : s) +
+    ':' +
+    (cs === 0 ? '00' : cs < 10 ? '0' + cs : cs) +
+    ':'
+  )
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "14.0.14",
+  "version": "14.0.16",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [

package/util/template/index.js

@@ -158,19 +158,28 @@ module.exports = ({ ds, proxify }) => {
 
     const { pre, type, body, post } = match
 
-    const compileExpression = compilers[type]
-    if (!compileExpression) {
-      throw new Error('unknown expression type: ' + type)
-    }
+    if (type === 'js') {
+      const expr = compilers.js(body)
 
-    const expr = compileExpression(body)
+      if (!pre && !post) {
+        return (str, args$) => expr(args$)
+      }
 
-    if (!pre && !post) {
-      return (str, args$) => expr(args$)
-    }
+      return (str, args$) => expr(args$).pipe(rx.map((body) => `${pre}${stringify(body)}${post}`))
+    } else if (type === 'nxt') {
+      const expr = compilers.nxt(body)
 
-    return (str, args$) =>
-      expr(args$).pipe(rx.map((body) => `${pre}${stringify(body, type !== 'js')}${post}`))
+      if (!pre && !post) {
+        return (str, args$) => expr(args$)
+      }
+
+      return (str, args$) =>
+        expr(args$).pipe(
+          rx.switchMap((body) => onResolveTemplate(`${pre}${stringify(body, true)}${post}`, args$))
+        )
+    } else {
+      throw new Error('unknown expression type: ' + type)
+    }
   }
 
   function stringify(value, escape) {