nv-constexpr-simple-codify 1.0.5 → 1.0.7

package/README.md

@@ -55,6 +55,10 @@ Every supported leaf type has a direct 1:1 counterpart in C++. This makes the ou
 `RegExp` use a third-party library that supports compile-time regex (do NOT use std::regex)
 
 
+## String 
+`new String`  (typeof !== string BUT instanceof String) ;   this is for special use:  to generate var-name/identifier ; will NOT be quoted.
+`string`      will be JSON.stringify(quoted)   
+
 
 ## Container Support
 

package/TEST/tst-is-supported.js

@@ -4,21 +4,27 @@ const {is_supported}  = require("../index");
 // 正常情况
 console.log(is_supported({ a: 1n, b: [1, 2, 3] }));
 
+console.log(is_supported(Symbol.for("aaa")));
+
+console.log(is_supported(new String("aaa")));
+
 // 循环引用
 const circ = { a: 1 };
 circ.self = circ;
 console.log(is_supported(circ));
 
 // 不支持的类型
+console.log(is_supported(Symbol("aaa")));
 console.log(is_supported(new Set()));
 
 console.log(is_supported(Promise.resolve()));
 
 console.log(is_supported(function() {}));
 
-
+/*
 [ true, null ]
 [ false, 'Circular reference detected' ]
 [ false, 'Set/Map/WeakMap/WeakSet/WeakRef is not supported' ]
 [ false, 'Promise is not supported' ]
 [ false, 'Function is not supported' ]
+*/

package/TEST/tst.js

