Merge branch 'types' into esm

* types:
  fix: don't need to make the TokContext and tokTypes public; pass attw validation
  fix: also fix duplicate identifier problem
  feat: add `TokContext` as type (now that not exported as type from acorn)

# Conflicts:
#	package.json

Author: brettz9

index.d.ts

@@ -1,21 +1,26 @@
 import * as acorn from 'acorn';
 
+declare class TokContext {
+  constructor(
+    token: string,
+    isExpr: boolean,
+    preserveSpace: boolean,
+    override?: (parser: any) => void
+  )
+}
+
 interface JsxTokTypes extends AcornTokTypes {
   jsxName: acorn.TokenType,
   jsxText: acorn.TokenType,
   jsxTagEnd: acorn.TokenType,
   jsxTagStart: acorn.TokenType
 }
 
-declare const jsx: {
-  tokTypes: JsxTokTypes;
-  (options?: jsx.Options): (BaseParser: typeof acorn.Parser) => jsx.AcornJsxParserCtor
-}
-
 type AcornTokTypes = typeof acorn.tokTypes;
 
-declare namespace jsx {
+declare function jsx(options?: jsx.Options): (BaseParser: typeof acorn.Parser) => jsx.AcornJsxParserCtor;
 
+declare namespace jsx {
   type TokTypes = JsxTokTypes
 
   interface Options {
@@ -24,9 +29,9 @@ declare namespace jsx {
   }
 
   interface TokContexts {
-    tc_oTag: acorn.TokContext,
-    tc_cTag: acorn.TokContext,
-    tc_expr: acorn.TokContext
+    tc_oTag: TokContext,
+    tc_cTag: TokContext,
+    tc_expr: TokContext
   }
 
   // We pick (statics) from acorn rather than plain extending to avoid complaint

package.json

@@ -22,6 +22,7 @@
   },
   "license": "MIT",
   "scripts": {
+    "attw": "attw --pack",
     "test": "node test/run.js",
     "build": "rollup -c",
     "prepublishOnly": "npm run build"
@@ -30,7 +31,8 @@
     "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
   },
   "devDependencies": {
-    "acorn": "^8.0.1",
+    "acorn": "^8.15.0",
+    "@arethetypeswrong/cli": "^0.18.2",
     "rollup": "^2.12.0"
   }
 }