@celox-sim/celox 0.1.13 → 0.1.14

package/src/napi-helpers.ts

@@ -9,104 +9,121 @@
  *   - Creating bridge functions for Simulator.create() / Simulation.create()
  */
 
+import type { NativeCreateSimulationFn } from "./simulation.js";
+import type { NativeCreateFn } from "./simulator.js";
 import type {
-  CreateResult,
-  LoopBreak,
-  NativeSimulatorHandle,
-  NativeSimulationHandle,
-  PortInfo,
-  SignalLayout,
-  SimulatorOptions,
-  TrueLoopSpec,
+	CreateResult,
+	LoopBreak,
+	NativeSimulationHandle,
+	NativeSimulatorHandle,
+	PortInfo,
+	SignalLayout,
+	SimulatorOptions,
+	TrueLoopSpec,
 } from "./types.js";
-import type { NativeCreateFn } from "./simulator.js";
-import type { NativeCreateSimulationFn } from "./simulation.js";
 
 // ---------------------------------------------------------------------------
 // Raw NAPI handle shapes (what the .node addon actually exports)
 // ---------------------------------------------------------------------------
 
 export interface RawNapiSimulatorHandle {
-  readonly layoutJson: string;
-  readonly eventsJson: string;
-  readonly hierarchyJson: string;
-  readonly stableSize: number;
-  readonly totalSize: number;
-  tick(eventId: number): void;
-  tickN(eventId: number, count: number): void;
-  evalComb(): void;
-  dump(timestamp: number): void;
-  sharedMemory(): Uint8Array;
-  dispose(): void;
+	readonly layoutJson: string;
+	readonly eventsJson: string;
+	readonly hierarchyJson: string;
+	readonly stableSize: number;
+	readonly totalSize: number;
+	tick(eventId: number): void;
+	tickN(eventId: number, count: number): void;
+	evalComb(): void;
+	dump(timestamp: number): void;
+	sharedMemory(): Uint8Array;
+	dispose(): void;
 }
 
 export interface RawNapiSimulationHandle {
-  readonly layoutJson: string;
-  readonly eventsJson: string;
-  readonly hierarchyJson: string;
-  readonly stableSize: number;
-  readonly totalSize: number;
-  readonly defaultMaxSteps: number | null;
-  addClock(eventId: number, period: number, initialDelay: number): void;
-  schedule(eventId: number, time: number, value: number): void;
-  runUntil(endTime: number): void;
-  step(): number | null;
-  time(): number;
-  nextEventTime(): number | null;
-  evalComb(): void;
-  dump(timestamp: number): void;
-  sharedMemory(): Uint8Array;
-  dispose(): void;
+	readonly layoutJson: string;
+	readonly eventsJson: string;
+	readonly hierarchyJson: string;
+	readonly stableSize: number;
+	readonly totalSize: number;
+	readonly defaultMaxSteps: number | null;
+	addClock(eventId: number, period: number, initialDelay: number): void;
+	schedule(eventId: number, time: number, value: number): void;
+	runUntil(endTime: number): void;
+	step(): number | null;
+	time(): number;
+	nextEventTime(): number | null;
+	evalComb(): void;
+	dump(timestamp: number): void;
+	sharedMemory(): Uint8Array;
+	dispose(): void;
 }
 
 export interface NapiFalseLoop {
-  from: NapiSignalPath;
-  to: NapiSignalPath;
+	from: NapiSignalPath;
+	to: NapiSignalPath;
 }
 
 export interface NapiTrueLoop {
-  from: NapiSignalPath;
-  to: NapiSignalPath;
-  maxIter: number;
+	from: NapiSignalPath;
+	to: NapiSignalPath;
+	maxIter: number;
 }
 
 export interface NapiSignalPath {
-  instancePath: NapiInstanceSegment[];
-  varPath: string[];
+	instancePath: NapiInstanceSegment[];
+	varPath: string[];
 }
 
 export interface NapiInstanceSegment {
-  name: string;
-  index: number;
+	name: string;
+	index: number;
 }
 
 export interface NapiParamOverride {
-  name: string;
-  value: number;
+	name: string;
+	value: number;
 }
 
 export interface NapiOptions {
-  fourState?: boolean;
-  vcd?: string;
-  optimize?: boolean;
-  falseLoops?: NapiFalseLoop[];
-  trueLoops?: NapiTrueLoop[];
-  clockType?: string;
-  resetType?: string;
-  extraSource?: string;
-  parameters?: NapiParamOverride[];
+	fourState?: boolean;
+	vcd?: string;
+	optimize?: boolean;
+	falseLoops?: NapiFalseLoop[];
+	trueLoops?: NapiTrueLoop[];
+	clockType?: string;
+	resetType?: string;
+	extraSource?: string;
+	parameters?: NapiParamOverride[];
+	deadStorePolicy?: string;
 }
 
 export interface RawNapiAddon {
-  NativeSimulatorHandle: {
-    new (code: string, top: string, options?: NapiOptions): RawNapiSimulatorHandle;
-    fromProject(projectPath: string, top: string, options?: NapiOptions): RawNapiSimulatorHandle;
-  };
-  NativeSimulationHandle: {
-    new (code: string, top: string, options?: NapiOptions): RawNapiSimulationHandle;
-    fromProject(projectPath: string, top: string, options?: NapiOptions): RawNapiSimulationHandle;
-  };
-  genTs(projectPath: string): string;
+	NativeSimulatorHandle: {
+		new (
+			code: string,
+			top: string,
+			options?: NapiOptions,
+		): RawNapiSimulatorHandle;
+		fromProject(
+			projectPath: string,
+			top: string,
+			options?: NapiOptions,
+		): RawNapiSimulatorHandle;
+	};
+	NativeSimulationHandle: {
+		new (
+			code: string,
+			top: string,
+			options?: NapiOptions,
+		): RawNapiSimulationHandle;
+		fromProject(
+			projectPath: string,
+			top: string,
+			options?: NapiOptions,
+		): RawNapiSimulationHandle;
+	};
+	genTs(projectPath: string): string;
 }
 
 // ---------------------------------------------------------------------------
