@thoughtspot/visual-embed-sdk 1.42.1-alpha.3 → 1.42.1-alpha.4

package/dist/tsembed.js

@@ -1,4 +1,4 @@
-/* @thoughtspot/visual-embed-sdk version 1.42.1-alpha.3 */
+/* @thoughtspot/visual-embed-sdk version 1.42.1-alpha.4 */
 'use client';
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
@@ -32,7 +32,7 @@
         }
         return false;
     };
-    const merge = (...objects) => objects.reduce((result, current) => {
+    const merge$1 = (...objects) => objects.reduce((result, current) => {
         if (Array.isArray(current)) {
             throw new TypeError("Arguments provided to ts-deepmerge must be objects, not arrays.");
         }
@@ -41,19 +41,19 @@
                 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 {
                 result[key] =
                     current[key] === undefined
-                        ? merge.options.allowUndefinedOverrides
+                        ? merge$1.options.allowUndefinedOverrides
                             ? current[key]
                             : result[key]
                         : current[key];
@@ -66,11 +66,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;
     };
 
@@ -271,7 +271,7 @@
     function getDOMNode(domSelector) {
         return typeof domSelector === 'string' ? document.querySelector(domSelector) : domSelector;
     }
-    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);
@@ -17536,7 +17536,7 @@ mutation GetUnsavedAnswerTML($session: BachSessionIdInput!, $exportDependencies:
         return eventData;
     }
 
-    var name="@thoughtspot/visual-embed-sdk";var version$1="1.42.1-alpha.3";var description="ThoughtSpot Embed SDK";var module="lib/src/index.js";var main="dist/tsembed.js";var types="lib/src/index.d.ts";var files=["dist/**","lib/**","src/**","cjs/**"];var exports$1={".":{"import":"./lib/src/index.js",require:"./cjs/src/index.js",types:"./lib/src/index.d.ts"},"./react":{"import":"./lib/src/react/all-types-export.js",require:"./cjs/src/react/all-types-export.js",types:"./lib/src/react/all-types-export.d.ts"},"./lib/src/react":{"import":"./lib/src/react/all-types-export.js",require:"./cjs/src/react/all-types-export.js",types:"./lib/src/react/all-types-export.d.ts"}};var typesVersions={"*":{react:["./lib/src/react/all-types-export.d.ts"]}};var scripts={lint:"eslint 'src/**'","lint:fix":"eslint 'src/**/*.*' --fix",tsc:"tsc -p tsconfig.build.json --incremental false; tsc -p tsconfig.build.json --incremental false --module commonjs --outDir cjs","build-and-publish":"npm run build:gatsby && npm run publish","bundle-dts-file":"dts-bundle-generator --config ./dts-config/dts-bundle-file.config.js","bundle-dts":"dts-bundle-generator --config ./dts-config/dts-bundle.config.js","bundle-dts-react":"dts-bundle-generator --config ./dts-config/dts-bundle-react.config.js","bundle-dts-react-full":"dts-bundle-generator --config ./dts-config/dts-bundle-react-full.config.js",build:"rollup -c",watch:"rollup -cw",docgen:"typedoc --tsconfig tsconfig.build.json --theme typedoc-theme --json static/typedoc/typedoc.json --disableOutputCheck","test-sdk":"jest -c jest.config.sdk.js --runInBand",test:"npm run test-sdk",posttest:"cat ./coverage/sdk/lcov.info | npx coveralls-next","is-publish-allowed":"node scripts/is-publish-allowed.js",prepublishOnly:"npm run tsc && npm run bundle-dts-file && npm run bundle-dts && npm run bundle-dts-react && npm run bundle-dts-react-full && npm run build","check-size":"npm run build && size-limit","publish-dev":"npm publish --tag dev","publish-prod":"npm publish --tag latest",dev:"vite -c vite.local.config.ts"};var peerDependencies={react:"> 16.8.0","react-dom":"> 16.8.0"};var dependencies={classnames:"^2.3.1",eventemitter3:"^4.0.7",lodash:"^4.17.21","mixpanel-browser":"2.47.0","ts-deepmerge":"^6.0.2",tslib:"^2.5.3","use-deep-compare-effect":"^1.8.1",yaml:"^2.5.1"};var devDependencies={"@mdx-js/mdx":"^1.6.22","@mdx-js/react":"^1.6.22","@react-icons/all-files":"^4.1.0","@rollup/plugin-commonjs":"^18.0.0","@rollup/plugin-json":"^4.1.0","@rollup/plugin-node-resolve":"^11.2.1","@rollup/plugin-replace":"^5.0.2","@size-limit/preset-big-lib":"^11.2.0","@testing-library/dom":"^7.31.0","@testing-library/jest-dom":"^5.14.1","@testing-library/react":"^11.2.7","@testing-library/user-event":"^13.1.8","@types/jest":"^22.2.3","@types/lodash":"^4.17.0","@types/mixpanel-browser":"^2.35.6","@types/react-test-renderer":"^17.0.1","@typescript-eslint/eslint-plugin":"^8.28.0","@typescript-eslint/parser":"^8.28.0",ajv:"^8.17.1",asciidoctor:"^2.2.1","babel-jest":"^26.6.3","babel-preset-gatsby":"^1.10.0","command-line-args":"^5.1.1","coveralls-next":"^5.0.0",crypto:"^1.0.1","current-git-branch":"^1.1.0","dts-bundle-generator":"^9.5.1",eslint:"^9.23.0","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^10.1.1","eslint-import-resolver-typescript":"^4.2.5","eslint-plugin-comment-length":"2.2.1","eslint-plugin-import":"^2.31.0","eslint-plugin-jsdoc":"^50.6.9","eslint-plugin-prettier":"^5.2.5","eslint-plugin-react":"^7.37.5","eslint-plugin-react-hooks":"^5.2.0","fs-extra":"^10.0.0","gh-pages":"6.3.0",globals:"^16.0.0","highlight.js":"^10.6.0","html-to-text":"^8.0.0","identity-obj-proxy":"^3.0.0","istanbul-merge":"^2.0.0",jest:"^26.6.3","jest-fetch-mock":"^3.0.3",jsdom:"^17.0.0",prettier:"2.1.2",react:"^16.14.0","react-dom":"^16.14.0","react-resizable":"^1.11.0","react-resize-detector":"^6.6.0","react-test-renderer":"^17.0.2","react-use-flexsearch":"^0.1.1",rollup:"4.24.0","rollup-plugin-typescript2":"0.27.3","ts-jest":"^26.5.5","ts-loader":"8.0.4",typedoc:"0.21.6","typedoc-plugin-toc-group":"thoughtspot/typedoc-plugin-toc-group",typescript:"^4.9.4","typescript-eslint":"^8.29.1","url-search-params-polyfill":"^8.1.0",util:"^0.12.4",vite:"^6.3.5"};var author="ThoughtSpot";var email="support@thoughtspot.com";var license="ThoughtSpot Development Tools End User License Agreement";var directories={lib:"lib"};var repository={type:"git",url:"git+https://github.com/thoughtspot/visual-embed-sdk.git"};var publishConfig={registry:"https://registry.npmjs.org"};var keywords=["thoughtspot","everywhere","embedded","embed","sdk","analytics"];var bugs={url:"https://github.com/thoughtspot/visual-embed-sdk/issues"};var homepage="https://github.com/thoughtspot/visual-embed-sdk#readme";var globals={window:{}};var pkgInfo = {name:name,version:version$1,description:description,module:module,main:main,types:types,files:files,exports:exports$1,typesVersions:typesVersions,"size-limit":[{path:"dist/tsembed.es.js",limit:"32 kB"}],scripts:scripts,peerDependencies:peerDependencies,dependencies:dependencies,devDependencies:devDependencies,author:author,email:email,license:license,directories:directories,repository:repository,publishConfig:publishConfig,keywords:keywords,bugs:bugs,homepage:homepage,globals:globals};
+    var name="@thoughtspot/visual-embed-sdk";var version$1="1.42.1-alpha.4";var description="ThoughtSpot Embed SDK";var module="lib/src/index.js";var main="dist/tsembed.js";var types="lib/src/index.d.ts";var files=["dist/**","lib/**","src/**","cjs/**"];var exports$1={".":{"import":"./lib/src/index.js",require:"./cjs/src/index.js",types:"./lib/src/index.d.ts"},"./react":{"import":"./lib/src/react/all-types-export.js",require:"./cjs/src/react/all-types-export.js",types:"./lib/src/react/all-types-export.d.ts"},"./lib/src/react":{"import":"./lib/src/react/all-types-export.js",require:"./cjs/src/react/all-types-export.js",types:"./lib/src/react/all-types-export.d.ts"}};var typesVersions={"*":{react:["./lib/src/react/all-types-export.d.ts"]}};var scripts={lint:"eslint 'src/**'","lint:fix":"eslint 'src/**/*.*' --fix",tsc:"tsc -p tsconfig.build.json --incremental false; tsc -p tsconfig.build.json --incremental false --module commonjs --outDir cjs","build-and-publish":"npm run build:gatsby && npm run publish","bundle-dts-file":"dts-bundle-generator --config ./dts-config/dts-bundle-file.config.js","bundle-dts":"dts-bundle-generator --config ./dts-config/dts-bundle.config.js","bundle-dts-react":"dts-bundle-generator --config ./dts-config/dts-bundle-react.config.js","bundle-dts-react-full":"dts-bundle-generator --config ./dts-config/dts-bundle-react-full.config.js",build:"rollup -c",watch:"rollup -cw",docgen:"typedoc --tsconfig tsconfig.build.json --theme typedoc-theme --json static/typedoc/typedoc.json --disableOutputCheck","test-sdk":"jest -c jest.config.sdk.js --runInBand",test:"npm run test-sdk",posttest:"cat ./coverage/sdk/lcov.info | npx coveralls-next","is-publish-allowed":"node scripts/is-publish-allowed.js",prepublishOnly:"npm run tsc && npm run bundle-dts-file && npm run bundle-dts && npm run bundle-dts-react && npm run bundle-dts-react-full && npm run build","check-size":"npm run build && size-limit","publish-dev":"npm publish --tag dev","publish-prod":"npm publish --tag latest",dev:"vite -c vite.local.config.ts"};var peerDependencies={react:"> 16.8.0","react-dom":"> 16.8.0"};var dependencies={classnames:"^2.3.1",eventemitter3:"^4.0.7",lodash:"^4.17.21","mixpanel-browser":"2.47.0","ts-deepmerge":"^6.0.2",tslib:"^2.5.3","use-deep-compare-effect":"^1.8.1",yaml:"^2.5.1"};var devDependencies={"@mdx-js/mdx":"^1.6.22","@mdx-js/react":"^1.6.22","@react-icons/all-files":"^4.1.0","@rollup/plugin-commonjs":"^18.0.0","@rollup/plugin-json":"^4.1.0","@rollup/plugin-node-resolve":"^11.2.1","@rollup/plugin-replace":"^5.0.2","@size-limit/preset-big-lib":"^11.2.0","@testing-library/dom":"^7.31.0","@testing-library/jest-dom":"^5.14.1","@testing-library/react":"^11.2.7","@testing-library/user-event":"^13.1.8","@types/jest":"^22.2.3","@types/lodash":"^4.17.0","@types/react-test-renderer":"^17.0.1","@typescript-eslint/eslint-plugin":"^8.28.0","@typescript-eslint/parser":"^8.28.0",ajv:"^8.17.1",asciidoctor:"^2.2.1","babel-jest":"^26.6.3","babel-preset-gatsby":"^1.10.0","command-line-args":"^5.1.1","coveralls-next":"^5.0.0",crypto:"^1.0.1","current-git-branch":"^1.1.0","dts-bundle-generator":"^9.5.1",eslint:"^9.23.0","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^10.1.1","eslint-import-resolver-typescript":"^4.2.5","eslint-plugin-comment-length":"2.2.1","eslint-plugin-import":"^2.31.0","eslint-plugin-jsdoc":"^50.6.9","eslint-plugin-prettier":"^5.2.5","eslint-plugin-react":"^7.37.5","eslint-plugin-react-hooks":"^5.2.0","fs-extra":"^10.0.0","gh-pages":"6.3.0",globals:"^16.0.0","highlight.js":"^10.6.0","html-to-text":"^8.0.0","identity-obj-proxy":"^3.0.0","istanbul-merge":"^2.0.0",jest:"^26.6.3","jest-fetch-mock":"^3.0.3",jsdom:"^17.0.0",prettier:"2.1.2",react:"^16.14.0","react-dom":"^16.14.0","react-resizable":"^1.11.0","react-resize-detector":"^6.6.0","react-test-renderer":"^17.0.2","react-use-flexsearch":"^0.1.1",rollup:"4.24.0","rollup-plugin-typescript2":"0.27.3","ts-jest":"^26.5.5","ts-loader":"8.0.4",typedoc:"0.21.6","typedoc-plugin-toc-group":"thoughtspot/typedoc-plugin-toc-group",typescript:"^4.9.4","typescript-eslint":"^8.29.1","url-search-params-polyfill":"^8.1.0",util:"^0.12.4",vite:"^6.3.5"};var author="ThoughtSpot";var email="support@thoughtspot.com";var license="ThoughtSpot Development Tools End User License Agreement";var directories={lib:"lib"};var repository={type:"git",url:"git+https://github.com/thoughtspot/visual-embed-sdk.git"};var publishConfig={registry:"https://registry.npmjs.org"};var keywords=["thoughtspot","everywhere","embedded","embed","sdk","analytics"];var bugs={url:"https://github.com/thoughtspot/visual-embed-sdk/issues"};var homepage="https://github.com/thoughtspot/visual-embed-sdk#readme";var globals={window:{}};var pkgInfo = {name:name,version:version$1,description:description,module:module,main:main,types:types,files:files,exports:exports$1,typesVersions:typesVersions,"size-limit":[{path:"dist/tsembed.es.js",limit:"32 kB"}],scripts:scripts,peerDependencies:peerDependencies,dependencies:dependencies,devDependencies:devDependencies,author:author,email:email,license:license,directories:directories,repository:repository,publishConfig:publishConfig,keywords:keywords,bugs:bugs,homepage:homepage,globals:globals};
 
     /**
      * Reloads the ThoughtSpot iframe.
@@ -22030,8 +22030,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
         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;
@@ -22195,23 +22194,36 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
          * Resolve the value of this alias within `doc`, finding the last
          * instance of the `source` anchor before this node.
          */
-        resolve(doc) {
+        resolve(doc, ctx) {
+            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);
@@ -22330,8 +22342,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
         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 {
@@ -22842,7 +22853,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
         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 ||
@@ -22902,23 +22913,32 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
             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;
@@ -22927,10 +22947,9 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
             (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
@@ -23059,7 +23078,12 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
         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);
         }
@@ -23068,7 +23092,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
             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;
@@ -23083,7 +23107,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
             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(' ');
@@ -23109,8 +23133,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
         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;
@@ -23272,54 +23295,10 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
 
     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
@@ -23327,7 +23306,35 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
     // 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 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) {
+        value = ctx && isAlias(value) ? value.resolve(ctx.doc) : value;
+        if (isSeq(value))
+            for (const it of value.items)
+                mergeValue(ctx, map, it);
+        else if (Array.isArray(value))
+            for (const it of value)
+                mergeValue(ctx, map, it);
+        else
+            mergeValue(ctx, map, value);
+    }
+    function mergeValue(ctx, map, value) {
         const source = ctx && isAlias(value) ? value.resolve(ctx.doc) : value;
         if (!isMap(source))
             throw new Error('Merge sources must be maps or map aliases');
@@ -23351,9 +23358,41 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
         }
         return map;
     }
+
+    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) {
@@ -23986,7 +24025,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
             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
         },
@@ -24031,10 +24070,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
          *   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);
