circuitscript 0.1.8 → 0.1.10

package/dist/cjs/execute.js

@@ -15,7 +15,7 @@ const helpers_js_1 = require("./helpers.js");
 const draw_symbols_js_1 = require("./draw_symbols.js");
 const utils_js_1 = require("./utils.js");
 class ExecutionContext {
-    constructor(name, namespace, netNamespace, executionLevel = 0, indentLevel = 0, silent = false, logger, parent) {
+    constructor(name, namespace, netNamespace, executionLevel = 0, indentLevel = 0, silent = false, logger, warnings, parent) {
         this.tmpPointId = 0;
         this.resolveNet = null;
         this.stopFurtherExpressions = false;
@@ -23,6 +23,7 @@ class ExecutionContext {
         this.silent = false;
         this.__functionCache = {};
         this.componentAngleFollowsWire = true;
+        this.warnings = [];
         this.name = name;
         this.namespace = namespace;
         this.netNamespace = netNamespace;
@@ -34,6 +35,14 @@ class ExecutionContext {
         this.silent = silent;
         this.log('create new execution context', this.namespace, this.name, this.scope.indentLevel);
         this.parentContext = parent;
+        this.warnings = warnings;
+    }
+    logWarning(message, context, fileName) {
+        this.warnings.push({
+            message,
+            ctx: context,
+            fileName,
+        });
     }
     log(...params) {
         const indentOutput = ''.padStart(this.scope.indentLevel * 4, '    ');
@@ -120,7 +129,6 @@ class ExecutionContext {
         pins.forEach((pin) => {
             component.pins.set(pin.id, pin);
         });
-        component.arrangeProps = props.arrange ?? null;
         component.displayProp = props.display ?? null;
         component.widthProp = props.width ?? null;
         component.heightProp = props.height ?? null;
@@ -133,6 +141,33 @@ class ExecutionContext {
                 useAngle += 360;
             }
         }
+        if (props.display === null && props.arrange === null) {
+            const tmpArrangeLeft = [];
+            const tmpArrangeRight = [];
+            pins.forEach((pin, index) => {
+                const useArray = (index % 2 === 0) ? tmpArrangeLeft : tmpArrangeRight;
+                useArray.push((0, ParamDefinition_js_1.numeric)(pin.id));
+            });
+            const arrangeProp = new Map([
+                [globals_js_1.SymbolPinSide.Left, tmpArrangeLeft],
+                [globals_js_1.SymbolPinSide.Right, tmpArrangeRight]
+            ]);
+            props.arrange = arrangeProp;
+        }
+        if (props.arrange !== null) {
+            component.arrangeProps = this.removeArrangePropDuplicates(props.arrange);
+            const arrangePropPins = this.getArrangePropPins(component.arrangeProps).map(item => {
+                return item.toNumber();
+            });
+            pins.forEach(pin => {
+                if (arrangePropPins.indexOf(pin.id) === -1) {
+                    this.logWarning(`Pin ${pin.id} is not specified in arrange property`);
+                }
+            });
+        }
+        else {
+            component.arrangeProps = null;
+        }
         component.angleProp = useAngle ?? 0;
         component.followWireOrientationProp = props.followWireOrientation;
         const paramsMap = new Map();
@@ -176,6 +211,59 @@ class ExecutionContext {
         this.log('add symbol', instanceName, '[' + pinsOutput.join(', ') + ']');
         return component;
     }
+    removeArrangePropDuplicates(arrangeProp) {
+        const sides = [
+            globals_js_1.SymbolPinSide.Left,
+            globals_js_1.SymbolPinSide.Right,
+            globals_js_1.SymbolPinSide.Top,
+            globals_js_1.SymbolPinSide.Bottom
+        ];
+        const result = new Map();
+        const seenIds = [];
+        sides.forEach(side => {
+            let items = arrangeProp.get(side) ?? [];
+            if (!Array.isArray(items)) {
+                items = [items];
+            }
+            const uniqueItems = [];
+            items.forEach(item => {
+                if (item instanceof ParamDefinition_js_1.NumericValue) {
+                    if (seenIds.indexOf(item.toNumber()) === -1) {
+                        seenIds.push(item.toNumber());
+                        uniqueItems.push(item);
+                    }
+                    else {
+                        this.logWarning(`Pin ${item.toNumber()} specified more than once in arrange property`);
+                    }
+                }
+                else {
+                    uniqueItems.push(item);
+                }
+            });
+            result.set(side, uniqueItems);
+        });
+        return result;
+    }
+    getArrangePropPins(arrangeProps) {
+        const pins = [];
+        const sides = [
+            globals_js_1.SymbolPinSide.Left,
+            globals_js_1.SymbolPinSide.Right,
+            globals_js_1.SymbolPinSide.Top,
+            globals_js_1.SymbolPinSide.Bottom
+        ];
+        sides.forEach(side => {
+            const items = arrangeProps.get(side);
+            if (items) {
+                items.forEach(item => {
+                    if (item instanceof ParamDefinition_js_1.NumericValue) {
+                        pins.push(item);
+                    }
+                });
+            }
+        });
+        return pins;
+    }
     printPoint(extra = '') {
         let netString = globals_js_1.NoNetText;
         if (this.scope.currentComponent === null || this.scope.currentPin === null) {

package/dist/cjs/helpers.js

@@ -195,6 +195,7 @@ async function renderScript(scriptData, outputPath, options) {
     visitor.log('reading file');
     visitor.log('done reading file');
     const { tree, parser, parserTimeTaken, lexerTimeTaken } = await (0, parser_js_1.parseFileWithVisitor)(visitor, scriptData);
+    (0, utils_js_1.printWarnings)(visitor.getWarnings());
     showStats && console.log('Lexing took:', lexerTimeTaken);
     showStats && console.log('Parsing took:', parserTimeTaken);
     if (dumpNets) {

package/dist/cjs/layout.js

@@ -1084,52 +1084,39 @@ function generateLayoutPinDefinition(component) {
     const pins = component.pins;
     const symbolPinDefinitions = [];
     const existingPinIds = Array.from(pins.keys());
-    if (component.arrangeProps === null) {
-        for (let i = 0; i < existingPinIds.length; i++) {
-            const pinPosition = Math.floor(i / 2);
-            const pin = pins.get(existingPinIds[i]);
-            symbolPinDefinitions.push({
-                side: (i % 2 === 0) ? globals_js_1.SymbolPinSide.Left : globals_js_1.SymbolPinSide.Right,
-                pinId: existingPinIds[i],
-                text: pin.name,
-                position: pinPosition,
-                pinType: pin.pinType,
-            });
+    const arrangeProps = component.arrangeProps ?? [];
+    const addedPins = [];
+    for (const [key, items] of arrangeProps) {
+        let useItems;
+        if (!Array.isArray(items)) {
+            useItems = [items];
         }
-    }
-    else {
-        const addedPins = [];
-        for (const [key, items] of component.arrangeProps) {
-            let useItems;
-            if (!Array.isArray(items)) {
-                useItems = [items];
-            }
-            else {
-                useItems = [...items];
-            }
-            useItems.forEach(pinId => {
-                if (pinId instanceof ParamDefinition_js_1.NumericValue) {
-                    const pinIdValue = pinId.toNumber();
-                    if (existingPinIds.indexOf(pinIdValue) !== -1) {
-                        const pin = pins.get(pinIdValue);
-                        symbolPinDefinitions.push({
-                            side: key,
-                            pinId: pinIdValue,
-                            text: pin.name,
-                            position: pin.position,
-                            pinType: pin.pinType,
-                        });
-                        addedPins.push(pinIdValue);
-                    }
-                }
-            });
+        else {
+            useItems = [...items];
         }
-        const unplacedPins = existingPinIds.filter(pinId => {
-            return addedPins.indexOf(pinId) === -1;
+        useItems.forEach(pinId => {
+            if (pinId instanceof ParamDefinition_js_1.NumericValue) {
+                const pinIdValue = pinId.toNumber();
+                if (existingPinIds.indexOf(pinIdValue) !== -1) {
+                    const pin = pins.get(pinIdValue);
+                    symbolPinDefinitions.push({
+                        side: key,
+                        pinId: pinIdValue,
+                        text: pin.name,
+                        position: pin.position,
+                        pinType: pin.pinType,
+                    });
+                    addedPins.push(pinIdValue);
+                }
+            }
         });
-        if (unplacedPins.length > 0) {
-            throw "'arrange' property is defined, but not all pins are specified: " + unplacedPins.join(",");
-        }
+    }
+    const unplacedPins = existingPinIds.filter(pinId => {
+        return addedPins.indexOf(pinId) === -1;
+    });
+    if (unplacedPins.length > 0) {
+        component._unplacedPins = unplacedPins;
+        console.warn("Warning: There are unplaced pins: " + unplacedPins);
     }
     return symbolPinDefinitions;
 }
@@ -1486,7 +1473,9 @@ function CalculatePinPositions(component) {
     tmpSymbol.refreshDrawing();
     const pins = component.pins;
     pins.forEach((value, key) => {
-        pinPositionMapping.set(key, tmpSymbol.pinPosition(key));
+        if (component._unplacedPins.indexOf(key) === -1) {
+            pinPositionMapping.set(key, tmpSymbol.pinPosition(key));
+        }
     });
     return pinPositionMapping;
 }

package/dist/cjs/objects/ClassComponent.js

@@ -14,6 +14,7 @@ class ClassComponent {
         this.pinsMaxPositions = new Map();
         this._copyID = null;
         this._copyFrom = null;
+        this._unplacedPins = [];
         this.arrangeProps = null;
         this.displayProp = null;
         this.widthProp = null;

package/dist/cjs/objects/ExecutionScope.js

@@ -132,12 +132,13 @@ class ExecutionScope {
     exitContext() {
         return this.contextStack.pop();
     }
-    findPropertyKeyTree() {
+    findPropertyKeyTree(visitor) {
         const keyNames = [];
         for (let i = this.contextStack.length - 1; i >= 0; i--) {
             const ctx = this.contextStack[i];
             if (ctx instanceof CircuitScriptParser_js_1.Property_key_exprContext) {
-                keyNames.push([ctx, ctx.getText()]);
+                const result = visitor.visitResult(ctx);
+                keyNames.push([ctx, result]);
             }
             else if (typeof ctx === 'number') {
                 keyNames.push(['index', ctx]);
@@ -151,9 +152,9 @@ class ExecutionScope {
     popOnPropertyHandler() {
         return this.onPropertyHandler.pop();
     }
-    triggerPropertyHandler(value, valueCtx) {
+    triggerPropertyHandler(visitor, value, valueCtx) {
         const lastHandler = this.onPropertyHandler[this.onPropertyHandler.length - 1];
-        const propertyTree = this.findPropertyKeyTree();
+        const propertyTree = this.findPropertyKeyTree(visitor);
         lastHandler && lastHandler(propertyTree, value, valueCtx);
     }
 }

package/dist/cjs/utils.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RenderError = exports.RuntimeExecutionError = exports.ParseError = exports.ParseSyntaxError = exports.BaseError = exports.getBlockTypeString = exports.generateDebugSequenceAction = exports.sequenceActionString = exports.areasOverlap = exports.isPointWithinArea = exports.resolveToNumericValue = exports.getNumberExponentialText = exports.getNumberExponential = exports.combineMaps = exports.throwWithTokenRange = exports.throwWithToken = exports.throwWithContext = exports.roundValue = exports.getPortType = exports.getBoundsSize = exports.toNearestGrid = exports.resizeToNearestGrid = exports.printBounds = exports.resizeBounds = exports.SimpleStopwatch = void 0;
+exports.printWarnings = exports.RenderError = exports.RuntimeExecutionError = exports.ParseError = exports.ParseSyntaxError = exports.getLinePositionAsString = exports.BaseError = exports.getBlockTypeString = exports.generateDebugSequenceAction = exports.sequenceActionString = exports.areasOverlap = exports.isPointWithinArea = exports.resolveToNumericValue = exports.getNumberExponentialText = exports.getNumberExponential = exports.combineMaps = exports.throwWithTokenRange = exports.throwWithToken = exports.throwWithContext = exports.roundValue = exports.getPortType = exports.getBoundsSize = exports.toNearestGrid = exports.resizeToNearestGrid = exports.printBounds = exports.resizeBounds = exports.SimpleStopwatch = void 0;
 const big_js_1 = require("big.js");
+const antlr4ng_1 = require("antlr4ng");
 const ClassComponent_js_1 = require("./objects/ClassComponent.js");
 const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
 const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
@@ -260,32 +261,55 @@ function getBlockTypeString(type) {
 }
 exports.getBlockTypeString = getBlockTypeString;
 class BaseError extends Error {
-    constructor(message, startToken, endToken, filePath) {
+    constructor(message, startTokenOrCtx, endToken, filePath) {
         super(message);
         this.name = 'BaseError';
         this.message = message;
-        this.startToken = startToken;
-        this.endToken = endToken;
+        if (startTokenOrCtx instanceof antlr4ng_1.ParserRuleContext) {
+            this.startToken = startTokenOrCtx.start;
+            this.endToken = startTokenOrCtx.stop;
+        }
+        else {
+            this.startToken = startTokenOrCtx;
+            this.endToken = endToken;
+        }
         this.filePath = filePath;
     }
     toString() {
         const parts = [this.name];
-        if (this.startToken) {
-            const { line, column } = this.startToken;
-            if (this.endToken && (this.endToken.line !== this.startToken.line || this.endToken.column !== this.startToken.column)) {
-                const endLine = this.endToken.line;
-                const endColumn = this.endToken.column + (this.endToken.stop - this.endToken.start);
-                parts.push(` at ${line}:${column}-${endLine}:${endColumn}`);
-            }
-            else {
-                parts.push(` at ${line}:${column}`);
-            }
+        const linePosition = getLinePositionAsString({
+            start: this.startToken,
+            stop: this.endToken
+        });
+        if (linePosition !== null) {
+            parts.push(linePosition);
         }
         parts.push(`: ${this.message}`);
         return parts.join('');
     }
 }
 exports.BaseError = BaseError;
+function getLinePositionAsString(ctx) {
+    if (ctx === null || ctx === undefined) {
+        return null;
+    }
+    const startToken = ctx.start;
+    const endToken = ctx.stop;
+    let result = null;
+    if (startToken) {
+        const { line, column } = startToken;
+        if (endToken && (endToken.line !== startToken.line || endToken.column !== startToken.column)) {
+            const endLine = endToken.line;
+            const endColumn = endToken.column + (endToken.stop - endToken.start);
+            result = ` at ${line}:${column}-${endLine}:${endColumn}`;
+        }
+        else {
+            result = ` at ${line}:${column}`;
+        }
+    }
+    return result;
+}
+exports.getLinePositionAsString = getLinePositionAsString;
 class ParseSyntaxError extends BaseError {
     constructor() {
         super(...arguments);
@@ -315,3 +339,22 @@ class RenderError extends Error {
     }
 }
 exports.RenderError = RenderError;
+function printWarnings(warnings) {
+    const warningMessages = [];
+    warnings.forEach(item => {
+        const { message } = item;
+        const linePosition = getLinePositionAsString(item.ctx);
+        const parts = [message];
+        if (linePosition !== null) {
+            parts.push(linePosition);
+        }
+        const finalMessage = parts.join('');
+        if (warningMessages.indexOf(finalMessage) === -1) {
+            warningMessages.push(finalMessage);
+        }
+    });
+    warningMessages.forEach(message => {
+        console.log(`Warning: ${message}`);
+    });
+}
+exports.printWarnings = printWarnings;

package/dist/cjs/visitor.js

@@ -52,7 +52,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     });
                 }
                 catch (err) {
-                    throw new utils_js_1.RuntimeExecutionError(err.message, ctx.start, ctx.stop);
+                    throw new utils_js_1.RuntimeExecutionError(err.message, ctx);
                 }
             });
             return this.getExecutor().getCurrentPoint();
@@ -120,6 +120,24 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         };
         this.visitCreate_component_expr = (ctx) => {
             const scope = this.getScope();
+            const definedPinIds = [];
+            const arrangedPinIds = [];
+            const checkPinExistsAndNotDuplicated = (pinId, ctx) => {
+                if (definedPinIds.indexOf(pinId) === -1) {
+                    this.warnings.push({
+                        message: `Invalid pin ${pinId}`, ctx
+                    });
+                }
+                if (arrangedPinIds.indexOf(pinId) !== -1) {
+                    this.warnings.push({
+                        message: `Pin ${pinId} specified more than once`,
+                        ctx,
+                    });
+                }
+                arrangedPinIds.push(pinId);
+            };
+            let didDefineArrangeProp = false;
+            let didDefineDisplayProp = false;
             scope.setOnPropertyHandler((path, value, ctx) => {
                 if (path.length === 1) {
                     const [, keyName] = path[0];
@@ -132,9 +150,25 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                         case 'height':
                             this.validateNumeric(value, ctx);
                             break;
+                        case 'display':
+                            if (didDefineArrangeProp) {
+                                throw new utils_js_1.RuntimeExecutionError("arrange property has already been defined", ctx);
+                            }
+                            didDefineDisplayProp = true;
+                            break;
+                        case 'arrange':
+                            if (didDefineDisplayProp) {
+                                throw new utils_js_1.RuntimeExecutionError("display property already defined", ctx);
+                            }
+                            didDefineArrangeProp = true;
+                            break;
                         case 'pins':
                             if (!(value instanceof Map)) {
                                 this.validateNumeric(value, ctx);
+                                const numPins = value.toNumber();
+                                for (let i = 0; i < numPins; i++) {
+                                    definedPinIds.push(i + 1);
+                                }
                             }
                             break;
                         case 'copy':
@@ -145,7 +179,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                                 this.validateBoolean(value, ctx);
                             }
                             else {
-                                throw new utils_js_1.RuntimeExecutionError("Invalid value for 'copy' property", ctx.start, ctx.end);
+                                throw new utils_js_1.RuntimeExecutionError("Invalid value for 'copy' property", ctx);
                             }
                             break;
                     }
@@ -155,20 +189,26 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     if (keyName === 'arrange') {
                         const [sideKeyCtx, sideKeyName] = path[1];
                         if (globals_js_1.ValidPinSides.indexOf(sideKeyName) === -1) {
-                            throw new utils_js_1.RuntimeExecutionError(`Invalid side ${sideKeyName} in arrange`, sideKeyCtx.start, sideKeyCtx.stop);
+                            throw new utils_js_1.RuntimeExecutionError(`Invalid side ${sideKeyName} in arrange`, sideKeyCtx);
                         }
                         else {
-                            if (path.length > 2 && path[2][0] === 'index') {
+                            if (path.length === 2 && value instanceof ParamDefinition_js_1.NumericValue) {
+                                checkPinExistsAndNotDuplicated(value.toNumber(), ctx);
+                            }
+                            else if (path.length > 2 && path[2][0] === 'index') {
                                 if (Array.isArray(value)) {
                                     const goodBlank = value.length === 1 &&
                                         value[0] instanceof ParamDefinition_js_1.NumericValue;
                                     if (!goodBlank) {
-                                        throw new utils_js_1.RuntimeExecutionError(`Invalid blank specifier`, ctx.start, ctx.stop);
+                                        throw new utils_js_1.RuntimeExecutionError(`Invalid blank specifier`, ctx);
                                     }
                                 }
                                 else {
                                     if (!(value instanceof ParamDefinition_js_1.NumericValue)) {
-                                        throw new utils_js_1.RuntimeExecutionError(`Invalid numeric value for arrange.${sideKeyName}`, ctx.start, ctx.stop);
+                                        throw new utils_js_1.RuntimeExecutionError(`Invalid numeric value for arrange.${sideKeyName}`, ctx);
+                                    }
+                                    else {
+                                        checkPinExistsAndNotDuplicated(value.toNumber(), ctx);
                                     }
                                 }
                             }
@@ -189,10 +229,12 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     }
                     else if (keyName === 'pins') {
                         if (path.length === 2) {
+                            const idName = path[1][1];
+                            definedPinIds.push(idName);
                             if (value.length === 2) {
                                 const [pinType,] = value;
                                 if (pinType instanceof types_js_1.UndeclaredReference) {
-                                    throw new utils_js_1.RuntimeExecutionError(`Invalid pin type: ${pinType.reference.name}`, ctx.start, ctx.end);
+                                    throw new utils_js_1.RuntimeExecutionError(`Invalid pin type: ${pinType.reference.name}`, ctx);
                                 }
                             }
                         }
@@ -421,7 +463,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.getScope().enterContext(ctxValue);
             const keyName = this.visitResult(ctxKey);
             const value = this.visitResult(ctxValue);
-            scope.triggerPropertyHandler(value, ctxValue);
+            scope.triggerPropertyHandler(this, value, ctxValue);
             this.getScope().exitContext();
             this.getScope().exitContext();
             if (value instanceof types_js_1.UndeclaredReference && (value.reference.parentValue === undefined
@@ -442,7 +484,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 value = ctx.data_expr().map((item, index) => {
                     this.getScope().enterContext(index);
                     const result = this.visitResult(item);
-                    this.getScope().triggerPropertyHandler(result, item);
+                    this.getScope().triggerPropertyHandler(this, result, item);
                     this.getScope().exitContext();
                     return result;
                 });
@@ -840,7 +882,21 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         };
         this.visitPoint_expr = (ctx) => {
             const ID = ctx.ID();
-            return this.getExecutor().addPoint(ID.getText());
+            const ctxData = ctx.data_expr();
+            let pointValue;
+            if (ctxData) {
+                const resultValue = this.visitResult(ctxData);
+                if (typeof resultValue === 'string') {
+                    pointValue = resultValue;
+                }
+                else {
+                    throw new utils_js_1.RuntimeExecutionError('Invalid value for point');
+                }
+            }
+            else if (ID) {
+                pointValue = ID.getText();
+            }
+            return this.getExecutor().addPoint(pointValue);
         };
         this.visitProperty_set_expr = (ctx) => {
             const result = this.visitResult(ctx.data_expr());
@@ -1069,45 +1125,46 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
     parseCreateComponentPins(pinData) {
         const pins = [];
         if (pinData instanceof ParamDefinition_js_1.NumericValue) {
+            const tmpMap = new Map();
             const lastPin = pinData.toNumber();
             for (let i = 0; i < lastPin; i++) {
                 const pinId = i + 1;
-                pins.push(new PinDefinition_js_1.PinDefinition(pinId, PinDefinition_js_1.PinIdType.Int, pinId.toString()));
+                tmpMap.set(pinId, (0, ParamDefinition_js_1.numeric)(pinId));
             }
+            pinData = tmpMap;
         }
-        else if (pinData instanceof Map) {
-            for (const [pinId, pinDef] of pinData) {
-                let pinIdType = PinDefinition_js_1.PinIdType.Int;
-                let pinType = PinTypes_js_1.PinTypes.Any;
-                let pinName = null;
-                let altPinNames = [];
-                if (typeof pinId === 'string') {
-                    pinIdType = PinDefinition_js_1.PinIdType.Str;
-                }
-                if (Array.isArray(pinDef)) {
-                    const firstValue = pinDef[0];
-                    if (firstValue.type
-                        && firstValue.type === globals_js_1.ReferenceTypes.pinType
-                        && this.pinTypes.indexOf(firstValue.value) !== -1) {
-                        pinType = firstValue.value;
-                        pinName = pinDef[1];
-                        if (pinDef.length > 2) {
-                            altPinNames = pinDef.slice(2);
-                        }
-                    }
-                    else {
-                        pinName = pinDef[0];
-                        if (pinDef.length > 1) {
-                            altPinNames = pinDef.slice(1);
-                        }
+        pinData = pinData ?? [];
+        for (const [pinId, pinDef] of pinData) {
+            let pinIdType = PinDefinition_js_1.PinIdType.Int;
+            let pinType = PinTypes_js_1.PinTypes.Any;
+            let pinName = null;
+            let altPinNames = [];
+            if (typeof pinId === 'string') {
+                pinIdType = PinDefinition_js_1.PinIdType.Str;
+            }
+            if (Array.isArray(pinDef)) {
+                const firstValue = pinDef[0];
+                if (firstValue.type
+                    && firstValue.type === globals_js_1.ReferenceTypes.pinType
+                    && this.pinTypes.indexOf(firstValue.value) !== -1) {
+                    pinType = firstValue.value;
+                    pinName = pinDef[1];
+                    if (pinDef.length > 2) {
+                        altPinNames = pinDef.slice(2);
                     }
                 }
                 else {
-                    pinName = pinDef;
+                    pinName = pinDef[0];
+                    if (pinDef.length > 1) {
+                        altPinNames = pinDef.slice(1);
+                    }
                 }
-                this.log('pins', pinId, pinIdType, pinName, pinType, altPinNames);
-                pins.push(new PinDefinition_js_1.PinDefinition(pinId, pinIdType, pinName, pinType, altPinNames));
             }
+            else {
+                pinName = pinDef;
+            }
+            this.log('pins', pinId, pinIdType, pinName, pinType, altPinNames);
+            pins.push(new PinDefinition_js_1.PinDefinition(pinId, pinIdType, pinName, pinType, altPinNames));
         }
         return pins;
     }
@@ -1316,6 +1373,9 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         });
         return properties;
     }
+    getWarnings() {
+        return this.warnings;
+    }
 }
 exports.ParserVisitor = ParserVisitor;
 const ComponentRefDesPrefixes = {