Skip to content

Commit f509d19

Browse files
committed
fix(lint): per-call oxlint disables + logger calls (.github/actions + scripts/npm)
Convert file-scope oxlint disables to inline disable-next-line per violation site, and rewrite `\n`-containing logger calls into split-line calls per the no-logger-newline-literal rule. .github/actions/lib/install-tool.mjs: 8x console.error + 1x fetch exemptions, each with reason "pre-setup-node action — lib not installed yet". Plus parseIntegrity exemption for the export-top-level-functions rule. .github/actions/lib/semver.mjs: switch console.error -> logger.fail (file already imports getDefaultLogger). Drop the redundant '×' prefix since logger.fail emits its own glyph. scripts/npm/{publish-npm-packages,set-npm-package-access, check-trusted-packages,make-npm-override}.mts: rewrite `logger.log(\n...\n)` into separate blank-line + content calls per the no-logger-newline-literal rule.
1 parent d0f95e6 commit f509d19

6 files changed

Lines changed: 42 additions & 24 deletions

File tree

.github/actions/lib/install-tool.mjs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,10 @@ if (process.env.GITHUB_TOKEN) {
8787
headers.Authorization = `Bearer ${process.env.GITHUB_TOKEN}`
8888
}
8989

90+
// oxlint-disable-next-line socket/no-fetch-prefer-http-request -- pre-setup-node action; @socketsecurity/lib-stable not installed yet, only built-in fetch is available.
9091
const res = await fetch(url, { redirect: 'follow', headers })
9192
if (!res.ok) {
93+
// oxlint-disable-next-line socket/no-console-prefer-logger -- pre-setup-node action; @socketsecurity/lib-stable not installed yet.
9294
console.error(
9395
`× download failed: HTTP ${res.status} ${res.statusText} for ${url}`,
9496
)
@@ -103,9 +105,13 @@ const actual = crypto.createHash(algo).update(bytes).digest('base64')
103105
// comparing so `sha512-...=` and `sha512-...` match.
104106
const stripPadding = b64 => b64.replace(/=+$/, '')
105107
if (stripPadding(actual) !== stripPadding(expected)) {
108+
// oxlint-disable-next-line socket/no-console-prefer-logger -- pre-setup-node action; @socketsecurity/lib-stable not installed yet.
106109
console.error(${algo} integrity mismatch for ${assetName}`)
110+
// oxlint-disable-next-line socket/no-console-prefer-logger -- pre-setup-node action; same.
107111
console.error(` Expected: ${algo}-${expected}`)
112+
// oxlint-disable-next-line socket/no-console-prefer-logger -- pre-setup-node action; same.
108113
console.error(` Actual: ${algo}-${actual}`)
114+
// oxlint-disable-next-line socket/no-console-prefer-logger -- pre-setup-node action; same.
109115
console.error(` URL: ${url}`)
110116
process.exit(2)
111117
}
@@ -135,6 +141,7 @@ if (lower.endsWith('.tar.gz') || lower.endsWith('.tgz')) {
135141
if (extractCmd) {
136142
const r = spawnSync(extractCmd, extractArgs, { stdio: 'inherit' })
137143
if (r.status !== 0) {
144+
// oxlint-disable-next-line socket/no-console-prefer-logger -- pre-setup-node action; @socketsecurity/lib-stable not installed yet.
138145
console.error(`× extraction failed: ${extractCmd} exited ${r.status}`)
139146
process.exit(1)
140147
}

.github/actions/lib/semver.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ if (mode === 'lt') {
3434
const pa = parts(a)
3535
const pb = parts(b)
3636
if (!pa) {
37-
logger.fail(`× not semver: "${a}"`)
37+
logger.fail(`not semver: "${a}"`)
3838
process.exit(2)
3939
}
4040
if (!pb) {
41-
console.error(not semver: "${b}"`)
41+
logger.fail(`not semver: "${b}"`)
4242
process.exit(2)
4343
}
4444
for (let i = 0; i < 3; i += 1) {
@@ -49,5 +49,5 @@ if (mode === 'lt') {
4949
process.exit(1)
5050
}
5151

52-
console.error(unknown mode "${mode}" (expected "valid" or "lt")`)
52+
logger.fail(`unknown mode "${mode}" (expected "valid" or "lt")`)
5353
process.exit(2)

scripts/npm/check-trusted-packages.mts

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,28 @@ const { values: args } = parseArgs({
6161
})
6262

6363
if (args.help) {
64-
logger.log(`
65-
Usage: node check-trusted-packages.mjs [options]
66-
67-
Options:
68-
--all Check all Socket packages (@socketsecurity/*, @socketregistry/*, @socketoverride/*)
69-
--debug Show detailed information for all packages (not just failures)
70-
--help Show this help message
71-
72-
By default, checks:
73-
- All @socketregistry/* packages
74-
- All @socketoverride/* packages
75-
- Core Socket packages (sfw, socket, etc.)
76-
77-
With --all flag, adds:
78-
- Additional Socket packages (@socketsecurity/config, @socketsecurity/mcp, etc.)
79-
`)
64+
logger.log('')
65+
logger.log('Usage: node check-trusted-packages.mjs [options]')
66+
logger.log('')
67+
logger.log('Options:')
68+
logger.log(
69+
' --all Check all Socket packages (@socketsecurity/*, @socketregistry/*, @socketoverride/*)',
70+
)
71+
logger.log(
72+
' --debug Show detailed information for all packages (not just failures)',
73+
)
74+
logger.log(' --help Show this help message')
75+
logger.log('')
76+
logger.log('By default, checks:')
77+
logger.log(' - All @socketregistry/* packages')
78+
logger.log(' - All @socketoverride/* packages')
79+
logger.log(' - Core Socket packages (sfw, socket, etc.)')
80+
logger.log('')
81+
logger.log('With --all flag, adds:')
82+
logger.log(
83+
' - Additional Socket packages (@socketsecurity/config, @socketsecurity/mcp, etc.)',
84+
)
85+
logger.log('')
8086
process.exitCode = 0
8187
}
8288

scripts/npm/make-npm-override.mts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,10 @@ async function main(): Promise<void> {
242242
const formattedWarnings = licenseWarnings.map(w =>
243243
indentString(${w}`, { count: 2 }),
244244
)
245-
logger.warn(
246-
`${origPkgName} has license warnings:\n${formattedWarnings.join('\n')}`,
247-
)
245+
logger.warn(`${origPkgName} has license warnings:`)
246+
for (let i = 0, { length } = formattedWarnings; i < length; i += 1) {
247+
logger.warn(formattedWarnings[i]!)
248+
}
248249
}
249250
if (badLicenses.length) {
250251
const singularOrPlural = pluralize('license', {

scripts/npm/publish-npm-packages.mts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,11 @@ export async function publishAtCommit(sha) {
306306
return { fails, skipped }
307307
}
308308

309+
logger.log('')
309310
logger.log(
310-
`\nPublishing ${packagesToPublish.length} ${pluralize('package', { count: packagesToPublish.length })}...\n`,
311+
`Publishing ${packagesToPublish.length} ${pluralize('package', { count: packagesToPublish.length })}...`,
311312
)
313+
logger.log('')
312314

313315
// Separate registry package from other packages.
314316
const registryPkgToPublish = packagesToPublish.find(

scripts/npm/set-npm-package-access.mts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ async function main(): Promise<void> {
100100
fails.push(pkg.printName)
101101
if (stderr) {
102102
const errorInfo = extractNpmError(stderr)
103-
logger.log(`\n${errorInfo}\n`)
103+
logger.log('')
104+
logger.log(errorInfo)
105+
logger.log('')
104106
}
105107
}
106108
},

0 commit comments

Comments
 (0)