@es-joy/jsoe 0.16.0 → 0.17.0

package/dist/utils/jsonPointer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsonPointer.d.ts","sourceRoot":"","sources":["../../src/utils/jsonPointer.js"],"names":[],"mappings":"8BA0Ca,GAAG;AA1ChB;;;GAGG;AACH,yCAHc,MAAM,KACP,MAAM,CAMlB;AAED;;;GAGG;AACH,wCAHW,MAAM,GACJ,MAAM,CAIlB;AAED;;;GAGG;AACH,kDAHW,MAAM,GACJ,MAAM,CASlB;AAED;;;GAGG;AACH,0CAHW,MAAM,GACJ,MAAM,EAAE,CAMpB;AAED;;GAEG;AAEH;;;;GAIG;AACH,4CAJW,eAAe,YACf,MAAM,GACJ,eAAe,GAAC,MAAM,CAQlC;AAED;;;;;GAKG;AACH;IAJuB,IAAI,EAAhB,MAAM;IACe,GAAG,EAAxB,eAAe;IACb,MAAM,GAAC,eAAe,CAOlC;AAED;;;GAGG;AACH,+CAHW,MAAM,GACJ,MAAM,CAYlB"}
+{"version":3,"file":"jsonPointer.d.ts","sourceRoot":"","sources":["../../src/utils/jsonPointer.js"],"names":[],"mappings":"8BA0Ca,GAAG;AA1ChB;;;GAGG;AACH,yCAHc,MAAM,EAAA,GACP,MAAM,CAMlB;AAED;;;GAGG;AACH,wCAHW,MAAM,GACJ,MAAM,CAIlB;AAED;;;GAGG;AACH,kDAHW,MAAM,GACJ,MAAM,CASlB;AAED;;;GAGG;AACH,0CAHW,MAAM,GACJ,MAAM,EAAE,CAMpB;AAED;;GAEG;AAEH;;;;GAIG;AACH,4CAJW,eAAe,YACf,MAAM,GACJ,eAAe,GAAC,MAAM,CAQlC;AAED;;;;;GAKG;AACH,kDAJG;IAAoB,IAAI,EAAhB,MAAM;IACe,GAAG,EAAxB,eAAe;CACvB,GAAU,MAAM,GAAC,eAAe,CAOlC;AAED;;;GAGG;AACH,+CAHW,MAAM,GACJ,MAAM,CAYlB"}

package/dist/utils/media.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../../src/utils/media.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,kCALW,WAAW,UACX,iBAAiB,GAEf,IAAI,CA4DhB;AAGD;;;GAGG;AACH,0CAHW,sBAAsB,GACpB,QAAQ,WAAW,GAAC,IAAI,CAAC,CAarC;AAED;;;GAGG;AACH,wDAHW,yBAAyB,GAAC,SAAS,GACjC,QAAQ,WAAW,GAAC,IAAI,CAAC,CAarC"}
+{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../../src/utils/media.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,kCALW,WAAW,UACX,iBAAiB,GAEf,IAAI,CA4DhB;AAGD;;;GAGG;AACH,0CAHW,sBAAsB,GACpB,OAAO,CAAC,WAAW,GAAC,IAAI,CAAC,CAarC;AAED;;;GAGG;AACH,wDAHW,yBAAyB,GAAC,SAAS,GACjC,OAAO,CAAC,WAAW,GAAC,IAAI,CAAC,CAarC"}

package/dist/utils/objects.d.ts

@@ -0,0 +1,16 @@
+/**
+ * @typedef {any} ArbitraryObject
+ */
+/**
+ * @typedef {{[key: string]: string|NestedObject}} NestedObject
+ */
+/**
+ * @param {ArbitraryObject} obj
+ * @returns {ArbitraryObject}
+ */
+export function copyObject(obj: ArbitraryObject): ArbitraryObject;
+export type ArbitraryObject = any;
+export type NestedObject = {
+    [key: string]: string | NestedObject;
+};
+//# sourceMappingURL=objects.d.ts.map

package/dist/utils/objects.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"objects.d.ts","sourceRoot":"","sources":["../../src/utils/objects.js"],"names":[],"mappings":"AAAA;;GAEG;AACH;;GAEG;AAEH;;;GAGG;AACH,gCAHW,eAAe,GACb,eAAe,CAY3B;8BApBY,GAAG;2BAGH;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAC,YAAY,CAAA;CAAC"}

