@tiptap/extension-code-block-lowlight 2.0.0-beta.6 → 2.0.0-beta.63

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020, überdosis GbR
+Copyright (c) 2021, überdosis GbR
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -7,8 +7,8 @@
 ## Introduction
 tiptap is a headless wrapper around [ProseMirror](https://ProseMirror.net) – a toolkit for building rich text WYSIWYG editors, which is already in use at many well-known companies such as *New York Times*, *The Guardian* or *Atlassian*.
 
-## Offical Documentation
+## Official Documentation
 Documentation can be found on the [tiptap website](https://tiptap.dev).
 
 ## License
-tiptap is open-sourced software licensed under the [MIT license](https://github.com/ueberdosis/tiptap-next/blob/main/LICENSE.md).
+tiptap is open sourced software licensed under the [MIT license](https://github.com/ueberdosis/tiptap/blob/main/LICENSE.md).

package/dist/packages/extension-code-block-lowlight/src/code-block-lowlight.d.ts

@@ -1,5 +1,6 @@
 import { CodeBlockOptions } from '@tiptap/extension-code-block';
 export interface CodeBlockLowlightOptions extends CodeBlockOptions {
     lowlight: any;
+    defaultLanguage: string | null | undefined;
 }
-export declare const CodeBlockLowlight: import("@tiptap/core").Node<CodeBlockLowlightOptions>;
+export declare const CodeBlockLowlight: import("@tiptap/core").Node<CodeBlockLowlightOptions, any>;

package/dist/packages/extension-code-block-lowlight/src/lowlight-plugin.d.ts

@@ -1,5 +1,6 @@
 import { Plugin } from 'prosemirror-state';
-export declare function LowlightPlugin({ name, lowlight }: {
+export declare function LowlightPlugin({ name, lowlight, defaultLanguage }: {
     name: string;
     lowlight: any;
+    defaultLanguage: string | null | undefined;
 }): Plugin<any, any>;

package/dist/tiptap-extension-code-block-lowlight.cjs.js

@@ -11,6 +11,8 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var CodeBlock__default = /*#__PURE__*/_interopDefaultLegacy(CodeBlock);
 
+var core$1 = {};
+
 function deepFreeze(obj) {
     if (obj instanceof Map) {
         obj.clear = obj.delete = obj.set = function () {
@@ -1241,7 +1243,7 @@ function expandOrCloneMode(mode) {
   return mode;
 }
 
-var version = "10.7.1";
+var version = "10.7.3";
 
 // @ts-nocheck
 
@@ -1473,6 +1475,11 @@ https://github.com/highlightjs/highlight.js/issues/2880#issuecomment-747275419
 
 */
 
+/**
+ * @type {Record<string, boolean>}
+ */
+const seenDeprecations = {};
+
 /**
  * @param {string} message
  */
@@ -1493,7 +1500,10 @@ const warn = (message, ...args) => {
  * @param {string} message
  */
 const deprecated = (version, message) => {
+  if (seenDeprecations[`${version}/${message}`]) return;
+
   console.log(`Deprecated as of ${version}. ${message}`);
+  seenDeprecations[`${version}/${message}`] = true;
 };
 
 /*
@@ -2519,14 +2529,11 @@ const HLJS = function(hljs) {
 // export an "instance" of the highlighter
 var highlight$1 = HLJS({});
 
-var core$1 = highlight$1;
+var core = highlight$1;
 
-function createCommonjsModule(fn) {
-  var module = { exports: {} };
-	return fn(module, module.exports), module.exports;
-}
+var format = {exports: {}};
 
-var format = createCommonjsModule(function (module) {
+(function (module) {
 (function() {
 
   //// Export the API
@@ -2638,20 +2645,22 @@ var format = createCommonjsModule(function (module) {
   }
 
 }());
-});
+}(format));
+
+var formatter = format.exports;
 
-var fault = create(Error);
+var fault$1 = create(Error);
 
-var fault_1 = fault;
+var fault_1 = fault$1;
 
-fault.eval = create(EvalError);
-fault.range = create(RangeError);
-fault.reference = create(ReferenceError);
-fault.syntax = create(SyntaxError);
-fault.type = create(TypeError);
-fault.uri = create(URIError);
+fault$1.eval = create(EvalError);
+fault$1.range = create(RangeError);
+fault$1.reference = create(ReferenceError);
+fault$1.syntax = create(SyntaxError);
+fault$1.type = create(TypeError);
+fault$1.uri = create(URIError);
 
-fault.create = create;
+fault$1.create = create;
 
 // Create a new `EConstructor`, with the formatted `format` as a first argument.
 function create(EConstructor) {
@@ -2659,20 +2668,23 @@ function create(EConstructor) {
 
   return FormattedError
 
-  function FormattedError(format$1) {
-    if (format$1) {
-      format$1 = format.apply(null, arguments);
+  function FormattedError(format) {
+    if (format) {
+      format = formatter.apply(null, arguments);
     }
 
-    return new EConstructor(format$1)
+    return new EConstructor(format)
   }
 }
 
-var highlight_1 = highlight;
-var highlightAuto_1 = highlightAuto;
-var registerLanguage_1 = registerLanguage;
-var listLanguages_1 = listLanguages;
-var registerAlias_1 = registerAlias;
+var high = core;
+var fault = fault_1;
+
+core$1.highlight = highlight;
+core$1.highlightAuto = highlightAuto;
+core$1.registerLanguage = registerLanguage;
+core$1.listLanguages = listLanguages;
+core$1.registerAlias = registerAlias;
 
 Emitter.prototype.addText = text;
 Emitter.prototype.addKeyword = addKeyword;
@@ -2687,32 +2699,32 @@ var defaultPrefix = 'hljs-';
 
 // Highlighting `value` in the language `name`.
 function highlight(name, value, options) {
-  var before = core$1.configure({});
+  var before = high.configure({});
   var settings = options || {};
   var prefix = settings.prefix;
   var result;
 
   if (typeof name !== 'string') {
-    throw fault_1('Expected `string` for name, got `%s`', name)
+    throw fault('Expected `string` for name, got `%s`', name)
   }
 
-  if (!core$1.getLanguage(name)) {
-    throw fault_1('Unknown language: `%s` is not registered', name)
+  if (!high.getLanguage(name)) {
+    throw fault('Unknown language: `%s` is not registered', name)
   }
 
   if (typeof value !== 'string') {
-    throw fault_1('Expected `string` for value, got `%s`', value)
+    throw fault('Expected `string` for value, got `%s`', value)
   }
 
   if (prefix === null || prefix === undefined) {
     prefix = defaultPrefix;
   }
 
-  core$1.configure({__emitter: Emitter, classPrefix: prefix});
+  high.configure({__emitter: Emitter, classPrefix: prefix});
 
-  result = core$1.highlight(value, {language: name, ignoreIllegals: true});
+  result = high.highlight(value, {language: name, ignoreIllegals: true});
 
-  core$1.configure(before || {});
+  high.configure(before || {});
 
   /* istanbul ignore if - Highlight.js seems to use this (currently) for broken
    * grammars, so let’s keep it in there just to be sure. */
@@ -2729,7 +2741,7 @@ function highlight(name, value, options) {
 
 function highlightAuto(value, options) {
   var settings = options || {};
-  var subset = settings.subset || core$1.listLanguages();
+  var subset = settings.subset || high.listLanguages();
   settings.prefix;
   var length = subset.length;
   var index = -1;
@@ -2739,7 +2751,7 @@ function highlightAuto(value, options) {
   var name;
 
   if (typeof value !== 'string') {
-    throw fault_1('Expected `string` for value, got `%s`', value)
+    throw fault('Expected `string` for value, got `%s`', value)
   }
 
   secondBest = {relevance: 0, language: null, value: []};
@@ -2748,7 +2760,7 @@ function highlightAuto(value, options) {
   while (++index < length) {
     name = subset[index];
 
-    if (!core$1.getLanguage(name)) {
+    if (!high.getLanguage(name)) {
       continue
     }
 
@@ -2774,12 +2786,12 @@ function highlightAuto(value, options) {
 
 // Register a language.
 function registerLanguage(name, syntax) {
-  core$1.registerLanguage(name, syntax);
+  high.registerLanguage(name, syntax);
 }
 
 // Get a list of all registered languages.
 function listLanguages() {
-  return core$1.listLanguages()
+  return high.listLanguages()
 }
 
 // Register more aliases for an already registered language.
@@ -2793,7 +2805,7 @@ function registerAlias(name, alias) {
   }
 
   for (key in map) {
-    core$1.registerAliases(map[key], {languageName: key});
+    high.registerAliases(map[key], {languageName: key});
   }
 }
 
@@ -2867,14 +2879,6 @@ function toHtmlNoop() {
 
 function noop() {}
 
-var core = {
-	highlight: highlight_1,
-	highlightAuto: highlightAuto_1,
-	registerLanguage: registerLanguage_1,
-	listLanguages: listLanguages_1,
-	registerAlias: registerAlias_1
-};
-
 function parseNodes(nodes, className = []) {
     return nodes
         .map(node => {
@@ -2894,18 +2898,20 @@ function parseNodes(nodes, className = []) {
     })
         .flat();
 }
-function getDecorations({ doc, name, lowlight }) {
+function getHighlightNodes(result) {
+    // `.value` for lowlight v1, `.children` for lowlight v2
+    return result.value || result.children || [];
+}
+function getDecorations({ doc, name, lowlight, defaultLanguage, }) {
     const decorations = [];
     core$2.findChildren(doc, node => node.type.name === name)
         .forEach(block => {
         let from = block.pos + 1;
-        const { language } = block.node.attrs;
-        // TODO: add missing type for `listLanguages`
-        // @ts-ignore
+        const language = block.node.attrs.language || defaultLanguage;
         const languages = lowlight.listLanguages();
         const nodes = language && languages.includes(language)
-            ? lowlight.highlight(language, block.node.textContent).value
-            : lowlight.highlightAuto(block.node.textContent).value;
+            ? getHighlightNodes(lowlight.highlight(language, block.node.textContent))
+            : getHighlightNodes(lowlight.highlightAuto(block.node.textContent));
         parseNodes(nodes).forEach(node => {
             const to = from + node.text.length;
             if (node.classes.length) {
@@ -2919,11 +2925,16 @@ function getDecorations({ doc, name, lowlight }) {
     });
     return prosemirrorView.DecorationSet.create(doc, decorations);
 }
-function LowlightPlugin({ name, lowlight }) {
+function LowlightPlugin({ name, lowlight, defaultLanguage }) {
     return new prosemirrorState.Plugin({
         key: new prosemirrorState.PluginKey('lowlight'),
         state: {
-            init: (_, { doc }) => getDecorations({ doc, name, lowlight }),
+            init: (_, { doc }) => getDecorations({
+                doc,
+                name,
+                lowlight,
+                defaultLanguage,
+            }),
             apply: (transaction, decorationSet, oldState, newState) => {
                 const oldNodeName = oldState.selection.$head.parent.type.name;
                 const newNodeName = newState.selection.$head.parent.type.name;
@@ -2951,7 +2962,12 @@ function LowlightPlugin({ name, lowlight }) {
                                         && node.pos + node.node.nodeSize <= step.to;
                                 });
                         }))) {
-                    return getDecorations({ doc: transaction.doc, name, lowlight });
+                    return getDecorations({
+                        doc: transaction.doc,
+                        name,
+                        lowlight,
+                        defaultLanguage,
+                    });
                 }
                 return decorationSet.map(transaction.mapping, transaction.doc);
             },
@@ -2964,23 +2980,28 @@ function LowlightPlugin({ name, lowlight }) {
     });
 }
 
-const CodeBlockLowlight = CodeBlock__default['default'].extend({
-    defaultOptions: {
-        ...CodeBlock__default['default'].config.defaultOptions,
-        lowlight: core,
+const CodeBlockLowlight = CodeBlock__default["default"].extend({
+    addOptions() {
+        var _a;
+        return {
+            ...(_a = this.parent) === null || _a === void 0 ? void 0 : _a.call(this),
+            lowlight: core$1,
+            defaultLanguage: null,
+        };
     },
     addProseMirrorPlugins() {
+        var _a;
         return [
-            // disable for now, see: https://github.com/ueberdosis/tiptap-next/issues/259#issuecomment-817954835
-            // ...this.parentConfig.addProseMirrorPlugins?.() || [],
+            ...((_a = this.parent) === null || _a === void 0 ? void 0 : _a.call(this)) || [],
             LowlightPlugin({
-                name: 'codeBlock',
+                name: this.name,
                 lowlight: this.options.lowlight,
+                defaultLanguage: this.options.defaultLanguage,
             }),
         ];
     },
 });
 
 exports.CodeBlockLowlight = CodeBlockLowlight;
-exports.default = CodeBlockLowlight;
+exports["default"] = CodeBlockLowlight;
 //# sourceMappingURL=tiptap-extension-code-block-lowlight.cjs.js.map