Merge branch 'zephyr' of https://git.moddable.tech:3000/git/moddable into zephyr

mkellner · mkellner · commit 3325b9e744f8 · 2026-01-05T12:40:51.000-08:00
diff --git a/build/devices/zephyr/targets/esp32_ethernet_kit/manifest.json b/build/devices/zephyr/targets/esp32_ethernet_kit/manifest.json
@@ -5,17 +5,13 @@
 	"include": [
 		"$(MODULES)/io/ethernet/manifest.json"
 	],
-	"modules": {
-		"setup/target": "./setup-target"
-	},
-	"preload": "setup/target",
 	"config": {
 	},
 	"defines": {
 	},
 	"zephyrConfig": {
-        "CONFIG_ESP_SIMPLE_BOOT": "y",
-        "CONFIG_BOOTLOADER_MCUBOOT": "n",
+		"CONFIG_ESP_SIMPLE_BOOT": "y",
+		"CONFIG_BOOTLOADER_MCUBOOT": "n",
 
 		"CONFIG_ETH_ESP32": "y",
 		"CONFIG_NET_IF_MAX_IPV4_COUNT": 2
diff --git a/build/devices/zephyr/targets/esp32_ethernet_kit/setup-target.js b/build/devices/zephyr/targets/esp32_ethernet_kit/setup-target.js
diff --git a/contributed/conversationalAI/main.js b/contributed/conversationalAI/main.js
@@ -23,7 +23,7 @@ import model from "model" with { type:"json" };
 import assets from "assets";
 import Controller from "Controller";
 
-globalThis.importNow = function(specifier) @ "xs_importNow";
+globalThis.importNow = function(specifier) { return native("xs_importNow").call(this, specifier); };
 globalThis.localize = function(it) {
 	if (it) {
 		let result = locals.get(it);
diff --git a/contributed/conversationalAI/views/Levels.js b/contributed/conversationalAI/views/Levels.js
@@ -23,7 +23,7 @@ import assets from "assets";
 import Timeline from "piu/Timeline";
 import View from "Common";
 
-function computeLevel(buffer) @ "xs_computeLevel";
+function computeLevel(buffer) { return native("xs_computeLevel").call(this, buffer); };
 
 class LevelsBehavior extends View.Behavior {
 	onCreate(container, view) {
diff --git a/contributed/conversationalAI/views/Services.js b/contributed/conversationalAI/views/Services.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024-2025 Moddable Tech, Inc.
+ * Copyright (c) 2024-2026 Moddable Tech, Inc.
  *
  *   This file is part of the Moddable SDK Runtime.
  * 
@@ -23,7 +23,7 @@ import Timeline from "piu/Timeline";
 import View from "Common";
 
 class ServicesBehavior extends View.Behavior {
-	onDisplaying(container) {
+	onDisplaying(/* container */) {
 		const view = this.view;
 		const row = view.LIST.content(view.selection);
 		row.last.previous.visible = true;
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -67,6 +67,8 @@ export default defineConfig([{
 				Outline: "readonly",
 				QRCode: "readonly",
 				Shape: "readonly",
+
+				assetMap: "readonly",
 			}
 		}
 	},
diff --git a/examples/io/tcp/httpclient/httpclient.js b/examples/io/tcp/httpclient/httpclient.js
@@ -418,9 +418,7 @@ class HTTPClient {
 					return;
 			}
 			
-			if (!this.#pendingWrite || !this.#writable)
-				break;
-		} while (true);
+		} while (this.#pendingWrite && this.#writable);
 	}
 	#error(e) {
 		if (("receivedBody" === this.#state) && this.#timer) {		// completion not reported yet. report before handling error.
diff --git a/examples/io/tcp/mqttclient/mqttclient.js b/examples/io/tcp/mqttclient/mqttclient.js
@@ -75,6 +75,7 @@ class MQTTClient {
 			id: options.id ?? "",
 			clean: options.clean ?? true,
 			keepalive: options.keepAlive ?? options.keepalive ?? 0,		// for compatibilty. should eventually be removed
+			/** @type {any[] & {timer?: Timer}} */
 			pending: []
 		};
 
@@ -270,11 +271,13 @@ class MQTTClient {
 		return (this.#writable > Overhead) ? (this.#writable - Overhead) : 0;
 	}
 	read(count = this.#payload) {
+		/** @type {BufferLike} */
 		let buffer;
 		if ("object" === typeof count) {
 			buffer = count;
 			count = buffer.byteLength;
 
+			// @ts-expect-error when BYTES_PER_ELEMENT is undefined, this check works as intended
 			if (buffer.BYTES_PER_ELEMENT > 1)		// allows ArrayBuffer, SharedArrayBuffer, Uint8Array, Int8Array, DataView. disallows multi-byte element arrays.
 				throw new Error("invalid buffer");
 		}
diff --git a/examples/io/tcp/websocketclient/websocketclient.js b/examples/io/tcp/websocketclient/websocketclient.js
@@ -263,7 +263,7 @@ class WebSocketClient {
 		switch (this.#state) {
 			case "receiveStatus":
 			case "receiveHeader":
-				do {
+				for (;;) {
 					while (count--) {
 						const c = this.#socket.read();
 						this.#line += String.fromCharCode(c);
@@ -318,7 +318,7 @@ class WebSocketClient {
 					}
 
 					this.#line = "";
-				} while (true);
+				}
 				break;
 
 			case "connected": {
diff --git a/examples/js/aborthook/main.js b/examples/js/aborthook/main.js
@@ -64,4 +64,4 @@ Promise.reject(new Error("exception from promise"));
 
 throw new Error("exception from module top level");
 
-trace("will never reach here\n");
+// trace("will never reach here\n");
diff --git a/examples/js/xs-in-c/rectangle.js b/examples/js/xs-in-c/rectangle.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2025  Moddable Tech, Inc.
+ * Copyright (c) 2016-2026  Moddable Tech, Inc.
  *
  *   This file is part of the Moddable SDK.
  * 
@@ -25,7 +25,7 @@ class Rectangle extends Native("xs_rectangle_destructor") {
 	set h(it) { native("xs_rectangle_set_h").call(this, it); }
 
 	contains(x, y) { return native("xs_rectangle_contains").call(this, x, y); }
-	union(r) { native("xs_rectangle_union").call(this, r); }
+	union(...r) { native("xs_rectangle_union").call(this, ...r); }
 };
 
 export default Rectangle;
diff --git a/modules/crypt/etc/pkcs1.js b/modules/crypt/etc/pkcs1.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017  Moddable Tech, Inc.
+ * Copyright (c) 2016-2026  Moddable Tech, Inc.
  *
  *   This file is part of the Moddable SDK Runtime.
  * 
@@ -84,7 +84,7 @@ export default class PKCS1 {
 		}
 		return BigInt.fromArrayBuffer(OS);
 	};
-	static randint(max, z) {
+	static randint(max) {
 		var i = BigInt.fromArrayBuffer(RNG.get(BigInt.bitLength(max) >>> 3));
 		while (i >= max)
 			i >>>= 1;
diff --git a/modules/crypt/etc/pkcs8.js b/modules/crypt/etc/pkcs8.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2021  Moddable Tech, Inc.
+ * Copyright (c) 2016-2026  Moddable Tech, Inc.
  *
  *   This file is part of the Moddable SDK Runtime.
  *
@@ -128,7 +128,6 @@ export default class PKCS8 {
 						break;
 					default:
 						throw new Error("PKCS8: unsupported encryption scheme: " + oid);
-						break;
 					}
 					var key = pkcs12gen(pass, salt, iter.toNumber(), 16, hash, v);
 					var enc = new cipher(key);
diff --git a/modules/data/crc/crc.js b/modules/data/crc/crc.js
@@ -18,19 +18,18 @@
  *
  */
 
-
-class CRC8  @ "xs_crc8_destructor" {
-	constructor(polynomial, initial, reflectInput, reflectOutput, xorOutput) @ "xs_crc8";
-	close() @ "xs_crc8_close";
-	checksum(buffer) @ "xs_crc8_checksum";
-	reset() @ "xs_crc8_reset";
+class CRC8 extends Native("xs_crc8_destructor") {
+	constructor(polynomial, initial, reflectInput, reflectOutput, xorOutput) { super(); native("xs_crc8").call(this, polynomial, initial, reflectInput, reflectOutput, xorOutput); };
+	close() { return native("xs_crc8_close").call(this); };
+	checksum(buffer) { return native("xs_crc8_checksum").call(this, buffer); };
+	reset() { return native("xs_crc8_reset").call(this); };
 }
 
-class CRC16  @ "xs_crc16_destructor" {
-	constructor(polynomial, initial, reflectInput, reflectOutput, xorOutput) @ "xs_crc16";
-	close() @ "xs_crc16_close";
-	checksum(buffer) @ "xs_crc16_checksum";
-	reset() @ "xs_crc16_reset";
+class CRC16 extends Native("xs_crc16_destructor") {
+	constructor(polynomial, initial, reflectInput, reflectOutput, xorOutput) { super(); native("xs_crc16").call(this, polynomial, initial, reflectInput, reflectOutput, xorOutput); };
+	close() { return native("xs_crc16_close").call(this); };
+	checksum(buffer) { return native("xs_crc16_checksum").call(this, buffer); };
+	reset() { return native("xs_crc16_reset").call(this); };
 }
 
 export { CRC8 as default, CRC8, CRC16 };
diff --git a/modules/data/logical/logical.js b/modules/data/logical/logical.js
@@ -28,7 +28,7 @@ export default class {
 			return this.xor(dst, 0xff);
 		return this.xor(dst, 0xff, count);
 	}
-	static xor(dst, src) @ "xs_logical_xor";		// optional third argument count
-	static and(dst, src) @ "xs_logical_and";		// optional third argument count
-	static or(dst, src) @ "xs_logical_or";			// optional third argument count
+	static xor(dst, src) { return native("xs_logical_xor").call(this, dst, src); };		// optional third argument count
+	static and(dst, src) { return native("xs_logical_and").call(this, dst, src); };		// optional third argument count
+	static or(dst, src) { return native("xs_logical_or").call(this, dst, src); };			// optional third argument count
 }
diff --git a/modules/data/text/decoder/textdecoder.js b/modules/data/text/decoder/textdecoder.js
@@ -18,10 +18,10 @@
 *
 */
 
-export default class @ "xs_textdecoder_destructor" {
-	constructor(label, options) @ "xs_textdecoder";
-	decode(buffer) @ "xs_textdecoder_decode";
-	get encoding() @ "xs_textdecoder_get_encoding";
-	get ignoreBOM() @ "xs_textdecoder_get_ignoreBOM";
-	get fatal() @ "xs_textdecoder_get_fatal";
+export default class extends Native("xs_textdecoder_destructor") {
+	constructor(label, options) { super(); native("xs_textdecoder").call(this, label, options); };
+	decode(buffer) { return native("xs_textdecoder_decode").call(this, buffer); };
+	get encoding() { return native("xs_textdecoder_get_encoding").call(this); };
+	get ignoreBOM() { return native("xs_textdecoder_get_ignoreBOM").call(this); };
+	get fatal() { return native("xs_textdecoder_get_fatal").call(this); };
 }
diff --git a/modules/data/text/encoder/textencoder.js b/modules/data/text/encoder/textencoder.js
@@ -19,6 +19,6 @@
 */
 
 export default class {
-	encode(value) @ "xs_textencoder_encode";
-	encodeInto(value, buffer) @ "xs_textencoder_encodeInto";
+	encode(value) { return native("xs_textencoder_encode").call(this, value); };
+	encodeInto(value, buffer) { return native("xs_textencoder_encodeInto").call(this, value, buffer); };
 }
diff --git a/modules/data/url/url.js b/modules/data/url/url.js
@@ -20,10 +20,10 @@
 
 // https://url.spec.whatwg.org/#url-class
 
-function parseURL(url) @ "fx_parseURL"
-function serializeURL(url) @ "fx_serializeURL"
-function parseQuery(query) @ "fx_parseQuery"
-function serializeQuery(pairs) @ "fx_serializeQuery"
+function parseURL(url) { return native("fx_parseURL").call(this, url); }
+function serializeURL(url) { return native("fx_serializeURL").call(this, url); }
+function parseQuery(query) { return native("fx_parseQuery").call(this, query); }
+function serializeQuery(pairs) { return native("fx_serializeQuery").call(this, pairs); }
 
 const SCHEME = 1;
 const USERNAME = 2;
diff --git a/modules/files/resourceiterator/ResourceIterator.js b/modules/files/resourceiterator/ResourceIterator.js
@@ -20,7 +20,7 @@
 
 import Resource from "Resource";
 
-function index(i) @ "Resource_index";
+function index(i) { return native("Resource_index").call(this, i); };
 
 Resource[Symbol.iterator] = function() {
 	return {
diff --git a/modules/io/files/zephyr/files-zephyr.js b/modules/io/files/zephyr/files-zephyr.js
@@ -67,14 +67,15 @@ class Directory extends Native("xs_directoryzephyr_destructor") {
 	}
 
 	createDirectory(options) { return native("xs_directoryzephyr_createDirectory").call(this, options); }
-	createLink(path, target) {throw new Error("unsupported");}
+	createLink(/* path, target */) {throw new Error("unsupported");}
 
-	readLink(path) {throw new Error("unsupported");}
+	readLink(/* path */) {throw new Error("unsupported");}
 
 	scan(...path) {
 		return new DirectoryIterator(this, ...path);
 	}
 }
+// @ts-expect-error assigning scan as iterator
 Directory.prototype[Symbol.iterator] = Directory.prototype.scan;
 
 export {Directory}
diff --git a/modules/io/socket/zephyr/listener.js b/modules/io/socket/zephyr/listener.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2025  Moddable Tech, Inc.
+ * Copyright (c) 2019-2026  Moddable Tech, Inc.
  *
  *   This file is part of the Moddable SDK Runtime.
  *
@@ -24,6 +24,7 @@ class Listener extends Native("xs_listener_destructor_") {
 	constructor(options) { super(); native("xs_listener_constructor").call(this, options); };
 	close() { return native("xs_listener_close_").call(this); }
 	read() {
+		// @ts-expect-error no arguments is internal-only use of TCP constructor
 		return native("xs_listener_read").call(this, new TCP);
 	}
 
diff --git a/modules/network/dns/dnsparser.js b/modules/network/dns/dnsparser.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Moddable Tech, Inc.
+ * Copyright (c) 2018-2026 Moddable Tech, Inc.
  *
  *   This file is part of the Moddable SDK Runtime.
  *
@@ -22,21 +22,20 @@ class Parser {
 	constructor(packet) {
 		this.buffer = (packet.byteLength >= 12) ? packet : new ArrayBuffer(12);		// too small to be valid
 	}
-	get id() @ "xs_dnspacket_get_id"
-	get flags() @ "xs_dnspacket_get_flags"
-	get questions() @ "xs_dnspacket_get_questions"
-	get answers() @ "xs_dnspacket_get_answers"
-	get authorities() @ "xs_dnspacket_get_authorities"
-	get additionals() @ "xs_dnspacket_get_additionals"
-	question(index) @ "xs_dnspacket_question"
-	answer(index) @ "xs_dnspacket_answer"
+	get id() { return native("xs_dnspacket_get_id").call(this); }
+	get flags() { return native("xs_dnspacket_get_flags").call(this); }
+	get questions() { return native("xs_dnspacket_get_questions").call(this); }
+	get answers() { return native("xs_dnspacket_get_answers").call(this); }
+	get authorities() { return native("xs_dnspacket_get_authorities").call(this); }
+	get additionals() { return native("xs_dnspacket_get_additionals").call(this); }
+	question(index) { return native("xs_dnspacket_question").call(this, index); }
+	answer(index) { return native("xs_dnspacket_answer").call(this, index); }
 	authority(index) {
 		return this.answer(this.answers + index);
 	}
 	additional(index) {
 		return this.answer(this.answers + this.authorities + index);
 	}
 }
-Object.freeze(Parser.prototype);
 
 export default Parser;
diff --git a/modules/network/dns/dnsserializer.js b/modules/network/dns/dnsserializer.js
@@ -51,7 +51,7 @@ class Serializer {
 					data = Uint8Array.from(data.split(".").map(value => parseInt(value)));
 					break;
 
-				case DNS.RR.NSEC:
+				case DNS.RR.NSEC: {
 					let next = data.next.split(".").map(item => ArrayBuffer.fromString(item));
 					next.push(new ArrayBuffer(0));		// trailing 0
 					d = new Uint8Array(next.reduce((value, item) => value + item.byteLength + 1, data.bitmaps.byteLength));
@@ -62,7 +62,7 @@ class Serializer {
 					}, 0);
 					d.set(new Uint8Array(data.bitmaps), offset);
 					data = d;
-					break;
+					} break;
 
 				case DNS.RR.PTR:
 					data = data.split(".").map(item => ArrayBuffer.fromString(item));
@@ -75,7 +75,7 @@ class Serializer {
 					data = d;
 					break;
 
-				case DNS.RR.SRV:
+				case DNS.RR.SRV: {
 					let target = data.target.split(".").map(item => ArrayBuffer.fromString(item));
 					d = new Uint8Array(target.reduce((value, item) => value + item.byteLength + 1, 6 + 1));
 					d[0] = data.priority >> 8;
@@ -90,7 +90,7 @@ class Serializer {
 						return offset + 1 + item.byteLength;
 					}, 6);
 					data = d;
-					break;
+				} break;
 
 				case DNS.RR.TXT:
 					d = 0;
diff --git a/modules/network/services/chatAudioIO/ChatAudioIO.js b/modules/network/services/chatAudioIO/ChatAudioIO.js
@@ -22,7 +22,7 @@ import AudioIn from "embedded:io/audio/in";
 import AudioOut from "embedded:io/audio/out";
 import Worker from "worker";
 
-function computeLevel(buffer) @ "xs_computeLevel";
+function computeLevel(buffer) { return native("xs_computeLevel").call(this, buffer); };
 
 class ChatAudioIO {
 	static FAILED = -1;
diff --git a/modules/network/services/chatAudioIO/codecs/audio-codecs.js b/modules/network/services/chatAudioIO/codecs/audio-codecs.js
@@ -1,5 +1,5 @@
 class Encode {
-	static toAlaw(input, output) @ "xs_alaw_encode"
+	static toAlaw(input, output) { return native("xs_alaw_encode").call(this, input, output); }
 }
 
 export {Encode}
diff --git a/modules/network/services/chatAudioIO/workers/ChatWebSocketWorker.js b/modules/network/services/chatAudioIO/workers/ChatWebSocketWorker.js
diff --git a/modules/network/services/chatAudioIO/workers/JSONBase64Parser.js b/modules/network/services/chatAudioIO/workers/JSONBase64Parser.js
diff --git a/modules/network/services/chatAudioIO/workers/googleGeminiLive.js b/modules/network/services/chatAudioIO/workers/googleGeminiLive.js
diff --git a/tools/mcdevicetree.js b/tools/mcdevicetree.js
diff --git a/tools/mcmanifest.js b/tools/mcmanifest.js
diff --git a/typings/dns/parser.d.ts b/typings/dns/parser.d.ts
diff --git a/typings/dns/serializer.d.ts b/typings/dns/serializer.d.ts
diff --git a/typings/embedded_network/mqtt/client.d.ts b/typings/embedded_network/mqtt/client.d.ts

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2024-2025 Moddable Tech, Inc.`
	`2`	`+ * Copyright (c) 2024-2026 Moddable Tech, Inc.`
`3`	`3`	`*`
`4`	`4`	`* This file is part of the Moddable SDK Runtime.`
`5`	`5`	`*`
`@@ -23,7 +23,7 @@ import Timeline from "piu/Timeline";`
`23`	`23`	`import View from "Common";`
`24`	`24`
`25`	`25`	`class ServicesBehavior extends View.Behavior {`
`26`		`- onDisplaying(container) {`
	`26`	`+ onDisplaying(/* container */) {`
`27`	`27`	`const view = this.view;`
`28`	`28`	`const row = view.LIST.content(view.selection);`
`29`	`29`	`row.last.previous.visible = true;`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@ export default defineConfig([{`
`67`	`67`	`Outline: "readonly",`
`68`	`68`	`QRCode: "readonly",`
`69`	`69`	`Shape: "readonly",`
	`70`	`+`
	`71`	`+ assetMap: "readonly",`
`70`	`72`	`}`
`71`	`73`	`}`
`72`	`74`	`},`
Original file line number	Diff line number	Diff line change
`@@ -418,9 +418,7 @@ class HTTPClient {`
`418`	`418`	`return;`
`419`	`419`	`}`
`420`	`420`
`421`		`- if (!this.#pendingWrite \|\| !this.#writable)`
`422`		`- break;`
`423`		`- } while (true);`
	`421`	`+ } while (this.#pendingWrite && this.#writable);`
`424`	`422`	`}`
`425`	`423`	`#error(e) {`
`426`	`424`	`if (("receivedBody" === this.#state) && this.#timer) { // completion not reported yet. report before handling error.`
Original file line number	Diff line number	Diff line change
`@@ -64,4 +64,4 @@ Promise.reject(new Error("exception from promise"));`
`64`	`64`
`65`	`65`	`throw new Error("exception from module top level");`
`66`	`66`
`67`		`-trace("will never reach here\n");`
	`67`	`+// trace("will never reach here\n");`