@@ -24048,15 +24084,11 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
             }
         },
         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]);
@@ -24065,8 +24097,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
             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);
@@ -24535,7 +24566,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
             }
             return new Date(date);
         },
-        stringify: ({ value }) => value.toISOString().replace(/((T00:00)?:00)?\.000Z$/, '')
+        stringify: ({ value }) => value?.toISOString().replace(/(T00:00:00)?\.000Z$/, '') ?? ''
     };
 
     const schema = [
@@ -24553,6 +24584,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
         floatExp,
         float,
         binary,
+        merge,
         omap,
         pairs,
         set,
@@ -24580,6 +24612,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
         intOct: intOct$1,
         intTime,
         map,
+        merge,
         null: nullTag,
         omap,
         pairs,
@@ -24589,13 +24622,20 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
     };
     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 = [];
@@ -24614,17 +24654,21 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
         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;
@@ -24635,10 +24679,9 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
                 : 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 });
@@ -24763,6 +24806,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
                 logLevel: 'warn',
                 prettyErrors: true,
                 strict: true,
+                stringKeys: false,
                 uniqueKeys: true,
                 version: '1.2'
             }, options);
@@ -24986,7 +25030,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
                         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':
@@ -24994,7 +25038,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
                         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)
@@ -25172,7 +25216,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
                     if (atNewline) {
                         if (comment)
                             comment += token.source;
-                        else
+                        else if (!found || indicator !== 'seq-item-ind')
                             spaceBefore = true;
                     }
                     else
@@ -25189,8 +25233,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
                     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;
@@ -25199,8 +25242,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
                     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;
@@ -25313,11 +25355,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
             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));
     }
 
@@ -25366,12 +25404,14 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
                 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
@@ -25431,6 +25471,8 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
         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) {
@@ -25515,6 +25557,8 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
         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];
@@ -25594,12 +25638,14 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
             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,
@@ -25755,8 +25801,8 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
                 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);
@@ -26197,11 +26243,16 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
         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);
@@ -26249,8 +26300,9 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
         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];
@@ -26266,8 +26318,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
 
     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) {
@@ -26292,6 +26343,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
 
     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;
@@ -26327,6 +26379,14 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
         }
         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) {
@@ -26379,6 +26439,7 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
         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,
@@ -28513,7 +28574,20 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
                     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);
@@ -28884,6 +28958,8 @@ query GetEurekaResults($params: Input_eureka_SearchRequest) {
             if (!keepUndefined)
                 return undefined;
         }
+        if (isDocument(value) && !_replacer)
+            return value.toString(options);
         return new Document(value, _replacer, options).toString(options);
     }