Update import syntax for printj to work with es modules

pull/9/head
Jonathan Staab 2 years ago
parent f083952b9f
commit 283734b5ff

@ -1,4 +1,4 @@
import printj from 'printj' import { sprintf } from 'printj'
import { Table } from '../Table' import { Table } from '../Table'
import { LuaError } from '../LuaError' import { LuaError } from '../LuaError'
import { tostring, posrelat, coerceArgToNumber, coerceArgToString, hasOwnProperty, LuaType } from '../utils' import { tostring, posrelat, coerceArgToNumber, coerceArgToString, hasOwnProperty, LuaType } from '../utils'
@ -165,19 +165,19 @@ function format(formatstring: string, ...args: LuaType[]): string {
throw new LuaError(`bad argument #${i} to 'format' (no value)`) throw new LuaError(`bad argument #${i} to 'format' (no value)`)
} }
if (/A|a|E|e|f|G|g/.test(modifier)) { if (/A|a|E|e|f|G|g/.test(modifier)) {
return printj.sprintf(format, coerceArgToNumber(arg, 'format', i)) return sprintf(format, coerceArgToNumber(arg, 'format', i))
} }
if (/c|d|i|o|u|X|x/.test(modifier)) { if (/c|d|i|o|u|X|x/.test(modifier)) {
return printj.sprintf(format, coerceArgToNumber(arg, 'format', i)) return sprintf(format, coerceArgToNumber(arg, 'format', i))
} }
if (modifier === 'q') { if (modifier === 'q') {
return `"${(arg as string).replace(/([\n"])/g, '\\$1')}"` return `"${(arg as string).replace(/([\n"])/g, '\\$1')}"`
} }
if (modifier === 's') { if (modifier === 's') {
return printj.sprintf(format, tostring(arg)) return sprintf(format, tostring(arg))
} }
return printj.sprintf(format, arg) return sprintf(format, arg)
}) })
} }

Loading…
Cancel
Save