diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lang/js-lang/builtin/builtin.ts | 14 | ||||
| -rw-r--r-- | src/lang/ts-lang/util/string.ts | 5 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/lang/js-lang/builtin/builtin.ts b/src/lang/js-lang/builtin/builtin.ts index bc40794..a984ca8 100644 --- a/src/lang/js-lang/builtin/builtin.ts +++ b/src/lang/js-lang/builtin/builtin.ts @@ -2,9 +2,17 @@ type BUILTIN = (args: any[]) => any; export const V_BUILTIN_Arr: BUILTIN = (args) => args; -// FIXME actually implement this properly -export const V_BUILTIN_ToString: BUILTIN = (args) => - args.length === 1 ? JSON.stringify(args[0]) : JSON.stringify(args); +const toStringInner = (o: any): string => { + if (Array.isArray(o)) { + return `[${o.map(toStringInner).join(", ")}]`; + } + + return o.toString(); +}; + +export const V_BUILTIN_ToString: BUILTIN = (args) => { + return args.length === 1 ? toStringInner(args[0]) : toStringInner(args); +}; export const V_BUILTIN_Add: BUILTIN = (args) => { if (args.every((arg) => ["string", "number"].includes(typeof arg))) { diff --git a/src/lang/ts-lang/util/string.ts b/src/lang/ts-lang/util/string.ts index 5772f40..ae17c2c 100644 --- a/src/lang/ts-lang/util/string.ts +++ b/src/lang/ts-lang/util/string.ts @@ -5,7 +5,10 @@ export type AddStrings< ? AddStrings<Tail, `${Carry}${Head}`> : Carry; -export type ToString<T, Carry extends string = ""> = T extends string | number +export type ToString<T, Carry extends string = ""> = T extends + | string + | number + | boolean ? `${T}` : T extends readonly any[] ? T extends readonly [infer Head, ...infer Tail] |