diff --git a/development/issues/open/274.html b/development/issues/open/274.html
index bfd57553c3b05c0769d3c09cf30a1b6c20f6962a..0adedea910b00f0420a7038b8ef63a5e39086897 100644
--- a/development/issues/open/274.html
+++ b/development/issues/open/274.html
@@ -13,15 +13,44 @@
<li><a href="https://gitlab.schukai.com/oss/libraries/javascript/monster/-/issues/274">Issue #274</a></li>
<li><a href="/">Back to overview</a></li>
</ul>
+
+<monster-host>
+ <monster-config-manager>
+
+ </monster-config-manager>
+</monster-host>
+
<main>
+
<h2>Control with DOM datasource</h2>
+
<monster-datasource-rest id="ds274-r"
data-monster-option-features-autoInit="true"
data-monster-option-write-url="/issue-274.json"
- data-monster-option-read-url="/issue-274.json?limit=1&page=${page}"
+ data-monster-option-read-url="/issue-274.json?limit=1&page=${page}&q=${query}"
+ data-monster-option-filter-id="ds274-filter"
+ data-monster-option-features-filter="true"
></monster-datasource-rest>
+ <monster-tabs id="ds274-tabs">
+ <div data-monster-button-label="Filter">
+ <monster-datatable-filter id="ds274-filter"
+ data-monster-option-features-storedConfig="true"
+ data-monster-option-storedConfig-selector="#ds274-tabs"
+ >
+ <label data-monster-label="Input">Input Filter
+ <monster-filter-input ></monster-filter-input>
+ </label>
+
+ <label slot="hidden" data-monster-label="Date Range">Date Range Filter
+ <monster-filter-date-range></monster-filter-date-range>
+ </label>
+ </monster-datatable-filter>
+ </div>
+ </monster-tabs>
+
+
<monster-pagination
data-monster-option-datasource-selector="#ds274-r"
data-monster-option-objectsperpage="1"
@@ -31,7 +60,8 @@
<p> Datasource status
- <monster-datasource-status data-monster-option-datasource-selector="#ds274-r"></monster-datasource-status></p>
+ <monster-datasource-status data-monster-option-datasource-selector="#ds274-r"></monster-datasource-status>
+ </p>
<monster-datasource-save-button data-monster-option-datasource-selector="#ds274-r"></monster-datasource-save-button>
@@ -42,10 +72,14 @@
data-monster-option-datasource-selector="#ds274-r">
<monster-field-set>
-
- <label>ID <monster-context-help>das ist eine hilfe</monster-context-help></label>
+ <label>ID
+ <monster-context-help>das ist eine hilfe</monster-context-help>
+ </label>
<input data-monster-attributes="value path:data.id | tostring" data-monster-bind="path:data.id">
- <label>Username <monster-context-help>das ist eine hilfe</monster-context-help> <monster-context-error>message</monster-context-error></label>
+ <label>Username
+ <monster-context-help>das ist eine hilfe</monster-context-help>
+ <monster-context-error>message</monster-context-error>
+ </label>
<input data-monster-attributes="value path:data.username" data-monster-bind="path:data.username">
<label>Full Name </label>
<monster-input-group>
@@ -58,11 +92,13 @@
<hr>
<label for="mail">Email</label>
- <input id="mail" type="email" data-monster-attributes="value path:data.email" data-monster-bind="path:data.email">
+ <input id="mail" type="email" data-monster-attributes="value path:data.email"
+ data-monster-bind="path:data.email">
<label for="age">Age</label>
<!--input id="age" type="range" min="0" max="120" data-monster-attributes="value path:data.age" data-monster-bind="path:data.age"-->
- <monster-select data-monster-attributes="value path:data.age" data-monster-bind="path:data.age" data-monster-bind-type="number">
+ <monster-select id="age" data-monster-attributes="value path:data.age" data-monster-bind="path:data.age"
+ data-monster-bind-type="number">
<div data-monster-value="1">1</div>
<div data-monster-value="28">28</div>
<div data-monster-value="37">37</div>
@@ -70,7 +106,6 @@
</monster-select>
-
<label>Registered Date</label>
<input type="date" data-monster-attributes="value path:data.registered_date"
data-monster-bind="path:data.registered_date">
@@ -126,11 +161,16 @@
<input data-monster-attributes="value path:data.status">
-
</div>
</monster-dataset>
-<hr><hr><hr><hr><hr><hr><hr>
+ <hr>
+ <hr>
+ <hr>
+ <hr>
+ <hr>
+ <hr>
+ <hr>
</main>
</body>
diff --git a/development/issues/open/274.mjs b/development/issues/open/274.mjs
index 30ce6d658585043a9fe7857915b679d162a540af..2d74cf8f6baee98acbeb8f24a094d003e9f765bc 100644
--- a/development/issues/open/274.mjs
+++ b/development/issues/open/274.mjs
@@ -19,6 +19,7 @@ import "../../../source/components/datatable/status.mjs";
import "../../../source/components/datatable/change-button.mjs";
import "../../../source/components/datatable/save-button.mjs";
import "../../../source/components/datatable/pagination.mjs";
+import "../../../source/components/datatable/filter.mjs";
import "../../../source/components/form/button.mjs";
import "../../../source/components/form/form.mjs";
import "../../../source/components/form/field-set.mjs";
@@ -27,6 +28,10 @@ import "../../../source/components/form/toggle-switch.mjs";
import "../../../source/components/form/context-help.mjs";
import "../../../source/components/form/context-error.mjs";
import "../../../source/components/form/input-group.mjs";
+import "../../../source/components/datatable/filter/input.mjs";
+import "../../../source/components/datatable/filter/date-range.mjs";
+import "../../../source/components/layout/tabs.mjs";
+
// DOM-Elemente für die Seiten-Datensätze
const pageData1 = document.getElementById("ds274-d");
diff --git a/development/mock/issue-274.js b/development/mock/issue-274.js
index 4303a51677fe54baf793fb557683eb27bcd6110e..49aa9d431266d97f48f87ea34ceed6b2ae8a2b28 100644
--- a/development/mock/issue-274.js
+++ b/development/mock/issue-274.js
@@ -212,13 +212,23 @@ if (!Array.isArray(objects)) {
const requestDelay = 40
function wrapJsonWithPagination(data, page, limit) {
+
+ let pages= 0;
+
+ if (data.length===1) {
+ pages = 1
+ } else {
+ pages = Math.ceil(data.length / limit);
+ }
+
+
return JSON.stringify({
dataset: data,
sys: {
pagination: {
objectsPerPage: limit,
- pages: Math.ceil(objects.length / limit),
- currentPage: page
+ pages:pages ,
+ currentPage: parseInt(page, 10),
}
}
})
@@ -254,23 +264,28 @@ export default [
limit = parseInt(q.limit)
}
+ // if the string q containes "=*" or =all, return all objects
+ if(q.q.includes("=*") || q.q === "all" || q.q === "" || q.q === "*") {
+ filtered = objects
+ } else if (q.q) {
+ const query = q.q.toLowerCase()
+ filtered = objects.filter(item => item.username.toLowerCase().includes(query))
+ } else {
+ filtered = objects
+ }
+
if (q.page) {
const page = parseInt(q.page)
const start = (page - 1) * limit
const end = start + limit
- filtered = objects.slice(start, end)
+ filtered = filtered.slice(start, end)
} else {
- filtered = objects.slice(0, limit)
+ filtered = filtered.slice(0, limit)
}
- if (q.q) {
- const query = q.q.toLowerCase()
- filtered = objects.filter(item => item.name.toLowerCase().includes(query))
-
- }
setTimeout(function () {
- res.end(wrapJsonWithPagination(filtered, q.page || 1, limit))
+ res.end(wrapJsonWithPagination(filtered, q.page || 1,limit))
}, requestDelay);
return
diff --git a/source/components/datatable/datasource/rest.mjs b/source/components/datatable/datasource/rest.mjs
index bddb4dbcdab45310b5685c04e77b8dfb7195c34b..c17b4752e2ba37187ec433b48d6e10d850a449cb 100644
--- a/source/components/datatable/datasource/rest.mjs
+++ b/source/components/datatable/datasource/rest.mjs
@@ -104,7 +104,7 @@ class Rest extends Datasource {
* @property {string} templates.main Main template
* @property {Object} features Feature definitions
* @property {boolean} features.autoInit If true, the component is initialized automatically
- * @property {boolean} features.filter If true, the component is initialized automatically
+ * @property {boolean} features.filter If true, the filter.id is used to attach a filter control
* @property {Object} autoInit Auto init definitions
* @property {boolean} autoInit.intersectionObserver If true, the intersection observer is initialized automatically
* @property {boolean} autoInit.oneTime If true, the intersection observer is initialized only once
@@ -131,7 +131,7 @@ class Rest extends Datasource {
restOptions.read.parameters = {
filter: null,
- oderBy: null,
+ orderBy: null,
page: "1",
};
@@ -199,7 +199,6 @@ class Rest extends Datasource {
[assembleMethodSymbol]() {
super[assembleMethodSymbol]();
initEventHandler.call(this);
- initAutoInit.call(this);
}
/**
@@ -260,6 +259,12 @@ class Rest extends Datasource {
queueMicrotask(() => {
if (this.getOption("features.filter", false) === true) {
initFilter.call(this);
+
+ if (!this[filterObserverSymbol]) {
+ initAutoInit.call(this);
+ }
+ } else {
+ initAutoInit.call(this);
}
});
}
@@ -286,12 +291,26 @@ class Rest extends Datasource {
this[dataSourceSymbol].setOption("read", opt);
let url = this.getOption("read.url");
- const formatter = new Formatter(this.getOption("read.parameters"));
-
if (!url) {
return Promise.reject(new Error("No url defined"));
}
+ const param = this.getOption("read.parameters", {});
+
+ if (param.query === null || param.query === undefined) {
+ param.query = "";
+ }
+
+ if (param.page === null || param.page === undefined) {
+ param.page = "1";
+ }
+
+ if (param.orderBy === null || param.orderBy === undefined) {
+ param.orderBy = "";
+ }
+
+ const formatter = new Formatter(param);
+
url = formatter.format(url);
this[dataSourceSymbol].setOption("read.url", url);
@@ -570,8 +589,7 @@ function initIntersectionObserver() {
*/
function getTemplate() {
// language=HTML
- return `
- <slot></slot>`;
+ return `<slot></slot>`;
}
registerCustomElement(Rest);
diff --git a/source/components/datatable/filter.mjs b/source/components/datatable/filter.mjs
index 8cfea89d4680a01b7233af992ef4f03068dd8003..1ba029f682175a00d467f02ce0ff7d788beb476c 100644
--- a/source/components/datatable/filter.mjs
+++ b/source/components/datatable/filter.mjs
@@ -13,7 +13,10 @@
*/
import { instanceSymbol } from "../../constants.mjs";
-import { findTargetElementFromEvent } from "../../dom/events.mjs";
+import {
+ findTargetElementFromEvent,
+ fireCustomEvent,
+} from "../../dom/events.mjs";
import {
findElementWithIdUpwards,
findElementWithSelectorUpwards,
@@ -25,7 +28,6 @@ import {
registerCustomElement,
} from "../../dom/customelement.mjs";
import { ID } from "../../types/id.mjs";
-import { DeadMansSwitch } from "../../util/deadmansswitch.mjs";
import { Settings } from "./filter/settings.mjs";
import { FilterStyleSheet } from "./stylesheet/filter.mjs";
import { getDocument, getWindow } from "../../dom/util.mjs";
@@ -54,6 +56,14 @@ import {
import "./filter/select.mjs";
+import "../form/button.mjs";
+import "../form/select.mjs";
+import "../form/popper-button.mjs";
+import "../form/toggle-switch.mjs";
+import "../form/context-help.mjs";
+import "../form/context-error.mjs";
+import "../form/message-state-button.mjs";
+
export { Filter };
/**
@@ -130,9 +140,23 @@ const sizeDataSymbol = Symbol("sizeData");
*/
const debounceSizeSymbol = Symbol("debounceSize");
+/**
+ * @private
+ * @type {symbol}
+ */
+const hashChangeSymbol = Symbol("hashChange");
+
/**
* The Filter component is used to show and handle the filter values.
*
+ * @fragments /fragments/components/datatable/filter
+ *
+ * @example /examples/components/datatable/filter-simple First filter
+ * @example /examples/components/datatable/filter-advanced Advanced filter
+ * @example /examples/components/datatable/filter-store Store filter
+ *
+ * @issue https://localhost.alvine.dev:8443/development/issues/closed/272.html
+ *
* @copyright schukai GmbH
* @summary The Filter component is used to show and handle the filter values.
*/
@@ -143,6 +167,9 @@ class Filter extends CustomElement {
constructor() {
super();
this[settingsSymbol] = new Settings();
+
+ // debounce the hash change event if doSearch is called by click the search button
+ this[hashChangeSymbol] = 0;
}
/**
@@ -171,7 +198,7 @@ class Filter extends CustomElement {
/**
*
- * @return {{Filter}}
+ * @return {Filter}
*/
resetFailureMessage() {
this[searchButtonElementSymbol].hideMessage();
@@ -181,7 +208,7 @@ class Filter extends CustomElement {
/**
*
- * @return {{Filter}}
+ * @return {Filter}
*/
showSuccess() {
this[searchButtonElementSymbol].setState(
@@ -210,8 +237,10 @@ class Filter extends CustomElement {
* @property {Object} formatter.marker Marker definitions
* @property {Object} formatter.marker.open Marker open
* @property {Object} formatter.marker.close Marker close
+ * @property {Object} features Feature definitions
+ * @property {boolean} features.storedConfig Stored configuration, this replaces the setting `storedConfig.enabled` @since 3.97.0
* @property {Object} storedConfig Stored configuration
- * @property {boolean} storedConfig.enabled Enabled
+ * @property {boolean} storedConfig.enabled The store has been enabled, this option will no longer have any effect. @deprecated 20250101
* @property {string} storedConfig.selector Selector
* @property {Object} timeouts Timeout definitions
* @property {number} timeouts.message Message timeout
@@ -227,19 +256,23 @@ class Filter extends CustomElement {
templates: {
main: getTemplate(),
},
+
formatter: {
marker: {
open: null,
close: null,
},
},
+
labels: {
search: "Search",
reset: "Reset",
save: "Save",
"filter-name": "Filter name",
- "empty-query-and-no-default": "Please select a filter",
- "query-not-changed": "The query has not changed",
+ "empty-query-and-no-default":
+ "The query is empty and there is no default query.",
+ "query-not-changed":
+ "The search request has not changed, so no search is required.",
},
templateMapping: {
@@ -247,6 +280,10 @@ class Filter extends CustomElement {
"filter-name-label": name,
},
+ features: {
+ storedConfig: false,
+ },
+
storedConfig: {
enabled: true,
selector: "",
@@ -268,8 +305,8 @@ class Filter extends CustomElement {
},
},
- query: undefined,
- defaultQuery: "",
+ query: null,
+ defaultQuery: null,
eventProcessing: true,
});
}
@@ -284,12 +321,14 @@ class Filter extends CustomElement {
/**
* @return {FilterButton}
+ * @fires monster-filter-initialized
*/
[assembleMethodSymbol]() {
this.setOption(
"templateMapping.filter-save-label",
this.getOption("labels.save"),
);
+
this.setOption(
"templateMapping.filter-name-label",
this.getOption("labels.filter-name"),
@@ -302,12 +341,19 @@ class Filter extends CustomElement {
initFromConfig
.call(this)
- .then(() => {
- initFilter.call(this);
- updateFilterTabs.call(this);
- })
+ .then(() => {})
.catch((error) => {
addAttributeToken(this, ATTRIBUTE_ERRORMESSAGE, error?.message);
+ })
+ .finally(() => {
+ initFilter.call(this);
+ updateFilterTabs.call(this);
+ doSearch
+ .call(this, { showEffect: false })
+ .then(() => {
+ fireCustomEvent(this, "monster-filter-initialized");
+ })
+ .catch(() => {});
});
}
@@ -316,7 +362,6 @@ class Filter extends CustomElement {
*/
connectedCallback() {
super.connectedCallback();
-
getWindow().addEventListener(
"hashchange",
this[locationChangeHandlerSymbol],
@@ -385,10 +430,13 @@ function updateFilterSelections() {
queueMicrotask(() => {
const options = this[settingsSymbol].getOptions();
this[filterSelectElementSymbol].setOption("options", options);
- queueMicrotask(() => {
- this[filterSelectElementSymbol].value =
- this[settingsSymbol].getSelected();
- });
+
+ setTimeout(() => {
+ window.requestAnimationFrame(() => {
+ this[filterSelectElementSymbol].value =
+ this[settingsSymbol].getSelected();
+ });
+ }, 0);
});
}
@@ -411,7 +459,12 @@ function initFilter() {
.forEach((element) => {
const label = element.getAttribute("data-monster-label");
if (!label) {
- throw new Error("no filter label is defined");
+ addAttributeToken(
+ this,
+ ATTRIBUTE_ERRORMESSAGE,
+ "no filter label is defined",
+ );
+ return;
}
let value = element.id;
@@ -448,6 +501,7 @@ function initFilter() {
this[settingsSymbol].set({ value, label, visible });
});
+
updateFilterSelections.call(this);
}
@@ -499,6 +553,33 @@ function setSlotAttribute(element, visible) {
*/
function initEventHandler() {
const self = this;
+
+ let lastHash = getGlobal().location.hash;
+ self[locationChangeHandlerSymbol] = () => {
+ if (lastHash === getGlobal().location.hash) {
+ return;
+ }
+
+ /**
+ * debounce the hash change event if doSearch
+ * is called by click the search button
+ */
+ if (self[hashChangeSymbol] > 0) {
+ self[hashChangeSymbol]--;
+ return;
+ }
+
+ initFilter.call(this);
+
+ doSearch
+ .call(self)
+ .then(() => {})
+ .catch((error) => {})
+ .finally(() => {
+ lastHash = getGlobal().location.hash;
+ });
+ };
+
/**
* Monster.Components.Form.event:monster-selection-cleared
*/
@@ -542,6 +623,7 @@ function initEventHandler() {
);
}
+ /** save the current filter */
if (self[filterSaveActionButtonElementSymbol]) {
self[filterSaveActionButtonElementSymbol].setOption(
"actions.click",
@@ -641,6 +723,8 @@ function initEventHandler() {
}
self[searchButtonElementSymbol].setOption("actions.click", () => {
+ self[hashChangeSymbol] = 1;
+
doSearch
.call(self)
.then(() => {})
@@ -684,7 +768,10 @@ function initEventHandler() {
}
if (event.keyCode === 13) {
- doSearch.call(self, { showEffect: false });
+ doSearch
+ .call(self, { showEffect: false })
+ .then(() => {})
+ .catch((error) => {});
}
});
@@ -696,6 +783,7 @@ function initEventHandler() {
}
function initTabEvents() {
+ const self = this;
this[filterTabElementSymbol].addEventListener(
"monster-tab-changed",
(event) => {
@@ -836,7 +924,18 @@ function doSearch({ showEffect } = { showEffect: true }) {
.call(this)
.then((query) => {
const buildQuery = buildSearchQuery.call(this, query);
- if (buildQuery === "" && !this.getOption("defaultQuery")) {
+ if (buildQuery === null) {
+ const msg = this.getOption("labels.empty-query-and-no-default");
+ if (showEffect) {
+ this[searchButtonElementSymbol].removeState();
+ this[searchButtonElementSymbol]
+ .setMessage(msg)
+ .showMessage(this.getOption("timeouts.message", 4000));
+ }
+ return Promise.reject(new Error(msg));
+ }
+
+ if (buildQuery === "" && this.getOption("defaultQuery") === null) {
const msg = this.getOption("labels.empty-query-and-no-default");
if (showEffect) {
@@ -846,7 +945,7 @@ function doSearch({ showEffect } = { showEffect: true }) {
.showMessage(this.getOption("timeouts.message", 4000));
}
- throw new Error(msg);
+ return Promise.reject(new Error(msg));
}
if (buildQuery === this.getOption("query")) {
@@ -859,7 +958,7 @@ function doSearch({ showEffect } = { showEffect: true }) {
.showMessage(this.getOption("timeouts.message", 4000));
}
- throw new Error(msg);
+ return Promise.reject(new Error(msg));
}
if (showEffect) {
@@ -870,6 +969,8 @@ function doSearch({ showEffect } = { showEffect: true }) {
}
this.setOption("query", buildSearchQuery.call(this, query));
+
+ return Promise.resolve();
})
.catch((error) => {
if (error instanceof Error) {
@@ -945,7 +1046,6 @@ function collectSearchQueries() {
return;
}
- //const visible = window.getComputedStyle(element).display !== "none";
const visible = getVisibilityFromSlotAttribute(element);
if (!visible) {
return;
@@ -1136,49 +1236,50 @@ function updateConfig() {
*/
function getTemplate() {
// language=HTML
- return `<div data-monster-role="control" part="control">
- <div data-monster-role="container">
- <div data-monster-role="layout">
- <div data-monster-role="filter">
- <slot></slot>
- <slot name="hidden"></slot>
- </div>
- <div data-monster-role="select-and-search">
- <monster-message-state-button data-monster-role="search-button" class="stretched-control"
- data-monster-replace="path:labels.search">
- </monster-message-state-button>
- <monster-select class="stretched-control"
- data-monster-selected-template="summary"
- data-monster-option-type="checkbox"
- data-monster-option-filter-mode="options"
- data-monster-option-filter-position="popper"
- data-monster-role="filter-select"></monster-select>
- <monster-popper-button data-monster-role="save-button" class="stretched-control"
- data-monster-attributes="data-monster-visible path:storedConfig.enabled">
- <div slot="button">\${filter-save-label}</div>
- <div class="monster-form" data-monster-role="form">
-
- <label for="filter-name">\${filter-name-label}
- <input name="filter-name"
- type="search"
- class="monster-margin-bottom-5"></label>
- <monster-message-state-button
- data-monster-role="save-action-button"
- data-monster-option-labels-button="\${filter-save-label}">
+ return `
+ <div data-monster-role="control" part="control">
+ <div data-monster-role="container">
+ <div data-monster-role="layout">
+ <div data-monster-role="filter">
+ <slot></slot>
+ <slot name="hidden"></slot>
+ </div>
+ <div data-monster-role="select-and-search">
+ <monster-message-state-button data-monster-role="search-button" class="stretched-control"
+ data-monster-replace="path:labels.search">
</monster-message-state-button>
-
+ <monster-select class="stretched-control"
+ data-monster-selected-template="summary"
+ data-monster-option-type="checkbox"
+ data-monster-option-filter-mode="options"
+ data-monster-option-filter-position="popper"
+ data-monster-role="filter-select"></monster-select>
+ <monster-popper-button data-monster-role="save-button" class="stretched-control"
+ data-monster-attributes="data-monster-visible path:features.storedConfig">
+ <div slot="button">\${filter-save-label}</div>
+ <div class="monster-form" data-monster-role="form">
+
+ <label for="filter-name">\${filter-name-label}
+ <input name="filter-name"
+ type="search"
+ class="monster-margin-bottom-5"></label>
+ <monster-message-state-button
+ data-monster-role="save-action-button"
+ data-monster-option-labels-button="\${filter-save-label}">
+ </monster-message-state-button>
+
+ </div>
+ </monster-popper-button>
+ <monster-button data-monster-role="reset-button" class="stretched-control"
+ data-monster-replace="path:labels.reset">
+ </monster-button>
</div>
- </monster-popper-button>
- <monster-button data-monster-role="reset-button" class="stretched-control"
- data-monster-replace="path:labels.reset">
- </monster-button>
- </div>
+ </div>
+ <input class="hidden" name="query" data-monster-role="query"
+ data-monster-attributes="value path:query">
+ </div>
</div>
- <input class="hidden" name="query" data-monster-role="query"
- data-monster-attributes="value path:query">
- </div>
-</div>
`;
}
diff --git a/source/data/extend.mjs b/source/data/extend.mjs
index cb82538ccd8bc404600dda238cc9a7a9845150e6..cd0dc94e37ece1a6f3d3f8bb875e8d4cf9b615b0 100644
--- a/source/data/extend.mjs
+++ b/source/data/extend.mjs
@@ -53,7 +53,8 @@ function extend(...args) {
for (const k in a) {
const v = a?.[k];
- if ((k in o) && v === o?.[k]) {
+ if (k in o && v === o?.[k]) {
+ // k in o is for the case of undefined
continue;
}
diff --git a/source/data/transformer.mjs b/source/data/transformer.mjs
index 58adf1dec114a177dff8fd7b6ab420583866004b..f2caccab73da9a46bd9d2bb6585bb73c697d4468 100644
--- a/source/data/transformer.mjs
+++ b/source/data/transformer.mjs
@@ -265,9 +265,11 @@ function transform(value) {
validateString(value);
return value.toUpperCase();
+ case "to-string":
case "tostring":
return `${value}`;
+ case "to-integer":
case "tointeger":
const n = parseInt(value);
validateInteger(n);
diff --git a/source/text/formatter.mjs b/source/text/formatter.mjs
index 70b53a3f168e6a18a45586ee2f314ff63f4c7bb0..d521a2182517dddeeb436d4af7fb813d2bb2edb7 100644
--- a/source/text/formatter.mjs
+++ b/source/text/formatter.mjs
@@ -290,7 +290,6 @@ function tokenize(text, openMarker, closeMarker) {
const callbacks = this[internalSymbol]["callbacks"];
while (true) {
-
const startIndex = text.indexOf(openMarker);
// no marker
if (startIndex === -1) {
@@ -343,7 +342,7 @@ function tokenize(text, openMarker, closeMarker) {
const t1 = key.split("|").shift().trim(); // pipe symbol
const t2 = t1.split("::").shift().trim(); // key value delimiter
const t3 = t2.split(".").shift().trim(); // path delimiter
- const prefix = (t3 in this[workingDataSymbol]) ? "path:" : "static:";
+ const prefix = t3 in this[workingDataSymbol] ? "path:" : "static:";
let command = "";
if (
diff --git a/source/types/proxyobserver.mjs b/source/types/proxyobserver.mjs
index 6bab2d64ac23906039518bb48778c5b376430f7a..cfcc8ba3e0ccee1bf6913c93907e9b40d16d9305 100644
--- a/source/types/proxyobserver.mjs
+++ b/source/types/proxyobserver.mjs
@@ -152,7 +152,7 @@ function getHandler() {
const handler = {
// https://262.ecma-international.org/9.0/#sec-proxy-object-internal-methods-and-internal-slots-get-p-receiver
get: function (target, key, receiver) {
- // this is an internal hack to identify proxy
+ // this is an internal hack to identify proxy
if (key === proxyInstanceMarker) {
return proxyInstanceMarker;
}
diff --git a/source/types/version.mjs b/source/types/version.mjs
index 9bddabf8e02793a5f427d55684ff62def624e758..1ea38f08efccb57d77d99b696c373e4935b4694a 100644
--- a/source/types/version.mjs
+++ b/source/types/version.mjs
@@ -156,7 +156,7 @@ function getMonsterVersion() {
}
/** don't touch, replaced by make with package.json version */
- monsterVersion = new Version("3.96.1");
+ monsterVersion = new Version("3.96.2");
return monsterVersion;
}
diff --git a/test/cases/monster.mjs b/test/cases/monster.mjs
index b9c9705c0a18837c86bb8c52cdf6d1702e6fbcb4..fa1ecef47f0bd437c55508aa76ea85282782dc00 100644
--- a/test/cases/monster.mjs
+++ b/test/cases/monster.mjs
@@ -7,7 +7,7 @@ describe('Monster', function () {
let monsterVersion
/** don´t touch, replaced by make with package.json version */
- monsterVersion = new Version("3.96.1")
+ monsterVersion = new Version("3.96.2")
let m = getMonsterVersion();
diff --git a/test/web/test.html b/test/web/test.html
index 3c478e4c8eef6508885427c85c12caccb8d3b831..d8047c7e2e2e2593711ad423c52f8352b519413f 100644
--- a/test/web/test.html
+++ b/test/web/test.html
@@ -9,8 +9,8 @@
</head>
<body>
<div id="headline" style="display: flex;align-items: center;justify-content: center;flex-direction: column;">
- <h1 style='margin-bottom: 0.1em;'>Monster 3.96.1</h1>
- <div id="lastupdate" style='font-size:0.7em'>last update Di 31. Dez 23:30:20 CET 2024</div>
+ <h1 style='margin-bottom: 0.1em;'>Monster 3.96.2</h1>
+ <div id="lastupdate" style='font-size:0.7em'>last update Fr 3. Jan 15:17:06 CET 2025</div>
</div>
<div id="mocha-errors"
style="color: red;font-weight: bold;display: flex;align-items: center;justify-content: center;flex-direction: column;margin:20px;"></div>
diff --git a/test/web/tests.js b/test/web/tests.js
index 3f9d7033d2053ab77f207cb3531bfa31a67377e7..bef9061b0882ee2f9571ce4939890982c087769f 100644
--- a/test/web/tests.js
+++ b/test/web/tests.js
@@ -39,7 +39,23 @@ try {
mod
));
+ // source/constants.mjs
+ var internalSymbol, internalStateSymbol, instanceSymbol, proxyInstanceMarker;
+ var init_constants = __esm({
+ "source/constants.mjs"() {
+ internalSymbol = Symbol.for("@schukai/monster/internal");
+ internalStateSymbol = Symbol.for("@schukai/monster/state");
+ instanceSymbol = Symbol.for("@schukai/monster/instance");
+ proxyInstanceMarker = Symbol.for(
+ "@schukai/monster/proxy-instance-marker"
+ );
+ }
+ });
+
// source/types/is.mjs
+ function isProxy(value) {
+ return value?.[proxyInstanceMarker] === proxyInstanceMarker;
+ }
function isIterable(value) {
if (value === void 0) return false;
if (value === null) return false;
@@ -107,6 +123,7 @@ try {
}
var init_is = __esm({
"source/types/is.mjs"() {
+ init_constants();
}
});
@@ -279,7 +296,7 @@ try {
}
for (const k in a2) {
const v = a2?.[k];
- if (v === o?.[k]) {
+ if (k in o && v === o?.[k]) {
continue;
}
if (isObject(v) && typeOf(v) === "object" || isArray(v)) {
@@ -4753,10 +4770,10 @@ ${values.join("\n")}` : `${blockName} :`;
}
});
- // node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/enums.js
+ // node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/enums.js
var AsnTypeTypes, AsnPropTypes;
var init_enums = __esm({
- "node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/enums.js"() {
+ "node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/enums.js"() {
(function(AsnTypeTypes2) {
AsnTypeTypes2[AsnTypeTypes2["Sequence"] = 0] = "Sequence";
AsnTypeTypes2[AsnTypeTypes2["Set"] = 1] = "Set";
@@ -4794,33 +4811,33 @@ ${values.join("\n")}` : `${blockName} :`;
}
});
- // node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/types/bit_string.js
+ // node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/types/bit_string.js
var import_pvtsutils;
var init_bit_string = __esm({
- "node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/types/bit_string.js"() {
+ "node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/types/bit_string.js"() {
init_index_es();
import_pvtsutils = __toESM(require_build());
}
});
- // node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/types/octet_string.js
+ // node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/types/octet_string.js
var import_pvtsutils2;
var init_octet_string = __esm({
- "node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/types/octet_string.js"() {
+ "node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/types/octet_string.js"() {
init_index_es();
import_pvtsutils2 = __toESM(require_build());
}
});
- // node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/types/index.js
+ // node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/types/index.js
var init_types = __esm({
- "node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/types/index.js"() {
+ "node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/types/index.js"() {
init_bit_string();
init_octet_string();
}
});
- // node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/converters.js
+ // node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/converters.js
function createStringConverter(Asn1Type) {
return {
fromASN: (value) => value.valueBlock.value,
@@ -4879,7 +4896,7 @@ ${values.join("\n")}` : `${blockName} :`;
}
var AsnAnyConverter, AsnIntegerConverter, AsnEnumeratedConverter, AsnBitStringConverter, AsnObjectIdentifierConverter, AsnBooleanConverter, AsnOctetStringConverter, AsnUtf8StringConverter, AsnBmpStringConverter, AsnUniversalStringConverter, AsnNumericStringConverter, AsnPrintableStringConverter, AsnTeletexStringConverter, AsnVideotexStringConverter, AsnIA5StringConverter, AsnGraphicStringConverter, AsnVisibleStringConverter, AsnGeneralStringConverter, AsnCharacterStringConverter, AsnUTCTimeConverter, AsnGeneralizedTimeConverter, AsnNullConverter;
var init_converters = __esm({
- "node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/converters.js"() {
+ "node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/converters.js"() {
init_index_es();
init_enums();
init_types();
@@ -4949,7 +4966,7 @@ ${values.join("\n")}` : `${blockName} :`;
}
});
- // node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/helper.js
+ // node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/helper.js
function isConvertible(target) {
if (typeof target === "function" && target.prototype) {
if (target.prototype.toASN && target.prototype.fromASN) {
@@ -4989,14 +5006,14 @@ ${values.join("\n")}` : `${blockName} :`;
return true;
}
var init_helper = __esm({
- "node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/helper.js"() {
+ "node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/helper.js"() {
}
});
- // node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/schema.js
+ // node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/schema.js
var AsnSchemaStorage;
var init_schema = __esm({
- "node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/schema.js"() {
+ "node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/schema.js"() {
init_index_es();
init_enums();
init_helper();
@@ -5146,19 +5163,19 @@ ${values.join("\n")}` : `${blockName} :`;
}
});
- // node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/storage.js
+ // node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/storage.js
var schemaStorage;
var init_storage = __esm({
- "node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/storage.js"() {
+ "node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/storage.js"() {
init_schema();
schemaStorage = new AsnSchemaStorage();
}
});
- // node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/decorators.js
+ // node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/decorators.js
var AsnType, AsnProp;
var init_decorators = __esm({
- "node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/decorators.js"() {
+ "node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/decorators.js"() {
init_converters();
init_enums();
init_storage();
@@ -5193,10 +5210,10 @@ ${values.join("\n")}` : `${blockName} :`;
}
});
- // node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/errors/schema_validation.js
+ // node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/errors/schema_validation.js
var AsnSchemaValidationError;
var init_schema_validation = __esm({
- "node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/errors/schema_validation.js"() {
+ "node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/errors/schema_validation.js"() {
AsnSchemaValidationError = class extends Error {
constructor() {
super(...arguments);
@@ -5206,17 +5223,17 @@ ${values.join("\n")}` : `${blockName} :`;
}
});
- // node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/errors/index.js
+ // node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/errors/index.js
var init_errors = __esm({
- "node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/errors/index.js"() {
+ "node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/errors/index.js"() {
init_schema_validation();
}
});
- // node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/parser.js
+ // node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/parser.js
var AsnParser;
var init_parser = __esm({
- "node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/parser.js"() {
+ "node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/parser.js"() {
init_index_es();
init_enums();
init_converters();
@@ -5345,10 +5362,10 @@ ${values.join("\n")}` : `${blockName} :`;
}
});
- // node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/serializer.js
+ // node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/serializer.js
var AsnSerializer;
var init_serializer = __esm({
- "node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/serializer.js"() {
+ "node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/serializer.js"() {
init_index_es();
init_converters();
init_enums();
@@ -5489,16 +5506,16 @@ ${values.join("\n")}` : `${blockName} :`;
}
});
- // node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/objects.js
+ // node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/objects.js
var init_objects = __esm({
- "node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/objects.js"() {
+ "node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/objects.js"() {
}
});
- // node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/convert.js
+ // node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/convert.js
var import_pvtsutils3, AsnConvert;
var init_convert = __esm({
- "node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/convert.js"() {
+ "node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/convert.js"() {
init_index_es();
import_pvtsutils3 = __toESM(require_build());
init_parser();
@@ -5522,9 +5539,9 @@ ${values.join("\n")}` : `${blockName} :`;
}
});
- // node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/index.js
+ // node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/index.js
var init_es2015 = __esm({
- "node_modules/.pnpm/@peculiar+asn1-schema@2.3.13/node_modules/@peculiar/asn1-schema/build/es2015/index.js"() {
+ "node_modules/.pnpm/@peculiar+asn1-schema@2.3.15/node_modules/@peculiar/asn1-schema/build/es2015/index.js"() {
init_converters();
init_types();
init_decorators();
@@ -11526,16 +11543,6 @@ ${key.data.toString("base64")}
}
});
- // source/constants.mjs
- var internalSymbol, internalStateSymbol, instanceSymbol;
- var init_constants = __esm({
- "source/constants.mjs"() {
- internalSymbol = Symbol.for("@schukai/monster/internal");
- internalStateSymbol = Symbol.for("@schukai/monster/state");
- instanceSymbol = Symbol.for("@schukai/monster/instance");
- }
- });
-
// node_modules/.pnpm/@popperjs+core@2.11.8/node_modules/@popperjs/core/lib/enums.js
var top, bottom, right, left, auto, basePlacements, start, end, clippingParents, viewport, popper, reference, variationPlacements, placements, beforeRead, read, afterRead, beforeMain, main, afterMain, beforeWrite, write, afterWrite, modifierPhases;
var init_enums2 = __esm({
@@ -14353,23 +14360,15 @@ ${key.data.toString("base64")}
return copy;
}
if (typeof Element !== "undefined" && obj instanceof Element) return obj;
- if (typeof HTMLDocument !== "undefined" && obj instanceof HTMLDocument)
- return obj;
+ if (typeof Document !== "undefined" && obj instanceof Document) return obj;
if (typeof DocumentFragment !== "undefined" && obj instanceof DocumentFragment)
return obj;
if (obj === getGlobal()) return obj;
- if (typeof globalContext !== "undefined" && obj === globalContext)
- return obj;
if (typeof window !== "undefined" && obj === window) return obj;
if (typeof document !== "undefined" && obj === document) return obj;
if (typeof navigator !== "undefined" && obj === navigator) return obj;
if (typeof JSON !== "undefined" && obj === JSON) return obj;
- try {
- if (obj instanceof Proxy) {
- return obj;
- }
- } catch (e) {
- }
+ if (isProxy(obj)) return obj;
return cloneObject(obj);
}
throw new Error("unable to clone obj! its type isn't supported.");
@@ -16414,8 +16413,10 @@ ${key.data.toString("base64")}
case "touppercase":
validateString(value);
return value.toUpperCase();
+ case "to-string":
case "tostring":
return `${value}`;
+ case "to-integer":
case "tointeger":
const n = parseInt(value);
validateInteger(n);
@@ -17053,7 +17054,7 @@ ${key.data.toString("base64")}
const t1 = key.split("|").shift().trim();
const t2 = t1.split("::").shift().trim();
const t3 = t2.split(".").shift().trim();
- const prefix = this[workingDataSymbol]?.[t3] ? "path:" : "static:";
+ const prefix = t3 in this[workingDataSymbol] ? "path:" : "static:";
let command = "";
if (prefix && key.indexOf(prefix) !== 0 && key.indexOf("path:") !== 0 && key.indexOf("static:") !== 0) {
command = prefix;
@@ -17718,6 +17719,9 @@ ${key.data.toString("base64")}
const handler = {
// https://262.ecma-international.org/9.0/#sec-proxy-object-internal-methods-and-internal-slots-get-p-receiver
get: function(target, key, receiver) {
+ if (key === proxyInstanceMarker) {
+ return proxyInstanceMarker;
+ }
const value = Reflect.get(target, key, receiver);
if (typeof key === "symbol") {
return value;
@@ -17844,7 +17848,7 @@ ${key.data.toString("base64")}
/**
* @since 1.24.0
* @param {Object} obj
- * @return {Monster.Types.ProxyObserver}
+ * @return {ProxyObserver}
*/
setSubject(obj) {
let i;
@@ -18277,7 +18281,11 @@ ${key.data.toString("base64")}
return;
}
queueMicrotask(() =>