Revert "feat: JSON.stringify encode idcode"

This reverts commit a1c8d94.
cheminfo · Oct 17, 2024 · 6c0a5cc · 6c0a5cc
1 parent a1c8d94
commit 6c0a5cc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 23 deletions.
diff --git a/examples/generic_editor/web_component.html b/examples/generic_editor/web_component.html
@@ -24,7 +24,7 @@ <h1>Generic editor - &lt;openchemlib-editor> (Web Component) demo</h1>
 
     <p>Molecule <code>ffc`P@H`QxNQQJJIJIZJHiSkQSejB`jFjhhaEqFUh@</code></p>
     <openchemlib-editor
-      idcode='"ffc`P@H`QxNQQJJIJIZJHiSkQSejB`jFjhhaEqFUh@"'
+      idcode="ffc`P@H`QxNQQJJIJIZJHiSkQSejB`jFjhhaEqFUh@"
     ></openchemlib-editor>
 
     <p>
@@ -34,7 +34,7 @@ <h1>Generic editor - &lt;openchemlib-editor> (Web Component) demo</h1>
       </code>
     </p>
     <openchemlib-editor
-      idcode='"ffc`P@H`QxNQQJJIJIZJHiSkQSejB`jFjhhaEqFUhCyqHiCHy@leBhMEh]B\sa^kp"'
+      idcode="ffc`P@H`QxNQQJJIJIZJHiSkQSejB`jFjhhaEqFUhCyqHiCHy@leBhMEh]B\sa^kp"
       fragment
     ></openchemlib-editor>
 
@@ -44,12 +44,12 @@ <h1>Generic editor - &lt;openchemlib-editor> (Web Component) demo</h1>
     </p>
     <openchemlib-editor
       readonly
-      idcode='"ffc`P@H`QxNQQJJIJIZJHiSkQSejB`jFjhhaEqFUh@"'
+      idcode="ffc`P@H`QxNQQJJIJIZJHiSkQSejB`jFjhhaEqFUh@"
     ></openchemlib-editor>
 
     <p>Reaction <code>gJX@@eKU@@ gGQHDHaImfh@!defH@DAIfUVjj`@</code></p>
     <openchemlib-editor
-      idcode='"gJX@@eKU@@ gGQHDHaImfh@!defH@DAIfUVjj`@"'
+      idcode="gJX@@eKU@@ gGQHDHaImfh@!defH@DAIfUVjj`@"
       mode="reaction"
     ></openchemlib-editor>
 
@@ -58,7 +58,7 @@ <h1>Generic editor - &lt;openchemlib-editor> (Web Component) demo</h1>
       <code>gJX@@eKU@P gGQHDHaImfhB!defH@DAIfUVjj`B</code>
     </p>
     <openchemlib-editor
-      idcode='"gJX@@eKU@P gGQHDHaImfhB!defH@DAIfUVjj`B"'
+      idcode="gJX@@eKU@P gGQHDHaImfhB!defH@DAIfUVjj`B"
       mode="reaction"
       fragment
     ></openchemlib-editor>
@@ -67,7 +67,7 @@ <h1>Generic editor - &lt;openchemlib-editor> (Web Component) demo</h1>
       Reaction readonly <code>gJX@@eKU@@ gGQHDHaImfh@!defH@DAIfUVjj`@</code>
     </p>
     <openchemlib-editor
-      idcode='"gJX@@eKU@@ gGQHDHaImfh@!defH@DAIfUVjj`@"'
+      idcode="gJX@@eKU@@ gGQHDHaImfh@!defH@DAIfUVjj`@"
       mode="reaction"
       readonly
     ></openchemlib-editor>
@@ -79,7 +79,7 @@ <h1>Generic editor - &lt;openchemlib-editor> (Web Component) demo</h1>
         !Bb@Jw@oy??`C~@K\B !Bb@K~_{\BbOvH?_y?##</code
       >
       <openchemlib-editor
-        idcode='"gOp@DjWkjj`@ gOp@DjWkjj`@!gOp@DjWkjj`@##!BbOvw?_x@?g?~_{_} !Bb@Jw@oy??`C~@K\B !Bb@K~_{\BbOvH?_y?##"'
+        idcode="gOp@DjWkjj`@ gOp@DjWkjj`@!gOp@DjWkjj`@##!BbOvw?_x@?g?~_{_} !Bb@Jw@oy??`C~@K\B !Bb@K~_{\BbOvH?_y?##"
         mode="reaction"
       ></openchemlib-editor>
     </p>

