@es-joy/jsoe 0.27.0 → 0.28.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@es-joy/jsoe",
-  "version": "0.27.0",
+  "version": "0.28.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "main": "./src/index.js",
@@ -28,20 +28,38 @@
     ]
   },
   "dependencies": {
+    "@codemirror/autocomplete": "^6.20.3",
+    "@codemirror/commands": "^6.11.0",
+    "@codemirror/lang-javascript": "^6.2.5",
+    "@codemirror/language": "^6.12.4",
+    "@codemirror/lint": "^6.9.7",
+    "@codemirror/search": "^6.7.2",
+    "@codemirror/state": "^6.7.4",
+    "@codemirror/view": "^6.43.11",
+    "@lezer/common": "^1.5.2",
+    "@lezer/highlight": "^1.2.3",
+    "@lezer/javascript": "^1.5.4",
+    "@lezer/lr": "^1.4.10",
+    "@marijn/find-cluster-break": "^1.0.4",
     "@node-static/node-static": "^0.9.2",
     "acorn": "^8.18.0",
-    "jamilih": "0.69.1",
+    "codemirror": "^6.0.2",
+    "crelt": "^1.0.7",
+    "jamilih": "0.70.0",
+    "json-6": "^1.1.4",
     "mime": "^4.1.0",
     "sceditor": "3.2.1",
+    "style-mod": "^4.1.3",
     "typeson-registry": "14.6.1",
-    "zod": "^4.6.1",
-    "zodexy": "^0.31.0"
+    "w3c-keyname": "^2.2.8",
+    "zod": "^4.6.4",
+    "zodexy": "^0.32.0"
   },
   "devDependencies": {
-    "@babel/core": "^8.0.1",
+    "@babel/core": "^8.0.5",
     "@babel/plugin-transform-modules-commonjs": "^8.0.1",
-    "@babel/preset-env": "^8.0.2",
-    "@babel/register": "^8.0.1",
+    "@babel/preset-env": "^8.0.5",
+    "@babel/register": "^8.0.5",
     "@cypress/code-coverage": "^4.0.3",
     "@rollup/plugin-babel": "^7.1.0",
     "@rollup/plugin-commonjs": "^29.0.3",
@@ -56,15 +74,17 @@
     "cypress-axe": "^1.7.0",
     "cypress-terminal-report": "^7.3.3",
     "eslint": "^10.10.0",
-    "eslint-config-ash-nazg": "^43.1.8",
+    "eslint-config-ash-nazg": "^43.1.10",
     "fast-deep-equal": "^3.1.3",
     "jsdom": "^30.0.1",
     "license-badger": "^0.23.0",
+    "mocha-badge-generator": "^0.13.0",
+    "mocha-multi-reporters": "^1.5.2",
     "npm-run-all": "^4.1.5",
     "nyc": "^18.0.0",
     "open-cli": "^9.0.0",
     "rimraf": "^6.1.3",
-    "rollup": "4.63.1",
+    "rollup": "4.63.2",
     "rollup-plugin-istanbul": "^5.0.0",
     "rollup-plugin-node-builtins": "^2.1.2",
     "typescript": "^6.0.3",
@@ -115,13 +135,15 @@
     "copy-zodexy": "cp -R node_modules/zodexy/dist/esm vendor/zodexy/dist && cp node_modules/zodexy/dist/schema.zodexy.json vendor/zodexy/dist/schema.zodexy.json",
     "copy-acorn": "cp -R node_modules/acorn/dist vendor/acorn",
     "copy-mime": "mkdir -p vendor/mime/dist/types && cp node_modules/mime/dist/types/standard.js vendor/mime/dist/types/standard.js && cp node_modules/mime/dist/types/other.js vendor/mime/dist/types/other.js",
-    "copy": "run-p copy-jamilih copy-typeson-registry copy-zod copy-zodexy copy-acorn copy-mime",
+    "copy-json6": "mkdir -p vendor/json-6/dist && cp node_modules/json-6/dist/index.mjs vendor/json-6/dist/index.mjs",
+    "copy-codemirror": "mkdir -p vendor/codemirror/dist vendor/@codemirror/lang-javascript/dist vendor/@codemirror/state/dist vendor/@codemirror/view/dist vendor/@codemirror/language/dist vendor/@codemirror/commands/dist vendor/@codemirror/search/dist vendor/@codemirror/autocomplete/dist vendor/@codemirror/lint/dist vendor/@lezer/common/dist vendor/@lezer/highlight/dist vendor/@lezer/lr/dist vendor/@lezer/javascript/dist vendor/@marijn/find-cluster-break/src vendor/crelt vendor/style-mod/src vendor/w3c-keyname && cp node_modules/codemirror/dist/index.js vendor/codemirror/dist/index.js && cp node_modules/@codemirror/lang-javascript/dist/index.js vendor/@codemirror/lang-javascript/dist/index.js && cp node_modules/@codemirror/state/dist/index.js vendor/@codemirror/state/dist/index.js && cp node_modules/@codemirror/view/dist/index.js vendor/@codemirror/view/dist/index.js && cp node_modules/@codemirror/language/dist/index.js vendor/@codemirror/language/dist/index.js && cp node_modules/@codemirror/commands/dist/index.js vendor/@codemirror/commands/dist/index.js && cp node_modules/@codemirror/search/dist/index.js vendor/@codemirror/search/dist/index.js && cp node_modules/@codemirror/autocomplete/dist/index.js vendor/@codemirror/autocomplete/dist/index.js && cp node_modules/@codemirror/lint/dist/index.js vendor/@codemirror/lint/dist/index.js && cp node_modules/@lezer/common/dist/index.js vendor/@lezer/common/dist/index.js && cp node_modules/@lezer/highlight/dist/index.js vendor/@lezer/highlight/dist/index.js && cp node_modules/@lezer/lr/dist/index.js vendor/@lezer/lr/dist/index.js && cp node_modules/@lezer/javascript/dist/index.js vendor/@lezer/javascript/dist/index.js && cp node_modules/@marijn/find-cluster-break/src/index.js vendor/@marijn/find-cluster-break/src/index.js && cp node_modules/crelt/index.js vendor/crelt/index.js && cp node_modules/style-mod/src/style-mod.js vendor/style-mod/src/style-mod.js && cp node_modules/w3c-keyname/index.js vendor/w3c-keyname/index.js",
+    "copy": "run-p copy-jamilih copy-typeson-registry copy-zod copy-zodexy copy-acorn copy-mime copy-json6 copy-codemirror",
     "instrument": "NODE_OPTIONS=--max-old-space-size=8192 run-s -c instrument-remove instrument-add copy-index rollup",
     "coveradge": "coveradge badges/coverage-badge.svg",
     "cypress:log": "ELECTRON_ENABLE_LOGGING=1 cypress run; npm run report",
-    "cypress": "rm -Rf .nyc_output && cypress run --browser chrome --spec cypress/e2e/all.cy.js; npm run report && npm run coveradge",
+    "cypress": "rm -Rf .nyc_output && cypress run --browser chrome --reporter=mocha-multi-reporters --reporter-options configFile=mmr.json --spec cypress/e2e/all.cy.js; npm run report && npm run coveradge",
     "cypress:record": "cypress run --browser chrome --record --parallel",
-    "cypress:sample-spec": "rm -Rf .nyc_output && cypress run --browser chrome --spec cypress/e2e/subTypes/true.cy.js; npm run report && npm run coveradge",
+    "cypress:sample-spec": "rm -Rf .nyc_output && cypress run --browser chrome --reporter=mocha-multi-reporters --reporter-options configFile=mmr.json --spec cypress/e2e/subTypes/true.cy.js; npm run report && npm run coveradge",
     "report": "nyc report",
     "test": "npm run eslint && npm run rollup && npm run cypress"
   }

