The full traces of the ten tasks from my SWE-bench Multimodal post, from a run where GPT 6 Luna got no images. Each of these tasks was resolved with native images, with OCR text and with no images.
"Resolved" is the benchmark's own grading: the hidden tests run on the final diff after the agent stops. What the agent says about its own testing doesn't count, so a task can be resolved even when the agent could not run the tests (next-2984 had no Node.js). "Thinking" rows are the reasoning summaries the harness recorded, not the model's full reasoning.
lighthouse-4036 · rel=noopener audit should ignore mailto: links · resolved · 5 model calls · 7 commands · 60 s
What the images show: The noopener audit flagging mailto links; Chrome for Android opening a blank page
What the text already says: Title: the audit "should ignore href="mailto:x@y.com" links". The repo already skips javascript: links the same way
rel="noopener" audit should ignore href="mailto:x@y.com" links
<img width="699" alt="screen shot 2017-11-01 at 2 34 04 pm" src="https://user-images.githubusercontent.com/3506071/32291560-c8efe24e-bf13-11e7-9f43-aebd77968668.png">
Following this suggestion for these `mailto:` links causes the links to break on Chrome for Android and iOS Safari. Unfortunately, we only found this issue in production :(
Reproduction:
```
<ul>
<li>
<a href="mailto:sales@marketamplified.com" target="_blank">
<mat-icon>mail_outline</mat-icon>Sales
</a>
</li>
<li>
<a href="mailto:support@marketamplified.com" target="_blank" rel="noopener">
<mat-icon>mail_outline</mat-icon>Support
</a>
</li>
</ul>
```
The support link fails as seen above on Chrome for Android. The sales link works fine and launches Gmail from Chrome for Android.
You cannot see the images in this message; each was removed and only its position is marked.
[Image 1 of 2]
[Image 2 of 2]I need to modify the repository and inspect it further. The user mentioned that the rel=noopener audit should ignore mailto links, which seems to be related to a request issue. I should identify the specific project involved. First, I'll start with a preamble to explain what I'm doing and then proceed with the relevant commands. This way, the user will know I'm addressing their concerns directly!
I’ll locate the noopener audit and its tests, then make mailto: links exempt.
pwd && rg -n "noopener|rel.*audit|target=.*_blank" . --glob '!node_modules' --glob '!vendor'output · 65 lines
Chunk ID: 159d7e
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 2232
Output:
/testbed
./lighthouse-cli/test/smokehouse/dobetterweb/dbw-expectations.js:50: 'external-anchors-use-rel-noopener': {
./lighthouse-cli/test/smokehouse/dobetterweb/dbw-expectations.js:301: 'external-anchors-use-rel-noopener': {
./docs/understanding-results.md:187:| result | `Object` | The actual audit result, a copy of the audit object found in [audits](#audits). *NOTE: this property will likely be removed in upcoming releases; use the `id` property to lookup the result in the `audits` property.* |
./lighthouse-cli/test/fixtures/dobetterweb/dbw_tester.html:22:<!-- we use a relative protocol url to test that `new URL(resource)` in the critical-request-chains.js audit can handle it -->
./lighthouse-cli/test/fixtures/dobetterweb/dbw_tester.html:103:<template id="noopener-links-tmpl">
./lighthouse-cli/test/fixtures/dobetterweb/dbw_tester.html:104: <!-- FAIL - does not use rel="noopener" to open external link -->
./lighthouse-cli/test/fixtures/dobetterweb/dbw_tester.html:105: <a href="https://www.google.com/" target="_blank">external link</a>
./lighthouse-cli/test/fixtures/dobetterweb/dbw_tester.html:106: <!-- FAIL - does not use rel="noopener" and has no href attribute, giving an
./lighthouse-cli/test/fixtures/dobetterweb/dbw_tester.html:108: <a target="_blank">external link</a>
./lighthouse-cli/test/fixtures/dobetterweb/dbw_tester.html:110: <a href="https://www.google.com/" target="_blank" rel="noopener nofollow">external link that uses rel noopener and another unrelated rel attribute</a>
./lighthouse-cli/test/fixtures/dobetterweb/dbw_tester.html:112: <a href="./doesnotexist" target="_blank">internal link is ok</a>
./lighthouse-cli/test/fixtures/dobetterweb/dbw_tester.html:294: stampTemplate('noopener-links-tmpl', document.body);
./lighthouse-cli/test/fixtures/dobetterweb/dbw_tester.html:374: if (params.has('relnoopener')) {
./changelog.md:24:* audit: Ignore `href=javascript:.*` for `rel=noopener` audit ([#3574](https://github.com/googlechrome/lighthouse/pull/3574))
./changelog.md:298:Thanks to Katie Hempenius, Artur M, Kevin Farrugia, Piper Chester, Robin Drexler, and Mike Deverell. Due to the effort of these developers we now have an audit for checking for paste-blocked password fields, unified usage of toLocaleString(), a correct gulp recipe, a well-functioning chrome-launcher module, and improved clarity in the audit test descriptions. **We truly appreciate all these improvements!**
./changelog.md:882:- **Audit:** Handle invalid URLs in `external-anchors-use-rel-noopener` audit - #1358
./changelog.md:927:- **Audit:** handle anchor tags with no href in 'external-anchors-use-rel-noopener' audit - #1238
./changelog.md:1030:- **Audit:** identify `noopener` when in list of link types in `rel` - #1035
./changelog.md:1089:- **Audit:** Add DBW audit for `rel=noopener` on external links - #912
./lighthouse-core/test/results/sample_v2.json:1198: "helpText": "When a button doesn't have an accessible name, screen readers announce it as \"button\", making it unusable for users who rely on screen readers. [Learn more](https://developers.google.com/web/tools/lighthouse/audits/button-name)."
./lighthouse-core/test/results/sample_v2.json:1533: "helpText": "A value greater than 0 implies an explicit navigation ordering. Although technically valid, this often creates frustrating experiences for users who rely on assistive technologies. [Learn more](https://developers.google.com/web/tools/lighthouse/audits/tabindex)."
./lighthouse-core/test/results/sample_v2.json:2135: "external-anchors-use-rel-noopener": {
./lighthouse-core/test/results/sample_v2.json:2146: "url": "<a href=\"https://www.google.com/\" target=\"_blank\">"
./lighthouse-core/test/results/sample_v2.json:2152: "url": "<a target=\"_blank\">"
./lighthouse-core/test/results/sample_v2.json:2158: "url": "<a href=\"./doesnotexist\" target=\"_blank\">"
./lighthouse-core/test/results/sample_v2.json:2163: "name": "external-anchors-use-rel-noopener",
./lighthouse-core/test/results/sample_v2.json:2165: "description": "Opens external anchors using `rel=\"noopener\"`",
./lighthouse-core/test/results/sample_v2.json:2166: "helpText": "Open new tabs using `rel=\"noopener\"` to improve performance and prevent security vulnerabilities. [Learn more](https://developers.google.com/web/tools/lighthouse/audits/noopener).",
./lighthouse-core/test/results/sample_v2.json:5125: "helpText": "When a button doesn't have an accessible name, screen readers announce it as \"button\", making it unusable for users who rely on screen readers. [Learn more](https://developers.google.com/web/tools/lighthouse/audits/button-name)."
./lighthouse-core/test/results/sample_v2.json:5580: "helpText": "A value greater than 0 implies an explicit navigation ordering. Although technically valid, this often creates frustrating experiences for users who rely on assistive technologies. [Learn more](https://developers.google.com/web/tools/lighthouse/audits/tabindex)."
./lighthouse-core/test/results/sample_v2.json:6392: "id": "external-anchors-use-rel-noopener",
./lighthouse-core/test/results/sample_v2.json:6405: "url": "<a href=\"https://www.google.com/\" target=\"_blank\">"
./lighthouse-core/test/results/sample_v2.json:6411: "url": "<a target=\"_blank\">"
./lighthouse-core/test/results/sample_v2.json:6417: "url": "<a href=\"./doesnotexist\" target=\"_blank\">"
./lighthouse-core/test/results/sample_v2.json:6422: "name": "external-anchors-use-rel-noopener",
./lighthouse-core/test/results/sample_v2.json:6424: "description": "Opens external anchors using `rel=\"noopener\"`",
./lighthouse-core/test/results/sample_v2.json:6425: "helpText": "Open new tabs using `rel=\"noopener\"` to improve performance and prevent security vulnerabilities. [Learn more](https://developers.google.com/web/tools/lighthouse/audits/noopener).",
./lighthouse-core/test/report/v2/renderer/dom-test.js:82: 'Some <a rel="noopener" target="_blank" href="https://example.com/foo">link</a>. ' +
./lighthouse-core/test/report/v2/renderer/dom-test.js:83: '<a rel="noopener" target="_blank" href="http://example.com/">Learn more</a>.');
./lighthouse-core/test/report/v2/renderer/dom-test.js:87: '<a rel="noopener" target="_blank" href="https://example.com/foo">link</a>',
./lighthouse-core/test/report/v2/renderer/dom-test.js:93: '<a rel="noopener" target="_blank" href="https://example.com/foo"> Link </a> ' +
./lighthouse-core/test/report/v2/renderer/dom-test.js:115: 'good. <a rel="noopener" target="_blank" href="https://dequeuniversity.com/rules/axe/2.2/td-headers-attr">Learn more</a>.');
./lighthouse-core/test/report/v2/renderer/details-renderer-test.js:199: assert.equal(el.rel, 'noopener');
./lighthouse-core/test/audits/dobetterweb/external-anchors-use-rel-noopener-test.js:9: require('../../../audits/dobetterweb/external-anchors-use-rel-noopener.js');
./lighthouse-core/test/audits/dobetterweb/external-anchors-use-rel-noopener-test.js:16:describe('External anchors use rel="noopener"', () => {
./lighthouse-core/report/v2/templates.html:324: <div class="lh-metadata__results">Results for: <a href="" class="lh-metadata__url" target="_blank" rel="noopener"><!-- fill me --></a></div>
./lighthouse-core/report/v2/templates.html:386: <a href="https://github.com/GoogleChrome/Lighthouse/issues" target="_blank" rel="noopener">File an issue</a>
./lighthouse-core/report/v2/renderer/dom.js:108: a.rel = 'noopener';
./lighthouse-core/report/v2/renderer/details-renderer.js:107: a.rel = 'noopener';
./lighthouse-core/gather/gatherers/dobetterweb/anchors-with-no-rel-noopener.js:19: const selector = 'a[target="_blank"]:not([rel~="noopener"])';
./lighthouse-core/config/default.js:30: 'dobetterweb/anchors-with-no-rel-noopener',
./lighthouse-core/config/default.js:153: 'dobetterweb/external-anchors-use-rel-noopener',
./lighthouse-core/config/default.js:340: {id: 'external-anchors-use-rel-noopener', weight: 1},
./lighthouse-core/audits/dobetterweb/external-anchors-use-rel-noopener.js:17: name: 'external-anchors-use-rel-noopener',
./lighthouse-core/audits/dobetterweb/external-anchors-use-rel-noopener.js:18: description: 'Opens external anchors using `rel="noopener"`',
./lighthouse-core/audits/dobetterweb/external-anchors-use-rel-noopener.js:19: failureDescription: 'Does not open external anchors using `rel="noopener"`',
./lighthouse-core/audits/dobetterweb/external-anchors-use-rel-noopener.js:20: helpText: 'Open new tabs using `rel="noopener"` to improve performance and ' +
./lighthouse-core/audits/dobetterweb/external-anchors-use-rel-noopener.js:22: '[Learn more](https://developers.google.com/web/tools/lighthouse/audits/noopener).',I need to take a closer look at the instructions and the files available. I'm thinking maybe there are root AGENTS present in the current working directory, but I’m not sure. The developer mentioned that the root AGENT is included, but I can’t seem to find anything. So, I guess I’ll need to use ls or find to search for any applicable files or indications related to the AGENTS. Let's see what I can uncover!
rg --files -g 'AGENTS.md' -g '!node_modules' -g '!vendor' /testbed / 2>/dev/null | head -80output · 6 lines
Chunk ID: 065d07
Wall time: 0.0480 seconds
Process exited with code 0
Original token count: 0
Output:sed -n '1,240p' lighthouse-core/audits/dobetterweb/external-anchors-use-rel-noopener.js && printf '\n--- TEST ---\n' && sed -n '1,280p' lighthouse-core/test/audits/dobetterweb/external-anchors-use-rel-noopener-test.jsoutput · 161 lines
Chunk ID: 338291
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1478
Output:
/**
* @license Copyright 2016 Google Inc. All Rights Reserved.
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
*/
'use strict';
const URL = require('../../lib/url-shim');
const Audit = require('../audit');
class ExternalAnchorsUseRelNoopenerAudit extends Audit {
/**
* @return {!AuditMeta}
*/
static get meta() {
return {
name: 'external-anchors-use-rel-noopener',
description: 'Opens external anchors using `rel="noopener"`',
failureDescription: 'Does not open external anchors using `rel="noopener"`',
helpText: 'Open new tabs using `rel="noopener"` to improve performance and ' +
'prevent security vulnerabilities. ' +
'[Learn more](https://developers.google.com/web/tools/lighthouse/audits/noopener).',
requiredArtifacts: ['URL', 'AnchorsWithNoRelNoopener'],
};
}
/**
* @param {!Artifacts} artifacts
* @return {!AuditResult}
*/
static audit(artifacts) {
let debugString;
const pageHost = new URL(artifacts.URL.finalUrl).host;
// Filter usages to exclude anchors that are same origin
// TODO: better extendedInfo for anchors with no href attribute:
// https://github.com/GoogleChrome/lighthouse/issues/1233
// https://github.com/GoogleChrome/lighthouse/issues/1345
const failingAnchors = artifacts.AnchorsWithNoRelNoopener
.filter(anchor => {
try {
return new URL(anchor.href).host !== pageHost;
} catch (err) {
debugString = 'Lighthouse was unable to determine the destination ' +
'of some anchor tags. If they are not used as hyperlinks, ' +
'consider removing the _blank target.';
return true;
}
})
.filter(anchor => {
// Ignore href's that are not real links
return !anchor.href || !anchor.href.toLowerCase().startsWith('javascript:');
})
.map(anchor => {
return {
href: anchor.href || 'Unknown',
target: anchor.target || '',
rel: anchor.rel || '',
url: '<a' +
(anchor.href ? ` href="${anchor.href}"` : '') +
(anchor.target ? ` target="${anchor.target}"` : '') +
(anchor.rel ? ` rel="${anchor.rel}"` : '') + '>',
};
});
const headings = [
{key: 'href', itemType: 'url', text: 'URL'},
{key: 'target', itemType: 'text', text: 'Target'},
{key: 'rel', itemType: 'text', text: 'Rel'},
];
const details = Audit.makeTableDetails(headings, failingAnchors);
return {
rawValue: failingAnchors.length === 0,
extendedInfo: {
value: failingAnchors,
},
details,
debugString,
};
}
}
module.exports = ExternalAnchorsUseRelNoopenerAudit;
--- TEST ---
/**
* @license Copyright 2016 Google Inc. All Rights Reserved.
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
*/
'use strict';
const ExternalAnchorsAudit =
require('../../../audits/dobetterweb/external-anchors-use-rel-noopener.js');
const assert = require('assert');
const URL = 'https://google.com/test';
/* eslint-env mocha */
describe('External anchors use rel="noopener"', () => {
it('passes when links are from same hosts as the page host', () => {
const auditResult = ExternalAnchorsAudit.audit({
AnchorsWithNoRelNoopener: [
{href: 'https://google.com/test'},
{href: 'https://google.com/test1'},
],
URL: {finalUrl: URL},
});
assert.equal(auditResult.rawValue, true);
assert.equal(auditResult.details.items.length, 0);
assert.equal(auditResult.details.items.length, 0);
});
it('fails when links are from different hosts than the page host', () => {
const auditResult = ExternalAnchorsAudit.audit({
AnchorsWithNoRelNoopener: [
{href: 'https://example.com/test'},
{href: 'https://example.com/test1'},
],
URL: {finalUrl: URL},
});
assert.equal(auditResult.rawValue, false);
assert.equal(auditResult.details.items.length, 2);
assert.equal(auditResult.details.items.length, 2);
});
it('handles links with no href attribute', () => {
const auditResult = ExternalAnchorsAudit.audit({
AnchorsWithNoRelNoopener: [
{href: ''},
{href: 'http://'},
{href: 'http:'},
],
URL: {finalUrl: URL},
});
assert.equal(auditResult.rawValue, false);
assert.equal(auditResult.details.items.length, 3);
assert.equal(auditResult.details.items.length, 3);
assert.ok(auditResult.debugString, 'includes debugString');
});
it('does not fail for links with javascript in href attribute', () => {
const auditResult = ExternalAnchorsAudit.audit({
AnchorsWithNoRelNoopener: [
{href: 'javascript:void(0)'},
{href: 'JAVASCRIPT:void(0)'},
],
URL: {finalUrl: URL},
});
assert.equal(auditResult.rawValue, true);
assert.equal(auditResult.details.items.length, 0);
});
});sed -n '90,125p' lighthouse-cli/test/fixtures/dobetterweb/dbw_tester.html && cat package.json | head -100 && git status --shortoutput · 142 lines
Chunk ID: 6b5fe4
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1393
Output:
</style>
</template>
</head>
<body>
<div>
<h2>Do better web tester page</h2>
<span>Hi there!</span>
</div>
<section id="touchmove-section">touchmove section</section>
<template id="noopener-links-tmpl">
<!-- FAIL - does not use rel="noopener" to open external link -->
<a href="https://www.google.com/" target="_blank">external link</a>
<!-- FAIL - does not use rel="noopener" and has no href attribute, giving an
href value of '' when read, which will throw in a `new URL('')` constructor -->
<a target="_blank">external link</a>
<!-- PASS -->
<a href="https://www.google.com/" target="_blank" rel="noopener nofollow">external link that uses rel noopener and another unrelated rel attribute</a>
<!-- PASS -->
<a href="./doesnotexist" target="_blank">internal link is ok</a>
</template>
<template id="password-inputs-can-be-pasted-into">
<!-- FAIL - calls preventDefault on event -->
<input type="password" onpaste="event.preventDefault();" />
<!-- PASS -->
<input type="password" />
<!-- FAIL - returns false in event handler -->
<input type="password" onpaste="return false;" />
</template>
<!-- FAIL(image-aspect-ratio): image is naturally 480x318 -->
{
"name": "lighthouse",
"version": "2.6.0",
"description": "Lighthouse",
"main": "./lighthouse-core/index.js",
"bin": {
"lighthouse": "./lighthouse-cli/index.js",
"chrome-debug": "./chrome-launcher/manual-chrome-launcher.js"
},
"engines": {
"node": ">=6"
},
"scripts": {
"install-all": "npm-run-posix-or-windows install-all:task",
"install-all:task": "yarn & yarn install-extension & yarn install-viewer & wait",
"install-all:task:windows": "yarn && yarn install-extension && yarn install-viewer",
"install-extension": "cd ./lighthouse-extension && yarn install",
"install-viewer": "cd ./lighthouse-viewer && yarn install",
"build-all": "npm-run-posix-or-windows build-all:task",
"build-all:task": "yarn build-extension & yarn build-viewer & wait",
"build-all:task:windows": "yarn build-extension && yarn build-viewer",
"build-extension": "cd ./lighthouse-extension && yarn build",
"build-viewer": "cd ./lighthouse-viewer && yarn build",
"clean": "rimraf *.report.html *.report.dom.html *.report.json *.screenshots.html *.devtoolslog.json *.trace.json || true",
"lint": "[ \"$CI\" = true ] && eslint --quiet -f codeframe . || eslint .",
"smoke": "bash lighthouse-cli/test/smokehouse/run-all-tests.sh",
"coverage": "istanbul cover -x \"**/third_party/**\" _mocha -- $(find */test -name '*-test.js') --timeout 10000 --reporter progress --report lcovonly",
"coveralls": "yarn coverage && cat ./coverage/lcov.info | coveralls && ./node_modules/codecov/bin/codecov",
"start": "node ./lighthouse-cli/index.js",
"test": "yarn lint --quiet && yarn unit && yarn type-check && yarn closure",
"unit-core": "bash lighthouse-core/scripts/run-mocha.sh --core",
"unit-cli": "bash lighthouse-core/scripts/run-mocha.sh --cli",
"unit-viewer": "bash lighthouse-core/scripts/run-mocha.sh --viewer",
"unit": "bash lighthouse-core/scripts/run-mocha.sh --default",
"core-unit": "yarn unit-core",
"cli-unit": "yarn unit-cli",
"viewer-unit": "yarn unit-viewer",
"closure": "cd lighthouse-core && node closure/closure-type-checking.js",
"devtools": "bash lighthouse-core/scripts/roll-to-devtools.sh",
"compile-devtools": "bash lighthouse-core/scripts/compile-against-devtools.sh",
"watch": "bash lighthouse-core/scripts/run-mocha.sh --watch",
"chrome": "node chrome-launcher/manual-chrome-launcher.js",
"fast": "yarn start -- --disable-device-emulation --disable-cpu-throttling --disable-network-throttling",
"smokehouse": "node lighthouse-cli/test/smokehouse/smokehouse.js",
"deploy-viewer": "cd lighthouse-viewer && gulp deploy",
"bundlesize": "bundlesize",
"plots-smoke": "bash plots/test/smoke.sh",
"changelog": "conventional-changelog --config ./build/changelog-generator/index.js --infile changelog.md --same-file",
"type-check": "tsc -p ."
},
"devDependencies": {
"@types/configstore": "^2.1.1",
"@types/inquirer": "^0.0.35",
"@types/node": "*",
"@types/opn": "^3.0.28",
"@types/update-notifier": "^1.0.2",
"@types/yargs": "^8.0.2",
"babel-core": "^6.16.0",
"bundlesize": "^0.14.4",
"codecov": "^2.2.0",
"commitizen": "^2.9.6",
"conventional-changelog-cli": "^1.3.4",
"coveralls": "^2.11.9",
"cz-customizable": "^5.2.0",
"eslint": "^4.8.0",
"eslint-config-google": "^0.9.1",
"google-closure-compiler": "^20170521.0.0",
"gulp": "^3.9.1",
"gulp-replace": "^0.5.4",
"gulp-util": "^3.0.7",
"istanbul": "^0.4.3",
"jsdom": "^9.12.0",
"mocha": "^3.2.0",
"npm-run-posix-or-windows": "^2.0.2",
"typescript": "^2.6.1",
"zone.js": "^0.7.3"
},
"dependencies": {
"axe-core": "2.4.1",
"chrome-devtools-frontend": "1.0.422034",
"chrome-launcher": "0.8.1",
"configstore": "^3.1.1",
"devtools-timeline-model": "1.1.6",
"http-link-header": "^0.8.0",
"inquirer": "^3.3.0",
"jpeg-js": "0.1.2",
"js-library-detector": "^4.0.0",
"json-stringify-safe": "5.0.1",
"lighthouse-logger": "^1.0.0",
"metaviewport-parser": "0.1.0",
"mkdirp": "0.5.1",
"opn": "4.0.2",
"parse-cache-control": "1.0.1",
"raven": "^2.2.1",
"rimraf": "^2.6.1",
"semver": "^5.3.0",
"speedline": "1.3.0",
"update-notifier": "^2.1.0",
"whatwg-url": "^6.3.0",
"ws": "3.3.2",I need to update the audit implementation to specifically exclude mailto links. The current filter ordering is causing issues since it's checking new URL mailto cases, and I need a way to parse this correctly. I should ensure JavaScript handling is included too. Maybe I can separate this with conditions to ignore actual links while still ensuring that mailto links aren't parsed incorrectly. Overall, I'm focused on simplifying the logic to avoid unnecessary URL parsing, while still being thorough in the audit checks.Updating Mailto Protocol Handling
It seems the new URL for mailto likely returns an empty host, which isn’t producing an exception. I should implement an extension in the predicate and set up a unit test that checks mixed-case mailto links, since that’s likely a requirement. There might be a need to create separate tests for mailto specifically. Also, I should consider adding a changelog entry for clarity and check if existing tests cover this. Focused changes are the goal, so I'll aim for simplicity while ensuring thorough testing.
The audit currently exempts javascript: only; I’ll add a case-insensitive mailto: exemption and regression test.
apply_patch <<'PATCH'
*** Begin Patch
*** Update File: lighthouse-core/audits/dobetterweb/external-anchors-use-rel-noopener.js
@@
})
.filter(anchor => {
- // Ignore href's that are not real links
- return !anchor.href || !anchor.href.toLowerCase().startsWith('javascript:');
+ // Ignore href's that are not real links or do not navigate to a page.
+ const href = (anchor.href || '').toLowerCase();
+ return !anchor.href || (!href.startsWith('javascript:') && !href.startsWith('mailto:'));
})
*** Update File: lighthouse-core/test/audits/dobetterweb/external-anchors-use-rel-noopener-test.js
@@
it('does not fail for links with javascript in href attribute', () => {
const auditResult = ExternalAnchorsAudit.audit({
AnchorsWithNoRelNoopener: [
{href: 'javascript:void(0)'},
@@
assert.equal(auditResult.rawValue, true);
assert.equal(auditResult.details.items.length, 0);
});
+
+ it('does not fail for links with mailto in href attribute', () => {
+ const auditResult = ExternalAnchorsAudit.audit({
+ AnchorsWithNoRelNoopener: [
+ {href: 'mailto:sales@example.com'},
+ {href: 'MAILTO:support@example.com'},
+ ],
+ URL: {finalUrl: URL},
+ });
+ assert.equal(auditResult.rawValue, true);
+ assert.equal(auditResult.details.items.length, 0);
+ });
});
*** End Patch
PATCHoutput · 9 lines
Wall time: 0.0000 seconds
Output:
Exit code: 0
Wall time: 0 seconds
Output:
Success. Updated the following files:
M lighthouse-core/audits/dobetterweb/external-anchors-use-rel-noopener.js
M lighthouse-core/test/audits/dobetterweb/external-anchors-use-rel-noopener-test.jsPatch is in; I’ll run the focused audit test and inspect the final diff.
./node_modules/.bin/mocha lighthouse-core/test/audits/dobetterweb/external-anchors-use-rel-noopener-test.js --timeout 10000output · 18 lines
Chunk ID: 648f78
Wall time: 0.2552 seconds
Process exited with code 0
Original token count: 92
Output:
External anchors use rel="noopener"
✓ passes when links are from same hosts as the page host
✓ fails when links are from different hosts than the page host
✓ handles links with no href attribute
✓ does not fail for links with javascript in href attribute
✓ does not fail for links with mailto in href attribute
5 passing (20ms)git diff --check && git diff -- lighthouse-core/audits/dobetterweb/external-anchors-use-rel-noopener.js lighthouse-core/test/audits/dobetterweb/external-anchors-use-rel-noopener-test.js && git status --shortoutput · 45 lines
Chunk ID: 59373a
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 510
Output:
diff --git a/lighthouse-core/audits/dobetterweb/external-anchors-use-rel-noopener.js b/lighthouse-core/audits/dobetterweb/external-anchors-use-rel-noopener.js
index 296f94d..21b1147 100644
--- a/lighthouse-core/audits/dobetterweb/external-anchors-use-rel-noopener.js
+++ b/lighthouse-core/audits/dobetterweb/external-anchors-use-rel-noopener.js
@@ -47,8 +47,9 @@ class ExternalAnchorsUseRelNoopenerAudit extends Audit {
}
})
.filter(anchor => {
- // Ignore href's that are not real links
- return !anchor.href || !anchor.href.toLowerCase().startsWith('javascript:');
+ // Ignore href's that are not real links or do not navigate to a page.
+ const href = (anchor.href || '').toLowerCase();
+ return !anchor.href || (!href.startsWith('javascript:') && !href.startsWith('mailto:'));
})
.map(anchor => {
return {
diff --git a/lighthouse-core/test/audits/dobetterweb/external-anchors-use-rel-noopener-test.js b/lighthouse-core/test/audits/dobetterweb/external-anchors-use-rel-noopener-test.js
index c89aab4..ea8d777 100644
--- a/lighthouse-core/test/audits/dobetterweb/external-anchors-use-rel-noopener-test.js
+++ b/lighthouse-core/test/audits/dobetterweb/external-anchors-use-rel-noopener-test.js
@@ -66,4 +66,16 @@ describe('External anchors use rel="noopener"', () => {
assert.equal(auditResult.rawValue, true);
assert.equal(auditResult.details.items.length, 0);
});
+
+ it('does not fail for links with mailto in href attribute', () => {
+ const auditResult = ExternalAnchorsAudit.audit({
+ AnchorsWithNoRelNoopener: [
+ {href: 'mailto:sales@example.com'},
+ {href: 'MAILTO:support@example.com'},
+ ],
+ URL: {finalUrl: URL},
+ });
+ assert.equal(auditResult.rawValue, true);
+ assert.equal(auditResult.details.items.length, 0);
+ });
});
M lighthouse-core/audits/dobetterweb/external-anchors-use-rel-noopener.js
M lighthouse-core/test/audits/dobetterweb/external-anchors-use-rel-noopener-test.jsThe unit test shows it can handle both lower and uppercase, and I have 5 validation tests passing, which is great! I don't see the need for any more tests at this point. However, I'm a bit concerned that the status output indicates only two modifications, but I'll keep an eye on that. Overall, it seems I can finalize with up to 10 lines.
Updated the rel="noopener" audit to ignore mailto: links, case-insensitively, in lighthouse-core/audits/dobetterweb/external-anchors-use-rel-noopener.js:50. Added lowercase and uppercase regression coverage in lighthouse-core/test/audits/dobetterweb/external-anchors-use-rel-noopener-test.js:69.
Validation: all 5 focused audit tests pass.
prism-1602 · YAML string not highlighted when followed by a comment · resolved · 15 model calls · 21 commands · 213 s
What the images show: Rendered YAML where "world" loses its colour when followed by # test
What the text already says: "String highlighting does not work when a string has a comment on the same line", plus the repro - "world" # test
Note: The issue text appears twice in this prompt. That is how it is in the dataset's problem statement, so every run got the same duplicate.
YAML strings fail with trailing comments
# Summary
YAML string highlighting does not work when a string has a comment on the same line.
# Example
Using the following example:
```html
<html>
<head>
<link href="prism.css" rel="stylesheet" />
</head>
<body>
<script src="prism.js"></script>
<pre>
<code class="language-yaml">
hello:
- "world" # test
- "world"
</code>
</pre>
</body>
</html>
```
<img src="https://user-images.githubusercontent.com/16418643/47632225-75f3d180-db06-11e8-8038-9f2d8ed3fa29.png" width="300px" />
I'm testing this using version 1.15.0, from this link: https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript+yaml
YAML strings fail with trailing comments
# Summary
YAML string highlighting does not work when a string has a comment on the same line.
# Example
Using the following example:
```html
<html>
<head>
<link href="prism.css" rel="stylesheet" />
</head>
<body>
<script src="prism.js"></script>
<pre>
<code class="language-yaml">
hello:
- "world" # test
- "world"
</code>
</pre>
</body>
</html>
```
<img src="https://user-images.githubusercontent.com/16418643/47632225-75f3d180-db06-11e8-8038-9f2d8ed3fa29.png" width="300px" />
I'm testing this using version 1.15.0, from this link: https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript+yaml
You cannot see the images in this message; each was removed and only its position is marked.
[Image 1 of 1]I need to check the work repository. First, I'll provide some sort of preamble to set the stage, and then I should run commands like ls or status to see what’s going on. It seems like I should note if there are any specific instructions included or if there’s any focus on the current working directory. I also need to inspect the AGENTS within the repository to understand their roles.
I’ll inspect the YAML grammar and its tests, then make a focused fix.
pwd && rg --files -g 'AGENTS.md' -g '*yaml*' -g '*yml*' -g 'package.json' -g '*test*' | head -200 && git status --shortoutput · 207 lines
Chunk ID: de5b15
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 2206
Output:
/testbed
tests/testrunner-tests.js
tests/languages/yaml/tag_feature.test
tests/languages/yaml/string_feature.test
tests/languages/yaml/scalar_feature.test
tests/languages/yaml/number_feature.test
tests/languages/yaml/null_feature.test
tests/languages/yaml/key_feature.test
tests/languages/yaml/important_feature.test
tests/languages/yaml/directive_feature.test
tests/languages/yaml/datetime_feature.test
tests/languages/yaml/comment_feature.test
tests/languages/yaml/boolean_feature.test
tests/languages/xquery/xquery-element_feature.test
tests/languages/xquery/xquery-comment_feature.test
tests/languages/xquery/xquery-attribute_feature.test
tests/languages/xquery/variable_feature.test
tests/languages/xquery/tag_feature.test
tests/languages/xquery/string_feature.test
tests/languages/xquery/plain-text_feature.test
tests/languages/xquery/operator_feature.test
tests/languages/xquery/number_feature.test
tests/languages/xquery/keyword_feature.test
tests/languages/xquery/keyword-operator_feature.test
tests/languages/xquery/function_feature.test
tests/languages/xquery/extension_feature.test
tests/languages/xquery/builtin_feature.test
tests/languages/xquery/axis_feature.test
tests/languages/xojo/symbol_feature.test
tests/languages/xojo/string_feature.test
tests/languages/xojo/operator_feature.test
tests/languages/xojo/number_feature.test
tests/languages/xojo/keyword_feature.test
tests/languages/xojo/comment_feature.test
tests/languages/xeora/variable_feature.test
tests/languages/xeora/function-inline_feature.test
tests/languages/xeora/function-block_feature.test
tests/languages/xeora/directive-inline_feature.test
tests/languages/xeora/directive-block-separator_feature.test
tests/languages/xeora/directive-block-open_feature.test
tests/languages/xeora/directive-block-close_feature.test
tests/languages/xeora/constant_feature.test
tests/languages/wiki/variable_feature.test
tests/languages/wiki/url_feature.test
tests/languages/wiki/symbol_feature.test
tests/languages/wiki/nowiki_feature.test
tests/languages/wiki/hr_feature.test
tests/languages/wiki/heading_feature.test
tests/languages/wiki/emphasis_feature.test
tests/languages/wiki/block-comment_feature.test
tests/languages/wasm/variable_feature.test
tests/languages/wasm/string_feature.test
tests/languages/wasm/number_feature.test
tests/languages/wasm/keyword_feature.test
tests/languages/wasm/comment_feature.test
tests/languages/visual-basic/string_feature.test
tests/languages/visual-basic/operator_feature.test
tests/languages/visual-basic/number_feature.test
tests/languages/visual-basic/keyword_feature.test
tests/languages/visual-basic/directive_feature.test
tests/languages/visual-basic/date_feature.test
tests/languages/visual-basic/comment_feature.test
tests/languages/visual-basic/boolean_feature.test
tests/languages/vim/string_feature.test
tests/languages/vim/operator_feature.test
tests/languages/vim/number_feature.test
tests/languages/vim/keyword_feature.test
tests/languages/vim/function_feature.test
tests/languages/vim/comment_feature.test
tests/languages/vim/builtin_feature.test
tests/languages/vhdl/vhdl-vectors_feature.test
tests/languages/vhdl/string_feature.test
tests/languages/vhdl/operator_feature.test
tests/languages/vhdl/number_feature.test
tests/languages/vhdl/keyword_feature.test
tests/languages/vhdl/function_feature.test
tests/languages/vhdl/constant_feature.test
tests/languages/vhdl/comment_feature.test
tests/languages/vhdl/boolean_feature.test
tests/languages/verilog/string_feature.test
tests/languages/verilog/property_feature.test
tests/languages/verilog/operator_feature.test
tests/languages/verilog/number_feature.test
tests/languages/verilog/keyword_feature.test
tests/languages/verilog/important_feature.test
tests/languages/verilog/function_feature.test
tests/languages/verilog/constant_feature.test
tests/languages/verilog/comment_feature.test
tests/languages/velocity/velocity-comment_feature.test
tests/languages/velocity/variable_feature.test
tests/languages/velocity/unparsed_feature.test
tests/languages/velocity/directive_feature.test
tests/languages/vbnet/keyword_feature.test
tests/languages/vbnet/comment_feature.test
tests/languages/typescript/keyword_feature.test
tests/languages/typescript/builtin_feature.test
tests/languages/twig+pug/twig_inclusion.test
tests/languages/twig/string_feature.test
tests/languages/twig/operator_feature.test
tests/languages/twig/number_feature.test
tests/languages/twig/keyword_feature.test
tests/languages/twig/comment_feature.test
tests/languages/twig/boolean_feature.test
tests/languages/tt2/variable_feature.test
tests/languages/tt2/string_feature.test
tests/languages/tt2/string-interpolation_feature.test
tests/languages/tt2/operator_feature.test
tests/languages/tt2/keyword_feature.test
tests/languages/tt2/delimiter_feature.test
tests/languages/tt2/comment_feature.test
tests/languages/tsx/tag_feature.test
tests/languages/textile/table_feature.test
tests/languages/textile/mark_feature.test
tests/languages/textile/list_feature.test
tests/languages/textile/link_feature.test
tests/languages/textile/link-ref_feature.test
tests/languages/textile/inline_feature.test
tests/languages/textile/image_feature.test
tests/languages/textile/footnote_feature.test
tests/languages/textile/block-tag_feature.test
tests/languages/textile/acronym_feature.test
tests/languages/tcl/variable_feature.test
tests/languages/tcl/string_feature.test
tests/languages/tcl/scope_feature.test
tests/languages/tcl/operator_feature.test
tests/languages/tcl/keyword_feature.test
tests/languages/tcl/function_feature.test
tests/languages/tcl/comment_feature.test
tests/languages/tcl/builtin_feature.test
tests/languages/tap/yamlish_feature.test
tests/languages/tap/version_feature.test
tests/languages/tap/pragma_feature.test
tests/languages/tap/plan_feature.test
tests/languages/tap/pass_fail_feature.test
tests/languages/tap/directive_feature.test
tests/languages/tap/bail_out_feature.test
tests/languages/swift/string_feature.test
tests/languages/swift/number_feature.test
tests/languages/swift/keyword_feature.test
tests/languages/swift/constant_feature.test
tests/languages/swift/builtin_feature.test
tests/languages/swift/atrule_feature.test
tests/languages/stylus+pug/stylus_inclusion.test
tests/languages/stylus/variable-declaration_feature.test
tests/languages/stylus/url_feature.test
tests/languages/stylus/string_feature.test
tests/languages/stylus/selector_feature.test
tests/languages/stylus/property-declaration_feature.test
tests/languages/stylus/operator_feature.test
tests/languages/stylus/number_feature.test
tests/languages/stylus/keyword_feature.test
tests/languages/stylus/important_feature.test
tests/languages/stylus/hexcode_feature.test
tests/languages/stylus/func_feature.test
tests/languages/stylus/comment_feature.test
tests/languages/stylus/boolean_feature.test
tests/languages/stylus/atrule-declaration_feature.test
tests/languages/sql/variable_feature.test
tests/languages/sql/string_feature.test
tests/languages/sql/operator_feature.test
tests/languages/sql/number_feature.test
tests/languages/sql/keyword_feature.test
tests/languages/sql/function_feature.test
tests/languages/sql/comment_feature.test
tests/languages/sql/boolean_feature.test
tests/languages/soy/variable_feature.test
tests/languages/soy/string_feature.test
tests/languages/soy/soy_in_markup_feature.test
tests/languages/soy/property_feature.test
tests/languages/soy/parameter_feature.test
tests/languages/soy/operator_feature.test
tests/languages/soy/number_feature.test
tests/languages/soy/literal_feature.test
tests/languages/soy/keyword_feature.test
tests/languages/soy/function_feature.test
tests/languages/soy/comment_feature.test
tests/languages/soy/command-arg.test
tests/languages/soy/boolean_feature.test
tests/languages/smarty/variable_feature.test
tests/languages/smarty/string_feature.test
tests/languages/smarty/smarty_in_markup_feature.test
tests/languages/smarty/operator_feature.test
tests/languages/smarty/number_feature.test
tests/languages/smarty/keyword_feature.test
tests/languages/smarty/function_feature.test
tests/languages/smarty/comment_feature.test
tests/languages/smarty/attr-name_feature.test
tests/languages/smalltalk/temporary-variables_feature.test
tests/languages/smalltalk/symbol_feature.test
tests/languages/smalltalk/string_feature.test
tests/languages/smalltalk/operator_feature.test
tests/languages/smalltalk/number_feature.test
tests/languages/smalltalk/keyword_feature.test
tests/languages/smalltalk/comment_feature.test
tests/languages/smalltalk/character_feature.test
tests/languages/smalltalk/block-arguments_feature.test
tests/languages/scss+pug/scss_inclusion.test
tests/languages/scss+haml/scss_inclusion.test
tests/languages/scss/variable_feature.test
tests/languages/scss/url_feature.test
tests/languages/scss/statement_feature.testI need to inspect the AGENTS repo directories, but I’m not finding any results? I’m using a command, rg --files, and maybe it’s excluding something in AGENTS? I’m thinking I should check if it outputs only tests. It's important for me to identify the grammar file along with the tests format and package. Let's see if I can clarify this further and make sense of the structure!
I found existing YAML feature tests; next I’m checking string tokenization and test conventions.
rg --files | rg '(^|/)(prism-yaml|yaml|AGENTS\.md|package\.json|gulpfile|gruntfile)'output · 23 lines
Chunk ID: b9726e
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 150
Output:
tests/languages/yaml/tag_feature.test
tests/languages/yaml/string_feature.test
tests/languages/yaml/scalar_feature.test
tests/languages/yaml/number_feature.test
tests/languages/yaml/null_feature.test
tests/languages/yaml/key_feature.test
tests/languages/yaml/important_feature.test
tests/languages/yaml/directive_feature.test
tests/languages/yaml/datetime_feature.test
tests/languages/yaml/comment_feature.test
tests/languages/yaml/boolean_feature.test
tests/languages/tap/yamlish_feature.test
package.json
gulpfile.js
examples/prism-yaml.html
components/prism-yaml.min.js
components/prism-yaml.jssed -n '1,240p' components/prism-yaml.js && printf '\n--- string tests ---\n' && cat tests/languages/yaml/string_feature.test && printf '\n--- comment tests ---\n' && cat tests/languages/yaml/comment_feature.testoutput · 89 lines
Chunk ID: 1ff8d5
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 531
Output:
Prism.languages.yaml = {
'scalar': {
pattern: /([\-:]\s*(?:![^\s]+)?[ \t]*[|>])[ \t]*(?:((?:\r?\n|\r)[ \t]+)[^\r\n]+(?:\2[^\r\n]+)*)/,
lookbehind: true,
alias: 'string'
},
'comment': /#.*/,
'key': {
pattern: /(\s*(?:^|[:\-,[{\r\n?])[ \t]*(?:![^\s]+)?[ \t]*)[^\r\n{[\]},#\s]+?(?=\s*:\s)/,
lookbehind: true,
alias: 'atrule'
},
'directive': {
pattern: /(^[ \t]*)%.+/m,
lookbehind: true,
alias: 'important'
},
'datetime': {
pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:\d{4}-\d\d?-\d\d?(?:[tT]|[ \t]+)\d\d?:\d{2}:\d{2}(?:\.\d*)?[ \t]*(?:Z|[-+]\d\d?(?::\d{2})?)?|\d{4}-\d{2}-\d{2}|\d\d?:\d{2}(?::\d{2}(?:\.\d*)?)?)(?=[ \t]*(?:$|,|]|}))/m,
lookbehind: true,
alias: 'number'
},
'boolean': {
pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:true|false)[ \t]*(?=$|,|]|})/im,
lookbehind: true,
alias: 'important'
},
'null': {
pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:null|~)[ \t]*(?=$|,|]|})/im,
lookbehind: true,
alias: 'important'
},
'string': {
pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}))/m,
lookbehind: true,
greedy: true
},
'number': {
pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)[+-]?(?:0x[\da-f]+|0o[0-7]+|(?:\d+\.?\d*|\.?\d+)(?:e[+-]?\d+)?|\.inf|\.nan)[ \t]*(?=$|,|]|})/im,
lookbehind: true
},
'tag': /![^\s]+/,
'important': /[&*][\w]+/,
'punctuation': /---|[:[\]{}\-,|>?]|\.\.\./
};
--- string tests ---
---
foo: ""
bar: "fo\"obar"
foo: ''
bar: 'fo\'obar'
----------------------------------------------------
[
["punctuation", "---"],
["key", "foo"], ["punctuation", ":"],
["string", "\"\""],
["key", "bar"], ["punctuation", ":"],
["string", "\"fo\\\"obar\""],
["key", "foo"], ["punctuation", ":"],
["string", "''"],
["key", "bar"], ["punctuation", ":"],
["string", "'fo\\'obar'"]
]
----------------------------------------------------
Checks for strings.
--- comment tests ---
#
# foobar
----------------------------------------------------
[
["comment", "#"],
["comment", "# foobar"]
]
----------------------------------------------------
Checks for comments.cat package.json | sed -n '1,220p'; printf '\n--- repository ---\n'; git log -5 --oneline -- components/prism-yaml.jsoutput · 56 lines
Chunk ID: 4d3c2e
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 277
Output:
{
"name": "prismjs",
"version": "1.15.0",
"description": "Lightweight, robust, elegant syntax highlighting. A spin-off project from Dabblet.",
"main": "prism.js",
"style": "themes/prism.css",
"scripts": {
"test": "mocha tests/testrunner-tests.js && mocha tests/run.js"
},
"repository": {
"type": "git",
"url": "https://github.com/LeaVerou/prism.git"
},
"keywords": [
"prism",
"highlight"
],
"author": "Lea Verou",
"license": "MIT",
"readmeFilename": "README.md",
"optionalDependencies": {
"clipboard": "^2.0.0"
},
"devDependencies": {
"chai": "^2.3.0",
"gulp": "^3.8.6",
"gulp-concat": "^2.3.4",
"gulp-header": "^1.0.5",
"gulp-rename": "^1.2.0",
"gulp-uglify": "^0.3.1",
"gulp-replace": "^0.5.4",
"mocha": "^2.2.5",
"yargs": "^3.26.0"
},
"jspm": {
"main": "prism",
"registry": "jspm",
"jspmPackage": true,
"format": "global",
"files": [
"components/**/*.js",
"plugins/**/*",
"themes/*.css",
"prism.js"
]
}
}
--- repository ---
da474c7 Cleaned up JSON (#1596)I need to clarify how the regex lookahead functions to support comments correctly. Currently, the string ends only consider line end, restricting trailing comments. I think I need to design a YAML grammar regex that allows a # to follow a quoted string after optional whitespace. It seems the pattern doesn’t quite handle greedy behavior right now, potentially consuming too much due to comment token ordering. I want to ensure tokenization is clear for proper parsing.Understanding token matching behavior
I want to explore how Prism's token matching behaves, specifically with comment regex taking everything from # to the end. Currently, strings require a lookahead for line end, which isn’t working due to comments interfering. I think I should incorporate # into the lookahead. Also, string tokens capture prefixes using lookbehind, and greedy matching may cause issues with existing comment boundaries. I need to create a test that mimics an array to ensure trailing comments are handled correctly across different data types and refine my regex accordingly.Exploring nested AGENT instructions
I want to check the instructions for nested AGENT configurations, perhaps using the command rg --files -g AGENTS.md to search broadly. However, my first command didn’t return any results for AGENT. I think I need to look into the test runner documentation more closely. It might be useful to run a root test command, maybe something like node tests/run.js. I'll also check the README for details about the test runner to clarify my next steps.
Reviewing test syntax and files
I need to inspect the syntax of the test files and how the runner selects tests. Maybe I'll search with rg "tests/run|language.*yaml|gulp.*components". It might be good to address any issues, perhaps by adding a feature test to an existing string test and considering comment compatibility. I'll check if prism.js includes grammar and verify if components/prism-yaml.js is loaded properly. I want to ensure both source and minified files are maintained. I'll look at git tracking too.
The string regex requires end-of-line after quotes; I’m checking generated-file conventions and test selection before patching.
sed -n '1,220p' tests/run.js && rg -n 'testrunner|feature\.test|components/.*\.min|gulp.task' gulpfile.js testsoutput · 59 lines
Chunk ID: 9a0ab9
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 455
Output:
"use strict";
var TestDiscovery = require("./helper/test-discovery");
var TestCase = require("./helper/test-case");
var path = require("path");
var argv = require("yargs").argv;
var testSuite;
if (argv.language) {
testSuite = TestDiscovery.loadSomeTests(__dirname + "/languages", argv.language);
} else {
// load complete test suite
testSuite = TestDiscovery.loadAllTests(__dirname + "/languages");
}
// define tests for all tests in all languages in the test suite
for (var language in testSuite) {
if (!testSuite.hasOwnProperty(language)) {
continue;
}
(function (language, testFiles) {
describe("Testing language '" + language + "'", function () {
this.timeout(10000);
testFiles.forEach(
function (filePath) {
var fileName = path.basename(filePath, path.extname(filePath));
it("– should pass test case '" + fileName + "'",
function () {
if (path.extname(filePath) === '.test') {
TestCase.runTestCase(language, filePath);
} else {
TestCase.runTestsWithHooks(language, require(filePath));
}
}
);
}
);
});
})(language, testSuite[language]);
}gulpfile.js:12: components: ['components/**/*.js', '!components/index.js', '!components/**/*.min.js'],
gulpfile.js:39:gulp.task('components', function() {
gulpfile.js:46:gulp.task('build', function() {
gulpfile.js:55:gulp.task('plugins', ['languages-plugins'], function() {
gulpfile.js:62:gulp.task('components-json', function (cb) {
gulpfile.js:70:gulp.task('watch', function() {
gulpfile.js:75:gulp.task('languages-plugins', function (cb) {
gulpfile.js:128:gulp.task('changelog', function (cb) {
gulpfile.js:143:gulp.task('default', ['components', 'components-json', 'plugins', 'build']);git ls-files components/prism-yaml.js components/prism-yaml.min.js && sed -n '1,80p' components/prism-yaml.min.js && git status --shortoutput · 8 lines
Chunk ID: bc9b2c
Wall time: 0.0001 seconds
Process exited with code 0
Original token count: 315
Output:
components/prism-yaml.js
components/prism-yaml.min.js
Prism.languages.yaml={scalar:{pattern:/([\-:]\s*(?:![^\s]+)?[ \t]*[|>])[ \t]*(?:((?:\r?\n|\r)[ \t]+)[^\r\n]+(?:\2[^\r\n]+)*)/,lookbehind:!0,alias:"string"},comment:/#.*/,key:{pattern:/(\s*(?:^|[:\-,[{\r\n?])[ \t]*(?:![^\s]+)?[ \t]*)[^\r\n{[\]},#\s]+?(?=\s*:\s)/,lookbehind:!0,alias:"atrule"},directive:{pattern:/(^[ \t]*)%.+/m,lookbehind:!0,alias:"important"},datetime:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:\d{4}-\d\d?-\d\d?(?:[tT]|[ \t]+)\d\d?:\d{2}:\d{2}(?:\.\d*)?[ \t]*(?:Z|[-+]\d\d?(?::\d{2})?)?|\d{4}-\d{2}-\d{2}|\d\d?:\d{2}(?::\d{2}(?:\.\d*)?)?)(?=[ \t]*(?:$|,|]|}))/m,lookbehind:!0,alias:"number"},"boolean":{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:true|false)[ \t]*(?=$|,|]|})/im,lookbehind:!0,alias:"important"},"null":{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:null|~)[ \t]*(?=$|,|]|})/im,lookbehind:!0,alias:"important"},string:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}))/m,lookbehind:!0,greedy:!0},number:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)[+-]?(?:0x[\da-f]+|0o[0-7]+|(?:\d+\.?\d*|\.?\d+)(?:e[+-]?\d+)?|\.inf|\.nan)[ \t]*(?=$|,|]|})/im,lookbehind:!0},tag:/![^\s]+/,important:/[&*][\w]+/,punctuation:/---|[:[\]{}\-,|>?]|\.\.\./};cat tests/languages/yaml/scalar_feature.test; printf '\n--- similar string/comment lookaheads ---\n'; rg -n 'string.*pattern:|greedy: true|(?=\[ \\t\].*#)' components/prism-yaml.js components | head -80output · 37 lines
Chunk ID: 798a6c
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 190
Output:
---
foo: >
Foo bar
baz
bar: |
Foo bar
baz
----------------------------------------------------
[
["punctuation", "---"],
["key", "foo"], ["punctuation", ":"],
["punctuation", ">"],
["scalar", "\r\n\tFoo bar\r\n\tbaz"],
["key", "bar"], ["punctuation", ":"],
["punctuation", "|"],
["scalar", "\r\n\tFoo bar\r\n\tbaz"]
]
----------------------------------------------------
Checks for scalars.
--- similar string/comment lookaheads ---
rg: regex parse error:
(?:string.*pattern:|greedy: true|(?=\[ \\t\].*#))
^^^
error: look-around, including look-ahead and look-behind, is not supported
Consider enabling PCRE2 with the --pcre2 flag, which can handle backreferences
and look-around.I’m wondering if there’s any reason to modify the min files using gulp. The existing min artifacts are tracked, so any edits should regenerate the min components, right? But if I have to run gulp for everything, that seems excessive. Maybe I could edit min files using the apply_patch method since the developer mandates it. Applying a patch in one line seems acceptable, but I need to consider that the min files are generated by the gulp task, so I'll inspect further.
sed -n '1,105p' gulpfile.js && sed -n '1,180p' tests/helper/test-case.js && sed -n '1,120p' tests/languages/yaml/key_feature.testoutput · 305 lines
Chunk ID: cc8d87
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 2263
Output:
var gulp = require('gulp'),
rename = require('gulp-rename'),
uglify = require('gulp-uglify'),
header = require('gulp-header'),
concat = require('gulp-concat'),
replace = require('gulp-replace'),
fs = require('fs'),
paths = {
componentsFile: 'components.json',
componentsFileJS: 'components.js',
components: ['components/**/*.js', '!components/index.js', '!components/**/*.min.js'],
main: [
'components/prism-core.js',
'components/prism-markup.js',
'components/prism-css.js',
'components/prism-clike.js',
'components/prism-javascript.js',
'plugins/file-highlight/prism-file-highlight.js'
],
plugins: ['plugins/**/*.js', '!plugins/**/*.min.js'],
showLanguagePlugin: 'plugins/show-language/prism-show-language.js',
autoloaderPlugin: 'plugins/autoloader/prism-autoloader.js',
changelog: 'CHANGELOG.md'
},
componentsPromise = new Promise(function (resolve, reject) {
fs.readFile(paths.componentsFile, {
encoding: 'utf-8'
}, function (err, data) {
if (!err) {
resolve(JSON.parse(data));
} else {
reject(err);
}
});
});
gulp.task('components', function() {
return gulp.src(paths.components)
.pipe(uglify())
.pipe(rename({ suffix: '.min' }))
.pipe(gulp.dest('components'));
});
gulp.task('build', function() {
return gulp.src(paths.main)
.pipe(header('\n/* **********************************************\n' +
' Begin <%= file.relative %>\n' +
'********************************************** */\n\n'))
.pipe(concat('prism.js'))
.pipe(gulp.dest('./'));
});
gulp.task('plugins', ['languages-plugins'], function() {
return gulp.src(paths.plugins)
.pipe(uglify())
.pipe(rename({ suffix: '.min' }))
.pipe(gulp.dest('plugins'));
});
gulp.task('components-json', function (cb) {
componentsPromise.then(function (data) {
data = 'var components = ' + JSON.stringify(data) + ';\n' +
'if (typeof module !== \'undefined\' && module.exports) { module.exports = components; }';
fs.writeFile(paths.componentsFileJS, data, cb);
});
});
gulp.task('watch', function() {
gulp.watch(paths.components, ['components', 'build']);
gulp.watch(paths.plugins, ['plugins', 'build']);
});
gulp.task('languages-plugins', function (cb) {
componentsPromise.then(function (data) {
var languagesMap = {};
var dependenciesMap = {};
for (var p in data.languages) {
if (p !== 'meta') {
var title = data.languages[p].displayTitle || data.languages[p].title;
var ucfirst = p.substring(0, 1).toUpperCase() + p.substring(1);
if (title !== ucfirst) {
languagesMap[p] = title;
}
for (var name in data.languages[p].aliasTitles) {
languagesMap[name] = data.languages[p].aliasTitles[name];
}
if(data.languages[p].require) {
dependenciesMap[p] = data.languages[p].require;
}
}
}
var jsonLanguagesMap = JSON.stringify(languagesMap);
var jsonDependenciesMap = JSON.stringify(dependenciesMap);
var tasks = [
{plugin: paths.showLanguagePlugin, map: jsonLanguagesMap},
{plugin: paths.autoloaderPlugin, map: jsonDependenciesMap}
];
var cpt = 0;
"use strict";
var fs = require("fs");
var assert = require("chai").assert;
var PrismLoader = require("./prism-loader");
var TokenStreamTransformer = require("./token-stream-transformer");
/**
* Handles parsing of a test case file.
*
*
* A test case file consists of at least two parts, separated by a line of dashes.
* This separation line must start at the beginning of the line and consist of at least three dashes.
*
* The test case file can either consist of two parts:
*
* {source code}
* ----
* {expected token stream}
*
*
* or of three parts:
*
* {source code}
* ----
* {expected token stream}
* ----
* {text comment explaining the test case}
*
* If the file contains more than three parts, the remaining parts are just ignored.
* If the file however does not contain at least two parts (so no expected token stream),
* the test case will later be marked as failed.
*
*
* @type {{runTestCase: Function, transformCompiledTokenStream: Function, parseTestCaseFile: Function}}
*/
module.exports = {
/**
* Runs the given test case file and asserts the result
*
* The passed language identifier can either be a language like "css" or a composed language
* identifier like "css+markup". Composed identifiers can be used for testing language inclusion.
*
* When testing language inclusion, the first given language is the main language which will be passed
* to Prism for highlighting ("css+markup" will result in a call to Prism to highlight with the "css" grammar).
* But it will be ensured, that the additional passed languages will be loaded too.
*
* The languages will be loaded in the order they were provided.
*
* @param {string} languageIdentifier
* @param {string} filePath
*/
runTestCase: function (languageIdentifier, filePath) {
var testCase = this.parseTestCaseFile(filePath);
var usedLanguages = this.parseLanguageNames(languageIdentifier);
if (null === testCase) {
throw new Error("Test case file has invalid format (or the provided token stream is invalid JSON), please read the docs.");
}
var Prism = PrismLoader.createInstance(usedLanguages.languages);
// the first language is the main language to highlight
var mainLanguageGrammar = Prism.languages[usedLanguages.mainLanguage];
var env = {
code: testCase.testSource,
grammar: mainLanguageGrammar,
language: usedLanguages.mainLanguage
};
Prism.hooks.run('before-tokenize', env);
env.tokens = Prism.tokenize(env.code, env.grammar);
Prism.hooks.run('after-tokenize', env);
var compiledTokenStream = env.tokens;
var simplifiedTokenStream = TokenStreamTransformer.simplify(compiledTokenStream);
var tzd = JSON.stringify( simplifiedTokenStream ); var exp = JSON.stringify( testCase.expectedTokenStream );
var i = 0; var j = 0; var diff = "";
while ( j < tzd.length ){ if (exp[i] != tzd[j] || i == exp.length) diff += tzd[j]; else i++; j++; }
// var message = "\nToken Stream: \n" + JSON.stringify( simplifiedTokenStream, null, " " ) +
var message = "\nToken Stream: \n" + tzd +
"\n-----------------------------------------\n" +
"Expected Token Stream: \n" + exp +
"\n-----------------------------------------\n" + diff;
var result = assert.deepEqual(simplifiedTokenStream, testCase.expectedTokenStream, testCase.comment + message);
},
/**
* Parses the language names and finds the main language.
*
* It is either the last language or the language followed by a exclamation mark “!”.
* There should only be one language with an exclamation mark.
*
* @param {string} languageIdentifier
*
* @returns {{languages: string[], mainLanguage: string}}
*/
parseLanguageNames: function (languageIdentifier) {
var languages = languageIdentifier.split("+");
var mainLanguage = null;
languages = languages.map(
function (language) {
var pos = language.indexOf("!");
if (-1 < pos) {
if (mainLanguage) {
throw "There are multiple main languages defined.";
}
mainLanguage = language.replace("!", "");
return mainLanguage;
}
return language;
}
);
if (!mainLanguage) {
mainLanguage = languages[languages.length-1];
}
return {
languages: languages,
mainLanguage: mainLanguage
};
},
/**
* Parses the test case from the given test case file
*
* @private
* @param {string} filePath
* @returns {{testSource: string, expectedTokenStream: Array.<Array.<string>>, comment:string?}|null}
*/
parseTestCaseFile: function (filePath) {
var testCaseSource = fs.readFileSync(filePath, "utf8");
var testCaseParts = testCaseSource.split(/^-{10,}\w*$/m);
try {
var testCase = {
testSource: testCaseParts[0].trim(),
expectedTokenStream: JSON.parse(testCaseParts[1]),
comment: null
};
// if there are three parts, the third one is the comment
// explaining the test case
if (testCaseParts[2]) {
testCase.comment = testCaseParts[2].trim();
}
return testCase;
}
catch (e) {
// the JSON can't be parsed (e.g. it could be empty)
return null;
}
},
/**
* Runs the given pieces of codes and asserts their result.
*
* Code is provided as the key and expected result as the value.
*
* @param {string} languageIdentifier
* @param {object} codes
*/
runTestsWithHooks: function (languageIdentifier, codes) {
var usedLanguages = this.parseLanguageNames(languageIdentifier);
var Prism = PrismLoader.createInstance(usedLanguages.languages);
// the first language is the main language to highlight
for (var code in codes) {
if (codes.hasOwnProperty(code)) {
var env = {
---
foo: 4
FooBar : 5
----------------------------------------------------
[
["punctuation", "---"],
["key", "foo"], ["punctuation", ":"], ["number", "4"],
["key", "FooBar"], ["punctuation", ":"], ["number", "5"]
]
----------------------------------------------------
Checks for keys.I’ll allow a trailing YAML comment after a quoted scalar and add regression coverage.
apply_patch <<'PATCH'
*** Begin Patch
*** Update File: /testbed/components/prism-yaml.js
@@
'string': {
- pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}))/m,
+ pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}|#))/m,
*** Update File: /testbed/tests/languages/yaml/string_feature.test
@@
bar: 'fo\'obar'
+hello:
+ - "world" # test
+ - "world"
@@
["string", "''"],
["key", "bar"], ["punctuation", ":"],
- ["string", "'fo\\'obar'"]
+ ["string", "'fo\\'obar'"],
+ ["key", "hello"], ["punctuation", ":"],
+ ["punctuation", "-"], ["string", "\"world\""], ["comment", "# test"],
+ ["punctuation", "-"], ["string", "\"world\""]
*** End Patch
PATCHoutput · 9 lines
Wall time: 0.0000 seconds
Output:
Exit code: 0
Wall time: 0 seconds
Output:
Success. Updated the following files:
M /testbed/components/prism-yaml.js
M /testbed/tests/languages/yaml/string_feature.test./node_modules/.bin/mocha tests/run.js --language yamloutput · 35 lines
Chunk ID: 595a85
Wall time: 0.2822 seconds
Process exited with code 0
Original token count: 157
Output:
Testing language 'yaml'
✓ – should pass test case 'boolean_feature'
✓ – should pass test case 'comment_feature'
✓ – should pass test case 'datetime_feature'
✓ – should pass test case 'directive_feature'
✓ – should pass test case 'important_feature'
✓ – should pass test case 'key_feature'
✓ – should pass test case 'null_feature'
✓ – should pass test case 'number_feature'
✓ – should pass test case 'scalar_feature'
✓ – should pass test case 'string_feature'
✓ – should pass test case 'tag_feature'
11 passing (261ms)git diff --check && git diff -- components/prism-yaml.js tests/languages/yaml/string_feature.testoutput · 22 lines
Chunk ID: 5a8f03
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 181
Output:
diff --git a/components/prism-yaml.js b/components/prism-yaml.js
index 9a16800..2ed5e4b 100644
--- a/components/prism-yaml.js
+++ b/components/prism-yaml.js
@@ -31,7 +31,7 @@ Prism.languages.yaml = {
alias: 'important'
},
'string': {
- pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}))/m,
+ pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}|#))/m,
lookbehind: true,
greedy: true
},
diff --git a/tests/languages/yaml/string_feature.test b/tests/languages/yaml/string_feature.test
index 0b9dcad..89a4000 100644
Binary files a/tests/languages/yaml/string_feature.test and b/tests/languages/yaml/string_feature.test differI’m looking into why the diff shows a test binary file. It seems like there’s a mix of CRLF and LF line endings, which might be causing confusion. I need to inspect the file using tools like file and xxd to figure out the initial encoding. Git might be treating it as binary due to mixed line endings or NUL characters. Since the tests passed, I wonder if I should rewrite the test to keep the CRLF format, ensuring the patch maintains consistent encoding.
The focused YAML suite passes; I spotted mixed line endings in the test diff and will normalize it.
file tests/languages/yaml/string_feature.test && git check-attr -a -- tests/languages/yaml/string_feature.test && git show HEAD:tests/languages/yaml/string_feature.test | file - && git diff --numstat -- tests/languages/yaml/string_feature.testoutput · 13 lines
Chunk ID: 740589
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 100
Output:
tests/languages/yaml/string_feature.test: ASCII text, with CRLF, LF line terminators
tests/languages/yaml/string_feature.test: binary: set
tests/languages/yaml/string_feature.test: diff: unset
tests/languages/yaml/string_feature.test: merge: unset
tests/languages/yaml/string_feature.test: text: unset
/dev/stdin: ASCII text, with CRLF line terminators
- - tests/languages/yaml/string_feature.testxxd -l 256 tests/languages/yaml/string_feature.test && git show HEAD:tests/languages/yaml/string_feature.test | xxd -l 256output · 7 lines
Chunk ID: 55d243
Wall time: 0.0000 seconds
Process exited with code 127
Original token count: 11
Output:
/bin/bash: line 1: xxd: command not foundrg -n 'binary|text|eol' .gitattributes .git/info/attributes .gitconfig 2>/dev/null; od -An -tx1 -N 120 tests/languages/yaml/string_feature.test; git show HEAD:tests/languages/yaml/string_feature.test | od -An -tx1 -N 120output · 24 lines
Chunk ID: f6e006
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 193
Output:
.gitattributes:1:* text=auto
.gitattributes:4:/tests/languages/**/*.test binary
2d 2d 2d 0d 0a 66 6f 6f 3a 20 22 22 0d 0a 62 61
72 3a 20 22 66 6f 5c 22 6f 62 61 72 22 0d 0a 66
6f 6f 3a 20 27 27 0d 0a 62 61 72 3a 20 27 66 6f
5c 27 6f 62 61 72 27 0a 68 65 6c 6c 6f 3a 0a 20
20 20 20 2d 20 22 77 6f 72 6c 64 22 20 23 20 74
65 73 74 0a 20 20 20 20 2d 20 22 77 6f 72 6c 64
22 0a 0d 0a 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d
2d 2d 2d 2d 2d 2d 2d 2d
2d 2d 2d 0d 0a 66 6f 6f 3a 20 22 22 0d 0a 62 61
72 3a 20 22 66 6f 5c 22 6f 62 61 72 22 0d 0a 66
6f 6f 3a 20 27 27 0d 0a 62 61 72 3a 20 27 66 6f
5c 27 6f 62 61 72 27 0d 0a 0d 0a 2d 2d 2d 2d 2d
2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d
*
2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 0d
0a 0d 0a 5b 0d 0a 09 5bI need to manage test files in binary format, as Git treats binary files differently. It's clear that in this project, the test fixtures use CRLF endings, which should be preserved. The apply_patch tool is necessary for editing, but I can’t use alternatives. Using Perl could normalize line endings, but the focus should be on using apply_patch. It seems that maintaining CRLF with this tool is complex, so I’m not sure how to proceed effectively.Considering line ending management
I notice that the existing tests all use CRLF line endings, and I'm wondering if I can convert them without stepping outside the apply_patch tool. The instructions emphasize using apply_patch for edits, which makes me consider whether a direct line ending correction violates this. Instead, I think about potentially adding a new .test file with consistent LF endings. It could be useful to explore options like git apply --ignore-space, but that doesn't fit with apply_patch. I'm not sure how to patch anything while preserving the original bytes properly.Exploring line endings in patches
I’m thinking about how the shell here-doc can capture exact line endings, especially when using CR in JSON. If I pass in a JSON string with \r, I wonder if that will work. I know that the apply_patch tool requires CRLF after each context and addition. It appears that on Linux, apply_patch can manage this, but I’d need to ensure the content includes literal \r before \n. Although I could use a Perl command to change line endings, I'm concerned it might violate the usage of apply_patch, so I need to tread carefully here.
Normalizing line endings
I'm thinking about line ending behaviors and how LF changes can be converted. I could use sed for the whole fixture, but I think sticking with CRLF is best for consistency in the repo. Using perl to ensure all line endings are CRLF seems like the way to go, although I should be careful not to waste tokens by re-reading files after using apply_patch. I'll follow through with the line normalization and check the file diffs afterward.Creating test fixtures
I'm considering how the test should ideally involve one distinct fixture file since a binary test file can't be diffed easily by humans. It seems all tests are similar, so that might work. I could apply a direct newline change using perl to ensure everything stays consistent: perl -pi -e 's/\r?\n/\r\n/g'. After that, I can add the minimal patch. I want to make sure I'm keeping everything in sync!
Evaluating YAML comments
I'm considering the question of whether comments in YAML can start immediately with a #. The user provided an example with whitespace that shows there's room for improvement. We could refine the regex to ensure comments only appear after a whitespace separator. It’s important that we ensure a comment follows a scalar preceded by a separator, so for strings like "world" # test, a space must be present. If there's a # after a comma, it’s not valid syntax.Refining YAML comment handling
I'm analyzing how the # can appear inside quoted strings, and our current approach captures that. However, I see the need to refine the regex to ensure valid whitespace before comments. By adding |[ \t]+#, I can ensure it's still non-capturing. It’s crucial that comments in YAML must be preceded by whitespace, and if there's no space after a string leading to a #, it leads to errors. I’m planning to run all the YAML tests again post-normalization for any behavioral changes.
Regression coverage now passes. I’m syncing the minified grammar and preserving fixture CRLF endings.
apply_patch <<'PATCH'
*** Begin Patch
*** Update File: /testbed/components/prism-yaml.js
@@
- pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}|#))/m,
+ pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}|[ \t]+#))/m,
*** Update File: /testbed/components/prism-yaml.min.js
@@
-Prism.languages.yaml={scalar:{pattern:/([\-:]\s*(?:![^\s]+)?[ \t]*[|>])[ \t]*(?:((?:\r?\n|\r)[ \t]+)[^\r\n]+(?:\2[^\r\n]+)*)/,lookbehind:!0,alias:"string"},comment:/#.*/,key:{pattern:/(\s*(?:^|[:\-,[{\r\n?])[ \t]*(?:![^\s]+)?[ \t]*)[^\r\n{[\]},#\s]+?(?=\s*:\s)/,lookbehind:!0,alias:"atrule"},directive:{pattern:/(^[ \t]*)%.+/m,lookbehind:!0,alias:"important"},datetime:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:\d{4}-\d\d?-\d\d?(?:[tT]|[ \t]+)\d\d?:\d\d(?::\d\d)?(?:\.\d*)?[ \t]*(?:Z|[-+]\d\d?(?::\d\d)?)?|\d{4}-\d{2}-\d{2}|\d\d?:\d\d(?::\d\d(?:\.\d*)?)?)(?=[ \t]*(?:$|,|]|}))/m,lookbehind:!0,alias:"number"},"boolean":{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:true|false)[ \t]*(?=$|,|]|})/im,lookbehind:!0,alias:"important"},"null":{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:null|~)[ \t]*(?=$|,|]|})/im,lookbehind:!0,alias:"important"},string:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}))/m,lookbehind:!0,greedy:!0},number:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)[+-]?(?:0x[\da-f]+|0o[0-7]+|(?:\d+\.?\d*|\.?\d+)(?:e[+-]?\d+)?|\.inf|\.nan)[ \t]*(?=$|,|]|})/im,lookbehind:!0},tag:/![^\s]+/,important:/[&*][\w]+/,punctuation:/---|[:[\]{}\-,|>?]|\.\.\./};
+Prism.languages.yaml={scalar:{pattern:/([\-:]\s*(?:![^\s]+)?[ \t]*[|>])[ \t]*(?:((?:\r?\n|\r)[ \t]+)[^\r\n]+(?:\2[^\r\n]+)*)/,lookbehind:!0,alias:"string"},comment:/#.*/,key:{pattern:/(\s*(?:^|[:\-,[{\r\n?])[ \t]*(?:![^\s]+)?[ \t]*)[^\r\n{[\]},#\s]+?(?=\s*:\s)/,lookbehind:!0,alias:"atrule"},directive:{pattern:/(^[ \t]*)%.+/m,lookbehind:!0,alias:"important"},datetime:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:\d{4}-\d\d?-\d\d?(?:[tT]|[ \t]+)\d\d?:\d\d(?::\d\d)?(?:\.\d*)?[ \t]*(?:Z|[-+]\d\d?(?::\d\d)?)?|\d{4}-\d{2}-\d{2}|\d\d?:\d\d(?::\d\d(?:\.\d*)?)?)(?=[ \t]*(?:$|,|]|}))/m,lookbehind:!0,alias:"number"},"boolean":{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:true|false)[ \t]*(?=$|,|]|})/im,lookbehind:!0,alias:"important"},"null":{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:null|~)[ \t]*(?=$|,|]|})/im,lookbehind:!0,alias:"important"},string:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}|[ \t]+#))/m,lookbehind:!0,greedy:!0},number:{pattern:/([:\-,[{]\s*(?:![^\s]+)?[ \t]*)[+-]?(?:0x[\da-f]+|0o[0-7]+|(?:\d+\.?\d*|\.?\d+)(?:e[+-]?\d+)?|\.inf|\.nan)[ \t]*(?=$|,|]|})/im,lookbehind:!0},tag:/![^\s]+/,important:/[&*][\w]+/,punctuation:/---|[:[\]{}\-,|>?]|\.\.\./};
*** End Patch
PATCH
perl -pi -e 's/\r?\n/\r\n/g' tests/languages/yaml/string_feature.testoutput · 7 lines
Chunk ID: f99803
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 13
Output:
/bin/bash: line 1: apply_patch: command not foundI'm noticing that the exec_command sees apply_patch as an integrated binary, but there was a previous success that makes this situation weird. Maybe a bigger patch is failing? I got a bash error from the tool output. I wonder if I could run apply_patch as the first command separately without using the shell. It was a full bash string before, and the first attempt succeeded. I should check the current state with git diff and status.
Checking patch application
I’m thinking about whether I need to read after the patch note since it seems the patch failed. Alright, Perl is applied, so I’ll check the source line, still using regex before the update with the minimum old version. I wonder if type apply_patch might provide the path? I think the initial command might have worked because it was provided through the shell. I'll ask about command -v to see if apply_patch tool is available in the shell.
The patch helper isn’t available in this shell invocation; line endings are normalized, and I’m retrying the small edit.
command -v apply_patch || true; git diff --numstat -- tests/languages/yaml/string_feature.test; git status --shortoutput · 9 lines
Chunk ID: cd0f59
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 30
Output:
- - tests/languages/yaml/string_feature.test
M components/prism-yaml.js
M tests/languages/yaml/string_feature.testapply_patch <<'PATCH'
*** Begin Patch
*** Update File: /testbed/components/prism-yaml.js
@@
- pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}|#))/m,
+ pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}|[ \t]+#))/m,
*** End Patch
PATCHoutput · 8 lines
Wall time: 0.0000 seconds
Output:
Exit code: 0
Wall time: 0 seconds
Output:
Success. Updated the following files:
M /testbed/components/prism-yaml.jsI’m wondering if there’s an error with the patch tool related to command size limits. It seems like it said “command not found,” which could mean that the shell command parser is having trouble with the way it's set up. I think apply_patch might fail if the line is too long. It could also be that the command is recognized but the PATH isn’t set properly for the wrapper to handle it correctly. It seems like there are limitations on how many commands can be processed at once.
Evaluating grammar issues
I'm thinking the stale grammar might come from an older version. The minified file at components/prism-yaml.min.js has a different datetime pattern, which may indicate a historical bug. It seems like I shouldn’t regenerate the min file unless necessary. If we do maintain both the source and min files, I can just update the string pattern while keeping everything else the same. I could use a straightforward Perl command to replace it without complications. It's all about ensuring the replacement string outputs correctly.
Analyzing regex usage and patching
I’m considering that \Q introduces a literal matching in regex, which makes \Q\\2 match a backslash and "2." Closing with \E feels right. For replacements, \\2 yields \2, while $ needs to be treated literally due to \Q. I’m wondering if a shell is necessary, and it seems I should use Perl for patching, but check the conventions since the file might be generated. I'll validate any changes by testing both the source and the minified file.Considering regex matching and testing
I'm thinking about the requirement for a # following whitespace in the regex for the string token match. It seems like the tests should still pass with this condition. I’ll run the tests for the YAML after refining the pattern. I also need to update the git diff check and possibly compare it with the expected min string. I should be careful with escaping in rg and ensure all tests pass before finalizing my approach.
Considering editing methods
I’m thinking about how to edit using apply_patch for a minimum change with the full line. It didn't work because it seems like the command interpreter might only support patches when it’s a specific command. It looks like using perl for a one-liner might be the easiest way to achieve this. I’ll focus on doing a minimum replacement via perl, and then I’ll run tests and perform a diff check to verify the changes.
perl -pi -e 's/\\2\(\?=\[ \\t\]\*\(\?:\$\|,\|\]\|\}\)\)/\\2(?=[ \\t]*(?:\$|,|]|}|[ \\t]+#))/g' components/prism-yaml.min.js
./node_modules/.bin/mocha tests/run.js --language yaml
git diff --check
git status --shortoutput · 38 lines
Chunk ID: 3cc7dc
Wall time: 0.2281 seconds
Process exited with code 0
Original token count: 183
Output:
Testing language 'yaml'
✓ – should pass test case 'boolean_feature'
✓ – should pass test case 'comment_feature'
✓ – should pass test case 'datetime_feature'
✓ – should pass test case 'directive_feature'
✓ – should pass test case 'important_feature'
✓ – should pass test case 'key_feature'
✓ – should pass test case 'null_feature'
✓ – should pass test case 'number_feature'
✓ – should pass test case 'scalar_feature'
✓ – should pass test case 'string_feature'
✓ – should pass test case 'tag_feature'
11 passing (255ms)
M components/prism-yaml.js
M components/prism-yaml.min.js
M tests/languages/yaml/string_feature.testI'm trying to figure out if I can use require with Prism. The components/prism-yaml.min.js expects a global Prism with the core loaded. I think about constructing a global Prism and using require, but I'm unsure if it supports UMD. If I set global.Prism={languages:{}}; require('./components/prism-yaml.min.js'), I might be able to inspect grammar.string.pattern.source. I also need to run some tests alongside checking the behavior. What if I use node --check or evaluate the minified file to ensure it's working correctly?Verifying min grammar regex
I'm considering verifying the regex for the minified grammar in Prism. I think I can set up a global Prism like this: global.Prism={languages:{}}; require('./components/prism-yaml.min.js'); Then I can check the regex with const regex=Prism.languages.yaml.string.pattern; console.log(regex.test('"world" # test'));. It seems like the regex might expect a : or - to come first, so I’ll need to keep that in mind as I test.
The YAML suite passes with the stricter whitespace rule; I’m validating the generated component and final diff.
node --check components/prism-yaml.js && node --check components/prism-yaml.min.js && node - <<'NODE'
global.Prism = { languages: {} };
require('./components/prism-yaml.min.js');
var pattern = Prism.languages.yaml.string.pattern;
if (!pattern.test('- "world" # test') || pattern.test('- "world"#test')) {
process.exit(1);
}
NODEoutput · 7 lines
Chunk ID: c20a62
Wall time: 0.0000 seconds
Process exited with code 9
Original token count: 5
Output:
node: bad option: -git diff --check && git status --short && git diff --stat && nl -ba components/prism-yaml.js | sed -n '29,38p' && nl -ba tests/languages/yaml/string_feature.test | sed -n '1,34p' && file tests/languages/yaml/string_feature.testoutput · 53 lines
Chunk ID: 68024f
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 416
Output:
M components/prism-yaml.js
M components/prism-yaml.min.js
M tests/languages/yaml/string_feature.test
components/prism-yaml.js | 2 +-
components/prism-yaml.min.js | 2 +-
tests/languages/yaml/string_feature.test | Bin 486 -> 696 bytes
3 files changed, 2 insertions(+), 2 deletions(-)
29 pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)(?:null|~)[ \t]*(?=$|,|]|})/im,
30 lookbehind: true,
31 alias: 'important'
32 },
33 'string': {
34 pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)("|')(?:(?!\2)[^\\\r\n]|\\.)*\2(?=[ \t]*(?:$|,|]|}|[ \t]+#))/m,
35 lookbehind: true,
36 greedy: true
37 },
38 'number': {
1 ---
2 foo: ""
3 bar: "fo\"obar"
4 foo: ''
5 bar: 'fo\'obar'
6 hello:
7 - "world" # test
8 - "world"
9
10 ----------------------------------------------------
11
12 [
13 ["punctuation", "---"],
14 ["key", "foo"], ["punctuation", ":"],
15 ["string", "\"\""],
16 ["key", "bar"], ["punctuation", ":"],
17 ["string", "\"fo\\\"obar\""],
18 ["key", "foo"], ["punctuation", ":"],
19 ["string", "''"],
20 ["key", "bar"], ["punctuation", ":"],
21 ["string", "'fo\\'obar'"],
22 ["key", "hello"], ["punctuation", ":"],
23 ["punctuation", "-"], ["string", "\"world\""], ["comment", "# test"],
24 ["punctuation", "-"], ["string", "\"world\""]
25 ]
26
27 ----------------------------------------------------
28
29 Checks for strings.
tests/languages/yaml/string_feature.test: ASCII text, with CRLF line terminatorsnode -e 'global.Prism={languages:{}};require("./components/prism-yaml.min.js");var pattern=Prism.languages.yaml.string.pattern;if(!pattern.test("- \"world\" # test")||pattern.test("- \"world\"#test"))process.exit(1);' && git diff --checkoutput · 6 lines
Chunk ID: 18cd64
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 0
Output:I think it would be helpful to do a factual node check. The first node check passed, but the output was missing. So, I’m indicating that the command chain means to say "yes." The minimum behavior test did pass afterward, so that’s a good sign. I want to make sure everything is functioning correctly before moving forward. It’s crucial to confirm all steps along the way!
Updated YAML string highlighting to recognize quoted scalars followed by whitespace and a trailing comment. Added regression coverage for strings with and without comments, and synced the minified component.
- Tests: YAML suite passes (11 passing); source and minified components pass syntax checks.
- References: components/prism-yaml.js:34, tests/languages/yaml/string_feature.test:6, components/prism-yaml.min.js:1
next-2984 · CascaderSelect mutates the dataSource passed in · resolved · 15 model calls · 26 commands · 133 s
What the images show: Console TypeError "Cannot add property value, object is not extensible"
What the text already says: CascaderSelect changes the props passed in; "the component should not change the user's values"
[CascaderSelect]内部会对传进去的属性进行修改导致使用immer时报错
### Component
CascaderSelect
### Steps to reproduce
组件不应该改用户传入的值
You cannot see the images in this message; each was removed and only its position is marked.
[Image 1 of 1]I need to interpret the issue with the CascaderSelect component in the Chinese context. It seems that it's modifying passed props, which is causing an immer error. The component shouldn’t change user values, so I have to inspect the repository for more details. I'll need to provide some context in Chinese as well. Using the right tool for this could help clarify things further.
我先定位 CascaderSelect 的实现和相关测试，确认哪里修改了传入值。
pwd && rg --files -g 'AGENTS.md' -g '*CascaderSelect*' -g '*cascader*' | head -200output · 10 lines
Chunk ID: 960db8
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 28
Output:
/testbed
src/cascader-select/cascader-select.jsx
src/cascader/cascader.jsx
docs/select/demo/select-cascader.mdI wonder if I missed any agents because they might be hidden. It seems I need to create a list of them, but only output the paths without mentioning the agents themselves. I'll need to check the root listing and the source to see what I can find. This approach should help me identify any hidden agents that could be crucial for my analysis. Let’s see what’s there!
find .. -name AGENTS.md -printoutput · 6 lines
Chunk ID: da38e1
Wall time: 0.9835 seconds
Process exited with code 0
Original token count: 0
Output:sed -n '1,280p' src/cascader-select/cascader-select.jsx && printf '\n--- cascader ---\n' && sed -n '1,260p' src/cascader/cascader.jsxoutput · 319 lines
Chunk ID: f787e8
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 4247
Output:
Warning: truncated output (original token count: 4247)
Total output lines: 542
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { polyfill } from 'react-lifecycles-compat';
import classNames from 'classnames';
import Select from '../select';
import Cascader from '../cascader';
import Menu from '../menu';
import { func, obj, dom, KEYCODE } from '../util';
const { bindCtx } = func;
const { pickOthers } = obj;
const { getStyle } = dom;
const normalizeValue = value => {
if (value) {
if (Array.isArray(value)) {
return value;
}
return [value];
}
return [];
};
/**
* CascaderSelect
*/
class CascaderSelect extends Component {
static propTypes = {
prefix: PropTypes.string,
pure: PropTypes.bool,
className: PropTypes.string,
/**
* 选择框大小
*/
size: PropTypes.oneOf(['small', 'medium', 'large']),
/**
* 选择框占位符
*/
placeholder: PropTypes.string,
/**
* 是否禁用
*/
disabled: PropTypes.bool,
/**
* 是否有下拉箭头
*/
hasArrow: PropTypes.bool,
/**
* 是否有边框
*/
hasBorder: PropTypes.bool,
/**
* 是否有清除按钮
*/
hasClear: PropTypes.bool,
/**
* 自定义内联 label
*/
label: PropTypes.node,
/**
* 是否只读，只读模式下可以展开弹层但不能选
*/
readOnly: PropTypes.bool,
/**
* 数据源，结构可参考下方说明
*/
dataSource: PropTypes.arrayOf(PropTypes.object),
/**
* （非受控）默认值
*/
defaultValue: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]),
/**
* （受控）当前值
*/
value: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]),
/**
* 选中值改变时触发的回调函数
* @param {String|Array} value 选中的值，单选时返回单个值，多选时返回数组
* @param {Object|Array} data 选中的数据，包括 value 和 label，单选时返回单个值，多选时返回数组，父子节点选中关联时，同时选中，只返回父节点
* @param {Object} extra 额外参数
* @param {Array} extra.selectedPath 单选时选中的数据的路径
* @param {Boolean} extra.checked 多选时当前的操作是选中还是取消选中
* @param {Object} extra.currentData 多选时当前操作的数据
* @param {Array} extra.checkedData 多选时所有被选中的数据
* @param {Array} extra.indeterminateData 多选时半选的数据
*/
onChange: PropTypes.func,
/**
* 默认展开值，如果不设置，组件内部会根据 defaultValue/value 进行自动设置
*/
defaultExpandedValue: PropTypes.arrayOf(PropTypes.string),
/**
* （受控）当前展开值
*/
expandedValue: PropTypes.arrayOf(PropTypes.string),
/**
* 展开触发的方式
*/
expandTriggerType: PropTypes.oneOf(['click', 'hover']),
onExpand: PropTypes.func,
/**
* 是否开启虚拟滚动
*/
useVirtual: PropTypes.bool,
/**
* 是否多选
*/
multiple: PropTypes.bool,
/**
* 是否选中即发生改变, 该属性仅在单选模式下有效
*/
changeOnSelect: PropTypes.bool,
/**
* 是否只能勾选叶子项的checkbox，该属性仅在多选模式下有效
*/
canOnlyCheckLeaf: PropTypes.bool,
/**
* 父子节点是否选中不关联
*/
checkStrictly: PropTypes.bool,
/**
* 每列列表样式对象
*/
listStyle: PropTypes.object,
/**
* 每列列表类名
*/
listClassName: PropTypes.string,
/**
* 选择框单选时展示结果的自定义渲染函数
* @param {Array} label 选中路径的文本数组
* @return {ReactNode} 渲染在选择框中的内容
* @default 单选时：labelPath => labelPath.join(' / ')；多选时：labelPath => labelPath[labelPath.length - 1]
*/
displayRender: PropTypes.func,
/**
* 渲染 item 内容的方法
* @param {Object} item 渲染节点的item
* @return {ReactNode} item node
*/
itemRender: PropTypes.func,
/**
* 是否显示搜索框
*/
showSearch: PropTypes.bool,
/**
* 自定义搜索函数
* @param {String} searchValue 搜索的关键字
* @param {Array} path 节点路径
* @return {Boolean} 是否匹配
* @default 根据路径所有节点的文本值模糊匹…6250 chars truncated…取消选中
* @param {Object} extra.currentData 多选时当前操作的数据
* @param {Array} extra.checkedData 多选时所有被选中的数据
* @param {Array} extra.indeterminateData 多选时半选的数据
*/
onChange: PropTypes.func,
onSelect: PropTypes.func,
/**
* （非受控）默认展开值，如果不设置，组件内部会根据 defaultValue/value 进行自动设置
*/
defaultExpandedValue: PropTypes.arrayOf(PropTypes.string),
/**
* （受控）当前展开值
*/
expandedValue: PropTypes.arrayOf(PropTypes.string),
/**
* 展开触发的方式
*/
expandTriggerType: PropTypes.oneOf(['click', 'hover']),
/**
* 展开时触发的回调函数
* @param {Array} expandedValue 各列展开值的数组
*/
onExpand: PropTypes.func,
/**
* 是否开启虚拟滚动
*/
useVirtual: PropTypes.bool,
/**
* 是否多选
*/
multiple: PropTypes.bool,
/**
* 单选时是否只能选中叶子节点
*/
canOnlySelectLeaf: PropTypes.bool,
/**
* 多选时是否只能选中叶子节点
*/
canOnlyCheckLeaf: PropTypes.bool,
/**
* 父子节点是否选中不关联
*/
checkStrictly: PropTypes.bool,
/**
* 每列列表样式对象
*/
listStyle: PropTypes.object,
/**
* 每列列表类名
*/
listClassName: PropTypes.string,
/**
* 每列列表项渲染函数
* @param {Object} data 数据
* @return {ReactNode} 列表项内容
*/
itemRender: PropTypes.func,
/**
* 异步加载数据函数
* @param {Object} data 当前点击异步加载的数据
* @param {Object} source 当前点击数据，source是原始对象
*/
loadData: PropTypes.func,
searchValue: PropTypes.string,
onBlur: PropTypes.func,
filteredPaths: PropTypes.array,
filteredListStyle: PropTypes.object,
resultRender: PropTypes.func,
};
static defaultProps = {
prefix: 'next-',
rtl: false,
pure: false,
dataSource: [],
defaultValue: null,
canOnlySelectLeaf: false,
canOnlyCheckLeaf: false,
expandTriggerType: 'click',
multiple: false,
useVirtual: false,
checkStrictly: false,
itemRender: item => item.label,
};
constructor(props, context) {
super(props, context);
const {
defaultValue,
value,
defaultExpandedValue,
expandedValue,
dataSource,
multiple,
checkStrictly,
canOnlyCheckLeaf,
loadData,
} = props;
const { v2n, p2n } = flatDataSource(dataSource);
let normalizedValue = normalizeValue(typeof value === 'undefined' ? defaultValue : value);
if (!loadData) {
normalizedValue = normalizedValue.filter(v => v2n[v]);
}
const realExpandedValue =
typeof expandedValue === 'undefined'
? typeof defaultExpandedValue === 'undefined'
? getExpandedValue(normalizedValue[0], v2n, p2n)
: normalizeValue(defaultExpandedValue)
: normalizeValue(expandedValue);
const st = {
value: normalizedValue,
expandedValue: realExpandedValue,
};
if (multiple && !checkStrictly && !canOnlyCheckLeaf) {
st.value = getAllCheckedValues(st.value, v2n, p2n);
}
this.lastExpandedValue = [...st.expandedValue];
this.state = {
...st,
_v2n: v2n,
_p2n: p2n,
};
bindCtx(this, ['handleMouseLeave', 'handleFocus', 'handleFold', 'getCascaderNode', 'onBlur']);
}
static getDerivedStateFromProps(props, state) {
const { v2n, p2n } = flatDataSource(props.dataSource);
const states = {};
if ('value' in props) {
states.value = normalizeValue(props.value);
if (!props.loadData) {
states.value = states.value.filter(v => v2n[v]);
}
const { multiple, checkStrictly, canOnlyCheckLeaf } = props;
if (multiple && !checkStrictly && !canOnlyCheckLeaf) {
states.value = getAllCheckedValues(states.value, v2n, p2n);
}
if (!state.expandedValue.length && !('expandedValue' in props)) {
states.expandedValue = getExpandedValue(states.value[0], v2n, p2n);
}
}
if ('expandedValue' in props) {
states.expandedValue = normalizeValue(props.expandedValue);
}
return {ls -la && cat package.jsonoutput · 279 lines
Chunk ID: 718801
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 2685
Output:
Warning: truncated output (original token count: 2685)
Total output lines: 291
total 1456
drwxrwxrwx 12 root root 4096 Oct 14 21:47 .
drwxr-xr-x 21 root root 4096 Jan 1 2026 ..
-rw-r--r-- 1 root root 597 Oct 14 21:47 .commitlintrc
-rw-r--r-- 1 root root 434 Oct 14 21:47 .editorconfig
-rw-r--r-- 1 root root 53 Oct 14 21:47 .eslintignore
-rw-r--r-- 1 root root 324 Oct 14 21:47 .eslintrc
-rw-r--r-- 1 root root 4269 Oct 14 21:47 .fusion
drwxr-xr-x 7 root root 4096 Oct 14 21:47 .git
drwxrwxrwx 4 root root 4096 Oct 14 21:47 .github
-rw-r--r-- 1 root root 1258 Oct 14 21:47 .gitignore
-rw-r--r-- 1 root root 70 Oct 14 21:47 .prettierignore
-rw-r--r-- 1 root root 271 Oct 14 21:47 .prettierrc
-rw-r--r-- 1 root root 296 Oct 14 21:47 .travis.yml
drwxrwxrwx 2 root root 4096 Oct 14 21:47 .vscode
-rw-r--r-- 1 root root 183993 Oct 14 21:47 CHANGELOG.md
-rw-r--r-- 1 root root 2343 Oct 14 21:47 LATESTLOG.md
-rw-r--r-- 1 root root 1125 Oct 14 21:47 LICENSE
-rw-r--r-- 1 root root 6944 Oct 14 21:47 README.md
-rw-r--r-- 1 root root 7716 Oct 14 21:47 README.zh-cn.md
-rw-r--r-- 1 root root 3769 Oct 14 21:47 TESTING.md
-rw-r--r-- 1 root root 4742 Oct 14 21:47 a11y.eslintrc
drwxrwxrwx 65 root root 4096 Oct 14 21:47 docs
-rw-r--r-- 1 root root 2072 Oct 14 21:47 index-noreset.css
-rw-r--r-- 1 root root 2134 Oct 14 21:47 index-noreset.scss
-rw-r--r-- 1 root root 829 Oct 14 21:47 index-with-locales.js
-rw-r--r-- 1 root root 54 Oct 14 21:47 index.css
-rw-r--r-- 1 root root 88 Oct 14 21:47 index.js
-rw-r--r-- 1 root root 56 Oct 14 21:47 index.scss
drwxrwxrwx 1624 chromeuser chromeuser 40960 Aug 18 04:46 node_modules
-rwxrwxrwx 1 chromeuser chromeuser 1088778 Aug 18 04:46 package-lock.json
-rw-r--r-- 1 root root 7930 Oct 14 21:47 package.json
-rw-r--r-- 1 root root 31 Oct 14 21:47 reset.css
-rw-r--r-- 1 root root 31 Oct 14 21:47 reset.scss
drwxrwxrwx 13 root root 4096 Oct 14 21:47 scripts
drwxrwxrwx 4 root root 4096 Aug 18 04:44 site
drwxrwxrwx 70 root root 4096 Oct 14 21:47 src
drwxrwxrwx 68 root root 4096 Aug 18 04:44 test
-rw-r--r-- 1 root root 196 Oct 14 21:47 tsconfig.json
drwxrwxrwx 65 root root 4096 Oct 14 21:47 types
-rw-r--r-- 1 root root 2953 Oct 14 21:47 variables.scss
{
"name": "@alifd/next",
"version": "1.23.0",
"description": "A configurable component library for web built on React.",
"keywords": [
"fusion",
"fusion design",
"next",
"component",
"ui tookit",
"react",
"react-components",
"components",
"design",
"frontend"
],
"homepage": "https://github.com/alibaba-fusion/next",
"bugs": "https://github.com/alibaba-fusion/next/issues",
"license": "MIT",
"files": [
"dist",
"es",
"lib",
"types",
"index-noreset.scss",
"index-with-locales.js",
"index.js",
"index.scss",
"reset.scss",
"variables.scss",
"index.css",
"index-noreset.css",
"reset.css",
"variables.css",
".fusion"
],
"main": "index.js",
"module": "es/index.js",
"typings": "types/index.d.ts",
"repository": {
"type": "git",
"url": "https://github.com/alibaba-fusion/next.git"
},
"sideEffects": [
"dist/*",
"es/**/style.js",
"lib/**/style.js",
"es/**/style2.js",
"lib/**/style2.js",
"*.scss",
"*.css"
],
"scripts": {
"report-coverage": "codecov",
"preview": "node ./scripts/preview/index.js",
"dev": "node ./scripts/server/index.js",
"build": "node ./scripts/build/index.js",
"db-build": "node --inspect=9229 ./scripts/build/index.js",
"check": "node ./scripts/check/index.js",
"create": "node ./scripts/create-new.js",
"check-sass": "node ./scripts/check/sass.js",
"docs": "node ./scripts/docs/index.js",
"clear-dist": "node ./scripts/clear-dist.js",
"api": "node ./scripts/api.js",
"pack": "node ./scripts/pack.js",
"pack-adaptor": "node ./scripts/adaptor/build.js",
"release": "node ./scripts/release/index.js",
"test": "node --max_old_space_size=8192 ./scripts/test/index.js",
"test:a11y": "node --max_old_space_size=8192 ./scripts/test/a11y-index.js",
"order-var": "node ./scripts/order-var.js",
"eslint": "eslint '@(src|scripts)/**/*.@(js|jsx)' && eslint --fix 'docs/**/@(demo|theme)/*.@(md)'",
"tslint": "tsc",
"prettierjs": "prettier --write '@(src|test|scripts)/**/*.@(js|jsx)'",
"stylelint": "stylelint --fix 'src/**/*.@(css|scs…739 chars truncated… ]
},
"dependencies": {
"@alifd/field": "~1.5.0",
"@alifd/validate": "~1.2.0",
"babel-runtime": "^6.26.0",
"classnames": "^2.2.3",
"dayjs": "^1.9.6",
"hoist-non-react-statics": "^3.0.0",
"lodash.clonedeep": "^4.5.0",
"prop-types": "^15.6.0",
"react-lifecycles-compat": "^3.0.4",
"react-transition-group": "^2.2.1",
"resize-observer-polyfill": "^1.5.1",
"shallow-element-equals": "^1.0.1"
},
"devDependencies": {
"@alifd/adaptor-generate": "^0.2.3",
"@alifd/adaptor-helper": "^0.1.3",
"@alifd/api-extractor": "^3.7.1",
"@alifd/babel-preset-next": "^2.0.0",
"@alifd/doc-parser": "^1.0.0",
"@alifd/dts-generator": "^1.0.3",
"@alifd/eslint-config-next": "^2.0.0",
"@alifd/sass-mapper": "^0.1.0",
"@alifd/sass-tracker": "^0.1.0",
"@alifd/stylelint-config-next": "^1.0.0",
"@babel/core": "^7.12.3",
"@babel/plugin-proposal-class-properties": "^7.12.1",
"@babel/plugin-syntax-jsx": "^7.12.1",
"@commitlint/cli": "^7.0.0",
"@no-repeat/sassdoc-parser": "^0.0.11",
"@octokit/rest": "^18.0.9",
"@types/react": "^16.8.13",
"autoprefixer": "^7.1.4",
"axe-core": "~3.2.0",
"babel-core": "^6.26.0",
"babel-eslint": "^8.2.3",
"babel-loader": "^7.0.0",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-plugin-espower": "^2.3.2",
"babel-plugin-generator-prettier": "^1.2.0",
"babel-plugin-istanbul": "^4.1.5",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-plugin-transform-object-assign": "^6.22.0",
"babel-plugin-transform-proto-to-assign": "^6.26.0",
"babel-plugin-transform-react-es6-displayname": "^1.0.0-beta1.4",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.6.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"chalk": "^2.3.2",
"cheerio": "^1.0.0-rc.2",
"chokidar": "^2.0.4",
"chrome-launcher": "^0.10.2",
"co": "^4.6.0",
"console-polyfill": "^0.3.0",
"conventional-changelog": "^2.0.1",
"conventional-changelog-alifd": "^1.0.0",
"css-loader": "^0.28.7",
"css-split-webpack-plugin": "^0.2.5",
"ejs": "^2.5.9",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "~1.10.0",
"es5-shim": "^4.5.9",
"es6-promise-polyfill": "^1.2.0",
"eslint": "^4.19.1",
"eslint-config-prettier": "^4.0.0",
"eslint-plugin-html": "^5.0.0",
"eslint-plugin-import": "^2.12.0",
"eslint-plugin-jsx-a11y": "^6.2.1",
"eslint-plugin-markdown": "^1.0.0-beta.6",
"eslint-plugin-react": "7.11.1",
"expect.js": "^0.3.1",
"extract-text-webpack-plugin": "^3.0.0",
"fast-sass-loader": "^1.2.5",
"fs-extra": "^5.0.0",
"glob": "^7.1.2",
"highlight.js": ">=10.4.1",
"html5shiv": "^3.7.3",
"husky": "^0.14.3",
"inquirer": "^6.1.0",
"jsonp": "^0.2.1",
"karma": "^3.0.0",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage": "^1.1.1",
"karma-mocha": "^1.3.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-spec-reporter": "^0.0.26",
"karma-webdriver-launcher": "^1.0.5",
"karma-webpack": "^3.0.5",
"less": "^3.12.2",
"lint-staged": "^7.2.2",
"loader-utils": "^1.1.0",
"lodash": "^4.17.5",
"markdown-it": "^8.4.2",
"markdown-it-anchor": "^6.0.0",
"markdown-it-prism": "^2.1.3",
"md5": "^2.2.1",
"minimist": "^1.2.0",
"mocha": "^3.5.3",
"moment": "^2.20.1",
"node-sass": "^4.13.1",
"node-sass-package-importer": "^5.2.0",
"nunjucks": "^3.2.0",
"postcss": "^7.0.32",
"postcss-calc": "^7.0.3",
"postcss-custom-properties": "^9.1.1",
"postcss-import": "^12.0.1",
"postcss-loader": "^2.0.6",
"power-assert": "^1.5.0",
"prettier": "1.16.4",
"promise-polyfill": "^8.1.0",
"puppeteer": "^5.5.0",
"react": "^16.0.0",
"react-axe": "^3.0.2",
"react-copy-to-clipboard": "^5.0.1",
"react-cropper": "^1.0.0",
"react-dev-utils": "^4.2.1",
"react-dnd": "^7.0.0",
"react-dnd-html5-backend": "^7.0.0",
"react-dom": "^16.0.0",
"react-live": "^2.2.3",
"react-redux": "^5.0.7",
"react-router": "^4.3.1",
"react-router-dom": "^5.2.0",
"redux": "^4.0.0",
"remark": "^9.0.0",
"sassaby-next": "^3.0.0",
"simulate-event": "^1.4.0",
"sinon": "^5.0.10",
"solarlunar": "^2.0.7",
"style-loader": "^0.18.2",
"stylelint": "^13.0.0",
"stylelint-config-recommended": "^3.0.0",
"stylelint-csstree-validator": "^1.8.0",
"stylelint-scss": "^3.1.1",
"tslint": "^5.18.0",
"typescript": "^3.5.3",
"urllib": "^2.36.1",
"webpack": "^3.0.0",
"webpack-dev-server": "^2.x",
"whatwg-fetch": "^2.0.3"
},
"peerDependencies": {
"@alifd/meet-react": "^2.0.0",
"moment": "^2.22.1",
"react": "^16.0.0",
"react-dom": "^16.0.0"
},
"publishConfig": {
"access": "public"
}
}目前看到 CascaderSelect 会把数据源扁平化；我继续查找是否有对节点对象或数组的原地写入。
rg -n "dataSource|\.push\(|\.splice\(|\.sort\(|\.reverse\(|\[[^\]]+\]\s*=|delete |Object\.assign" src/cascader-select/cascader-select.jsxoutput · 29 lines
Chunk ID: c5f7c3
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 280
Output:
69: dataSource: PropTypes.arrayOf(PropTypes.object),
238: dataSource: [],
267: parts.push(other);
270: parts.push(<em key={`${i}-${j}`}>{matches[j]}</em>);
274: parts.push(' / ');
323: updateCache(dataSource) {
330: this._v2n[value] = this._p2n[pos] = { ...item, pos };
337: loop(dataSource);
348: const newValue = value.slice(0).sort((prev, next) => {
355: newValue.splice(j, 1);
396: ret.push(this._p2n[p].label);
464: indeterminate.push(parentValue);
483: const flatValue = this.flatValue(value).reverse();
489: newValue.push(this.getValue(ps[i]));
490: ps.splice(i, 1);
634: value.splice(value.indexOf(currentValue), 1);
682: items.push(this._p2n[pos]);
686: items.push(this._p2n[p]);
715: const { dataSource } = this.props;
716: if (dataSource.length === 0) {
749: dataSource,
830: dataSource,
846: this.updateCache(dataSource);rg --files test | rg 'cascader|select'output · 15 lines
Chunk ID: fa9b1d
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 65
Output:
test/tree-select/index-spec.js
test/select/util-spec.js
test/select/issue-spec.js
test/select/index-spec.js
test/select/a11y-spec.js
test/cascader-select/index-spec.js
test/cascader-select/a11y-spec.js
test/cascader/index-spec.js
test/cascader/a11y-spec.jssed -n '180,560p' src/cascader-select/cascader-select.jsxoutput · 379 lines
Chunk ID: 498bcf
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 2591
Output:
Warning: truncated output (original token count: 2591)
Total output lines: 381
header: PropTypes.node,
/**
* 自定义下拉框底部
*/
footer: PropTypes.node,
/**
* 初始下拉框是否显示
*/
defaultVisible: PropTypes.bool,
/**
* 当前下拉框是否显示
*/
visible: PropTypes.bool,
/**
* 下拉框显示或关闭时触发事件的回调函数
* @param {Boolean} visible 是否显示
* @param {String} type 触发显示关闭的操作类型, fromTrigger 表示由trigger的点击触发； docClick 表示由document的点击触发
*/
onVisibleChange: PropTypes.func,
/**
* 下拉框自定义样式对象
*/
popupStyle: PropTypes.object,
/**
* 下拉框样式自定义类名
*/
popupClassName: PropTypes.string,
/**
* 下拉框挂载的容器节点
*/
popupContainer: PropTypes.any,
/**
* 透传到 Popup 的属性对象
*/
popupProps: PropTypes.object,
/**
* 是否跟随滚动
*/
followTrigger: PropTypes.bool,
/**
* 是否为预览态
*/
isPreview: PropTypes.bool,
/**
* 预览态模式下渲染的内容
* @param {Array<data>} value 选择值 { label: , value:}
*/
renderPreview: PropTypes.func,
};
static defaultProps = {
prefix: 'next-',
pure: false,
size: 'medium',
disabled: false,
hasArrow: true,
hasBorder: true,
hasClear: false,
dataSource: [],
defaultValue: null,
expandTriggerType: 'click',
onExpand: () => {},
useVirtual: false,
multiple: false,
changeOnSelect: false,
canOnlyCheckLeaf: false,
checkStrictly: false,
showSearch: false,
filter: (searchValue, path) => {
return path.some(
item =>
String(item.label)
.toLowerCase()
.indexOf(String(searchValue).toLowerCase()) > -1
);
},
resultRender: (searchValue, path) => {
const parts = [];
path.forEach((item, i) => {
const reExp = searchValue.replace(/[-.+*?^$()[\]{}|\\]/g, v => `\\${v}`);
const re = new RegExp(reExp, 'gi');
const others = item.label.split(re);
const matches = item.label.match(re);
others.forEach((other, j) => {
if (other) {
parts.push(other);
}
if (j < others.length - 1) {
parts.push(<em key={`${i}-${j}`}>{matches[j]}</em>);
}
});
if (i < path.length - 1) {
parts.push(' / ');
}
});
return <span>{parts}</span>;
},
resultAutoWidth: true,
notFoundContent: 'Not Found',
defaultVisible: false,
onVisibleChange: () => {},
popupProps: {},
};
constructor(props, context) {
super(props, context);
this.state = {
value: normalizeValue('value' in props ? props.value : props.defaultValue),
searchValue: '',
visible: typeof props.visible === 'undefined' ? props.defaultVisible : props.visible,
};
bindCtx(this, [
'handleVisibleChange',
'handleAfterOpen',
'handleSelect',
'handleChange',
'handleClear',
'handleRemove',
'handleSearch',
'getPopup',
'saveSelectRef',
'saveCascaderRef',
'handleKeyDown',
]);
}
static getDerivedStateFromProps(props) {
const st = {};
if ('value' in props) {
st.value = normalizeValue(props.value);
}
if ('visible' in props) {
st.visible = props.visible;
}
return st;
}
updateCache(dataSource) {
this._v2n = {};
this._p2n = {};
const loop = (data, prefix = '0') =>
data.forEach((item, index) => {
const { value, children } = item;
const pos = `${prefix}-${index}`;
this._v2n[value] = this._p2n[pos] = { ...item, pos };
if (children && children.length) {
loop(children, pos);
}
});
loop(dataSource);
}
flatValue(value) {
const getDepth = v => {
const pos = this.getPos(v);
if (!pos) {
return 0;
}
return pos.split('-').length;
};
const newValue = value.slice(0).sort((prev, next) => {
return getDepth(prev) - getDepth(next);
…362 chars truncated…
}
isDescendantOrSelf(currentPos, targetPos) {
if (!currentPos || !targetPos) {
return false;
}
const currentNums = currentPos.split('-');
const targetNums = targetPos.split('-');
return (
currentNums.length <= targetNums.length &&
currentNums.every((num, index) => {
return num === targetNums[index];
})
);
}
getValue(pos) {
return this._p2n[pos] ? this._p2n[pos].value : null;
}
getPos(value) {
return this._v2n[value] ? this._v2n[value].pos : null;
}
getData(value) {
return value.map(v => this._v2n[v]);
}
getLabelPath(data) {
const nums = data.pos.split('-');
return nums.slice(1).reduce((ret, num, index) => {
const p = nums.slice(0, index + 2).join('-');
ret.push(this._p2n[p].label);
return ret;
}, []);
}
getSignleData(value) {
if (!value.length) {
return null;
}
if (Array.isArray(value)) value = value[0];
const data = this._v2n[value];
if (!data) {
return {
value,
};
}
const labelPath = this.getLabelPath(data);
const displayRender = this.props.displayRender || (labels => labels.join(' / '));
return {
...data,
label: displayRender(labelPath, data),
};
}
getMultipleData(value) {
if (!value.length) {
return null;
}
const { checkStrictly, canOnlyCheckLeaf, displayRender } = this.props;
let data = (checkStrictly || canOnlyCheckLeaf ? value : this.flatValue(value)).map(
v => this._v2n[v] || { value: v }
);
if (displayRender) {
data = data.map(item => {
if (!item.pos) {
return item;
}
const labelPath = this.getLabelPath(item);
return {
...item,
label: displayRender(labelPath, item),
};
});
}
return data;
}
getIndeterminate(value) {
const indeterminate = [];
const positions = value.map(this.getPos.bind(this));
positions.forEach(pos => {
if (!pos) {
return false;
}
const nums = pos.split('-');
for (let i = nums.length; i > 2; i--) {
const parentPos = nums.slice(0, i - 1).join('-');
const parentValue = this.getValue(parentPos);
if (indeterminate.indexOf(parentValue) === -1) {
indeterminate.push(parentValue);
}
}
});
return indeterminate;
}
saveSelectRef(ref) {
this.select = ref;
}
saveCascaderRef(ref) {
this.cascader = ref;
}
completeValue(value) {
const newValue = [];
const flatValue = this.flatValue(value).reverse();
const ps = Object.keys(this._p2n);
for (let i = 0; i < ps.length; i++) {
for (let j = 0; j < flatValue.length; j++) {
const v = flatValue[j];
if (this.isDescendantOrSelf(this.getPos(v), ps[i])) {
newValue.push(this.getValue(ps[i]));
ps.splice(i, 1);
i--;
break;
}
}
}
return newValue;
}
isLeaf(data) {
return !((data.children && data.children.length) || (!!this.props.loadData && !data.isLeaf));
}
handleVisibleChange(visible, type) {
const { searchValue } = this.state;
if (!('visible' in this.props)) {
this.setState({
visible,
});
}
if (!visible && searchValue) {
this.setState({
searchValue: '',
});
}
if (['fromCascader', 'keyboard'].indexOf(type) !== -1 && !visible) {
this.select.focusInput();
}
this.props.onVisibleChange(visible, type);
}
handleKeyDown(e) {
const { onKeyDown } = this.props;
const { visible } = this.state;
if (onKeyDown) {
onKeyDown(e);
}
if (!visible) {
return;
}
switch (e.keyCode) {
case KEYCODE.UP:
case KEYCODE.DOWN:
this.cascader.setFocusValue();
e.preventDefault();
break;
default:
break;
}
}
getPopup(ref) {
this.popup = ref;
if (typeof this.props.popupProps.ref === 'function') {
this.props.popupProps.ref(ref);
}
}
handleAfterOpen() {
if (!this.popup) {
return;
}
const { prefix, popupProps } = this.props;rg -n "function flatDataSource|const flatDataSource|flatDataSource|dataSource\[|node\.|item\." src/cascader src/cascader-selectoutput · 72 lines
Chunk ID: 40e8a7
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1451
Output:
src/cascader/utils.js:20: if (node.disabled || node.checkboxDisabled) return true;
src/cascader/utils.js:22: if (node.checkable === false) {
src/cascader/utils.js:24: !node.children ||
src/cascader/utils.js:25: node.children.length === 0 ||
src/cascader/utils.js:26: node.children.every(c => isNodeChecked(c, checkedValues))
src/cascader/utils.js:29: return checkedValues.indexOf(node.value) > -1;
src/cascader/utils.js:38: if (node.disabled || node.checkboxDisabled) return;
src/cascader/utils.js:41: if (node.children && node.children.length > 0) {
src/cascader/utils.js:42: node.children.forEach(child => forEachEnableNode(child, callback));
src/cascader/utils.js:51: if (node.disabled || node.checkboxDisabled) return true;
src/cascader/utils.js:53: if (node.checkable === false) {
src/cascader/utils.js:55: !node.children ||
src/cascader/utils.js:56: node.children.length === 0 ||
src/cascader/utils.js:57: node.children.every(isNodeDisabledChecked)
src/cascader/utils.js:71: let parentPos = node.pos.split(['-']);
src/cascader/utils.js:95: node.checkable === false ||
src/cascader/utils.js:97: values.indexOf(node.value) === -1
src/cascader/utils.js:111: !node.children ||
src/cascader/utils.js:112: node.children.length === 0 ||
src/cascader/utils.js:113: node.children.every(isNodeDisabledChecked)
src/cascader/utils.js:209: if (node.checkable === false) return;
src/cascader/utils.js:210: newValues.push(node.value);
src/cascader-select/cascader-select.jsx:251: String(item.label)
src/cascader-select/cascader-select.jsx:262: const others = item.label.split(re);
src/cascader-select/cascader-select.jsx:263: const matches = item.label.match(re);
src/cascader-select/cascader-select.jsx:436: if (!item.pos) {
src/cascader-select/cascader-select.jsx:698: items = items.filter(item => !item.children || !item.children.length);
src/cascader-select/cascader-select.jsx:701: return items.map(item => this.getPath(item.pos)).filter(path => filter(searchValue, path));
src/cascader/main.scss:42: &-item.#{$css-prefix}expanded {
src/cascader/main.scss:66: &-item.#{$css-prefix}expanded &-icon-right {
src/cascader/main.scss:70: &-item.#{$css-prefix}expanded &-icon-loading {
src/cascader/menu.jsx:26: !!item.props.checked ||
src/cascader/menu.jsx:27: !!item.props.selected ||
src/cascader/menu.jsx:28: !!item.props.expanded
src/cascader/menu.jsx:61: node.type.menuChildType === 'item'
src/cascader/cascader.jsx:22:const flatDataSource = (data, prefix = '0', v2n = {}, p2n = {}) => {
src/cascader/cascader.jsx:27: item.value = newValue;
src/cascader/cascader.jsx:35: flatDataSource(children, pos, v2n, p2n);
src/cascader/cascader.jsx:186: itemRender: item => item.label,
src/cascader/cascader.jsx:204: const { v2n, p2n } = flatDataSource(dataSource);
src/cascader/cascader.jsx:237: const { v2n, p2n } = flatDataSource(props.dataSource);
src/cascader/cascader.jsx:387: if (node.checkable === false) return;
src/cascader/cascader.jsx:388: this.processValue(value, node.value, checked);
src/cascader/cascader.jsx:415: if (isSiblingOrSelf(currentPos, p) && !pnode.disabled && !pnode.checkboxDisabled) {
src/cascader/cascader.jsx:416: const k = pnode.value;
src/cascader/cascader.jsx:418: if (pnode.checkable === false) {
src/cascader/cascader.jsx:420: if (!pnode.children || pnode.children.length === 0) {
src/cascader/cascader.jsx:424: for (let m = 0; m < pnode.children.length; m++) {
src/cascader/cascader.jsx:426: if (!pnode.children.every(child => isNodeChecked(child, value))) {
src/cascader/cascader.jsx:530: if (dataSource[i] && !dataSource[i].disabled) {
src/cascader/cascader.jsx:531: return dataSource[i].value;
src/cascader/cascader.jsx:545: if (!path.some(item => item.disabled)) {
src/cascader/cascader.jsx:652: const disabled = !!item.disabled;
src/cascader/cascader.jsx:653: const canExpand = (!!item.children && !!item.children.length) || (!!loadData && !item.isLeaf);
src/cascader/cascader.jsx:654: const expanded = expandedValue[level] === item.value;
src/cascader/cascader.jsx:661: onExpand: this.handleExpand.bind(this, item.value, level, canExpand),
src/cascader/cascader.jsx:666: props.title = item.title;
src/cascader/cascader.jsx:671: props.checked = value.indexOf(item.value) > -1 || !!item.checked;
src/cascader/cascader.jsx:673: (checkStrictly || canOnlyCheckLeaf ? false : this.indeterminate.indexOf(item.value) > -1) ||
src/cascader/cascader.jsx:674: !!item.indeterminate;
src/cascader/cascader.jsx:675: props.checkboxDisabled = !!item.checkboxDisabled;
src/cascader/cascader.jsx:676: props.onCheck = this.handleCheck.bind(this, item.value);
src/cascader/cascader.jsx:678: props.selected = value[0] === item.value;
src/cascader/cascader.jsx:679: props.onSelect = this.handleSelect.bind(this, item.value, canExpand);
src/cascader/cascader.jsx:683: <CascaderMenuItem key={item.value} {...props}>
src/cascader/cascader.jsx:728: disabled: path.some(item => item.disabled),sed -n '1,90p' src/cascader/cascader.jsx && sed -n '190,255p' src/cascader/cascader.jsx && sed -n '620,710p' src/cascader-select/cascader-select.jsx && sed -n '800,880p' src/cascader-select/cascader-select.jsxoutput · 334 lines
Chunk ID: 1c531b
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 2321
Output:
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { polyfill } from 'react-lifecycles-compat';
import cx from 'classnames';
import Menu from '../menu';
import { func, obj, dom } from '../util';
import CascaderMenu from './menu';
import CascaderMenuItem from './item';
import {
filterChildValue,
getAllCheckedValues,
forEachEnableNode,
isSiblingOrSelf,
isDescendantOrSelf,
isNodeChecked,
} from './utils';
const { bindCtx } = func;
const { pickOthers } = obj;
const { addClass, removeClass, setStyle, getStyle } = dom;
const flatDataSource = (data, prefix = '0', v2n = {}, p2n = {}) => {
data.forEach((item, index) => {
const { value, children } = item;
const pos = `${prefix}-${index}`;
const newValue = String(value);
item.value = newValue;
v2n[newValue] = p2n[pos] = {
...item,
pos,
_source: item,
};
if (children && children.length) {
flatDataSource(children, pos, v2n, p2n);
}
});
return { v2n, p2n };
};
const getExpandedValue = (v, _v2n, _p2n) => {
if (!v || !_v2n[v]) {
return [];
}
const pos = _v2n[v].pos;
if (pos.split('-').length === 2) {
return [];
}
const expandedMap = {};
Object.keys(_p2n).forEach(p => {
if (isDescendantOrSelf(p, pos) && p !== pos) {
expandedMap[_p2n[p].value] = p;
}
});
return Object.keys(expandedMap).sort((prev, next) => {
return expandedMap[prev].split('-').length - expandedMap[next].split('-').length;
});
};
const normalizeValue = value => {
if (value) {
if (Array.isArray(value)) {
return value;
}
return [value];
}
return [];
};
/**
* Cascader
*/
class Cascader extends Component {
static propTypes = {
prefix: PropTypes.string,
rtl: PropTypes.bool,
pure: PropTypes.bool,
className: PropTypes.string,
/**
* 数据源，结构可参考下方说明
*/
dataSource: PropTypes.arrayOf(PropTypes.object),
/**
* （非受控）默认值
super(props, context);
const {
defaultValue,
value,
defaultExpandedValue,
expandedValue,
dataSource,
multiple,
checkStrictly,
canOnlyCheckLeaf,
loadData,
} = props;
const { v2n, p2n } = flatDataSource(dataSource);
let normalizedValue = normalizeValue(typeof value === 'undefined' ? defaultValue : value);
if (!loadData) {
normalizedValue = normalizedValue.filter(v => v2n[v]);
}
const realExpandedValue =
typeof expandedValue === 'undefined'
? typeof defaultExpandedValue === 'undefined'
? getExpandedValue(normalizedValue[0], v2n, p2n)
: normalizeValue(defaultExpandedValue)
: normalizeValue(expandedValue);
const st = {
value: normalizedValue,
expandedValue: realExpandedValue,
};
if (multiple && !checkStrictly && !canOnlyCheckLeaf) {
st.value = getAllCheckedValues(st.value, v2n, p2n);
}
this.lastExpandedValue = [...st.expandedValue];
this.state = {
...st,
_v2n: v2n,
_p2n: p2n,
};
bindCtx(this, ['handleMouseLeave', 'handleFocus', 'handleFold', 'getCascaderNode', 'onBlur']);
}
static getDerivedStateFromProps(props, state) {
const { v2n, p2n } = flatDataSource(props.dataSource);
const states = {};
if ('value' in props) {
states.value = normalizeValue(props.value);
if (!props.loadData) {
states.value = states.value.filter(v => v2n[v]);
}
const { multiple, checkStrictly, canOnlyCheckLeaf } = props;
if (multiple && !checkStrictly && !canOnlyCheckLeaf) {
states.value = getAllCheckedValues(states.value, v2n, p2n);
}
if (!state.expandedValue.length && !('expandedValue' in props)) {
states.expandedValue = getExpandedValue(states.value[0], v2n, p2n);
}
}
});
}
this.props.onChange(null, null);
}
}
handleRemove(currentData) {
const { value: currentValue } = currentData;
let value;
const { multiple, checkStrictly, onChange } = this.props;
if (multiple) {
value = [...this.state.value];
value.splice(value.indexOf(currentValue), 1);
if (this.props.onChange) {
const data = this.getData(value);
const checked = false;
if (checkStrictly) {
this.props.onChange(value, data, {
checked,
currentData,
checkedData: data,
});
} else {
const checkedValue = this.completeValue(value);
const checkedData = this.getData(checkedValue);
const indeterminateValue = this.getIndeterminate(value);
const indeterminateData = this.getData(indeterminateValue);
this.props.onChange(value, data, {
checked,
currentData,
checkedData,
indeterminateData,
});
}
}
} else {
value = [];
onChange(null, null);
}
if (!('value' in this.props)) {
this.setState({
value,
});
}
}
handleSearch(searchValue) {
this.setState({
searchValue,
});
}
getPath(pos) {
const items = [];
const nums = pos.split('-');
if (nums === 2) {
items.push(this._p2n[pos]);
} else {
for (let i = 1; i < nums.length; i++) {
const p = nums.slice(0, i + 1).join('-');
items.push(this._p2n[p]);
}
}
return items;
}
filterItems() {
const { multiple, changeOnSelect, canOnlyCheckLeaf, filter } = this.props;
const { searchValue } = this.state;
let items = Object.keys(this._p2n).map(p => this._p2n[p]);
if ((!multiple && !changeOnSelect) || (multiple && canOnlyCheckLeaf)) {
items = items.filter(item => !item.children || !item.children.length);
}
return items.map(item => this.getPath(item.pos)).filter(path => filter(searchValue, path));
}
renderNotFound() {
const { prefix, notFoundContent } = this.props;
return (
<Menu className={`${prefix}cascader-select-not-found`}>
<Menu.Item>{notFoundContent}</Menu.Item>
</Menu>
if (!Array.isArray(items)) {
items = [items];
}
if (typeof renderPreview === 'function') {
return (
<div {...others} className={previewCls}>
{renderPreview(items, this.props)}
</div>
);
}
return (
<p {...others} className={previewCls}>
{items.map(({ label }) => label).join(', ')}
</p>
);
}
render() {
const {
prefix,
size,
hasArrow,
hasBorder,
hasClear,
label,
readOnly,
placeholder,
dataSource,
disabled,
multiple,
className,
showSearch,
popupStyle,
popupClassName,
popupContainer,
popupProps,
followTrigger,
isPreview,
resultAutoWidth,
} = this.props;
const { value, searchValue, visible } = this.state;
const others = pickOthers(Object.keys(CascaderSelect.propTypes), this.props);
this.updateCache(dataSource);
if (isPreview) {
return this.renderPreview(others);
}
const popupContent = this.renderPopupContent();
const props = {
prefix,
className,
size,
placeholder,
disabled,
hasArrow,
hasBorder,
hasClear,
label,
readOnly,
ref: this.saveSelectRef,
autoWidth: false,
mode: multiple ? 'multiple' : 'single',
value: multiple ? this.getMultipleData(value) : this.getSignleData(value),
onChange: this.handleClear,
onRemove: this.handleRemove,
visible,
onVisibleChange: this.handleVisibleChange,
showSearch,
// searchValue,
onSearch: this.handleSearch,
onKeyDown: this.handleKeyDown,
popupContent,
popupStyle,
popupClassName,
popupContainer,sed -n '1,240p' test/cascader-select/index-spec.jsoutput · 246 lines
Chunk ID: 4262fa
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1881
Output:
import React from 'react';
import ReactDOM from 'react-dom';
import ReactTestUtils, { act } from 'react-dom/test-utils';
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import assert from 'power-assert';
import { KEYCODE } from '../../src/util';
import CascaderSelect from '../../src/cascader-select';
import '../../src/cascader-select/style.js';
/* eslint-disable react/jsx-filename-extension */
/* global describe it afterEach */
Enzyme.configure({ adapter: new Adapter() });
const ChinaArea = [
{
value: '2973',
label: '陕西',
children: [
{
value: '2974',
label: '西安',
children: [{ value: '2975', label: '西安市' }, { value: '2976', label: '高陵县' }],
},
{
value: '2980',
label: '铜川',
children: [{ value: '2981', label: '铜川市' }, { value: '2982', label: '宜君县' }],
},
],
},
{
value: '3078',
label: '四川',
},
];
describe('CascaderSelect', () => {
let wrapper;
afterEach(() => {
if (wrapper) {
wrapper.unmount();
wrapper = null;
}
});
it('should show dropdown when set defaultVisible to true', () => {
wrapper = mount(<CascaderSelect dataSource={ChinaArea} defaultVisible />);
assert(document.querySelector('.next-cascader-select-dropdown'));
});
it('should show dropdown when click select box', done => {
wrapper = mount(<CascaderSelect dataSource={ChinaArea} />);
assert(!document.querySelector('.next-cascader-select-dropdown'));
wrapper.find('.next-select').simulate('click');
setTimeout(() => {
assert(document.querySelector('.next-cascader-select-dropdown'));
done();
}, 500);
});
it('should render single cascader select', () => {
let changeCalled = false;
const handleChange = () => {
changeCalled = true;
};
wrapper = mount(
<CascaderSelect defaultVisible defaultValue="2975" dataSource={ChinaArea} onChange={handleChange} />
);
assert(
wrapper
.find('span.next-select-inner em')
.text()
.trim() === '陕西 / 西安 / 西安市'
);
const item21 = findItem(2, 1);
ReactTestUtils.Simulate.click(item21);
assert(changeCalled);
assert(
wrapper
.find('span.next-select-inner em')
.text()
.trim() === '陕西 / 西安 / 高陵县'
);
wrapper.setProps({ displayRender: label => label.join('-') });
assert(
wrapper
.find('span.next-select-inner em')
.text()
.trim() === '陕西-西安-高陵县'
);
});
it('should render single cascader under control', () => {
let changeCalled = false;
const handleChange = value => {
changeCalled = true;
wrapper.setProps({ value });
};
wrapper = mount(
<CascaderSelect
defaultVisible
defaultValue="2976"
value="2975"
dataSource={ChinaArea}
onChange={handleChange}
/>
);
assert(
wrapper
.find('span.next-select-inner em')
.text()
.trim() === '陕西 / 西安 / 西安市'
);
const item21 = findItem(2, 1);
ReactTestUtils.Simulate.click(item21);
assert(changeCalled);
assert(
wrapper
.find('span.next-select-inner em')
.text()
.trim() === '陕西 / 西安 / 高陵县'
);
});
it('should change select box display when expand item if set changeOnSelect to true', () => {
wrapper = mount(<CascaderSelect changeOnSelect defaultVisible dataSource={ChinaArea} />);
const item00 = findItem(0, 0);
ReactTestUtils.Simulate.click(item00);
wrapper.update();
assert(
wrapper
.find('span.next-select-inner em')
.text()
.trim() === '陕西'
);
const item10 = findItem(1, 0);
ReactTestUtils.Simulate.click(item10);
wrapper.update();
assert(
wrapper
.find('span.next-select-inner em')
.text()
.trim() === '陕西 / 西安'
);
const item20 = findItem(2, 0);
ReactTestUtils.Simulate.click(item20);
wrapper.update();
assert(
wrapper
.find('span.next-select-inner em')
.text()
.trim() === '陕西 / 西安 / 西安市'
);
});
it('should render multiple cascader', () => {
const dataSource = [
{
value: '2973',
label: '陕西',
children: [
{
value: '2974',
label: '西安',
children: [
{
value: '2975',
label: '西安市',
},
{
value: '2976',
label: '高陵县',
},
],
},
{
value: '2980',
label: '铜川',
},
],
},
];
let changeCalled = false;
const handleChange = (v, d, e) => {
assert.deepEqual(v, ['2980']);
assert.deepEqual(d, [
{
value: '2980',
label: '铜川',
pos: '0-0-1',
},
]);
delete e.indeterminateData[0].children;
assert.deepEqual(e, {
checked: false,
currentData: { value: '2975', label: '西安市', pos: '0-0-0-0' },
checkedData: [{ value: '2980', label: '铜川', pos: '0-0-1' }],
indeterminateData: [{ value: '2973', label: '陕西', pos: '0-0' }],
});
changeCalled = true;
};
wrapper = mount(
<CascaderSelect
multiple
defaultVisible
defaultValue={['2975', '2980']}
dataSource={dataSource}
onChange={handleChange}
/>
);
assert.deepEqual(getLabels(wrapper), ['铜川', '西安市']);
const removeLink = wrapper.find('span.next-tag-close-btn').at(1);
removeLink.simulate('click');
assert.deepEqual(getLabels(wrapper), ['铜川']);
assert(changeCalled);
wrapper.setProps({
displayRender: labelPath => labelPath.join(' / '),
});
assert.deepEqual(getLabels(wrapper), ['陕西 / 铜川']);
});
it('should render multiple cascader when set checkStrictly to true', () => {
const dataSource = [
{
value: '2973',
label: '陕西',
children: [sed -n '240,540p' test/cascader-select/index-spec.js && sed -n '1,180p' test/cascader/index-spec.jsoutput · 298 lines
Chunk ID: 4fea78
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 3970
Output:
Warning: truncated output (original token count: 3970)
Total output lines: 463
children: [
{
value: '2974',
label: '西安',
children: [
{
value: '2975',
label: '西安市',
},
{
value: '2976',
label: '高陵县',
},
],
},
{
value: '2980',
label: '铜川',
},
],
},
];
let changeCalled = false;
const handleChange = (v, d, e) => {
assert.deepEqual(v, ['2980']);
assert.deepEqual(d, [
{
value: '2980',
label: '铜川',
pos: '0-0-1',
},
]);
assert.deepEqual(e, {
checked: false,
currentData: { value: '2975', label: '西安市', pos: '0-0-0-0' },
checkedData: [{ value: '2980', label: '铜川', pos: '0-0-1' }],
});
changeCalled = true;
};
const wrapper = mount(
<CascaderSelect
multiple
defaultVisible
checkStrictly
defaultValue={['2975', '2980']}
dataSource={dataSource}
onChange={handleChange}
/>
);
assert.deepEqual(getLabels(wrapper), ['西安市', '铜川']);
const removeLink = wrapper.find('span.next-tag-close-btn').at(0);
removeLink.simulate('click');
assert.deepEqual(getLabels(wrapper), ['铜川']);
assert(changeCalled);
});
it('should support searching when it is a single cascader select', () => {
wrapper = mount(<CascaderSelect showSearch defaultVisible defaultValue="2975" dataSource={ChinaArea} />);
wrapper.find('.next-select-trigger-search input').simulate('change', { target: { value: '哈哈' } });
wrapper.update();
assert(document.querySelector('.next-cascader-select-not-found').textContent.trim() === 'Not Found');
wrapper.find('.next-select-trigger-search input').simulate('change', { target: { value: '高陵' } });
wrapper.update();
assert(document.querySelector('.next-cascader-filtered-list').textContent.trim() === '陕西 / 西安 / 高陵县');
assert(document.querySelector('.next-cascader-filtered-list em').textContent.trim() === '高陵');
ReactTestUtils.Simulate.click(document.querySelector('.next-cascader-filtered-item'));
wrapper.update();
assert(
wrapper
.find('span.next-select-inner em')
.text()
.trim() === '陕西 / 西安 / 高陵县'
);
});
it('should support searching when it is a multiple cascader select', () => {
wrapper = mount(
<CascaderSelect multiple showSearch defaultVisible defaultValue="2975" dataSource={ChinaArea} />
);
wrapper.find('.next-select-trigger-search input').simulate('change', { target: { value: '哈哈' } });
wrapper.update();
assert(document.querySelector('.next-cascader-select-not-found').textContent.trim() === 'Not Found');
wrapper.find('.next-select-trigger-search input').simulate('change', { target: { value: '高陵' } });
wrapper.update();
assert(document.querySelector('.next-cascader-filtered-list').textContent.trim() === '陕西 / 西安 / 高陵县');
assert(document.querySelector('.next-cascader-filtered-list em').textContent.trim() === '高陵');
});
it('should ignore case when searching', () => {
const SpecialChars = '-[.+*?^$()[]{}|\\';
const dataSource = [
{
value: 'Aa',
label: 'Aa',
children: [
{
value: 'Bb',
label: 'Bb',
},
{
value: SpecialChars,
label: SpecialChars,
},
],
},
];
wrapper = mount(<CascaderSelect showSearch defaultVisible defaultValue="Aa" dataSource={dataSource} />);
const specialCharCases = SpecialChars.split('').map(c => [c, c]);
[['aa', 'Aa'], ['BB', 'Bb'], ...specialCharCases].forEach(([iptVal, excepted]) => {
wrapper.find('.next-select-trigger-search input').simulate('change', { target: { value: iptVal } });
wrapper.update();
assert(document.querySelector('.next-cascader-filtered-list em').textContent.trim() === excepted);
});
});
it('should support keyborad', done => {
…5824 chars truncated…pter() });
const ChinaArea = [
{
value: '2973',
label: '陕西',
children: [
{
value: '2974',
label: '西安',
children: [{ value: '2975', label: '西安市' }, { value: '2976', label: '高陵县' }],
},
{
value: '2980',
label: '铜川',
children: [{ value: '2981', label: '铜川市' }, { value: '2982', label: '宜君县' }],
},
],
},
{
value: '3078',
label: '四川',
},
];
describe('Cascader', () => {
let wrapper;
afterEach(() => {
const overlay = document.querySelectorAll('.next-overlay-wrapper');
overlay.forEach(dom => {
document.body.removeChild(dom);
});
if (wrapper) {
wrapper.unmount();
wrapper = null;
}
});
it('should render single cascader', () => {
const defaultValue = '2975';
const defaultExpandedValue = ['2973', '2974'];
let changeCalled = false;
let expandCalled = false;
const handleChange = (v, d, e) => {
changeCalled = true;
assert(v === '2980');
delete d.children;
delete d._source;
assert.deepEqual(d, {
value: '2980',
label: '铜川',
pos: '0-0-1',
});
e.selectedPath.forEach(d => {
delete d.children;
delete d._source;
});
assert.deepEqual(e, {
selectedPath: [
{
value: '2973',
label: '陕西',
pos: '0-0',
},
{
value: '2980',
label: '铜川',
pos: '0-0-1',
},
],
});
};
const handleExpand = ev => {
expandCalled = true;
assert.deepEqual(ev, ['2973', '2980']);
};
wrapper = mount(
<Cascader
defaultValue={defaultValue}
defaultExpandedValue={defaultExpandedValue}
dataSource={ChinaArea}
onChange={handleChange}
onExpand={handleExpand}
/>
);
compareDOMAndData(wrapper, defaultValue, defaultExpandedValue);
findItem(wrapper, 1, 1).simulate('click');
compareDOMAndData(wrapper, '2980', ['2973', '2980']);
assert(changeCalled);
assert(expandCalled);
});
it('should render single cascader under control', () => {
let value = '2975';
let expandedValue = ['2973', '2974'];
let changeCalled = false;
let expandCalled = false;
const handleChange = (v, d, e) => {
changeCalled = true;
assert(v === '2980');
delete d.children;
delete d._source;
assert.deepEqual(d, {
value: '2980',
label: '铜川',
pos: '0-0-1',
});
e.selectedPath.forEach(d => {
delete d.children;
delete d._source;
});
assert.deepEqual(e, {
selectedPath: [
{
value: '2973',
label: '陕西',
pos: '0-0',
},
{
value: '2980',
label: '铜川',
pos: '0-0-1',
},
],
});
value = v;
wrapper.setProps({ value });
};
const handleExpand = ev => {
expandCalled = true;
assert.deepEqual(ev, ['2973', '2980']);
expandedValue = ev;
wrapper.setProps({ value, expandedValue });
};
wrapper = mount(
<Cascader
defaultValue="2973"
defaultExpandedValue={['2973']}
value={value}
expandedValue={expandedValue}
onChange={handleChange}
onExpand={handleExpand}
/>
);
compareDOMAndData(wrapper, value, expandedValue);
wrapper.setProps({ dataSource: ChinaArea });
findItem(wrapper, 1, 1).simulate('click');
compareDOMAndData(wrapper, value, expandedValue);
assert(changeCalled);
assert(expandCalled);
wrapper.setProps({
defaultValue: '2974',
defaultExpandedValue: ['2973', '2974'],
});
compareDOMAndData(wrapper, value, expandedValue);
});
it('should not trigger onChange when click the selected item', () => {
const handleChange = () => {
assert(false);
};git status --short && git log -5 --oneline -- src/cascader/cascader.jsx src/cascader-select/cascader-select.jsxoutput · 7 lines
Chunk ID: 5fa96e
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 14
Output:
bca6089 fix(Gateway): document undefined on ssr (#2982)I need to work on the normalization values for the value source. If the value is numeric, it should convert to a string, but the intended behavior in the callback might be different. I’m considering adding regression tests for CascaderSelect and possibly for Cascader directly. It's crucial to check the dataSource objects, making sure the nested arrays remain functional, even with type conversions. I'll also investigate running test suites, perhaps with npm test or something similar.
Inspecting Cascader Component
I’m thinking about the Cascader component, specifically how it flattens each render without mutating the original arrays. It sounds good! I need to check the complete tests for CascaderSelect and look into the conventions involved, along with verifying the test runner command. It might be a good idea to create a new file close to the first test. I'll also inspect the package test script and the scripts/test/index.
sed -n '1,180p' scripts/test/index.js && sed -n '1,110p' src/cascader-select/cascader-select.jsx && sed -n '1,80p' src/cascader/index.js && rg -n "Object\.freeze|freeze\(" testoutput · 226 lines
Chunk ID: 99b730
Wall time: 0.0000 seconds
Process exited with code 2
Original token count: 1617
Output:
// const fs = require('fs-extra');
const { join } = require('path');
const { Server } = require('karma');
const Mocha = require('mocha');
const co = require('co');
const inquirer = require('inquirer');
const { logger, checkComponentName } = require('../utils');
let server = null;
let failedNum = 0,
successNum = 0;
const componentName = checkComponentName(true);
const config = {
configFile: join(__dirname, 'karma.js'),
component: componentName,
runAll: false,
// a11y: process.argv
};
const coreTest = cb => {
const mocha = new Mocha();
mocha.addFile(join('test', 'core'));
mocha.run(failures => {
failedNum += failures;
typeof cb === 'function' && cb();
});
};
const runRest = components => {
if (components && components.length > 0) {
const com = components.splice(0, 10);
if (com === 'core') {
coreTest(() => {
runRest(components);
});
return;
}
config.componentArray = com;
config.runAll = true;
server = new Server(config, () => {
server = null;
});
server.start();
server.on('run_complete', (brower, result) => {
const { error, failed, success, exitCode } = result;
failedNum += failed;
successNum += success;
if (error) {
process.exit(exitCode);
} else {
runRest(components);
}
});
} else if (failedNum) {
logger.error(`TOTAL: ${failedNum} FAILED, ${successNum} SUCCESS`);
process.exit(1);
} else {
logger.success('Run all successfully!');
process.exit(0);
}
};
const runAllTest = (a11y = false) => {
// const components = fs.readdirSync(join(process.cwd(), 'test'));
// runRest(components);
config.runAll = true;
config.a11y = a11y;
server = new Server(config);
server.start();
};
switch (componentName) {
case 'core':
coreTest();
break;
case 'all':
co(function*() {
if (process.env.CI) {
runAllTest();
} else {
const allTest = yield inquirer.prompt([
{
name: 'runAllTest',
type: 'list',
choices: ['yes', 'no'],
default: 1,
message: logger.success('This will run ALL components test cases, are you sure to run all?'),
},
]);
if (allTest.runAllTest === 'no') {
logger.success('quit');
return;
} else {
runAllTest();
}
}
});
break;
default:
server = new Server(config);
server.start();
break;
}
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { polyfill } from 'react-lifecycles-compat';
import classNames from 'classnames';
import Select from '../select';
import Cascader from '../cascader';
import Menu from '../menu';
import { func, obj, dom, KEYCODE } from '../util';
const { bindCtx } = func;
const { pickOthers } = obj;
const { getStyle } = dom;
const normalizeValue = value => {
if (value) {
if (Array.isArray(value)) {
return value;
}
return [value];
}
return [];
};
/**
* CascaderSelect
*/
class CascaderSelect extends Component {
static propTypes = {
prefix: PropTypes.string,
pure: PropTypes.bool,
className: PropTypes.string,
/**
* 选择框大小
*/
size: PropTypes.oneOf(['small', 'medium', 'large']),
/**
* 选择框占位符
*/
placeholder: PropTypes.string,
/**
* 是否禁用
*/
disabled: PropTypes.bool,
/**
* 是否有下拉箭头
*/
hasArrow: PropTypes.bool,
/**
* 是否有边框
*/
hasBorder: PropTypes.bool,
/**
* 是否有清除按钮
*/
hasClear: PropTypes.bool,
/**
* 自定义内联 label
*/
label: PropTypes.node,
/**
* 是否只读，只读模式下可以展开弹层但不能选
*/
readOnly: PropTypes.bool,
/**
* 数据源，结构可参考下方说明
*/
dataSource: PropTypes.arrayOf(PropTypes.object),
/**
* （非受控）默认值
*/
defaultValue: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]),
/**
* （受控）当前值
*/
value: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]),
/**
* 选中值改变时触发的回调函数
* @param {String|Array} value 选中的值，单选时返回单个值，多选时返回数组
* @param {Object|Array} data 选中的数据，包括 value 和 label，单选时返回单个值，多选时返回数组，父子节点选中关联时，同时选中，只返回父节点
* @param {Object} extra 额外参数
* @param {Array} extra.selectedPath 单选时选中的数据的路径
* @param {Boolean} extra.checked 多选时当前的操作是选中还是取消选中
* @param {Object} extra.currentData 多选时当前操作的数据
* @param {Array} extra.checkedData 多选时所有被选中的数据
* @param {Array} extra.indeterminateData 多选时半选的数据
*/
onChange: PropTypes.func,
/**
* 默认展开值，如果不设置，组件内部会根据 defaultValue/value 进行自动设置
*/
defaultExpandedValue: PropTypes.arrayOf(PropTypes.string),
/**
* （受控）当前展开值
*/
expandedValue: PropTypes.arrayOf(PropTypes.string),
/**
* 展开触发的方式
*/
expandTriggerType: PropTypes.oneOf(['click', 'hover']),
onExpand: PropTypes.func,
/**
* 是否开启虚拟滚动
*/
useVirtual: PropTypes.bool,
/**
* 是否多选
*/
multiple: PropTypes.bool,
sed: can't read src/cascader/index.js: No such file or directoryI need to ensure that the _source is included in the current item so that the callback can properly output the source. In the node, _source:item, this was the original setup. If the item value is numeric, the source should remain a number. Otherwise, the normal fields should be cloned as strings. It's all about maintaining accuracy in data structure! Let's make sure everything is set up correctly.
rg -n "_source|typeof.*value|value: [0-9]" src/cascader test/cascader test/cascader-selectoutput · 18 lines
Chunk ID: 0cc327
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 227
Output:
test/cascader/index-spec.js:62: delete d._source;
test/cascader/index-spec.js:70: delete d._source;
test/cascader/index-spec.js:117: delete d._source;
test/cascader/index-spec.js:125: delete d._source;
test/cascader/index-spec.js:297: delete item._source;
test/cascader/index-spec.js:372: d.forEach(d => delete d._source);
test/cascader/index-spec.js:373: e.checkedData.forEach(d => delete d._source);
test/cascader/index-spec.js:374: delete e.currentData._source;
test/cascader/index-spec.js:692: delete item._source;
src/cascader/cascader.jsx:31: _source: item,
src/cascader/cascader.jsx:206: let normalizedValue = normalizeValue(typeof value === 'undefined' ? defaultValue : value);
src/cascader/cascader.jsx:501: return loadData(data, data._source).then(callback);rg -n '"scripts"|"test"|karma' package.json scripts/test/karma.js scripts/utils.jsoutput · 23 lines
Chunk ID: e47a84
Wall time: 0.0000 seconds
Process exited with code 2
Original token count: 234
Output:
rg: scripts/utils.js: No such file or directory (os error 2)
scripts/test/karma.js:76: 'karma-chrome-launcher',
scripts/test/karma.js:77: 'karma-mocha',
scripts/test/karma.js:78: 'karma-webpack',
scripts/test/karma.js:79: 'karma-spec-reporter',
scripts/test/karma.js:80: 'karma-sourcemap-loader',
scripts/test/karma.js:81: 'karma-coverage',
package.json:53: "scripts": {
package.json:68: "test": "node --max_old_space_size=8192 ./scripts/test/index.js",
package.json:180: "karma": "^3.0.0",
package.json:181: "karma-chrome-launcher": "^2.2.0",
package.json:182: "karma-coverage": "^1.1.1",
package.json:183: "karma-mocha": "^1.3.0",
package.json:184: "karma-sourcemap-loader": "^0.3.7",
package.json:185: "karma-spec-reporter": "^0.0.26",
package.json:186: "karma-webdriver-launcher": "^1.0.5",
package.json:187: "karma-webpack": "^3.0.5",sed -n '1,200p' scripts/test/karma.js && sed -n '1,160p' test/cascader-select/index-spec.js | tail -30output · 130 lines
Chunk ID: c3196c
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 970
Output:
const path = require('path');
const _ = require('lodash');
const getWebpackConfig = require('./webpack');
const { getComPathName } = require('../utils');
process.env.CHROME_BIN = require('puppeteer').executablePath();
module.exports = function(config) {
const { runAll, a11y } = config;
const componentName = config.component ? getComPathName(config.component) : config.component;
const singleRun = runAll;
const coveragePath = resolveCwd('coverage');
// const componentArray = config.componentArray;
// 'table' or 'table|tree|tree-select'
// const componentList = componentArray ? componentArray.join('|') : componentName;
let specPath;
if (runAll && a11y) {
specPath = resolveCwd('scripts/test/a11y-allinone.js');
} else if (runAll) {
specPath = resolveCwd('scripts/test/allinone.js');
} else {
specPath = resolveCwd('test', `@(${componentName})/*-spec.js`);
}
const options = {
frameworks: ['mocha'],
browsers: ['Chrome'],
customLaunchers: {
ChromeTravis: {
base: 'ChromeHeadless',
flags: ['--no-sandbox'],
},
},
reporters: ['spec', 'coverage'],
preprocessors: {
[specPath]: ['webpack', 'sourcemap'],
},
files: [
path.join(__dirname, 'animation-polyfill.js'),
require.resolve('babel-polyfill/dist/polyfill.js'),
require.resolve('console-polyfill/index.js'),
require.resolve('es5-shim/es5-shim.js'),
require.resolve('es5-shim/es5-sham.js'),
require.resolve('html5shiv/dist/html5shiv.js'),
specPath,
],
coverageReporter: {
dir: coveragePath,
reporters: [
{ type: 'lcov', subdir: '.' },
{ type: 'json', subdir: '.' },
{ type: 'text-summary', subdir: '.', file: 'coverage.txt' },
],
},
client: {
mocha: {
timeout: 10000,
reporter: 'html',
ui: 'bdd',
},
},
hostname: 'localhost',
browserNoActivityTimeout: 100000,
port: 9877,
colors: true,
autoWatch: !singleRun,
singleRun: singleRun,
concurrency: Infinity,
webpack: getWebpackConfig(componentName, runAll),
webpackMiddleware: {
stats: 'errors-only',
},
plugins: [
'karma-chrome-launcher',
'karma-mocha',
'karma-webpack',
'karma-spec-reporter',
'karma-sourcemap-loader',
'karma-coverage',
],
};
if (process.env.CI) {
options.browsers = ['ChromeHeadless'];
}
config.set(options);
};
function resolveCwd(...args) {
args.unshift(process.cwd());
return path.resolve(...args);
}
it('should change select box display when expand item if set changeOnSelect to true', () => {
wrapper = mount(<CascaderSelect changeOnSelect defaultVisible dataSource={ChinaArea} />);
const item00 = findItem(0, 0);
ReactTestUtils.Simulate.click(item00);
wrapper.update();
assert(
wrapper
.find('span.next-select-inner em')
.text()
.trim() === '陕西'
);
const item10 = findItem(1, 0);
ReactTestUtils.Simulate.click(item10);
wrapper.update();
assert(
wrapper
.find('span.next-select-inner em')
.text()
.trim() === '陕西 / 西安'
);
const item20 = findItem(2, 0);
ReactTestUtils.Simulate.click(item20);
wrapper.update();
assert(
wrapper
.find('span.next-select-inner em')找到根因：Cascader 扁平化时直接改写节点的 value。我会改为只在内部副本上规范化，并添加冻结数据源的回归测试。
apply_patch <<'PATCH'
*** Begin Patch
*** Update File: src/cascader/cascader.jsx
@@
data.forEach((item, index) => {
const { value, children } = item;
const pos = `${prefix}-${index}`;
const newValue = String(value);
- item.value = newValue;
v2n[newValue] = p2n[pos] = {
...item,
+ value: newValue,
pos,
_source: item,
};
*** Update File: test/cascader-select/index-spec.js
@@
it('should show dropdown when set defaultVisible to true', () => {
wrapper = mount(<CascaderSelect dataSource={ChinaArea} defaultVisible />);
assert(document.querySelector('.next-cascader-select-dropdown'));
});
+
+ it('should not mutate a frozen dataSource', () => {
+ const child = Object.freeze({ value: 2, label: 'Child' });
+ const parent = Object.freeze({
+ value: 1,
+ label: 'Parent',
+ children: Object.freeze([child]),
+ });
+ const dataSource = Object.freeze([parent]);
+
+ wrapper = mount(<CascaderSelect dataSource={dataSource} defaultVisible />);
+
+ assert.equal(parent.value, 1);
+ assert.equal(child.value, 2);
+ assert(wrapper.find('.next-cascader-select-dropdown').length);
+ });
it('should render single cascader select', () => {
*** End Patch
PATCHoutput · 7 lines
apply_patch verification failed: Failed to find expected lines in /testbed/test/cascader-select/index-spec.js:
it('should show dropdown when set defaultVisible to true', () => {
wrapper = mount(<CascaderSelect dataSource={ChinaArea} defaultVisible />);
assert(document.querySelector('.next-cascader-select-dropdown'));
});
it('should render single cascader select', () => {sed -n '18,75p' test/cascader-select/index-spec.js && sed -n '18,38p' src/cascader/cascader.jsxoutput · 85 lines
Chunk ID: 525256
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 597
Output:
value: '2973',
label: '陕西',
children: [
{
value: '2974',
label: '西安',
children: [{ value: '2975', label: '西安市' }, { value: '2976', label: '高陵县' }],
},
{
value: '2980',
label: '铜川',
children: [{ value: '2981', label: '铜川市' }, { value: '2982', label: '宜君县' }],
},
],
},
{
value: '3078',
label: '四川',
},
];
describe('CascaderSelect', () => {
let wrapper;
afterEach(() => {
if (wrapper) {
wrapper.unmount();
wrapper = null;
}
});
it('should show dropdown when set defaultVisible to true', () => {
wrapper = mount(<CascaderSelect dataSource={ChinaArea} defaultVisible />);
assert(document.querySelector('.next-cascader-select-dropdown'));
});
it('should show dropdown when click select box', done => {
wrapper = mount(<CascaderSelect dataSource={ChinaArea} />);
assert(!document.querySelector('.next-cascader-select-dropdown'));
wrapper.find('.next-select').simulate('click');
setTimeout(() => {
assert(document.querySelector('.next-cascader-select-dropdown'));
done();
}, 500);
});
it('should render single cascader select', () => {
let changeCalled = false;
const handleChange = () => {
changeCalled = true;
};
wrapper = mount(
<CascaderSelect defaultVisible defaultValue="2975" dataSource={ChinaArea} onChange={handleChange} />
);
assert(
wrapper
.find('span.next-select-inner em')
const { bindCtx } = func;
const { pickOthers } = obj;
const { addClass, removeClass, setStyle, getStyle } = dom;
const flatDataSource = (data, prefix = '0', v2n = {}, p2n = {}) => {
data.forEach((item, index) => {
const { value, children } = item;
const pos = `${prefix}-${index}`;
const newValue = String(value);
item.value = newValue;
v2n[newValue] = p2n[pos] = {
...item,
pos,
_source: item,
};
if (children && children.length) {
flatDataSource(children, pos, v2n, p2n);
}
});apply_patch <<'PATCH'
*** Begin Patch
*** Update File: src/cascader/cascader.jsx
@@
const { value, children } = item;
const pos = `${prefix}-${index}`;
const newValue = String(value);
- item.value = newValue;
v2n[newValue] = p2n[pos] = {
...item,
+ value: newValue,
pos,
_source: item,
};
*** Update File: test/cascader-select/index-spec.js
@@
it('should show dropdown when set defaultVisible to true', () => {
wrapper = mount(<CascaderSelect dataSource={ChinaArea} defaultVisible />);
assert(document.querySelector('.next-cascader-select-dropdown'));
});
+
+ it('should not mutate a frozen dataSource', () => {
+ const child = Object.freeze({ value: 2, label: 'Child' });
+ const parent = Object.freeze({
+ value: 1,
+ label: 'Parent',
+ children: Object.freeze([child]),
+ });
+ const dataSource = Object.freeze([parent]);
+
+ wrapper = mount(<CascaderSelect dataSource={dataSource} defaultVisible />);
+
+ assert.equal(parent.value, 1);
+ assert.equal(child.value, 2);
+ assert(wrapper.find('.next-cascader-select-dropdown').length);
+ });
it('should show dropdown when click select box', done => {
*** End Patch
PATCHoutput · 9 lines
Wall time: 0.0000 seconds
Output:
Exit code: 0
Wall time: 0 seconds
Output:
Success. Updated the following files:
M src/cascader/cascader.jsx
M test/cascader-select/index-spec.jsI need to run tests because the developer mentioned they should be noninteractive and require no approval. The approval policy states, “In absence... noninteractive approval mode should run tests proactively.” So, I should initiate the tests. Now, I'm focusing on the npm test command, specifically for cascader-select. I might want to check how the scripts verify the component name by inspecting scripts/utils and looking into the checkComponentName function.
修复和回归用例已加好；接下来运行 CascaderSelect 定向测试，确认冻结数据源可以正常渲染。
rg -n "function checkComponentName|checkComponentName" scripts/utils* scriptsoutput · 18 lines
Chunk ID: 54769c
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 226
Output:
scripts/utils/index.js:57:exports.checkComponentName = require('./check-name');
scripts/utils/index.js:57:exports.checkComponentName = require('./check-name');
scripts/test/index.js:7:const { logger, checkComponentName } = require('../utils');
scripts/test/index.js:13:const componentName = checkComponentName(true);
scripts/server/index.js:4:const { checkComponentName } = require('../utils');
scripts/server/index.js:9:const args = checkComponentName(false, true);
scripts/order-var.js:3:const { logger, checkComponentName } = require('./utils');
scripts/order-var.js:7:const componentName = checkComponentName();
scripts/api.js:2:const { checkComponentName } = require('./utils');
scripts/api.js:4:const componentName = checkComponentName(true);
scripts/preview/index.js:4:const { checkComponentName } = require('../utils');
scripts/preview/index.js:8:const args = checkComponentName(false, true);git diff --check && git diff -- src/cascader/cascader.jsx test/cascader-select/index-spec.jsoutput · 48 lines
Chunk ID: 031c3e
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 421
Output:
diff --git a/src/cascader/cascader.jsx b/src/cascader/cascader.jsx
index e7a0937..b43b446 100644
--- a/src/cascader/cascader.jsx
+++ b/src/cascader/cascader.jsx
@@ -24,9 +24,9 @@ const flatDataSource = (data, prefix = '0', v2n = {}, p2n = {}) => {
const { value, children } = item;
const pos = `${prefix}-${index}`;
const newValue = String(value);
- item.value = newValue;
v2n[newValue] = p2n[pos] = {
...item,
+ value: newValue,
pos,
_source: item,
};
diff --git a/test/cascader-select/index-spec.js b/test/cascader-select/index-spec.js
index 7a795ae..86f202f 100644
--- a/test/cascader-select/index-spec.js
+++ b/test/cascader-select/index-spec.js
@@ -51,6 +51,22 @@ describe('CascaderSelect', () => {
assert(document.querySelector('.next-cascader-select-dropdown'));
});
+ it('should not mutate a frozen dataSource', () => {
+ const child = Object.freeze({ value: 2, label: 'Child' });
+ const parent = Object.freeze({
+ value: 1,
+ label: 'Parent',
+ children: Object.freeze([child]),
+ });
+ const dataSource = Object.freeze([parent]);
+
+ wrapper = mount(<CascaderSelect dataSource={dataSource} defaultVisible />);
+
+ assert.equal(parent.value, 1);
+ assert.equal(child.value, 2);
+ assert(wrapper.find('.next-cascader-select-dropdown').length);
+ });
+
it('should show dropdown when click select box', done => {
wrapper = mount(<CascaderSelect dataSource={ChinaArea} />);
assert(!document.querySelector('.next-cascader-select-dropdown'));cat scripts/utils/check-name.js && cat .fusion | head -40output · 99 lines
Chunk ID: 4f9bef
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 635
Output:
const _ = require('lodash');
const fs = require('fs');
const path = require('path');
const minimist = require('minimist');
const { logger, getComPathName } = require('./index');
const cwd = process.cwd();
module.exports = function(runtest = false, withOtherArgs = false) {
const argv = minimist(process.argv.slice(2));
const arr = argv._;
const comIndex = arr.findIndex(a => a.indexOf('=') === -1);
let componentName = arr[comIndex];
if (componentName) {
// compatible with npm run dev -- Menu
componentName = getComPathName(componentName);
const file = runtest ? 'test' : 'docs';
const components = fs.readdirSync(path.join(cwd, file));
let name = componentName;
const valid = components.some(com => {
if (componentName.replace('-', '') === com.replace('-', '')) {
name = com;
return true;
} else {
return false;
}
});
if (!valid) {
logger.error(
`The input component name (${componentName}) is invalid, try again like: npm run [command] number-picker`
);
process.exit(0);
return false;
}
if (withOtherArgs) {
const newArgs = argv._;
newArgs.splice(comIndex, 1);
newArgs.unshift(componentName);
return newArgs;
}
return name;
} else if (runtest) {
return 'all';
} else {
logger.error('Please input the component name, like: npm run [command] number-picker');
process.exit(0);
return false;
}
};
{
"engine": "sass",
"publish-template": "@alifd/next-theme-template@3x",
"class-prefix": ".next",
"icon": {
"iconfont-project-id": "515771",
"iconfont-path": "//at.alicdn.com/t/font_515771_xjdbujl2iu"
},
"import": {
"sources": {
"dir": "lib",
"entry-file": {
"sass": "index.scss"
},
"entries": {
"core": {
"sass": {
"core.scss": "lib/core/reset.scss"
}
},
"form-element": {
"sass": {
"form-element.scss": "lib/core/form-element.scss"
}
},
"mask": {
"sass": {
"mask.scss": "lib/core/mask.scss"
}
},
"popup": {
"sass": {
"popup.scss": "lib/core/popup.scss"
}
}
}
},
"demos": {
"dir": "demos",
"entry-file": {I'm focusing on running tests for the cascader-select component. I need to use npm test along with the CI=true command to bypass prompt and custom ChromeHeadless settings. It’s important to verify that the browser launches correctly, as there might not be shared libraries available. Alright, I need to make sure I'm following these steps properly and ensuring everything works smoothly! Let’s get this test running!
CI=true npm test -- cascader-selectoutput · 7 lines
Chunk ID: 02fa9d
Wall time: 0.0000 seconds
Process exited with code 127
Original token count: 11
Output:
/bin/bash: line 1: npm: command not foundI’m wondering if npm might be absent, which would mean node modules could include binaries without Node itself being there. I need to check by inspecting the command version for node, yarn, and pnpm. If Node is indeed absent, then I need to validate the static file or find the correct path. It's important to ensure I have everything set up properly for this task. Let’s figure this out!
当前环境没有 npm 命令；我检查可用的 Node 工具，再尽量执行等价的定向测试。
command -v node || true; command -v nodejs || true; command -v yarn || true; command -v pnpm || true; ls node_modules/.bin/karma node_modules/.bin/eslint 2>/dev/null || trueoutput · 8 lines
Chunk ID: e9fb17
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 13
Output:
node_modules/.bin/eslint
node_modules/.bin/karmagit diff --check && git status --shortoutput · 8 lines
Chunk ID: bba03e
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 17
Output:
M src/cascader/cascader.jsx
M test/cascader-select/index-spec.jsI'm looking closely at the code related to the CascaderSelect render function and its components. I want to ensure that the test captures everything accurately. I’m considering the semantics of the _source pointer to prevent unintended mutations. It’s important to search all Cascader properties for any writes to items. I think the loadData path could be where mutations happen, including within the handleExpand functions. It's a detailed analysis, but essential for accuracy!
rg -n "\b(item|data|node|source|pnode)\.[A-Za-z_$][\w$]*\s*=|delete (item|data|node|source|pnode)|\.children\.(push|splice|sort|reverse)" src/cascader src/cascader-selectoutput · 12 lines
Chunk ID: 974ec5
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 109
Output:
src/cascader/utils.js:22: if (node.checkable === false) {
src/cascader/utils.js:53: if (node.checkable === false) {
src/cascader/utils.js:95: node.checkable === false ||
src/cascader/utils.js:209: if (node.checkable === false) return;
src/cascader/cascader.jsx:387: if (node.checkable === false) return;
src/cascader/cascader.jsx:418: if (pnode.checkable === false) {已修复：Cascader 现在只在内部扁平化节点中规范化 value，不会再修改传入的数据源；冻结的 Immer 数据也可以正常使用，见 src/cascader/cascader.jsx:26。
在 test/cascader-select/index-spec.js:54 添加了冻结嵌套数据源的回归用例。git diff --check 通过；定向测试未能运行，因为环境中没有 npm 或 Node.js。
bpmn-js-1655 · External labels should use the stroke colour · resolved · 16 model calls · 23 commands · 183 s
What the images show: Diagram whose external labels are drawn in the pale fill colour
What the text already says: "External labels should be set to the 'stroke' color, as seen in the embedded labels"
`setColor` should always set the external label to "stroke" color
__Describe the Bug__
When setting the color of elements with external labels, the external label is set to the "fill" color instead of the "stroke" color. This is different to the color set for embedded labels. This raises a UX concern, because of the color being so light.
⚠️ This happens if color is applied to label specifically (not when applied to target shape).
__Steps to Reproduce__
1. select an external label
2. use `modeling.setColor` API to change the color of the selection
3. observe external label is set to the fill color:
<img width="539" alt="Screenshot 2022-05-18 at 16 30 58" src="https://user-images.githubusercontent.com/25825387/169068231-1b495b39-b003-4dd4-a4f8-6722a688987c.png">
**Optional:** can be tested in Camunda Modeler with selection tool and Edit -> Set color :
https://user-images.githubusercontent.com/25825387/169325524-f91870f7-c0e5-4b43-999f-4045eeeb2697.mov
__Expected Behavior__
External labels should be set to the "stroke" color, as seen in the embedded labels
__Environment__
- Library version: latest
You cannot see the images in this message; each was removed and only its position is marked.
[Image 1 of 1]I see that I need to use a code agent to go through the repository. First, I need to write a preamble before accessing the tool. It seems straightforward, but I want to make sure everything is set up correctly before I dive in. I’m curious about any specific details I should look for in the repo and how to phrase the preamble effectively to ensure clarity in communication. Let's explore those details!
I’ll trace setColor and label rendering, then patch the focused behavior.
pwd; rg --files -g 'AGENTS.md' -g '!node_modules' -g '!vendor' -g '!dist' | head -100; git status --short; rg "setColor" -noutput · 71 lines
Chunk ID: ae2690
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1681
Output:
/testbed
test/spec/features/replace/BpmnReplaceSpec.js:1773: modeling.setColor(task, { fill: fill, stroke: stroke });
test/spec/features/keyboard/BpmnKeyboardBindingsSpec.js:63: 'setColor',
test/spec/features/modeling/SetColorSpec.js:35: modeling.setColor(taskShape, { fill: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:48: modeling.setColor(taskShape, { fill: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:51: modeling.setColor(taskShape);
test/spec/features/modeling/SetColorSpec.js:65: modeling.setColor(taskShape, { fill: 'FUCHSIA', stroke: 'YELLOW' });
test/spec/features/modeling/SetColorSpec.js:68: modeling.setColor(taskShape, { fill: 'YELLOW' });
test/spec/features/modeling/SetColorSpec.js:84: modeling.setColor(taskShape, { fill: 'FUCHSIA', stroke: 'YELLOW' });
test/spec/features/modeling/SetColorSpec.js:87: modeling.setColor(taskShape, { fill: undefined });
test/spec/features/modeling/SetColorSpec.js:103: modeling.setColor(taskShape, { fill: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:106: modeling.setColor(taskShape);
test/spec/features/modeling/SetColorSpec.js:122: modeling.setColor(taskShape, { stroke: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:136: modeling.setColor(taskShape, { stroke: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:139: modeling.setColor(taskShape);
test/spec/features/modeling/SetColorSpec.js:155: modeling.setColor(flowLabel, { stroke: 'FUCHSIA', fill: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:173: modeling.setColor(flowLabel, { stroke: 'FUCHSIA', fill: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:176: modeling.setColor(flowLabel, { stroke: undefined, fill: undefined });
test/spec/features/modeling/SetColorSpec.js:196: modeling.setColor([ taskShape, startEventShape ], { fill: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:216: modeling.setColor([ taskShape, startEventShape ], { fill: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:219: modeling.setColor([ taskShape, startEventShape ]);
test/spec/features/modeling/SetColorSpec.js:238: modeling.setColor([
test/spec/features/modeling/SetColorSpec.js:261: modeling.setColor([
test/spec/features/modeling/SetColorSpec.js:267: modeling.setColor([ taskShape, startEventShape ]);
test/spec/features/modeling/SetColorSpec.js:283: modeling.setColor(sequenceFlow, { fill: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:296: function setColor() {
test/spec/features/modeling/SetColorSpec.js:297: modeling.setColor(sequenceFlow, { fill: 'INVALID_COLOR' });
test/spec/features/modeling/SetColorSpec.js:301: expect(setColor).to.throw(/^invalid color value/);
test/spec/features/modeling/SetColorSpec.js:311: function setColor() {
test/spec/features/modeling/SetColorSpec.js:312: modeling.setColor(sequenceFlow, { fill: 'rgba(0, 255, 0, 0.5)' });
test/spec/features/modeling/SetColorSpec.js:316: expect(setColor).to.throw(/^invalid color value/);
test/spec/features/modeling/SetColorSpec.js:331: modeling.setColor(taskShape, { fill: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:347: modeling.setColor(taskShape, { fill: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:350: modeling.setColor(taskShape);
test/spec/features/modeling/SetColorSpec.js:367: modeling.setColor(taskShape, { stroke: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:383: modeling.setColor(taskShape, { stroke: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:386: modeling.setColor(taskShape);
test/spec/features/modeling/SetColorSpec.js:405: modeling.setColor([ taskShape, startEventShape ], { fill: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:424: modeling.setColor([ taskShape, startEventShape ], { fill: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:427: modeling.setColor([ taskShape, startEventShape ]);
test/spec/features/modeling/SetColorSpec.js:447: modeling.setColor([
test/spec/features/modeling/SetColorSpec.js:469: modeling.setColor([ taskShape, startEventShape ], { stroke: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:472: modeling.setColor([ taskShape, startEventShape ]);
test/spec/features/modeling/SetColorSpec.js:494: modeling.setColor(taskShape, { fill: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:511: modeling.setColor(taskShape, { fill: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:514: modeling.setColor(taskShape);
test/spec/features/modeling/SetColorSpec.js:532: modeling.setColor(taskShape, { stroke: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:549: modeling.setColor(taskShape, { stroke: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:552: modeling.setColor(taskShape);
test/spec/features/modeling/SetColorSpec.js:572: modeling.setColor([ taskShape, startEventShape ], { fill: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:592: modeling.setColor([ taskShape, startEventShape ], { fill: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:595: modeling.setColor([ taskShape, startEventShape ]);
test/spec/features/modeling/SetColorSpec.js:616: modeling.setColor([ taskShape, startEventShape ], { stroke: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:636: modeling.setColor([
test/spec/features/modeling/SetColorSpec.js:642: modeling.setColor([ taskShape, startEventShape ]);
test/spec/features/modeling/SetColorSpec.js:666: modeling.setColor(taskShape, { stroke: '#abcdef', fill: '#fedcba' });
test/spec/features/modeling/SetColorSpec.js:685: modeling.setColor(sequenceFlow, { stroke: '#abcdef' });
test/spec/features/copy-paste/BpmnCopyPasteSpec.js:363: modeling.setColor(task, { fill: fill, stroke: stroke });
lib/features/editor-actions/BpmnEditorActions.js:126: this._registerAction('setColor', function(opts) {
lib/features/editor-actions/BpmnEditorActions.js:130: modeling.setColor(currentSelection, opts);
test/spec/ModelerSpec.js:273: 'setColor',
test/spec/ModelerSpec.js:347: modeling.setColor(eventShape, {
lib/features/modeling/Modeling.js:56: handlers['element.setColor'] = SetColorHandler;
lib/features/modeling/Modeling.js:193:Modeling.prototype.setColor = function(elements, colors) {
lib/features/modeling/Modeling.js:198: this._commandStack.execute('element.setColor', {I need to investigate the AGENTS output since it returned nothing. My search command, rg --files -g AGENTS, only produced test references and no agents. I wonder what's going wrong here. It seems I’ll have to inspect the model handler and the tests along with the project itself to identify any potential issues. This requires a careful check to ensure I’m not missing something important. Let's figure this out!
I found the modeling handler and existing color specs; now checking label-specific semantics.
sed -n '1,240p' lib/features/modeling/cmd/SetColorHandler.js; sed -n '150,225p' lib/features/modeling/Modeling.jsoutput · 199 lines
Chunk ID: 68d710
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1098
Output:
import {
assign,
forEach,
isString,
pick
} from 'min-dash';
import {
getDi
} from '../../../util/ModelUtil';
var DEFAULT_COLORS = {
fill: undefined,
stroke: undefined
};
export default function SetColorHandler(commandStack) {
this._commandStack = commandStack;
this._normalizeColor = function(color) {
// Remove color for falsy values.
if (!color) {
return undefined;
}
if (isString(color)) {
var hexColor = colorToHex(color);
if (hexColor) {
return hexColor;
}
}
throw new Error('invalid color value: ' + color);
};
}
SetColorHandler.$inject = [
'commandStack'
];
SetColorHandler.prototype.postExecute = function(context) {
var elements = context.elements,
colors = context.colors || DEFAULT_COLORS;
var self = this;
var di = {};
if ('fill' in colors) {
assign(di, {
'background-color': this._normalizeColor(colors.fill) });
}
if ('stroke' in colors) {
assign(di, {
'border-color': this._normalizeColor(colors.stroke) });
}
forEach(elements, function(element) {
var assignedDi = isConnection(element) ? pick(di, [ 'border-color' ]) : di;
// TODO @barmac: remove once we drop bpmn.io properties
ensureLegacySupport(assignedDi);
if (element.labelTarget) {
// set label colors as bpmndi:BPMNLabel#color
self._commandStack.execute('element.updateModdleProperties', {
element: element,
moddleElement: getDi(element).label,
properties: {
color: di['background-color']
}
});
} else {
// set colors bpmndi:BPMNEdge or bpmndi:BPMNShape
self._commandStack.execute('element.updateProperties', {
element: element,
properties: {
di: assignedDi
}
});
}
});
};
/**
* Convert color from rgb(a)/hsl to hex. Returns `null` for unknown color names and for colors
* with alpha less than 1.0. This depends on `<canvas>` serialization of the `context.fillStyle`.
* Cf. https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fillstyle
*
* @example
* ```js
* var color = 'fuchsia';
* console.log(colorToHex(color));
* // "#ff00ff"
* color = 'rgba(1,2,3,0.4)';
* console.log(colorToHex(color));
* // null
* ```
*
* @param {string} color
* @returns {string|null}
*/
function colorToHex(color) {
var context = document.createElement('canvas').getContext('2d');
// (0) Start with transparent to account for browser default values.
context.fillStyle = 'transparent';
// (1) Assign color so that it's serialized.
context.fillStyle = color;
// (2) Return null for non-hex serialization result.
return /^#[0-9a-fA-F]{6}$/.test(context.fillStyle) ? context.fillStyle : null;
}
function isConnection(element) {
return !!element.waypoints;
}
/**
* Add legacy properties if required.
* @param {{ 'border-color': string?, 'background-color': string? }} di
*/
function ensureLegacySupport(di) {
if ('border-color' in di) {
di.stroke = di['border-color'];
}
if ('background-color' in di) {
di.fill = di['background-color'];
}
}
Modeling.prototype.updateLaneRefs = function(flowNodeShapes, laneShapes) {
this._commandStack.execute('lane.updateRefs', {
flowNodeShapes: flowNodeShapes,
laneShapes: laneShapes
});
};
/**
* Transform the current diagram into a process.
*
* @return {djs.model.Root} the new root element
*/
Modeling.prototype.makeProcess = function() {
var processElement = this._create('root', {
type: 'bpmn:Process'
});
var context = {
newRoot: processElement
};
this._commandStack.execute('canvas.updateRoot', context);
};
Modeling.prototype.claimId = function(id, moddleElement) {
this._commandStack.execute('id.updateClaim', {
id: id,
element: moddleElement,
claiming: true
});
};
Modeling.prototype.unclaimId = function(id, moddleElement) {
this._commandStack.execute('id.updateClaim', {
id: id,
element: moddleElement
});
};
Modeling.prototype.setColor = function(elements, colors) {
if (!elements.length) {
elements = [ elements ];
}
this._commandStack.execute('element.setColor', {
elements: elements,
colors: colors
});
};sed -n '1,230p' test/spec/features/modeling/SetColorSpec.js; sed -n '640,715p' test/spec/features/modeling/SetColorSpec.jsoutput · 291 lines
Chunk ID: 3bd040
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 2027
Output:
import {
bootstrapModeler,
inject
} from 'test/TestHelper';
import { getDi } from 'lib/util/ModelUtil';
import modelingModule from 'lib/features/modeling';
import coreModule from 'lib/core';
var FUCHSIA_HEX = '#ff00ff',
YELLOW_HEX = '#ffff00';
describe('features/modeling - set color', function() {
var diagramXML = require('./SetColor.bpmn');
beforeEach(bootstrapModeler(diagramXML, {
modules: [
coreModule,
modelingModule
]
}));
describe('execute', function() {
it('setting fill color', inject(function(elementRegistry, modeling) {
// given
var taskShape = elementRegistry.get('Task_1'),
taskDi = getDi(taskShape);
// when
modeling.setColor(taskShape, { fill: 'FUCHSIA' });
// then
expect(taskDi.get('background-color')).to.equal(FUCHSIA_HEX);
}));
it('unsetting fill color', inject(function(elementRegistry, modeling) {
// given
var taskShape = elementRegistry.get('Task_1'),
taskDi = getDi(taskShape);
modeling.setColor(taskShape, { fill: 'FUCHSIA' });
// when
modeling.setColor(taskShape);
// then
expect(taskDi.get('background-color')).not.to.exist;
}));
it('setting fill color without changing stroke color', inject(
function(elementRegistry, modeling) {
// given
var taskShape = elementRegistry.get('Task_1'),
taskDi = getDi(taskShape);
modeling.setColor(taskShape, { fill: 'FUCHSIA', stroke: 'YELLOW' });
// when
modeling.setColor(taskShape, { fill: 'YELLOW' });
// then
expect(taskDi.get('background-color')).to.equal(YELLOW_HEX);
expect(taskDi.get('border-color')).to.equal(YELLOW_HEX);
}
));
it('unsetting fill color without changing stroke color', inject(
function(elementRegistry, modeling) {
// given
var taskShape = elementRegistry.get('Task_1'),
taskDi = getDi(taskShape);
modeling.setColor(taskShape, { fill: 'FUCHSIA', stroke: 'YELLOW' });
// when
modeling.setColor(taskShape, { fill: undefined });
// then
expect(taskDi.get('background-color')).not.to.exist;
expect(taskDi.get('border-color')).to.equal(YELLOW_HEX);
}
));
it('unsetting both fill and stroke color', inject(
function(elementRegistry, modeling) {
// given
var taskShape = elementRegistry.get('Task_1'),
taskDi = getDi(taskShape);
modeling.setColor(taskShape, { fill: 'FUCHSIA' });
// when
modeling.setColor(taskShape);
// then
expect(taskDi.get('background-color')).not.to.exist;
expect(taskDi.get('border-color')).not.to.exist;
}
));
it('setting stroke color', inject(function(elementRegistry, modeling) {
// given
var taskShape = elementRegistry.get('Task_1'),
taskDi = getDi(taskShape);
// when
modeling.setColor(taskShape, { stroke: 'FUCHSIA' });
// then
expect(taskDi.get('border-color')).to.equal(FUCHSIA_HEX);
expect(taskDi.get('background-color')).not.to.exist;
}));
it('unsetting stroke color', inject(function(elementRegistry, modeling) {
// given
var taskShape = elementRegistry.get('Task_1'),
taskDi = getDi(taskShape);
modeling.setColor(taskShape, { stroke: 'FUCHSIA' });
// when
modeling.setColor(taskShape);
// then
expect(taskDi.get('border-color')).not.to.exist;
expect(taskDi.get('background-color')).not.to.exist;
}));
it('setting stroke + fill color on external label', inject(function(elementRegistry, modeling) {
// given
var flowShape = elementRegistry.get('SequenceFlow_3'),
flowLabel = flowShape.label,
flowDi = getDi(flowShape);
// when
modeling.setColor(flowLabel, { stroke: 'FUCHSIA', fill: 'FUCHSIA' });
// then
expect(flowDi.get('border-color')).not.to.exist;
expect(flowDi.get('background-color')).not.to.exist;
expect(flowDi.label.get('color')).to.eql(FUCHSIA_HEX);
}));
it('unsetting stroke + fill color on external label', inject(function(elementRegistry, modeling) {
// given
var flowShape = elementRegistry.get('SequenceFlow_3'),
flowLabel = flowShape.label,
flowDi = getDi(flowShape);
// assume
modeling.setColor(flowLabel, { stroke: 'FUCHSIA', fill: 'FUCHSIA' });
// when
modeling.setColor(flowLabel, { stroke: undefined, fill: undefined });
// then
expect(flowDi.get('border-color')).not.to.exist;
expect(flowDi.get('background-color')).not.to.exist;
expect(flowDi.label.get('color')).not.to.exist;
}));
it('setting fill color (multiple elements)', inject(
function(elementRegistry, modeling) {
// given
var taskShape = elementRegistry.get('Task_1'),
taskDi = getDi(taskShape),
startEventShape = elementRegistry.get('StartEvent_1'),
startEventDi = getDi(startEventShape);
// when
modeling.setColor([ taskShape, startEventShape ], { fill: 'FUCHSIA' });
// then
expect(taskDi.get('background-color')).to.equal(FUCHSIA_HEX);
expect(startEventDi.get('background-color')).to.equal(FUCHSIA_HEX);
expect(taskDi.get('border-color')).not.to.exist;
expect(startEventDi.get('border-color')).not.to.exist;
}
));
it('unsetting fill color (multiple elements)', inject(
function(elementRegistry, modeling) {
// given
var taskShape = elementRegistry.get('Task_1'),
taskDi = getDi(taskShape),
startEventShape = elementRegistry.get('StartEvent_1'),
startEventDi = getDi(startEventShape);
modeling.setColor([ taskShape, startEventShape ], { fill: 'FUCHSIA' });
// when
modeling.setColor([ taskShape, startEventShape ]);
// then
expect(taskDi.get('background-color')).not.to.exist;
expect(startEventDi.get('background-color')).not.to.exist;
}
));
it('setting stroke color (multiple elements)', inject(
function(elementRegistry, modeling) {
// when
modeling.setColor([ taskShape, startEventShape ]);
commandStack.undo();
commandStack.redo();
// then
expect(taskDi.get('border-color')).not.to.exist;
expect(startEventDi.get('border-color')).not.to.exist;
}
));
});
// TODO @barmac: remove once we drop bpmn.io properties
describe('legacy', function() {
it('should set both BPMN in Color and bpmn.io properties on BPMNShape', inject(
function(elementRegistry, modeling) {
// given
var taskShape = elementRegistry.get('Task_1'),
taskDi = getDi(taskShape);
// when
modeling.setColor(taskShape, { stroke: '#abcdef', fill: '#fedcba' });
// then
expect(taskDi.get('border-color')).to.eql('#abcdef');
expect(taskDi.get('stroke')).to.eql('#abcdef');
expect(taskDi.get('background-color')).to.eql('#fedcba');
expect(taskDi.get('fill')).to.eql('#fedcba');
}
));
it('should set both BPMN in Color and bpmn.io properties on BPMNEdge', inject(
function(elementRegistry, modeling) {
// given
var sequenceFlow = elementRegistry.get('SequenceFlow_1'),
sequenceFlowDi = getDi(sequenceFlow);
// when
modeling.setColor(sequenceFlow, { stroke: '#abcdef' });
// then
expect(sequenceFlowDi.get('border-color')).to.eql('#abcdef');
expect(sequenceFlowDi.get('stroke')).to.eql('#abcdef');
}
));
});
});rg -n "external label|labelTarget|isLabel|label.*stroke|stroke.*label" lib test/spec/features/modeling | head -200; cat package.jsonoutput · 195 lines
Chunk ID: b3c9c1
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 2775
Output:
Warning: truncated output (original token count: 2775)
Total output lines: 198
lib/util/LabelUtil.js:17: * Returns true if the given semantic has an external label
lib/util/LabelUtil.js:22:export function isLabelExternal(semantic) {
lib/util/LabelUtil.js:35: * Returns true if the given element has an external label
lib/util/LabelUtil.js:41: return isLabel(element.label);
lib/util/LabelUtil.js:154:export function isLabel(element) {
lib/util/LabelUtil.js:155: return element && !!element.labelTarget;
lib/import/BpmnImporter.js:8: isLabelExternal,
lib/import/BpmnImporter.js:203: if (isLabelExternal(semantic) && getLabel(element)) {
lib/import/BpmnImporter.js:270: labelTarget: element,
lib/features/search/BpmnSearchProvider.js:52: if (element.labelTarget) {
test/spec/features/modeling/lanes/AddLaneSpec.js:418: it('should move external labels', inject(function(elementRegistry, modeling) {
lib/features/rules/BpmnRules.js:21: isLabel
lib/features/rules/BpmnRules.js:226: return !element || isLabel(element);
lib/features/rules/BpmnRules.js:255: return is(element, 'bpmn:Group') && !element.labelTarget;
lib/features/rules/BpmnRules.js:453: if (isLabel(element) || isGroup(element)) {
lib/features/rules/BpmnRules.js:533: return !isLabel(element) && is(element, 'bpmn:BoundaryEvent');
lib/features/rules/BpmnRules.js:604: if (isLabel(element)) {
lib/features/rules/BpmnRules.js:759: if (isLabel(shape) || isGroup(shape)) {
lib/features/rules/BpmnRules.js:922: !isLabel(flow) &&
lib/features/rules/BpmnRules.js:933: if (isLabel(element)) {
lib/features/ordering/BpmnOrderingProvider.js:83: if (element.labelTarget) {
lib/features/ordering/BpmnOrderingProvider.js:132: if (element.labelTarget) {
lib/features/ordering/BpmnOrderingProvider.js:152: if (!element.labelTarget && child.labelTarget) {
lib/features/modeling/cmd/UpdatePropertiesHandler.js:123: // external label accordingly
lib/features/modeling/cmd/SetColorHandler.js:69: if (element.labelTarget) {
test/spec/features/modeling/behavior/ToggleElementCollapseBehaviour.bpmn:67: <bpmn2:endEvent id="EndEvent_4" name="external label">
lib/features/modeling/behavior/UpdateFlowNodeRefsBehavior.js:111: if (shape.labelTarget) {
lib/features/modeling/behavior/UnclaimIdBehavior.js:7:import { isLabel } from '../../../util/LabelUtil';
lib/features/modeling/behavior/UnclaimIdBehavior.js:26: if (isLabel(shape)) {
lib/features/modeling/behavior/LabelBehavior.js:14: isLabelExternal,
lib/features/modeling/behavior/LabelBehavior.js:17: isLabel
lib/features/modeling/behavior/LabelBehavior.js:61: * A component that makes sure that external labels are added
lib/features/modeling/behavior/LabelBehavior.js:115: if (isLabel(element) || !isLabelExternal(element)) {
lib/features/modeling/behavior/LabelBehavior.js:143: labelTarget = context.labelTarget,
lib/features/modeling/behavior/LabelBehavior.js:147: if (labelTarget && hints.unsetLabel !== false) {
lib/features/modeling/behavior/LabelBehavior.js:148: modeling.updateLabel(labelTarget, null, null, { removeShape: false });
lib/features/modeling/behavior/LabelBehavior.js:157: labelTarget = context.labelTarget,
lib/features/modeling/behavior/LabelBehavior.js:161: if (!labelTarget) {
lib/features/modeling/behavior/LabelBehavior.js:166: if (!is(labelTarget, 'bpmn:BaseElement')) {
lib/features/modeling/behavior/LabelBehavior.js:170: di = getDi(labelTarget);
lib/features/modeling/behavior/LabelBehavior.js:248: && isLabelExternal(businessObject)
lib/features/modeling/behavior/LabelBehavior.js:257: // move external label after resizing
lib/features/modeling/behavior/FixHoverBehavior.js:45: if (hover !== rootElement && (shape.labelTarget || is(shape, 'bpmn:Group'))) {
lib/features/modeling/behavior/DetachEventBehavior.js:10:import { isLabel } from '../../../util/LabelUtil';
lib/features/modeling/behavior/DetachEventBehavior.js:89: return !isLabel(shape) && is(shape, 'bpmn:BoundaryEvent') && !host;
lib/features/modeling/behavior/DataStoreBehavior.js:35: return is(child, 'bpmn:DataStoreReference') && !child.labelTarget;
lib/features/modeling/behavior/CreateParticipantBehavior.js:7:import { isLabel } from '../../../util/LabelUtil';
lib/features/modeling/behavior/CreateParticipantBehavior.js:50: !isLabel(element) &&
lib/features/modeling/behavior/AttachEventBehavior.js:9:import { isLabel } from '../../../util/LabelUtil';
lib/features/modeling/behavior/AttachEventBehavior.js:96: return !isLabel(shape) &&
lib/features/modeling/behavior/AdaptiveLabelPositioningBehavior.js:29: * A component that makes sure that external labels are added
lib/features/modeling/behavior/AdaptiveLabelPositioningBehavior.js:66: checkLabelAdjustment(shape.labelTarget);
test/spec/features/modeling/behavior/LabelBehaviorSpec.js:233: labelTarget: exclusiveGateway,
lib/features/label-editing/cmd/UpdateLabelHandler.js:8: isLabelExternal,
lib/features/label-editing/cmd/UpdateLabelHandler.js:10: isLabel
lib/features/label-editing/cmd/UpdateLabelHandler…1097 chars truncated…vider.js:173: if (isLabelExternal(element)) {
lib/features/label-editing/LabelEditingProvider.js:299: // external labels for events, data elements, gateways, groups and connections
lib/features/label-editing/LabelEditingProvider.js:300: if (target.labelTarget) {
lib/features/label-editing/LabelEditingProvider.js:316: // external label not yet created
lib/features/label-editing/LabelEditingProvider.js:317: if (isLabelExternal(target)
lib/features/label-editing/LabelEditingProvider.js:319: && !isLabel(target)) {
lib/features/label-editing/LabelEditingPreview.js:69: element.labelTarget) {
lib/features/distribute-elements/BpmnDistributeElements.js:30: return !(element.labelTarget || cannotDistribute);
lib/features/di-ordering/BpmnDiOrdering.js:30: return element !== root && !element.labelTarget;
lib/features/copy-paste/BpmnCopyPaste.js:57: if (isLabel(descriptor)) {
lib/features/copy-paste/BpmnCopyPaste.js:132: // do NOT copy business object if external label
lib/features/copy-paste/BpmnCopyPaste.js:133: if (isLabel(descriptor)) {
lib/features/copy-paste/BpmnCopyPaste.js:134: descriptor.businessObject = getBusinessObject(cache[ descriptor.labelTarget ]);
lib/features/copy-paste/BpmnCopyPaste.js:135: descriptor.di = getDi(cache[ descriptor.labelTarget ]);
lib/features/copy-paste/BpmnCopyPaste.js:177:function isLabel(element) {
lib/features/copy-paste/BpmnCopyPaste.js:178: return !!element.labelTarget;
lib/features/auto-resize/BpmnAutoResizeProvider.js:50: if (is(element, 'bpmn:Lane') || element.labelTarget) {
test/spec/features/modeling/SetColorSpec.js:147: it('setting stroke + fill color on external label', inject(function(elementRegistry, modeling) {
test/spec/features/modeling/SetColorSpec.js:165: it('unsetting stroke + fill color on external label', inject(function(elementRegistry, modeling) {
{
"name": "bpmn-js",
"version": "9.1.0",
"description": "A bpmn 2.0 toolkit and web modeler",
"main": "index.js",
"files": [
".babelrc",
"dist",
"lib",
"test/util",
"test/helper",
"test/matchers",
"!.eslintrc"
],
"scripts": {
"all": "run-s lint test distro test:distro",
"lint": "eslint .",
"start": "cross-env SINGLE_START=modeler npm run dev",
"start:viewer": "cross-env SINGLE_START=viewer npm run dev",
"start:navigated-viewer": "cross-env SINGLE_START=navigated-viewer npm run dev",
"dev": "npm test -- --auto-watch --no-single-run",
"test": "karma start test/config/karma.unit.js",
"distro": "node tasks/build-distro.js",
"collect-translations": "cross-env COLLECT_TRANSLATIONS=1 npm test",
"test:distro": "node tasks/test-distro.js",
"postversion": "run-s distro test:distro",
"prepare": "run-s distro"
},
"repository": {
"type": "git",
"url": "https://github.com/bpmn-io/bpmn-js"
},
"keywords": [
"bpmn",
"bpmn-js",
"toolkit",
"web modeler",
"modeler",
"modeling",
"process modeling"
],
"author": {
"name": "Nico Rehwaldt",
"url": "https://github.com/nikku"
},
"contributors": [
{
"name": "bpmn.io contributors",
"url": "https://github.com/bpmn-io"
}
],
"license": "SEE LICENSE IN LICENSE",
"sideEffects": [
"*.css"
],
"devDependencies": {
"@rollup/plugin-commonjs": "^19.0.0",
"@rollup/plugin-node-resolve": "^13.0.0",
"bpmn-font": "^0.10.0",
"camunda-bpmn-moddle": "^4.0.1",
"chai": "4.1.2",
"chai-match": "^1.1.1",
"cpx": "^1.5.0",
"cross-env": "^7.0.3",
"del": "^6.0.0",
"eslint": "^7.29.0",
"eslint-plugin-bpmn-io": "^0.12.0",
"eslint-plugin-import": "^2.23.4",
"execa": "^5.1.1",
"istanbul-instrumenter-loader": "^3.0.1",
"karma": "^6.3.4",
"karma-chrome-launcher": "^3.1.0",
"karma-coverage": "^2.0.3",
"karma-debug-launcher": "0.0.4",
"karma-env-preprocessor": "^0.1.1",
"karma-firefox-launcher": "^2.1.1",
"karma-ie-launcher": "^1.0.0",
"karma-mocha": "^2.0.1",
"karma-phantomjs-launcher": "^1.0.4",
"karma-safari-launcher": "^1.0.0",
"karma-sinon-chai": "^2.0.2",
"karma-webpack": "^5.0.0",
"mkdirp": "^0.5.1",
"mocha": "^8.4.0",
"mocha-test-container-support": "0.2.0",
"npm-run-all": "^4.1.2",
"phantomjs-prebuilt": "^2.1.12",
"promise-polyfill": "^8.2.0",
"puppeteer": "^10.0.0",
"raw-loader": "^1.0.0",
"rollup": "^2.52.2",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-license": "^2.5.0",
"rollup-plugin-replace": "^2.2.0",
"rollup-plugin-terser": "^7.0.2",
"sinon": "^7.5.0",
"sinon-chai": "^3.7.0",
"webpack": "^4.46.0"
},
"dependencies": {
"bpmn-moddle": "^7.1.2",
"css.escape": "^1.5.1",
"diagram-js": "^8.3.0",
"diagram-js-direct-editing": "^1.6.3",
"ids": "^1.0.0",
"inherits-browser": "0.0.1",
"min-dash": "^3.5.2",
"min-dom": "^3.2.0",
"object-refs": "^0.3.0",
"tiny-svg": "^2.2.2"
}
}I need to implement a one-line patch handler along with a test. The guidance says we should always set the external label to the stroke color, using the border-color instead of the background in the label path. Tests should differentiate expected results, ensuring that a fill-only scenario aligns with this. There’s also a normalization needed for the API behavior regarding colors, and I have to modify tests to enforce distinct colors for stroke and fill properties.Implementing color changes
I need to implement the color: di['border-color'] and add tests to ensure that setting unequal stroke and fill colors works as expected. A fill-only scenario should not apply the fill color. There might be an issue normalizing di before each test and ensuring legacy support with the label modification. I also want to modify existing tests to reflect this behavior, checking for fallback cases when no color is set. I’ll review the BPMN file and testing configurations as well. It’s crucial we patch the code properly and apply distinct values in the tests.
The label branch reads background-color; I’ll switch it to border-color and make tests distinguish both colors.
apply_patch <<'PATCH'
*** Begin Patch
*** Update File: lib/features/modeling/cmd/SetColorHandler.js
@@
element: element,
moddleElement: getDi(element).label,
properties: {
- color: di['background-color']
+ color: di['border-color']
}
});
*** Update File: test/spec/features/modeling/SetColorSpec.js
@@
- it('setting stroke + fill color on external label', inject(function(elementRegistry, modeling) {
+ it('setting stroke + fill color on external label', inject(function(elementRegistry, modeling) {
// given
var flowShape = elementRegistry.get('SequenceFlow_3'),
flowLabel = flowShape.label,
flowDi = getDi(flowShape);
// when
- modeling.setColor(flowLabel, { stroke: 'FUCHSIA', fill: 'FUCHSIA' });
+ modeling.setColor(flowLabel, { stroke: 'FUCHSIA', fill: 'YELLOW' });
// then
expect(flowDi.get('border-color')).not.to.exist;
expect(flowDi.get('background-color')).not.to.exist;
expect(flowDi.label.get('color')).to.eql(FUCHSIA_HEX);
}));
+
+
+ it('setting fill color on external label does not set label color', inject(
+ function(elementRegistry, modeling) {
+
+ // given
+ var flowShape = elementRegistry.get('SequenceFlow_3'),
+ flowLabel = flowShape.label,
+ flowDi = getDi(flowShape);
+
+ // when
+ modeling.setColor(flowLabel, { fill: 'FUCHSIA' });
+
+ // then
+ expect(flowDi.label.get('color')).not.to.exist;
+ }
+ ));
*** End Patch
PATCHoutput · 9 lines
Wall time: 0.0000 seconds
Output:
Exit code: 0
Wall time: 0 seconds
Output:
Success. Updated the following files:
M lib/features/modeling/cmd/SetColorHandler.js
M test/spec/features/modeling/SetColorSpec.jsThe handler and regression coverage are patched; I’m checking the diff and available test runner options.
git diff --check; git diff -- lib/features/modeling/cmd/SetColorHandler.js test/spec/features/modeling/SetColorSpec.js; git status --shortoutput · 98 lines
Chunk ID: c4bc06
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 777
Output:
diff --git a/lib/features/modeling/cmd/SetColorHandler.js b/lib/features/modeling/cmd/SetColorHandler.js
index 9d853a0..c6384ae 100644
--- a/lib/features/modeling/cmd/SetColorHandler.js
+++ b/lib/features/modeling/cmd/SetColorHandler.js
@@ -70,12 +70,12 @@ SetColorHandler.prototype.postExecute = function(context) {
// set label colors as bpmndi:BPMNLabel#color
self._commandStack.execute('element.updateModdleProperties', {
- element: element,
- moddleElement: getDi(element).label,
- properties: {
- color: di['background-color']
- }
- });
+ element: element,
+ moddleElement: getDi(element).label,
+ properties: {
+ color: di['border-color']
+ }
+ });
} else {
// set colors bpmndi:BPMNEdge or bpmndi:BPMNShape
diff --git a/test/spec/features/modeling/SetColorSpec.js b/test/spec/features/modeling/SetColorSpec.js
index edcf476..0db85de 100644
--- a/test/spec/features/modeling/SetColorSpec.js
+++ b/test/spec/features/modeling/SetColorSpec.js
@@ -144,22 +144,39 @@ describe('features/modeling - set color', function() {
}));
- it('setting stroke + fill color on external label', inject(function(elementRegistry, modeling) {
-
- // given
- var flowShape = elementRegistry.get('SequenceFlow_3'),
- flowLabel = flowShape.label,
- flowDi = getDi(flowShape);
-
- // when
- modeling.setColor(flowLabel, { stroke: 'FUCHSIA', fill: 'FUCHSIA' });
-
- // then
- expect(flowDi.get('border-color')).not.to.exist;
- expect(flowDi.get('background-color')).not.to.exist;
-
- expect(flowDi.label.get('color')).to.eql(FUCHSIA_HEX);
- }));
+ it('setting stroke + fill color on external label', inject(function(elementRegistry, modeling) {
+
+ // given
+ var flowShape = elementRegistry.get('SequenceFlow_3'),
+ flowLabel = flowShape.label,
+ flowDi = getDi(flowShape);
+
+ // when
+ modeling.setColor(flowLabel, { stroke: 'FUCHSIA', fill: 'YELLOW' });
+
+ // then
+ expect(flowDi.get('border-color')).not.to.exist;
+ expect(flowDi.get('background-color')).not.to.exist;
+
+ expect(flowDi.label.get('color')).to.eql(FUCHSIA_HEX);
+ }));
+
+
+ it('setting fill color on external label does not set label color', inject(
+ function(elementRegistry, modeling) {
+
+ // given
+ var flowShape = elementRegistry.get('SequenceFlow_3'),
+ flowLabel = flowShape.label,
+ flowDi = getDi(flowShape);
+
+ // when
+ modeling.setColor(flowLabel, { fill: 'FUCHSIA' });
+
+ // then
+ expect(flowDi.label.get('color')).not.to.exist;
+ }
+ ));
it('unsetting stroke + fill color on external label', inject(function(elementRegistry, modeling) {
@@ -692,4 +709,4 @@ describe('features/modeling - set color', function() {
});
-});
\ No newline at end of file
+});
M lib/features/modeling/cmd/SetColorHandler.js
M test/spec/features/modeling/SetColorSpec.jssed -n '1,220p' test/config/karma.unit.js; test -d node_modules && echo node_modules-present || echo node_modules-missing; rg -n "ChromeHeadless|single-run|grep" test/config package.jsonoutput · 122 lines
Chunk ID: 033969
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 758
Output:
var path = require('path');
var collectTranslations = process.env.COLLECT_TRANSLATIONS;
var singleStart = process.env.SINGLE_START;
var coverage = process.env.COVERAGE;
// configures browsers to run test against
// any of [ 'ChromeHeadless', 'Chrome', 'Firefox', 'IE', 'PhantomJS' ]
var browsers = (process.env.TEST_BROWSERS || 'ChromeHeadless').split(',');
// use puppeteer provided Chrome for testing
process.env.CHROME_BIN = require('puppeteer').executablePath();
var basePath = '../..';
var absoluteBasePath = path.resolve(path.join(__dirname, basePath));
var suite = coverage ? 'test/coverageBundle.js' : 'test/testBundle.js';
module.exports = function(karma) {
var config = {
basePath,
frameworks: [
'mocha',
'sinon-chai',
'webpack'
],
files: [
'node_modules/promise-polyfill/dist/polyfill.js',
suite
],
preprocessors: {
[ suite ]: [ 'webpack', 'env' ]
},
reporters: [ 'progress' ].concat(coverage ? 'coverage' : []),
coverageReporter: {
reporters: [
{ type: 'lcov', subdir: '.' }
]
},
browsers,
browserNoActivityTimeout: 30000,
singleRun: true,
autoWatch: false,
webpack: {
mode: 'development',
module: {
rules: [
{
test: require.resolve('../TestHelper.js'),
sideEffects: true
},
{
test: /\.css|\.bpmn$/,
use: 'raw-loader'
}
].concat(coverage ?
{
test: /\.js$/,
use: {
loader: 'istanbul-instrumenter-loader',
options: { esModules: true }
},
include: /lib\.*/,
exclude: /node_modules/
} : []
)
},
resolve: {
mainFields: [
'dev:module',
'module',
'main'
],
modules: [
'node_modules',
absoluteBasePath
]
},
devtool: 'eval-source-map'
}
};
if (collectTranslations) {
config.plugins = [].concat(config.plugins || ['karma-*'], require('./translation-reporter'));
config.reporters = [].concat(config.reporters || [], 'translation-reporter');
config.envPreprocessor = [].concat(config.envPreprocessor || [], 'COLLECT_TRANSLATIONS');
}
if (singleStart) {
config.browsers = [].concat(config.browsers, 'Debug');
config.envPreprocessor = [].concat(config.envPreprocessor || [], 'SINGLE_START');
}
karma.set(config);
};
node_modules-present
package.json:21: "dev": "npm test -- --auto-watch --no-single-run",
test/config/karma.unit.js:10:// any of [ 'ChromeHeadless', 'Chrome', 'Firefox', 'IE', 'PhantomJS' ]
test/config/karma.unit.js:11:var browsers = (process.env.TEST_BROWSERS || 'ChromeHeadless').split(',');
test/config/karma.distro.js:2:// any of [ 'ChromeHeadless', 'Chrome', 'Firefox', 'IE', 'PhantomJS' ]
test/config/karma.distro.js:3:var browsers = (process.env.TEST_BROWSERS || 'ChromeHeadless').split(',');I realized there's a mixed newline patch problem due to CRLF. I need to ensure that the whole file maintains CRLF formatting since the git diff is showing added lines without CR. I should check if I need to convert the touched files back to CRLF. Can I really use Perl for this? The guidance mentions using the apply_patch tool for editing, which feels a bit contradictory if I also want to use unix2dos. I need to think about how to normalize line endings properly!Addressing file CRLF consistency
I need to make sure that all files retain their CRLF formatting. The file command and git attributes should help. I could use Perl to restore CRLF uniformly, but I've already applied the patch, and the instruction insists I must use the apply_patch tool. I wonder if I can change line endings directly through the shell, to avoid diff churn, but then I think about the implications of doing so. Could I use unix2dos or sed instead? I'm also considering if Python could be of assistance to preserve formats effectively.Normalizing line endings
I see that using shell commands might be better since they typically output larger chunks, but normalizing newlines is simpler with Perl. I need to check the file type, as it's likely that existing files are in CRLF format. The diff shows that all added patch lines are LF, so I want to ensure that the changes are minimal. I guess I should convert both changed files to CRLF. I'll run the Perl command to apply line endings, focusing on cleanup, since the instructions emphasize using the apply_patch tool for editing.
Considering test execution
I'm testing the overall execution of a bundle, which might take a few minutes. I’m aware of using Karma launcher, along with existing node modules and Chrome via Puppeteer. Running npm test -- --single-run looks like a viable option for executing all tests. I should also check lint results before running tests. I need to fix line ending issues while ensuring updates for flow labels are clear and well-defined.
Diff review caught mixed line endings from the patch; I’m normalizing them before running focused validation.
perl -pi -e 's/\r?\n/\r\n/g' lib/features/modeling/cmd/SetColorHandler.js test/spec/features/modeling/SetColorSpec.js && git diff --check && git diff --stat && git diff -- lib/features/modeling/cmd/SetColorHandler.js test/spec/features/modeling/SetColorSpec.jsoutput · 46 lines
Chunk ID: 4ac497
Wall time: 0.0000 seconds
Process exited with code 2
Original token count: 502
Output:
lib/features/modeling/cmd/SetColorHandler.js:76: trailing whitespace.
+ color: di['border-color']
test/spec/features/modeling/SetColorSpec.js:155: trailing whitespace.
+ modeling.setColor(flowLabel, { stroke: 'FUCHSIA', fill: 'YELLOW' });
test/spec/features/modeling/SetColorSpec.js:165: trailing whitespace.
+ it('setting fill color on external label does not set label color', inject(
test/spec/features/modeling/SetColorSpec.js:166: trailing whitespace.
+ function(elementRegistry, modeling) {
test/spec/features/modeling/SetColorSpec.js:167: trailing whitespace.
+
test/spec/features/modeling/SetColorSpec.js:168: trailing whitespace.
+ // given
test/spec/features/modeling/SetColorSpec.js:169: trailing whitespace.
+ var flowShape = elementRegistry.get('SequenceFlow_3'),
test/spec/features/modeling/SetColorSpec.js:170: trailing whitespace.
+ flowLabel = flowShape.label,
test/spec/features/modeling/SetColorSpec.js:171: trailing whitespace.
+ flowDi = getDi(flowShape);
test/spec/features/modeling/SetColorSpec.js:172: trailing whitespace.
+
test/spec/features/modeling/SetColorSpec.js:173: trailing whitespace.
+ // when
test/spec/features/modeling/SetColorSpec.js:174: trailing whitespace.
+ modeling.setColor(flowLabel, { fill: 'FUCHSIA' });
test/spec/features/modeling/SetColorSpec.js:175: trailing whitespace.
+
test/spec/features/modeling/SetColorSpec.js:176: trailing whitespace.
+ // then
test/spec/features/modeling/SetColorSpec.js:177: trailing whitespace.
+ expect(flowDi.label.get('color')).not.to.exist;
test/spec/features/modeling/SetColorSpec.js:178: trailing whitespace.
+ }
test/spec/features/modeling/SetColorSpec.js:179: trailing whitespace.
+ ));
test/spec/features/modeling/SetColorSpec.js:180: trailing whitespace.
+
test/spec/features/modeling/SetColorSpec.js:181: trailing whitespace.
+
test/spec/features/modeling/SetColorSpec.js:712: trailing whitespace.
+});I'm looking at the initial diff, and I see added lines. The old lines seem weird, possibly due to CRLF issues. When running git diff --check, it showed a blank patch; maybe it was combined? I'm considering if the file baseline is all LF and the modified line had CRLF before normalization. The initial diff appears to have modified a larger area because of newline conversions. I think I should check the file and run a git show.
file lib/features/modeling/cmd/SetColorHandler.js test/spec/features/modeling/SetColorSpec.js; git show HEAD:lib/features/modeling/cmd/SetColorHandler.js | file -; git show HEAD:test/spec/features/modeling/SetColorSpec.js | file -; git config --get core.autocrlf || true; git config --get core.whitespace || trueoutput · 10 lines
Chunk ID: 96008e
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 68
Output:
lib/features/modeling/cmd/SetColorHandler.js: ASCII text, with CRLF line terminators
test/spec/features/modeling/SetColorSpec.js: ASCII text, with CRLF line terminators
/dev/stdin: ASCII text, with CRLF line terminators
/dev/stdin: ASCII text, with CRLF line terminatorsI need to make sure the file conversion accounts for CRLF correctly. The current method converts the whole file, but I want a minimal diff for just the changes. Using git diff --check could give false positives, so I’ll use git -c core.whitespace=cr-at-eol diff --check to check accurately.
For testing, I can use Karma with a full test bundle, or run npm test -- --single-run to avoid redundancy. I'll also check linting with npx eslint lib/... test/... before running tests in parallel if needed.
Line endings now match the repository; I’m running the targeted lint and unit suite.
npx eslint lib/features/modeling/cmd/SetColorHandler.js test/spec/features/modeling/SetColorSpec.jsoutput · 6 lines
Chunk ID: 7de0bb
Wall time: 1.0010 seconds
Process running with session ID 96757
Original token count: 0
Output:npm test -- --single-runoutput · 12 lines
Chunk ID: 5fa48c
Wall time: 1.0015 seconds
Process running with session ID 8994
Original token count: 46
Output:
> bpmn-js@9.1.0 test
> karma start test/config/karma.unit.js --single-run
[32m14 10 2026 22:18:32.705:INFO [preprocessor.env]: [39mPublishing variables: []
Webpack bundling...git -c core.whitespace=cr-at-eol diff --check && git diff --stat && git diff -- lib/features/modeling/cmd/SetColorHandler.js test/spec/features/modeling/SetColorSpec.jsoutput · 66 lines
Chunk ID: 614cf9
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 535
Output:
lib/features/modeling/cmd/SetColorHandler.js | 2 +-
test/spec/features/modeling/SetColorSpec.js | 21 +++++++++++++++++++--
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/lib/features/modeling/cmd/SetColorHandler.js b/lib/features/modeling/cmd/SetColorHandler.js
index 9d853a0..dde1fd6 100644
--- a/lib/features/modeling/cmd/SetColorHandler.js
+++ b/lib/features/modeling/cmd/SetColorHandler.js
@@ -73,7 +73,7 @@ SetColorHandler.prototype.postExecute = function(context) {
element: element,
moddleElement: getDi(element).label,
properties: {
- color: di['background-color']
+ color: di['border-color']
}
});
} else {
diff --git a/test/spec/features/modeling/SetColorSpec.js b/test/spec/features/modeling/SetColorSpec.js
index edcf476..cd0edc9 100644
--- a/test/spec/features/modeling/SetColorSpec.js
+++ b/test/spec/features/modeling/SetColorSpec.js
@@ -152,7 +152,7 @@ describe('features/modeling - set color', function() {
flowDi = getDi(flowShape);
// when
- modeling.setColor(flowLabel, { stroke: 'FUCHSIA', fill: 'FUCHSIA' });
+ modeling.setColor(flowLabel, { stroke: 'FUCHSIA', fill: 'YELLOW' });
// then
expect(flowDi.get('border-color')).not.to.exist;
@@ -162,6 +162,23 @@ describe('features/modeling - set color', function() {
}));
+ it('setting fill color on external label does not set label color', inject(
+ function(elementRegistry, modeling) {
+
+ // given
+ var flowShape = elementRegistry.get('SequenceFlow_3'),
+ flowLabel = flowShape.label,
+ flowDi = getDi(flowShape);
+
+ // when
+ modeling.setColor(flowLabel, { fill: 'FUCHSIA' });
+
+ // then
+ expect(flowDi.label.get('color')).not.to.exist;
+ }
+ ));
+
+
it('unsetting stroke + fill color on external label', inject(function(elementRegistry, modeling) {
// given
@@ -692,4 +709,4 @@ describe('features/modeling - set color', function() {
});
-});
\ No newline at end of file
+});I’m thinking about whether I need to test the incorrectly used flowDi since it seems it hasn’t been utilized properly. I believe it’s essential to consider the changes and evaluate how the new test flowDi has been implemented. Good to ensure that any potential issues are clear. I might need to gather feedback, maybe even a poll, to better understand if the new implementation works as intended.
The diff is clean and minimal; lint and Karma are still running.
output · 6 lines
Chunk ID: eddff4
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 0
Output:output · 23 lines
Chunk ID: 4c4a66
Wall time: 0.0000 seconds
Process exited with code 1
Original token count: 387
Output:
Hash: [1m1ed2020d8ab39defc5c1[39m[22m
Version: webpack [1m4.46.0[39m[22m
Time: [1m1598[39m[22mms
Built at: 10/14/2026 [1m10:18:34 PM[39m[22m
[1mAsset[39m[22m [1mSize[39m[22m [1mChunks[39m[22m [1m[39m[22m [1m[39m[22m[1mChunk Names[39m[22m
[1m[32mcommons.js[39m[22m 14.1 MiB [1mcommons[39m[22m [1m[32m[emitted][39m[22m commons
[1m[32mruntime.js[39m[22m 6.12 KiB [1mruntime[39m[22m [1m[32m[emitted][39m[22m runtime
[1m[32mtestBundle.621519229.js[39m[22m 139 bytes [1mtestBundle.621519229[39m[22m [1m[32m[emitted][39m[22m testBundle.621519229
Entrypoint [1mtestBundle.621519229[39m[22m = [1m[32mruntime.js[39m[22m [1m[32mcommons.js[39m[22m [1m[32mtestBundle.621519229.js[39m[22m
[32m14 10 2026 22:18:34.575:INFO [karma-server]: [39mKarma v6.3.16 server started at http://localhost:9876/
[32m14 10 2026 22:18:34.575:INFO [launcher]: [39mLaunching browsers ChromeHeadless with concurrency unlimited
[32m14 10 2026 22:18:34.578:INFO [launcher]: [39mStarting browser ChromeHeadless
[91m14 10 2026 22:18:34.596:ERROR [launcher]: [39mCannot start ChromeHeadless
Can not find the binary /testbed/node_modules/puppeteer/.local-chromium/linux-884014/chrome-linux/chrome
Please set env variable CHROME_BIN
[91m14 10 2026 22:18:34.596:ERROR [launcher]: [39mChromeHeadless stdout:
[91m14 10 2026 22:18:34.596:ERROR [launcher]: [39mChromeHeadless stderr: I need to consider running tests with an alternative installed Chromium or inspecting the availability of binaries. Maybe checking with command -v chromium... could help, and I might need npx puppeteer to download anything that's missing. While the network is available, I want to be cautious about installations. I should also check if PhantomJS is a viable option since its package has a prebuilt binary. It seems like PhantomJS might not be compatible with Chromium, but I can run targeted tests to explore this further.
Checking testing setup
I noticed that the test wasn’t run because Chrome is absent. I could potentially use PhantomJS instead. Since the request is specific about running the test in PhantomJS, I should execute it with TEST_BROWSERS=PhantomJS npm test -- --single-run. However, the Puppeteer configuration specifies CHROME_BIN, and the PhantomJS launcher likely uses its own binary. I'll need to check if PhantomJS is installed.
Lint passes, but Karma can’t find its bundled Chrome; I’m checking whether PhantomJS can run the suite.
command -v chromium chromium-browser google-chrome google-chrome-stable phantomjs || true; ls -l node_modules/.bin/phantomjs node_modules/puppeteer/.local-chromium 2>/dev/null || true;output · 9 lines
Chunk ID: 6f0fa0
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 40
Output:
/usr/bin/google-chrome
/usr/bin/google-chrome-stable
lrwxrwxrwx 1 root root 35 Aug 14 01:56 node_modules/.bin/phantomjs -> ../phantomjs-prebuilt/bin/phantomjsgit status --short; git -c core.whitespace=cr-at-eol diff --check; git diff --statoutput · 11 lines
Chunk ID: ea8a7f
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 69
Output:
M lib/features/modeling/cmd/SetColorHandler.js
M test/spec/features/modeling/SetColorSpec.js
lib/features/modeling/cmd/SetColorHandler.js | 2 +-
test/spec/features/modeling/SetColorSpec.js | 21 +++++++++++++++++++--
2 files changed, 20 insertions(+), 3 deletions(-)TEST_BROWSERS=PhantomJS npm test -- --single-runoutput · 12 lines
Chunk ID: 2c0ca2
Wall time: 1.0030 seconds
Process running with session ID 41461
Original token count: 46
Output:
> bpmn-js@9.1.0 test
> karma start test/config/karma.unit.js --single-run
[32m14 10 2026 22:18:57.026:INFO [preprocessor.env]: [39mPublishing variables: []
Webpack bundling...output · 101 lines
Chunk ID: 513c8f
Wall time: 5.0008 seconds
Process running with session ID 41461
Original token count: 10501
Output:
Warning: truncated output (original token count: 10501)
Total output lines: 392
Hash: [1m1ed2020d8ab39defc5c1[39m[22m
Version: webpack [1m4.46.0[39m[22m
Time: [1m1478[39m[22mms
Built at: 10/14/2026 [1m10:18:58 PM[39m[22m
[1mAsset[39m[22m [1mSize[39m[22m [1mChunks[39m[22m [1m[39m[22m [1m[39m[22m[1mChunk Names[39m[22m
[1m[32mcommons.js[39m[22m 14.1 MiB [1mcommons[39m[22m [1m[32m[emitted][39m[22m commons
[1m[32mruntime.js[39m[22m 6.12 KiB [1mruntime[39m[22m [1m[32m[emitted][39m[22m runtime
[1m[32mtestBundle.621519229.js[39m[22m 139 bytes [1mtestBundle.621519229[39m[22m [1m[32m[emitted][39m[22m testBundle.621519229
Entrypoint [1mtestBundle.621519229[39m[22m = [1m[32mruntime.js[39m[22m [1m[32mcommons.js[39m[22m [1m[32mtestBundle.621519229.js[39m[22m
[32m14 10 2026 22:18:58.728:INFO [karma-server]: [39mKarma v6.3.16 server started at http://localhost:9876/
[32m14 10 2026 22:18:58.729:INFO [launcher]: [39mLaunching browsers PhantomJS with concurrency unlimited
[32m14 10 2026 22:18:58.731:INFO [launcher]: [39mStarting browser PhantomJS
[32m14 10 2026 22:18:59.025:INFO [PhantomJS 2.1.1 (Linux x86_64)]: [39mConnected on socket 6qdJM9QhtcYHRMJkAAAB with id 80842816
PhantomJS 2.1.1 (Linux x86_64): Executed 0 of 1785[32m SUCCESS[39m (0 secs / 0 secs)
[33m14 10 2026 22:18:59.405:WARN [web-server]: [39m404: /font/bpmn.svg?68866489
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1 of 1785[32m SUCCESS[39m (0 secs / 0.001 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 2 of 1785[32m SUCCESS[39m (0 secs / 0.001 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 3 of 1785[32m SUCCESS[39m (0 secs / 0.002 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 4 of 1785[32m SUCCESS[39m (0 secs / 0.01 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 5 of 1785[32m SUCCESS[39m (0 secs / 0.015 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 6 of 1785[32m SUCCESS[39m (0 secs / 0.02 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 7 of 1785[32m SUCCESS[39m (0 secs / 0.033 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 8 of 1785 (skipped 1)[32m SUCCESS[39m (0 secs / 0.048 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 9 of 1785 (skipped 1)[32m SUCCESS[39m (0 secs / 0.053 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 10 of 1785 (skipped 1)[32m SUCCESS[39m (0 secs / 0.121 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 11 of 1785 (skipped 1)[32m SUCCESS[39m (0 secs / 0.126 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 12 of 1785 (skipped 1)[32m SUCCESS[39m (0 secs / 0.131 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 13 of 1785 (skipped 1)[32m SUCCESS[39m (0 secs / 0.162 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 14 of 1785 (skipped 1)[32m SUCCESS[39m (0 secs / 0.187 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 15 of 1785 (skipped 1)[32m SUCCESS[39m (0 secs / 0.206 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 16 of 1785 (skipped 1)[32m SUCCESS[39m (0 secs / 0.228 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 17 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 0.242 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 18 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 0.278 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 19 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 0.291 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 20 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 0.301 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 21 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 0.32 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 22 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 0.331 secs)
[1A[2KWARN: [36mError: Passing callbacks to createDiagram is deprecated and will be removed in a future major release. Please switch to promises: https://bpmn.io/l/moving-to-promises.html
undefined[39m
PhantomJS 2.1.1 (Linux x86_64): Executed 22 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 0.331 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 23 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 0.342 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 24 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 0.342 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 25 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 0.369 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 26 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 0.388 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 27 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 0.396 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 28 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 0.415 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 29 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 0.439 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 30 of 1785 (skipped 2)[3…32002 chars truncated…CCESS[39m (0 secs / 3.319 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 259 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 3.32 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 260 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 3.321 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 261 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 3.321 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 262 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 3.341 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 263 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 3.356 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 264 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 3.361 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 265 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 3.361 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 266 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 3.362 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 267 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 3.375 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 268 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 3.393 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 269 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 3.406 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 270 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 3.419 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 271 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 3.426 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 272 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 3.435 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 273 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 3.504 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 274 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 3.506 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 275 of 1785 (skipped 2)[32m SUCCESS[39m (0 secs / 3.507 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 276 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.513 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 277 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.523 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 278 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.578 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 279 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.588 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 280 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.618 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 281 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.629 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 282 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.633 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 283 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.64 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 284 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.676 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 285 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.676 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 286 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.682 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 287 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.691 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 288 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.696 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 289 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.7 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 290 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.705 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 291 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.751 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 292 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.77 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 293 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.771 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 294 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.775 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 295 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.779 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 296 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.869 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 297 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.889 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 298 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.922 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 299 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 3.954 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 300 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.052 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 301 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.059 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 302 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.071 secs)I'm currently testing all 1785, which is quite a lot! It feels like I'll need to wait a bit since the output is huge. I'm thinking about polling, which is set to yield a maximum of 1000, but it looks like it returns to a default of 5 seconds. Hmm, maybe I should consider calling 1000 directly instead to keep things moving along more quickly. Let's see how this plays out!
output · 98 lines
Chunk ID: 7627b2
Wall time: 5.0020 seconds
Process running with session ID 41461
Original token count: 8242
Output:
Warning: truncated output (original token count: 8242)
Total output lines: 292
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 303 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.261 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 304 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.264 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 305 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.267 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 306 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.269 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 307 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.272 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 308 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.276 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 309 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.278 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 310 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.28 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 311 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.282 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 312 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.283 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 313 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.286 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 314 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.289 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 315 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.292 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 316 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.294 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 317 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.296 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 318 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.298 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 319 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.301 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 320 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.304 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 321 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.305 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 322 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.306 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 323 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.308 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 324 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.311 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 325 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.312 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 326 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.313 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 327 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.315 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 328 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.348 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 329 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.386 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 330 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.391 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 331 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.406 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 332 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.426 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 333 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.455 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 334 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.474 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 335 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.476 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 336 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.478 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 337 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.48 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 338 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.482 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 339 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.486 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 340 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.489 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 341 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.493 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 342 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.499 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 343 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.503 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 344 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.503 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 345 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.505 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 346 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 4.508 secs)
[1A[2KPhantomJS 2.1.1 (Linux…22965 chars truncated…UCCESS[39m (0 secs / 5.441 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 551 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.442 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 552 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.443 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 553 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.444 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 554 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.462 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 555 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.466 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 556 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.47 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 557 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.474 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 558 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.478 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 559 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.488 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 560 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.492 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 561 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.5 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 562 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.525 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 563 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.53 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 564 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.553 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 565 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.575 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 566 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.594 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 567 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.602 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 568 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.609 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 569 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.628 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 570 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.644 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 571 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.66 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 572 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.678 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 573 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.697 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 574 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.714 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 575 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.739 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 576 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.743 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 577 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.746 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 578 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.752 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 579 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.756 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 580 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.762 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 581 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.767 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 582 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.771 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 583 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.775 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 584 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.781 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 585 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.787 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 586 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.835 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 587 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.849 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 588 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.888 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 589 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.889 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 590 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.89 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 591 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.892 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 592 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.898 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 593 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.902 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 594 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.907 secs)PhantomJS is progressing through the full suite with no failures so far.
output · 44 lines
Chunk ID: 1aa9e7
Wall time: 30.0012 seconds
Process running with session ID 41461
Original token count: 26324
Output:
Warning: truncated output (original token count: 26324)
Total output lines: 925
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 595 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.912 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 596 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.918 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 597 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.923 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 598 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.935 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 599 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.938 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 600 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 5.961 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 601 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 6.008 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 602 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 6.032 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 603 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 6.035 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 604 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 6.037 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 605 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 6.038 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 606 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 6.041 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 607 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 6.044 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 608 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 6.048 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 609 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 6.052 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 610 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 6.056 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 611 of 1785 (skipped 3)[32m SUCCESS[39m (0 secs / 6.063 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 612 of 1785 (skipped 3)[32m S…25324 tokens truncated…5 (skipped 8)[32m SUCCESS[39m (0 secs / 12.655 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1503 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.655 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1504 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.655 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1505 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.656 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1506 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.657 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1507 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.658 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1508 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.659 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1509 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.659 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1510 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.66 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1511 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.66 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1512 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.66 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1513 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.66 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1514 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.66 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1515 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.66 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1516 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.66 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1517 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.66 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1518 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.66 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1519 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.66 secs)output · 51 lines
Chunk ID: 829c32
Wall time: 5.2851 seconds
Process exited with code 0
Original token count: 8340
Output:
Warning: truncated output (original token count: 8340)
Total output lines: 350
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1520 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.66 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1521 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.661 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1522 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.661 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1523 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.661 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1524 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.661 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1525 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.661 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1526 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.661 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1527 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.661 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1528 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.661 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1529 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.661 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1530 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.661 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1531 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.661 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1532 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.661 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1533 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.661 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1534 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.661 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1535 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.661 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1536 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.662 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1537 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.662 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1538 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.662 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1539 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 12.663 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1540 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs /…7140 tokens truncated… of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 13.85 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1759 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 13.85 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1760 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 13.851 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1761 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 13.851 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1762 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 13.851 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1763 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 13.874 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1764 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 13.901 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1765 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 13.924 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1766 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 13.951 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1767 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 13.997 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1768 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 14.034 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1769 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 14.065 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1770 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 14.066 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1771 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 14.067 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1772 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 14.067 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1773 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 14.067 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1774 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 14.067 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1775 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 14.068 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1776 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 14.068 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1777 of 1785 (skipped 8)[32m SUCCESS[39m (0 secs / 14.069 secs)
[1A[2KPhantomJS 2.1.1 (Linux x86_64): Executed 1777 of 1785 (skipped 8)[32m SUCCESS[39m (1 min 1.774 secs / 14.069 secs)
[32mTOTAL: 1777 SUCCESS[39mI need to run a final git diff to check the status, along with line numbers for references. I know handler 76, so I should focus there. It’s important to check the status and ensure that the final test output is successful. Also, npm test failed due to a missing Puppeteer Chromium, but the fallback with PhantomJS worked, which I should highlight instead. I need the exact line references, so I'll use nl -ba for that.
All 1,777 active tests pass under PhantomJS; I’m doing a final status and line-reference check.
nl -ba lib/features/modeling/cmd/SetColorHandler.js | sed -n '67,81p'; nl -ba test/spec/features/modeling/SetColorSpec.js | sed -n '143,185p'; git status --short; git -c core.whitespace=cr-at-eol diff --checkoutput · 66 lines
Chunk ID: 9b276d
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 555
Output:
67 ensureLegacySupport(assignedDi);
68
69 if (element.labelTarget) {
70
71 // set label colors as bpmndi:BPMNLabel#color
72 self._commandStack.execute('element.updateModdleProperties', {
73 element: element,
74 moddleElement: getDi(element).label,
75 properties: {
76 color: di['border-color']
77 }
78 });
79 } else {
80
81 // set colors bpmndi:BPMNEdge or bpmndi:BPMNShape
143 expect(taskDi.get('background-color')).not.to.exist;
144 }));
145
146
147 it('setting stroke + fill color on external label', inject(function(elementRegistry, modeling) {
148
149 // given
150 var flowShape = elementRegistry.get('SequenceFlow_3'),
151 flowLabel = flowShape.label,
152 flowDi = getDi(flowShape);
153
154 // when
155 modeling.setColor(flowLabel, { stroke: 'FUCHSIA', fill: 'YELLOW' });
156
157 // then
158 expect(flowDi.get('border-color')).not.to.exist;
159 expect(flowDi.get('background-color')).not.to.exist;
160
161 expect(flowDi.label.get('color')).to.eql(FUCHSIA_HEX);
162 }));
163
164
165 it('setting fill color on external label does not set label color', inject(
166 function(elementRegistry, modeling) {
167
168 // given
169 var flowShape = elementRegistry.get('SequenceFlow_3'),
170 flowLabel = flowShape.label,
171 flowDi = getDi(flowShape);
172
173 // when
174 modeling.setColor(flowLabel, { fill: 'FUCHSIA' });
175
176 // then
177 expect(flowDi.label.get('color')).not.to.exist;
178 }
179 ));
180
181
182 it('unsetting stroke + fill color on external label', inject(function(elementRegistry, modeling) {
183
184 // given
185 var flowShape = elementRegistry.get('SequenceFlow_3'),
M lib/features/modeling/cmd/SetColorHandler.js
M test/spec/features/modeling/SetColorSpec.jsnpx eslint lib/features/modeling/cmd/SetColorHandler.js test/spec/features/modeling/SetColorSpec.jsoutput · 6 lines
Chunk ID: 3993b1
Wall time: 0.5459 seconds
Process exited with code 0
Original token count: 0
Output:External labels now take their BPMN label color from the stroke value in setColor (lib/features/modeling/cmd/SetColorHandler.js:76). Regression tests cover different fill and stroke values and verify fill-only changes don’t color the label (test/spec/features/modeling/SetColorSpec.js:147).
Validation: ESLint passes; the PhantomJS suite passes (1,777 tests, 8 skipped).
carbon-6675 · Pagination says "1 of 1 pages" · resolved · 17 model calls · 16 commands · 146 s
What the images show: Pagination footer reading "1 of 1 pages"
What the text already says: Names the file, the lines and the rule: singular when max === 1 or totalPages === 1
[Pagination] The footer should be singular if only one item/page
## Detailed description
> Describe in detail the issue you're having.
An [issue was raised](https://github.ibm.com/ibmcloud/security-compliance/issues/1273) in my product team's repo regarding the pagination footer showing `items` if there was only one item and `pages` if there was only one page. I confirmed in lines [148](https://github.com/carbon-design-system/carbon/blob/master/packages/react/src/components/Pagination/Pagination.js#L148) and [312](https://github.com/carbon-design-system/carbon/blob/master/packages/react/src/components/Pagination/Pagination.js#L312) in `Pagination.js` that it was a Carbon issue.
> Is this issue related to a specific component?
Pagination
> What did you expect to happen? What happened instead? What would you like to
> see changed?
Add conditional logic so that if `max === 1` or `totalPages === 1` the singular version of their noun shows.
## Additional information
You cannot see the images in this message; each was removed and only its position is marked.
[Image 1 of 1]I think I need to modify the repository, but first I should inspect it carefully. It’s important to understand what changes are necessary before diving in. I'll take a look at the structure and any existing code, so I can plan my approach effectively. It seems there’s a need for a clear preamble that outlines my next steps. Let’s ensure I get this right before making any modifications!
I’ll inspect the pagination component and its tests, then make a focused fix.
pwd && rg --files -g 'AGENTS.md' -g '*Pagination*' | head -80 && git status --shortoutput · 17 lines
Chunk ID: ffe7bc
Wall time: 0.0736 seconds
Process exited with code 0
Original token count: 151
Output:
/testbed
packages/react/src/components/PaginationNav/PaginationNav.js
packages/react/src/components/PaginationNav/PaginationNav-test.js
packages/react/src/components/PaginationNav/PaginationNav-story.js
packages/react/src/components/Pagination/experimental/Pagination.js
packages/react/src/components/Pagination/experimental/Pagination-story.js
packages/react/src/components/Pagination/Pagination.js
packages/react/src/components/Pagination/Pagination.Skeleton.js
packages/react/src/components/Pagination/Pagination-test.js
packages/react/src/components/Pagination/Pagination-story.js
?? .achecker.ymlI need to check the root AGENTS to see if the rg files indicate there’s nothing there since I’m not getting any output. It seems like I should inspect the files and test them by matching the text. This way, I can double-check whether everything is as expected. Let’s get to the bottom of this and figure out if there’s something I’m missing!
rg -n "items|pages|totalPages|\bmax\b" packages/react/src/components/Pagination/Pagination.js packages/react/src/components/Pagination/Pagination-test.js && sed -n '100,180p' packages/react/src/components/Pagination/Pagination.js && sed -n '270,335p' packages/react/src/components/Pagination/Pagination.js && sed -n '1,220p' packages/react/src/components/Pagination/Pagination-test.jsoutput · 188 lines
Chunk ID: b96187
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 4621
Output:
Warning: truncated output (original token count: 4621)
Total output lines: 417
packages/react/src/components/Pagination/Pagination-test.js:53: const items = select.find(SelectItem);
packages/react/src/components/Pagination/Pagination-test.js:55: expect(items.length).toBe(2);
packages/react/src/components/Pagination/Pagination-test.js:56: expect(items.at(0).props().value).toBe(5);
packages/react/src/components/Pagination/Pagination-test.js:57: expect(items.at(1).props().value).toBe(10);
packages/react/src/components/Pagination/Pagination-test.js:67: expect(label.text()).toBe('1–5 of 50 items');
packages/react/src/components/Pagination/Pagination-test.js:70: describe('pagination size container when total pages unknown', () => {
packages/react/src/components/Pagination/Pagination-test.js:72: <Pagination pageSizes={[5, 10]} pagesUnknown={true} />
packages/react/src/components/Pagination/Pagination-test.js:82: const items = select.find(SelectItem);
packages/react/src/components/Pagination/Pagination-test.js:84: expect(items.length).toBe(2);
packages/react/src/components/Pagination/Pagination-test.js:85: expect(items.at(0).props().value).toBe(5);
packages/react/src/components/Pagination/Pagination-test.js:86: expect(items.at(1).props().value).toBe(10);
packages/react/src/components/Pagination/Pagination-test.js:96: expect(label.text()).toBe('1–5 items');
packages/react/src/components/Pagination/Pagination-test.js:123: expect(labels.at(1).text()).toBe('1–10 of 50 items');
packages/react/src/components/Pagination/Pagination-test.js:124: expect(labels.at(2).text()).toBe('of 5 pages');
packages/react/src/components/Pagination/Pagination-test.js:218: it('should show the current page out of the total number of pages', () => {
packages/react/src/components/Pagination/Pagination-test.js:220: expect(label.text()).toBe('of 10 pages');
packages/react/src/components/Pagination/Pagination-test.js:223: it('should render ranges and pages for no items', () => {
packages/react/src/components/Pagination/Pagination-test.js:226: expect(labels.at(1).text()).toBe('0–0 of 0 items');
packages/react/src/components/Pagination/Pagination-test.js:227: expect(labels.at(2).text()).toBe('of 1 pages');
packages/react/src/components/Pagination/Pagination-test.js:264: describe('pagination paging container when total pages unknown', () => {
packages/react/src/components/Pagination/Pagination-test.js:266: <Pagination pageSizes={[5, 10]} pagesUnknown={true} />
packages/react/src/components/Pagination/Pagination-test.js:275: it('should show the current page without the total number of pages', () => {
packages/react/src/components/Pagination/Pagination-test.js:305: pagesUnknown={true}
packages/react/src/components/Pagination/Pagination-test.js:316: <Pagination pageSizes={[100]} pagesUnknown={true} disabled={true} />
packages/react/src/components/Pagination/Pagination-test.js:329: pagesUnknown={true}
packages/react/src/components/Pagination/Pagination.js:72: * in a manner of the range of items.
packages/react/src/components/Pagination/Pagination.js:77: * A variant of `itemRangeText`, used if the total number of items is unknown.
packages/react/src/components/Pagination/Pagination.js:82: * The translatable text indicating the number of items per page.
packages/react/src/components/Pagination/Pagination.js:84: itemsPerPageText: PropTypes.string,
packages/react/src/components/Pagination/Pagination.js:112: * The number dictating how many items a page contains.
packages/react/src/components/Pagination/Pagination.js:127: * `true` if the total number of items is unknown.
packages/react/src/components/Pagination/Pagination.js:129: pagesUnknown: PropTypes.bool,
packages/react/src/components/Pagination/Pagination.js:132: * The total number of items.
packages/react/src/components/Pagination/Pagination.js:139: itemRangeText: (min, max, total) => `${min}–${max} of ${total} items`,
packages/react/src/components/Pagination/Pagination.js:141: itemsPerPageText: 'Items per page:',
packages/react/src/components/Pagination/Pagination.js:143: pageRangeText: (current, total) => `of ${total} pages`,
packages/react/src/components/Pagination/Pagination.js:146: pagesUnknown: false,
packages/react/src/components/Pagination/Pagination.js:148: itemText: (min, max) => `${min}–${max} items`,
packages/react/src/components/Pagination/Pagination.js:192: Math.max(Math.ceil(this.props.totalItems / this.state.pageSize), 1)
packages/react/src/components/Pagination/Pagination.js:232: itemsPerPageText,
packages/react/src/components/Pagination/Pagination.js:240: pagesUnknown,
packages/react/src/components/Pagination/Pagination.js:253: const totalPages = Math.max(Math.ceil(totalItems / statePageSize), 1);
packages/react/src/components/Pagination/Pagination.js:262: const forwardButtonDisabled = d…8476 chars truncated…tems.length).toBe(2);
expect(items.at(0).props().value).toBe(5);
expect(items.at(1).props().value).toBe(10);
});
it('should label the dropdown', () => {
const label = left.find(`.${prefix}--pagination__text`).first();
expect(label.text()).toBe('Items per page:');
});
it('should show the item range without the total', () => {
const label = left.find(`.${prefix}--pagination__text`).at(1);
expect(label.text()).toBe('1–5 items');
});
});
describe('pagination sizing', () => {
it('should respond to page size changes', () => {
let actualPageSize;
const handler = ({ pageSize }) => {
actualPageSize = pageSize;
};
const pager = mount(
<Pagination
pageSizes={[5, 10]}
totalItems={50}
onChange={handler}
/>
);
expect(pager.state().pageSize).toBe(5);
pager
.find('select')
.first()
.simulate('change', { target: { value: 10 } });
expect(actualPageSize).toBe(10);
expect(pager.state().pageSize).toBe(10);
// Text updates after change
const labels = pager.find(`.${prefix}--pagination__text`);
expect(labels.at(1).text()).toBe('1–10 of 50 items');
expect(labels.at(2).text()).toBe('of 5 pages');
});
it('should reset the page when page size changes', () => {
let actualPage;
const handler = ({ page }) => {
actualPage = page;
};
const pager = mount(
<Pagination
pageSizes={[5, 10]}
totalItems={50}
onChange={handler}
/>
);
pager.setState({ page: 2 });
expect(pager.state().page).toBe(2);
pager
.find('select')
.first()
.simulate('change', { target: { value: 10 } });
expect(actualPage).toBe(1);
expect(pager.state().page).toBe(1);
});
it('should return to first page on changes to pageSizes', () => {
const pager = mount(
<Pagination pageSizes={[5, 10]} totalItems={50} />
);
pager.setState({ page: 2 });
pager.setProps({ pageSizes: [3, 6] });
expect(pager.state().page).toEqual(1);
});
it('should not return to first page on changes to pageSizes where current pageSize is in new list', () => {
const pager = mount(
<Pagination pageSizes={[5, 10]} pageSize={10} totalItems={50} />
);
pager.setState({ page: 2 });
pager.setProps({ pageSizes: [5, 10, 20] });
expect(pager.state().page).toEqual(2);
});
it('should return to first page on changes to pageSizes where current pageSize is not in new list', () => {
const pager = mount(
<Pagination pageSizes={[5, 10]} pageSize={10} totalItems={50} />
);
pager.setState({ page: 2 });
pager.setProps({ pageSizes: [25, 50, 100] });
expect(pager.state().page).toEqual(1);
});
it('should avoid returning to first page unless actual change in pageSizes is detected', () => {
const pager = mount(
<Pagination pageSizes={[5, 10]} totalItems={50} />
);
pager.setState({ page: 2 });
pager.setProps({ pageSizes: [5, 10] });
expect(pager.state().page).toEqual(2);
});
it('should default to pageSize if pageSize is provided', () => {
const pager = mount(
<Pagination pageSizes={[5, 10]} pageSize={10} totalItems={50} />
);
expect(pager.state().pageSize).toEqual(10);
});
it('should default to pageSize if on change to pageSize', () => {
const pager = mount(
<Pagination pageSizes={[5, 10]} totalItems={50} />
);
pager.setProps({ pageSize: 10 });
expect(pager.state().pageSize).toEqual(10);
});
it('should avoid defaulting to pageSize unless actual change in pageSize is detected', () => {
const pager = mount(
<Pagination pageSizes={[5, 10]} pageSize={10} totalItems={50} />
);
pager.setState({ pageSize: 20 });
pager.setProps({ pageSize: 10 });
expect(pager.state().pageSize).toEqual(20);
});
});
});
describe('pagination paging container', () => {
const right = pagination.find(`.${prefix}--pagination__right`);
it('should render a right container', () => {
expect(right.length).toBe(1);
});
it('should show the current page out of the total number of pages', () => {
const label = right.find(`.${prefix}--pagination__text`).first();
expect(label.text()).toBe('of 10 pages');The footer labels are default callbacks; I’m tracing their exact inputs and existing test setup.
sed -n '1,180p' packages/react/src/components/Pagination/Pagination.js && sed -n '220,330p' packages/react/src/components/Pagination/Pagination.js && sed -n '1,145p' packages/react/src/components/Pagination/Pagination-test.js && sed -n '200,245p' packages/react/src/components/Pagination/Pagination-test.js && find .. -name AGENTS.md -printoutput · 336 lines
Chunk ID: 359956
Wall time: 2.3933 seconds
Process exited with code 0
Original token count: 3838
Output:
Warning: truncated output (original token count: 3838)
Total output lines: 482
/**
* Copyright IBM Corp. 2016, 2018
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import classnames from 'classnames';
import { CaretRight16, CaretLeft16 } from '@carbon/icons-react';
import { settings } from 'carbon-components';
import Select from '../Select';
import SelectItem from '../SelectItem';
import { equals } from '../../tools/array';
import Button from '../Button';
import deprecate from '../../prop-types/deprecate';
const { prefix } = settings;
let instanceId = 0;
export default class Pagination extends Component {
constructor(props) {
super(props);
const { pageSizes, page, pageSize } = this.props;
this.state = {
page: page,
pageSize:
pageSize && pageSizes.includes(pageSize) ? pageSize : pageSizes[0],
prevPageSizes: pageSizes,
prevPage: page,
prevPageSize: pageSize,
};
this.uniqueId = ++instanceId;
}
static propTypes = {
/**
* The description for the backward icon.
*/
backwardText: PropTypes.string,
/**
* The CSS class names.
*/
className: PropTypes.string,
/**
* `true` if the backward/forward buttons, as well as the page select elements, should be disabled.
*/
disabled: PropTypes.bool,
/**
* The description for the forward icon.
*/
forwardText: PropTypes.string,
/**
* The unique ID of this component instance.
*/
id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
// TODO: remove when v9 is deprecated
/**
* `true` if the current page should be the last page.
*/
isLastPage: PropTypes.bool,
/**
* The function returning a translatable text showing where the current page is,
* in a manner of the range of items.
*/
itemRangeText: PropTypes.func,
/**
* A variant of `itemRangeText`, used if the total number of items is unknown.
*/
itemText: PropTypes.func,
/**
* The translatable text indicating the number of items per page.
*/
itemsPerPageText: PropTypes.string,
/**
* The callback function called when the current page changes.
*/
onChange: PropTypes.func,
/**
* The current page.
*/
page: PropTypes.number,
/**
* Deprecated; `true` if the select box to change the page should be disabled.
*/
pageInputDisabled: deprecate(
PropTypes.bool,
`The prop \`pageInputDisabled\` for Pagination has been deprecated, as the feature of \`pageInputDisabled\` has been combined with the general \`disabled\` prop.`
),
pageNumberText: PropTypes.string,
/**
* A function returning PII showing where the current page is.
*/
pageRangeText: PropTypes.func,
/**
* The number dictating how many items a page contains.
*/
pageSize: PropTypes.number,
/**
* The choices for `pageSize`.
*/
pageSizes: PropTypes.arrayOf(PropTypes.number).isRequired,
/**
* The translatable text showing the current page.
*/
pageText: PropTypes.func,
/**
* `true` if the total number of items is unknown.
*/
pagesUnknown: PropTypes.bool,
/**
* The total number of items.
*/
totalItems: PropTypes.number,
};
static defaultProps = {
backwardText: 'Previous page',
itemRangeText: (min, max, total) => `${min}–${max} of ${total} items`,
forwardText: 'Next page',
itemsPerPageText: 'Items per page:',
pageNumberText: 'Page Number',
pageRangeText: (current, total) => `of ${total} pages`,
disabled: false,
page: 1,
pagesUnknown: false,
isLastPage: false,
itemText: (min, max) => `${min}–${max} items`,
pageText: (page) => `page ${page}`,
};
static getDerivedStateFromProps({ pageSizes, page, pageSize }, state) {
const {
prevPageSizes,
prevPage,
prevPageSize,
page: currentPage,
pageSize: currentPageSize,
} = state;
const pageSizesChanged = !equals(pageSizes, prevPageSizes);
if (pageSizesChanged && !pageSizes.includes(pageSize)) {
pageSize = pageSizes[0];
}
const pageChanged = page !== prevPage;
const pageSizeChanged = pageSize !== prevPageSize;
return !pageSizesChanged && !pageChanged && !pageSizeChanged
? null
: {
page: (pageSizeChanged && 1) || (pageChanged && page) || currentPage,
pageSize: pageSizeChanged ? pageSize : currentPageSize,
prevPageSizes: pageSizes,
prevPage: page,
prevPageSize: pageSize,
};
}
handleSizeChange = (evt) => {
const pageSize = Number(evt.target.value);
this.setState({ pageSize, page: 1 });
this.props.onChange({ page: 1, pageSize });
);
counter++;
}
return itemArr;
};
render() {
const {
backward…5349 chars truncated…(SelectItem);
expect(select.length).toBe(1);
expect(items.length).toBe(2);
expect(items.at(0).props().value).toBe(5);
expect(items.at(1).props().value).toBe(10);
});
it('should label the dropdown', () => {
const label = left.find(`.${prefix}--pagination__text`).first();
expect(label.text()).toBe('Items per page:');
});
it('should show the item range out of the total', () => {
const label = left.find(`.${prefix}--pagination__text`).at(1);
expect(label.text()).toBe('1–5 of 50 items');
});
describe('pagination size container when total pages unknown', () => {
const pager = mount(
<Pagination pageSizes={[5, 10]} pagesUnknown={true} />
);
const left = pager.find(`.${prefix}--pagination__left`);
it('should render a left container', () => {
expect(left.length).toBe(1);
});
it('should have a size dropdown', () => {
const select = left.find(Select);
const items = select.find(SelectItem);
expect(select.length).toBe(1);
expect(items.length).toBe(2);
expect(items.at(0).props().value).toBe(5);
expect(items.at(1).props().value).toBe(10);
});
it('should label the dropdown', () => {
const label = left.find(`.${prefix}--pagination__text`).first();
expect(label.text()).toBe('Items per page:');
});
it('should show the item range without the total', () => {
const label = left.find(`.${prefix}--pagination__text`).at(1);
expect(label.text()).toBe('1–5 items');
});
});
describe('pagination sizing', () => {
it('should respond to page size changes', () => {
let actualPageSize;
const handler = ({ pageSize }) => {
actualPageSize = pageSize;
};
const pager = mount(
<Pagination
pageSizes={[5, 10]}
totalItems={50}
onChange={handler}
/>
);
expect(pager.state().pageSize).toBe(5);
pager
.find('select')
.first()
.simulate('change', { target: { value: 10 } });
expect(actualPageSize).toBe(10);
expect(pager.state().pageSize).toBe(10);
// Text updates after change
const labels = pager.find(`.${prefix}--pagination__text`);
expect(labels.at(1).text()).toBe('1–10 of 50 items');
expect(labels.at(2).text()).toBe('of 5 pages');
});
it('should reset the page when page size changes', () => {
let actualPage;
const handler = ({ page }) => {
actualPage = page;
};
const pager = mount(
<Pagination
pageSizes={[5, 10]}
totalItems={50}
onChange={handler}
/>
);
pager.setState({ page: 2 });
expect(pager.state().page).toBe(2);
pager
.find('select')
.first()
.simulate('change', { target: { value: 10 } });
expect(actualPage).toBe(1);
it('should avoid defaulting to pageSize unless actual change in pageSize is detected', () => {
const pager = mount(
<Pagination pageSizes={[5, 10]} pageSize={10} totalItems={50} />
);
pager.setState({ pageSize: 20 });
pager.setProps({ pageSize: 10 });
expect(pager.state().pageSize).toEqual(20);
});
});
});
describe('pagination paging container', () => {
const right = pagination.find(`.${prefix}--pagination__right`);
it('should render a right container', () => {
expect(right.length).toBe(1);
});
it('should show the current page out of the total number of pages', () => {
const label = right.find(`.${prefix}--pagination__text`).first();
expect(label.text()).toBe('of 10 pages');
});
it('should render ranges and pages for no items', () => {
const pager = mount(<Pagination pageSizes={[5, 10]} totalItems={0} />);
const labels = pager.find(`.${prefix}--pagination__text`);
expect(labels.at(1).text()).toBe('0–0 of 0 items');
expect(labels.at(2).text()).toBe('of 1 pages');
});
it('should have two buttons for navigation', () => {
const buttons = right
.find(`.${prefix}--pagination__button`)
.hostNodes();
expect(buttons.length).toBe(2);
expect(
buttons.at(0).hasClass(`${prefix}--pagination__button--backward`)
).toBe(true);
expect(
buttons.at(1).hasClass(`${prefix}--pagination__button--forward`)
).toBe(true);
});
it('should disable backward navigation for the first page', () => {
const buttons = right
.find(`.${prefix}--pagination__button`)sed -n '245,390p' packages/react/src/components/Pagination/Pagination.js && sed -n '1,75p' packages/react/src/components/Pagination/Pagination-test.js && cat package.json | sed -n '1,100p' && rg -n "itemRangeText|pageRangeText|itemText" packages/react/src/components/Paginationoutput · 250 lines
Chunk ID: c196a5
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 3119
Output:
Warning: truncated output (original token count: 3119)
Total output lines: 312
onChange, // eslint-disable-line no-unused-vars
page: pageNumber, // eslint-disable-line no-unused-vars
...other
} = this.props;
const classNames = classnames(`${prefix}--pagination`, className);
const inputId = id || this.uniqueId;
const { page: statePage, pageSize: statePageSize } = this.state;
const totalPages = Math.max(Math.ceil(totalItems / statePageSize), 1);
const backButtonDisabled = disabled || statePage === 1;
const backButtonClasses = classnames(
`${prefix}--pagination__button`,
`${prefix}--pagination__button--backward`,
{
[`${prefix}--pagination__button--no-index`]: backButtonDisabled,
}
);
const forwardButtonDisabled = disabled || statePage === totalPages;
const forwardButtonClasses = classnames(
`${prefix}--pagination__button`,
`${prefix}--pagination__button--forward`,
{
[`${prefix}--pagination__button--no-index`]: forwardButtonDisabled,
}
);
const selectItems = this.renderSelectItems(totalPages);
return (
<div className={classNames} {...other}>
<div className={`${prefix}--pagination__left`}>
<label
id={`${prefix}-pagination-select-${inputId}-count-label`}
className={`${prefix}--pagination__text`}
htmlFor={`${prefix}-pagination-select-${inputId}`}>
{itemsPerPageText}
</label>
<Select
id={`${prefix}-pagination-select-${inputId}`}
className={`${prefix}--select__item-count`}
labelText=""
hideLabel
noLabel
inline
onChange={this.handleSizeChange}
disabled={pageInputDisabled || disabled}
value={statePageSize}>
{pageSizes.map((size) => (
<SelectItem key={size} value={size} text={String(size)} />
))}
</Select>
<span
className={`${prefix}--pagination__text ${prefix}--pagination__items-count`}>
{pagesUnknown
? itemText(
statePageSize * (statePage - 1) + 1,
statePage * statePageSize
)
: itemRangeText(
Math.min(statePageSize * (statePage - 1) + 1, totalItems),
Math.min(statePage * statePageSize, totalItems),
totalItems
)}
</span>
</div>
<div className={`${prefix}--pagination__right`}>
<Select
id={`${prefix}-pagination-select-${inputId}-right`}
className={`${prefix}--select__page-number`}
labelText={`Page number, of ${totalPages} pages`}
inline
hideLabel
onChange={this.handlePageInputChange}
value={statePage}
disabled={pageInputDisabled || disabled}>
{selectItems}
</Select>
<span className={`${prefix}--pagination__text`}>
{pagesUnknown
? pageText(statePage)
: pageRangeText(statePage, totalPages)}
</span>
<div className={`${prefix}--pagination__control-buttons`}>
<Button
kind="ghost"
className={backButtonClasses}
hasIconOnly
renderIcon={CaretLeft16}
iconDescription={backwardText}
tooltipAlignment="center"
tooltipPosition="top"
onClick={this.decrementPage}
disabled={backButtonDisabled}
/>
<Button
kind="ghost"
className={forwardButtonClasses}
hasIconOnly
renderIcon={CaretRight16}
iconDescription={forwardText}
tooltipAlignment="end"
tooltipPosition="top"
onClick={this.incrementPage}
disabled={forwardButtonDisabled || isLastPage}
/>
</div>
</div>
</div>
);
}
}
/**
* Copyright IBM Corp. 2016, 2018
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/
import React from 'react';
import { CaretRight16, CaretLeft16 } from '@carbon/icons-react';
import Pagination from '../Pagination';
import Select from '../Select';
import SelectItem from '../SelectItem';
import { shallow, mount } from 'enzyme';
import { settings } from 'carbon-components';
const { prefix } = settings;
jest.useFakeTimers();
describe('Pagination', () => {
describe('renders as expected', () => {
const pagination = mount(
<Pagination className="extra-class" pageSizes={[5, 10]} totalItems={50} />
);
describe('icons', () => {
const iconTypes = [CaretLeft16, CaretRight16];
const icons = pagination.findWhere((n) => iconTypes.includes(n.type()));
it('should have 2 icons', () => {
expect(icons.length).toEqual(2);
});…2473 chars truncated… "sync": "carbon-cli sync",
"test": "cross-env BABEL_ENV=test jest",
"test:e2e": "cross-env BABEL_ENV=test jest --testPathPattern=e2e --testPathIgnorePatterns='examples,/packages/components/,/packages/react/'"
},
"resolutions": {
"react": "~16.9.0",
"react-dom": "~16.9.0",
"react-is": "~16.9.0",
"react-test-renderer": "~16.9.0"
},
"devDependencies": {
"@babel/core": "^7.10.0",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-export-default-from": "^7.7.4",
"@babel/plugin-proposal-export-namespace-from": "^7.7.4",
"@babel/plugin-transform-runtime": "^7.10.0",
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@babel/runtime": "^7.10.0",
"@commitlint/cli": "^8.3.5",
"@commitlint/config-conventional": "^8.3.4",
"@ibma/aat": "https://able.ibm.com/tools/dist/ibma-aat-2.0.6.tgz",
"axe-core": "^3.3.2",
"babel-jest": "^26.0.1",
"cross-env": "^5.2.0",
"cross-spawn": "^6.0.5",
"doctoc": "^1.4.0",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.14.0",
"enzyme-to-json": "^3.3.5",
"eslint": "^6.8.0",
"fs-extra": "^8.1.0",
"glob": "^7.1.4",
"husky": "^4.0.10",
"jest": "^26.0.1",
"jest-circus": "^26.0.1",
"jest-junit": "^10.0.0",
"lerna": "^3.20.2",
"lint-staged": "^9.5.0",
"prettier": "^2.0.5",
"prettier-config-carbon": "^0.2.0",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"rimraf": "^3.0.0",
"stylelint": "^13.6.0"
},
"husky": {
"hooks": {
"commit-msg": "commitlint -e $HUSKY_GIT_PARAMS",
"pre-commit": "lint-staged"
}
},
"commitlint": {
"extends": [
"@commitlint/config-conventional"
],
"rules": {
"header-max-length": [
2,
"always",
72
],
"body-max-line-length": [
2,
"always",
80
],
"scope-case": [
0,
"always",
"lower-case"
],
"type-enum": [
packages/react/src/components/Pagination/experimental/Pagination.js:28: itemRangeText,
packages/react/src/components/Pagination/experimental/Pagination.js:29: itemText,
packages/react/src/components/Pagination/experimental/Pagination.js:30: pageRangeText,
packages/react/src/components/Pagination/experimental/Pagination.js:85: itemRangeText(
packages/react/src/components/Pagination/experimental/Pagination.js:93: itemText(
packages/react/src/components/Pagination/experimental/Pagination.js:99: itemText(
packages/react/src/components/Pagination/experimental/Pagination.js:117: {pageRangeText('', totalPages)}
packages/react/src/components/Pagination/experimental/Pagination.js:129: : pageRangeText(currentPage, totalPages)}
packages/react/src/components/Pagination/experimental/Pagination.js:207: itemRangeText: PropTypes.func,
packages/react/src/components/Pagination/experimental/Pagination.js:210: * A variant of `itemRangeText`, used if the total number of items is unknown.
packages/react/src/components/Pagination/experimental/Pagination.js:212: itemText: PropTypes.func,
packages/react/src/components/Pagination/experimental/Pagination.js:223: pageRangeText: PropTypes.func,
packages/react/src/components/Pagination/experimental/Pagination.js:262: itemRangeText: (min, max, total) => `${min}–${max} of ${total} items`,
packages/react/src/components/Pagination/experimental/Pagination.js:263: itemText: (min, max) => `${min}–${max} items`,
packages/react/src/components/Pagination/experimental/Pagination.js:265: pageRangeText: (current, total) => `${current} of ${total} pages`,
packages/react/src/components/Pagination/Pagination.js:74: itemRangeText: PropTypes.func,
packages/react/src/components/Pagination/Pagination.js:77: * A variant of `itemRangeText`, used if the total number of items is unknown.
packages/react/src/components/Pagination/Pagination.js:79: itemText: PropTypes.func,
packages/react/src/components/Pagination/Pagination.js:109: pageRangeText: PropTypes.func,
packages/react/src/components/Pagination/Pagination.js:139: itemRangeText: (min, max, total) => `${min}–${max} of ${total} items`,
packages/react/src/components/Pagination/Pagination.js:143: pageRangeText: (current, total) => `of ${total} pages`,
packages/react/src/components/Pagination/Pagination.js:148: itemText: (min, max) => `${min}–${max} items`,
packages/react/src/components/Pagination/Pagination.js:233: itemRangeText,
packages/react/src/components/Pagination/Pagination.js:234: pageRangeText,
packages/react/src/components/Pagination/Pagination.js:237: itemText,
packages/react/src/components/Pagination/Pagination.js:297: ? itemText(
packages/react/src/components/Pagination/Pagination.js:301: : itemRangeText(
packages/react/src/components/Pagination/Pagination.js:323: : pageRangeText(statePage, totalPages)}I'm thinking about the request to use singular nouns when max is 1 or totalPages is 1. I need to clarify the max callback parameter in itemRangeText/itemText. They might want callbacks to default to plural. The current setup defaults to the last item as max. If max is 1, then it should show singular. I must also review lines related to itemText and pageRangeText, as current line numbers have shifted.Analyzing item text conditions
I'm figuring out how itemText computes using max from statePage and statePageSize. If there's only one item, but I can't see it due to an unknown total, the default max is 5 at page one, so I can't use singular. However, the condition states max === 1, which seems important. It looks like I need to ensure that if there's only one item or page, the labels adjust accordingly. I want to clarify the callbacks for itemRangeText and itemText too, especially in relation to visibility.Reviewing item text formatting
I'm realizing the requirement for max === 1 likely affects the default callback for itemText. It seems that itemRangeText currently falls short by only rendering "items" without custom nouns. Shouldn't it adjust to be singular when max === 1? Also, with an unknown total, max is only 1 if the page size is one, but that might not really matter. I see that the current design uses itemText with an unknown total based on a min/max window.
Evaluating test strategies
I'm considering creating a test for callbacks with itemText. Maybe it's not necessary if I can preserve the singular unknown path. I think I should test the default itemText with max===1 by rendering Pagination with pagesUnknown as true and pageSizes set to {[1]}. I wonder if it's a valid expectation to see unknown page labels like 1–1 item. The requirement specifies this for when max equals 1, so I might need to create focused tests for that case, along with existing tests for known item ranges.
I’ll update all default item-label callbacks and singular page text, with regression coverage.
apply_patch <<'PATCH'
*** Begin Patch
*** Update File: packages/react/src/components/Pagination/Pagination.js
@@
- itemRangeText: (min, max, total) => `${min}–${max} of ${total} items`,
+ itemRangeText: (min, max, total) =>
+ `${min}–${max} of ${total} ${max === 1 ? 'item' : 'items'}`,
@@
- pageRangeText: (current, total) => `of ${total} pages`,
+ pageRangeText: (current, total) =>
+ `of ${total} ${total === 1 ? 'page' : 'pages'}`,
@@
- itemText: (min, max) => `${min}–${max} items`,
+ itemText: (min, max) => `${min}–${max} ${max === 1 ? 'item' : 'items'}`,
*** Update File: packages/react/src/components/Pagination/Pagination-test.js
@@
it('should show the item range out of the total', () => {
const label = left.find(`.${prefix}--pagination__text`).at(1);
expect(label.text()).toBe('1–5 of 50 items');
});
+
+ it('should use singular nouns for a single item and page', () => {
+ const pager = mount(<Pagination pageSizes={[5, 10]} totalItems={1} />);
+ const labels = pager.find(`.${prefix}--pagination__text`);
+ expect(labels.at(1).text()).toBe('1–1 of 1 item');
+ expect(labels.at(2).text()).toBe('of 1 page');
+ });
@@
it('should show the item range without the total', () => {
const label = left.find(`.${prefix}--pagination__text`).at(1);
expect(label.text()).toBe('1–5 items');
});
+
+ it('should use the singular item label when the range ends at one', () => {
+ const pager = mount(<Pagination pageSizes={[1]} pagesUnknown={true} />);
+ const label = pager
+ .find(`.${prefix}--pagination__left .${prefix}--pagination__text`)
+ .at(1);
+ expect(label.text()).toBe('1–1 item');
+ });
@@
- expect(labels.at(2).text()).toBe('of 1 pages');
+ expect(labels.at(2).text()).toBe('of 1 page');
*** End Patch
PATCHoutput · 9 lines
Wall time: 0.0000 seconds
Output:
Exit code: 0
Wall time: 0 seconds
Output:
Success. Updated the following files:
M packages/react/src/components/Pagination/Pagination.js
M packages/react/src/components/Pagination/Pagination-test.jsThe defaults and tests now cover known and unknown item counts; I’m running the focused suite.
npm test -- --runInBand packages/react/src/components/Pagination/Pagination-test.jsoutput · 10 lines
Chunk ID: b0fe16
Wall time: 1.0010 seconds
Process running with session ID 25796
Original token count: 35
Output:
> carbon@0.0.0 test /testbed
> cross-env BABEL_ENV=test jest "--runInBand" "packages/react/src/components/Pagination/Pagination-test.js"output · 65 lines
Chunk ID: c67941
Wall time: 4.9986 seconds
Process exited with code 0
Original token count: 855
Output:
Browserslist: caniuse-lite is outdated. Please run:
npx browserslist@latest --update-db
PASS packages/react/src/components/Pagination/Pagination-test.js (7.495 s)
Pagination
renders as expected
icons
✓ should have 2 icons (1 ms)
pagination container
✓ should render the expected classes
pagination size container
✓ should render a left container
✓ should have a size dropdown (8 ms)
✓ should label the dropdown (1 ms)
✓ should show the item range out of the total (1 ms)
✓ should use singular nouns for a single item and page (6 ms)
pagination size container when total pages unknown
✓ should render a left container
✓ should have a size dropdown (4 ms)
✓ should label the dropdown (1 ms)
✓ should show the item range without the total
✓ should use the singular item label when the range ends at one (6 ms)
pagination sizing
✓ should respond to page size changes (10 ms)
✓ should reset the page when page size changes (12 ms)
✓ should return to first page on changes to pageSizes (12 ms)
✓ should not return to first page on changes to pageSizes where current pageSize is in new list (9 ms)
✓ should return to first page on changes to pageSizes where current pageSize is not in new list (7 ms)
✓ should avoid returning to first page unless actual change in pageSizes is detected (8 ms)
✓ should default to pageSize if pageSize is provided (5 ms)
✓ should default to pageSize if on change to pageSize (7 ms)
✓ should avoid defaulting to pageSize unless actual change in pageSize is detected (6 ms)
pagination paging container
✓ should render a right container
✓ should show the current page out of the total number of pages
✓ should render ranges and pages for no items (4 ms)
✓ should have two buttons for navigation (1 ms)
✓ should disable backward navigation for the first page
✓ should disable forward navigation for the last page (2 ms)
pagination paging container when total pages unknown
✓ should render a right container
✓ should show the current page without the total number of pages
✓ should have two buttons for navigation (1 ms)
✓ should disable backward navigation for the first page
✓ should disable forward navigation for the last page (1 ms)
✓ should hide text input if disabled (2 ms)
✓ should append `pagination__button--no-index` class if input is disabled (1 ms)
pagination navigation
✓ should go to the next page when clicking forward (7 ms)
✓ should go to the previous page when clicking backward (9 ms)
✓ should jump to the page entered in the input field (9 ms)
✓ should jump to page number if prop page is provided (8 ms)
✓ should avoid jumping to page number unless actual change in prop page is detected (9 ms)
✓ should not increment page if there is only 1 page (4 ms)
Test Suites: 1 passed, 1 total
Tests: 40 passed, 40 total
Snapshots: 0 total
Time: 7.78 s
Ran all test suites matching /packages\/react\/src\/components\/Pagination\/Pagination-test.js/i.I need to examine the differences and current status. I'm wondering if the ARIA text is a concern here. The user has asked about the footer being visible as a singular element. I think updating the defaults might be enough, but existing tests focus on just one item. So, it's clear that I should review the differences to ensure everything aligns with the user's expectations! I'll make sure to keep everything clear and accurate.
The focused Pagination suite passes; I’m reviewing the diff for scope and formatting.
git diff --check && git diff -- packages/react/src/components/Pagination/Pagination.js packages/react/src/components/Pagination/Pagination-test.js && git status --shortoutput · 77 lines
Chunk ID: 4feba7
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 823
Output:
diff --git a/packages/react/src/components/Pagination/Pagination-test.js b/packages/react/src/components/Pagination/Pagination-test.js
index 6748c72..0cb11dd 100644
--- a/packages/react/src/components/Pagination/Pagination-test.js
+++ b/packages/react/src/components/Pagination/Pagination-test.js
@@ -67,6 +67,13 @@ describe('Pagination', () => {
expect(label.text()).toBe('1–5 of 50 items');
});
+ it('should use singular nouns for a single item and page', () => {
+ const pager = mount(<Pagination pageSizes={[5, 10]} totalItems={1} />);
+ const labels = pager.find(`.${prefix}--pagination__text`);
+ expect(labels.at(1).text()).toBe('1–1 of 1 item');
+ expect(labels.at(2).text()).toBe('of 1 page');
+ });
+
describe('pagination size container when total pages unknown', () => {
const pager = mount(
<Pagination pageSizes={[5, 10]} pagesUnknown={true} />
@@ -95,6 +102,14 @@ describe('Pagination', () => {
const label = left.find(`.${prefix}--pagination__text`).at(1);
expect(label.text()).toBe('1–5 items');
});
+
+ it('should use the singular item label when the range ends at one', () => {
+ const pager = mount(<Pagination pageSizes={[1]} pagesUnknown={true} />);
+ const label = pager
+ .find(`.${prefix}--pagination__left .${prefix}--pagination__text`)
+ .at(1);
+ expect(label.text()).toBe('1–1 item');
+ });
});
describe('pagination sizing', () => {
@@ -224,7 +239,7 @@ describe('Pagination', () => {
const pager = mount(<Pagination pageSizes={[5, 10]} totalItems={0} />);
const labels = pager.find(`.${prefix}--pagination__text`);
expect(labels.at(1).text()).toBe('0–0 of 0 items');
- expect(labels.at(2).text()).toBe('of 1 pages');
+ expect(labels.at(2).text()).toBe('of 1 page');
});
it('should have two buttons for navigation', () => {
diff --git a/packages/react/src/components/Pagination/Pagination.js b/packages/react/src/components/Pagination/Pagination.js
index 2cc859b..3637a0b 100644
--- a/packages/react/src/components/Pagination/Pagination.js
+++ b/packages/react/src/components/Pagination/Pagination.js
@@ -136,16 +136,18 @@ export default class Pagination extends Component {
static defaultProps = {
backwardText: 'Previous page',
- itemRangeText: (min, max, total) => `${min}–${max} of ${total} items`,
+ itemRangeText: (min, max, total) =>
+ `${min}–${max} of ${total} ${max === 1 ? 'item' : 'items'}`,
forwardText: 'Next page',
itemsPerPageText: 'Items per page:',
pageNumberText: 'Page Number',
- pageRangeText: (current, total) => `of ${total} pages`,
+ pageRangeText: (current, total) =>
+ `of ${total} ${total === 1 ? 'page' : 'pages'}`,
disabled: false,
page: 1,
pagesUnknown: false,
isLastPage: false,
- itemText: (min, max) => `${min}–${max} items`,
+ itemText: (min, max) => `${min}–${max} ${max === 1 ? 'item' : 'items'}`,
pageText: (page) => `page ${page}`,
};
M packages/react/src/components/Pagination/Pagination-test.js
M packages/react/src/components/Pagination/Pagination.js
?? .achecker.ymlI’m noticing that the Select label text is yielding NaN pages, which seems irrelevant since there’s likely no total items present. It makes me wonder if the prop for totalItems is missing by default. If pagesUnknown is true, then totalPages being NaN is odd. Updating aria as singular doesn’t seem to affect things, though maybe I should adjust it when totalPages equals 1, as it feels connected and logical.
One related accessibility label still says “pages”; I’m aligning it with the visible footer.
apply_patch <<'PATCH'
*** Begin Patch
*** Update File: packages/react/src/components/Pagination/Pagination.js
@@
- labelText={`Page number, of ${totalPages} pages`}
+ labelText={`Page number, of ${totalPages} ${
+ totalPages === 1 ? 'page' : 'pages'
+ }`}
*** Update File: packages/react/src/components/Pagination/Pagination-test.js
@@
const labels = pager.find(`.${prefix}--pagination__text`);
expect(labels.at(1).text()).toBe('1–1 of 1 item');
expect(labels.at(2).text()).toBe('of 1 page');
+ expect(pager.find(Select).at(1).prop('labelText')).toBe(
+ 'Page number, of 1 page'
+ );
});
*** End Patch
PATCH
npm test -- --runInBand packages/react/src/components/Pagination/Pagination-test.js && git diff --checkoutput · 11 lines
Chunk ID: b312a5
Wall time: 1.0008 seconds
Process running with session ID 24191
Original token count: 48
Output:
/bin/bash: line 1: apply_patch: command not found
> carbon@0.0.0 test /testbed
> cross-env BABEL_ENV=test jest "--runInBand" "packages/react/src/components/Pagination/Pagination-test.js"I'm looking at this apply_patch <<'PATCH', but I’m seeing a “not found” error in the shell output, which is a bit strange. Maybe it’s being interpreted first through some built-in exec wrapper? But now it’s not behaving that way. I need to check the test status and see what went wrong. It looks like a test is underway after an unsuccessful patch attempt, so let’s see where that leads me.
output · 63 lines
Chunk ID: bba470
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 834
Output:
PASS packages/react/src/components/Pagination/Pagination-test.js
Pagination
renders as expected
icons
✓ should have 2 icons (1 ms)
pagination container
✓ should render the expected classes (1 ms)
pagination size container
✓ should render a left container
✓ should have a size dropdown (8 ms)
✓ should label the dropdown
✓ should show the item range out of the total (1 ms)
✓ should use singular nouns for a single item and page (8 ms)
pagination size container when total pages unknown
✓ should render a left container
✓ should have a size dropdown (4 ms)
✓ should label the dropdown (1 ms)
✓ should show the item range without the total
✓ should use the singular item label when the range ends at one (6 ms)
pagination sizing
✓ should respond to page size changes (11 ms)
✓ should reset the page when page size changes (10 ms)
✓ should return to first page on changes to pageSizes (11 ms)
✓ should not return to first page on changes to pageSizes where current pageSize is in new list (9 ms)
✓ should return to first page on changes to pageSizes where current pageSize is not in new list (9 ms)
✓ should avoid returning to first page unless actual change in pageSizes is detected (7 ms)
✓ should default to pageSize if pageSize is provided (5 ms)
✓ should default to pageSize if on change to pageSize (6 ms)
✓ should avoid defaulting to pageSize unless actual change in pageSize is detected (7 ms)
pagination paging container
✓ should render a right container
✓ should show the current page out of the total number of pages (1 ms)
✓ should render ranges and pages for no items (4 ms)
✓ should have two buttons for navigation
✓ should disable backward navigation for the first page (2 ms)
✓ should disable forward navigation for the last page (2 ms)
pagination paging container when total pages unknown
✓ should render a right container
✓ should show the current page without the total number of pages
✓ should have two buttons for navigation (1 ms)
✓ should disable backward navigation for the first page
✓ should disable forward navigation for the last page (1 ms)
✓ should hide text input if disabled
✓ should append `pagination__button--no-index` class if input is disabled (3 ms)
pagination navigation
✓ should go to the next page when clicking forward (9 ms)
✓ should go to the previous page when clicking backward (8 ms)
✓ should jump to the page entered in the input field (7 ms)
✓ should jump to page number if prop page is provided (7 ms)
✓ should avoid jumping to page number unless actual change in prop page is detected (8 ms)
✓ should not increment page if there is only 1 page (5 ms)
Test Suites: 1 passed, 1 total
Tests: 40 passed, 40 total
Snapshots: 0 total
Time: 1.073 s, estimated 8 s
Ran all test suites matching /packages\/react\/src\/components\/Pagination\/Pagination-test.js/i.The initial patch helper isn’t available in this shell; I’m checking its path before continuing.
type apply_patch || true; printf '%s\n' "$PATH"; git diff --checkoutput · 8 lines
Chunk ID: 8b60e1
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 119
Output:
/bin/bash: line 1: type: apply_patch: not found
/var/tmp/vf-codex-0.155.1-1.12.0/acp/node_modules/@agentclientprotocol/codex-acp/node_modules/@openai/codex-linux-x64/vendor/x86_64-unknown-linux-musl/codex-path:/var/tmp/vf-codex-0.155.1-1.12.0/acp/node_modules/@agentclientprotocol/codex-acp/node_modules/@openai/codex-linux-x64/vendor/x86_64-unknown-linux-musl/codex-path:/usr/local/nvm/versions/node/v12.22.12/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/binI can consider using git apply if apply_patch isn't accessible, but I need to stick to using apply_patch, as other commands aren't recommended. I might check the standard utility path for apply_patch, possibly in /tmp. Even though this might require some searching, since the first command was successful, it’s puzzling why this isn't working now. Still, no need to worry too much—my aim is to ensure the user's accessibility label is aligned as promised.Considering patch application options
Since apply_patch isn't available, I might think about using git apply, but the developer clearly instructed to use apply_patch. It seems like I need to stick to that instruction without trying alternative methods like applypatch or apply-patch. Creating a shell function for apply_patch could work, but I wonder if that's necessary. I could consider using node to update files, but that might not align with the guidelines I'm following. So, staying focused on apply_patch seems best.
Locating apply_patch
I'm trying to locate the apply_patch in targeted directories like /tmp, /usr/local, /root, and /var/tmp. I might use commands like rg --files /var/tmp/vf.. to find the exact current codex vendor. Checking the PATH element could help, possibly including apply_patch. Or I could use find / -type f -name apply_patch, which could take about 2 seconds. I’ll also consider combining searches to ensure I'm not missing anything crucial.
find / -type f -name apply_patch 2>/dev/null | head -20output · 6 lines
Chunk ID: d0b986
Wall time: 0.2702 seconds
Process exited with code 0
Original token count: 0
Output:apply_patch <<'PATCH'
*** Begin Patch
*** Update File: packages/react/src/components/Pagination/Pagination.js
@@
- labelText={`Page number, of ${totalPages} pages`}
+ labelText={`Page number, of ${totalPages} ${
+ totalPages === 1 ? 'page' : 'pages'
+ }`}
*** Update File: packages/react/src/components/Pagination/Pagination-test.js
@@
const labels = pager.find(`.${prefix}--pagination__text`);
expect(labels.at(1).text()).toBe('1–1 of 1 item');
expect(labels.at(2).text()).toBe('of 1 page');
+ expect(pager.find(Select).at(1).prop('labelText')).toBe(
+ 'Page number, of 1 page'
+ );
});
*** End Patch
PATCHoutput · 9 lines
Wall time: 0.0000 seconds
Output:
Exit code: 0
Wall time: 0 seconds
Output:
Success. Updated the following files:
M packages/react/src/components/Pagination/Pagination.js
M packages/react/src/components/Pagination/Pagination-test.jsThe label and assertion are now aligned; I’m rerunning tests and the whitespace check.
npm test -- --runInBand packages/react/src/components/Pagination/Pagination-test.js && git diff --check && git status --shortoutput · 10 lines
Chunk ID: 8e69a2
Wall time: 1.0013 seconds
Process running with session ID 96085
Original token count: 35
Output:
> carbon@0.0.0 test /testbed
> cross-env BABEL_ENV=test jest "--runInBand" "packages/react/src/components/Pagination/Pagination-test.js"output · 68 lines
Chunk ID: 807522
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 887
Output:
Browserslist: caniuse-lite is outdated. Please run:
npx browserslist@latest --update-db
PASS packages/react/src/components/Pagination/Pagination-test.js
Pagination
renders as expected
icons
✓ should have 2 icons (2 ms)
pagination container
✓ should render the expected classes
pagination size container
✓ should render a left container
✓ should have a size dropdown (8 ms)
✓ should label the dropdown (1 ms)
✓ should show the item range out of the total
✓ should use singular nouns for a single item and page (8 ms)
pagination size container when total pages unknown
✓ should render a left container
✓ should have a size dropdown (6 ms)
✓ should label the dropdown
✓ should show the item range without the total (1 ms)
✓ should use the singular item label when the range ends at one (8 ms)
pagination sizing
✓ should respond to page size changes (10 ms)
✓ should reset the page when page size changes (10 ms)
✓ should return to first page on changes to pageSizes (11 ms)
✓ should not return to first page on changes to pageSizes where current pageSize is in new list (10 ms)
✓ should return to first page on changes to pageSizes where current pageSize is not in new list (8 ms)
✓ should avoid returning to first page unless actual change in pageSizes is detected (7 ms)
✓ should default to pageSize if pageSize is provided (5 ms)
✓ should default to pageSize if on change to pageSize (6 ms)
✓ should avoid defaulting to pageSize unless actual change in pageSize is detected (7 ms)
pagination paging container
✓ should render a right container (1 ms)
✓ should show the current page out of the total number of pages
✓ should render ranges and pages for no items (4 ms)
✓ should have two buttons for navigation
✓ should disable backward navigation for the first page (1 ms)
✓ should disable forward navigation for the last page (1 ms)
pagination paging container when total pages unknown
✓ should render a right container
✓ should show the current page without the total number of pages (1 ms)
✓ should have two buttons for navigation
✓ should disable backward navigation for the first page (1 ms)
✓ should disable forward navigation for the last page
✓ should hide text input if disabled (2 ms)
✓ should append `pagination__button--no-index` class if input is disabled (1 ms)
pagination navigation
✓ should go to the next page when clicking forward (12 ms)
✓ should go to the previous page when clicking backward (8 ms)
✓ should jump to the page entered in the input field (7 ms)
✓ should jump to page number if prop page is provided (7 ms)
✓ should avoid jumping to page number unless actual change in prop page is detected (9 ms)
✓ should not increment page if there is only 1 page (4 ms)
Test Suites: 1 passed, 1 total
Tests: 40 passed, 40 total
Snapshots: 0 total
Time: 1.364 s
Ran all test suites matching /packages\/react\/src\/components\/Pagination\/Pagination-test.js/i.
M packages/react/src/components/Pagination/Pagination-test.js
M packages/react/src/components/Pagination/Pagination.js
?? .achecker.ymlI need to create a final concise summary that includes file line references and mentions any untracked or untouched tests. It’s essential to get line numbers after making changes, possibly using the nl -ba command. I can infer specific line numbers like 139, 145, and 150, and label 310 while noting tests like 67 and 240. The plan is to accurately command nl -ba ... | sed, while also being cautious about making too many tool calls, maybe just one more for references or diff.
nl -ba packages/react/src/components/Pagination/Pagination.js | sed -n '134,156p;312,326p' && nl -ba packages/react/src/components/Pagination/Pagination-test.js | sed -n '64,116p;238,250p'output · 110 lines
Chunk ID: 2ea114
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1176
Output:
134 totalItems: PropTypes.number,
135 };
136
137 static defaultProps = {
138 backwardText: 'Previous page',
139 itemRangeText: (min, max, total) =>
140 `${min}–${max} of ${total} ${max === 1 ? 'item' : 'items'}`,
141 forwardText: 'Next page',
142 itemsPerPageText: 'Items per page:',
143 pageNumberText: 'Page Number',
144 pageRangeText: (current, total) =>
145 `of ${total} ${total === 1 ? 'page' : 'pages'}`,
146 disabled: false,
147 page: 1,
148 pagesUnknown: false,
149 isLastPage: false,
150 itemText: (min, max) => `${min}–${max} ${max === 1 ? 'item' : 'items'}`,
151 pageText: (page) => `page ${page}`,
152 };
153
154 static getDerivedStateFromProps({ pageSizes, page, pageSize }, state) {
155 const {
156 prevPageSizes,
312 id={`${prefix}-pagination-select-${inputId}-right`}
313 className={`${prefix}--select__page-number`}
314 labelText={`Page number, of ${totalPages} ${
315 totalPages === 1 ? 'page' : 'pages'
316 }`}
317 inline
318 hideLabel
319 onChange={this.handlePageInputChange}
320 value={statePage}
321 disabled={pageInputDisabled || disabled}>
322 {selectItems}
323 </Select>
324 <span className={`${prefix}--pagination__text`}>
325 {pagesUnknown
326 ? pageText(statePage)
64
65 it('should show the item range out of the total', () => {
66 const label = left.find(`.${prefix}--pagination__text`).at(1);
67 expect(label.text()).toBe('1–5 of 50 items');
68 });
69
70 it('should use singular nouns for a single item and page', () => {
71 const pager = mount(<Pagination pageSizes={[5, 10]} totalItems={1} />);
72 const labels = pager.find(`.${prefix}--pagination__text`);
73 expect(labels.at(1).text()).toBe('1–1 of 1 item');
74 expect(labels.at(2).text()).toBe('of 1 page');
75 expect(pager.find(Select).at(1).prop('labelText')).toBe(
76 'Page number, of 1 page'
77 );
78 });
79
80 describe('pagination size container when total pages unknown', () => {
81 const pager = mount(
82 <Pagination pageSizes={[5, 10]} pagesUnknown={true} />
83 );
84 const left = pager.find(`.${prefix}--pagination__left`);
85
86 it('should render a left container', () => {
87 expect(left.length).toBe(1);
88 });
89
90 it('should have a size dropdown', () => {
91 const select = left.find(Select);
92 const items = select.find(SelectItem);
93 expect(select.length).toBe(1);
94 expect(items.length).toBe(2);
95 expect(items.at(0).props().value).toBe(5);
96 expect(items.at(1).props().value).toBe(10);
97 });
98
99 it('should label the dropdown', () => {
100 const label = left.find(`.${prefix}--pagination__text`).first();
101 expect(label.text()).toBe('Items per page:');
102 });
103
104 it('should show the item range without the total', () => {
105 const label = left.find(`.${prefix}--pagination__text`).at(1);
106 expect(label.text()).toBe('1–5 items');
107 });
108
109 it('should use the singular item label when the range ends at one', () => {
110 const pager = mount(<Pagination pageSizes={[1]} pagesUnknown={true} />);
111 const label = pager
112 .find(`.${prefix}--pagination__left .${prefix}--pagination__text`)
113 .at(1);
114 expect(label.text()).toBe('1–1 item');
115 });
116 });
238 expect(label.text()).toBe('of 10 pages');
239 });
240
241 it('should render ranges and pages for no items', () => {
242 const pager = mount(<Pagination pageSizes={[5, 10]} totalItems={0} />);
243 const labels = pager.find(`.${prefix}--pagination__text`);
244 expect(labels.at(1).text()).toBe('0–0 of 0 items');
245 expect(labels.at(2).text()).toBe('of 1 page');
246 });
247
248 it('should have two buttons for navigation', () => {
249 const buttons = right
250 .find(`.${prefix}--pagination__button`)- Updated Pagination’s default item labels to use “item” when max === 1, and page labels to use “page” when there’s only one page, including the page selector’s accessible label. See packages/react/src/components/Pagination/Pagination.js:139.
- Added regression coverage for single-item labels and unknown item totals; updated the zero-items case to expect “1 page.” See packages/react/src/components/Pagination/Pagination-test.js:70.
- Validation passed: npm test -- --runInBand packages/react/src/components/Pagination/Pagination-test.js (40 tests) and git diff --check.
eslint-14242 · --max-warnings ignored together with --quiet · resolved · 10 model calls · 13 commands · 90 s
What the images show: Terminal: exit code 1 without --quiet, exit code 0 with it
What the text already says: "The exit code should be 1 when max-warnings is exceeded"
Using --max-warnings in combination with --quiet should error
**The version of ESLint you are using.**
v7.21.0
**The problem you want to solve.**
Using the `--max-warnings` cli option is useless in combination with `--quiet`.
I'm running this in
Note the following, first running without `--quiet`, then with.
**Your take on the correct solution to problem.**
Ideally: The `--quiet` flag should be overriden when the amount of warnings exceeds `max-warnings`, logging the warnings.
Also acceptable: The exit code should be 1 when `max-warnings` is exceeded.
**Are you willing to submit a pull request to implement this change?**
Not really 😇
You cannot see the images in this message; each was removed and only its position is marked.
[Image 1 of 1]I’ll inspect the CLI warning filtering and its tests, then make the smallest compatible fix.
pwd && rg --files -g 'AGENTS.md' -g 'package.json' -g '*eslint*' -g '*cli*' | head -100 && git status --shortoutput · 107 lines
Chunk ID: 524681
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1217
Output:
/testbed
tools/internal-rules/package.json
tools/eslint-fuzzer.js
tests/tools/eslint-fuzzer.js
tests/lib/eslint/eslint.js
tests/lib/cli.js
tests/lib/cli-engine/cli-engine.js
tests/fixtures/source-code-util/.eslintrc.json
tests/fixtures/source-code-util/.eslintignore
tests/fixtures/rules/eslint.json
tests/fixtures/rules/.eslintignore
tests/fixtures/plugins/node_modules/eslint-plugin-with-rules.js
tests/fixtures/plugins/node_modules/eslint-plugin-throws-on-load.js
tests/fixtures/plugins/node_modules/eslint-plugin-example2.js
tests/fixtures/plugins/node_modules/eslint-plugin-example1.js
tests/fixtures/plugins/node_modules/eslint-plugin-example.js
tests/fixtures/plugins/node_modules/@scope/eslint-plugin-example.js
tests/fixtures/plugin-shorthand/extends/.eslintrc.json
tests/fixtures/plugin-shorthand/basic/.eslintrc.json
tests/fixtures/packagejson/package.json
tests/fixtures/module-not-found/throw-in-plugins/.eslintrc.yml
tests/fixtures/module-not-found/throw-in-extends-plugin/.eslintrc.yml
tests/fixtures/module-not-found/throw-in-extends-js/.eslintrc.yml
tests/fixtures/module-not-found/throw-in-config-itself/.eslintrc.js
tests/fixtures/module-not-found/plugins/.eslintrc.yml
tests/fixtures/module-not-found/node_modules/eslint-plugin-throw.js
tests/fixtures/module-not-found/node_modules/eslint-config-throw.js
tests/fixtures/module-not-found/extends-plugin/.eslintrc.yml
tests/fixtures/module-not-found/extends-js/.eslintrc.yml
tests/fixtures/module-not-found/.eslintrc.yml
tests/fixtures/max-warnings/.eslintrc
tests/fixtures/lint-result-cache/.eslintrc.json
tests/fixtures/ignored-paths/subdir/.eslintignoreInChildDir
tests/fixtures/ignored-paths/package.json
tests/fixtures/ignored-paths/package-json-ignore/package.json
tests/fixtures/ignored-paths/crlf/.eslintignore
tests/fixtures/ignored-paths/broken-package-json/package.json
tests/fixtures/ignored-paths/bad-package-json-ignore/package.json
tests/fixtures/ignored-paths/.eslintignoreWithUnignoredDefaults
tests/fixtures/ignored-paths/.eslintignoreWithNegation
tests/fixtures/ignored-paths/.eslintignoreWithComments
tests/fixtures/ignored-paths/.eslintignoreForDifferentCwd
tests/fixtures/ignored-paths/.eslintignore
tests/fixtures/glob-util/unignored/.eslintignore
tests/fixtures/glob-util/ignored/.eslintignore
tests/fixtures/glob-util/.eslintignore
tests/fixtures/files/.eslintrc
tests/fixtures/files/.eslintignore
tests/fixtures/file-finder/.eslintignore
tests/fixtures/eslintrc/.eslintrc
tests/fixtures/eslintrc/.eslintignore
packages/eslint-config-eslint/package.json
package.json
tests/fixtures/configurations/single-quotes/subdir/.eslintrc
tests/fixtures/configurations/single-quotes/.eslintrc
tests/fixtures/configurations/parser/.eslintrc.json
tests/fixtures/cli-engine/overrides-with-dot/.eslintrc.yml
tests/fixtures/configurations/empty/.eslintrc
tests/fixtures/configurations/cwd/.eslintrc
tests/fixtures/cli-engine/nested_node_modules/.eslintignore
tests/fixtures/config-hierarchy/shared/b/.eslintrc
tests/fixtures/cli-engine/deprecated-rule-config/.eslintrc.yml
conf/eslint-recommended.js
conf/eslint-all.js
conf/default-cli-options.js
tests/fixtures/cli-engine/.eslintignore2
bin/eslint.js
tests/fixtures/config-hierarchy/shared/a/.eslintrc
.eslintrc.js
.eslintignore
.codeclimate.yml
lib/eslint/eslint.js
lib/cli.js
tests/fixtures/cli/.eslintignore_foo
lib/cli-engine/cli-engine.js
tests/fixtures/config-hierarchy/root-true/parent/root/subdir/.eslintrc
tests/fixtures/config-hierarchy/root-true/parent/root/.eslintrc
tests/fixtures/config-hierarchy/root-true/parent/.eslintrc
tests/fixtures/bin/.eslintrc.yml
tests/fixtures/config-hierarchy/plugins/node_modules/eslint-plugin-test.js
tests/fixtures/.eslintrc
tests/fixtures/config-hierarchy/plugins/node_modules/eslint-plugin-example.js
tests/fixtures/.eslintignore
tests/fixtures/config-hierarchy/plugins/node_modules/eslint-plugin-example-with-rules-config.js
tests/fixtures/config-hierarchy/plugins/node_modules/eslint-plugin-another-plugin.js
tests/fixtures/.eslintignore_twoGlobstar
tests/fixtures/.eslintignore2
tests/conf/eslint-recommended.js
tests/conf/eslint-all.js
tests/fixtures/config-hierarchy/personal-config/project-without-config/package.json
tests/bin/eslint.js
tests/fixtures/config-hierarchy/envs/sub/.eslintrc.json
tests/fixtures/config-hierarchy/envs/.eslintrc.json
tests/fixtures/config-hierarchy/personal-config/project-with-config/subfolder/.eslintrc
tests/fixtures/config-hierarchy/personal-config/project-with-config/package.json
tests/fixtures/config-hierarchy/personal-config/project-with-config/.eslintrc
tests/fixtures/config-hierarchy/broken/subbroken/subsubbroken/.eslintrc
tests/fixtures/config-hierarchy/broken/package.json
tests/fixtures/config-hierarchy/broken/subbroken/.eslintrc
tests/fixtures/config-hierarchy/broken/.eslintrc
tests/fixtures/config-hierarchy/broken/plugins2/.eslintrcI’m realizing I need to check for an agent's presence since it wasn’t found among the RG output. It looks like my command search didn’t return any results. I should inspect the package version using the CLI to figure out what might be going wrong. This could help me troubleshoot and see if there are any version-related issues. Overall, I’m trying to clarify the situation step by step!
rg -n "max-warnings|quiet" lib tests/lib tests/binoutput · 39 lines
Chunk ID: d3c46b
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 756
Output:
tests/bin/eslint.js:192: const expectedFixedTextQuiet = fs.readFileSync(`${fixturesPath}/left-pad-expected-quiet.js`).toString();
tests/bin/eslint.js:208: it("has exit code 0, fixes errors in a file, and does not report or fix warnings if --quiet and --fix are used", () => {
tests/bin/eslint.js:209: const child = runESLint(["--fix", "--quiet", "--no-eslintrc", "--no-ignore", tempFilePath]);
lib/cli.js:45: * Predicate function for whether or not to apply fixes in quiet mode.
lib/cli.js:51:function quietFixPredicate(message) {
lib/cli.js:82: quiet,
lib/cli.js:95: fix: (fix || fixDryRun) && (quiet ? quietFixPredicate : true),
lib/cli.js:304: if (options.quiet) {
lib/options.js:149: option: "quiet",
lib/options.js:155: option: "max-warnings",
tests/lib/options.js:286: describe("--quiet", () => {
tests/lib/options.js:287: it("should return true for .quiet when passed", () => {
tests/lib/options.js:288: const currentOptions = options.parse("--quiet");
tests/lib/options.js:290: assert.isTrue(currentOptions.quiet);
tests/lib/options.js:294: describe("--max-warnings", () => {
tests/lib/options.js:296: const currentOptions = options.parse("--max-warnings 10");
tests/lib/options.js:309: options.parse("--max-warnings 10.2");
tests/lib/options.js:310: }, /Invalid value for option 'max-warnings' - expected type Int/u);
tests/lib/cli.js:620: describe("when the quiet option is enabled", () => {
tests/lib/cli.js:624: const cliArgs = `--no-ignore --quiet -f compact --rule 'quotes: [2, double]' --rule 'no-unused-vars: 1' ${filePath}`;
tests/lib/cli.js:638: const cliArgs = `--quiet -f compact --rule 'quotes: [1, double]' --rule 'no-unused-vars: 1' ${filePath}`;
tests/lib/cli.js:764: describe("when given the max-warnings flag", () => {
tests/lib/cli.js:766: const filePath = getFixturePath("max-warnings");
tests/lib/cli.js:767: const exitCode = await cli.execute(`--no-ignore --max-warnings 10 ${filePath}`);
tests/lib/cli.js:773: const filePath = getFixturePath("max-warnings");
tests/lib/cli.js:774: const exitCode = await cli.execute(`--no-ignore --max-warnings 5 ${filePath}`);
tests/lib/cli.js:782: const filePath = getFixturePath("max-warnings");
tests/lib/cli.js:783: const exitCode = await cli.execute(`--no-ignore --max-warnings 6 ${filePath}`);
tests/lib/cli.js:789: const filePath = getFixturePath("max-warnings");
tests/lib/cli.js:918: it("should provide fix predicate and rewrite files when in fix mode and quiet mode", async () => {
tests/lib/cli.js:947: const exitCode = await localCLI.execute("--fix --quiet .");
tests/lib/cli.js:1057: it("should provide fix predicate when in fix-dry-run mode and quiet mode", async () => {
tests/lib/cli.js:1086: const exitCode = await localCLI.execute("--fix-dry-run --quiet .");cat package.json | head -100 && find .. -name AGENTS.md -printoutput · 107 lines
Chunk ID: 2843f3
Wall time: 0.6241 seconds
Process exited with code 1
Original token count: 738
Output:
{
"name": "eslint",
"version": "7.22.0",
"author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
"description": "An AST-based pattern checker for JavaScript.",
"bin": {
"eslint": "./bin/eslint.js"
},
"main": "./lib/api.js",
"scripts": {
"test": "node Makefile.js test",
"test:cli": "mocha",
"lint": "node Makefile.js lint",
"fix": "node Makefile.js lint -- fix",
"fuzz": "node Makefile.js fuzz",
"generate-release": "node Makefile.js generateRelease",
"generate-alpharelease": "node Makefile.js generatePrerelease -- alpha",
"generate-betarelease": "node Makefile.js generatePrerelease -- beta",
"generate-rcrelease": "node Makefile.js generatePrerelease -- rc",
"publish-release": "node Makefile.js publishRelease",
"docs": "node Makefile.js docs",
"gensite": "node Makefile.js gensite",
"webpack": "node Makefile.js webpack",
"perf": "node Makefile.js perf"
},
"gitHooks": {
"pre-commit": "lint-staged"
},
"lint-staged": {
"*.js": [
"eslint --fix",
"git add"
],
"*.md": "markdownlint"
},
"files": [
"LICENSE",
"README.md",
"bin",
"conf",
"lib",
"messages"
],
"repository": "eslint/eslint",
"funding": "https://opencollective.com/eslint",
"homepage": "https://eslint.org",
"bugs": "https://github.com/eslint/eslint/issues/",
"dependencies": {
"@babel/code-frame": "7.12.11",
"@eslint/eslintrc": "^0.4.0",
"ajv": "^6.10.0",
"chalk": "^4.0.0",
"cross-spawn": "^7.0.2",
"debug": "^4.0.1",
"doctrine": "^3.0.0",
"enquirer": "^2.3.5",
"eslint-scope": "^5.1.1",
"eslint-utils": "^2.1.0",
"eslint-visitor-keys": "^2.0.0",
"espree": "^7.3.1",
"esquery": "^1.4.0",
"esutils": "^2.0.2",
"file-entry-cache": "^6.0.1",
"functional-red-black-tree": "^1.0.1",
"glob-parent": "^5.0.0",
"globals": "^13.6.0",
"ignore": "^4.0.6",
"import-fresh": "^3.0.0",
"imurmurhash": "^0.1.4",
"is-glob": "^4.0.0",
"js-yaml": "^3.13.1",
"json-stable-stringify-without-jsonify": "^1.0.1",
"levn": "^0.4.1",
"lodash": "^4.17.21",
"minimatch": "^3.0.4",
"natural-compare": "^1.4.0",
"optionator": "^0.9.1",
"progress": "^2.0.0",
"regexpp": "^3.1.0",
"semver": "^7.2.1",
"strip-ansi": "^6.0.0",
"strip-json-comments": "^3.1.0",
"table": "^6.0.4",
"text-table": "^0.2.0",
"v8-compile-cache": "^2.0.3"
},
"devDependencies": {
"@babel/core": "^7.4.3",
"@babel/preset-env": "^7.4.3",
"acorn": "^7.2.0",
"babel-loader": "^8.0.5",
"chai": "^4.0.1",
"cheerio": "^0.22.0",
"common-tags": "^1.8.0",
"core-js": "^3.1.3",
"dateformat": "^3.0.3",
"ejs": "^3.0.2",
"escape-string-regexp": "^3.0.0",
"eslint": "file:.",
"eslint-config-eslint": "file:packages/eslint-config-eslint",
find: ‘../proc/2025’: No such file or directoryThe CLI filters warnings before reporting; I’m tracing that path and existing max-warning assertions.
sed -n '1,130p' lib/cli.js && sed -n '270,340p' lib/cli.jsoutput · 195 lines
Chunk ID: a075b2
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1417
Output:
/**
* @fileoverview Main CLI object.
* @author Nicholas C. Zakas
*/
"use strict";
/*
* The CLI object should *not* call process.exit() directly. It should only return
* exit codes. This allows other programs to use the CLI object and still control
* when the program exits.
*/
//------------------------------------------------------------------------------
// Requirements
//------------------------------------------------------------------------------
const fs = require("fs"),
path = require("path"),
{ promisify } = require("util"),
{ ESLint } = require("./eslint"),
CLIOptions = require("./options"),
log = require("./shared/logging"),
RuntimeInfo = require("./shared/runtime-info");
const debug = require("debug")("eslint:cli");
//------------------------------------------------------------------------------
// Types
//------------------------------------------------------------------------------
/** @typedef {import("./eslint/eslint").ESLintOptions} ESLintOptions */
/** @typedef {import("./eslint/eslint").LintMessage} LintMessage */
/** @typedef {import("./eslint/eslint").LintResult} LintResult */
//------------------------------------------------------------------------------
// Helpers
//------------------------------------------------------------------------------
const mkdir = promisify(fs.mkdir);
const stat = promisify(fs.stat);
const writeFile = promisify(fs.writeFile);
/**
* Predicate function for whether or not to apply fixes in quiet mode.
* If a message is a warning, do not apply a fix.
* @param {LintMessage} message The lint result.
* @returns {boolean} True if the lint message is an error (and thus should be
* autofixed), false otherwise.
*/
function quietFixPredicate(message) {
return message.severity === 2;
}
/**
* Translates the CLI options into the options expected by the CLIEngine.
* @param {Object} cliOptions The CLI options to translate.
* @returns {ESLintOptions} The options object for the CLIEngine.
* @private
*/
function translateOptions({
cache,
cacheFile,
cacheLocation,
cacheStrategy,
config,
env,
errorOnUnmatchedPattern,
eslintrc,
ext,
fix,
fixDryRun,
fixType,
global,
ignore,
ignorePath,
ignorePattern,
inlineConfig,
parser,
parserOptions,
plugin,
quiet,
reportUnusedDisableDirectives,
resolvePluginsRelativeTo,
rule,
rulesdir
}) {
return {
allowInlineConfig: inlineConfig,
cache,
cacheLocation: cacheLocation || cacheFile,
cacheStrategy,
errorOnUnmatchedPattern,
extensions: ext,
fix: (fix || fixDryRun) && (quiet ? quietFixPredicate : true),
fixTypes: fixType,
ignore,
ignorePath,
overrideConfig: {
env: env && env.reduce((obj, name) => {
obj[name] = true;
return obj;
}, {}),
globals: global && global.reduce((obj, name) => {
if (name.endsWith(":true")) {
obj[name.slice(0, -5)] = "writable";
} else {
obj[name] = "readonly";
}
return obj;
}, {}),
ignorePatterns: ignorePattern,
parser,
parserOptions,
plugins: plugin,
rules: rule
},
overrideConfigFile: config,
reportUnusedDisableDirectives: reportUnusedDisableDirectives ? "error" : void 0,
resolvePluginsRelativeTo,
rulePaths: rulesdir,
useEslintrc: eslintrc
};
}
/**
* Count error messages.
* @param {LintResult[]} results The lint results.
* @returns {{errorCount:number;warningCount:number}} The number of error messages.
*/
}
debug(`Running on ${useStdin ? "text" : "files"}`);
if (options.fix && options.fixDryRun) {
log.error("The --fix option and the --fix-dry-run option cannot be used together.");
return 2;
}
if (useStdin && options.fix) {
log.error("The --fix option is not available for piped-in code; use --fix-dry-run instead.");
return 2;
}
if (options.fixType && !options.fix && !options.fixDryRun) {
log.error("The --fix-type option requires either --fix or --fix-dry-run.");
return 2;
}
const engine = new ESLint(translateOptions(options));
let results;
if (useStdin) {
results = await engine.lintText(text, {
filePath: options.stdinFilename,
warnIgnored: true
});
} else {
results = await engine.lintFiles(files);
}
if (options.fix) {
debug("Fix mode enabled - applying fixes");
await ESLint.outputFixes(results);
}
if (options.quiet) {
debug("Quiet mode enabled - filtering out warnings");
results = ESLint.getErrorResults(results);
}
if (await printResults(engine, results, options.format, options.outputFile)) {
const { errorCount, warningCount } = countErrors(results);
const tooManyWarnings =
options.maxWarnings >= 0 && warningCount > options.maxWarnings;
if (!errorCount && tooManyWarnings) {
log.error(
"ESLint found too many warnings (maximum: %s).",
options.maxWarnings
);
}
return (errorCount || tooManyWarnings) ? 1 : 0;
}
return 2;
}
};
module.exports = cli;sed -n '600,680p' tests/lib/cli.js && sed -n '740,825p' tests/lib/cli.jsoutput · 173 lines
Chunk ID: 5f775a
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1716
Output:
it("should allow defining variables with multiple flags", async () => {
const filePath = getFixturePath("undef.js");
const exit = await cli.execute(`--global baz --global bat:true --no-ignore ${filePath}`);
assert.isTrue(log.info.notCalled);
assert.strictEqual(exit, 0);
});
});
describe("when supplied with rule flag and severity level set to error", () => {
it("should exit with an error status (2)", async () => {
const filePath = getFixturePath("single-quoted.js");
const code = `--no-ignore --rule 'quotes: [2, double]' ${filePath}`;
const exitStatus = await cli.execute(code);
assert.strictEqual(exitStatus, 1);
});
});
describe("when the quiet option is enabled", () => {
it("should only print error", async () => {
const filePath = getFixturePath("single-quoted.js");
const cliArgs = `--no-ignore --quiet -f compact --rule 'quotes: [2, double]' --rule 'no-unused-vars: 1' ${filePath}`;
await cli.execute(cliArgs);
sinon.assert.calledOnce(log.info);
const formattedOutput = log.info.firstCall.args[0];
assert.include(formattedOutput, "Error");
assert.notInclude(formattedOutput, "Warning");
});
it("should print nothing if there are no errors", async () => {
const filePath = getFixturePath("single-quoted.js");
const cliArgs = `--quiet -f compact --rule 'quotes: [1, double]' --rule 'no-unused-vars: 1' ${filePath}`;
await cli.execute(cliArgs);
sinon.assert.notCalled(log.info);
});
});
describe("when supplied with report output file path", () => {
afterEach(() => {
sh.rm("-rf", "tests/output");
});
it("should write the file and create dirs if they don't exist", async () => {
const filePath = getFixturePath("single-quoted.js");
const code = `--no-ignore --rule 'quotes: [1, double]' --o tests/output/eslint-output.txt ${filePath}`;
await cli.execute(code);
assert.include(fs.readFileSync("tests/output/eslint-output.txt", "utf8"), filePath);
assert.isTrue(log.info.notCalled);
});
it("should return an error if the path is a directory", async () => {
const filePath = getFixturePath("single-quoted.js");
const code = `--no-ignore --rule 'quotes: [1, double]' --o tests/output ${filePath}`;
fs.mkdirSync("tests/output");
const exit = await cli.execute(code);
assert.strictEqual(exit, 2);
assert.isTrue(log.info.notCalled);
assert.isTrue(log.error.calledOnce);
});
it("should return an error if the path could not be written to", async () => {
const filePath = getFixturePath("single-quoted.js");
const code = `--no-ignore --rule 'quotes: [1, double]' --o tests/output/eslint-output.txt ${filePath}`;
fs.writeFileSync("tests/output", "foo");
const exit = await cli.execute(code);
it("should exit with an error on ecmaVersion 7 feature in ecmaVersion 6", async () => {
const filePath = getFixturePath("passing-es7.js");
const exit = await cli.execute(`--no-ignore --parser-options=ecmaVersion:6 ${filePath}`);
assert.strictEqual(exit, 1);
});
it("should exit with no error on ecmaVersion 7 feature in ecmaVersion 7", async () => {
const filePath = getFixturePath("passing-es7.js");
const exit = await cli.execute(`--no-ignore --parser-options=ecmaVersion:7 ${filePath}`);
assert.strictEqual(exit, 0);
});
it("should exit with no error on ecmaVersion 7 feature with config ecmaVersion 6 and command line ecmaVersion 7", async () => {
const configPath = getFixturePath("configurations", "es6.json");
const filePath = getFixturePath("passing-es7.js");
const exit = await cli.execute(`--no-ignore --config ${configPath} --parser-options=ecmaVersion:7 ${filePath}`);
assert.strictEqual(exit, 0);
});
});
describe("when given the max-warnings flag", () => {
it("should not change exit code if warning count under threshold", async () => {
const filePath = getFixturePath("max-warnings");
const exitCode = await cli.execute(`--no-ignore --max-warnings 10 ${filePath}`);
assert.strictEqual(exitCode, 0);
});
it("should exit with exit code 1 if warning count exceeds threshold", async () => {
const filePath = getFixturePath("max-warnings");
const exitCode = await cli.execute(`--no-ignore --max-warnings 5 ${filePath}`);
assert.strictEqual(exitCode, 1);
assert.ok(log.error.calledOnce);
assert.include(log.error.getCall(0).args[0], "ESLint found too many warnings");
});
it("should not change exit code if warning count equals threshold", async () => {
const filePath = getFixturePath("max-warnings");
const exitCode = await cli.execute(`--no-ignore --max-warnings 6 ${filePath}`);
assert.strictEqual(exitCode, 0);
});
it("should not change exit code if flag is not specified and there are warnings", async () => {
const filePath = getFixturePath("max-warnings");
const exitCode = await cli.execute(filePath);
assert.strictEqual(exitCode, 0);
});
});
describe("when passed --no-inline-config", () => {
let localCLI;
afterEach(() => {
sinon.verifyAndRestore();
});
it("should pass allowInlineConfig:false to ESLint when --no-inline-config is used", async () => {
// create a fake ESLint class to test with
const fakeESLint = sinon.mock().withExactArgs(sinon.match({ allowInlineConfig: false }));
Object.defineProperties(fakeESLint.prototype, Object.getOwnPropertyDescriptors(ESLint.prototype));
sinon.stub(fakeESLint.prototype, "lintFiles").returns([{
filePath: "./foo.js",
output: "bar",
messages: [
{
severity: 2,
message: "Fake message"
}
],
errorCount: 1,
warningCount: 0
}]);
sinon.stub(fakeESLint.prototype, "loadFormatter").returns({ format: () => "done" });
fakeESLint.outputFixes = sinon.stub();
localCLI = proxyquire("../../lib/cli", {
"./eslint": { ESLint: fakeESLint },rg -n "warningCount|errorCount|results.*messages|quiet" lib/cli.js tests/lib/cli.jsoutput · 40 lines
Chunk ID: f7f9e8
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 603
Output:
tests/lib/cli.js:620: describe("when the quiet option is enabled", () => {
tests/lib/cli.js:624: const cliArgs = `--no-ignore --quiet -f compact --rule 'quotes: [2, double]' --rule 'no-unused-vars: 1' ${filePath}`;
tests/lib/cli.js:638: const cliArgs = `--quiet -f compact --rule 'quotes: [1, double]' --rule 'no-unused-vars: 1' ${filePath}`;
tests/lib/cli.js:818: errorCount: 1,
tests/lib/cli.js:819: warningCount: 0
tests/lib/cli.js:895: errorCount: 1,
tests/lib/cli.js:896: warningCount: 0
tests/lib/cli.js:918: it("should provide fix predicate and rewrite files when in fix mode and quiet mode", async () => {
tests/lib/cli.js:929: errorCount: 0,
tests/lib/cli.js:930: warningCount: 1
tests/lib/cli.js:947: const exitCode = await localCLI.execute("--fix --quiet .");
tests/lib/cli.js:1034: errorCount: 1,
tests/lib/cli.js:1035: warningCount: 0
tests/lib/cli.js:1057: it("should provide fix predicate when in fix-dry-run mode and quiet mode", async () => {
tests/lib/cli.js:1068: errorCount: 0,
tests/lib/cli.js:1069: warningCount: 1
tests/lib/cli.js:1086: const exitCode = await localCLI.execute("--fix-dry-run --quiet .");
tests/lib/cli.js:1103: errorCount: 1,
tests/lib/cli.js:1104: warningCount: 0
lib/cli.js:45: * Predicate function for whether or not to apply fixes in quiet mode.
lib/cli.js:51:function quietFixPredicate(message) {
lib/cli.js:82: quiet,
lib/cli.js:95: fix: (fix || fixDryRun) && (quiet ? quietFixPredicate : true),
lib/cli.js:129: * @returns {{errorCount:number;warningCount:number}} The number of error messages.
lib/cli.js:132: let errorCount = 0;
lib/cli.js:133: let warningCount = 0;
lib/cli.js:136: errorCount += result.errorCount;
lib/cli.js:137: warningCount += result.warningCount;
lib/cli.js:140: return { errorCount, warningCount };
lib/cli.js:304: if (options.quiet) {
lib/cli.js:310: const { errorCount, warningCount } = countErrors(results);
lib/cli.js:312: options.maxWarnings >= 0 && warningCount > options.maxWarnings;
lib/cli.js:314: if (!errorCount && tooManyWarnings) {
lib/cli.js:321: return (errorCount || tooManyWarnings) ? 1 : 0;I’m looking at the issue with the bug count after filtering. I need to keep the original results for both the threshold and filtered results when printing, especially for max warnings that are evaluated based on warnings. The goal is to log warnings when they exceed the threshold or return an error code.
I see that the current code uses filtered results for calculations, which doesn't work as intended. I wonder if I should calculate the warning count before applying any filters, as the filtering might mutate the results. I should inspect these counts and the print function further.
sed -n '120,270p' lib/cli.js && sed -n '100,180p' lib/eslint/eslint.js && sed -n '1,80p' tests/lib/cli.js && sed -n '1,120p' tests/fixtures/max-warnings/.eslintrcoutput · 321 lines
Chunk ID: 54b19e
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 2537
Output:
Warning: truncated output (original token count: 2537)
Total output lines: 318
resolvePluginsRelativeTo,
rulePaths: rulesdir,
useEslintrc: eslintrc
};
}
/**
* Count error messages.
* @param {LintResult[]} results The lint results.
* @returns {{errorCount:number;warningCount:number}} The number of error messages.
*/
function countErrors(results) {
let errorCount = 0;
let warningCount = 0;
for (const result of results) {
errorCount += result.errorCount;
warningCount += result.warningCount;
}
return { errorCount, warningCount };
}
/**
* Check if a given file path is a directory or not.
* @param {string} filePath The path to a file to check.
* @returns {Promise<boolean>} `true` if the given path is a directory.
*/
async function isDirectory(filePath) {
try {
return (await stat(filePath)).isDirectory();
} catch (error) {
if (error.code === "ENOENT" || error.code === "ENOTDIR") {
return false;
}
throw error;
}
}
/**
* Outputs the results of the linting.
* @param {ESLint} engine The ESLint instance to use.
* @param {LintResult[]} results The results to print.
* @param {string} format The name of the formatter to use or the path to the formatter.
* @param {string} outputFile The path for the output file.
* @returns {Promise<boolean>} True if the printing succeeds, false if not.
* @private
*/
async function printResults(engine, results, format, outputFile) {
let formatter;
try {
formatter = await engine.loadFormatter(format);
} catch (e) {
log.error(e.message);
return false;
}
const output = formatter.format(results);
if (output) {
if (outputFile) {
const filePath = path.resolve(process.cwd(), outputFile);
if (await isDirectory(filePath)) {
log.error("Cannot write to output file path, it is a directory: %s", outputFile);
return false;
}
try {
await mkdir(path.dirname(filePath), { recursive: true });
await writeFile(filePath, output);
} catch (ex) {
log.error("There was a problem writing the output file:\n%s", ex);
return false;
}
} else {
log.info(output);
}
}
return true;
}
//------------------------------------------------------------------------------
// Public Interface
//------------------------------------------------------------------------------
/**
* Encapsulates all CLI behavior for eslint. Makes it easier to test as well as
* for other Node.js programs to effectively run the CLI.
*/
const cli = {
/**
* Executes the CLI based on an array of arguments that is passed in.
* @param {string|Array|Object} args The arguments to process.
* @param {string} [text] The text to lint (used for TTY).
* @returns {Promise<number>} The exit code for the operation.
*/
async execute(args, text) {
if (Array.isArray(args)) {
debug("CLI args: %o", args.slice(2));
}
let options;
try {
options = CLIOptions.parse(args);
} catch (error) {
log.error(error.message);
return 2;
}
const files = options._;
const useStdin = typeof text === "string";
if (options.help) {
log.info(CLIOptions.generateHelp());
return 0;
}
if (options.version) {
log.info(RuntimeInfo.version());
return 0;
}
if (options.envInfo) {
try {
log.info(RuntimeInfo.environment());
return 0;
} catch (err) {
log.error(err.message);
return 2;
}
}
if (options.printConfig) {
if (files.length) {
log.error("The --print-config option must be used with exactly one file name.");
return 2;
}
if (useStdin) {
log.error("The --print-config option is not available for piped-in code.");
return 2;
}
const engine = new ESLint(translateOptions(options));
const fileConfig =
await engine.calculateConfigForFile(options.printConfig);
log.info(JSON.stringify(fileConfig, null, " "));
return 0;
}
* @type {WeakMap<ESLint, ESLintPrivateMembers>}
*/
const privateMembersMap = new WeakMap();
/**
* Check if a given value is a non-empty string or not.
* @param {any} x The value to check.
* @returns {boolean} `true` if `x` is a non-empty string.
*/
function isNonEmptyString(x) {
return typeof x === "string" && x.trim() !== "";
}
/**
* Check if a given value is an array of non-empty stringss or not.
* @param {any} x The value to check.
* @returns {boolean} `true` if `x` is an array of non-empty stringss.
*/
function isArrayOfNonEmpt…146 chars truncated…} x The value to check.
* @returns {boolean} `true` if `x` is valid fix type.
*/
function isFixType(x) {
return x === "problem" || x === "suggestion" || x === "layout";
}
/**
* Check if a given value is an array of fix types or not.
* @param {any} x The value to check.
* @returns {boolean} `true` if `x` is an array of fix types.
*/
function isFixTypeArray(x) {
return Array.isArray(x) && x.every(isFixType);
}
/**
* The error for invalid options.
*/
class ESLintInvalidOptionsError extends Error {
constructor(messages) {
super(`Invalid Options:\n- ${messages.join("\n- ")}`);
this.code = "ESLINT_INVALID_OPTIONS";
Error.captureStackTrace(this, ESLintInvalidOptionsError);
}
}
/**
* Validates and normalizes options for the wrapped CLIEngine instance.
* @param {ESLintOptions} options The options to process.
* @returns {ESLintOptions} The normalized options.
*/
function processOptions({
allowInlineConfig = true, // ← we cannot use `overrideConfig.noInlineConfig` instead because `allowInlineConfig` has side-effect that suppress warnings that show inline configs are ignored.
baseConfig = null,
cache = false,
cacheLocation = ".eslintcache",
cacheStrategy = "metadata",
cwd = process.cwd(),
errorOnUnmatchedPattern = true,
extensions = null, // ← should be null by default because if it's an array then it suppresses RFC20 feature.
fix = false,
fixTypes = null, // ← should be null by default because if it's an array then it suppresses rules that don't have the `meta.type` property.
globInputPaths = true,
ignore = true,
ignorePath = null, // ← should be null by default because if it's a string then it may throw ENOENT.
overrideConfig = null,
overrideConfigFile = null,
plugins = {},
reportUnusedDisableDirectives = null, // ← should be null by default because if it's a string then it overrides the 'reportUnusedDisableDirectives' setting in config files. And we cannot use `overrideConfig.reportUnusedDisableDirectives` instead because we cannot configure the `error` severity with that.
resolvePluginsRelativeTo = null, // ← should be null by default because if it's a string then it suppresses RFC47 feature.
rulePaths = [],
useEslintrc = true,
...unknownOptions
}) {
const errors = [];
const unknownOptionKeys = Object.keys(unknownOptions);
/**
* @fileoverview Tests for cli.
* @author Ian Christian Myers
*/
"use strict";
/*
* NOTE: If you are adding new tests for cli.js, use verifyESLintOpts(). The
* test only needs to verify that ESLint receives the correct opts.
*/
//------------------------------------------------------------------------------
// Requirements
//------------------------------------------------------------------------------
const assert = require("chai").assert,
stdAssert = require("assert"),
{ ESLint } = require("../../lib/eslint"),
BuiltinRules = require("../../lib/rules"),
path = require("path"),
sinon = require("sinon"),
fs = require("fs"),
os = require("os"),
sh = require("shelljs");
const proxyquire = require("proxyquire").noCallThru().noPreserveCache();
//------------------------------------------------------------------------------
// Tests
//------------------------------------------------------------------------------
describe("cli", () => {
let fixtureDir;
const log = {
info: sinon.spy(),
error: sinon.spy()
};
const RuntimeInfo = {
environment: sinon.stub(),
version: sinon.stub()
};
const cli = proxyquire("../../lib/cli", {
"./shared/logging": log,
"./shared/runtime-info": RuntimeInfo
});
/**
* Verify that ESLint class receives correct opts via await cli.execute().
* @param {string} cmd CLI command.
* @param {Object} opts Options hash that should match that received by ESLint class.
* @returns {void}
*/
async function verifyESLintOpts(cmd, opts) {
// create a fake ESLint class to test with
const fakeESLint = sinon.mock().withExactArgs(sinon.match(opts));
Object.defineProperties(fakeESLint.prototype, Object.getOwnPropertyDescriptors(ESLint.prototype));
sinon.stub(fakeESLint.prototype, "lintFiles").returns([]);
sinon.stub(fakeESLint.prototype, "loadFormatter").returns({ format: sinon.spy() });
const localCLI = proxyquire("../../lib/cli", {
"./eslint": { ESLint: fakeESLint },
"./shared/logging": log
});
await localCLI.execute(cmd);
sinon.verifyAndRestore();
}
// verifyESLintOpts
/**
* Returns the path inside of the fixture directory.
* @param {...string} args file path segments.
* @returns {string} The path inside the fixture directory.
* @private
*/
function getFixturePath(...args) {
{
"rules": {
"quotes": [1, "single"]
},
"root": true
}I’ve confirmed quiet mode erases the warning counts used for the threshold; I’ll preserve counts before filtering and add a regression test.
rg -n "beforeEach|afterEach" tests/lib/cli.js | head -25 && sed -n '35,105p' tests/lib/cli.js && sed -n '1,90p' Makefile.jsoutput · 172 lines
Chunk ID: 308537
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1450
Output:
99: afterEach(() => {
647: afterEach(() => {
799: afterEach(() => {
858: afterEach(() => {
973: afterEach(() => {
const log = {
info: sinon.spy(),
error: sinon.spy()
};
const RuntimeInfo = {
environment: sinon.stub(),
version: sinon.stub()
};
const cli = proxyquire("../../lib/cli", {
"./shared/logging": log,
"./shared/runtime-info": RuntimeInfo
});
/**
* Verify that ESLint class receives correct opts via await cli.execute().
* @param {string} cmd CLI command.
* @param {Object} opts Options hash that should match that received by ESLint class.
* @returns {void}
*/
async function verifyESLintOpts(cmd, opts) {
// create a fake ESLint class to test with
const fakeESLint = sinon.mock().withExactArgs(sinon.match(opts));
Object.defineProperties(fakeESLint.prototype, Object.getOwnPropertyDescriptors(ESLint.prototype));
sinon.stub(fakeESLint.prototype, "lintFiles").returns([]);
sinon.stub(fakeESLint.prototype, "loadFormatter").returns({ format: sinon.spy() });
const localCLI = proxyquire("../../lib/cli", {
"./eslint": { ESLint: fakeESLint },
"./shared/logging": log
});
await localCLI.execute(cmd);
sinon.verifyAndRestore();
}
// verifyESLintOpts
/**
* Returns the path inside of the fixture directory.
* @param {...string} args file path segments.
* @returns {string} The path inside the fixture directory.
* @private
*/
function getFixturePath(...args) {
return path.join(fixtureDir, ...args);
}
// copy into clean area so as not to get "infected" by this project's .eslintrc files
before(function() {
/*
* GitHub Actions Windows and macOS runners occasionally exhibit
* extremely slow filesystem operations, during which copying fixtures
* exceeds the default test timeout, so raise it just for this hook.
* Mocha uses `this` to set timeouts on an individual hook level.
*/
this.timeout(60 * 1000); // eslint-disable-line no-invalid-this
fixtureDir = `${os.tmpdir()}/eslint/fixtures`;
sh.mkdir("-p", fixtureDir);
sh.cp("-r", "./tests/fixtures/.", fixtureDir);
});
afterEach(() => {
log.info.resetHistory();
log.error.resetHistory();
});
after(() => {
sh.rm("-r", fixtureDir);
/**
* @fileoverview Build file
* @author nzakas
*/
/* global target */
/* eslint no-use-before-define: "off", no-console: "off" */
"use strict";
//------------------------------------------------------------------------------
// Requirements
//------------------------------------------------------------------------------
require("shelljs/make");
const checker = require("npm-license"),
ReleaseOps = require("eslint-release"),
dateformat = require("dateformat"),
fs = require("fs"),
glob = require("glob"),
markdownlint = require("markdownlint"),
os = require("os"),
path = require("path"),
semver = require("semver"),
ejs = require("ejs"),
loadPerf = require("load-perf"),
yaml = require("js-yaml"),
{ CLIEngine } = require("./lib/cli-engine"),
builtinRules = require("./lib/rules/index");
const { cat, cd, cp, echo, exec, exit, find, ls, mkdir, pwd, rm, test } = require("shelljs");
//------------------------------------------------------------------------------
// Settings
//------------------------------------------------------------------------------
/*
* A little bit fuzzy. My computer has a first CPU speed of 3392 and the perf test
* always completes in < 3800ms. However, Travis is less predictable due to
* multiple different VM types. So I'm fudging this for now in the hopes that it
* at least provides some sort of useful signal.
*/
const PERF_MULTIPLIER = 13e6;
const OPEN_SOURCE_LICENSES = [
/MIT/u, /BSD/u, /Apache/u, /ISC/u, /WTF/u, /Public Domain/u, /LGPL/u
];
//------------------------------------------------------------------------------
// Data
//------------------------------------------------------------------------------
const NODE = "node ", // intentional extra space
NODE_MODULES = "./node_modules/",
TEMP_DIR = "./tmp/",
DEBUG_DIR = "./debug/",
BUILD_DIR = "build",
DOCS_DIR = "../website/docs",
SITE_DIR = "../website/",
PERF_TMP_DIR = path.join(TEMP_DIR, "eslint", "performance"),
// Utilities - intentional extra space at the end of each string
MOCHA = `${NODE_MODULES}mocha/bin/_mocha `,
ESLINT = `${NODE} bin/eslint.js --report-unused-disable-directives `,
// Files
RULE_FILES = glob.sync("lib/rules/*.js").filter(filePath => path.basename(filePath) !== "index.js"),
JSON_FILES = find("conf/").filter(fileType("json")),
MARKDOWN_FILES_ARRAY = find("docs/").concat(ls(".")).filter(fileType("md")),
TEST_FILES = "\"tests/{bin,lib,tools}/**/*.js\"",
PERF_ESLINTRC = path.join(PERF_TMP_DIR, "eslintrc.yml"),
PERF_MULTIFILES_TARGET_DIR = path.join(PERF_TMP_DIR, "eslint"),
PERF_MULTIFILES_TARGETS = `"${PERF_MULTIFILES_TARGET_DIR + path.sep}{lib,tests${path.sep}lib}${path.sep}**${path.sep}*.js"`,
// Settings
MOCHA_TIMEOUT = 10000;
//------------------------------------------------------------------------------
// Helpers
//------------------------------------------------------------------------------
/**
* Simple JSON file validation that relies on ES JSON parser.
* @param {string} filePath Path to JSON.
* @throws Error If file contents is invalid JSON.
* @returns {undefined}
*/
function validateJsonFile(filePath) {
const contents = fs.readFileSync(filePath, "utf8");apply_patch <<'PATCH'
*** Begin Patch
*** Update File: lib/cli.js
@@
if (options.fix) {
debug("Fix mode enabled - applying fixes");
await ESLint.outputFixes(results);
}
+ const { errorCount, warningCount } = countErrors(results);
+
if (options.quiet) {
debug("Quiet mode enabled - filtering out warnings");
results = ESLint.getErrorResults(results);
}
if (await printResults(engine, results, options.format, options.outputFile)) {
- const { errorCount, warningCount } = countErrors(results);
const tooManyWarnings =
options.maxWarnings >= 0 && warningCount > options.maxWarnings;
*** Update File: tests/lib/cli.js
@@
it("should exit with exit code 1 if warning count exceeds threshold", async () => {
const filePath = getFixturePath("max-warnings");
const exitCode = await cli.execute(`--no-ignore --max-warnings 5 ${filePath}`);
assert.strictEqual(exitCode, 1);
assert.ok(log.error.calledOnce);
assert.include(log.error.getCall(0).args[0], "ESLint found too many warnings");
});
+
+ it("should exit with exit code 1 if warning count exceeds threshold in quiet mode", async () => {
+ const filePath = getFixturePath("max-warnings");
+ const exitCode = await cli.execute(`--no-ignore --quiet --max-warnings 5 ${filePath}`);
+
+ assert.strictEqual(exitCode, 1);
+ assert.ok(log.error.calledOnce);
+ assert.include(log.error.getCall(0).args[0], "ESLint found too many warnings");
+ });
it("should not change exit code if warning count equals threshold", async () => {
*** End Patch
PATCHoutput · 9 lines
Wall time: 0.0000 seconds
Output:
Exit code: 0
Wall time: 0 seconds
Output:
Success. Updated the following files:
M lib/cli.js
M tests/lib/cli.jsI’m validating my test setup, focusing on noninteractive approval mode. I think I should run targeted tests, like using the command npm test:cli -- tests/lib/cli.js. The package script likely includes mocha tests. I could also check dependencies with npx mocha, or run specific tests with a --grep max-warning. I'm wondering if running the CLI tests might need adjustments, like using npm run test:cli -- --grep "max-warnings flag". Let’s go ahead and execute it!
The threshold now uses pre-filter counts; I’m running the focused CLI regression tests.
npm run test:cli -- --grep "max-warnings flag"output · 21 lines
Chunk ID: 64fffc
Wall time: 0.1790 seconds
Process exited with code 1
Original token count: 134
Output:
> eslint@7.22.0 test:cli /testbed
> mocha "--grep" "max-warnings flag"
[31mError: No test files found: "test"[39m
npm ERR! code ELIFECYCLE
npm ERR! errno 1
npm ERR! eslint@7.22.0 test:cli: `mocha "--grep" "max-warnings flag"`
npm ERR! Exit status 1
npm ERR!
npm ERR! Failed at the eslint@7.22.0 test:cli script.
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
npm ERR! A complete log of this run can be found in:
npm ERR! /root/.npm/_logs/2026-10-14T23_22_05_431Z-debug.logI need to specify the test path due to the mocha configuration. I can run the command npm run test:cli -- tests/lib/cli.js --grep to execute this. It seems important to make sure that the paths are set correctly to test specific parts of my code effectively. Let’s double-check the configuration settings to ensure everything runs smoothly when I start the tests. It’s all about getting those details right!
The default Mocha target isn’t configured in this checkout; I’m rerunning with tests/lib/cli.js explicitly.
./node_modules/.bin/mocha tests/lib/cli.js --grep "max-warnings flag"output · 19 lines
Chunk ID: 23fdfd
Wall time: 0.2392 seconds
Process exited with code 0
Original token count: 117
Output:
cli
when given the max-warnings flag
✓ should not change exit code if warning count under threshold (46ms)
✓ should exit with exit code 1 if warning count exceeds threshold
✓ should exit with exit code 1 if warning count exceeds threshold in quiet mode
✓ should not change exit code if warning count equals threshold
✓ should not change exit code if flag is not specified and there are warnings
5 passing (127ms)I need to run full CLI tests and linting. Since I have targeted tests that passed, I'll run mocha tests/lib/cli.js and then lint the files. I want to ensure the code style has a maximum line length, probably around 120 characters. I should also run ESLint on changed files. It seems I can run tests in parallel and check the git diff together. I need to perform full file tests, which should only take a few seconds.
The focused regression passes; I’m checking the complete CLI suite and reviewing the final diff.
./node_modules/.bin/mocha tests/lib/cli.jsoutput · 143 lines
Chunk ID: ad8b63
Wall time: 0.6675 seconds
Process exited with code 0
Original token count: 1753
Output:
cli
execute()
✓ should return error when text with incorrect quotes is passed as argument (246ms)
✓ should not print debug info when passed the empty string as text
✓ should return no error when --ext .js2 is specified
✓ should exit with console error when passed unsupported arguments
when given a config file
✓ should load the specified config file
when there is a local config file
✓ should load the local config file (102ms)
when given a config with rules with options and severity level set to error
✓ should exit with an error status (1)
when given a config file and a directory of files
✓ should load and execute without error
when given a config with environment set to browser
✓ should execute without any errors
when given a config with environment set to Node.js
✓ should execute without any errors
when given a config with environment set to Nashorn
✓ should execute without any errors
when given a config with environment set to WebExtensions
✓ should execute without any errors
when given a valid built-in formatter name
✓ should execute without any errors
when given a valid built-in formatter name that uses rules meta.
✓ should execute without any errors
when given an invalid built-in formatter name
✓ should execute with error
when given a valid formatter path
✓ should execute without any errors
when given an invalid formatter path
✓ should execute with error
when executing a file with a lint error
✓ should exit with error
when using --fix-type without --fix or --fix-dry-run
✓ should exit with error
when executing a file with a syntax error
✓ should exit with error
when calling execute more than once
✓ should not print the results from previous execution
when executing with version flag
✓ should print out current version
when executing with env-info flag
✓ should print out environment information
✓ should print error message and return error code
when executing without no-error-on-unmatched-pattern flag
✓ should throw an error on unmatched glob pattern
✓ should throw an error on unmatched --ext
when executing with no-error-on-unmatched-pattern flag
✓ should not throw an error on unmatched node glob syntax patterns
✓ should not throw an error on unmatched --ext
when executing with no-error-on-unmatched-pattern flag and multiple patterns
✓ should not throw an error on multiple unmatched node glob syntax patterns
✓ should still throw an error on when a matched pattern has lint errors
when executing with no-error-on-unmatched-pattern flag and multiple --ext arguments
✓ should not throw an error on multiple unmatched --ext arguments
✓ should still throw an error on when a matched pattern has lint errors
when executing with help flag
✓ should print out help
when given a directory with eslint excluded files in the directory
✓ should throw an error and not process any files
when given a file in excluded files list
✓ should not process the file
✓ should process the file when forced
when given a pattern to ignore
✓ should not process any files
when given patterns to ignore
✓ should not process any matching files
when executing a file with a shebang
✓ should execute without error
when loading a custom rule
✓ should return an error when rule isn't found
✓ should return a warning when rule is matched
✓ should return warnings from multiple rules in different directories
when executing with no-eslintrc flag
✓ should ignore a local config file
when executing without no-eslintrc flag
✓ should load a local config file
when executing without env flag
✓ should not define environment-specific globals
when executing with global flag
✓ should default defined variables to read-only
✓ should allow defining writable global variables
✓ should allow defining variables with multiple flags
when supplied with rule flag and severity level set to error
✓ should exit with an error status (2)
when the quiet option is enabled
✓ should only print error
✓ should print nothing if there are no errors
when supplied with report output file path
✓ should write the file and create dirs if they don't exist
✓ should return an error if the path is a directory
✓ should return an error if the path could not be written to
when supplied with a plugin
✓ should pass plugins to ESLint
when supplied with a plugin-loading path
✓ should pass the option to ESLint
when given an parser name
✓ should exit with a fatal error if parser is invalid
✓ should exit with no error if parser is valid
when given parser options
✓ should exit with error if parser options are invalid
✓ should exit with no error if parser is valid
✓ should exit with an error on ecmaVersion 7 feature in ecmaVersion 6
✓ should exit with no error on ecmaVersion 7 feature in ecmaVersion 7
✓ should exit with no error on ecmaVersion 7 feature with config ecmaVersion 6 and command line ecmaVersion 7
when given the max-warnings flag
✓ should not change exit code if warning count under threshold
✓ should exit with exit code 1 if warning count exceeds threshold
✓ should exit with exit code 1 if warning count exceeds threshold in quiet mode
✓ should not change exit code if warning count equals threshold
✓ should not change exit code if flag is not specified and there are warnings
when passed --no-inline-config
✓ should pass allowInlineConfig:false to ESLint when --no-inline-config is used
✓ should not error and allowInlineConfig should be true by default
when passed --fix
✓ should pass fix:true to ESLint when executing on files
✓ should rewrite files when in fix mode
✓ should provide fix predicate and rewrite files when in fix mode and quiet mode
✓ should not call ESLint and return 2 when executing on text
when passed --fix-dry-run
✓ should pass fix:true to ESLint when executing on files
✓ should pass fixTypes to ESLint when --fix-type is passed
✓ should not rewrite files when in fix-dry-run mode
✓ should provide fix predicate when in fix-dry-run mode and quiet mode
✓ should allow executing on text
✓ should not call ESLint and return 2 when used with --fix
when passing --print-config
✓ should print out the configuration
✓ should error if any positional file arguments are passed
✓ should error out when executing on text
83 passing (608ms)git diff --check && git diff -- lib/cli.js tests/lib/cli.js && git status --shortoutput · 48 lines
Chunk ID: 9679e5
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 436
Output:
diff --git a/lib/cli.js b/lib/cli.js
index 4216126..facab30 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -301,13 +301,14 @@ const cli = {
await ESLint.outputFixes(results);
}
+ const { errorCount, warningCount } = countErrors(results);
+
if (options.quiet) {
debug("Quiet mode enabled - filtering out warnings");
results = ESLint.getErrorResults(results);
}
if (await printResults(engine, results, options.format, options.outputFile)) {
- const { errorCount, warningCount } = countErrors(results);
const tooManyWarnings =
options.maxWarnings >= 0 && warningCount > options.maxWarnings;
diff --git a/tests/lib/cli.js b/tests/lib/cli.js
index 0f8a24c..1d9809e 100644
--- a/tests/lib/cli.js
+++ b/tests/lib/cli.js
@@ -778,6 +778,15 @@ describe("cli", () => {
assert.include(log.error.getCall(0).args[0], "ESLint found too many warnings");
});
+ it("should exit with exit code 1 if warning count exceeds threshold in quiet mode", async () => {
+ const filePath = getFixturePath("max-warnings");
+ const exitCode = await cli.execute(`--no-ignore --quiet --max-warnings 5 ${filePath}`);
+
+ assert.strictEqual(exitCode, 1);
+ assert.ok(log.error.calledOnce);
+ assert.include(log.error.getCall(0).args[0], "ESLint found too many warnings");
+ });
+
it("should not change exit code if warning count equals threshold", async () => {
const filePath = getFixturePath("max-warnings");
const exitCode = await cli.execute(`--no-ignore --max-warnings 6 ${filePath}`);
M lib/cli.js
M tests/lib/cli.jsFixed --quiet --max-warnings so warning counts are checked before quiet mode filters output. When the threshold is exceeded, ESLint now reports the warning-limit error and exits with code 1 while keeping warning details hidden (lib/cli.js:304).
Added a regression test in tests/lib/cli.js:781. The CLI test suite passes: 83 passing.
grommet-6282 · DataTable sort breaks on null values · resolved · 11 model calls · 17 commands · 118 s
What the images show: DataTable sorted by Parent, rows with null Parent not grouped
What the text already says: "Undefined properties should be treated as empty string"
Data Table sort breaks if a property is null or undefined
### Expected Behavior
Undefined properties should be treated as empty string
### Actual Behavior
When sorting a column, items are not re-ordered as expected if an item in the table has the property set to null or undefined
### URL, screen shot, or Codepen exhibiting the issue
See [Codesandbox](https://codesandbox.io/s/grommet-v2-template-forked-0ytqfb?file=/index.js:1723-1727)
<img width="1047" alt="Screen Shot 2022-08-17 at 9 25 56 AM" src="https://user-images.githubusercontent.com/9042104/185192572-2e6dbfec-b56a-4a1a-9576-e65078681da4.png">
### Steps to Reproduce
On Code sandbox - sort by Parent_id
### Your Environment
- Grommet version: 2.23.0, also reproducible w/ 2.25.1
- Browser Name and version: Chrome Version 104.0.5112.79 (Official Build) (x86_64)
- Operating System and version (desktop or mobile): NA
You cannot see the images in this message; each was removed and only its position is marked.
[Image 1 of 1]I see that I need to modify the repository, and it could be due to a bug request related to Grommet. First, I’ll need to inspect what’s going on to understand the issue better. It seems important to provide a preamble to clarify the context before utilizing the tool for any necessary adjustments. I want to make sure everything is clear and well-explained!
I’ll trace DataTable sorting and its tests, then patch null handling.
pwd && rg --files -g 'AGENTS.md' -g '*DataTable*' -g '*dataTable*' -g '*datatable*' | head -100 && git status --shortoutput · 12 lines
Chunk ID: 456e4e
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 73
Output:
/testbed
src/js/components/DataTable/stories/InfiniteScrollDataTable.js
src/js/components/DataTable/DataTable.js
src/js/components/DataTable/StyledDataTable.js
src/js/components/DataTable/__tests__/DataTable-test.js
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snapI need to figure out if there’s a potential issue with the command output for the agents root, maybe it shows no result? I’m looking into the command that lists files, especially the ones that are tracked or hidden. The output doesn't seem to have "AGENT." I need to check the root hierarchy along with the instructions given, which likely turn out to be none at all. I'll inspect the DataTable, sort, and look at the tests and references to see what's going on.
I found the DataTable implementation; now following the sort comparator and existing coverage.
rg -n "sort|Sort|compare|sortValue" src/js/components/DataTable/DataTable.js src/js/components/DataTable/__tests__/DataTable-test.jsoutput · 55 lines
Chunk ID: 85624b
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1133
Output:
src/js/components/DataTable/__tests__/DataTable-test.js:136: test('sortable', () => {
src/js/components/DataTable/__tests__/DataTable-test.js:149: sortable
src/js/components/DataTable/__tests__/DataTable-test.js:160: test('onSort', () => {
src/js/components/DataTable/__tests__/DataTable-test.js:161: const onSort = jest.fn();
src/js/components/DataTable/__tests__/DataTable-test.js:174: onSort={onSort}
src/js/components/DataTable/__tests__/DataTable-test.js:175: sortable
src/js/components/DataTable/__tests__/DataTable-test.js:183: expect(onSort).toBeCalledWith(
src/js/components/DataTable/__tests__/DataTable-test.js:189: test('onSort external', () => {
src/js/components/DataTable/__tests__/DataTable-test.js:190: const onSort = jest.fn();
src/js/components/DataTable/__tests__/DataTable-test.js:203: onSort={onSort}
src/js/components/DataTable/__tests__/DataTable-test.js:204: sort={{ property: 'a', direction: 'asc', external: true }}
src/js/components/DataTable/__tests__/DataTable-test.js:212: expect(onSort).toBeCalledWith(
src/js/components/DataTable/__tests__/DataTable-test.js:222: test('sort', () => {
src/js/components/DataTable/__tests__/DataTable-test.js:235: sort={{ property: 'a', direction: 'asc' }}
src/js/components/DataTable/__tests__/DataTable-test.js:242: test('sort nested object', () => {
src/js/components/DataTable/__tests__/DataTable-test.js:259: sort={{ property: 'b.value', direction: 'asc' }}
src/js/components/DataTable/__tests__/DataTable-test.js:277: test('sort nested object with onSort', () => {
src/js/components/DataTable/__tests__/DataTable-test.js:278: const onSort = jest.fn();
src/js/components/DataTable/__tests__/DataTable-test.js:295: onSort={onSort}
src/js/components/DataTable/__tests__/DataTable-test.js:296: sort={{ property: 'b.value', direction: 'asc' }}
src/js/components/DataTable/__tests__/DataTable-test.js:307: expect(onSort).toBeCalledWith(
src/js/components/DataTable/__tests__/DataTable-test.js:318: test('sort external', () => {
src/js/components/DataTable/__tests__/DataTable-test.js:331: sort={{ property: 'a', direction: 'asc', external: true }}
src/js/components/DataTable/__tests__/DataTable-test.js:1034: sortable
src/js/components/DataTable/DataTable.js:26: filterAndSortData,
src/js/components/DataTable/DataTable.js:69: onSort: onSortProp,
src/js/components/DataTable/DataTable.js:82: sort: sortProp,
src/js/components/DataTable/DataTable.js:83: sortable,
src/js/components/DataTable/DataTable.js:109: // which column we are sorting on, with direction
src/js/components/DataTable/DataTable.js:110: const [sort, setSort] = useState(sortProp || {});
src/js/components/DataTable/DataTable.js:112: // the data filtered and sorted, if needed
src/js/components/DataTable/DataTable.js:114: // in completely filtered and sorted already.
src/js/components/DataTable/DataTable.js:116: () => (onUpdate ? data : filterAndSortData(data, filters, onSearch, sort)),
src/js/components/DataTable/DataTable.js:117: [data, filters, onSearch, onUpdate, sort],
src/js/components/DataTable/DataTable.js:239: // toggle the sort direction on this property
src/js/components/DataTable/DataTable.js:240: const onSort = (property) => () => {
src/js/components/DataTable/DataTable.js:241: const external = sort ? sort.external : false;
src/js/components/DataTable/DataTable.js:243: if (!sort || property !== sort.property) direction = 'asc';
src/js/components/DataTable/DataTable.js:244: else if (sort.direction === 'asc') direction = 'desc';
src/js/components/DataTable/DataTable.js:246: const nextSort = { property, direction, external };
src/js/components/DataTable/DataTable.js:247: setSort(nextSort);
src/js/components/DataTable/DataTable.js:251: sort: nextSort,
src/js/components/DataTable/DataTable.js:261: if (onSortProp) onSortProp(nextSort);
src/js/components/DataTable/DataTable.js:280: if (sort?.property) opts.sort = sort;
src/js/components/DataTable/DataTable.js:308: if (sort?.property) opts.sort = sort;
src/js/components/DataTable/DataTable.js:398: if (sort?.property) opts.sort = sort;
src/js/components/DataTable/DataTable.js:439: if (sort?.property) opts.sort = sort;
src/js/components/DataTable/DataTable.js:498: sort={sort}
src/js/components/DataTable/DataTable.js:511: onSort={sortable || sortProp || onSortProp ? onSort : undefined}sed -n '1,260p' src/js/components/DataTable/DataTable.js && sed -n '1,240p' src/js/components/DataTable/__tests__/DataTable-test.jsoutput · 394 lines
Chunk ID: fea278
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 3387
Output:
Warning: truncated output (original token count: 3387)
Total output lines: 500
import React, {
useCallback,
useContext,
useEffect,
useMemo,
useRef,
useState,
Fragment,
} from 'react';
import { ThemeContext } from 'styled-components';
import { defaultProps } from '../../default-props';
import { useLayoutEffect } from '../../utils/use-isomorphic-layout-effect';
import { Box } from '../Box';
import { Text } from '../Text';
import { Header } from './Header';
import { Footer } from './Footer';
import { Body } from './Body';
import { GroupedBody } from './GroupedBody';
import { Pagination } from '../Pagination';
import {
buildFooterValues,
buildGroups,
buildGroupState,
filterAndSortData,
initializeFilters,
normalizeCellProps,
normalizePrimaryProperty,
} from './buildState';
import { normalizeShow, usePagination } from '../../utils';
import {
StyledContainer,
StyledDataTable,
StyledPlaceholder,
} from './StyledDataTable';
import { DataTablePropTypes } from './propTypes';
import { PlaceholderBody } from './PlaceholderBody';
function useGroupState(groups, groupBy) {
const [groupState, setGroupState] = useState(() =>
buildGroupState(groups, groupBy),
);
const [prevDeps, setPrevDeps] = useState({ groups, groupBy });
const { groups: prevGroups, groupBy: prevGroupBy } = prevDeps;
if (groups !== prevGroups || groupBy !== prevGroupBy) {
setPrevDeps({ groups, groupBy });
const nextGroupState = buildGroupState(groups, groupBy);
setGroupState(nextGroupState);
return [nextGroupState, setGroupState];
}
return [groupState, setGroupState];
}
const DataTable = ({
background,
border,
columns = [],
data = [],
disabled,
fill,
groupBy,
onClickRow, // removing unknown DOM attributes
onMore,
onSearch, // removing unknown DOM attributes
onSelect,
onSort: onSortProp,
onUpdate,
replace,
pad,
paginate,
pin,
placeholder,
primaryKey,
resizeable,
rowProps,
select,
show: showProp,
size,
sort: sortProp,
sortable,
rowDetails,
step = 50,
verticalAlign,
...rest
}) => {
const theme = useContext(ThemeContext) || defaultProps.theme;
// property name of the primary property
const primaryProperty = useMemo(
() => normalizePrimaryProperty(columns, primaryKey),
[columns, primaryKey],
);
// whether or not we should show a footer
const showFooter = useMemo(
() => columns.filter((c) => c.footer).length > 0,
[columns],
);
// what column we are actively capturing filter input on
const [filtering, setFiltering] = useState();
// the currently active filters
const [filters, setFilters] = useState(initializeFilters(columns));
// which column we are sorting on, with direction
const [sort, setSort] = useState(sortProp || {});
// the data filtered and sorted, if needed
// Note: onUpdate mode expects the data to be passed
// in completely filtered and sorted already.
const adjustedData = useMemo(
() => (onUpdate ? data : filterAndSortData(data, filters, onSearch, sort)),
[data, filters, onSearch, onUpdate, sort],
);
// the values to put in the footer cells
const footerValues = useMemo(
() => buildFooterValues(columns, adjustedData),
[adjustedData, columns],
);
// cell styling properties: background, border, pad
const cellProps = useMemo(
() => normalizeCellProps({ background, border, pad, pin }, theme),
[background, border, pad, pin, theme],
);
// if groupBy, an array with one item per unique groupBy key value
const groups = useMemo(
() => buildGroups(columns, adjustedData, groupBy, primaryProperty),
[adjustedData, columns, groupBy, primaryProperty],
);
// an object indicating which group values are expanded
const [groupState, setGroupState] = useGroupState(groups, groupBy);
const [limit, setLimit] = useState(step);
const [selected, setSelected] = useState(
select || (onSelect && []) || undefined,
);
useEffect(
() => setSelected(select || (onSelect && []) || undefined),
[onSelect, select],
);
const [rowExpand, setRowExpand] = useState([]);
// any customized column widths
const [widths, setWidths] = useState({});
// placeholder placement stuff
const headerRef = useRef();
const bodyRef = useRef();
const footerRef = useRef();
const [headerHeight, setHeaderHeight] = useState();
const [footerHeight, setFooterHeight] = useState();
// offset compensation when body overflows
const [scrollOffset, setScrollOffset] = useState(0);
// multiple pinned columns offset
const [pinnedOffset, setPinnedOffset] = useState();
const onHeaderWidths = useCallback(
(columnWidths) => {
const hasSelectColumn = Boolean(select || onSelect);
let pinnedProperties = columns
.map((pinnedColumn) => pinnedColumn.pin && pinnedColumn.property)
.filter((n) => n);
if (hasSelectColumn && pinnedProperties.length > 0) {
pinnedProperties = ['_grommetDataTableSelect', ...pinnedProperties];
}
const nextPinnedOffset = {};
i…3546 chars truncated…two', b: 2 },
]}
/>
</Grommet>,
);
expect(container.firstChild).toMatchSnapshot();
});
test('!primaryKey', () => {
const { container } = render(
<Grommet>
<DataTable
columns={[
{ property: 'a', header: 'A' },
{ property: 'b', header: 'B' },
]}
data={[
{ a: 'one', b: 1 },
{ a: 'two', b: 2 },
]}
primaryKey={false}
/>
</Grommet>,
);
expect(container.firstChild).toMatchSnapshot();
});
test('paths', () => {
const { container } = render(
<Grommet>
<DataTable
columns={[
{ property: 'a', header: 'A' },
{ property: 'b.c', header: 'B' },
]}
data={[
{ a: 'one', b: { c: 1 } },
{ a: 'two', b: { c: 2 } },
]}
/>
</Grommet>,
);
expect(container.firstChild).toMatchSnapshot();
});
test('primaryKey', () => {
const { container } = render(
<Grommet>
<DataTable
columns={[
{ property: 'a', header: 'A' },
{ property: 'b', header: 'B' },
]}
data={[
{ a: 'one', b: 1 },
{ a: 'two', b: 2 },
]}
primaryKey="b"
/>
</Grommet>,
);
expect(container.firstChild).toMatchSnapshot();
});
test('footer', () => {
const { container } = render(
<Grommet>
<DataTable
columns={[
{ property: 'a', header: 'A', footer: 'Total' },
{ property: 'b', header: 'B' },
]}
data={[
{ a: 'one', b: 1 },
{ a: 'two', b: 2 },
]}
/>
</Grommet>,
);
expect(container.firstChild).toMatchSnapshot();
});
test('footer node', () => {
const { getByText } = render(
<Grommet>
<DataTable
columns={[
{ property: 'a', header: 'A', footer: <span>Total</span> },
{ property: 'b', header: 'B' },
]}
data={[
{ a: 'one', b: 1 },
{ a: 'two', b: 2 },
]}
/>
</Grommet>,
);
expect(getByText('Total')).not.toBeNull();
});
test('sortable', () => {
const { container, getByText } = render(
<Grommet>
<DataTable
columns={[
{ property: 'a', header: 'A' },
{ property: 'b', header: 'B' },
]}
data={[
{ a: 'zero', b: 0 },
{ a: 'one', b: 1 },
{ a: 'two', b: 2 },
]}
sortable
/>
</Grommet>,
);
expect(container.firstChild).toMatchSnapshot();
const headerCell = getByText('A');
fireEvent.click(headerCell, {});
expect(container.firstChild).toMatchSnapshot();
});
test('onSort', () => {
const onSort = jest.fn();
const { container, getByText } = render(
<Grommet>
<DataTable
columns={[
{ property: 'a', header: 'A' },
{ property: 'b', header: 'B' },
]}
data={[
{ a: 'zero', b: 0 },
{ a: 'one', b: 1 },
{ a: 'two', b: 2 },
]}
onSort={onSort}
sortable
/>
</Grommet>,
);
expect(container.firstChild).toMatchSnapshot();
const headerCell = getByText('A');
fireEvent.click(headerCell, {});
expect(onSort).toBeCalledWith(
expect.objectContaining({ property: 'a', direction: 'asc' }),
);
expect(container.firstChild).toMatchSnapshot();
});
test('onSort external', () => {
const onSort = jest.fn();
const { container, getByText } = render(
<Grommet>
<DataTable
columns={[
{ property: 'a', header: 'A' },
{ property: 'b', header: 'B' },
]}
data={[
{ a: 'zero', b: 0 },
{ a: 'one', b: 1 },
{ a: 'two', b: 2 },
]}
onSort={onSort}
sort={{ property: 'a', direction: 'asc', external: true }}
/>
</Grommet>,
);
expect(container.firstChild).toMatchSnapshot();
const headerCell = getByText('A');
fireEvent.click(headerCell, {});
expect(onSort).toBeCalledWith(
expect.objectContaining({
property: 'a',
direction: 'desc',
external: true,
}),
);
expect(container.firstChild).toMatchSnapshot();
});
test('sort', () => {
const { container } = render(
<Grommet>
<DataTable
columns={[
{ property: 'a', header: 'A' },
{ property: 'b', header: 'B' },
]}
data={[
{ a: 'zero', b: 0 },
{ a: 'one', b: 1 },
{ a: 'two', b: 2 },
]}
sort={{ property: 'a', direction: 'asc' }}
/>
</Grommet>,
);
expect(container.firstChild).toMatchSnapshot();
});rg -n "function.*sort|\.sort\(|sortAscending|compare.*value|undefined.*sort|null.*sort" src/js/componentsoutput · 16 lines
Chunk ID: cccd22
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 230
Output:
src/js/components/Select/stories/ManyOptions.js:15: .sort((a, b) =>
src/js/components/Select/stories/ManyOptions.js:36: options.sort((p1, p2) => {
src/js/components/Select/stories/LazyLoadingOptions.js:8: .sort((a, b) =>
src/js/components/Select/stories/LazyLoadingOptions.js:31: options.sort((p1, p2) => {
src/js/components/Select/stories/CustomThemed/CustomSearch.js:184: const sortedContentPartners = [...allContentPartners].sort(
src/js/components/Select/stories/ChildrenRender.js:88: setSelected([...nextSelected].sort());
src/js/components/DataTable/stories/OnUpdate.js:113: groups.sort((a, b) => {
src/js/components/DataTable/stories/OnUpdate.js:130: members.sort((a, b) => sortCompare(a, b, sort));
src/js/components/DataTable/buildState.js:90: result.sort((d1, d2) => {
src/js/components/Chart/Chart.js:569: .sort((c1, c2) => c2.value - c1.value)I think I need to inspect the buildState and the imports to fully understand how lodash's get function is being utilized here. It's essential to see what values are being accessed and manipulated. Alright, let’s look closely at those parts to ensure everything is functioning properly. I want to make sure I get this right, as it's key to understanding how my piece fits together in the overall code!
sed -n '1,180p' src/js/components/DataTable/buildState.js && sed -n '210,360p' src/js/components/DataTable/__tests__/DataTable-test.jsoutput · 337 lines
Chunk ID: ef8a5a
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 2424
Output:
// This file contains helper functions for DataTable, to keep the component
// files simpler.
export const set = (obj, path, value) => {
let parts = path;
if (Object(obj) !== obj) return obj;
if (!Array.isArray(path)) parts = path.toString().match(/[^.[\]]+/g) || [];
parts.slice(0, -1).reduce((acc, item, index) => {
if (Object(acc[item]) === acc[item]) {
return acc[item];
}
acc[item] = Math.abs(parts[index + 1]) > 0 === +parts[index + 1] ? [] : {};
return acc[item];
}, obj)[parts[parts.length - 1]] = value;
return obj;
};
// get the value for the property in the datum object
export const datumValue = (datum, property) => {
if (!property) return undefined;
const parts = property.split('.');
if (parts.length === 1) {
return datum[property];
}
if (!datum[parts[0]]) {
return undefined;
}
return datumValue(datum[parts[0]], parts.slice(1).join('.'));
};
// get the primary property name
export const normalizePrimaryProperty = (columns, primaryKey) => {
let result;
columns.forEach((column) => {
// remember the first key property
if (column.primary && !result) {
result = column.property;
}
});
if (!result) {
if (primaryKey === false) result = undefined;
else if (primaryKey) result = primaryKey;
else if (columns.length > 0) result = columns[0].property;
}
return result;
};
// initialize filters with empty strings
export const initializeFilters = (columns) => {
const result = {};
columns.forEach((column) => {
if (column.search) {
result[column.property] = '';
}
});
return result;
};
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#Escaping
const escapeRegExp = (input) => input.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
// filter data based on filters then sort
export const filterAndSortData = (data, filters, onSearch, sort) => {
let result = data;
if (!onSearch) {
const regexps = {};
Object.keys(filters)
.filter((n) => filters[n])
.forEach((n) => {
regexps[n] = new RegExp(escapeRegExp(filters[n]), 'i');
});
if (Object.keys(regexps).length > 0) {
result = data.filter(
(datum) =>
!Object.keys(regexps).some(
(property) => !regexps[property].test(datumValue(datum, property)),
),
);
}
}
if (sort && !sort.external) {
const { property, direction } = sort;
result = result === data ? [...data] : result; // don't sort caller's data
const sortAsc = direction === 'asc';
const before = sortAsc ? 1 : -1;
const after = sortAsc ? -1 : 1;
result.sort((d1, d2) => {
const d1Val = datumValue(d1, property);
const d2Val = datumValue(d2, property);
if (typeof d1Val === 'string' && typeof d2Val === 'string') {
const sortResult = d1Val.localeCompare(d2Val, undefined, {
sensitivity: 'base',
});
return sortAsc ? sortResult : -sortResult;
}
if (d1Val > d2Val) return before;
if (d1Val < d2Val) return after;
return 0;
});
}
return result;
};
// aggregate reducers
const sumReducer = (accumulated, next) => accumulated + next;
const minReducer = (accumulated, next) =>
accumulated === undefined ? next : Math.min(accumulated, next);
const maxReducer = (accumulated, next) =>
accumulated === undefined ? next : Math.max(accumulated, next);
const reducers = {
max: maxReducer,
min: minReducer,
sum: sumReducer,
};
// aggregate reducers init values
const reducersInitValues = {
min: Number.MAX_VALUE,
max: Number.MIN_VALUE,
sum: 0,
};
// aggregate a single column
const aggregateColumn = (column, data) => {
let value;
if (column.aggregate === 'avg') {
value = data.map((d) => datumValue(d, column.property)).reduce(sumReducer);
value /= data.length;
} else {
value = data
.map((d) => datumValue(d, column.property))
.reduce(reducers[column.aggregate], reducersInitValues[column.aggregate]);
}
return value;
};
// aggregate all columns that can
const aggregate = (columns, data) => {
let result = {};
columns.forEach((column) => {
if (column.aggregate) {
const value = aggregateColumn(column, data);
result = set(result, column.property, value);
}
});
return result;
};
// build the values for the footer cells
export const buildFooterValues = (columns, data) => {
const aggregateValues = aggregate(columns, data);
let result = {};
columns.forEach((column) => {
if (column.footer) {
if (column.footer.aggregate) {
const value = datumValue(aggregateValues, column.property);
result = set(result, column.property, value);
} else {
result = set(result, column.property, column.footer);
}
}
});
return result;
};
// looks at the groupBy property of each data object and returns an
// array with one item for each unique value of that property.
export const buildGroups = (columns, data, groupBy, primaryProperty) => {
let result;
if (groupBy?.property || typeof groupBy === 'string') {
result = [];
const groupMap = {};
const headerCell = getByText('A');
fireEvent.click(headerCell, {});
expect(onSort).toBeCalledWith(
expect.objectContaining({
property: 'a',
direction: 'desc',
external: true,
}),
);
expect(container.firstChild).toMatchSnapshot();
});
test('sort', () => {
const { container } = render(
<Grommet>
<DataTable
columns={[
{ property: 'a', header: 'A' },
{ property: 'b', header: 'B' },
]}
data={[
{ a: 'zero', b: 0 },
{ a: 'one', b: 1 },
{ a: 'two', b: 2 },
]}
sort={{ property: 'a', direction: 'asc' }}
/>
</Grommet>,
);
expect(container.firstChild).toMatchSnapshot();
});
test('sort nested object', () => {
const { container, getByText } = render(
<Grommet>
<DataTable
columns={[
{ property: 'a', header: 'A' },
{
property: 'b.value',
header: 'Value',
render: (datum) => datum.b && datum.b.value,
},
]}
data={[
{ a: 'zero', b: { value: 1 } },
{ a: 'one', b: { value: 2 } },
{ a: 'two', b: { value: 3 } },
]}
sort={{ property: 'b.value', direction: 'asc' }}
/>
</Grommet>,
);
expect(container.querySelectorAll('td').item(0).textContent).toBe('1');
expect(container.querySelectorAll('td').item(1).textContent).toBe('2');
expect(container.querySelectorAll('td').item(2).textContent).toBe('3');
fireEvent.click(getByText('Value'));
expect(container.querySelectorAll('td').item(0).textContent).toBe('3');
expect(container.querySelectorAll('td').item(1).textContent).toBe('2');
expect(container.querySelectorAll('td').item(2).textContent).toBe('1');
expect(container.firstChild).toMatchSnapshot();
});
test('sort nested object with onSort', () => {
const onSort = jest.fn();
const { container, getByText } = render(
<Grommet>
<DataTable
columns={[
{ property: 'a', header: 'A' },
{
property: 'b.value',
header: 'Value',
render: (datum) => datum.b && datum.b.value,
},
]}
data={[
{ a: 'zero', b: { value: 1 } },
{ a: 'one', b: { value: 2 } },
{ a: 'two', b: { value: 3 } },
]}
onSort={onSort}
sort={{ property: 'b.value', direction: 'asc' }}
/>
</Grommet>,
);
expect(container.querySelectorAll('td').item(0).textContent).toBe('1');
expect(container.querySelectorAll('td').item(1).textContent).toBe('2');
expect(container.querySelectorAll('td').item(2).textContent).toBe('3');
fireEvent.click(getByText('Value'));
expect(onSort).toBeCalledWith(
expect.objectContaining({ property: 'b.value' }),
);
expect(container.querySelectorAll('td').item(0).textContent).toBe('3');
expect(container.querySelectorAll('td').item(1).textContent).toBe('2');
expect(container.querySelectorAll('td').item(2).textContent).toBe('1');
expect(container.firstChild).toMatchSnapshot();
});
test('sort external', () => {
const { container } = render(
<Grommet>
<DataTable
columns={[
{ property: 'a', header: 'A' },
{ property: 'b', header: 'B' },
]}
data={[
{ a: 'zero', b: 0 },
{ a: 'one', b: 1 },
{ a: 'two', b: 2 },
]}
sort={{ property: 'a', direction: 'asc', external: true }}
/>
</Grommet>,
);
expect(container.firstChild).toMatchSnapshot();
});
test('search', () => {
const { container } = render(
<Grommet>
<DataTable
columns={[{ property: 'a', header: 'A', search: true }]}
data={[{ a: 'Alpha' }, { a: 'beta' }, { a: '[]' }]}
/>
</Grommet>,
);
expect(container.firstChild).toMatchSnapshot();
fireEvent.click(container.querySelector('[aria-label="Open search by a"]'));
const searchInput = container.querySelector('[name="search-a"]');
expect(document.activeElement).toBe(searchInput);
fireEvent.change(searchInput, {
target: { value: '[' },
});
expect(container.firstChild).toMatchSnapshot();
});
test('resizeable', () => {
const { container } = render(
<Grommet>
<DataTablecat package.json | sed -n '1,200p'; rg -n "get\(|lodash|get-value|path.*property" src/js/components/DataTable src/js/utilsoutput · 206 lines
Chunk ID: 556efe
Wall time: 0.0000 seconds
Process exited with code 1
Original token count: 1763
Output:
{
"name": "grommet",
"version": "2.25.1",
"main": "index.js",
"module": "es6/index.js",
"jsnext:main": "es6/index.js",
"sideEffects": [
"./src/js/contexts/ThemeContext/ThemeContext.js",
"./es6/contexts/ThemeContext/ThemeContext.js"
],
"description": "focus on the essential experience",
"authors": [
"Alan Souza",
"Bryan Jacquot",
"Chris Carlozzi",
"Eric Soderberg",
"Shimrit Yacobi"
],
"homepage": "http://grommet.io",
"bugs": "https://github.com/grommet/grommet/issues",
"license": "Apache-2.0",
"repository": {
"type": "git",
"url": "https://github.com/grommet/grommet.git"
},
"engine-strict": true,
"engines": {
"node": ">= 14"
},
"scripts": {
"build": "webpack --mode production && babel ./src/js/ --out-dir ./dist --ignore '**/**/__tests__' --ignore './e2e' --ignore 'src/**/portal.js' && copyfiles -u 2 \"src/js/**/**/*.*\" -e \"src/js/**/**/*.js\" -e \"src/js/**/**/*.js.snap\" \"./dist\" && cross-env BABEL_ENV=es6 babel ./src/js/ --out-dir ./dist/es6 --ignore '**/**/__tests__' --ignore 'src/**/portal.js' && copyfiles -u 2 \"src/js/**/**/*.*\" -e \"src/js/**/**/*.js\" -e \"src/js/**/**/*.js.snap\" \"./dist/es6\"",
"release-stable": "babel-node ./tools/release-stable",
"lint": "eslint src",
"lint-fix": "eslint src --fix",
"test": "jest --runInBand && yarn test-timezones",
"test-update": "jest --updateSnapshot && yarn test-timezones",
"test-watch": "jest --watchAll",
"test-bundlesize": "bundlesize",
"test-timezones": "TZ=Australia/Brisbane yarn test-calendar-dateinput --coverage=false && TZ=America/Los_Angeles yarn test-calendar-dateinput --coverage=false && TZ=Europe/Madrid yarn test-calendar-dateinput --coverage=false",
"test-calendar-dateinput": "jest ./src/js/components/Calendar/__tests__/Calendar-test.tsx ./src/js/components/DateInput/__tests__/DateInput-test.tsx",
"pack": "babel-node ./tools/pack",
"storybook": "cross-env NODE_ENV=development start-storybook -p 9001 -c storybook",
"start": "webpack serve --config ./e2e/webpack.config.js --mode development",
"test-e2e": "testcafe chrome:headless e2e/tests",
"build-storybook": "build-storybook -c storybook -o storybook-static",
"prettier": "pretty-quick --staged",
"chromatic": "chromatic -t 9q99in2ygnh"
},
"peerDependencies": {
"react": "^16.6.1 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.6.1 || ^17.0.0 || ^18.0.0",
"styled-components": ">= 5.1"
},
"dependencies": {
"@testing-library/testcafe": "^4.4.1",
"grommet-icons": "^4.7.0",
"hoist-non-react-statics": "^3.2.0",
"markdown-to-jsx": "^7.1.5",
"prop-types": "^15.8.1",
"testcafe": "^1.20.1",
"testcafe-react-selectors": "^5.0.2"
},
"devDependencies": {
"@babel/cli": "^7.18.9",
"@babel/core": "^7.18.9",
"@babel/eslint-parser": "^7.18.9",
"@babel/node": "^7.18.9",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-do-expressions": "^7.18.6",
"@babel/plugin-proposal-export-default-from": "^7.18.9",
"@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
"@babel/plugin-proposal-optional-chaining": "^7.18.9",
"@babel/plugin-proposal-pipeline-operator": "^7.18.9",
"@babel/preset-env": "^7.18.9",
"@babel/preset-react": "^7.18.6",
"@storybook/addon-a11y": "6.4.22",
"@storybook/addon-storysource": "6.4.22",
"@storybook/addon-toolbars": "6.4.22",
"@storybook/addons": "6.4.22",
"@storybook/react": "6.4.22",
"@storybook/source-loader": "6.4.22",
"@testing-library/dom": "8.14.0",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "14.2.1",
"@types/jest": "^28.1.6",
"@types/jest-axe": "^3.5.4",
"@types/node": "^18.6.2",
"@types/react": "^18.0.15",
"@types/react-dom": "^18.0.6",
"@types/styled-components": "^5.1.25",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "28.1.2",
"babel-loader": "^8.2.5",
"babel-plugin-styled-components": "2.0.6",
"babel-plugin-transform-imports": "^2.0.0",
"bundlesize2": "^0.0.31",
"chromatic": "^6.7.2",
"clean-webpack-plugin": "^4.0.0",
"copy-webpack-plugin": "^5.0.4",
"copyfiles": "^2.4.1",
"core-js": "^3.24.0",
"cross-env": "^7.0.3",
"del": "^6.1.1",
"elliptic": "^6.5.4",
"eslint": "^8.20.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-babel": "^5.3.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-prettier": "^4.1.0",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-testing-library": "^5.5.1",
"fs-extra": "^10.1.0",
"grommet-theme-aruba": "^0.1.2",
"grommet-theme-dxc": "^0.1.2",
"grommet-theme-hp": "^0.1.2",
"grommet-theme-hpe": "^3.2.1",
"jest": "28.1.2",
"jest-axe": "^6.0.0",
"jest-cli": "28.1.2",
"jest-environment-jsdom": "28.1.2",
"jest-styled-components": "7.0.5",
"jsdom": "^20.0.0",
"postcss": "^8.4.14",
"pre-commit": "^1.2.2",
"prettier": "^2.7.1",
"pretty-quick": "^3.1.3",
"react": "^18.2.0",
"react-dev-utils": "^12.0.1",
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"regenerator-runtime": "^0.13.9",
"require-reload": "^0.2.2",
"simple-git": "^3.10.0",
"styled-components": "^5.3.5",
"tarball-extract": "^0.0.6",
"ts-jest": "^28.0.7",
"ts-loader": "^8.4.0",
"typescript": "^4.7.4",
"webpack": "^4.44.2",
"webpack-cli": "^4.8.0",
"webpack-dev-server": "^4.9.3"
},
"jest": {
"globals": {
"ts-jest": {
"tsconfig": "tsconfig.tests.json"
}
},
"transform": {
"^.+\\.tsx?$": "ts-jest",
"^.+\\.jsx?$": "babel-jest"
},
"collectCoverage": true,
"testEnvironment": "jsdom",
"testEnvironmentOptions": {
"url": "http://localhost/"
},
"setupFilesAfterEnv": [
"<rootDir>/src/setupTests.js"
],
"coverageReporters": [
"lcov"
],
"collectCoverageFrom": [
"src/js/components/**/*.js",
"src/js/contexts/**/*.js",
"src/js/themes/**/*.js",
"src/js/utils/**/*.js",
"!src/js/**/**/*.stories.js",
"!src/js/**/**/stories/*.js",
"!src/js/**/**/stories/**/**/*.js",
"!src/js/utils/portal.js",
"!src/js/**/**/doc.js",
"!src/js/components/**/__tests__/**/*.js"
],
"coverageThreshold": {
"global": {
"branches": 76.3,
"functions": 88,
"lines": 87.5,
"statements": 86.6
}
},
"modulePathIgnorePatterns": [
"<rootDir>/dist/"
],
"testPathIgnorePatterns": [
"<rootDir>[/\\\\](dist|node_modules)[/\\\\]",
"components/(.*)/__tests__/(.*)/(.*).js"
]
},
"pre-commit": [
"lint-fix",
"prettier",
"test"rg -n "filterAndSortData|buildState" src/js/components/DataTable src/jsoutput · 22 lines
Chunk ID: aecc0e
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 377
Output:
src/js/components/DataTable/buildState.js:65:export const filterAndSortData = (data, filters, onSearch, sort) => {
src/js/components/DataTable/Header.js:27:import { datumValue } from './buildState';
src/js/components/DataTable/GroupedBody.js:10:import { datumValue, normalizeRowCellProps } from './buildState';
src/js/components/DataTable/DataTable.js:26: filterAndSortData,
src/js/components/DataTable/DataTable.js:30:} from './buildState';
src/js/components/DataTable/DataTable.js:116: () => (onUpdate ? data : filterAndSortData(data, filters, onSearch, sort)),
src/js/components/DataTable/Cell.js:8:import { datumValue } from './buildState';
src/js/components/DataTable/Body.js:15:import { datumValue, normalizeRowCellProps } from './buildState';
src/js/components/DataTable/buildState.js:65:export const filterAndSortData = (data, filters, onSearch, sort) => {
src/js/components/DataTable/Header.js:27:import { datumValue } from './buildState';
src/js/components/DataTable/Body.js:15:import { datumValue, normalizeRowCellProps } from './buildState';
src/js/components/DataTable/GroupedBody.js:10:import { datumValue, normalizeRowCellProps } from './buildState';
src/js/components/DataTable/DataTable.js:26: filterAndSortData,
src/js/components/DataTable/DataTable.js:30:} from './buildState';
src/js/components/DataTable/DataTable.js:116: () => (onUpdate ? data : filterAndSortData(data, filters, onSearch, sort)),
src/js/components/DataTable/Cell.js:8:import { datumValue } from './buildState';It seems like the default comparator for undefined properties is set to treat them as empty strings. I need to consider how null and undefined are both converted to empty strings. There’s an interesting aspect with number and string comparisons in JavaScript; for instance, comparisons between an empty string and numbers can yield unexpected results. The user expects undefined to be treated as an empty string, so mapping both null and undefined to an empty string seems like the right approach. I'll ensure to utilize localeCompare for proper string comparison.Evaluating number and null behavior
I think the existing comparator currently only handles strings, so when dealing with numbers and null, I might need to apply lexical comparisons. The expected handling of empty strings suggests I should normalize values, potentially using d1Val = datumValue(...) || '', but this could incorrectly treat 0 as false. Instead, using nullish coalescing with ?? '' seems better. I'll add regression tests for both null and undefined, structured with React and Grommet, ensuring the sorting behaves correctly even with mixed data types. I'll also check that the parent_id values are strings and confirm the order in the rendered table.Assessing test structure for DataTable
I’m looking at the existing sorting tests that evaluate values through table data cells. I need to ensure that if a cell is undefined, the render output includes a placeholder, so it’s clear during data observation. This means I should utilize another identifying column in the table's DOM cells. The DataTable should have a tbody for data rows, and I could implement querySelectorAll('tbody tr'). I’ll also check the tests for the body selector and make sure to inspect the relevant imports.
Clarifying string comparisons
I need to determine how to handle expected placements when comparing strings. An empty string sorts before non-empty strings in ascending order and after in descending. When comparing a string value of '' against 'a', the localeCompare gives -1, working correctly. For numeric comparisons, treating '' as lesser than any number is crucial, especially when handling undefined or null values. Normalizing these comparisons helps keep everything consistent through type-specific handling.Ensuring consistent sorting
I’m considering how undefined and empty string values interact when performing greater-than operations. This leads to unintended number coercion, so I might standardize sorting values with const d1Val = datumValue(...) ?? ''; for original comparators. I need to conduct regression tests, especially in DataTable-test, to check handles for null and undefined scenarios. Simpler tests that include strings mixed with nulls can help ensure meaningful row order. Maybe testing the buildState function and examining rendered table markup can provide better insights.
The comparator returns ties for nullish values; I’ll normalize them and add a regression test.
sed -n '1,90p' src/js/components/DataTable/__tests__/DataTable-test.js && rg -n "querySelectorAll\('td|tbody|textContent\).*toBe|\.item\(" src/js/components/DataTable/__tests__/DataTable-test.jsoutput · 108 lines
Chunk ID: cf0a3f
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 774
Output:
import React from 'react';
import 'jest-styled-components';
import { render, fireEvent } from '@testing-library/react';
import { Grommet } from '../../Grommet';
import { Box } from '../../Box';
import { Text } from '../../Text';
import { DataTable } from '..';
const DATA = [];
for (let i = 0; i < 95; i += 1) {
DATA.push({ a: `entry-${i}`, b: i });
}
describe('DataTable', () => {
test('empty', () => {
const { container } = render(
<Grommet>
<DataTable />
</Grommet>,
);
expect(container.firstChild).toMatchSnapshot();
});
test('basic', () => {
const { container } = render(
<Grommet>
<DataTable
columns={[
{ property: 'a', header: 'A' },
{ property: 'b', header: 'B' },
]}
data={[
{ a: 'one', b: 1 },
{ a: 'two', b: 2 },
]}
/>
</Grommet>,
);
expect(container.firstChild).toMatchSnapshot();
});
test('!primaryKey', () => {
const { container } = render(
<Grommet>
<DataTable
columns={[
{ property: 'a', header: 'A' },
{ property: 'b', header: 'B' },
]}
data={[
{ a: 'one', b: 1 },
{ a: 'two', b: 2 },
]}
primaryKey={false}
/>
</Grommet>,
);
expect(container.firstChild).toMatchSnapshot();
});
test('paths', () => {
const { container } = render(
<Grommet>
<DataTable
columns={[
{ property: 'a', header: 'A' },
{ property: 'b.c', header: 'B' },
]}
data={[
{ a: 'one', b: { c: 1 } },
{ a: 'two', b: { c: 2 } },
]}
/>
</Grommet>,
);
expect(container.firstChild).toMatchSnapshot();
});
test('primaryKey', () => {
const { container } = render(
<Grommet>
<DataTable
columns={[
{ property: 'a', header: 'A' },
{ property: 'b', header: 'B' },
]}
data={[
{ a: 'one', b: 1 },
{ a: 'two', b: 2 },
264: expect(container.querySelectorAll('td').item(0).textContent).toBe('1');
265: expect(container.querySelectorAll('td').item(1).textContent).toBe('2');
266: expect(container.querySelectorAll('td').item(2).textContent).toBe('3');
270: expect(container.querySelectorAll('td').item(0).textContent).toBe('3');
271: expect(container.querySelectorAll('td').item(1).textContent).toBe('2');
272: expect(container.querySelectorAll('td').item(2).textContent).toBe('1');
301: expect(container.querySelectorAll('td').item(0).textContent).toBe('1');
302: expect(container.querySelectorAll('td').item(1).textContent).toBe('2');
303: expect(container.querySelectorAll('td').item(2).textContent).toBe('3');
311: expect(container.querySelectorAll('td').item(0).textContent).toBe('3');
312: expect(container.querySelectorAll('td').item(1).textContent).toBe('2');
313: expect(container.querySelectorAll('td').item(2).textContent).toBe('1');rg -n "DataTable-test|jest.*testPath|yarn test" README.md CONTRIBUTING.md package.jsonoutput · 12 lines
Chunk ID: f7d415
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 189
Output:
package.json:35: "test": "jest --runInBand && yarn test-timezones",
package.json:36: "test-update": "jest --updateSnapshot && yarn test-timezones",
package.json:39: "test-timezones": "TZ=Australia/Brisbane yarn test-calendar-dateinput --coverage=false && TZ=America/Los_Angeles yarn test-calendar-dateinput --coverage=false && TZ=Europe/Madrid yarn test-calendar-dateinput --coverage=false",
CONTRIBUTING.md:110: any fail. To manually run tests, you should run `yarn test`. If you need to
CONTRIBUTING.md:111: update snapshots then run `yarn test-update`.
CONTRIBUTING.md:148:Jest tests are run using `yarn test` or `npm run test`. When changes to functionality are made, tests should always be included covering the functionality introduced.find .. -name AGENTS.md -printoutput · 6 lines
Chunk ID: 182e56
Wall time: 2.9138 seconds
Process exited with code 0
Original token count: 0
Output:rg -n "DataTable sort|DataTable-sort|zero|b.value|tbody" src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap | head -40 && rg -n "<tbody|tbody" src/js/components/DataTableoutput · 150 lines
Chunk ID: 90571e
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 4415
Output:
Warning: truncated output (original token count: 4415)
Total output lines: 223
138: <tbody
201: </tbody>
384: <tbody
449: </tbody>
608: <tbody
673: </tbody>
874: <tbody
965: </tbody>
1220: <tbody
1285: </tbody>
1354: <tbody
1419: </tbody>
1488: <tbody
1553: </tbody>
1727: <tbody
1792: </tbody>
1952: <tbody
2017: </tbody>
2086: <tbody
2151: </tbody>
2220: <tbody
2285: </tbody>
2354: <tbody
2419: </tbody>
2583: <tbody
2623: </tbody>
2657: <tbody
2697: </tbody>
3251: <tbody
3367: </tbody>
3441: <tbody
3557: </tbody>
3693: <tbody
3734: </tbody>
3768: <tbody
3809: </tbody>
4199: <tbody
4305: </tbody>
4355: <tbody
4534: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:138: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:201: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:384: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:449: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:608: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:673: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:874: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:965: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:1220: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:1285: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:1354: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:1419: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:1488: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:1553: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:1727: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:1792: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:1952: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:2017: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:2086: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:2151: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:2220: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:2285: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:2354: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:2419: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:2583: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:2623: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:2657: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:2697: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:3251: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:3367: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:3441: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:3557: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:3693: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:3734: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:3768: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:3809: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:4199: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:4305: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:4355: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:4534: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:4599: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:4668: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:4733: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:4802: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:4867: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:5054: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:5119: </tbody>
src/js/componen…7660 chars truncated…st.js.snap:18936: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:19201: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:19534: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:19802: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:19973: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:20038: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:20362: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:20419: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:20573: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:20594: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:20943: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:21044: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:21131: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:21259: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:21956: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:23509: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:23757: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:23931: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:24027: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:24718: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:26271: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:27056: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:27493: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:28348: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:29901: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:30051: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:31449: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:32234: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:33787: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:34572: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:35970: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:36373: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:36469: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:36776: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:36872: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:37179: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:37275: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:37582: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:37678: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:37920: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:38016: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:38151: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:38247: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:38430: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:38495: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:38687: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:38752: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:39057: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:39122: </tbody>
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:39171: <tbody
src/js/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap:39224: </tbody>
src/js/components/DataTable/StyledDataTable.js:91:// focus styling other than outline doesn't work on <tbody />
src/js/components/DataTable/PlaceholderBody.js:7: <tbody ref={ref}>
src/js/components/DataTable/PlaceholderBody.js:13: </tbody>I'm thinking about how to identify rows in a DataTable where we have one column for sorting. I need to separate values and consider missing entries, treating them as different rows. If there's a null or blank cell, that matters for what I display. I’ll sort the rows based on the 'value' property and the 'label' for comparison, ensuring that null values get handled correctly, maintaining stable insertion order while sorting string values.Testing Sort Behavior
I'm realizing that earlier, my comparator didn't handle missing values properly, which caused sorting issues. For example, using an input like [b, undefined, a, null], the old comparator isn't working as expected. It compares undefined and b, returning 0, but that creates a sequence problem. When I test JavaScript's Array sort, I find that it treats undefined elements differently by putting them at the end, while null comparisons still get processed. I need to check this with a more structured data array to see if the old method fails.Simulating JS Sorting Behavior
I’m noticing that native JavaScript automatically pushes undefined values to the end of the array, regardless of the comparator. So when I sort an input array, I might end up with something like ['z', '', 'a', 'b', undefined], which isn’t what I expect since null should come before alpha characters. I need to simulate this behavior in Node.js to see how it deals with these values more accurately and adjust my comparator accordingly.
Refining sort tests
I need to run some simple tests to make sure everything is working well, specifically focusing on patch tests and builds. It would be helpful to add tests for both ascending and descending sorts to verify that null values are interpreted as blank positions. I’ll check that the DataTable initializes a sort in ascending order and confirm that clicking the header toggles it to descending. I also need to ensure the sorting properties and behavior work correctly across both columns. It’s important to consider the row order during sorting, especially with cases involving null and undefined values.Sorting and Testing Values
I need to define distinct values for testing, such as null-1, null-2, alpha, and beta. I want to test both null and undefined rows, expecting the order [missing, null, alpha, beta], and for descending, [beta, alpha, missing, null]. I'll check for stability in sorting, ensuring ties are preserved regardless of direction. For input values like [beta, null, undefined, alpha], I'll expect descending order to be [beta, alpha, null, undefined]. I’ll also need to ensure the table structure includes only one <tbody> and confirm if row headers are part of it.Handling Null and Undefined Values
I’m considering adding a scenario with a nested property that has a null parent to address a bug related to null and undefined properties. The datumValue function can handle this simply. I want to implement normalization in the comparator values, ensuring that both undefined and null are treated as empty strings. I’m pondering if nullish values should consistently be at the front, as empty string sorting supports this in ascending and descending orders. Finally, I’ll need to create a patch to address these points.
I’ll preserve existing comparison rules while treating both null and undefined as empty strings.
apply_patch <<'PATCH'
*** Begin Patch
*** Update File: src/js/components/DataTable/buildState.js
@@
const before = sortAsc ? 1 : -1;
const after = sortAsc ? -1 : 1;
result.sort((d1, d2) => {
- const d1Val = datumValue(d1, property);
- const d2Val = datumValue(d2, property);
+ const d1Val = datumValue(d1, property) ?? '';
+ const d2Val = datumValue(d2, property) ?? '';
if (typeof d1Val === 'string' && typeof d2Val === 'string') {
const sortResult = d1Val.localeCompare(d2Val, undefined, {
sensitivity: 'base',
*** Update File: src/js/components/DataTable/__tests__/DataTable-test.js
@@
test('sort', () => {
const { container } = render(
<Grommet>
@@
);
expect(container.firstChild).toMatchSnapshot();
});
+ test('sort treats null and undefined values as empty strings', () => {
+ const { container, getByText } = render(
+ <Grommet>
+ <DataTable
+ columns={[
+ { property: 'name', header: 'Name' },
+ { property: 'value', header: 'Value' },
+ ]}
+ data={[
+ { name: 'beta', value: 'Beta' },
+ { name: 'null', value: null },
+ { name: 'undefined' },
+ { name: 'alpha', value: 'Alpha' },
+ ]}
+ sort={{ property: 'value', direction: 'asc' }}
+ />
+ </Grommet>,
+ );
+ const getSortedNames = () =>
+ Array.from(container.querySelectorAll('tbody tr')).map(
+ (row) => row.cells[0].textContent,
+ );
+
+ expect(getSortedNames()).toEqual(['null', 'undefined', 'alpha', 'beta']);
+
+ fireEvent.click(getByText('Value'));
+
+ expect(getSortedNames()).toEqual(['beta', 'alpha', 'null', 'undefined']);
+ });
+
test('sort nested object', () => {
*** End Patch
PATCHoutput · 9 lines
Wall time: 0.0000 seconds
Output:
Exit code: 0
Wall time: 0 seconds
Output:
Success. Updated the following files:
M src/js/components/DataTable/buildState.js
M src/js/components/DataTable/__tests__/DataTable-test.jsI need to run tests in a non-interactive mode, so I'll probably use yarn jest path -runInBand or just yarn jest. I should double-check the package scripts to find the right command for running Jest tests. Also, verifying the Node modules is important. If needed, I can run targeted Jest tests. It might be worth considering linting as well, so I’ll make sure to focus on that aspect too.
Patch is in; I’m running the focused DataTable tests to verify both sort directions.
yarn jest src/js/components/DataTable/__tests__/DataTable-test.js --runInBand --coverage=falseoutput · 8 lines
Chunk ID: caf1f7
Wall time: 1.0012 seconds
Process running with session ID 99494
Original token count: 35
Output:
yarn run v1.22.22
$ /testbed/node_modules/.bin/jest src/js/components/DataTable/__tests__/DataTable-test.js --runInBand --coverage=falseoutput · 78 lines
Chunk ID: 5b2df5
Wall time: 1.0355 seconds
Process exited with code 0
Original token count: 697
Output:
(node:2245) [DEP0040] DeprecationWarning: The `punycode` module is deprecated. Please use a userland alternative instead.
(Use `node --trace-deprecation ...` to show where the warning was created)
PASS src/js/components/DataTable/__tests__/DataTable-test.js (5.006 s)
DataTable
✓ empty (30 ms)
✓ basic (24 ms)
✓ !primaryKey (14 ms)
✓ paths (10 ms)
✓ primaryKey (17 ms)
✓ footer (12 ms)
✓ footer node (12 ms)
✓ sortable (37 ms)
✓ onSort (33 ms)
✓ onSort external (28 ms)
✓ sort (19 ms)
✓ sort treats null and undefined values as empty strings (20 ms)
✓ sort nested object (23 ms)
✓ sort nested object with onSort (21 ms)
✓ sort external (19 ms)
✓ search (35 ms)
✓ resizeable (26 ms)
✓ aggregate (13 ms)
✓ aggregate with nested object (17 ms)
✓ rowDetails (35 ms)
✓ rowDetails condtional (31 ms)
✓ groupBy (22 ms)
✓ groupBy toggle (41 ms)
✓ click (12 ms)
✓ disabled click (9 ms)
✓ background (27 ms)
✓ border (34 ms)
✓ pad (27 ms)
✓ rowProps (13 ms)
✓ groupBy property (20 ms)
✓ groupBy expand (24 ms)
✓ groupBy onExpand (29 ms)
✓ replace (10 ms)
✓ themeColumnSizes (10 ms)
✓ absoluteColumnSizes (9 ms)
✓ relativeColumnSizes (11 ms)
✓ fill (29 ms)
✓ pin (33 ms)
✓ pin + background (27 ms)
✓ pin + background context (36 ms)
✓ select (77 ms)
✓ disabled select (24 ms)
✓ custom theme (34 ms)
✓ units (12 ms)
✓ placeholder (25 ms)
✓ should paginate (107 ms)
✓ should apply pagination styling (94 ms)
✓ should show correct item index when "show" is a number (110 ms)
✓ should show correct page when "show" is { page: # } (70 ms)
✓ should render correct num items per page (step) (47 ms)
✓ should render new data when page changes (104 ms)
✓ should not show paginate controls when data is empty array (7 ms)
✓ should not show paginate controls when length of data < step (9 ms)
✓ onSelect select/unselect all (67 ms)
✓ onSelect + groupBy should select/deselect all when grouped (78 ms)
✓ onSelect + groupBy should select all items within a group (36 ms)
✓ onSelect + groupBy should render indeterminate checkbox on table and
group if subset of group items are selected (60 ms)
✓ onSelect + groupBy should render indeterminate checkbox on table and
group when controlled (28 ms)
✓ verticalAlign (23 ms)
Test Suites: 1 passed, 1 total
Tests: 59 passed, 59 total
Snapshots: 74 passed, 74 total
Time: 5.272 s
Ran all test suites matching /src\/js\/components\/DataTable\/__tests__\/DataTable-test.js/i.
Done in 5.70s.I need to think about running a lint check and inspecting the differences in my files. I might want to target specific files with eslint, using a command like yarn eslint .... Also, checking my status with git diff --check could be helpful. I’m considering working on these tasks in parallel to make the process more efficient. I'll go through the steps to ensure everything looks good!
Focused tests pass; I’m checking formatting and reviewing the final diff.
yarn eslint src/js/components/DataTable/buildState.js src/js/components/DataTable/__tests__/DataTable-test.jsoutput · 8 lines
Chunk ID: 92c515
Wall time: 1.0008 seconds
Process running with session ID 23376
Original token count: 38
Output:
yarn run v1.22.22
$ /testbed/node_modules/.bin/eslint src/js/components/DataTable/buildState.js src/js/components/DataTable/__tests__/DataTable-test.jsgit diff --check && git status --short && git diff -- src/js/components/DataTable/buildState.js src/js/components/DataTable/__tests__/DataTable-test.jsoutput · 64 lines
Chunk ID: eee433
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 589
Output:
M src/js/components/DataTable/__tests__/DataTable-test.js
M src/js/components/DataTable/buildState.js
diff --git a/src/js/components/DataTable/__tests__/DataTable-test.js b/src/js/components/DataTable/__tests__/DataTable-test.js
index 7103fd4..43ea5fd 100644
--- a/src/js/components/DataTable/__tests__/DataTable-test.js
+++ b/src/js/components/DataTable/__tests__/DataTable-test.js
@@ -239,6 +239,36 @@ describe('DataTable', () => {
expect(container.firstChild).toMatchSnapshot();
});
+ test('sort treats null and undefined values as empty strings', () => {
+ const { container, getByText } = render(
+ <Grommet>
+ <DataTable
+ columns={[
+ { property: 'name', header: 'Name' },
+ { property: 'value', header: 'Value' },
+ ]}
+ data={[
+ { name: 'beta', value: 'Beta' },
+ { name: 'null', value: null },
+ { name: 'undefined' },
+ { name: 'alpha', value: 'Alpha' },
+ ]}
+ sort={{ property: 'value', direction: 'asc' }}
+ />
+ </Grommet>,
+ );
+ const getSortedNames = () =>
+ Array.from(container.querySelectorAll('tbody tr')).map(
+ (row) => row.cells[0].textContent,
+ );
+
+ expect(getSortedNames()).toEqual(['null', 'undefined', 'alpha', 'beta']);
+
+ fireEvent.click(getByText('Value'));
+
+ expect(getSortedNames()).toEqual(['beta', 'alpha', 'null', 'undefined']);
+ });
+
test('sort nested object', () => {
const { container, getByText } = render(
<Grommet>
diff --git a/src/js/components/DataTable/buildState.js b/src/js/components/DataTable/buildState.js
index 619ffda..e3b86f9 100644
--- a/src/js/components/DataTable/buildState.js
+++ b/src/js/components/DataTable/buildState.js
@@ -88,8 +88,8 @@ export const filterAndSortData = (data, filters, onSearch, sort) => {
const before = sortAsc ? 1 : -1;
const after = sortAsc ? -1 : 1;
result.sort((d1, d2) => {
- const d1Val = datumValue(d1, property);
- const d2Val = datumValue(d2, property);
+ const d1Val = datumValue(d1, property) ?? '';
+ const d2Val = datumValue(d2, property) ?? '';
if (typeof d1Val === 'string' && typeof d2Val === 'string') {
const sortResult = d1Val.localeCompare(d2Val, undefined, {
sensitivity: 'base',output · 7 lines
Chunk ID: 3dccce
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 4
Output:
Done in 2.40s.I need to ensure that my reference lines are precise. I should mention the differences in lines like buildState.js:90 and DataTable-test.js:242, confirming that the tests pass and eslint checks out. It's important to keep it concise, no more than 10 lines overall. This final outcome will help me present the information clearly while meeting the requirements. I'll check again to make sure it all aligns properly.
Updated DataTable sorting to treat null and undefined values as empty strings, preserving the existing comparison behavior. Added coverage for ascending and descending sorts in src/js/components/DataTable/__tests__/DataTable-test.js:242.
Validation passed: all 59 DataTable tests, ESLint on the changed files, and git diff --check.
highlight.js-2958 · XML tag with a single-letter namespace not highlighted · resolved · 18 model calls · 25 commands · 210 s
What the images show: Output where <a:FAIL …> is plain text and the other tags are coloured
What the text already says: Sample code labels each line OK or FAIL; title: "single letter namespace prefix not highlighted"
(xml) line with single letter namespace prefix not highlighted since 10.4.0
**Are you using `highlight` or `highlightAuto`?**
`highlight`
**Sample Code to Reproduce**
```none
<abc:OK xmlns:abc="..." />
<ab:OK xmlns:ab="..." />
<a:FAIL xmlns:a="..." />
<OK xmlns="..." />
```
https://jsbin.com/gexeyen/edit?html,js,output
**Expected behavior**
```xml
<abc:OK xmlns:abc="..." />
<ab:OK xmlns:ab="..." />
<a:OK xmlns:a="..." />
<OK xmlns="..." />
```
```xml
<abc:OK xmlns:abc="..." />
<ab:OK xmlns:ab="..." />
<a:OK xmlns:a="...">
<AllOK xmlns="..." />
</a:Ok>
<OK xmlns="..." />
```
**Additional context**
* Reproducible since version 10.4.0.
* Initially [reported on Stack Exchange](https://meta.stackexchange.com/q/359456/394472) (now moved to this issue).
* Same behavior on Stack Overflow: https://stackoverflow.com/a/48559689/5846045 (See `<f:FlexibleColumnLayout>`).
You cannot see the images in this message; each was removed and only its position is marked.
[Image 1 of 2]
[Image 2 of 2]I recognize that I need to take a closer look at the repository to find solutions. It seems like a preamble should be established first to clarify what needs addressing. I'll make sure to inspect the contents carefully and determine the key issues that may require resolution. This approach should help in organizing my thoughts and identifying the next actionable steps. Alright, let's get to work on this!
I’ll trace the XML grammar change and add a focused regression test.
pwd && rg --files -g 'AGENTS.md' -g '*xml*' -g 'package.json' -g '*test*' | head -100output · 15 lines
Chunk ID: d7af3e
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 61
Output:
/testbed
test/markup/subunit/subunit-testline.txt
test/markup/subunit/subunit-testline.expect.txt
test/markup/pgsql/xml.txt
test/markup/pgsql/xml.expect.txt
test/browser/test_case.js
src/languages/xml.js
package.json
docs/building-testing.rstrg --files -g 'AGENTS.md' -g '!node_modules' /testbed / 2>/dev/null | head -80output · 6 lines
Chunk ID: 404383
Wall time: 10.0016 seconds
Process running with session ID 58319
Original token count: 0
Output:git status --short && sed -n '1,260p' src/languages/xml.js && cat package.jsonoutput · 314 lines
Chunk ID: f53648
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1851
Output:
/*
Language: HTML, XML
Website: https://www.w3.org/XML/
Category: common
Audit: 2020
*/
import * as regex from '../lib/regex.js';
/** @type LanguageFn */
export default function(hljs) {
// Element names can contain letters, digits, hyphens, underscores, and periods
const TAG_NAME_RE = regex.concat(/[A-Z_]/, regex.optional(/[A-Z0-9_.-]+:/), /[A-Z0-9_.-]*/);
const XML_IDENT_RE = /[A-Za-z0-9._:-]+/;
const XML_ENTITIES = {
className: 'symbol',
begin: /&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;/
};
const XML_META_KEYWORDS = {
begin: /\s/,
contains: [
{
className: 'meta-keyword',
begin: /#?[a-z_][a-z1-9_-]+/,
illegal: /\n/
}
]
};
const XML_META_PAR_KEYWORDS = hljs.inherit(XML_META_KEYWORDS, {
begin: /\(/,
end: /\)/
});
const APOS_META_STRING_MODE = hljs.inherit(hljs.APOS_STRING_MODE, {
className: 'meta-string'
});
const QUOTE_META_STRING_MODE = hljs.inherit(hljs.QUOTE_STRING_MODE, {
className: 'meta-string'
});
const TAG_INTERNALS = {
endsWithParent: true,
illegal: /</,
relevance: 0,
contains: [
{
className: 'attr',
begin: XML_IDENT_RE,
relevance: 0
},
{
begin: /=\s*/,
relevance: 0,
contains: [
{
className: 'string',
endsParent: true,
variants: [
{
begin: /"/,
end: /"/,
contains: [ XML_ENTITIES ]
},
{
begin: /'/,
end: /'/,
contains: [ XML_ENTITIES ]
},
{
begin: /[^\s"'=<>`]+/
}
]
}
]
}
]
};
return {
name: 'HTML, XML',
aliases: [
'html',
'xhtml',
'rss',
'atom',
'xjb',
'xsd',
'xsl',
'plist',
'wsf',
'svg'
],
case_insensitive: true,
contains: [
{
className: 'meta',
begin: /<![a-z]/,
end: />/,
relevance: 10,
contains: [
XML_META_KEYWORDS,
QUOTE_META_STRING_MODE,
APOS_META_STRING_MODE,
XML_META_PAR_KEYWORDS,
{
begin: /\[/,
end: /\]/,
contains: [
{
className: 'meta',
begin: /<![a-z]/,
end: />/,
contains: [
XML_META_KEYWORDS,
XML_META_PAR_KEYWORDS,
QUOTE_META_STRING_MODE,
APOS_META_STRING_MODE
]
}
]
}
]
},
hljs.COMMENT(
/<!--/,
/-->/,
{
relevance: 10
}
),
{
begin: /<!\[CDATA\[/,
end: /\]\]>/,
relevance: 10
},
XML_ENTITIES,
{
className: 'meta',
begin: /<\?xml/,
end: /\?>/,
relevance: 10
},
{
className: 'tag',
/*
The lookahead pattern (?=...) ensures that 'begin' only matches
'<style' as a single word, followed by a whitespace or an
ending braket. The '$' is needed for the lexeme to be recognized
by hljs.subMode() that tests lexemes outside the stream.
*/
begin: /<style(?=\s|>)/,
end: />/,
keywords: {
name: 'style'
},
contains: [ TAG_INTERNALS ],
starts: {
end: /<\/style>/,
returnEnd: true,
subLanguage: [
'css',
'xml'
]
}
},
{
className: 'tag',
// See the comment in the <style tag about the lookahead pattern
begin: /<script(?=\s|>)/,
end: />/,
keywords: {
name: 'script'
},
contains: [ TAG_INTERNALS ],
starts: {
end: /<\/script>/,
returnEnd: true,
subLanguage: [
'javascript',
'handlebars',
'xml'
]
}
},
// we need this for now for jSX
{
className: 'tag',
begin: /<>|<\/>/
},
// open tag
{
className: 'tag',
begin: regex.concat(
/</,
regex.lookahead(regex.concat(
TAG_NAME_RE,
// <tag/>
// <tag>
// <tag ...
regex.either(/\/>/, />/, /\s/)
))
),
end: /\/?>/,
contains: [
{
className: 'name',
begin: TAG_NAME_RE,
relevance: 0,
starts: TAG_INTERNALS
}
]
},
// close tag
{
className: 'tag',
begin: regex.concat(
/<\//,
regex.lookahead(regex.concat(
TAG_NAME_RE, />/
))
),
contains: [
{
className: 'name',
begin: TAG_NAME_RE,
relevance: 0
},
{
begin: />/,
relevance: 0
}
]
}
]
};
}
{
"name": "highlight.js",
"description": "Syntax highlighting with language autodetection.",
"keywords": [
"highlight",
"syntax"
],
"homepage": "https://highlightjs.org/",
"version": "10.5.0",
"author": {
"name": "Ivan Sagalaev",
"email": "maniac@softwaremaniacs.org"
},
"contributors": [],
"bugs": {
"url": "https://github.com/highlightjs/highlight.js/issues"
},
"license": "BSD-3-Clause",
"repository": {
"type": "git",
"url": "git://github.com/highlightjs/highlight.js.git"
},
"main": "./lib/index.js",
"types": "./types/index.d.ts",
"scripts": {
"mocha": "mocha",
"lint": "eslint src/*.js src/lib/*.js src/plugins/*.js demo/*.js",
"lint-languages": "eslint --no-eslintrc -c .eslintrc.lang.js src/languages/**/*.js",
"build_and_test": "npm run build && npm run test",
"build": "node ./tools/build.js -t node",
"build-cdn": "node ./tools/build.js -t cdn",
"build-browser": "node ./tools/build.js -t browser :common",
"test": "mocha test",
"test-markup": "mocha test/markup",
"test-detect": "mocha test/detect",
"test-browser": "mocha test/browser",
"test-parser": "mocha test/parser"
},
"engines": {
"node": "*"
},
"devDependencies": {
"@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^11.0.1",
"@typescript-eslint/eslint-plugin": "^4.6.1",
"@typescript-eslint/parser": "^4.6.1",
"clean-css": "^4.2.3",
"cli-table": "^0.3.1",
"colors": "^1.1.2",
"commander": "^6.2.0",
"deep-freeze-es6": "^1.4.1",
"del": "^6.0.0",
"dependency-resolver": "^2.0.1",
"eslint": "^7.12.1",
"eslint-config-standard": "^16.0.1",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^5.0.0",
"glob": "^7.1.6",
"glob-promise": "^3.4.0",
"handlebars": "^4.7.6",
"js-beautify": "^1.13.0",
"jsdom": "^16.4.0",
"lodash": "^4.17.20",
"mocha": "^8.2.1",
"refa": "^0.4.1",
"rollup": "^2.33.1",
"should": "^13.2.3",
"terser": "^5.3.8",
"tiny-worker": "^2.3.0",
"typescript": "^4.0.5"
}
}rg -n "xml|namespace|ATTR|TAG" test src/languages -g '*.js' -g '*.xml' -g '*.txt' | head -200output · 100 lines
Chunk ID: ef9f99
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 11059
Output:
Warning: truncated output (original token count: 11059)
Total output lines: 200
test/special/useBr.js:25: it('should recognize xml-style <br/>', () => {
src/languages/zephir.js:32: 'namespace class interface use extends ' +
src/languages/zephir.js:121: beginKeywords: 'namespace',
test/special/buildClassName.js:11: const expected = 'some-class hljs xml',
test/special/buildClassName.js:18: const expected = 'hljs some-class xml',
test/special/buildClassName.js:25: const expected = 'some-class hljs xml',
test/special/buildClassName.js:32: const expected = 'hljs some-class xml',
src/languages/xquery.js:6:Refactored to process xml constructor syntax and function-bodies. Added missing data-types, xpath operands, inbuilt functions, and query prologs
src/languages/xquery.js:16: 'module schema namespace boundary-space preserve no-preserve strip default collation base-uri ordering context decimal-format decimal-separator copy-namespaces empty-sequence except exponent-separator external grouping-separator inherit no-inherit lax minus-sign per-mille percent schema-attribute schema-element strict unordered zero-digit ' +
src/languages/xquery.js:27: 'item document-node node attribute document element comment namespace namespace-node processing-instruction text construction ' +
src/languages/xquery.js:61: // do not highlight inbuilt strings as variable or xml element names
src/languages/xquery.js:63: begin: /[^</$:'"-]\b(?:abs|accumulator-(?:after|before)|adjust-(?:date(?:Time)?|time)-to-timezone|analyze-string|apply|available-(?:environment-variables|system-properties)|avg|base-uri|boolean|ceiling|codepoints?-(?:equal|to-string)|collation-key|collection|compare|concat|contains(?:-token)?|copy-of|count|current(?:-)?(?:date(?:Time)?|time|group(?:ing-key)?|output-uri|merge-(?:group|key))?data|dateTime|days?-from-(?:date(?:Time)?|duration)|deep-equal|default-(?:collation|language)|distinct-values|document(?:-uri)?|doc(?:-available)?|element-(?:available|with-id)|empty|encode-for-uri|ends-with|environment-variable|error|escape-html-uri|exactly-one|exists|false|filter|floor|fold-(?:left|right)|for-each(?:-pair)?|format-(?:date(?:Time)?|time|integer|number)|function-(?:arity|available|lookup|name)|generate-id|has-children|head|hours-from-(?:dateTime|duration|time)|id(?:ref)?|implicit-timezone|in-scope-prefixes|index-of|innermost|insert-before|iri-to-uri|json-(?:doc|to-xml)|key|lang|last|load-xquery-module|local-name(?:-from-QName)?|(?:lower|upper)-case|matches|max|minutes-from-(?:dateTime|duration|time)|min|months?-from-(?:date(?:Time)?|duration)|name(?:space-uri-?(?:for-prefix|from-QName)?)?|nilled|node-name|normalize-(?:space|unicode)|not|number|one-or-more|outermost|parse-(?:ietf-date|json)|path|position|(?:prefix-from-)?QName|random-number-generator|regex-group|remove|replace|resolve-(?:QName|uri)|reverse|root|round(?:-half-to-even)?|seconds-from-(?:dateTime|duration|time)|snapshot|sort|starts-with|static-base-uri|stream-available|string-?(?:join|length|to-codepoints)?|subsequence|substring-?(?:after|before)?|sum|system-property|tail|timezone-from-(?:date(?:Time)?|time)|tokenize|trace|trans(?:form|late)|true|type-available|unordered|unparsed-(?:entity|text)?-?(?:public-id|uri|available|lines)?|uri-collection|xml-to-json|years?-from-(?:date(?:Time)?|duration)|zero-or-one)\b/
src/languages/xquery.js:72: end: /(?:zip-file|(?:xml|html|text|binary)-entry| (?:update-)?entries)\b/
src/languages/xquery.js:75: begin: /\b(?:util|db|functx|app|xdmp|xmldb):/,
src/languages/xquery.js:156: subLanguage: 'xml',
src/languages/xml.js:13: const TAG_NAME_RE = regex.concat(/[A-Z_]/, regex.optional(/[A-Z0-9_.-]+:/), /[A-Z0-9_.-]*/);
src/languages/xml.js:39: const TAG_INTERNALS = {
src/languages/xml.js:136: begin: /<\?xml/,
src/languages/xml.js:153: contains: [ TAG_INTERNALS ],
src/languages/xml.js:159: 'xml'
src/languages/xml.js:171: contains: [ TAG_INTERNALS ],
src/languages/xml.js:178: 'xml'
src/languages/xml.js:193: TAG_NAME_RE,
src/languages/xml.js:204: begin: TAG_NAME_RE,
src/languages/xml.js:206: starts: TAG_INTERNALS
src/languages/xml.js:216: TAG_NAME_RE, />/
src/languages/xml.js:222: begin: TAG_NAME_RE,
test/parser/reuse-endsWithParent.js:9: const TAG_CONTENTS = {className: 'name', begin: /\w+/, starts: {endsWithParent: true}};
test/parser/reuse-endsWithParent.js:11: const PAREN_TAG = {className: 'tag', begin: /\(/, end: /\)/, contains: [TAG_CONTENTS]};
test/parser/reuse-endsWithParent.js:12: const SQUARE_BRACKET_TAG = {className: 'tag', begin: /\[/, end: /\]/, contains: [TAG_CONTENTS]};
test/parser/reuse-endsWithParent.js:15: contains: [PAREN_TAG, SQUARE_BRACKET_TAG]
src/languages/vbscript-html.js:3:Requires: xml.js, vbscript.js
src/languages/vbscript-html.js:13: subLanguage: 'xml',
src/languages/vbnet.js:148: 'namespace narrowing new next notinheritable notoverridable ' + /* n */
src/languages/vbnet.js:156: 'addre…34234 chars truncated…on integer map pair string tag xml null ' +
src/languages/lasso.js:28: 'loop namespace_using output_none portal private protect records ' +
test/markup/twig/template_tags.expect.txt:1:<span class="hljs-template-tag">{% <span class="hljs-name"><span class="hljs-keyword">if</span></span> posts|<span class="hljs-keyword">length</span> %}</span><span class="xml">
test/markup/twig/template_tags.expect.txt:2: </span><span class="hljs-template-tag">{% <span class="hljs-name"><span class="hljs-keyword">for</span></span> article in articles %}</span><span class="xml">
test/markup/twig/template_tags.expect.txt:4: </span><span class="hljs-template-variable">{{ article.title|<span class="hljs-keyword">upper</span>() }}</span><span class="xml">
test/markup/twig/template_tags.expect.txt:6: </span><span class="hljs-comment">{# outputs 'WELCOME' #}</span><span class="xml">
test/markup/twig/template_tags.expect.txt:8: </span><span class="hljs-template-tag">{% <span class="hljs-name"><span class="hljs-keyword">endfor</span></span> %}</span><span class="xml">
test/markup/twig/template_tags.expect.txt:9:</span><span class="hljs-template-tag">{% <span class="hljs-name"><span class="hljs-keyword">endif</span></span> %}</span><span class="xml">
test/markup/twig/template_tags.expect.txt:11:</span><span class="hljs-template-tag">{% <span class="hljs-name"><span class="hljs-keyword">set</span></span> user = json_encode(user) %}</span><span class="xml">
test/markup/tp/default.txt:2:/ATTR
src/languages/javascript.js:31: const XML_TAG = {
src/languages/javascript.js:112: subLanguage: 'xml'
src/languages/javascript.js:328: begin: XML_TAG.begin,
src/languages/javascript.js:331: 'on:begin': XML_TAG.isTrulyOpeningTag,
src/languages/javascript.js:332: end: XML_TAG.end
src/languages/javascript.js:335: subLanguage: 'xml',
src/languages/javascript.js:338: begin: XML_TAG.begin,
src/languages/javascript.js:339: end: XML_TAG.end,
test/markup/tp/default.expect.txt:2:<span class="hljs-keyword">/ATTR</span>
test/markup/thrift/default.txt:1:namespace * thrift.test
test/markup/thrift/default.expect.txt:1:<span class="hljs-keyword">namespace</span> * thrift.test
src/languages/isbl.js:76: "SYSRES_CONST_ACTION_TYPE_LIFE_CYCLE_STAGE " +
src/languages/isbl.js:214: "SYSRES_CONST_BLACK_LIFE_CYCLE_STAGE_FONT_COLOR " +
src/languages/isbl.js:215: "SYSRES_CONST_BLUE_LIFE_CYCLE_STAGE_FONT_COLOR " +
src/languages/isbl.js:344: "SYSRES_CONST_EDOC_VERSION_ACTIVE_STAGE_CODE " +
src/languages/isbl.js:345: "SYSRES_CONST_EDOC_VERSION_DESIGN_STAGE_CODE " +
src/languages/isbl.js:346: "SYSRES_CONST_EDOC_VERSION_OBSOLETE_STAGE_CODE " +
src/languages/isbl.js:396: "SYSRES_CONST_GREEN_LIFE_CYCLE_STAGE_FONT_COLOR " +
src/languages/isbl.js:438: "SYSRES_CONST_ITALIC_LIFE_CYCLE_STAGE_DRAW_STYLE " +
src/languages/isbl.js:449: "SYSRES_CONST_KINDS_DEFAULT_EDOC_LIFE_STAGE_REQUISITE_CODE " +
src/languages/isbl.js:451: "SYSRES_CONST_KINDS_EDOC_ALLOW_LIFE_CYCLE_STAGE_CHANGING_REQUISITE_CODE " +
src/languages/isbl.js:459: "SYSRES_CONST_LIFE_CYCLE_START_STAGE_REQUISITE_CODE " +
src/languages/isbl.js:460: "SYSRES_CONST_LILAC_LIFE_CYCLE_STAGE_FONT_COLOR " +
src/languages/isbl.js:500: "SYSRES_CONST_NORMAL_LIFE_CYCLE_STAGE_DRAW_STYLE " +
src/languages/isbl.js:520: "SYSRES_CONST_ORANGE_LIFE_CYCLE_STAGE_FONT_COLOR " +
src/languages/isbl.js:541: "SYSRES_CONST_RED_LIFE_CYCLE_STAGE_FONT_COLOR " +
src/languages/isbl.js:675: "SYSRES_CONST_STRIKEOUT_LIFE_CYCLE_STAGE_DRAW_STYLE " +
src/languages/isbl.js:722: "SYSRES_CONST_UNDEFINED_LIFE_CYCLE_STAGE_FONT_COLOR " +
src/languages/isbl.js:1085: "SYSREQ_EDOC_LIFE_STAGE_NAME " +
src/languages/isbl.js:1149: "SYSREQ_EDOC_VERSION_LIFE_STAGE " +
src/languages/isbl.js:1479: "EDOC_VERSION_ACTIVE_STAGE_CODE " +
src/languages/isbl.js:1480: "EDOC_VERSION_DESIGN_STAGE_CODE " +
src/languages/isbl.js:1481: "EDOC_VERSION_OBSOLETE_STAGE_CODE ";
src/languages/isbl.js:3083: const DOCTAGS = {
src/languages/isbl.js:3097: DOCTAGS
src/languages/isbl.js:3109: DOCTAGS
src/languages/htmlbars.js:3: Requires: xml.js
src/languages/handlebars.js:3:Requires: xml.js
src/languages/handlebars.js:204: subLanguage: 'xml',
src/languages/handlebars.js:219: subLanguage: 'xml'
src/languages/clojure.js:34: 'refer keys select-keys vals key val rseq name namespace promise into transient persistent! conj! ' +
src/languages/fsharp.js:28: 'match member module mutable namespace new null of open or ' +
src/languages/flix.js:40: keyword: 'case class def else enum if impl import in lat rel index let match namespace switch type yield with'
src/languages/c-like.js:120: 'dynamic_cast|10 typedef const_cast|10 const for static_cast|10 union namespace ' +
src/languages/erb.js:3:Requires: xml.js, ruby.js
src/languages/erb.js:15: subLanguage: 'xml',
src/languages/axapta.js:101: 'namespace',The tag-name regex requires a colon prefix to exceed one character; I’m checking test conventions and history before fixing it.
find .. -name AGENTS.md -print; find . -maxdepth 2 -name AGENTS.md -printoutput · 9 lines
Chunk ID: f66392
Wall time: 10.0012 seconds
Process running with session ID 67193
Original token count: 39
Output:
find: ‘../proc/2114’: No such file or directory
find: ‘../proc/2129’: No such file or directory
find: ‘../proc/2131’: No such file or directoryrg --files test/markup | rg '/xml|markup/xml|xml\.' | head -100; ls test/markup/xml 2>/dev/null; rg -n "markup/xml|expect.txt|test/markup" testoutput · 28 lines
Chunk ID: b798a4
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 246
Output:
test/markup/xml/unquoted-attributes.txt
test/markup/xml/unquoted-attributes.expect.txt
test/markup/xml/sublanguage_no_relevancy.txt
test/markup/xml/sublanguage_no_relevancy.expect.txt
test/markup/xml/space-attributes.txt
test/markup/xml/space-attributes.expect.txt
test/markup/xml/document-type-variations.txt
test/markup/xml/document-type-variations.expect.txt
test/markup/pgsql/xml.expect.txt
test/markup/pgsql/xml.txt
document-type-variations.expect.txt
document-type-variations.txt
space-attributes.expect.txt
space-attributes.txt
sublanguage_no_relevancy.expect.txt
sublanguage_no_relevancy.txt
unquoted-attributes.expect.txt
unquoted-attributes.txt
test/index.js:18:// expected markup will be added into the `test/markup` folder to keep
test/markup/index.js:16: path.join(testDir, '*.expect.txt') :
test/markup/index.js:17: utility.buildPath('markup', language, '*.expect.txt');
test/markup/index.js:22: const testName = path.basename(filename, '.expect.txt');git log -8 --oneline -- src/languages/xml.js && git blame -L 8,17 src/languages/xml.js && git status --shortoutput · 17 lines
Chunk ID: c72937
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 246
Output:
006a478 doc(fix) Improve plugin-api types and docs (#2951)
^006a478 (Jan Pilzer 2021-01-06 22:00:50 -0800 8) import * as regex from '../lib/regex.js';
^006a478 (Jan Pilzer 2021-01-06 22:00:50 -0800 9)
^006a478 (Jan Pilzer 2021-01-06 22:00:50 -0800 10) /** @type LanguageFn */
^006a478 (Jan Pilzer 2021-01-06 22:00:50 -0800 11) export default function(hljs) {
^006a478 (Jan Pilzer 2021-01-06 22:00:50 -0800 12) // Element names can contain letters, digits, hyphens, underscores, and periods
^006a478 (Jan Pilzer 2021-01-06 22:00:50 -0800 13) const TAG_NAME_RE = regex.concat(/[A-Z_]/, regex.optional(/[A-Z0-9_.-]+:/), /[A-Z0-9_.-]*/);
^006a478 (Jan Pilzer 2021-01-06 22:00:50 -0800 14) const XML_IDENT_RE = /[A-Za-z0-9._:-]+/;
^006a478 (Jan Pilzer 2021-01-06 22:00:50 -0800 15) const XML_ENTITIES = {
^006a478 (Jan Pilzer 2021-01-06 22:00:50 -0800 16) className: 'symbol',
^006a478 (Jan Pilzer 2021-01-06 22:00:50 -0800 17) begin: /&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;/I'm realizing that the regex design for namespaces needs some adjustments. I should include a prefix that allows all characters following the initial letter and a colon. To accommodate this, I might modify the optional segment to allow for patterns like /[A-Z0-9_.-]*:/ while ensuring the XML name adheres to specifications. This approach would let me correctly validate input like a:. Additionally, I plan to set up a test fixture and stop searching by using process control.
output · 6 lines
Chunk ID: 71e36b
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 0
Output:I need to inspect the test snippets and the test runner setup. I’m wondering if I should also check the git log for previous revisions since it mentions version 10.4, but the current package is at 10.5. It seems likely that the regex changed with version 10.4. I need to take a closer look at the fixture conventions to get better insights.
sed -n '1,100p' test/markup/xml/space-attributes.txt && printf '\n--- expected ---\n' && sed -n '1,120p' test/markup/xml/space-attributes.expect.txt && printf '\n--- markup runner ---\n' && sed -n '1,120p' test/markup/index.jsoutput · 78 lines
Chunk ID: 5f5b25
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 660
Output:
<img src ="/pics/foo.jpg">
<img src= "/pics/foo.jpg">
<img src = "/pics/foo.jpg">
--- expected ---
<span class="hljs-tag"><<span class="hljs-name">img</span> <span class="hljs-attr">src</span> =<span class="hljs-string">"/pics/foo.jpg"</span>></span>
<span class="hljs-tag"><<span class="hljs-name">img</span> <span class="hljs-attr">src</span>= <span class="hljs-string">"/pics/foo.jpg"</span>></span>
<span class="hljs-tag"><<span class="hljs-name">img</span> <span class="hljs-attr">src</span> = <span class="hljs-string">"/pics/foo.jpg"</span>></span>
--- markup runner ---
'use strict';
const fs = require('fs').promises;
const glob = require('glob');
const hljs = require('../../build');
const path = require('path');
const utility = require('../utility');
hljs.debugMode();
const { getThirdPartyPackages } = require("../../tools/lib/external_language")
function testLanguage(language, {testDir}) {
describe(language, function() {
const where = testDir ?
path.join(testDir, '*.expect.txt') :
utility.buildPath('markup', language, '*.expect.txt');
const filePath = where;
const filenames = glob.sync(filePath);
filenames.forEach(function(filename) {
const testName = path.basename(filename, '.expect.txt');
const sourceName = filename.replace(/\.expect/, '');
it(`should markup ${testName}`, function(done) {
const sourceFile = fs.readFile(sourceName, 'utf-8');
const expectedFile = fs.readFile(filename, 'utf-8');
Promise.all([sourceFile, expectedFile]).then(function([source, expected]) {
const actual = hljs.highlight(language, source).value;
// Uncomment this for major changes that rewrite the test expectations
// which will then need to be manually compared by hand of course
// require('fs').writeFileSync(filename, actual);
actual.trim().should.equal(expected.trim());
done();
}).catch(function(err) { return done(err) });
});
});
});
}
describe('highlight() markup', async() => {
before(async function() {
const markupPath = utility.buildPath('markup');
if (!process.env.ONLY_EXTRA) {
const languages = await fs.readdir(markupPath);
languages.forEach(testLanguage);
}
const thirdPartyPackages = await getThirdPartyPackages();
thirdPartyPackages.forEach(
(pkg) => pkg.names.forEach(
(name, idx) => testLanguage(name, { testDir: pkg.markupTestPaths[idx] })
)
);
});
it("adding dynamic tests...", async function() {}); // this is required to work
});sed -n '1,180p' test/index.js && sed -n '1,160p' test/markup.js 2>/dev/null || true && rg -n "xml\.js|languages/xml|registerLanguage" test | head -80output · 47 lines
Chunk ID: 96f00d
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 535
Output:
'use strict';
const hljs = require('../build');
hljs.debugMode(); // tests run in debug mode so errors are raised
// Tests specific to the API exposed inside the hljs object.
// Right now, that only includes tests for several common regular expressions.
require('./api');
// Test weird bugs we've fixed over time
require("./parser");
// Tests for auto detection of languages via `highlightAuto`.
require('./detect');
// HTML markup tests for particular languages. Usually when there is an
// incorrect highlighting of one language, once the bug get fixed, the
// expected markup will be added into the `test/markup` folder to keep
// theses highlighting errors from cropping up again.
require('./markup');
// check regex for fatal issues like exponential backtracking, etc
require('./regex');
// Tests meant for the browser only. Using the `test/fixtures/index.html` file
// along with `jsdom` these tests check for things like: custom markup already
// existing in the code being highlighted, blocks that disable highlighting,
// and several other cases. Do note that the `test/fixtures/index.html` file
// isn't actually used to test inside a browser but `jsdom` acts as a virtual
// browser inside of node.js and runs together with all the other tests.
require('./special');
test/special/index.js:18: hljs.registerLanguage('nested', require('../fixtures/nested.js'));
test/parser/should-not-destroyData.js:9: hljs.registerLanguage('test-language', (hljs) => {
test/parser/reuse-endsWithParent.js:7: hljs.registerLanguage('test-language', (hljs) => {
test/parser/look-ahead-end-matchers.js:8: hljs.registerLanguage('test-language', (hljs) => {
test/parser/compiler-extensions.js:8: hljs.registerLanguage("extension_test", function(hljs) {
test/api/keywords.js:15: hljs.registerLanguage("test", grammar)
test/api/keywords.js:29: hljs.registerLanguage("test", grammar)
test/api/keywords.js:43: hljs.registerLanguage("test", grammar)
test/api/beginKeywords.js:24: hljs.registerLanguage("test", grammar);
test/api/beginKeywords.js:25: hljs.registerLanguage("has-followup", grammarWithFollowupRule);git show 006a478^:src/languages/xml.js 2>/dev/null | sed -n '8,18p'; cat .gitignore | head -80; test -d node_modules && echo node_modules-present || echo node_modules-absentoutput · 25 lines
Chunk ID: 4b0716
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 42
Output:
.DS_Store
build
docs/_build
__pycache__
*.swp
node_modules
.project
yarn.lock
extra/
# editors
.idea/
.vscode/
.Rproj.user
# misc
/work
/website
node_modules-presentI need a test fixture since the test has expected HTML. I might create something like namespace-prefix-single-letter.txt with examples covering all namespace cases, looking to verify any regressions. The expected output could be generated manually or via test command. It’s crucial to ensure file edits use apply_patch. I’ll assess whether test sources need to include both opening and nested structures. Also, I should check the current output and run nodes without additional builds. Let’s go ahead and run that!
I’ve confirmed the regression mechanism; next I’ll reproduce output and add a fixture for all prefix lengths.
node - <<'NODE'
const hljs = require('./build');
const source = '<abc:OK xmlns:abc="..." />\n<ab:OK xmlns:ab="..." />\n<a:FAIL xmlns:a="..." />\n<OK xmlns="..." />';
console.log(hljs.highlight('xml', source).value);
NODEoutput · 6 lines
Chunk ID: 2e9104
Wall time: 10.0011 seconds
Process running with session ID 96124
Original token count: 0
Output:git log --oneline --all -- src/languages/xml.js | head -20 && git status --shortoutput · 7 lines
Chunk ID: 2a637a
Wall time: 1.7679 seconds
Process exited with code 0
Original token count: 15
Output:
006a478 doc(fix) Improve plugin-api types and docs (#2951)output · 10 lines
Chunk ID: 3fbf3d
Wall time: 14.5227 seconds
Process exited with code 0
Original token count: 134
Output:
<span class="hljs-tag"><<span class="hljs-name">abc:OK</span> <span class="hljs-attr">xmlns:abc</span>=<span class="hljs-string">"..."</span> /></span>
<span class="hljs-tag"><<span class="hljs-name">ab:OK</span> <span class="hljs-attr">xmlns:ab</span>=<span class="hljs-string">"..."</span> /></span>
<a:FAIL xmlns:a="..." />
<span class="hljs-tag"><<span class="hljs-name">OK</span> <span class="hljs-attr">xmlns</span>=<span class="hljs-string">"..."</span> /></span>I’m thinking about a test named namespace-prefix.txt and the expected input it might have, like <a:OK xmlns:a="...">, followed by <AllOK xmlns="..." />, and then the closing tag </a:OK>. The goal is to ensure that the nested structure is accepted directly. I also want to include multiple prefixes to maintain proper separation and organization. This structure needs to handle namespaces correctly to avoid any confusion.
apply_patch <<'PATCH'
*** Begin Patch
*** Update File: /testbed/src/languages/xml.js
@@
- const TAG_NAME_RE = regex.concat(/[A-Z_]/, regex.optional(/[A-Z0-9_.-]+:/), /[A-Z0-9_.-]*/);
+ const TAG_NAME_RE = regex.concat(/[A-Z_]/, regex.optional(/[A-Z0-9_.-]*:/), /[A-Z0-9_.-]*/);
*** Add File: /testbed/test/markup/xml/namespace-prefix.txt
+<abc:OK xmlns:abc="..." />
+<ab:OK xmlns:ab="..." />
+<a:OK xmlns:a="...">
+ <AllOK xmlns="..." />
+</a:OK>
+<OK xmlns="..." />
*** Add File: /testbed/test/markup/xml/namespace-prefix.expect.txt
+<span class="hljs-tag"><<span class="hljs-name">abc:OK</span> <span class="hljs-attr">xmlns:abc</span>=<span class="hljs-string">"..."</span> /></span>
+<span class="hljs-tag"><<span class="hljs-name">ab:OK</span> <span class="hljs-attr">xmlns:ab</span>=<span class="hljs-string">"..."</span> /></span>
+<span class="hljs-tag"><<span class="hljs-name">a:OK</span> <span class="hljs-attr">xmlns:a</span>=<span class="hljs-string">"..."</span>></span>
+ <span class="hljs-tag"><<span class="hljs-name">AllOK</span> <span class="hljs-attr">xmlns</span>=<span class="hljs-string">"..."</span> /></span>
+<span class="hljs-tag"></<span class="hljs-name">a:OK</span>></span>
+<span class="hljs-tag"><<span class="hljs-name">OK</span> <span class="hljs-attr">xmlns</span>=<span class="hljs-string">"..."</span> /></span>
*** End Patch
PATCH
npm run test-markup -- --grep '^highlight\(\) markup xml should markup namespace-prefix$'output · 7 lines
Chunk ID: c44426
Wall time: 1.0002 seconds
Process running with session ID 9967
Original token count: 13
Output:
/bin/bash: line 1: apply_patch: command not foundoutput · 14 lines
Chunk ID: 96ec6f
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 36
Output:
> highlight.js@10.5.0 test-markup
> mocha test/markup --grep ^highlight\(\) markup xml should markup namespace-prefix$
0 passing (0ms)The shell lacks apply_patch; I’m locating the provided patch helper before making edits.
type -a apply_patch || true; printf 'PATH=%s\n' "$PATH"; rg --files /tmp /usr/local/bin /usr/bin 2>/dev/null | rg '(^|/)apply_patch$' | head -20output · 8 lines
Chunk ID: ac0a4c
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 120
Output:
/bin/bash: line 1: type: apply_patch: not found
PATH=/var/tmp/vf-codex-0.155.1-1.12.0/acp/node_modules/@agentclientprotocol/codex-acp/node_modules/@openai/codex-linux-x64/vendor/x86_64-unknown-linux-musl/codex-path:/var/tmp/vf-codex-0.155.1-1.12.0/acp/node_modules/@agentclientprotocol/codex-acp/node_modules/@openai/codex-linux-x64/vendor/x86_64-unknown-linux-musl/codex-path:/usr/local/nvm/versions/node/v21.6.2/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/binls -la /var/tmp/vf-codex-0.155.1-1.12.0/acp/node_modules/@agentclientprotocol/codex-acp/node_modules/@openai/codex-linux-x64/vendor/x86_64-unknown-linux-musl/codex-pathoutput · 10 lines
Chunk ID: f6a2d4
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 38
Output:
total 5292
drwxr-xr-x 2 root root 4096 Oct 14 23:38 .
drwxr-xr-x 5 root root 4096 Oct 14 23:38 ..
-rwxr-xr-x 1 root root 5408904 Oct 14 23:38 rgpatch -p1 <<'PATCH'
*** Begin Patch
*** Update File: src/languages/xml.js
@@
- const TAG_NAME_RE = regex.concat(/[A-Z_]/, regex.optional(/[A-Z0-9_.-]+:/), /[A-Z0-9_.-]*/);
+ const TAG_NAME_RE = regex.concat(/[A-Z_]/, regex.optional(/[A-Z0-9_.-]*:/), /[A-Z0-9_.-]*/);
*** Add File: test/markup/xml/namespace-prefix.txt
+<abc:OK xmlns:abc="..." />
+<ab:OK xmlns:ab="..." />
+<a:OK xmlns:a="...">
+ <AllOK xmlns="..." />
+</a:OK>
+<OK xmlns="..." />
*** Add File: test/markup/xml/namespace-prefix.expect.txt
+<span class="hljs-tag"><<span class="hljs-name">abc:OK</span> <span class="hljs-attr">xmlns:abc</span>=<span class="hljs-string">"..."</span> /></span>
+<span class="hljs-tag"><<span class="hljs-name">ab:OK</span> <span class="hljs-attr">xmlns:ab</span>=<span class="hljs-string">"..."</span> /></span>
+<span class="hljs-tag"><<span class="hljs-name">a:OK</span> <span class="hljs-attr">xmlns:a</span>=<span class="hljs-string">"..."</span>></span>
+ <span class="hljs-tag"><<span class="hljs-name">AllOK</span> <span class="hljs-attr">xmlns</span>=<span class="hljs-string">"..."</span> /></span>
+<span class="hljs-tag"></<span class="hljs-name">a:OK</span>></span>
+<span class="hljs-tag"><<span class="hljs-name">OK</span> <span class="hljs-attr">xmlns</span>=<span class="hljs-string">"..."</span> /></span>
*** End Patch
PATCH
npm run build && npx mocha test/markup --grep 'xml should markup namespace-prefix'output · 18 lines
Chunk ID: 4da669
Wall time: 1.0003 seconds
Process running with session ID 35764
Original token count: 105
Output:
patch: **** Only garbage was found in the patch input.
> highlight.js@10.5.0 build
> node ./tools/build.js -t node
Starting build.
Finished build.
Writing styles.
Writing package.json.
Writing languages.
...............................................................................................................................................................................................
Writing highlight.jsI'm focusing on using git apply, which supports the diff --git format with a specific structure. I need to create a standard patch and utilize the patch -p1 command to apply changes. After that, I should test to ensure the build command runs without issues, even if there are no changes. I have to pay attention to any ignored statuses in the build output, and I'm thinking that maybe I could use git apply with the patch text directly.
Updating on patching process
I need to give a clear update about the patch helper being unavailable. I want to say something like, "The patch helper isn't installed, so I'm applying an equivalent unified patch. After that, I’ll rebuild the test bundle and run it." I hope this communicates effectively, so the user isn't confused about what's happening. It's important to keep the information straightforward and transparent!
The patch helper isn’t installed, so I’m applying the same unified diff and rebuilding the test bundle.
patch -p1 <<'PATCH'
--- a/src/languages/xml.js
+++ b/src/languages/xml.js
@@ -10,7 +10,7 @@
/** @type LanguageFn */
export default function(hljs) {
// Element names can contain letters, digits, hyphens, underscores, and periods
- const TAG_NAME_RE = regex.concat(/[A-Z_]/, regex.optional(/[A-Z0-9_.-]+:/), /[A-Z0-9_.-]*/);
+ const TAG_NAME_RE = regex.concat(/[A-Z_]/, regex.optional(/[A-Z0-9_.-]*:/), /[A-Z0-9_.-]*/);
const XML_IDENT_RE = /[A-Za-z0-9._:-]+/;
const XML_ENTITIES = {
className: 'symbol',
--- /dev/null
+++ b/test/markup/xml/namespace-prefix.txt
@@ -0,0 +1,6 @@
+<abc:OK xmlns:abc="..." />
+<ab:OK xmlns:ab="..." />
+<a:OK xmlns:a="...">
+ <AllOK xmlns="..." />
+</a:OK>
+<OK xmlns="..." />
--- /dev/null
+++ b/test/markup/xml/namespace-prefix.expect.txt
@@ -0,0 +1,6 @@
+<span class="hljs-tag"><<span class="hljs-name">abc:OK</span> <span class="hljs-attr">xmlns:abc</span>=<span class="hljs-string">"..."</span> /></span>
+<span class="hljs-tag"><<span class="hljs-name">ab:OK</span> <span class="hljs-attr">xmlns:ab</span>=<span class="hljs-string">"..."</span> /></span>
+<span class="hljs-tag"><<span class="hljs-name">a:OK</span> <span class="hljs-attr">xmlns:a</span>=<span class="hljs-string">"..."</span>></span>
+ <span class="hljs-tag"><<span class="hljs-name">AllOK</span> <span class="hljs-attr">xmlns</span>=<span class="hljs-string">"..."</span> /></span>
+<span class="hljs-tag"></<span class="hljs-name">a:OK</span>></span>
+<span class="hljs-tag"><<span class="hljs-name">OK</span> <span class="hljs-attr">xmlns</span>=<span class="hljs-string">"..."</span> /></span>
PATCH
npm run build && npx mocha test/markup --grep 'xml should markup namespace-prefix'output · 20 lines
Chunk ID: 7e5e9b
Wall time: 1.0002 seconds
Process running with session ID 66199
Original token count: 127
Output:
patching file src/languages/xml.js
patching file test/markup/xml/namespace-prefix.txt
patching file test/markup/xml/namespace-prefix.expect.txt
> highlight.js@10.5.0 build
> node ./tools/build.js -t node
Starting build.
Finished build.
Writing styles.
Writing package.json.
Writing languages.
...............................................................................................................................................................................................
Writing highlight.jsoutput · 10 lines
Chunk ID: 84e975
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 6
Output:
0 passing (1ms)I need to run specific tests using Mocha. I think the command npx mocha test/index.js --grep 'xml should markup namespace-prefix' gets me where I need to go. Alternatively, I can look at test/markup/index.js, since that’s where some tests are emitted. Running Mocha directly with npx mocha test/markup/index.js will load that markup, but I want to ensure I check if the test succeeds and might run the entire markup suite too. Let's see how it goes!
The build passed, but the first Mocha path loaded no tests; I’m rerunning the XML markup suite through its actual loader.
npx mocha test/markup/index.js --grep 'xml should markup namespace-prefix' && git status --short && git diff -- src/languages/xml.js test/markup/xml/namespace-prefix.txt test/markup/xml/namespace-prefix.expect.txtoutput · 26 lines
Chunk ID: 83858f
Wall time: 0.1307 seconds
Process exited with code 0
Original token count: 191
Output:
0 passing (1ms)
M src/languages/xml.js
?? test/markup/xml/namespace-prefix.expect.txt
?? test/markup/xml/namespace-prefix.txt
diff --git a/src/languages/xml.js b/src/languages/xml.js
index 31268b5..db7920b 100644
--- a/src/languages/xml.js
+++ b/src/languages/xml.js
@@ -10,7 +10,7 @@ import * as regex from '../lib/regex.js';
/** @type LanguageFn */
export default function(hljs) {
// Element names can contain letters, digits, hyphens, underscores, and periods
- const TAG_NAME_RE = regex.concat(/[A-Z_]/, regex.optional(/[A-Z0-9_.-]+:/), /[A-Z0-9_.-]*/);
+ const TAG_NAME_RE = regex.concat(/[A-Z_]/, regex.optional(/[A-Z0-9_.-]*:/), /[A-Z0-9_.-]*/);
const XML_IDENT_RE = /[A-Za-z0-9._:-]+/;
const XML_ENTITIES = {
className: 'symbol',I’m wondering why the test at test/markup/index.js doesn’t match the expected path. When I run npx mocha test/markup/index.js, it seems like it loads the JavaScript but isn't matching any specs. This might be due to the async before hook that doesn't recognize the nested language tests. There could also be a formatting issue in the test title. I need to check the configurations and perhaps run tests directly using npm test.Examining Mocha test behavior
I might be getting a 0 result because test/index.js isn’t found. The package setting, "test": "mocha test", possibly fails to search recursively through nested files. It seems like it selects only test/*.js, leaving out any deeper paths. The before callback might be where the nested declarations occur, but Mocha could be disallowing async setups for those tests. I should run npm test normally to check visibility and run with a grep filter afterward to see what tests are loaded.Analyzing Mocha test structure
I'm looking at how describe('highlight() markup', async() => {...}) works with the before hook. It seems like the before might be trying to dynamically add tests, but Mocha might not allow that. It could be that tests initialized during the before don't actually get executed. I'm also considering whether the markup path glob.sync fails due to lack of language directories, which might mean the test runner isn't set up properly. I’ll need to dig deeper into how the test structure is working.
Running Mocha Tests
I'm considering if Mocha needs to discover .js nested indexes in a specific way. When I run the command npx mocha test/markup/index.js, it shouldn't be grep-related, but rather just focused on executing. There are over 100 markup tests, and I might need to skip certain external packages. I’ll follow through with this command to ensure everything runs smoothly without additional complications. Let's go ahead and execute that!
The markup tests create cases dynamically, so grep filters them out; I’m running the complete markup suite.
npx mocha test/markup/index.jsoutput · 524 lines
Chunk ID: 51d138
Wall time: 0.8160 seconds
Process exited with code 0
Original token count: 3971
Output:
Warning: truncated output (original token count: 3971)
Total output lines: 806
highlight() markup
✓ adding dynamic tests...
1c
✓ should markup default
abnf
✓ should markup default
accesslog
✓ should markup default
actionscript
✓ should markup method-call
ada
✓ should markup default
angelscript
✓ should markup default
apache
✓ should markup default
applescript
✓ should markup default
arcade
✓ should markup profile
arduino
✓ should markup default
armasm
✓ should markup default
asciidoc
✓ should markup constrained
✓ should markup default
✓ should markup unconstrained
aspectj
✓ should markup intertype-constructor
✓ should markup intertype-method
autohotkey
✓ should markup default
autoit
✓ should markup default
avrasm
✓ should markup default
awk
✓ should markup default
axapta
✓ should markup default
bash
✓ should markup arithmetic
✓ should markup escaped-quote
✓ should markup no-numbers
✓ should markup strings
✓ should markup token-containing-keyword
✓ should markup variables
basic
✓ should markup default
bnf
✓ should markup default
brainfuck
✓ should markup default
cal
✓ should markup default
capnproto
✓ should markup default
ceylon
✓ should markup nested-comments
clean
✓ should markup default
clojure
✓ should markup globals_definition
✓ should markup hint_col
✓ should markup symbols-numbers
clojure-repl
✓ should markup prompt
cmake
✓ should markup default
coffeescript
✓ should markup division
✓ should markup freeze_bug
✓ should markup function
✓ should markup regex
coq
✓ should markup default
cos
✓ should markup basic
✓ should markup embedded
cpp
✓ should markup expression-keywords
✓ should markup function-declarations
✓ should markup function-params
✓ should markup function-title
✓ should markup number-literals
✓ should markup pointers-returns
✓ should markup preprocessor
✓ should markup primitive-types
✓ should markup string-literals
✓ should markup template_complexity
✓ should markup truncated-block-comment
✓ should markup truncated-raw-string
crmsh
✓ should markup default
crystal
✓ should markup defs
✓ should markup literals
✓ should markup macro
✓ should markup operators
✓ should markup regexes
✓ should markup toplevel-keywords
csharp
✓ should markup dotted-namespace
✓ should markup floats
✓ should markup functions
✓ should markup generic_modifiers
✓ should markup identifiers
✓ should markup records
✓ should markup string-interpolation
✓ should markup titles
csp
✓ should markup default
css
✓ should markup css_consistency
✓ should markup pseudo-selector
✓ should markup sample
✓ should markup url
d
✓ should markup default
dart
✓ should markup comment-markdown
✓ should markup string-interpolation
delphi
✓ should markup compiler-directive
diff
✓ should markup comments
✓ should markup git-format-patch
django
✓ should markup default
dns
✓ should markup default
dockerfile
✓ should markup default
dos
✓ should markup comments
dsconfig
✓ should markup default
dts
✓ should markup default
dust
✓ should markup default
ebnf
✓ should markup quote-symbols
✓ should markup terminators
✓ should markup underscore-production
elixir
✓ should markup function-not-regex
✓ should markup function-title
✓ should markup numbers
✓ should markup sigils
✓ should markup strings
✓ should markup uppercase-string-sigil
elm
✓ should markup default
erb
✓ should markup default
erlang
✓ should markup numbers
erlang-repl
✓ should markup default
excel
✓ should markup comments
fix
✓ should markup default
flix
✓ should markup default
fortran
✓ should markup comments
✓ should markup numbers
fsharp
✓ should markup bang-keywords
✓ should markup comments
gams
✓ should markup default
gauss
✓ should markup function_defs
✓ should markup function_refs
✓ should markup keywords
gcode
✓ should markup default
gherkin
✓ should markup default
glsl
✓ should markup default
gml
✓ should markup default
go
✓ should markup functions
✓ should markup numbers
✓ should markup strings
golo
✓ should markup default
gradle
✓ should markup default
groovy
✓ should markup default
✓ should markup oneoffs
haml
✓ should markup default
handlebars
✓ should markup block-expression-varian…5565 chars truncated…on-header
✓ should markup keywords
✓ should markup matrix-multiplication
✓ should markup numbers
python-repl
✓ should markup sample
q
✓ should markup default
qml
✓ should markup default
r
✓ should markup names
✓ should markup numbers
✓ should markup roxygen
✓ should markup strings
reasonml
✓ should markup functions
✓ should markup literals
✓ should markup modules
✓ should markup pattern-matching
rib
✓ should markup default
roboconf
✓ should markup default
routeros
✓ should markup default
rsl
✓ should markup default
ruby
✓ should markup gemfile
✓ should markup heredoc
✓ should markup numbers
✓ should markup prompt
✓ should markup regexes
ruleslanguage
✓ should markup default
rust
✓ should markup comments
✓ should markup numbers
✓ should markup strings
✓ should markup traits
✓ should markup types
✓ should markup variables
sas
✓ should markup default
scala
✓ should markup case-classes
scheme
✓ should markup lambda
✓ should markup quoted
scilab
✓ should markup default
scss
✓ should markup css_consistency
✓ should markup default
shell
✓ should markup command-continuation
✓ should markup plain-prompt
✓ should markup prompt-with-slash
✓ should markup simple
✓ should markup single
smali
✓ should markup default
smalltalk
✓ should markup default
sml
✓ should markup default
sqf
✓ should markup default
sql
✓ should markup functions
✓ should markup join
✓ should markup keywords
✓ should markup numeric-types
✓ should markup set-operator
✓ should markup string-types
✓ should markup types
✓ should markup values-statement
sql_more
✓ should markup interval
✓ should markup join
✓ should markup lateral-view
✓ should markup window-function
stan
✓ should markup default
stata
✓ should markup built_ins
step21
✓ should markup default
stylus
✓ should markup css_consistency
✓ should markup default
subunit
✓ should markup subunit-errorline
✓ should markup subunit-failureline
✓ should markup subunit-progressline
✓ should markup subunit-skipline
✓ should markup subunit-successline
✓ should markup subunit-tagline
✓ should markup subunit-testline
✓ should markup subunit-timeline
✓ should markup subunit-uxsuccessline
✓ should markup subunit-xfailline
swift
✓ should markup attributes
✓ should markup functions
✓ should markup identifiers
✓ should markup keywords
✓ should markup numbers
✓ should markup operator-declarations
✓ should markup operators
✓ should markup precedencegroup
✓ should markup strings
✓ should markup swiftui
✓ should markup tuples
✓ should markup types
taggerscript
✓ should markup default
tap
✓ should markup basic
✓ should markup without-numbers
✓ should markup yaml-block
tcl
✓ should markup default
thrift
✓ should markup default
tp
✓ should markup default
twig
✓ should markup filter_with_underscore
✓ should markup template_tags
typescript
✓ should markup class
✓ should markup declares
✓ should markup decorator-factories
✓ should markup functions
✓ should markup identifiers_that_include_keywords
✓ should markup inline-languages
✓ should markup jsx
✓ should markup module-id
✓ should markup nested-templates
✓ should markup numbers-and-dashes
✓ should markup numbers
vala
✓ should markup default
vbnet
✓ should markup comments
✓ should markup default
✓ should markup directives
✓ should markup literals
✓ should markup numbers
vbscript
✓ should markup default
vbscript-html
✓ should markup default
verilog
✓ should markup misc
✓ should markup numbers
vhdl
✓ should markup default
vim
✓ should markup strings-comments
x86asm
✓ should markup labels-directives
xl
✓ should markup default
xml
✓ should markup document-type-variations
✓ should markup namespace-prefix
✓ should markup space-attributes
✓ should markup sublanguage_no_relevancy
✓ should markup unquoted-attributes
xquery
✓ should markup computed_inbuilt
✓ should markup direct_method
✓ should markup function_body
✓ should markup prolog_declarations
yaml
✓ should markup block
✓ should markup inline
✓ should markup keys
✓ should markup numbers
✓ should markup string
✓ should markup tag
zephir
✓ should markup default
423 passing (662ms)I need to run a linting command for languages, possibly using npm run lint-languages. It should be quick and cover everything. I’ll also test the full suite to make sure it passes. Checking the Git diff and status will help. I might want to specifically run the command for XML grammar by targeting the appropriate script. I’ll confirm the diff lines again and check the Git status after running all the checks.
The markup suite passes all 423 cases, including the new namespace fixture; I’m checking formatting and final diff now.
npx eslint --no-eslintrc -c .eslintrc.lang.js src/languages/xml.js && git diff --checkoutput · 6 lines
Chunk ID: da8df4
Wall time: 0.2057 seconds
Process exited with code 0
Original token count: 0
Output:git status --short && git diff --stat && git diff -- src/languages/xml.js && nl -ba src/languages/xml.js | sed -n '10,16p' && nl -ba test/markup/xml/namespace-prefix.txtoutput · 37 lines
Chunk ID: 2eec86
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 340
Output:
M src/languages/xml.js
?? test/markup/xml/namespace-prefix.expect.txt
?? test/markup/xml/namespace-prefix.txt
src/languages/xml.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/languages/xml.js b/src/languages/xml.js
index 31268b5..db7920b 100644
--- a/src/languages/xml.js
+++ b/src/languages/xml.js
@@ -10,7 +10,7 @@ import * as regex from '../lib/regex.js';
/** @type LanguageFn */
export default function(hljs) {
// Element names can contain letters, digits, hyphens, underscores, and periods
- const TAG_NAME_RE = regex.concat(/[A-Z_]/, regex.optional(/[A-Z0-9_.-]+:/), /[A-Z0-9_.-]*/);
+ const TAG_NAME_RE = regex.concat(/[A-Z_]/, regex.optional(/[A-Z0-9_.-]*:/), /[A-Z0-9_.-]*/);
const XML_IDENT_RE = /[A-Za-z0-9._:-]+/;
const XML_ENTITIES = {
className: 'symbol',
10 /** @type LanguageFn */
11 export default function(hljs) {
12 // Element names can contain letters, digits, hyphens, underscores, and periods
13 const TAG_NAME_RE = regex.concat(/[A-Z_]/, regex.optional(/[A-Z0-9_.-]*:/), /[A-Z0-9_.-]*/);
14 const XML_IDENT_RE = /[A-Za-z0-9._:-]+/;
15 const XML_ENTITIES = {
16 className: 'symbol',
1 <abc:OK xmlns:abc="..." />
2 <ab:OK xmlns:ab="..." />
3 <a:OK xmlns:a="...">
4 <AllOK xmlns="..." />
5 </a:OK>
6 <OK xmlns="..." />I’m noting that git diff --stat typically excludes untracked tests, which is normal. I might want the final output to include changed reference lines, keeping it to ten lines or fewer, and mentioning the tests executed. Since no further tools are needed, I should point out that the root cause allows zero additional characters after the initial letter. It could be useful to include the source line 13 and the fixture path. Formatting the heading is optional, but I’ll keep it concise.
Fixed XML tag matching so a single-letter namespace prefix is highlighted, including opening and closing tags. Added coverage for single- and multi-letter prefixes and unprefixed tags in test/markup/xml/namespace-prefix.txt:1.
Validation passed: all 423 markup tests, XML language lint, and git diff --check.
openlayers-14627 · applyTransform on an empty extent returns NaN · resolved · 24 model calls · 28 commands · 393 s
What the images show: WebGL stack trace; debugger in fromEPSG4326 with Infinity inputs
What the text already says: Repro code, the cause ("Math.tan will transform Infinity to NaN") and the expected behaviour
applyTransform for empty extent will get NaN
**Describe the bug**
applyTransform for empty extent will get a extent with NaN, use this extent as param to fit view will throw error.
**To Reproduce**
simple code is below
```javascript
import { applyTransform, createEmpty } from 'ol/extent';
import { getTransform } from 'ol/proj';
function fit(geomOrExtent) {
// default value
let extent = createEmpty();
if (isArray(geomOrExtent)) {
// assignment by case
}
extent = applyTransform(extent, getTransform('EPSG:4326', 'EPSG:3857'));
map.getView().fit(extent);
}
```
then get error
<img width="613" alt="image" src="https://user-images.githubusercontent.com/22017489/228728865-77f2f818-e6b8-4965-aac7-42d39694ef0c.png">
i found it actually cause by `fromEPSG4326` which return by `getTransform('EPSG:4326', 'EPSG:3857')`
more precisely, it's caused by `Math.tan` will transform `Infinity` to `NaN`.
see below
<img width="849" alt="image" src="https://user-images.githubusercontent.com/22017489/228727872-7b7dac45-0b75-4027-b0d0-cd9634426f47.png">
**Expected behavior**
`fromEPSG4326` can handle empty extent (`Infinity`) correctly
btw, the background is that my user use EPSG:4326, but tile service use EPSG:3857
so I need to do a conversion at the input and output.
You cannot see the images in this message; each was removed and only its position is marked.
[Image 1 of 2]
[Image 2 of 2]I’ll trace the projection transform and extent tests, then make the smallest fix.
pwd && rg --files -g 'AGENTS.md' -g 'package.json' -g '*proj*' -g '*extent*' | head -100 && git status --shortoutput · 49 lines
Chunk ID: b53b61
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 327
Output:
/testbed
site/src/doc/tutorials/raster-reprojection.md
package.json
test/node/ol/proj.test.js
test/node/ol/proj/proj4.test.js
test/node/ol/geom/flat/intersectsextent.test.js
test/node/ol/extent.test.js
config/jsdoc/package.json
examples/extent-interaction.html
examples/extent-constrained.js
examples/extent-constrained.html
examples/reprojection-wgs84.html
examples/wms-no-proj.js
examples/reprojection-image.js
examples/reprojection-image.html
examples/reprojection-by-code.js
examples/reprojection-by-code.html
examples/projection-and-scale.js
examples/projection-and-scale.html
examples/layer-extent.js
examples/layer-extent.html
examples/geotiff-reprojection.js
examples/geotiff-reprojection.html
examples/geotiff-reprojection.css
examples/extent-interaction.js
examples/wms-no-proj.html
examples/wms-image-custom-proj.js
examples/wms-image-custom-proj.html
examples/wms-custom-proj.js
examples/wms-custom-proj.html
examples/reprojection.js
test/browser/spec/ol/reproj/reproj.test.js
examples/reprojection.html
examples/reprojection.css
examples/reprojection-wgs84.js
test/browser/spec/ol/control/zoomtoextent.test.js
test/browser/spec/ol/interaction/extent.test.js
src/ol/extent.js
src/ol/geom/flat/intersectsextent.js
src/ol/proj.js
src/ol/reproj.js
src/ol/proj/projections.js
src/ol/proj/proj4.jsrg -n "fromEPSG4326|EPSG4326|applyTransform|createEmpty" src/ol test/node/oloutput · 137 lines
Chunk ID: 3c4d9d
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 2549
Output:
Warning: truncated output (original token count: 2549)
Total output lines: 131
src/ol/Map.js:26: apply as applyTransform,
src/ol/Map.js:869: return applyTransform(frameState.pixelToCoordinateTransform, pixel.slice());
src/ol/Map.js:1002: return applyTransform(
test/node/ol/geom/Point.test.js:188: describe('#applyTransform()', function () {
test/node/ol/geom/Point.test.js:196: point.applyTransform(transform);
test/node/ol/geom/Point.test.js:212: point.applyTransform(mod);
test/node/ol/geom/Point.test.js:217: const got = point.applyTransform(transform);
test/node/ol/geom/MultiPoint.test.js:264: describe('#applyTransform()', function () {
test/node/ol/geom/MultiPoint.test.js:275: multi.applyTransform(transform);
test/node/ol/geom/MultiPoint.test.js:293: multi.applyTransform(mod);
test/node/ol/geom/MultiPoint.test.js:301: const got = multi.applyTransform(transform);
src/ol/Geolocation.js:248: geometry.applyTransform(this.transform_);
src/ol/interaction/Snap.js:10:import {boundingExtent, buffer, createEmpty} from '../extent.js';
src/ol/interaction/Snap.js:217: createEmpty()
src/ol/source/UTFGrid.js:9:import {applyTransform, intersects} from '../extent.js';
src/ol/source/UTFGrid.js:432: extent = applyTransform(tileJSON['bounds'], transform);
src/ol/source/TileWMS.js:9:import {buffer, createEmpty} from '../extent.js';
src/ol/source/TileWMS.js:144: this.tmpExtent_ = createEmpty();
src/ol/source/TileJSON.js:11:import {applyTransform, intersects} from '../extent.js';
src/ol/source/TileJSON.js:175: extent = applyTransform(tileJSON['bounds'], transform);
src/ol/geom/flat/intersectsextent.js:6: createEmpty,
src/ol/geom/flat/intersectsextent.js:30: createEmpty(),
src/ol/source/TileArcGISRest.js:7:import {createEmpty} from '../extent.js';
src/ol/source/TileArcGISRest.js:107: this.tmpExtent_ = createEmpty();
src/ol/geom/flat/center.js:4:import {createEmpty, createOrUpdateFromFlatCoordinates} from '../../extent.js';
src/ol/geom/flat/center.js:15: let extent = createEmpty();
src/ol/geom/SimpleGeometry.js:206: applyTransform(transformFn) {
src/ol/geom/GeometryCollection.js:299: applyTransform(transformFn) {
src/ol/geom/GeometryCollection.js:302: geometries[i].applyTransform(transformFn);
src/ol/geom/Geometry.js:11: createEmpty,
src/ol/geom/Geometry.js:58: this.extent_ = createEmpty();
src/ol/geom/Geometry.js:95: clone.applyTransform(transform);
src/ol/geom/Geometry.js:267: applyTransform(transformFn) {
src/ol/geom/Geometry.js:342: this.applyTransform(transformFn);
test/node/ol/extent.test.js:274: const emptyExtent = _ol_extent_.createEmpty();
test/node/ol/extent.test.js:304: const none = _ol_extent_.createEmpty();
test/node/ol/extent.test.js:319: const none = _ol_extent_.createEmpty();
test/node/ol/extent.test.js:458: const extent = _ol_extent_.createEmpty();
test/node/ol/extent.test.js:783: describe('#applyTransform()', function () {
test/node/ol/extent.test.js:787: const destinationExtent = _ol_extent_.applyTransform(
test/node/ol/extent.test.js:815: const destinationExtent = _ol_extent_.applyTransform(
test/node/ol/extent.test.js:835: const destinationExtentN = _ol_extent_.applyTransform(
test/node/ol/extent.test.js:846: const destinationExtentNS = _ol_extent_.applyTransform(
test/node/ol/extent.test.js:862: const destinationExtentNS2 = _ol_extent_.applyTransform(
src/ol/source/Cluster.js:13: createEmpty,
src/ol/source/Cluster.js:262: const extent = createEmpty();
src/ol/source/BingMaps.js:6:import {applyTransform, intersects} from '../extent.js';
src/ol/source/BingMaps.js:297: const extent = applyTransform(epsg4326Extent, transform);
src/ol/format/Feature.js:275: transformed.applyTransform(transform);
src/ol/reproj.js:6: createEmpty,
src/ol/reproj.js:245: const sourceDataExtent = createEmpty();
src/ol/extent.js:26: const extent = createEmpty();
src/ol/extent.js:197:export function createEmpty() {
src/ol/extent.js:605: const intersection = dest ? dest : createEmpty();
src/ol/extent.js:811:export function applyTransform(extent, transformFn, dest, stops) {
src/ol/reproj/Triangulation.js:6: createEmpty,
src/ol/reproj/Triangulation.js:482: const extent = createEmpty();
src/ol/renderer/webgl/VectorLayer.js:22:import {buffer, createEmpty, equals, getWidth} from '../../extent.js';
src/ol/renderer/webgl/VectorLayer.js:108: this.previousExtent_ = createEmpty();
src/ol/renderer/webgl/TileLayer.js:15:import {apply as applyTransform} from '../../transform.js';
src/ol/renderer/webgl/TileLayer.js:278: const coordinate = applyTransform(
src/ol/renderer/webgl/PointsLayer.js:14: apply as applyTransform,
src/ol/renderer/webgl/PointsLayer.js:21:import {buffer, createEmpty, equals, getWidth} from '../../extent.js';
src/ol/renderer/webgl/PointsLayer.js:243: this.previousExtent_ = createEmpty();
src/ol/renderer/webgl/PointsLayer.js:604: applyTransform(projectionTransform, tmpCoords);
src/ol/renderer/webgl/PointsLayer.js:688: const pixel = ap…196 chars truncated…VectorLayer.js:22: createEmpty,
src/ol/renderer/canvas/VectorLayer.js:91: this.renderedExtent_ = createEmpty();
src/ol/renderer/canvas/VectorLayer.js:97: this.wrappedRenderedExtent_ = createEmpty();
src/ol/proj/epsg4326.js:36:class EPSG4326Projection extends Projection {
src/ol/proj/epsg4326.js:61: new EPSG4326Projection('CRS:84'),
src/ol/proj/epsg4326.js:62: new EPSG4326Projection('EPSG:4326', 'neu'),
src/ol/proj/epsg4326.js:63: new EPSG4326Projection('urn:ogc:def:crs:OGC:1.3:CRS84'),
src/ol/proj/epsg4326.js:64: new EPSG4326Projection('urn:ogc:def:crs:OGC:2:84'),
src/ol/proj/epsg4326.js:65: new EPSG4326Projection('http://www.opengis.net/def/crs/OGC/1.3/CRS84'),
src/ol/proj/epsg4326.js:66: new EPSG4326Projection('http://www.opengis.net/gml/srs/epsg.xml#4326', 'neu'),
src/ol/proj/epsg4326.js:67: new EPSG4326Projection('http://www.opengis.net/def/crs/EPSG/0/4326', 'neu'),
src/ol/proj/epsg3857.js:84:export function fromEPSG4326(input, output, dimension) {
src/ol/proj/epsg3857.js:116:export function toEPSG4326(input, output, dimension) {
src/ol/renderer/canvas/TileLayer.js:10: apply as applyTransform,
src/ol/renderer/canvas/TileLayer.js:18: createEmpty,
src/ol/renderer/canvas/TileLayer.js:91: this.tmpExtent = createEmpty();
src/ol/renderer/canvas/TileLayer.js:152: const coordinate = applyTransform(
src/ol/renderer/canvas/TileLayer.js:452: const origin = applyTransform(this.tempTransform, [
src/ol/renderer/canvas/Layer.js:8: apply as applyTransform,
src/ol/renderer/canvas/Layer.js:219: applyTransform(frameState.coordinateToPixelTransform, topLeft);
src/ol/renderer/canvas/Layer.js:220: applyTransform(frameState.coordinateToPixelTransform, topRight);
src/ol/renderer/canvas/Layer.js:221: applyTransform(frameState.coordinateToPixelTransform, bottomRight);
src/ol/renderer/canvas/Layer.js:222: applyTransform(frameState.coordinateToPixelTransform, bottomLeft);
src/ol/renderer/canvas/Layer.js:225: applyTransform(inverted, topLeft);
src/ol/renderer/canvas/Layer.js:226: applyTransform(inverted, topRight);
src/ol/renderer/canvas/Layer.js:227: applyTransform(inverted, bottomRight);
src/ol/renderer/canvas/Layer.js:228: applyTransform(inverted, bottomLeft);
src/ol/render.js:7: apply as applyTransform,
src/ol/render.js:140: return applyTransform(event.inversePixelTransform, pixel.slice(0));
src/ol/renderer/canvas/ImageLayer.js:8: apply as applyTransform,
src/ol/renderer/canvas/ImageLayer.js:112: const coordinate = applyTransform(
src/ol/render/webgl/utils.js:5:import {apply as applyTransform} from '../../transform.js';
src/ol/render/webgl/utils.js:141: const p0world = applyTransform(invertInstructionsTransform, [...p0]);
src/ol/render/webgl/utils.js:142: const p1world = applyTransform(invertInstructionsTransform, [...p1]);
src/ol/render/webgl/utils.js:191: const pBworld = applyTransform(invertInstructionsTransform, [...pB]);
src/ol/render/webgl/utils.js:201: const pAworld = applyTransform(invertInstructionsTransform, [...pA]);
src/ol/render/webgl/PointBatchRenderer.js:7:import {apply as applyTransform} from '../../transform.js';
src/ol/render/webgl/PointBatchRenderer.js:80: applyTransform(batch.renderInstructionsTransform, tmpCoords);
src/ol/layer/Graticule.js:16: applyTransform,
src/ol/layer/Graticule.js:856: const validExtent = applyTransform(
src/ol/layer/Graticule.js:1220: const worldExtentP = applyTransform(
src/ol/proj.js:59: fromEPSG4326,
src/ol/proj.js:60: toEPSG4326,
src/ol/proj.js:62:import {PROJECTIONS as EPSG4326_PROJECTIONS} from './proj/epsg4326.js';
src/ol/proj.js:74:import {applyTransform, getWidth} from './extent.js';
src/ol/proj.js:219: const toEPSG4326 = getTransformFromProjections(
src/ol/proj.js:223: if (toEPSG4326 === identityTransform && projUnits !== 'degrees') {
src/ol/proj.js:237: vertices = toEPSG4326(vertices, vertices, 2);
src/ol/proj.js:522: return applyTransform(extent, transformFunc, undefined, stops);
src/ol/proj.js:740: addEquivalentProjections(EPSG4326_PROJECTIONS);
src/ol/proj.js:744: EPSG4326_PROJECTIONS,
src/ol/proj.js:746: fromEPSG4326,
src/ol/proj.js:747: toEPSG4326
src/ol/render/canvas/ExecutorGroup.js:7:import {buffer, createEmpty, extendCoordinate} from '../../extent.js';
src/ol/render/canvas/ExecutorGroup.js:206: hitExtent = createEmpty();
src/ol/render/canvas/Executor.js:7: apply as applyTransform,
src/ol/render/canvas/Executor.js:12:import {createEmpty, createOrUpdate, intersects} from '../../extent.js';
src/ol/render/canvas/Executor.js:60:const tmpExtent = createEmpty();
src/ol/render/canvas/Executor.js:448: applyTransform(transform, p1);
src/ol/render/canvas/Executor.js:449: applyTransform(transform, p2);
src/ol/render/canvas/Executor.js:450: applyTransform(transform, p3);
src/ol/render/canvas/Executor.js:451: applyTransform(transform, p4);
src/ol/render/canvas/Executor.js:559: const origin = applyTransform(this.renderedTransform_, [0, 0]);find .. -name AGENTS.md -print && cat package.jsonoutput · 149 lines
Chunk ID: 93f49b
Wall time: 0.4761 seconds
Process exited with code 0
Original token count: 1241
Output:
{
"name": "ol",
"version": "7.3.1-dev",
"description": "OpenLayers mapping library",
"keywords": [
"map",
"mapping",
"openlayers"
],
"private": true,
"homepage": "https://openlayers.org/",
"scripts": {
"lint": "eslint tasks test src/ol examples config",
"pretest": "npm run lint && npm run typecheck",
"test-rendering": "npm run build-full && node test/rendering/test.js",
"test-browser": "npm run karma -- --single-run --log-level error",
"test-node": "mocha --recursive test/node",
"test": "npm run test-browser && npm run test-node && npm run test-rendering -- --force",
"karma": "karma start test/browser/karma.config.cjs",
"start": "npm run serve-examples",
"serve-examples": "webpack serve --config examples/webpack/config.mjs --mode development",
"build-examples": "shx rm -rf build/examples && webpack --config examples/webpack/config.mjs --mode production",
"build-package": "npm run build-full && npm run copy-css && npm run generate-types && node tasks/prepare-package.js",
"build-index": "shx rm -f build/index.js && npm run transpile && node tasks/generate-index.js",
"build-full": "shx rm -rf build/full && npm run build-index && npx rollup --config config/rollup-full-build.js",
"copy-css": "shx cp src/ol/ol.css build/ol/ol.css",
"generate-types": "tsc --project config/tsconfig-build.json --declaration --declarationMap --emitDeclarationOnly --outdir build/ol",
"transpile": "shx rm -rf build/ol && shx mkdir -p build/ol && shx cp -rf src/ol build && node tasks/serialize-workers.cjs && node tasks/set-version.js",
"typecheck": "tsc --pretty",
"apidoc-debug": "shx rm -rf build/apidoc && node --inspect-brk=9229 ./node_modules/jsdoc/jsdoc.js -R config/jsdoc/api/index.md -c config/jsdoc/api/conf.json -P package.json -d build/apidoc",
"apidoc": "shx rm -rf build/apidoc && jsdoc -R config/jsdoc/api/index.md -c config/jsdoc/api/conf.json -P package.json -d build/apidoc"
},
"type": "module",
"repository": {
"type": "git",
"url": "git://github.com/openlayers/openlayers.git"
},
"license": "BSD-2-Clause",
"bugs": {
"url": "https://github.com/openlayers/openlayers/issues"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/openlayers"
},
"dependencies": {
"earcut": "^2.2.3",
"geotiff": "^2.0.7",
"ol-mapbox-style": "^10.1.0",
"pbf": "3.2.1",
"rbush": "^3.0.1"
},
"devDependencies": {
"@metalsmith/in-place": "^4.5.0",
"@metalsmith/layouts": "^2.5.1",
"@metalsmith/markdown": "^1.6.0",
"@octokit/rest": "^19.0.3",
"@openlayers/eslint-plugin": "^4.0.0",
"@rollup/plugin-commonjs": "^24.0.0",
"@rollup/plugin-node-resolve": "^15.0.0",
"@types/arcgis-rest-api": "^10.4.4",
"@types/geojson": "^7946.0.7",
"@types/offscreencanvas": "^2019.6.4",
"@types/pbf": "^3.0.2",
"@types/proj4": "^2.5.2",
"@types/topojson-specification": "^1.0.1",
"chaikin-smooth": "^1.0.4",
"clean-css-cli": "5.6.2",
"copy-webpack-plugin": "^11.0.0",
"es-main": "^1.0.2",
"eslint": "^8.0.1",
"eslint-config-openlayers": "^18.0.0",
"expect.js": "0.3.1",
"express": "^4.17.1",
"front-matter": "^4.0.0",
"fs-extra": "^11.1.0",
"globby": "^13.0.0",
"handlebars": "4.7.7",
"jquery": "3.6.4",
"jsdoc": "4.0.2",
"jsdoc-plugin-intersection": "^1.0.4",
"jsdoc-plugin-typescript": "^2.2.0",
"json-stringify-safe": "^5.0.1",
"jstransformer-handlebars": "^1.2.0",
"karma": "^6.3.8",
"karma-chrome-launcher": "^3.1.0",
"karma-firefox-launcher": "^2.1.2",
"karma-mocha": "2.0.1",
"karma-source-map-support": "^1.4.0",
"karma-webpack": "^5.0.0",
"loglevelnext": "^5.0.5",
"marked": "4.3.0",
"metalsmith": "^2.5.0",
"mocha": "10.2.0",
"pixelmatch": "^5.1.0",
"pngjs": "^7.0.0",
"proj4": "2.9.0",
"puppeteer": "19.8.0",
"rollup": "^2.42.3",
"rollup-plugin-external-globals": "^0.7.1",
"rollup-plugin-terser": "^7.0.2",
"semver": "^7.3.7",
"serve-static": "^1.14.0",
"shx": "^0.3.2",
"sinon": "^15.0.0",
"source-map-loader": "^4.0.0",
"threads": "^1.6.5",
"typescript": "5.0.2",
"walk": "^2.3.9",
"webpack": "^5.27.2",
"webpack-cli": "^5.0.0",
"webpack-dev-middleware": "^6.0.0",
"webpack-dev-server": "^4.0.0-beta.2",
"webpack-sources": "^3.2.0",
"worker-loader": "^3.0.8",
"yargs": "^17.0.0"
},
"eslintConfig": {
"extends": "openlayers",
"plugins": [
"@openlayers"
],
"rules": {
"jsdoc/no-bad-blocks": "off",
"import/no-commonjs": "error",
"@openlayers/no-exclusive-tests": [
"error",
{
"include": "test/**/*.test.js"
}
]
}
},
"browserslist": [
"> 1%",
"last 2 versions",
"not dead"
],
"sideEffects": [
"proj.js",
"ol.css"
]
}The empty extent uses infinite coordinates; I’m checking transform sampling and projection tests.
sed -n '60,145p' src/ol/proj/epsg3857.js && sed -n '790,885p' src/ol/extent.jsoutput · 176 lines
Chunk ID: 6eb33f
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1243
Output:
/**
* Projections equal to EPSG:3857.
*
* @const
* @type {Array<import("./Projection.js").default>}
*/
export const PROJECTIONS = [
new EPSG3857Projection('EPSG:3857'),
new EPSG3857Projection('EPSG:102100'),
new EPSG3857Projection('EPSG:102113'),
new EPSG3857Projection('EPSG:900913'),
new EPSG3857Projection('http://www.opengis.net/def/crs/EPSG/0/3857'),
new EPSG3857Projection('http://www.opengis.net/gml/srs/epsg.xml#3857'),
];
/**
* Transformation from EPSG:4326 to EPSG:3857.
*
* @param {Array<number>} input Input array of coordinate values.
* @param {Array<number>} [output] Output array of coordinate values.
* @param {number} [dimension] Dimension (default is `2`).
* @return {Array<number>} Output array of coordinate values.
*/
export function fromEPSG4326(input, output, dimension) {
const length = input.length;
dimension = dimension > 1 ? dimension : 2;
if (output === undefined) {
if (dimension > 2) {
// preserve values beyond second dimension
output = input.slice();
} else {
output = new Array(length);
}
}
for (let i = 0; i < length; i += dimension) {
output[i] = (HALF_SIZE * input[i]) / 180;
let y = RADIUS * Math.log(Math.tan((Math.PI * (+input[i + 1] + 90)) / 360));
if (y > MAX_SAFE_Y) {
y = MAX_SAFE_Y;
} else if (y < -MAX_SAFE_Y) {
y = -MAX_SAFE_Y;
}
output[i + 1] = y;
}
return output;
}
/**
* Transformation from EPSG:3857 to EPSG:4326.
*
* @param {Array<number>} input Input array of coordinate values.
* @param {Array<number>} [output] Output array of coordinate values.
* @param {number} [dimension] Dimension (default is `2`).
* @return {Array<number>} Output array of coordinate values.
*/
export function toEPSG4326(input, output, dimension) {
const length = input.length;
dimension = dimension > 1 ? dimension : 2;
if (output === undefined) {
if (dimension > 2) {
// preserve values beyond second dimension
output = input.slice();
} else {
output = new Array(length);
}
}
for (let i = 0; i < length; i += dimension) {
output[i] = (180 * input[i]) / HALF_SIZE;
output[i + 1] =
(360 * Math.atan(Math.exp(input[i + 1] / RADIUS))) / Math.PI - 90;
}
return output;
}
!(startRel & Relationship.LEFT)
) {
// potentially intersects left
y = endY - (endX - minX) * slope;
intersects = y >= minY && y <= maxY;
}
}
return intersects;
}
/**
* Apply a transform function to the extent.
* @param {Extent} extent Extent.
* @param {import("./proj.js").TransformFunction} transformFn Transform function.
* Called with `[minX, minY, maxX, maxY]` extent coordinates.
* @param {Extent} [dest] Destination extent.
* @param {number} [stops] Number of stops per side used for the transform.
* By default only the corners are used.
* @return {Extent} Extent.
* @api
*/
export function applyTransform(extent, transformFn, dest, stops) {
let coordinates = [];
if (stops > 1) {
const width = extent[2] - extent[0];
const height = extent[3] - extent[1];
for (let i = 0; i < stops; ++i) {
coordinates.push(
extent[0] + (width * i) / stops,
extent[1],
extent[2],
extent[1] + (height * i) / stops,
extent[2] - (width * i) / stops,
extent[3],
extent[0],
extent[3] - (height * i) / stops
);
}
} else {
coordinates = [
extent[0],
extent[1],
extent[2],
extent[1],
extent[2],
extent[3],
extent[0],
extent[3],
];
}
transformFn(coordinates, coordinates, 2);
const xs = [];
const ys = [];
for (let i = 0, l = coordinates.length; i < l; i += 2) {
xs.push(coordinates[i]);
ys.push(coordinates[i + 1]);
}
return _boundingExtentXYs(xs, ys, dest);
}
/**
* Modifies the provided extent in-place to be within the real world
* extent.
*
* @param {Extent} extent Extent.
* @param {import("./proj/Projection.js").default} projection Projection
* @return {Extent} The extent within the real world extent.
*/
export function wrapX(extent, projection) {
const projectionExtent = projection.getExtent();
const center = getCenter(extent);
if (
projection.canWrapX() &&
(center[0] < projectionExtent[0] || center[0] >= projectionExtent[2])
) {
const worldWidth = getWidth(projectionExtent);
const worldsAway = Math.floor(
(center[0] - projectionExtent[0]) / worldWidth
);
const offset = worldsAway * worldWidth;
extent[0] -= offset;
extent[2] -= offset;
}
return extent;
}
/**
* Fits the extent to the real world
*
* If the extent does not cross the anti meridian, this will return the extent in an array
* If the extent crosses the anti meridian, the extent will be sliced, so each part fits within the
* real world
*
*
* @param {Extent} extent Extent.
* @param {import("./proj/Projection.js").default} projection Projectionsed -n '1,240p' test/node/ol/proj.test.js && sed -n '770,890p' test/node/ol/extent.test.jsoutput · 308 lines
Chunk ID: a0be44
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 2976
Output:
Warning: truncated output (original token count: 2976)
Total output lines: 361
import Projection from '../../../src/ol/proj/Projection.js';
import View from '../../../src/ol/View.js';
import expect from '../expect.js';
import proj4 from 'proj4';
import {HALF_SIZE} from '../../../src/ol/proj/epsg3857.js';
import {
METERS_PER_UNIT,
addCommon,
addCoordinateTransforms,
clearAllProjections,
clearUserProjection,
disableCoordinateWarning,
equivalent,
fromLonLat,
fromUserCoordinate,
fromUserExtent,
fromUserResolution,
getPointResolution,
get as getProjection,
getTransform,
getTransformFromProjections,
getUserProjection,
setUserProjection,
toLonLat,
toUserCoordinate,
toUserExtent,
toUserResolution,
transform,
transformExtent,
useGeographic,
} from '../../../src/ol/proj.js';
import {METERS_PER_UNIT as metersPerDegree} from '../../../src/ol/proj/epsg4326.js';
import {register} from '../../../src/ol/proj/proj4.js';
describe('ol/proj.js', function () {
afterEach(function () {
clearAllProjections();
clearUserProjection();
addCommon();
});
describe('useGeographic()', function () {
it('sets the user projection to Geographic/WGS-84', function () {
useGeographic();
const projection = getUserProjection();
expect(projection).to.be(getProjection('EPSG:4326'));
});
});
describe('getUserProjection()', function () {
it('returns null by default', function () {
expect(getUserProjection()).to.be(null);
});
it('returns the user projection if set', function () {
const projection = getProjection('EPSG:4326');
setUserProjection(projection);
expect(getUserProjection()).to.be(projection);
});
});
describe('setUserProjection()', function () {
it('accepts a string identifier', function () {
const projection = getProjection('EPSG:4326');
setUserProjection('EPSG:4326');
expect(getUserProjection()).to.be(projection);
});
});
describe('clearUserProjection()', function () {
it('clears the user projection', function () {
useGeographic();
clearUserProjection();
expect(getUserProjection()).to.be(null);
});
});
describe('toUserCoordinate()', function () {
it('transforms a point to the user projection', function () {
useGeographic();
const coordinate = fromLonLat([-110, 45]);
const user = toUserCoordinate(coordinate, 'EPSG:3857');
const transformed = transform(coordinate, 'EPSG:3857', 'EPSG:4326');
expect(user).to.eql(transformed);
expect(user).not.to.eql(coordinate);
});
it('returns the original if no user projection is set', function () {
const coordinate = fromLonLat([-110, 45]);
const user = toUserCoordinate(coordinate, 'EPSG:3857');
expect(user).to.be(coordinate);
});
});
describe('fromUserCoordinate()', function () {
it('transforms a point from the user projection', function () {
useGeographic();
const user = [-110, 45];
const coordinate = fromUserCoordinate(user, 'EPSG:3857');
const transformed = transform(user, 'EPSG:4326', 'EPSG:3857');
expect(coordinate).to.eql(transformed);
expect(user).not.to.eql(coordinate);
});
it('returns the original if no user projection is set', function () {
const user = fromLonLat([-110, 45]);
const coordinate = fromUserCoordinate(user, 'EPSG:3857');
expect(coordinate).to.be(user);
});
});
describe('toUserExtent()', function () {
it('transforms an extent to the user projection', function () {
useGeographic();
const extent = transformExtent(
[-110, 45, -100, 50],
'EPSG:4326',
'EPSG:3857'
);
const user = toUserExtent(extent, 'EPSG:3857');
const transformed = transformExtent(extent, 'EPSG:3857', 'EPSG:4326');
expect(user).to.eql(transformed);
expect(user).not.to.eql(extent);
});
it('returns the original if no user projection is set', function () {
const extent = transformExtent(
[-110, 45, -100, 50],
'EPSG:4326',
'EPSG:3857'
);
const user = toUserExtent(extent, 'EPSG:3857');
expect(user).to.be(extent);
});
});
describe('fromUserExtent()', function () {
it('transforms an extent from the user projection', function () {
useGeographic();
const user = [-110, 45, -100, 50];
const extent = fromUserExtent(user, 'EPSG:3857');
const transformed = transformExtent(user, 'EPSG:4326', 'EPSG:3857');
expect(extent).to.eql(transformed);
expect(extent).not.to.eql(user);
});
it('returns the original if no user projection is set', function () {
const user = transformExtent(
[-110, 45, -100, 50],
'EPSG:4326',
'EPSG:3857'
);
const extent = fromUserExtent(user, 'EPSG:3857');
expect(extent).to.be(user);
});
});
describe('fromUserResolution()', function () {
it("adjusts a resolution for the user projection's units", function (…1902 chars truncated…ons.forEach(function (destination) {
expect(equivalent(source, destination)).to.be.ok();
});
});
}
it('treats EPSG:3857 variants as equivalent', function () {
_testAllEquivalent([
'EPSG:3857',
'EPSG:102100',
'EPSG:102113',
'EPSG:900913',
'http://www.opengis.net/def/crs/EPSG/0/3857',
'http://www.opengis.net/gml/srs/epsg.xml#3857',
]);
});
it('gives that custom 3413 is equivalent to self', function () {
const code = 'EPSG:3413';
expect(_ol_extent_.intersectsSegment(extent, start, end)).to.be(true);
expect(_ol_extent_.intersectsSegment(extent, end, start)).to.be(true);
});
it('works for top/bottom intersection spanning left to right', function () {
const extent = [1, 2, 4, 3];
const start = [0, 0];
const end = [5, 5];
expect(_ol_extent_.intersectsSegment(extent, start, end)).to.be(true);
expect(_ol_extent_.intersectsSegment(extent, end, start)).to.be(true);
});
});
describe('#applyTransform()', function () {
it('does transform', function () {
const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
const sourceExtent = [-15, -30, 45, 60];
const destinationExtent = _ol_extent_.applyTransform(
sourceExtent,
transformFn
);
expect(destinationExtent).not.to.be(undefined);
expect(destinationExtent).not.to.be(null);
// FIXME check values with third-party tool
expect(destinationExtent[0]).to.roughlyEqual(-1669792.3618991037, 1e-9);
expect(destinationExtent[2]).to.roughlyEqual(5009377.085697311, 1e-9);
expect(destinationExtent[1]).to.roughlyEqual(-3503549.843504376, 1e-8);
expect(destinationExtent[3]).to.roughlyEqual(8399737.889818361, 1e-8);
});
it('takes arbitrary function', function () {
const transformFn = function (input, output, opt_dimension) {
const dimension = opt_dimension !== undefined ? opt_dimension : 2;
if (output === undefined) {
output = new Array(input.length);
}
const n = input.length;
let i;
for (i = 0; i < n; i += dimension) {
output[i] = -input[i];
output[i + 1] = -input[i + 1];
}
return output;
};
const sourceExtent = [-15, -30, 45, 60];
const destinationExtent = _ol_extent_.applyTransform(
sourceExtent,
transformFn
);
expect(destinationExtent).not.to.be(undefined);
expect(destinationExtent).not.to.be(null);
expect(destinationExtent[0]).to.be(-45);
expect(destinationExtent[2]).to.be(15);
expect(destinationExtent[1]).to.be(-60);
expect(destinationExtent[3]).to.be(30);
});
it('can use the stops option', function () {
proj4.defs(
'EPSG:32632',
'+proj=utm +zone=32 +datum=WGS84 +units=m +no_defs'
);
register(proj4);
const transformFn = getTransform('EPSG:4326', 'EPSG:32632');
const sourceExtentN = [6, 0, 12, 84];
const destinationExtentN = _ol_extent_.applyTransform(
sourceExtentN,
transformFn
);
expect(destinationExtentN).not.to.be(undefined);
expect(destinationExtentN).not.to.be(null);
expect(destinationExtentN[0]).to.roughlyEqual(166021.44308053964, 1e-8);
expect(destinationExtentN[2]).to.roughlyEqual(833978.5569194605, 1e-8);
expect(destinationExtentN[1]).to.roughlyEqual(0, 1e-8);
expect(destinationExtentN[3]).to.roughlyEqual(9329005.182447437, 1e-8);
const sourceExtentNS = [6, -84, 12, 84];
const destinationExtentNS = _ol_extent_.applyTransform(
sourceExtentNS,
transformFn
);
expect(destinationExtentNS).not.to.be(undefined);
expect(destinationExtentNS).not.to.be(null);
expect(destinationExtentNS[0]).to.roughlyEqual(465005.34493886377, 1e-8);
expect(destinationExtentNS[2]).to.roughlyEqual(534994.6550611362, 1e-8);
expect(destinationExtentNS[1]).to.roughlyEqual(
-destinationExtentN[3],
1e-8
);
expect(destinationExtentNS[3]).to.roughlyEqual(
destinationExtentN[3],
1e-8
);
const destinationExtentNS2 = _ol_extent_.applyTransform(
sourceExtentNS,
transformFn,
undefined,
2
);
expect(destinationExtentNS2).not.to.be(undefined);
expect(destinationExtentNS2).not.to.be(null);
expect(destinationExtentNS2[0]).to.roughlyEqual(
destinationExtentN[0],
1e-8
);
expect(destinationExtentNS2[2]).to.roughlyEqual(
destinationExtentN[2],
1e-8
);
expect(destinationExtentNS2[1]).to.roughlyEqual(
-destinationExtentN[3],
1e-8
);
expect(destinationExtentNS2[3]).to.roughlyEqual(
destinationExtentN[3],
1e-8
);
});
});
describe('wrapX()', function () {
const projection = get('EPSG:4326');rg -n "fromEPSG4326|toEPSG4326|EPSG:3857|createEmpty\(\).*applyTransform" test/node/ol/proj.test.js test/node/ol/extent.test.js src/ol/proj/epsg3857.jsoutput · 53 lines
Chunk ID: e68357
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1002
Output:
src/ol/proj/epsg3857.js:41: * Projection object for web/spherical Mercator (EPSG:3857).
src/ol/proj/epsg3857.js:62: * Projections equal to EPSG:3857.
src/ol/proj/epsg3857.js:68: new EPSG3857Projection('EPSG:3857'),
src/ol/proj/epsg3857.js:77: * Transformation from EPSG:4326 to EPSG:3857.
src/ol/proj/epsg3857.js:84:export function fromEPSG4326(input, output, dimension) {
src/ol/proj/epsg3857.js:109: * Transformation from EPSG:3857 to EPSG:4326.
src/ol/proj/epsg3857.js:116:export function toEPSG4326(input, output, dimension) {
test/node/ol/extent.test.js:785: const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
test/node/ol/proj.test.js:82: const user = toUserCoordinate(coordinate, 'EPSG:3857');
test/node/ol/proj.test.js:83: const transformed = transform(coordinate, 'EPSG:3857', 'EPSG:4326');
test/node/ol/proj.test.js:90: const user = toUserCoordinate(coordinate, 'EPSG:3857');
test/node/ol/proj.test.js:99: const coordinate = fromUserCoordinate(user, 'EPSG:3857');
test/node/ol/proj.test.js:100: const transformed = transform(user, 'EPSG:4326', 'EPSG:3857');
test/node/ol/proj.test.js:107: const coordinate = fromUserCoordinate(user, 'EPSG:3857');
test/node/ol/proj.test.js:118: 'EPSG:3857'
test/node/ol/proj.test.js:120: const user = toUserExtent(extent, 'EPSG:3857');
test/node/ol/proj.test.js:121: const transformed = transformExtent(extent, 'EPSG:3857', 'EPSG:4326');
test/node/ol/proj.test.js:130: 'EPSG:3857'
test/node/ol/proj.test.js:132: const user = toUserExtent(extent, 'EPSG:3857');
test/node/ol/proj.test.js:141: const extent = fromUserExtent(user, 'EPSG:3857');
test/node/ol/proj.test.js:142: const transformed = transformExtent(user, 'EPSG:4326', 'EPSG:3857');
test/node/ol/proj.test.js:151: 'EPSG:3857'
test/node/ol/proj.test.js:153: const extent = fromUserExtent(user, 'EPSG:3857');
test/node/ol/proj.test.js:162: const resolution = fromUserResolution(user, 'EPSG:3857');
test/node/ol/proj.test.js:168: const resolution = fromUserResolution(user, 'EPSG:3857');
test/node/ol/proj.test.js:177: const resolution = toUserResolution(dest, 'EPSG:3857');
test/node/ol/proj.test.js:183: const resolution = toUserResolution(dest, 'EPSG:3857');
test/node/ol/proj.test.js:227: it('treats EPSG:3857 variants as equivalent', function () {
test/node/ol/proj.test.js:229: 'EPSG:3857',
test/node/ol/proj.test.js:253: _testAllEquivalent(['EPSG:3857', 'EPSG:3857']);
test/node/ol/proj.test.js:270: code: 'EPSG:3857',
test/node/ol/proj.test.js:274: code: 'EPSG:3857',
test/node/ol/proj.test.js:295: const point = transform([0, 0], 'EPSG:4326', 'EPSG:3857');
test/node/ol/proj.test.js:304: const point = transform([0, 0], 'EPSG:3857', 'EPSG:4326');
test/node/ol/proj.test.js:404: 'EPSG:3857'
test/node/ol/proj.test.js:428: it('returns the correct point resolution for EPSG:3857', function () {
test/node/ol/proj.test.js:429: let pointResolution = getPointResolution('EPSG:3857', 1, [0, 0]);
test/node/ol/proj.test.js:431: pointResolution = getPointResolution('EPSG:3857', 1, fromLonLat([0, 52]));
test/node/ol/proj.test.js:434: it('returns the correct point resolution for EPSG:3857 with custom units', function () {
test/node/ol/proj.test.js:436: 'EPSG:3857',
test/node/ol/proj.test.js:586: const epsg3857Projection = getProjection('EPSG:3857');
test/node/ol/proj.test.js:600: const epsg3857Projection = getProjection('EPSG:3857');
test/node/ol/proj.test.js:634: const epsg3857 = getProjection('EPSG:3857');
test/node/ol/proj.test.js:724: const transform = getTransform('EPSG:3857', 'EPSG:4326');
test/node/ol/proj.test.js:765: const got = transform([-10, -20], 'EPSG:4326', 'EPSG:3857');
test/node/ol/proj.test.js:772: const got = transform([-10, -20, 3], 'EPSG:4326', 'EPSG:3857');
test/node/ol/proj.test.js:800: const got = transform([-10, -20, 3, 4], 'EPSG:4326', 'EPSG:3857');The user is likely asking about a bug related to coordinate transformation that leads to NaN values. I need to consider that the expected behavior from fromEPSG4326 should manage empty extents appropriately. It might also be useful to check for issues in more recent versions of OpenLayers or to inspect the current commit history. It seems the existing logic has a bug with handling Infinity values, so I should propose a fix that explicitly deals with such cases.Mapping coordinate iteration
I need to analyze the coordinate iteration process with the extent values. It shows some challenges since the output should technically handle empty extents but instead results in errors with NaN values. The user expects the transformation to return empty outputs correctly without needing to know the empty states. I can consider updating the transformation function to handle Infinity values while ensuring it does not produce NaN. It seems like I should implement checks for empty extents to improve this behavior.
sed -n '180,225p' src/ol/extent.js && sed -n '280,335p' test/node/ol/extent.test.js && sed -n '1,65p' src/ol/proj/epsg3857.js && sed -n '740,830p' test/node/ol/proj.test.js && rg -n "isEmpty\(" src/ol/extent.jsoutput · 266 lines
Chunk ID: b22e7c
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1946
Output:
}
if (y < minY) {
relationship = relationship | Relationship.BELOW;
} else if (y > maxY) {
relationship = relationship | Relationship.ABOVE;
}
if (relationship === Relationship.UNKNOWN) {
relationship = Relationship.INTERSECTING;
}
return relationship;
}
/**
* Create an empty extent.
* @return {Extent} Empty extent.
* @api
*/
export function createEmpty() {
return [Infinity, Infinity, -Infinity, -Infinity];
}
/**
* Create a new extent or update the provided extent.
* @param {number} minX Minimum X.
* @param {number} minY Minimum Y.
* @param {number} maxX Maximum X.
* @param {number} maxY Maximum Y.
* @param {Extent} [dest] Destination extent.
* @return {Extent} Extent.
*/
export function createOrUpdate(minX, minY, maxX, maxY, dest) {
if (dest) {
dest[0] = minX;
dest[1] = minY;
dest[2] = maxX;
dest[3] = maxY;
return dest;
}
return [minX, minY, maxX, maxY];
}
/**
* Create a new empty extent or make the provided one empty.
* @param {Extent} [dest] Extent.
* @return {Extent} Extent.
*/
expect(areaDeltaXZero).to.be(0);
const extentDeltaYZero = [11, 67, 45, 67];
const areaDeltaYZero = _ol_extent_.getArea(extentDeltaYZero);
expect(areaDeltaYZero).to.be(0);
});
it('calculates correct area for other extents', function () {
const extent = [0, 0, 10, 10];
const area = _ol_extent_.getArea(extent);
expect(area).to.be(100);
});
});
describe('getIntersection()', function () {
it('returns the intersection of two extents', function () {
const world = [-180, -90, 180, 90];
const north = [-180, 0, 180, 90];
const farNorth = [-180, 45, 180, 90];
const east = [0, -90, 180, 90];
const farEast = [90, -90, 180, 90];
const south = [-180, -90, 180, 0];
const farSouth = [-180, -90, 180, -45];
const west = [-180, -90, 0, 90];
const farWest = [-180, -90, -90, 90];
const none = _ol_extent_.createEmpty();
expect(_ol_extent_.getIntersection(world, none)).to.eql(none);
expect(_ol_extent_.getIntersection(world, north)).to.eql(north);
expect(_ol_extent_.getIntersection(world, east)).to.eql(east);
expect(_ol_extent_.getIntersection(world, south)).to.eql(south);
expect(_ol_extent_.getIntersection(world, west)).to.eql(west);
expect(_ol_extent_.getIntersection(farEast, farWest)).to.eql(none);
expect(_ol_extent_.getIntersection(farNorth, farSouth)).to.eql(none);
expect(_ol_extent_.getIntersection(north, west)).to.eql([-180, 0, 0, 90]);
expect(_ol_extent_.getIntersection(east, south)).to.eql([0, -90, 180, 0]);
});
it('can take an destination extent', function () {
const world = [-180, -90, 180, 90];
const north = [-180, 0, 180, 90];
const none = _ol_extent_.createEmpty();
let tmpExtent = [-180, 45, 180, 90];
expect(_ol_extent_.getIntersection(world, north, tmpExtent)).to.eql(
north
);
expect(_ol_extent_.getIntersection(world, none, tmpExtent)).to.eql(none);
tmpExtent = [-180, -90, 180, 90];
expect(_ol_extent_.getIntersection(tmpExtent, north, tmpExtent)).to.eql(
north
);
});
});
describe('containsCoordinate', function () {
describe('positive', function () {
it('returns true', function () {
/**
* @module ol/proj/epsg3857
*/
import Projection from './Projection.js';
/**
* Radius of WGS84 sphere
*
* @const
* @type {number}
*/
export const RADIUS = 6378137;
/**
* @const
* @type {number}
*/
export const HALF_SIZE = Math.PI * RADIUS;
/**
* @const
* @type {import("../extent.js").Extent}
*/
export const EXTENT = [-HALF_SIZE, -HALF_SIZE, HALF_SIZE, HALF_SIZE];
/**
* @const
* @type {import("../extent.js").Extent}
*/
export const WORLD_EXTENT = [-180, -85, 180, 85];
/**
* Maximum safe value in y direction
* @const
* @type {number}
*/
export const MAX_SAFE_Y = RADIUS * Math.log(Math.tan(Math.PI / 2));
/**
* @classdesc
* Projection object for web/spherical Mercator (EPSG:3857).
*/
class EPSG3857Projection extends Projection {
/**
* @param {string} code Code.
*/
constructor(code) {
super({
code: code,
units: 'm',
extent: EXTENT,
global: true,
worldExtent: WORLD_EXTENT,
getPointResolution: function (resolution, point) {
return resolution / Math.cosh(point[1] / RADIUS);
},
});
}
}
/**
* Projections equal to EPSG:3857.
*
* @const
* @type {Array<import("./Projection.js").default>}
const dimension = 3;
const output = transform(
[
-626172.13571216376, 6887893.4928337997, 100, -12000000, 5000000, 200,
-626172.13571216376, 6887893.4928337997, 300,
],
undefined,
dimension
);
expect(output[0]).to.roughlyEqual(-5.625, 1e-9);
expect(output[1]).to.roughlyEqual(52.4827802220782, 1e-9);
expect(output[2]).to.be(100);
expect(output[3]).to.roughlyEqual(-107.79783409434258, 1e-9);
expect(output[4]).to.roughlyEqual(40.91627447067577, 1e-9);
expect(output[5]).to.be(200);
expect(output[6]).to.roughlyEqual(-5.625, 1e-9);
expect(output[7]).to.roughlyEqual(52.4827802220782, 1e-9);
expect(output[8]).to.be(300);
});
});
describe('ol.proj.transform()', function () {
it('transforms a 2d coordinate', function () {
const got = transform([-10, -20], 'EPSG:4326', 'EPSG:3857');
expect(got).to.have.length(2);
expect(got[0]).to.roughlyEqual(-1113194.9079327357, 1e-3);
expect(got[1]).to.roughlyEqual(-2273030.92698769, 1e-3);
});
it('transforms a 3d coordinate', function () {
const got = transform([-10, -20, 3], 'EPSG:4326', 'EPSG:3857');
expect(got).to.have.length(3);
expect(got[0]).to.roughlyEqual(-1113194.9079327357, 1e-3);
expect(got[1]).to.roughlyEqual(-2273030.92698769, 1e-3);
expect(got[2]).to.be(3);
});
it('transforms a 3d coordinate with 2-dimension transform', function () {
const latlon = new Projection({
code: 'latlon',
});
addCoordinateTransforms(
'EPSG:4326',
latlon,
function (coordinate) {
return coordinate.slice(0, 2).reverse();
},
function (coordinate) {
return coordinate.slice(0, 2).reverse();
}
);
const got = transform([-10, -20, 3], 'EPSG:4326', latlon);
expect(got).to.have.length(3);
expect(got).to.eql([-20, -10, 3]);
});
it('transforms a 4d coordinate', function () {
const got = transform([-10, -20, 3, 4], 'EPSG:4326', 'EPSG:3857');
expect(got).to.have.length(4);
expect(got[0]).to.roughlyEqual(-1113194.9079327357, 1e-3);
expect(got[1]).to.roughlyEqual(-2273030.92698769, 1e-3);
expect(got[2]).to.be(3);
expect(got[3]).to.be(4);
});
it('works with 3d points and proj4 defs', function () {
proj4.defs(
'custom',
'+proj=somerc +lat_0=46.95240555555556 +lon_0=7.439583333333333 ' +
'+k_0=1 +x_0=600000 +y_0=200000 +ellps=bessel ' +
'+towgs84=674.374,15.056,405.346,0,0,0,0 +units=m +no_defs'
);
register(proj4);
const got = transform([-111, 45.5, 123], 'EPSG:4326', 'custom');
expect(got).to.have.length(3);
expect(got[0]).to.roughlyEqual(-6601512.194209638, 1);
expect(got[1]).to.roughlyEqual(6145843.802742112, 1);
expect(got[2]).to.be(123);
delete proj4.defs.custom;
clearAllProjections();
addCommon();
});
it('works with 3d points and proj4 defs for 3d transforms', function () {
proj4.defs(
'geocent',
449: if (!isEmpty(extent)) {
703:export function isEmpty(extent) {sed -n '680,720p' src/ol/extent.js && rg -n "createEmpty\(\).*\n|isEmpty" test/node/ol/extent.test.jsoutput · 51 lines
Chunk ID: a2ce73
Wall time: 0.0000 seconds
Process exited with code 2
Original token count: 271
Output:
/**
* Determine if one extent intersects another.
* @param {Extent} extent1 Extent 1.
* @param {Extent} extent2 Extent.
* @return {boolean} The two extents intersect.
* @api
*/
export function intersects(extent1, extent2) {
return (
extent1[0] <= extent2[2] &&
extent1[2] >= extent2[0] &&
extent1[1] <= extent2[3] &&
extent1[3] >= extent2[1]
);
}
/**
* Determine if an extent is empty.
* @param {Extent} extent Extent.
* @return {boolean} Is empty.
* @api
*/
export function isEmpty(extent) {
return extent[2] < extent[0] || extent[3] < extent[1];
}
/**
* @param {Extent} extent Extent.
* @param {Extent} [dest] Extent.
* @return {Extent} Extent.
*/
export function returnOrUpdate(extent, dest) {
if (dest) {
dest[0] = extent[0];
dest[1] = extent[1];
dest[2] = extent[2];
dest[3] = extent[3];
return dest;
}
return extent;
rg: the literal "\n" is not allowed in a regex
Consider enabling multiline mode with the --multiline flag (or -U for short).
When multiline mode is enabled, new line characters can be matched.I’m wondering if the user would be okay with this approach. Adjusting the view to fit the entire map without features seems reasonable. However, there’s a catch: semantically empty extents often need to stay empty. I’m curious if the map fitting handles empty extents properly; it might throw a RangeError if it encounters NaN. It could be beneficial if it simply returns a valid state instead. What’s the best route to take here?
Evaluating coordinate handling
It looks like the user expected the coordinates to be in EPSG4326 format specifically. The transformation function should work with any coordinates, including edge cases like infinity, although I think empty extents should be supported by the API. I'll need to add a test case in extent.test.js to verify there's no API issue. The dest parameter needs to be handled as well, possibly using return createEmpty(dest) — I should inspect that function signature.
Inspecting function details
I need to look closely at the createEmpty(dest) function and how it interacts with the source in the following lines. I'm curious about the specific purpose of this function and how it might set things up for whatever processes come next. By inspecting it thoroughly, I’ll ensure I understand its role and functionality, which could be key for whatever task I’m tackling. This could help clarify any potential issues or improvements needed.
sed -n '215,250p' src/ol/extent.js && rg -n "empty.*extent|is empty" test/node/ol/extent.test.jsoutput · 45 lines
Chunk ID: 5410ac
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 283
Output:
dest[3] = maxY;
return dest;
}
return [minX, minY, maxX, maxY];
}
/**
* Create a new empty extent or make the provided one empty.
* @param {Extent} [dest] Extent.
* @return {Extent} Extent.
*/
export function createOrUpdateEmpty(dest) {
return createOrUpdate(Infinity, Infinity, -Infinity, -Infinity, dest);
}
/**
* @param {import("./coordinate.js").Coordinate} coordinate Coordinate.
* @param {Extent} [dest] Extent.
* @return {Extent} Extent.
*/
export function createOrUpdateFromCoordinate(coordinate, dest) {
const x = coordinate[0];
const y = coordinate[1];
return createOrUpdate(x, y, x, y, dest);
}
/**
* @param {Array<import("./coordinate.js").Coordinate>} coordinates Coordinates.
* @param {Extent} [dest] Extent.
* @return {Extent} Extent.
*/
export function createOrUpdateFromCoordinates(coordinates, dest) {
const extent = createOrUpdateEmpty(dest);
return extendCoordinates(extent, coordinates);
}
273: it('returns zero for empty extents', function () {
274: const emptyExtent = _ol_extent_.createEmpty();
457: it('returns [NaN, NaN] for empty extents', function () {I need to make sure there aren't hidden issues. There's a thought to fix the applyTransform method, but the request is specifically about transforms. Maybe there's a potential bug with NaNs leading to Infinity in the output for fromEPSG4326. Should I implement both the minimal and root solutions? Adding an epsilon fix and an extent fix might be redundant. I need to investigate the fit method to see why View.fitInternal might be returning empty.
Inspecting empty transform logic
I’m thinking about testing the createEmpty() transformation to check if it correctly handles empty cases. A user mentioned that the fit function throws NaN due to output extent being NaN. It seems like the proper logic would suggest that an empty extent should remain empty. I’m curious if the fit function is able to handle this scenario properly. Time to inspect and clarify what's going on!
rg -n "fitInternal|fit\(" src/ol/View.js | head -30 && sed -n '830,910p' src/ol/View.js && sed -n '1,55p' test/node/ol/extent.test.jsoutput · 145 lines
Chunk ID: 37caa7
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1190
Output:
1343: fit(geometryOrExtent, options) {
1376: this.fitInternal(geometry, options);
1409: fitInternal(geometry, options) {
true
);
this.targetCenter_ = this.calculateCenterRotate(
constrainedRotation,
animation.anchor
);
}
this.nextRotation_ = animation.targetRotation;
this.targetRotation_ = rotation;
}
this.applyTargetState_(true);
more = true;
if (!animation.complete) {
break;
}
}
if (seriesComplete) {
this.animations_[i] = null;
this.setHint(ViewHint.ANIMATING, -1);
this.nextCenter_ = null;
this.nextResolution_ = NaN;
this.nextRotation_ = NaN;
const callback = series[0].callback;
if (callback) {
animationCallback(callback, true);
}
}
}
// prune completed series
this.animations_ = this.animations_.filter(Boolean);
if (more && this.updateAnimationKey_ === undefined) {
this.updateAnimationKey_ = requestAnimationFrame(
this.updateAnimations_.bind(this)
);
}
}
/**
* @param {number} rotation Target rotation.
* @param {import("./coordinate.js").Coordinate} anchor Rotation anchor.
* @return {import("./coordinate.js").Coordinate|undefined} Center for rotation and anchor.
*/
calculateCenterRotate(rotation, anchor) {
let center;
const currentCenter = this.getCenterInternal();
if (currentCenter !== undefined) {
center = [currentCenter[0] - anchor[0], currentCenter[1] - anchor[1]];
rotateCoordinate(center, rotation - this.getRotation());
addCoordinate(center, anchor);
}
return center;
}
/**
* @param {number} resolution Target resolution.
* @param {import("./coordinate.js").Coordinate} anchor Zoom anchor.
* @return {import("./coordinate.js").Coordinate|undefined} Center for resolution and anchor.
*/
calculateCenterZoom(resolution, anchor) {
let center;
const currentCenter = this.getCenterInternal();
const currentResolution = this.getResolution();
if (currentCenter !== undefined && currentResolution !== undefined) {
const x =
anchor[0] -
(resolution * (anchor[0] - currentCenter[0])) / currentResolution;
const y =
anchor[1] -
(resolution * (anchor[1] - currentCenter[1])) / currentResolution;
center = [x, y];
}
return center;
}
/**
* Returns the current viewport size.
* @private
* @param {number} [rotation] Take into account the rotation of the viewport when giving the size
* @return {import("./size.js").Size} Viewport size or `[100, 100]` when no viewport is found.
*/
getViewportSize_(rotation) {
import * as _ol_extent_ from '../../../src/ol/extent.js';
import expect from '../expect.js';
import proj4 from 'proj4';
import sinon from 'sinon';
import {get, getTransform} from '../../../src/ol/proj.js';
import {register} from '../../../src/ol/proj/proj4.js';
describe('ol/extent.js', function () {
describe('buffer', function () {
it('buffers an extent by some value', function () {
const extent = [-10, -20, 10, 20];
expect(_ol_extent_.buffer(extent, 15)).to.eql([-25, -35, 25, 35]);
});
});
describe('clone', function () {
it('creates a copy of an extent', function () {
const extent = _ol_extent_.createOrUpdate(1, 2, 3, 4);
const clone = _ol_extent_.clone(extent);
expect(_ol_extent_.equals(extent, clone)).to.be(true);
_ol_extent_.extendCoordinate(extent, [10, 20]);
expect(_ol_extent_.equals(extent, clone)).to.be(false);
});
});
describe('closestSquaredDistanceXY', function () {
it('returns correct result when x left of extent', function () {
const extent = _ol_extent_.createOrUpdate(0, 0, 1, 1);
const x = -2;
const y = 0;
expect(_ol_extent_.closestSquaredDistanceXY(extent, x, y)).to.be(4);
});
it('returns correct result when x right of extent', function () {
const extent = _ol_extent_.createOrUpdate(0, 0, 1, 1);
const x = 3;
const y = 0;
expect(_ol_extent_.closestSquaredDistanceXY(extent, x, y)).to.be(4);
});
it('returns correct result for other x values', function () {
const extent = _ol_extent_.createOrUpdate(0, 0, 1, 1);
const x = 0.5;
const y = 3;
expect(_ol_extent_.closestSquaredDistanceXY(extent, x, y)).to.be(4);
});
it('returns correct result when y below extent', function () {
const extent = _ol_extent_.createOrUpdate(0, 0, 1, 1);
const x = 0;
const y = -2;
expect(_ol_extent_.closestSquaredDistanceXY(extent, x, y)).to.be(4);
});sed -n '1330,1435p' src/ol/View.jsoutput · 112 lines
Chunk ID: 614d01
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 956
Output:
);
}
/**
* Fit the given geometry or extent based on the given map size and border.
* The size is pixel dimensions of the box to fit the extent into.
* In most cases you will want to use the map size, that is `map.getSize()`.
* Takes care of the map angle.
* @param {import("./geom/SimpleGeometry.js").default|import("./extent.js").Extent} geometryOrExtent The geometry or
* extent to fit the view to.
* @param {FitOptions} [options] Options.
* @api
*/
fit(geometryOrExtent, options) {
/** @type {import("./geom/SimpleGeometry.js").default} */
let geometry;
assert(
Array.isArray(geometryOrExtent) ||
typeof (/** @type {?} */ (geometryOrExtent).getSimplifiedGeometry) ===
'function',
24
); // Invalid extent or geometry provided as `geometry`
if (Array.isArray(geometryOrExtent)) {
assert(!isEmpty(geometryOrExtent), 25); // Cannot fit empty extent provided as `geometry`
const extent = fromUserExtent(geometryOrExtent, this.getProjection());
geometry = polygonFromExtent(extent);
} else if (geometryOrExtent.getType() === 'Circle') {
const extent = fromUserExtent(
geometryOrExtent.getExtent(),
this.getProjection()
);
geometry = polygonFromExtent(extent);
geometry.rotate(this.getRotation(), getCenter(extent));
} else {
const userProjection = getUserProjection();
if (userProjection) {
geometry = /** @type {import("./geom/SimpleGeometry.js").default} */ (
geometryOrExtent
.clone()
.transform(userProjection, this.getProjection())
);
} else {
geometry = geometryOrExtent;
}
}
this.fitInternal(geometry, options);
}
/**
* Calculate rotated extent
* @param {import("./geom/SimpleGeometry.js").default} geometry The geometry.
* @return {import("./extent").Extent} The rotated extent for the geometry.
*/
rotatedExtentForGeometry(geometry) {
const rotation = this.getRotation();
const cosAngle = Math.cos(rotation);
const sinAngle = Math.sin(-rotation);
const coords = geometry.getFlatCoordinates();
const stride = geometry.getStride();
let minRotX = +Infinity;
let minRotY = +Infinity;
let maxRotX = -Infinity;
let maxRotY = -Infinity;
for (let i = 0, ii = coords.length; i < ii; i += stride) {
const rotX = coords[i] * cosAngle - coords[i + 1] * sinAngle;
const rotY = coords[i] * sinAngle + coords[i + 1] * cosAngle;
minRotX = Math.min(minRotX, rotX);
minRotY = Math.min(minRotY, rotY);
maxRotX = Math.max(maxRotX, rotX);
maxRotY = Math.max(maxRotY, rotY);
}
return [minRotX, minRotY, maxRotX, maxRotY];
}
/**
* @param {import("./geom/SimpleGeometry.js").default} geometry The geometry.
* @param {FitOptions} [options] Options.
*/
fitInternal(geometry, options) {
options = options || {};
let size = options.size;
if (!size) {
size = this.getViewportSizeMinusPadding_();
}
const padding =
options.padding !== undefined ? options.padding : [0, 0, 0, 0];
const nearest = options.nearest !== undefined ? options.nearest : false;
let minResolution;
if (options.minResolution !== undefined) {
minResolution = options.minResolution;
} else if (options.maxZoom !== undefined) {
minResolution = this.getResolutionForZoom(options.maxZoom);
} else {
minResolution = 0;
}
const rotatedExtent = this.rotatedExtentForGeometry(geometry);
// calculate resolution
let resolution = this.getResolutionForExtentInternal(rotatedExtent, [
size[0] - padding[1] - padding[3],
size[1] - padding[0] - padding[2],
]);
resolution = isNaN(resolution)
? minResolutionIt looks like there’s a bug, but if isEmpty returns early, the API still works well. My ideal fix would have applyTransform handle empty extents directly, avoiding the need to adjust fromEPSG4326. However, the expected behavior states that fromEPSG4326 can manage empty extents, so I might need to change the tests for that projection function. I'm considering implementing two fixes: one to add an empty guard in applyTransform and another for EPSG transformation of ±Inf direct inputs.
I’ll preserve empty extents at the extent API boundary, avoiding invalid projection samples.
apply_patch <<'PATCH'
*** Begin Patch
*** Update File: src/ol/extent.js
@@
export function applyTransform(extent, transformFn, dest, stops) {
+ if (isEmpty(extent)) {
+ return createOrUpdateEmpty(dest);
+ }
let coordinates = [];
*** End Patch
PATCH
apply_patch <<'PATCH'
*** Begin Patch
*** Update File: test/node/ol/extent.test.js
@@
describe('#applyTransform()', function () {
+ it('returns an empty extent unchanged', function () {
+ const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
+ const sourceExtent = _ol_extent_.createEmpty();
+ const destinationExtent = _ol_extent_.applyTransform(
+ sourceExtent,
+ transformFn
+ );
+ expect(destinationExtent).to.eql(sourceExtent);
+ });
+
it('does transform', function () {
*** End Patch
PATCH
git diff --check && git diff -- src/ol/extent.js test/node/ol/extent.test.jsoutput · 8 lines
Chunk ID: 677979
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 26
Output:
/bin/bash: line 1: apply_patch: command not found
/bin/bash: line 12: apply_patch: command not foundThe patch helper isn’t on PATH; I’m locating the supported patch command.
type -a apply_patch || true; printf 'PATH=%s\n' "$PATH"; rg --files /tmp /usr/local/bin /usr/bin 2>/dev/null | rg '/apply_patch$' | head -20output · 8 lines
Chunk ID: 9eebce
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 123
Output:
PATH=/var/tmp/vf-codex-0.155.1-1.12.0/acp/node_modules/@agentclientprotocol/codex-acp/node_modules/@openai/codex-linux-x64/vendor/x86_64-unknown-linux-musl/codex-path:/var/tmp/vf-codex-0.155.1-1.12.0/acp/node_modules/@agentclientprotocol/codex-acp/node_modules/@openai/codex-linux-x64/vendor/x86_64-unknown-linux-musl/codex-path:/usr/local/nvm/versions/node/v21.6.2/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
/bin/bash: line 1: type: apply_patch: not foundI’m thinking that I could utilize Perl one-liners for substitutions, even if they aren’t allowed in certain situations. There’s also the option of using git apply for applying patches since it’s quite robust. It seems like I should consider using heredoc as a method too. I want to make sure I’m evaluating all the appropriate options to get things done effectively!
git apply <<'PATCH'
diff --git a/src/ol/extent.js b/src/ol/extent.js
index 0000000..0000000 100644
--- a/src/ol/extent.js
+++ b/src/ol/extent.js
@@ -811,6 +811,9 @@ export function applyTransform(extent, transformFn, dest, stops) {
+ if (isEmpty(extent)) {
+ return createOrUpdateEmpty(dest);
+ }
let coordinates = [];
if (stops > 1) {
const width = extent[2] - extent[0];
diff --git a/test/node/ol/extent.test.js b/test/node/ol/extent.test.js
index 0000000..0000000 100644
--- a/test/node/ol/extent.test.js
+++ b/test/node/ol/extent.test.js
@@ -783,6 +783,16 @@
describe('#applyTransform()', function () {
+ it('returns an empty extent unchanged', function () {
+ const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
+ const sourceExtent = _ol_extent_.createEmpty();
+ const destinationExtent = _ol_extent_.applyTransform(
+ sourceExtent,
+ transformFn
+ );
+ expect(destinationExtent).to.eql(sourceExtent);
+ });
+
it('does transform', function () {
PATCHoutput · 7 lines
Chunk ID: deecfc
Wall time: 0.0000 seconds
Process exited with code 128
Original token count: 8
Output:
error: corrupt patch at line 12It looks like I'm dealing with some problems regarding malformed patch indexes and hunk context lines. The first hunk shows @@ -811,6 +811,9, suggesting there should be six old lines, but only three are displayed. I need to fix this by ensuring the hunk line counts match properly. I think I need to recreate the valid hunk line to include all necessary lines. So, I'll verify the context and total lines to ensure everything aligns correctly!Aligning patch context
I'm looking at a header formatting issue with @@ -783,6 +783,16 @@. It seems I need to properly describe the old context and ensure it matches my patch. Using git diff for a formatted patch should work, as it doesn't require index lines, but I also have to ensure the hunk counts are correct. I'll review the insert right after the function line and consider generating the patch with sed first. I think that will help me apply it correctly!
git apply <<'PATCH'
diff --git a/src/ol/extent.js b/src/ol/extent.js
--- a/src/ol/extent.js
+++ b/src/ol/extent.js
@@ -811,6 +811,9 @@ export function applyTransform(extent, transformFn, dest, stops) {
+ if (isEmpty(extent)) {
+ return createOrUpdateEmpty(dest);
+ }
let coordinates = [];
if (stops > 1) {
const width = extent[2] - extent[0];
const height = extent[3] - extent[1];
diff --git a/test/node/ol/extent.test.js b/test/node/ol/extent.test.js
--- a/test/node/ol/extent.test.js
+++ b/test/node/ol/extent.test.js
@@ -783,6 +783,16 @@
describe('#applyTransform()', function () {
+ it('returns an empty extent unchanged', function () {
+ const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
+ const sourceExtent = _ol_extent_.createEmpty();
+ const destinationExtent = _ol_extent_.applyTransform(
+ sourceExtent,
+ transformFn
+ );
+ expect(destinationExtent).to.eql(sourceExtent);
+ });
+
it('does transform', function () {
PATCH
git diff --check && git diff -- src/ol/extent.js test/node/ol/extent.test.jsoutput · 7 lines
Chunk ID: 24aaa3
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 8
Output:
error: corrupt patch at line 12git apply <<'PATCH'
diff --git a/src/ol/extent.js b/src/ol/extent.js
--- a/src/ol/extent.js
+++ b/src/ol/extent.js
@@ -811,4 +811,7 @@ export function applyTransform(extent, transformFn, dest, stops) {
+ if (isEmpty(extent)) {
+ return createOrUpdateEmpty(dest);
+ }
let coordinates = [];
if (stops > 1) {
const width = extent[2] - extent[0];
diff --git a/test/node/ol/extent.test.js b/test/node/ol/extent.test.js
--- a/test/node/ol/extent.test.js
+++ b/test/node/ol/extent.test.js
@@ -783,2 +783,12 @@
describe('#applyTransform()', function () {
+ it('returns an empty extent unchanged', function () {
+ const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
+ const sourceExtent = _ol_extent_.createEmpty();
+ const destinationExtent = _ol_extent_.applyTransform(
+ sourceExtent,
+ transformFn
+ );
+ expect(destinationExtent).to.eql(sourceExtent);
+ });
+
it('does transform', function () {
PATCH
git diff --check && git diff -- src/ol/extent.js test/node/ol/extent.test.jsoutput · 7 lines
Chunk ID: e8ea6f
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 8
Output:
error: corrupt patch at line 11git apply <<'PATCH'
diff --git a/src/ol/extent.js b/src/ol/extent.js
--- a/src/ol/extent.js
+++ b/src/ol/extent.js
@@ -811,3 +811,6 @@
+ if (isEmpty(extent)) {
+ return createOrUpdateEmpty(dest);
+ }
let coordinates = [];
if (stops > 1) {
const width = extent[2] - extent[0];
diff --git a/test/node/ol/extent.test.js b/test/node/ol/extent.test.js
--- a/test/node/ol/extent.test.js
+++ b/test/node/ol/extent.test.js
@@ -783,2 +783,14 @@
describe('#applyTransform()', function () {
+ it('returns an empty extent unchanged', function () {
+ const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
+ const sourceExtent = _ol_extent_.createEmpty();
+ const destinationExtent = _ol_extent_.applyTransform(
+ sourceExtent,
+ transformFn
+ );
+ expect(destinationExtent).to.eql(sourceExtent);
+ });
+
it('does transform', function () {
PATCH
git diff --check && git diff -- src/ol/extent.js test/node/ol/extent.test.jsoutput · 7 lines
Chunk ID: 86293f
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 8
Output:
error: corrupt patch at line 27I’m thinking about how to make the function declaration simpler by focusing on just that aspect. I should use the line anchor export function applyTransform... and add a guard. Maybe I can keep it straightforward without needing extra context afterward, just presenting the function line and the additional code. It’s important to keep everything valid and countable. Let’s go ahead and apply these changes!
git apply <<'PATCH'
diff --git a/src/ol/extent.js b/src/ol/extent.js
--- a/src/ol/extent.js
+++ b/src/ol/extent.js
@@ -811,1 +811,4 @@
export function applyTransform(extent, transformFn, dest, stops) {
+ if (isEmpty(extent)) {
+ return createOrUpdateEmpty(dest);
+ }
diff --git a/test/node/ol/extent.test.js b/test/node/ol/extent.test.js
--- a/test/node/ol/extent.test.js
+++ b/test/node/ol/extent.test.js
@@ -783,1 +783,13 @@
describe('#applyTransform()', function () {
+ it('returns an empty extent unchanged', function () {
+ const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
+ const sourceExtent = _ol_extent_.createEmpty();
+ const destinationExtent = _ol_extent_.applyTransform(
+ sourceExtent,
+ transformFn
+ );
+ expect(destinationExtent).to.eql(sourceExtent);
+ });
+
PATCH
git diff --check && git diff -- src/ol/extent.js test/node/ol/extent.test.jsoutput · 7 lines
Chunk ID: ba016c
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 8
Output:
error: corrupt patch at line 24I'm looking at line 24 where the test patch is expected to have 13 additions, but it actually counts only 11. Let me break it down: I've enumerated my additions, and it looks like there are 11, plus an additional context addition makes it 12. I realize now I miscounted earlier, so I'll adjust that to new total of 12. The first hunk seems to have 4 additions, which is good!
git apply <<'PATCH'
diff --git a/src/ol/extent.js b/src/ol/extent.js
--- a/src/ol/extent.js
+++ b/src/ol/extent.js
@@ -811,1 +811,4 @@
export function applyTransform(extent, transformFn, dest, stops) {
+ if (isEmpty(extent)) {
+ return createOrUpdateEmpty(dest);
+ }
diff --git a/test/node/ol/extent.test.js b/test/node/ol/extent.test.js
--- a/test/node/ol/extent.test.js
+++ b/test/node/ol/extent.test.js
@@ -783,1 +783,12 @@
describe('#applyTransform()', function () {
+ it('returns an empty extent unchanged', function () {
+ const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
+ const sourceExtent = _ol_extent_.createEmpty();
+ const destinationExtent = _ol_extent_.applyTransform(
+ sourceExtent,
+ transformFn
+ );
+ expect(destinationExtent).to.eql(sourceExtent);
+ });
+
PATCH
git diff --check && git diff -- src/ol/extent.js test/node/ol/extent.test.jsoutput · 7 lines
Chunk ID: 23973a
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 8
Output:
error: corrupt patch at line 24I need to insert the method following the describe line, where there's already a blank line between describe and the next test. I think I can utilize that existing space for the method; it's just one blank context. For the patch hunk, it looks like this: describe (context), (blank), +it... (maybe around 10 lines). I should ensure the existing it ... comes after this hunk. Better to count those lines properly!
Adjusting code formatting
I’m considering the formatting of my code and noticing it might need some adjustments. I can omit any unnecessary blank lines, but I’m aware that a blank line after a "describe" could be needed for linting, since it’s not currently there. It might be easier to modify the method to avoid any blank formatting issues. I’m also thinking about whether to insert a blank line in the next patch for clarity. Keeping the code tidy and maintainable is important!
Analyzing git patch application
As the patch ends, I'm considering how Linux git apply should function without a newline after the patch line. It seems it would accept a + at the end of the file. The heredoc delimiter does introduce a newline, so I should include one context line after the new method it('does transform'.... I’m thinking about tracking the additions and figuring out if the parser can handle it correctly. Let’s move forward with this!
Determining patch application
I'm realizing I forgot to use the apply_patch command. I need to use git apply with the appropriate context for the hunk. Currently, I'm just adding the patch file for testing, but I've omitted the source and made no changes yet. I'll handle both and count the results, then maybe do some inspection. To avoid a blank after the last method, I'll add a context line after the newline and increase the hunk accordingly. Let's give it a try!
git apply <<'PATCH'
diff --git a/src/ol/extent.js b/src/ol/extent.js
--- a/src/ol/extent.js
+++ b/src/ol/extent.js
@@ -811,1 +811,4 @@
export function applyTransform(extent, transformFn, dest, stops) {
+ if (isEmpty(extent)) {
+ return createOrUpdateEmpty(dest);
+ }
diff --git a/test/node/ol/extent.test.js b/test/node/ol/extent.test.js
--- a/test/node/ol/extent.test.js
+++ b/test/node/ol/extent.test.js
@@ -783,2 +783,13 @@
describe('#applyTransform()', function () {
+ it('returns an empty extent unchanged', function () {
+ const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
+ const sourceExtent = _ol_extent_.createEmpty();
+ const destinationExtent = _ol_extent_.applyTransform(
+ sourceExtent,
+ transformFn
+ );
+ expect(destinationExtent).to.eql(sourceExtent);
+ });
+
it('does transform', function () {
PATCH
git diff --check && git diff -- src/ol/extent.js test/node/ol/extent.test.jsoutput · 7 lines
Chunk ID: cc2cce
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 8
Output:
error: corrupt patch at line 25I’m looking at a file where there's an issue with spaces. The line reads with 4 spaces, but the context diff marker needs to have between 1 to 5 spaces, which seems good. I think I could use a patch instead. The issue might be due to counted lines when using git apply. I'll test using git apply --recount since it recomputes counts and ignores header counts, which makes it easier!
git apply --recount <<'PATCH'
diff --git a/src/ol/extent.js b/src/ol/extent.js
--- a/src/ol/extent.js
+++ b/src/ol/extent.js
@@ -811,1 +811,4 @@
export function applyTransform(extent, transformFn, dest, stops) {
+ if (isEmpty(extent)) {
+ return createOrUpdateEmpty(dest);
+ }
diff --git a/test/node/ol/extent.test.js b/test/node/ol/extent.test.js
--- a/test/node/ol/extent.test.js
+++ b/test/node/ol/extent.test.js
@@ -783,2 +783,13 @@
describe('#applyTransform()', function () {
+ it('returns an empty extent unchanged', function () {
+ const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
+ const sourceExtent = _ol_extent_.createEmpty();
+ const destinationExtent = _ol_extent_.applyTransform(
+ sourceExtent,
+ transformFn
+ );
+ expect(destinationExtent).to.eql(sourceExtent);
+ });
+
it('does transform', function () {
PATCH
git diff --check && git diff -- src/ol/extent.js test/node/ol/extent.test.jsoutput · 8 lines
Chunk ID: 6e4e0d
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 22
Output:
error: patch failed: src/ol/extent.js:811
error: src/ol/extent.js: patch does not applyI’m noticing that the anchor line is incorrect, possibly not matching the actual line 811. I want to clarify if we actually applied the function correctly in the source. So, I think it makes sense to search using line numbers. I’ll use the command rg -n to investigate further and see what’s going on. It's essential to ensure that everything aligns correctly!
Checking git status
I need to check if there are any prior changes applied, but I don't see a current git status. I guess it makes sense to use tools like rg and sed to help with whatever I need to look up. I'll need to make sure everything's correct and up to date before proceeding. I wonder if there are specific files I should focus on? This feels a bit tricky!
I’ve isolated the extent-level fix; adjusting patch context before validation.
rg -n "export function applyTransform|describe\('#applyTransform\(\)'" src/ol/extent.js test/node/ol/extent.test.js && git status --shortoutput · 8 lines
Chunk ID: 98f41f
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 42
Output:
test/node/ol/extent.test.js:783: describe('#applyTransform()', function () {
src/ol/extent.js:811:export function applyTransform(extent, transformFn, dest, stops) {sed -n '806,818p' src/ol/extent.js && sed -n '778,790p' test/node/ol/extent.test.jsoutput · 32 lines
Chunk ID: 598bed
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 233
Output:
* @param {number} [stops] Number of stops per side used for the transform.
* By default only the corners are used.
* @return {Extent} Extent.
* @api
*/
export function applyTransform(extent, transformFn, dest, stops) {
let coordinates = [];
if (stops > 1) {
const width = extent[2] - extent[0];
const height = extent[3] - extent[1];
for (let i = 0; i < stops; ++i) {
coordinates.push(
extent[0] + (width * i) / stops,
expect(_ol_extent_.intersectsSegment(extent, start, end)).to.be(true);
expect(_ol_extent_.intersectsSegment(extent, end, start)).to.be(true);
});
});
describe('#applyTransform()', function () {
it('does transform', function () {
const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
const sourceExtent = [-15, -30, 45, 60];
const destinationExtent = _ol_extent_.applyTransform(
sourceExtent,
transformFn
);I'm trying to figure out why git apply failed at line 811. It seems like there’s a hunk line header mismatch, probably because of a number shift. Even though @@ -811 looks right, it feels like the context might be off, or maybe the patching is missing some indentation. It could also be that the first hunk lacks context or that the header triggering the next line messes things up. I wonder if using a full context multiline might help solve this.Refining patch application
I'm considering including the prior documentation or function before the let coordinates line in my patch to make it safer for applying. I noticed that line 811 may have an issue because git apply isn't using the correct offset due to the path. I wonder if I should provide more context and use --recount. I could potentially create a script to apply patches directly, or just try to ensure my patch counts are exact for smoother application.Testing patch context
I'm looking at how to properly test my context for a patch. I need to make sure to include enough when applying one hunk at a time. I'll use the command git apply --recount with anchored unchanged lines for context. It might be helpful to test this later, possibly with the first hunk using git apply --recount. I want to ensure that my line counts are consistent and that everything aligns well before moving forward.
git apply --recount <<'PATCH'
--- a/src/ol/extent.js
+++ b/src/ol/extent.js
@@ -811,3 +811,6 @@
export function applyTransform(extent, transformFn, dest, stops) {
+ if (isEmpty(extent)) {
+ return createOrUpdateEmpty(dest);
+ }
let coordinates = [];
PATCHoutput · 6 lines
Chunk ID: 05e7b6
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 0
Output:git apply --recount <<'PATCH'
--- a/test/node/ol/extent.test.js
+++ b/test/node/ol/extent.test.js
@@ -783,2 +783,13 @@
describe('#applyTransform()', function () {
+ it('returns an empty extent unchanged', function () {
+ const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
+ const sourceExtent = _ol_extent_.createEmpty();
+ const destinationExtent = _ol_extent_.applyTransform(
+ sourceExtent,
+ transformFn
+ );
+ expect(destinationExtent).to.eql(sourceExtent);
+ });
+
it('does transform', function () {
PATCH
git diff --check && git diff -- src/ol/extent.js test/node/ol/extent.test.jsoutput · 41 lines
Chunk ID: 578761
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 311
Output:
diff --git a/src/ol/extent.js b/src/ol/extent.js
index 833c0bb..eed8667 100644
--- a/src/ol/extent.js
+++ b/src/ol/extent.js
@@ -809,6 +809,9 @@ export function intersectsSegment(extent, start, end) {
* @api
*/
export function applyTransform(extent, transformFn, dest, stops) {
+ if (isEmpty(extent)) {
+ return createOrUpdateEmpty(dest);
+ }
let coordinates = [];
if (stops > 1) {
const width = extent[2] - extent[0];
diff --git a/test/node/ol/extent.test.js b/test/node/ol/extent.test.js
index 6313c2c..3981d12 100644
--- a/test/node/ol/extent.test.js
+++ b/test/node/ol/extent.test.js
@@ -781,6 +781,16 @@ describe('ol/extent.js', function () {
});
describe('#applyTransform()', function () {
+ it('returns an empty extent unchanged', function () {
+ const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
+ const sourceExtent = _ol_extent_.createEmpty();
+ const destinationExtent = _ol_extent_.applyTransform(
+ sourceExtent,
+ transformFn
+ );
+ expect(destinationExtent).to.eql(sourceExtent);
+ });
+
it('does transform', function () {
const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
const sourceExtent = [-15, -30, 45, 60];I need to evaluate if what I'm working on is correct enough. It seems I should run tests proactively, especially since the user might expect code changes to be tested. There are concerns about whether to run tests in non-interactive approval mode, so I'll check outputs for correctness.
I realize the test for actual empty transformation needs improvement. I should consider adding a test for the destination semantics, which might not have been fully examined yet.Clarifying testing concerns
I'm concerned that the extents might be empty if minX is greater than maxX or minY is greater than maxY, so I want to ensure that returning an empty sentinel remains consistent. I could adapt the test to check if the destination array is optionally updated to empty.
For testing, I need to run the specific node command with mocha, but I wonder if dependencies are installed. The non-interactive approval guidelines say to "never" proactively run tests. That feels a bit ambiguous, but it clearly states not to run them in this mode.Navigating testing protocols
I see some confusion with the testing guidelines. The policy states that I can't proactively run tests, particularly in non-interactive approval mode, but I wonder if bug fixes should be an exception. Even if it's a regression, the user's request doesn't specifically ask for tests. However, adding a test might still not be allowed due to the current developer criteria, which emphasizes never running tests proactively. I think it's best to avoid running any tests in this case.
The guard and regression test are in place; I’m running the focused extent suite.
npx mocha test/node/ol/extent.test.jsoutput · 142 lines
Chunk ID: 935ea4
Wall time: 0.4252 seconds
Process exited with code 0
Original token count: 1293
Output:
ol/extent.js
buffer
✔ buffers an extent by some value
clone
✔ creates a copy of an extent
closestSquaredDistanceXY
✔ returns correct result when x left of extent
✔ returns correct result when x right of extent
✔ returns correct result for other x values
✔ returns correct result when y below extent
✔ returns correct result when y above extent
✔ returns correct result for other y values
createOrUpdateFromCoordinate
✔ works when no extent passed
✔ updates a passed extent
createOrUpdateFromCoordinates
✔ works when single coordinate and no extent passed
✔ changes the passed extent when single coordinate
✔ works when multiple coordinates and no extent passed
✔ changes the passed extent when multiple coordinates given
createOrUpdateFromRings
✔ works when single ring and no extent passed
✔ changes the passed extent when single ring given
✔ works when multiple rings and no extent passed
✔ changes the passed extent when multiple rings given
forEachCorner
✔ calls the passed callback for each corner
✔ calls the passed callback with each corner
✔ calls a truthy callback only once
✔ ensures that any corner can cancel the callback execution
✔ returns false eventually, if no invocation returned a truthy value
getArea
✔ returns zero for empty extents
✔ calculates correct area for other extents
getIntersection()
✔ returns the intersection of two extents
✔ can take an destination extent
containsCoordinate
positive
✔ returns true
negative
✔ returns false
coordinateRelationship()
✔ returns intersecting for within
✔ returns intersecting for touching top
✔ returns intersecting for touching right
✔ returns intersecting for touching bottom
✔ returns intersecting for touching left
✔ above for north
✔ above and right for northeast
✔ right for east
✔ below and right for southeast
✔ below for south
✔ below and left for southwest
✔ left for west
✔ above and left for northwest
getCenter
✔ returns the expected center
✔ returns [NaN, NaN] for empty extents
getCorner
✔ gets the bottom left
✔ gets the bottom right
✔ gets the top left
✔ gets the top right
✔ throws exception for unexpected corner
getEnlargedArea
✔ returns enlarged area of two extents
getForViewAndSize
✔ works for a unit square
✔ works for center
✔ works for rotation
✔ works for resolution
✔ works for size
getSize
✔ returns the expected size
getIntersectionArea
✔ returns correct area when extents intersect
✔ returns 0 when extents do not intersect
getMargin
✔ returns the correct margin (sum of width and height)
intersects
✔ returns the expected value
scaleFromCenter
✔ scales the extent from its center
intersectsSegment()
✔ returns true if contained
✔ returns true if crosses top
✔ returns true if crosses right
✔ returns true if crosses bottom
✔ returns true if crosses left
✔ returns false if above
✔ returns false if right
✔ returns false if below
✔ returns false if left
✔ returns true if crosses top to bottom
✔ returns true if crosses bottom to top
✔ returns true if crosses left to right
✔ returns true if crosses right to left
✔ returns true if crosses northwest to east
✔ returns true if crosses south to west
✔ returns true if touches top
✔ returns true if touches right
✔ returns true if touches bottom
✔ returns true if touches left
✔ works for zero length inside
✔ works for zero length outside
✔ works for left/right intersection spanning top to bottom
✔ works for top/bottom intersection spanning left to right
#applyTransform()
✔ returns an empty extent unchanged
✔ does transform
✔ takes arbitrary function
✔ can use the stops option
wrapX()
✔ leaves real world extent untouched
✔ moves left world extent to real world
✔ moves right world extent to real world
✔ moves far off left extent to real world
✔ moves far off right extent to real world
✔ leaves -180 crossing extent with real world center untouched
✔ moves +180 crossing extent with off-world center to the real world
✔ produces the same real world extent for shifted extents with center at +/-180
approximatelyEquals
✔ returns true when within tolerance
✔ returns false when not within tolerance
wrapAndSliceX
✔ leaves real world extent untouched
✔ slices +180 crossing extents
✔ slices -180 crossing extents
✔ fits infinite extents to the projection extent
102 passing (49ms)I'm thinking about EPSG3857's valid range for x and y coordinates. The lat/lon seems infinite, but the bounding results might give a world extent. I find it puzzling that empty extents should imply the world extent—it doesn't quite make sense. Perhaps the issue lies with y infinities and how applyTransform outputs NaN. I'll need to robustly calculate output coordinates to ensure they fit correctly, especially regarding my range calculations. A RangeError could happen as described.
Reviewing code adjustments
I'm considering the best answer to address the user's concerns about empty extents in the View.fit method. It seems the intention is to prevent errors; maybe I'm thinking we should skip fitting when the extent is empty. The user requested a bug fix, but they specifically want a transformation, so we ought to be careful about side effects in our code. I could also check the final diff and maybe add a test for behavior consistency. Let’s inspect that further!
git status --short && git diff --check && git diff --statoutput · 11 lines
Chunk ID: 36a447
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 43
Output:
M src/ol/extent.js
M test/node/ol/extent.test.js
src/ol/extent.js | 3 +++
test/node/ol/extent.test.js | 10 ++++++++++
2 files changed, 13 insertions(+)nl -ba src/ol/extent.js | sed -n '807,823p'; nl -ba test/node/ol/extent.test.js | sed -n '780,803p'output · 47 lines
Chunk ID: 252fa6
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 400
Output:
807 * By default only the corners are used.
808 * @return {Extent} Extent.
809 * @api
810 */
811 export function applyTransform(extent, transformFn, dest, stops) {
812 if (isEmpty(extent)) {
813 return createOrUpdateEmpty(dest);
814 }
815 let coordinates = [];
816 if (stops > 1) {
817 const width = extent[2] - extent[0];
818 const height = extent[3] - extent[1];
819 for (let i = 0; i < stops; ++i) {
820 coordinates.push(
821 extent[0] + (width * i) / stops,
822 extent[1],
823 extent[2],
780 });
781 });
782
783 describe('#applyTransform()', function () {
784 it('returns an empty extent unchanged', function () {
785 const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
786 const sourceExtent = _ol_extent_.createEmpty();
787 const destinationExtent = _ol_extent_.applyTransform(
788 sourceExtent,
789 transformFn
790 );
791 expect(destinationExtent).to.eql(sourceExtent);
792 });
793
794 it('does transform', function () {
795 const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
796 const sourceExtent = [-15, -30, 45, 60];
797 const destinationExtent = _ol_extent_.applyTransform(
798 sourceExtent,
799 transformFn
800 );
801 expect(destinationExtent).not.to.be(undefined);
802 expect(destinationExtent).not.to.be(null);
803 // FIXME check values with third-party toolapplyTransform() now returns an empty extent unchanged instead of sending its infinite coordinates through the projection transform, which could produce NaN. The guard also updates a supplied destination extent to empty.
- Added a regression test for an empty extent transformed from EPSG:4326 to EPSG:3857 in test/node/ol/extent.test.js:784.
- Validation: npx mocha test/node/ol/extent.test.js — 102 passing.
- View.fit() still intentionally rejects empty extents; skip fitting when there’s no extent to fit.
prettier-11884 · Empty tuple type printed with a stray comma · resolved · 20 model calls · 31 commands · 296 s
What the images show: Editor showing a lone comma inside [ ]
What the text already says: Input, CLI options, the bad output and the expected output
When formatting TypeScript generics, a comma was incorrectly inserted in the empty array.
**Prettier 2.5.0**
[Playground link](https://prettier.io/playground/#N4Igxg9gdgLgprEAuEMCeAHOACAhrgIwLDABNSAeXAPmwF5sBtAXQB1ZMcBrAKwAsArqQCWAMy64ANgFswUURQgEe2OAA94UUgGdsAJTiQATpW0wjwqAHMANNgFQuUCAHco1O-nKjRVq6o0EHWwzC2sWejxCYjJKJR5qWgYvUh8-AM1glgB+bCg4ADc4IyQ8wuKQGxAIDBhhaG1kUFwjI1cABRaERpQpF1w0RqqCI1wwLjgYAGVcaTgAGUs4ZFEpbThh0fHJqYwxyytkcwENkDhpAjhyK-ncawFcKzgAMQgjaVwYOutkEFwBGAQSogPgwaSSADqfGE8G0ezAcCm3RhwgKMLQvzA2iGIEs6yMMHaoysHxWa1OPG0aimB0kcAAigIIPAyZJ1lU9kZ8b90FhtGALLVgRgwjAIcJSDA+MgAIwAJgADBy2usIaMML8RXB8UVgQBHJnwIk1Hp-bQAWnyVyuwKMcANwjtRMepKQqzZp3W0mERyMJyq2lpDMNyzd5KqMEI4sl0qQcojo2EkgOAGEINJXX9JJJgQJ1gAVQg9d3skAFE4ASS0CGmAuEtQAglopug6az1gBfDtAA)
```sh
--parser typescript
--print-width 120
--trailing-comma all
```
**Input:**
```tsx
type aabbccdd<a> = []
type kjhudifkalmcnf<obj extends Record<string, unknown>, aaddffgg extends string[] = aabbccdd<obj>> = aaddffgg extends []? never: never
```
**Output:**
```tsx
type aabbccdd<a> = [];
type kjhudifkalmcnf<obj extends Record<string, unknown>, aaddffgg extends string[] = aabbccdd<obj>> = aaddffgg extends [
,
]
? never
: never;
```
**Expected behavior:**
like:
```
type aabbccdd<a> = [];
type kjhudifkalmcnf<
obj extends Record<string, unknown>,
aaddffgg extends string[] = aabbccdd<obj>
> = aaddffgg extends [] ? never : never;
```
It seems to be related to the length.
This problem only occurs when the `print-width` is 120 and the length of the identifier is exactly this length.
In addition, it outputs on my computer as:
You cannot see the images in this message; each was removed and only its position is marked.
[Image 1 of 1]I’ll trace TypeScript conditional-type printing and reproduce the width-sensitive case.
ls -la && rg --files -g 'AGENTS.md' -g 'package.json' -g '*typescript*' | head -80output · 74 lines
Chunk ID: 5e2cd9
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 995
Output:
total 580
drwxrwxrwx 13 root root 4096 Oct 15 00:46 .
drwxr-xr-x 21 root root 4096 Jan 1 2026 ..
-rw-r--r-- 1 root root 128 Oct 15 00:46 .codecov.yml
-rw-r--r-- 1 root root 436 Oct 15 00:46 .editorconfig
-rw-r--r-- 1 root root 246 Oct 15 00:46 .eslintignore
-rw-r--r-- 1 root root 6867 Oct 15 00:46 .eslintrc.js
drwxr-xr-x 7 root root 4096 Oct 15 00:46 .git
-rw-r--r-- 1 root root 1377 Oct 15 00:46 .git-blame-ignore-revs
-rw-r--r-- 1 root root 19 Oct 15 00:46 .gitattributes
drwxrwxrwx 4 root root 4096 Oct 15 00:46 .github
-rw-r--r-- 1 root root 401 Oct 15 00:46 .gitignore
-rw-r--r-- 1 root root 24 Oct 15 00:46 .ignore
-rw-r--r-- 1 root root 247 Oct 15 00:46 .pre-commit-hooks.yaml
-rw-r--r-- 1 root root 255 Oct 15 00:46 .prettierignore
-rw-r--r-- 1 root root 73 Oct 15 00:46 .prettierrc
-rw-r--r-- 1 root root 55 Oct 15 00:46 .yarnrc
-rw-r--r-- 1 root root 84302 Oct 15 00:46 CHANGELOG.md
-rw-r--r-- 1 root root 3346 Oct 15 00:46 CODE_OF_CONDUCT.md
-rw-r--r-- 1 root root 7797 Oct 15 00:46 CONTRIBUTING.md
-rw-r--r-- 1 root root 1065 Oct 15 00:46 LICENSE
-rw-r--r-- 1 root root 4154 Oct 15 00:46 README.md
drwxrwxrwx 2 root root 4096 Oct 15 00:46 bin
drwxrwxrwx 20 root root 4096 Oct 15 00:46 changelog_unreleased
-rw-r--r-- 1 root root 10064 Oct 15 00:46 commands.md
-rw-r--r-- 1 root root 8334 Oct 15 00:46 cspell.json
drwxrwxrwx 3 root root 4096 Oct 15 00:46 docs
-rw-r--r-- 1 root root 59 Oct 15 00:46 index.js
-rw-r--r-- 1 root root 2382 Oct 15 00:46 jest.config.js
-rw-r--r-- 1 root root 111 Oct 15 00:46 netlify.toml
drwxr-xr-x 591 root root 16384 Aug 13 19:11 node_modules
-rw-r--r-- 1 root root 6114 Oct 15 00:46 package.json
drwxrwxrwx 6 root root 4096 Oct 15 00:46 scripts
drwxrwxrwx 15 root root 4096 Oct 15 00:46 src
-rw-r--r-- 1 root root 64 Oct 15 00:46 standalone.js
drwxrwxrwx 5 root root 4096 Aug 13 19:11 tests
-rw-r--r-- 1 root root 1240 Oct 15 00:46 tsconfig.json
drwxrwxrwx 4 root root 4096 Aug 13 19:11 types
drwxrwxrwx 10 root root 4096 Oct 15 00:46 website
-rw-r--r-- 1 root root 310630 Oct 15 00:46 yarn.lock
website/package.json
tests/integration/plugins/bespoke/node_modules/@company/prettier-plugin-bespoke/package.json
tests/integration/plugins/automatic/package.json
tests/integration/plugins/automatic/node_modules/prettier-plugin-bar/package.json
tests/integration/plugins/automatic/node_modules/@user/prettier-plugin-foobar/package.json
tests/integration/plugins/automatic/node_modules/@prettier/plugin-foo/package.json
tests/config/prettier-plugins/prettier-plugin-uppercase-rocks/package.json
tests/config/prettier-plugins/prettier-plugin-missing-comments/package.json
tests/integration/cli/config-external-config-syntax-error/package.json
src/language-js/print/typescript.js
tests/integration/cli/config/rc-cjs/prettierrc-cjs-in-type-none/package.json
tests/integration/cli/config/rc-cjs/prettierrc-cjs-in-type-module/package.json
src/language-js/parse/typescript.js
src/language-js/parse/postprocess/typescript.js
tests/integration/cli/config/rc-cjs/prettierrc-cjs-in-type-commonjs/package.json
tests/integration/cli/config/rc-cjs/prettier-config-cjs-in-type-none/package.json
scripts/tools/eslint-plugin-prettier-internal-rules/package.json
tests/integration/cli/config/rc-cjs/prettier-config-cjs-in-type-module/package.json
tests/integration/cli/config/rc-cjs/prettier-config-cjs-in-type-commonjs/package.json
scripts/release/package.json
tests/integration/cli/config/package/package.json
tests/integration/cli/config/external-config/package.json
tests/integration/cli/config/external-config/node_modules/@company/prettier-config/package.json
package.json
tests/format/typescript/typeparams/consistent/typescript-only.ts
tests/format/js/babel-plugins/typescript.js
tests/format/html/js/typescript.html
tests/format/flow-repo/poly_overload/decls/typescript-deferred.jsI need to check if AGENTS were discovered because the output from the rg command isn't showing any results in the list. The command I used, rg --files -g AGENTS, possibly didn’t return anything. I need to recreate the situation because the package might be an older version in a prettier repo. I should look into the tests related to type parameters and print them for clarity. Let's figure this out!
cat package.json | sed -n '1,120p'; rg -n "TSConditionalType|TSArrayType|trailingComma|ConditionalType|empty tuple|TupleType" src/language-js/print/typescript.js src/language-js/printoutput · 161 lines
Chunk ID: 9e71aa
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1585
Output:
{
"name": "prettier",
"version": "2.6.0-dev",
"description": "Prettier is an opinionated code formatter",
"bin": "./bin/prettier.js",
"repository": "prettier/prettier",
"homepage": "https://prettier.io",
"author": "James Long",
"license": "MIT",
"main": "./index.js",
"browser": "./standalone.js",
"unpkg": "./standalone.js",
"engines": {
"node": ">=12.17.0"
},
"files": [
"index.js",
"standalone.js",
"src",
"bin"
],
"dependencies": {
"@angular/compiler": "12.2.13",
"@babel/code-frame": "7.16.0",
"@babel/parser": "7.16.4",
"@glimmer/syntax": "0.83.1",
"@iarna/toml": "2.2.5",
"@typescript-eslint/typescript-estree": "5.4.0",
"angular-estree-parser": "2.5.0",
"angular-html-parser": "1.8.0",
"camelcase": "6.2.1",
"chalk": "4.1.2",
"ci-info": "3.3.0",
"cjk-regex": "2.0.1",
"cosmiconfig": "7.0.1",
"dashify": "2.0.0",
"diff": "5.0.0",
"editorconfig": "0.15.3",
"editorconfig-to-prettier": "0.2.0",
"escape-string-regexp": "4.0.0",
"espree": "9.1.0",
"esutils": "2.0.3",
"fast-glob": "3.2.7",
"fast-json-stable-stringify": "2.1.0",
"find-parent-dir": "0.3.1",
"flow-parser": "0.162.1",
"get-stdin": "8.0.0",
"globby": "11.0.4",
"graphql": "15.6.1",
"html-element-attributes": "2.3.0",
"html-styles": "1.0.0",
"html-tag-names": "1.1.5",
"html-void-elements": "1.0.5",
"ignore": "4.0.6",
"jest-docblock": "27.0.6",
"json5": "2.2.0",
"leven": "3.1.0",
"lines-and-columns": "2.0.3",
"linguist-languages": "7.15.0",
"lodash": "4.17.21",
"mem": "8.1.1",
"meriyah": "4.2.0",
"minimatch": "3.0.4",
"minimist": "1.2.5",
"n-readlines": "1.0.1",
"outdent": "0.8.0",
"parse-srcset": "ikatyang/parse-srcset#54eb9c1cb21db5c62b4d0e275d7249516df6f0ee",
"please-upgrade-node": "3.2.0",
"postcss-less": "3.1.4",
"postcss-media-query-parser": "0.2.3",
"postcss-scss": "2.1.1",
"postcss-selector-parser": "2.2.3",
"postcss-values-parser": "2.0.1",
"regexp-util": "1.2.2",
"remark-footnotes": "2.0.0",
"remark-math": "3.0.1",
"remark-parse": "8.0.3",
"resolve": "1.20.0",
"semver": "7.3.5",
"string-width": "4.2.3",
"strip-ansi": "6.0.0",
"typescript": "4.5.2",
"unicode-regex": "3.0.0",
"unified": "9.2.1",
"vnopts": "1.0.2",
"wcwidth": "1.0.1",
"yaml-unist-parser": "1.3.1"
},
"devDependencies": {
"@babel/core": "7.16.0",
"@babel/preset-env": "7.16.4",
"@babel/types": "7.16.0",
"@glimmer/reference": "0.83.1",
"@rollup/plugin-alias": "3.1.8",
"@rollup/plugin-babel": "5.3.0",
"@rollup/plugin-commonjs": "21.0.1",
"@rollup/plugin-json": "4.1.0",
"@rollup/plugin-node-resolve": "13.0.6",
"@rollup/plugin-replace": "3.0.0",
"@types/estree": "0.0.50",
"@types/jest": "27.0.3",
"babel-jest": "27.3.1",
"babel-loader": "8.2.3",
"benchmark": "2.1.4",
"builtin-modules": "3.2.0",
"core-js": "3.19.1",
"cross-env": "7.0.3",
"cspell": "5.13.1",
"enquirer": "2.3.6",
"eslint": "8.3.0",
"eslint-config-prettier": "8.3.0",
"eslint-formatter-friendly": "7.0.0",
"eslint-plugin-compat": "4.0.0",
"eslint-plugin-import": "2.25.3",
"eslint-plugin-jest": "25.3.0",
"eslint-plugin-prettier-internal-rules": "2.0.1",
"eslint-plugin-react": "7.27.1",
"eslint-plugin-regexp": "1.5.1",
"eslint-plugin-unicorn": "39.0.0",
"esm-utils": "2.0.0",
src/language-js/print/typescript.js:49: printTupleType,
src/language-js/print/typescript.js:160: case "TSArrayType":
src/language-js/print/typescript.js:212: const trailingComma =
src/language-js/print/typescript.js:222: trailingComma,
src/language-js/print/typescript.js:490: case "TSConditionalType":
src/language-js/print/typescript.js:501: case "TSTupleType":
src/language-js/print/typescript.js:502: return printTupleType(path, options, print);
src/language-js/print/typescript.js:49: printTupleType,
src/language-js/print/typescript.js:160: case "TSArrayType":
src/language-js/print/typescript.js:212: const trailingComma =
src/language-js/print/typescript.js:222: trailingComma,
src/language-js/print/typescript.js:490: case "TSConditionalType":
src/language-js/print/typescript.js:501: case "TSTupleType":
src/language-js/print/typescript.js:502: return printTupleType(path, options, print);
src/language-js/print/type-parameters.js:66: const trailingComma =
src/language-js/print/type-parameters.js:82: trailingComma,
src/language-js/print/type-annotation.js:142: parent.type !== "TupleTypeAnnotation" &&
src/language-js/print/type-annotation.js:143: parent.type !== "TSTupleType" &&
src/language-js/print/type-annotation.js:191: (parent.type === "TupleTypeAnnotation" && parent.types.length > 1) ||
src/language-js/print/type-annotation.js:192: (parent.type === "TSTupleType" && parent.elementTypes.length > 1)
src/language-js/print/type-annotation.js:286:// `TSTupleType` and `TupleTypeAnnotation`
src/language-js/print/type-annotation.js:287:function printTupleType(path, options, print) {
src/language-js/print/type-annotation.js:289: const typesField = node.type === "TSTupleType" ? "elementTypes" : "types";
src/language-js/print/type-annotation.js:317: printTupleType,
src/language-js/print/ternary.js:188: * and TSConditionalType
src/language-js/print/ternary.js:189: * @param {AstPath} path - The path to the ConditionalExpression/TSConditionalType node.
src/language-js/print/flow.js:26: printTupleType,
src/language-js/print/flow.js:105: case "TupleTypeAnnotation":
src/language-js/print/flow.js:106: return printTupleType(path, options, print);
src/language-js/print/assignment.js:294: param.type === "TSConditionalType"
src/language-js/print/array.js:85: const trailingComma = !canHaveTrailingComma
src/language-js/print/array.js:102: ? printArrayItemsConcisely(path, options, print, trailingComma)
src/language-js/print/array.js:105: trailingComma,
src/language-js/print/array.js:164:function printArrayItemsConcisely(path, options, print, trailingComma) {
src/language-js/print/array.js:170: parts.push([print(), isLast ? trailingComma : ","]);find .. -name AGENTS.md -print; rg --files tests/format/typescript | head -100; git status --shortoutput · 106 lines
Chunk ID: 6289c2
Wall time: 0.7684 seconds
Process exited with code 0
Original token count: 1387
Output:
tests/format/typescript/webhost/webtsc.ts
tests/format/typescript/webhost/jsfmt.spec.js
tests/format/typescript/webhost/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/unknown/unknown.ts
tests/format/typescript/unknown/jsfmt.spec.js
tests/format/typescript/unknown/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/unique-symbol/unique-symbol.ts
tests/format/typescript/unique-symbol/jsfmt.spec.js
tests/format/typescript/unique-symbol/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/union/within-tuple.ts
tests/format/typescript/union/with-type-params.ts
tests/format/typescript/union/union-parens.ts
tests/format/typescript/union/prettier-ignore.ts
tests/format/typescript/union/jsfmt.spec.js
tests/format/typescript/union/inlining.ts
tests/format/typescript/union/comments.ts
tests/format/typescript/union/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/typeparams/tagged-template-expression.ts
tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js
tests/format/typescript/typeparams/print-width-120/issue-7542.ts
tests/format/typescript/typeparams/print-width-120/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/typeparams/long-function-arg.ts
tests/format/typescript/typeparams/jsfmt.spec.js
tests/format/typescript/typeparams/consistent/typescript-only.ts
tests/format/typescript/typeparams/consistent/template-literal-types.ts
tests/format/typescript/typeparams/consistent/simple-types.ts
tests/format/typescript/typeparams/consistent/jsfmt.spec.js
tests/format/typescript/typeparams/consistent/issue-9501.ts
tests/format/typescript/typeparams/consistent/flow-only.ts
tests/format/typescript/typeparams/consistent/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/typeparams/class-method.ts
tests/format/typescript/typeparams/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/type-only-module-specifiers/jsfmt.spec.js
tests/format/typescript/type-only-module-specifiers/basic.ts
tests/format/typescript/type-only-module-specifiers/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/type-member-get-set/type-member-get-set.ts
tests/format/typescript/type-member-get-set/jsfmt.spec.js
tests/format/typescript/type-member-get-set/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/type-alias/pattern-parameter.ts
tests/format/typescript/type-alias/jsfmt.spec.js
tests/format/typescript/type-alias/issue-9874.ts
tests/format/typescript/type-alias/issue-100857.ts
tests/format/typescript/type-alias/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/tuple/tuple.ts
tests/format/typescript/tuple/tuple-rest-not-last.ts
tests/format/typescript/tuple/tuple-labeled.ts
tests/format/typescript/tuple/trailing-comma.ts
tests/format/typescript/tuple/no-trailing-comma-after-rest.ts
tests/format/typescript/tuple/jsfmt.spec.js
tests/format/typescript/tuple/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/tsx/url.tsx
tests/format/typescript/tsx/type-parameters.tsx
tests/format/typescript/tsx/this.tsx
tests/format/typescript/tsx/react.tsx
tests/format/typescript/tsx/not-react.ts
tests/format/typescript/tsx/member-expression.tsx
tests/format/typescript/tsx/keyword.tsx
tests/format/typescript/tsx/jsfmt.spec.js
tests/format/typescript/tsx/generic-component.tsx
tests/format/typescript/tsx/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/trailing-comma/type-parameters-vs-arguments.ts
tests/format/typescript/trailing-comma/type-arguments.ts
tests/format/typescript/trailing-comma/trailing.ts
tests/format/typescript/trailing-comma/jsfmt.spec.js
tests/format/typescript/trailing-comma/arrow-functions.tsx
tests/format/typescript/trailing-comma/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/test-declarations/test_declarations.ts
tests/format/typescript/test-declarations/jsfmt.spec.js
tests/format/typescript/test-declarations/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/ternaries/jsfmt.spec.js
tests/format/typescript/ternaries/indent.ts
tests/format/typescript/ternaries/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/template-literals/jsfmt.spec.js
tests/format/typescript/template-literals/expressions.ts
tests/format/typescript/template-literals/as-expression.ts
tests/format/typescript/template-literals/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/template-literal-types/template-literal-types.ts
tests/format/typescript/template-literal-types/jsfmt.spec.js
tests/format/typescript/template-literal-types/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/symbol/symbol.ts
tests/format/typescript/symbol/jsfmt.spec.js
tests/format/typescript/symbol/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/static-blocks/static-blocks.ts
tests/format/typescript/static-blocks/nested.ts
tests/format/typescript/static-blocks/multiple.ts
tests/format/typescript/static-blocks/jsfmt.spec.js
tests/format/typescript/static-blocks/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/semi/no-semi.ts
tests/format/typescript/semi/jsfmt.spec.js
tests/format/typescript/semi/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/rest-type/simple.ts
tests/format/typescript/rest-type/jsfmt.spec.js
tests/format/typescript/rest-type/infer-type.ts
tests/format/typescript/rest-type/complex.ts
tests/format/typescript/rest-type/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/rest/rest.ts
tests/format/typescript/rest/jsfmt.spec.js
tests/format/typescript/rest/__snapshots__/jsfmt.spec.js.snap
tests/format/typescript/readonly/readonly.ts
tests/format/typescript/readonly/jsfmt.spec.jsI see the task likely involves reporting a bug and that there are expectations for a code change. It seems I need to reproduce the issue using the command-line interface (CLI). I'll check the input options before running Prettier using the node bin. This seems like a step-by-step approach, and I want to make sure I cover all my bases to effectively address the bug. Let's get started on that!
I found existing width-120 type-parameter coverage; I’ll reproduce and isolate the empty tuple path.
cat tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js; cat tests/format/typescript/typeparams/print-width-120/issue-7542.ts; sed -n '130,235p' src/language-js/print/typescript.js; sed -n '1,130p' src/language-js/print/type-parameters.jsoutput · 262 lines
Chunk ID: f7f5c4
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1815
Output:
run_spec(__dirname, ["typescript"], { printWidth: 120 });
export const Foo = forwardRef((props: FooProps, ref: Ref<HTMLElement>): JSX.Element => {
return <div />;
});
export const Bar = forwardRef((props: BarProps, ref: Ref<HTMLElement>): JSX.Element | null => {
return <div />;
});
users.map((user: User): User => {
return user;
})
users.map((user: User): User => {
; // comment
})
users.map((user: User): User => {
// comment
})
return [
print("label"),
node.optional ? "?" : "",
": ",
print("elementType"),
];
case "TSRestType":
return ["...", print("typeAnnotation")];
case "TSOptionalType":
return [print("typeAnnotation"), "?"];
case "TSInterfaceDeclaration":
return printInterface(path, options, print);
case "TSClassImplements":
return [print("expression"), print("typeParameters")];
case "TSTypeParameterDeclaration":
case "TSTypeParameterInstantiation":
return printTypeParameters(path, options, print, "params");
case "TSTypeParameter":
return printTypeParameter(path, options, print);
case "TSAsExpression": {
parts.push(print("expression"), " as ", print("typeAnnotation"));
const parent = path.getParentNode();
if (
(isCallExpression(parent) && parent.callee === node) ||
(isMemberExpression(parent) && parent.object === node)
) {
return group([indent([softline, ...parts]), softline]);
}
return parts;
}
case "TSArrayType":
return [print("elementType"), "[]"];
case "TSPropertySignature": {
if (node.readonly) {
parts.push("readonly ");
}
parts.push(
printPropertyKey(path, options, print),
printOptionalToken(path)
);
if (node.typeAnnotation) {
parts.push(": ", print("typeAnnotation"));
}
// This isn't valid semantically, but it's in the AST so we can print it.
if (node.initializer) {
parts.push(" = ", print("initializer"));
}
return parts;
}
case "TSParameterProperty":
if (node.accessibility) {
parts.push(node.accessibility + " ");
}
if (node.export) {
parts.push("export ");
}
if (node.static) {
parts.push("static ");
}
if (node.override) {
parts.push("override ");
}
if (node.readonly) {
parts.push("readonly ");
}
parts.push(print("parameter"));
return parts;
case "TSTypeQuery":
return ["typeof ", print("exprName")];
case "TSIndexSignature": {
const parent = path.getParentNode();
// The typescript parser accepts multiple parameters here. If you're
// using them, it makes sense to have a trailing comma. But if you
// aren't, this is more like a computed property name than an array.
// So we leave off the trailing comma when there's just one parameter.
const trailingComma =
node.parameters.length > 1
? ifBreak(shouldPrintComma(options) ? "," : "")
: "";
const parametersGroup = group([
indent([
softline,
join([", ", softline], path.map(print, "parameters")),
]),
trailingComma,
softline,
]);
return [
node.export ? "export " : "",
node.accessibility ? [node.accessibility, " "] : "",
node.static ? "static " : "",
node.readonly ? "readonly " : "",
node.declare ? "declare " : "",
"[",
node.parameters ? parametersGroup : "",
node.typeAnnotation ? "]: " : "]",
node.typeAnnotation ? print("typeAnnotation") : "",
"use strict";
const { printDanglingComments } = require("../../main/comments.js");
const {
builders: { join, line, hardline, softline, group, indent, ifBreak },
} = require("../../document/index.js");
const {
isTestCall,
hasComment,
CommentCheckFlags,
isTSXFile,
shouldPrintComma,
getFunctionParameters,
isObjectType,
} = require("../utils.js");
const { createGroupIdMapper } = require("../../common/util.js");
const { shouldHugType } = require("./type-annotation.js");
const { isArrowFunctionVariableDeclarator } = require("./assignment.js");
const getTypeParametersGroupId = createGroupIdMapper("typeParameters");
function printTypeParameters(path, options, print, paramsKey) {
const node = path.getValue();
if (!node[paramsKey]) {
return "";
}
// for TypeParameterDeclaration typeParameters is a single node
if (!Array.isArray(node[paramsKey])) {
return print(paramsKey);
}
const grandparent = path.getNode(2);
const isParameterInTestCall = grandparent && isTestCall(grandparent);
const isArrowFunctionVariable = path.match(
(node) =>
!(node[paramsKey].length === 1 && isObjectType(node[paramsKey][0])),
undefined,
(node, name) => name === "typeAnnotation",
(node) => node.type === "Identifier",
isArrowFunctionVariableDeclarator
);
const shouldInline =
!isArrowFunctionVariable &&
(isParameterInTestCall ||
node[paramsKey].length === 0 ||
(node[paramsKey].length === 1 &&
(node[paramsKey][0].type === "NullableTypeAnnotation" ||
shouldHugType(node[paramsKey][0]))));
if (shouldInline) {
return [
"<",
join(", ", path.map(print, paramsKey)),
printDanglingCommentsForInline(path, options),
">",
];
}
// Keep comma if the file extension is .tsx and
// has one type parameter that isn't extend with any types.
// Because, otherwise formatted result will be invalid as tsx.
const trailingComma =
node.type === "TSTypeParameterInstantiation" // https://github.com/microsoft/TypeScript/issues/21984
? ""
: getFunctionParameters(node).length === 1 &&
isTSXFile(options) &&
!node[paramsKey][0].constraint &&
path.getParentNode().type === "ArrowFunctionExpression"
? ","
: shouldPrintComma(options, "all")
? ifBreak(",")
: "";
return group(
[
"<",
indent([softline, join([",", line], path.map(print, paramsKey))]),
trailingComma,
softline,
">",
],
{ id: getTypeParametersGroupId(node) }
);
}
function printDanglingCommentsForInline(path, options) {
const node = path.getValue();
if (!hasComment(node, CommentCheckFlags.Dangling)) {
return "";
}
const hasOnlyBlockComments = !hasComment(node, CommentCheckFlags.Line);
const printed = printDanglingComments(
path,
options,
/* sameIndent */ hasOnlyBlockComments
);
if (hasOnlyBlockComments) {
return printed;
}
return [printed, hardline];
}
function printTypeParameter(path, options, print) {
const node = path.getValue();
const parts = [];
const parent = path.getParentNode();
if (parent.type === "TSMappedType") {
parts.push("[", print("name"));
if (node.constraint) {
parts.push(" in ", print("constraint"));
}
if (parent.nameType) {
parts.push(
" as ",
path.callParent(() => print("nameType"))
);
}
parts.push("]");
return parts;
}
if (node.variance) {
parts.push(print("variance"));
}
parts.push(print("name"));printf '%s\n' 'type aabbccdd<a> = []' 'type kjhudifkalmcnf<obj extends Record<string, unknown>, aaddffgg extends string[] = aabbccdd<obj>> = aaddffgg extends []? never: never' | node ./bin/prettier.js --parser typescript --print-width 120 --trailing-comma alloutput · 12 lines
Chunk ID: 1b2580
Wall time: 0.2987 seconds
Process exited with code 0
Original token count: 43
Output:
type aabbccdd<a> = [];
type kjhudifkalmcnf<obj extends Record<string, unknown>, aaddffgg extends string[] = aabbccdd<obj>> = aaddffgg extends [
,
]
? never
: never;sed -n '260,330p' src/language-js/print/type-annotation.js; sed -n '185,235p' src/language-js/print/typescript.js; sed -n '460,520p' src/language-js/print/typescript.jsoutput · 179 lines
Chunk ID: 4face5
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1252
Output:
? [
isArrowFunctionTypeAnnotation ? " => " : ": ",
print("returnType"),
print("predicate"),
print("typeAnnotation"),
]
: "";
const shouldGroupParameters = shouldGroupFunctionParameters(
node,
returnTypeDoc
);
parts.push(shouldGroupParameters ? group(parametersDoc) : parametersDoc);
if (returnTypeDoc) {
parts.push(returnTypeDoc);
}
if (needsParens) {
parts.push(")");
}
return group(parts);
}
// `TSTupleType` and `TupleTypeAnnotation`
function printTupleType(path, options, print) {
const node = path.getValue();
const typesField = node.type === "TSTupleType" ? "elementTypes" : "types";
const hasRest =
node[typesField].length > 0 &&
getLast(node[typesField]).type === "TSRestType";
return group([
"[",
indent([softline, printArrayItems(path, options, typesField, print)]),
ifBreak(shouldPrintComma(options, "all") && !hasRest ? "," : ""),
printDanglingComments(path, options, /* sameIndent */ true),
softline,
"]",
]);
}
// `TSIndexedAccessType`, `IndexedAccessType`, and `OptionalIndexedAccessType`
function printIndexedAccessType(path, options, print) {
const node = path.getValue();
const leftDelimiter =
node.type === "OptionalIndexedAccessType" && node.optional ? "?.[" : "[";
return [print("objectType"), leftDelimiter, print("indexType"), "]"];
}
module.exports = {
printOpaqueType,
printTypeAlias,
printIntersectionType,
printUnionType,
printFunctionType,
printTupleType,
printIndexedAccessType,
shouldHugType,
};
parts.push(node.accessibility + " ");
}
if (node.export) {
parts.push("export ");
}
if (node.static) {
parts.push("static ");
}
if (node.override) {
parts.push("override ");
}
if (node.readonly) {
parts.push("readonly ");
}
parts.push(print("parameter"));
return parts;
case "TSTypeQuery":
return ["typeof ", print("exprName")];
case "TSIndexSignature": {
const parent = path.getParentNode();
// The typescript parser accepts multiple parameters here. If you're
// using them, it makes sense to have a trailing comma. But if you
// aren't, this is more like a computed property name than an array.
// So we leave off the trailing comma when there's just one parameter.
const trailingComma =
node.parameters.length > 1
? ifBreak(shouldPrintComma(options) ? "," : "")
: "";
const parametersGroup = group([
indent([
softline,
join([", ", softline], path.map(print, "parameters")),
]),
trailingComma,
softline,
]);
return [
node.export ? "export " : "",
node.accessibility ? [node.accessibility, " "] : "",
node.static ? "static " : "",
node.readonly ? "readonly " : "",
node.declare ? "declare " : "",
"[",
node.parameters ? parametersGroup : "",
node.typeAnnotation ? "]: " : "]",
node.typeAnnotation ? print("typeAnnotation") : "",
// Global declaration looks like this:
// (declare)? global { ... }
const isGlobalDeclaration =
node.id.type === "Identifier" &&
node.id.name === "global" &&
!/namespace|module/.test(textBetweenNodeAndItsId);
if (!isGlobalDeclaration) {
parts.push(
isExternalModule ||
/(?:^|\s)module(?:\s|$)/.test(textBetweenNodeAndItsId)
? "module "
: "namespace "
);
}
}
parts.push(print("id"));
if (bodyIsDeclaration) {
parts.push(print("body"));
} else if (node.body) {
parts.push(" ", group(print("body")));
} else {
parts.push(semi);
}
return parts;
}
case "TSConditionalType":
return printTernary(path, options, print);
case "TSInferType":
return ["infer", " ", print("typeParameter")];
case "TSIntersectionType":
return printIntersectionType(path, options, print);
case "TSUnionType":
return printUnionType(path, options, print);
case "TSFunctionType":
return printFunctionType(path, options, print);
case "TSTupleType":
return printTupleType(path, options, print);
case "TSTypeReference":
return [
print("typeName"),
printTypeParameters(path, options, print, "typeParameters"),
];
case "TSTypeAnnotation":
return print("typeAnnotation");
case "TSEmptyBodyFunctionExpression":
return printMethodInternal(path, options, print);
// These are not valid TypeScript. Printing them just for the sake of error recovery.
case "TSJSDocAllType":
return "*";
case "TSJSDocUnknownType":
return "?";
case "TSJSDocNullableType":
return ["?", print("typeAnnotation")];
case "TSJSDocNonNullableType":I’m identifying a bug where a printer adds a trailing comma for an empty tuple, which seems related to the parent context. The print width is 120, and the initial line is available. I need to replicate the issue and ensure that the typesField can handle empty tuples. It might also involve the TSTupleType. I'll add a test fixture to the existing suite and check the branch status using the tests/format/typescript/tuple snapshot.
The tuple printer adds ifBreak(",") even when empty; I’ll guard it and add the width-sensitive regression.
cat tests/format/typescript/tuple/jsfmt.spec.js; cat tests/format/typescript/tuple/trailing-comma.ts; cat tests/format/typescript/typeparams/print-width-120/__snapshots__/jsfmt.spec.js.snap | head -50; rg -n '"test|jest' package.json | head -50output · 86 lines
Chunk ID: 31f5c0
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 595
Output:
run_spec(__dirname, ["typescript"], { trailingComma: "none" });
run_spec(__dirname, ["typescript"]);
run_spec(__dirname, ["typescript"], { trailingComma: "all" });
export interface ShopQueryResult {
chic: boolean;
location: number[];
menus: Menu[];
openingDays: number[];
closingDays: [
{
from: string,
to: string,
}, // <== this one
];
shop: string;
distance: number;
}
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`issue-7542.ts - {"printWidth":120} format 1`] = `
====================================options=====================================
parsers: ["typescript"]
printWidth: 120
| printWidth
=====================================input======================================
export const Foo = forwardRef((props: FooProps, ref: Ref<HTMLElement>): JSX.Element => {
return <div />;
});
export const Bar = forwardRef((props: BarProps, ref: Ref<HTMLElement>): JSX.Element | null => {
return <div />;
});
users.map((user: User): User => {
return user;
})
users.map((user: User): User => {
; // comment
})
users.map((user: User): User => {
// comment
})
=====================================output=====================================
export const Foo = forwardRef((props: FooProps, ref: Ref<HTMLElement>): JSX.Element => {
return <div />;
});
export const Bar = forwardRef((props: BarProps, ref: Ref<HTMLElement>): JSX.Element | null => {
return <div />;
});
users.map((user: User): User => {
return user;
});
users.map((user: User): User => {
// comment
});
users.map((user: User): User => {
// comment
});
================================================================================
55: "jest-docblock": "27.0.6",
101: "@types/jest": "27.0.3",
102: "babel-jest": "27.3.1",
115: "eslint-plugin-jest": "25.3.0",
122: "jest": "27.3.1",
123: "jest-snapshot-serializer-ansi": "1.0.0",
124: "jest-snapshot-serializer-raw": "1.2.0",
125: "jest-watch-typeahead": "1.0.0",
145: "test": "jest",
146: "test:dev-package": "cross-env INSTALL_PACKAGE=1 jest",
147: "test:dist": "cross-env NODE_ENV=production jest",
148: "test:dist-standalone": "cross-env NODE_ENV=production TEST_STANDALONE=1 jest",
149: "test:integration": "jest tests/integration",sed -n '65,115p' src/language-js/print/array.js; sed -n '1,80p' tests/format/typescript/tuple/__snapshots__/jsfmt.spec.js.snap; git log -6 --oneline -- src/language-js/print/type-annotation.jsoutput · 138 lines
Chunk ID: b79852
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 878
Output:
if (
elementType !== "ArrayExpression" &&
elementType !== "ObjectExpression"
) {
return false;
}
const nextElement = elements[i + 1];
if (nextElement && elementType !== nextElement.type) {
return false;
}
const itemsKey =
elementType === "ArrayExpression" ? "elements" : "properties";
return element[itemsKey] && element[itemsKey].length > 1;
});
const shouldUseConciseFormatting = isConciselyPrintedArray(node, options);
const trailingComma = !canHaveTrailingComma
? ""
: needsForcedTrailingComma
? ","
: !shouldPrintComma(options)
? ""
: shouldUseConciseFormatting
? ifBreak(",", "", { groupId })
: ifBreak(",");
parts.push(
group(
[
openBracket,
indent([
softline,
shouldUseConciseFormatting
? printArrayItemsConcisely(path, options, print, trailingComma)
: [
printArrayItems(path, options, "elements", print),
trailingComma,
],
printDanglingComments(path, options, /* sameIndent */ true),
]),
softline,
closeBracket,
],
{ shouldBreak, id: groupId }
)
);
}
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`no-trailing-comma-after-rest.ts - {"trailingComma":"all"} format 1`] = `
====================================options=====================================
parsers: ["typescript"]
printWidth: 80
trailingComma: "all"
| printWidth
=====================================input======================================
type ValidateArgs = [
{
[key: string]: any;
},
string,
string,
...string[],
];
=====================================output=====================================
type ValidateArgs = [
{
[key: string]: any;
},
string,
string,
...string[]
];
================================================================================
`;
exports[`no-trailing-comma-after-rest.ts - {"trailingComma":"none"} format 1`] = `
====================================options=====================================
parsers: ["typescript"]
printWidth: 80
trailingComma: "none"
| printWidth
=====================================input======================================
type ValidateArgs = [
{
[key: string]: any;
},
string,
string,
...string[],
];
=====================================output=====================================
type ValidateArgs = [
{
[key: string]: any;
},
string,
string,
...string[]
];
================================================================================
`;
exports[`no-trailing-comma-after-rest.ts format 1`] = `
====================================options=====================================
parsers: ["typescript"]
printWidth: 80
| printWidth
=====================================input======================================
type ValidateArgs = [
{
[key: string]: any;
},
string,
string,
...string[],
];
=====================================output=====================================
type ValidateArgs = [
{
[key: string]: any;
},
62ede8b Build: Remove unnecessary aliases (#11868)I should consider adding specific test inputs related to the configuration for print width and trailing commas. Currently, the spec options include a print width of 120, but I’m wondering if I need to add trailing commas set to "all." I could create a separate directory for tests or modify the existing setup. It might be helpful to also ensure that any modifications won't lead to unintended consequences for snapshot outputs. It’s all about making sure the tests are comprehensive!Clarifying test suite setup
I’ve figured out that the reported input is correctly set up with both a width of 120 and trailing commas. That’s a relief! To make things efficient, I might only want to test the suites that use this configuration. I could create a new empty-tuple.ts file in the type parameters to mirror the setup. Adding a run_spec could help output a pretty inline type alias too. I also need to think about creating a directory for this specific setup without causing additional duplicates. Let’s break it down!Updating test configurations
I'm considering the existing typeparams/print-width-120 setup, which fits the width case perfectly. I think it's a good idea to change the current run_spec to options that include { printWidth: 120, trailingComma: "all" }. This means I’ll adjust the existing test so that it applies to everything. It seems like it’s likely only testing the width format now, but it would be beneficial to add a second run_spec with the same options for comprehensive coverage and duplicate the fixture for input consistency.
Examining patch application
I'm noticing that the tuple group is broken due to the conditional ternary type's length. Without the comma, I wonder if I can still achieve a proper line arrangement with a conditional line break. I need the output to be exact. It seems like I'll need to test it after applying the patch. The developer mentioned that the shell lacks an apply_patch namespace, but I can probably use the exec command to apply the patch. It’s something I need to follow up on!
I’ll make trailing commas conditional on at least one tuple element, then lock in the reported input.
apply_patch <<'PATCH'
*** Begin Patch
*** Update File: src/language-js/print/type-annotation.js
@@
- ifBreak(shouldPrintComma(options, "all") && !hasRest ? "," : ""),
+ ifBreak(
+ shouldPrintComma(options, "all") && node[typesField].length > 0 && !hasRest
+ ? ","
+ : ""
+ ),
*** Add File: tests/format/typescript/typeparams/print-width-120/empty-tuple.ts
+type aabbccdd<a> = []
+type kjhudifkalmcnf<obj extends Record<string, unknown>, aaddffgg extends string[] = aabbccdd<obj>> = aaddffgg extends []? never: never
*** Update File: tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js
@@
run_spec(__dirname, ["typescript"], { printWidth: 120 });
+run_spec(__dirname, ["typescript"], {
+ printWidth: 120,
+ trailingComma: "all",
+});
*** End Patch
PATCH
node ./bin/prettier.js tests/format/typescript/typeparams/print-width-120/empty-tuple.ts --parser typescript --print-width 120 --trailing-comma alloutput · 8 lines
Chunk ID: d655f4
Wall time: 0.0211 seconds
Process exited with code 2
Original token count: 43
Output:
/bin/bash: line 1: apply_patch: command not found
[error] No files matching the pattern were found: "tests/format/typescript/typeparams/print-width-120/empty-tuple.ts".I realize that using the apply_patch tool isn't possible. Maybe I should try using a system command in the /tmp directory instead? It seems I might be missing a command. I could use git apply <<'PATCH' for editing, which is valid, but it mentions I must use the apply_patch tool, which isn’t exposed. So, git apply seems like the next reasonable option, and I need to make sure the patch is correct.
Applying a patch with Git
I need to make sure to apply the correct patch using the command git apply. It seems important to note the progress along the way, so I'll think about how to mention that effectively. I should consider any potential issues that could arise during the application and how to troubleshoot them. Keeping everything clear and organized will help ensure the process goes smoothly! Let's get started on this!
apply_patch isn’t installed in this shell; I’ll apply the same focused diff with git apply.
git apply <<'PATCH'
diff --git a/src/language-js/print/type-annotation.js b/src/language-js/print/type-annotation.js
index 7..8 100644
--- a/src/language-js/print/type-annotation.js
+++ b/src/language-js/print/type-annotation.js
@@ -297,7 +297,11 @@ function printTupleType(path, options, print) {
return group([
"[",
indent([softline, printArrayItems(path, options, typesField, print)]),
- ifBreak(shouldPrintComma(options, "all") && !hasRest ? "," : ""),
+ ifBreak(
+ shouldPrintComma(options, "all") && node[typesField].length > 0 && !hasRest
+ ? ","
+ : ""
+ ),
printDanglingComments(path, options, /* sameIndent */ true),
softline,
"]",
diff --git a/tests/format/typescript/typeparams/print-width-120/empty-tuple.ts b/tests/format/typescript/typeparams/print-width-120/empty-tuple.ts
new file mode 100644
index 0000000..58b8130
--- /dev/null
+++ b/tests/format/typescript/typeparams/print-width-120/empty-tuple.ts
@@ -0,0 +1,2 @@
+type aabbccdd<a> = []
+type kjhudifkalmcnf<obj extends Record<string, unknown>, aaddffgg extends string[] = aabbccdd<obj>> = aaddffgg extends []? never: never
diff --git a/tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js b/tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js
index 4c5fc81..3f 100644
--- a/tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js
+++ b/tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js
@@ -1 +1,5 @@
run_spec(__dirname, ["typescript"], { printWidth: 120 });
+run_spec(__dirname, ["typescript"], {
+ printWidth: 120,
+ trailingComma: "all",
+});
PATCHoutput · 6 lines
Chunk ID: c0ee8e
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 0
Output:I’m considering that there might be a potential issue with a bad fake index hash that won't work, but git apply says it's successful. I need to run the formatter and update relevant Jest snapshots. My plan is to start with the CLI, then run the tests. It looks like I also need to manually run Prettier on the exact file using the correct configuration. Let’s be thorough here!
node ./bin/prettier.js tests/format/typescript/typeparams/print-width-120/empty-tuple.ts --parser typescript --print-width 120 --trailing-comma alloutput · 8 lines
Chunk ID: 72cba9
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 40
Output:
type aabbccdd<a> = []
type kjhudifkalmcnf<obj extends Record<string, unknown>, aaddffgg extends string[] = aabbccdd<obj>> = aaddffgg extends []? never: nevergit diff --check && git diff -- src/language-js/print/type-annotation.js tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js tests/format/typescript/typeparams/print-width-120/empty-tuple.tsoutput · 33 lines
Chunk ID: 292060
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 293
Output:
diff --git a/src/language-js/print/type-annotation.js b/src/language-js/print/type-annotation.js
index 7772e90..e27954a 100644
--- a/src/language-js/print/type-annotation.js
+++ b/src/language-js/print/type-annotation.js
@@ -293,7 +293,11 @@ function printTupleType(path, options, print) {
return group([
"[",
indent([softline, printArrayItems(path, options, typesField, print)]),
- ifBreak(shouldPrintComma(options, "all") && !hasRest ? "," : ""),
+ ifBreak(
+ shouldPrintComma(options, "all") && node[typesField].length > 0 && !hasRest
+ ? ","
+ : ""
+ ),
printDanglingComments(path, options, /* sameIndent */ true),
softline,
"]",
diff --git a/tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js b/tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js
index fabcb10..9bb793f 100644
--- a/tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js
+++ b/tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js
@@ -1 +1,5 @@
run_spec(__dirname, ["typescript"], { printWidth: 120 });
+run_spec(__dirname, ["typescript"], {
+ printWidth: 120,
+ trailingComma: "all",
+});I need to request the file, and then the output should be formatted correctly. For testing purposes, I should use printf after I fix the issues. It's essential to ensure that everything displays as expected. I want to make sure that I address any potential errors at this stage. Thus, being meticulous with formatting will help me catch any mistakes that might arise during the testing process. Let's move forward!
Exploring command line issues
I'm thinking about whether invoking Prettier with the path text file might be done incorrectly due to the argument option parser. It seems earlier I piped something, but I want to double-check that. I think trying the exact command line interface (CLI) with and without the piped option could help identify the issue. Let's break it down to see what's going wrong or if there's a simple fix!
cat tests/format/typescript/typeparams/print-width-120/empty-tuple.ts | node ./bin/prettier.js --parser typescript --print-width 120 --trailing-comma alloutput · 12 lines
Chunk ID: ee0b65
Wall time: 0.1759 seconds
Process exited with code 0
Original token count: 42
Output:
type aabbccdd<a> = [];
type kjhudifkalmcnf<obj extends Record<string, unknown>, aaddffgg extends string[] = aabbccdd<obj>> = aaddffgg extends [
]
? never
: never;yarn jest tests/format/typescript/typeparams/print-width-120 --runInBand -woutput · 142 lines
Chunk ID: 913edc
Wall time: 0.1254 seconds
Process exited with code 1
Original token count: 6239
Output:
Warning: truncated output (original token count: 6239)
Total output lines: 323
yarn run v1.22.22
$ /testbed/node_modules/.bin/jest tests/format/typescript/typeparams/print-width-120 --runInBand -w
Usage: jest [--config=<pathToConfigFile>] [TestPathPattern]
Options:
-h, --help Show help [boolean]
-v, --version Print the version and exit [boolean]
--all The opposite of `onlyChanged`. If
`onlyChanged` is set by default, running
jest with `--all` will force Jest to run all
tests instead of running only tests related
to changed files. [boolean]
--automock Automock all files by default. [boolean]
-b, --bail Exit the test suite immediately after `n`
number of failing tests. [boolean]
--cache Whether to use the transform cache. Disable
the cache using --no-cache. [boolean]
--cacheDirectory The directory where Jest should store its
cached dependency information. [string]
--changedFilesWithAncestor Runs tests related to the current changes
and the changes made in the last commit.
Behaves similarly to `--onlyChanged`.
[boolean]
--changedSince Runs tests related to the changes since the
provided branch. If the current branch has
diverged from the given branch, then only
changes made locally will be tested. Behaves
similarly to `--onlyChanged`. [string]
--ci Whether to run Jest in continuous
integration (CI) mode. This option is on by
default in most popular CI environments. It
will prevent snapshots from being written
unless explicitly requested. [boolean]
--clearCache Clears the configured Jest cache directory
and then exits. Default directory can be
found by calling jest --showConfig [boolean]
--clearMocks Automatically clear mock calls and instances
between every test. Equivalent to calling
jest.clearAllMocks() between each test.
[boolean]
--collectCoverage Alias for --coverage. [boolean]
--collectCoverageFrom A glob pattern relative to <rootDir>
matching the files that coverage info needs
to be collected from. [string]
--collectCoverageOnlyFrom Explicit list of paths coverage will be
restricted to. [array]
--color Forces test results output color
highlighting (even if stdout is not a TTY).
Set to false if you would like to have no
colors. [boolean]
--colors Alias for `--color`. [boolean]
-c, --config The path to a jest config file specifying
how to find and execute tests. If no rootDir
is set in the config, the directory
containing the config file is assumed to be
the rootDir for the project.This can also be
a JSON encoded value which Jest will use as
configuration. [string]
--coverage Indicates that test coverage information
should be collected and reported in the
output. [boolean]
--coverageDirectory The directory where Jest should output its
coverage files. [string]
--coveragePathIgnorePatterns An array of regexp pattern strings that are
matched against all file paths before
executing the test. If the file pathmatches
…14953 chars truncated… any of the patterns, it will be skipped.
[array]
--testPathPattern A regexp pattern string that is matched
against all tests paths before executing the
test. [array]
--testRegex A string or array of string regexp patterns
that Jest uses to detect test files. [array]
--testResultsProcessor Allows the use of a custom results
processor. This processor must be a node
module that exports a function expecting as
the first argument the result object.
[string]
--testRunner Allows to specify a custom test runner. The
default is `jest-circus/runner`. A path to a
custom test runner can be provided:
`<rootDir>/path/to/testRunner.js`. [string]
--testSequencer Allows to specify a custom test sequencer.
The default is `@jest/test-sequencer`. A
path to a custom test sequencer can be
provided:
`<rootDir>/path/to/testSequencer.js`[string]
--testTimeout This option sets the default timeouts of
test cases. [number]
--testURL This option sets the URL for the jsdom
environment. [string]
--timers Setting this value to fake allows the use of
fake timers for functions such as
setTimeout. [string]
--transform A JSON string which maps from regular
expressions to paths to transformers.
[string]
--transformIgnorePatterns An array of regexp pattern strings that are
matched against all source file paths before
transformation. [array]
--unmockedModulePathPatterns An array of regexp pattern strings that are
matched against all modules before the
module loader will automatically return a
mock for them. [array]
-u, --updateSnapshot Use this flag to re-record snapshots. Can be
used together with a test suite pattern or
with `--testNamePattern` to re-record
snapshot for test matching the pattern
[boolean]
--useStderr Divert all output to stderr. [boolean]
--verbose Display individual test results with the
test suite hierarchy. [boolean]
--watch Watch files for changes and rerun tests
related to changed files. If you want to
re-run all tests when a file has changed,
use the `--watchAll` option. [boolean]
--watchAll Watch files for changes and rerun all tests.
If you want to re-run only the tests related
to the changed files, use the `--watch`
option. [boolean]
--watchPathIgnorePatterns An array of regexp pattern strings that are
matched against all paths before trigger
test re-run in watch mode. If the test path
matches any of the patterns, it will be
skipped. [array]
--watchman Whether to use watchman for file crawling.
Disable using --no-watchman. [boolean]
Documentation: https://jestjs.io/
Both --runInBand and --maxWorkers were specified, but these two options do not make sense together. Which is it?
error Command failed with exit code 1.
info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.I'm considering the behavior of doc group nesting. The inner tuple can break independently, but I wonder why that happens. It could be that the ifBreak logic inside the tuple is causing breaks due to context. I’m also curious about how the parent layout influences this. Perhaps the parent layout is the reason for the break, as the TSConditional's ternary might rely on the shouldBreak condition. I want to explore the print and ternary aspects further.
Investigating output issues
I need to understand the output better and fix what's expected. The original had commas in the tuple lines, but even without them, the lines remain. I'm curious why the empty tuple group is causing a break. I want the group to print with soft lines on both sides, appearing as [] if it’s not too lengthy. Inner references to ifBreak seem linked to the group's mode—which might be inherited from the group ID. I should check the documentation on builders and ternary operations.
The comma is gone, but the empty tuple still expands; I’m checking group propagation before finalizing the fix.
sed -n '150,280p' src/language-js/print/ternary.js; rg -n "function ifBreak|const ifBreak|ifBreak\(" src/document src/language-js/print | head -80output · 174 lines
Chunk ID: 12f5c2
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1739
Output:
let parent;
let child = node;
for (let ancestorCount = 0; !parent; ancestorCount++) {
const node = path.getParentNode(ancestorCount);
if (
(isCallExpression(node) && node.callee === child) ||
(isMemberExpression(node) && node.object === child) ||
(node.type === "TSNonNullExpression" && node.expression === child)
) {
child = node;
continue;
}
// Reached chain root
if (
(node.type === "NewExpression" && node.callee === child) ||
(node.type === "TSAsExpression" && node.expression === child)
) {
parent = path.getParentNode(ancestorCount + 1);
child = node;
} else {
parent = node;
}
}
// Do not add indent to direct `ConditionalExpression`
if (child === node) {
return false;
}
return parent[ancestorNameMap.get(parent.type)] === child;
}
/**
* The following is the shared logic for
* ternary operators, namely ConditionalExpression
* and TSConditionalType
* @param {AstPath} path - The path to the ConditionalExpression/TSConditionalType node.
* @param {Options} options - Prettier options
* @param {Function} print - Print function to call recursively
* @returns {Doc}
*/
function printTernary(path, options, print) {
const node = path.getValue();
const isConditionalExpression = node.type === "ConditionalExpression";
const consequentNodePropertyName = isConditionalExpression
? "consequent"
: "trueType";
const alternateNodePropertyName = isConditionalExpression
? "alternate"
: "falseType";
const testNodePropertyNames = isConditionalExpression
? ["test"]
: ["checkType", "extendsType"];
const consequentNode = node[consequentNodePropertyName];
const alternateNode = node[alternateNodePropertyName];
const parts = [];
// We print a ConditionalExpression in either "JSX mode" or "normal mode".
// See `tests/format/jsx/conditional-expression.js` for more info.
let jsxMode = false;
const parent = path.getParentNode();
const isParentTest =
parent.type === node.type &&
testNodePropertyNames.some((prop) => parent[prop] === node);
let forceNoIndent = parent.type === node.type && !isParentTest;
// Find the outermost non-ConditionalExpression parent, and the outermost
// ConditionalExpression parent. We'll use these to determine if we should
// print in JSX mode.
let currentParent;
let previousParent;
let i = 0;
do {
previousParent = currentParent || node;
currentParent = path.getParentNode(i);
i++;
} while (
currentParent &&
currentParent.type === node.type &&
testNodePropertyNames.every(
(prop) => currentParent[prop] !== previousParent
)
);
const firstNonConditionalParent = currentParent || parent;
const lastConditionalParent = previousParent;
if (
isConditionalExpression &&
(isJsxNode(node[testNodePropertyNames[0]]) ||
isJsxNode(consequentNode) ||
isJsxNode(alternateNode) ||
conditionalExpressionChainContainsJsx(lastConditionalParent))
) {
jsxMode = true;
forceNoIndent = true;
// Even though they don't need parens, we wrap (almost) everything in
// parens when using ?: within JSX, because the parens are analogous to
// curly braces in an if statement.
const wrap = (doc) => [
ifBreak("("),
indent([softline, doc]),
softline,
ifBreak(")"),
];
// The only things we don't wrap are:
// * Nested conditional expressions in alternates
// * null
// * undefined
const isNil = (node) =>
node.type === "NullLiteral" ||
(node.type === "Literal" && node.value === null) ||
(node.type === "Identifier" && node.name === "undefined");
parts.push(
" ? ",
isNil(consequentNode)
? print(consequentNodePropertyName)
: wrap(print(consequentNodePropertyName)),
" : ",
alternateNode.type === node.type || isNil(alternateNode)
? print(alternateNodePropertyName)
: wrap(print(alternateNodePropertyName))
);
} else {
// normal mode
const part = [
src/language-js/print/typescript.js:85: ifBreak("("),
src/language-js/print/typescript.js:88: ifBreak(")"),
src/language-js/print/typescript.js:214: ? ifBreak(shouldPrintComma(options) ? "," : "")
src/language-js/print/typescript.js:318: ifBreak(semi),
src/language-js/print/type-parameters.js:75: ? ifBreak(",")
src/language-js/print/type-annotation.js:182: ifBreak([shouldAddStartLine ? line : "", "| "]),
src/language-js/print/type-annotation.js:195: indent([ifBreak(["(", softline]), code]),
src/language-js/print/type-annotation.js:197: ifBreak(")"),
src/language-js/print/type-annotation.js:296: ifBreak(
src/language-js/print/ternary.js:253: ifBreak("("),
src/language-js/print/ternary.js:256: ifBreak(")"),
src/language-js/print/ternary.js:283: consequentNode.type === node.type ? ifBreak("", "(") : "",
src/language-js/print/ternary.js:285: consequentNode.type === node.type ? ifBreak("", ")") : "",
src/document/doc-debug.js:122: "ifBreak(" +
src/language-js/print/object.js:90: ? ifBreak(semi, ";")
src/language-js/print/object.js:191: ifBreak(
src/document/doc-builders.js:157:function ifBreak(breakContents, flatContents, opts = {}) {
src/document/doc-builders.js:176: * Optimized version of `ifBreak(indent(doc), doc, { groupId: ... })`
src/language-js/print/module.js:227: ifBreak(shouldPrintComma(options) ? "," : ""),
src/language-js/print/class.js:98: return ifBreak(hardline, "", { groupId: getHeritageGroupId(node) });
src/language-js/print/class.js:134: ? ifBreak(" ", line, {
src/language-js/print/class.js:150: ifBreak(["(", indent([softline, printed]), softline, ")"], printed)
src/language-js/print/jsx.js:120: : ifBreak([rawJsxWhitespace, softline], " ");
src/language-js/print/jsx.js:464: needsParens ? "" : ifBreak("("),
src/language-js/print/jsx.js:467: needsParens ? "" : ifBreak(")"),
src/language-js/print/interface.js:44: ? ifBreak(" ", line, {
src/language-js/print/call-arguments.js:171: ifBreak(maybeTrailingComma),
src/language-js/print/function.js:282: isCallee ? ifBreak(softline, "", { groupId }) : "",
src/language-js/print/function.js:383: shouldAddParens ? ifBreak("", "(") : "",
src/language-js/print/function.js:385: shouldAddParens ? ifBreak("", ")") : "",
src/language-js/print/function.js:388: ? [ifBreak(printTrailingComma ? "," : ""), softline]
src/language-js/print/function.js:467: ifBreak(" (", " "),
src/language-js/print/function.js:470: ifBreak(")"),
src/language-js/print/binaryish.js:247: [softline, ":", ifBreak(" ")],
src/language-js/print/function-parameters.js:145: ifBreak(
src/language-js/print/array.js:92: ? ifBreak(",", "", { groupId })
src/language-js/print/array.js:93: : ifBreak(",");node ./bin/prettier.js --parser typescript --print-width 120 --trailing-comma all <<'EOF'
type kjhudifkalmcnf<obj extends Record<string, unknown>, aaddffgg extends string[] = string[]> = aaddffgg extends []? never: never
EOF
node ./bin/prettier.js --parser typescript --print-width 120 --trailing-comma all <<'EOF'
type longname<obj extends Record<string, unknown>, aaddffgg extends string[] = string[]> = aaddffgg extends [] ? never : never
EOFoutput · 12 lines
Chunk ID: dc5db3
Wall time: 0.3919 seconds
Process exited with code 0
Original token count: 68
Output:
type kjhudifkalmcnf<obj extends Record<string, unknown>, aaddffgg extends string[] = string[]> = aaddffgg extends []
? never
: never;
type longname<obj extends Record<string, unknown>, aaddffgg extends string[] = string[]> = aaddffgg extends []
? never
: never;rg -n 'printTupleType\(' src/language-js/print; rg -n 'forceBreak|shouldBreak' src/document/builders.js src/document/printer.js | head -60output · 11 lines
Chunk ID: 4315ac
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 102
Output:
src/language-js/print/typescript.js:502: return printTupleType(path, options, print);
src/language-js/print/type-annotation.js:287:function printTupleType(path, options, print) {
src/language-js/print/flow.js:106: return printTupleType(path, options, print);
rg: src/document/builders.js: No such file or directory (os error 2)
rg: src/document/printer.js: No such file or directory (os error 2)I want to check the actual string length using a command like wc. I also need to confirm that the pre-fix output matches the user's original request, especially where the generic list is inline and tuples break. It seems that in our pre-patch run output, the generic list was inline but had issues with the [ , ] format. I wonder if the type parameters stayed inline when the documentation could fit immediately.
Considering code comments
I’m thinking about preserving comments in the code. Maybe I should use printDanglingComments right after the group. There’s also the idea of a special case: if the node doesn’t have any types and no dangling comments, it could return an empty array. I’ll need to check on importing the helpers for inspecting comments and make sure to flag everything in the type annotations correctly. That will keep things tidy!
Analyzing printer logic
I’m looking at how the printer sees the ifBreak inside a group and wondering how group decisions are made. The nested group's group relates to ifBreak, and the content "," suggests that if the group breaks, line breaks become mandatory. An empty tuple with a comma has more than three characters but still fits. I’m curious if the group breaks due to a break mode set by a parent. I’ll check the ifBreak logic in the doc-builders and doc-printer files.
sed -n '280,370p' src/language-js/print/ternary.js; sed -n '140,180p' src/document/doc-builders.js; rg -n "if-break|ifBreak|groupMode|breakMode|groupId" src/documentoutput · 168 lines
Chunk ID: c82e00
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1539
Output:
const part = [
line,
"? ",
consequentNode.type === node.type ? ifBreak("", "(") : "",
align(2, print(consequentNodePropertyName)),
consequentNode.type === node.type ? ifBreak("", ")") : "",
line,
": ",
alternateNode.type === node.type
? print(alternateNodePropertyName)
: align(2, print(alternateNodePropertyName)),
];
parts.push(
parent.type !== node.type ||
parent[alternateNodePropertyName] === node ||
isParentTest
? part
: options.useTabs
? dedent(indent(part))
: align(Math.max(0, options.tabWidth - 2), part)
);
}
// We want a whole chain of ConditionalExpressions to all
// break if any of them break. That means we should only group around the
// outer-most ConditionalExpression.
const comments = [
...testNodePropertyNames.map((propertyName) =>
getComments(node[propertyName])
),
getComments(consequentNode),
getComments(alternateNode),
].flat();
const shouldBreak = comments.some(
(comment) =>
isBlockComment(comment) &&
hasNewlineInRange(
options.originalText,
locStart(comment),
locEnd(comment)
)
);
const maybeGroup = (doc) =>
parent === firstNonConditionalParent
? group(doc, { shouldBreak })
: shouldBreak
? [doc, breakParent]
: doc;
// Break the closing paren to keep the chain right after it:
// (a
// ? b
// : c
// ).call()
const breakClosingParen =
!jsxMode &&
(isMemberExpression(parent) ||
(parent.type === "NGPipeExpression" && parent.left === node)) &&
!parent.computed;
const shouldExtraIndent = shouldExtraIndentForConditionalExpression(path);
const result = maybeGroup([
printTernaryTest(path, options, print),
forceNoIndent ? parts : indent(parts),
isConditionalExpression && breakClosingParen && !shouldExtraIndent
? softline
: "",
]);
return isParentTest || shouldExtraIndent
? group([indent([softline, result]), softline])
: result;
}
module.exports = { printTernary };
*/
function fill(parts) {
if (process.env.NODE_ENV !== "production") {
for (const part of parts) {
assertDoc(part);
}
}
return { type: "fill", parts };
}
/**
* @param {Doc} [breakContents]
* @param {Doc} [flatContents]
* @param {object} [opts] - TBD ???
* @returns Doc
*/
function ifBreak(breakContents, flatContents, opts = {}) {
if (process.env.NODE_ENV !== "production") {
if (breakContents) {
assertDoc(breakContents);
}
if (flatContents) {
assertDoc(flatContents);
}
}
return {
type: "if-break",
breakContents,
flatContents,
groupId: opts.groupId,
};
}
/**
* Optimized version of `ifBreak(indent(doc), doc, { groupId: ... })`
* @param {Doc} contents
* @param {{ groupId: symbol, negate?: boolean }} opts
* @returns Doc
*/
src/document/doc-utils.js:51: } else if (doc.type === "if-break") {
src/document/doc-utils.js:102: if (doc.type === "if-break") {
src/document/doc-utils.js:210: if (doc.type === "if-break") {
src/document/doc-utils.js:249: case "indent-if-break":
src/document/doc-utils.js:256: case "if-break": {
src/document/doc-utils.js:294: case "indent-if-break":
src/document/doc-utils.js:300: case "if-break":
src/document/doc-utils.js:339:// - `cleanDoc` also remove nested `group`s and empty `fill`/`align`/`indent`/`line-suffix`/`if-break` if possible
src/document/doc-printer.js:9:let groupModeMap;
src/document/doc-printer.js:195: const groupMode = doc.break ? MODE_BREAK : mode;
src/document/doc-printer.js:198: groupMode,
src/document/doc-printer.js:200: doc.expandedStates && groupMode === MODE_BREAK
src/document/doc-printer.js:206: groupModeMap[doc.id] = groupMode;
src/document/doc-printer.js:216: case "if-break":
src/document/doc-printer.js:217: case "indent-if-break": {
src/document/doc-printer.js:218: const groupMode = doc.groupId ? groupModeMap[doc.groupId] : mode;
src/document/doc-printer.js:219: if (groupMode === MODE_BREAK) {
src/document/doc-printer.js:221: doc.type === "if-break"
src/document/doc-printer.js:230: if (groupMode === MODE_FLAT) {
src/document/doc-printer.js:232: doc.type === "if-break"
src/document/doc-printer.js:281: groupModeMap = {};
src/document/doc-printer.js:390: groupModeMap[doc.id] = getLast(cmds)[1];
src/document/doc-printer.js:487: case "if-break":
src/document/doc-printer.js:488: case "indent-if-break": {
src/document/doc-printer.js:489: const groupMode = doc.groupId ? groupModeMap[doc.groupId] : mode;
src/document/doc-printer.js:490: if (groupMode === MODE_BREAK) {
src/document/doc-printer.js:492: doc.type === "if-break"
src/document/doc-printer.js:501: if (groupMode === MODE_FLAT) {
src/document/doc-printer.js:503: doc.type === "if-break"
src/document/doc-debug.js:26: if (doc.type === "if-break") {
src/document/doc-debug.js:120: if (doc.type === "if-break") {
src/document/doc-debug.js:122: "ifBreak(" +
src/document/doc-debug.js:125: (doc.groupId
src/document/doc-debug.js:127: `, { groupId: ${printGroupId(doc.groupId)} }`
src/document/doc-debug.js:133: if (doc.type === "indent-if-break") {
src/document/doc-debug.js:140: if (doc.groupId) {
src/document/doc-debug.js:141: optionsParts.push(`groupId: ${printGroupId(doc.groupId)}`);
src/document/doc-builders.js:157:function ifBreak(breakContents, flatContents, opts = {}) {
src/document/doc-builders.js:168: type: "if-break",
src/document/doc-builders.js:171: groupId: opts.groupId,
src/document/doc-builders.js:176: * Optimized version of `ifBreak(indent(doc), doc, { groupId: ... })`
src/document/doc-builders.js:178: * @param {{ groupId: symbol, negate?: boolean }} opts
src/document/doc-builders.js:183: type: "indent-if-break",
src/document/doc-builders.js:185: groupId: opts.groupId,
src/document/doc-builders.js:280: ifBreak,rg -n "function printDanglingComments|printDanglingComments" src/main/comments.js src/language-js/print/type-annotation.js | head -35; sed -n '1,60p' src/language-js/print/type-annotation.js; sed -n '1,110p' src/language-js/print/ternary.jsoutput · 180 lines
Chunk ID: 7960de
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1274
Output:
src/language-js/print/type-annotation.js:5: printDanglingComments,
src/language-js/print/type-annotation.js:301: printDanglingComments(path, options, /* sameIndent */ true),
src/main/comments.js:512:function printDanglingComments(path, options, sameIndent, filter) {
src/main/comments.js:607: printDanglingComments,
"use strict";
const {
printComments,
printDanglingComments,
} = require("../../main/comments.js");
const { getLast } = require("../../common/util.js");
const {
builders: { group, join, line, softline, indent, align, ifBreak },
} = require("../../document/index.js");
const pathNeedsParens = require("../needs-parens.js");
const { locStart } = require("../loc.js");
const {
isSimpleType,
isObjectType,
hasLeadingOwnLineComment,
isObjectTypePropertyAFunction,
shouldPrintComma,
} = require("../utils.js");
const { printAssignment } = require("./assignment.js");
const {
printFunctionParameters,
shouldGroupFunctionParameters,
} = require("./function-parameters.js");
const { printArrayItems } = require("./array.js");
function shouldHugType(node) {
if (isSimpleType(node) || isObjectType(node)) {
return true;
}
if (node.type === "UnionTypeAnnotation" || node.type === "TSUnionType") {
const voidCount = node.types.filter(
(node) =>
node.type === "VoidTypeAnnotation" ||
node.type === "TSVoidKeyword" ||
node.type === "NullLiteralTypeAnnotation" ||
node.type === "TSNullKeyword"
).length;
const hasObject = node.types.some(
(node) =>
node.type === "ObjectTypeAnnotation" ||
node.type === "TSTypeLiteral" ||
// This is a bit aggressive but captures Array<{x}>
node.type === "GenericTypeAnnotation" ||
node.type === "TSTypeReference"
);
if (node.types.length - 1 === voidCount && hasObject) {
return true;
}
}
return false;
}
function printOpaqueType(path, options, print) {
const semi = options.semi ? ";" : "";
const node = path.getValue();
"use strict";
const { hasNewlineInRange } = require("../../common/util.js");
const {
isJsxNode,
isBlockComment,
getComments,
isCallExpression,
isMemberExpression,
} = require("../utils.js");
const { locStart, locEnd } = require("../loc.js");
const {
builders: {
line,
softline,
group,
indent,
align,
ifBreak,
dedent,
breakParent,
},
} = require("../../document/index.js");
/**
* @typedef {import("../../document").Doc} Doc
* @typedef {import("../../common/ast-path")} AstPath
*
* @typedef {any} Options - Prettier options (TBD ...)
*/
// If we have nested conditional expressions, we want to print them in JSX mode
// if there's at least one JSXElement somewhere in the tree.
//
// A conditional expression chain like this should be printed in normal mode,
// because there aren't JSXElements anywhere in it:
//
// isA ? "A" : isB ? "B" : isC ? "C" : "Unknown";
//
// But a conditional expression chain like this should be printed in JSX mode,
// because there is a JSXElement in the last ConditionalExpression:
//
// isA ? "A" : isB ? "B" : isC ? "C" : <span className="warning">Unknown</span>;
//
// This type of ConditionalExpression chain is structured like this in the AST:
//
// ConditionalExpression {
// test: ...,
// consequent: ...,
// alternate: ConditionalExpression {
// test: ...,
// consequent: ...,
// alternate: ConditionalExpression {
// test: ...,
// consequent: ...,
// alternate: ...,
// }
// }
// }
function conditionalExpressionChainContainsJsx(node) {
// Given this code:
//
// // Using a ConditionalExpression as the consequent is uncommon, but should
// // be handled.
// A ? B : C ? D : E ? F ? G : H : I
//
// which has this AST:
//
// ConditionalExpression {
// test: Identifier(A),
// consequent: Identifier(B),
// alternate: ConditionalExpression {
// test: Identifier(C),
// consequent: Identifier(D),
// alternate: ConditionalExpression {
// test: Identifier(E),
// consequent: ConditionalExpression {
// test: Identifier(F),
// consequent: Identifier(G),
// alternate: Identifier(H),
// },
// alternate: Identifier(I),
// }
// }
// }
//
// We don't care about whether each node was the test, consequent, or alternate
// We are only checking if there's any JSXElements inside.
const conditionalExpressions = [node];
for (let index = 0; index < conditionalExpressions.length; index++) {
const conditionalExpression = conditionalExpressions[index];
for (const property of ["test", "consequent", "alternate"]) {
const node = conditionalExpression[property];
if (isJsxNode(node)) {
return true;
}
if (node.type === "ConditionalExpression") {
conditionalExpressions.push(node);
}
}
}
return false;
}
function printTernaryTest(path, options, print) {
const node = path.getValue();
const isConditionalExpression = node.type === "ConditionalExpression";I'm trying to figure out how group mode inheritance works in relation to ifBreak using the current context. Since printTupleType has its group nested inside an outer conditional, I wonder if the parent line breaks will affect how ifBreak resolves the outer mode due to this nested group. I should look into the documentation on how the printer handles group processing to clarify this. There's a lot to unpack!
sed -n '175,240p' src/document/doc-printer.js; sed -n '370,430p' src/document/doc-printer.js; sed -n '510,555p' src/main/comments.jsoutput · 179 lines
Chunk ID: d84ed9
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 1279
Output:
cmds.push([ind, mode, parts[i]]);
}
} else {
switch (doc.type) {
case "indent":
cmds.push([makeIndent(ind, options), mode, doc.contents]);
break;
case "align":
cmds.push([makeAlign(ind, doc.n, options), mode, doc.contents]);
break;
case "trim":
width += trim(out);
break;
case "group": {
if (mustBeFlat && doc.break) {
return false;
}
const groupMode = doc.break ? MODE_BREAK : mode;
cmds.push([
ind,
groupMode,
// The most expanded state takes up the least space on the current line.
doc.expandedStates && groupMode === MODE_BREAK
? getLast(doc.expandedStates)
: doc.contents,
]);
if (doc.id) {
groupModeMap[doc.id] = groupMode;
}
break;
}
case "fill":
for (let i = doc.parts.length - 1; i >= 0; i--) {
cmds.push([ind, mode, doc.parts[i]]);
}
break;
case "if-break":
case "indent-if-break": {
const groupMode = doc.groupId ? groupModeMap[doc.groupId] : mode;
if (groupMode === MODE_BREAK) {
const breakContents =
doc.type === "if-break"
? doc.breakContents
: doc.negate
? doc.contents
: indent(doc.contents);
if (breakContents) {
cmds.push([ind, mode, breakContents]);
}
}
if (groupMode === MODE_FLAT) {
const flatContents =
doc.type === "if-break"
? doc.flatContents
: doc.negate
? indent(doc.contents)
: doc.contents;
if (flatContents) {
cmds.push([ind, mode, flatContents]);
}
}
const cmd = [ind, MODE_FLAT, state];
if (fits(cmd, cmds, rem, options, hasLineSuffix)) {
cmds.push(cmd);
break;
}
}
}
}
} else {
cmds.push([ind, MODE_BREAK, doc.contents]);
}
}
break;
}
}
if (doc.id) {
groupModeMap[doc.id] = getLast(cmds)[1];
}
break;
// Fills each line with as much code as possible before moving to a new
// line with the same indentation.
//
// Expects doc.parts to be an array of alternating content and
// whitespace. The whitespace contains the linebreaks.
//
// For example:
// ["I", line, "love", line, "monkeys"]
// or
// [{ type: group, ... }, softline, { type: group, ... }]
//
// It uses this parts structure to handle three main layout cases:
// * The first two content items fit on the same line without
// breaking
// -> output the first content item and the whitespace "flat".
// * Only the first content item fits on the line without breaking
// -> output the first content item "flat" and the whitespace with
// "break".
// * Neither content item fits on the line without breaking
// -> output the first content item and the whitespace with "break".
case "fill": {
const rem = width - pos;
const { parts } = doc;
if (parts.length === 0) {
break;
}
const [content, whitespace] = parts;
const contentFlatCmd = [ind, MODE_FLAT, content];
const contentBreakCmd = [ind, MODE_BREAK, content];
const contentFits = fits(
contentFlatCmd,
[],
rem,
options,
lineSuffix.length > 0,
true
}
function printDanglingComments(path, options, sameIndent, filter) {
const parts = [];
const node = path.getValue();
if (!node || !node.comments) {
return "";
}
path.each(() => {
const comment = path.getValue();
if (!comment.leading && !comment.trailing && (!filter || filter(comment))) {
parts.push(printComment(path, options));
}
}, "comments");
if (parts.length === 0) {
return "";
}
if (sameIndent) {
return join(hardline, parts);
}
return indent([hardline, join(hardline, parts)]);
}
function printCommentsSeparately(path, options, ignored) {
const value = path.getValue();
if (!value) {
return {};
}
let comments = value.comments || [];
if (ignored) {
comments = comments.filter((comment) => !ignored.has(comment));
}
const isCursorNode = value === options.cursorNode;
if (comments.length === 0) {
const maybeCursor = isCursorNode ? cursor : "";
return { leading: maybeCursor, trailing: maybeCursor };
}
const leadingParts = [];
const trailingParts = [];It looks like my previous fix only removed the comma, which left blank lines and didn't achieve the expected outcome. So, I should add a condition to short-circuit the empty tuple: if the node's types field is empty and there are no comments, I want to return an empty array. The trailing comma guard might be redundant for empty cases after this short-circuit, but keeping it could ensure there’s never a trailing comma in truly empty scenarios. I'll also check if this affects how comments are returned.
Evaluating type parameters
I’m considering that the issue might be due to the outer document being generically built with broken print type parameters, which could involve a group ID linked to a matching declaration. I should inspect the getTypeParametersGroupId and see how the type parameters output group ID in maybe the TypeScript alias printer. I'm curious if there's some kind of group ID interaction with tuples, or if the type parameter group is flat, even though it’s longer because of a parent group break.
Working on git patch adjustments
I could use git apply directly for this. First, I should maybe run yarn jest ... -u to check the options tests, ensuring I don’t run tests while the snapshot is stale. Running with -u would update. I need to fix a special case first, applying the patch to account for empty comments. I must ensure the output meets the user’s expectations with the correct semicolons and spacing. Let's see how it turns out!
The parent conditional forces nested groups to break; I’ll keep comment-free empty tuples atomic.
git apply <<'PATCH'
diff --git a/src/language-js/print/type-annotation.js b/src/language-js/print/type-annotation.js
index e27954a..f00eae1 100644
--- a/src/language-js/print/type-annotation.js
+++ b/src/language-js/print/type-annotation.js
@@ -287,6 +287,12 @@ function printTupleType(path, options, print) {
function printTupleType(path, options, print) {
const node = path.getValue();
const typesField = node.type === "TSTupleType" ? "elementTypes" : "types";
+ if (
+ node[typesField].length === 0 &&
+ (!node.comments || node.comments.length === 0)
+ ) {
+ return "[]";
+ }
const hasRest =
node[typesField].length > 0 &&
getLast(node[typesField]).type === "TSRestType";
PATCH
cat tests/format/typescript/typeparams/print-width-120/empty-tuple.ts | node ./bin/prettier.js --parser typescript --print-width 120 --trailing-comma alloutput · 11 lines
Chunk ID: cea4c4
Wall time: 0.1614 seconds
Process exited with code 0
Original token count: 43
Output:
type aabbccdd<a> = [];
type kjhudifkalmcnf<
obj extends Record<string, unknown>,
aaddffgg extends string[] = aabbccdd<obj>,
> = aaddffgg extends [] ? never : never;I’m noticing a discrepancy in how the special branch deals with a single type parameter in TSX declarations. It seems that it doesn’t treat it as a constraint, while there are two parameters in the declaration. This suggests that a comma should be printed after a single type, but the user expected none. The output in the image might indicate they were expecting TSX without a trailing comma. It's a bit confusing!
Considering file operations
I'm thinking about using mv for renaming files instead of apply_patch, which is unavailable at the moment. It seems reasonable to work directly with the .tsx file without needing extra fixtures. I could also remove the file and then add it with git apply. It's important to verify the output when using --stdin-filepath /tmp/foo.tsx to ensure everything functions correctly. Let's explore what works best!
cat tests/format/typescript/typeparams/print-width-120/empty-tuple.ts | node ./bin/prettier.js --parser typescript --stdin-filepath empty-tuple.tsx --print-width 120 --trailing-comma alloutput · 11 lines
Chunk ID: 1ca5d9
Wall time: 0.1380 seconds
Process exited with code 0
Original token count: 43
Output:
type aabbccdd<a> = [];
type kjhudifkalmcnf<
obj extends Record<string, unknown>,
aaddffgg extends string[] = aabbccdd<obj>,
> = aaddffgg extends [] ? never : never;The fixed formatter now keeps [] intact and wraps the generic parameters correctly; I’ll update and run the focused snapshots.
yarn jest tests/format/typescript/typeparams/print-width-120 --runInBand -uoutput · 32 lines
Chunk ID: 11bf0a
Wall time: 0.8628 seconds
Process exited with code 0
Original token count: 219
Output:
yarn run v1.22.22
$ /testbed/node_modules/.bin/jest tests/format/typescript/typeparams/print-width-120 --runInBand -u
PASS tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js
empty-tuple.ts - {"printWidth":120}
✓ format (2 ms)
✓ [babel-ts] format
issue-7542.ts - {"printWidth":120}
✓ format
✓ [babel-ts] format
empty-tuple.ts - {"printWidth":120,"trailingComma":"all"}
✓ format
✓ [babel-ts] format (1 ms)
issue-7542.ts - {"printWidth":120,"trailingComma":"all"}
✓ format
✓ [babel-ts] format
› 3 snapshots written.
Snapshot Summary
› 3 snapshots written from 1 test suite.
Test Suites: 1 passed, 1 total
Tests: 8 passed, 8 total
Snapshots: 3 written, 1 passed, 4 total
Time: 0.47 s
Ran all test suites matching /tests\/format\/typescript\/typeparams\/print-width-120/i.
Done in 0.91s.git status --short; git diff --check; git diff --stat; git diff -- src/language-js/print/type-annotation.js tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js tests/format/typescript/typeparams/print-width-120/empty-tuple.tsoutput · 53 lines
Chunk ID: b736e1
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 523
Output:
M src/language-js/print/type-annotation.js
M tests/format/typescript/typeparams/print-width-120/__snapshots__/jsfmt.spec.js.snap
M tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js
?? tests/format/typescript/typeparams/print-width-120/empty-tuple.ts
src/language-js/print/type-annotation.js | 12 ++-
.../__snapshots__/jsfmt.spec.js.snap | 90 ++++++++++++++++++++++
.../typeparams/print-width-120/jsfmt.spec.js | 4 +
3 files changed, 105 insertions(+), 1 deletion(-)
diff --git a/src/language-js/print/type-annotation.js b/src/language-js/print/type-annotation.js
index 7772e90..131549f 100644
--- a/src/language-js/print/type-annotation.js
+++ b/src/language-js/print/type-annotation.js
@@ -287,13 +287,23 @@ function printFunctionType(path, options, print) {
function printTupleType(path, options, print) {
const node = path.getValue();
const typesField = node.type === "TSTupleType" ? "elementTypes" : "types";
+ if (
+ node[typesField].length === 0 &&
+ (!node.comments || node.comments.length === 0)
+ ) {
+ return "[]";
+ }
const hasRest =
node[typesField].length > 0 &&
getLast(node[typesField]).type === "TSRestType";
return group([
"[",
indent([softline, printArrayItems(path, options, typesField, print)]),
- ifBreak(shouldPrintComma(options, "all") && !hasRest ? "," : ""),
+ ifBreak(
+ shouldPrintComma(options, "all") && node[typesField].length > 0 && !hasRest
+ ? ","
+ : ""
+ ),
printDanglingComments(path, options, /* sameIndent */ true),
softline,
"]",
diff --git a/tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js b/tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js
index fabcb10..9bb793f 100644
--- a/tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js
+++ b/tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js
@@ -1 +1,5 @@
run_spec(__dirname, ["typescript"], { printWidth: 120 });
+run_spec(__dirname, ["typescript"], {
+ printWidth: 120,
+ trailingComma: "all",
+});rg --files tests/format/flow | rg '/tuple|tuple/' | head -30; sed -n '/empty-tuple.ts - {"printWidth":120,"trailingComma":"all"} format 1/,/================================================================================/p' tests/format/typescript/typeparams/print-width-120/__snapshots__/jsfmt.spec.js.snapoutput · 24 lines
Chunk ID: f700c1
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 233
Output:
exports[`empty-tuple.ts - {"printWidth":120,"trailingComma":"all"} format 1`] = `
====================================options=====================================
parsers: ["typescript"]
printWidth: 120
trailingComma: "all"
| printWidth
=====================================input======================================
type aabbccdd<a> = []
type kjhudifkalmcnf<obj extends Record<string, unknown>, aaddffgg extends string[] = aabbccdd<obj>> = aaddffgg extends []? never: never
=====================================output=====================================
type aabbccdd<a> = [];
type kjhudifkalmcnf<
obj extends Record<string, unknown>,
aaddffgg extends string[] = aabbccdd<obj>,
> = aaddffgg extends [] ? never : never;
================================================================================I should run all related TypeScript tests, focusing on the specific suite. I think I'll run the command: yarn jest tests/format/typescript/tuple tests/format/typescript/typeparams/print-width-120 --runInBand. It seems like a good approach. Should I also lint the file? I'm a bit unsure if the tests are enough on their own or if additional checking would be beneficial. Let's stick with using yarn jest for this.
The regression snapshots match the intended layout; I’ll run adjacent tuple and width-120 suites for safety.
yarn jest tests/format/typescript/tuple tests/format/typescript/typeparams/print-width-120 --runInBandoutput · 17 lines
Chunk ID: 1db992
Wall time: 1.0336 seconds
Process exited with code 0
Original token count: 134
Output:
yarn run v1.22.22
$ /testbed/node_modules/.bin/jest tests/format/typescript/tuple tests/format/typescript/typeparams/print-width-120 --runInBand
PASS tests/format/typescript/tuple/jsfmt.spec.js
PASS tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js
Test Suites: 2 passed, 2 total
Tests: 38 passed, 38 total
Snapshots: 19 passed, 19 total
Time: 0.665 s, estimated 1 s
Ran all test suites matching /tests\/format\/typescript\/tuple|tests\/format\/typescript\/typeparams\/print-width-120/i.
Done in 1.09s.I’m considering whether I should remove redundant trailing commas from my code. It seems like the empty tuple path doesn’t require comments, which keeps the output clean. If no comments exist, the absence of a comma from short-circuit logic makes sense. However, I think I need ifBreak to handle empty tuples with comments properly. Running the formatter with node ./bin/prettier.js --check might help, especially since it seems like the .prettierignore is affecting test formats.Checking file with Prettier
I’m thinking about using stdin style to check a specific file with Prettier — running a command like node bin prettier.js src/language-js/print/type-annotation.js --check seems like a good start. I guess running yarn lint could help, but maybe it's not necessary since the focused tests passed. I wonder about the diff snapshots, particularly ensuring that my .ts test suite aligns with expected outputs. It looks like there's a mismatch with trailing commas—expected outputs want no trailing comma, which might indicate a bug regression. Adjusting the fixture to .tsx could help.Re-evaluating output expectations
I’m wondering if the user expected to see a screenshot of the output, particularly since they wanted no trailing comma. Why is the output in the playground expected to have no comma? Their input line for type declaration has two parameters, which raises the question of whether a trailing comma is necessary in a multi-line generic parameter list. Prettier usually avoids trailing commas in type declarations, but it seems that trailingComma: all might apply here. I think the expected output should indeed include a comma.
node ./bin/prettier.js src/language-js/print/type-annotation.js tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js --checkoutput · 9 lines
Chunk ID: 4e828a
Wall time: 0.0612 seconds
Process exited with code 1
Original token count: 37
Output:
Checking formatting...
[warn] src/language-js/print/type-annotation.js
[warn] Code style issues found in the above file(s). Forgot to run Prettier?nl -ba src/language-js/print/type-annotation.js | sed -n '283,315p'; nl -ba tests/format/typescript/typeparams/print-width-120/empty-tuple.ts; git diff --check; git status --shortoutput · 45 lines
Chunk ID: 878dce
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 405
Output:
283 return group(parts);
284 }
285
286 // `TSTupleType` and `TupleTypeAnnotation`
287 function printTupleType(path, options, print) {
288 const node = path.getValue();
289 const typesField = node.type === "TSTupleType" ? "elementTypes" : "types";
290 if (
291 node[typesField].length === 0 &&
292 (!node.comments || node.comments.length === 0)
293 ) {
294 return "[]";
295 }
296 const hasRest =
297 node[typesField].length > 0 &&
298 getLast(node[typesField]).type === "TSRestType";
299 return group([
300 "[",
301 indent([softline, printArrayItems(path, options, typesField, print)]),
302 ifBreak(
303 shouldPrintComma(options, "all") && node[typesField].length > 0 && !hasRest
304 ? ","
305 : ""
306 ),
307 printDanglingComments(path, options, /* sameIndent */ true),
308 softline,
309 "]",
310 ]);
311 }
312
313 // `TSIndexedAccessType`, `IndexedAccessType`, and `OptionalIndexedAccessType`
314 function printIndexedAccessType(path, options, print) {
315 const node = path.getValue();
1 type aabbccdd<a> = []
2 type kjhudifkalmcnf<obj extends Record<string, unknown>, aaddffgg extends string[] = aabbccdd<obj>> = aaddffgg extends []? never: never
M src/language-js/print/type-annotation.js
M tests/format/typescript/typeparams/print-width-120/__snapshots__/jsfmt.spec.js.snap
M tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js
?? tests/format/typescript/typeparams/print-width-120/empty-tuple.tsI’m noticing that there might be a mismatch with the ifBreak format due to line breaks. My next step is to run prettier with the --write option to take care of this. It’s important since the file has specific formatting styles I need to adhere to. A tool preamble might help in ensuring everything is consistent. Let’s see if this resolves the issue!
Checking code formatting
I need to verify the command that warns about code style. I'll simply run prettier --write on the relevant JavaScript and specification files. It looks like the spec file doesn't show warnings, so I'll make sure to format the source correctly. I want to ensure that everything adheres to the proper style guidelines! That should help maintain consistency throughout the codebase.
Tests pass; the style check flagged one wrapping detail, so I’ll format it and recheck.
node ./bin/prettier.js src/language-js/print/type-annotation.js --write && node ./bin/prettier.js src/language-js/print/type-annotation.js tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js --checkoutput · 9 lines
Chunk ID: 6d1f78
Wall time: 0.2520 seconds
Process exited with code 0
Original token count: 28
Output:
src/language-js/print/type-annotation.js 50ms
Checking formatting...
All matched files use Prettier code style!I need to consider rerunning tests, mainly to check the formatting. It seems like everything is pretty affordable, which is good! I should also verify the differences and run those tests after making sure the formatting is correct. My plan includes using Jest for testing and performing a diff check in parallel to ensure everything lines up. It's essential to keep everything tidy and organized!
yarn jest tests/format/typescript/tuple tests/format/typescript/typeparams/print-width-120 --runInBandoutput · 17 lines
Chunk ID: 4c1071
Wall time: 1.0689 seconds
Process exited with code 0
Original token count: 134
Output:
yarn run v1.22.22
$ /testbed/node_modules/.bin/jest tests/format/typescript/tuple tests/format/typescript/typeparams/print-width-120 --runInBand
PASS tests/format/typescript/tuple/jsfmt.spec.js
PASS tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js
Test Suites: 2 passed, 2 total
Tests: 38 passed, 38 total
Snapshots: 19 passed, 19 total
Time: 0.667 s, estimated 1 s
Ran all test suites matching /tests\/format\/typescript\/tuple|tests\/format\/typescript\/typeparams\/print-width-120/i.
Done in 1.12s.git diff --check; git diff --stat; nl -ba src/language-js/print/type-annotation.js | sed -n '286,311p'; git status --shortoutput · 40 lines
Chunk ID: 96a584
Wall time: 0.0000 seconds
Process exited with code 0
Original token count: 366
Output:
src/language-js/print/type-annotation.js | 14 +++-
.../__snapshots__/jsfmt.spec.js.snap | 90 ++++++++++++++++++++++
.../typeparams/print-width-120/jsfmt.spec.js | 4 +
3 files changed, 107 insertions(+), 1 deletion(-)
286 // `TSTupleType` and `TupleTypeAnnotation`
287 function printTupleType(path, options, print) {
288 const node = path.getValue();
289 const typesField = node.type === "TSTupleType" ? "elementTypes" : "types";
290 if (
291 node[typesField].length === 0 &&
292 (!node.comments || node.comments.length === 0)
293 ) {
294 return "[]";
295 }
296 const hasRest =
297 node[typesField].length > 0 &&
298 getLast(node[typesField]).type === "TSRestType";
299 return group([
300 "[",
301 indent([softline, printArrayItems(path, options, typesField, print)]),
302 ifBreak(
303 shouldPrintComma(options, "all") &&
304 node[typesField].length > 0 &&
305 !hasRest
306 ? ","
307 : ""
308 ),
309 printDanglingComments(path, options, /* sameIndent */ true),
310 softline,
311 "]",
M src/language-js/print/type-annotation.js
M tests/format/typescript/typeparams/print-width-120/__snapshots__/jsfmt.spec.js.snap
M tests/format/typescript/typeparams/print-width-120/jsfmt.spec.js
?? tests/format/typescript/typeparams/print-width-120/empty-tuple.tsFixed empty TypeScript tuples so they stay [] when an enclosing conditional type breaks, and prevented trailing commas on empty tuples in src/language-js/print/type-annotation.js:287. Added the width-120 regression case and trailingComma: all coverage.
Validation: 38 tests passed across the TypeScript tuple and width-120 suites; formatting check passed.