@schukai/monster 3.96.2 → 3.97.0

package/source/types/proxyobserver.mjs

@@ -18,7 +18,7 @@ import { Observer } from "./observer.mjs";
 import { ObserverList } from "./observerlist.mjs";
 import { validateObject } from "./validate.mjs";
 import { extend } from "../data/extend.mjs";
-import { instanceSymbol } from "../constants.mjs";
+import { instanceSymbol, proxyInstanceMarker } from "../constants.mjs";
 import { clone } from "../util/clone.mjs";
 export { ProxyObserver };
 
@@ -74,7 +74,7 @@ class ProxyObserver extends Base {
 	/**
 	 * @since 1.24.0
 	 * @param {Object} obj
-	 * @return {Monster.Types.ProxyObserver}
+	 * @return {ProxyObserver}
 	 */
 	setSubject(obj) {
 		let i;
@@ -152,6 +152,11 @@ 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
+			if (key === proxyInstanceMarker) {
+				return proxyInstanceMarker;
+			}
+
 			const value = Reflect.get(target, key, receiver);
 
 			if (typeof key === "symbol") {

package/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;
 }

package/source/util/clone.mjs

@@ -13,7 +13,13 @@
  */
 
 import { getGlobal } from "../types/global.mjs";
-import { isArray, isFunction, isObject, isPrimitive } from "../types/is.mjs";
+import {
+	isArray,
+	isFunction,
+	isObject,
+	isPrimitive,
+	isProxy,
+} from "../types/is.mjs";
 import { typeOf } from "../types/typeof.mjs";
 import { validateObject } from "../types/validate.mjs";
 
@@ -71,8 +77,7 @@ function clone(obj) {
 
 		/** Do not clone DOM nodes */
 		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
@@ -81,21 +86,11 @@ function clone(obj) {
 
 		/** Do not clone global objects */
 		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;
-
-		// Handle Proxy-Object
-		try {
-			// try/catch because possible: TypeError: Function has non-object prototype 'undefined' in instanceof check
-			if (obj instanceof Proxy) {
-				return obj;
-			}
-		} catch (e) {}
-
+		if (isProxy(obj)) return obj; // Handle Proxy-Object
 		return cloneObject(obj);
 	}
 

package/test/cases/data/pathfinder.mjs

@@ -22,6 +22,24 @@ describe('Pathfinder', function () {
         return r;
     }
 
+    describe("value is not an integer issue #274", function () {
+        it("should not be fail with", function () {
+
+            const pf = new Pathfinder({
+                data: {}
+            });
+
+            try {
+                pf.setVia("data.age", 10);
+            } catch (e) {
+                expect(e).to.be.null;
+            }
+
+            expect(pf.getVia("data.age")).to.be.equal(10);
+
+        });
+    });
+
 
     describe('with Wildcard and Iterations', function () {
         let pf, obj;

package/test/cases/i18n/util.mjs

@@ -0,0 +1,295 @@
+import {getGlobal} from "../../../source/types/global.mjs";
+
+import * as chai from 'chai';
+import {chaiDom} from "../../util/chai-dom.mjs";
+import {initJSDOM} from "../../util/jsdom.mjs";
+
+let expect = chai.expect;
+chai.use(chaiDom);
+
+describe('LocalPicker', function () {
+
+    let LocalPicker, documentLanguage, linkTags, originalLanguages, getPreferredLanguage;
+
+    before(function (done) {
+        initJSDOM().then(() => {
+
+            documentLanguage = document.documentElement.lang;
+            linkTags = Array.from(document.querySelectorAll('link[rel="alternate"]'));
+            linkTags.forEach(item => item.remove());
+
+            import("element-internals-polyfill").catch(e => done(e));
+
+            import("../../../source/i18n/util.mjs").then((m) => {
+
+                LocalPicker = m['LocalPicker'];
+                getPreferredLanguage = m['detectUserLanguagePreference'];
+
+                originalLanguages = navigator.languages;
+
+                done()
+            }).catch(e => done(e))
+
+
+        });
+    })
+
+    after(function () {
+        document.documentElement.lang = documentLanguage;
+
+        linkTags.forEach(item => {
+            const link = document.createElement('link');
+            link.setAttribute('rel', 'alternate');
+            link.setAttribute('hreflang', item.hreflang);
+            link.setAttribute('href', item.href);
+
+            // check if already exits
+            if (!document.querySelector(`link[hreflang="${item.hreflang}"]`)) {
+                document.querySelector('head').appendChild(link);
+            }
+        });
+
+
+        Object.defineProperty(navigator, 'languages', {
+            value: originalLanguages,
+            writable: true
+        });
+
+
+    })
+
+    // Hilfsfunktion zum Setup eines JSDOM-Dokuments mit <html> und ggf. link-Tags
+    function setupDOM({htmlLang = '', linkHreflangs = [], navLang = ""}) {
+
+        linkTags = Array.from(document.querySelectorAll('link[rel="alternate"]'));
+        linkTags.forEach(item => item.remove());
+
+        // Links hinzufügen
+        const head = window.document.querySelector('head');
+        linkHreflangs.forEach(item => {
+            const link = window.document.createElement('link');
+            link.setAttribute('rel', 'alternate');
+            link.setAttribute('hreflang', item.hreflang);
+            link.setAttribute('href', item.href);
+            head.appendChild(link);
+        });
+
+        window.document.documentElement.lang = htmlLang;
+
+
+        Object.defineProperty(navigator, 'language', {
+            value: navLang[0] || "",
+            writable: true
+        });
+
+        Object.defineProperty(navigator, 'languages', {
+            value: navLang,
+            writable: true
+        });
+    }
+
+    describe('getPreferredLanguage()', () => {
+
+        // 1) No document language, no navigator.languages => "No language information available."
+        it('should return "No language information available." when no current and no user preferences', () => {
+            setupDOM({htmlLang: '', linkHreflangs: [], navLang: []});
+
+            const result = getPreferredLanguage();
+            expect(result).to.have.property('message').that.not.empty;
+        });
+
+        // 2) Document lang is set, but no <link> tags => "No <link> tags with hreflang available."
+        it('should return "No <link> tags with hreflang available." when there are no link tags', () => {
+            setupDOM({htmlLang: 'en', linkHreflangs: []});
+            window.navigator.languages = [];
+
+            const result = getPreferredLanguage();
+            expect(result).to.have.property('current', 'en');
+            expect(result).to.have.property('message').that.equals('No <link> tags with hreflang available.');
+        });
+
+        // 3) Document lang 'en', no user preferences, but link tags exist => "None of the preferred languages are available."
+        it('should return "None of the preferred languages are available." when there are link tags but no matching user preferences', () => {
+            setupDOM({
+                htmlLang: 'en',
+                linkHreflangs: [
+                    {hreflang: 'de', href: 'http://example.com/de'},
+                    {hreflang: 'fr', href: 'http://example.com/fr'}
+                ],
+                navLang: []
+            });
+
+            const result = getPreferredLanguage();
+            expect(result).to.have.property('current', 'en');
+            expect(result).to.have.property('message').that.equals('No available languages match the user\'s preferences.');
+            expect(result.available).to.be.an('array').that.has.lengthOf(2);
+        });
+
+        // 4) Document lang 'en', user prefers ['en'], link tags with 'en' and 'de' => best match is 'en'
+        it('should return best match = "en" when user prefers en', () => {
+            setupDOM({
+                htmlLang: 'en',
+                linkHreflangs: [
+                    {hreflang: 'en', href: 'http://example.com/en'},
+                    {hreflang: 'de', href: 'http://example.com/de'}
+                ]
+            });
+            window.navigator.languages = ['en'];
+
+            const result = getPreferredLanguage();
+            expect(result).to.have.property('current', 'en');
+            console.log(JSON.stringify(result.preferred));
+            expect(result.preferred).to.have.property('full', "en");
+            expect(result.preferred).to.have.property('base', "en");
+            expect(result.preferred).to.have.property('label', "English");
+            expect(result.preferred).to.have.property('href', "http://example.com/en");
+        });
+
+        // 5) Document lang 'de-DE', user prefers ['de-DE'], link tags with 'de-DE' & 'en-US' => best match is 'de-DE'
+        it('should return best match = "de-DE" when user prefers de-DE', () => {
+            setupDOM({
+                htmlLang: 'de-DE',
+                linkHreflangs: [
+                    {hreflang: 'de-DE', href: 'http://example.com/de-DE'},
+                    {hreflang: 'en-US', href: 'http://example.com/en-US'}
+                ]
+            });
+            window.navigator.languages = ['de-DE'];
+
+            const result = getPreferredLanguage();
+            expect(result).to.have.property('current', 'de-DE');
+
+            expect(result.preferred).to.have.property('full', "de-DE");
+            expect(result.preferred).to.have.property('base', "de");
+            expect(result.preferred).to.have.property('label', "Deutsch (Deutschland)");
+            expect(result.preferred).to.have.property('href', "http://example.com/de-DE");
+
+        });
+
+
+        // 5x) Document lang 'de-DE', user prefers ['de-DE'], link tags with 'de-DE' & 'en-US' => best match is 'de-DE'
+        it('should return best match = "de-DE" when user prefers de-DE', () => {
+            setupDOM({
+                htmlLang: 'en',
+                linkHreflangs: [
+                    {hreflang: 'de', href: 'http://example.com/de-DE'},
+                    {hreflang: 'en', href: 'http://example.com/en-US'}
+                ]
+            });
+            window.navigator.languages = ['de-DE'];
+
+            const result = getPreferredLanguage();
+            expect(result).to.have.property('current', 'en');
+
+            expect(result.preferred).to.have.property('full', "de");
+            expect(result.preferred).to.have.property('base', "de");
+            expect(result.preferred).to.have.property('label', "Deutsch");
+            expect(result.preferred).to.have.property('href', "http://example.com/de-DE");
+
+        });
+
+        // 6) Document lang 'de-DE', user prefers ['en-US', 'en'], link tags with 'en-US' & 'en-GB' => best match = 'en-US'
+        it('should return best match = "en-US" for user preferences [en-US, en]', () => {
+            setupDOM({
+                htmlLang: 'de-DE',
+                linkHreflangs: [
+                    {hreflang: 'en-US', href: 'http://example.com/en-US'},
+                    {hreflang: 'en-GB', href: 'http://example.com/en-GB'}
+                ]
+            });
+            window.navigator.languages = ['en-US', 'en'];
+
+            const result = getPreferredLanguage();
+            expect(result).to.have.property('current', 'de-DE');
+            expect(result.preferred).to.have.property('full', "en-US");
+            expect(result.preferred).to.have.property('base', "en");
+            expect(result.preferred).to.have.property('label', "English (United States)");
+            expect(result.preferred).to.have.property('href', "http://example.com/en-US");
+
+        });
+
+        // 7) Document lang 'de-DE', user prefers ['de','en'], link tags with 'de-DE' & 'en-US' => best match = 'de-DE' (baseLang = 'de')
+        it('should return best match = "de-DE" when user preferences include its base language "de"', () => {
+            setupDOM({
+                htmlLang: 'de-DE',
+                linkHreflangs: [
+                    {hreflang: 'de-DE', href: 'http://example.com/de-DE'},
+                    {hreflang: 'en-US', href: 'http://example.com/en-US'}
+                ]
+            });
+            window.navigator.languages = ['de', 'en'];
+
+            const result = getPreferredLanguage();
+            expect(result).to.have.property('current', 'de-DE');
+
+            expect(result.preferred).to.have.property('full', "de-DE");
+            expect(result.preferred).to.have.property('base', "de");
+            expect(result.preferred).to.have.property('label', "Deutsch (Deutschland)");
+            expect(result.preferred).to.have.property('href', "http://example.com/de-DE");
+
+        });
+
+        // 8) Multiple link tags share the same weight => the first in the sorted array should be returned
+        it('should return the first item when multiple link tags have the same weight', () => {
+            setupDOM({
+                htmlLang: 'en',
+                linkHreflangs: [
+                    {hreflang: 'fr', href: 'http://example.com/fr'},
+                    {hreflang: 'es', href: 'http://example.com/es'}
+                ]
+            });
+            // Neither "fr" nor "es" is in the user preferences => both have weight = 1
+            window.navigator.languages = ['de'];
+
+            const result = getPreferredLanguage();
+            // Both 'fr' and 'es' have weight 1. After sorting, 'fr' appears first (as it was added first).
+            expect(result.available[0].fullLang).to.equal('fr');
+            expect(result.available[1].fullLang).to.equal('es');
+            expect(result.offerable).to.be.undefined;
+            expect(result).to.have.property('message', 'No available languages match the user\'s preferences.');
+        });
+
+        // 9) Check that bestURL is returned if a best match is found
+        it('should include bestURL when a best match is found', () => {
+            setupDOM({
+                htmlLang: 'fr',
+                linkHreflangs: [
+                    {hreflang: 'fr-FR', href: 'http://example.com/fr-FR'},
+                    {hreflang: 'de-DE', href: 'http://example.com/de-DE'}
+                ]
+            });
+            window.navigator.languages = ['fr-FR', 'de-DE'];
+
+            const result = getPreferredLanguage();
+
+            expect(result.preferred).to.have.property('full', "fr-FR");
+            expect(result.preferred).to.have.property('base', "fr");
+            expect(result.preferred).to.have.property('label', "Français (France)");
+            expect(result.preferred).to.have.property('href', "http://example.com/fr-FR");
+
+        });
+
+        // 10) Check presence of availableLanguages array, ensuring it has weight info
+        it('should return availableLanguages with weight for each link', () => {
+            setupDOM({
+                htmlLang: 'en-GB',
+                linkHreflangs: [
+                    {hreflang: 'en-GB', href: 'http://example.com/en-GB'},
+                    {hreflang: 'en-US', href: 'http://example.com/en-US'}
+                ]
+            });
+            window.navigator.languages = ['en-GB', 'en', 'en-US'];
+
+            const result = getPreferredLanguage();
+            expect(result.available).to.be.an('array').with.lengthOf(2);
+            result.available.forEach(item => {
+                expect(item).to.have.property('weight');
+                expect(item).to.have.property('fullLang');
+                expect(item).to.have.property('baseLang');
+                expect(item).to.have.property('href');
+            });
+        });
+
+    });
+
+})

package/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();
 

package/test/cases/text/formatter.mjs

@@ -4,7 +4,27 @@ import {Formatter} from "../../../source/text/formatter.mjs";
 
 describe('Formatter', function () {
 
-    // https://gitlab.schukai.com/oss/libraries/javascript/monster/-/issues/47
+    // https://gitlab.schukai.com/oss/libraries/javascript/monster/-/issues/275
+    describe('change empty handling', function () {
+
+        it('modification 1', function () {
+
+            const  formatter = new Formatter({
+
+                a: null,
+                b: undefined,
+                c : 0
+
+
+            })
+
+            expect(formatter.format("${a | tostring}")).to.be.equal('null');
+            expect(formatter.format("${b | tostring}")).to.be.equal('undefined');
+            expect(formatter.format("${c | tostring}")).to.be.equal('0');
+        })
+    })
+
+        // https://gitlab.schukai.com/oss/libraries/javascript/monster/-/issues/47
     describe('examples', function () {
 
         it('rfc example should run', function () {

package/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>