package/pnpm-workspace.yaml

@@ -10,40 +10,40 @@ minimumReleaseAgeExclude:
   - cypress@15.20.1 || 15.21.0 || 16.0.0
   - '@es-joy/jsdoccomment@0.95.0 || 0.95.1'
   - '@typescript-eslint/types@8.67.0 || 8.69.0'
-  - eslint-config-ash-nazg@42.3.0 || 42.5.0 || 43.0.1 || 43.1.0 || 43.1.2 || 43.1.5 || 43.1.6
-  - eslint-plugin-jsdoc@64.1.0 || 64.2.1 || 64.3.0 || 64.3.2 || 64.3.3
+  - eslint-config-ash-nazg@42.3.0 || 42.5.0 || 43.0.1 || 43.1.0 || 43.1.2 || 43.1.5 || 43.1.6 || 43.1.10
+  - eslint-plugin-jsdoc@64.1.0 || 64.2.1 || 64.3.0 || 64.3.2 || 64.3.3 || 64.3.10
   - jsdoc-type-pratt-parser@9.1.1 || 9.1.2
-  - zodexy@0.21.1 || 0.21.2 || 0.22.0 || 0.23.0 || 0.24.0 || 0.24.1 || 0.25.0 || 0.26.0 || 0.26.1 || 0.27.0 || 0.30.0 || 0.30.1 || 0.31.0
+  - zodexy@0.21.1 || 0.21.2 || 0.22.0 || 0.23.0 || 0.24.0 || 0.24.1 || 0.25.0 || 0.26.0 || 0.26.1 || 0.27.0 || 0.30.0 || 0.30.1 || 0.31.0 || 0.31.1 || 0.32.0
   - typeson-registry@13.0.1 || 13.1.0 || 14.4.0 || 14.5.0
   - typeson@10.1.1 || 10.2.0 || 10.3.0
