schyma 1.0.2 → 1.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -37,7 +37,7 @@ Then use it in your app:
37
37
  ```js
38
38
  import React from 'react';
39
39
  import Schyma from 'schyma';
40
- import 'schyma/esm/style.css'
40
+ import 'schyma/dist/esm/style.css'
41
41
  import schema from '../config/2.6.0.json';
42
42
 
43
43
  export default function App() {
@@ -56,8 +56,18 @@ const Nodes = ({ setCurrentNode, setnNodes, initialNode, nNodes, schema }) => {
56
56
  const onConnect = (0, react_1.useCallback)((connection) => setEdges((eds) => (0, reactflow_1.addEdge)(Object.assign(Object.assign({}, connection), { type: reactflow_1.ConnectionLineType.SmoothStep, animated: true }), eds)),
57
57
  // eslint-disable-next-line react-hooks/exhaustive-deps
58
58
  []);
59
- const focusNode = (x, y, zoom) => {
60
- setCenter(x, y, { zoom, duration: 1000 });
59
+ const focusNode = (children, zoom) => {
60
+ const length = children.length;
61
+ let middleChild;
62
+ if (length % 2 === 0) {
63
+ const middleIndex = length / 2;
64
+ middleChild = children[middleIndex];
65
+ }
66
+ else {
67
+ const middleIndex = Math.floor(length / 2);
68
+ middleChild = children[middleIndex];
69
+ }
70
+ setCenter(middleChild.position.x, middleChild.position.y, { zoom, duration: 1000 });
61
71
  };
62
72
  let initialNodes = [initialNode];
63
73
  const extractChildren = (props, parent) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
@@ -119,8 +129,8 @@ const Nodes = ({ setCurrentNode, setnNodes, initialNode, nNodes, schema }) => {
119
129
  const { nodes: layoutedNodes, edges: layoutedEdges } = getLayoutedElements(newNodes, newEdges, "LR");
120
130
  setNodes([...layoutedNodes]);
121
131
  setEdges([...layoutedEdges]);
122
- if (itemChildren.length) {
123
- focusNode(itemChildren[0].position.x, itemChildren[0].position.y, 0.9);
132
+ if (itemChildren.length > 0) {
133
+ focusNode(itemChildren, 0.9);
124
134
  }
125
135
  }
126
136
  else {
@@ -134,7 +144,7 @@ const Nodes = ({ setCurrentNode, setnNodes, initialNode, nNodes, schema }) => {
134
144
  const itemChildren = [];
135
145
  yield Promise.all(node.data.children.map((item) => tslib_1.__awaiter(this, void 0, void 0, function* () {
136
146
  let children = [];
137
- const extractProps = (0, reusables_1.propMerge)(item);
147
+ const extractProps = (0, reusables_1.propMerge)(item, item.label);
138
148
  if (Object.keys(extractProps).length > 0) {
139
149
  const res = yield extractChildren(extractProps, item);
140
150
  children = res;
@@ -1 +1 @@
1
- {"version":3,"file":"Nodes.js","sourceRoot":"","sources":["../../../src/components/Nodes.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Nodes.js","sourceRoot":"","sources":["../../../src/components/Nodes.tsx"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  export declare function resolveRef(ref: string, schema: any): Promise<JSONSchema>;
2
2
  export declare function nameFromRef(string: string): string;
3
- export declare function propMerge(schema: any): {};
4
- export declare function arrayToProps(props: any): any;
3
+ export declare function propMerge(schema: any, label: string): {};
4
+ export declare function arrayToProps(props: any, label: string): any;
5
5
  export declare function removeElementsByParent(nodes: any, id: any): any;
6
6
  export declare function retrieveObj(theObject: any, key: string | undefined): any;
@@ -15,12 +15,12 @@ function nameFromRef(string) {
15
15
  return newRef.split('.')[0];
16
16
  }
17
17
  exports.nameFromRef = nameFromRef;
18
- function propMerge(schema) {
18
+ function propMerge(schema, label) {
19
19
  let mergedProps = {};
20
- const { properties, patternProperties, additionalProperties, items, oneOf } = schema;
20
+ const { properties, patternProperties, additionalProperties, items, oneOf, allOf, anyOf, not } = schema;
21
21
  const arrWithObject = additionalProperties || items;
22
22
  const arrExtractor = (items) => {
23
- const props = arrayToProps(items);
23
+ const props = arrayToProps(items, label);
24
24
  mergedProps = Object.assign(Object.assign({}, mergedProps), props);
25
25
  };
26
26
  if (schema.patternProperties) {
@@ -30,23 +30,61 @@ function propMerge(schema) {
30
30
  mergedProps = Object.assign(Object.assign({}, mergedProps), properties);
31
31
  }
32
32
  if (arrWithObject) {
33
- if (arrWithObject.oneOf) {
34
- arrExtractor(arrWithObject.oneOf);
33
+ const { oneOf, allOf, anyOf } = arrWithObject;
34
+ if (oneOf || allOf || anyOf) {
35
+ const items = oneOf || anyOf || not;
36
+ arrExtractor(items);
37
+ }
38
+ if (arrWithObject.$ref) {
39
+ const name = nameFromRef(arrWithObject.$ref);
40
+ mergedProps = Object.assign(Object.assign({}, mergedProps), { [name]: arrWithObject });
35
41
  }
36
42
  }
37
- if (oneOf) {
38
- arrExtractor(oneOf);
43
+ // handling allOf case seperatly
44
+ if (allOf) {
45
+ let propObj = {};
46
+ for (let i = 0; i < allOf.length; i++) {
47
+ if (allOf[i].type === 'object') {
48
+ if (allOf[i].properties) {
49
+ propObj = allOf[i].properties;
50
+ }
51
+ else {
52
+ propObj[allOf[i].type] = allOf[i];
53
+ }
54
+ }
55
+ else if (allOf[i].$ref) {
56
+ const name = nameFromRef(allOf[i].$ref);
57
+ propObj[name] = allOf[i];
58
+ }
59
+ else {
60
+ propObj[allOf[i].type] = allOf[i];
61
+ }
62
+ }
63
+ mergedProps = Object.assign(Object.assign({}, mergedProps), propObj);
64
+ }
65
+ if (oneOf || anyOf || not) {
66
+ const items = oneOf || anyOf || not;
67
+ arrExtractor(items);
39
68
  }
40
69
  return mergedProps;
41
70
  }
42
71
  exports.propMerge = propMerge;
43
- function arrayToProps(props) {
72
+ function arrayToProps(props, label) {
44
73
  const propObj = {};
45
74
  for (let i = 0; i < props.length; i++) {
46
75
  if (props[i].$ref) {
47
76
  const name = nameFromRef(props[i].$ref);
48
77
  propObj[name] = props[i];
49
78
  }
79
+ else {
80
+ if (props[i].type === 'object') {
81
+ const objectName = props[i].title || `${label}Object`;
82
+ propObj[objectName] = props[i];
83
+ }
84
+ else {
85
+ propObj[props[i].type] = props[i];
86
+ }
87
+ }
50
88
  }
51
89
  return propObj;
52
90
  }
@@ -1 +1 @@
1
- {"version":3,"file":"reusables.js","sourceRoot":"","sources":["../../../src/utils/reusables.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"reusables.js","sourceRoot":"","sources":["../../../src/utils/reusables.ts"],"names":[],"mappings":"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"}
@@ -54,8 +54,18 @@ const Nodes = ({ setCurrentNode, setnNodes, initialNode, nNodes, schema }) => {
54
54
  const onConnect = useCallback((connection) => setEdges((eds) => addEdge(Object.assign(Object.assign({}, connection), { type: ConnectionLineType.SmoothStep, animated: true }), eds)),
55
55
  // eslint-disable-next-line react-hooks/exhaustive-deps
56
56
  []);
57
- const focusNode = (x, y, zoom) => {
58
- setCenter(x, y, { zoom, duration: 1000 });
57
+ const focusNode = (children, zoom) => {
58
+ const length = children.length;
59
+ let middleChild;
60
+ if (length % 2 === 0) {
61
+ const middleIndex = length / 2;
62
+ middleChild = children[middleIndex];
63
+ }
64
+ else {
65
+ const middleIndex = Math.floor(length / 2);
66
+ middleChild = children[middleIndex];
67
+ }
68
+ setCenter(middleChild.position.x, middleChild.position.y, { zoom, duration: 1000 });
59
69
  };
60
70
  let initialNodes = [initialNode];
61
71
  const extractChildren = (props, parent) => __awaiter(void 0, void 0, void 0, function* () {
@@ -117,8 +127,8 @@ const Nodes = ({ setCurrentNode, setnNodes, initialNode, nNodes, schema }) => {
117
127
  const { nodes: layoutedNodes, edges: layoutedEdges } = getLayoutedElements(newNodes, newEdges, "LR");
118
128
  setNodes([...layoutedNodes]);
119
129
  setEdges([...layoutedEdges]);
120
- if (itemChildren.length) {
121
- focusNode(itemChildren[0].position.x, itemChildren[0].position.y, 0.9);
130
+ if (itemChildren.length > 0) {
131
+ focusNode(itemChildren, 0.9);
122
132
  }
123
133
  }
124
134
  else {
@@ -132,7 +142,7 @@ const Nodes = ({ setCurrentNode, setnNodes, initialNode, nNodes, schema }) => {
132
142
  const itemChildren = [];
133
143
  yield Promise.all(node.data.children.map((item) => __awaiter(this, void 0, void 0, function* () {
134
144
  let children = [];
135
- const extractProps = propMerge(item);
145
+ const extractProps = propMerge(item, item.label);
136
146
  if (Object.keys(extractProps).length > 0) {
137
147
  const res = yield extractChildren(extractProps, item);
138
148
  children = res;
@@ -1 +1 @@
1
- {"version":3,"file":"Nodes.js","sourceRoot":"","sources":["../../../src/components/Nodes.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Nodes.js","sourceRoot":"","sources":["../../../src/components/Nodes.tsx"],"names":[],"mappings":";AAAA,uDAAuD;AACvD,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,SAAS,EAAE,EAChB,aAAa,EACb,aAAa,EACb,OAAO,EACP,iBAAiB,EACjB,UAAU,EACV,YAAY,EACZ,kBAAkB,EAIlB,QAAQ,GACT,MAAM,WAAW,CAAA;AAClB,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,SAAS,EAAE,sBAAsB,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAGjF,MAAM,QAAQ,GAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;AAClC,MAAM,YAAY,GAAW;IAC3B;QACE,EAAE,EAAE,YAAY;QAChB,MAAM,EAAE,GAAG;QACX,MAAM,EAAE,GAAG;QACX,KAAK,EAAE,GAAG;QACV,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACtB,mBAAmB,EAAE,CAAC;QACtB,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE;YACT,IAAI,EAAE,UAAU,CAAC,WAAW;SAC7B;KACF;CACF,CAAC;AAGF,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAA;AAE7C,UAAU,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;AAE1C,MAAM,SAAS,GAAG,GAAG,CAAA;AACrB,MAAM,UAAU,GAAG,EAAE,CAAA;AAErB,MAAM,mBAAmB,GAAG,CAAC,KAAsC,EAAE,KAAkB,EAAE,SAAS,GAAG,IAAI,EAAE,EAAE;IAC3G,UAAU,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;IAE3C,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAGH,KAAK,CAAC,OAAO,CAAC,CAAC,IAAU,EAAE,EAAE;QAC3B,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IAC9C,CAAC,CAAC,CAAA;IAEF,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAExB,KAAK,CAAC,OAAO,CAAC,CAAC,IAAU,EAAE,EAAE;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;QACvB,MAAM,gBAAgB,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC;QACrC,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG;YACd,CAAC,EAAE,gBAAgB,CAAC,CAAC,GAAG,SAAS,GAAG,CAAC;YACrC,CAAC,EAAE,gBAAgB,CAAC,CAAC,GAAG,UAAU,GAAG,CAAC;SACvC,CAAA;QACD,OAAO,IAAI,CAAA;IACb,CAAC,CAAC,CAAA;IAEF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;AACzB,CAAC,CAAA;AAYD,MAAM,KAAK,GAAG,CAAC,EAAE,cAAc,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAa,EAAE,EAAE;IACtF,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,mBAAmB,CAAC,CAAC,WAAW,CAAC,EAAE,YAAY,CAAC,CAAA;IACvG,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,CAAA;IACpC,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,GAAG,aAAa,CAAC,aAAa,CAAC,CAAA;IACrE,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;IAEtE,MAAM,SAAS,GAAG,WAAW,CAC3B,CAAC,UAAsB,EAAE,EAAE,CACzB,QAAQ,CAAC,CAAC,GAAG,EAAE,EAAE,CACf,OAAO,iCAEA,UAAU,KACb,IAAI,EAAE,kBAAkB,CAAC,UAAU,EACnC,QAAQ,EAAE,IAAI,KAEhB,GAAG,CACJ,CACF;IACH,uDAAuD;IACvD,EAAE,CACH,CAAA;IAED,MAAM,SAAS,GAAG,CAAC,QAAc,EAAE,IAAY,EAAE,EAAE;QACjD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAA;QAC9B,IAAI,WAAW,CAAA;QACf,IAAI,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;YACpB,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,CAAC;YAC/B,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAA;SACpC;aAAM;YACL,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC3C,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAA;SACpC;QACD,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IACrF,CAAC,CAAA;IAGD,IAAI,YAAY,GAAa,CAAC,WAAW,CAAC,CAAC;IAE3C,MAAM,eAAe,GAAG,CAAO,KAAc,EAAE,MAAe,EAAE,EAAE;QAChE,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,KAAI,MAAM,IAAI,IAAI,KAAK,EAAC;YACtB,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;YACvD,IAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAC;gBAClB,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBACvD,QAAQ,CAAC,IAAI,6DAAK,KAAK,CAAC,IAAI,CAAC,KAAE,KAAK,EAAC,IAAI,EAAE,EAAE,EAAE,MAAM,EAAC,MAAM,CAAC,EAAE,EAAE,SAAS,kCAAK,MAAM,CAAC,SAAS,KAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,QAAM,GAAG,KAAE,QAAQ,EAAC,EAAE,IAAE,CAAA;aAC7I;iBAAI;gBACH,QAAQ,CAAC,IAAI,iCAAK,KAAK,CAAC,IAAI,CAAC,KAAE,KAAK,EAAC,IAAI,EAAE,EAAE,EAAE,MAAM,EAAC,MAAM,CAAC,EAAE,EAAE,SAAS,kCAAK,MAAM,CAAC,SAAS,KAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,KAAG,QAAQ,EAAC,EAAE,IAAE,CAAA;aACrI;SACF;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAA,CAAA;IAED,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,QAAQ,GAAU,EAAE,CAAC;QAC3B,YAAY,CAAC,GAAG,CAAC,CAAO,IAAS,EAAE,EAAE;YACnC,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YACnE,QAAQ,CAAC,IAAI,CAAC;gBACZ,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE;oBACJ,QAAQ;oBACR,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;oBACtB,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;oBAClC,UAAU,oBAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;oBACrC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;iBAC/B;gBACD,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;gBACxB,cAAc,EAAE,QAAQ,CAAC,KAAK;gBAC9B,cAAc,EAAE,QAAQ,CAAC,IAAI;aAC9B,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QACF,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACnB,uDAAuD;IACzD,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,SAAS,GAAG,CAAO,MAAwB,EAAE,IAAU,EAAE,EAAE;QAC/D,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,0CAAE,MAAM,MAAK,IAAI,CAAC,EAAE,CAAA,EAAA,CAAC,CAAC;QAC5E,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;YACxB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;YACxC,MAAM,QAAQ,GAAG;gBACf,GAAG,KAAK;gBACR,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;;oBACtC,OAAO;wBACL,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC;wBAC/C,MAAM,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,0CAAE,MAAM;wBAC1B,MAAM,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,EAAE;wBAChB,SAAS,EAAE;4BACT,IAAI,EAAE,UAAU,CAAC,WAAW;yBAC7B;qBACF,CAAC;gBACJ,CAAC,CAAC;aACH,CAAC;YACF,4BAA4B;YAC5B,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAClD,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,EAAE,GAClD,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;YAChD,QAAQ,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;YAC7B,QAAQ,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;YAC7B,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC3B,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;aAC9B;SACF;aAAM;YACL,MAAM,QAAQ,GAAG,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YACxD,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;SACzB;IACD,CAAC,CAAA,CAAA;IAGH,SAAe,gBAAgB,CAAC,EAAO,EAAE,IAAU;;YACjD,IAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAC;gBAClB,MAAM,YAAY,GAAW,EAAE,CAAC;gBAChC,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,IAAQ,EAAE,EAAE;oBACxC,IAAI,QAAQ,GAAG,EAAE,CAAC;oBAClB,MAAM,YAAY,GAAG,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;oBACjD,IAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,GAAG,CAAC,EAAC;wBACtC,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;wBACtD,QAAQ,GAAG,GAAG,CAAC;qBAChB;oBACD,YAAY,CAAC,IAAI,CAAC;wBAChB,EAAE,EAAE,IAAI,CAAC,EAAE;wBACX,IAAI,EAAE,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,IAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;wBACjD,IAAI,EAAE;4BACJ,KAAK,EAAE,IAAI,CAAC,KAAK;4BACjB,QAAQ,EAAE,QAAQ;4BAClB,MAAM,EAAE,IAAI,CAAC,MAAM;4BACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;4BACvB,WAAW,EAAE,IAAI,CAAC,WAAW;4BAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;yBAC1B;wBACD,QAAQ,EAAE,QAAQ;wBAClB,cAAc,EAAE,QAAQ,CAAC,KAAK;wBAC9B,cAAc,EAAE,QAAQ,CAAC,IAAI;wBAC7B,SAAS,EAAE,KAAK;qBACjB,CAAC,CAAA;gBACJ,CAAC,CAAA,CAAC,CACH,CAAA;gBACD,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,YAAY,CAAC;gBAClC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;gBACvB,SAAS,CAAC,MAAM,CAAC,CAAA;aAClB;YACD,cAAc,CAAC,IAAI,CAAC,CAAA;QACtB,CAAC;KAAA;IACD,MAAM,SAAS,GAAG;QAChB,KAAK,EAAE,eAAe;KACvB,CAAA;IACD,OAAO,CACL,6BACE,SAAS,EAAC,SAAS,EACnB,KAAK,EAAE;YACL,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,MAAM;SACf;QAED,oBAAC,SAAS,IACR,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa,EAC5B,kBAAkB,EAAE,kBAAkB,CAAC,UAAU,EACjD,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,SAAS,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,QACP,eAAe,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,GAC1C,CACE,CACP,CAAA;AACH,CAAC,CAAA;AAED,8CAA8C;AAC9C,eAAe,CAAC,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAa,EAAE,EAAE,CAAC,CACxF,oBAAC,iBAAiB;IAChB,oBAAC,KAAK,IAAC,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,EAAG,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAI,CACxG,CACrB,CAAA"}
@@ -1,6 +1,6 @@
1
1
  export declare function resolveRef(ref: string, schema: any): Promise<JSONSchema>;
2
2
  export declare function nameFromRef(string: string): string;
3
- export declare function propMerge(schema: any): {};
4
- export declare function arrayToProps(props: any): any;
3
+ export declare function propMerge(schema: any, label: string): {};
4
+ export declare function arrayToProps(props: any, label: string): any;
5
5
  export declare function removeElementsByParent(nodes: any, id: any): any;
6
6
  export declare function retrieveObj(theObject: any, key: string | undefined): any;
@@ -10,12 +10,12 @@ export function nameFromRef(string) {
10
10
  const newRef = string.split('/').slice(-1)[0];
11
11
  return newRef.split('.')[0];
12
12
  }
13
- export function propMerge(schema) {
13
+ export function propMerge(schema, label) {
14
14
  let mergedProps = {};
15
- const { properties, patternProperties, additionalProperties, items, oneOf } = schema;
15
+ const { properties, patternProperties, additionalProperties, items, oneOf, allOf, anyOf, not } = schema;
16
16
  const arrWithObject = additionalProperties || items;
17
17
  const arrExtractor = (items) => {
18
- const props = arrayToProps(items);
18
+ const props = arrayToProps(items, label);
19
19
  mergedProps = Object.assign(Object.assign({}, mergedProps), props);
20
20
  };
21
21
  if (schema.patternProperties) {
@@ -25,22 +25,60 @@ export function propMerge(schema) {
25
25
  mergedProps = Object.assign(Object.assign({}, mergedProps), properties);
26
26
  }
27
27
  if (arrWithObject) {
28
- if (arrWithObject.oneOf) {
29
- arrExtractor(arrWithObject.oneOf);
28
+ const { oneOf, allOf, anyOf } = arrWithObject;
29
+ if (oneOf || allOf || anyOf) {
30
+ const items = oneOf || anyOf || not;
31
+ arrExtractor(items);
32
+ }
33
+ if (arrWithObject.$ref) {
34
+ const name = nameFromRef(arrWithObject.$ref);
35
+ mergedProps = Object.assign(Object.assign({}, mergedProps), { [name]: arrWithObject });
30
36
  }
31
37
  }
32
- if (oneOf) {
33
- arrExtractor(oneOf);
38
+ // handling allOf case seperatly
39
+ if (allOf) {
40
+ let propObj = {};
41
+ for (let i = 0; i < allOf.length; i++) {
42
+ if (allOf[i].type === 'object') {
43
+ if (allOf[i].properties) {
44
+ propObj = allOf[i].properties;
45
+ }
46
+ else {
47
+ propObj[allOf[i].type] = allOf[i];
48
+ }
49
+ }
50
+ else if (allOf[i].$ref) {
51
+ const name = nameFromRef(allOf[i].$ref);
52
+ propObj[name] = allOf[i];
53
+ }
54
+ else {
55
+ propObj[allOf[i].type] = allOf[i];
56
+ }
57
+ }
58
+ mergedProps = Object.assign(Object.assign({}, mergedProps), propObj);
59
+ }
60
+ if (oneOf || anyOf || not) {
61
+ const items = oneOf || anyOf || not;
62
+ arrExtractor(items);
34
63
  }
35
64
  return mergedProps;
36
65
  }
37
- export function arrayToProps(props) {
66
+ export function arrayToProps(props, label) {
38
67
  const propObj = {};
39
68
  for (let i = 0; i < props.length; i++) {
40
69
  if (props[i].$ref) {
41
70
  const name = nameFromRef(props[i].$ref);
42
71
  propObj[name] = props[i];
43
72
  }
73
+ else {
74
+ if (props[i].type === 'object') {
75
+ const objectName = props[i].title || `${label}Object`;
76
+ propObj[objectName] = props[i];
77
+ }
78
+ else {
79
+ propObj[props[i].type] = props[i];
80
+ }
81
+ }
44
82
  }
45
83
  return propObj;
46
84
  }
@@ -1 +1 @@
1
- {"version":3,"file":"reusables.js","sourceRoot":"","sources":["../../../src/utils/reusables.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"reusables.js","sourceRoot":"","sources":["../../../src/utils/reusables.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "schyma",
3
- "version": "1.0.2",
3
+ "version": "1.0.3",
4
4
  "description": "JSON Schemas Visualizer React component",
5
5
  "main": "./dist/cjs/index.js",
6
6
  "module": "./dist/esm/index.js",