commit abca9cbaa50f2b90b42410009223d78eb2255e62 parent db9d0a64a5263a6e1f31f2c5f7dfddcd3ff6bce5 Author: triesap <tyson@radroots.org> Date: Thu, 11 Jun 2026 13:40:05 -0700 chore: align source layout Diffstat:
20 files changed, 8 insertions(+), 154 deletions(-)
diff --git a/crates/core_bindings/src/lib.rs b/crates/core_bindings/src/lib.rs @@ -1,7 +1,6 @@ pub use radroots_core as upstream; -pub const TYPES_TS: &str = - include_str!("../../../testdata/baseline/current-radroots-generated/core/types.ts"); +pub const TYPES_TS: &str = include_str!("typescript/types.ts"); #[cfg(test)] mod tests { diff --git a/testdata/baseline/current-radroots-generated/core/types.ts b/crates/core_bindings/src/typescript/types.ts diff --git a/crates/events_bindings/src/lib.rs b/crates/events_bindings/src/lib.rs @@ -1,11 +1,8 @@ pub use radroots_events as upstream; -pub const TYPES_TS: &str = - include_str!("../../../testdata/baseline/current-radroots-generated/events/types.ts"); -pub const CONSTANTS_TS: &str = - include_str!("../../../testdata/baseline/current-radroots-generated/events/constants.ts"); -pub const KINDS_TS: &str = - include_str!("../../../testdata/baseline/current-radroots-generated/events/kinds.ts"); +pub const TYPES_TS: &str = include_str!("typescript/types.ts"); +pub const CONSTANTS_TS: &str = include_str!("typescript/constants.ts"); +pub const KINDS_TS: &str = include_str!("typescript/kinds.ts"); #[cfg(test)] mod tests { diff --git a/testdata/baseline/current-radroots-generated/events/constants.ts b/crates/events_bindings/src/typescript/constants.ts diff --git a/testdata/baseline/current-radroots-generated/events/kinds.ts b/crates/events_bindings/src/typescript/kinds.ts diff --git a/testdata/baseline/current-radroots-generated/events/types.ts b/crates/events_bindings/src/typescript/types.ts diff --git a/crates/identity_bindings/src/lib.rs b/crates/identity_bindings/src/lib.rs @@ -1,7 +1,6 @@ pub use radroots_identity as upstream; -pub const CONSTANTS_TS: &str = - include_str!("../../../testdata/baseline/current-radroots-generated/identity/constants.ts"); +pub const CONSTANTS_TS: &str = include_str!("typescript/constants.ts"); #[cfg(test)] mod tests { diff --git a/testdata/baseline/current-radroots-generated/identity/constants.ts b/crates/identity_bindings/src/typescript/constants.ts diff --git a/crates/replica_db_schema_bindings/src/lib.rs b/crates/replica_db_schema_bindings/src/lib.rs @@ -1,8 +1,6 @@ pub use radroots_replica_db_schema as upstream; -pub const TYPES_TS: &str = include_str!( - "../../../testdata/baseline/current-radroots-generated/replica-db-schema/types.ts" -); +pub const TYPES_TS: &str = include_str!("typescript/types.ts"); #[cfg(test)] mod tests { diff --git a/testdata/baseline/current-radroots-generated/replica-db-schema/types.ts b/crates/replica_db_schema_bindings/src/typescript/types.ts diff --git a/crates/trade_bindings/src/lib.rs b/crates/trade_bindings/src/lib.rs @@ -1,7 +1,6 @@ pub use radroots_trade as upstream; -pub const TYPES_TS: &str = - include_str!("../../../testdata/baseline/current-radroots-generated/trade/types.ts"); +pub const TYPES_TS: &str = include_str!("typescript/types.ts"); #[cfg(test)] mod tests { diff --git a/testdata/baseline/current-radroots-generated/trade/types.ts b/crates/trade_bindings/src/typescript/types.ts diff --git a/crates/types_bindings/src/lib.rs b/crates/types_bindings/src/lib.rs @@ -1,7 +1,6 @@ pub use radroots_types as upstream; -pub const TYPES_TS: &str = - include_str!("../../../testdata/baseline/current-radroots-generated/types/types.ts"); +pub const TYPES_TS: &str = include_str!("typescript/types.ts"); #[cfg(test)] mod tests { diff --git a/testdata/baseline/current-radroots-generated/types/types.ts b/crates/types_bindings/src/typescript/types.ts diff --git a/crates/xtask/src/check.rs b/crates/xtask/src/check.rs @@ -10,7 +10,6 @@ pub fn check() -> Result<(), String> { validate_package_matrix()?; let root = workspace_root()?; check_forbidden_packages(&root)?; - check_baseline(&root)?; for spec in package_specs() { let package_dir = root.join(spec.package_dir); let package_json_path = package_dir.join("package.json"); @@ -35,41 +34,6 @@ pub fn check() -> Result<(), String> { Ok(()) } -fn check_baseline(root: &Path) -> Result<(), String> { - let baseline = root.join("testdata/baseline/current-radroots-generated"); - if !baseline.is_dir() { - return Err(format!( - "missing generated baseline: {}", - baseline.display() - )); - } - let mut files = Vec::new(); - collect_files(&baseline, &mut files)?; - if files.is_empty() { - return Err(format!( - "generated baseline is empty: {}", - baseline.display() - )); - } - Ok(()) -} - -fn collect_files(dir: &Path, files: &mut Vec<std::path::PathBuf>) -> Result<(), String> { - let entries = - fs::read_dir(dir).map_err(|error| format!("failed to read {}: {error}", dir.display()))?; - for entry in entries { - let entry = - entry.map_err(|error| format!("failed to read {} entry: {error}", dir.display()))?; - let path = entry.path(); - if path.is_dir() { - collect_files(&path, files)?; - } else if path.is_file() { - files.push(path); - } - } - Ok(()) -} - fn check_forbidden_packages(root: &Path) -> Result<(), String> { for forbidden in FORBIDDEN_PACKAGE_NAMES { let package_leaf = forbidden.trim_start_matches("@radroots/").to_owned(); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml @@ -41,30 +41,6 @@ importers: packages/types-bindings: {} - tests/import-smoke: - dependencies: - '@radroots/core-bindings': - specifier: workspace:* - version: link:../../packages/core-bindings - '@radroots/events-bindings': - specifier: workspace:* - version: link:../../packages/events-bindings - '@radroots/events-indexed-bindings': - specifier: workspace:* - version: link:../../packages/events-indexed-bindings - '@radroots/identity-bindings': - specifier: workspace:* - version: link:../../packages/identity-bindings - '@radroots/replica-db-schema-bindings': - specifier: workspace:* - version: link:../../packages/replica-db-schema-bindings - '@radroots/trade-bindings': - specifier: workspace:* - version: link:../../packages/trade-bindings - '@radroots/types-bindings': - specifier: workspace:* - version: link:../../packages/types-bindings - packages: typescript@5.9.3: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml @@ -1,3 +1,2 @@ packages: - "packages/*" - - "tests/*" diff --git a/tests/import-smoke/package.json b/tests/import-smoke/package.json @@ -1,18 +0,0 @@ -{ - "name": "@radroots/sdk-import-smoke", - "private": true, - "type": "module", - "scripts": { - "build": "tsc -p tsconfig.json", - "typecheck": "tsc -p tsconfig.json --noEmit" - }, - "dependencies": { - "@radroots/core-bindings": "workspace:*", - "@radroots/events-bindings": "workspace:*", - "@radroots/events-indexed-bindings": "workspace:*", - "@radroots/identity-bindings": "workspace:*", - "@radroots/replica-db-schema-bindings": "workspace:*", - "@radroots/trade-bindings": "workspace:*", - "@radroots/types-bindings": "workspace:*" - } -} diff --git a/tests/import-smoke/src/index.ts b/tests/import-smoke/src/index.ts @@ -1,48 +0,0 @@ -import { - KIND_LISTING, - RADROOTS_LISTING_PRODUCT_TAG_KEYS, -} from "@radroots/events-bindings"; -import { RADROOTS_USERNAME_MIN_LEN } from "@radroots/identity-bindings"; -import type { RadrootsCoreMoney } from "@radroots/core-bindings"; -import type { - RadrootsEventsIndexedManifest, - RadrootsEventsIndexedShardId, -} from "@radroots/events-indexed-bindings"; -import type { RadrootsListing } from "@radroots/events-bindings"; -import type { Farm } from "@radroots/replica-db-schema-bindings"; -import type { RadrootsTradeListingTotal } from "@radroots/trade-bindings"; -import type { IError } from "@radroots/types-bindings"; - -const amount: RadrootsCoreMoney = { - amount: "1.00", - currency: "USD", -}; - -const shardId: RadrootsEventsIndexedShardId = "us-1"; - -const manifest: RadrootsEventsIndexedManifest = { - country: "US", - total: 0, - shard_size: 1000, - first_published_at: 0, - last_published_at: 0, - shards: [], -}; - -const farm = undefined as unknown as Farm; -const listing = undefined as unknown as RadrootsListing; -const total = undefined as unknown as RadrootsTradeListingTotal; -const error = undefined as unknown as IError<string>; - -export const smoke = { - amount, - error, - farm, - kind: KIND_LISTING, - listing, - manifest, - productKeys: RADROOTS_LISTING_PRODUCT_TAG_KEYS, - shardId, - total, - usernameMinLen: RADROOTS_USERNAME_MIN_LEN, -}; diff --git a/tests/import-smoke/tsconfig.json b/tests/import-smoke/tsconfig.json @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "outDir": "dist", - "rootDir": "src" - }, - "include": [ - "src/**/*.ts" - ] -}