Browse Source

Pass spec code through Babel before serving it to the browser

This will allow to use ES2015 constructs in spec code.

The change required introducing a small server, which serves both PEG.js
and spec code passed through Babel and bundled together. This allowed to
convert the specs to regular modules and get rid of the hackery that was
previously needed to make them run both in Node.js and in the browser.

Note the specs no longer exercise the browser version. This will allow
to spec PEG.js internals in the future.

See #442.
redux
David Majda 5 years ago
parent
commit
5c40fff136
  1. 3
      Makefile
  2. 1
      spec/.eslintrc.json
  3. 14
      spec/README.md
  4. 4
      spec/api/generated-parser-api.spec.js
  5. 4
      spec/api/pegjs-api.spec.js
  6. 4
      spec/api/plugin-api.spec.js
  7. 4
      spec/behavior/generated-parser-behavior.spec.js
  8. 9
      spec/helpers.js
  9. 16
      spec/index.html
  10. 37
      spec/server
  11. 4
      spec/unit/compiler/passes/generate-bytecode.spec.js
  12. 4
      spec/unit/compiler/passes/helpers.js
  13. 4
      spec/unit/compiler/passes/remove-proxy-rules.spec.js
  14. 4
      spec/unit/compiler/passes/report-duplicate-labels.spec.js
  15. 4
      spec/unit/compiler/passes/report-duplicate-rules.spec.js
  16. 4
      spec/unit/compiler/passes/report-infinite-recursion.spec.js
  17. 4
      spec/unit/compiler/passes/report-infinite-repetition.spec.js
  18. 4
      spec/unit/compiler/passes/report-undefined-rules.spec.js
  19. 4
      spec/unit/parser.spec.js

3
Makefile