@@ -125,21 +142,21 @@ import { createRequire } from "node:module";
  * @param addonPath  Explicit path to the `.node` file (overrides auto-detection).
  */
 export function loadNativeAddon(addonPath?: string): RawNapiAddon {
-  const require = createRequire(import.meta.url);
-
-  if (addonPath) {
-    return require(addonPath) as RawNapiAddon;
-  }
-
-  try {
-    return require("@celox-sim/celox-napi") as RawNapiAddon;
-  } catch (e) {
-    throw new Error(
-      `Failed to load NAPI addon from @celox-sim/celox-napi. ` +
-        `Build it with: pnpm run build:napi`,
-      { cause: e },
-    );
-  }
+	const require = createRequire(import.meta.url);
+
+	if (addonPath) {
+		return require(addonPath) as RawNapiAddon;
+	}
+
+	try {
+		return require("@celox-sim/celox-napi") as RawNapiAddon;
+	} catch (e) {
+		throw new Error(
+			`Failed to load NAPI addon from @celox-sim/celox-napi. ` +
+				`Build it with: pnpm run build:napi`,
+			{ cause: e },
+		);
+	}
 }
 
 // ---------------------------------------------------------------------------
@@ -160,89 +177,99 @@ export function loadNativeAddon(addonPath?: string): RawNapiAddon {
  *   - `"a.b[3]:x.y"` → { instancePath: [{name:"a",index:0},{name:"b",index:3}], varPath: ["x","y"] }
  */
 export function parseSignalPath(path: string): NapiSignalPath {
-  const colonIdx = path.indexOf(":");
-  if (colonIdx < 0) {
-    return { instancePath: [], varPath: path.split(".") };
-  }
-
-  const instPart = path.slice(0, colonIdx);
-  const varPart = path.slice(colonIdx + 1);
-
-  const instancePath: NapiInstanceSegment[] = [];
-  if (instPart.length > 0) {
-    for (const seg of instPart.split(".")) {
-      const bracketIdx = seg.indexOf("[");
-      if (bracketIdx >= 0) {
-        const name = seg.slice(0, bracketIdx);
-        const index = Number.parseInt(seg.slice(bracketIdx + 1, -1), 10);
-        instancePath.push({ name, index });
-      } else {
-        instancePath.push({ name: seg, index: 0 });
-      }
-    }
-  }
-
-  return { instancePath, varPath: varPart.split(".") };
+	const colonIdx = path.indexOf(":");
+	if (colonIdx < 0) {
+		return { instancePath: [], varPath: path.split(".") };
+	}
+
+	const instPart = path.slice(0, colonIdx);
+	const varPart = path.slice(colonIdx + 1);
+
+	const instancePath: NapiInstanceSegment[] = [];
+	if (instPart.length > 0) {
+		for (const seg of instPart.split(".")) {
+			const bracketIdx = seg.indexOf("[");
+			if (bracketIdx >= 0) {
+				const name = seg.slice(0, bracketIdx);
+				const index = Number.parseInt(seg.slice(bracketIdx + 1, -1), 10);
+				instancePath.push({ name, index });
+			} else {
+				instancePath.push({ name: seg, index: 0 });
+			}
+		}
+	}
+
+	return { instancePath, varPath: varPart.split(".") };
 }
 
 /**
  * Build NapiOptions from SimulatorOptions.
  * Returns `undefined` when no options are set (to skip the NAPI options arg).
  */
-export function buildNapiOpts(options?: SimulatorOptions): NapiOptions | undefined {
-  if (!options) return undefined;
-
-  const napiOpts: NapiOptions = {};
-  let hasOpt = false;
-
-  if (options.fourState) {
-    napiOpts.fourState = options.fourState;
-    hasOpt = true;
-  }
-  if (options.vcd) {
-    napiOpts.vcd = options.vcd;
-    hasOpt = true;
-  }
-  if (options.optimize != null) {
-    napiOpts.optimize = options.optimize;
-    hasOpt = true;
-  }
-  if (options.falseLoops && options.falseLoops.length > 0) {
-    napiOpts.falseLoops = options.falseLoops.map((lb: LoopBreak) => ({
-      from: parseSignalPath(lb.from),
-      to: parseSignalPath(lb.to),
-    }));
-    hasOpt = true;
-  }
-  if (options.trueLoops && options.trueLoops.length > 0) {
-    napiOpts.trueLoops = options.trueLoops.map((tl: TrueLoopSpec) => ({
-      from: parseSignalPath(tl.from),
-      to: parseSignalPath(tl.to),
-      maxIter: tl.maxIter,
-    }));
-    hasOpt = true;
-  }
-  if (options.clockType) {
-    napiOpts.clockType = options.clockType;
-    hasOpt = true;
-  }
-  if (options.resetType) {
-    napiOpts.resetType = options.resetType;
-    hasOpt = true;
-  }
-  if (options.extraSource) {
-    napiOpts.extraSource = options.extraSource;
-    hasOpt = true;
-  }
-  if (options.parameters && options.parameters.length > 0) {
-    napiOpts.parameters = options.parameters.map((p) => ({
-      name: p.name,
-      value: typeof p.value === "bigint" ? Number(p.value) : p.value,
-    }));
-    hasOpt = true;
-  }
-
-  return hasOpt ? napiOpts : undefined;
+export function buildNapiOpts(
+	options?: SimulatorOptions,
+): NapiOptions | undefined {
+	if (!options) return undefined;
+
+	const napiOpts: NapiOptions = {};
+	let hasOpt = false;
+
+	if (options.fourState) {
+		napiOpts.fourState = options.fourState;
+		hasOpt = true;
+	}
+	if (options.vcd) {
+		napiOpts.vcd = options.vcd;
+		hasOpt = true;
+	}
+	if (options.optimize != null) {
+		napiOpts.optimize = options.optimize;
+		hasOpt = true;
+	}
+	if (options.falseLoops && options.falseLoops.length > 0) {
+		napiOpts.falseLoops = options.falseLoops.map((lb: LoopBreak) => ({
+			from: parseSignalPath(lb.from),
+			to: parseSignalPath(lb.to),
+		}));
+		hasOpt = true;
+	}
+	if (options.trueLoops && options.trueLoops.length > 0) {
+		napiOpts.trueLoops = options.trueLoops.map((tl: TrueLoopSpec) => ({
+			from: parseSignalPath(tl.from),
+			to: parseSignalPath(tl.to),
+			maxIter: tl.maxIter,
+		}));
+		hasOpt = true;
+	}
+	if (options.clockType) {
+		napiOpts.clockType = options.clockType;
+		hasOpt = true;
+	}
+	if (options.resetType) {
+		napiOpts.resetType = options.resetType;
+		hasOpt = true;
+	}
+	if (options.extraSource) {
+		napiOpts.extraSource = options.extraSource;
+		hasOpt = true;
+	}
+	if (options.parameters && options.parameters.length > 0) {
+		napiOpts.parameters = options.parameters.map((p) => ({
+			name: p.name,
+			value: typeof p.value === "bigint" ? Number(p.value) : p.value,
+		}));
+		hasOpt = true;
+	}
+	if (options.deadStorePolicy && options.deadStorePolicy !== "off") {
+		const map: Record<string, string> = {
+			preserveTopPorts: "preserve_top_ports",
+			preserveAllPorts: "preserve_all_ports",
+		};
+		napiOpts.deadStorePolicy = map[options.deadStorePolicy] ?? options.deadStorePolicy;
+		hasOpt = true;
+	}
+
+	return hasOpt ? napiOpts : undefined;
 }
 
 // ---------------------------------------------------------------------------
@@ -250,14 +277,14 @@ export function buildNapiOpts(options?: SimulatorOptions): NapiOptions | undefin
 // ---------------------------------------------------------------------------
 
 interface RawSignalLayout {
-  offset: number;
-  width: number;
-  byte_size: number;
-  is_4state: boolean;
-  direction: string;
-  type_kind: string;
-  array_dims?: number[];
-  associated_clock?: string;
+	offset: number;
+	width: number;
+	byte_size: number;
+	is_4state: boolean;
+	direction: string;
+	type_kind: string;
+	array_dims?: number[];
+	associated_clock?: string;
 }
 
 /**
@@ -266,36 +293,54 @@ interface RawSignalLayout {
  * the DUT-compatible layout (without type_kind).
  */
 export function parseNapiLayout(json: string): {
-  signals: Record<string, SignalLayout & { typeKind: string; arrayDims?: number[]; associatedClock?: string }>;
-  forDut: Record<string, SignalLayout>;
+	signals: Record<
+		string,
+		SignalLayout & {
+			typeKind: string;
+			arrayDims?: number[];
+			associatedClock?: string;
+		}
+	>;
+	forDut: Record<string, SignalLayout>;
 } {
-  const raw: Record<string, RawSignalLayout> = JSON.parse(json);
-  const signals: Record<string, SignalLayout & { typeKind: string; arrayDims?: number[]; associatedClock?: string }> = {};
-  const forDut: Record<string, SignalLayout> = {};
-
-  for (const [name, r] of Object.entries(raw)) {
-    const sl: SignalLayout = {
-      offset: r.offset,
-      width: r.width,
-      byteSize: r.byte_size > 0 ? r.byte_size : Math.ceil(r.width / 8),
-      is4state: r.is_4state,
-      direction: r.direction as "input" | "output" | "inout",
-    };
-    const entry: SignalLayout & { typeKind: string; arrayDims?: number[]; associatedClock?: string } = {
-      ...sl,
-      typeKind: r.type_kind,
-    };
-    if (r.array_dims && r.array_dims.length > 0) {
-      entry.arrayDims = r.array_dims;
-    }
-    if (r.associated_clock) {
-      entry.associatedClock = r.associated_clock;
-    }
-    signals[name] = entry;
-    forDut[name] = sl;
-  }
-
-  return { signals, forDut };
+	const raw: Record<string, RawSignalLayout> = JSON.parse(json);
+	const signals: Record<
+		string,
+		SignalLayout & {
+			typeKind: string;
+			arrayDims?: number[];
+			associatedClock?: string;
+		}
+	> = {};
+	const forDut: Record<string, SignalLayout> = {};
+
+	for (const [name, r] of Object.entries(raw)) {
+		const sl: SignalLayout = {
+			offset: r.offset,
+			width: r.width,
+			byteSize: r.byte_size > 0 ? r.byte_size : Math.ceil(r.width / 8),
+			is4state: r.is_4state,
+			direction: r.direction as SignalLayout["direction"],
+		};
+		const entry: SignalLayout & {
+			typeKind: string;
+			arrayDims?: number[];
+			associatedClock?: string;
+		} = {
+			...sl,
+			typeKind: r.type_kind,
+		};
+		if (r.array_dims && r.array_dims.length > 0) {
+			entry.arrayDims = r.array_dims;
+		}
+		if (r.associated_clock) {
+			entry.associatedClock = r.associated_clock;
+		}
+		signals[name] = entry;
+		forDut[name] = sl;
+	}
+
+	return { signals, forDut };
 }
 
 /**
@@ -307,67 +352,70 @@ export function parseNapiLayout(json: string): {
  * expose them as `dut.bus.data` and `dut.bus.valid`.
  */
 export function buildPortsFromLayout(
-  signals: Record<string, SignalLayout & { typeKind: string; arrayDims?: number[] }>,
-  _events: Record<string, number>,
+	signals: Record<
+		string,
+		SignalLayout & { typeKind: string; arrayDims?: number[] }
+	>,
+	_events: Record<string, number>,
 ): Record<string, PortInfo> {
-  // Step 1: Build flat PortInfo for every signal name
-  const flat: Record<string, PortInfo> = {};
-
-  for (const [name, sig] of Object.entries(signals)) {
-    const typeKind = sig.typeKind;
-    let portType: "clock" | "reset" | "logic" | "bit";
-    if (typeKind === "clock") {
-      portType = "clock";
-    } else if (typeKind.startsWith("reset")) {
-      portType = "reset";
-    } else if (typeKind === "bit") {
-      portType = "bit";
-    } else {
-      portType = "logic";
-    }
-
-    const port: PortInfo = {
-      direction: sig.direction,
-      type: portType,
-      width: sig.width,
-      is4state: sig.is4state,
-    };
-    if (sig.arrayDims && sig.arrayDims.length > 0) {
-      (port as { arrayDims: readonly number[] }).arrayDims = sig.arrayDims;
-    }
-    flat[name] = port;
-  }
-
-  // Step 2: Group hierarchical signals (e.g. "bus.data") into nested PortInfo.
-  // Veryl interface ports are exactly one level deep, so "bus.data" → parent "bus",
-  // member "data". The parent entry receives an `interface` map of its members;
-  // the flat layout keys are kept as-is so createNestedDut can look them up.
-  const ports: Record<string, PortInfo> = {};
-  const ifMaps = new Map<string, Record<string, PortInfo>>();
-
-  for (const [name, port] of Object.entries(flat)) {
-    const dotIdx = name.indexOf(".");
-    if (dotIdx < 0) {
-      ports[name] = port;
-      continue;
-    }
-    // Hierarchical signal: first segment is the interface port name
-    const parentName = name.slice(0, dotIdx);
-    const memberName = name.slice(dotIdx + 1);
-    if (!ifMaps.has(parentName)) {
-      const ifMap: Record<string, PortInfo> = {};
-      ifMaps.set(parentName, ifMap);
-      ports[parentName] = {
-        direction: "inout",
-        type: "logic",
-        width: 0,
-        interface: ifMap,
-      };
-    }
-    ifMaps.get(parentName)![memberName] = port;
-  }
-
-  return ports;
+	// Step 1: Build flat PortInfo for every signal name
+	const flat: Record<string, PortInfo> = {};
+
+	for (const [name, sig] of Object.entries(signals)) {
+		const typeKind = sig.typeKind;
+		let portType: "clock" | "reset" | "logic" | "bit";
+		if (typeKind === "clock") {
+			portType = "clock";
+		} else if (typeKind.startsWith("reset")) {
+			portType = "reset";
+		} else if (typeKind === "bit") {
+			portType = "bit";
+		} else {
+			portType = "logic";
+		}
+
+		const port: PortInfo = {
+			direction: sig.direction,
+			type: portType,
+			width: sig.width,
+			is4state: sig.is4state,
+		};
+		if (sig.arrayDims && sig.arrayDims.length > 0) {
+			(port as { arrayDims: readonly number[] }).arrayDims = sig.arrayDims;
+		}
+		flat[name] = port;
+	}
+
+	// Step 2: Group hierarchical signals (e.g. "bus.data") into nested PortInfo.
+	// Veryl interface ports are exactly one level deep, so "bus.data" → parent "bus",
+	// member "data". The parent entry receives an `interface` map of its members;
+	// the flat layout keys are kept as-is so createNestedDut can look them up.
+	const ports: Record<string, PortInfo> = {};
+	const ifMaps = new Map<string, Record<string, PortInfo>>();
+
+	for (const [name, port] of Object.entries(flat)) {
+		const dotIdx = name.indexOf(".");
+		if (dotIdx < 0) {
+			ports[name] = port;
+			continue;
+		}
+		// Hierarchical signal: first segment is the interface port name
+		const parentName = name.slice(0, dotIdx);
+		const memberName = name.slice(dotIdx + 1);
+		if (!ifMaps.has(parentName)) {
+			const ifMap: Record<string, PortInfo> = {};
+			ifMaps.set(parentName, ifMap);
+			ports[parentName] = {
+				direction: "inout",
+				type: "logic",
+				width: 0,
+				interface: ifMap,
+			};
+		}
+		ifMaps.get(parentName)![memberName] = port;
+	}
+
+	return ports;
 }
 
 // ---------------------------------------------------------------------------
@@ -375,17 +423,20 @@ export function buildPortsFromLayout(
 // ---------------------------------------------------------------------------
 
 export interface HierarchyNode {
-  moduleName: string;
-  signals: Record<string, SignalLayout & { typeKind: string; arrayDims?: number[] }>;
-  forDut: Record<string, SignalLayout>;
-  ports: Record<string, PortInfo>;
-  children: Record<string, HierarchyNode[]>;
+	moduleName: string;
+	signals: Record<
+		string,
+		SignalLayout & { typeKind: string; arrayDims?: number[] }
+	>;
+	forDut: Record<string, SignalLayout>;
+	ports: Record<string, PortInfo>;
+	children: Record<string, HierarchyNode[]>;
 }
 
 interface RawHierarchyNode {
-  module_name: string;
-  signals: Record<string, RawSignalLayout>;
-  children: Record<string, RawHierarchyNode[]>;
+	module_name: string;
+	signals: Record<string, RawSignalLayout>;
+	children: Record<string, RawHierarchyNode[]>;
 }
 
 /**
@@ -393,53 +444,75 @@ interface RawHierarchyNode {
  * Converts snake_case keys to camelCase and auto-detects ports.
  */
 export function parseHierarchyLayout(
-  json: string,
-  events: Record<string, number>,
+	json: string,
+	events: Record<string, number>,
 ): HierarchyNode {
-  const raw: RawHierarchyNode = JSON.parse(json);
-  return convertHierarchyNode(raw, events);
+	const raw: RawHierarchyNode = JSON.parse(json);
+	return convertHierarchyNode(raw, events);
 }
 
 function convertHierarchyNode(
-  raw: RawHierarchyNode,
-  events: Record<string, number>,
+	raw: RawHierarchyNode,
+	events: Record<string, number>,
+): HierarchyNode {
+	const signals: Record<
+		string,
+		SignalLayout & { typeKind: string; arrayDims?: number[] }
+	> = {};
+	const forDut: Record<string, SignalLayout> = {};
+
+	for (const [name, r] of Object.entries(raw.signals)) {
+		const sl: SignalLayout = {
+			offset: r.offset,
+			width: r.width,
+			byteSize: r.byte_size > 0 ? r.byte_size : Math.ceil(r.width / 8),
+			is4state: r.is_4state,
+			direction: r.direction as SignalLayout["direction"],
+		};
+		const entry: SignalLayout & { typeKind: string; arrayDims?: number[] } = {
+			...sl,
+			typeKind: r.type_kind,
+		};
+		if (r.array_dims && r.array_dims.length > 0) {
+			entry.arrayDims = r.array_dims;
+		}
+		signals[name] = entry;
+		forDut[name] = sl;
+	}
+
+	const ports = buildPortsFromLayout(signals, events);
+
+	const children: Record<string, HierarchyNode[]> = {};
+	for (const [name, instances] of Object.entries(raw.children)) {
+		children[name] = instances.map((inst) =>
+			convertHierarchyNode(inst, events),
+		);
+	}
+
+	return {
+		moduleName: raw.module_name,
+		signals,
+		forDut,
+		ports,
+		children,
+	};
+}
+
+/**
+ * Filter a hierarchy tree based on the dead store elimination policy.
+ *
+ * - `"off"` / undefined → full hierarchy (no filtering)
+ * - `"preserveTopPorts"` → strip children (only top-module ports survive DSE)
+ * - `"preserveAllPorts"` → hierarchy intact (all instance ports survive DSE)
+ */
+export function filterHierarchyForDse(
+	hierarchy: HierarchyNode,
+	policy?: "off" | "preserveTopPorts" | "preserveAllPorts",
 ): HierarchyNode {
-  const signals: Record<string, SignalLayout & { typeKind: string; arrayDims?: number[] }> = {};
-  const forDut: Record<string, SignalLayout> = {};
-
-  for (const [name, r] of Object.entries(raw.signals)) {
-    const sl: SignalLayout = {
-      offset: r.offset,
-      width: r.width,
-      byteSize: r.byte_size > 0 ? r.byte_size : Math.ceil(r.width / 8),
-      is4state: r.is_4state,
-      direction: r.direction as "input" | "output" | "inout",
-    };
-    const entry: SignalLayout & { typeKind: string; arrayDims?: number[] } = {
-      ...sl,
-      typeKind: r.type_kind,
-    };
-    if (r.array_dims && r.array_dims.length > 0) {
-      entry.arrayDims = r.array_dims;
-    }
-    signals[name] = entry;
-    forDut[name] = sl;
-  }
-
-  const ports = buildPortsFromLayout(signals, events);
-
-  const children: Record<string, HierarchyNode[]> = {};
-  for (const [name, instances] of Object.entries(raw.children)) {
-    children[name] = instances.map((inst) => convertHierarchyNode(inst, events));
-  }
-
-  return {
-    moduleName: raw.module_name,
-    signals,
-    forDut,
-    ports,
-    children,
-  };
+	if (!policy || policy === "off") return hierarchy;
+	if (policy === "preserveTopPorts") return { ...hierarchy, children: {} };
+	// "preserveAllPorts" — hierarchy intact, Rust-side ensures only ports survive
+	return hierarchy;
 }
 
 // ---------------------------------------------------------------------------
@@ -451,62 +524,62 @@ function convertHierarchyNode(
  * The buffer is shared between JS and Rust — no copies per tick.
  */
 export function wrapDirectSimulatorHandle(
-  raw: RawNapiSimulatorHandle,
+	raw: RawNapiSimulatorHandle,
 ): NativeSimulatorHandle {
-  return {
-    tick(eventId: number): void {
-      raw.tick(eventId);
-    },
-    tickN(eventId: number, count: number): void {
-      raw.tickN(eventId, count);
-    },
-    evalComb(): void {
-      raw.evalComb();
-    },
-    dump(timestamp: number): void {
-      raw.dump(timestamp);
-    },
-    dispose(): void {
-      raw.dispose();
-    },
-  };
+	return {
+		tick(eventId: number): void {
+			raw.tick(eventId);
+		},
+		tickN(eventId: number, count: number): void {
+			raw.tickN(eventId, count);
+		},
+		evalComb(): void {
+			raw.evalComb();
+		},
+		dump(timestamp: number): void {
+			raw.dump(timestamp);
+		},
+		dispose(): void {
+			raw.dispose();
+		},
+	};
 }
 
 /**
  * Wrap a raw NAPI simulation handle with direct (zero-copy) operations.
  */
 export function wrapDirectSimulationHandle(
-  raw: RawNapiSimulationHandle,
+	raw: RawNapiSimulationHandle,
 ): NativeSimulationHandle {
-  return {
-    addClock(eventId: number, period: number, initialDelay: number): void {
-      raw.addClock(eventId, period, initialDelay);
-    },
-    schedule(eventId: number, time: number, value: number): void {
-      raw.schedule(eventId, time, value);
-    },
-    runUntil(endTime: number): void {
-      raw.runUntil(endTime);
-    },
-    step(): number | null {
-      return raw.step();
-    },
-    time(): number {
-      return raw.time();
-    },
-    nextEventTime(): number | null {
-      return raw.nextEventTime();
-    },
-    evalComb(): void {
-      raw.evalComb();
-    },
-    dump(timestamp: number): void {
-      raw.dump(timestamp);
-    },
-    dispose(): void {
-      raw.dispose();
-    },
-  };
+	return {
+		addClock(eventId: number, period: number, initialDelay: number): void {
+			raw.addClock(eventId, period, initialDelay);
+		},
+		schedule(eventId: number, time: number, value: number): void {
+			raw.schedule(eventId, time, value);
+		},
+		runUntil(endTime: number): void {
+			raw.runUntil(endTime);
+		},
+		step(): number | null {
+			return raw.step();
+		},
+		time(): number {
+			return raw.time();
+		},
+		nextEventTime(): number | null {
+			return raw.nextEventTime();
+		},
+		evalComb(): void {
+			raw.evalComb();
+		},
+		dump(timestamp: number): void {
+			raw.dump(timestamp);
+		},
+		dispose(): void {
+			raw.dispose();
+		},
+	};
 }
 
 // ---------------------------------------------------------------------------
@@ -514,18 +587,18 @@ export function wrapDirectSimulationHandle(
 // ---------------------------------------------------------------------------
 
 function parseLegacyLayout(json: string): Record<string, SignalLayout> {
-  const raw: Record<string, RawSignalLayout> = JSON.parse(json);
-  const result: Record<string, SignalLayout> = {};
-  for (const [name, r] of Object.entries(raw)) {
-    result[name] = {
-      offset: r.offset,
-      width: r.width,
-      byteSize: r.byte_size > 0 ? r.byte_size : Math.ceil(r.width / 8),
-      is4state: r.is_4state,
-      direction: r.direction as "input" | "output" | "inout",
-    };
-  }
-  return result;
+	const raw: Record<string, RawSignalLayout> = JSON.parse(json);
+	const result: Record<string, SignalLayout> = {};
+	for (const [name, r] of Object.entries(raw)) {
+		result[name] = {
+			offset: r.offset,
+			width: r.width,
+			byteSize: r.byte_size > 0 ? r.byte_size : Math.ceil(r.width / 8),
+			is4state: r.is_4state,
+			direction: r.direction as SignalLayout["direction"],
+		};
+	}
+	return result;
 }
 
 // ---------------------------------------------------------------------------
@@ -537,45 +610,47 @@ function parseLegacyLayout(json: string): Record<string, SignalLayout> {
  * `Simulator.create(module, { __nativeCreate: ... })`.
  */
 export function createSimulatorBridge(addon: RawNapiAddon): NativeCreateFn {
-  return (
-    source: string,
-    moduleName: string,
-    options: SimulatorOptions,
-  ): CreateResult<NativeSimulatorHandle> => {
-    const napiOpts = buildNapiOpts(options);
-    const raw = new addon.NativeSimulatorHandle(source, moduleName, napiOpts);
-
-    const layout = parseLegacyLayout(raw.layoutJson);
-    const events: Record<string, number> = JSON.parse(raw.eventsJson);
-    const hierarchy = parseHierarchyLayout(raw.hierarchyJson, events);
-
-    const buf = raw.sharedMemory().buffer;
-    const handle = wrapDirectSimulatorHandle(raw);
-
-    return { buffer: buf, layout, events, handle, hierarchy };
-  };
+	return (
+		source: string,
+		moduleName: string,
+		options: SimulatorOptions,
+	): CreateResult<NativeSimulatorHandle> => {
+		const napiOpts = buildNapiOpts(options);
+		const raw = new addon.NativeSimulatorHandle(source, moduleName, napiOpts);
+
+		const layout = parseLegacyLayout(raw.layoutJson);
+		const events: Record<string, number> = JSON.parse(raw.eventsJson);
+		const hierarchy = parseHierarchyLayout(raw.hierarchyJson, events);
+
+		const buf = raw.sharedMemory().buffer;
+		const handle = wrapDirectSimulatorHandle(raw);
+
+		return { buffer: buf, layout, events, handle, hierarchy };
+	};
 }
 
 /**
  * Create a `NativeCreateSimulationFn` from a raw NAPI addon, suitable for
  * `Simulation.create(module, { __nativeCreate: ... })`.
  */
-export function createSimulationBridge(addon: RawNapiAddon): NativeCreateSimulationFn {
-  return (
-    source: string,
-    moduleName: string,
-    options: SimulatorOptions,
-  ): CreateResult<NativeSimulationHandle> => {
-    const napiOpts = buildNapiOpts(options);
-    const raw = new addon.NativeSimulationHandle(source, moduleName, napiOpts);
-
-    const layout = parseLegacyLayout(raw.layoutJson);
-    const events: Record<string, number> = JSON.parse(raw.eventsJson);
-    const hierarchy = parseHierarchyLayout(raw.hierarchyJson, events);
-
-    const buf = raw.sharedMemory().buffer;
-    const handle = wrapDirectSimulationHandle(raw);
-
-    return { buffer: buf, layout, events, handle, hierarchy };
-  };
+export function createSimulationBridge(
+	addon: RawNapiAddon,
+): NativeCreateSimulationFn {
+	return (
+		source: string,
+		moduleName: string,
+		options: SimulatorOptions,
+	): CreateResult<NativeSimulationHandle> => {
+		const napiOpts = buildNapiOpts(options);
+		const raw = new addon.NativeSimulationHandle(source, moduleName, napiOpts);
+
+		const layout = parseLegacyLayout(raw.layoutJson);
+		const events: Record<string, number> = JSON.parse(raw.eventsJson);
+		const hierarchy = parseHierarchyLayout(raw.hierarchyJson, events);
+
+		const buf = raw.sharedMemory().buffer;
+		const handle = wrapDirectSimulationHandle(raw);
+
+		return { buffer: buf, layout, events, handle, hierarchy };
+	};
 }