altium-to-circuit-json 0.0.77 → 0.0.78

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { LayerRef, SourceSimpleChip, SourcePort, AnyCircuitElement, SourceNet, SourceTrace } from 'circuit-json';
-import { AltiumPcbDocument, AltiumRecord, AltiumPadRecord, AltiumSchDoc } from 'altiumts';
+import { AltiumPcbDocument, AltiumRecord, AltiumPadRecord, AltiumSchDoc, AltiumPrjPcb } from 'altiumts';
 
 declare class PcbCopperLayerMap {
     readonly layers: LayerRef[];
@@ -110,9 +110,14 @@ declare function convertAltiumPcbDocToCircuitJson(document: AltiumPcbDocument, o
 
 interface ConvertAltiumSchDocOptions {
     centerOnSchematicSheet?: boolean;
+    currentDate?: string;
+    currentTime?: string;
+    documentName?: string;
     includeHidden?: boolean;
     includeSheetBorder?: boolean;
     includeText?: boolean;
+    project?: AltiumPrjPcb;
+    projectName?: string;
     schematicUnitScale?: number;
     sheetName?: string;
 }

package/dist/index.js

@@ -837,6 +837,28 @@ function getFontFamily(record, context) {
   return context.sheetRecord?.getDecoded(`FONTNAME${fontId}`) ?? "Arial";
 }
 
+// lib/schematic/text/resolveSchematicText.ts
+import {
+  resolveSchematicParameterReferenceWithContext
+} from "altiumts";
+function resolveSchematicText({
+  document,
+  options,
+  record,
+  reference
+}) {
+  return resolveSchematicParameterReferenceWithContext({
+    currentDate: options.currentDate,
+    currentTime: options.currentTime,
+    document,
+    documentName: options.documentName,
+    project: options.project,
+    projectName: options.projectName,
+    record,
+    reference
+  }) ?? reference;
+}
+
 // lib/schematic/text/wrapSchematicText.ts
 function wrapSchematicText({
   text,
@@ -882,9 +904,15 @@ function renderTextRecord({
   if (kind === "4" || kind === "25" || kind === "32" || kind === "33" || kind === "34" || kind === "41") {
     if (options.includeText === false) return [];
     if (record.getBoolean("ISHIDDEN") && !options.includeHidden) return [];
-    const text = record.getDecoded("TEXT") ?? record.getDecoded("NAME") ?? record.getDecoded("DESIGNATOR");
+    const reference = record.getDecoded("TEXT") ?? record.getDecoded("NAME") ?? record.getDecoded("DESIGNATOR");
     const location = getLocation(record);
-    if (!text || !location) return [];
+    if (!reference || !location) return [];
+    const text = resolveSchematicText({
+      document: context.document,
+      options,
+      record,
+      reference
+    });
     return [createText({ record, index, text, location, color, context })];
   }
   if (kind === "28") {
@@ -3222,7 +3250,7 @@ function convertOwnedComponentRecords({
       {
         index,
         options: {
-          includeHidden: context.options.includeHidden,
+          ...context.options,
           includeText: record instanceof AltiumSchPinRecord ? false : context.options.includeText
         },
         record
@@ -3743,7 +3771,13 @@ function getComponentIdentity({
   ownedRecords
 }, context) {
   const designator = findOwnedDesignator(ownedRecords) ?? componentRecord.designator ?? `U${componentIndex}`;
-  const displayText = findOwnedParameterText(ownedRecords, "Value")?.trim() || findOwnedParameterText(ownedRecords, "Comment")?.trim() || componentRecord.comment?.trim() || componentRecord.designItemId?.trim() || componentRecord.libraryReference?.trim() || "";
+  const displayTextReference = findOwnedParameterText(ownedRecords, "Value")?.trim() || findOwnedParameterText(ownedRecords, "Comment")?.trim() || componentRecord.comment?.trim() || componentRecord.designItemId?.trim() || componentRecord.libraryReference?.trim() || "";
+  const displayText = resolveSchematicText({
+    document: context.document,
+    options: context.options,
+    record: componentRecord,
+    reference: displayTextReference
+  }).trim();
   const libraryReference = componentRecord.libraryReference ?? componentRecord.designItemId ?? designator;
   const manufacturerPartNumber = findOwnedParameterText(
     ownedRecords,
@@ -4193,8 +4227,7 @@ function convertSemanticSchematic(document, options) {
 // lib/schematic/document/convertSchematicSemantics.ts
 function convertSchematicSemantics(context) {
   const conversion = convertSemanticSchematic(context.document, {
-    includeHidden: context.options.includeHidden,
-    includeText: context.options.includeText,
+    ...context.options,
     scale: context.scale,
     schematicSheetId: SCHEMATIC_SHEET_ID
   });