package/dist/utils/types.d.ts

@@ -1,2 +1,2 @@
-export function isNullish(obj: unknown): boolean;
+export function isNullish(obj: unknown): obj is null | undefined;
 //# sourceMappingURL=types.d.ts.map

package/dist/utils/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/utils/types.js"],"names":[],"mappings":"AAGO,+BAFI,OAAO,WAIjB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/utils/types.js"],"names":[],"mappings":"AAGO,+BAFI,OAAO,2BAIjB"}

package/dist/vendor-imports.d.ts

@@ -1,3 +1,3 @@
 export { jml, body, nbsp, $ } from "jamilih";
-export { getJSONType, Typeson, unescapeKeyPathComponent, structuredCloningThrowing, resurrectable, toStringTag } from "typeson-registry";
+export { getJSONType, Typeson, unescapeKeyPathComponent, structuredCloningThrowing, resurrectable, toStringTag, hasConstructorOf } from "typeson-registry";
 //# sourceMappingURL=vendor-imports.d.ts.map

package/eslint.config.js

@@ -0,0 +1,74 @@
+import ashNazg from 'eslint-config-ash-nazg';
+
+export default [
+  {
+    name: 'JSOE/Ignores',
+    ignores: [
+      'coverage',
+      'instrumented',
+      'ignore',
+      'src/deepEqual.js',
+      'vendor',
+      'typings/**',
+      'dist'
+    ]
+  },
+  ...ashNazg(['sauron', 'browser']),
+  {
+    name: 'JSOE/Coverage',
+    settings: {
+      coverage: true
+    }
+  },
+  {
+    name: 'JSOE/Markdown',
+    files: ['*.md/*.js'],
+    rules: {
+      'import/unambiguous': 'off'
+    }
+  },
+  {
+    name: 'JSOE/Cypress',
+    files: ['cypress/**'],
+    rules: {
+      'unicorn/no-empty-file': 'off'
+    }
+  },
+  {
+    name: 'JSOE/main rules',
+    rules: {
+      'no-console': 0,
+      'no-shadow': 0,
+
+      '@stylistic/quotes': ['error', 'single', {
+        avoidEscape: true, allowTemplateLiterals: true
+      }],
+
+      'jsdoc/require-jsdoc': ['warn', {
+        contexts: [
+          'Program > VariableDeclaration > ' +
+            'VariableDeclarator > ArrowFunctionExpression',
+          'Program > VariableDeclaration > ' +
+            'VariableDeclarator > FunctionExpression',
+          'ExportNamedDeclaration > VariableDeclaration > ' +
+            'VariableDeclarator > ArrowFunctionExpression',
+          'ExportNamedDeclaration > VariableDeclaration > ' +
+            'VariableDeclarator > FunctionExpression',
+          'ExportDefaultDeclaration > ArrowFunctionExpression',
+          'ExportDefaultDeclaration > FunctionExpression',
+
+          'ClassDeclaration',
+          'ClassExpression',
+          'FunctionDeclaration', // Default is true
+          'MethodDefinition'
+        ]
+      }],
+
+      // Disable until find time
+      'prefer-named-capture-group': 0,
+      // Disable; waiting on https://github.com/mysticatea/eslint-plugin-node/issues/162
+      'n/no-unpublished-import': 0,
+      'unicorn/no-this-assignment': 0
+    }
+  }
+];

package/licenseInfo.json

