yaml 2.2.1 → 2.3.0-1

package/dist/schema/core/schema.d.ts

@@ -1 +1 @@
-export declare const schema: (import("../types.js").ScalarTag | import("../types.js").CollectionTag)[];
+export declare const schema: (import("../types.js").CollectionTag | import("../types.js").ScalarTag)[];

package/dist/schema/json/schema.d.ts

@@ -1,2 +1,2 @@
 import { CollectionTag, ScalarTag } from '../types.js';
-export declare const schema: (ScalarTag | CollectionTag)[];
+export declare const schema: (CollectionTag | ScalarTag)[];

package/dist/schema/tags.d.ts

@@ -36,5 +36,5 @@ export declare const coreKnownTags: {
         test: RegExp;
     };
 };
-export declare function getTags(customTags: SchemaOptions['customTags'] | undefined, schemaName: string): (ScalarTag | CollectionTag)[];
+export declare function getTags(customTags: SchemaOptions['customTags'] | undefined, schemaName: string): (CollectionTag | ScalarTag)[];
 export {};

package/dist/schema/yaml-1.1/omap.d.ts

@@ -1,5 +1,5 @@
-import { YAMLSeq } from '../../nodes/YAMLSeq.js';
 import { ToJSContext } from '../../nodes/toJS.js';
