Merge pull request #19 from ChristianMurphy/type/node-16-esm-types

types: add export to package.json, test with strict mode and node16 resolution

package.json

@@ -7,6 +7,7 @@
   "module": "src/index.js",
   "type": "module",
   "exports": {
+    "types": "./types/index.js",
     "import": "./src/index.js"
   },
   "types": "types/index.d.ts",
@@ -15,9 +16,8 @@
     "types"
   ],
   "devDependencies": {
-    "@types/estree": "0.0.39",
-    "acorn": "^7.0.0",
-    "typescript": "^4.1.2",
+    "acorn": "^8.0.0",
+    "typescript": "^4.9.0",
     "uvu": "^0.5.1"
   },
   "scripts": {
@@ -26,6 +26,7 @@
   },
   "license": "MIT",
   "dependencies": {
+    "@types/estree": "^1.0.0",
     "estree-walker": "^3.0.0",
     "is-reference": "^3.0.0"
   }

src/index.js

@@ -15,17 +15,14 @@ export function analyze(expression) {
 
 	/** @type {[Scope, import('estree').Identifier][]} */
 	const references = [];
+	/** @type {Scope} */
 	let current_scope = scope;
 
 	walk(expression, {
-		/**
-		 * @param {Node} node
-		 * @param {any} parent
-		 */
 		enter(node, parent) {
 			switch (node.type) {
 				case 'Identifier':
-					if (is_reference(node, parent)) {
+					if (parent && is_reference(node, parent)) {
 						references.push([current_scope, node]);
 					}
 					break;
@@ -80,16 +77,17 @@ export function analyze(expression) {
 
 					if (node.param) {
 						extract_names(node.param).forEach(name => {
-							current_scope.declarations.set(name, node.param);
+							if (node.param) {
+								current_scope.declarations.set(name, node.param);
+							}
 						});
 					}
 					break;
 			}
 		},
 
-		/** @param {Node} node */
 		leave(node) {
-			if (map.has(node)) {
+			if (map.has(node) && current_scope !== null && current_scope.parent) {
 				current_scope = current_scope.parent;
 			}
 		}
@@ -110,7 +108,6 @@ export function analyze(expression) {
 }
 
 /**
- *
  * @param {Scope} scope
  * @param {string} name
  */
@@ -120,6 +117,10 @@ function add_reference(scope, name) {
 }
 
 export class Scope {
+	/**
+	 * @param {Scope | null} parent 
+	 * @param {boolean} block 
+	 */
 	constructor(parent, block) {
 		/** @type {Scope | null} */
 		this.parent = parent;
@@ -137,7 +138,9 @@ export class Scope {
 		this.references = new Set();
 	}
 
-	/** @param {import('estree').VariableDeclaration | import('estree').ClassDeclaration} node */
+	/**
+	 * @param {import('estree').VariableDeclaration | import('estree').ClassDeclaration} node
+	 */
 	add_declaration(node) {
 		if (node.type === 'VariableDeclaration') {
 			if (node.kind === 'var' && this.block && this.parent) {
@@ -224,7 +227,11 @@ export function extract_identifiers(param, nodes = []) {
 				if (element) extract_identifiers(element, nodes);
 			};
 
-			param.elements.forEach(handle_element);
+			param.elements.forEach((element) => {
+				if (element) {
+					handle_element(element)
+				}
+			});
 			break;
 
 		case 'RestElement':

test/test.js

@@ -1,6 +1,6 @@
 import * as uvu from 'uvu';
 import * as assert from 'uvu/assert';
-import acorn from 'acorn';
+import * as acorn from 'acorn';
 import { analyze, extract_identifiers, extract_names } from '../src/index.js';
 import { walk } from 'estree-walker';
 

tsconfig.json

@@ -1,11 +1,11 @@
 {
 	"compilerOptions": {
-		"allowJs": true,
 		"checkJs": true,
+		"strict": true,
+		"module": "node16",
 		"target": "es2017",
 		"declaration": true,
 		"emitDeclarationOnly": true,
-		"moduleResolution": "node",
 		"outDir": "types"
 	},