@takeshape/util 11.63.3 → 11.63.7

package/dist/common/draftjs.d.ts

@@ -1,9 +1,5 @@
 import type { Entity, RawDraftContentState } from 'draft-js';
-export type Content = {
-    [name: string]: any;
-    _id: string;
-};
-export type MaybeContent = Content | undefined;
+import type { MaybeContent } from './types.ts';
 type DraftEntityWithData = {
     type?: string;
     mutability?: string;

package/dist/common/draftjs.js

@@ -1,11 +1,15 @@
+/*
+ * The intention is to move all this to the client package in the end, but right now it's here
+ * to be shared between the draftjs / mdx implementations, which span the client / server differently.
+ */
 import { getImageUrl } from '@takeshape/routing';
 import render from 'dom-serializer';
 import he from 'he';
 import { ElementType, parseDOM } from 'htmlparser2';
-import escape from 'lodash/escape.js';
+import _escape from 'lodash/escape.js';
 import forEach from 'lodash/forEach.js';
 import pickBy from 'lodash/pickBy.js';
-import unescape from 'lodash/unescape.js';
+import _unescape from 'lodash/unescape.js';
 import { draftToMarkdown, markdownToDraft } from 'markdown-draft-js';
 import shortid from 'shortid';
 import Url from 'url-parse';
@@ -166,7 +170,7 @@ export function fromDraftjs(draftjs, styleItems, entityItems) {
             LINK: {
                 open(entity) {
                     if (entity?.data?.target === '_blank') {
-                        const url = escape(entity?.data?.url || entity?.data?.href || '');
+                        const url = _escape(entity?.data?.url || entity?.data?.href || '');
                         return `<TSExternalLink text="${EXTERNAL_LINK_MARKER}" href="${url}">`;
                     }
                     return '[';
@@ -390,17 +394,17 @@ function mdxToDraftjsOembed(item, entityKeyGenerator) {
             return;
         }
         return getDraftjsOembed({
-            html: unescape(dom.attribs.html),
+            html: _unescape(dom.attribs.html),
             width: dom.attribs.width ? Number(dom.attribs.width) : undefined,
             height: dom.attribs.height ? Number(dom.attribs.height) : undefined,
-            url: unescape(dom.attribs.url),
-            author_name: unescape(dom.attribs.author_name),
-            author_url: unescape(dom.attribs.author_url),
-            type: unescape(dom.attribs.type),
+            url: _unescape(dom.attribs.url),
+            author_name: _unescape(dom.attribs.author_name),
+            author_url: _unescape(dom.attribs.author_url),
+            type: _unescape(dom.attribs.type),
             cache_age: Number(dom.attribs.cache_age),
-            provider_name: unescape(dom.attribs.provider_name),
-            provider_url: unescape(dom.attribs.provider_url),
-            version: unescape(dom.attribs.version),
+            provider_name: _unescape(dom.attribs.provider_name),
+            provider_url: _unescape(dom.attribs.provider_url),
+            version: _unescape(dom.attribs.version),
             key: entityKeyGenerator(),
             depth: item.level
         });
@@ -542,8 +546,8 @@ function mdxToDraftjsImage(item, entityKeyGenerator) {
             return;
         }
         return getDraftjsImage({
-            captionText: unescape(dom.attribs.caption).replace(/<\/?p>/g, ''),
-            creditText: unescape(dom.attribs.credit).replace(/<\/?p>/g, ''),
+            captionText: _unescape(dom.attribs.caption).replace(/<\/?p>/g, ''),
+            creditText: _unescape(dom.attribs.credit).replace(/<\/?p>/g, ''),
             alignment: dom.attribs.alignment,
             size: dom.attribs.size,
             assetId: dom.attribs.id,
@@ -562,7 +566,7 @@ function mdxToDraftjsPullquote(item) {
             return;
         }
         return getDraftjsPullquote({
-            text: unescape(dom.attribs.text),
+            text: _unescape(dom.attribs.text),
             depth: item.level
         });
     }

package/dist/common/highlight-code.js

@@ -16,11 +16,11 @@ import 'prismjs/components/prism-sass.js';
 import 'prismjs/components/prism-scss.js';
 import 'prismjs/components/prism-markdown.js';
 import 'prismjs/components/prism-json.js';
-import escape from 'lodash/escape.js';
+import _escape from 'lodash/escape.js';
 export const highlightCode = (code, lang) => {
     if (lang) {
         const syntax = Prism.languages[lang];
         return Prism.highlight(code, syntax, lang);
     }
-    return escape(code);
+    return _escape(code);
 };

package/dist/common/templates.d.ts

@@ -1,5 +1,5 @@
 import { type ImgixParams } from '@takeshape/routing';
-import type { MaybeContent } from './draftjs.ts';
+import type { MaybeContent } from './types.ts';
 export declare function getApplyPrefix(prefix: string): (str: string) => string;
 type AttrsObj = {
     alt: string;

package/dist/common/templates.js

@@ -4,7 +4,7 @@ import { getImageUrl } from '@takeshape/routing';
  * to be shared between the draftjs / mdx implementations, which span the client / server differently.
  */
 import classnames from 'classnames';
-import escape from 'lodash/escape.js';
+import _escape from 'lodash/escape.js';
 import { highlightCode } from "./highlight-code.js";
 import { isRecord } from "./types.js";
 export function getApplyPrefix(prefix) {
@@ -17,7 +17,7 @@ export function attrs(obj) {
     for (const attrName of attrNames) {
         const value = obj[attrName];
         if (value) {
-            attrStrings.push(`${attrName}="${escape(value)}"`);
+            attrStrings.push(`${attrName}="${_escape(value)}"`);
         }
     }
     return attrStrings.length ? ` ${attrStrings.join(' ')}` : '';
@@ -48,7 +48,7 @@ export function imageTemplate(applyPrefix, data) {
     return `<figure${classAttr}>${image}${figCaption}</figure>`;
 }
 function renderMdx(tag, attributes, data, children) {
-    const tagWithAttributes = `${tag} ${attributes.map((attr) => `${attr}="${escape(data[attr])}"`).join(' ')}`;
+    const tagWithAttributes = `${tag} ${attributes.map((attr) => `${attr}="${_escape(data[attr])}"`).join(' ')}`;
     if (children) {
         return `<${tagWithAttributes}>
 ${children.replace(/[\n\r]+$/, '')}

package/dist/common/types.d.ts

@@ -67,3 +67,8 @@ export declare function getSingle<T>(t?: T | T[]): Maybe<T>;
  * Test whether a provided string is numeric, e.g., '9' is numeric while 'nine' is not.
  */
 export declare function isNumericString(key: string): boolean;
+export type Content = {
+    [name: string]: any;
+    _id: string;
+};
+export type MaybeContent = Content | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/util",
-  "version": "11.63.3",
+  "version": "11.63.7",
   "description": "Shared utilities",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -46,7 +46,7 @@
     "tiny-invariant": "^1.2.0",
     "uint8array-extras": "^1.4.0",
     "url-parse": "^1.5.3",
-    "@takeshape/routing": "11.63.3"
+    "@takeshape/routing": "11.63.7"
   },
   "devDependencies": {
     "@types/classnames": "^2.2.9",
@@ -57,6 +57,7 @@
     "@types/mime-types": "^2.1.0",
     "@types/prismjs": "^1.16.2",
     "@types/shortid": "^0.0.29",
+    "domhandler": "^5.0.3",
     "stripe": "13.8.0"
   },
   "engines": {