@luomus/laji-form 15.1.64 → 15.1.66

package/lib/validation.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -11,22 +15,33 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toErrorSchema = exports.transformErrors = exports.initializeValidation = void 0;
+exports.initializeValidation = initializeValidation;
+exports.transformErrors = transformErrors;
+exports.toErrorSchema = toErrorSchema;
 const lajiValidate = __importStar(require("@luomus/laji-validate"));
 function initializeValidation(apiClient) {
     lajiValidate.extend(lajiValidate.validators.remote, {
         fetch: (...params) => apiClient.fetchRaw(...params)
     });
 }
-exports.initializeValidation = initializeValidation;
 exports.default = ({ errors: error, warnings: warning }, data) => {
     const promises = [];
     const getPromiseForValidator = (type, validator) => {
@@ -62,7 +77,6 @@ function transformErrors(translations, errors) {
         return error;
     });
 }
-exports.transformErrors = transformErrors;
 function getMessages(result, type) {
     const messages = [];
     for (let k in result) {
@@ -142,7 +156,6 @@ function toErrorSchema(errors) {
         return errorSchema;
     }, {});
 }
-exports.toErrorSchema = toErrorSchema;
 const RE_ERROR_ARRAY_PATH = /\[\d+]/g;
 function errorPropertyToPath(property) {
     // Parse array indices, eg. "instance.level1.level2[2].level3"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luomus/laji-form",
-  "version": "15.1.64",
+  "version": "15.1.66",
   "description": "React module capable of building dynamic forms from Laji form json schemas",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -22,7 +22,7 @@
     "version": "bin/update-changelog.sh",
     "postversion": "npm publish",
     "prepublishOnly": "npm run build && git push && git push --tags",
-    "lint": "eslint -c .eslintrc.prod.json src playground",
+    "lint": "eslint src playground",
     "test": "npx playwright test",
     "test:ui": "npx playwright test --ui",
     "test:docker": "npm run test:docker:build && npm run test:docker:run --",
@@ -69,23 +69,24 @@
   "devDependencies": {
     "@luomus/laji-schema": "^2.0.174",
     "@playwright/test": "^1.40.1",
+    "@stylistic/eslint-plugin": "^5.4.0",
     "@types/jasmine": "^3.7.7",
-    "@types/node": "^20.10.1",
-    "@typescript-eslint/eslint-plugin": "^4.28.1",
-    "@typescript-eslint/parser": "^4.28.1",
+    "@types/node": "^20.17.0",
+    "@typescript-eslint/eslint-plugin": "^8.44.1",
+    "@typescript-eslint/parser": "^8.44.1",
     "copy-webpack-plugin": "^9.0.1",
     "css-loader": "^5.2.6",
-    "eslint": "^7.30.0",
-    "eslint-plugin-jasmine": "^4.1.2",
-    "eslint-plugin-react": "^7.24.0",
-    "eslint-plugin-react-hooks": "^4.2.0",
+    "eslint": "^9.36.0",
+    "eslint-plugin-jasmine": "^4.2.2",
+    "eslint-plugin-react": "^7.37.5",
+    "eslint-plugin-react-hooks": "^5.2.0",
     "mini-css-extract-plugin": "^2.1.0",
     "notus": "^0.3.2",
     "querystring": "^0.2.1",
     "rimraf": "^2.5.4",
     "style-loader": "^3.0.0",
     "ts-loader": "^9.2.3",
-    "typescript": "^4.3.5",
+    "typescript": "^5.9.2",
     "webpack": "^5.41.1",
     "webpack-cli": "^4.8.0",
     "webpack-dev-server": "^4.2.1",
@@ -100,7 +101,7 @@
     "react-bootstrap-5": "npm:react-bootstrap@^2.5.0"
   },
   "volta": {
-    "node": "20.10.0"
+    "node": "20.17.0"
   },
   "publishConfig": {
     "access": "public"

package/test-export/test-utils.d.ts

@@ -39,7 +39,7 @@ export interface BooleanWidgetPO {
     $active: Locator;
     $nonactive: Locator;
 }
-export declare type EnumWidgetPOI = ReturnType<typeof getEnumWidgetForContainer>;
+export type EnumWidgetPOI = ReturnType<typeof getEnumWidgetForContainer>;
 declare function getEnumWidgetForContainer($container: Locator): {
     $container: Locator;
     openEnums: () => Promise<void>;
@@ -69,8 +69,8 @@ export declare class Form {
     setMockResponse(path: string, query?: any): Promise<Mock>;
     createMockResponseQueue(path: string, query?: any): Promise<{
         create: () => Promise<{
-            resolve: (response: any, raw?: boolean | undefined) => Promise<unknown>;
-            reject: (response: any, raw?: boolean | undefined) => Promise<unknown>;
+            resolve: (response: any, raw?: boolean) => Promise<unknown>;
+            reject: (response: any, raw?: boolean) => Promise<unknown>;
         }>;
         remove: () => Promise<unknown>;
     }>;
@@ -219,10 +219,10 @@ export declare class Form {
     /** Draws a marker to the center of a laji-map rendered to the given locator. The locator defaults to "gatherings" */
     putMarkerToMap(lajiFormLocator?: string): Promise<void>;
 }
-export declare type ImageArrayFieldPOI = ReturnType<Form["getImageArrayField"]>;
-export declare type TaxonAutosuggestWidgetPOI = ReturnType<Form["getTaxonAutosuggestWidget"]>;
-export declare type UnitListShorthandArrayFieldPOI = ReturnType<Form["getUnitListShorthandArrayField"]>;
-export declare type NamedPlaceChooserPO = ReturnType<Form["getNamedPlaceChooser"]>;
+export type ImageArrayFieldPOI = ReturnType<Form["getImageArrayField"]>;
+export type TaxonAutosuggestWidgetPOI = ReturnType<Form["getTaxonAutosuggestWidget"]>;
+export type UnitListShorthandArrayFieldPOI = ReturnType<Form["getUnitListShorthandArrayField"]>;
+export type NamedPlaceChooserPO = ReturnType<Form["getNamedPlaceChooser"]>;
 export declare class DemoPageForm extends Form {
     private props?;
     constructor(page: Page, props?: DemoPageProps | undefined);

package/test-export/test-utils.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -11,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -39,20 +53,21 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRemoveUnit = exports.updateValue = exports.maybeJSONPointerToLocator = exports.filterUUIDs = exports.mockImageMetadata = exports.createForm = exports.DemoPageForm = exports.Form = exports.getFocusedId = exports.getFocusedElement = exports.lajiFormLocate = exports.lajiFormLocator = exports.navigateToForm = exports.emptyForm = void 0;
+exports.getRemoveUnit = exports.updateValue = exports.maybeJSONPointerToLocator = exports.filterUUIDs = exports.mockImageMetadata = exports.DemoPageForm = exports.Form = exports.getFocusedId = exports.getFocusedElement = exports.lajiFormLocate = exports.lajiFormLocator = exports.navigateToForm = exports.emptyForm = void 0;
+exports.createForm = createForm;
 const path = __importStar(require("path"));
 const test_utils_1 = require("@luomus/laji-map/test-export/test-utils");
-const emptyForm = (page, params = "") => __awaiter(void 0, void 0, void 0, function* () { return page.goto(`/?test=true&settings=false&mockApi=true&${params}`); });
+const emptyForm = (page_1, ...args_1) => __awaiter(void 0, [page_1, ...args_1], void 0, function* (page, params = "") { return page.goto(`/?test=true&settings=false&mockApi=true&${params}`); });
 exports.emptyForm = emptyForm;
-const navigateToForm = (page, formID, params = "") => __awaiter(void 0, void 0, void 0, function* () { return page.goto(`/?id=${formID}&local=true&settings=false&mockApi=true${params}`); });
+const navigateToForm = (page_1, formID_1, ...args_1) => __awaiter(void 0, [page_1, formID_1, ...args_1], void 0, function* (page, formID, params = "") { return page.goto(`/?id=${formID}&local=true&settings=false&mockApi=true${params}`); });
 exports.navigateToForm = navigateToForm;
 const lajiFormLocator = (path) => `#_laji-form_root${typeof path === "string" && path.length ? `_${path.replace(/\./g, "_")}` : ""}`;
 exports.lajiFormLocator = lajiFormLocator;
-const lajiFormLocate = (page, str) => page.locator(exports.lajiFormLocator(str));
+const lajiFormLocate = (page, str) => page.locator((0, exports.lajiFormLocator)(str));
 exports.lajiFormLocate = lajiFormLocate;
 const getFocusedElement = (page) => page.locator("*:focus");
 exports.getFocusedElement = getFocusedElement;
-const getFocusedId = (page) => exports.getFocusedElement(page).getAttribute("id");
+const getFocusedId = (page) => (0, exports.getFocusedElement)(page).getAttribute("id");
 exports.getFocusedId = getFocusedId;
 function getEnumWidgetForContainer($container) {
     return {
@@ -171,7 +186,7 @@ class Form {
         };
     }
     $locate(path) {
-        return this.$locator.locator(exports.lajiFormLocator(path));
+        return this.$locator.locator((0, exports.lajiFormLocator)(path));
     }
     $locateButton(path, selector, locateFromBody = false) {
         return (locateFromBody ? this.page : this.$locator).locator(`#root${typeof path === "string" && path.length > 0 ? `_${path.replace(/\./g, "_")}` : ""}-${selector}`);
@@ -216,7 +231,7 @@ class Form {
         const $container = this.$locate(str).locator(".btn-toolbar");
         return {
             $container,
-            $true: $container.locator(".btn").nth(0),
+            $true: $container.locator(".btn").nth(0), // eslint-disable-line  protractor/use-first-last
             $false: $container.locator(".btn").nth(1),
             $undefined: this.$locate(str).locator(".btn").nth(2),
             $active: $container.locator(".btn.active"),
@@ -259,8 +274,8 @@ class Form {
         return this.$locate(str).locator(".laji-form-error-container li");
     }
     /** Draws a marker to the center of a laji-map rendered to the given locator. The locator defaults to "gatherings" */
-    putMarkerToMap(lajiFormLocator = "gatherings") {
-        return __awaiter(this, void 0, void 0, function* () {
+    putMarkerToMap() {
+        return __awaiter(this, arguments, void 0, function* (lajiFormLocator = "gatherings") {
             const $map = this.$locate(lajiFormLocator).locator(".laji-map");
             yield $map.scrollIntoViewIfNeeded();
             const map = new test_utils_1.MapPageObject(this.page, $map);
@@ -293,15 +308,15 @@ class DemoPageForm extends Form {
         });
     }
     initialize(beforeInit) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const query = (params) => Object.keys(params).reduce((q, key) => `${q}&${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`, "");
             if ((_a = this.props) === null || _a === void 0 ? void 0 : _a.id) {
                 const _b = this.props, { id } = _b, _props = __rest(_b, ["id"]);
-                yield exports.navigateToForm(this.page, id, query(_props));
+                yield (0, exports.navigateToForm)(this.page, id, query(_props));
             }
             else {
-                yield exports.emptyForm(this.page);
+                yield (0, exports.emptyForm)(this.page);
             }
             beforeInit && (yield beforeInit(this));
             yield this.setState(this.props);
@@ -363,7 +378,6 @@ function createForm(page, props, beforeInit) {
         return form;
     });
 }
-exports.createForm = createForm;
 exports.mockImageMetadata = {
     "id": "mock",
     "capturerVerbatim": [
@@ -381,7 +395,7 @@ exports.mockImageMetadata = {
 };
 const filterUUIDs = (any) => {
     if (typeof any === "object" && !Array.isArray(any) && any !== null) {
-        return Object.keys(any).filter(key => key !== "_lajiFormId").reduce((_any, key) => (Object.assign(Object.assign({}, _any), { [key]: exports.filterUUIDs(any[key]) })), {});
+        return Object.keys(any).filter(key => key !== "_lajiFormId").reduce((_any, key) => (Object.assign(Object.assign({}, _any), { [key]: (0, exports.filterUUIDs)(any[key]) })), {});
     }
     else if (Array.isArray(any)) {
         return any.map(exports.filterUUIDs);