@es-joy/jsoe 0.24.3 → 0.25.1

package/src/superTypes/dompointType.js

@@ -1,4 +1,5 @@
 import {$e} from '../utils/templateUtils.js';
+import {schemaLabel} from '../utils/schemaMeta.js';
 import {toStringTag} from '../vendor-imports.js';
 
 let idx = 0;
@@ -76,12 +77,12 @@ const dompointType = {
     const isReadWrite = toStringTag(value) === 'DOMPoint';
     return ['div', {
       dataset: {type: 'dompoint'},
-      title: specificSchemaObject?.description
+      title: schemaLabel(specificSchemaObject)
         ? `(a \`${(isReadWrite ? 'DOMPoint' : 'DOMPointReadOnly')}\`)`
         : undefined
     }, [
       ['b', {class: 'emphasis'}, [
-        specificSchemaObject?.description ??
+        schemaLabel(specificSchemaObject) ??
           (isReadWrite ? 'DOMPoint' : 'DOMPointReadOnly')
       ]],
       ['br'],
@@ -108,8 +109,8 @@ const dompointType = {
     const step = 'any'; // Proper step?
     return ['div', {
       dataset: {type: 'dompoint'},
-      title: specificSchemaObject?.description ?? 'DOMPoint'
-    }, /** @type {import('jamilih').JamilihChildren} */ ([
+      title: schemaLabel(specificSchemaObject) ?? 'DOMPoint'
+    }, [
       ['div', [
         ['label', [
           ['input', {
@@ -172,7 +173,7 @@ const dompointType = {
           name: `${typeNamespace}-dompoint-w`, value: value.w
         }]
       ]]
-    ])];
+    ]];
   }
 };
 

package/src/superTypes/domrectType.js

@@ -1,4 +1,5 @@
 import {$e} from '../utils/templateUtils.js';
+import {schemaLabel} from '../utils/schemaMeta.js';
 import {toStringTag} from '../vendor-imports.js';
 
 let idx = 0;
@@ -79,14 +80,14 @@ const domrectType = {
       dataset: {
         type: 'domrect'
       },
-      title: specificSchemaObject?.description
+      title: schemaLabel(specificSchemaObject)
         ? `(a \`${(isReadWrite ? 'DOMRect' : 'DOMRectReadOnly')}\`)`
         : undefined
     }, [
       ['b', {
         class: 'emphasis'
       }, [
-        specificSchemaObject?.description ??
+        schemaLabel(specificSchemaObject) ??
           (isReadWrite ? 'DOMRect' : 'DOMRectReadOnly')
       ]],
       ['br'],
@@ -113,8 +114,8 @@ const domrectType = {
     const step = 'any'; // Proper step?
     return ['div', {
       dataset: {type: 'domrect'},
-      title: specificSchemaObject?.description ?? 'DOMRect'
-    }, /** @type {import('jamilih').JamilihChildren} */ ([
+      title: schemaLabel(specificSchemaObject) ?? 'DOMRect'
+    }, [
       ['div', [
         ['label', [
           ['input', {
@@ -177,7 +178,7 @@ const domrectType = {
           name: `${typeNamespace}-domrect-height`, value: value.height
         }]
       ]]
-    ])];
+    ]];
   }
 };
 

package/src/superTypes/errorsSpecialType.js

@@ -1,6 +1,8 @@
 /* globals InternalError -- Non-standard */
 import {errors as errorsTypesonRegistry} from 'typeson-registry';
 import {$e} from '../utils/templateUtils.js';
+import {schemaLabel} from '../utils/schemaMeta.js';
+import {tick} from '../utils/timing.js';
 import {jml, hasConstructorOf} from '../vendor-imports.js';
 import arrayType from '../fundamentalTypes/arrayType.js';
 
@@ -41,6 +43,7 @@ if (typeof InternalError !== 'undefined') {
   specialErrorsMap.set('InternalError', InternalError);
 }
 
+// eslint-disable-next-line unicorn/prefer-iterator-to-array -- Map iterator
 const specialErrors = [...specialErrorsMap.keys()];
 
 /**
@@ -150,10 +153,14 @@ const errorsSpecialType = {
       ).click();
     }
 
-    setTimeout(() => {
+    // Return a promise that settles once the deferred `.cause` sub-editor and
+    //   aggregate-errors contents are built and populated, so callers can await
+    //   a fully-built subtree before reading it back.
+    return (async () => {
+      await tick();
       if (typeof value.cause === 'object') {
         /** @type {HTMLElement} */ ($e(root, '.cause')).click();
-        /** @type {import('../types.js').TypeObjectSetValue} */ (
+        await /** @type {import('../types.js').TypeObjectSetValue} */ (
           this.setValue
         )({
           root: /** @type {HTMLDivElement} */ ($e(root, '.causeContents')),
@@ -175,7 +182,7 @@ const errorsSpecialType = {
         aggregateErrors.$emptyAggregateErrorsContents();
         aggregateErrors.$populateContents(value.errors);
       }
-    });
+    })();
   },
   getValue ({root, stateObj}) {
     const UserErrorType = specialErrorsMap.get(
@@ -184,7 +191,7 @@ const errorsSpecialType = {
       ).value
     );
     if (!UserErrorType) {
-      throw new Error('Bad error type');
+      throw new Error('Not yet instantiated');
     }
 
     /**
@@ -199,6 +206,7 @@ const errorsSpecialType = {
      * }}
      */
     let errObj;
+    const UET = /** @type {AggregateErrorConstructor} */ (UserErrorType);
     if (/** @type {HTMLInputElement} */ (
       $e(root, 'input.message[type=checkbox]')
     ).checked) {
@@ -207,11 +215,17 @@ const errorsSpecialType = {
       ).value;
 
       if (getConstructor(UserErrorType) === 'AggregateError') {
-        const UET = /** @type {AggregateErrorConstructor} */ (UserErrorType);
         const errorRoot =
           /** @type {HTMLElement} */ ($e(
             root, '.aggregateErrorsContents'
           )).firstElementChild;
+        /* istanbul ignore if -- Async guard */
+        if (!errorRoot) {
+          // `setValue` populates `.aggregateErrorsContents` asynchronously,
+          //   so if `getValue` runs first (e.g. a synchronous `validate`
+          //   immediately after `setValue`), the value is not ready yet.
+          throw new Error('Not yet instantiated');
+        }
 
         const errors = arrayType.getValue({
           stateObj,
@@ -219,23 +233,28 @@ const errorsSpecialType = {
         });
         errObj = new UET(errors, message);
       } else {
-        const UET = /** @type {TypeErrorConstructor} */ (UserErrorType);
         errObj = new UET(message);
       }
     } else {
       if (getConstructor(UserErrorType) === 'AggregateError') {
-        const UET = /** @type {AggregateErrorConstructor} */ (UserErrorType);
         const errorRoot =
           /** @type {HTMLElement} */ ($e(
             root, '.aggregateErrorsContents'
           )).firstElementChild;
+        /* istanbul ignore if -- Async guard */
+        if (!errorRoot) {
+          // `setValue` populates `.aggregateErrorsContents` asynchronously,
+          //   so if `getValue` runs first (e.g. a synchronous `validate`
+          //   immediately after `setValue`), the value is not ready yet.
+          throw new Error('Not yet instantiated');
+        }
         const errors = arrayType.getValue({
           stateObj,
           root: /** @type {HTMLDivElement} */ (errorRoot)
         });
         errObj = new UET(errors);
       } else {
-        const UET = /** @type {TypeErrorConstructor} */ (UserErrorType);
+        // @ts-expect-error -- Deliberately allowing
         errObj = new UET();
       }
       errObj.message = undefined; // Force (at least needed for Chrome)
@@ -302,32 +321,32 @@ const errorsSpecialType = {
     return /** @type {import('jamilih').JamilihArray} */ ([
       'div', {
         dataset: {type: 'errors'},
-        title: specificSchemaObject?.description
+        title: schemaLabel(specificSchemaObject)
           ? `(an Error ${constructor})`
           : undefined
       }, [
-        specificSchemaObject?.description ??
+        schemaLabel(specificSchemaObject) ??
           ['div', [['b', ['Error type: ']], ['span', [
             constructor
           ]]]],
-        typeof o.message === 'string'
-          ? ['div', [['b', ['Message: ']], ['span', [o.message]]]]
-          : [],
-        typeof o.name === 'string'
-          ? ['div', [['b', ['Name: ']], ['span', [o.name]]]]
-          : [],
-        typeof o.fileName === 'string'
-          ? ['div', [['b', ['File name: ']], ['span', [o.fileName]]]]
-          : [],
-        typeof o.lineNumber === 'number'
-          ? ['div', [['b', ['Line number: ']], ['span', [o.lineNumber]]]]
-          : [],
-        typeof o.columnNumber === 'number'
-          ? ['div', [['b', ['Column number: ']], ['span', [o.columnNumber]]]]
-          : [],
-        typeof o.stack === 'string'
-          ? ['div', [['b', ['Stack: ']], ['span', [o.stack]]]]
-          : [],
+        ...(typeof o.message === 'string'
+          ? [['div', [['b', ['Message: ']], ['span', [o.message]]]]]
+          : []),
+        ...(typeof o.name === 'string'
+          ? [['div', [['b', ['Name: ']], ['span', [o.name]]]]]
+          : []),
+        ...(typeof o.fileName === 'string'
+          ? [['div', [['b', ['File name: ']], ['span', [o.fileName]]]]]
+          : []),
+        ...(typeof o.lineNumber === 'number'
+          ? [['div', [['b', ['Line number: ']], ['span', [o.lineNumber]]]]]
+          : []),
+        ...(typeof o.columnNumber === 'number'
+          ? [['div', [['b', ['Column number: ']], ['span', [o.columnNumber]]]]]
+          : []),
+        ...(typeof o.stack === 'string'
+          ? [['div', [['b', ['Stack: ']], ['span', [o.stack]]]]]
+          : []),
         ['b', ['Cause: ']], ['div', {class: 'causeHolder'}, [
           ['button', {$on: {click (/** @type {Event} */ e) {
             e.preventDefault();
@@ -451,7 +470,7 @@ const errorsSpecialType = {
         /** @type {HTMLElement} */ ($e(
           div, '.cause'
         )).click();
-      });
+      }, 0);
     }
 
     if (Array.isArray(value.errors)) {
@@ -459,14 +478,14 @@ const errorsSpecialType = {
         /** @type {HTMLElement} */ ($e(
           div, 'input.aggregateErrors'
         )).click();
-      });
+      }, 0);
     }
 
     const div = jml(
       'div',
       {
         dataset: {type: 'errors'},
-        title: specificSchemaObject?.description ?? 'Special error'
+        title: schemaLabel(specificSchemaObject) ?? 'Special error'
       },
       /** @type {import('jamilih').JamilihChildren} */ ([
         ['div', [
@@ -744,10 +763,10 @@ const errorsSpecialType = {
                 click.call(/** @type {HTMLInputElement} */ (this), e);
                 const that =
                   /**
-                  * @type {HTMLInputElement & {
-                  *   $populateContents: (errs: unknown[]) => void
-                  * }}
-                  */
+                   * @type {HTMLInputElement & {
+                   *   $populateContents: (errs: unknown[]) => void
+                   * }}
+                   */
                   (this);
                 if (value.errors) {
                   (that).$populateContents(value.errors);