circuitscript 0.0.37 → 0.1.0

package/dist/esm/visitor.mjs

@@ -3,7 +3,7 @@ import { NumericValue, ParamDefinition } from './objects/ParamDefinition.mjs';
 import { PinDefinition, PinIdType } from './objects/PinDefinition.mjs';
 import { PinTypes } from './objects/PinTypes.mjs';
 import { DeclaredReference, UndeclaredReference } from './objects/types.mjs';
-import { BlockTypes, ComponentTypes, FrameType, GlobalDocumentName, NoNetText, ReferenceTypes, WireAutoDirection } from './globals.mjs';
+import { BlockTypes, ComponentTypes, FrameType, GlobalDocumentName, ModuleContainsKeyword, NoNetText, ReferenceTypes, WireAutoDirection } from './globals.mjs';
 import { PlaceHolderCommands, SymbolDrawingCommands } from './draw_symbols.mjs';
 import { BaseVisitor } from './BaseVisitor.mjs';
 import { getPortType } from './utils.mjs';
@@ -152,10 +152,32 @@ export class ParserVisitor extends BaseVisitor {
         this.setResult(ctx, createdComponent);
     };
     visitCreate_graphic_expr = (ctx) => {
-        const graphicsExpressionsCtx = ctx.graphic_expressions_block();
-        this.visit(graphicsExpressionsCtx);
-        const commands = this.getResult(graphicsExpressionsCtx);
-        const drawing = new SymbolDrawingCommands(commands);
+        const ctxId = ctx.ID();
+        const paramIds = [];
+        if (ctxId !== null) {
+            const varName = ctxId.getText();
+            paramIds.push(varName);
+            this.getExecutor().scope.variables.set(varName, {});
+        }
+        const executor = this.getExecutor();
+        const stack = [...this.executionStack];
+        const drawing = new SymbolDrawingCommands(variables => {
+            if (variables && paramIds.length > 0) {
+                const obj = {};
+                variables.forEach((value, key) => {
+                    obj[key] = value;
+                });
+                executor.scope.variables.set(paramIds[0], obj);
+            }
+            const currentStack = this.executionStack.splice(0);
+            this.executionStack.push(...stack);
+            const graphicsExpressionsCtx = ctx.graphic_expressions_block();
+            this.visit(graphicsExpressionsCtx);
+            const commands = this.getResult(graphicsExpressionsCtx);
+            this.executionStack.splice(0);
+            this.executionStack.push(...currentStack);
+            return commands;
+        });
         drawing.source = ctx.getText();
         this.setResult(ctx, drawing);
     };
@@ -177,7 +199,7 @@ export class ParserVisitor extends BaseVisitor {
                     }
                     return accum;
                 }, []);
-                accum.push([commandName, positionParams, keywordParams]);
+                accum.push([commandName, positionParams, keywordParams, item]);
             }
             return accum;
         }, []);
