Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
200 changes: 88 additions & 112 deletions bun.lock

Large diffs are not rendered by default.

9 changes: 8 additions & 1 deletion cli/snapshot/worker-snapshot-handlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import type { CameraPreset } from "lib/shared/camera-presets"
import type { PcbSnapshotSettings } from "lib/project-config/project-config-schema"
import { processSnapshotFile } from "lib/shared/process-snapshot-file"
import { registerStaticAssetLoaders } from "lib/shared/register-static-asset-loaders"
import { loadRuntimeProjectConfig } from "lib/project-config"
import { mergePlatformConfigs } from "lib/shared/platform-config-utils"
import type { SnapshotCompletedMessage } from "./worker-types"

type SnapshotWorkerOptions = {
Expand All @@ -25,6 +27,11 @@ export const handleSnapshotFile = async (
): Promise<SnapshotCompletedMessage> => {
process.chdir(projectDir)
await registerStaticAssetLoaders()
const projectConfig = await loadRuntimeProjectConfig(projectDir)
const platformConfig = mergePlatformConfigs(
projectConfig?.platformConfig,
options.platformConfig,
)

const result = await processSnapshotFile({
file: filePath,
Expand All @@ -35,7 +42,7 @@ export const handleSnapshotFile = async (
pcbOnly: options.pcbOnly,
schematicOnly: options.schematicOnly,
forceUpdate: options.forceUpdate,
platformConfig: options.platformConfig,
platformConfig,
pcbSnapshotSettings: options.pcbSnapshotSettings,
createDiff: options.createDiff,
cameraPreset: options.cameraPreset,
Expand Down
33 changes: 23 additions & 10 deletions lib/shared/snapshot-project.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ import kleur from "kleur"
import {
getBoardFilePatterns,
getSnapshotsDir,
loadProjectConfig,
loadRuntimeProjectConfig,
} from "lib/project-config"
import type { PcbSnapshotSettings } from "lib/project-config/project-config-schema"
import type { CameraPreset } from "lib/shared/camera-presets"
import { findBoardFiles } from "lib/shared/find-board-files"
import { findBoardFilesAsync } from "lib/shared/find-board-files"
import { mergePlatformConfigs } from "lib/shared/platform-config-utils"
import { processSnapshotFile } from "lib/shared/process-snapshot-file"
import {
DEFAULT_IGNORED_PATTERNS,
Expand Down Expand Up @@ -45,8 +46,9 @@ type SnapshotOptions = {
onSuccess?: (message: string) => void
}

const hasConfiguredIncludeBoardFiles = (projectDir: string): boolean => {
const projectConfig = loadProjectConfig(projectDir)
const hasConfiguredIncludeBoardFiles = (
projectConfig: Awaited<ReturnType<typeof loadRuntimeProjectConfig>>,
): boolean => {
const hasConfiguredPatterns = Boolean(
projectConfig?.includeBoardFiles?.some((pattern) => pattern.trim()),
)
Expand Down Expand Up @@ -76,7 +78,7 @@ export const snapshotProject = async ({
threeD = true
}
const projectDir = process.cwd()
const projectConfig = loadProjectConfig(projectDir)
const projectConfig = await loadRuntimeProjectConfig(projectDir)
const ignore = [
...DEFAULT_IGNORED_PATTERNS,
...ignored.map(normalizeIgnorePattern),
Expand All @@ -90,7 +92,7 @@ export const snapshotProject = async ({

return fs.statSync(resolvedPath).isDirectory()
})
const boardFiles = findBoardFiles({
const boardFiles = await findBoardFilesAsync({
projectDir,
ignore,
filePaths: resolvedPaths,
Expand All @@ -100,8 +102,14 @@ export const snapshotProject = async ({
if (explicitDirectoryTarget) {
const relativeDirectory =
path.relative(projectDir, explicitDirectoryTarget) || "."
const includeBoardFilePatterns = getBoardFilePatterns(projectDir)
const patternSourceMessage = hasConfiguredIncludeBoardFiles(projectDir)
const runtimeIncludeBoardFilePatterns =
projectConfig?.includeBoardFiles?.filter((pattern) => pattern.trim()) ??
[]
const includeBoardFilePatterns =
runtimeIncludeBoardFilePatterns.length > 0
? runtimeIncludeBoardFilePatterns
: getBoardFilePatterns(projectDir)
const patternSourceMessage = hasConfiguredIncludeBoardFiles(projectConfig)
? "Searched using tscircuit.config.json includeBoardFiles"
: "Searched using default includeBoardFiles"

Expand All @@ -120,10 +128,15 @@ export const snapshotProject = async ({
return onExit(0)
}

const snapshotsDirName = getSnapshotsDir(projectDir)
const snapshotsDirName =
projectConfig?.snapshotsDir ?? getSnapshotsDir(projectDir)
const pcbSnapshotSettings = pcbSnapshotSettingsOverride
? { ...projectConfig?.pcbSnapshotSettings, ...pcbSnapshotSettingsOverride }
: projectConfig?.pcbSnapshotSettings
const mergedPlatformConfig = mergePlatformConfigs(
projectConfig?.platformConfig,
platformConfig,
)
const mismatches: string[] = []
let didUpdate = false

Expand Down Expand Up @@ -204,7 +217,7 @@ export const snapshotProject = async ({
pcbOnly,
schematicOnly,
forceUpdate,
platformConfig,
platformConfig: mergedPlatformConfig,
pcbSnapshotSettings,
createDiff,
cameraPreset,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@tscircuit/image-utils": "^0.0.3",
"@tscircuit/krt-wasm": "^0.1.0",
"@tscircuit/math-utils": "0.0.36",
"@tscircuit/props": "^0.0.536",
"@tscircuit/props": "^0.0.546",
"@tscircuit/runframe": "^0.0.2057",
"@tscircuit/schematic-match-adapt": "^0.0.22",
"@types/bun": "^1.2.2",
Expand Down
1 change: 1 addition & 0 deletions tests/cli/__snapshots__/pcb.snap.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions tests/cli/__snapshots__/schematic.snap.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions tests/cli/runtime-project-config-command-flows.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { mkdir, readFile, writeFile } from "node:fs/promises"
import { join } from "node:path"
import { getCliTestFixture } from "../fixtures/get-cli-test-fixture"
import { getBuildEntrypoints } from "../../cli/build/get-build-entrypoints"
import "bun-match-svg"

const createTiPlatformConfigModule = ({
includeBoardFiles,
Expand Down Expand Up @@ -260,3 +261,32 @@ test("simulate analog consumes runtime platformConfig from tscircuit.config.ts",
expect(stderr).toContain("source_port_id")
expect(stdout).toContain("Index time")
}, 30_000)

test("snapshot command consumes runtime platformConfig from tscircuit.config.ts", async () => {
const { tmpDir, runCommand } = await getCliTestFixture()
const circuitPath = join(tmpDir, "index.circuit.tsx")

await writeFile(circuitPath, tiBoardCircuitCode)
await writeFile(
join(tmpDir, "tscircuit.config.ts"),
createTiPlatformConfigModule(),
)

const { stdout, stderr, exitCode } = await runCommand(
`tsci snapshot --update`,
)

expect(stderr).toBe("")
expect(stdout).toContain("Created snapshots")

const snapshotDir = join(tmpDir, "__snapshots__")
const pcbSnapshot = Bun.file(join(snapshotDir, "index.circuit-pcb.snap.svg"))
const schematicSnapshot = Bun.file(
join(snapshotDir, "index.circuit-schematic.snap.svg"),
)
expect(pcbSnapshot.text()).toMatchSvgSnapshot(import.meta.path, "pcb")
expect(schematicSnapshot.text()).toMatchSvgSnapshot(
import.meta.path,
"schematic",
)
})
Binary file modified tests/cli/snapshot/__snapshots__/large-pcb-3d.snap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading