@es-joy/jsoe 0.12.3 → 0.13.0

package/src/superTypes/errorsSpecialType.js

@@ -169,7 +169,7 @@ const errorsSpecialType = {
       }
     });
   },
-  getValue ({root}) {
+  getValue ({root, stateObj}) {
     const UserErrorType = specialErrorsMap.get(
       /** @type {HTMLSelectElement} */ (
         $e(root, '.errorType')
@@ -206,6 +206,7 @@ const errorsSpecialType = {
           )).firstElementChild;
 
         const errors = arrayType.getValue({
+          stateObj,
           root: /** @type {HTMLDivElement} */ (errorRoot)
         });
         errObj = new UET(errors, message);
@@ -221,6 +222,7 @@ const errorsSpecialType = {
             root, '.aggregateErrorsContents'
           )).firstElementChild;
         const errors = arrayType.getValue({
+          stateObj,
           root: /** @type {HTMLDivElement} */ (errorRoot)
         });
         errObj = new UET(errors);
@@ -278,6 +280,7 @@ const errorsSpecialType = {
     );
     if (causeContents.children.length) {
       errObj.cause = this.getValue({
+        stateObj,
         root: causeContents
       });
     }
@@ -285,7 +288,7 @@ const errorsSpecialType = {
     return errObj;
   },
   viewUI (
-    {value: o, format, typeNamespace, resultType}
+    {value: o, types, format, typeNamespace, resultType}
   ) {
     const constructor = getConstructor(o.constructor);
     return /** @type {import('jamilih').JamilihArray} */ ([
@@ -327,7 +330,8 @@ const errorsSpecialType = {
             o.cause
               ? this.viewUI({
                 format,
-                value: o.cause
+                value: o.cause,
+                types
               })
               : ''
           ]]
@@ -354,7 +358,8 @@ const errorsSpecialType = {
                     const [div] = arrayType.viewUI({
                       typeNamespace, resultType, format,
                       type: 'arrayNonindexKeys',
-                      value: []
+                      value: [],
+                      types
                     });
 
                     /** @type {Error[]} */
@@ -389,6 +394,7 @@ const errorsSpecialType = {
   },
   editUI ({
     typeNamespace,
+    types,
 
     // Pass these to `errors` array
     buildTypeChoices,
@@ -617,6 +623,7 @@ const errorsSpecialType = {
                 if (!causeContents?.children.length) {
                   const editui = component.editUI({
                     typeNamespace,
+                    types,
                     value: value.cause
                   });
                   jml(...editui, causeContents);
@@ -683,7 +690,7 @@ const errorsSpecialType = {
                 );
                 if (!aggregateErrorsContents?.children.length) {
                   const [editui] = arrayType.editUI({
-                    typeNamespace, buildTypeChoices, format,
+                    typeNamespace, types, buildTypeChoices, format,
                     type: 'array',
                     topRoot, bringIntoFocus,
                     arrayState: 'errorsArray',

package/src/typeChoices.js

@@ -1,5 +1,5 @@
 import {jml} from './vendor-imports.js';
-import Formats, {getControlsForFormatAndValue} from './formats.js';
+import Formats from './formats.js';
 import Types from './types.js';
 
 import {$e, DOM} from './utils/templateUtils.js';
@@ -75,6 +75,8 @@ import dialogs from './utils/dialogs.js';
  *   requireObject?: boolean,
  *   objectHasValue?: boolean,
  *   topRoot?: import('./types.js').RootElement,
+ *   formats?: import('./formats.js').default
+ *   types?: import('./types.js').default
  *   schema?: string,
  *   schemaContent?: object,
  * }} cfg
@@ -101,13 +103,15 @@ export const buildTypeChoices = ({
   requireObject,
   objectHasValue,
   topRoot,
+  formats = new Formats(),
+  types = new Types(),
   schema,
   schemaContent
 }) => {
   // console.log('format', format, 'state', state, 'path', typeNamespace);
   const typeOptions = requireObject
-    ? [Types.getOptionForType('object')]
-    : Types.getTypeOptionsForFormatAndState(format, state);
+    ? [types.getOptionForType('object')]
+    : types.getTypeOptionsForFormatAndState(format, state);
 
   let editUI;
 
@@ -116,11 +120,13 @@ export const buildTypeChoices = ({
     const root = /** @type {HTMLDivElement} */ (
       $e(typeContainer, 'div[data-type]')
     );
-    return Types.getValueForRoot(
+    return types.getValueForRoot(
       root,
       /** @type {import('./types.js').StateObject} */ ({
         typeNamespace,
+        formats,
         format,
+        types,
         ...stateObj
       }),
       currentPath
@@ -183,7 +189,7 @@ export const buildTypeChoices = ({
         //    (needed by arrayNonindexKeys for setting an array
         //    length and avoiding errors); could set all
         //    values through here?
-        editUI = Types.getUIForModeAndType({
+        editUI = types.getUIForModeAndType({
           readonly: false,
           typeNamespace,
           type,
@@ -198,7 +204,7 @@ export const buildTypeChoices = ({
         this.$validate();
         topRoot = this.$getTopRoot(); // May be existing now
         // Needed; Array/object ref somewhere could now be valid or invalid
-        Types.validateAllReferences({topRoot});
+        types.validateAllReferences({topRoot});
       },
 
       /** @type {AddTypeAndEditUI} */
@@ -230,7 +236,7 @@ export const buildTypeChoices = ({
           return false;
         }
         const editUI = container.firstElementChild;
-        return Types.validate({
+        return types.validate({
           type, root: editUI, topRoot: this.$getTopRoot()
         });
       }
@@ -267,13 +273,17 @@ export const buildTypeChoices = ({
         value = {};
       }
       try {
-        const rootEditUI = await Formats.availableFormats[format].iterate(
+        const rootEditUI = await formats.getControlsForFormatAndValue(
+          types,
+          format,
           value,
           {
             readonly: false,
             typeNamespace,
             schema,
-            schemaContent
+            schemaContent,
+            formats,
+            types
           }
         );
         const type =
@@ -329,7 +339,8 @@ export const buildTypeChoices = ({
     /** @type {SetValue} */
     async setValue (value, stateObj) {
       const rootEditUI = /** @type {HTMLDivElement} */ (
-        await getControlsForFormatAndValue(
+        await formats.getControlsForFormatAndValue(
+          types,
           format, value, stateObj
         )
       );