yaml 2.0.0-3 → 2.0.0-7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml",
-  "version": "2.0.0-3",
+  "version": "2.0.0-7",
   "license": "ISC",
   "author": "Eemeli Aro <eemeli@gmail.com>",
   "repository": "github:eemeli/yaml",
@@ -14,61 +14,47 @@
   "files": [
     "browser/",
     "dist/",
-    "types/",
-    "*.d.ts",
-    "*.js",
-    "*.mjs",
-    "!*config.js"
+    "util.js"
   ],
   "type": "commonjs",
-  "main": "./index.js",
+  "main": "./dist/index.js",
   "browser": {
-    "./index.js": "./browser/index.js",
-    "./types.js": "./browser/dist/types.js",
-    "./types.mjs": "./browser/dist/types.js",
-    "./util.js": "./browser/dist/util.js",
-    "./util.mjs": "./browser/dist/util.js"
+    "./dist/index.js": "./browser/index.js",
+    "./dist/util.js": "./browser/dist/util.js",
+    "./util.js": "./browser/dist/util.js"
   },
   "exports": {
     ".": {
-      "node": "./index.js",
+      "node": "./dist/index.js",
       "default": "./browser/index.js"
     },
     "./package.json": "./package.json",
-    "./types": {
-      "node": {
-        "import": "./types.mjs",
-        "require": "./types.js"
-      },
-      "default": "./browser/dist/types.js"
-    },
     "./util": {
-      "node": {
-        "import": "./util.mjs",
-        "require": "./util.js"
-      },
+      "node": "./dist/util.js",
       "default": "./browser/dist/util.js"
     }
   },
   "scripts": {
     "build": "npm run build:node && npm run build:browser",
-    "build:browser": "rollup -c rollup.browser-config.js",
-    "build:node": "rollup -c rollup.node-config.js",
+    "build:browser": "rollup -c config/rollup.browser-config.js",
+    "build:node": "rollup -c config/rollup.node-config.js",
     "clean": "git clean -fdxe node_modules",
     "lint": "eslint src/",
     "prettier": "prettier --write .",
-    "start": "cross-env TRACE_LEVEL=log npm run build:node && node -i -e 'YAML=require(\".\")'",
-    "test": "jest",
+    "prestart": "npm run build:node",
+    "start": "node -i -e 'YAML=require(\"./dist/index.js\")'",
+    "test": "jest --config config/jest.config.js",
     "test:browsers": "cd playground && npm test",
-    "test:dist": "npm run build:node && jest",
-    "test:types": "tsc --lib ES2017 --noEmit tests/typings.ts",
+    "test:dist": "npm run build:node && jest --config config/jest.config.js",
+    "test:dist:types": "tsc --allowJs --moduleResolution node --noEmit --target es2017 dist/index.js",
+    "test:types": "tsc --noEmit",
     "docs:install": "cd docs-slate && bundle install",
     "docs:deploy": "cd docs-slate && ./deploy.sh",
     "docs": "cd docs-slate && bundle exec middleman server",
     "preversion": "npm test && npm run build",
     "prepublishOnly": "npm run clean && npm test && npm run build"
   },
-  "browserslist": "> 0.5%, not dead, not ie 11",
+  "browserslist": "defaults, not ie 11",
   "prettier": {
     "arrowParens": "avoid",
     "semi": false,
@@ -79,22 +65,28 @@
     "@babel/core": "^7.12.10",
     "@babel/plugin-proposal-class-properties": "^7.12.1",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
+    "@babel/plugin-transform-typescript": "^7.12.17",
     "@babel/preset-env": "^7.12.11",
     "@rollup/plugin-babel": "^5.2.3",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^26.6.3",
-    "babel-plugin-trace": "^1.1.0",
-    "common-tags": "^1.8.0",
+    "@rollup/plugin-replace": "^2.3.4",
+    "@rollup/plugin-typescript": "^8.1.1",
+    "@types/jest": "^26.0.20",
+    "@types/node": "^15.6.1",
+    "@typescript-eslint/eslint-plugin": "^4.15.2",
+    "@typescript-eslint/parser": "^4.15.2",
+    "babel-jest": "^27.0.1",
     "cross-env": "^7.0.3",
-    "eslint": "^7.19.0",
-    "eslint-config-prettier": "^7.2.0",
+    "eslint": "^7.20.0",
+    "eslint-config-prettier": "^8.1.0",
     "fast-check": "^2.12.0",
-    "jest": "^26.6.3",
+    "jest": "^27.0.1",
+    "jest-ts-webcompat-resolver": "^1.0.0",
     "prettier": "^2.2.1",
     "rollup": "^2.38.2",
+    "tslib": "^2.1.0",
     "typescript": "^4.1.3"
   },
   "engines": {
-    "node": ">= 10"
+    "node": ">= 12"
   }
 }

