qsharp-lang 1.15.4-dev → 1.16.1-dev

package/docs/Std.ResourceEstimation/RotationCount.md

@@ -2,7 +2,7 @@
 uid: Qdk.Std.ResourceEstimation.RotationCount
 title: RotationCount function
 description: "Q# RotationCount function: Returns a tuple that can be passed to the `AccountForEstimates` operation to specify that the number of rotations is equal to the `amount`."
-ms.date: 04/30/2025
+ms.date: 05/12/2025
 ms.topic: managed-reference
 qsharp.kind: function
 qsharp.package: __Std__

package/docs/Std.ResourceEstimation/RotationDepth.md

@@ -2,7 +2,7 @@
 uid: Qdk.Std.ResourceEstimation.RotationDepth
 title: RotationDepth function
 description: "Q# RotationDepth function: Returns a tuple that can be passed to the `AccountForEstimates` operation to specify that the rotation depth is equal to the `amount`."
-ms.date: 04/30/2025
+ms.date: 05/12/2025
 ms.topic: managed-reference
 qsharp.kind: function
 qsharp.package: __Std__

package/docs/Std.ResourceEstimation/SingleVariant.md

@@ -2,7 +2,7 @@
 uid: Qdk.Std.ResourceEstimation.SingleVariant
 title: SingleVariant function
 description: "Q# SingleVariant function: Used to specify that there's only one execution variant in `BeginEstimateCaching` function"
-ms.date: 04/30/2025
+ms.date: 05/12/2025
 ms.topic: managed-reference
 qsharp.kind: function
 qsharp.package: __Std__

package/docs/Std.ResourceEstimation/TCount.md

@@ -2,7 +2,7 @@
 uid: Qdk.Std.ResourceEstimation.TCount
 title: TCount function
 description: "Q# TCount function: Returns a tuple that can be passed to the `AccountForEstimates` operation to specify that the number of the T gates is equal to the `amount`."
-ms.date: 04/30/2025
+ms.date: 05/12/2025
 ms.topic: managed-reference
 qsharp.kind: function
 qsharp.package: __Std__

package/docs/Std.ResourceEstimation/index.md

@@ -4,7 +4,7 @@ title: Std.ResourceEstimation namespace
 description: Table of contents for the Q# ResourceEstimation namespace
 author: {AUTHOR}
 ms.author: {MS_AUTHOR}
-ms.date: 04/30/2025
+ms.date: 05/12/2025
 ms.topic: landing-page
 ---
 

package/docs/Std.StatePreparation/ApproximatelyPreparePureStateCP.md

@@ -2,7 +2,7 @@
 uid: Qdk.Std.StatePreparation.ApproximatelyPreparePureStateCP
 title: ApproximatelyPreparePureStateCP operation
 description: "Q# ApproximatelyPreparePureStateCP operation: Given a set of coefficients and a big-endian quantum register, prepares a state on that register described by the given coefficients, up to a given approximation tolerance."
-ms.date: 04/30/2025
+ms.date: 05/12/2025
 ms.topic: managed-reference
 qsharp.kind: operation
 qsharp.package: __Std__

package/docs/Std.StatePreparation/PreparePureStateD.md

@@ -2,7 +2,7 @@
 uid: Qdk.Std.StatePreparation.PreparePureStateD
 title: PreparePureStateD operation
 description: "Q# PreparePureStateD operation: Given a set of coefficients and a big-endian quantum register, prepares a state on that register described by the given coefficients."
-ms.date: 04/30/2025
+ms.date: 05/12/2025
 ms.topic: managed-reference
 qsharp.kind: operation
 qsharp.package: __Std__

package/docs/Std.StatePreparation/PrepareUniformSuperposition.md

@@ -2,7 +2,7 @@
 uid: Qdk.Std.StatePreparation.PrepareUniformSuperposition
 title: PrepareUniformSuperposition operation
 description: "Q# PrepareUniformSuperposition operation: Prepares a uniform superposition of states that represent integers 0 through `nStates - 1` in a little-endian `qubits` register."
-ms.date: 04/30/2025
+ms.date: 05/12/2025
 ms.topic: managed-reference
 qsharp.kind: operation
 qsharp.package: __Std__

package/docs/Std.StatePreparation/index.md

@@ -4,7 +4,7 @@ title: Std.StatePreparation namespace
 description: Table of contents for the Q# StatePreparation namespace
 author: {AUTHOR}
 ms.author: {MS_AUTHOR}