@ -24,6 +24,8 @@ PARSER_OUT_FILE_NEW = $(LIB_DIR)/parser.js.new
BROWSER_FILE_DEV = $(BROWSER_DIR)/peg-$(PEGJS_VERSION).js
BROWSER_FILE_MIN = $(BROWSER_DIR)/peg-$(PEGJS_VERSION).min.js
SPEC_SERVER_FILE = $(SPEC_DIR)/server
VERSION_FILE = VERSION
# ===== Executables =====
@ -103,6 +105,7 @@ lint:
$(ESLINT) \
`find $(LIB_DIR) -name '*.js'` \
`find $(SPEC_DIR) -name '*.js' -and -not -path '$(SPEC_DIR)/vendor/*'` \
$(SPEC_SERVER_FILE) \
$(BENCHMARK_DIR)/*.js \
$(BENCHMARK_RUN) \
$(PEGJS)

1
spec/.eslintrc.json

@ -1,5 +1,6 @@
{
"env": {
"commonjs": true,
"jasmine": true
}
}

14
spec/README.md

@ -38,18 +38,12 @@ All commands in the following steps need to be executed in PEG.js root directory
$ npm install
```
3. Build browser version of PEG.js:
3. Serve the spec suite using a web server:
```console
$ make browser
$ spec/server
```
4. Serve PEG.js root directory using a web server:
4. Point your browser to the [spec suite](http://localhost:8000/).
```console
$ node_modules/.bin/http-server
```
5. Point your browser to the [spec suite](http://localhost:8080/spec/index.html).
6. Watch the specs pass (or fail).
5. Watch the specs pass (or fail).

4
spec/api/generated-parser-api.spec.js

@ -1,8 +1,10 @@
/* eslint no-console: 0 */
/* global peg, console */
/* global console */
"use strict";
var peg = require("../../lib/peg");
describe("generated parser API", function() {
describe("parse", function() {
it("parses input", function() {

4
spec/api/pegjs-api.spec.js

@ -1,7 +1,7 @@
/* global peg */
"use strict";
var peg = require("../../lib/peg");
describe("PEG.js API", function() {
describe("generate", function() {
it("generates a parser", function() {

4
spec/api/plugin-api.spec.js

@ -1,7 +1,7 @@
/* global peg */
"use strict";
var peg = require("../../lib/peg");
describe("plugin API", function() {
beforeEach(function() {
this.addMatchers({

4
spec/behavior/generated-parser-behavior.spec.js

@ -1,8 +1,10 @@
/* eslint no-console: 0 */
/* global peg, console */
/* global console */
"use strict";
var peg = require("../../lib/peg");
describe("generated parser behavior", function() {
function varyOptimizationOptions(block) {
function clone(object) {

9
spec/helpers.js

@ -1,9 +0,0 @@
/* global require */
"use strict";
(function(root) {
if (typeof module !== 'undefined') {
root.peg = require("../lib/peg.js");
}
}(this));

16
spec/index.html

@ -6,21 +6,7 @@
<link rel="stylesheet" href="vendor/jasmine/jasmine.css">
<script src="vendor/jasmine/jasmine.js"></script>
<script src="vendor/jasmine/jasmine-html.js"></script>
<script src="../browser/peg-0.10.0.js"></script>
<script src="helpers.js"></script>
<script src="unit/parser.spec.js"></script>
<script src="unit/compiler/passes/helpers.js"></script>
<script src="unit/compiler/passes/report-undefined-rules.spec.js"></script>
<script src="unit/compiler/passes/report-duplicate-rules.spec.js"></script>
<script src="unit/compiler/passes/report-duplicate-labels.spec.js"></script>
<script src="unit/compiler/passes/report-infinite-recursion.spec.js"></script>
<script src="unit/compiler/passes/report-infinite-repetition.spec.js"></script>
<script src="unit/compiler/passes/remove-proxy-rules.spec.js"></script>
<script src="unit/compiler/passes/generate-bytecode.spec.js"></script>
<script src="api/pegjs-api.spec.js"></script>
<script src="api/plugin-api.spec.js"></script>
<script src="api/generated-parser-api.spec.js"></script>
<script src="behavior/generated-parser-behavior.spec.js"></script>
<script src="bundle.js"></script>
<script>
(function() {
var env = jasmine.getEnv(),

37
spec/server

@ -0,0 +1,37 @@
#!/usr/bin/env node
/* eslint-env node */
/* eslint no-console: 0 */
/*
* Small server whose main purpose is to ensure that both the specced code and
* the specs get passed through Babel & Browserify before they are served to the
* browser.
*/
var express = require("express"),
logger = require("morgan"),
glob = require("glob"),
browserify = require("browserify"),
babelify = require("babelify");
var app = express();
app.use(logger("dev"));
app.use(express.static(__dirname));
app.get("/bundle.js", function(req, res) {
var files = glob.sync(__dirname + "/**/*.js", {
ignore: __dirname + "/vendor/**/*"
});
browserify(files)
.transform(babelify, { presets: "es2015", compact: false })
.bundle()
.pipe(res);
});
app.listen(8000, function() {
console.log("Spec server running at http://localhost:8000...");
});

4
spec/unit/compiler/passes/generate-bytecode.spec.js

@ -1,7 +1,7 @@
/* global peg */
"use strict";
var peg = require("../../../../lib/peg");
describe("compiler pass |generateBytecode|", function() {
var pass = peg.compiler.passes.generate.generateBytecode;

4
spec/unit/compiler/passes/helpers.js

@ -1,7 +1,7 @@
/* global peg */
"use strict";
var peg = require("../../../../lib/peg");
beforeEach(function() {
this.addMatchers({
toChangeAST: function(grammar, details, options) {

4
spec/unit/compiler/passes/remove-proxy-rules.spec.js

@ -1,7 +1,7 @@
/* global peg */
"use strict";
var peg = require("../../../../lib/peg");
describe("compiler pass |removeProxyRules|", function() {
var pass = peg.compiler.passes.transform.removeProxyRules;

4
spec/unit/compiler/passes/report-duplicate-labels.spec.js

@ -1,7 +1,7 @@
/* global peg */
"use strict";
var peg = require("../../../../lib/peg");
describe("compiler pass |reportDuplicateLabels|", function() {
var pass = peg.compiler.passes.check.reportDuplicateLabels;

4
spec/unit/compiler/passes/report-duplicate-rules.spec.js

@ -1,7 +1,7 @@
/* global peg */
"use strict";
var peg = require("../../../../lib/peg");
describe("compiler pass |reportDuplicateRules|", function() {
var pass = peg.compiler.passes.check.reportDuplicateRules;

4
spec/unit/compiler/passes/report-infinite-recursion.spec.js

@ -1,7 +1,7 @@
/* global peg */
"use strict";
var peg = require("../../../../lib/peg");
describe("compiler pass |reportInfiniteRecursion|", function() {
var pass = peg.compiler.passes.check.reportInfiniteRecursion;

4
spec/unit/compiler/passes/report-infinite-repetition.spec.js

@ -1,7 +1,7 @@
/* global peg */
"use strict";
var peg = require("../../../../lib/peg");
describe("compiler pass |reportInfiniteRepetition|", function() {
var pass = peg.compiler.passes.check.reportInfiniteRepetition;

4
spec/unit/compiler/passes/report-undefined-rules.spec.js

@ -1,7 +1,7 @@
/* global peg */
"use strict";
var peg = require("../../../../lib/peg");
describe("compiler pass |reportUndefinedRules|", function() {
var pass = peg.compiler.passes.check.reportUndefinedRules;

4
spec/unit/parser.spec.js

@ -1,7 +1,7 @@
/* global peg */
"use strict";
var peg = require("../../lib/peg");
describe("PEG.js grammar parser", function() {
var literalAbcd = { type: "literal", value: "abcd", ignoreCase: false },
literalEfgh = { type: "literal", value: "efgh", ignoreCase: false },

Loading…
Cancel
Save