prettyPrint: handle more cases in nested objects

GJS logs warnings if we pretty print an object containing null as a value. This is because a WeakSet cannot take in null values but null has typeof object.

GJS also does not print [GjsFileImporter root] objects if it is nested within another object, such as for imports.gi. This is because the logic on whether to call toString differs between prettyPrint and formatObject.

Guard explicitly against null and apply the same logic to formatObject as were in prettyPrint.

Author: garyli2

installed-tests/js/testPrint.js

@@ -202,4 +202,13 @@ describe('prettyPrint', function () {
     it('null', function () {
         expect(prettyPrint(null)).toEqual('null');
     });
+
+    it('nested null', function () {
+        expect(prettyPrint({'foo': null})).toEqual('{ foo: null }');
+    });
+
+    it('imports root in object', function () {
+        expect(prettyPrint({'foo': imports}))
+            .toEqual('{ foo: [GjsFileImporter root] }');
+    });
 });

modules/script/_bootstrap/default.js

@@ -23,15 +23,19 @@
         return nativeLogError(e, args.map(arg => typeof arg === 'string' ? arg : prettyPrint(arg)).join(' '));
     }
 
+    function _hasStandardToString(value) {
+        return value.toString === Object.prototype.toString ||
+                value.toString === Array.prototype.toString ||
+                value.toString === Date.prototype.toString;
+    }
+
     function prettyPrint(value) {
         switch (typeof value) {
         case 'object':
             if (value === null)
                 return 'null';
 
-            if (value.toString === Object.prototype.toString ||
-                value.toString === Array.prototype.toString ||
-                value.toString === Date.prototype.toString) {
+            if (_hasStandardToString(value)) {
                 const printedObjects = new WeakSet();
                 return formatObject(value, printedObjects);
             }
@@ -66,9 +70,6 @@
         if (obj instanceof Date)
             return formatDate(obj);
 
-        if (obj[Symbol.toStringTag] === 'GIRepositoryNamespace' || obj[Symbol.toStringTag] === 'GObject_ParamSpec')
-            return obj.toString();
-
         const formattedObject = [];
         const keys = Object.getOwnPropertyNames(obj).concat(Object.getOwnPropertySymbols(obj));
         for (const propertyKey of keys) {
@@ -78,8 +79,12 @@
             case 'object':
                 if (printedObjects.has(value))
                     formattedObject.push(`${key}: [Circular]`);
-                else
+                else if (value === null)
+                    formattedObject.push(`${key}: null`);
+                else if (_hasStandardToString(value))
                     formattedObject.push(`${key}: ${formatObject(value, printedObjects)}`);
+                else
+                    formattedObject.push(`${key}: ${value.toString()}`);
                 break;
             case 'function':
                 formattedObject.push(`${key}: ${formatFunction(value)}`);