package/util.js

@@ -1,14 +1,2 @@
-const util = require('./dist/util')
-
-exports.findPair = util.findPair
-exports.toJSON = util.toJSON
-
-exports.stringifyNumber = util.stringifyNumber
-exports.stringifyString = util.stringifyString
-exports.Type = util.Type
-
-exports.YAMLError = util.YAMLError
-exports.YAMLReferenceError = util.YAMLReferenceError
-exports.YAMLSemanticError = util.YAMLSemanticError
-exports.YAMLSyntaxError = util.YAMLSyntaxError
-exports.YAMLWarning = util.YAMLWarning
+// Re-exporter for Node.js < 12.16.0
+module.exports = require('./dist/util.js')

package/browser/dist/_virtual/_rollupPluginBabelHelpers.js

@@ -1,16 +0,0 @@
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
-
-export { _defineProperty as defineProperty };

package/browser/dist/ast/Alias.js

@@ -1,95 +0,0 @@
-import { defineProperty as _defineProperty } from '../_virtual/_rollupPluginBabelHelpers.js';
-import { Type } from '../constants.js';
-import { YAMLReferenceError } from '../errors.js';
-import { Collection } from './Collection.js';
-import { Node } from './Node.js';
-import { Pair } from './Pair.js';
-import { toJS } from './toJS.js';
-
-const getAliasCount = (node, anchors) => {
-  if (node instanceof Alias) {
-    const anchor = anchors.get(node.source);
-    return anchor.count * anchor.aliasCount;
-  } else if (node instanceof Collection) {
-    let count = 0;
-
-    for (const item of node.items) {
-      const c = getAliasCount(item, anchors);
-      if (c > count) count = c;
-    }
-
-    return count;
-  } else if (node instanceof Pair) {
-    const kc = getAliasCount(node.key, anchors);
-    const vc = getAliasCount(node.value, anchors);
-    return Math.max(kc, vc);
-  }
-
-  return 1;
-};
-
-class Alias extends Node {
-  static stringify({
-    range,
-    source
-  }, {
-    anchors,
-    doc,
-    implicitKey,
-    inStringifyKey
-  }) {
-    let anchor = Object.keys(anchors).find(a => anchors[a] === source);
-    if (!anchor && inStringifyKey) anchor = doc.anchors.getName(source) || doc.anchors.newName();
-    if (anchor) return "*".concat(anchor).concat(implicitKey ? ' ' : '');
-    const msg = doc.anchors.getName(source) ? 'Alias node must be after source node' : 'Source node not found for alias node';
-    throw new Error("".concat(msg, " [").concat(range, "]"));
-  }
-
-  constructor(source) {
-    super();
-    this.source = source;
-    this.type = Type.ALIAS;
-  }
-
-  set tag(t) {
-    throw new Error('Alias nodes cannot have tags');
-  }
-
-  toJSON(arg, ctx) {
-    if (!ctx) return toJS(this.source, arg, ctx);
-    const {
-      anchors,
-      maxAliasCount
-    } = ctx;
-    const anchor = anchors.get(this.source);
-    /* istanbul ignore if */
-
-    if (!anchor || anchor.res === undefined) {
-      const msg = 'This should not happen: Alias anchor was not resolved?';
-      if (this.cstNode) throw new YAMLReferenceError(this.cstNode, msg);else throw new ReferenceError(msg);
-    }
-
-    if (maxAliasCount >= 0) {
-      anchor.count += 1;
-      if (anchor.aliasCount === 0) anchor.aliasCount = getAliasCount(this.source, anchors);
-
-      if (anchor.count * anchor.aliasCount > maxAliasCount) {
-        const msg = 'Excessive alias count indicates a resource exhaustion attack';
-        if (this.cstNode) throw new YAMLReferenceError(this.cstNode, msg);else throw new ReferenceError(msg);
-      }
-    }
-
-    return anchor.res;
-  } // Only called when stringifying an alias mapping key while constructing
-  // Object output.
-
-
-  toString(ctx) {
-    return Alias.stringify(this, ctx);
-  }
-
-}
-
-_defineProperty(Alias, "default", true);
-
-export { Alias };

package/browser/dist/ast/Collection.js