-ms.date: 04/30/2025
+ms.date: 05/12/2025
 ms.topic: landing-page
 ---
 

package/docs/Std.TableLookup/Select.md

@@ -2,7 +2,7 @@
 uid: Qdk.Std.TableLookup.Select
 title: Select operation
 description: "Q# Select operation: Performs table lookup using a SELECT network"
-ms.date: 04/30/2025
+ms.date: 05/12/2025
 ms.topic: managed-reference
 qsharp.kind: operation
 qsharp.package: __Std__

package/docs/Std.TableLookup/index.md

@@ -4,7 +4,7 @@ title: Std.TableLookup namespace
 description: Table of contents for the Q# TableLookup namespace
 author: {AUTHOR}
 ms.author: {MS_AUTHOR}
-ms.date: 04/30/2025
+ms.date: 05/12/2025
 ms.topic: landing-page
 ---
 

package/docs/index.md

@@ -4,7 +4,7 @@ title: Q# standard libraries for the Azure Quantum Development Kit
 description: Table of contents for the Q# standard libraries for Azure Quantum Development Kit
 author: {AUTHOR}
 ms.author: {MS_AUTHOR}
-ms.date: 04/30/2025
+ms.date: 05/12/2025
 ms.topic: landing-page
 ---
 

package/docs/toc.yml

@@ -187,6 +187,7 @@
   - {name: Rzz, uid: Qdk.Std.Intrinsic.Rzz}
   - {name: S, uid: Qdk.Std.Intrinsic.S}
   - {name: SWAP, uid: Qdk.Std.Intrinsic.SWAP}
+  - {name: SX, uid: Qdk.Std.Intrinsic.SX}
   - {name: T, uid: Qdk.Std.Intrinsic.T}
   - {name: X, uid: Qdk.Std.Intrinsic.X}
   - {name: Y, uid: Qdk.Std.Intrinsic.Y}

package/lib/node/qsc_wasm.cjs

@@ -611,7 +611,7 @@ function __wbg_adapter_52(arg0, arg1, arg2) {
     wasm.__wbindgen_export_5(arg0, arg1, addHeapObject(arg2));
 }
 
