Skip to content

fix(scripts): normalize Windows path separators in validation scripts #9400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sahooarnav2007-gif wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −18
Open

fix(scripts): normalize Windows path separators in validation scripts #9400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions scripts/check-api-validation-contracts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ import { readdir, readFile } from 'node:fs/promises'
import path from 'node:path'

const ROOT = path.resolve(import.meta.dir, '..')
const API_DIR = path.join(ROOT, 'apps/sim/app/api')
const CONTRACTS_DIR = path.join(ROOT, 'apps/sim/lib/api/contracts')
const QUERY_HOOKS_DIR = path.join(ROOT, 'apps/sim/hooks/queries')
const SELECTOR_HOOKS_DIR = path.join(ROOT, 'apps/sim/hooks/selectors')
const toPosix = (p: string) => p.replace(/\\/g, '/')
const API_DIR = toPosix(path.join(ROOT, 'apps/sim/app/api'))
const CONTRACTS_DIR = toPosix(path.join(ROOT, 'apps/sim/lib/api/contracts'))
const QUERY_HOOKS_DIR = toPosix(path.join(ROOT, 'apps/sim/hooks/queries'))
const SELECTOR_HOOKS_DIR = toPosix(path.join(ROOT, 'apps/sim/hooks/selectors'))

/**
* `totalRoutes` is reported, never gated.
Expand Down Expand Up @@ -477,7 +478,7 @@ function findRawFetchFindings(
exemptions: number
missingReasons: AnnotationMissingReasonFinding[]
} {
const relativePath = path.relative(ROOT, filePath)
const relativePath = toPosix(path.relative(ROOT, filePath))
const lines = content.split('\n')
const findings: RawFetchFinding[] = []
const missingReasons: AnnotationMissingReasonFinding[] = []
Expand Down Expand Up @@ -515,7 +516,7 @@ function findDoubleCastFindings(
exemptions: number
missingReasons: AnnotationMissingReasonFinding[]
} {
const relativePath = path.relative(ROOT, filePath)
const relativePath = toPosix(path.relative(ROOT, filePath))
const lines = content.split('\n')
const findings: DoubleCastFinding[] = []
const missingReasons: AnnotationMissingReasonFinding[] = []
Expand Down Expand Up @@ -562,7 +563,7 @@ function findRawJsonFindings(
exemptions: number
missingReasons: AnnotationMissingReasonFinding[]
} {
const relativePath = path.relative(ROOT, filePath)
const relativePath = toPosix(path.relative(ROOT, filePath))
const lines = content.split('\n')
const findings: RawJsonFinding[] = []
const missingReasons: AnnotationMissingReasonFinding[] = []
Expand Down Expand Up @@ -613,7 +614,7 @@ function findUntypedResponseFindings(
exemptions: number
missingReasons: AnnotationMissingReasonFinding[]
} {
const relativePath = path.relative(ROOT, filePath)
const relativePath = toPosix(path.relative(ROOT, filePath))
const lines = content.split('\n')
const findings: UntypedResponseFinding[] = []
const missingReasons: AnnotationMissingReasonFinding[] = []
Expand Down Expand Up @@ -683,7 +684,7 @@ function findSameOriginApiFetchFindings(
exemptions: number
missingReasons: AnnotationMissingReasonFinding[]
} {
const relativePath = path.relative(ROOT, filePath)
const relativePath = toPosix(path.relative(ROOT, filePath))
const lines = content.split('\n')
const findings: SameOriginApiFetchFinding[] = []
const missingReasons: AnnotationMissingReasonFinding[] = []
Expand Down Expand Up @@ -713,7 +714,7 @@ function findSameOriginApiFetchFindings(
}

function routeFamily(routePath: string): string {
const relative = routePath.replace(/^apps\/sim\/app\/api\//, '')
const relative = toPosix(routePath).replace(/^apps\/sim\/app\/api\//, '')
const [first, second] = relative.split('/')

if (first === 'tools') return `tools/${second ?? 'unknown'}`
Expand Down Expand Up @@ -767,7 +768,7 @@ function hasZodUsage(relativePath: string, content: string): boolean {
}

function auditRoute(filePath: string, content: string): RouteAudit {
const relativePath = path.relative(ROOT, filePath)
const relativePath = toPosix(path.relative(ROOT, filePath))
const schemaConstructorCount = [...content.matchAll(ZOD_SCHEMA_CONSTRUCTOR_PATTERN)].length

return {
Expand All @@ -785,7 +786,7 @@ function auditRoute(filePath: string, content: string): RouteAudit {

function findAdHocWireTypes(filePath: string, content: string): WireTypeFinding[] {
const findings: WireTypeFinding[] = []
const relativePath = path.relative(ROOT, filePath)
const relativePath = toPosix(path.relative(ROOT, filePath))

for (const match of content.matchAll(WIRE_TYPE_DECLARATION_PATTERN)) {
const kind = match[1]
Expand Down Expand Up @@ -814,7 +815,7 @@ function findAdHocWireTypes(filePath: string, content: string): WireTypeFinding[
}

function auditQueryHook(filePath: string, content: string): QueryHookAudit {
const relativePath = path.relative(ROOT, filePath)
const relativePath = toPosix(path.relative(ROOT, filePath))
const schemaConstructorCount = [...content.matchAll(ZOD_SCHEMA_CONSTRUCTOR_PATTERN)].length

return {
Expand Down Expand Up @@ -1281,13 +1282,13 @@ async function main() {
let sameOriginApiFetchExemptions = 0
let doubleCastExemptions = 0

const appsSimRoot = path.join(ROOT, 'apps/sim')
const contractsRoot = path.join(CONTRACTS_DIR, path.sep)
const appsSimRoot = toPosix(path.join(ROOT, 'apps/sim'))
const contractsRoot = `${toPosix(CONTRACTS_DIR)}/`

for (const filePath of sourceFiles) {
const content = sourceCache.get(filePath) ?? (await readFile(filePath, 'utf8'))
if (filePath.startsWith(contractsRoot)) sourceCache.set(filePath, content)
const normalized = filePath.replace(/\\/g, '/')
const normalized = toPosix(filePath)
if (normalized.startsWith(contractsRoot)) sourceCache.set(filePath, content)

if (isClientHookFile(filePath) && content.includes('fetch')) {
const rawFetch = findRawFetchFindings(filePath, content)
Expand Down
2 changes: 1 addition & 1 deletion scripts/check-tool-registry-boundary.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ function collectEntries(
for (const entry of readdirSync(dir, { withFileTypes: true })) {
const full = join(dir, entry.name)
if (entry.isDirectory()) collectEntries(full, matches, found)
else if (matches(entry.name, full)) found.push(relative(APP, full))
else if (matches(entry.name, full)) found.push(relative(APP, full).replaceAll('\\', '/'))
}
return found
}
Expand Down