BREAKING CHANGE: Switch to named exports only (fixes #386)

.gitignore

@@ -7,6 +7,7 @@ packages/ohm-js/dist/ohm-grammar.js.*
 packages/ohm-js/dist/*.old
 packages/ohm-js/dist/browserify-cache.json
 packages/ohm-js/dist/test-typings.js
+packages/packaging-tests/test-ts.js
 node_modules
 npm-debug.log
 yarn-error.log

examples/ecmascript/scripts/generate-ecmascript-grammar.mjs

@@ -1,6 +1,6 @@
 import assert from 'assert';
 import {readFileSync} from 'fs';
-import ohm from 'ohm-js';
+import * as ohm from 'ohm-js';
 import {exit} from 'process';
 
 const {raw} = String;

examples/ecmascript/src/es6.test.mjs

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import ohm from 'ohm-js';
+import * as ohm from 'ohm-js';
 import test from 'ava';
 
 import es5 from './es5.js';

examples/ecmascript/test/es2015.test.mjs

@@ -2,7 +2,7 @@ import assert from 'assert';
 import test from 'ava';
 import fastGlob from 'fast-glob';
 import fs from 'fs';
-import ohm from 'ohm-js';
+import * as ohm from 'ohm-js';
 import path from 'path';
 import {fileURLToPath} from 'url';
 

examples/markdown/markdown.mjs

@@ -1,4 +1,4 @@
-import ohm from 'ohm-js';
+import * as ohm from 'ohm-js';
 
 const H1 = content => ({type: 'H1', content});
 const H2 = content => ({type: 'H2', content});

examples/operators/operator-example.mjs

@@ -1,6 +1,6 @@
 // An experiment in representing an expression language four different ways in Ohm.
 
-import ohm from 'ohm-js';
+import * as ohm from 'ohm-js';
 
 // The expression language is the classic arithmetic operators over integer literals
 // and identifiers, which, in EBNF, is:

examples/prettyPrint.mjs

@@ -3,7 +3,7 @@
 import fs from 'fs';
 import * as url from 'url';
 
-import ohm from 'ohm-js';
+import * as ohm from 'ohm-js';
 
 /*
   Usage: prettyPrint.js <filename>

examples/simple-lisp/src/simple-lisp.mjs

@@ -1,6 +1,6 @@
 'use strict';
 
-import ohm from 'ohm-js';
+import * as ohm from 'ohm-js';
 
 export const grammar = ohm.grammar(`
 Lisp {

examples/typescript/src/arithmetic.ts

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import ohm from 'ohm-js';
+import * as ohm from 'ohm-js';
 
 /*
   In ../package.json, there is a 'generate' script that uses the Ohm command

packages/cli/src/commands/generateBundles/index.js

@@ -1,6 +1,6 @@
 import fastGlob from 'fast-glob';
 import fs from 'fs';
-import ohm from 'ohm-js';
+import * as ohm from 'ohm-js';
 import path from 'path';
 
 import {generateTypes} from '../../helpers/generateTypes.js';
@@ -69,7 +69,7 @@ function generateRecipe(grammarPath, grammars, writer, isEsm) {
   const isSingleGrammar = Object.keys(grammars).length === 1;
 
   let output = isEsm ?
-    "import ohm from 'ohm-js';" :
+    "import * as ohm from 'ohm-js';" :
     "'use strict';const ohm=require('ohm-js');";
 
   // If it's a single-grammar source file, the default export is the grammar.

packages/cli/src/commands/match.js

@@ -2,7 +2,7 @@
 
 import assert from 'assert';
 import fs from 'fs';
-import ohm from 'ohm-js';
+import * as ohm from 'ohm-js';
 import path from 'path';
 
 function match(inputPath, opts) {

packages/cli/src/helpers/generateTypes.test.ts

@@ -2,7 +2,7 @@
 
 import test from 'ava';
 import fs from 'fs';
-import ohm from 'ohm-js';
+import * as ohm from 'ohm-js';
 import {dedent} from 'ts-dedent';
 import {Project} from 'ts-morph';
 

packages/cli/src/helpers/getNodeTypes.js

@@ -1,4 +1,4 @@
-import ohm from 'ohm-js';
+import * as ohm from 'ohm-js';
 
 const {pexprs} = ohm;