Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 34 additions & 37 deletions packages/core/src/utils-hoist/object.ts
Comment thread
chargome marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import type { WrappedFunction } from '../types-hoist';

import { htmlTreeAsString } from './browser';
import { DEBUG_BUILD } from './debug-build';
import { isElement, isError, isEvent, isInstanceOf, isPlainObject, isPrimitive } from './is';
import { isElement, isError, isEvent, isInstanceOf, isPrimitive } from './is';
import { logger } from './logger';
import { truncate } from './string';

Expand DownExpand Up@@ -222,58 +222,55 @@ export function dropUndefinedKeys<T>(inputValue: T): T {
}

function _dropUndefinedKeys<T>(inputValue: T, memoizationMap: Map<unknown, unknown>): T {
if (isPojo(inputValue)) {
// If this node has already been visited due to a circular reference, return the object it was mapped to in the new object
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

const returnValue: { [key: string]: unknown } = {};
// Store the mapping of this value in case we visit it again, in case of circular data
memoizationMap.set(inputValue, returnValue);

for (const key of Object.getOwnPropertyNames(inputValue)) {
if (typeof inputValue[key] !== 'undefined') {
returnValue[key] = _dropUndefinedKeys(inputValue[key], memoizationMap);
}
}
// Early return for primitive values
if (inputValue === null || typeof inputValue !== 'object') {
return inputValue;
}

return returnValue as T;
// Check memo map first for all object types
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

// handle arrays
if (Array.isArray(inputValue)) {
// If this node has already been visited due to a circular reference, return the array it was mapped to in the new object
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

const returnValue: unknown[] = [];
// Store the mapping of this value in case we visit it again, in case of circular data
// Store mapping to handle circular references
memoizationMap.set(inputValue, returnValue);

inputValue.forEach((item: unknown) => {
returnValue.push(_dropUndefinedKeys(item, memoizationMap));
inputValue.forEach(value => {
returnValue.push(_dropUndefinedKeys(value, memoizationMap));
});

return returnValue as unknown as T;
}

if (isPojo(inputValue)) {
const returnValue: { [key: string]: unknown } = {};
// Store mapping to handle circular references
memoizationMap.set(inputValue, returnValue);

const keys = Object.keys(inputValue);

keys.forEach(key => {
const val = inputValue[key];
if (val !== undefined) {
returnValue[key] = _dropUndefinedKeys(val, memoizationMap);
}
});

return returnValue as T;
}

// For other object types, return as is
return inputValue;
}

function isPojo(input: unknown): input is Record<string, unknown> {
if (!isPlainObject(input)) {
return false;
}

try {
const name = (Object.getPrototypeOf(input) as { constructor: { name: string } }).constructor.name;
return !name || name === 'Object';
} catch {
return true;
}
// Plain objects have Object as constructor or no constructor
const constructor = (input as object).constructor;
return constructor === Object || constructor === undefined;
Comment thread
chargome marked this conversation as resolved.
}

/**
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat(core): Optimize `dropUndefinedKeys` by chargome · Pull Request #15760 · getsentry/sentry-javascript · GitHub
Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 34 additions & 37 deletions packages/core/src/utils-hoist/object.ts
Comment thread
chargome marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import type { WrappedFunction } from '../types-hoist';

import { htmlTreeAsString } from './browser';
import { DEBUG_BUILD } from './debug-build';
import { isElement, isError, isEvent, isInstanceOf, isPlainObject, isPrimitive } from './is';
import { isElement, isError, isEvent, isInstanceOf, isPrimitive } from './is';
import { logger } from './logger';
import { truncate } from './string';

Expand DownExpand Up@@ -222,58 +222,55 @@ export function dropUndefinedKeys<T>(inputValue: T): T {
}

function _dropUndefinedKeys<T>(inputValue: T, memoizationMap: Map<unknown, unknown>): T {
if (isPojo(inputValue)) {
// If this node has already been visited due to a circular reference, return the object it was mapped to in the new object
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

const returnValue: { [key: string]: unknown } = {};
// Store the mapping of this value in case we visit it again, in case of circular data
memoizationMap.set(inputValue, returnValue);

for (const key of Object.getOwnPropertyNames(inputValue)) {
if (typeof inputValue[key] !== 'undefined') {
returnValue[key] = _dropUndefinedKeys(inputValue[key], memoizationMap);
}
}
// Early return for primitive values
if (inputValue === null || typeof inputValue !== 'object') {
return inputValue;
}

return returnValue as T;
// Check memo map first for all object types
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

// handle arrays
if (Array.isArray(inputValue)) {
// If this node has already been visited due to a circular reference, return the array it was mapped to in the new object
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

const returnValue: unknown[] = [];
// Store the mapping of this value in case we visit it again, in case of circular data
// Store mapping to handle circular references
memoizationMap.set(inputValue, returnValue);

inputValue.forEach((item: unknown) => {
returnValue.push(_dropUndefinedKeys(item, memoizationMap));
inputValue.forEach(value => {
returnValue.push(_dropUndefinedKeys(value, memoizationMap));
});

return returnValue as unknown as T;
}

if (isPojo(inputValue)) {
const returnValue: { [key: string]: unknown } = {};
// Store mapping to handle circular references
memoizationMap.set(inputValue, returnValue);

const keys = Object.keys(inputValue);

keys.forEach(key => {
const val = inputValue[key];
if (val !== undefined) {
returnValue[key] = _dropUndefinedKeys(val, memoizationMap);
}
});

return returnValue as T;
}

// For other object types, return as is
return inputValue;
}

function isPojo(input: unknown): input is Record<string, unknown> {
if (!isPlainObject(input)) {
return false;
}

try {
const name = (Object.getPrototypeOf(input) as { constructor: { name: string } }).constructor.name;
return !name || name === 'Object';
} catch {
return true;
}
// Plain objects have Object as constructor or no constructor
const constructor = (input as object).constructor;
return constructor === Object || constructor === undefined;
Comment thread
chargome marked this conversation as resolved.
}

/**
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(core): Optimize `dropUndefinedKeys` by chargome · Pull Request #15760 · getsentry/sentry-javascript · GitHub
Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 34 additions & 37 deletions packages/core/src/utils-hoist/object.ts
Comment thread
chargome marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import type { WrappedFunction } from '../types-hoist';

import { htmlTreeAsString } from './browser';
import { DEBUG_BUILD } from './debug-build';
import { isElement, isError, isEvent, isInstanceOf, isPlainObject, isPrimitive } from './is';
import { isElement, isError, isEvent, isInstanceOf, isPrimitive } from './is';
import { logger } from './logger';
import { truncate } from './string';

Expand DownExpand Up@@ -222,58 +222,55 @@ export function dropUndefinedKeys<T>(inputValue: T): T {
}

function _dropUndefinedKeys<T>(inputValue: T, memoizationMap: Map<unknown, unknown>): T {
if (isPojo(inputValue)) {
// If this node has already been visited due to a circular reference, return the object it was mapped to in the new object
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

const returnValue: { [key: string]: unknown } = {};
// Store the mapping of this value in case we visit it again, in case of circular data
memoizationMap.set(inputValue, returnValue);

for (const key of Object.getOwnPropertyNames(inputValue)) {
if (typeof inputValue[key] !== 'undefined') {
returnValue[key] = _dropUndefinedKeys(inputValue[key], memoizationMap);
}
}
// Early return for primitive values
if (inputValue === null || typeof inputValue !== 'object') {
return inputValue;
}

return returnValue as T;
// Check memo map first for all object types
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

// handle arrays
if (Array.isArray(inputValue)) {
// If this node has already been visited due to a circular reference, return the array it was mapped to in the new object
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

const returnValue: unknown[] = [];
// Store the mapping of this value in case we visit it again, in case of circular data
// Store mapping to handle circular references
memoizationMap.set(inputValue, returnValue);

inputValue.forEach((item: unknown) => {
returnValue.push(_dropUndefinedKeys(item, memoizationMap));
inputValue.forEach(value => {
returnValue.push(_dropUndefinedKeys(value, memoizationMap));
});

return returnValue as unknown as T;
}

if (isPojo(inputValue)) {
const returnValue: { [key: string]: unknown } = {};
// Store mapping to handle circular references
memoizationMap.set(inputValue, returnValue);

const keys = Object.keys(inputValue);

keys.forEach(key => {
const val = inputValue[key];
if (val !== undefined) {
returnValue[key] = _dropUndefinedKeys(val, memoizationMap);
}
});

return returnValue as T;
}

// For other object types, return as is
return inputValue;
}

function isPojo(input: unknown): input is Record<string, unknown> {
if (!isPlainObject(input)) {
return false;
}

try {
const name = (Object.getPrototypeOf(input) as { constructor: { name: string } }).constructor.name;
return !name || name === 'Object';
} catch {
return true;
}
// Plain objects have Object as constructor or no constructor
const constructor = (input as object).constructor;
return constructor === Object || constructor === undefined;
Comment thread
chargome marked this conversation as resolved.
}

/**
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(core): Optimize `dropUndefinedKeys` by chargome · Pull Request #15760 · getsentry/sentry-javascript · GitHub
Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 34 additions & 37 deletions packages/core/src/utils-hoist/object.ts
Comment thread
chargome marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import type { WrappedFunction } from '../types-hoist';

import { htmlTreeAsString } from './browser';
import { DEBUG_BUILD } from './debug-build';
import { isElement, isError, isEvent, isInstanceOf, isPlainObject, isPrimitive } from './is';
import { isElement, isError, isEvent, isInstanceOf, isPrimitive } from './is';
import { logger } from './logger';
import { truncate } from './string';

Expand DownExpand Up@@ -222,58 +222,55 @@ export function dropUndefinedKeys<T>(inputValue: T): T {
}

function _dropUndefinedKeys<T>(inputValue: T, memoizationMap: Map<unknown, unknown>): T {
if (isPojo(inputValue)) {
// If this node has already been visited due to a circular reference, return the object it was mapped to in the new object
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

const returnValue: { [key: string]: unknown } = {};
// Store the mapping of this value in case we visit it again, in case of circular data
memoizationMap.set(inputValue, returnValue);

for (const key of Object.getOwnPropertyNames(inputValue)) {
if (typeof inputValue[key] !== 'undefined') {
returnValue[key] = _dropUndefinedKeys(inputValue[key], memoizationMap);
}
}
// Early return for primitive values
if (inputValue === null || typeof inputValue !== 'object') {
return inputValue;
}

return returnValue as T;
// Check memo map first for all object types
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

// handle arrays
if (Array.isArray(inputValue)) {
// If this node has already been visited due to a circular reference, return the array it was mapped to in the new object
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

const returnValue: unknown[] = [];
// Store the mapping of this value in case we visit it again, in case of circular data
// Store mapping to handle circular references
memoizationMap.set(inputValue, returnValue);

inputValue.forEach((item: unknown) => {
returnValue.push(_dropUndefinedKeys(item, memoizationMap));
inputValue.forEach(value => {
returnValue.push(_dropUndefinedKeys(value, memoizationMap));
});

return returnValue as unknown as T;
}

if (isPojo(inputValue)) {
const returnValue: { [key: string]: unknown } = {};
// Store mapping to handle circular references
memoizationMap.set(inputValue, returnValue);

const keys = Object.keys(inputValue);

keys.forEach(key => {
const val = inputValue[key];
if (val !== undefined) {
returnValue[key] = _dropUndefinedKeys(val, memoizationMap);
}
});

return returnValue as T;
}

// For other object types, return as is
return inputValue;
}

function isPojo(input: unknown): input is Record<string, unknown> {
if (!isPlainObject(input)) {
return false;
}

try {
const name = (Object.getPrototypeOf(input) as { constructor: { name: string } }).constructor.name;
return !name || name === 'Object';
} catch {
return true;
}
// Plain objects have Object as constructor or no constructor
const constructor = (input as object).constructor;
return constructor === Object || constructor === undefined;
Comment thread
chargome marked this conversation as resolved.
}

/**
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat(core): Optimize `dropUndefinedKeys` by chargome · Pull Request #15760 · getsentry/sentry-javascript · GitHub
Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 34 additions & 37 deletions packages/core/src/utils-hoist/object.ts
Comment thread
chargome marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import type { WrappedFunction } from '../types-hoist';

import { htmlTreeAsString } from './browser';
import { DEBUG_BUILD } from './debug-build';
import { isElement, isError, isEvent, isInstanceOf, isPlainObject, isPrimitive } from './is';
import { isElement, isError, isEvent, isInstanceOf, isPrimitive } from './is';
import { logger } from './logger';
import { truncate } from './string';

Expand DownExpand Up@@ -222,58 +222,55 @@ export function dropUndefinedKeys<T>(inputValue: T): T {
}

function _dropUndefinedKeys<T>(inputValue: T, memoizationMap: Map<unknown, unknown>): T {
if (isPojo(inputValue)) {
// If this node has already been visited due to a circular reference, return the object it was mapped to in the new object
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

const returnValue: { [key: string]: unknown } = {};
// Store the mapping of this value in case we visit it again, in case of circular data
memoizationMap.set(inputValue, returnValue);

for (const key of Object.getOwnPropertyNames(inputValue)) {
if (typeof inputValue[key] !== 'undefined') {
returnValue[key] = _dropUndefinedKeys(inputValue[key], memoizationMap);
}
}
// Early return for primitive values
if (inputValue === null || typeof inputValue !== 'object') {
return inputValue;
}

return returnValue as T;
// Check memo map first for all object types
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

// handle arrays
if (Array.isArray(inputValue)) {
// If this node has already been visited due to a circular reference, return the array it was mapped to in the new object
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

const returnValue: unknown[] = [];
// Store the mapping of this value in case we visit it again, in case of circular data
// Store mapping to handle circular references
memoizationMap.set(inputValue, returnValue);

inputValue.forEach((item: unknown) => {
returnValue.push(_dropUndefinedKeys(item, memoizationMap));
inputValue.forEach(value => {
returnValue.push(_dropUndefinedKeys(value, memoizationMap));
});

return returnValue as unknown as T;
}

if (isPojo(inputValue)) {
const returnValue: { [key: string]: unknown } = {};
// Store mapping to handle circular references
memoizationMap.set(inputValue, returnValue);

const keys = Object.keys(inputValue);

keys.forEach(key => {
const val = inputValue[key];
if (val !== undefined) {
returnValue[key] = _dropUndefinedKeys(val, memoizationMap);
}
});

return returnValue as T;
}

// For other object types, return as is
return inputValue;
}

function isPojo(input: unknown): input is Record<string, unknown> {
if (!isPlainObject(input)) {
return false;
}

try {
const name = (Object.getPrototypeOf(input) as { constructor: { name: string } }).constructor.name;
return !name || name === 'Object';
} catch {
return true;
}
// Plain objects have Object as constructor or no constructor
const constructor = (input as object).constructor;
return constructor === Object || constructor === undefined;
Comment thread
chargome marked this conversation as resolved.
}

/**
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(core): Optimize `dropUndefinedKeys` by chargome · Pull Request #15760 · getsentry/sentry-javascript · GitHub
Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 34 additions & 37 deletions packages/core/src/utils-hoist/object.ts
Comment thread
chargome marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import type { WrappedFunction } from '../types-hoist';

import { htmlTreeAsString } from './browser';
import { DEBUG_BUILD } from './debug-build';
import { isElement, isError, isEvent, isInstanceOf, isPlainObject, isPrimitive } from './is';
import { isElement, isError, isEvent, isInstanceOf, isPrimitive } from './is';
import { logger } from './logger';
import { truncate } from './string';

Expand DownExpand Up@@ -222,58 +222,55 @@ export function dropUndefinedKeys<T>(inputValue: T): T {
}

function _dropUndefinedKeys<T>(inputValue: T, memoizationMap: Map<unknown, unknown>): T {
if (isPojo(inputValue)) {
// If this node has already been visited due to a circular reference, return the object it was mapped to in the new object
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

const returnValue: { [key: string]: unknown } = {};
// Store the mapping of this value in case we visit it again, in case of circular data
memoizationMap.set(inputValue, returnValue);

for (const key of Object.getOwnPropertyNames(inputValue)) {
if (typeof inputValue[key] !== 'undefined') {
returnValue[key] = _dropUndefinedKeys(inputValue[key], memoizationMap);
}
}
// Early return for primitive values
if (inputValue === null || typeof inputValue !== 'object') {
return inputValue;
}

return returnValue as T;
// Check memo map first for all object types
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

// handle arrays
if (Array.isArray(inputValue)) {
// If this node has already been visited due to a circular reference, return the array it was mapped to in the new object
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

const returnValue: unknown[] = [];
// Store the mapping of this value in case we visit it again, in case of circular data
// Store mapping to handle circular references
memoizationMap.set(inputValue, returnValue);

inputValue.forEach((item: unknown) => {
returnValue.push(_dropUndefinedKeys(item, memoizationMap));
inputValue.forEach(value => {
returnValue.push(_dropUndefinedKeys(value, memoizationMap));
});

return returnValue as unknown as T;
}

if (isPojo(inputValue)) {
const returnValue: { [key: string]: unknown } = {};
// Store mapping to handle circular references
memoizationMap.set(inputValue, returnValue);

const keys = Object.keys(inputValue);

keys.forEach(key => {
const val = inputValue[key];
if (val !== undefined) {
returnValue[key] = _dropUndefinedKeys(val, memoizationMap);
}
});

return returnValue as T;
}

// For other object types, return as is
return inputValue;
}

function isPojo(input: unknown): input is Record<string, unknown> {
if (!isPlainObject(input)) {
return false;
}

try {
const name = (Object.getPrototypeOf(input) as { constructor: { name: string } }).constructor.name;
return !name || name === 'Object';
} catch {
return true;
}
// Plain objects have Object as constructor or no constructor
const constructor = (input as object).constructor;
return constructor === Object || constructor === undefined;
Comment thread
chargome marked this conversation as resolved.
}

/**
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); feat(core): Optimize `dropUndefinedKeys` by chargome · Pull Request #15760 · getsentry/sentry-javascript · GitHub
Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 34 additions & 37 deletions packages/core/src/utils-hoist/object.ts
Comment thread
chargome marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import type { WrappedFunction } from '../types-hoist';

import { htmlTreeAsString } from './browser';
import { DEBUG_BUILD } from './debug-build';
import { isElement, isError, isEvent, isInstanceOf, isPlainObject, isPrimitive } from './is';
import { isElement, isError, isEvent, isInstanceOf, isPrimitive } from './is';
import { logger } from './logger';
import { truncate } from './string';

Expand DownExpand Up@@ -222,58 +222,55 @@ export function dropUndefinedKeys<T>(inputValue: T): T {
}

function _dropUndefinedKeys<T>(inputValue: T, memoizationMap: Map<unknown, unknown>): T {
if (isPojo(inputValue)) {
// If this node has already been visited due to a circular reference, return the object it was mapped to in the new object
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

const returnValue: { [key: string]: unknown } = {};
// Store the mapping of this value in case we visit it again, in case of circular data
memoizationMap.set(inputValue, returnValue);

for (const key of Object.getOwnPropertyNames(inputValue)) {
if (typeof inputValue[key] !== 'undefined') {
returnValue[key] = _dropUndefinedKeys(inputValue[key], memoizationMap);
}
}
// Early return for primitive values
if (inputValue === null || typeof inputValue !== 'object') {
return inputValue;
}

return returnValue as T;
// Check memo map first for all object types
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

// handle arrays
if (Array.isArray(inputValue)) {
// If this node has already been visited due to a circular reference, return the array it was mapped to in the new object
const memoVal = memoizationMap.get(inputValue);
if (memoVal !== undefined) {
return memoVal as T;
}

const returnValue: unknown[] = [];
// Store the mapping of this value in case we visit it again, in case of circular data
// Store mapping to handle circular references
memoizationMap.set(inputValue, returnValue);

inputValue.forEach((item: unknown) => {
returnValue.push(_dropUndefinedKeys(item, memoizationMap));
inputValue.forEach(value => {
returnValue.push(_dropUndefinedKeys(value, memoizationMap));
});

return returnValue as unknown as T;
}

if (isPojo(inputValue)) {
const returnValue: { [key: string]: unknown } = {};
// Store mapping to handle circular references
memoizationMap.set(inputValue, returnValue);

const keys = Object.keys(inputValue);

keys.forEach(key => {
const val = inputValue[key];
if (val !== undefined) {
returnValue[key] = _dropUndefinedKeys(val, memoizationMap);
}
});

return returnValue as T;
}

// For other object types, return as is
return inputValue;
}

function isPojo(input: unknown): input is Record<string, unknown> {
if (!isPlainObject(input)) {
return false;
}

try {
const name = (Object.getPrototypeOf(input) as { constructor: { name: string } }).constructor.name;
return !name || name === 'Object';
} catch {
return true;
}
// Plain objects have Object as constructor or no constructor
const constructor = (input as object).constructor;
return constructor === Object || constructor === undefined;
Comment thread
chargome marked this conversation as resolved.
}

/**
Expand Down