@tscircuit/core 0.0.374 → 0.0.375

package/dist/index.d.ts

@@ -427,8 +427,10 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
     doesSelectorMatch(selector: string): boolean;
     getSubcircuit(): ISubcircuit;
     getGroup(): IGroup | null;
-    selectAll(selector: string): PrimitiveComponent[];
-    selectOne<T = PrimitiveComponent>(selector: string, options?: {
+    _cachedSelectAllQueries: Map<string, PrimitiveComponent[]>;
+    selectAll(selectorRaw: string): PrimitiveComponent[];
+    _cachedSelectOneQueries: Map<string, PrimitiveComponent | null>;
+    selectOne<T = PrimitiveComponent>(selectorRaw: string, options?: {
         type?: string;
         port?: boolean;
         pcbPrimitive?: boolean;

package/dist/index.js

@@ -32,7 +32,7 @@ __export(components_exports, {
   Port: () => Port,
   Potentiometer: () => Potentiometer,
   PowerSource: () => PowerSource,
-  PrimitiveComponent: () => PrimitiveComponent,
+  PrimitiveComponent: () => PrimitiveComponent2,
   PushButton: () => PushButton,
   Renderable: () => Renderable,
   Resistor: () => Resistor,
@@ -531,8 +531,8 @@ var underscorifyPortArrangement = (portArrangement) => {
   return void 0;
 };
 
-// lib/components/base-components/PrimitiveComponent.ts
-import Debug2 from "debug";
+// lib/components/base-components/PrimitiveComponent/PrimitiveComponent.ts
+import "debug";
 
 // lib/errors/InvalidProps.ts
 var InvalidProps = class extends Error {
@@ -590,7 +590,7 @@ function isMatchingSelector(component, selector) {
   });
 }
 
-// lib/components/base-components/PrimitiveComponent.ts
+// lib/components/base-components/PrimitiveComponent/PrimitiveComponent.ts
 import { symbols } from "schematic-symbols";
 import {
   applyToPoint,
@@ -601,8 +601,123 @@ import {
   translate
 } from "transformation-matrix";
 import { z as z2 } from "zod";
-var debugSelectAll = Debug2("tscircuit:primitive-component:selectAll");
-var PrimitiveComponent = class extends Renderable {
+import { selectOne, selectAll } from "css-select";
+
+// lib/components/base-components/PrimitiveComponent/cssSelectPrimitiveComponentAdapter.ts
+var cssSelectPrimitiveComponentAdapter = {
+  // Is the node an element?
+  isTag: (node) => true,
+  // Get the parent of the node
+  getParent: (node) => node.parent,
+  // Get the children of the node
+  getChildren: (node) => node.children,
+  // Get the name of the tag
+  getName: (node) => node.lowercaseComponentName,
+  // Get the attribute value
+  getAttributeValue: (node, name) => {
+    if (name === "class" && "getNameAndAliases" in node) {
+      return node.getNameAndAliases().join(" ");
+    }
+    if (name === "name" && node._parsedProps?.name) {
+      return node._parsedProps.name;
+    }
+    if (node._parsedProps && name in node._parsedProps) {
+      const value = node._parsedProps[name];
+      return typeof value === "string" ? value : value !== null && value !== void 0 ? String(value) : null;
+    }
+    return null;
+  },
+  // Check if a node has an attribute
+  hasAttrib: (node, name) => {
+    if (name === "class") {
+      return !!node._parsedProps?.name;
+    }
+    return node._parsedProps && name in node._parsedProps;
+  },
+  // Get the siblings of the node
+  getSiblings: (node) => {
+    if (!node.parent) return [];
+    return node.parent.children;
+  },
+  // Get the previous sibling
+  prevElementSibling: (node) => {
+    if (!node.parent) return null;
+    const siblings = node.parent.children;
+    const idx = siblings.indexOf(node);
+    return idx > 0 ? siblings[idx - 1] : null;
+  },
+  // Get the text content
+  getText: () => "",
+  // Remove the node
+  removeSubsets: (nodes) => {
+    return nodes.filter(
+      (node, i) => !nodes.some(
+        (other, j) => i !== j && other !== node && other.getDescendants().includes(node)
+      )
+    );
+  },
+  // Determine if element a is a subset of element b
+  existsOne: (test, nodes) => {
+    return nodes.some(test);
+  },
+  // Find all elements matching a selector
+  findAll: (test, nodes) => {
+    const result = [];
+    const recurse = (node) => {
+      if (test(node)) {
+        result.push(node);
+      }
+      for (const child of node.children) {
+        recurse(child);
+      }
+    };
+    for (const node of nodes) {
+      recurse(node);
+    }
+    return result;
+  },
+  // Find one element matching a selector
+  findOne: (test, nodes) => {
+    for (const node of nodes) {
+      if (test(node)) return node;
+      const children = node.children;
+      if (children.length > 0) {
+        const result = cssSelectPrimitiveComponentAdapter.findOne(
+          test,
+          children
+        );
+        if (result) return result;
+      }
+    }
+    return null;
+  },
+  equals: (a, b) => {
+    return a._renderId === b._renderId;
+  },
+  isHovered: (elem) => false,
+  isVisited: (elem) => false,
+  isActive: (elem) => false
+};
+var cssSelectPrimitiveComponentAdapterWithoutSubcircuits = {
+  ...cssSelectPrimitiveComponentAdapter,
+  getChildren: (node) => node.children.filter((c) => !c.isSubcircuit)
+};
+var cssSelectPrimitiveComponentAdapterOnlySubcircuits = {
+  ...cssSelectPrimitiveComponentAdapter,
+  getChildren: (node) => node.children.filter((c) => c.isSubcircuit)
+};
+
+// lib/components/base-components/PrimitiveComponent/preprocessSelector.ts
+var preprocessSelector = (selector) => {
+  return selector.replace(/ pin/g, " port").replace(/ subcircuit\./g, " group[isSubcircuit=true]").trim();
+};
+
+// lib/components/base-components/PrimitiveComponent/PrimitiveComponent.ts
+var cssSelectOptionsInsideSubcircuit = {
+  adapter: cssSelectPrimitiveComponentAdapterWithoutSubcircuits,
+  cacheResults: true
+};
+var PrimitiveComponent2 = class extends Renderable {
   parent = null;
   children;
   childrenPendingRemoval;
@@ -1007,57 +1122,65 @@ var PrimitiveComponent = class extends Renderable {
     if (this.isGroup) return this;
     return this.parent?.getGroup?.() ?? null;
   }
-  selectAll(selector) {
-    debugSelectAll(`selectAll: "${selector}"`);
-    const parts = selector.trim().split(/\s+/);
-    let currentSearch = parts[0] === ">" ? this.children : this.getSelectableDescendants();
-    let currentResults = [];
-    let onlyDirectChildren = false;
-    let iteration = -1;
-    for (const part of parts) {
-      iteration++;
-      debugSelectAll(`
-
-iteration: ${iteration}`);
-      debugSelectAll(`part: "${parts[iteration]}"`);
-      debugSelectAll(
-        `currentSearch: [${currentSearch.map((r) => r.getString()).join(",")}]`
+  _cachedSelectAllQueries = /* @__PURE__ */ new Map();
+  selectAll(selectorRaw) {
+    if (this._cachedSelectAllQueries.has(selectorRaw)) {
+      return this._cachedSelectAllQueries.get(
+        selectorRaw
       );
-      debugSelectAll(
-        `currentResults: [${currentResults.map((r) => r.getString()).join(",")}]`
-      );
-      if (part === ">") {
-        onlyDirectChildren = true;
-      } else {
-        const newResults = currentSearch.filter(
-          (component) => isMatchingSelector(component, part)
-        );
-        const newSearch = newResults.flatMap((component) => {
-          if (onlyDirectChildren) return component.children;
-          return component.getSelectableDescendants();
-        });
-        currentSearch = newSearch;
-        currentResults = newResults;
-        onlyDirectChildren = false;
-      }
     }
-    return currentResults;
-  }
-  selectOne(selector, options) {
-    let type = options?.type?.toLowerCase();
-    if (options?.port) type = "port";
-    if (type) {
-      return this.selectAll(selector).find(
-        (c) => c.lowercaseComponentName === type
-      ) ?? null;
+    const selector = preprocessSelector(selectorRaw);
+    const result = selectAll(selector, this, cssSelectOptionsInsideSubcircuit);
+    if (result.length > 0) {
+      this._cachedSelectAllQueries.set(selectorRaw, result);
+      return result;
     }
-    if (options?.pcbPrimitive) {
-      return this.selectAll(selector).find((c) => c.isPcbPrimitive) ?? null;
+    const [firstpart, ...rest] = selector.split(" ");
+    const subcircuit = selectOne(firstpart, this, {
+      adapter: cssSelectPrimitiveComponentAdapterOnlySubcircuits
+    });
+    if (!subcircuit) return [];
+    const result2 = subcircuit.selectAll(rest.join(" "));
+    this._cachedSelectAllQueries.set(selectorRaw, result2);
+    return result2;
+  }
+  _cachedSelectOneQueries = /* @__PURE__ */ new Map();
+  selectOne(selectorRaw, options) {
+    if (this._cachedSelectOneQueries.has(selectorRaw)) {
+      return this._cachedSelectOneQueries.get(selectorRaw);
+    }
+    const selector = preprocessSelector(selectorRaw);
+    if (options?.port) {
+      options.type = "port";
+    }
+    let result = null;
+    if (options?.type) {
+      const allMatching = selectAll(
+        selector,
+        this,
+        cssSelectOptionsInsideSubcircuit
+      );
+      result = allMatching.find(
+        (n) => n.lowercaseComponentName === options.type
+      );
     }
-    if (options?.schematicPrimitive) {
-      return this.selectAll(selector).find((c) => c.isSchematicPrimitive) ?? null;
+    result ??= selectOne(
+      selector,
+      this,
+      cssSelectOptionsInsideSubcircuit
+    );
+    if (result) {
+      this._cachedSelectOneQueries.set(selectorRaw, result);
+      return result;
     }
-    return this.selectAll(selector)[0] ?? null;
+    const [firstpart, ...rest] = selector.split(" ");
+    const subcircuit = selectOne(firstpart, this, {
+      adapter: cssSelectPrimitiveComponentAdapterOnlySubcircuits
+    });
+    if (!subcircuit) return null;
+    result = subcircuit.selectOne(rest.join(" "), options);
+    this._cachedSelectOneQueries.set(selectorRaw, result);
+    return result;
   }
   getAvailablePcbLayers() {
     if (this.isPcbPrimitive) {
@@ -1173,7 +1296,7 @@ import { autoroute } from "@tscircuit/infgrid-ijump-astar";
 var netProps = z3.object({
   name: z3.string()
 });
-var Net = class extends PrimitiveComponent {
+var Net = class extends PrimitiveComponent2 {
   source_net_id;
   get config() {
     return {
@@ -1362,7 +1485,7 @@ var createNetsFromProps = (component, props) => {
 // lib/components/primitive-components/SmtPad.ts
 import { smtPadProps } from "@tscircuit/props";
 import { decomposeTSR } from "transformation-matrix";
-var SmtPad = class extends PrimitiveComponent {
+var SmtPad = class extends PrimitiveComponent2 {
   pcb_smtpad_id = null;
   matchedPort = null;
   isPcbPrimitive = true;
@@ -1567,7 +1690,7 @@ var SmtPad = class extends PrimitiveComponent {
 // lib/components/primitive-components/SilkscreenPath.ts
 import { silkscreenPathProps } from "@tscircuit/props";
 import { applyToPoint as applyToPoint2 } from "transformation-matrix";
-var SilkscreenPath = class extends PrimitiveComponent {
+var SilkscreenPath = class extends PrimitiveComponent2 {
   pcb_silkscreen_path_id = null;
   isPcbPrimitive = true;
   get config() {
@@ -1630,7 +1753,7 @@ var SilkscreenPath = class extends PrimitiveComponent {
 
 // lib/components/primitive-components/PlatedHole.ts
 import { platedHoleProps } from "@tscircuit/props";
-var PlatedHole = class extends PrimitiveComponent {
+var PlatedHole = class extends PrimitiveComponent2 {
   pcb_plated_hole_id = null;
   matchedPort = null;
   isPcbPrimitive = true;
@@ -1749,7 +1872,7 @@ var PlatedHole = class extends PrimitiveComponent {
 // lib/components/primitive-components/Keepout.ts
 import { pcbKeepoutProps } from "@tscircuit/props";
 import { decomposeTSR as decomposeTSR2 } from "transformation-matrix";
-var Keepout = class extends PrimitiveComponent {
+var Keepout = class extends PrimitiveComponent2 {
   pcb_keepout_id = null;
   isPcbPrimitive = true;
   get config() {
@@ -1804,7 +1927,7 @@ var Keepout = class extends PrimitiveComponent {
 
 // lib/components/primitive-components/Hole.ts
 import { holeProps } from "@tscircuit/props";
-var Hole = class extends PrimitiveComponent {
+var Hole = class extends PrimitiveComponent2 {
   pcb_hole_id = null;
   isPcbPrimitive = true;
   get config() {
@@ -1861,7 +1984,7 @@ var Hole = class extends PrimitiveComponent {
 
 // lib/components/primitive-components/SilkscreenText.ts
 import { silkscreenTextProps } from "@tscircuit/props";
-var SilkscreenText = class extends PrimitiveComponent {
+var SilkscreenText = class extends PrimitiveComponent2 {
   isPcbPrimitive = true;
   get config() {
     return {
@@ -2105,7 +2228,7 @@ var portProps = z4.object({
   pinNumber: z4.number().optional(),
   aliases: z4.array(z4.string()).optional()
 });
-var Port = class extends PrimitiveComponent {
+var Port = class extends PrimitiveComponent2 {
   source_port_id = null;
   pcb_port_id = null;
   schematic_port_id = null;
@@ -2756,7 +2879,7 @@ import { footprintProps } from "@tscircuit/props";
 import * as kiwi from "@lume/kiwi";
 import Debug3 from "debug";
 var debug2 = Debug3("tscircuit:core:footprint");
-var Footprint = class extends PrimitiveComponent {
+var Footprint = class extends PrimitiveComponent2 {
   get config() {
     return {
       componentName: "Footprint",
@@ -3708,7 +3831,7 @@ var portToObjective = (port) => {
   };
 };
 var SHOULD_USE_SINGLE_LAYER_ROUTING = false;
-var Trace2 = class extends PrimitiveComponent {
+var Trace2 = class extends PrimitiveComponent2 {
   source_trace_id = null;
   pcb_trace_id = null;
   schematic_trace_id = null;
@@ -3759,7 +3882,7 @@ var Trace2 = class extends PrimitiveComponent {
     }));
     for (const { selector, port } of portsWithSelectors) {
       if (!port) {
-        const parentSelector = selector.replace(/\>.*$/, "");
+        const parentSelector = selector.replace(/(\> )?[^ ]+$/, "");
         const targetComponent = this.getSubcircuit().selectOne(parentSelector);
         if (!targetComponent) {
           this.renderError(`Could not find port for selector "${selector}"`);
@@ -4457,7 +4580,7 @@ var rotation3 = z6.object({
   y: rotation,
   z: rotation
 });
-var NormalComponent = class extends PrimitiveComponent {
+var NormalComponent = class extends PrimitiveComponent2 {
   reactSubtrees = [];
   _impliedFootprint;
   isPrimitiveContainer = true;
@@ -5346,7 +5469,7 @@ import "zod";
 // lib/components/primitive-components/TraceHint.ts
 import { traceHintProps } from "@tscircuit/props";
 import { applyToPoint as applyToPoint4 } from "transformation-matrix";
-var TraceHint = class extends PrimitiveComponent {
+var TraceHint = class extends PrimitiveComponent2 {
   matchedPort = null;
   get config() {
     return {
@@ -6756,7 +6879,7 @@ var edgeSpecifiers = [
   "bottomedge",
   "center"
 ];
-var Constraint2 = class extends PrimitiveComponent {
+var Constraint2 = class extends PrimitiveComponent2 {
   get config() {
     return {
       componentName: "Constraint",
@@ -6812,7 +6935,7 @@ var Constraint2 = class extends PrimitiveComponent {
 // lib/components/primitive-components/FabricationNotePath.ts
 import { fabricationNotePathProps } from "@tscircuit/props";
 import { applyToPoint as applyToPoint5 } from "transformation-matrix";
-var FabricationNotePath = class extends PrimitiveComponent {
+var FabricationNotePath = class extends PrimitiveComponent2 {
   fabrication_note_path_id = null;
   get config() {
     return {
@@ -6856,7 +6979,7 @@ var FabricationNotePath = class extends PrimitiveComponent {
 
 // lib/components/primitive-components/FabricationNoteText.ts
 import { fabricationNoteTextProps } from "@tscircuit/props";
-var FabricationNoteText = class extends PrimitiveComponent {
+var FabricationNoteText = class extends PrimitiveComponent2 {
   get config() {
     return {
       componentName: "FabricationNoteText",
@@ -6900,7 +7023,7 @@ var Subcircuit = class extends Group {
 
 // lib/components/primitive-components/NetAlias.ts
 import { netAliasProps } from "@tscircuit/props";
-var NetAlias = class extends PrimitiveComponent {
+var NetAlias = class extends PrimitiveComponent2 {
   source_net_alias_id;
   get config() {
     return {
@@ -6927,7 +7050,7 @@ var NetAlias = class extends PrimitiveComponent {
 
 // lib/components/primitive-components/SilkscreenCircle.ts
 import { silkscreenCircleProps } from "@tscircuit/props";
-var SilkscreenCircle = class extends PrimitiveComponent {
+var SilkscreenCircle = class extends PrimitiveComponent2 {
   pcb_silkscreen_circle_id = null;
   isPcbPrimitive = true;
   get config() {
@@ -6972,7 +7095,7 @@ var SilkscreenCircle = class extends PrimitiveComponent {
 
 // lib/components/primitive-components/SilkscreenRect.ts
 import { silkscreenRectProps } from "@tscircuit/props";
-var SilkscreenRect = class extends PrimitiveComponent {
+var SilkscreenRect = class extends PrimitiveComponent2 {
   pcb_silkscreen_rect_id = null;
   isPcbPrimitive = true;
   get config() {
@@ -7016,7 +7139,7 @@ var SilkscreenRect = class extends PrimitiveComponent {
 
 // lib/components/primitive-components/SilkscreenLine.ts
 import { silkscreenLineProps } from "@tscircuit/props";
-var SilkscreenLine = class extends PrimitiveComponent {
+var SilkscreenLine = class extends PrimitiveComponent2 {
   pcb_silkscreen_line_id = null;
   isPcbPrimitive = true;
   get config() {
@@ -7060,7 +7183,7 @@ var SilkscreenLine = class extends PrimitiveComponent {
 
 // lib/components/primitive-components/Via.ts
 import { viaProps } from "@tscircuit/props";
-var Via = class extends PrimitiveComponent {
+var Via = class extends PrimitiveComponent2 {
   pcb_via_id = null;
   matchedPort = null;
   isPcbPrimitive = true;
@@ -7514,7 +7637,7 @@ import { identity as identity4 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.373",
+  version: "0.0.374",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -7549,6 +7672,7 @@ var package_default = {
     "chokidar-cli": "^3.0.0",
     "circuit-to-svg": "^0.0.113",
     concurrently: "^9.1.2",
+    "css-select": "^5.1.0",
     debug: "^4.3.6",
     "graphics-debug": "^0.0.4",
     howfat: "^0.3.8",
@@ -7968,7 +8092,7 @@ export {
   Port,
   Potentiometer,
   PowerSource,
-  PrimitiveComponent,
+  PrimitiveComponent2 as PrimitiveComponent,
   Project,
   PushButton,
   Renderable,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.374",
+  "version": "0.0.375",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -36,6 +36,7 @@
     "chokidar-cli": "^3.0.0",
     "circuit-to-svg": "^0.0.113",
     "concurrently": "^9.1.2",
+    "css-select": "^5.1.0",
     "debug": "^4.3.6",
     "graphics-debug": "^0.0.4",
     "howfat": "^0.3.8",