@@ -0,0 +1,4 @@
+{
+  "bundledRootPackages": ["jamilih", "typeson-registry", "zod", "zodex"],
+  "filesByLicense": {}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@es-joy/jsoe",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "main": "./src/index.js",
@@ -12,7 +12,7 @@
   },
   "description": "Editing of arbitrary JavaScript objects",
   "browserslist": [
-    "cover 100%"
+    "defaults, not op_mini all"
   ],
   "nyc": {
     "excludeAfterRemap": true,
@@ -23,54 +23,40 @@
   },
   "dependencies": {
     "@brettz9/node-static": "^0.1.1",
-    "jamilih": "0.58.2",
+    "jamilih": "0.59.2",
     "sceditor": "3.2.0",
-    "typeson-registry": "9.2.1"
+    "typeson-registry": "11.0.0",
+    "zod": "^3.23.8",
+    "zodex": "github:brettz9/zodex#browser-dist"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.6",
-    "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-    "@babel/preset-env": "^7.23.6",
-    "@babel/register": "^7.22.15",
-    "@brettz9/eslint-plugin": "^1.0.4",
-    "@cypress/code-coverage": "^3.12.13",
+    "@babel/core": "^7.25.2",
+    "@babel/plugin-transform-modules-commonjs": "^7.24.8",
+    "@babel/preset-env": "^7.25.3",
+    "@babel/register": "^7.24.6",
+    "@cypress/code-coverage": "^3.12.44",
     "@rollup/plugin-babel": "^6.0.4",
-    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@stylistic/eslint-plugin": "^1.5.1",
-    "@types/jsdom": "^21.1.6",
-    "@types/node": "^20.10.4",
-    "axe-core": "^4.8.2",
-    "cypress": "^13.6.1",
+    "@types/jsdom": "^21.1.7",
+    "@types/node": "^22.1.0",
+    "axe-core": "^4.10.0",
+    "cypress": "^13.13.2",
     "cypress-axe": "^1.5.0",
-    "eslint": "^8.55.0",
-    "eslint-config-ash-nazg": "^35.1.0",
-    "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-array-func": "^4.0.0",
-    "eslint-plugin-compat": "^4.2.0",
-    "eslint-plugin-cypress": "^2.15.1",
-    "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-html": "^7.1.0",
-    "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-jsdoc": "^46.9.1",
-    "eslint-plugin-markdown": "^3.0.1",
-    "eslint-plugin-n": "^16.4.0",
-    "eslint-plugin-no-unsanitized": "^4.0.2",
-    "eslint-plugin-no-use-extend-native": "^0.5.0",
-    "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-sonarjs": "^0.23.0",
-    "eslint-plugin-standard": "^4.1.0",
-    "eslint-plugin-unicorn": "^49.0.0",
+    "eslint": "^9.8.0",
+    "eslint-config-ash-nazg": "^36.11.1",
     "fast-deep-equal": "^3.1.3",
-    "jsdom": "^21.1.1",
+    "jsdom": "^24.1.1",
+    "license-badger": "^0.21.1",
     "npm-run-all": "^4.1.5",
-    "nyc": "^15.1.0",
-    "open-cli": "^7.2.0",
-    "rimraf": "^5.0.5",
-    "rollup": "4.9.0",
+    "nyc": "^17.0.0",
+    "open-cli": "^8.0.0",
+    "rimraf": "^6.0.1",
+    "rollup": "4.20.0",
     "rollup-plugin-istanbul": "^5.0.0",
+    "rollup-plugin-no-op": "^1.0.2",
     "rollup-plugin-node-builtins": "^2.1.2",
-    "typescript": "^5.3.3",
+    "typescript": "^5.5.4",
     "typeson": "^9.0.3",
     "webappfind-demos-samples": "^0.7.0"
   },
@@ -86,7 +72,7 @@
   "author": "Brett Zamir",
   "contributors": [],
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=18.0.0"
   },
   "bugs": "https://github.com/es-joy/jsoe/issues",
   "license": "MIT",
@@ -94,6 +80,7 @@
   "scripts": {
     "tsc": "tsc",
     "tsc-cypress": "tsc -p cypress/tsconfig.json",
+    "license-badge": "license-badger --corrections --uncategorizedLicenseTemplate \"\\${license} (\\${name} (\\${version}))\" --filteredTypes=nonempty --textTemplate \"License types\n(project, deps, and bundled devDeps)\" --packageJson --production badges/licenses-badge.svg",
     "eslint": "eslint .",
     "lint": "npm run eslint --",
     "coverage": "open-cli http://localhost:8087/coverage/lcov-report/",
@@ -110,10 +97,14 @@
     "copy-index": "echo \"Copy our index.html file too? \"",
     "copy-jamilih": "cp node_modules/jamilih/dist/jml-es.js vendor/jamilih/dist/jml-es.js",
     "copy-typeson-registry": "cp node_modules/typeson-registry/dist/index.js vendor/typeson-registry/dist/index.js",
-    "copy": "run-p copy-jamilih copy-typeson-registry",
+    "copy-zod": "cp node_modules/zod/lib/index.mjs vendor/zod/lib/index.mjs",
+    "copy-zodex": "cp -R node_modules/zodex/dist/esm vendor/zodex/dist",
+    "copy": "run-p copy-jamilih copy-typeson-registry copy-zod copy-zodex",
     "instrument": "run-s -c instrument-remove instrument-add copy-index rollup",
     "cypress:log": "ELECTRON_ENABLE_LOGGING=1 cypress run; nyc report",
     "cypress": "cypress run; nyc report",
+    "cypress:record": "cypress run --record --parallel",
+    "report": "nyc report",
     "test": "npm run eslint && npm run rollup && npm run cypress"
   }
 }