diff --git a/lib/canvas_editor/init/canvas_editor_element.js b/lib/canvas_editor/init/canvas_editor_element.js
@@ -27,7 +27,7 @@ function initCanvasEditorElement(CanvasEditor, Molecule, ReactionEncoder) {
 
     set idcode(value) {
       this.#state.idcode = String(value);
-      this.setAttribute('idcode', JSON.stringify(this.#state.idcode));
+      this.setAttribute('idcode', this.#state.idcode);
     }
 
     get fragment() {
@@ -286,10 +286,8 @@ function initCanvasEditorElement(CanvasEditor, Molecule, ReactionEncoder) {
      * Custom element added to page.
      */
     connectedCallback() {
-      const jsonIdcode = this.getAttribute('idcode');
-
       this.#state = {
-        idcode: JSON.parse(jsonIdcode) || '',
+        idcode: this.getAttribute('idcode') || '',
         fragment: this.hasAttribute('fragment'),
         mode: this.getAttribute('mode') || CanvasEditorElement.MODE.MOLECULE,
         readonly: this.hasAttribute('readonly'),
@@ -325,7 +323,7 @@ function initCanvasEditorElement(CanvasEditor, Molecule, ReactionEncoder) {
       const mutatorHandler = (() => {
         switch (name) {
           case 'idcode': {
-            this.#state.idcode = JSON.parse(String(newValue));
+            this.#state.idcode = String(newValue);
             return () => this.#initIdCode();
           }
           case 'fragment': {

diff --git a/types.d.ts b/types.d.ts
@@ -3921,17 +3921,13 @@ interface CanvasEditorElementConstructor extends CustomElementConstructor {
  * ```
  *
  * In HTML
- *
- * /!\ The `idcode` attribute MUST be encoded with `JSON.stringify`.
- * `idcode` can include special characters like `\u007F` which are not valid in `UVString`
- *
  * ```html
  * <p>Empty editor</p>
  * <openchemlib-editor></openchemlib-editor>
  *
  * <p>Molecule <code>ffc`P@H`QxNQQJJIJIZJHiSkQSejB`jFjhhaEqFUh@</code></p>
  * <openchemlib-editor
- *   idcode="&quot;ffc`P@H`QxNQQJJIJIZJHiSkQSejB`jFjhhaEqFUh@&quot;"
+ *   idcode="ffc`P@H`QxNQQJJIJIZJHiSkQSejB`jFjhhaEqFUh@"
  * ></openchemlib-editor>
  *
  * <p>
@@ -3941,13 +3937,13 @@ interface CanvasEditorElementConstructor extends CustomElementConstructor {
  *   </code>
  * </p>
  * <openchemlib-editor
- *   idcode="&quot;ffc`P@H`QxNQQJJIJIZJHiSkQSejB`jFjhhaEqFUhCyqHiCHy@leBhMEh]B\sa^kp&quot;"
+ *   idcode="ffc`P@H`QxNQQJJIJIZJHiSkQSejB`jFjhhaEqFUhCyqHiCHy@leBhMEh]B\sa^kp"
  *   fragment
  * ></openchemlib-editor>
  *
  * <p>Reaction <code>gJX@@eKU@@ gGQHDHaImfh@!defH@DAIfUVjj`@</code></p>
  * <openchemlib-editor
- *   idcode="&quot;gJX@@eKU@@ gGQHDHaImfh@!defH@DAIfUVjj`@&quot;"
+ *   idcode="gJX@@eKU@@ gGQHDHaImfh@!defH@DAIfUVjj`@"
  *   mode="reaction"
  * ></openchemlib-editor>
  *
@@ -3956,7 +3952,7 @@ interface CanvasEditorElementConstructor extends CustomElementConstructor {
  *   <code>gJX@@eKU@P gGQHDHaImfhB!defH@DAIfUVjj`B</code>
  * </p>
  * <openchemlib-editor
- *   idcode="&quot;gJX@@eKU@P gGQHDHaImfhB!defH@DAIfUVjj`B&quot;"
+ *   idcode="gJX@@eKU@P gGQHDHaImfhB!defH@DAIfUVjj`B"
  *   mode="reaction"
  *   fragment
  * ></openchemlib-editor>
@@ -3967,7 +3963,7 @@ interface CanvasEditorElementConstructor extends CustomElementConstructor {
  * </p>
  * <openchemlib-editor
  *   readonly
- *   idcode="&quot;ffc`P@H`QxNQQJJIJIZJHiSkQSejB`jFjhhaEqFUh@&quot;"
+ *   idcode="ffc`P@H`QxNQQJJIJIZJHiSkQSejB`jFjhhaEqFUh@"
  * ></openchemlib-editor>
  * ```
  *
@@ -3987,8 +3983,7 @@ interface CanvasEditorElementConstructor extends CustomElementConstructor {
  */
 declare interface CanvasEditorElement extends HTMLElement {
   /**
-   * If set from attributes, init from DOM, it MUST be encoded with JSON.stringify.
-   * @defaultValue '""'
+   * @defaultValue ''
    */
   idcode: string;
   /**