@doist/typist 1.0.7 → 1.0.9

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [1.0.9](https://github.com/Doist/typist/compare/v1.0.8...v1.0.9) (2022-12-19)
+
+### Bug Fixes
+
+-   **rich-text-link:** More lenient regex for input/paste rule ([#72](https://github.com/Doist/typist/issues/72)) ([98e363f](https://github.com/Doist/typist/commit/98e363f27e6e403a775ca8fe729ce17dbdf721df))
+
+## [1.0.8](https://github.com/Doist/typist/compare/v1.0.7...v1.0.8) (2022-12-19)
+
+### Bug Fixes
+
+-   **factories:** Allow alphanumeric IDs for suggestion nodes in `createSuggestionExtension` ([#66](https://github.com/Doist/typist/issues/66)) ([a1726a6](https://github.com/Doist/typist/commit/a1726a6be089e3e1452def641dfcfc622ac3e942))
+
 ## [1.0.7](https://github.com/Doist/typist/compare/v1.0.6...v1.0.7) (2022-12-14)
 
 ### Bug Fixes

package/dist/extensions/rich-text/rich-text-link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rich-text-link.d.ts","sourceRoot":"","sources":["../../../src/extensions/rich-text/rich-text-link.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AA2DzD;;;;GAIG;AACH,QAAA,MAAM,YAAY,+CA8ChB,CAAA;AAEF,OAAO,EAAE,YAAY,EAAE,CAAA;AAEvB,YAAY,EAAE,WAAW,IAAI,mBAAmB,EAAE,CAAA"}
+{"version":3,"file":"rich-text-link.d.ts","sourceRoot":"","sources":["../../../src/extensions/rich-text/rich-text-link.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAuDzD;;;;GAIG;AACH,QAAA,MAAM,YAAY,+CA8ChB,CAAA;AAEF,OAAO,EAAE,YAAY,EAAE,CAAA;AAEvB,YAAY,EAAE,WAAW,IAAI,mBAAmB,EAAE,CAAA"}

package/dist/extensions/rich-text/rich-text-link.js

@@ -3,17 +3,13 @@ import { Link } from '@tiptap/extension-link';
 /**
  * The input regex for Markdown links with title support, and multiple quotation marks (required
  * in case the `Typography` extension is being included).
- *
- * @see https://stephenweiss.dev/regex-markdown-link
  */
-const inputRegex = /(?:^|\s)\[([^\]]*)?\]\(([A-Za-z0-9:/.-?]+)(?: ["“](.+)["”])?\)$/;
+const inputRegex = /(?:^|\s)\[([^\]]*)?\]\((\S+)(?: ["“](.+)["”])?\)$/i;
 /**
  * The paste regex for Markdown links with title support, and multiple quotation marks (required
  * in case the `Typography` extension is being included).
- *
- * @see https://stephenweiss.dev/regex-markdown-link
  */
-const pasteRegex = /(?:^|\s)\[([^\]]*)?\]\(([A-Za-z0-9:/.-?]+)(?: ["“](.+)["”])?\)/g;
+const pasteRegex = /(?:^|\s)\[([^\]]*)?\]\((\S+)(?: ["“](.+)["”])?\)/gi;
 /**
  * Input rule built specifically for the `Link` extension, which ignores the auto-linked URL in
  * parentheses (e.g., `(https://doist.dev)`).
@@ -24,7 +20,7 @@ function linkInputRule(config) {
     const defaultMarkInputRule = markInputRule(config);
     return new InputRule({
         find: config.find,
-        handler: (props) => {
+        handler(props) {
             const { tr } = props.state;
             defaultMarkInputRule.handler(props);
             tr.setMeta('preventAutolink', true);
@@ -42,7 +38,7 @@ function linkPasteRule(config) {
     const defaultMarkInputRule = markPasteRule(config);
     return new PasteRule({
         find: config.find,
-        handler: (props) => {
+        handler(props) {
             const { tr } = props.state;
             defaultMarkInputRule.handler(props);
             tr.setMeta('preventAutolink', true);

package/dist/factories/create-suggestion-extension.d.ts

@@ -8,7 +8,7 @@ type SuggestionAttributes = {
     /**
      * The suggestion node unique identifier to be rendered by the editor as a `data-id` attribute.
      */
-    id: number;
+    id: number | string;
     /**
      * The suggestion node label to be rendered by the editor as a `data-label` attribute and the
      * display text itself.
@@ -84,7 +84,7 @@ type SuggestionStorage<SuggestionItemType> = Readonly<{
      * A collection of suggestion items indexed by the item id.
      */
     itemsById: {
-        readonly [id: number]: SuggestionItemType | undefined;
+        readonly [id: SuggestionAttributes['id']]: SuggestionItemType | undefined;
     };
 }>;
 /**
@@ -109,11 +109,11 @@ type SuggestionExtensionResult<SuggestionItemType> = Node<SuggestionOptions<Sugg
  * @returns A new suggestion extension tailored to a specific use case.
  */
 declare function createSuggestionExtension<SuggestionItemType extends {
-    [id: string]: unknown;
+    [id: SuggestionAttributes['id']]: unknown;
 } = SuggestionAttributes>(type: string, items?: SuggestionItemType[], ...attributesMapping: SuggestionItemType extends SuggestionAttributes ? [] : [
     RequireAtLeastOne<{
-        id: ConditionalKeys<SuggestionItemType, number>;
-        label: ConditionalKeys<SuggestionItemType, string>;
+        id: ConditionalKeys<SuggestionItemType, SuggestionAttributes['id']>;
+        label: ConditionalKeys<SuggestionItemType, SuggestionAttributes['label']>;
     }>
 ]): SuggestionExtensionResult<SuggestionItemType>;
 export { createSuggestionExtension };

package/dist/factories/create-suggestion-extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-suggestion-extension.d.ts","sourceRoot":"","sources":["../../src/factories/create-suggestion-extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,IAAI,EAAE,MAAM,cAAc,CAAA;AAOpD,OAAO,KAAK,EACR,sBAAsB,IAAI,0BAA0B,EACpD,iBAAiB,IAAI,qBAAqB,EAC7C,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAEnE;;GAEG;AACH,KAAK,oBAAoB,GAAG;IACxB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAA;IAEV;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAA;CAChB,CAAA;AAED;;GAEG;AACH,KAAK,uBAAuB,CAAC,kBAAkB,IAAI;IAC/C;;OAEG;IACH,OAAO,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,CAAA;IAE3C;;OAEG;IACH,KAAK,EAAE,kBAAkB,EAAE,CAAA;CAC9B,CAAA;AAED;;;GAGG;AACH,KAAK,qBAAqB,GAAG;IACzB,SAAS,EAAE,CAAC,KAAK,EAAE,0BAA0B,KAAK,OAAO,CAAA;CAC5D,CAAA;AAED;;GAEG;AACH,KAAK,iBAAiB,CAAC,kBAAkB,IAAI;IACzC;;OAEG;IACH,WAAW,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;IAE5B;;OAEG;IACH,WAAW,EAAE,qBAAqB,CAAC,aAAa,CAAC,CAAA;IAEjD;;OAEG;IACH,eAAe,EAAE,qBAAqB,CAAC,iBAAiB,CAAC,CAAA;IAEzD;;OAEG;IACH,WAAW,EAAE,qBAAqB,CAAC,aAAa,CAAC,CAAA;IAEjD;;OAEG;IACH,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,MAAM,CAAA;IAEzD;;OAEG;IACH,gBAAgB,CAAC,EAAE,qBAAqB,CAAC,kBAAkB,CAAC,CAAC,QAAQ,CAAC,CAAA;IAEtE;;OAEG;IACH,cAAc,CAAC,EAAE,CACb,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,KAC7C,kBAAkB,EAAE,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAA;IAEzD;;OAEG;IACH,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,CAAA;CACpD,CAAA;AAED;;GAEG;AACH,KAAK,iBAAiB,CAAC,kBAAkB,IAAI,QAAQ,CAAC;IAClD;;OAEG;IACH,KAAK,EAAE,kBAAkB,EAAE,CAAA;IAE3B;;OAEG;IACH,SAAS,EAAE;QAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS,CAAA;KAAE,CAAA;CACvE,CAAC,CAAA;AAEF;;GAEG;AACH,KAAK,yBAAyB,CAAC,kBAAkB,IAAI,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,CAAA;AAEhG;;;;;;;;;;;;;;;;GAgBG;AACH,iBAAS,yBAAyB,CAC9B,kBAAkB,SAAS;IAAE,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,GAAG,oBAAoB,EAE3E,IAAI,EAAE,MAAM,EACZ,KAAK,GAAE,kBAAkB,EAAO,EAKhC,GAAG,iBAAiB,EAAE,kBAAkB,SAAS,oBAAoB,GAC/D,EAAE,GACF;IACI,iBAAiB,CAAC;QACd,EAAE,EAAE,eAAe,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAA;QAC/C,KAAK,EAAE,eAAe,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAA;KACrD,CAAC;CACL,GACR,yBAAyB,CAAC,kBAAkB,CAAC,CAuJ/C;AAED,OAAO,EAAE,yBAAyB,EAAE,CAAA;AAEpC,YAAY,EACR,yBAAyB,EACzB,iBAAiB,EACjB,uBAAuB,EACvB,qBAAqB,EACrB,iBAAiB,GACpB,CAAA"}
+{"version":3,"file":"create-suggestion-extension.d.ts","sourceRoot":"","sources":["../../src/factories/create-suggestion-extension.ts"],"names":[],"mappings":"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"}

package/dist/factories/create-suggestion-extension.js

@@ -63,13 +63,13 @@ function createSuggestionExtension(type, items = [],
                     default: null,
                     parseHTML: (element) => element.getAttribute('data-id'),
                     renderHTML: (attributes) => ({
-                        'data-id': Number(attributes[idAttribute]),
+                        'data-id': String(attributes[idAttribute]),
                     }),
                 },
                 [labelAttribute]: {
                     default: null,
                     parseHTML: (element) => {
-                        const id = Number(element.getAttribute('data-id'));
+                        const id = String(element.getAttribute('data-id'));
                         const item = this.storage.itemsById[id];
                         // Read the latest item label from the storage, if available, otherwise
                         // fallback to the item label in the `data-label` attribute
@@ -90,7 +90,7 @@ function createSuggestionExtension(type, items = [],
                 mergeAttributes({
                     [`data-${attributeType}`]: '',
                     'aria-label': this.options.renderAriaLabel?.({
-                        id: Number(node.attrs[idAttribute]),
+                        id: String(node.attrs[idAttribute]),
                         label: String(node.attrs[labelAttribute]),
                     }),
                 }, HTMLAttributes),

package/dist/serializers/html/extensions/link.js

@@ -15,7 +15,7 @@ function link(suggestionNodes) {
         renderer: {
             link(href, title, text) {
                 if (href && linkSchemaRegex.test(href)) {
-                    const [, schema, id] = /^([a-z-]+):\/\/(\d+)$/i.exec(href) || [];
+                    const [, schema, id] = /^([a-z-]+):\/\/(\S+)$/i.exec(href) || [];
                     if (schema && id && text) {
                         return `<span data-${schema} data-id="${id}" data-label="${text}"></span>`;
                     }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@doist/typist",
     "description": "The mighty Tiptap-based rich-text editor React component that powers Doist products.",
-    "version": "1.0.7",
+    "version": "1.0.9",
     "license": "MIT",
     "homepage": "https://typist.doist.dev/",
     "repository": "https://github.com/Doist/typist",
@@ -82,15 +82,15 @@
     "devDependencies": {
         "@doist/eslint-config": "8.1.3",
         "@doist/prettier-config": "3.0.5",
-        "@doist/reactist": "17.4.0",
-        "@mdx-js/react": "2.1.5",
+        "@doist/reactist": "17.5.0",
+        "@mdx-js/react": "2.2.1",
         "@semantic-release/changelog": "6.0.2",
         "@semantic-release/exec": "6.0.3",
         "@semantic-release/git": "10.0.1",
         "@storybook/addon-a11y": "6.5.14",
         "@storybook/addon-essentials": "6.5.14",
         "@storybook/addons": "6.5.14",
-        "@storybook/builder-vite": "0.2.5",
+        "@storybook/builder-vite": "0.2.6",
         "@storybook/mdx2-csf": "0.0.3",
         "@storybook/react": "6.5.14",
         "@testing-library/dom": "8.19.0",
@@ -112,7 +112,7 @@
         "eslint-import-resolver-typescript": "3.5.2",
         "eslint-plugin-jest": "27.1.6",
         "eslint-plugin-simple-import-sort": "8.0.0",
-        "eslint-plugin-unicorn": "45.0.1",
+        "eslint-plugin-unicorn": "45.0.2",
         "github-markdown-css": "5.1.0",
         "husky": "8.0.2",
         "ignore-sync": "6.0.2",
@@ -132,7 +132,7 @@
         "storybook-css-modules": "1.0.8",
         "ts-jest": "29.0.3",
         "ts-node": "10.9.1",
-        "type-fest": "3.3.0",
+        "type-fest": "3.4.0",
         "typescript": "4.9.4",
         "typescript-plugin-css-modules": "4.1.1"
     },