shaderkit 0.1.10 → 0.1.12

package/src/index.ts

@@ -1,3 +1,3 @@
-export * from './constants'
-export * from './minifier'
-export * from './tokenizer'
+export * from './constants'
+export * from './minifier'
+export * from './tokenizer'

package/src/minifier.ts

@@ -1,100 +1,115 @@
-import { type Token, tokenize } from './tokenizer'
-
-export type MangleMatcher = (token: Token, index: number, tokens: Token[]) => boolean
-
-export interface MinifyOptions {
-  /** Whether to rename variables. Will call a {@link MangleMatcher} if specified. Default is `false`. */
-  mangle: boolean | MangleMatcher
-  /** A map to read and write renamed variables to when mangling. */
-  mangleMap: Map<string, string>
-  /** Whether to rename external variables such as uniforms or varyings. Default is `false`. */
-  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 isStorage = RegExp.prototype.test.bind(/^(uniform|in|out|attribute|varying|,)$/)
-
-/**
- * Minifies a string of GLSL or WGSL code.
- */
-export function minify(
-  code: string,
-  { mangle = false, mangleMap = new Map(), mangleExternals = false }: Partial<MinifyOptions> = {},
-): string {
-  // Escape newlines after directives, skip comments
-  code = code.replace(/(^\s*#[^\\]*?)(\n|\/[\/\*])/gm, '$1\\$2')
-
-  const exclude = new Set<string>(mangleMap.values())
-  const tokens: Token[] = tokenize(code).filter((token) => token.type !== 'whitespace' && token.type !== 'comment')
-
-  let mangleIndex: number = 0
-  let blockIndex: number | null = null
-  let minified: string = ''
-  for (let i = 0; i < tokens.length; i++) {
-    const token = tokens[i]
-
-    // Pad alphanumeric tokens
-    if (isWord(token.value) && isWord(tokens[i - 1]?.value)) minified += ' '
-
-    // Mark enter/leave block-scope
-    if (token.value === '{' && isName(tokens[i - 1]?.value)) blockIndex = i - 1
-    else if (token.value === '}') blockIndex = null
-
-    // Pad symbols around #define and three.js #include (white-space sensitive)
-    if (
-      isSymbol(token.value) &&
-      ((tokens[i - 2]?.value === '#' && tokens[i - 1]?.value === 'include') ||
-        (tokens[i - 3]?.value === '#' && tokens[i - 2]?.value === 'define'))
-    )
-      minified += ' '
-
-    // Mangle declarations and their references
-    if (
-      token.type === 'identifier' &&
-      // Filter variable names
-      token.value !== 'main' &&
-      (typeof mangle === 'boolean' ? mangle : mangle(token, i, tokens))
-    ) {
-      let renamed = mangleMap.get(token.value)
-      if (
-        // no-op
-        !renamed &&
-        // Skip struct properties
-        blockIndex == null &&
-        // Is declaration, reference, namespace, or comma-separated list
-        (isName(tokens[i - 1]?.value) ||
-          // uniform Type { ... } name;
-          (tokens[i - 1]?.value === '}' && tokens[i + 1]?.value === ';') ||
-          // float foo, bar;
-          tokens[i - 1]?.value === ',' ||
-          // fn (arg: type) -> void
-          tokens[i + 1]?.value === ':') &&
-        // Skip shader externals when disabled
-        (mangleExternals || (!isStorage(tokens[i - 1]?.value) && !isStorage(tokens[i - 2]?.value)))
-      ) {
-        while (!renamed || exclude.has(renamed)) {
-          renamed = ''
-          mangleIndex++
-
-          let j = mangleIndex
-          while (j > 0) {
-            renamed = String.fromCharCode(97 + ((j - 1) % 26)) + renamed
-            j = Math.floor(j / 26)
-          }
-        }
-
-        mangleMap.set(token.value, renamed)
-      }
-
-      minified += renamed ?? token.value
-    } else {
-      if (token.value === '#' && tokens[i - 1]?.value !== '\\') minified += '\n#'
-      else if (token.value === '\\') minified += '\n'
-      else minified += token.value
-    }
-  }
-
-  return minified.trim()
-}
+import { type Token, tokenize } from './tokenizer'
+
+export type MangleMatcher = (token: Token, index: number, tokens: Token[]) => boolean
+
+export interface MinifyOptions {
+  /** Whether to rename variables. Will call a {@link MangleMatcher} if specified. Default is `false`. */
+  mangle: boolean | MangleMatcher
+  /** A map to read and write renamed variables to when mangling. */
+  mangleMap: Map<string, string>
+  /** Whether to rename external variables such as uniforms or varyings. Default is `false`. */
+  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 isStorage = RegExp.prototype.test.bind(/^(binding|group|layout|uniform|in|out|attribute|varying|,)$/)
+
+/**
+ * Minifies a string of GLSL or WGSL code.
+ */
+export function minify(
+  code: string,
+  { mangle = false, mangleMap = new Map(), mangleExternals = false }: Partial<MinifyOptions> = {},
+): string {
+  // Escape newlines after directives, skip comments
+  code = code.replace(/(^\s*#[^\\]*?)(\n|\/[\/\*])/gm, '$1\\$2')
+
+  const mangleCache = new Map()
+  const exclude = new Set<string>(mangleMap.values())
+  const tokens: Token[] = tokenize(code).filter((token) => token.type !== 'whitespace' && token.type !== 'comment')
+
+  let mangleIndex: number = 0
+  let blockIndex: number | null = null
+  let minified: string = ''
+  for (let i = 0; i < tokens.length; i++) {
+    const token = tokens[i]
+
+    // Pad alphanumeric tokens
+    if (isWord(token.value) && isWord(tokens[i - 1]?.value)) minified += ' '
+
+    // Mark enter/leave block-scope
+    if (token.value === '{' && isName(tokens[i - 1]?.value)) blockIndex = i - 1
+    else if (token.value === '}') blockIndex = null
+
+    // Pad symbols around #define and three.js #include (white-space sensitive)
+    if (
+      isSymbol(token.value) &&
+      ((tokens[i - 2]?.value === '#' && tokens[i - 1]?.value === 'include') ||
+        (tokens[i - 3]?.value === '#' && tokens[i - 2]?.value === 'define'))
+    )
+      minified += ' '
+
+    // Mangle declarations and their references
+    if (
+      token.type === 'identifier' &&
+      // Filter variable names
+      token.value !== 'main' &&
+      (typeof mangle === 'boolean' ? mangle : mangle(token, i, tokens))
+    ) {
+      const namespace = tokens[i - 1]?.value === '}' && tokens[i + 1]?.value === ';'
+      const storage = isStorage(tokens[i - 1]?.value) || isStorage(tokens[i - 2]?.value)
+      let renamed = mangleMap.get(token.value) ?? mangleCache.get(token.value)
+      if (
+        // no-op
+        !renamed &&
+        // Skip struct properties
+        blockIndex == null &&
+        // Is declaration, reference, namespace, or comma-separated list
+        (isName(tokens[i - 1]?.value) ||
+          // uniform Type { ... } name;
+          namespace ||
+          // float foo, bar;
+          tokens[i - 1]?.value === ',' ||
+          // fn (arg: type) -> void
+          tokens[i + 1]?.value === ':') &&
+        // Skip shader externals when disabled
+        (mangleExternals || !storage)
+      ) {
+        while (!renamed || exclude.has(renamed)) {
+          renamed = ''
+          mangleIndex++
+
+          let j = mangleIndex
+          while (j > 0) {
+            renamed = String.fromCharCode(97 + ((j - 1) % 26)) + renamed
+            j = Math.floor(j / 26)
+          }
+        }
+
+        // Write shader externals and preprocessor defines to mangleMap for multiple passes
+        // TODO: do so via scope tracking
+        const isExternal =
+          // Shader externals
+          (mangleExternals && storage) ||
+          // Defines
+          tokens[i - 2]?.value === '#' ||
+          // Namespaced uniform structs
+          namespace ||
+          // WGSL entrypoints via @stage or @workgroup_size(...)
+          (tokens[i - 1]?.value === 'fn' && (tokens[i - 2]?.value === ')' || tokens[i - 3]?.value === '@'))
+        const cache = isExternal ? mangleMap : mangleCache
+        cache.set(token.value, renamed)
+      }
+
+      minified += renamed ?? token.value
+    } else {
+      if (token.value === '#' && tokens[i - 1]?.value !== '\\') minified += '\n#'
+      else if (token.value === '\\') minified += '\n'
+      else minified += token.value
+    }
+  }
+
+  return minified.trim()
+}

package/src/tokenizer.ts

@@ -1,78 +1,78 @@
-import { WGSL_KEYWORDS, WGSL_SYMBOLS, GLSL_KEYWORDS, GLSL_SYMBOLS } from './constants'
-
-export type TokenType = 'whitespace' | 'comment' | 'symbol' | 'bool' | 'float' | 'int' | 'identifier' | 'keyword'
-
-export interface Token<T = TokenType, V = string> {
-  type: T
-  value: V
-}
-
-// Checks for WGSL-specific `fn foo(`, `var bar =`, and `let baz =`
-const isWGSL = RegExp.prototype.test.bind(/\bfn\s+\w+\s*\(|\b(var|let)\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 ZERO = 48
-const NINE = 57
-const A = 65
-const Z = 90
-const LF = 10
-const CR = 13
-const TAB = 9
-const SPACE = 32
-const UNDERSCORE = 95
-const SLASH = 47
-const STAR = 42
-const HASH = 35
-const AT = 64
-
-const isDigit = (c: number) => ZERO <= c && c <= NINE
-const isAlpha = (c: number) => ((c &= ~32), A <= c && c <= Z)
-const isLine = (c: number) => c === LF || c === CR
-const isSpace = (c: number) => isLine(c) || c === TAB || c === SPACE
-const isIdent = (c: number) => isAlpha(c) || isDigit(c) || c === UNDERSCORE
-const isMacro = (c: number) => c === HASH || c === AT
-
-/**
- * Tokenizes a string of GLSL or WGSL code.
- */
-export function tokenize(code: string, index: number = 0): Token[] {
-  const tokens: Token[] = []
-
-  let prev: number = -1
-  const [KEYWORDS, SYMBOLS] = isWGSL(code) ? [WGSL_KEYWORDS, WGSL_SYMBOLS] : [GLSL_KEYWORDS, GLSL_SYMBOLS]
-  while (index < code.length) {
-    let value = code[index]
-    const char = code.charCodeAt(index++)
-
-    if (isSpace(char)) {
-      while (isSpace(code.charCodeAt(index))) value += code[index++]
-      tokens.push({ type: 'whitespace', value })
-    } else if (isDigit(char)) {
-      while (isFloat(value + code[index]) || isInt(value + code[index])) value += code[index++]
-      if (isFloat(value)) tokens.push({ type: 'float', value })
-      else tokens.push({ type: 'int', value })
-    } else if (isIdent(char)) {
-      while (isIdent(code.charCodeAt(index))) value += code[index++]
-      if (isBool(value)) tokens.push({ type: 'bool', value })
-      else if (KEYWORDS.includes(isMacro(prev) ? String.fromCharCode(prev) + value : value))
-        tokens.push({ type: 'keyword', value })
-      else tokens.push({ type: 'identifier', value })
-    } else if (char === SLASH && (code.charCodeAt(index) === SLASH || code.charCodeAt(index) === STAR)) {
-      const terminator = code.charCodeAt(index) === STAR ? '*/' : '\n'
-      while (!value.endsWith(terminator)) value += code[index++]
-      tokens.push({ type: 'comment', value })
-    } else {
-      for (const symbol of SYMBOLS) {
-        if (symbol.length > value.length && code.startsWith(symbol, index - 1)) value = symbol
-      }
-      index += value.length - 1
-      tokens.push({ type: 'symbol', value })
-    }
-    prev = char
-  }
-
-  return tokens
-}
+import { WGSL_KEYWORDS, WGSL_SYMBOLS, GLSL_KEYWORDS, GLSL_SYMBOLS } from './constants'
+
+export type TokenType = 'whitespace' | 'comment' | 'symbol' | 'bool' | 'float' | 'int' | 'identifier' | 'keyword'
+
+export interface Token<T = TokenType, V = string> {
+  type: T
+  value: V
+}
+
+// Checks for WGSL-specific `fn foo(`, `var bar =`, and `let baz =`
+const isWGSL = RegExp.prototype.test.bind(/\bfn\s+\w+\s*\(|\b(var|let)\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 ZERO = 48
+const NINE = 57
+const A = 65
+const Z = 90
+const LF = 10
+const CR = 13
+const TAB = 9
+const SPACE = 32
+const UNDERSCORE = 95
+const SLASH = 47
+const STAR = 42
+const HASH = 35
+const AT = 64
+
+const isDigit = (c: number) => ZERO <= c && c <= NINE
+const isAlpha = (c: number) => ((c &= ~32), A <= c && c <= Z)
+const isLine = (c: number) => c === LF || c === CR
+const isSpace = (c: number) => isLine(c) || c === TAB || c === SPACE
+const isIdent = (c: number) => isAlpha(c) || isDigit(c) || c === UNDERSCORE
+const isMacro = (c: number) => c === HASH || c === AT
+
+/**
+ * Tokenizes a string of GLSL or WGSL code.
+ */
+export function tokenize(code: string, index: number = 0): Token[] {
+  const tokens: Token[] = []
+
+  let prev: number = -1
+  const [KEYWORDS, SYMBOLS] = isWGSL(code) ? [WGSL_KEYWORDS, WGSL_SYMBOLS] : [GLSL_KEYWORDS, GLSL_SYMBOLS]
+  while (index < code.length) {
+    let value = code[index]
+    const char = code.charCodeAt(index++)
+
+    if (isSpace(char)) {
+      while (isSpace(code.charCodeAt(index))) value += code[index++]
+      tokens.push({ type: 'whitespace', value })
+    } else if (isDigit(char)) {
+      while (isFloat(value + code[index]) || isInt(value + code[index])) value += code[index++]
+      if (isFloat(value)) tokens.push({ type: 'float', value })
+      else tokens.push({ type: 'int', value })
+    } else if (isIdent(char)) {
+      while (isIdent(code.charCodeAt(index))) value += code[index++]
+      if (isBool(value)) tokens.push({ type: 'bool', value })
+      else if (KEYWORDS.includes(isMacro(prev) ? String.fromCharCode(prev) + value : value))
+        tokens.push({ type: 'keyword', value })
+      else tokens.push({ type: 'identifier', value })
+    } else if (char === SLASH && (code.charCodeAt(index) === SLASH || code.charCodeAt(index) === STAR)) {
+      const terminator = code.charCodeAt(index) === STAR ? '*/' : '\n'
+      while (!value.endsWith(terminator)) value += code[index++]
+      tokens.push({ type: 'comment', value })
+    } else {
+      for (const symbol of SYMBOLS) {
+        if (symbol.length > value.length && code.startsWith(symbol, index - 1)) value = symbol
+      }
+      index += value.length - 1
+      tokens.push({ type: 'symbol', value })
+    }
+    prev = char
+  }
+
+  return tokens
+}