-  - '@rollup/rollup-android-arm-eabi@4.63.1'
-  - '@rollup/rollup-android-arm64@4.63.1'
-  - '@rollup/rollup-darwin-arm64@4.63.1'
-  - '@rollup/rollup-darwin-x64@4.63.1'
-  - '@rollup/rollup-freebsd-arm64@4.63.1'
-  - '@rollup/rollup-freebsd-x64@4.63.1'
-  - '@rollup/rollup-linux-arm-gnueabihf@4.63.1'
-  - '@rollup/rollup-linux-arm-musleabihf@4.63.1'
-  - '@rollup/rollup-linux-arm64-gnu@4.63.1'
-  - '@rollup/rollup-linux-arm64-musl@4.63.1'
-  - '@rollup/rollup-linux-loong64-gnu@4.63.1'
-  - '@rollup/rollup-linux-loong64-musl@4.63.1'
-  - '@rollup/rollup-linux-ppc64-gnu@4.63.1'
-  - '@rollup/rollup-linux-ppc64-musl@4.63.1'
-  - '@rollup/rollup-linux-riscv64-gnu@4.63.1'
-  - '@rollup/rollup-linux-riscv64-musl@4.63.1'
-  - '@rollup/rollup-linux-s390x-gnu@4.63.1'
-  - '@rollup/rollup-linux-x64-gnu@4.63.1'
-  - '@rollup/rollup-linux-x64-musl@4.63.1'
-  - '@rollup/rollup-openbsd-x64@4.63.1'
-  - '@rollup/rollup-openharmony-arm64@4.63.1'
-  - '@rollup/rollup-win32-arm64-msvc@4.63.1'
-  - '@rollup/rollup-win32-ia32-msvc@4.63.1'
-  - '@rollup/rollup-win32-x64-gnu@4.63.1'
-  - '@rollup/rollup-win32-x64-msvc@4.63.1'
+  - '@rollup/rollup-android-arm-eabi@4.63.1 || 4.63.2'
+  - '@rollup/rollup-android-arm64@4.63.1 || 4.63.2'
+  - '@rollup/rollup-darwin-arm64@4.63.1 || 4.63.2'
+  - '@rollup/rollup-darwin-x64@4.63.1 || 4.63.2'
+  - '@rollup/rollup-freebsd-arm64@4.63.1 || 4.63.2'
+  - '@rollup/rollup-freebsd-x64@4.63.1 || 4.63.2'
+  - '@rollup/rollup-linux-arm-gnueabihf@4.63.1 || 4.63.2'
+  - '@rollup/rollup-linux-arm-musleabihf@4.63.1 || 4.63.2'
+  - '@rollup/rollup-linux-arm64-gnu@4.63.1 || 4.63.2'
+  - '@rollup/rollup-linux-arm64-musl@4.63.1 || 4.63.2'
+  - '@rollup/rollup-linux-loong64-gnu@4.63.1 || 4.63.2'
+  - '@rollup/rollup-linux-loong64-musl@4.63.1 || 4.63.2'
+  - '@rollup/rollup-linux-ppc64-gnu@4.63.1 || 4.63.2'
+  - '@rollup/rollup-linux-ppc64-musl@4.63.1 || 4.63.2'
+  - '@rollup/rollup-linux-riscv64-gnu@4.63.1 || 4.63.2'
+  - '@rollup/rollup-linux-riscv64-musl@4.63.1 || 4.63.2'
+  - '@rollup/rollup-linux-s390x-gnu@4.63.1 || 4.63.2'
+  - '@rollup/rollup-linux-x64-gnu@4.63.1 || 4.63.2'
+  - '@rollup/rollup-linux-x64-musl@4.63.1 || 4.63.2'
+  - '@rollup/rollup-openbsd-x64@4.63.1 || 4.63.2'
+  - '@rollup/rollup-openharmony-arm64@4.63.1 || 4.63.2'
+  - '@rollup/rollup-win32-arm64-msvc@4.63.1 || 4.63.2'
+  - '@rollup/rollup-win32-ia32-msvc@4.63.1 || 4.63.2'
+  - '@rollup/rollup-win32-x64-gnu@4.63.1 || 4.63.2'
+  - '@rollup/rollup-win32-x64-msvc@4.63.1 || 4.63.2'
   - eslint-plugin-escompat@3.11.6 || 3.12.0
