') + ')', '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('^' + ".*" + ', '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" + ', '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('^' + ".*" + ', '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); } })(); })(); 3.2 merge dev by ralfhandl · Pull Request #4727 · OAI/OpenAPI-Specification · GitHub
Skip to content

3.2 merge dev - #4727

Merged
handrews merged 23 commits into
OAI:v3.2-devfrom
ralfhandl:3.2-merge-dev
Jun 15, 2025
Merged

3.2 merge dev#4727
handrews merged 23 commits into
OAI:v3.2-devfrom
ralfhandl:3.2-merge-dev

Conversation

@ralfhandl

@ralfhandlralfhandl commented Jun 15, 2025

Copy link
Copy Markdown
Contributor

This should resolve the merge conflicts between dev and v3.2-dev because it brings in all missing commits from dev and then adds a merge commit. Looks good locally with git merge.

  • schema changes are included in this pull request
  • schema changes are needed for this pull request but not done yet
  • no schema changes are needed for this pull request

handrewsand others added 23 commits June 12, 2025 18:28
@handrews
Use full schema (schema-base.yaml) for coverage
3a0fb3d
But don't count standard JSON Schema keywords.
@handrews
Do not expect coverage of unreachable schema
0fadf2e
There needs to be a local `$dynamicAnchor`, but it is never
actually evaluated.
@handrews@ralfhandl
Fix spelling
f66d94c
Co-authored-by: Ralf Handl <ralf.handl@sap.com>
@handrews@ralfhandl
Fix coverage calculation
d986f88
Co-authored-by: Ralf Handl <ralf.handl@sap.com>
@handrews
Remove stray commented-out line.
20eec3a
@handrews
Use full schema-base to run schema tests
8136caa
@handrews
Use matching jsonSchemaDialect
3a0a025
Since we are testing with a placeholder, we need to match
the placeholder. This will unfortunately need to be different
on each new release line branch, so let's separate this test
case into its own file.
@handrews@ralfhandl
Update scripts/schema-test-coverage.mjs
0c75419
Co-authored-by: Ralf Handl <ralf.handl@sap.com>
@ralfhandl
Merge pull requestOAI#4702from handrews/redundant
835059f
Use full schema (schema-base.yaml) in schema.test.mjs
@ralfhandl
Merge pull requestOAI#4701from handrews/cov-main
b862c2e
Use full schema (schema-base.yaml) for coverage
@ralfhandl
Merge pull requestOAI#4707from OAI/main
fec632d
dev: update from main
@handrews
Fix typos
3b6551c
@ralfhandl
Merge pull requestOAI#4708from handrews/fixit
1873c23
Fix typos
@handrews
Merge pull requestOAI#4709from OAI/main
eee4d20
dev: update from main
@ralfhandl
Set exit code only if base branch is not dev
ea3dd41
@handrews
Merge pull requestOAI#4712from ralfhandl/main-base-branch-for-schem…
4765634
…a-tests
schema test coverage: set exit code only if base branch is not dev
@handrews
Merge pull requestOAI#4715from OAI/main
5d06d24
dev: update from main
@ralfhandl
Determine OAS Base Vocab name
60f359f
and remove unnecessary code, thanks to @jdesrosiers
@ralfhandl
Determine OAS Base Vocab name from meta.yaml
dee2baa
@handrews
Merge pull requestOAI#4720from ralfhandl/main-determine-dialect
ce4ecec
main: determine OAS Base Vocab name from meta.yaml for schema test coverage
@ralfhandl
Merge pull requestOAI#4721from OAI/main
b173b48
dev: update from main
@handrews
Merge pull requestOAI#4719from ralfhandl/dev-determine-dialect
0703eb2
dev: don't hard-code vocabulary in test code
@ralfhandl
Merge remote-tracking branch 'upstream/dev' into 3.2-merge-dev
bdfbbcf
@ralfhandl
ralfhandl requested review from a team as code ownersJune 15, 2025 11:28
@handrews
handrews merged commit 8604a79 into OAI:v3.2-devJun 15, 2025
@ralfhandl
ralfhandl deleted the 3.2-merge-dev branch June 15, 2025 18:14
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@handrewshandrewshandrews approved these changes

Assignees

No one assigned

Labels

Housekeeping

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ralfhandl@handrews