+import { YAMLSeq } from '../../nodes/YAMLSeq.js';
 import { CollectionTag } from '../types.js';
 export declare class YAMLOMap extends YAMLSeq {
     static tag: string;

package/dist/schema/yaml-1.1/omap.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var YAMLSeq = require('../../nodes/YAMLSeq.js');
+var identity = require('../../nodes/identity.js');
 var toJS = require('../../nodes/toJS.js');
-var Node = require('../../nodes/Node.js');
 var YAMLMap = require('../../nodes/YAMLMap.js');
+var YAMLSeq = require('../../nodes/YAMLSeq.js');
 var pairs = require('./pairs.js');
 
 class YAMLOMap extends YAMLSeq.YAMLSeq {
@@ -28,7 +28,7 @@ class YAMLOMap extends YAMLSeq.YAMLSeq {
             ctx.onCreate(map);
         for (const pair of this.items) {
             let key, value;
-            if (Node.isPair(pair)) {
+            if (identity.isPair(pair)) {
                 key = toJS.toJS(pair.key, '', ctx);
                 value = toJS.toJS(pair.value, key, ctx);
             }
@@ -53,7 +53,7 @@ const omap = {
         const pairs$1 = pairs.resolvePairs(seq, onError);
         const seenKeys = [];
         for (const { key } of pairs$1.items) {
-            if (Node.isScalar(key)) {
+            if (identity.isScalar(key)) {
                 if (seenKeys.includes(key.value)) {
                     onError(`Ordered maps must not include duplicate keys: ${key.value}`);
                 }

package/dist/schema/yaml-1.1/pairs.d.ts

@@ -1,5 +1,5 @@
 import type { CreateNodeContext } from '../../doc/createNode.js';
-import { ParsedNode } from '../../nodes/Node.js';
+import type { ParsedNode } from '../../nodes/Node.js';
 import { Pair } from '../../nodes/Pair.js';
 import { YAMLMap } from '../../nodes/YAMLMap.js';
 import { YAMLSeq } from '../../nodes/YAMLSeq.js';

package/dist/schema/yaml-1.1/pairs.js

@@ -1,17 +1,17 @@
 'use strict';
 
-var Node = require('../../nodes/Node.js');
+var identity = require('../../nodes/identity.js');
 var Pair = require('../../nodes/Pair.js');
 var Scalar = require('../../nodes/Scalar.js');
 var YAMLSeq = require('../../nodes/YAMLSeq.js');
 
 function resolvePairs(seq, onError) {
-    if (Node.isSeq(seq)) {
+    if (identity.isSeq(seq)) {
         for (let i = 0; i < seq.items.length; ++i) {
             let item = seq.items[i];
-            if (Node.isPair(item))
+            if (identity.isPair(item))
                 continue;
-            else if (Node.isMap(item)) {
+            else if (identity.isMap(item)) {
                 if (item.items.length > 1)
                     onError('Each pair must have its own sequence indicator');
                 const pair = item.items[0] || new Pair.Pair(new Scalar.Scalar(null));
@@ -27,7 +27,7 @@ function resolvePairs(seq, onError) {
                 }
                 item = pair;
             }
-            seq.items[i] = Node.isPair(item) ? item : new Pair.Pair(item);
+            seq.items[i] = identity.isPair(item) ? item : new Pair.Pair(item);
         }
     }
     else

package/dist/schema/yaml-1.1/schema.d.ts

@@ -1 +1 @@
-export declare const schema: (import("../types.js").ScalarTag | import("../types.js").CollectionTag)[];
+export declare const schema: (import("../types.js").CollectionTag | import("../types.js").ScalarTag)[];

package/dist/schema/yaml-1.1/set.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require('../../nodes/Node.js');
+var identity = require('../../nodes/identity.js');
 var Pair = require('../../nodes/Pair.js');
 var YAMLMap = require('../../nodes/YAMLMap.js');
 
@@ -11,7 +11,7 @@ class YAMLSet extends YAMLMap.YAMLMap {
     }
     add(key) {
         let pair;
-        if (Node.isPair(key))
+        if (identity.isPair(key))
             pair = key;
         else if (key &&
             typeof key === 'object' &&
@@ -31,8 +31,8 @@ class YAMLSet extends YAMLMap.YAMLMap {
      */
     get(key, keepPair) {
         const pair = YAMLMap.findPair(this.items, key);
-        return !keepPair && Node.isPair(pair)
-            ? Node.isScalar(pair.key)
+        return !keepPair && identity.isPair(pair)
+            ? identity.isScalar(pair.key)
                 ? pair.key.value
                 : pair.key
             : pair;
@@ -68,7 +68,7 @@ const set = {
     default: false,
     tag: 'tag:yaml.org,2002:set',
     resolve(map, onError) {
-        if (Node.isMap(map)) {
+        if (identity.isMap(map)) {
             if (map.hasAllNullValues(true))
                 return Object.assign(new YAMLSet(), map);
             else

package/dist/stringify/stringify.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var anchors = require('../doc/anchors.js');
-var Node = require('../nodes/Node.js');
+var identity = require('../nodes/identity.js');
 var stringifyComment = require('./stringifyComment.js');
 var stringifyString = require('./stringifyString.js');
 
@@ -54,7 +54,7 @@ function getTagObject(tags, item) {
     }
     let tagObj = undefined;
     let obj;
-    if (Node.isScalar(item)) {
+    if (identity.isScalar(item)) {
         obj = item.value;
         const match = tags.filter(t => t.identify?.(obj));
         tagObj =
@@ -75,7 +75,7 @@ function stringifyProps(node, tagObj, { anchors: anchors$1, doc }) {
     if (!doc.directives)
         return '';
     const props = [];
-    const anchor = (Node.isScalar(node) || Node.isCollection(node)) && node.anchor;
+    const anchor = (identity.isScalar(node) || identity.isCollection(node)) && node.anchor;
     if (anchor && anchors.anchorIsValid(anchor)) {
         anchors$1.add(anchor);
         props.push(`&${anchor}`);
@@ -86,9 +86,9 @@ function stringifyProps(node, tagObj, { anchors: anchors$1, doc }) {
     return props.join(' ');
 }
 function stringify(item, ctx, onComment, onChompKeep) {
-    if (Node.isPair(item))
+    if (identity.isPair(item))
         return item.toString(ctx, onComment, onChompKeep);
-    if (Node.isAlias(item)) {
+    if (identity.isAlias(item)) {
         if (ctx.doc.directives)
             return item.toString(ctx);
         if (ctx.resolvedAliases?.has(item)) {
@@ -103,7 +103,7 @@ function stringify(item, ctx, onComment, onChompKeep) {
         }
     }
     let tagObj = undefined;
-    const node = Node.isNode(item)
+    const node = identity.isNode(item)
         ? item
         : ctx.doc.createNode(item, { onTagObj: o => (tagObj = o) });
     if (!tagObj)
@@ -113,12 +113,12 @@ function stringify(item, ctx, onComment, onChompKeep) {
         ctx.indentAtStart = (ctx.indentAtStart ?? 0) + props.length + 1;
     const str = typeof tagObj.stringify === 'function'
         ? tagObj.stringify(node, ctx, onComment, onChompKeep)
-        : Node.isScalar(node)
+        : identity.isScalar(node)
             ? stringifyString.stringifyString(node, ctx, onComment, onChompKeep)
             : node.toString(ctx, onComment, onChompKeep);
     if (!props)
         return str;
-    return Node.isScalar(node) || str[0] === '{' || str[0] === '['
+    return identity.isScalar(node) || str[0] === '{' || str[0] === '['
         ? `${props} ${str}`
         : `${props}\n${ctx.indent}${str}`;
 }

package/dist/stringify/stringifyCollection.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var Collection = require('../nodes/Collection.js');
-var Node = require('../nodes/Node.js');
+var identity = require('../nodes/identity.js');
 var stringify = require('./stringify.js');
 var stringifyComment = require('./stringifyComment.js');
 
@@ -18,15 +18,15 @@ function stringifyBlockCollection({ comment, items }, ctx, { blockItemPrefix, fl
     for (let i = 0; i < items.length; ++i) {
         const item = items[i];
         let comment = null;
-        if (Node.isNode(item)) {
+        if (identity.isNode(item)) {
             if (!chompKeep && item.spaceBefore)
                 lines.push('');
             addCommentBefore(ctx, lines, item.commentBefore, chompKeep);
             if (item.comment)
                 comment = item.comment;
         }
-        else if (Node.isPair(item)) {
-            const ik = Node.isNode(item.key) ? item.key : null;
+        else if (identity.isPair(item)) {
+            const ik = identity.isNode(item.key) ? item.key : null;
             if (ik) {
                 if (!chompKeep && ik.spaceBefore)
                     lines.push('');
@@ -75,15 +75,15 @@ function stringifyFlowCollection({ comment, items }, ctx, { flowChars, itemInden
     for (let i = 0; i < items.length; ++i) {
         const item = items[i];
         let comment = null;
-        if (Node.isNode(item)) {
+        if (identity.isNode(item)) {
             if (item.spaceBefore)
                 lines.push('');
             addCommentBefore(ctx, lines, item.commentBefore, false);
             if (item.comment)
                 comment = item.comment;
         }
-        else if (Node.isPair(item)) {
-            const ik = Node.isNode(item.key) ? item.key : null;
+        else if (identity.isPair(item)) {
+            const ik = identity.isNode(item.key) ? item.key : null;
             if (ik) {
                 if (ik.spaceBefore)
                     lines.push('');
@@ -91,7 +91,7 @@ function stringifyFlowCollection({ comment, items }, ctx, { flowChars, itemInden
                 if (ik.comment)
                     reqNewline = true;
             }
-            const iv = Node.isNode(item.value) ? item.value : null;
+            const iv = identity.isNode(item.value) ? item.value : null;
             if (iv) {
                 if (iv.comment)
                     comment = iv.comment;
@@ -135,7 +135,7 @@ function stringifyFlowCollection({ comment, items }, ctx, { flowChars, itemInden
         }
     }
     if (comment) {
-        str += stringifyComment.lineComment(str, commentString(comment), indent);
+        str += stringifyComment.lineComment(str, indent, commentString(comment));
         if (onComment)
             onComment();
     }

package/dist/stringify/stringifyDocument.d.ts

@@ -1,3 +1,4 @@
-import { Document } from '../doc/Document.js';
-import { ToStringOptions } from '../options.js';
-export declare function stringifyDocument(doc: Readonly<Document>, options: ToStringOptions): string;
+import type { Document } from '../doc/Document.js';
+import type { Node } from '../nodes/Node.js';
+import type { ToStringOptions } from '../options.js';
+export declare function stringifyDocument(doc: Readonly<Document<Node, boolean>>, options: ToStringOptions): string;

package/dist/stringify/stringifyDocument.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require('../nodes/Node.js');
+var identity = require('../nodes/identity.js');
 var stringify = require('./stringify.js');
 var stringifyComment = require('./stringifyComment.js');
 
@@ -29,7 +29,7 @@ function stringifyDocument(doc, options) {
     let chompKeep = false;
     let contentComment = null;
     if (doc.contents) {
-        if (Node.isNode(doc.contents)) {
+        if (identity.isNode(doc.contents)) {
             if (doc.contents.spaceBefore && hasDirectives)
                 lines.push('');
             if (doc.contents.commentBefore) {

package/dist/stringify/stringifyPair.js

@@ -1,18 +1,18 @@
 'use strict';
 
-var Node = require('../nodes/Node.js');
+var identity = require('../nodes/identity.js');
 var Scalar = require('../nodes/Scalar.js');
 var stringify = require('./stringify.js');
 var stringifyComment = require('./stringifyComment.js');
 
 function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
     const { allNullValues, doc, indent, indentStep, options: { commentString, indentSeq, simpleKeys } } = ctx;
-    let keyComment = (Node.isNode(key) && key.comment) || null;
+    let keyComment = (identity.isNode(key) && key.comment) || null;
     if (simpleKeys) {
         if (keyComment) {
             throw new Error('With simple keys, key nodes cannot have comments');
         }
-        if (Node.isCollection(key)) {
+        if (identity.isCollection(key)) {
             const msg = 'With simple keys, collection cannot be used as a key value';
             throw new Error(msg);
         }
@@ -20,8 +20,8 @@ function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
     let explicitKey = !simpleKeys &&
         (!key ||
             (keyComment && value == null && !ctx.inFlow) ||
-            Node.isCollection(key) ||
-            (Node.isScalar(key)
+            identity.isCollection(key) ||
+            (identity.isScalar(key)
                 ? key.type === Scalar.Scalar.BLOCK_FOLDED || key.type === Scalar.Scalar.BLOCK_LITERAL
                 : typeof key === 'object'));
     ctx = Object.assign({}, ctx, {
@@ -66,7 +66,7 @@ function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
             str += stringifyComment.lineComment(str, ctx.indent, commentString(keyComment));
     }
     let vsb, vcb, valueComment;
-    if (Node.isNode(value)) {
+    if (identity.isNode(value)) {
         vsb = !!value.spaceBefore;
         vcb = value.commentBefore;
         valueComment = value.comment;
@@ -79,14 +79,14 @@ function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
             value = doc.createNode(value);
     }
     ctx.implicitKey = false;
-    if (!explicitKey && !keyComment && Node.isScalar(value))
+    if (!explicitKey && !keyComment && identity.isScalar(value))
         ctx.indentAtStart = str.length + 1;
     chompKeep = false;
     if (!indentSeq &&
         indentStep.length >= 2 &&
         !ctx.inFlow &&
         !explicitKey &&
-        Node.isSeq(value) &&
+        identity.isSeq(value) &&
         !value.flow &&
         !value.tag &&
         !value.anchor) {
@@ -110,7 +110,7 @@ function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
             ws += `\n${ctx.indent}`;
         }
     }
-    else if (!explicitKey && Node.isCollection(value)) {
+    else if (!explicitKey && identity.isCollection(value)) {
         const vs0 = valueStr[0];
         const nl0 = valueStr.indexOf('\n');
         const hasNewline = nl0 !== -1;

package/dist/stringify/stringifyString.js

@@ -3,8 +3,8 @@
 var Scalar = require('../nodes/Scalar.js');
 var foldFlowLines = require('./foldFlowLines.js');
 
-const getFoldOptions = (ctx) => ({
-    indentAtStart: ctx.indentAtStart,
+const getFoldOptions = (ctx, isBlock) => ({
+    indentAtStart: isBlock ? ctx.indent.length : ctx.indentAtStart,
     lineWidth: ctx.options.lineWidth,
     minContentWidth: ctx.options.minContentWidth
 });
@@ -117,7 +117,7 @@ function doubleQuotedString(value, ctx) {
     str = start ? str + json.slice(start) : json;
     return implicitKey
         ? str
-        : foldFlowLines.foldFlowLines(str, indent, foldFlowLines.FOLD_QUOTED, getFoldOptions(ctx));
+        : foldFlowLines.foldFlowLines(str, indent, foldFlowLines.FOLD_QUOTED, getFoldOptions(ctx, false));
 }
 function singleQuotedString(value, ctx) {
     if (ctx.options.singleQuote === false ||
@@ -129,7 +129,7 @@ function singleQuotedString(value, ctx) {
     const res = "'" + value.replace(/'/g, "''").replace(/\n+/g, `$&\n${indent}`) + "'";
     return ctx.implicitKey
         ? res
-        : foldFlowLines.foldFlowLines(res, indent, foldFlowLines.FOLD_FLOW, getFoldOptions(ctx));
+        : foldFlowLines.foldFlowLines(res, indent, foldFlowLines.FOLD_FLOW, getFoldOptions(ctx, false));
 }
 function quotedString(value, ctx) {
     const { singleQuote } = ctx.options;
@@ -148,6 +148,15 @@ function quotedString(value, ctx) {
     }
     return qs(value, ctx);
 }
+// The negative lookbehind avoids a polynomial search,
+// but isn't supported yet on Safari: https://caniuse.com/js-regexp-lookbehind
+let blockEndNewlines;
+try {
+    blockEndNewlines = new RegExp('(^|(?<!\n))\n+(?!\n|$)', 'g');
+}
+catch {
+    blockEndNewlines = /\n+(?!\n|$)/g;
+}
 function blockString({ comment, type, value }, ctx, onComment, onChompKeep) {
     const { blockQuote, commentString, lineWidth } = ctx.options;
     // 1. Block can't end in whitespace unless the last line is non-empty.
@@ -191,7 +200,7 @@ function blockString({ comment, type, value }, ctx, onComment, onChompKeep) {
         value = value.slice(0, -end.length);
         if (end[end.length - 1] === '\n')
             end = end.slice(0, -1);
-        end = end.replace(/\n+(?!\n|$)/g, `$&${indent}`);
+        end = end.replace(blockEndNewlines, `$&${indent}`);
     }
     // determine indent indicator from whitespace at value start
     let startWithSpace = false;
@@ -227,7 +236,7 @@ function blockString({ comment, type, value }, ctx, onComment, onChompKeep) {
         .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.foldFlowLines(`${start}${value}${end}`, indent, foldFlowLines.FOLD_BLOCK, getFoldOptions(ctx));
+    const body = foldFlowLines.foldFlowLines(`${start}${value}${end}`, indent, foldFlowLines.FOLD_BLOCK, getFoldOptions(ctx, true));
     return `${header}\n${indent}${body}`;
 }
 function plainString(item, ctx, onComment, onChompKeep) {
@@ -277,7 +286,7 @@ function plainString(item, ctx, onComment, onChompKeep) {
     }
     return implicitKey
         ? str
-        : foldFlowLines.foldFlowLines(str, indent, foldFlowLines.FOLD_FLOW, getFoldOptions(ctx));
+        : foldFlowLines.foldFlowLines(str, indent, foldFlowLines.FOLD_FLOW, getFoldOptions(ctx, false));
 }
 function stringifyString(item, ctx, onComment, onChompKeep) {
     const { implicitKey, inFlow } = ctx;

package/dist/test-events.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require('./nodes/Node.js');
+var identity = require('./nodes/identity.js');
 var publicApi = require('./public-api.js');
 var visit = require('./visit.js');
 
@@ -66,10 +66,10 @@ function addEvents(events, doc, errPos, node) {
         events.push('=VAL :');
         return;
     }
-    if (errPos !== -1 && Node.isNode(node) && node.range[0] >= errPos)
+    if (errPos !== -1 && identity.isNode(node) && node.range[0] >= errPos)
         throw new Error();
     let props = '';
-    let anchor = Node.isScalar(node) || Node.isCollection(node) ? node.anchor : undefined;
+    let anchor = identity.isScalar(node) || identity.isCollection(node) ? node.anchor : undefined;
     if (anchor) {
         if (/\d$/.test(anchor)) {
             const alt = anchor.replace(/\d$/, '');
@@ -78,9 +78,9 @@ function addEvents(events, doc, errPos, node) {
         }
         props = ` &${anchor}`;
     }
-    if (Node.isNode(node) && node.tag)
+    if (identity.isNode(node) && node.tag)
         props += ` <${node.tag}>`;
-    if (Node.isMap(node)) {
+    if (identity.isMap(node)) {
         const ev = node.flow ? '+MAP {}' : '+MAP';
         events.push(`${ev}${props}`);
         node.items.forEach(({ key, value }) => {
@@ -89,7 +89,7 @@ function addEvents(events, doc, errPos, node) {
         });
         events.push('-MAP');
     }
-    else if (Node.isSeq(node)) {
+    else if (identity.isSeq(node)) {
         const ev = node.flow ? '+SEQ []' : '+SEQ';
         events.push(`${ev}${props}`);
         node.items.forEach(item => {
@@ -97,13 +97,13 @@ function addEvents(events, doc, errPos, node) {
         });
         events.push('-SEQ');
     }
-    else if (Node.isPair(node)) {
+    else if (identity.isPair(node)) {
         events.push(`+MAP${props}`);
         addEvents(events, doc, errPos, node.key);
         addEvents(events, doc, errPos, node.value);
         events.push('-MAP');
     }
-    else if (Node.isAlias(node)) {
+    else if (identity.isAlias(node)) {
         let alias = node.source;
         if (alias && /\d$/.test(alias)) {
             const alt = alias.replace(/\d$/, '');

package/dist/util.d.ts

@@ -1,9 +1,11 @@
+export { createNode, CreateNodeContext } from './doc/createNode.js';
 export { debug, LogLevelId, warn } from './log.js';
+export { createPair } from './nodes/Pair.js';
 export { findPair } from './nodes/YAMLMap.js';
 export { toJS, ToJSContext } from './nodes/toJS.js';
 export { map as mapTag } from './schema/common/map.js';
 export { seq as seqTag } from './schema/common/seq.js';
 export { string as stringTag } from './schema/common/string.js';
-export { foldFlowLines } from './stringify/foldFlowLines';
+export { foldFlowLines, FoldOptions } from './stringify/foldFlowLines';
 export { stringifyNumber } from './stringify/stringifyNumber.js';
 export { stringifyString } from './stringify/stringifyString.js';

package/dist/util.js

@@ -1,6 +1,8 @@
 'use strict';
 
+var createNode = require('./doc/createNode.js');
 var log = require('./log.js');
+var Pair = require('./nodes/Pair.js');
 var YAMLMap = require('./nodes/YAMLMap.js');
 var toJS = require('./nodes/toJS.js');
 var map = require('./schema/common/map.js');
@@ -12,8 +14,10 @@ var stringifyString = require('./stringify/stringifyString.js');
 
 
 
+exports.createNode = createNode.createNode;
 exports.debug = log.debug;
 exports.warn = log.warn;
+exports.createPair = Pair.createPair;
 exports.findPair = YAMLMap.findPair;
 exports.toJS = toJS.toJS;
 exports.mapTag = map.map;

package/dist/visit.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require('./nodes/Node.js');
+var identity = require('./nodes/identity.js');
 
 const BREAK = Symbol('break visit');
 const SKIP = Symbol('skip children');
@@ -37,7 +37,7 @@ const REMOVE = Symbol('remove node');
  */
 function visit(node, visitor) {
     const visitor_ = initVisitor(visitor);
-    if (Node.isDocument(node)) {
+    if (identity.isDocument(node)) {
         const cd = visit_(null, node.contents, visitor_, Object.freeze([node]));
         if (cd === REMOVE)
             node.contents = null;
@@ -56,12 +56,12 @@ visit.SKIP = SKIP;
 visit.REMOVE = REMOVE;
 function visit_(key, node, visitor, path) {
     const ctrl = callVisitor(key, node, visitor, path);
-    if (Node.isNode(ctrl) || Node.isPair(ctrl)) {
+    if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
         replaceNode(key, path, ctrl);
         return visit_(key, ctrl, visitor, path);
     }
     if (typeof ctrl !== 'symbol') {
-        if (Node.isCollection(node)) {
+        if (identity.isCollection(node)) {
             path = Object.freeze(path.concat(node));
             for (let i = 0; i < node.items.length; ++i) {
                 const ci = visit_(i, node.items[i], visitor, path);
@@ -75,7 +75,7 @@ function visit_(key, node, visitor, path) {
                 }
             }
         }
-        else if (Node.isPair(node)) {
+        else if (identity.isPair(node)) {
             path = Object.freeze(path.concat(node));
             const ck = visit_('key', node.key, visitor, path);
             if (ck === BREAK)
@@ -124,7 +124,7 @@ function visit_(key, node, visitor, path) {
  */
 async function visitAsync(node, visitor) {
     const visitor_ = initVisitor(visitor);
-    if (Node.isDocument(node)) {
+    if (identity.isDocument(node)) {
         const cd = await visitAsync_(null, node.contents, visitor_, Object.freeze([node]));
         if (cd === REMOVE)
             node.contents = null;
@@ -143,12 +143,12 @@ visitAsync.SKIP = SKIP;
 visitAsync.REMOVE = REMOVE;
 async function visitAsync_(key, node, visitor, path) {
     const ctrl = await callVisitor(key, node, visitor, path);
-    if (Node.isNode(ctrl) || Node.isPair(ctrl)) {
+    if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
         replaceNode(key, path, ctrl);
         return visitAsync_(key, ctrl, visitor, path);
     }
     if (typeof ctrl !== 'symbol') {
-        if (Node.isCollection(node)) {
+        if (identity.isCollection(node)) {
             path = Object.freeze(path.concat(node));
             for (let i = 0; i < node.items.length; ++i) {
                 const ci = await visitAsync_(i, node.items[i], visitor, path);
@@ -162,7 +162,7 @@ async function visitAsync_(key, node, visitor, path) {
                 }
             }
         }
-        else if (Node.isPair(node)) {
+        else if (identity.isPair(node)) {
             path = Object.freeze(path.concat(node));
             const ck = await visitAsync_('key', node.key, visitor, path);
             if (ck === BREAK)
@@ -200,34 +200,34 @@ function initVisitor(visitor) {
 function callVisitor(key, node, visitor, path) {
     if (typeof visitor === 'function')
         return visitor(key, node, path);
-    if (Node.isMap(node))
+    if (identity.isMap(node))
         return visitor.Map?.(key, node, path);
-    if (Node.isSeq(node))
+    if (identity.isSeq(node))
         return visitor.Seq?.(key, node, path);
-    if (Node.isPair(node))
+    if (identity.isPair(node))
         return visitor.Pair?.(key, node, path);
-    if (Node.isScalar(node))
+    if (identity.isScalar(node))
         return visitor.Scalar?.(key, node, path);
-    if (Node.isAlias(node))
+    if (identity.isAlias(node))
         return visitor.Alias?.(key, node, path);
     return undefined;
 }
 function replaceNode(key, path, node) {
     const parent = path[path.length - 1];
-    if (Node.isCollection(parent)) {
+    if (identity.isCollection(parent)) {
         parent.items[key] = node;
     }
-    else if (Node.isPair(parent)) {
+    else if (identity.isPair(parent)) {
         if (key === 'key')
             parent.key = node;
         else
             parent.value = node;
     }
-    else if (Node.isDocument(parent)) {
+    else if (identity.isDocument(parent)) {
         parent.contents = node;
     }
     else {
-        const pt = Node.isAlias(parent) ? 'alias' : 'scalar';
+        const pt = identity.isAlias(parent) ? 'alias' : 'scalar';
         throw new Error(`Cannot replace node with ${pt} parent`);
     }
 }