-  - rollup@4.63.1
-  - zod@4.5.2 || 4.5.4 || 4.6.1
+  - rollup@4.63.1 || 4.63.2
+  - zod@4.5.2 || 4.5.4 || 4.6.1 || 4.6.3 || 4.6.4
   - '@typescript-eslint/eslint-plugin@8.69.0'
   - '@typescript-eslint/parser@8.69.0'
   - '@typescript-eslint/project-service@8.69.0'
@@ -56,3 +56,5 @@ minimumReleaseAgeExclude:
   - typescript-eslint@8.69.0
   - '@types/node@26.4.1'
   - '@node-static/node-static@0.9.2'
+  - mocha-multi-reporters@1.5.2
+  - '@eslint-community/eslint-plugin-eslint-comments@4.8.1'

package/src/formats/schema.js

@@ -43,10 +43,6 @@ const zodexToStructuredCloningTypeMap = new Map([
   ['array', 'arrayNonindexKeys'],
 
   ['object', 'object'],
-  // `z.properties()` (Zod 4.5+) is a bare named-property shape: like `object`
-  //   but with no `catchall`/`symbols` and, in Zod, no unknown-key stripping.
-  //   jsoe edits it through the same `object` UI, keyed off the schema `type`.
-  ['properties', 'object'],
 
   ['tuple', 'array'],
   ['record', 'object'],
@@ -194,13 +190,15 @@ const dezerializerCodecs = {
 };
 
 /**
+ * Exported for reuse by `src/utils/rawTypesonEditor.js`, which must enforce
+ *   the same schema conformance check before accepting a raw-edited value.
  * @param {InstanceType<typeof import('../types.js').default>} types
  * @param {ZodexSchema} schemaObject
  * @param {ZodexSchema} originalShape
  * @param {unknown} value
  * @returns {ReturnType<ReturnType<typeof dezerialize>['safeParse']>}
  */
-function parseValue (types, schemaObject, originalShape, value) {
+export function parseValue (types, schemaObject, originalShape, value) {
   return dezerialize(schemaObject, {
     checks: getChecks(types),
     codecs: dezerializerCodecs,
@@ -386,13 +384,12 @@ function mergeMeta (target, source) {
 
 /**
  * Whether a schema node carries a fixed bag of named property schemas under
- * `properties` - `object` and `z.properties()`. Both are merged the same way
- * across an intersection and both drive the `object` editor UI.
+ * `properties` - i.e., `object`.
  * @param {ZodexSchema['type']|undefined} type
  * @returns {boolean}
  */
 function isPropertyBagType (type) {
-  return type === 'object' || type === 'properties';
+  return type === 'object';
 }
 
 /**
@@ -611,7 +608,6 @@ export function getTypesForSchema (schemaObject, originalJSON) {
         originalJSON
       );
     }
-    case 'properties':
     case 'object': {
       const set = new Set();
       // const {properties} = schemaObject;
@@ -934,13 +930,12 @@ const schema = {
 
     switch (parentSchema?.type) {
     case 'object':
-    case 'properties':
       // A key outside the declared shape: an `object` pins it to its
-      //   `catchall` if it has one; otherwise (and always for `properties`,
-      //   which has no `catchall`) its control is offered the unconstrained
-      //   type choice - as a `looseRecord`'s non-conforming entry is - rather
-      //   than the bare "unschema'd" fallback. A strict `object` will still
-      //   strip the key on parse; this only governs how it is edited.
+      //   `catchall` if it has one; otherwise its control is offered the
+      //   unconstrained type choice - as a `looseRecord`'s non-conforming
+      //   entry is - rather than the bare "unschema'd" fallback. A strict
+      //   `object` will still strip the key on parse; this only governs how
+      //   it is edited.
       currentSchema = /** @type {import('zodexy').SzObject} */ (
         parentSchema
       ).properties[

package/src/formats/structuredCloning.js

@@ -274,23 +274,30 @@ const encapsulateObserver = (stateObj) => {
     // console.log('but could set to', schema);
     // console.log('arrayOrObjectPropertyName', arrayOrObjectPropertyName);
 
-    if (!stateObj.rootUI) {
-      // console.log('vvvv0', newType, newValue);
-      stateObj.rootUI = types?.getUIForModeAndType({
-        readonly,
-        typeNamespace,
-        type: newType,
-        bringIntoFocus: false,
-        buildTypeChoices,
-        format,
-        specificSchemaObject: schema,
-        schemaContent,
-        value: newValue,
-        hasValue: true,
-        // Not currently in use but may be convenient for a
-        //     type wanting the serialized data
-        replaced
-      });
+    if (!parents['']) {
+      // A caller repopulating an *existing* container in place (e.g. the raw
+      //   Typeson/JSON6 editor replacing one control's children after a
+      //   bulk edit, `src/utils/rawTypesonEditor.js`) pre-seeds
+      //   `stateObj.rootUI` with that container so it is reused here instead
+      //   of a fresh one being built.
+      if (!stateObj.rootUI) {
+        // console.log('vvvv0', newType, newValue);
+        stateObj.rootUI = types?.getUIForModeAndType({
+          readonly,
+          typeNamespace,
+          type: newType,
+          bringIntoFocus: false,
+          buildTypeChoices,
+          format,
+          specificSchemaObject: schema,
+          schemaContent,
+          value: newValue,
+          hasValue: true,
+          // Not currently in use but may be convenient for a
+          //     type wanting the serialized data
+          replaced
+        });
+      }
       parents[''] = /**
                      * @type {HTMLElement &
                      *   {$addAndSetArrayElement: AddAndSetArrayElement}}

package/src/fundamentalTypes/arrayType.js

@@ -7,6 +7,7 @@ import {
   schemaLabel, lastTypeChild, deprecatedClassSuffix
 } from '../utils/schemaMeta.js';
 import dialogs from '../utils/dialogs.js';
+import {openRawEditorDialog} from '../utils/rawTypesonEditor.js';
 import {
   resolveJSONPointer, getJSONPointerParts, reduceJSONPointerParts
 } from '../utils/jsonPointer.js';
@@ -266,7 +267,7 @@ const arrayType = {
     return {value: retObj, remnant: stringVal};
   },
   getValue ({root, stateObj, currentPath = ''}) {
-    /* istanbul ignore if */
+    /* istanbul ignore if -- TS guard */
     if (!stateObj) {
       throw new Error('TS guard'); // TS guard
     }
@@ -428,6 +429,13 @@ const arrayType = {
       specificSchemaObject?.type === 'looseRecord';
     const tupleMode = specificSchemaObject?.type === 'tuple';
 
+    // See `docs/proposals/raw-typeson-edit-view.md` §1 for the scope
+    //   rationale (why `filelist` is included, why record/tuple count).
+    const isRawEditable = types.showRawTypesonControls &&
+      ((type === 'object' || type === 'array' ||
+        type === 'set' || type === 'map' || type === 'filelist') ||
+        recordMode || tupleMode);
+
     /**
      * @param {{
      *   itemIndex: number,
@@ -660,6 +668,31 @@ const arrayType = {
           target
         ).textContent = arrayContents.hidden ? '+' : '-';
       }}}, ['-']],
+      ...(isRawEditable
+        ? /** @type {import('jamilih').JamilihArray[]} */ ([
+          nbsp.repeat(2),
+          ['button', {
+            class: 'viewRawTypeson',
+            $on: {click (/** @type {Event} */ e) {
+              e.preventDefault();
+              openRawEditorDialog({
+                types,
+                format: /** @type {import('../formats.js').AvailableFormat} */ (
+                  format
+                ),
+                type: /** @type {import('../types.js').AvailableArbitraryType} */ (
+                  type
+                ),
+                root: /** @type {HTMLDivElement} */ (div),
+                topRoot: /** @type {HTMLDivElement} */ (topRoot),
+                typeNamespace,
+                specificSchemaObject,
+                readonly: true
+              });
+            }}
+          }, ['View raw']]
+        ])
+        : []),
       ['div', {class: 'arrayContents'}, [
         !recordMode && this.array
           ? ['div', {
@@ -724,6 +757,13 @@ const arrayType = {
       specificSchemaObject?.type === 'looseRecord';
     const tupleMode = specificSchemaObject?.type === 'tuple';
 
+    // See `docs/proposals/raw-typeson-edit-view.md` §1 for the scope
+    //   rationale (why `filelist` is included, why record/tuple count).
+    const isRawEditable = types.showRawTypesonControls &&
+      ((type === 'object' || type === 'array' ||
+        type === 'set' || type === 'map' || type === 'filelist') ||
+        recordMode || tupleMode);
+
     // A `record` refines `object` but, for legend numbering/reordering, behaves
     //   like the array-based types did when it was its own (`array: true`) type.
     const parentIsArrayLike = parentTypeObject.array || recordMode;
@@ -1380,7 +1420,7 @@ const arrayType = {
                   const method = latest ? 'after' : 'before';
                   // Ensure move *after* splice that will occur after this
                   setTimeout(() => {
-                    /* istanbul ignore if */
+                    /* istanbul ignore if -- Should be present */
                     if (!nearest) {
                       return;
                     }
@@ -1631,21 +1671,19 @@ const arrayType = {
       const objectSchema = /** @type {import('zodexy').SzObject} */ (
         specificSchemaObject
       );
-      const schemaType = specificSchemaObject?.type;
       const propSchema = objectSchema?.properties?.[/** @type {string} */ (
         propName
       )];
       if (
         !propSchema &&
-        (schemaType === 'properties' ||
-          (schemaType === 'object' && !objectSchema.catchall))
+        specificSchemaObject?.type === 'object' && !objectSchema.catchall
       ) {
-        // A key outside the declared shape of a `z.properties()` (which keeps
-        //   it) or a `catchall`-less `z.object()` (which strips it on parse but
-        //   still shows it while editing): offer the unconstrained type choice
-        //   rather than an unschema'd control, as a `looseRecord`'s
-        //   non-conforming entry gets. An `object` `catchall` takes precedence
-        //   (handled where the per-property schema is chosen elsewhere).
+        // A key outside the declared shape of a `catchall`-less `z.object()`
+        //   (which strips it on parse but still shows it while editing):
+        //   offer the unconstrained type choice rather than an unschema'd
+        //   control, as a `looseRecord`'s non-conforming entry gets. An
+        //   `object` `catchall` takes precedence (handled where the
+        //   per-property schema is chosen elsewhere).
         return /** @type {import('zodexy').SzType} */ ({type: 'unknown'});
       }
       return propSchema;
@@ -2358,6 +2396,34 @@ const arrayType = {
       ).textContent = arrayContents.hidden ? '+' : '-';
     }}}, ['-']];
 
+    const rawEditButton = isRawEditable
+      ? [
+        nbsp.repeat(2),
+        ['button', {
+          class: 'editRawTypeson',
+          $on: {click (/** @type {Event} */ e) {
+            e.preventDefault();
+            openRawEditorDialog({
+              types,
+              format: /** @type {import('../formats.js').AvailableFormat} */ (
+                format
+              ),
+              type: /** @type {import('../types.js').AvailableArbitraryType} */ (
+                type
+              ),
+              root: /** @type {HTMLDivElement} */ (div),
+              // By click time `topRoot ||= div` below has already run if
+              //   this control is itself the root.
+              topRoot: /** @type {HTMLDivElement} */ (topRoot),
+              typeNamespace,
+              specificSchemaObject,
+              readonly: false
+            });
+          }}
+        }, ['Edit raw']]
+      ]
+      : [];
+
     const arrayContents = /** @type {import('jamilih').JamilihArray} */ (
       ['div', {class: 'arrayContents'}, [
         arrayContentsFirstChild,
@@ -2433,7 +2499,8 @@ const arrayType = {
      *   $getTypeChoices: () => HTMLSelectElement & {
      *     $setType: import('../typeChoices.js').SetType,
      *     $getTypeRoot: import('../formatAndTypeChoices.js').TypeRootGetter
-     *   }
+     *   },
+     *   $resetItemIndex: () => void
      * }} DivArrayOrObjectHolder
      */
 
@@ -2585,6 +2652,40 @@ const arrayType = {
                 this.$getAddArrayElement().previousElementSibling
               );
             },
+            /**
+             * Resets the `itemIndex`/legend-numbering counter back to its
+             *   empty-container baseline (`itemAdjust - 1`, the same value
+             *   it's initialized to before any item is ever added — *not*
+             *   the `-1` the "x All" button below hardcodes, which is only
+             *   correct for arrays; an object's baseline is `0`). Exposed so
+             *   a caller that repopulates this container's children from
+             *   outside this closure (bypassing the normal per-item
+             *   add/remove handlers that keep `itemIndex` in sync as they
+             *   go) — currently only
+             *   `src/utils/rawTypesonEditor.js`'s `commitValueToContainer`,
+             *   after a raw-value edit replaces every child — ends up with
+             *   exactly the same numbering a fresh container holding the
+             *   same new items would have, rather than continuing from
+             *   wherever the replaced content had left off (or, using the
+             *   wrong baseline, starting one lower than a fresh container
+             *   would: a single-property object's only property would be
+             *   renumbered from "1" to "0" by a bulk edit that didn't even
+             *   change its key, for example).
+             * @this {DivArrayOrObjectHolder}
+             * @returns {void}
+             */
+            $resetItemIndex () {
+              if (sparse) {
+                decrementItemIndex(
+                  /**
+                   * @type {HTMLDivElement & {
+                   *   $getPropertyInputs: GetPropertyInputs
+                    }} */ (this.$getArrayItems())
+                );
+              } else {
+                itemIndex = itemAdjust - 1;
+              }
+            },
             /**
              * @this {DivArrayOrObjectHolder}
              * @returns {HTMLSelectElement & {
@@ -2630,16 +2731,10 @@ const arrayType = {
           }
         }, /** @type {import('jamilih').JamilihChildren} */ ([
           [specificSchemaObject ? 'span' : 'b', {
-            title: schemaLabel(specificSchemaObject) ?? (
-              // `z.properties()` renders through the `object` UI; without a
-              //   `meta` label of its own, name it "Properties" rather than an
-              //   indistinguishable "Object".
-              specificSchemaObject?.type === 'properties'
-                ? 'Properties'
-                : DOM.initialCaps(
-                  /** @type {import('../types.js').AvailableType} */
-                  (itemType)
-                ).replace(/s$/u, ''))
+            title: schemaLabel(specificSchemaObject) ?? DOM.initialCaps(
+              /** @type {import('../types.js').AvailableType} */
+              (itemType)
+            ).replace(/s$/u, '')
           }, [
             specificSchemaObject
               ? '—'
@@ -2659,7 +2754,7 @@ const arrayType = {
                  * @this {HTMLInputElement}
                  */
                 change () {
-                  /* istanbul ignore if */
+                  /* istanbul ignore if -- TS */
                   if (!this.files) {
                     return;
                   }
@@ -2684,6 +2779,7 @@ const arrayType = {
             }]
             : '',
           minusButton,
+          ...rawEditButton,
           arrayContents
         ]))
       );

package/src/fundamentalTypes/blobType.js

@@ -117,7 +117,7 @@ function binaryButton (value, editable) {
                 ['textarea', {
                   class: 'view-binary'
                 }, [
-                  /* istanbul ignore next */
+                  /* istanbul ignore next -- Guard */
                   /** @type {string|null} */ (reader.result) ?? ''
                 ]]
               ]]
@@ -127,11 +127,11 @@ function binaryButton (value, editable) {
         // Seems not feasible to accurately simulate
         reader.addEventListener(
           'error',
-          /* istanbul ignore next */
+          /* istanbul ignore next -- See comment above */
           async function () {
-            /* istanbul ignore next */
+            /* istanbul ignore nex -- See comment abovet */
             console.error(reader.error);
-            /* istanbul ignore next */
+            /* istanbul ignore next -- See comment above */
             await dialogs.alert(/** @type {string} */ (
               /** @type {DOMException} */ (reader.error).message
             ));
@@ -205,7 +205,7 @@ const blobType = {
               'Text source',
               ['br'],
               ['textarea', {class: 'view-text'}, [
-                /* istanbul ignore next */
+                /* istanbul ignore next -- Guard */
                 /** @type {string|null} */ (reader.result) ?? ''
               ]]
             ]));
@@ -213,11 +213,11 @@ const blobType = {
           // Seems not feasible to accurately simulate
           reader.addEventListener(
             'error',
-            /* istanbul ignore next */
+            /* istanbul ignore next -- See comment above */
             function () {
-              /* istanbul ignore next */
+              /* istanbul ignore next -- See comment above */
               console.error(reader.error);
-              /* istanbul ignore next */
+              /* istanbul ignore next -- See comment above */
               div.append(
                 /** @type {DOMException} */ (reader.error).message
               );
@@ -400,7 +400,7 @@ const blobType = {
               blob
             ).slice(8, -1) === 'Blob'
               ? /** @type {Blob} */ (blob)
-              /* istanbul ignore next */
+              /* istanbul ignore next -- Guard */
               : undefined;
           }
         }
@@ -619,7 +619,7 @@ const blobType = {
 
                 if (constraints) {
                   const mediaStream = await getUserMedia(constraints);
-                  /* istanbul ignore if */
+                  /* istanbul ignore if -- Should be present */
                   if (!mediaStream) {
                     await dialogs.alert('Error getting user media');
                     return;
@@ -667,7 +667,7 @@ const blobType = {
                   const mediaStream = await startScreenCapture(
                     screenShareConstraints
                   );
-                  /* istanbul ignore if */
+                  /* istanbul ignore if -- Should be present */
                   if (!mediaStream) {
                     await dialogs.alert('Error getting user media');
                     return;
@@ -747,7 +747,7 @@ const blobType = {
                     'video.previewMedia'
                   ));
 
-                /* istanbul ignore if */
+                /* istanbul ignore if -- Should be present */
                 if (!previewMedia.srcObject) {
                   dialogs.alert('No stream found to record');
                   return;
@@ -782,11 +782,11 @@ const blobType = {
 
                 try {
                   mediaRecorder.start();
-                /* istanbul ignore next */
+                /* istanbul ignore next -- Should not err */
                 } catch {
-                  /* istanbul ignore next */
+                  /* istanbul ignore next -- Should not err */
                   dialogs.alert('Error starting media recorder');
-                  /* istanbul ignore next */
+                  /* istanbul ignore next -- Should not err */
                   return;
                 }
                 mediaRecorder.addEventListener('stop', () => {
@@ -923,7 +923,7 @@ const blobType = {
                   ($e(videoContainer, 'img.photo'));
 
                 canvas.toBlob((blob) => {
-                  /* istanbul ignore if */
+                  /* istanbul ignore if -- Should not err */
                   if (!blob) {
                     dialogs.alert('Error converting canvas to Blob');
                     return;