@@ -8,6 +8,12 @@ var code0 = codify({
         str: "hello\"world\n\t\\test",
         num: 12345.6789,
         bigint: 9007199254740993n,
+	//global sym
+	gsym: Symbol.for("gloabl-symbol"),
+	//Name
+        name: new String("varname"),    //    varname
+	str2: "varname",                //   "varname"
+
         // TypedArrays
         uint8: new Uint8Array([1, 2, 255]),
         uint8c: new Uint8ClampedArray([0, 128, 255]),

package/index.js

@@ -36,61 +36,85 @@ const _codify_ab = (o,ClsName) => {
 }
 
 const _codify_leaf = (o)=>{
-    if(o instanceof ArrayBuffer)                                   { 
+    if(o?.constructor?.name === 'ArrayBuffer') { 
         return (_codify_ab(o,"ArrayBuffer"));
-    } else if(o?.constructor?.name === 'SharedArrayBuffer')        { 
+    } else if(o?.constructor?.name === 'SharedArrayBuffer') { 
         return (_codify_ab(o,"SharedArrayBuffer"));
-    } else if(o instanceof DataView){
+    } else if(o?.constructor?.name === 'DataView'){
         return(`(new DataView((new Uint8Array(${_codify_typed_ary(o,Uint8Array)})).buffer))`);
-    } else if(o instanceof Uint8Array){ 
+    } else if(o?.constructor?.name === 'Uint8Array'){ 
         return(`(new Uint8Array(${_codify_typed_ary(o,Uint8Array)}))`);
-    } else if(o instanceof Uint8ClampedArray)    {
+    } else if(o?.constructor?.name === 'Uint8ClampedArray')    {
         return(`(new Uint8ClampedArray(${_codify_typed_ary(o,Uint8ClampedArray)}))`);
-    } else if(o instanceof Int8Array) {
+    } else if(o?.constructor?.name === 'Int8Array') {
         return(`(new Int8Array(${_codify_typed_ary(o,Int8Array)}))`);
-    } else if(o instanceof Uint16Array) {
+    } else if(o?.constructor?.name === 'Uint16Array') {
         return(`(new Uint16Array(${_codify_typed_ary(o,Uint16Array)}))`);
-    } else if(o instanceof Int16Array)  {
+    } else if(o?.constructor?.name === 'Int16Array')  {
         return(`(new Int16Array(${_codify_typed_ary(o,Int16Array)}))`);
-    } else if (o instanceof Uint32Array) {
+    } else if (o?.constructor?.name === 'Uint32Array') {
         return(`(new Uint32Array(${_codify_typed_ary(o,Uint32Array)}))`);
-    } else if (o instanceof Int32Array) {
+    } else if (o?.constructor?.name === 'Int32Array') {
         return(`(new Int32Array(${_codify_typed_ary(o,Int32Array)}))`);
-    } else if(o instanceof BigUint64Array) {
+    } else if(o?.constructor?.name === 'BigUint64Array') {
         return(`(new BigUint64Array(${_codify_typed_ary(o,BigUint64Array)}))`);
-    } else if(o instanceof BigInt64Array) {
+    } else if(o?.constructor?.name === 'BigInt64Array') {
         return(`(new BigInt64Array(${_codify_typed_ary(o,BigInt64Array)}))`);
-    } else if(o instanceof Float32Array) {
+    } else if(o?.constructor?.name === 'Float32Array') {
         return(`(new Float32Array(${_codify_typed_ary(o,Float32Array)}))`);
-    } else if(o instanceof Float64Array) {
+    } else if(o?.constructor?.name === 'Float64Array') {
         return(`(new Float64Array(${_codify_typed_ary(o,Float64Array)}))`);
-    } else if(o instanceof Date) {
+    } else if(o?.constructor?.name === 'Date') {
         var mts = o.getTime();
         return(`(new Date(${String(mts)}))`);
-    } else if(o instanceof RegExp) {
+    } else if(o?.constructor?.name === 'RegExp') {
         var source = o.source;
         var flags =  o.flags;
-        return `/${source}/${flags}`
+        return `/${source}/${flags}`;
     } else if(o === undefined){
-        return "undefined"
+        return "undefined";
     } else if(o === null)     {
         return "null";
     } else {
         var tnm = typeof(o);
         if(tnm === "string") {
-            return JSON.stringify(o)
+            return JSON.stringify(o);
         } else if(tnm === "number") {
-            return String(o)
+            return String(o);
         } else if(tnm === "boolean") {
-            return o?"true":"false"
+            return o ? "true" : "false";
         } else if(tnm === "bigint"){
             return String(o) + "n";
+        } else if(tnm === "symbol") {
+            var gkey = Symbol.keyFor(o);
+            if(gkey !== undefined) {
+                return `Symbol.for(${JSON.stringify(gkey)})`;
+            } else {
+                return undefined;
+            }
         } else {
-	    return undefined
-	}
+            if(o?.constructor?.name === 'String') {
+                return o.valueOf();       //不加引号用作name
+            } else if(o?.constructor?.name?.includes?.('Error')) {
+                var Ctor = o.constructor;
+                var msg  = o.message;       // only keep message and json-cause
+                var cause = o.cause;
+                if(cause === undefined) {
+                    return `(new ${Ctor}(${JSON.stringify(msg)}))`;
+                } else {
+                    try {
+                        cause = JSON.stringify(cause);
+                        return `(new ${Ctor}(${JSON.stringify(msg)},{cause:${cause}}))`;
+                    } catch(e) {
+                        return `(new ${Ctor}(${JSON.stringify(msg)}))`;
+                    }
+                }
+            } else {
+                return undefined;
+            }
+        }
     }
-}
-
+};
 
 function   _codify_ary(ary,depth,space,recv,is_lst,key) {
     var indent_str = space.repeat(depth);
@@ -227,9 +251,19 @@ function is_supported(o, rtrn_pair = true, seen = new WeakSet()) {
         return rtrn_pair ? [true, null] : true;
     }
 
-    // 2. 排除 Symbol
+    // 2. 排除 Local Symbol
     if (typeof o === 'symbol') {
-        return rtrn_pair ? [false, "Symbol is not supported"] : false;
+        var gkey = Symbol.keyFor(o);
+        if (gkey !== undefined) {
+            return rtrn_pair ? [true, null] : true;
+        } else {
+            return rtrn_pair ? [false, "Local Symbol is not supported"] : false;
+        }
+    }
+
+    // 特殊情况  new String 用作name
+    if (o?.constructor?.name === "String") {
+        return rtrn_pair ? [true, null] : true;
     }
 
     // 3. 排除 Function
@@ -253,36 +287,45 @@ function is_supported(o, rtrn_pair = true, seen = new WeakSet()) {
     }
 
     // 8. 支持的特殊对象类型
-    if (o instanceof Date) {
+    if (o?.constructor?.name === "Date") {
         return rtrn_pair ? [true, null] : true;
     }
 
-    if (o instanceof RegExp) {
+    if (o?.constructor?.name === "RegExp") {
         return rtrn_pair ? [true, null] : true;
     }
 
-    if (o instanceof ArrayBuffer || o?.constructor?.name === 'SharedArrayBuffer') {
+    if (
+        o?.constructor?.name === "ArrayBuffer" ||
+        o?.constructor?.name === "SharedArrayBuffer"
+    ) {
         return rtrn_pair ? [true, null] : true;
     }
 
-    if (o instanceof DataView) {
+    if (o?.constructor?.name === "DataView") {
         return rtrn_pair ? [true, null] : true;
     }
 
     // TypedArrays
-    if (
-        o instanceof Uint8Array ||
-        o instanceof Uint8ClampedArray ||
-        o instanceof Int8Array ||
-        o instanceof Uint16Array ||
-        o instanceof Int16Array ||
-        o instanceof Uint32Array ||
-        o instanceof Int32Array ||
-        o instanceof Float32Array ||
-        o instanceof Float64Array ||
-        o instanceof BigUint64Array ||
-        o instanceof BigInt64Array
-    ) {
+    const typedArrayNames = [
+        "Uint8Array",
+        "Uint8ClampedArray",
+        "Int8Array",
+        "Uint16Array",
+        "Int16Array",
+        "Uint32Array",
+        "Int32Array",
+        "Float32Array",
+        "Float64Array",
+        "BigUint64Array",
+        "BigInt64Array"
+    ];
+    if (typedArrayNames.includes(o?.constructor?.name)) {
+        return rtrn_pair ? [true, null] : true;
+    }
+
+    // Error
+    if (o?.constructor?.name?.includes?.("Error")) {
         return rtrn_pair ? [true, null] : true;
     }
 
@@ -290,7 +333,6 @@ function is_supported(o, rtrn_pair = true, seen = new WeakSet()) {
     if (Array.isArray(o)) {
         for (const item of o) {
             const res = is_supported(item, rtrn_pair, seen);
-            // 直接用 res[0] 判断，因为 res 是 [bool, string] 或 bool
             if (rtrn_pair) {
                 if (!res[0]) return res;
             } else {
@@ -302,16 +344,16 @@ function is_supported(o, rtrn_pair = true, seen = new WeakSet()) {
 
     if (o !== null && typeof o === 'object') {
         // 排除不支持的容器类型
-        if (
-            o instanceof Set ||
-            o instanceof Map ||
-            o instanceof WeakMap ||
-            o instanceof WeakSet ||
-            o instanceof WeakRef
-        ) {
+        const unsupportedContainerNames = [
+            "Set",
+            "Map",
+            "WeakMap",
+            "WeakSet",
+            "WeakRef"
+        ];
+        if (unsupportedContainerNames.includes(o?.constructor?.name)) {
             return rtrn_pair ? [false, "Set/Map/WeakMap/WeakSet/WeakRef is not supported"] : false;
         }
-
         // 递归检查每个属性值
         for (const key in o) {
             const res = is_supported(o[key], rtrn_pair, seen);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nv-constexpr-simple-codify",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"