@es-joy/jsoe 0.5.1 → 0.6.0

package/src/subTypes/blobHTMLType.js

@@ -6,9 +6,14 @@ import dialogs from '../utils/dialogs.js';
 import {isNullish} from '../utils/types.js';
 
 /**
- * @type {import('../types.js').TypeObject & {
- *   loadBlob: (blob: Blob) => Promise<FileReader>,
+ * @typedef {HTMLTextAreaElement & {
  *   sceditorInstance: {val: (val?: string) => string|void}
+ * }} SCEditorTextarea
+ */
+
+/**
+ * @type {import('../types.js').TypeObject & {
+ *   loadBlob: (blob: Blob) => Promise<string>
  * }}
  */
 const blobHTMLType = {
@@ -17,9 +22,6 @@ const blobHTMLType = {
   stringRegex: /^data:text\/html(?:;base64)?,.*$/u,
   valueMatch: (v) => v.type === 'text/html',
   superType: 'blob',
-  sceditorInstance: {val () {
-    throw new Error('Not yet instantiated');
-  }},
   toValue (s) {
     // Todo (low): `Blob` untested; use https://stackoverflow.com/a/30407840/271577 ?
     /**
@@ -51,34 +53,26 @@ const blobHTMLType = {
   },
   /* istanbul ignore next -- No dupe keys, array refs, or validation */
   getInput ({root}) {
-    return /** @type {HTMLTextAreaElement} */ ($e(root, 'textarea'));
+    return /** @type {HTMLTextAreaElement} */ (
+      $e(root, 'textarea[name$=-blobHTML]')
+    );
   },
-  getValue (/* {root} */) {
+  getValue ({root}) {
     return this.toValue(
-      'data:text/html,' + this.sceditorInstance.val()
+      'data:text/html,' + /** @type {SCEditorTextarea} */ (
+        this.getInput({root})
+      ).sceditorInstance.val()
       // this.getInput({root}).value
     ).value;
   },
-  loadBlob (blob) {
-    const reader = new FileReader();
-    // eslint-disable-next-line promise/avoid-new
-    return new Promise((resolve, reject) => {
-      reader.addEventListener('loadend', () => {
-        resolve(reader);
-      });
-      reader.addEventListener(
-        'error',
-        /* istanbul ignore next -- How to simulate? */
-        (_e) => {
-          reject(reader.error);
-        }
-      );
-      reader.readAsText(blob);
-    });
+  async loadBlob (blob) {
+    return await blob.text();
   },
-  async setValue ({/* root, */ value}) {
-    const {result} = await this.loadBlob(value);
-    this.sceditorInstance.val(/** @type {string} */ (result));
+  async setValue ({root, value}) {
+    const result = await this.loadBlob(value);
+    /** @type {SCEditorTextarea} */ (
+      this.getInput({root})
+    ).sceditorInstance.val(/** @type {string} */ (result));
     // this.getInput({root}).value = result;
   },
   viewUI ({value}) {
@@ -98,9 +92,9 @@ const blobHTMLType = {
       ])
     );
     // eslint-disable-next-line promise/prefer-await-to-then
-    this.loadBlob(value).then(({
+    this.loadBlob(value).then((
       result
-    }) => {
+    ) => {
       val = /** @type {string} */ (result);
       jml('iframe', {
         sandbox: '',
@@ -118,9 +112,19 @@ const blobHTMLType = {
     // return ['i', [`data:text/html,${value}`]];
   },
   editUI ({typeNamespace, value}) {
-    const textarea = /** @type {HTMLTextAreaElement} */ (
-      jml('textarea', {name: `${typeNamespace}-blobHTML`})
-    );
+    const textarea =
+      /**
+       * @type {SCEditorTextarea}
+       */ (
+        jml('textarea', {name: `${typeNamespace}-blobHTML`})
+      );
+    textarea.sceditorInstance = {
+      /* istanbul ignore next */
+      val () {
+        throw new Error('Not yet instantiated');
+      }
+    };
+
     const root = /** @type {HTMLDivElement} */ (jml(
       'div',
       {dataset: {type: 'blobHTML'}},
@@ -166,7 +170,7 @@ const blobHTMLType = {
         emoticonsRoot: 'node_modules/sceditor/',
         style: 'node_modules/sceditor/minified/themes/content/default.min.css'
       });
-      this.sceditorInstance = sceditor.instance(textarea);
+      textarea.sceditorInstance = sceditor.instance(textarea);
       if (!isNullish(value)) {
         /** @type {Required<import('../types.js').TypeObject>} */ (
           this

package/src/subTypes/falseType.js

@@ -16,7 +16,7 @@ const falseType = {
   ct: 0,
   /* istanbul ignore next -- No dupe keys, array refs, or validation */
   getInput ({root}) {
-    return /** @type {HTMLInputElement} */ ($e(root, 'input'));
+    return /** @type {HTMLInputElement} */ ($e(root, 'input[value=false]'));
   },
   editUI ({typeNamespace}) {
     this.ct++;
@@ -32,7 +32,7 @@ const falseType = {
         'False',
         ['input', {
           type: 'radio', name: `${typeNamespace}-false${this.ct}`,
-          value: 'false', checked: true, disabled: true
+          value: 'false', checked: true
         }]
       ]]
     ]];

package/src/subTypes/trueType.js

@@ -6,7 +6,7 @@ import {$e} from '../utils/templateUtils.js';
 const trueType = {
   option: ['Boolean (true)', {value: 'true'}],
   stringRegex: /^true$/u,
-  toValue: (_s) => ({value: true}),
+  toValue: (/* _s */) => ({value: true}),
   valueMatch: (v) => v === true,
   superType: 'boolean',
   getValue: () => true,
@@ -25,7 +25,7 @@ const trueType = {
         'True',
         ['input', {
           type: 'radio', name: `${typeNamespace}-true${this.ct}`,
-          value: 'true', checked: true, disabled: true
+          value: 'true', checked: true
         }]
       ]],
       ['label', [

package/src/superTypes/{SpecialNumberSuperType.js → SpecialNumberType.js}

@@ -41,7 +41,7 @@ const SpecialNumberSuperType = {
   setValue ({root, value}) {
     /** @type {Required<import('../types.js').TypeObject>} */ (
       this
-    ).getSelect({root}).value = String(value);
+    ).getSelect({root}).value = Object.is(value, -0) ? '-0' : String(value);
   },
   viewUI ({value}) {
     return ['i', {dataset: {type: 'SpecialNumber'}}, [

package/src/superTypes/{SpecialRealNumberSuperType.js → SpecialRealNumberType.js}

@@ -1,7 +1,7 @@
 import {$e} from '../utils/templateUtils.js';
 
 /**
- * @type {import('./SpecialNumberSuperType.js').SuperTypeObject}
+ * @type {import('./SpecialNumberType.js').SuperTypeObject}
  */
 const SpecialRealNumberSuperType = {
   option: ['Special Real Number', {title: '`Infinity`, `-Infinity`, `-0`'}],
@@ -29,13 +29,14 @@ const SpecialRealNumberSuperType = {
   setValue ({root, value}) {
     /** @type {Required<import('../types.js').TypeObject>} */ (
       this
-    ).getSelect({root}).value = String(value);
+    ).getSelect({root}).value = Object.is(value, -0) ? '-0' : String(value);
   },
   viewUI ({value}) {
     return ['i', {dataset: {type: 'SpecialRealNumber'}}, [
       Object.is(value, -0) ? '-0' : String(value)
     ]];
   },
+  /* istanbul ignore next -- No dupe keys, array refs, or validation */
   getInput ({root}) {
     return /** @type {HTMLSelectElement} */ ($e(root, 'select'));
   },