@tiptap/extension-code-block-lowlight 2.5.0-beta.5 → 2.5.0-beta.6

package/dist/index.umd.js

@@ -8,37 +8,41 @@
 		return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 	}
 
-	var deepFreezeEs6 = {exports: {}};
+	/* eslint-disable no-multi-assign */
 
 	function deepFreeze(obj) {
-	    if (obj instanceof Map) {
-	        obj.clear = obj.delete = obj.set = function () {
-	            throw new Error('map is read-only');
+	  if (obj instanceof Map) {
+	    obj.clear =
+	      obj.delete =
+	      obj.set =
+	        function () {
+	          throw new Error('map is read-only');
 	        };
-	    } else if (obj instanceof Set) {
-	        obj.add = obj.clear = obj.delete = function () {
-	            throw new Error('set is read-only');
+	  } else if (obj instanceof Set) {
+	    obj.add =
+	      obj.clear =
+	      obj.delete =
+	        function () {
+	          throw new Error('set is read-only');
 	        };
-	    }
+	  }
 
-	    // Freeze self
-	    Object.freeze(obj);
+	  // Freeze self
+	  Object.freeze(obj);
 
-	    Object.getOwnPropertyNames(obj).forEach(function (name) {
-	        var prop = obj[name];
+	  Object.getOwnPropertyNames(obj).forEach((name) => {
+	    const prop = obj[name];
+	    const type = typeof prop;
 
-	        // Freeze prop if it is an object
-	        if (typeof prop == 'object' && !Object.isFrozen(prop)) {
-	            deepFreeze(prop);
-	        }
-	    });
+	    // Freeze prop if it is an object or function and also not already frozen
+	    if ((type === 'object' || type === 'function') && !Object.isFrozen(prop)) {
+	      deepFreeze(prop);
+	    }
+	  });
 
-	    return obj;
+	  return obj;
 	}
 
-	deepFreezeEs6.exports = deepFreeze;
-	deepFreezeEs6.exports.default = deepFreeze;
-
 	/** @typedef {import('highlight.js').CallbackResponse} CallbackResponse */
 	/** @typedef {import('highlight.js').CompiledMode} CompiledMode */
 	/** @implements CallbackResponse */
@@ -117,7 +121,7 @@
 	const emitsWrappingTags = (node) => {
 	  // rarely we can have a sublanguage where language is undefined
 	  // TODO: track down why
-	  return !!node.scope || (node.sublanguage && node.language);
+	  return !!node.scope;
 	};
 
 	/**
@@ -126,6 +130,11 @@
 	 * @param {{prefix:string}} options
 	 */
 	const scopeToCSSClass = (name, { prefix }) => {
+	  // sub-language
+	  if (name.startsWith("language:")) {
+	    return name.replace("language:", "language-");
+	  }
+	  // tiered scope: comment.line
 	  if (name.includes(".")) {
 	    const pieces = name.split(".");
 	    return [
@@ -133,6 +142,7 @@
 	      ...(pieces.map((x, i) => `${x}${"_".repeat(i + 1)}`))
 	    ].join(" ");
 	  }
+	  // simple scope
 	  return `${prefix}${name}`;
 	};
 
@@ -165,12 +175,8 @@
 	  openNode(node) {
 	    if (!emitsWrappingTags(node)) return;
 
-	    let className = "";
-	    if (node.sublanguage) {
-	      className = `language-${node.language}`;
-	    } else {
-	      className = scopeToCSSClass(node.scope, { prefix: this.classPrefix });
-	    }
+	    const className = scopeToCSSClass(node.scope,
+	      { prefix: this.classPrefix });
 	    this.span(className);
 	  }
 
@@ -202,8 +208,8 @@
 	  }
 	}
 
-	/** @typedef {{scope?: string, language?: string, sublanguage?: boolean, children: Node[]} | string} Node */
-	/** @typedef {{scope?: string, language?: string, sublanguage?: boolean, children: Node[]} } DataNode */
+	/** @typedef {{scope?: string, language?: string, children: Node[]} | string} Node */
+	/** @typedef {{scope?: string, language?: string, children: Node[]} } DataNode */
 	/** @typedef {import('highlight.js').Emitter} Emitter */
 	/**  */
 
@@ -308,13 +314,11 @@
 
 	  Minimal interface:
 
-	  - addKeyword(text, scope)
 	  - addText(text)
-	  - addSublanguage(emitter, subLanguageName)
+	  - __addSublanguage(emitter, subLanguageName)
+	  - startScope(scope)
+	  - endScope()
 	  - finalize()
-	  - openNode(scope)
-	  - closeNode()
-	  - closeAllNodes()
 	  - toHTML()
 
 	*/
@@ -333,34 +337,31 @@
 
 	  /**
 	   * @param {string} text
-	   * @param {string} scope
 	   */
