Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: eemeli/yaml
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.9.1
Choose a base ref
...
head repository: eemeli/yaml
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.9.2
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Apr 20, 2020

  1. ts: Fix Node.toJSON() type (Fixes #154)

    @eemeli
    eemeli committed Apr 20, 2020
    Copy the full SHA
    31c3b32 View commit details

  2. Add test script for typings; run it in CI

    @eemeli
    eemeli committed Apr 20, 2020
    Copy the full SHA
    f8b7ab9 View commit details

  3. 1.9.2

    @eemeli
    eemeli committed Apr 20, 2020
    Copy the full SHA
    0013206 View commit details
Showing with 16 additions and 6 deletions.
  1. +3 −2 .travis.yml
  2. +7 −1 package-lock.json
  3. +4 −2 package.json
  4. +2 −1 types.d.ts
5 changes: 3 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -11,12 +11,13 @@ addons:

jobs:
include:
- stage: lint
- stage: Lint & TypeScript
node_js: node
script:
- npm run lint
- npm run test:types

- stage: browser tests
- stage: Browser tests
node_js: node
script:
- npm run build
8 changes: 7 additions & 1 deletion package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "yaml",
"version": "1.9.1",
"version": "1.9.2",
"license": "ISC",
"author": "Eemeli Aro <eemeli@gmail.com>",
"repository": "github:eemeli/yaml",
@@ -69,6 +69,7 @@
"start": "npm run dist:build && node -i -e 'YAML=require(\".\")'",
"test": "cross-env TRACE_LEVEL=log jest",
"test:trace": "cross-env TRACE_LEVEL=trace,log jest --no-cache",
"test:types": "tsc --lib ES2017 --noEmit tests/typings.ts",
"docs:install": "cd docs-slate && bundle install",
"docs:deploy": "cd docs-slate && ./deploy.sh",
"docs": "cd docs-slate && bundle exec middleman server",
@@ -110,7 +111,8 @@
"eslint-plugin-prettier": "^3.1.3",
"fast-check": "^1.24.1",
"jest": "^25.3.0",
"prettier": "^2.0.4"
"prettier": "^2.0.4",
"typescript": "^3.8.3"
},
"dependencies": {
"@babel/runtime": "^7.9.2"
3 changes: 2 additions & 1 deletion types.d.ts
View file
Original file line number Diff line number Diff line change
@@ -196,6 +196,7 @@ export namespace Schema {

export class Scalar extends AST.Node {
constructor(value: any)
toJSON(arg?: any, ctx?: AST.NodeToJsonContext): any
type?: Scalar.Type
/**
* By default (undefined), numbers use decimal notation.
@@ -276,7 +277,7 @@ export namespace AST {
/** A fully qualified tag, if required */
tag?: string
/** A plain JS representation of this node */
toJSON(arg?: any, ctx?: NodeToJsonContext): any
toJSON(arg?: any): any
/** The type of this node */
type?: Type | Pair.Type
}