@@ -1,192 +0,0 @@
-import { defineProperty as _defineProperty } from '../_virtual/_rollupPluginBabelHelpers.js';
-import { addComment } from '../stringify/addComment.js';
-import { Type } from '../constants.js';
-import { createNode } from '../doc/createNode.js';
-import { Node } from './Node.js';
-import { Scalar } from './Scalar.js';
-
-function collectionFromPath(schema, path, value) {
-  let v = value;
-
-  for (let i = path.length - 1; i >= 0; --i) {
-    const k = path[i];
-
-    if (Number.isInteger(k) && k >= 0) {
-      const a = [];
-      a[k] = v;
-      v = a;
-    } else {
-      const o = {};
-      Object.defineProperty(o, k, {
-        value: v,
-        writable: true,
-        enumerable: true,
-        configurable: true
-      });
-      v = o;
-    }
-  }
-
-  return createNode(v, null, {
-    onAlias() {
-      throw new Error('Repeated objects are not supported here');
-    },
-
-    prevObjects: new Map(),
-    schema,
-    wrapScalars: false
-  });
-} // null, undefined, or an empty non-string iterable (e.g. [])
-
-const isEmptyPath = path => path == null || typeof path === 'object' && path[Symbol.iterator]().next().done;
-class Collection extends Node {
-  constructor(schema) {
-    super();
-
-    _defineProperty(this, "items", []);
-
-    this.schema = schema;
-  }
-
-  addIn(path, value) {
-    if (isEmptyPath(path)) this.add(value);else {
-      const [key, ...rest] = path;
-      const node = this.get(key, true);
-      if (node instanceof Collection) node.addIn(rest, value);else if (node === undefined && this.schema) this.set(key, collectionFromPath(this.schema, rest, value));else throw new Error("Expected YAML collection at ".concat(key, ". Remaining path: ").concat(rest));
-    }
-  }
-
-  deleteIn([key, ...rest]) {
-    if (rest.length === 0) return this.delete(key);
-    const node = this.get(key, true);
-    if (node instanceof Collection) return node.deleteIn(rest);else throw new Error("Expected YAML collection at ".concat(key, ". Remaining path: ").concat(rest));
-  }
-
-  getIn([key, ...rest], keepScalar) {
-    const node = this.get(key, true);
-    if (rest.length === 0) return !keepScalar && node instanceof Scalar ? node.value : node;else return node instanceof Collection ? node.getIn(rest, keepScalar) : undefined;
-  }
-
-  hasAllNullValues() {
-    return this.items.every(node => {
-      if (!node || node.type !== 'PAIR') return false;
-      const n = node.value;
-      return n == null || n instanceof Scalar && n.value == null && !n.commentBefore && !n.comment && !n.tag;
-    });
-  }
-
-  hasIn([key, ...rest]) {
-    if (rest.length === 0) return this.has(key);
-    const node = this.get(key, true);
-    return node instanceof Collection ? node.hasIn(rest) : false;
-  }
-
-  setIn([key, ...rest], value) {
-    if (rest.length === 0) {
-      this.set(key, value);
-    } else {
-      const node = this.get(key, true);
-      if (node instanceof Collection) node.setIn(rest, value);else if (node === undefined && this.schema) this.set(key, collectionFromPath(this.schema, rest, value));else throw new Error("Expected YAML collection at ".concat(key, ". Remaining path: ").concat(rest));
-    }
-  }
-  /* istanbul ignore next: overridden in implementations */
-
-
-  toJSON() {
-    return null;
-  }
-
-  toString(ctx, {
-    blockItem,
-    flowChars,
-    isMap,
-    itemIndent
-  }, onComment, onChompKeep) {
-    const {
-      indent,
-      indentStep,
-      stringify
-    } = ctx;
-    const inFlow = this.type === Type.FLOW_MAP || this.type === Type.FLOW_SEQ || ctx.inFlow;
-    if (inFlow) itemIndent += indentStep;
-    const allNullValues = isMap && this.hasAllNullValues();
-    ctx = Object.assign({}, ctx, {
-      allNullValues,
-      indent: itemIndent,
-      inFlow,
-      type: null
-    });
-    let chompKeep = false;
-    let hasItemWithNewLine = false;
-    const nodes = this.items.reduce((nodes, item, i) => {
-      let comment;
-
-      if (item) {
-        if (!chompKeep && item.spaceBefore) nodes.push({
-          type: 'comment',
-          str: ''
-        });
-        if (item.commentBefore) item.commentBefore.match(/^.*$/gm).forEach(line => {
-          nodes.push({
-            type: 'comment',
-            str: "#".concat(line)
-          });
-        });
-        if (item.comment) comment = item.comment;
-        if (inFlow && (!chompKeep && item.spaceBefore || item.commentBefore || item.comment || item.key && (item.key.commentBefore || item.key.comment) || item.value && (item.value.commentBefore || item.value.comment))) hasItemWithNewLine = true;
-      }
-
-      chompKeep = false;
-      let str = stringify(item, ctx, () => comment = null, () => chompKeep = true);
-      if (inFlow && !hasItemWithNewLine && str.includes('\n')) hasItemWithNewLine = true;
-      if (inFlow && i < this.items.length - 1) str += ',';
-      str = addComment(str, itemIndent, comment);
-      if (chompKeep && (comment || inFlow)) chompKeep = false;
-      nodes.push({
-        type: 'item',
-        str
-      });
-      return nodes;
-    }, []);
-    let str;
-
-    if (nodes.length === 0) {
-      str = flowChars.start + flowChars.end;
-    } else if (inFlow) {
-      const {
-        start,
-        end
-      } = flowChars;
-      const strings = nodes.map(n => n.str);
-
-      if (hasItemWithNewLine || strings.reduce((sum, str) => sum + str.length + 2, 2) > Collection.maxFlowStringSingleLineLength) {
-        str = start;
-
-        for (const s of strings) {
-          str += s ? "\n".concat(indentStep).concat(indent).concat(s) : '\n';
-        }
-
-        str += "\n".concat(indent).concat(end);
-      } else {
-        str = "".concat(start, " ").concat(strings.join(' '), " ").concat(end);
-      }
-    } else {
-      const strings = nodes.map(blockItem);
-      str = strings.shift();
-
-      for (const s of strings) str += s ? "\n".concat(indent).concat(s) : '\n';
-    }
-
-    if (this.comment) {
-      str += '\n' + this.comment.replace(/^/gm, "".concat(indent, "#"));
-      if (onComment) onComment();
-    } else if (chompKeep && onChompKeep) onChompKeep();
-
-    return str;
-  }
-
-}
-
-_defineProperty(Collection, "maxFlowStringSingleLineLength", 60);
-
-export { Collection, collectionFromPath, isEmptyPath };

