@20minutes/draft-convert 3.1.1 → 3.1.2

package/{esm/blockEntities.js → dist/blockEntities.mjs}

@@ -1,7 +1,7 @@
-import updateMutation from './util/updateMutation.js';
-import rangeSort from './util/rangeSort.js';
-import getElementHTML from './util/getElementHTML.js';
-import getElementTagLength from './util/getElementTagLength.js';
+import updateMutation from './util/updateMutation.mjs';
+import rangeSort from './util/rangeSort.mjs';
+import getElementHTML from './util/getElementHTML.mjs';
+import getElementTagLength from './util/getElementTagLength.mjs';
 const converter = (entity = {}, originalText = '')=>originalText;
 export default ((block, entityMap, entityConverter = converter)=>{
     let resultText = [

package/{esm/blockInlineStyles.js → dist/blockInlineStyles.mjs}

@@ -1,9 +1,9 @@
 import invariant from 'invariant';
-import styleObjectFunction from './util/styleObjectFunction.js';
-import accumulateFunction from './util/accumulateFunction.js';
-import getElementHTML from './util/getElementHTML.js';
-import rangeSort from './util/rangeSort.js';
-import defaultInlineHTML from './default/defaultInlineHTML.js';
+import styleObjectFunction from './util/styleObjectFunction.mjs';
+import accumulateFunction from './util/accumulateFunction.mjs';
+import getElementHTML from './util/getElementHTML.mjs';
+import rangeSort from './util/rangeSort.mjs';
+import defaultInlineHTML from './default/defaultInlineHTML.mjs';
 const subtractStyles = (original, toRemove)=>original.filter((el)=>!toRemove.some((elToRemove)=>elToRemove.style === el.style));
 const popEndingStyles = (styleStack, endingStyles)=>endingStyles.reduceRight((stack, style)=>{
         const styleToRemove = stack[stack.length - 1];

package/{lib → dist}/convertFromHTML.js

@@ -8,7 +8,9 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the /src directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
- */ "use strict";
+ */ // immutable is CJS-only; default import maps to module.exports for Node ESM interop.
+// eslint-disable-next-line import/default
+"use strict";
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
@@ -18,8 +20,8 @@ Object.defineProperty(exports, "default", {
         return _default;
     }
 });
-const _immutable = /*#__PURE__*/ _interop_require_wildcard(require("immutable"));
-const _draftjs = /*#__PURE__*/ _interop_require_wildcard(require("draft-js"));
+const _immutable = /*#__PURE__*/ _interop_require_default(require("immutable"));
+const _draftjs = /*#__PURE__*/ _interop_require_default(require("draft-js"));
 const _parseHTML = /*#__PURE__*/ _interop_require_default(require("./util/parseHTML.js"));
 const _rangeSort = /*#__PURE__*/ _interop_require_default(require("./util/rangeSort.js"));
 function _interop_require_default(obj) {
@@ -27,49 +29,9 @@ function _interop_require_default(obj) {
         default: obj
     };
 }
-function _getRequireWildcardCache(nodeInterop) {
-    if (typeof WeakMap !== "function") return null;
-    var cacheBabelInterop = new WeakMap();
-    var cacheNodeInterop = new WeakMap();
-    return (_getRequireWildcardCache = function(nodeInterop) {
-        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
-    })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) {
-        return obj;
-    }
-    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-        return {
-            default: obj
-        };
-    }
-    var cache = _getRequireWildcardCache(nodeInterop);
-    if (cache && cache.has(obj)) {
-        return cache.get(obj);
-    }
-    var newObj = {
-        __proto__: null
-    };
-    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-    for(var key in obj){
-        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-            if (desc && (desc.get || desc.set)) {
-                Object.defineProperty(newObj, key, desc);
-            } else {
-                newObj[key] = obj[key];
-            }
-        }
-    }
-    newObj.default = obj;
-    if (cache) {
-        cache.set(obj, newObj);
-    }
-    return newObj;
-}
-const { List, Map, OrderedSet } = _immutable;
-const { BlockMapBuilder, CharacterMetadata, ContentBlock, ContentState, Entity, SelectionState, genKey } = _draftjs;
+// eslint-disable-next-line import/no-named-as-default-member
+const { List, Map, OrderedSet } = _immutable.default;
+const { BlockMapBuilder, CharacterMetadata, ContentBlock, ContentState, Entity, SelectionState, genKey } = _draftjs.default;
 const SPACE = ' ';
 // Arbitrary max indent
 const MAX_DEPTH = 4;

package/{esm/convertFromHTML.js → dist/convertFromHTML.mjs}

@@ -8,10 +8,13 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the /src directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
- */ import * as Immutable from 'immutable';
-import * as DraftJS from 'draft-js';
-import getSafeBodyFromHTML from './util/parseHTML.js';
-import rangeSort from './util/rangeSort.js';
+ */ // immutable is CJS-only; default import maps to module.exports for Node ESM interop.
+// eslint-disable-next-line import/default
+import Immutable from 'immutable';
+import DraftJS from 'draft-js';
+import getSafeBodyFromHTML from './util/parseHTML.mjs';
+import rangeSort from './util/rangeSort.mjs';
+// eslint-disable-next-line import/no-named-as-default-member
 const { List, Map, OrderedSet } = Immutable;
 const { BlockMapBuilder, CharacterMetadata, ContentBlock, ContentState, Entity, SelectionState, genKey } = DraftJS;
 const SPACE = ' ';

package/{lib → dist}/convertToHTML.js

@@ -11,7 +11,7 @@ Object.defineProperty(exports, "default", {
 const _invariant = /*#__PURE__*/ _interop_require_default(require("invariant"));
 const _react = /*#__PURE__*/ _interop_require_default(require("react"));
 const _server = /*#__PURE__*/ _interop_require_default(require("react-dom/server"));
-const _draftjs = /*#__PURE__*/ _interop_require_wildcard(require("draft-js"));
+const _draftjs = /*#__PURE__*/ _interop_require_default(require("draft-js"));
 const _encodeBlock = /*#__PURE__*/ _interop_require_default(require("./encodeBlock.js"));
 const _blockEntities = /*#__PURE__*/ _interop_require_default(require("./blockEntities.js"));
 const _blockInlineStyles = /*#__PURE__*/ _interop_require_default(require("./blockInlineStyles.js"));
@@ -25,48 +25,7 @@ function _interop_require_default(obj) {
         default: obj
     };
 }
-function _getRequireWildcardCache(nodeInterop) {
-    if (typeof WeakMap !== "function") return null;
-    var cacheBabelInterop = new WeakMap();
-    var cacheNodeInterop = new WeakMap();
-    return (_getRequireWildcardCache = function(nodeInterop) {
-        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
-    })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) {
-        return obj;
-    }
-    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-        return {
-            default: obj
-        };
-    }
-    var cache = _getRequireWildcardCache(nodeInterop);
-    if (cache && cache.has(obj)) {
-        return cache.get(obj);
-    }
-    var newObj = {
-        __proto__: null
-    };
-    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-    for(var key in obj){
-        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-            if (desc && (desc.get || desc.set)) {
-                Object.defineProperty(newObj, key, desc);
-            } else {
-                newObj[key] = obj[key];
-            }
-        }
-    }
-    newObj.default = obj;
-    if (cache) {
-        cache.set(obj, newObj);
-    }
-    return newObj;
-}
-const { convertToRaw } = _draftjs;
+const { convertToRaw } = _draftjs.default;
 const defaultEntityToHTML = (entity, originalText)=>originalText;
 const defaultValidateHTML = (html)=>true;
 const convertToHTML = ({ styleToHTML = {}, blockToHTML = {}, entityToHTML = defaultEntityToHTML, validateHTML = defaultValidateHTML })=>(contentState)=>{

package/{esm/convertToHTML.js → dist/convertToHTML.mjs}

@@ -1,15 +1,15 @@
 import invariant from 'invariant';
 import React from 'react';
 import ReactDOMServer from 'react-dom/server';
-import * as DraftJS from 'draft-js';
-import encodeBlock from './encodeBlock.js';
-import blockEntities from './blockEntities.js';
-import blockInlineStyles from './blockInlineStyles.js';
-import accumulateFunction from './util/accumulateFunction.js';
-import blockTypeObjectFunction from './util/blockTypeObjectFunction.js';
-import getBlockTags from './util/getBlockTags.js';
-import getNestedBlockTags from './util/getNestedBlockTags.js';
-import defaultBlockHTML from './default/defaultBlockHTML.js';
+import DraftJS from 'draft-js';
+import encodeBlock from './encodeBlock.mjs';
+import blockEntities from './blockEntities.mjs';
+import blockInlineStyles from './blockInlineStyles.mjs';
+import accumulateFunction from './util/accumulateFunction.mjs';
+import blockTypeObjectFunction from './util/blockTypeObjectFunction.mjs';
+import getBlockTags from './util/getBlockTags.mjs';
+import getNestedBlockTags from './util/getNestedBlockTags.mjs';
+import defaultBlockHTML from './default/defaultBlockHTML.mjs';
 const { convertToRaw } = DraftJS;
 const defaultEntityToHTML = (entity, originalText)=>originalText;
 const defaultValidateHTML = (html)=>true;

package/{esm/encodeBlock.js → dist/encodeBlock.mjs}

@@ -1,5 +1,5 @@
-import updateMutation from './util/updateMutation.js';
-import rangeSort from './util/rangeSort.js';
+import updateMutation from './util/updateMutation.mjs';
+import rangeSort from './util/rangeSort.mjs';
 const ENTITY_MAP = {
     '&': '&',
     '<': '&lt;',

package/dist/index.d.ts

@@ -0,0 +1,121 @@
+// Based on: https://github.com/HubSpot/draft-convert/issues/107#issuecomment-488581709 by <https://github.com/sbusch>
+// Grabbed from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/draft-convert/index.d.ts
+
+import {
+  ContentState,
+  DraftBlockType,
+  DraftEntityMutability,
+  DraftInlineStyleType,
+  Entity,
+  RawDraftContentBlock,
+  RawDraftEntity,
+} from 'draft-js'
+import { ReactNode } from 'react'
+
+export type RawDraftContentBlockWithCustomType<T> = Omit<
+  RawDraftContentBlock,
+  'type'
+> & {
+  type: T
+}
+
+export type ExtendedHTMLElement<T> = (HTMLElement | HTMLLinkElement) & T
+
+export type EntityKey = string
+
+export type ContentStateConverter = (contentState: ContentState) => string
+export type HTMLConverter = (html: string) => ContentState
+
+export type Tag =
+  | ReactNode
+  | { start: string; end: string; empty?: string | undefined }
+  | {
+      element: ReactNode
+      empty?: ReactNode | undefined
+    }
+
+export interface IConvertToHTMLConfig<
+  S = DraftInlineStyleType,
+  B extends DraftBlockType = DraftBlockType,
+  E extends RawDraftEntity = RawDraftEntity,
+> {
+  // Inline styles:
+  // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+  styleToHTML?: ((style: S) => Tag | null | undefined | void) | undefined
+
+  // Block styles:
+  blockToHTML?: ((block: RawDraftContentBlockWithCustomType<B>) => Tag | null | undefined) | undefined
+
+  // Entity styling:
+  entityToHTML?: ((entity: E, originalText: string) => Tag | null | undefined) | undefined
+
+  // HTML validation:
+  validateHTML?: ((html: string) => boolean) | undefined
+}
+
+export interface IConvertFromHTMLConfig<
+  S extends {
+    [name: string]: unknown
+  } = DOMStringMap,
+  B extends DraftBlockType = DraftBlockType,
+  E extends RawDraftEntity = RawDraftEntity,
+> {
+  // Inline styles:
+  htmlToStyle?:
+    | ((nodeName: string, node: ExtendedHTMLElement<S>, currentStyle: Set<string>) => Set<string>)
+    | undefined
+
+  // Block styles:
+  htmlToBlock?:
+    | ((
+        nodeName: string,
+        node: ExtendedHTMLElement<S>
+      ) => B | { type: B; data: object } | false | undefined)
+    | undefined
+
+  // Html entities
+  htmlToEntity?:
+    | ((
+        nodeName: string,
+        node: ExtendedHTMLElement<S>,
+        createEntity: (type: E['type'], mutability: DraftEntityMutability, data: E['data']) => EntityKey,
+        getEntity: (key: EntityKey) => Entity,
+        mergeEntityData: (key: string, data: object) => void,
+        replaceEntityData: (key: string, data: object) => void
+      ) => EntityKey | undefined)
+    | undefined
+
+  // Text entities
+  textToEntity?:
+    | ((
+        text: string,
+        createEntity: (type: E['type'], mutability: DraftEntityMutability, data: E['data']) => EntityKey,
+        getEntity: (key: EntityKey) => Entity,
+        mergeEntityData: (key: string, data: object) => void,
+        replaceEntityData: (key: string, data: object) => void
+      ) => Array<{
+        entity: EntityKey
+        offset: number
+        length: number
+        result?: string | undefined
+      }>)
+    | undefined
+}
+
+export function convertToHTML<
+  S = DraftInlineStyleType,
+  B extends DraftBlockType = DraftBlockType,
+  E extends RawDraftEntity = RawDraftEntity,
+>(config: IConvertToHTMLConfig<S, B, E>): ContentStateConverter
+export function convertToHTML(contentState: ContentState): string
+
+export function convertFromHTML<
+  S extends {
+    [name: string]: unknown
+  } = DOMStringMap,
+  B extends DraftBlockType = DraftBlockType,
+  E extends RawDraftEntity = RawDraftEntity,
+>(config: IConvertFromHTMLConfig<S, B, E>): HTMLConverter
+export function convertFromHTML(html: string): ContentState
+
+export function parseHTML(html: string): HTMLBodyElement

package/dist/index.mjs

@@ -0,0 +1,4 @@
+import convertToHTML from './convertToHTML.mjs';
+import convertFromHTML from './convertFromHTML.mjs';
+import parseHTML from './util/parseHTML.mjs';
+export { convertToHTML, convertFromHTML, parseHTML };

package/{esm/util/getBlockTags.js → dist/util/getBlockTags.mjs}

@@ -1,7 +1,7 @@
 import invariant from 'invariant';
 import React from 'react';
 import ReactDOMServer from 'react-dom/server';
-import splitReactElement from './splitReactElement.js';
+import splitReactElement from './splitReactElement.mjs';
 function hasChildren(element) {
     return /*#__PURE__*/ React.isValidElement(element) && React.Children.count(element.props.children) > 0;
 }

package/{esm/util/getElementHTML.js → dist/util/getElementHTML.mjs}

@@ -1,7 +1,7 @@
 import invariant from 'invariant';
 import React from 'react';
 import ReactDOMServer from 'react-dom/server';
-import splitReactElement from './splitReactElement.js';
+import splitReactElement from './splitReactElement.mjs';
 function hasChildren(element) {
     return /*#__PURE__*/ React.isValidElement(element) && React.Children.count(element.props.children) > 0;
 }

package/{esm/util/getElementTagLength.js → dist/util/getElementTagLength.mjs}

@@ -1,5 +1,5 @@
 import React from 'react';
-import splitReactElement from './splitReactElement.js';
+import splitReactElement from './splitReactElement.mjs';
 const getElementTagLength = (element, type = 'start')=>{
     if (/*#__PURE__*/ React.isValidElement(element)) {
         const splitElement = splitReactElement(element);

package/{esm/util/getNestedBlockTags.js → dist/util/getNestedBlockTags.mjs}

@@ -1,6 +1,6 @@
 import invariant from 'invariant';
 import React from 'react';
-import splitReactElement from './splitReactElement.js';
+import splitReactElement from './splitReactElement.mjs';
 export default function getNestedBlockTags(blockHTML, depth) {
     invariant(blockHTML !== null && blockHTML !== undefined, 'Expected block HTML value to be non-null');
     if (typeof blockHTML.nest === 'function') {

package/package.json

@@ -1,32 +1,32 @@
 {
   "name": "@20minutes/draft-convert",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "Extensibly serialize & deserialize Draft.js ContentState",
-  "main": "lib/index.js",
-  "types": "types/index.d.ts",
-  "module": "esm/index.js",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./types/index.d.ts",
-      "require": "./lib/index.js",
-      "import": "./esm/index.js"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs",
+      "default": "./dist/index.mjs"
     }
   },
   "repository": "20minutes/draft-convert",
   "scripts": {
-    "build": "yarn build:cjs && yarn build:esm",
-    "build:cjs": "swc src -d lib --config-file .swcrc.cjs --strip-leading-paths --delete-dir-on-start",
-    "build:esm": "swc src -d esm --config-file .swcrc.esm --strip-leading-paths --delete-dir-on-start",
+    "build": "yarn clean && yarn build:esm && yarn build:cjs && yarn build:types",
+    "build:cjs": "swc src -d dist --config-file .swcrc.cjs --strip-leading-paths && node scripts/rename-dist-cjs-entry.js",
+    "build:esm": "swc src -d dist --config-file .swcrc.esm --strip-leading-paths --delete-dir-on-start --out-file-extension mjs && node scripts/fix-dist-esm-imports.js",
+    "build:types": "node scripts/build-dist-types.js",
     "test": "jest",
     "test:watch": "jest --watch",
-    "clean": "rimraf ./lib ./esm",
+    "clean": "rimraf ./dist ./lib ./esm",
     "build-and-test": "yarn clean && yarn test",
     "lint": "eslint src/ test/"
   },
   "files": [
-    "types",
-    "lib",
-    "esm"
+    "dist"
   ],
   "keywords": [
     "draft",

package/esm/index.js

@@ -1,4 +0,0 @@
-import convertToHTML from './convertToHTML.js';
-import convertFromHTML from './convertFromHTML.js';
-import parseHTML from './util/parseHTML.js';
-export { convertToHTML, convertFromHTML, parseHTML };

package/types/index.d.ts

@@ -1,114 +0,0 @@
-// Based on: https://github.com/HubSpot/draft-convert/issues/107#issuecomment-488581709 by <https://github.com/sbusch>
-// Grabbed from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/draft-convert/index.d.ts
-
-declare module "@20minutes/draft-convert" {
-    import {
-        ContentState,
-        DraftBlockType,
-        DraftEntityMutability,
-        DraftInlineStyleType,
-        Entity,
-        RawDraftContentBlock,
-        RawDraftEntity,
-    } from "draft-js";
-    import { ReactNode } from "react";
-
-    type RawDraftContentBlockWithCustomType<T> = Omit<RawDraftContentBlock, "type"> & {
-        type: T;
-    };
-
-    type ExtendedHTMLElement<T> = (HTMLElement | HTMLLinkElement) & T;
-
-    interface IConvertToHTMLConfig<
-        S = DraftInlineStyleType,
-        B extends DraftBlockType = DraftBlockType,
-        E extends RawDraftEntity = RawDraftEntity,
-    > {
-        // Inline styles:
-        // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
-        styleToHTML?: ((style: S) => Tag | void) | undefined;
-
-        // Block styles:
-        blockToHTML?: ((block: RawDraftContentBlockWithCustomType<B>) => Tag) | undefined;
-
-        // Entity styling:
-        entityToHTML?: ((entity: E, originalText: string) => Tag) | undefined;
-
-        // HTML validation:
-        validateHTML?: ((html: string) => boolean) | undefined;
-    }
-
-    type EntityKey = string;
-
-    interface IConvertFromHTMLConfig<
-        S extends {
-            [name: string]: unknown;
-        } = DOMStringMap,
-        B extends DraftBlockType = DraftBlockType,
-        E extends RawDraftEntity = RawDraftEntity,
-    > {
-        // Inline styles:
-        htmlToStyle?:
-            | ((nodeName: string, node: ExtendedHTMLElement<S>, currentStyle: Set<string>) => Set<string>)
-            | undefined;
-
-        // Block styles:
-        htmlToBlock?:
-            | ((
-                nodeName: string,
-                node: ExtendedHTMLElement<S>,
-            ) => B | { type: B; data: object } | false | undefined)
-            | undefined;
-
-        // Html entities
-        htmlToEntity?:
-            | ((
-                nodeName: string,
-                node: ExtendedHTMLElement<S>,
-                createEntity: (type: E["type"], mutability: DraftEntityMutability, data: E["data"]) => EntityKey,
-                getEntity: (key: EntityKey) => Entity,
-                mergeEntityData: (key: string, data: object) => void,
-                replaceEntityData: (key: string, data: object) => void,
-            ) => EntityKey | undefined)
-            | undefined;
-
-        // Text entities
-        textToEntity?:
-            | ((
-                text: string,
-                createEntity: (type: E["type"], mutability: DraftEntityMutability, data: E["data"]) => EntityKey,
-                getEntity: (key: EntityKey) => Entity,
-                mergeEntityData: (key: string, data: object) => void,
-                replaceEntityData: (key: string, data: object) => void,
-            ) => Array<{
-                entity: EntityKey;
-                offset: number;
-                length: number;
-                result?: string | undefined;
-            }>)
-            | undefined;
-    }
-
-    type ContentStateConverter = (contentState: ContentState) => string;
-    type HTMLConverter = (html: string) => ContentState;
-
-    type Tag = ReactNode | { start: string; end: string; empty?: string | undefined } | {
-        element: ReactNode;
-        empty?: ReactNode | undefined;
-    };
-
-    export function convertToHTML<
-        S = DraftInlineStyleType,
-        B extends DraftBlockType = DraftBlockType,
-        E extends RawDraftEntity = RawDraftEntity,
-    >(config: IConvertToHTMLConfig<S, B, E>): ContentStateConverter;
-    export function convertToHTML(contentState: ContentState): string;
-    export function convertFromHTML<
-        S extends {
-            [name: string]: unknown;
-        } = DOMStringMap,
-        B extends DraftBlockType = DraftBlockType,
-        E extends RawDraftEntity = RawDraftEntity,
-    >(config: IConvertFromHTMLConfig<S, B, E>): HTMLConverter;
-    export function convertFromHTML(html: string): ContentState;
-}