Merge pull request #256 from peggyjs/1.3

Merge 1.3 branch in as v2.0.0

.bs-config.js

@@ -0,0 +1,55 @@
+"use strict";
+
+/*
+ |--------------------------------------------------------------------------
+ | Browser-sync config file
+ |--------------------------------------------------------------------------
+ |
+ | For up-to-date information about the options:
+ |   http://www.browsersync.io/docs/options/
+ |
+ | There are more options than you see here, these are just the ones that are
+ | set internally. See the website for more info.
+ |
+ |
+ */
+module.exports = {
+  "ui": false,
+  "files": false,
+  "watchEvents": [
+    "change",
+  ],
+  "watch": true,
+  "watchOptions": {
+    "ignoreInitial": true,
+  },
+  "server": {
+    baseDir: "./docs",
+    routes: {
+      "/coverage": "./coverage/lcov-report",
+    },
+  },
+  "port": 5000,
+  "ghostMode": false,
+  "logLevel": "info",
+  "logPrefix": "peggyjs.org",
+  "logConnections": false,
+  "logFileChanges": true,
+  "logSnippet": true,
+  "open": "local",
+  "browser": "default",
+  "cors": false,
+  "hostnameSuffix": false,
+  "reloadOnRestart": true,
+  "notify": true,
+  "reloadDebounce": 500,
+  "injectChanges": true,
+  "startPath": null,
+  "minify": false,
+  "host": null,
+  "listen": "localhost",
+  "localOnly": false,
+  "codeSync": true,
+  "timestamps": true,
+  "injectNotification": false,
+};

.eslintrc.js

