es2022 class features

package.json

@@ -24,9 +24,9 @@
 	},
 	"license": "MIT",
 	"dependencies": {
+		"@types/estree": "^1.0.0",
 		"@jridgewell/sourcemap-codec": "^1.4.14",
-		"@types/estree": "^0.0.50",
-		"acorn": "^8.0.5",
+		"acorn": "^8.8.2",
 		"estree-walker": "^3.0.0",
 		"periscopic": "^3.0.4"
 	},

src/index.js

@@ -127,7 +127,7 @@ const EMPTY = { type: 'Empty' };
 const acorn_opts = (comments, raw) => {
 	const { onComment } = get_comment_handlers(comments, raw);
 	return {
-		ecmaVersion: 2020,
+		ecmaVersion: 2022,
 		sourceType: 'module',
 		allowAwaitOutsideFunction: true,
 		allowImportExportEverywhere: true,

src/print/handlers.js

@@ -19,10 +19,14 @@ import { push_array } from '../utils/push_array.js';
 /** @typedef {import('estree').Node} Node */
 /** @typedef {import('estree').ObjectExpression} ObjectExpression */
 /** @typedef {import('estree').Pattern} Pattern */
+/** @typedef {import('estree').Property} Property */
+/** @typedef {import('estree').PropertyDefinition} PropertyDefinition */
 /** @typedef {import('estree').SequenceExpression} SequenceExpression */
 /** @typedef {import('estree').SimpleCallExpression} SimpleCallExpression */
 /** @typedef {import('estree').SwitchStatement} SwitchStatement */
 /** @typedef {import('estree').VariableDeclaration} VariableDeclaration */
+/** @typedef {import('estree').StaticBlock} StaticBlock */
+/** @typedef {import('estree').PrivateIdentifier} PrivateIdenifier*/
 
 /**
  * @typedef {{
@@ -1372,6 +1376,50 @@ const handlers = {
 		}
 
 		return [c(node.raw || String(node.value), node)];
+	},
+
+	PropertyDefinition(/** @type {PropertyDefinition} */ node, state) {
+		const chunks = [];
+
+		if (node.static) {
+			chunks.push(c('static '));
+		}
+
+		if (node.computed) {
+			chunks.push(
+				c('['),
+				...handle(node.key, state),
+				c(']')
+			);
+		} else {
+			chunks.push(...handle(node.key, state));
+		}
+
+		if (node.value) {
+			chunks.push(c(' = '))
+
+			chunks.push(...handle(node.value, state));
+		}
+
+		chunks.push(c(';'));
+
+		return chunks;
+	},
+
+	StaticBlock(/** @type {StaticBlock} */ node, state) {
+		const chunks = [c('static ')];
+
+		push_array(chunks, handlers.BlockStatement(node, state));
+
+		return chunks;
+	},
+
+	PrivateIdentifier(/** @type {PrivateIdenifier} */node, state) {
+		const chunks = [c('#')];
+
+		push_array(chunks, [c(node.name, node)]);
+
+		return chunks;
 	}
 };
 

test/samples/class-private/expected.js

@@ -0,0 +1,33 @@
+class A {
+	#p;
+	static #p1;
+	static #p2;
+
+	static is(obj) {
+		return #p2 in obj;
+	}
+
+	get #p3() {
+
+	}
+
+	set #p3(v) {
+
+	}
+
+	#m1() {
+		return this.#p1;
+	}
+
+	static #m2() {
+
+	}
+
+	*#m3() {
+
+	}
+
+	async #m4() {
+
+	}
+}

test/samples/class-private/input.js

@@ -0,0 +1,18 @@
+export default ({ parse }) => parse(`class A {
+	#p
+	static #p1
+	static #p2
+
+	static is(obj) {
+		return #p2 in obj
+	}
+
+	get #p3() {}
+	set #p3(v) {}
+	#m1() {
+		return this.#p1
+	}
+	static #m2() {}
+	*#m3() {}
+	async #m4() {}
+}`);

test/samples/class-property/expected.js

@@ -0,0 +1,5 @@
+class Foo {
+	hi;
+	static foo = 1;
+	[KEY] = 2;
+}

test/samples/class-property/input.js

@@ -0,0 +1,7 @@
+export default ({ b }) => b`
+class Foo {
+	hi
+	static foo = 1;
+	[KEY] = 2
+}
+`;

test/samples/class-static-block/expected.js

@@ -0,0 +1,5 @@
+class Foo {
+	static {
+		this.abc = 1;
+	}
+}

test/samples/class-static-block/input.js

@@ -0,0 +1,7 @@
+export default ({ b }) => b`
+class Foo {
+    static {
+        this.abc = 1;
+    }
+}
+`;

test/test.js

@@ -31,6 +31,13 @@ const b = (s, ...v) => remove_ranges(codered.b(s, ...v));
 const x = (s, ...v) => remove_ranges(codered.x(s, ...v));
 const p = (s, ...v) => remove_ranges(codered.p(s, ...v));
 const print = codered.print;
+const parse = (s) => codered.parse(s, {
+	ecmaVersion: 2022,
+	sourceType: 'module',
+	allowAwaitOutsideFunction: true,
+	allowImportExportEverywhere: true,
+	allowReturnOutsideFunction: true,
+})
 
 /**
  * @param {string} name
@@ -465,7 +472,7 @@ suite('print', test => {
 
 			const url = new URL(`./samples/${dir}/input.js`, import.meta.url);
 			const mod = await import(fileURLToPath(url.href));
-			const input = mod.default({ b, x, p });
+			const input = mod.default({ b, x, p, parse });
 
 			const expected = {
 				code: read(`test/samples/${dir}/expected.js`),