@tsplc/compiler 0.2.1 → 0.2.3

package/package.json

@@ -17,7 +17,7 @@
     "url": "git+https://github.com/livingforjesus/tsplc.git",
     "directory": "packages/compiler"
   },
-  "version": "0.2.1",
+  "version": "0.2.3",
   "type": "module",
   "exports": {
     ".": {
@@ -90,14 +90,14 @@
     "bun": ">=1.4.3"
   },
   "dependencies": {
-    "@tsplc/agent": "0.2.1",
-    "@tsplc/build": "0.2.1",
-    "@tsplc/config": "0.2.1",
-    "@tsplc/typegen": "0.2.1",
+    "@tsplc/agent": "0.2.3",
+    "@tsplc/build": "0.2.3",
+    "@tsplc/config": "0.2.3",
+    "@tsplc/typegen": "0.2.3",
     "typescript": "6.0.3",
     "zod": "4.3.6",
     "@types/bun": "1.4.2",
-    "@tsplc/server": "0.2.1"
+    "@tsplc/server": "0.2.3"
   },
   "bin": {
     "tsplc": "./dist/cli.js"

package/src/frontend/elaborate/specialize.ts

@@ -27,6 +27,8 @@ export type Value =
       declared?: ts.Type;
       place?: boolean;
       iec?: string;
+      /** For an array place, the IEC width its declaration gives its elements, as `Array<BYTE>` does. */
+      elementIec?: string;
       /** A module global another module stores into through its setter; an import is read-only. */
       setter?: string;
     };
@@ -1309,24 +1311,20 @@ export class Specializer {
     return this.capturedConstant(value, holder.type?.symbol?.valueDeclaration ?? this.sources[0]!);
   }
 
+  /** A captured field's declaration: a class member or a record's property. */
+  private fieldDeclaration(holder: ModelNode, name: string): ts.Node | undefined {
+    return holder.captured.kind === "instance"
+      ? this.model.member(this.model.classOf(holder), name)
+      : this.fieldSymbol(holder, name)?.valueDeclaration;
+  }
+
   /** The IEC width a captured field's declaration names. */
   private fieldIec(holder: ModelNode, name: string): string | undefined {
-    if (holder.captured.kind === "instance")
-      return this.layouts.iecName(this.model.member(this.model.classOf(holder), name));
-    return this.layouts.iecName(this.fieldSymbol(holder, name)?.valueDeclaration);
+    return this.layouts.iecName(this.fieldDeclaration(holder, name));
   }
 
-  /** The IEC width of an array's elements, from the declaration holding the array. */
-  private elementIec(array: ModelNode): string | undefined {
-    const owner = array.owner;
-    const last = owner?.steps.at(-1);
-    if (!owner || last?.kind !== "field") return undefined;
-    const holder = this.at(owner.root, owner.steps.slice(0, -1));
-    const declaration =
-      holder &&
-      (holder.captured.kind === "instance"
-        ? this.model.member(this.model.classOf(holder), last.name)
-        : this.fieldSymbol(holder, last.name)?.valueDeclaration);
+  /** The IEC width an array declaration gives its elements, as `data: Array<BYTE>` does. */
+  private elementIec(declaration: ts.Node | undefined): string | undefined {
     const node = declaration && (declaration as { type?: ts.TypeNode }).type;
     const element =
       node && ts.isArrayTypeNode(node)
@@ -1337,6 +1335,15 @@ export class Specializer {
     return element ? this.layouts.iecName({ type: element } as unknown as ts.Node) : undefined;
   }
 
+  /** The IEC width of an array's elements, from the declaration holding the array. */
+  private arrayElementIec(array: ModelNode): string | undefined {
+    const owner = array.owner;
+    const last = owner?.steps.at(-1);
+    if (!owner || last?.kind !== "field") return undefined;
+    const holder = this.at(owner.root, owner.steps.slice(0, -1));
+    return holder && this.elementIec(this.fieldDeclaration(holder, last.name));
+  }
+
   private storedField(holder: ModelNode, step: Step): Value {
     const declared =
       step.kind === "index"
@@ -1356,7 +1363,12 @@ export class Specializer {
       text: `${this.pathText(holder)}${step.kind === "index" ? `[${step.index}]` : `.${step.name}`}`,
       declared,
       place: true,
-      iec: step.kind === "field" ? this.fieldIec(holder, step.name) : this.elementIec(holder),
+      ...(step.kind === "field"
+        ? {
+            iec: this.fieldIec(holder, step.name),
+            elementIec: this.elementIec(this.fieldDeclaration(holder, step.name)),
+          }
+        : { iec: this.arrayElementIec(holder) }),
       ...(global && { setter: `${this.pathText(holder)}.${setterName(step.name)}` }),
     };
   }
@@ -1509,6 +1521,7 @@ export class Specializer {
         text: `${object.text}[${this.code(index, undefined, frame)}]`,
         declared,
         place: object.place,
+        iec: object.elementIec,
       };
     }
     if (object.kind === "virtual" && object.items) {