@tscircuit/rectdiff 0.0.25 → 0.0.27

package/.github/workflows/bun-pver-release.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - '!version-bumps/**'
   workflow_dispatch:
 
 env:
@@ -13,35 +14,39 @@ env:
 jobs:
   publish:
     runs-on: ubuntu-latest
-    if: ${{ !(github.event_name == 'push' && startsWith(github.event.head_commit.message, 'v')) }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.TSCIRCUIT_BOT_GITHUB_TOKEN }}
       - name: Setup bun
         uses: oven-sh/setup-bun@v2
         with:
-          bun-version: 1.3.1
-      - uses: actions/setup-node@v3
+          bun-version: latest
+      - uses: actions/setup-node@v4
         with:
           node-version: 20
           registry-url: https://registry.npmjs.org/
       - run: npm install -g pver
-      - run: bun install
+      - run: bun install --frozen-lockfile
       - run: bun run build
       - run: pver release --no-push-main
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.TSCIRCUIT_BOT_GITHUB_TOKEN }}
 
+      - name: Get package version
+        id: package-version
+        run: |
+          VERSION=$(node -p "require('./package.json').version")
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
+
       - name: Create Pull Request
         id: create-pr
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           commit-message: "chore: bump version"
-          title: "chore: bump version"
+          title: "chore: bump version to v${{ steps.package-version.outputs.version }}"
           body: "Automated package update"
-          branch: bump-version-${{ github.run_number }}
+          branch: version-bumps/v${{ steps.package-version.outputs.version }}
           base: main
           token: ${{ secrets.TSCIRCUIT_BOT_GITHUB_TOKEN }}
           committer: tscircuitbot <githubbot@tscircuit.com>
@@ -54,18 +59,34 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.TSCIRCUIT_BOT_GITHUB_TOKEN }}
 
-      # - name: Trigger upstream repo updates
-      #   if: env.UPSTREAM_REPOS && env.UPSTREAM_PACKAGES_TO_UPDATE
-      #   run: |
-      #     IFS=',' read -ra REPOS <<< "${{ env.UPSTREAM_REPOS }}"
-      #     for repo in "${REPOS[@]}"; do
-      #       if [[ -n "$repo" ]]; then
-      #         echo "Triggering update for repo: $repo"
-      #         curl -X POST \
-      #           -H "Accept: application/vnd.github.v3+json" \
-      #           -H "Authorization: token ${{ secrets.TSCIRCUIT_BOT_GITHUB_TOKEN }}" \
-      #           -H "Content-Type: application/json" \
-      #           "https://api.github.com/repos/tscircuit/$repo/actions/workflows/update-package.yml/dispatches" \
-      #           -d "{\"ref\":\"main\",\"inputs\":{\"package_names\":\"${{ env.UPSTREAM_PACKAGES_TO_UPDATE }}\"}}"
-      #       fi
-      #     done
+      - name: Trigger upstream repo updates
+        if: env.UPSTREAM_REPOS && env.UPSTREAM_PACKAGES_TO_UPDATE
+        run: |
+          IFS=',' read -ra REPOS <<< "${{ env.UPSTREAM_REPOS }}"
+          for repo in "${REPOS[@]}"; do
+            if [[ -n "$repo" ]]; then
+              echo "Triggering update for repo: $repo"
+              curl -X POST \
+                -H "Accept: application/vnd.github.v3+json" \
+                -H "Authorization: token ${{ secrets.TSCIRCUIT_BOT_GITHUB_TOKEN }}" \
+                -H "Content-Type: application/json" \
+                "https://api.github.com/repos/tscircuit/$repo/actions/workflows/update-package.yml/dispatches" \
+                -d "{\"ref\":\"main\",\"inputs\":{\"package_names\":\"${{ env.UPSTREAM_PACKAGES_TO_UPDATE }}\"}}"
+            fi
+          done
+      - name: Notify release-tracker of version update
+        # Continue-on-error just in case the tracker is down
+        continue-on-error: true
+        run: |
+          VERSION=$(node -p "require('./package.json').version")
+          PACKAGE_JSON=$(cat package.json)
+          curl -X POST https://release-tracker.tscircuit.com/release_events/create \
+            -H "Content-Type: application/json" \
+            -d "{
+              \"event\": {
+                \"event_type\": \"versions_updated\",
+                \"repo\": \"tscircuit/circuit-json-to-kicad\",
+                \"version\": \"$VERSION\",
+                \"package_json\": $PACKAGE_JSON
+              }
+            }"

package/dist/index.d.ts

@@ -34,6 +34,7 @@ interface Obstacle {
     height: number;
     connectedTo: TraceId[];
     netIsAssignable?: boolean;
+    isCopperPour?: boolean;
     offBoardConnectsTo?: TraceId[];
 }
 interface SimpleRouteConnection {
@@ -116,6 +117,26 @@ type RTreeRect = XYRect & {
     zLayers: number[];
 };
 
+type AdjacentLayerContainmentMergeSolverInput = {
+    meshNodes: CapacityMeshNode[];
+    simpleRouteJson: SimpleRouteJson;
+    minFragmentArea?: number;
+};
+declare class AdjacentLayerContainmentMergeSolver extends BaseSolver {
+    private input;
+    private outputNodes;
+    private promotedNodeIds;
+    private residualNodeIds;
+    constructor(input: AdjacentLayerContainmentMergeSolverInput);
+    _setup(): void;
+    _step(): void;
+    private processAdjacentLayerContainmentMerges;
+    getOutput(): {
+        outputNodes: CapacityMeshNode[];
+    };
+    visualize(): GraphicsObject;
+}
+
 interface SegmentWithAdjacentEmptySpace {
     parent: CapacityMeshNode;
     start: {
@@ -215,6 +236,29 @@ declare class GapFillSolverPipeline extends BasePipelineSolver<GapFillSolverInpu
     finalVisualize(): GraphicsObject;
 }
 
+type OuterLayerContainmentMergeSolverInput = {
+    meshNodes: CapacityMeshNode[];
+    simpleRouteJson: SimpleRouteJson;
+    zIndexByName: Map<string, number>;
+    obstacleClearance?: number;
+};
+declare class OuterLayerContainmentMergeSolver extends BaseSolver {
+    private input;
+    private outputNodes;
+    private promotedNodeIds;
+    private residualNodeIds;
+    constructor(input: OuterLayerContainmentMergeSolverInput);
+    _setup(): void;
+    _step(): void;
+    private processOuterLayerContainmentMerges;
+    private buildObstaclesByLayer;
+    private isTransitCompatibleAcrossIntermediateLayers;
+    getOutput(): {
+        outputNodes: CapacityMeshNode[];
+    };
+    visualize(): GraphicsObject;
+}
+
 type RectDiffSeedingSolverInput = {
     simpleRouteJson: SimpleRouteJson;
     obstacleIndexByLayer: Array<RBush<RTreeRect>>;
@@ -365,6 +409,8 @@ interface RectDiffPipelineInput {
 declare class RectDiffPipeline extends BasePipelineSolver<RectDiffPipelineInput> {
     rectDiffGridSolverPipeline?: RectDiffGridSolverPipeline;
     gapFillSolver?: GapFillSolverPipeline;
+    outerLayerContainmentMergeSolver?: OuterLayerContainmentMergeSolver;
+    adjacentLayerContainmentMergeSolver?: AdjacentLayerContainmentMergeSolver;
     boardVoidRects: XYRect[] | undefined;
     zIndexByName?: Map<string, number>;
     layerNames?: string[];