@es-joy/jsoe 0.12.4 → 0.13.0

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
         )
       );