package/rollup.config.js

@@ -4,9 +4,11 @@ import commonjs from '@rollup/plugin-commonjs';
 // import babel from 'rollup-plugin-babel';
 // import {terser} from 'rollup-plugin-terser';
 import istanbul from 'rollup-plugin-istanbul';
+import noOp from 'rollup-plugin-no-op';
 
 export default [{
   input: 'src/index.js',
+  external: ['react'], // Todo: remove when removed from Zodex
   output: {
     file: 'dist/index.js',
     format: 'es'
@@ -22,6 +24,19 @@ export default [{
     format: 'es'
   },
   plugins: [
+    noOp({ids: ['react']}), // todo: remove when Zodex may remove dep.
+    istanbul(),
+    nodeResolve(),
+    commonjs()
+  ]
+}, {
+  input: 'demo/index-schema.js',
+  output: {
+    file: 'instrumented/demo/index-schema.js',
+    format: 'es'
+  },
+  plugins: [
+    noOp({ids: ['react']}), // todo: remove when Zodex may remove dep.
     istanbul(),
     nodeResolve(),
     commonjs()

package/src/formatAndTypeChoices.js

@@ -13,14 +13,17 @@ import {$e, DOM} from './utils/templateUtils.js';
  * Defaults to structured cloning.
  * @todo Compose from format metadata, so can make user customizable.
  * @param {object} cfg
- * @param {string} [cfg.schema] (NOT IN USE)
+ * @param {string[]} [cfg.schemas]
+ * @param {string} [cfg.selectedSchema]
  * @param {boolean} [cfg.hasKeyPath] Whether or not a key path is expected; if
  *   true, an indexedDB key is not allowed here as a key does not support
  *   the object type which is needed for a key path.
  * @returns {DocumentFragment}
  */
-export const getFormatAndSchemaChoices = ({schema, hasKeyPath} = {}) => {
-  const hasSchema = typeof schema === 'string';
+export const getFormatAndSchemaChoices = ({
+  schemas, selectedSchema, hasKeyPath
+} = {}) => {
+  const hasSchema = schemas && schemas.length;
   // eslint-disable-next-line @stylistic/max-len -- Long
   return /** @type {[optText: string, opts: {value: string, selected?: boolean}][]} */ ([
     ['JSON only', {value: 'json'}],
@@ -29,35 +32,18 @@ export const getFormatAndSchemaChoices = ({schema, hasKeyPath} = {}) => {
       : [['IndexedDB key', {value: 'indexedDBKey'}]]),
     ['Structured Clone (via Typeson JSON)', {
       value: 'structuredCloning', selected: !hasSchema
-    }]
-    /* schema:
+    }],
     ...(hasSchema
-      ? [
-        [`Schema + arbitrary: ${schema}`, {
-          value: 'schemaAndArbitrary',
-          dataset: {schema}
-        }],
-        [`Schema only: ${schema}`, {
-          value: 'schemaOnly',
+      ? schemas.map((schema, idx) => {
+        return [`Schema: ${schema}`, {
+          value: 'schema',
           dataset: {schema},
-          selected: hasSchema
-        }]
-      ]
-      : []
-    )
-    */
-    /*
-        // This can be supported for editing only
-        ['Arbitrary (Non-Typeson-serializable will be read-only)', {
-            value: 'arbitrary',
-            title: 'Any value that the typeson-registry supports ' +
-              'for structured cloning'
-        }]
-    */
+          selected: selectedSchema ? schema === selectedSchema : idx === 0
+        }];
+      })
+      : [])
   ]).map(([optText, optAtts]) => {
-    return /** @type {HTMLOptionElement} */ (
-      jml('option', optAtts, [optText])
-    );
+    return jml('option', optAtts, [optText]);
   }).reduce((
     frag,
     option
@@ -74,11 +60,16 @@ export const getFormatAndSchemaChoices = ({schema, hasKeyPath} = {}) => {
  * @returns {Promise<void>}
  */
 
+/**
+ * @typedef {import('./formats/schema.js').ZodexSchema} ZodexSchema
+ */
+
 /**
  * Builds a selector and container for types.
  * @param {object} cfg
- * @param {string} [cfg.schema] The schema name (NOT IN USE)
- * @param {object} [cfg.schemaContent] The schema content (NOT IN USE)
+ * @param {string[]} [cfg.schemas] The schema names
+ * @param {(schema: string) => Promise<ZodexSchema>} [cfg.getSchemaContent] The
+ *    schema content retriever
  * @param {boolean} [cfg.hasValue] Set to `true` if you are supplying
  *   your own value. If `false` and `hasKeyPath` is `true`,
  *   will initialize with an object.
@@ -90,9 +81,10 @@ export const getFormatAndSchemaChoices = ({schema, hasKeyPath} = {}) => {
  *   plain object).
  * @param {string} [cfg.typeNamespace] Used to prevent conflicts with other
  *   instances of typeChoices on the page
+ * @param {string} [cfg.selectedSchema]
  * @param {import('./formats.js').default} [cfg.formats]
  * @param {import('./types.js').default} [cfg.types]
- * @returns {{
+ * @returns {Promise<{
  *   formatChoices: FormatChoices,
  *   typesHolder: TypesHolder,
  *   domArray: [formatChoices: FormatChoices, typesHolder: TypesHolder],
@@ -103,20 +95,21 @@ export const getFormatAndSchemaChoices = ({schema, hasKeyPath} = {}) => {
  *   setValue: SetValue,
  *   formats: import('./formats.js').default,
  *   types: import('./types.js').default
- * }} The selector for types and the container for them. Both should be
+ * }>} The selector for types and the container for them. Both should be
  *   added to the page.
  */
-export function formatAndTypeChoices ({
-  schema,
-  schemaContent,
+export async function formatAndTypeChoices ({
+  schemas,
+  getSchemaContent,
   hasValue,
   singleValue,
   hasKeyPath,
   typeNamespace,
+  selectedSchema,
   formats = new Formats(),
   types = new Types()
 }) {
-  const format = 'structuredCloning';
+  const format = schemas && schemas.length ? 'schema' : 'structuredCloning';
   const formatChoices = /** @type {FormatChoices} */ (jml('select', {
     class: 'formatChoices',
     hidden: singleValue,
@@ -126,13 +119,19 @@ export function formatAndTypeChoices ({
        * Sets the desired format and rebuilds the type choices.
        * @callback SetFormat
        * @param {string} valueFormat
-       * @returns {void}
+       * @this {HTMLSelectElement & {
+       *   $buildTypeChoices: TypeChoiceBuilder
+       * }}
+       * @returns {Promise<void>}
        */
 
       /**
        * Rebuilds the type choices.
        * @callback TypeChoiceBuilder
-       * @returns {void}
+       * @this {HTMLSelectElement & {
+       *   $buildTypeChoices: TypeChoiceBuilder
+       * }}
+       * @returns {Promise<void>}
        */
 
       /**
@@ -145,38 +144,49 @@ export function formatAndTypeChoices ({
       /**
        * @type {SetFormat}
        */
-      $setFormat (valueFormat) {
+      async $setFormat (valueFormat) {
         this.value = valueFormat;
-        this.$buildTypeChoices();
+        await this.$buildTypeChoices();
       },
 
       /**
        * @type {TypeChoiceBuilder}
        */
-      $buildTypeChoices () {
+      async $buildTypeChoices () {
         DOM.removeChildren(typesHolder);
+        const {schema} = this.selectedOptions[0].dataset;
         jml({'#': buildTypeChoices({
           topRoot: /** @type {HTMLDivElement} */ (
             $e(typesHolder, 'div[data-type]')
           ),
           // resultType: 'both',
-          format: this.value,
+          format: /** @type {import('./formats.js').AvailableFormat} */ (
+            this.value
+          ),
           formats,
           types,
           typeNamespace,
           requireObject: hasKeyPath,
           objectHasValue: hasValue,
           schema,
-          schemaContent
+          schemaContent: await getSchemaContent?.(
+            /** @type {string} */ (schema)
+          )
         }).domArray}, typesHolder);
       }
     },
-    $on: {change () {
-      /** @type {HTMLElement & {$buildTypeChoices: TypeChoiceBuilder}} */ (
-        this
-      ).$buildTypeChoices();
-    }}
-  }, [getFormatAndSchemaChoices({schema, hasKeyPath})]));
+    $on: {
+      async change () {
+        await /**
+         * @type {HTMLSelectElement & {
+         *   $buildTypeChoices: TypeChoiceBuilder
+         * }}
+         */ (
+          this
+        ).$buildTypeChoices();
+      }
+    }
+  }, [getFormatAndSchemaChoices({schemas, hasKeyPath, selectedSchema})]));
 
   /**
    * @callback TypeSelectGetter
@@ -189,7 +199,7 @@ export function formatAndTypeChoices ({
    * @property {TypeSelectGetter} $getTypeSelect
    */
 
-  const typesHolder = /** @type {HTMLDivElement} */ (
+  const typesHolder = (
     jml('div', {class: 'typesHolder', $custom: {
       /**
        * @type {TypeRootGetter}
@@ -210,6 +220,10 @@ export function formatAndTypeChoices ({
     }})
   );
 
+  const schema = format === 'schema'
+    ? formatChoices.selectedOptions[0].dataset.schema
+    : undefined;
+
   jml({'#': buildTypeChoices({
     // resultType: 'both',
     topRoot: /** @type {HTMLDivElement} */ ($e(typesHolder, 'div[data-type]')),
@@ -220,7 +234,7 @@ export function formatAndTypeChoices ({
     requireObject: hasKeyPath,
     objectHasValue: hasValue,
     schema,
-    schemaContent
+    schemaContent: await getSchemaContent?.(/** @type {string} */ (schema))
   }).domArray}, typesHolder);
 
   return {
@@ -283,14 +297,14 @@ export function formatAndTypeChoices ({
     /** @type {SetValue} */
     async setValue (value, stateObj) {
       const rootEditUI = /** @type {HTMLDivElement} */ (
-        await formats.getControlsForFormatAndValue(
+        (await formats.getControlsForFormatAndValue(
           types,
           /** @type {import('./formats.js').AvailableFormat} */ (
             formatChoices.value
           ),
           value,
           stateObj
-        )
+        )).rootUI
       );
       const type = Types.getTypeForRoot(rootEditUI);
       // eslint-disable-next-line @stylistic/max-len -- Long

package/src/formats/indexedDBKey.js

@@ -27,17 +27,22 @@ const indexedDBKey = {
     }
   },
   convertFromTypeson (typesonType) {
-    return typesonToIndexedDBKey.get(typesonType);
+    return {type: typesonToIndexedDBKey.get(typesonType)};
   },
   iterate (records, stateObj) {
     stateObj.format = 'indexedDBKey';
     return structuredCloning.iterate(records, stateObj);
   },
-  getTypesForState (types, state) {
+  getTypesAndSchemasForState (types, state) {
+    /* istanbul ignore else -- See below */
     if (!state || ['array'].includes(state)) {
-      return this.types();
+      return {
+        types: this.types(),
+        schemaObjects: []
+      };
     }
-    // Can't be object, so shouldn't normally reach here
+    // eslint-disable-next-line @stylistic/max-len -- Long
+    /* istanbul ignore next -- Can't be object, so shouldn't normally reach here */
     return undefined;
   }
 };

package/src/formats/json.js

@@ -26,7 +26,7 @@ const json = {
   },
   // A hack until we simply pass in our own types or do own parsing
   convertFromTypeson (typesonType) {
-    return typesonToJson.get(typesonType);
+    return {type: typesonToJson.get(typesonType)};
   },
   testInvalid (newType, value) {
     switch (newType) {
@@ -41,12 +41,15 @@ const json = {
       return undefined; // Todo: Fix?
     }
   },
-  getTypesForState (types, state) {
+  getTypesAndSchemasForState (types, state) {
     /* istanbul ignore else -- No other states apparently */
     if (!state || ['array', 'object'].includes(state)) {
-      return this.types();
+      return {
+        types: this.types(),
+        schemaObjects: []
+      };
     }
-    // Shouldn't normally reach here
+    /* istanbul ignore next -- Shouldn't normally reach here */
     return undefined;
   }
 };