@@ -5,8 +5,8 @@ module.exports = {
   extends: "@peggyjs",
   ignorePatterns: [
     "docs/",
-    "bin/peggy.js", // Generated
     "lib/parser.js", // Generated
+    "examples/*.js", // Testing examples
     "test/vendor/",
     "test/cli/fixtures/bad.js", // Intentionally-invalid
     "benchmark/vendor/",
@@ -18,7 +18,38 @@ module.exports = {
   overrides: [
     {
       files: ["rollup.config.js", "*.mjs"],
-      parserOptions: { sourceType: "module" },
+      parserOptions: {
+        sourceType: "module",
+        ecmaVersion: 2018,
+      },
+      rules: {
+        "comma-dangle": ["error", {
+          arrays: "always-multiline",
+          objects: "always-multiline",
+          imports: "always-multiline",
+          exports: "always-multiline",
+          functions: "never",
+        }],
+      },
+    },
+    {
+      files: ["bin/*.js"],
+      parserOptions: {
+        // Doesn't have to run in a browser, and Node 10 not supported.
+        ecmaVersion: 2020,
+      },
+      env: {
+        node: true,
+      },
+      rules: {
+        "comma-dangle": ["error", {
+          arrays: "always-multiline",
+          objects: "always-multiline",
+          imports: "always-multiline",
+          exports: "always-multiline",
+          functions: "never",
+        }],
+      },
     },
   ],
 };

.github/workflows/node.js.yml

@@ -5,14 +5,14 @@ on:
     branches:
       - '*'
   pull_request:
-    branches: [main]
+    branches: ['*']
 
 jobs:
   build:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x, 15.x, 16.x]
+        node-version: [12.x, 14.x, 15.x, 16.x, 18.x]
         os: [ubuntu-latest, windows-latest, macos-latest]
 
     runs-on: ${{ matrix.os }}
@@ -26,6 +26,7 @@ jobs:
       - name: Install dependencies
         run: npm install
       - name: Check coding standards
+        if: matrix.node-version == '16.x' && matrix.os == 'ubuntu-latest'
         run: npm run lint
       - name: Static analysis - check types
         run: npm run ts

.npmignore

@@ -1,24 +1,25 @@
+.bs-config.js
 .editorconfig
 .eslintrc-modules.js
 .eslintrc.js
+.gitattributes
 .github
+.nyc_output
 .vscode/
+*.map
 benchmark
-bin/.eslintrc.json
+bin/*.mjs
 build/
 coverage/
 docs
 examples
+jest.config.js
 lib/.eslintrc.json
 pnpm-lock.yaml
 rollup.config.js
 src
 test
 tools
 tsconfig.json
+web-test/
 yarn.lock
-jest.config.js
-.nyc_output
-*.map
-bin/*.mjs
-.gitattributes

AUTHORS

@@ -13,6 +13,7 @@ Arlo Breault <arlolra@gmail.com> (https://github.com/arlolra/)
 Balázs Kutil <bkutil@users.noreply.github.com> (https://github.com/bkutil/)
 Caleb Hearon <crh0872@gmail.com> (https://github.com/chearon/)
 Charles Pick <charles@codemix.com> (https://github.com/phpnode/)
+Christian Flach <github@christianflach.de> (https://github.com/cmfcmf/)
 David Berneda <david@steema.com>
 Futago-za Ryuu <futagoza.ryuu@gmail.com> (https://github.com/futagoza/)
 Jakub Vrana <jakub@vrana.cz> (https://github.com/vrana/)

CHANGELOG.md

@@ -3,22 +3,73 @@ Change Log
 
 This file documents all notable changes to Peggy.
 
-1.3.0
+2.0.0
 -----
 
 Released: TBD
 
+### Major Changes
+
+- [#163](https://github.com/peggyjs/peggy/pull/163): Add support for
+  generating source maps, from @Mingun
+- [#160](https://github.com/peggyjs/peggy/pull/160): Introduce an API for
+  reporting errors, warnings and information messages from passes. New API
+  allows reporting several diagnostics at once with intermediate results
+  checking after each compilation stage, from @Mingun
+- [#218](https://github.com/peggyjs/peggy/pull/218): Add a `sourceMappingURL`
+  to the generated code, from @hildjj
+- [#248](https://github.com/peggyjs/peggy/pull/248): Remove support for
+  Node.js version 10.  When updating dependencies, too many of the tools we
+  use no longer work on the Node 10, which went out of security maintenance
+  more than a year ago.  Added support for Node.js version 18, from @hildjj
+- [#251](https://github.com/peggyjs/peggy/pull/251): Make `commander` and
+  `source-map-generator` full dependencies.  These are not needed for the
+  pre-packaged web build, but will be used by Node or people that are doing
+  their own packaging for the web, from @hildjj
+
 ### Minor Changes
 
-- New CLI [@hildjj](https://github.com/peggyjs/peggy/pull/167)
+- [#167](https://github.com/peggyjs/peggy/pull/167): New CLI, from @hildjj
   - Backward compatible with the previous
   - New -t/--test and -T/--testfile flags to directly test the generated grammar
-- Check allowedStartRules for validity [@hildjj](https://github.com/peggyjs/peggy/pull/175)
+- [#169](https://github.com/peggyjs/peggy/issues/169): Expose string escape
+  functions, `stringEscape()` and `regexpClassEscape()`, from @hildjj
+- [#175](https://github.com/peggyjs/peggy/pull/175): Check allowedStartRules
+  for validity, from @hildjj
+- [#185](https://github.com/peggyjs/peggy/pull/185): Updated eslint rules,
+  from @hildjj
+- [#196](https://github.com/peggyjs/peggy/pull/196): Add example grammars for
+  XML and source-mapping, from @hildjj
+- [#204](https://github.com/peggyjs/peggy/pull/204): Increase coverage for the
+  tests, from @Mingun
+- [#210](https://github.com/peggyjs/peggy/pull/210): Refactor CLI testing,
+  from @hildjj
 
 ### Bug fixes
 
-- [#164](https://github.com/peggyjs/peggy/pull/164): Fix some errors in the typescript definitions
-- [#169](https://github.com/peggyjs/peggy/issues/169): Expose string escape functions
+- [#164](https://github.com/peggyjs/peggy/pull/164): Fix some errors in the
+  typescript definitions, from @Mingun
+- [#170](https://github.com/peggyjs/peggy/issues/170): Add
+  missing argument in function call, from @darlanalves
+- [#182](https://github.com/peggyjs/peggy/issues/182): Fix typo in
+  documentation, from @zargold
+- [#197](https://github.com/peggyjs/peggy/pull/197): Fix a regression of
+  redundant commas in the character classes in the error messages, introduced
+  in fad4ab74d1de67ef1902cd22d479c81ccab73224, from @Mingun
+- [#198](https://github.com/peggyjs/peggy/pull/198): Make all build scripts
+  run on Windows, from @hildjj
+- [#199](https://github.com/peggyjs/peggy/pull/199): Test web version locally,
+  using puppeteer, from @hildjj
+- [#211](https://github.com/peggyjs/peggy/pull/211):Command-line -t requires
+  from wrong directory, from @hildjj
+- [#212](https://github.com/peggyjs/peggy/pull/212): Parse errors with zero
+  length give badly-formatted errors, from @hildjj
+- [#214](https://github.com/peggyjs/peggy/pull/214): Failing tests don't
+  format errors
+- [#216](https://github.com/peggyjs/peggy/issues/216): Fix typescript
+  definition of SyntaxError, from @cmfcmf
+- [#220](https://github.com/peggyjs/peggy/issues/220): Fix rollup warnings,
+  from @hildjj
 
 1.2.0
 -----

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2010-2021 The Peggy AUTHORS
+Copyright (c) 2010-2022 The Peggy AUTHORS
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal