drf-react-by-schema 0.28.0 → 0.28.1

package/dist/utils/utils.js

@@ -63,6 +63,9 @@ exports.extractFieldValue = extractFieldValue;
 exports.buildConditionalVisibleBySchema = buildConditionalVisibleBySchema;
 exports.showConditionalVisibleField = showConditionalVisibleField;
 exports.showConditionalVisibleFieldObj = showConditionalVisibleFieldObj;
+exports.getMapLibraries = getMapLibraries;
+exports.geometryValueToString = geometryValueToString;
+exports.parseGeoJSON = parseGeoJSON;
 const dayjs_1 = __importDefault(require("dayjs"));
 const Yup = __importStar(require("yup"));
 const string_mask_1 = __importDefault(require("string-mask"));
@@ -202,6 +205,16 @@ const getYupValidator = (type) => {
             case 'file upload':
                 yupFunc = Yup.object();
                 break;
+            // PostGIS geometry fields arrive as GeoJSON objects (e.g.
+            // { type: 'Point', coordinates: [...] }), so they must validate as
+            // objects rather than falling through to the default string schema.
+            case 'point':
+            case 'polygon':
+            case 'multipoint':
+            case 'multipolygon':
+            case 'geometrycollection':
+                yupFunc = Yup.object();
+                break;
             // String-like types produced by SimpleMetadata but not needing
             // specialized validation behave as plain strings:
             case 'url':
@@ -223,14 +236,14 @@ const getYupValidator = (type) => {
     return yupFunc.transform((v) => (v === '' ? null : v)).nullable();
 };
 function buildGenericYupValidationSchema({ data, schema, many = false, skipFields = [], extraValidators, uiFields, }) {
-    var _a;
+    var _a, _b;
     const yupValidator = {};
     for (const entry of Object.entries(schema)) {
         const [field, fieldSchema] = entry;
         if (!data || !(field in data) || field === 'id' || skipFields.includes(field)) {
             continue;
         }
-        // OneToMany or ManyToMany:
+        // OneToMany or ManyToMany (built as an array-of-object schema):
         if (fieldSchema.type === 'field' && ((_a = fieldSchema.child) === null || _a === void 0 ? void 0 : _a.children)) {
             yupValidator[field] =
                 extraValidators && field in extraValidators
@@ -241,27 +254,20 @@ function buildGenericYupValidationSchema({ data, schema, many = false, skipField
                         data: data[field],
                         uiFields,
                     });
-            continue;
         }
-        // Nested Object:
-        if (fieldSchema.type === 'nested object' && fieldSchema.children) {
-            // yupValidator[key] = buildGenericYupValidationSchema({
-            //     schema: field.children,
-            //     many: false,
-            //     data: data[key],
-            //     extraValidators: key in extraValidators ? extraValidators[key] : {}
-            // });
-            // if (!field.model_required) {
-            //     yupValidator[key] = yupValidator[key].nullable();
-            // }
-            // continue;
+        else {
+            yupValidator[field] =
+                extraValidators && field in extraValidators
+                    ? extraValidators[field]
+                    : getYupValidator(fieldSchema.type);
         }
-        yupValidator[field] =
-            extraValidators && field in extraValidators
-                ? extraValidators[field]
-                : getYupValidator(fieldSchema.type);
         if (isFieldRequired(fieldSchema, (uiFields || []).includes(field))) {
             yupValidator[field] = yupValidator[field].required('Este campo é obrigatório');
+            // For required many-fields the selected items live in an array, and yup's
+            // `.required()` still allows `[]`; enforce at least one selection instead.
+            if (fieldSchema.type === 'field' && ((_b = fieldSchema.child) === null || _b === void 0 ? void 0 : _b.children)) {
+                yupValidator[field] = yupValidator[field].min(1, 'Este campo é obrigatório');
+            }
         }
         if (fieldSchema.max_length && fieldSchema.type === 'string') {
             yupValidator[field] = yupValidator[field].max(parseInt(fieldSchema.max_length), `Este campo só pode ter no máximo ${fieldSchema.max_length} caracteres`);
@@ -847,3 +853,60 @@ function showConditionalVisibleFieldObj(field, conditionalVisible, values) {
         .filter((item) => item.target === field);
     return sources.length > 0;
 }
+// --- Optional OSM (leaflet) geometry support --------------------------------
+// PostGIS geometry fields arrive from the backend as GeoJSON (type point /
+// polygon / multipoint / multipolygon / geometrycollection). Editing them uses
+// leaflet + leaflet-draw when those optional libraries are installed in the
+// consuming app; otherwise the UI falls back to plain text editing.
+/**
+ * Detect whether the consuming app has installed leaflet + leaflet-draw.
+ * Uses CJS require so that the bundler does not fail to build when they are
+ * absent; returns null so callers can fall back to text inputs.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function getMapLibraries() {
+    try {
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        const L = require('leaflet');
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        require('leaflet-draw');
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        require('react-leaflet');
+        if (L && L.map && L.Control && typeof L.Control.Draw === 'function') {
+            return L;
+        }
+    }
+    catch (_a) {
+        // leaflet / leaflet-draw / react-leaflet not installed -> no map support
+    }
+    return null;
+}
+/** Normalize a GeoJSON value (object, JSON string or null) to a string. */
+function geometryValueToString(value) {
+    if (value === null || value === undefined)
+        return '';
+    if (typeof value === 'string')
+        return value;
+    try {
+        return JSON.stringify(value);
+    }
+    catch (_a) {
+        return '';
+    }
+}
+/** Parse a GeoJSON value (object or JSON string) into an object, or null. */
+function parseGeoJSON(geoType, rawValue) {
+    const text = geometryValueToString(rawValue);
+    if (!text) {
+        return null;
+    }
+    try {
+        const parsed = JSON.parse(text);
+        return parsed && typeof parsed.type === 'string' && (0, exports.slugify)(parsed.type) === geoType
+            ? parsed
+            : null;
+    }
+    catch (_a) {
+        return null;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drf-react-by-schema",
-  "version": "0.28.0",
+  "version": "0.28.1",
   "description": "Components and Tools for building a React App having Django Rest Framework (DRF) as server",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -42,25 +42,45 @@
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
+    "@emotion/react": "^11",
+    "@emotion/styled": "^11",
     "@eslint/compat": "^1.3.0",
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.29.0",
+    "@hookform/resolvers": "^3",
+    "@mui/icons-material": "^6",
+    "@mui/material": "^6",
+    "@mui/x-data-grid": "^7",
+    "@mui/x-date-pickers": "^7",
+    "@types/leaflet": "^1.9.22",
+    "@types/leaflet-draw": "^1.0.13",
     "@types/node": "^18.11.15",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
     "@typescript-eslint/eslint-plugin": "^8.34.1",
     "@typescript-eslint/parser": "8.34.1",
+    "axios": "^1",
+    "dayjs": "^1",
     "eslint": "^9.29.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
+    "leaflet": "^1.9.4",
+    "leaflet-draw": "^1.0.4",
     "prettier": "^3.0.0",
+    "react": "^19",
     "react-docgen-typescript": "^2.2.2",
+    "react-dom": "^19",
+    "react-hook-form": "^7",
+    "react-leaflet": "^5.0.0",
+    "react-number-format": "^5",
     "semver": "^7.5.1",
+    "string-mask": "^0.3.0",
     "ts-loader": "^9.4.2",
     "typescript": "^5.7.3",
-    "webpack": "^5.75.0"
+    "webpack": "^5.75.0",
+    "yup": "^1"
   },
   "peerDependencies": {
     "@emotion/react": "^11",
@@ -72,13 +92,27 @@
     "@mui/x-date-pickers": "^7",
     "axios": "^1",
     "dayjs": "^1",
+    "leaflet": "^1.9.0",
+    "leaflet-draw": "^1.0.4",
     "react": "^18 || ^19",
     "react-dom": "^18 || ^19",
     "react-hook-form": "^7",
+    "react-leaflet": "^5.0.0",
     "react-number-format": "^5",
     "string-mask": "^0.3.0",
     "yup": "^1"
   },
+  "peerDependenciesMeta": {
+    "leaflet": {
+      "optional": true
+    },
+    "react-leaflet": {
+      "optional": true
+    },
+    "leaflet-draw": {
+      "optional": true
+    }
+  },
   "browserslist": [
     ">1%",
     "last 1 version",