-function __wbg_adapter_198(arg0, arg1, arg2, arg3) {
+function __wbg_adapter_201(arg0, arg1, arg2, arg3) {
     wasm.__wbindgen_export_6(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 
@@ -1093,6 +1093,16 @@ class ProjectLoader {
         const ret = wasm.projectloader_load_project_with_deps(this.__wbg_ptr, ptr0, len0);
         return takeObject(ret);
     }
+    /**
+     * @param {string} file_path
+     * @returns {Promise<IProjectConfig>}
+     */
+    load_openqasm_project(file_path) {
+        const ptr0 = passStringToWasm0(file_path, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.projectloader_load_openqasm_project(this.__wbg_ptr, ptr0, len0);
+        return takeObject(ret);
+    }
 }
 module.exports.ProjectLoader = ProjectLoader;
 
@@ -1279,7 +1289,7 @@ module.exports.__wbg_new_07527e5c188e7771 = function(arg0, arg1) {
             const a = state0.a;
             state0.a = 0;
             try {
-                return __wbg_adapter_198(a, state0.b, arg0, arg1);
+                return __wbg_adapter_201(a, state0.b, arg0, arg1);
             } finally {
                 state0.a = a;
             }
@@ -1364,6 +1374,14 @@ module.exports.__wbg_profile_35b65d3ebe7ebbee = function(arg0, arg1) {
     getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
 };
 
+module.exports.__wbg_projectType_2bf93409ae72a803 = function(arg0, arg1) {
+    const ret = getObject(arg1).projectType;
+    const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+    const len1 = WASM_VECTOR_LEN;
+    getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
+    getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
+};
+
 module.exports.__wbg_queueMicrotask_98e746b9f850fe3d = function(arg0) {
     queueMicrotask(getObject(arg0));
 };
@@ -1499,8 +1517,8 @@ module.exports.__wbindgen_cb_drop = function(arg0) {
     return ret;
 };
 
-module.exports.__wbindgen_closure_wrapper955 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 387, __wbg_adapter_52);
+module.exports.__wbindgen_closure_wrapper1003 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 392, __wbg_adapter_52);
     return addHeapObject(ret);
 };
 

package/lib/node/qsc_wasm.d.cts

@@ -210,6 +210,7 @@ export interface IProjectHost {
 export interface IProgramConfig {
     packageGraphSources: IPackageGraphSources;
     profile: TargetProfile;
+    projectType: ProjectType;
 }
 
 
@@ -242,6 +243,10 @@ export interface IProjectConfig {
         packageGraphSources: IPackageGraphSources;
         lints: ({ lint: string; level: string } | { group: string; level: string })[];
         errors: string[];
+        /**
+         * The type of project. This is used to determine how to load the project.
+         */
+        projectType: ProjectType;
     }
 
 export interface ITestDescriptor {
@@ -265,6 +270,10 @@ export type TargetProfile = "base" | "adaptive_ri" | "adaptive_rif" | "unrestric
 export type LanguageFeatures = "v2-preview-syntax";
 
 
+
+export type ProjectType = "qsharp" | "openqasm";
+
+
 export class DebugService {
   free(): void;
   constructor();
@@ -308,4 +317,5 @@ export class ProjectLoader {
   free(): void;
   constructor(project_host: IProjectHost);
   load_project_with_deps(directory: string): Promise<IProjectConfig>;
+  load_openqasm_project(file_path: string): Promise<IProjectConfig>;
 }

package/lib/web/qsc_wasm.d.ts

@@ -210,6 +210,7 @@ export interface IProjectHost {
 export interface IProgramConfig {
     packageGraphSources: IPackageGraphSources;
     profile: TargetProfile;
+    projectType: ProjectType;
 }
 
 
@@ -242,6 +243,10 @@ export interface IProjectConfig {
         packageGraphSources: IPackageGraphSources;
         lints: ({ lint: string; level: string } | { group: string; level: string })[];
         errors: string[];
+        /**
+         * The type of project. This is used to determine how to load the project.
+         */
+        projectType: ProjectType;
     }
 
 export interface ITestDescriptor {
@@ -265,6 +270,10 @@ export type TargetProfile = "base" | "adaptive_ri" | "adaptive_rif" | "unrestric
 export type LanguageFeatures = "v2-preview-syntax";
 
 
+
+export type ProjectType = "qsharp" | "openqasm";
+
+
 export class DebugService {
   free(): void;
   constructor();
@@ -308,6 +317,7 @@ export class ProjectLoader {
   free(): void;
   constructor(project_host: IProjectHost);
   load_project_with_deps(directory: string): Promise<IProjectConfig>;
+  load_openqasm_project(file_path: string): Promise<IProjectConfig>;
 }
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
@@ -350,6 +360,7 @@ export interface InitOutput {
   readonly __wbg_projectloader_free: (a: number, b: number) => void;
   readonly projectloader_new: (a: number) => number;
   readonly projectloader_load_project_with_deps: (a: number, b: number, c: number) => number;
+  readonly projectloader_load_openqasm_project: (a: number, b: number, c: number) => number;
   readonly git_hash: (a: number) => void;
   readonly get_qir: (a: number, b: number) => void;
   readonly get_estimates: (a: number, b: number, c: number, d: number, e: number, f: number) => void;

package/lib/web/qsc_wasm.js

@@ -607,7 +607,7 @@ function __wbg_adapter_52(arg0, arg1, arg2) {
     wasm.__wbindgen_export_5(arg0, arg1, addHeapObject(arg2));
 }
 
-function __wbg_adapter_198(arg0, arg1, arg2, arg3) {
+function __wbg_adapter_201(arg0, arg1, arg2, arg3) {
     wasm.__wbindgen_export_6(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 
@@ -1087,6 +1087,16 @@ export class ProjectLoader {
         const ret = wasm.projectloader_load_project_with_deps(this.__wbg_ptr, ptr0, len0);
         return takeObject(ret);
     }
+    /**
+     * @param {string} file_path
+     * @returns {Promise<IProjectConfig>}
+     */
+    load_openqasm_project(file_path) {
+        const ptr0 = passStringToWasm0(file_path, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.projectloader_load_openqasm_project(this.__wbg_ptr, ptr0, len0);
+        return takeObject(ret);
+    }
 }
 
 async function __wbg_load(module, imports) {
@@ -1276,7 +1286,7 @@ function __wbg_get_imports() {
                 const a = state0.a;
                 state0.a = 0;
                 try {
-                    return __wbg_adapter_198(a, state0.b, arg0, arg1);
+                    return __wbg_adapter_201(a, state0.b, arg0, arg1);
                 } finally {
                     state0.a = a;
                 }
@@ -1346,6 +1356,13 @@ function __wbg_get_imports() {
         getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
         getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
     };
+    imports.wbg.__wbg_projectType_2bf93409ae72a803 = function(arg0, arg1) {
+        const ret = getObject(arg1).projectType;
+        const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const len1 = WASM_VECTOR_LEN;
+        getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
+        getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
+    };
     imports.wbg.__wbg_queueMicrotask_98e746b9f850fe3d = function(arg0) {
         queueMicrotask(getObject(arg0));
     };
@@ -1455,8 +1472,8 @@ function __wbg_get_imports() {
         const ret = false;
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper955 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 387, __wbg_adapter_52);
+    imports.wbg.__wbindgen_closure_wrapper1003 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 392, __wbg_adapter_52);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_debug_string = function(arg0, arg1) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "qsharp-lang",
   "description": "qsharp language package for quantum development",
-  "version": "1.15.4-dev",
+  "version": "1.16.1-dev",
   "license": "MIT",
   "engines": {
     "node": ">=16.17.0"

package/ux/circuit-vis/circuitManipulation.ts

@@ -1,7 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { ComponentGrid, Operation, Unitary } from "./circuit";
+import { getOperationRegisters } from "../../src/utils";
+import { Column, ComponentGrid, Operation, Unitary } from "./circuit";
 import { CircuitEvents } from "./events";
 import { Register } from "./register";
 import {
@@ -45,6 +46,8 @@ const moveOperation = (
     JSON.stringify(originalOperation),
   );
 
+  _ensureQubitCount(circuitEvents, targetWire);
+
   // Update operation's targets and controls
   _moveY(
     circuitEvents,
@@ -70,6 +73,7 @@ const moveOperation = (
   );
   if (sourceOperationParent == null) return null;
   _removeOp(circuitEvents, originalOperation, sourceOperationParent);
+  removeTrailingUnusedQubits(circuitEvents);
 
   return newSourceOperation;
 };
@@ -254,6 +258,8 @@ const addOperation = (
     newSourceOperation.targets = [{ qubit: targetWire }];
   }
 
+  _ensureQubitCount(circuitEvents, targetWire);
+
   _addOp(
     circuitEvents,
     newSourceOperation,
@@ -286,29 +292,32 @@ const removeOperation = (
 
   if (sourceOperation == null || sourceOperationParent == null) return null;
 
-  // Delete sourceOperation
   _removeOp(circuitEvents, sourceOperation, sourceOperationParent);
+  removeTrailingUnusedQubits(circuitEvents);
 };
 
 /**
- * Find and remove operations in-place based on a predicate function.
+ * Find and remove operations in-place that return `true` for a predicate function.
  *
- * @param componentGrid The grid of components to search through.
+ * @param circuitEvents The CircuitEvents instance to handle circuit-related events.
  * @param pred The predicate function to determine which operations to remove.
  */
 const findAndRemoveOperations = (
-  componentGrid: ComponentGrid,
+  circuitEvents: CircuitEvents,
   pred: (op: Operation) => boolean,
 ) => {
-  const inPlaceFilter = (
-    grid: ComponentGrid,
-    pred: (op: Operation) => boolean,
-  ) => {
+  // Remove operations that are true for the predicate function
+  const inPlaceFilter = (grid: ComponentGrid) => {
     let i = 0;
     while (i < grid.length) {
       let j = 0;
       while (j < grid[i].components.length) {
-        if (!pred(grid[i].components[j])) {
+        const op = grid[i].components[j];
+        if (op.children) {
+          inPlaceFilter(op.children);
+        }
+        if (pred(op)) {
+          circuitEvents.decrementQubitUseCountForOp(op);
           grid[i].components.splice(j, 1);
         } else {
           j++;
@@ -322,25 +331,22 @@ const findAndRemoveOperations = (
     }
   };
 
-  const recursivePred = (op: Operation) => {
-    if (pred(op)) return true;
-    if (op.children) {
-      inPlaceFilter(op.children, (child) => !recursivePred(child));
-    }
-    return false;
-  };
-
-  inPlaceFilter(componentGrid, (op) => !recursivePred(op));
+  inPlaceFilter(circuitEvents.componentGrid);
 };
 
 /**
  * Add a control to the specified operation on the given wire index.
  *
+ * @param circuitEvents The CircuitEvents instance to handle circuit-related events.
  * @param op The unitary operation to which the control will be added.
  * @param wireIndex The index of the wire where the control will be added.
  * @returns True if the control was added, false if it already existed.
  */
-const addControl = (op: Unitary, wireIndex: number): boolean => {
+const addControl = (
+  circuitEvents: CircuitEvents,
+  op: Unitary,
+  wireIndex: number,
+): boolean => {
   if (!op.controls) {
     op.controls = [];
   }
@@ -350,6 +356,8 @@ const addControl = (op: Unitary, wireIndex: number): boolean => {
   if (!existingControl) {
     op.controls.push({ qubit: wireIndex });
     op.controls.sort((a, b) => a.qubit - b.qubit);
+    _ensureQubitCount(circuitEvents, wireIndex);
+    circuitEvents.qubitUseCounts[wireIndex]++;
     return true;
   }
   return false;
@@ -358,23 +366,112 @@ const addControl = (op: Unitary, wireIndex: number): boolean => {
 /**
  * Remove a control from the specified operation on the given wire index.
  *
+ * @param circuitEvents The CircuitEvents instance to handle circuit-related events.
  * @param op The unitary operation from which the control will be removed.
  * @param wireIndex The index of the wire where the control will be removed.
  * @returns True if the control was removed, false if it did not exist.
  */
-const removeControl = (op: Unitary, wireIndex: number): boolean => {
+const removeControl = (
+  circuitEvents: CircuitEvents,
+  op: Unitary,
+  wireIndex: number,
+): boolean => {
   if (op.controls) {
     const controlIndex = op.controls.findIndex(
       (control) => control.qubit === wireIndex,
     );
     if (controlIndex !== -1) {
       op.controls.splice(controlIndex, 1);
+      circuitEvents.qubitUseCounts[wireIndex]--;
+      if (wireIndex === circuitEvents.qubits.length - 1) {
+        removeTrailingUnusedQubits(circuitEvents);
+      }
       return true;
     }
   }
   return false;
 };
 
+/**
+ * Resolves overlapping operations in each column of the component grid.
+ * For each column, splits overlapping operations into separate columns so that
+ * no two operations in the same column overlap on their register ranges.
+ * Modifies the component grid in-place.
+ *
+ * @param parentArray The component grid (array of columns) to process.
+ */
+const resolveOverlappingOperations = (parentArray: ComponentGrid): void => {
+  // Helper to resolve a single column into non-overlapping columns
+  const resolveColumn = (col: Column): Column[] => {
+    const newColumn: Column = { components: [] };
+    let [lastMin, lastMax] = [-1, -1];
+    let i = 0;
+    while (i < col.components.length) {
+      const op = col.components[i];
+      const [currMin, currMax] = _getMinMaxRegIdx(op);
+      // Sets up the first operation for comparison or if the current operation doesn't overlap
+      if (i === 0 || !_doesOverlap([lastMin, lastMax], [currMin, currMax])) {
+        [lastMin, lastMax] = [currMin, currMax];
+        i++;
+      } else {
+        // If they overlap, add the current operation to the new column
+        newColumn.components.push(op);
+        col.components.splice(i, 1);
+      }
+    }
+    if (newColumn.components.length > 0) {
+      const newColumns = resolveColumn(newColumn);
+      newColumns.push(col);
+      return newColumns;
+    } else {
+      return [col];
+    }
+  };
+
+  // In-place update of parentArray
+  let i = 0;
+  while (i < parentArray.length) {
+    const col = parentArray[i];
+    const newColumns = resolveColumn(col);
+    if (newColumns.length > 1) {
+      parentArray.splice(i, 1, ...newColumns);
+      i += newColumns.length;
+    }
+    i++;
+  }
+};
+
+/**
+ * Remove trailing unused qubits from the circuit.
+ *
+ * @param circuitEvents The CircuitEvents instance to handle circuit-related events.
+ */
+const removeTrailingUnusedQubits = (circuitEvents: CircuitEvents) => {
+  while (
+    circuitEvents.qubitUseCounts.length > 0 &&
+    circuitEvents.qubitUseCounts[circuitEvents.qubitUseCounts.length - 1] === 0
+  ) {
+    circuitEvents.qubits.pop();
+    circuitEvents.qubitUseCounts.pop();
+  }
+};
+
+/**
+ * Determines whether two register index ranges overlap.
+ *
+ * @param op1 The [min, max] register indices of the first operation.
+ * @param op2 The [min, max] register indices of the second operation.
+ * @returns True if the ranges overlap, false otherwise.
+ */
+const _doesOverlap = (
+  op1: [number, number],
+  op2: [number, number],
+): boolean => {
+  const [min1, max1] = op1;
+  const [min2, max2] = op2;
+  return max1 >= min2 && max2 >= min1;
+};
+
 /**
  * Add an operation to the circuit at the specified location.
  *
@@ -409,12 +506,7 @@ const _addOp = (
       if (op === originalOperation) continue;
 
       const [opMinTarget, opMaxTarget] = _getMinMaxRegIdx(op);
-      if (
-        (opMinTarget >= minTarget && opMinTarget <= maxTarget) ||
-        (opMaxTarget >= minTarget && opMaxTarget <= maxTarget) ||
-        (minTarget >= opMinTarget && minTarget <= opMaxTarget) ||
-        (maxTarget >= opMinTarget && maxTarget <= opMaxTarget)
-      ) {
+      if (_doesOverlap([minTarget, maxTarget], [opMinTarget, opMaxTarget])) {
         insertNewColumn = true;
         break;
       }
@@ -433,9 +525,11 @@ const _addOp = (
     );
   }
 
+  circuitEvents.incrementQubitUseCountForOp(sourceOperation);
+
   if (sourceOperation.kind === "measurement") {
-    for (const targetWires of sourceOperation.qubits) {
-      _updateMeasurementLines(circuitEvents, targetWires.qubit);
+    for (const targetWire of sourceOperation.qubits) {
+      _updateMeasurementLines(circuitEvents, targetWire.qubit);
     }
   }
 };
@@ -448,25 +542,7 @@ const _addOp = (
  * @returns A tuple containing the minimum and maximum register indices.
  */
 const _getMinMaxRegIdx = (operation: Operation): [number, number] => {
-  let targets: Register[];
-  let controls: Register[];
-  switch (operation.kind) {
-    case "measurement":
-      targets = operation.results;
-      controls = operation.qubits;
-      break;
-    case "unitary":
-      targets = operation.targets;
-      controls = operation.controls || [];
-      break;
-    case "ket":
-      targets = operation.targets;
-      controls = [];
-      break;
-  }
-
-  const ctrls: Register[] = controls || [];
-  const qRegs: Register[] = [...ctrls, ...targets].filter(
+  const qRegs: Register[] = getOperationRegisters(operation).filter(
     ({ result }) => result === undefined,
   );
   if (qRegs.length === 0) return [-1, -1];
@@ -527,6 +603,8 @@ const _removeOp = (
     }
   }
 
+  circuitEvents.decrementQubitUseCountForOp(sourceOperation);
+
   if (sourceOperation.kind === "measurement") {
     for (const result of sourceOperation.results) {
       _updateMeasurementLines(circuitEvents, result.qubit);
@@ -544,6 +622,7 @@ const _updateMeasurementLines = (
   circuitEvents: CircuitEvents,
   wireIndex: number,
 ) => {
+  _ensureQubitCount(circuitEvents, wireIndex);
   let resultIndex = 0;
   for (const col of circuitEvents.componentGrid) {
     for (const comp of col.components) {
@@ -561,6 +640,22 @@ const _updateMeasurementLines = (
     resultIndex > 0 ? resultIndex : undefined;
 };
 
+/**
+ * Ensure that the qubit count in the circuit is sufficient for the given wire index.
+ *
+ * @param circuitEvents The CircuitEvents instance to handle circuit-related events.
+ * @param wireIndex The index of the wire to check.
+ */
+const _ensureQubitCount = (circuitEvents: CircuitEvents, wireIndex: number) => {
+  while (circuitEvents.qubits.length <= wireIndex) {
+    circuitEvents.qubits.push({
+      id: circuitEvents.qubits.length,
+      numResults: undefined,
+    });
+    circuitEvents.qubitUseCounts.push(0);
+  }
+};
+
 export {
   moveOperation,
   addOperation,
@@ -568,4 +663,6 @@ export {
   findAndRemoveOperations,
   addControl,
   removeControl,
+  resolveOverlappingOperations,
+  removeTrailingUnusedQubits,
 };