@json-layout/vocabulary 0.10.0 → 0.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-layout/vocabulary",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "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/index.js

@@ -1,4 +1,4 @@
 /** @typedef {import("./types.js").SchemaFragment} SchemaFragment */
 export * from './layout-keyword/index.js'
 export * from './normalized-layout/index.js'
-export { normalizeLayoutFragment } from './normalize.js'
+export { normalizeLayoutFragment, getSchemaFragmentType } from './normalize.js'

package/src/normalize.js

@@ -18,7 +18,7 @@ import { validateNormalizedLayout, compositeCompNames } from './normalized-layou
  * @returns {Children}
  */
 function getDefaultChildren (schemaFragment) {
-  const { type } = getType(schemaFragment)
+  const { type } = getSchemaFragmentType(schemaFragment)
   /** @type {Children} */
   const children = []
   if (type === 'object') {
@@ -87,8 +87,8 @@ function getChildren (defaultChildren, partialChildren) {
  * @returns {import('./index.js').ComponentName}
  */
 function getDefaultComp (partial, schemaFragment, arrayChild) {
-  const { type } = getType(schemaFragment)
-  const hasSimpleType = ['string', 'integer', 'number'].includes(type)
+  const { type } = getSchemaFragmentType(schemaFragment)
+  const hasSimpleType = type && ['string', 'integer', 'number'].includes(type)
   if (arrayChild === 'oneOf') return 'one-of-select'
   if (hasSimpleType && schemaFragment.enum) return schemaFragment.enum.length > 20 ? 'autocomplete' : 'select'
   if (hasSimpleType && schemaFragment.oneOf) return schemaFragment.oneOf.length > 20 ? 'autocomplete' : 'select'
@@ -162,8 +162,8 @@ function normalizeExpression (expression, defaultType = 'js-eval') {
  */
 function getItemsFromSchema (schemaFragment) {
   if (!schemaFragment) return null
-  const { type } = getType(schemaFragment)
-  const hasSimpleType = ['string', 'integer', 'number'].includes(type)
+  const { type } = getSchemaFragmentType(schemaFragment)
+  const hasSimpleType = type && ['string', 'integer', 'number'].includes(type)
   if (schemaFragment.enum && hasSimpleType) {
     return schemaFragment.enum.map((/** @type {string} */ value) => ({ key: value + '', title: value + '', value }))
   }
@@ -194,13 +194,36 @@ function getItemsFromSchema (schemaFragment) {
 
 /**
  * @param {SchemaFragment} schemaFragment
- * @returns {{type: string, nullable: boolean}}
+ * @returns {{type: string | undefined, nullable: boolean}}
  */
-const getType = (schemaFragment) => {
+export const getSchemaFragmentType = (schemaFragment) => {
   if (Array.isArray(schemaFragment.type) && schemaFragment.type.length === 2 && schemaFragment.type.includes('null')) {
     const type = schemaFragment.type.find(t => t !== 'null')
     return { type, nullable: true }
   }
+
+  if (!schemaFragment.type && schemaFragment.properties) {
+    return { type: 'object', nullable: false }
+  }
+
+  // case where type is not defined but can be deduced from children oneOf/allOf/anyOf
+  /** @type {any[]} */
+  if (!schemaFragment.type) {
+    /** @type {string[]} */
+    const combinationTypes = []
+    for (const combinationKey of ['allOf', 'anyOf', 'oneOf']) {
+      // @ts-ignore
+      if (schemaFragment[combinationKey]) {
+        // @ts-ignore
+        for (const subSchema of schemaFragment[combinationKey]) {
+          const { type: subType } = getSchemaFragmentType(subSchema)
+          if (subType && !combinationTypes.includes(subType)) combinationTypes.push(subType)
+        }
+      }
+    }
+    if (combinationTypes.length === 1) return { type: combinationTypes[0], nullable: false }
+  }
+
   return { type: schemaFragment.type, nullable: false }
 }
 
@@ -218,7 +241,7 @@ function getCompObject (layoutKeyword, schemaFragment, schemaPath, markdown, opt
   const errors = []
   const key = schemaPath.slice(schemaPath.lastIndexOf('/') + 1)
 
-  const { type, nullable } = getType(schemaFragment)
+  const { type, nullable } = getSchemaFragmentType(schemaFragment)
 
   if ('const' in schemaFragment) return { normalized: { comp: 'none' }, errors }
   if (!type) return { normalized: { comp: 'none' }, errors }

package/types/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./layout-keyword/index.js";
 export * from "./normalized-layout/index.js";
-export { normalizeLayoutFragment } from "./normalize.js";
 export type SchemaFragment = import("./types.js").SchemaFragment;
+export { normalizeLayoutFragment, getSchemaFragmentType } from "./normalize.js";
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":";;;6BAAc,OAAO,YAAY,EAAE,cAAc"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":";;6BAAc,OAAO,YAAY,EAAE,cAAc"}

package/types/normalize.d.ts

@@ -10,6 +10,10 @@ export function normalizeLayoutFragment(schemaFragment: SchemaFragment, schemaPa
     layout: NormalizedLayout;
     errors: string[];
 };
+export function getSchemaFragmentType(schemaFragment: SchemaFragment): {
+    type: string | undefined;
+    nullable: boolean;
+};
 export type Child = import('./index.js').Child;
 export type Children = import('./index.js').Children;
 export type CompObject = import('./index.js').CompObject;

package/types/normalize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../src/normalize.js"],"names":[],"mappings":"AA2bA;;;;;;;GAOG;AACH,wDAPW,cAAc,cACd,MAAM,oBACC,MAAM,KAAK,MAAM,yEAGtB;IAAC,MAAM,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAC,CA2BxD;oBAxdY,OAAO,YAAY,EAAE,KAAK;uBAC1B,OAAO,YAAY,EAAE,QAAQ;yBAC7B,OAAO,YAAY,EAAE,UAAU;yBAC/B,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":"AAkdA;;;;;;;GAOG;AACH,wDAPW,cAAc,cACd,MAAM,oBACC,MAAM,KAAK,MAAM,yEAGtB;IAAC,MAAM,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAC,CA2BxD;AA7SM,sDAHI,cAAc,GACZ;IAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAC,CA+BzD;oBA/NY,OAAO,YAAY,EAAE,KAAK;uBAC1B,OAAO,YAAY,EAAE,QAAQ;yBAC7B,OAAO,YAAY,EAAE,UAAU;yBAC/B,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"}