@json-layout/core 0.10.0 → 0.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-layout/core",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Compilation and state management utilities for JSON Layout.",
   "type": "module",
   "exports": {
@@ -59,7 +59,7 @@
   },
   "homepage": "https://github.com/json-layout/json-layout#readme",
   "dependencies": {
-    "@json-layout/vocabulary": "^0.10.0",
+    "@json-layout/vocabulary": "^0.11.0",
     "@types/markdown-it": "^13.0.1",
     "ajv": "^8.12.0",
     "ajv-errors": "^3.0.0",

package/src/compile/index.js

@@ -6,6 +6,7 @@ import addFormats from 'ajv-formats'
 import ajvErrors from 'ajv-errors'
 import ajvLocalizeModule from 'ajv-i18n'
 import MarkdownIt from 'markdown-it'
+import { produce } from 'immer'
 import i18n from '../i18n/index.js'
 import { makeSkeletonTree } from './skeleton-tree.js'
 import { resolveRefs } from './utils/resolve-refs.js'
@@ -29,6 +30,17 @@ const ajvLocalize = /** @type {typeof ajvLocalizeModule.default} */ (ajvLocalize
 
 // const exprEvalParser = new ExprEvalParser()
 
+// use Immer for efficient updating with immutability and no-op detection
+/** @type {(draft: PartialCompileOptions, newOptions: PartialCompileOptions) => PartialCompileOptions} */
+export const produceCompileOptions = produce((draft, newOptions) => {
+  for (const key of ['ajv', 'ajvOptions', 'code', 'markdown', 'markdownItOptions', 'locale', 'messages', 'optionsKeys']) {
+    // @ts-ignore
+    if (key in newOptions) draft[key] = newOptions[key]
+    // @ts-ignore
+    else delete draft[key]
+  }
+})
+
 /**
  * @param {PartialCompileOptions} partialOptions
  * @returns {CompileOptions}

package/src/compile/skeleton-node.js

@@ -1,5 +1,5 @@
 // import Debug from 'debug'
-import { normalizeLayoutFragment, isSwitchStruct, isGetItemsExpression, isGetItemsFetch, isItemsLayout } from '@json-layout/vocabulary'
+import { normalizeLayoutFragment, isSwitchStruct, isGetItemsExpression, isGetItemsFetch, isItemsLayout, getSchemaFragmentType } from '@json-layout/vocabulary'
 import { makeSkeletonTree } from './skeleton-tree.js'
 
 /**
@@ -27,8 +27,7 @@ export function makeSkeletonNode (
   parentPointer,
   required
 ) {
-  // consolidate schema
-  if (!schema.type && schema.properties) schema.type = 'object'
+  const { type, nullable } = getSchemaFragmentType(schema)
 
   // improve on ajv error messages based on ajv-errors (https://ajv.js.org/packages/ajv-errors.html)
   schema.errorMessage = schema.errorMessage ?? {}
@@ -49,8 +48,9 @@ export function makeSkeletonNode (
   let defaultData
   if ('default' in schema) defaultData = schema.default
   else if (required) {
-    if (schema.type === 'object') defaultData = {}
-    if (schema.type === 'array') defaultData = []
+    if (nullable) defaultData = null
+    else if (type === 'object') defaultData = {}
+    else if (type === 'array') defaultData = []
   }
 
   let pure = true
@@ -103,7 +103,7 @@ export function makeSkeletonNode (
 
   /** @type {import('./types.js').SkeletonNode} */
   const node = { key: key ?? '', pointer, parentPointer, pure, propertyKeys: [], roPropertyKeys: [] }
-  if (schema.type === 'object') {
+  if (type === 'object') {
     if (schema.properties) {
       node.children = node.children ?? []
       for (const propertyKey of Object.keys(schema.properties)) {
@@ -166,7 +166,7 @@ export function makeSkeletonNode (
       const childrenTrees = []
       /** @type {string[]} */
       for (let i = 0; i < schema.oneOf.length; i++) {
-        if (!schema.oneOf[i].type) schema.oneOf[i].type = schema.type
+        if (!schema.oneOf[i].type) schema.oneOf[i].type = type
         const title = schema.oneOf[i].title ?? `option ${i}`
         delete schema.oneOf[i].title
         childrenTrees.push(makeSkeletonTree(
@@ -195,7 +195,7 @@ export function makeSkeletonNode (
     }
   }
 
-  if (schema.type === 'array' && schema.items) {
+  if (type === 'array' && schema.items) {
     if (Array.isArray(schema.items)) {
       node.children = schema.items.map((/** @type {any} */ itemSchema, /** @type {number} */ i) => {
         return makeSkeletonNode(

package/types/compile/index.d.ts

@@ -5,6 +5,8 @@
  */
 export function compile(_schema: object, partialOptions?: import("./types.js").PartialCompileOptions | undefined): CompiledLayout;
 export { resolveRefs } from "./utils/resolve-refs.js";
+/** @type {(draft: PartialCompileOptions, newOptions: PartialCompileOptions) => PartialCompileOptions} */
+export const produceCompileOptions: (draft: PartialCompileOptions, newOptions: PartialCompileOptions) => PartialCompileOptions;
 export type SkeletonTree = import('./types.js').SkeletonTree;
 export type SkeletonNode = import('./types.js').SkeletonNode;
 export type CompiledLayout = import('./types.js').CompiledLayout;

package/types/compile/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/compile/index.js"],"names":[],"mappings":"AAsEA;;;;GAIG;AACH,iCAJW,MAAM,4EAEJ,cAAc,CA6E1B;;2BAtIY,OAAO,YAAY,EAAE,YAAY;2BACjC,OAAO,YAAY,EAAE,YAAY;6BACjC,OAAO,YAAY,EAAE,cAAc;6BACnC,OAAO,YAAY,EAAE,cAAc;oCACnC,OAAO,YAAY,EAAE,qBAAqB;iCAC1C,OAAO,YAAY,EAAE,kBAAkB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/compile/index.js"],"names":[],"mappings":"AAkFA;;;;GAIG;AACH,iCAJW,MAAM,4EAEJ,cAAc,CA6E1B;;AAjID,yGAAyG;AACzG,4CADmB,qBAAqB,cAAc,qBAAqB,KAAK,qBAAqB,CAQnG;2BAxBW,OAAO,YAAY,EAAE,YAAY;2BACjC,OAAO,YAAY,EAAE,YAAY;6BACjC,OAAO,YAAY,EAAE,cAAc;6BACnC,OAAO,YAAY,EAAE,cAAc;oCACnC,OAAO,YAAY,EAAE,qBAAqB;iCAC1C,OAAO,YAAY,EAAE,kBAAkB"}