@json-layout/vocabulary 2.13.1 → 2.13.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-layout/vocabulary",
-  "version": "2.13.1",
+  "version": "2.13.3",
   "description": "Main JSON Layout vocabulary as JSON schemas and Typescript types. Also contains some small utility functions to validate and normalize annotations.",
   "type": "module",
   "exports": {

package/src/normalize.js

@@ -210,7 +210,9 @@ function getPartialCompObject (layoutKeyword) {
  */
 function looksPure (expression) {
   const expr = typeof expression === 'string' ? expression : expression.expr
-  return !expr.includes('rootData.') && !expr.includes('rootData[') && !expr.includes('parent.data') && !expr.includes('parent.parent')
+  // a cheap text check, so it also lists the optional-chaining and bracket spellings
+  return !['rootData.', 'rootData[', 'rootData?.', 'parent.data', 'parent?.data', "parent['data']", 'parent["data"]', 'parent.parent', 'parent?.parent']
+    .some((read) => expr.includes(read))
 }
 
 /**
@@ -822,7 +824,16 @@ export function normalizeLayoutFragment (key, schemaFragment, schemaPath, option
       errors.push(err.message)
       if (err.cause && Array.isArray(err.cause)) errors.push(...err.cause)
       errors.push('failed to normalize layout, use default component')
-      const layout = normalizeValidLayoutFragment(key, { ...schemaFragment, layout: {} }, type, nullable, schemaPath, options, schemaChild)
+      // Clear the keyword that was actually read, not always `layout`: a oneOf child
+      // takes its keyword from `oneOfLayout` and a patternProperties child from
+      // `patternPropertiesLayout`, so clearing `layout` left the bad value in place, the
+      // retry failed the same way, and the node fell through to comp "none". For a oneOf
+      // that is not cosmetic — a variant selector that becomes "none" stops merging its
+      // branch into the parent, and the data silently stops matching the state tree.
+      const layoutKeyword = schemaChild === 'oneOf'
+        ? 'oneOfLayout'
+        : schemaChild === 'patternProperties' ? 'patternPropertiesLayout' : 'layout'
+      const layout = normalizeValidLayoutFragment(key, { ...schemaFragment, [layoutKeyword]: {} }, type, nullable, schemaPath, options, schemaChild)
       return { layout, errors }
     } catch (/** @type {any} */err) {
       errors.push(err.message)

package/types/normalize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../src/normalize.js"],"names":[],"mappings":"AAiyBA;;;;;;;;;GASG;AACH,6CATW,MAAM,GAAG,MAAM,kBACf,cAAc,cACd,MAAM,WACL,OAAO,YAAY,EAAE,gBAAgB,gBACtC,OAAO,GAAG,mBAAmB,cAC7B,MAAM,GAAG,SAAS,kBAClB,OAAO,GACL;IAAC,MAAM,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAC,CAwBxD;;;AA9gBM,uDAHI,cAAc,GACZ,CAAC,cAAc,EAAE,MAAM,CAAC,GAAG,SAAS,CA6BhD;AAMM,sDAHI,cAAc,GACZ;IAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAC,CAkCzD;+BA1WY,OAAO,YAAY,EAAE,gBAAgB;gCACrC,OAAO,YAAY,EAAE,iBAAiB;oBACtC,OAAO,YAAY,EAAE,KAAK;uBAC1B,OAAO,YAAY,EAAE,QAAQ;6BAC7B,OAAO,YAAY,EAAE,cAAc;yBACnC,OAAO,YAAY,EAAE,UAAU;+BAC/B,OAAO,YAAY,EAAE,gBAAgB;4BACrC,OAAO,YAAY,EAAE,aAAa;8BAClC,OAAO,YAAY,EAAE,eAAe;gCACpC,OAAO,YAAY,EAAE,iBAAiB;6BACtC,OAAO,YAAY,EAAE,cAAc"}
+{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../src/normalize.js"],"names":[],"mappings":"AAmyBA;;;;;;;;;GASG;AACH,6CATW,MAAM,GAAG,MAAM,kBACf,cAAc,cACd,MAAM,WACL,OAAO,YAAY,EAAE,gBAAgB,gBACtC,OAAO,GAAG,mBAAmB,cAC7B,MAAM,GAAG,SAAS,kBAClB,OAAO,GACL;IAAC,MAAM,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAC,CAiCxD;;;AAvhBM,uDAHI,cAAc,GACZ,CAAC,cAAc,EAAE,MAAM,CAAC,GAAG,SAAS,CA6BhD;AAMM,sDAHI,cAAc,GACZ;IAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAC,CAkCzD;+BA5WY,OAAO,YAAY,EAAE,gBAAgB;gCACrC,OAAO,YAAY,EAAE,iBAAiB;oBACtC,OAAO,YAAY,EAAE,KAAK;uBAC1B,OAAO,YAAY,EAAE,QAAQ;6BAC7B,OAAO,YAAY,EAAE,cAAc;yBACnC,OAAO,YAAY,EAAE,UAAU;+BAC/B,OAAO,YAAY,EAAE,gBAAgB;4BACrC,OAAO,YAAY,EAAE,aAAa;8BAClC,OAAO,YAAY,EAAE,eAAe;gCACpC,OAAO,YAAY,EAAE,iBAAiB;6BACtC,OAAO,YAAY,EAAE,cAAc"}