fix!: publish as ESM, tree-shaking

Author: CodyJasonBennett

package.json

@@ -22,19 +22,7 @@
     "src/*"
   ],
   "type": "module",
-  "types": "./dist/index.d.ts",
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
-  "exports": {
-    "require": {
-      "types": "./dist/index.d.cts",
-      "default": "./dist/index.cjs"
-    },
-    "import": {
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
-    }
-  },
+  "exports": "./dist/index.js",
   "sideEffects": false,
   "devDependencies": {
     "@types/node": "^22.10.2",

src/generator.ts

@@ -1,4 +1,4 @@
-import { type AST, type Program } from './ast'
+import { type AST, type Program } from './ast.js'
 
 function formatLayout(layout: Record<string, string | boolean> | null): string {
   if (!layout) return ''

src/index.ts

@@ -1,6 +1,6 @@
-export * from './ast'
-export * from './constants'
-export * from './generator'
-export * from './minifier'
-export * from './parser'
-export * from './tokenizer'
+export * from './ast.js'
+export * from './constants.js'
+export * from './generator.js'
+export * from './minifier.js'
+export * from './parser.js'
+export * from './tokenizer.js'

src/minifier.ts

@@ -1,4 +1,4 @@
-import { type Token, tokenize } from './tokenizer'
+import { type Token, tokenize } from './tokenizer.js'
 
 export type MangleMatcher = (token: Token, index: number, tokens: Token[]) => boolean
 
@@ -11,11 +11,13 @@ export interface MinifyOptions {
   mangleExternals: boolean
 }
 
-const isWord = RegExp.prototype.test.bind(/^\w/)
-const isSymbol = RegExp.prototype.test.bind(/[^\w\\]/)
-const isName = RegExp.prototype.test.bind(/^[_A-Za-z]/)
-const isScoped = RegExp.prototype.test.bind(/[;{}\\@]/)
-const isStorage = RegExp.prototype.test.bind(/^(binding|group|layout|uniform|in|out|attribute|varying)$/)
+const isWord = /* @__PURE__ */ RegExp.prototype.test.bind(/^\w/)
+const isSymbol = /* @__PURE__ */ RegExp.prototype.test.bind(/[^\w\\]/)
+const isName = /* @__PURE__ */ RegExp.prototype.test.bind(/^[_A-Za-z]/)
+const isScoped = /* @__PURE__ */ RegExp.prototype.test.bind(/[;{}\\@]/)
+const isStorage = /* @__PURE__ */ RegExp.prototype.test.bind(
+  /^(binding|group|layout|uniform|in|out|attribute|varying)$/,
+)
 
 /**
  * Minifies a string of GLSL or WGSL code.

src/parser.ts

@@ -35,8 +35,8 @@ import {
   VariableDeclaration,
   VariableDeclarator,
   WhileStatement,
-} from './ast'
-import { type Token, tokenize } from './tokenizer'
+} from './ast.js'
+import { type Token, tokenize } from './tokenizer.js'
 
 // https://engineering.desmos.com/articles/pratt-parser
 // https://matklad.github.io/2020/04/13/simple-but-powerful-pratt-parsing.html
@@ -123,10 +123,10 @@ const TYPE_REGEX = /^(void|bool|float|u?int|[uib]?vec\d|mat\d(x\d)?)$/
 const QUALIFIER_REGEX = /^(const|uniform|in|out|inout|centroid|flat|smooth|invariant|lowp|mediump|highp)$/
 const VARIABLE_REGEX = new RegExp(`${TYPE_REGEX.source}|${QUALIFIER_REGEX.source}|layout`)
 
-const isDeclaration = RegExp.prototype.test.bind(VARIABLE_REGEX)
+const isDeclaration = /* @__PURE__ */ RegExp.prototype.test.bind(VARIABLE_REGEX)
 
-const isOpen = RegExp.prototype.test.bind(/^[\(\[\{]$/)
-const isClose = RegExp.prototype.test.bind(/^[\)\]\}]$/)
+const isOpen = /* @__PURE__ */ RegExp.prototype.test.bind(/^[\(\[\{]$/)
+const isClose = /* @__PURE__ */ RegExp.prototype.test.bind(/^[\)\]\}]$/)
 
 function getScopeDelta(token: Token): number {
   if (isOpen(token.value)) return 1

src/tokenizer.ts

@@ -1,4 +1,4 @@
-import { WGSL_KEYWORDS, WGSL_SYMBOLS, GLSL_KEYWORDS, GLSL_SYMBOLS } from './constants'
+import { WGSL_KEYWORDS, WGSL_SYMBOLS, GLSL_KEYWORDS, GLSL_SYMBOLS } from './constants.js'
 
 export type TokenType = 'whitespace' | 'comment' | 'symbol' | 'bool' | 'float' | 'int' | 'identifier' | 'keyword'
 
@@ -8,11 +8,11 @@ export interface Token<T = TokenType, V = string> {
 }
 
 // Checks for WGSL-specific `fn foo(`, `var bar =`, `let baz =`, `const qux =`
-const isWGSL = RegExp.prototype.test.bind(/\bfn\s+\w+\s*\(|\b(var|let|const)\s+\w+\s*[:=]/)
+const isWGSL = /* @__PURE__ */ RegExp.prototype.test.bind(/\bfn\s+\w+\s*\(|\b(var|let|const)\s+\w+\s*[:=]/)
 
-const isFloat = RegExp.prototype.test.bind(/^(\d+\.\d*|\d*\.\d+)([eEpP][-+]?\d+)?[fFhH]?$/)
-const isInt = RegExp.prototype.test.bind(/^(0[xX][\w\d]+|\d+)[iIuU]?$/)
-const isBool = RegExp.prototype.test.bind(/^(true|false)$/)
+const isFloat = /* @__PURE__ */ RegExp.prototype.test.bind(/^(\d+\.\d*|\d*\.\d+)([eEpP][-+]?\d+)?[fFhH]?$/)
+const isInt = /* @__PURE__ */ RegExp.prototype.test.bind(/^(0[xX][\w\d]+|\d+)[iIuU]?$/)
+const isBool = /* @__PURE__ */ RegExp.prototype.test.bind(/^(true|false)$/)
 
 const ZERO = 48
 const NINE = 57

tsconfig.json

@@ -9,7 +9,6 @@
     "pretty": true,
     "noEmit": true,
     "forceConsistentCasingInFileNames": true,
-    "allowSyntheticDefaultImports": true,
     "paths": {
       "shaderkit": ["./src"]
     }

vite.config.ts

@@ -9,10 +9,10 @@ export default vite.defineConfig({
     },
   },
   build: {
-    target: 'es2018',
+    target: 'esnext',
     sourcemap: true,
     lib: {
-      formats: ['es', 'cjs'],
+      formats: ['es'],
       entry: 'src/index.ts',
       fileName: '[name]',
     },
@@ -27,16 +27,19 @@ export default vite.defineConfig({
     {
       name: 'vite-tsc',
       generateBundle(options) {
-        const ext = options.format === 'cjs' ? 'cts' : 'ts'
-        this.emitFile({ type: 'asset', fileName: `index.d.${ext}`, source: `export * from '../src'` })
+        this.emitFile({ type: 'asset', fileName: 'index.d.ts', source: `export * from '../src/index.ts'` })
       },
     },
     {
       name: 'vite-minify',
       renderChunk: {
         order: 'post',
-        handler(code, { fileName }) {
-          return vite.transformWithEsbuild(code, fileName, { minify: true, target: 'es2018' })
+        async handler(code, { fileName }) {
+          // Preserve pure annotations, but remove all other comments and whitespace
+          code = code.replaceAll('/* @__PURE__ */', '__PURE__ || ')
+          const result = await vite.transformWithEsbuild(code, fileName, { minify: true, target: 'es2020' })
+          result.code = result.code.replaceAll('__PURE__||', '/*@__PURE__*/')
+          return result
         },
       },
     },