@@ -297,7 +319,7 @@ export class ParserVisitor extends BaseVisitor {
             const [firstBlock] = ctxPropertyBlock;
             this.visit(firstBlock);
             const [keyName, expressionsBlock] = this.getResult(firstBlock);
-            if (keyName === 'contains') {
+            if (keyName === ModuleContainsKeyword) {
                 createdComponent.moduleContainsExpressions = expressionsBlock;
                 this.expandModuleContains(createdComponent, this.getExecutor().netNamespace);
             }
@@ -318,7 +340,8 @@ export class ParserVisitor extends BaseVisitor {
         this.visit(ctxPropertyValueExpr);
         const keyName = this.getResult(ctxPropertyKeyExpr);
         const value = this.getResult(ctxPropertyValueExpr);
-        if (value instanceof UndeclaredReference) {
+        if (value instanceof UndeclaredReference && (value.reference.parentValue === undefined
+            && value.reference.value === undefined)) {
             throw value.throwMessage();
         }
         const map = new Map();
@@ -374,30 +397,34 @@ export class ParserVisitor extends BaseVisitor {
     };
     visitData_expr_with_assignment = (ctx) => {
         let component = null;
+        let componentCtx = null;
         const ctxDataExpr = ctx.data_expr();
         const ctxAssignmentExpr = ctx.assignment_expr();
         if (ctxDataExpr) {
             this.visit(ctxDataExpr);
             component = this.getResult(ctxDataExpr);
+            componentCtx = ctxDataExpr;
             if (component === null || component === undefined) {
-                throw "Could not find component: " + ctxDataExpr.getText();
+                this.throwWithContext(ctxDataExpr, "Could not find component: " + ctxDataExpr.getText());
             }
         }
         else if (ctxAssignmentExpr) {
             this.visit(ctxAssignmentExpr);
             component = this.getResult(ctxAssignmentExpr);
+            componentCtx = ctxAssignmentExpr;
         }
         if (component instanceof ClassComponent
             && component.copyProp) {
             component = this.getExecutor().copyComponent(component);
         }
-        if (component instanceof DeclaredReference
-            && component.found
-            && component.trailers
-            && component.trailers.length > 0
-            && component.trailers[0] === 'contains') {
-            component = component.value;
-            this.placeModuleContains(component);
+        if (component instanceof UndeclaredReference) {
+            const { reference: { trailers = [], parentValue = null } } = component;
+            if (parentValue instanceof ClassComponent
+                && trailers.length > 0
+                && trailers[0] === ModuleContainsKeyword) {
+                component = parentValue;
+                this.placeModuleContains(component);
+            }
         }
         if (component && component instanceof ClassComponent) {
             const modifiers = ctx.component_modifier_expr();
@@ -431,19 +458,7 @@ export class ParserVisitor extends BaseVisitor {
                     shouldIgnoreWireOrientation = true;
                 }
                 else if (modifierText === 'anchor') {
-                    if (component.displayProp
-                        && component.displayProp instanceof SymbolDrawingCommands) {
-                        const commands = (component.displayProp)
-                            .getCommands();
-                        commands.forEach(command => {
-                            const positionParams = command[1];
-                            const keywordParams = command[2];
-                            if (command[0] === PlaceHolderCommands.label
-                                && positionParams[0] === 'value') {
-                                keywordParams.set('anchor', result);
-                            }
-                        });
-                    }
+                    component.setParam('anchor', result);
                 }
                 if (shouldIgnoreWireOrientation) {
                     component.useWireOrientationAngle = false;
@@ -462,7 +477,7 @@ export class ParserVisitor extends BaseVisitor {
             }
             else {
                 const undeclaredRef = component;
-                throw 'Invalid component: ' + undeclaredRef.reference.name;
+                this.throwWithContext(componentCtx, 'Invalid component: ' + undeclaredRef.reference.name);
             }
         }
         this.setResult(ctx, [component, pinValue]);
@@ -525,6 +540,9 @@ export class ParserVisitor extends BaseVisitor {
                 if (typeof value === "boolean") {
                     value = !value;
                 }
+                else if (typeof value === "number") {
+                    value = (value === 0) ? false : true;
+                }
                 else {
                     throw "Failed to do Not operator";
                 }
@@ -822,7 +840,11 @@ export class ParserVisitor extends BaseVisitor {
         const ctxDataExpr = ctx.data_expr();
         this.visit(ctxDataExpr);
         const result = this.getResult(ctxDataExpr);
-        if (result) {
+        let resultValue = result;
+        if (result instanceof UndeclaredReference) {
+            resultValue = false;
+        }
+        if (resultValue) {
             this.visit(ctx.expressions_block());
         }
         else {
@@ -928,10 +950,22 @@ export class ParserVisitor extends BaseVisitor {
         this.visit(data_expr);
         const value = this.getResult(data_expr);
         if (value instanceof UndeclaredReference) {
-            throw value.throwMessage();
+            this.throwWithContext(data_expr, value.throwMessage());
+        }
+        else if (value instanceof DeclaredReference) {
+            return this.resolveDataValue(value);
         }
         return value;
     }
+    resolveDataValue(reference) {
+        const { value } = reference;
+        if (value instanceof NumericValue) {
+            return value.toDisplayString();
+        }
+        else {
+            return value;
+        }
+    }
     pinTypes = [
         PinTypes.Any,
         PinTypes.IO,
@@ -1131,10 +1165,14 @@ export class ParserVisitor extends BaseVisitor {
         let frameComponent = null;
         if (document && document[FrameParamKeys.SheetType]) {
             frameComponent = document[FrameParamKeys.SheetType];
-            baseScope.frames.forEach(item => {
-                if (item.frameType === FrameType.Sheet) {
-                    item.parameters.set(FrameParamKeys.SheetType, frameComponent);
-                }
+            const sheets = baseScope.frames.filter(item => {
+                return item.frameType === FrameType.Sheet;
+            });
+            const totalSheets = sheets.length;
+            sheets.forEach((item, index) => {
+                item.parameters.set(FrameParamKeys.SheetType, frameComponent);
+                item.parameters.set(FrameParamKeys.SheetNumber, index + 1);
+                item.parameters.set(FrameParamKeys.SheetTotal, totalSheets);
             });
         }
         return {

package/dist/types/BaseVisitor.d.ts

@@ -54,7 +54,7 @@ export declare class BaseVisitor extends CircuitScriptVisitor<ComplexType | Refe
     visitArrayExpr: (ctx: ArrayExprContext) => void;
     protected setResult(ctx: ParserRuleContext, value: any): void;
     protected getResult(ctx: ParserRuleContext): any;
-    protected handleImportFile(name: string, throwErrors?: boolean): {
+    protected handleImportFile(name: string, throwErrors?: boolean, ctx?: ParserRuleContext | null): {
         hasError: boolean;
         hasParseError: boolean;
         pathExists: boolean;
@@ -67,5 +67,6 @@ export declare class BaseVisitor extends CircuitScriptVisitor<ComplexType | Refe
     protected getInstanceParam<T>(object: ClassComponent, trailers: string[]): T;
     protected enterNewChildContext(executionStack: ExecutionContext[], parentContext: ExecutionContext, executionContextName: string, options: CFunctionOptions, funcDefinedParameters: FunctionDefinedParameter[], passedInParameters: CallableParameter[]): ExecutionContext;
     protected prepareStringValue(value: string): string;
+    protected throwWithContext(context: ParserRuleContext, message: string): void;
 }
 export type OnErrorCallback = (line: number, column: number, message: string, e: any | undefined) => void;

package/dist/types/antlr/CircuitScriptParser.d.ts

@@ -708,6 +708,9 @@ export declare class Create_graphic_exprContext extends antlr.ParserRuleContext
     Create(): antlr.TerminalNode;
     Graphic(): antlr.TerminalNode;
     graphic_expressions_block(): Graphic_expressions_blockContext;
+    OPEN_PAREN(): antlr.TerminalNode | null;
+    ID(): antlr.TerminalNode | null;
+    CLOSE_PAREN(): antlr.TerminalNode | null;
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }

package/dist/types/draw_symbols.d.ts

@@ -2,6 +2,7 @@ import { G } from "@svgdotjs/svg.js";
 import { Feature, GeometryProp, HorizontalAlign, LabelStyle, Textbox, VerticalAlign } from "./geometry.js";
 import { Logger } from "./logger.js";
 import { PinTypes } from "./objects/PinTypes.js";
+import { ParserRuleContext } from "antlr4ng";
 export declare abstract class SymbolGraphic {
     drawPortsName: boolean;
     displayBounds: boolean;
@@ -12,6 +13,7 @@ export declare abstract class SymbolGraphic {
     width: number;
     height: number;
     labelTexts: Map<string, string>;
+    constructor();
     get angle(): number;
     set angle(value: number);
     get flipX(): number;
@@ -40,8 +42,6 @@ export declare abstract class SymbolGraphic {
     protected drawLabels(group: G): void;
     flipTextAnchor(value: HorizontalAlign): HorizontalAlign;
     flipDominantBaseline(value: VerticalAlign): VerticalAlign;
-    setLabelValue(labelId: string, labelValue: string): void;
-    getLabelValue(labelId: string): string;
 }
 export declare function SymbolFactory(name: string): SymbolGraphic;
 export declare class SymbolPointHidden extends SymbolGraphic {
@@ -56,6 +56,7 @@ export declare class SymbolText extends SymbolGraphic {
 }
 export declare class SymbolPlaceholder extends SymbolGraphic {
     generateDrawing(): void;
+    private resolveReference;
     parseLabelStyle(keywordParams: Map<string, any>): {
         [key: string]: any;
     };
@@ -113,6 +114,7 @@ export declare class SymbolDrawing {
     flipY: number;
     mainOrigin: [number, number];
     logger: Logger;
+    variables: Map<string, any>;
     clear(): void;
     log(...params: any[]): void;
     addLine(startX: number, startY: number, endX: number, endY: number): SymbolDrawing;
@@ -125,7 +127,7 @@ export declare class SymbolDrawing {
     addTriangle(startX: number, startY: number, endX: number, endY: number, width: number): SymbolDrawing;
     addRect2(x: number, y: number, x2: number, y2: number): SymbolDrawing;
     addLabel(x: number, y: number, textValue: string, style: LabelStyle): SymbolDrawing;
-    addLabelId(id: string, x: number, y: number, textValue: string, style: LabelStyle): SymbolDrawing;
+    addLabelMils(x: number, y: number, textValue: string, style: LabelStyle): SymbolDrawing;
     addTextbox(x: number, y: number, textValue: string, style: LabelStyle): SymbolDrawing;
     addModulePort(x: number, y: number, width: number, height: number, portType?: PinTypes, scaleX?: number): SymbolDrawing;
     addPath(...pathParts: any): SymbolDrawing;
@@ -162,12 +164,16 @@ export declare class SymbolDrawing {
 export type GraphicExprCommand = [
     commandName: string,
     positionParams: any[],
-    keywordParams: Map<string, any>
+    keywordParams: Map<string, any>,
+    ctx: ParserRuleContext
 ];
 export declare class SymbolDrawingCommands extends SymbolDrawing {
     id: string;
     private commands;
-    constructor(commands: GraphicExprCommand[]);
+    paramIds: string[];
+    callback: (variables: Map<string, any>) => GraphicExprCommand[];
+    constructor(callback: (variables: Map<string, any>) => GraphicExprCommand[]);
+    runCommands(): void;
     getCommands(): GraphicExprCommand[];
     clone(): SymbolDrawingCommands;
 }

package/dist/types/execute.d.ts

@@ -65,7 +65,7 @@ export declare class ExecutionContext {
     createFunction(functionName: string, __runFunc: CFunction): void;
     hasFunction(functionName: string): boolean;
     getFunction(functionName: string): CFunction;
-    resolveVariable(executionStack: ExecutionContext[], idName: string): DeclaredReference;
+    resolveVariable(executionStack: ExecutionContext[], idName: string, trailers?: string[]): DeclaredReference;
     callFunction(functionName: string, functionParams: CallableParameter[], executionStack: ExecutionContext[], netNamespace: string): CFunctionResult;
     mergeScope(childScope: ExecutionScope, namespace: string): void;
     addWire(segments: [string, (number | UnitDimension)?][]): void;

package/dist/types/globals.d.ts

@@ -87,6 +87,7 @@ export declare enum FrameType {
     Frame = 1,
     Sheet = 2
 }
+export declare const ModuleContainsKeyword = "contains";
 export declare const GlobalDocumentName = "document";
 export declare const RenderFlags: {
     ShowElementFrames: boolean;

package/dist/types/layout.d.ts

@@ -60,6 +60,7 @@ type EdgeValue = [
     priority: number
 ];
 type RenderItem = RenderComponent | RenderWire | RenderText;
+export declare function applyComponentParamsToSymbol(component: ClassComponent, symbol: SymbolGraphic): void;
 export declare function getBounds(components: (RenderComponent | RenderText)[], wires: RenderWire[], junctions: RenderJunction[], frames: RenderFrame[]): BoundBox;
 export declare class RenderObject {
     x: number;

package/dist/types/objects/Frame.d.ts

@@ -13,7 +13,9 @@ export declare enum FrameParamKeys {
     Width = "width",
     Height = "height",
     PaperSize = "paper_size",
-    SheetType = "sheet_type"
+    SheetType = "sheet_type",
+    SheetNumber = "sheet_number",
+    SheetTotal = "sheet_total"
 }
 export declare enum FramePlotDirection {
     Row = "row",

package/dist/types/objects/types.d.ts

@@ -40,22 +40,27 @@ export declare class UndeclaredReference {
     reference: ReferenceType;
     constructor(reference: ReferenceType);
     throwMessage(): string;
+    toString(): string;
+    nameString(): string;
 }
 export declare class DeclaredReference {
     found: boolean;
     name?: string;
     trailers?: string[];
-    type?: string;
+    type?: 'value' | 'instance' | 'variable';
     value?: any;
+    parentValue?: any;
     constructor(refType: ReferenceType);
     toString(): string;
+    toDisplayString(): string;
 }
 export type ReferenceType = {
     found: boolean;
     name?: string;
     trailers?: string[];
-    type?: string;
+    type?: 'value' | 'instance' | 'variable';
     value?: any;
+    parentValue?: any;
 };
 export declare enum ParseSymbolType {
     Variable = "variable",

package/dist/types/utils.d.ts

@@ -1,3 +1,4 @@
+import { ParserRuleContext } from "antlr4ng";
 import { ClassComponent } from "./objects/ClassComponent";
 export declare class SimpleStopwatch {
     startTime: Date;
@@ -20,3 +21,5 @@ export declare function getBoundsSize(bounds: BoundBox): {
 };
 export declare function getPortType(component: ClassComponent): string | null;
 export declare function roundValue(value: number): number;
+export declare function throwWithContext(context: ParserRuleContext, message: string): void;
+export declare function combineMaps(map1: Map<string, any>, map2: Map<string, any>): Map<string, any>;

package/dist/types/visitor.d.ts

@@ -55,6 +55,7 @@ export declare class ParserVisitor extends BaseVisitor {
     visitWhile_expr: (ctx: While_exprContext) => void;
     visitFor_expr: (ctx: For_exprContext) => void;
     private resolveDataExpr;
+    private resolveDataValue;
     pinTypes: PinTypes[];
     private parseCreateComponentPins;
     private parseCreateModulePorts;

package/libs/lib.cst

@@ -5,10 +5,10 @@ def net(net_name):
         pins: 1
         copy: true
         angle: -90
-        display: create graphic:
+        display: create graphic (params):
             hline: -50, 0, 100
             vpin: 1, 0, 50, -50, display_pin_id=false
-            label: "net_name", 0, -15, net_name, fontSize=50, anchor="middle"
+            label: params.net_name, 0, -15, fontSize=50, anchor="middle"
         type: "net"
         params:
             net_name: net_name
@@ -19,10 +19,10 @@ def supply(net_name):
         pins: 1
         copy: true
         angle: -90
-        display: create graphic:
+        display: create graphic (params):
             hline: -50, 0, 100
             vpin: 1, 0, 50, -50, display_pin_id=false
-            label: "net_name", 0, -15, net_name, fontSize=50, anchor="middle"
+            label: params.net_name, 0, -15, fontSize=50, anchor="middle"
         type: "net"
         params:
             net_name: net_name
@@ -33,9 +33,9 @@ def label(value, anchor="left"):
         pins: 1
         copy: true
         followWireOrientation: false
-        display: create graphic:
+        display: create graphic (params):
             textColor: "#222"
-            label: "value", 0, -10, "?", fontSize=50, anchor=anchor
+            label: params.value, 0, -10, fontSize=50, anchor=anchor
             pin: 1, 0, 0, 0, 0, display_pin_id=false
         type: "label"
         params:
@@ -47,9 +47,9 @@ def port(value, portType="input"):
     return create component:
         pins: 1
         copy: true
-        display: create graphic:
+        display: create graphic (params):
             textColor: "#222"
-            label: "value", 0, 0, "?", fontSize=40, anchor="left", vanchor="middle", portType=portType
+            label: params.value, 0, 0, fontSize=40, anchor="left", vanchor="middle", portType=portType
             pin: 1, 0, 0, 0, 0, display_pin_id=false
         type: "port"
         params:
@@ -63,12 +63,12 @@ def res(value):
  
     return create component:
         pins: 2
-        display: create graphic:
+        display: create graphic (params):
             rect: 0, 0, width, height
             hpin: 1, -width/2 - 30, 0, 30
             hpin: 2, width/2 + 30, 0, -30
-            label: "refdes", -width/2, -height/2 - 20 , "?", fontSize=50, anchor="left"
-            label: "value", 0, 4, value, fontSize=30, anchor="middle", vanchor="middle"
+            label: params.refdes, -width/2, -height/2 - 20, fontSize=50, anchor="left"
+            label: params.value, 0, 4, fontSize=30, anchor="middle", vanchor="middle"
         type: "res"
         params:
             value: value
@@ -82,14 +82,14 @@ def cap(value):
     return create component:
         pins: 2
         angle: 90
-        display: create graphic:
+        display: create graphic (params):
             lineWidth: 13
             hline: -width/2, 20, width
             hline: -width/2, -20, width
             vpin: 1, 0, -100, 80
             vpin: 2, 0, 100, -80
-            label: "refdes", 80, -30, "?", fontSize=50, anchor="left", vanchor="middle"
-            label: "value", 80, 30, value, fontSize=50, anchor = "left", vanchor="middle"
+            label: params.refdes, 80, -30, fontSize=50, anchor="left", vanchor="middle"
+            label: params.value, 80, 30, fontSize=50, anchor = "left", vanchor="middle"
         type: "cap"
         params:
             value: value
@@ -103,15 +103,15 @@ def ind(value):
     return create component:
         pins: 2
         type: "ind"
-        display: create graphic:
+        display: create graphic (params):
             arc: -15, 0, 5, 180, 360
             arc: -5, 0, 5, 180, 360
             arc: 5, 0, 5, 180, 360
             arc: 15, 0, 5, 180, 360
             hpin: 1, -width/2 - 20, 0, 20
             hpin: 2, width/2 + 20, 0, -20
-            label: ("refdes", -width/2, -height/2 -5 , "?", fontSize=50, anchor="left")
-            label: ("value", 0, 10, value, fontSize=50, anchor="middle", vanchor="middle")
+            label: (params.refdes, -width/2, -height/2 -5 , fontSize=50, anchor="left")
+            label: (params.value, 0, 10, fontSize=50, anchor="middle", vanchor="middle")
         params:
             value: value
 
@@ -124,12 +124,12 @@ def diode():
     return create component:
         pins: 2
         type: "diode"
-        display: create graphic:
+        display: create graphic (params):
             triangle: -width/2, 0, width/2, 0, height
             vline: width/2, -height/2, height
             hpin: 1, -width/2-100, 0, 100    # anode
             hpin: 2, width/2 + 100, 0, -100  # cathode
-            label: "refdes", 0, -100, "?", fontSize=50, anchor="middle", vanchor="top"
+            label: params.refdes, 0, -100, fontSize=50, anchor="middle", vanchor="top"
 
 def led(color):
     width = 100
@@ -140,7 +140,7 @@ def led(color):
             1: "cathode"
             2: "anode"
         type: "diode"
-        display: create graphic:
+        display: create graphic (params):
             triangle: -width/2, 0, width/2, 0, height
             vline: width/2, -height/2, height
             path: ("M", 70, 30, "L", 130, 90,
@@ -149,10 +149,11 @@ def led(color):
                     "M", 180, 60, "L", 180, 90, "L", 150, 90)
             hpin: 1, -width/2-100, 0, 100    # anode
             hpin: 2, width/2 + 100, 0, -100  # cathode
-            label: "refdes", 0, -100, "?", fontSize=50, anchor="middle", vanchor="top"
-            label: "color", 0, 100, color, fontSize=40, anchor="middle", vanchor="bottom"
+            label: params.refdes, 0, -100, fontSize=50, anchor="middle", vanchor="top"
+            label: params.color, 0, 100, fontSize=40, anchor="middle", vanchor="bottom"
         params:
             size: "0603"
+            color: color
             footprint: "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder"
 
 
@@ -162,12 +163,12 @@ def cgnd():
         pins: 1
         copy: true
         angle: 90
-        display: create graphic:
+        display: create graphic (params):
             hline: -15, 0, 30
             hline: -10, 5, 20
             hline: -5, 10, 10
             vpin: 1, 0, -10, 10, display_pin_id=false
-            label: "net_name", 0, 22, net_name, fontSize=50, anchor="middle"
+            label: params.net_name, 0, 22, fontSize=50, anchor="middle"
         type: "net"
         params:
             net_name: net_name
@@ -181,10 +182,10 @@ def dgnd(net_name="GND"):
         pins: 1
         copy: true
         angle: 90
-        display: create graphic:
+        display: create graphic (params):
             triangle: 0, 0, 0, height, width
             vpin: 1, 0, -50, 50, display_pin_id=false
-            label: "net_name", 0, height + 50, net_name, fontSize=50, anchor="middle", vanchor="middle"
+            label: params.net_name, 0, height + 50, fontSize=50, anchor="middle", vanchor="middle"
         type: "net"
         params:
             net_name: net_name
@@ -230,6 +231,9 @@ def sheet_generator(paper_size_name, paper_width, paper_height, margin_x, margin
     vertical_1 = margin_y - inner_frame_margin
     vertical_2 = paper_height - margin_y + inner_frame_margin
 
+    inner_width = paper_width - 2 * margin_x
+    inner_height = paper_height - 2 * margin_y
+
     tmp_height = paper_height - margin_y * 2 + inner_frame_margin * 2
     tmp_y = margin_y - inner_frame_margin
 
@@ -244,9 +248,19 @@ def sheet_generator(paper_size_name, paper_width, paper_height, margin_x, margin
     ratio_x = 1 / num_columns
     ratio_y = 1 / num_rows
 
+    title_block_width = 2000
+    title_block_height = 350
+
+    # center of title_block
+    title_block_x = margin_x + inner_width - title_block_width
+    title_block_y = margin_y + inner_height - title_block_height
+
+    title_block_x2 = title_block_x + title_block_width
+    title_block_y2 = title_block_y + title_block_height
+
     return create component:
         type: "frame"
-        display: create graphic:
+        display: create graphic (params):
             fill: "none"
 
             # outer rect 
@@ -255,7 +269,7 @@ def sheet_generator(paper_size_name, paper_width, paper_height, margin_x, margin
 
             # inner rect
             lineColor: "#111111"
-            rect: paper_width/2, paper_height/2, paper_width - 2 * margin_x, paper_height - 2 * margin_y
+            rect: paper_width/2, paper_height/2, inner_width, inner_height
 
             rect: (paper_width/2, paper_height/2, 
                     paper_width - 2 * margin_x + inner_frame_margin * 2, 
@@ -300,7 +314,46 @@ def sheet_generator(paper_size_name, paper_width, paper_height, margin_x, margin
                     anchor: "middle"
                     vanchor: "middle"
 
+            # Draw title frame
+            text: 
+                content: "Size: " + paper_size_name
+                offset: title_block_x + 20, title_block_y2 - 30
+                anchor: "left"
+                vanchor: "bottom"
+
+            text:
+                content: "Sheet: " + params.sheet_number + "/" + params.sheet_total
+                anchor: "left"
+                vanchor: "bottom"
+                offset: title_block_x + title_block_width / 2 + 20, title_block_y2 - 30
+
+            hline: title_block_x, title_block_y2 - 100, title_block_width
+            vline: title_block_x + title_block_width / 2, title_block_y2, -100
+
+            text:
+                content: "Rev: " + params.revision
+                anchor: "left"
+                vanchor: "bottom"
+                offset: title_block_x + 20 , title_block_y2 - 130
+
+            hline: title_block_x, title_block_y2 - 200, title_block_width
+
+            text: 
+                content: params.title
+                offset: title_block_x + 20, title_block_y2 - 240
+                bold: true
+                fontSize: 60
+                anchor: "left"
+                vanchor: "bottom"
+
+            rect: title_block_x + title_block_width / 2, title_block_y + title_block_height / 2, title_block_width, title_block_height
+
         params:
+            title: "Sheet title"
+            revision: "V1"
+            sheet_number: 1
+            sheet_total: 1
+
             paper_size: paper_size_name
             paper_width: paper_width
             paper_height: paper_height
@@ -350,9 +403,14 @@ def sheet_A5():
 
     return sheet_generator("A5", paper_width, paper_height, margin, margin, range(1, 5), ["A", "B", "C"])
 
-def sheet_A6():
+def sheet_A6(revision="V1"):
     paper_width = toMils(148)
     paper_height = toMils(105)
     margin = 400
 
-    return sheet_generator("A6", paper_width, paper_height, margin, margin, range(1, 4), ["A", "B"])
+    tmp_sheet = sheet_generator("A6", paper_width, paper_height, margin, margin, range(1, 4), ["A", "B"])
+    tmp_sheet.revision = revision
+
+    return tmp_sheet
+
+document.sheet_type = sheet_A4()