package/browser/dist/ast/Merge.js

@@ -1,71 +0,0 @@
-import { Pair } from './Pair.js';
-import { Scalar } from './Scalar.js';
-import { YAMLMap } from './YAMLMap.js';
-import { YAMLSeq } from './YAMLSeq.js';
-
-const MERGE_KEY = '<<';
-class Merge extends Pair {
-  constructor(pair) {
-    if (pair instanceof Pair) {
-      let seq = pair.value;
-
-      if (!(seq instanceof YAMLSeq)) {
-        seq = new YAMLSeq();
-        seq.items.push(pair.value);
-        seq.range = pair.value.range;
-      }
-
-      super(pair.key, seq);
-      this.range = pair.range;
-    } else {
-      super(new Scalar(MERGE_KEY), new YAMLSeq());
-    }
-
-    this.type = Pair.Type.MERGE_PAIR;
-  } // 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
-  // sequence, then this sequence is expected to contain mapping nodes and each
-  // 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
-
-
-  addToJSMap(ctx, map) {
-    for (const {
-      source
-    } of this.value.items) {
-      if (!(source instanceof YAMLMap)) throw new Error('Merge sources must be maps');
-      const srcMap = source.toJSON(null, ctx, Map);
-
-      for (const [key, value] of srcMap) {
-        if (map instanceof Map) {
-          if (!map.has(key)) map.set(key, value);
-        } else if (map instanceof Set) {
-          map.add(key);
-        } else if (!Object.prototype.hasOwnProperty.call(map, key)) {
-          Object.defineProperty(map, key, {
-            value,
-            writable: true,
-            enumerable: true,
-            configurable: true
-          });
-        }
-      }
-    }
-
-    return map;
-  }
-
-  toString(ctx, onComment) {
-    const seq = this.value;
-    if (seq.items.length > 1) return super.toString(ctx, onComment);
-    this.value = seq.items[0];
-    const str = super.toString(ctx, onComment);
-    this.value = seq;
-    return str;
-  }
-
-}
-
-export { MERGE_KEY, Merge };

package/browser/dist/ast/Node.js

@@ -1,3 +0,0 @@
-class Node {}
-
-export { Node };