-	  addKeyword(text, scope) {
+	  addText(text) {
 	    if (text === "") { return; }
 
-	    this.openNode(scope);
-	    this.addText(text);
-	    this.closeNode();
+	    this.add(text);
 	  }
 
-	  /**
-	   * @param {string} text
-	   */
-	  addText(text) {
-	    if (text === "") { return; }
+	  /** @param {string} scope */
+	  startScope(scope) {
+	    this.openNode(scope);
+	  }
 
-	    this.add(text);
+	  endScope() {
+	    this.closeNode();
 	  }
 
 	  /**
 	   * @param {Emitter & {root: DataNode}} emitter
 	   * @param {string} name
 	   */
-	  addSublanguage(emitter, name) {
+	  __addSublanguage(emitter, name) {
 	    /** @type DataNode */
 	    const node = emitter.root;
-	    node.sublanguage = true;
-	    node.language = name;
+	    if (name) node.scope = `language:${name}`;
+
 	    this.add(node);
 	  }
 
@@ -370,6 +371,7 @@
 	  }
 
 	  finalize() {
+	    this.closeAllNodes();
 	    return true;
 	  }
 	}
@@ -674,28 +676,18 @@
 	  relevance: 0
 	};
 	const REGEXP_MODE = {
-	  // this outer rule makes sure we actually have a WHOLE regex and not simply
-	  // an expression such as:
-	  //
-	  //     3 / something
-	  //
-	  // (which will then blow up when regex's `illegal` sees the newline)
-	  begin: /(?=\/[^/\n]*\/)/,
-	  contains: [{
-	    scope: 'regexp',
-	    begin: /\//,
-	    end: /\/[gimuy]*/,
-	    illegal: /\n/,
-	    contains: [
-	      BACKSLASH_ESCAPE,
-	      {
-	        begin: /\[/,
-	        end: /\]/,
-	        relevance: 0,
-	        contains: [BACKSLASH_ESCAPE]
-	      }
-	    ]
-	  }]
+	  scope: "regexp",
+	  begin: /\/(?=[^/\n]*\/)/,
+	  end: /\/[gimuy]*/,
+	  contains: [
+	    BACKSLASH_ESCAPE,
+	    {
+	      begin: /\[/,
+	      end: /\]/,
+	      relevance: 0,
+	      contains: [BACKSLASH_ESCAPE]
+	    }
+	  ]
 	};
 	const TITLE_MODE = {
 	  scope: 'title',
@@ -731,31 +723,31 @@
 	};
 
 	var MODES = /*#__PURE__*/Object.freeze({
-	    __proto__: null,
-	    MATCH_NOTHING_RE: MATCH_NOTHING_RE,
-	    IDENT_RE: IDENT_RE,
-	    UNDERSCORE_IDENT_RE: UNDERSCORE_IDENT_RE,
-	    NUMBER_RE: NUMBER_RE,
-	    C_NUMBER_RE: C_NUMBER_RE,
-	    BINARY_NUMBER_RE: BINARY_NUMBER_RE,
-	    RE_STARTERS_RE: RE_STARTERS_RE,
-	    SHEBANG: SHEBANG,
-	    BACKSLASH_ESCAPE: BACKSLASH_ESCAPE,
-	    APOS_STRING_MODE: APOS_STRING_MODE,
-	    QUOTE_STRING_MODE: QUOTE_STRING_MODE,
-	    PHRASAL_WORDS_MODE: PHRASAL_WORDS_MODE,
-	    COMMENT: COMMENT,
-	    C_LINE_COMMENT_MODE: C_LINE_COMMENT_MODE,
-	    C_BLOCK_COMMENT_MODE: C_BLOCK_COMMENT_MODE,
-	    HASH_COMMENT_MODE: HASH_COMMENT_MODE,
-	    NUMBER_MODE: NUMBER_MODE,
-	    C_NUMBER_MODE: C_NUMBER_MODE,
-	    BINARY_NUMBER_MODE: BINARY_NUMBER_MODE,
-	    REGEXP_MODE: REGEXP_MODE,
-	    TITLE_MODE: TITLE_MODE,
-	    UNDERSCORE_TITLE_MODE: UNDERSCORE_TITLE_MODE,
-	    METHOD_GUARD: METHOD_GUARD,
-	    END_SAME_AS_BEGIN: END_SAME_AS_BEGIN
+	  __proto__: null,
+	  APOS_STRING_MODE: APOS_STRING_MODE,
+	  BACKSLASH_ESCAPE: BACKSLASH_ESCAPE,
+	  BINARY_NUMBER_MODE: BINARY_NUMBER_MODE,
+	  BINARY_NUMBER_RE: BINARY_NUMBER_RE,
+	  COMMENT: COMMENT,
+	  C_BLOCK_COMMENT_MODE: C_BLOCK_COMMENT_MODE,
+	  C_LINE_COMMENT_MODE: C_LINE_COMMENT_MODE,
+	  C_NUMBER_MODE: C_NUMBER_MODE,
+	  C_NUMBER_RE: C_NUMBER_RE,
+	  END_SAME_AS_BEGIN: END_SAME_AS_BEGIN,
+	  HASH_COMMENT_MODE: HASH_COMMENT_MODE,
+	  IDENT_RE: IDENT_RE,
+	  MATCH_NOTHING_RE: MATCH_NOTHING_RE,
+	  METHOD_GUARD: METHOD_GUARD,
+	  NUMBER_MODE: NUMBER_MODE,
+	  NUMBER_RE: NUMBER_RE,
+	  PHRASAL_WORDS_MODE: PHRASAL_WORDS_MODE,
+	  QUOTE_STRING_MODE: QUOTE_STRING_MODE,
+	  REGEXP_MODE: REGEXP_MODE,
+	  RE_STARTERS_RE: RE_STARTERS_RE,
+	  SHEBANG: SHEBANG,
+	  TITLE_MODE: TITLE_MODE,
+	  UNDERSCORE_IDENT_RE: UNDERSCORE_IDENT_RE,
+	  UNDERSCORE_TITLE_MODE: UNDERSCORE_TITLE_MODE
 	});
 
 	/**
@@ -909,7 +901,7 @@
 	 * @param {boolean} caseInsensitive
 	 */
 	function compileKeywords(rawKeywords, caseInsensitive, scopeName = DEFAULT_KEYWORD_SCOPE) {
-	  /** @type KeywordDict */
+	  /** @type {import("highlight.js/private").KeywordDict} */
 	  const compiledKeywords = Object.create(null);
 
 	  // input can be a string of keywords, an array of keywords, or a object with
@@ -1568,7 +1560,7 @@
 	  return mode;
 	}
 
