@thoughtspot/visual-embed-sdk 1.49.2 → 1.49.3

package/dist/tsembed-react.js

@@ -1,4 +1,4 @@
-/* @thoughtspot/visual-embed-sdk version 1.49.2 */
+/* @thoughtspot/visual-embed-sdk version 1.49.3 */
 'use client';
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react')) :
@@ -163,28 +163,45 @@
 	    }
 	    return false;
 	};
-	const merge = (...objects) => objects.reduce((result, current) => {
+	const UNSAFE_KEYS = new Set([
+	    "__proto__",
+	    "constructor",
+	    "prototype",
+	    "toString",
+	    "valueOf",
+	    "hasOwnProperty",
+	    "isPrototypeOf",
+	    "propertyIsEnumerable",
+	    "toLocaleString",
+	]);
+	const merge$1 = (...objects) => objects.reduce((result, current) => {
+	    if (current === undefined) {
+	        return result;
+	    }
 	    if (Array.isArray(current)) {
 	        throw new TypeError("Arguments provided to ts-deepmerge must be objects, not arrays.");
 	    }
 	    Object.keys(current).forEach((key) => {
-	        if (["__proto__", "constructor", "prototype"].includes(key)) {
+	        if (UNSAFE_KEYS.has(key)) {
 	            return;
 	        }
 	        if (Array.isArray(result[key]) && Array.isArray(current[key])) {
-	            result[key] = merge.options.mergeArrays
-	                ? merge.options.uniqueArrayItems
+	            result[key] = merge$1.options.mergeArrays
+	                ? merge$1.options.uniqueArrayItems
 	                    ? Array.from(new Set(result[key].concat(current[key])))
 	                    : [...result[key], ...current[key]]
 	                : current[key];
 	        }
 	        else if (isObject$1(result[key]) && isObject$1(current[key])) {
-	            result[key] = merge(result[key], current[key]);
+	            result[key] = merge$1(result[key], current[key]);
+	        }
+	        else if (!isObject$1(result[key]) && isObject$1(current[key])) {
+	            result[key] = merge$1(current[key], undefined);
 	        }
 	        else {
 	            result[key] =
 	                current[key] === undefined
-	                    ? merge.options.allowUndefinedOverrides
+	                    ? merge$1.options.allowUndefinedOverrides
 	                        ? current[key]
 	                        : result[key]
 	                    : current[key];
@@ -197,11 +214,11 @@
 	    mergeArrays: true,
 	    uniqueArrayItems: true,
 	};
-	merge.options = defaultOptions;
-	merge.withOptions = (options, ...objects) => {
-	    merge.options = Object.assign(Object.assign({}, defaultOptions), options);
-	    const result = merge(...objects);
-	    merge.options = defaultOptions;
+	merge$1.options = defaultOptions;
+	merge$1.withOptions = (options, ...objects) => {
+	    merge$1.options = Object.assign(Object.assign({}, defaultOptions), options);
+	    const result = merge$1(...objects);
+	    merge$1.options = defaultOptions;
 	    return result;
 	};
 
@@ -6645,7 +6662,7 @@
 	    TableContentDensity["Compact"] = "COMPACT";
 	})(TableContentDensity || (TableContentDensity = {}));
 
-	var version$1="1.49.2";var pkg = {version:version$1};
+	var version$1="1.49.3";var pkg = {version:version$1};
 
 	const { version } = pkg;
 
@@ -7013,7 +7030,7 @@
 	    }
 	    return null;
 	}
-	const deepMerge = (target, source) => merge(target, source);
+	const deepMerge = (target, source) => merge$1(target, source);
 	const getOperationNameFromQuery = (query) => {
 	    const regex = /(?:query|mutation)\s+(\w+)/;
 	    const matches = query.match(regex);
@@ -25061,8 +25078,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    return {
 	        onAnchor: (source) => {
 	            aliasObjects.push(source);
-	            if (!prevAnchors)
-	                prevAnchors = anchorNames(doc);
+	            prevAnchors ?? (prevAnchors = anchorNames(doc));
 	            const anchor = findNewAnchor(prefix, prevAnchors);
 	            prevAnchors.add(anchor);
 	            return anchor;
@@ -25226,23 +25242,38 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	     * Resolve the value of this alias within `doc`, finding the last
 	     * instance of the `source` anchor before this node.
 	     */
-	    resolve(doc) {
+	    resolve(doc, ctx) {
+	        if (ctx?.maxAliasCount === 0)
+	            throw new ReferenceError('Alias resolution is disabled');
+	        let nodes;
+	        if (ctx?.aliasResolveCache) {
+	            nodes = ctx.aliasResolveCache;
+	        }
+	        else {
+	            nodes = [];
+	            visit$1(doc, {
+	                Node: (_key, node) => {
+	                    if (isAlias(node) || hasAnchor(node))
+	                        nodes.push(node);
+	                }
+	            });
+	            if (ctx)
+	                ctx.aliasResolveCache = nodes;
+	        }
 	        let found = undefined;
-	        visit$1(doc, {
-	            Node: (_key, node) => {
-	                if (node === this)
-	                    return visit$1.BREAK;
-	                if (node.anchor === this.source)
-	                    found = node;
-	            }
-	        });
+	        for (const node of nodes) {
+	            if (node === this)
+	                break;
+	            if (node.anchor === this.source)
+	                found = node;
+	        }
 	        return found;
 	    }
 	    toJSON(_arg, ctx) {
 	        if (!ctx)
 	            return { source: this.source };
 	        const { anchors, doc, maxAliasCount } = ctx;
-	        const source = this.resolve(doc);
+	        const source = this.resolve(doc, ctx);
 	        if (!source) {
 	            const msg = `Unresolved alias (the anchor must be set before the alias): ${this.source}`;
 	            throw new ReferenceError(msg);
@@ -25254,7 +25285,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	            data = anchors.get(source);
 	        }
 	        /* istanbul ignore if */
-	        if (!data || data.res === undefined) {
+	        if (data?.res === undefined) {
 	            const msg = 'This should not happen: Alias anchor was not resolved?';
 	            throw new ReferenceError(msg);
 	        }
@@ -25361,8 +25392,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    if (aliasDuplicateObjects && value && typeof value === 'object') {
 	        ref = sourceObjects.get(value);
 	        if (ref) {
-	            if (!ref.anchor)
-	                ref.anchor = onAnchor(value);
+	            ref.anchor ?? (ref.anchor = onAnchor(value));
 	            return new Alias(ref.anchor);
 	        }
 	        else {
@@ -25873,7 +25903,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    const { blockQuote, commentString, lineWidth } = ctx.options;
 	    // 1. Block can't end in whitespace unless the last line is non-empty.
 	    // 2. Strings consisting of only whitespace are best rendered explicitly.
-	    if (!blockQuote || /\n[\t ]+$/.test(value) || /^\s*$/.test(value)) {
+	    if (!blockQuote || /\n[\t ]+$/.test(value)) {
 	        return quotedString(value, ctx);
 	    }
 	    const indent = ctx.indent ||
@@ -25933,23 +25963,32 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	        start = start.replace(/\n+/g, `$&${indent}`);
 	    }
 	    const indentSize = indent ? '2' : '1'; // root is at -1
-	    let header = (literal ? '|' : '>') + (startWithSpace ? indentSize : '') + chomp;
+	    // Leading | or > is added later
+	    let header = (startWithSpace ? indentSize : '') + chomp;
 	    if (comment) {
 	        header += ' ' + commentString(comment.replace(/ ?[\r\n]+/g, ' '));
 	        if (onComment)
 	            onComment();
 	    }
-	    if (literal) {
-	        value = value.replace(/\n+/g, `$&${indent}`);
-	        return `${header}\n${indent}${start}${value}${end}`;
+	    if (!literal) {
+	        const foldedValue = value
+	            .replace(/\n+/g, '\n$&')
+	            .replace(/(?:^|\n)([\t ].*)(?:([\n\t ]*)\n(?![\n\t ]))?/g, '$1$2') // more-indented lines aren't folded
+	            //                ^ more-ind. ^ empty     ^ capture next empty lines only at end of indent
+	            .replace(/\n+/g, `$&${indent}`);
+	        let literalFallback = false;
+	        const foldOptions = getFoldOptions(ctx, true);
+	        if (blockQuote !== 'folded' && type !== Scalar.BLOCK_FOLDED) {
+	            foldOptions.onOverflow = () => {
+	                literalFallback = true;
+	            };
+	        }
+	        const body = foldFlowLines(`${start}${foldedValue}${end}`, indent, FOLD_BLOCK, foldOptions);
+	        if (!literalFallback)
+	            return `>${header}\n${indent}${body}`;
 	    }
-	    value = value
-	        .replace(/\n+/g, '\n$&')
-	        .replace(/(?:^|\n)([\t ].*)(?:([\n\t ]*)\n(?![\n\t ]))?/g, '$1$2') // more-indented lines aren't folded
-	        //                ^ more-ind. ^ empty     ^ capture next empty lines only at end of indent
-	        .replace(/\n+/g, `$&${indent}`);
-	    const body = foldFlowLines(`${start}${value}${end}`, indent, FOLD_BLOCK, getFoldOptions(ctx, true));
-	    return `${header}\n${indent}${body}`;
+	    value = value.replace(/\n+/g, `$&${indent}`);
+	    return `|${header}\n${indent}${start}${value}${end}`;
 	}
 	function plainString(item, ctx, onComment, onChompKeep) {
 	    const { type, value } = item;
@@ -25958,10 +25997,9 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	        (inFlow && /[[\]{},]/.test(value))) {
 	        return quotedString(value, ctx);
 	    }
-	    if (!value ||
-	        /^[\n\t ,[\]{}#&*!|>'"%@`]|^[?-]$|^[?-][ \t]|[\n:][ \t]|[ \t]\n|[\n\t ]#|[\n\t :]$/.test(value)) {
+	    if (/^[\n\t ,[\]{}#&*!|>'"%@`]|^[?-]$|^[?-][ \t]|[\n:][ \t]|[ \t]\n|[\n\t ]#|[\n\t :]$/.test(value)) {
 	        // not allowed:
-	        // - empty string, '-' or '?'
+	        // - '-' or '?'
 	        // - start with an indicator character (except [?:-]) or /[?-] /
 	        // - '\n ', ': ' or ' \n' anywhere
 	        // - '#' not preceded by a non-space char
@@ -26056,6 +26094,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	        nullStr: 'null',
 	        simpleKeys: false,
 	        singleQuote: null,
+	        trailingComma: false,
 	        trueStr: 'true',
 	        verifyAliasOrder: true
 	    }, doc.schema.toStringOptions, options);
@@ -26090,7 +26129,12 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    let obj;
 	    if (isScalar$1(item)) {
 	        obj = item.value;
-	        const match = tags.filter(t => t.identify?.(obj));
+	        let match = tags.filter(t => t.identify?.(obj));
+	        if (match.length > 1) {
+	            const testMatch = match.filter(t => t.test);
+	            if (testMatch.length > 0)
+	                match = testMatch;
+	        }
 	        tagObj =
 	            match.find(t => t.format === item.format) ?? match.find(t => !t.format);
 	    }
@@ -26099,7 +26143,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	        tagObj = tags.find(t => t.nodeClass && obj instanceof t.nodeClass);
 	    }
 	    if (!tagObj) {
-	        const name = obj?.constructor?.name ?? typeof obj;
+	        const name = obj?.constructor?.name ?? (obj === null ? 'null' : typeof obj);
 	        throw new Error(`Tag not resolved for ${name} value`);
 	    }
 	    return tagObj;
@@ -26114,7 +26158,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	        anchors.add(anchor);
 	        props.push(`&${anchor}`);
 	    }
-	    const tag = node.tag ? node.tag : tagObj.default ? null : tagObj.tag;
+	    const tag = node.tag ?? (tagObj.default ? null : tagObj.tag);
 	    if (tag)
 	        props.push(doc.directives.tagString(tag));
 	    return props.join(' ');
@@ -26140,8 +26184,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    const node = isNode(item)
 	        ? item
 	        : ctx.doc.createNode(item, { onTagObj: o => (tagObj = o) });
-	    if (!tagObj)
-	        tagObj = getTagObject(ctx.doc.schema.tags, node);
+	    tagObj ?? (tagObj = getTagObject(ctx.doc.schema.tags, node));
 	    const props = stringifyProps(node, tagObj, ctx);
 	    if (props.length > 0)
 	        ctx.indentAtStart = (ctx.indentAtStart ?? 0) + props.length + 1;
@@ -26255,7 +26298,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	            ws += `\n${indentComment(cs, ctx.indent)}`;
 	        }
 	        if (valueStr === '' && !ctx.inFlow) {
-	            if (ws === '\n')
+	            if (ws === '\n' && valueComment)
 	                ws = '\n\n';
 	        }
 	        else {
@@ -26303,54 +26346,10 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 
 	function warn(logLevel, warning) {
 	    if (logLevel === 'debug' || logLevel === 'warn') {
-	        if (typeof process !== 'undefined' && process.emitWarning)
-	            process.emitWarning(warning);
-	        else
-	            console.warn(warning);
+	        console.warn(warning);
 	    }
 	}
 
-	const MERGE_KEY = '<<';
-	function addPairToJSMap(ctx, map, { key, value }) {
-	    if (ctx?.doc.schema.merge && isMergeKey(key)) {
-	        value = isAlias(value) ? value.resolve(ctx.doc) : value;
-	        if (isSeq(value))
-	            for (const it of value.items)
-	                mergeToJSMap(ctx, map, it);
-	        else if (Array.isArray(value))
-	            for (const it of value)
-	                mergeToJSMap(ctx, map, it);
-	        else
-	            mergeToJSMap(ctx, map, value);
-	    }
-	    else {
-	        const jsKey = toJS(key, '', ctx);
-	        if (map instanceof Map) {
-	            map.set(jsKey, toJS(value, jsKey, ctx));
-	        }
-	        else if (map instanceof Set) {
-	            map.add(jsKey);
-	        }
-	        else {
-	            const stringKey = stringifyKey(key, jsKey, ctx);
-	            const jsValue = toJS(value, stringKey, ctx);
-	            if (stringKey in map)
-	                Object.defineProperty(map, stringKey, {
-	                    value: jsValue,
-	                    writable: true,
-	                    enumerable: true,
-	                    configurable: true
-	                });
-	            else
-	                map[stringKey] = jsValue;
-	        }
-	    }
-	    return map;
-	}
-	const isMergeKey = (key) => key === MERGE_KEY ||
-	    (isScalar$1(key) &&
-	        key.value === MERGE_KEY &&
-	        (!key.type || key.type === Scalar.PLAIN));
 	// If the value associated with a merge key is a single mapping node, each of
 	// its key/value pairs is inserted into the current mapping, unless the key
 	// already exists in it. If the value associated with the merge key is a
@@ -26358,8 +26357,36 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	// of these nodes is merged in turn according to its order in the sequence.
 	// Keys in mapping nodes earlier in the sequence override keys specified in
 	// later mapping nodes. -- http://yaml.org/type/merge.html
-	function mergeToJSMap(ctx, map, value) {
-	    const source = ctx && isAlias(value) ? value.resolve(ctx.doc) : value;
+	const MERGE_KEY = '<<';
+	const merge = {
+	    identify: value => value === MERGE_KEY ||
+	        (typeof value === 'symbol' && value.description === MERGE_KEY),
+	    default: 'key',
+	    tag: 'tag:yaml.org,2002:merge',
+	    test: /^<<$/,
+	    resolve: () => Object.assign(new Scalar(Symbol(MERGE_KEY)), {
+	        addToJSMap: addMergeToJSMap
+	    }),
+	    stringify: () => MERGE_KEY
+	};
+	const isMergeKey = (ctx, key) => (merge.identify(key) ||
+	    (isScalar$1(key) &&
+	        (!key.type || key.type === Scalar.PLAIN) &&
+	        merge.identify(key.value))) &&
+	    ctx?.doc.schema.tags.some(tag => tag.tag === merge.tag && tag.default);
+	function addMergeToJSMap(ctx, map, value) {
+	    const source = resolveAliasValue(ctx, value);
+	    if (isSeq(source))
+	        for (const it of source.items)
+	            mergeValue(ctx, map, it);
+	    else if (Array.isArray(source))
+	        for (const it of source)
+	            mergeValue(ctx, map, it);
+	    else
+	        mergeValue(ctx, map, source);
+	}
+	function mergeValue(ctx, map, value) {
+	    const source = resolveAliasValue(ctx, value);
 	    if (!isMap(source))
 	        throw new Error('Merge sources must be maps or map aliases');
 	    const srcMap = source.toJSON(null, ctx, Map);
@@ -26382,9 +26409,44 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    }
 	    return map;
 	}
+	function resolveAliasValue(ctx, value) {
+	    return ctx && isAlias(value) ? value.resolve(ctx.doc, ctx) : value;
+	}
+
+	function addPairToJSMap(ctx, map, { key, value }) {
+	    if (isNode(key) && key.addToJSMap)
+	        key.addToJSMap(ctx, map, value);
+	    // TODO: Should drop this special case for bare << handling
+	    else if (isMergeKey(ctx, key))
+	        addMergeToJSMap(ctx, map, value);
+	    else {
+	        const jsKey = toJS(key, '', ctx);
+	        if (map instanceof Map) {
+	            map.set(jsKey, toJS(value, jsKey, ctx));
+	        }
+	        else if (map instanceof Set) {
+	            map.add(jsKey);
+	        }
+	        else {
+	            const stringKey = stringifyKey(key, jsKey, ctx);
+	            const jsValue = toJS(value, stringKey, ctx);
+	            if (stringKey in map)
+	                Object.defineProperty(map, stringKey, {
+	                    value: jsValue,
+	                    writable: true,
+	                    enumerable: true,
+	                    configurable: true
+	                });
+	            else
+	                map[stringKey] = jsValue;
+	        }
+	    }
+	    return map;
+	}
 	function stringifyKey(key, jsKey, ctx) {
 	    if (jsKey === null)
 	        return '';
+	    // eslint-disable-next-line @typescript-eslint/no-base-to-string
 	    if (typeof jsKey !== 'object')
 	        return String(jsKey);
 	    if (isNode(key) && ctx?.doc) {
@@ -26537,12 +26599,22 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	        if (comment)
 	            reqNewline = true;
 	        let str = stringify$2(item, itemCtx, () => (comment = null));
-	        if (i < items.length - 1)
+	        reqNewline || (reqNewline = lines.length > linesAtValue || str.includes('\n'));
+	        if (i < items.length - 1) {
 	            str += ',';
+	        }
+	        else if (ctx.options.trailingComma) {
+	            if (ctx.options.lineWidth > 0) {
+	                reqNewline || (reqNewline = lines.reduce((sum, line) => sum + line.length + 2, 2) +
+	                    (str.length + 2) >
+	                    ctx.options.lineWidth);
+	            }
+	            if (reqNewline) {
+	                str += ',';
+	            }
+	        }
 	        if (comment)
 	            str += lineComment(str, itemIndent, commentString(comment));
-	        if (!reqNewline && (lines.length > linesAtValue || str.includes('\n')))
-	            reqNewline = true;
 	        lines.push(str);
 	        linesAtValue = lines.length;
 	    }
@@ -26887,11 +26959,12 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    const num = typeof value === 'number' ? value : Number(value);
 	    if (!isFinite(num))
 	        return isNaN(num) ? '.nan' : num < 0 ? '-.inf' : '.inf';
-	    let n = JSON.stringify(value);
+	    let n = Object.is(value, -0) ? '-0' : JSON.stringify(value);
 	    if (!format &&
 	        minFractionDigits &&
 	        (!tag || tag === 'tag:yaml.org,2002:float') &&
-	        /^\d/.test(n)) {
+	        /^-?\d/.test(n) &&
+	        !n.includes('e')) {
 	        let i = n.indexOf('.');
 	        if (i < 0) {
 	            i = n.length;
@@ -27017,7 +27090,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	        identify: value => typeof value === 'boolean',
 	        default: true,
 	        tag: 'tag:yaml.org,2002:bool',
-	        test: /^true|false$/,
+	        test: /^true$|^false$/,
 	        resolve: str => str === 'true',
 	        stringify: stringifyJSON
 	    },
@@ -27062,10 +27135,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	     *   document.querySelector('#photo').src = URL.createObjectURL(blob)
 	     */
 	    resolve(src, onError) {
-	        if (typeof Buffer === 'function') {
-	            return Buffer.from(src, 'base64');
-	        }
-	        else if (typeof atob === 'function') {
+	        if (typeof atob === 'function') {
 	            // On IE 11, atob() can't handle newlines
 	            const str = atob(src.replace(/[\n\r]/g, ''));
 	            const buffer = new Uint8Array(str.length);
@@ -27079,15 +27149,11 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	        }
 	    },
 	    stringify({ comment, type, value }, ctx, onComment, onChompKeep) {
+	        if (!value)
+	            return '';
 	        const buf = value; // checked earlier by binary.identify()
 	        let str;
-	        if (typeof Buffer === 'function') {
-	            str =
-	                buf instanceof Buffer
-	                    ? buf.toString('base64')
-	                    : Buffer.from(buf.buffer).toString('base64');
-	        }
-	        else if (typeof btoa === 'function') {
+	        if (typeof btoa === 'function') {
 	            let s = '';
 	            for (let i = 0; i < buf.length; ++i)
 	                s += String.fromCharCode(buf[i]);
@@ -27096,8 +27162,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	        else {
 	            throw new Error('This environment does not support writing binary tags; either Buffer or btoa is required');
 	        }
-	        if (!type)
-	            type = Scalar.BLOCK_LITERAL;
+	        type ?? (type = Scalar.BLOCK_LITERAL);
 	        if (type !== Scalar.QUOTE_DOUBLE) {
 	            const lineWidth = Math.max(ctx.options.lineWidth - ctx.indent.length, ctx.options.minContentWidth);
 	            const n = Math.ceil(str.length / lineWidth);
@@ -27566,7 +27631,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	        }
 	        return new Date(date);
 	    },
-	    stringify: ({ value }) => value.toISOString().replace(/((T00:00)?:00)?\.000Z$/, '')
+	    stringify: ({ value }) => value?.toISOString().replace(/(T00:00:00)?\.000Z$/, '') ?? ''
 	};
 
 	const schema = [
@@ -27584,6 +27649,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    floatExp,
 	    float,
 	    binary,
+	    merge,
 	    omap,
 	    pairs,
 	    set,
@@ -27611,6 +27677,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    intOct: intOct$1,
 	    intTime,
 	    map,
+	    merge,
 	    null: nullTag,
 	    omap,
 	    pairs,
@@ -27620,13 +27687,20 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	};
 	const coreKnownTags = {
 	    'tag:yaml.org,2002:binary': binary,
+	    'tag:yaml.org,2002:merge': merge,
 	    'tag:yaml.org,2002:omap': omap,
 	    'tag:yaml.org,2002:pairs': pairs,
 	    'tag:yaml.org,2002:set': set,
 	    'tag:yaml.org,2002:timestamp': timestamp
 	};
-	function getTags(customTags, schemaName) {
-	    let tags = schemas.get(schemaName);
+	function getTags(customTags, schemaName, addMergeTag) {
+	    const schemaTags = schemas.get(schemaName);
+	    if (schemaTags && !customTags) {
+	        return addMergeTag && !schemaTags.includes(merge)
+	            ? schemaTags.concat(merge)
+	            : schemaTags.slice();
+	    }
+	    let tags = schemaTags;
 	    if (!tags) {
 	        if (Array.isArray(customTags))
 	            tags = [];
@@ -27645,17 +27719,21 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    else if (typeof customTags === 'function') {
 	        tags = customTags(tags.slice());
 	    }
-	    return tags.map(tag => {
-	        if (typeof tag !== 'string')
-	            return tag;
-	        const tagObj = tagsByName[tag];
-	        if (tagObj)
-	            return tagObj;
-	        const keys = Object.keys(tagsByName)
-	            .map(key => JSON.stringify(key))
-	            .join(', ');
-	        throw new Error(`Unknown custom tag "${tag}"; use one of ${keys}`);
-	    });
+	    if (addMergeTag)
+	        tags = tags.concat(merge);
+	    return tags.reduce((tags, tag) => {
+	        const tagObj = typeof tag === 'string' ? tagsByName[tag] : tag;
+	        if (!tagObj) {
+	            const tagName = JSON.stringify(tag);
+	            const keys = Object.keys(tagsByName)
+	                .map(key => JSON.stringify(key))
+	                .join(', ');
+	            throw new Error(`Unknown custom tag ${tagName}; use one of ${keys}`);
+	        }
+	        if (!tags.includes(tagObj))
+	            tags.push(tagObj);
+	        return tags;
+	    }, []);
 	}
 
 	const sortMapEntriesByKey = (a, b) => a.key < b.key ? -1 : a.key > b.key ? 1 : 0;
@@ -27666,10 +27744,9 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	            : compat
 	                ? getTags(null, compat)
 	                : null;
-	        this.merge = !!merge;
 	        this.name = (typeof schema === 'string' && schema) || 'core';
 	        this.knownTags = resolveKnownTags ? coreKnownTags : {};
-	        this.tags = getTags(customTags, this.name);
+	        this.tags = getTags(customTags, this.name, merge);
 	        this.toStringOptions = toStringDefaults ?? null;
 	        Object.defineProperty(this, MAP, { value: map });
 	        Object.defineProperty(this, SCALAR$1, { value: string });
@@ -27794,6 +27871,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	            logLevel: 'warn',
 	            prettyErrors: true,
 	            strict: true,
+	            stringKeys: false,
 	            uniqueKeys: true,
 	            version: '1.2'
 	        }, options);
@@ -28017,7 +28095,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	                    this.directives.yaml.version = '1.1';
 	                else
 	                    this.directives = new Directives({ version: '1.1' });
-	                opt = { merge: true, resolveKnownTags: false, schema: 'yaml-1.1' };
+	                opt = { resolveKnownTags: false, schema: 'yaml-1.1' };
 	                break;
 	            case '1.2':
 	            case 'next':
@@ -28025,7 +28103,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	                    this.directives.yaml.version = version;
 	                else
 	                    this.directives = new Directives({ version });
-	                opt = { merge: false, resolveKnownTags: true, schema: 'core' };
+	                opt = { resolveKnownTags: true, schema: 'core' };
 	                break;
 	            case null:
 	                if (this.directives)
@@ -28138,7 +28216,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    if (/[^ ]/.test(lineStr)) {
 	        let count = 1;
 	        const end = error.linePos[1];
-	        if (end && end.line === line && end.col > col) {
+	        if (end?.line === line && end.col > col) {
 	            count = Math.max(1, Math.min(end.col - col, 80 - ci));
 	        }
 	        const pointer = ' '.repeat(ci) + '^'.repeat(count);
@@ -28203,7 +28281,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	                if (atNewline) {
 	                    if (comment)
 	                        comment += token.source;
-	                    else
+	                    else if (!found || indicator !== 'seq-item-ind')
 	                        spaceBefore = true;
 	                }
 	                else
@@ -28220,8 +28298,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	                if (token.source.endsWith(':'))
 	                    onError(token.offset + token.source.length - 1, 'BAD_ALIAS', 'Anchor ending in : is ambiguous', true);
 	                anchor = token;
-	                if (start === null)
-	                    start = token.offset;
+	                start ?? (start = token.offset);
 	                atNewline = false;
 	                hasSpace = false;
 	                reqSpace = true;
@@ -28230,8 +28307,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	                if (tag)
 	                    onError(token, 'MULTIPLE_TAGS', 'A node can have at most one tag');
 	                tag = token;
-	                if (start === null)
-	                    start = token.offset;
+	                start ?? (start = token.offset);
 	                atNewline = false;
 	                hasSpace = false;
 	                reqSpace = true;
@@ -28344,11 +28420,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	        return false;
 	    const isEqual = typeof uniqueKeys === 'function'
 	        ? uniqueKeys
-	        : (a, b) => a === b ||
-	            (isScalar$1(a) &&
-	                isScalar$1(b) &&
-	                a.value === b.value &&
-	                !(a.value === '<<' && ctx.schema.merge));
+	        : (a, b) => a === b || (isScalar$1(a) && isScalar$1(b) && a.value === b.value);
 	    return items.some(pair => isEqual(pair.key, search));
 	}
 
@@ -28397,12 +28469,14 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	            onError(offset, 'BAD_INDENT', startColMsg);
 	        }
 	        // key value
+	        ctx.atKey = true;
 	        const keyStart = keyProps.end;
 	        const keyNode = key
 	            ? composeNode(ctx, key, keyProps, onError)
 	            : composeEmptyNode(ctx, keyStart, start, null, keyProps, onError);
 	        if (ctx.schema.compat)
 	            flowIndentCheck(bm.indent, key, onError);
+	        ctx.atKey = false;
 	        if (mapIncludes(ctx, map.items, keyNode))
 	            onError(keyStart, 'DUPLICATE_KEY', 'Map keys must be unique');
 	        // value properties
@@ -28462,6 +28536,8 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    const seq = new NodeClass(ctx.schema);
 	    if (ctx.atRoot)
 	        ctx.atRoot = false;
+	    if (ctx.atKey)
+	        ctx.atKey = false;
 	    let offset = bs.offset;
 	    let commentEnd = null;
 	    for (const { start, value } of bs.items) {
@@ -28475,7 +28551,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	        });
 	        if (!props.found) {
 	            if (props.anchor || props.tag || value) {
-	                if (value && value.type === 'block-seq')
+	                if (value?.type === 'block-seq')
 	                    onError(props.end, 'BAD_INDENT', 'All sequence items must start at the same column');
 	                else
 	                    onError(offset, 'MISSING_CHAR', 'Sequence item without - indicator');
@@ -28546,6 +28622,8 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    const atRoot = ctx.atRoot;
 	    if (atRoot)
 	        ctx.atRoot = false;
+	    if (ctx.atKey)
+	        ctx.atKey = false;
 	    let offset = fc.offset + fc.start.source.length;
 	    for (let i = 0; i < fc.items.length; ++i) {
 	        const collItem = fc.items[i];
@@ -28625,12 +28703,14 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	        else {
 	            // item is a key+value pair
 	            // key value
+	            ctx.atKey = true;
 	            const keyStart = props.end;
 	            const keyNode = key
 	                ? composeNode(ctx, key, props, onError)
 	                : composeEmptyNode(ctx, keyStart, start, null, props, onError);
 	            if (isBlock(key))
 	                onError(keyNode.range, 'BLOCK_IN_FLOW', blockMsg);
+	            ctx.atKey = false;
 	            // value properties
 	            const valueProps = resolveProps(sep ?? [], {
 	                flow: fcName,
@@ -28657,7 +28737,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	                }
 	            }
 	            else if (value) {
-	                if ('source' in value && value.source && value.source[0] === ':')
+	                if ('source' in value && value.source?.[0] === ':')
 	                    onError(value, 'MISSING_CHAR', `Missing space after : in ${fcName}`);
 	                else
 	                    onError(valueProps.start, 'MISSING_CHAR', `Missing , or : between ${fcName} items`);
@@ -28701,7 +28781,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    const expectedEnd = isMap ? '}' : ']';
 	    const [ce, ...ee] = fc.end;
 	    let cePos = offset;
-	    if (ce && ce.source === expectedEnd)
+	    if (ce?.source === expectedEnd)
 	        cePos = ce.offset + ce.source.length;
 	    else {
 	        const name = fcName[0].toUpperCase() + fcName.substring(1);
@@ -28781,13 +28861,13 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    let tag = ctx.schema.tags.find(t => t.tag === tagName && t.collection === expType);
 	    if (!tag) {
 	        const kt = ctx.schema.knownTags[tagName];
-	        if (kt && kt.collection === expType) {
+	        if (kt?.collection === expType) {
 	            ctx.schema.tags.push(Object.assign({}, kt, { default: false }));
 	            tag = kt;
 	        }
 	        else {
-	            if (kt?.collection) {
-	                onError(tagToken, 'BAD_COLLECTION_TYPE', `${kt.tag} used for ${expType} collection, but expects ${kt.collection}`, true);
+	            if (kt) {
+	                onError(tagToken, 'BAD_COLLECTION_TYPE', `${kt.tag} used for ${expType} collection, but expects ${kt.collection ?? 'scalar'}`, true);
 	            }
 	            else {
 	                onError(tagToken, 'TAG_RESOLVE_FAILED', `Unresolved tag: ${tagName}`, true);
@@ -29143,7 +29223,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	                    next = source[++i + 1];
 	            }
 	            else if (next === 'x' || next === 'u' || next === 'U') {
-	                const length = { x: 2, u: 4, U: 8 }[next];
+	                const length = next === 'x' ? 2 : next === 'u' ? 4 : 8;
 	                res += parseCharCode(source, i + 1, length, onError);
 	                i += length;
 	            }
@@ -29213,12 +29293,14 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    const cc = source.substr(offset, length);
 	    const ok = cc.length === length && /^[0-9a-fA-F]+$/.test(cc);
 	    const code = ok ? parseInt(cc, 16) : NaN;
-	    if (isNaN(code)) {
+	    try {
+	        return String.fromCodePoint(code);
+	    }
+	    catch {
 	        const raw = source.substr(offset - 2, length + 2);
 	        onError(offset - 2, 'BAD_DQ_ESCAPE', `Invalid escape sequence ${raw}`);
 	        return raw;
 	    }
-	    return String.fromCodePoint(code);
 	}
 
 	function composeScalar(ctx, token, tagToken, onError) {
@@ -29228,11 +29310,16 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    const tagName = tagToken
 	        ? ctx.directives.tagName(tagToken.source, msg => onError(tagToken, 'TAG_RESOLVE_FAILED', msg))
 	        : null;
-	    const tag = tagToken && tagName
-	        ? findScalarTagByName(ctx.schema, value, tagName, tagToken, onError)
-	        : token.type === 'scalar'
-	            ? findScalarTagByTest(ctx, value, token, onError)
-	            : ctx.schema[SCALAR$1];
+	    let tag;
+	    if (ctx.options.stringKeys && ctx.atKey) {
+	        tag = ctx.schema[SCALAR$1];
+	    }
+	    else if (tagName)
+	        tag = findScalarTagByName(ctx.schema, value, tagName, tagToken, onError);
+	    else if (token.type === 'scalar')
+	        tag = findScalarTagByTest(ctx, value, token, onError);
+	    else
+	        tag = ctx.schema[SCALAR$1];
 	    let scalar;
 	    try {
 	        const res = tag.resolve(value, msg => onError(tagToken ?? token, 'TAG_RESOLVE_FAILED', msg), ctx.options);
@@ -29280,8 +29367,9 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    onError(tagToken, 'TAG_RESOLVE_FAILED', `Unresolved tag: ${tagName}`, tagName !== 'tag:yaml.org,2002:str');
 	    return schema[SCALAR$1];
 	}
-	function findScalarTagByTest({ directives, schema }, value, token, onError) {
-	    const tag = schema.tags.find(tag => tag.default && tag.test?.test(value)) || schema[SCALAR$1];
+	function findScalarTagByTest({ atKey, directives, schema }, value, token, onError) {
+	    const tag = schema.tags.find(tag => (tag.default === true || (atKey && tag.default === 'key')) &&
+	        tag.test?.test(value)) || schema[SCALAR$1];
 	    if (schema.compat) {
 	        const compat = schema.compat.find(tag => tag.default && tag.test?.test(value)) ??
 	            schema[SCALAR$1];
@@ -29297,8 +29385,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 
 	function emptyScalarPosition(offset, before, pos) {
 	    if (before) {
-	        if (pos === null)
-	            pos = before.length;
+	        pos ?? (pos = before.length);
 	        for (let i = pos - 1; i >= 0; --i) {
 	            let st = before[i];
 	            switch (st.type) {
@@ -29323,6 +29410,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 
 	const CN = { composeNode, composeEmptyNode };
 	function composeNode(ctx, token, props, onError) {
+	    const atKey = ctx.atKey;
 	    const { spaceBefore, comment, anchor, tag } = props;
 	    let node;
 	    let isSrcToken = true;
@@ -29343,21 +29431,36 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	        case 'block-map':
 	        case 'block-seq':
 	        case 'flow-collection':
-	            node = composeCollection(CN, ctx, token, props, onError);
-	            if (anchor)
-	                node.anchor = anchor.source.substring(1);
+	            try {
+	                node = composeCollection(CN, ctx, token, props, onError);
+	                if (anchor)
+	                    node.anchor = anchor.source.substring(1);
+	            }
+	            catch (error) {
+	                // Almost certainly here due to a stack overflow
+	                const message = error instanceof Error ? error.message : String(error);
+	                onError(token, 'RESOURCE_EXHAUSTION', message);
+	            }
 	            break;
 	        default: {
 	            const message = token.type === 'error'
 	                ? token.message
 	                : `Unsupported token (type: ${token.type})`;
 	            onError(token, 'UNEXPECTED_TOKEN', message);
-	            node = composeEmptyNode(ctx, token.offset, undefined, null, props, onError);
 	            isSrcToken = false;
 	        }
 	    }
+	    node ?? (node = composeEmptyNode(ctx, token.offset, undefined, null, props, onError));
 	    if (anchor && node.anchor === '')
 	        onError(anchor, 'BAD_ALIAS', 'Anchor cannot be an empty string');
+	    if (atKey &&
+	        ctx.options.stringKeys &&
+	        (!isScalar$1(node) ||
+	            typeof node.value !== 'string' ||
+	            (node.tag && node.tag !== 'tag:yaml.org,2002:str'))) {
+	        const msg = 'With stringKeys, all keys must be strings';
+	        onError(tag ?? token, 'NON_STRING_KEY', msg);
+	    }
 	    if (spaceBefore)
 	        node.spaceBefore = true;
 	    if (comment) {
@@ -29410,6 +29513,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    const opts = Object.assign({ _directives: directives }, options);
 	    const doc = new Document(undefined, opts);
 	    const ctx = {
+	        atKey: false,
 	        atRoot: true,
 	        directives: doc.directives,
 	        options: doc.options,
@@ -29531,8 +29635,10 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	            }
 	        }
 	        if (afterDoc) {
-	            Array.prototype.push.apply(doc.errors, this.errors);
-	            Array.prototype.push.apply(doc.warnings, this.warnings);
+	            for (let i = 0; i < this.errors.length; ++i)
+	                doc.errors.push(this.errors[i]);
+	            for (let i = 0; i < this.warnings.length; ++i)
+	                doc.warnings.push(this.warnings[i]);
 	        }
 	        else {
 	            doc.errors = this.errors;
@@ -30435,7 +30541,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	            const n = (yield* this.pushCount(1)) + (yield* this.pushSpaces(true));
 	            this.indentNext = this.indentValue + 1;
 	            this.indentValue += n;
-	            return yield* this.parseBlockStart();
+	            return 'block-start';
 	        }
 	        return 'doc';
 	    }
@@ -30756,32 +30862,36 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	        return 0;
 	    }
 	    *pushIndicators() {
-	        switch (this.charAt(0)) {
-	            case '!':
-	                return ((yield* this.pushTag()) +
-	                    (yield* this.pushSpaces(true)) +
-	                    (yield* this.pushIndicators()));
-	            case '&':
-	                return ((yield* this.pushUntil(isNotAnchorChar)) +
-	                    (yield* this.pushSpaces(true)) +
-	                    (yield* this.pushIndicators()));
-	            case '-': // this is an error
-	            case '?': // this is an error outside flow collections
-	            case ':': {
-	                const inFlow = this.flowLevel > 0;
-	                const ch1 = this.charAt(1);
-	                if (isEmpty(ch1) || (inFlow && flowIndicatorChars.has(ch1))) {
-	                    if (!inFlow)
-	                        this.indentNext = this.indentValue + 1;
-	                    else if (this.flowKey)
-	                        this.flowKey = false;
-	                    return ((yield* this.pushCount(1)) +
-	                        (yield* this.pushSpaces(true)) +
-	                        (yield* this.pushIndicators()));
+	        let n = 0;
+	        loop: while (true) {
+	            switch (this.charAt(0)) {
+	                case '!':
+	                    n += yield* this.pushTag();
+	                    n += yield* this.pushSpaces(true);
+	                    continue loop;
+	                case '&':
+	                    n += yield* this.pushUntil(isNotAnchorChar);
+	                    n += yield* this.pushSpaces(true);
+	                    continue loop;
+	                case '-': // this is an error
+	                case '?': // this is an error outside flow collections
+	                case ':': {
+	                    const inFlow = this.flowLevel > 0;
+	                    const ch1 = this.charAt(1);
+	                    if (isEmpty(ch1) || (inFlow && flowIndicatorChars.has(ch1))) {
+	                        if (!inFlow)
+	                            this.indentNext = this.indentValue + 1;
+	                        else if (this.flowKey)
+	                            this.flowKey = false;
+	                        n += yield* this.pushCount(1);
+	                        n += yield* this.pushSpaces(true);
+	                        continue loop;
+	                    }
 	                }
 	            }
+	            break loop;
 	        }
-	        return 0;
+	        return n;
 	    }
 	    *pushTag() {
 	        if (this.charAt(1) === '<') {
@@ -30943,6 +31053,14 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    }
 	    return prev.splice(i, prev.length);
 	}
+	function arrayPushArray(target, source) {
+	    // May exhaust call stack with large `source` array
+	    if (source.length < 1e5)
+	        Array.prototype.push.apply(target, source);
+	    else
+	        for (let i = 0; i < source.length; ++i)
+	            target.push(source[i]);
+	}
 	function fixFlowSeqItems(fc) {
 	    if (fc.start.type === 'flow-seq-start') {
 	        for (const it of fc.items) {
@@ -30955,12 +31073,12 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	                delete it.key;
 	                if (isFlowToken(it.value)) {
 	                    if (it.value.end)
-	                        Array.prototype.push.apply(it.value.end, it.sep);
+	                        arrayPushArray(it.value.end, it.sep);
 	                    else
 	                        it.value.end = it.sep;
 	                }
 	                else
-	                    Array.prototype.push.apply(it.start, it.sep);
+	                    arrayPushArray(it.start, it.sep);
 	                delete it.sep;
 	            }
 	        }
@@ -31102,7 +31220,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	    }
 	    *step() {
 	        const top = this.peek(1);
-	        if (this.type === 'doc-end' && (!top || top.type !== 'doc-end')) {
+	        if (this.type === 'doc-end' && top?.type !== 'doc-end') {
 	            while (this.stack.length > 0)
 	                yield* this.pop();
 	            this.stack.push({
@@ -31378,7 +31496,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	                        const prev = map.items[map.items.length - 2];
 	                        const end = prev?.value?.end;
 	                        if (Array.isArray(end)) {
-	                            Array.prototype.push.apply(end, it.start);
+	                            arrayPushArray(end, it.start);
 	                            end.push(this.sourceToken);
 	                            map.items.pop();
 	                            return;
@@ -31544,7 +31662,20 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	                default: {
 	                    const bv = this.startBlockValue(map);
 	                    if (bv) {
-	                        if (atMapIndent && bv.type !== 'block-seq') {
+	                        if (bv.type === 'block-seq') {
+	                            if (!it.explicitKey &&
+	                                it.sep &&
+	                                !includesToken(it.sep, 'newline')) {
+	                                yield* this.pop({
+	                                    type: 'error',
+	                                    offset: this.offset,
+	                                    message: 'Unexpected block-seq-ind on same line with key',
+	                                    source: this.source
+	                                });
+	                                return;
+	                            }
+	                        }
+	                        else if (atMapIndent) {
 	                            map.items.push({ start });
 	                        }
 	                        this.stack.push(bv);
@@ -31580,7 +31711,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	                        const prev = seq.items[seq.items.length - 2];
 	                        const end = prev?.value?.end;
 	                        if (Array.isArray(end)) {
-	                            Array.prototype.push.apply(end, it.start);
+	                            arrayPushArray(end, it.start);
 	                            end.push(this.sourceToken);
 	                            seq.items.pop();
 	                            return;
@@ -31621,7 +31752,7 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	            do {
 	                yield* this.pop();
 	                top = this.peek(1);
-	            } while (top && top.type === 'flow-collection');
+	            } while (top?.type === 'flow-collection');
 	        }
 	        else if (fc.end.length === 0) {
 	            switch (this.type) {
@@ -31915,6 +32046,8 @@ query SendMessage($params: Input_convassist_SendMessageRequest) {
 	        if (!keepUndefined)
 	            return undefined;
 	    }
+	    if (isDocument(value) && !_replacer)
+	        return value.toString(options);
 	    return new Document(value, _replacer, options).toString(options);
 	}