@entryscape/rdforms 10.6.0 → 10.6.1

package/package.json

@@ -8,7 +8,7 @@
     "application profile",
     "linked data"
   ],
-  "version": "10.6.0",
+  "version": "10.6.1",
   "main": "dist/rdforms.node.js",
   "browser": "dist/rdforms.react.js",
   "module": "main.js",
@@ -29,6 +29,7 @@
     "bootstrap-material-datetimepicker": "https://bitbucket.org/metasolutions/bootstrap-material-datetimepicker.git#webpack",
     "bootstrap-material-design": "^4.1.1",
     "core-js": "^3.1.4",
+    "circular-dependency-plugin": "^5.2.2",
     "ifdef-loader": "^2.1.1",
     "jquery": "^3.3.1",
     "jquery-mousewheel": "^3.1.13",

package/src/model/CODES.js

@@ -0,0 +1,17 @@
+export default {
+  UNKNOWN: 'unknown', // Used as a marker initially, to not mark everything red initially
+  OK: 'correct',
+  TOO_FEW_VALUES: 'few', // deprecated
+  TOO_FEW_VALUES_MIN: 'min',
+  TOO_FEW_VALUES_PREF: 'pref',
+  TOO_MANY_VALUES: 'many',
+  AT_MOST_ONE_CHILD: 'atmostonechild',
+  AT_LEAST_ONE_CHILD: 'atleastonechild',
+  EXACTLY_ONE_CHILD: 'exactlyonechild',
+  WRONG_VALUE: 'value',
+  WRONG_PATTERN: 'pattern',
+  WRONG_NODETYPE: 'nodetype',
+  WRONG_DATATYPE: 'datatype',
+  MISSING_LANGUAGE: 'language',
+  MISSING_CONSTRAINTS: 'constraints',
+};

package/src/model/CardinalityTracker.js