-	var version = "11.6.0";
+	var version = "11.9.0";
 
 	class HTMLInjectionError extends Error {
 	  constructor(reason, html) {
@@ -1583,6 +1575,8 @@
 	https://highlightjs.org/
 	*/
 
+
+
 	/**
 	@typedef {import('highlight.js').Mode} Mode
 	@typedef {import('highlight.js').CompiledMode} CompiledMode
@@ -1792,7 +1786,7 @@
 	            buf += match[0];
 	          } else {
 	            const cssClass = language.classNameAliases[kind] || kind;
-	            emitter.addKeyword(match[0], cssClass);
+	            emitKeyword(match[0], cssClass);
 	          }
 	        } else {
 	          buf += match[0];
@@ -1827,7 +1821,7 @@
 	      if (top.relevance > 0) {
 	        relevance += result.relevance;
 	      }
-	      emitter.addSublanguage(result._emitter, result.language);
+	      emitter.__addSublanguage(result._emitter, result.language);
 	    }
 
 	    function processBuffer() {
@@ -1839,6 +1833,18 @@
 	      modeBuffer = '';
 	    }
 
+	    /**
+	     * @param {string} text
+	     * @param {string} scope
+	     */
+	    function emitKeyword(keyword, scope) {
+	      if (keyword === "") return;
+
+	      emitter.startScope(scope);
+	      emitter.addText(keyword);
+	      emitter.endScope();
+	    }
+
 	    /**
 	     * @param {CompiledScope} scope
 	     * @param {RegExpMatchArray} match
@@ -1851,7 +1857,7 @@
 	        const klass = language.classNameAliases[scope[i]] || scope[i];
 	        const text = match[i];
 	        if (klass) {
-	          emitter.addKeyword(text, klass);
+	          emitKeyword(text, klass);
 	        } else {
 	          modeBuffer = text;
 	          processKeywords();
@@ -1872,7 +1878,7 @@
 	      if (mode.beginScope) {
 	        // beginScope just wraps the begin match itself in a scope
 	        if (mode.beginScope._wrap) {
-	          emitter.addKeyword(modeBuffer, language.classNameAliases[mode.beginScope._wrap] || mode.beginScope._wrap);
+	          emitKeyword(modeBuffer, language.classNameAliases[mode.beginScope._wrap] || mode.beginScope._wrap);
 	          modeBuffer = "";
 	        } else if (mode.beginScope._multi) {
 	          // at this point modeBuffer should just be the match
@@ -1983,7 +1989,7 @@
 	      const origin = top;
 	      if (top.endScope && top.endScope._wrap) {
 	        processBuffer();
-	        emitter.addKeyword(lexeme, top.endScope._wrap);
+	        emitKeyword(lexeme, top.endScope._wrap);
 	      } else if (top.endScope && top.endScope._multi) {
 	        processBuffer();
 	        emitMultiClass(top.endScope, match);
@@ -2126,37 +2132,41 @@
 	    let resumeScanAtSamePosition = false;
 
 	    try {
-	      top.matcher.considerAll();
-
-	      for (;;) {
-	        iterations++;
-	        if (resumeScanAtSamePosition) {
-	          // only regexes not matched previously will now be
-	          // considered for a potential match
-	          resumeScanAtSamePosition = false;
-	        } else {
-	          top.matcher.considerAll();
-	        }
-	        top.matcher.lastIndex = index;
+	      if (!language.__emitTokens) {
+	        top.matcher.considerAll();
+
+	        for (;;) {
+	          iterations++;
+	          if (resumeScanAtSamePosition) {
+	            // only regexes not matched previously will now be
+	            // considered for a potential match
+	            resumeScanAtSamePosition = false;
+	          } else {
+	            top.matcher.considerAll();
+	          }
+	          top.matcher.lastIndex = index;
 
-	        const match = top.matcher.exec(codeToHighlight);
-	        // console.log("match", match[0], match.rule && match.rule.begin)
+	          const match = top.matcher.exec(codeToHighlight);
+	          // console.log("match", match[0], match.rule && match.rule.begin)
 
-	        if (!match) break;
+	          if (!match) break;
 
-	        const beforeMatch = codeToHighlight.substring(index, match.index);
-	        const processedCount = processLexeme(beforeMatch, match);
-	        index = match.index + processedCount;
+	          const beforeMatch = codeToHighlight.substring(index, match.index);
+	          const processedCount = processLexeme(beforeMatch, match);
+	          index = match.index + processedCount;
+	        }
+	        processLexeme(codeToHighlight.substring(index));
+	      } else {
+	        language.__emitTokens(codeToHighlight, emitter);
 	      }
-	      processLexeme(codeToHighlight.substring(index));
-	      emitter.closeAllNodes();
+
 	      emitter.finalize();
 	      result = emitter.toHTML();
 
 	      return {
 	        language: languageName,
 	        value: result,
-	        relevance: relevance,
+	        relevance,
 	        illegal: false,
 	        _emitter: emitter,
 	        _top: top
@@ -2170,7 +2180,7 @@
 	          relevance: 0,
 	          _illegalBy: {
 	            message: err.message,
-	            index: index,
+	            index,
 	            context: codeToHighlight.slice(index - 100, index + 100),
 	            mode: err.mode,
 	            resultSoFar: result
@@ -2292,7 +2302,12 @@
 	    if (shouldNotHighlight(language)) return;
 
 	    fire("before:highlightElement",
-	      { el: element, language: language });
+	      { el: element, language });
+
+	    if (element.dataset.highlighted) {
+	      console.log("Element previously highlighted. To highlight again, first unset `dataset.highlighted`.", element);
+	      return;
+	    }
 
 	    // we should be all text, no child nodes (unescaped HTML) - this is possibly
 	    // an HTML injection attack - it's likely too late if this is already in
@@ -2320,6 +2335,7 @@
 	    const result = language ? highlight(text, { language, ignoreIllegals: true }) : highlightAuto(text);
 
 	    element.innerHTML = result.value;
+	    element.dataset.highlighted = "yes";
 	    updateClassName(element, language, result.language);
 	    element.result = {
 	      language: result.language,
@@ -2496,6 +2512,16 @@
 	    plugins.push(plugin);
 	  }
 
+	  /**
+	   * @param {HLJSPlugin} plugin
+	   */
+	  function removePlugin(plugin) {
+	    const index = plugins.indexOf(plugin);
+	    if (index !== -1) {
+	      plugins.splice(index, 1);
+	    }
+	  }
+
 	  /**
 	   *
 	   * @param {PluginEvent} event
@@ -2539,7 +2565,8 @@
 	    registerAliases,
 	    autoDetection,
 	    inherit,
-	    addPlugin
+	    addPlugin,
+	    removePlugin
 	  });
 
 	  hljs.debugMode = function() { SAFE_MODE = false; };
@@ -2558,7 +2585,7 @@
 	    // @ts-ignore
 	    if (typeof MODES[key] === "object") {
 	      // @ts-ignore
-	      deepFreezeEs6.exports(MODES[key]);
+	      deepFreeze(MODES[key]);
 	    }
 	  }
 
@@ -2568,8 +2595,12 @@
 	  return hljs;
 	};
 
-	// export an "instance" of the highlighter
-	var highlight = HLJS({});
+	// Other names for the variable may break build script
+	const highlight = HLJS({});
+
+	// returns a new instance of the highlighter to be used for extensions
+	// check https://github.com/wooorm/lowlight/issues/47
+	highlight.newInstance = () => HLJS({});
 
 	var core = highlight;
 	highlight.HighlightJS = highlight;