wenay-common 1.0.96 → 1.0.98

package/lib/Common/common.d.ts

@@ -1,4 +1,5 @@
 import { Immutable, KeysWithoutType, Mutable, MutableFull, ReadonlyFull } from "./BaseTypes";
+import "./node_console";
 export declare function GetEnumKeys<TT extends {
     [key: string]: any;
 }>(T: TT): readonly (keyof typeof T)[];
@@ -185,7 +186,7 @@ export declare class CancelablePromise<T> extends Promise<T> {
     static resolve<T>(value: T | PromiseLike<T>): CancelablePromise<T>;
 }
 export declare function createCancellableTimer(interval_ms: number, onTimer: () => boolean | void, onStop?: () => void): CancelablePromise<never>;
-export declare function createCancellableTaskWrapper<T>(task: Promise<T>, isStopped: () => boolean, interval_ms?: number): Promise<"stopped" | T>;
+export declare function createCancellableTaskWrapper<T>(task: Promise<T>, isStopped: () => boolean, interval_ms?: number): Promise<T | "stopped">;
 export declare class MyTimerInterval {
     private _timer;
     private _onstop;

package/lib/Common/common.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CCachedValueT = exports.WeakMapExt = exports.MapExt = exports.CObjectID = exports.copyToClipboard = exports.Mutex = exports.MyTimerInterval = exports.createCancellableTaskWrapper = exports.createCancellableTimer = exports.CancelablePromise = exports.CancelToken = exports.JSON_clone = exports.VirtualItems = exports.ArraySet = exports.ArrayMap = exports.StructSet = exports.StructMap = exports.MyNumMap = exports.MyMap = exports.__MyMap = exports.CreateArrayProxy = exports.ArrayItemHandler = exports.DblToStrAuto = exports.GetDblPrecision = exports.GetDblPrecision2 = exports.MaxCommonDivisorOnArray = exports.MaxCommonDivisor = exports.NormalizeDouble = exports._BSearchNearest = exports.BSearchNearest = exports.BSearchDefault = exports.BSearchAsync = exports.BSearch = exports.E_MATCH = exports.E_SORTMODE = exports.CBase = exports.sleepAsync = exports.arrayShallowEqual = exports.shallowEqual = exports.deepEqual = exports.readonlyFull = exports.toImmutable = exports.deepCloneObjectMutable = exports.deepCloneObject = exports.deepCloneMutable = exports.deepClone = exports._deepClone = exports.shallowClone = exports.isDate = exports.GetEnumKeys = void 0;
 exports.isObjectCastableTo = exports.CCachedValue2 = void 0;
+require("./node_console");
 function GetEnumKeys(T) { return Object.keys(T).filter(k => isNaN(k)); }
 exports.GetEnumKeys = GetEnumKeys;
 function isDate(value) {

package/lib/Common/commonsServer.js

@@ -32,8 +32,8 @@ function funcPromiseServer(data, obj) {
                 }
                 const a = await (async () => buf(...request))()
                     .catch((e) => {
-                    data.sendMessage({ mapId: datum.mapId, error: e });
-                    console.error({ data: e, key: key, arguments: request });
+                    data.sendMessage({ mapId: datum.mapId, error: { error: e, key: key, arguments: request } });
+                    console.error({ error: e, key: key, arguments: request });
                 })
                     .then(a => {
                     if (datum.wait !== false)

package/lib/Common/node_console.d.ts

@@ -1 +1,2 @@
+/// <reference lib="esnext" />
 export {};

package/lib/Common/node_console.js

@@ -1,43 +1,71 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-let wrapCallSite;
 if (1)
-    if (typeof self != 'object' && typeof window != "object") {
-        try {
-            require('source-map-support').install();
-            wrapCallSite = require('source-map-support').wrapCallSite;
-        }
-        catch (e) {
-            console.warn(e);
+    (async () => {
+        if (typeof self != 'object' && typeof window != "object") {
+            let wrapCallSite;
+            let moduleName = 'source-map-support';
+            try {
+                let module = await Promise.resolve(`${moduleName}`).then(s => __importStar(require(s)));
+                module.install();
+                wrapCallSite = module.wrapCallSite;
+            }
+            catch (e) {
+                console.warn(e);
+                return;
+            }
+            for (let methodName of ['debug', 'log', 'warn', 'error']) {
+                const originalLoggingMethod = console[methodName];
+                console[methodName] = ((firstArgument, ...otherArguments) => {
+                    const originalPrepareStackTrace = Error.prepareStackTrace;
+                    Error.prepareStackTrace = (_, stack) => stack;
+                    let callee = new Error().stack[1];
+                    if (!callee)
+                        return;
+                    if (wrapCallSite)
+                        callee = wrapCallSite(callee);
+                    Error.prepareStackTrace = originalPrepareStackTrace;
+                    const fileName = callee.getFileName();
+                    if (fileName?.includes("source-map-support")) {
+                        originalLoggingMethod(firstArgument, ...otherArguments);
+                        return;
+                    }
+                    let fileAndLine = `${fileName}:${callee.getLineNumber()}:${callee.getColumnNumber()}  ` + callee.getFunctionName();
+                    fileAndLine = fileAndLine.replaceAll("\\", "/");
+                    if (!fileAndLine.toLowerCase().startsWith("file:///"))
+                        fileAndLine = "file:///" + fileAndLine;
+                    if (1)
+                        originalLoggingMethod(firstArgument, ...otherArguments, "", fileAndLine);
+                    else if (typeof firstArgument === 'string') {
+                        originalLoggingMethod(fileAndLine + ' ' + firstArgument, ...otherArguments);
+                    }
+                    else {
+                        originalLoggingMethod(fileAndLine, firstArgument, ...otherArguments);
+                    }
+                });
+            }
         }
-        for (let methodName of ['debug', 'log', 'warn', 'error']) {
-            const originalLoggingMethod = console[methodName];
-            console[methodName] = ((firstArgument, ...otherArguments) => {
-                const originalPrepareStackTrace = Error.prepareStackTrace;
-                Error.prepareStackTrace = (_, stack) => stack;
-                let callee = new Error().stack[1];
-                if (!callee)
-                    return;
-                if (wrapCallSite)
-                    callee = wrapCallSite(callee);
-                Error.prepareStackTrace = originalPrepareStackTrace;
-                const fileName = callee.getFileName();
-                if (fileName.includes("source-map-support")) {
-                    originalLoggingMethod(firstArgument, ...otherArguments);
-                    return;
-                }
-                let fileAndLine = `${fileName}:${callee.getLineNumber()}:${callee.getColumnNumber()}  ` + callee.getFunctionName();
-                fileAndLine = fileAndLine.replaceAll("\\", "/");
-                if (!fileAndLine.toLowerCase().startsWith("file:///"))
-                    fileAndLine = "file:///" + fileAndLine;
-                if (1)
-                    originalLoggingMethod(firstArgument, ...otherArguments, "", fileAndLine);
-                else if (typeof firstArgument === 'string') {
-                    originalLoggingMethod(fileAndLine + ' ' + firstArgument, ...otherArguments);
-                }
-                else {
-                    originalLoggingMethod(fileAndLine, firstArgument, ...otherArguments);
-                }
-            });
-        }
-    }
+    })();

package/lib/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "esnext",
+  }
+}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "wenay-common",
-  "version": "1.0.96",
-  "description": "math math math",
+  "version": "1.0.98",
+  "description": "Common library",
   "strict": true,
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
     "lib/**/*"
   ],
-  "author": "perfectoff",
+  "author": "wenay",
   "license": "ISC",
   "type": "commonjs",
   "engines": {