@json-layout/core 1.4.4 → 1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-layout/core",
-  "version": "1.4.4",
+  "version": "1.5.1",
   "description": "Compilation and state management utilities for JSON Layout.",
   "type": "module",
   "exports": {
@@ -57,8 +57,10 @@
     "url": "https://github.com/json-layout/json-layout/issues"
   },
   "homepage": "https://github.com/json-layout/json-layout#readme",
+  "peerDependencies": {
+    "@json-layout/vocabulary": "^1.5.1"
+  },
   "dependencies": {
-    "@json-layout/vocabulary": "~1.4.2",
     "ajv": "^8.17.1",
     "ajv-errors": "^3.0.0",
     "ajv-formats": "^3.0.1",

package/src/compile/index.js

@@ -5,7 +5,7 @@ import ajvLocalizeModule from 'ajv-i18n'
 import { makeSkeletonTree } from './skeleton-tree.js'
 import { resolveLocaleRefs } from './utils/resolve-refs.js'
 import { resolveXI18n } from './utils/x-i18n.js'
-import clone from '../utils/clone.js'
+import { clone } from '@json-layout/vocabulary'
 import { fillOptions } from './options.js'
 
 export { resolveLocaleRefs } from './utils/resolve-refs.js'
@@ -77,6 +77,7 @@ export function compile (_schema, partialOptions = {}) {
   const uriResolver = options.ajv.opts.uriResolver
   /** @type {Record<string, import('ajv').ValidateFunction>} */
   const validates = {}
+
   for (const pointer of validatePointers) {
     const fullPointer = uriResolver.resolve(schema.$id, pointer)
     validates[pointer] = options.ajv.compile({ $ref: fullPointer })

package/src/compile/serialize.js

@@ -2,8 +2,7 @@
 import { ok } from 'assert/strict'
 import standaloneCode from 'ajv/dist/standalone/index.js'
 import { parseModule, generateCode, builders } from 'magicast'
-import clone from '../utils/clone.js'
-import { isSwitchStruct } from '@json-layout/vocabulary'
+import { clone, isSwitchStruct } from '@json-layout/vocabulary'
 
 /**
  * @generator

package/src/compile/skeleton-node.js

@@ -1,5 +1,5 @@
 // import Debug from 'debug'
-import { normalizeLayoutFragment, isSwitchStruct, isGetItemsExpression, isGetItemsFetch, isItemsLayout, getSchemaFragmentType, isCompositeLayout, childIsCompositeCompObject } from '@json-layout/vocabulary'
+import { normalizeLayoutFragment, mergeNullableSubSchema, isSwitchStruct, isGetItemsExpression, isGetItemsFetch, isItemsLayout, getSchemaFragmentType, isCompositeLayout, childIsCompositeCompObject } from '@json-layout/vocabulary'
 import { makeSkeletonTree } from './skeleton-tree.js'
 import { partialResolveRefs } from './utils/resolve-refs.js'
 
@@ -51,9 +51,16 @@ export function makeSkeletonNode (
     schema = { ...rawSchema, ...refFragment }
     delete schema.$ref
   }
+  const nullableType = mergeNullableSubSchema(schema)
+  if (nullableType) {
+    schema = nullableType
+    if (pointer === refPointer) pointer = schema.__pointer
+    refPointer = schema.__pointer
+  }
   const resolvedSchema = partialResolveRefs(schema, schemaId, getJSONRef)
   let { type, nullable } = getSchemaFragmentType(resolvedSchema)
   if (knownType) type = knownType
+  if (nullableType) nullable = true
 
   // improve on ajv error messages based on ajv-errors (https://ajv.js.org/packages/ajv-errors.html)
   rawSchema.errorMessage = rawSchema.errorMessage ?? {}

package/src/compile/utils/resolve-refs.js

@@ -1,4 +1,4 @@
-import clone from '../../utils/clone.js'
+import { clone } from '@json-layout/vocabulary'
 
 /**
  * @param {Record<string, import('ajv').SchemaObject>} schemas

package/src/index.js

@@ -1,4 +1,4 @@
 export * from './compile/index.js'
 export * from './state/index.js'
 export { default as i18n } from './i18n/index.js'
-export { default as clone } from './utils/clone.js'
+export { clone } from '@json-layout/vocabulary'

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/compile/index.js"],"names":[],"mappings":"AA4BA;;;;GAIG;AACH,iCAJW,MAAM,mBACN,qBAAqB,GACnB,cAAc,CAiG1B;;;;2BAjHY,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":"AA4BA;;;;GAIG;AACH,iCAJW,MAAM,mBACN,qBAAqB,GACnB,cAAc,CAkG1B;;;;2BAlHY,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"}

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

@@ -1 +1 @@
-{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../src/compile/serialize.js"],"names":[],"mappings":"AAoBA;;;GAGG;AACH,0CAHW,OAAO,YAAY,EAAE,cAAc,GACjC,MAAM,CAmFlB"}
+{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../src/compile/serialize.js"],"names":[],"mappings":"AAmBA;;;GAGG;AACH,0CAHW,OAAO,YAAY,EAAE,cAAc,GACjC,MAAM,CAmFlB"}

package/types/compile/skeleton-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skeleton-node.d.ts","sourceRoot":"","sources":["../../src/compile/skeleton-node.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;;GAkBG;AACH,4CAlBW,GAAG,kBACH,MAAM,WACN,OAAO,YAAY,EAAE,cAAc,cACnC,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,iBACxD,MAAM,CAAC,MAAM,EAAE,OAAO,YAAY,EAAE,YAAY,CAAC,iBACjD,MAAM,CAAC,MAAM,EAAE,OAAO,YAAY,EAAE,YAAY,CAAC,oBACjD,MAAM,EAAE,oBACR,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,qBACxB,MAAM,CAAC,MAAM,EAAE,OAAO,yBAAyB,EAAE,gBAAgB,CAAC,eAClE,OAAO,yBAAyB,EAAE,UAAU,EAAE,OAC9C,MAAM,GAAG,MAAM,WACf,MAAM,YACN,OAAO,cACP,MAAM,cACN,OAAO,cACP,MAAM,GACJ,OAAO,YAAY,EAAE,YAAY,CAuf7C"}
+{"version":3,"file":"skeleton-node.d.ts","sourceRoot":"","sources":["../../src/compile/skeleton-node.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;;GAkBG;AACH,4CAlBW,GAAG,kBACH,MAAM,WACN,OAAO,YAAY,EAAE,cAAc,cACnC,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,iBACxD,MAAM,CAAC,MAAM,EAAE,OAAO,YAAY,EAAE,YAAY,CAAC,iBACjD,MAAM,CAAC,MAAM,EAAE,OAAO,YAAY,EAAE,YAAY,CAAC,oBACjD,MAAM,EAAE,oBACR,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,qBACxB,MAAM,CAAC,MAAM,EAAE,OAAO,yBAAyB,EAAE,gBAAgB,CAAC,eAClE,OAAO,yBAAyB,EAAE,UAAU,EAAE,OAC9C,MAAM,GAAG,MAAM,WACf,MAAM,YACN,OAAO,cACP,MAAM,cACN,OAAO,cACP,MAAM,GACJ,OAAO,YAAY,EAAE,YAAY,CA8f7C"}

package/types/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./compile/index.js";
 export * from "./state/index.js";
 export { default as i18n } from "./i18n/index.js";
-export { default as clone } from "./utils/clone.js";
+export { clone } from "@json-layout/vocabulary";
 //# sourceMappingURL=index.d.ts.map

package/src/utils/clone.js

@@ -1,65 +0,0 @@
-/* eslint-disable jsdoc/require-jsdoc */
-// @ts-nocheck
-
-// a copy of https://github.com/davidmarkclements/rfdc/blob/master/index.js
-// but lighter and with ESM export
-
-function copyBuffer (cur) {
-  if (cur instanceof Buffer) {
-    return Buffer.from(cur)
-  }
-
-  return new cur.constructor(cur.buffer.slice(), cur.byteOffset, cur.length)
-}
-
-function rfdc () {
-  return clone
-
-  function cloneArray (a, fn) {
-    const keys = Object.keys(a)
-    const a2 = new Array(keys.length)
-    for (let i = 0; i < keys.length; i++) {
-      const k = keys[i]
-      const cur = a[k]
-      if (typeof cur !== 'object' || cur === null) {
-        a2[k] = cur
-      } else if (cur instanceof Date) {
-        a2[k] = new Date(cur)
-      } else if (ArrayBuffer.isView(cur)) {
-        a2[k] = copyBuffer(cur)
-      } else {
-        a2[k] = fn(cur)
-      }
-    }
-    return a2
-  }
-
-  function clone (o) {
-    if (typeof o !== 'object' || o === null) return o
-    if (o instanceof Date) return new Date(o)
-    if (Array.isArray(o)) return cloneArray(o, clone)
-    if (o instanceof Map) return new Map(cloneArray(Array.from(o), clone))
-    if (o instanceof Set) return new Set(cloneArray(Array.from(o), clone))
-    const o2 = {}
-    for (const k in o) {
-      if (Object.hasOwnProperty.call(o, k) === false) continue
-      const cur = o[k]
-      if (typeof cur !== 'object' || cur === null) {
-        o2[k] = cur
-      } else if (cur instanceof Date) {
-        o2[k] = new Date(cur)
-      } else if (cur instanceof Map) {
-        o2[k] = new Map(cloneArray(Array.from(cur), clone))
-      } else if (cur instanceof Set) {
-        o2[k] = new Set(cloneArray(Array.from(cur), clone))
-      } else if (ArrayBuffer.isView(cur)) {
-        o2[k] = copyBuffer(cur)
-      } else {
-        o2[k] = clone(cur)
-      }
-    }
-    return o2
-  }
-}
-
-export default rfdc()

package/types/utils/clone.d.ts

@@ -1,3 +0,0 @@
-declare function _default(o: any): any;
-export default _default;
-//# sourceMappingURL=clone.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"clone.d.ts","sourceRoot":"","sources":["../../src/utils/clone.js"],"names":[],"mappings":"AAoCE,uCAyBC"}