mam 1.11.964 → 1.11.966

package/node.d.ts

@@ -804,8 +804,8 @@ declare namespace $ {
         dir: string;
     }> {
     }
-    const $mol_run_spawn: (...args: Parameters<(typeof $node)["child_process"]["spawn"]>) => import("child_process").ChildProcess;
-    const $mol_run_spawn_sync: (...args: Parameters<(typeof $node)["child_process"]["spawnSync"]>) => import("child_process").SpawnSyncReturns<string | NonSharedBuffer>;
+    const $mol_run_spawn: (...args: Parameters<(typeof $node)["child_process"]["spawn"]>) => import("node:child_process").ChildProcess;
+    const $mol_run_spawn_sync: (...args: Parameters<(typeof $node)["child_process"]["spawnSync"]>) => import("node:child_process").SpawnSyncReturns<string | NonSharedBuffer>;
     type $mol_run_options = {
         command: readonly string[] | string;
         dir: string;
@@ -814,10 +814,10 @@ declare namespace $ {
     };
     class $mol_run extends $mol_object {
         static async_enabled(): boolean;
-        static spawn(options: $mol_run_options): import("child_process").SpawnSyncReturns<string | NonSharedBuffer> | $mol_run_error_context;
+        static spawn(options: $mol_run_options): import("node:child_process").SpawnSyncReturns<string | NonSharedBuffer> | $mol_run_error_context;
         static spawn_async({ dir, sync, timeout, command, env }: $mol_run_options & {
             sync?: boolean;
-        }): import("child_process").SpawnSyncReturns<string | NonSharedBuffer> | (Promise<$mol_run_error_context> & {
+        }): import("node:child_process").SpawnSyncReturns<string | NonSharedBuffer> | (Promise<$mol_run_error_context> & {
             destructor: () => void;
         });
         static error_message(res?: $mol_run_error_context): string;
@@ -832,7 +832,7 @@ declare namespace $ {
         uri(): string;
         options(): import("node:worker_threads").WorkerOptions;
         worker_data(): unknown;
-        worker(): Promise<import("worker_threads").Worker & {
+        worker(): Promise<import("node:worker_threads").Worker & {
             destructor: () => void;
         }>;
         restarts(next?: null): number;
@@ -1408,7 +1408,7 @@ declare namespace $ {
 declare namespace $ {
     class $mol_storage_node extends $mol_storage {
         static persisted(): boolean;
-        static stats(): import("fs").StatsFs;
+        static stats(): import("node:fs").StatsFs;
         static total(): number;
         static used(): number;
         static free(): number;
@@ -1862,9 +1862,9 @@ declare namespace $ {
     class $mol_server extends $mol_object {
         express(): import("express-serve-static-core").Express;
         internal_ip(): string;
-        http(): import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
+        http(): import("node:http").Server<typeof import("node:http").IncomingMessage, typeof import("node:http").ServerResponse>;
         connections: Set<import("ws").default>;
-        socket(): import("ws").Server<typeof import("ws").default, typeof import("http").IncomingMessage>;
+        socket(): import("ws").Server<typeof import("ws").default, typeof import("node:http").IncomingMessage>;
         expressHandlers(): readonly $mol_server_middleware[];
         expressCompressor(): $mol_server_middleware;
         expressCors(): $mol_server_middleware;
@@ -1893,8 +1893,8 @@ declare namespace $ {
         expressIndexRequest(req: typeof $node.express.request, res: typeof $node.express.response): true | undefined;
         port(): number;
         lines(next?: Map<import("ws").default, string>): Map<import("ws").default, string>;
-        socket(): import("ws").Server<typeof import("ws").default, typeof import("http").IncomingMessage>;
-        start(): import("ws").Server<typeof import("ws").default, typeof import("http").IncomingMessage>;
+        socket(): import("ws").Server<typeof import("ws").default, typeof import("node:http").IncomingMessage>;
+        start(): import("ws").Server<typeof import("ws").default, typeof import("node:http").IncomingMessage>;
         protected bundles_count(reset?: null): number;
         /**
          * Держать в памяти собранные бандлы плохо, т.к. gc их может долго не утилизировать и node сожрет память и упадет.
@@ -1910,13 +1910,13 @@ declare namespace $ {
         bundle_changed_at(path: string): Date;
         notify([line, path]: [InstanceType<$node['ws']['WebSocket']>, string]): boolean;
         slave_commands(next?: string[]): string[];
-        slave_servers(): ((import("child_process").ChildProcessByStdio<import("stream").Writable, null, null> & {
+        slave_servers(): ((import("node:child_process").ChildProcessByStdio<import("node:stream").Writable, null, null> & {
             destructor: () => void;
         }) | null)[];
-        slave_server(cmd: string): (import("child_process").ChildProcessByStdio<import("stream").Writable, null, null> & {
+        slave_server(cmd: string): (import("node:child_process").ChildProcessByStdio<import("node:stream").Writable, null, null> & {
             destructor: () => void;
         }) | null;
-        repl(): import("readline").Interface;
+        repl(): import("node:readline").Interface;
     }
 }
 

package/node.test.js

@@ -13949,7 +13949,7 @@ var $;
 })($ || ($ = {}));
 
 ;
-	($.$mol_hotkey) = class $mol_hotkey extends ($.$mol_plugin) {
+	($.$mol_hotkey2) = class $mol_hotkey2 extends ($.$mol_plugin) {
 		keydown(next){
 			if(next !== undefined) return next;
 			return null;
@@ -13957,20 +13957,11 @@ var $;
 		event(){
 			return {...(super.event()), "keydown": (next) => (this.keydown(next))};
 		}
-		key(){
+		action(){
 			return {};
 		}
-		mod_ctrl(){
-			return false;
-		}
-		mod_alt(){
-			return false;
-		}
-		mod_shift(){
-			return false;
-		}
 	};
-	($mol_mem(($.$mol_hotkey.prototype), "keydown"));
+	($mol_mem(($.$mol_hotkey2.prototype), "keydown"));
 
 
 ;
@@ -14100,27 +14091,71 @@ var $;
          * Plugin which adds handlers for keyboard keys.
          * @see [mol_keyboard_code](../keyboard/code/code.ts)
          */
-        class $mol_hotkey extends $.$mol_hotkey {
-            key() {
-                return super.key();
-            }
+        class $mol_hotkey2 extends $.$mol_hotkey2 {
             keydown(event) {
                 if (!event)
                     return;
                 if (event.defaultPrevented)
                     return;
-                let name = $mol_keyboard_code[event.keyCode];
-                if (this.mod_ctrl() !== (event.ctrlKey || event.metaKey))
-                    return;
-                if (this.mod_alt() !== event.altKey)
-                    return;
-                if (this.mod_shift() !== event.shiftKey)
-                    return;
-                const handle = this.key()[name];
-                if (handle)
-                    handle(event);
+                const key = [...new Set([
+                        ...(event.ctrlKey || event.metaKey) ? ['ctrl'] : [],
+                        ...event.altKey ? ['alt'] : [],
+                        ...event.shiftKey ? ['shift'] : [],
+                        $mol_keyboard_code[event.keyCode] ?? '?',
+                    ])].join('_');
+                this.action()[key]?.(event);
             }
         }
+        $$.$mol_hotkey2 = $mol_hotkey2;
+    })($$ = $.$$ || ($.$$ = {}));
+})($ || ($ = {}));
+
+;
+	($.$mol_hotkey) = class $mol_hotkey extends ($.$mol_hotkey2) {
+		key(){
+			return {};
+		}
+		mod_ctrl(){
+			return false;
+		}
+		mod_alt(){
+			return false;
+		}
+		mod_shift(){
+			return false;
+		}
+	};
+
+
+;
+"use strict";
+
+
+;
+"use strict";
+var $;
+(function ($) {
+    var $$;
+    (function ($$) {
+        /**
+         * Plugin which adds handlers for keyboard keys.
+         * @deprecated Use $mol_hotkey2
+         * @see [mol_keyboard_code](../keyboard/code/code.ts)
+         */
+        class $mol_hotkey extends $.$mol_hotkey {
+            action() {
+                const prefix = [...new Set([
+                        ...this.mod_ctrl() ? ['ctrl_'] : [],
+                        ...this.mod_alt() ? ['alt_'] : [],
+                        ...this.mod_shift() ? ['shift_'] : [],
+                    ])].join('');
+                return Object.fromEntries(Object.entries(this.key())
+                    .map(([key, val]) => [prefix + key, val]));
+            }
+        }
+        __decorate([
+            $mol_mem
+        ], $mol_hotkey.prototype, "action", null);
         $$.$mol_hotkey = $mol_hotkey;
     })($$ = $.$$ || ($.$$ = {}));
 })($ || ($ = {}));