@remoteoss/json-schema-form 0.6.6-beta.0 → 0.7.0-beta.0

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+#### 0.7.0-beta.0 (2023-10-23)
+
+##### Chores
+
+BREAKING CHANGES:
+
+- **Description/Extra/Statement fields:** We have removed the sorrounding spans that we output in these fields ([#17](https://github.com/remoteoss/json-schema-form/pull/27)) ([6257533](https://github.com/remoteoss/json-schema-form/commit/6257533bead9c0f7391f240c2e5bacc801a90af7))
+
+```diff
+-description: '<span class="jsf-description">Write in <b>hh:ss</b> format</span>',
++description: 'Write in <b>hh:ss</b> format',
+```
+
 #### 0.6.6-beta.0 (2023-10-17)
 
 ##### Chores

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.6.6-beta.0
- Generated: Tue, 17 Oct 2023 13:38:25 GMT
+ NPM Package: @remoteoss/json-schema-form@0.7.0-beta.0
+ Generated: Mon, 23 Oct 2023 10:15:24 GMT
 
  MIT License
 
@@ -91,13 +91,6 @@ function convertDiskSizeFromTo(from, to) {
     return value * Math.pow(1024, units.indexOf(from.toLowerCase())) / Math.pow(1024, units.indexOf(to.toLowerCase()));
   };
 }
-function containsHTML(str = "") {
-  return /<[a-z][\s\S]*>/i.test(str);
-}
-function wrapWithSpan(html, properties = {}) {
-  const attributes = Object.entries(properties).reduce((acc, [key, value]) => `${acc}${key}="${value}" `, "").trim();
-  return `<span ${attributes}>${html}</span>`;
-}
 function hasProperty(object2, propertyName) {
   return Object.prototype.hasOwnProperty.call(object2, propertyName);
 }
@@ -1329,7 +1322,7 @@ function extractParametersFromNode(schemaNode) {
   const decoratedComputedAttributes = getDecoratedComputedAttributes(computedAttributes);
   const node = (0, import_omit.default)(schemaNode, ["x-jsf-presentation", "presentation"]);
   const description = presentation?.description || node.description;
-  const statementDescription = containsHTML(presentation.statement?.description) ? wrapWithSpan(presentation.statement.description, { class: "jsf-statement" }) : presentation.statement?.description;
+  const statementDescription = presentation.statement?.description;
   const value = typeof node.const !== "undefined" && typeof node.default !== "undefined" ? { value: node.const } : {};
   return (0, import_omitBy.default)(
     {
@@ -1371,10 +1364,8 @@ function extractParametersFromNode(schemaNode) {
       ...presentation,
       jsonLogicValidations,
       computedAttributes: decoratedComputedAttributes,
-      description: containsHTML(description) ? wrapWithSpan(description, {
-        class: "jsf-description"
-      }) : description,
-      extra: containsHTML(presentation.extra) ? wrapWithSpan(presentation.extra, { class: "jsf-extra" }) : presentation.extra,
+      description,
+      extra: presentation.extra,
       statement: presentation.statement && {
         ...presentation.statement,
         description: statementDescription

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.6.6-beta.0
- Generated: Tue, 17 Oct 2023 13:38:25 GMT
+ NPM Package: @remoteoss/json-schema-form@0.7.0-beta.0
+ Generated: Mon, 23 Oct 2023 10:15:24 GMT
 
  MIT License
 
@@ -55,13 +55,6 @@ function convertDiskSizeFromTo(from, to) {
     return value * Math.pow(1024, units.indexOf(from.toLowerCase())) / Math.pow(1024, units.indexOf(to.toLowerCase()));
   };
 }
-function containsHTML(str = "") {
-  return /<[a-z][\s\S]*>/i.test(str);
-}
-function wrapWithSpan(html, properties = {}) {
-  const attributes = Object.entries(properties).reduce((acc, [key, value]) => `${acc}${key}="${value}" `, "").trim();
-  return `<span ${attributes}>${html}</span>`;
-}
 function hasProperty(object2, propertyName) {
   return Object.prototype.hasOwnProperty.call(object2, propertyName);
 }
@@ -1293,7 +1286,7 @@ function extractParametersFromNode(schemaNode) {
   const decoratedComputedAttributes = getDecoratedComputedAttributes(computedAttributes);
   const node = omit(schemaNode, ["x-jsf-presentation", "presentation"]);
   const description = presentation?.description || node.description;
-  const statementDescription = containsHTML(presentation.statement?.description) ? wrapWithSpan(presentation.statement.description, { class: "jsf-statement" }) : presentation.statement?.description;
+  const statementDescription = presentation.statement?.description;
   const value = typeof node.const !== "undefined" && typeof node.default !== "undefined" ? { value: node.const } : {};
   return omitBy(
     {
@@ -1335,10 +1328,8 @@ function extractParametersFromNode(schemaNode) {
       ...presentation,
       jsonLogicValidations,
       computedAttributes: decoratedComputedAttributes,
-      description: containsHTML(description) ? wrapWithSpan(description, {
-        class: "jsf-description"
-      }) : description,
-      extra: containsHTML(presentation.extra) ? wrapWithSpan(presentation.extra, { class: "jsf-extra" }) : presentation.extra,
+      description,
+      extra: presentation.extra,
       statement: presentation.statement && {
         ...presentation.statement,
         description: statementDescription

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.6.6-beta.0
- Generated: Tue, 17 Oct 2023 13:38:25 GMT
+ NPM Package: @remoteoss/json-schema-form@0.7.0-beta.0
+ Generated: Mon, 23 Oct 2023 10:15:24 GMT
 
  MIT License
 
@@ -3577,7 +3577,7 @@ var require_property_expr = __commonJS({
       );
     }
     function split2(path) {
-      return path.match(SPLIT_REGEX);
+      return path.match(SPLIT_REGEX) || [""];
     }
     function forEach2(parts, iter, thisArg) {
       var len = parts.length, part, idx, isArray2, isBracket;
@@ -6898,13 +6898,13 @@ function _extends() {
 }
 
 // node_modules/@babel/runtime/helpers/esm/typeof.js
-function _typeof(obj) {
+function _typeof(o) {
   "@babel/helpers - typeof";
-  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(obj2) {
-    return typeof obj2;
-  } : function(obj2) {
-    return obj2 && "function" == typeof Symbol && obj2.constructor === Symbol && obj2 !== Symbol.prototype ? "symbol" : typeof obj2;
-  }, _typeof(obj);
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o2) {
+    return typeof o2;
+  } : function(o2) {
+    return o2 && "function" == typeof Symbol && o2.constructor === Symbol && o2 !== Symbol.prototype ? "symbol" : typeof o2;
+  }, _typeof(o);
 }
 
 // node_modules/@babel/runtime/helpers/esm/toPrimitive.js
@@ -11410,13 +11410,6 @@ function convertDiskSizeFromTo(from2, to) {
     return value * Math.pow(1024, units.indexOf(from2.toLowerCase())) / Math.pow(1024, units.indexOf(to.toLowerCase()));
   };
 }
-function containsHTML(str = "") {
-  return /<[a-z][\s\S]*>/i.test(str);
-}
-function wrapWithSpan(html, properties = {}) {
-  const attributes = Object.entries(properties).reduce((acc, [key, value]) => `${acc}${key}="${value}" `, "").trim();
-  return `<span ${attributes}>${html}</span>`;
-}
 function hasProperty(object2, propertyName) {
   return Object.prototype.hasOwnProperty.call(object2, propertyName);
 }
@@ -12647,7 +12640,7 @@ function extractParametersFromNode(schemaNode) {
   const decoratedComputedAttributes = getDecoratedComputedAttributes(computedAttributes);
   const node = (0, import_omit.default)(schemaNode, ["x-jsf-presentation", "presentation"]);
   const description = presentation?.description || node.description;
-  const statementDescription = containsHTML(presentation.statement?.description) ? wrapWithSpan(presentation.statement.description, { class: "jsf-statement" }) : presentation.statement?.description;
+  const statementDescription = presentation.statement?.description;
   const value = typeof node.const !== "undefined" && typeof node.default !== "undefined" ? { value: node.const } : {};
   return (0, import_omitBy.default)(
     {
@@ -12689,10 +12682,8 @@ function extractParametersFromNode(schemaNode) {
       ...presentation,
       jsonLogicValidations,
       computedAttributes: decoratedComputedAttributes,
-      description: containsHTML(description) ? wrapWithSpan(description, {
-        class: "jsf-description"
-      }) : description,
-      extra: containsHTML(presentation.extra) ? wrapWithSpan(presentation.extra, { class: "jsf-extra" }) : presentation.extra,
+      description,
+      extra: presentation.extra,
       statement: presentation.statement && {
         ...presentation.statement,
         description: statementDescription

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remoteoss/json-schema-form",
-  "version": "0.6.6-beta.0",
+  "version": "0.7.0-beta.0",
   "description": "Headless UI form powered by JSON Schemas",
   "author": "Remote.com <engineering@remote.com> (https://remote.com/)",
   "license": "MIT",

package/src/tests/createHeadlessForm.test.js

@@ -2040,10 +2040,7 @@ describe('createHeadlessForm', () => {
       });
 
       expect(result).toMatchObject({
-        fields: [
-          { description: 'I am regular' },
-          { description: '<span class="jsf-description">I am <b>bold</b>.</span>' },
-        ],
+        fields: [{ description: 'I am regular' }, { description: 'I am <b>bold</b>.' }],
       });
     });
 
@@ -2502,7 +2499,7 @@ describe('createHeadlessForm', () => {
   });
 
   describe('when a field has conditional presentation properties', () => {
-    it('adds .jsf-statement to nested statement markup when visible', () => {
+    it('returns the nested properties when the conditional matches', () => {
       const { fields } = createHeadlessForm(schemaWithConditionalPresentationProperties, {
         initialValues: {
           // show the hidden statement
@@ -2510,9 +2507,7 @@ describe('createHeadlessForm', () => {
         },
       });
 
-      expect(fields[0].statement.description).toBe(
-        `<span class="jsf-statement"><a href="">conditional statement markup</a></span>`
-      );
+      expect(fields[0].statement.description).toBe(`<a href="">conditional statement markup</a>`);
     });
   });
 
@@ -3710,7 +3705,7 @@ describe('createHeadlessForm', () => {
       expect(fields).toMatchObject([
         {
           name: 'time',
-          description: '<span class="jsf-description">Write in <b>hh:ss</b> format</span>', // from presentation
+          description: 'Write in <b>hh:ss</b> format', // from presentation
           inputType: 'clock', // arbitrary type from presentation
           deprecated: {
             description: 'In favor of X', // from presentation