@@ -1,4 +1,5 @@
-import { CODES } from './engine';
+import CODES from './CODES';
+
 export default class CardinalityTracker {
   /**
    * A counter paired with a item with cardinality restrictions.

package/src/model/ChoiceBinding.js

@@ -1,5 +1,5 @@
 import ValueBinding from './ValueBinding';
-import {CODES} from './engine';
+import CODES from './CODES';
 
 const label = 'http://www.w3.org/2000/01/rdf-schema#label';
 const seeAlso = 'http://www.w3.org/2000/01/rdf-schema#seeAlso';

package/src/model/engine.js

@@ -11,6 +11,7 @@ import ValueBinding from './ValueBinding';
 import ChoiceBinding from './ChoiceBinding';
 import GroupURIBinding from './GroupURIBinding';
 import utils from '../utils';
+import CODES from './CODES';
 
 // See public API at the bottom of this file.
 
@@ -871,27 +872,8 @@ export { levelProfile };
  */
 export { detectLevel };
 
-const CODES = {
-  UNKNOWN: 'unknown', // Used as a marker initially, to not mark everything red initially
-  OK: 'correct',
-  TOO_FEW_VALUES: 'few', // deprecated
-  TOO_FEW_VALUES_MIN: 'min',
-  TOO_FEW_VALUES_PREF: 'pref',
-  TOO_MANY_VALUES: 'many',
-  AT_MOST_ONE_CHILD: 'atmostonechild',
-  AT_LEAST_ONE_CHILD: 'atleastonechild',
-  EXACTLY_ONE_CHILD: 'exactlyonechild',
-  WRONG_VALUE: 'value',
-  WRONG_PATTERN: 'pattern',
-  WRONG_NODETYPE: 'nodetype',
-  WRONG_DATATYPE: 'datatype',
-  MISSING_LANGUAGE: 'language',
-  MISSING_CONSTRAINTS: 'constraints',
-};
-
 export { CODES };
 
-
 export default { // TODO @valentino anti-pattern. This is done because engine is used in EntryScape. It shouldn't really...
   detectLevel,
   levelProfile,

package/src/model/validate.js

@@ -1,8 +1,9 @@
 import { namespaces as ns } from '@entryscape/rdfjson';
-import * as engine from './engine';
+import { fuzzyMatch, findBindingRelativeToParentBinding, matchPathBelowBinding } from './engine';
+import CODES from './CODES';
 
 const _clearMatchingCodes = (binding) => {
-  binding.setMatchingCode(engine.CODES.OK);
+  binding.setMatchingCode(CODES.OK);
   if (binding.getItem().getType() === 'group') {
     binding.getChildBindings().forEach(childBinding => _clearMatchingCodes(childBinding));
   }
@@ -66,8 +67,8 @@ const doNotProceedFurther = (groupBinding, childItem) => {
   // Don't check further if the binding is hidden due to missing dependencies
   const childPath = childItem.getDeps();
   if (childPath) {
-    const fromBinding = engine.findBindingRelativeToParentBinding(groupBinding, childPath);
-    if (!engine.matchPathBelowBinding(fromBinding, childPath)) {
+    const fromBinding = findBindingRelativeToParentBinding(groupBinding, childPath);
+    if (!matchPathBelowBinding(fromBinding, childPath)) {
       return true;
     }
   }
@@ -75,7 +76,7 @@ const doNotProceedFurther = (groupBinding, childItem) => {
 };
 
 const _createReport = (groupbinding, report, firstLevel) => {
-  if (groupbinding.getMatchingCode() !== engine.CODES.OK) {
+  if (groupbinding.getMatchingCode() !== CODES.OK) {
     return undefined;
   }
   const groupitem = groupbinding.getItem();
@@ -84,8 +85,8 @@ const _createReport = (groupbinding, report, firstLevel) => {
   // Check disabled since it is done for each child before recursive call
  /* const path = groupitem.getDeps();
   if (path && groupbinding.getParent() != null) {
-    const fromBinding = engine.findBindingRelativeToParentBinding(groupbinding.getParent(), path);
-    if (!engine.matchPathBelowBinding(fromBinding, path)) {
+    const fromBinding = findBindingRelativeToParentBinding(groupbinding.getParent(), path);
+    if (!matchPathBelowBinding(fromBinding, path)) {
       return undefined;
     }
   } */
@@ -101,11 +102,11 @@ const _createReport = (groupbinding, report, firstLevel) => {
       const nrOfValid = _countValidBindings(bindings);
       let code;
       if (nrOfValid > 1 && (groupitem.hasStyle('disjoint') || groupitem.hasStyle('atMostOneChild'))) {
-        code = engine.CODES.AT_MOST_ONE_CHILD;
+        code = CODES.AT_MOST_ONE_CHILD;
       } else if (nrOfValid !== 1 && groupitem.hasStyle('exactlyOneChild')) {
-        code = engine.CODES.EXACTLY_ONE_CHILD;
+        code = CODES.EXACTLY_ONE_CHILD;
       } else if (nrOfValid === 0 && groupitem.hasStyle('atLeastOneChild')) {
-        code = engine.CODES.AT_LEAST_ONE_CHILD;
+        code = CODES.AT_LEAST_ONE_CHILD;
       }
       if (code) {
         updateViaCardinalityTracker([groupbinding], code);
@@ -129,15 +130,15 @@ const _createReport = (groupbinding, report, firstLevel) => {
             report.errors.push({
               parentBinding: groupbinding,
               item: childItem,
-              code: engine.CODES.TOO_FEW_VALUES_MIN,
+              code: CODES.TOO_FEW_VALUES_MIN,
             });
-            updateViaCardinalityTracker(bindings, engine.CODES.TOO_FEW_VALUES_MIN);
+            updateViaCardinalityTracker(bindings, CODES.TOO_FEW_VALUES_MIN);
 /*            let counter = 0;
             bindings.forEach((binding) => {
               if (!binding.isValid()) {
                 if (counter < card.min) {
                   counter += 1;
-                  binding.setMatchingCode(engine.CODES.TOO_FEW_VALUES_MIN);
+                  binding.setMatchingCode(CODES.TOO_FEW_VALUES_MIN);
                 }
               }
             }); */
@@ -145,23 +146,23 @@ const _createReport = (groupbinding, report, firstLevel) => {
             report.warnings.push({
               parentBinding: groupbinding,
               item: childItem,
-              code: engine.CODES.TOO_FEW_VALUES_PREF,
+              code: CODES.TOO_FEW_VALUES_PREF,
             });
-//            updateViaCardinalityTracker(bindings, engine.CODES.TOO_FEW_VALUES_PREF);
+//            updateViaCardinalityTracker(bindings, CODES.TOO_FEW_VALUES_PREF);
           }
           if (card.max != null && card.max < nrOfValid) {
             report.errors.push({
               parentBinding: groupbinding,
               item: childItem,
-              code: engine.CODES.TOO_MANY_VALUES,
+              code: CODES.TOO_MANY_VALUES,
             });
-            updateViaCardinalityTracker(bindings, engine.CODES.TOO_MANY_VALUES);
+            updateViaCardinalityTracker(bindings, CODES.TOO_MANY_VALUES);
 /*            let counter = 0;
             bindings.forEach((binding) => {
               if (binding.isValid()) {
                 counter += 1;
                 if (counter > card.max) {
-                  binding.setMatchingCode(engine.CODES.TOO_MANY_VALUES);
+                  binding.setMatchingCode(CODES.TOO_MANY_VALUES);
                 }
               }
             }); */
@@ -172,7 +173,7 @@ const _createReport = (groupbinding, report, firstLevel) => {
 
     groupbinding.getChildBindings().forEach((binding) => {
       const item = binding.getItem();
-      if (binding.getMatchingCode() !== engine.CODES.OK) {
+      if (binding.getMatchingCode() !== CODES.OK) {
         report.errors.push({
           parentBinding: binding,
           item,
@@ -330,7 +331,7 @@ const _simplifyReport = (report) => {
 };
 
 const _resourceReport = (resource, graph, template, ignoreResources) => {
-  const binding = engine.fuzzyMatch(graph, resource, template);
+  const binding = fuzzyMatch(graph, resource, template);
   const report = bindingReport(binding);
   _filterReport(report, resource, ignoreResources || {});
   _simplifyReport(report);

package/src/view/Editor.js

@@ -1,5 +1,6 @@
 import renderingContext from './renderingContext';
 import Presenter from './Presenter';
+import CODES from '../model/CODES';
 import * as engine from '../model/engine';
 import { bindingReport } from '../model/validate';
 
@@ -74,7 +75,7 @@ export default class Editor extends Presenter {
     for (let j = 0; j < _report.errors.length; j++) {
       const err = _report.errors[j];
       if (err.parentBinding === this.binding) {
-        if (err.code === engine.CODES.TOO_FEW_VALUES_MIN) {
+        if (err.code === CODES.TOO_FEW_VALUES_MIN) {
           const item = err.item;
           let counter = item.getCardinality().min;
 
@@ -86,9 +87,9 @@ export default class Editor extends Presenter {
             }
             return counter === 0;
           });
-        } else if (err.code === engine.CODES.AT_MOST_ONE_CHILD) {
+        } else if (err.code === CODES.AT_MOST_ONE_CHILD) {
           this.binding.getChildBindings().forEach((binding) => {
-            if (binding.getMatchingCode() !== engine.CODES.OK) {
+            if (binding.getMatchingCode() !== CODES.OK) {
               renderingContext.domClassToggle(this._binding2node[binding.getHash()],
                 'errorReport', true);
             }

package/src/view/ValidationPresenter.js

@@ -1,6 +1,7 @@
 import renderingContext from './renderingContext';
 import Presenter from './Presenter';
-import engine, { CODES } from '../model/engine';
+import CODES from '../model/CODES';
+import engine from '../model/engine';
 import { bindingReport } from '../model/validate';
 
 const localize = (bundle, key, val) => {

package/src/view/react/labels.js

@@ -5,7 +5,7 @@ import { styled } from '@mui/material/styles';
 import ClickAwayListener from '@mui/material/ClickAwayListener';
 import renderingContext from '../renderingContext';
 import { Editor } from './Wrappers';
-import { CODES } from '../../model/engine';
+import CODES from '../../model/CODES';
 
 const StyledTooltip = styled(
   forwardRef(({ className, ...props }, ref) => (