sugar-high 2.2.0 → 2.2.2

package/lib/core.js

@@ -1,7 +1,7 @@
 // @ts-check
 
 import {
-  assemble, generate, SugarHigh, toHtml, T_BREAK, T_CLASS, T_COMMENT, T_IDENTIFIER,
+  assemble, generate, render, SugarHigh, T_BREAK, T_CLASS, T_COMMENT, T_IDENTIFIER,
   T_KEYWORD, T_PROPERTY, T_SIGN, T_SPACE, T_STRING,
 } from './shared.js'
 
@@ -147,11 +147,6 @@ function parse(code, options) {
   return parsed
 }
 
-/** @param {ParsedCode} parsed @param {DisplayOptions | undefined} options */
-function render(parsed, options) {
-  return toHtml(generate(parsed, options))
-}
-
 export { generate, parse, render, SugarHigh, tokenize }
 
 /**

package/lib/index.js

@@ -4,12 +4,7 @@ import {
   parse,
   render,
 } from './core.js'
-import { languages } from './lang.js'
-
-/** @param {string | undefined} name */
-function configFor(name) {
-  return languages.find(({ id }) => id === (name || 'javascript'))?.config
-}
+import { configFor } from './presets/configs.js'
 
 /** @param {string} code @param {HighlightOptions | undefined} options */
 function highlight(code, options) {

package/lib/lang.js

@@ -1,32 +1,10 @@
 // @ts-check
 
-import * as c from './lang/c.js'
-import * as cpp from './lang/cpp.js'
-import * as csharp from './lang/csharp.js'
-import * as css from './lang/css.js'
-import * as diff from './lang/diff.js'
-import * as dockerfile from './lang/dockerfile.js'
-import * as go from './lang/go.js'
-import * as html from './lang/html.js'
-import * as graphql from './lang/graphql.js'
-import * as hcl from './lang/hcl.js'
-import * as java from './lang/java.js'
-import * as json from './lang/json.js'
-import * as javascript from './lang/javascript.js'
-import * as kotlin from './lang/kotlin.js'
-import * as markdown from './lang/markdown.js'
-import * as php from './lang/php.js'
-import * as plaintext from './lang/plaintext.js'
-import * as powershell from './lang/powershell.js'
-import * as python from './lang/python.js'
-import * as ruby from './lang/ruby.js'
-import * as rust from './lang/rust.js'
-import * as shell from './lang/shell.js'
-import * as sql from './lang/sql.js'
-import * as swift from './lang/swift.js'
-import * as toml from './lang/toml.js'
-import * as typescript from './lang/typescript.js'
-import * as yaml from './lang/yaml.js'
+import {
+  c, cpp, csharp, css, diff, dockerfile, go, graphql, hcl, html, java, javascript, json,
+  kotlin, markdown, nonJavaScript, php, plaintext, powershell, python, ruby, rust, shell, sql,
+  swift, toml, typescript, yaml,
+} from './presets/configs.js'
 
 /**
  * @typedef {import('./core.js').ParseOptions} ParseOptions
@@ -38,20 +16,6 @@ import * as yaml from './lang/yaml.js'
  * }} Language
  */
 
-/**
- * Disable JavaScript-only scanner modes for a non-JavaScript language.
- * @param {ParseOptions} config
- * @returns {ParseOptions}
- */
-function nonJavaScript(config) {
-  return {
-    ...config,
-    jsx: false,
-    regex: false,
-    templateStrings: false,
-  }
-}
-
 /** @type {readonly Language[]} */
 const languages = [
   { id: 'javascript', extension: 'js', aliases: ['js', 'jsx', 'node'], config: javascript },

package/lib/presets/configs.js

@@ -0,0 +1,88 @@
+// @ts-check
+
+import * as c from '../lang/c.js'
+import * as cpp from '../lang/cpp.js'
+import * as csharp from '../lang/csharp.js'
+import * as css from '../lang/css.js'
+import * as diff from '../lang/diff.js'
+import * as dockerfile from '../lang/dockerfile.js'
+import * as go from '../lang/go.js'
+import * as graphql from '../lang/graphql.js'
+import * as hcl from '../lang/hcl.js'
+import * as html from '../lang/html.js'
+import * as java from '../lang/java.js'
+import * as javascript from '../lang/javascript.js'
+import * as json from '../lang/json.js'
+import * as kotlin from '../lang/kotlin.js'
+import * as markdown from '../lang/markdown.js'
+import * as php from '../lang/php.js'
+import * as plaintext from '../lang/plaintext.js'
+import * as powershell from '../lang/powershell.js'
+import * as python from '../lang/python.js'
+import * as ruby from '../lang/ruby.js'
+import * as rust from '../lang/rust.js'
+import * as shell from '../lang/shell.js'
+import * as sql from '../lang/sql.js'
+import * as swift from '../lang/swift.js'
+import * as toml from '../lang/toml.js'
+import * as typescript from '../lang/typescript.js'
+import * as yaml from '../lang/yaml.js'
+
+/**
+ * Disable JavaScript-only scanner modes for a non-JavaScript language.
+ * @param {import('../core.js').ParseOptions} config
+ * @returns {import('../core.js').ParseOptions}
+ */
+function nonJavaScript(config) {
+  return {
+    ...config,
+    jsx: false,
+    regex: false,
+    templateStrings: false,
+  }
+}
+
+function createConfigs() {
+  return {
+    javascript,
+    typescript,
+    css: nonJavaScript(css),
+    python: nonJavaScript(python),
+    c: nonJavaScript(c),
+    go: nonJavaScript(go),
+    java: nonJavaScript(java),
+    rust: nonJavaScript(rust),
+    json: nonJavaScript(json),
+    diff: nonJavaScript(diff),
+    shell: nonJavaScript(shell),
+    cpp: nonJavaScript(cpp),
+    csharp: nonJavaScript(csharp),
+    sql: nonJavaScript(sql),
+    html,
+    yaml: nonJavaScript(yaml),
+    markdown: nonJavaScript(markdown),
+    plaintext: nonJavaScript(plaintext),
+    ruby: nonJavaScript(ruby),
+    kotlin: nonJavaScript(kotlin),
+    swift: nonJavaScript(swift),
+    php: nonJavaScript(php),
+    toml: nonJavaScript(toml),
+    powershell: nonJavaScript(powershell),
+    dockerfile: nonJavaScript(dockerfile),
+    graphql: nonJavaScript(graphql),
+    hcl: nonJavaScript(hcl),
+  }
+}
+
+const configs = /* @__PURE__ */ createConfigs()
+
+/** @param {string | undefined} name */
+function configFor(name) {
+  return configs[name || 'javascript']
+}
+
+export {
+  c, configFor, configs, cpp, csharp, css, diff, dockerfile, go, graphql, hcl, html, java,
+  javascript, json, kotlin, markdown, nonJavaScript, php, plaintext, powershell, python, ruby,
+  rust, shell, sql, swift, toml, typescript, yaml,
+}

package/lib/shared.js

@@ -64,6 +64,42 @@ function assemble(value, tokens) {
   return { value, lines }
 }
 
+/**
+ * @param {import('./core.js').ParsedLine} parsedLine
+ * @param {import('./core.js').DisplayOptions['markLine']} markLine
+ */
+function createLine(parsedLine, markLine) {
+  const line = {
+    index: parsedLine.index,
+    value: parsedLine.value,
+    tokens: parsedLine.tokens,
+    annotations: parsedLine.annotations,
+    className: `sh__line${parsedLine.annotations.map(annotation => ` sh__line--${annotation}`).join('')}`,
+    style: {},
+    properties: {},
+  }
+  markLine?.(line)
+  return line
+}
+
+/**
+ * @param {import('./core.js').ParsedToken} parsedToken
+ * @param {import('./core.js').DisplayOptions['cx']} cx
+ * @param {import('./core.js').DisplayOptions['mark']} mark
+ */
+function createToken({ type, value }, cx, mark) {
+  const extraClassName = cx?.[type]
+  const token = {
+    type,
+    value,
+    className: `sh__token--${type}${extraClassName ? ` ${extraClassName}` : ''}`,
+    style: { color: `var(--sh-${type})` },
+    properties: {},
+  }
+  mark?.(token)
+  return token
+}
+
 /**
  * @param {import('./core.js').ParsedCode} parsed
  * @param {import('./core.js').DisplayOptions | undefined} options
@@ -74,30 +110,13 @@ function generate(parsed, options) {
   const markLine = options?.markLine
 
   return parsed.lines.map((parsedLine) => {
-    const line = {
-      index: parsedLine.index,
-      value: parsedLine.value,
-      tokens: parsedLine.tokens,
-      annotations: parsedLine.annotations,
-      className: `sh__line${parsedLine.annotations.map(annotation => ` sh__line--${annotation}`).join('')}`,
-      style: {},
-      properties: {},
-    }
-    markLine?.(line)
+    const line = createLine(parsedLine, markLine)
 
     return {
       type: 'element',
       tagName: 'span',
-      children: parsedLine.tokens.map(({ type, value }) => {
-        const extraClassName = cx?.[type]
-        const token = {
-          type,
-          value,
-          className: `sh__token--${type}${extraClassName ? ` ${extraClassName}` : ''}`,
-          style: { color: `var(--sh-${type})` },
-          properties: {},
-        }
-        mark?.(token)
+      children: parsedLine.tokens.map((parsedToken) => {
+        const token = createToken(parsedToken, cx, mark)
         return {
           type: 'element',
           tokenType: token.type,
@@ -119,6 +138,46 @@ function generate(parsed, options) {
   })
 }
 
+/**
+ * Render parsed lines directly while preserving generate()'s markup and mutable display hooks.
+ * @param {import('./core.js').ParsedCode} parsed
+ * @param {import('./core.js').DisplayOptions | undefined} options
+ */
+function render(parsed, options) {
+  const cx = options?.cx
+  const mark = options?.mark
+  const markLine = options?.markLine
+
+  if (!cx && !mark && !markLine) {
+    return parsed.lines.map((line) => {
+      const className = `sh__line${line.annotations.map(annotation => ` sh__line--${annotation}`).join('')}`
+      const children = line.tokens.map(({ type, value }) => (
+        `<span class="sh__token--${type}" style="color:var(--sh-${type})">${encode(value)}</span>`
+      )).join('')
+      return `<span class="${encode(className)}">${children}</span>`
+    }).join('\n')
+  }
+
+  return parsed.lines.map((parsedLine) => {
+    const line = createLine(parsedLine, markLine)
+
+    const children = parsedLine.tokens.map((parsedToken) => {
+      const token = createToken(parsedToken, cx, mark)
+      return `<span ${attributes({
+        ...token.properties,
+        className: token.className,
+        style: token.style,
+      })}>${encode(token.value)}</span>`
+    }).join('')
+
+    return `<span ${attributes({
+      ...line.properties,
+      className: line.className,
+      style: line.style,
+    })}>${children}</span>`
+  }).join('\n')
+}
+
 const entities = { '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#039;' }
 /** @param {string} value */
 const encode = (value) => value.replace(/[&<>"']/g, character => entities[character])
@@ -133,17 +192,7 @@ function attributes(values) {
   return `class="${encode(values.className || '')}"${style ? ` style="${encode(style)}"` : ''}${properties ? ` ${properties}` : ''}`
 }
 
-/** @param {Array<any>} lines */
-function toHtml(lines) {
-  return lines.map(line => {
-    const children = line.children.map(token => {
-      return `<${token.tagName} ${attributes(token.properties)}>${encode(token.children[0].value)}</${token.tagName}>`
-    }).join('')
-    return `<${line.tagName} ${attributes(line.properties)}>${children}</${line.tagName}>`
-  }).join('\n')
-}
-
 export {
-  assemble, encode, generate, SugarHigh, toHtml, TokenTypes, T_BREAK, T_CLASS, T_COMMENT, T_ENTITY, T_IDENTIFIER,
+  assemble, encode, generate, render, SugarHigh, TokenTypes, T_BREAK, T_CLASS, T_COMMENT, T_ENTITY, T_IDENTIFIER,
   T_JSX_LITERALS, T_KEYWORD, T_PROPERTY, T_SIGN, T_SPACE, T_STRING,
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sugar-high",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/huozhi/sugar-high.git",
@@ -40,6 +40,7 @@
   "scripts": {
     "test": "vitest",
     "build": "echo 'package requires no build'",
-    "benchmark": "node scripts/benchmark.mjs"
+    "benchmark": "node scripts/benchmark.mjs",
+    "benchmark:large": "node scripts/benchmark-large.mjs"
   }
 }