circuitscript 0.1.5 → 0.1.7

package/dist/esm/{visitor.mjs → visitor.js}

@@ -1,14 +1,14 @@
-import { ClassComponent } from './objects/ClassComponent.mjs';
-import { NumberOperator, numeric, 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, Delimiter1, FrameType, GlobalDocumentName, ModuleContainsKeyword, NoNetText, ParamKeys, ReferenceTypes, SymbolPinSide, WireAutoDirection } from './globals.mjs';
-import { PlaceHolderCommands, SymbolDrawingCommands } from './draw_symbols.mjs';
-import { BaseVisitor } from './BaseVisitor.mjs';
-import { getPortType } from './utils.mjs';
-import { UnitDimension } from './helpers.mjs';
-import { FrameParamKeys } from './objects/Frame.mjs';
+import { ClassComponent } from './objects/ClassComponent.js';
+import { NumberOperator, numeric, NumericValue, ParamDefinition } from './objects/ParamDefinition.js';
+import { PinDefinition, PinIdType } from './objects/PinDefinition.js';
+import { PinTypes } from './objects/PinTypes.js';
+import { DeclaredReference, UndeclaredReference } from './objects/types.js';
+import { BlockTypes, ComponentTypes, Delimiter1, FrameType, GlobalDocumentName, ModuleContainsKeyword, NoNetText, ParamKeys, ReferenceTypes, SymbolPinSide, ValidPinSides, WireAutoDirection } from './globals.js';
+import { PlaceHolderCommands, SymbolDrawingCommands } from './draw_symbols.js';
+import { BaseVisitor } from './BaseVisitor.js';
+import { getPortType, RuntimeExecutionError } from './utils.js';
+import { UnitDimension } from './helpers.js';
+import { FrameParamKeys } from './objects/Frame.js';
 export class ParserVisitor extends BaseVisitor {
     visitKeyword_assignment_expr = (ctx) => {
         const id = ctx.ID().getText();
@@ -41,9 +41,14 @@ export class ParserVisitor extends BaseVisitor {
     visitTo_component_expr = (ctx) => {
         ctx.component_select_expr().forEach(item => {
             const [component, pin] = this.visitResult(item);
-            this.getExecutor().toComponent(component, pin, {
-                addSequence: true
-            });
+            try {
+                this.getExecutor().toComponent(component, pin, {
+                    addSequence: true
+                });
+            }
+            catch (err) {
+                throw new RuntimeExecutionError(err.message, ctx.start, ctx.stop);
+            }
         });
         return this.getExecutor().getCurrentPoint();
     };
@@ -58,7 +63,10 @@ export class ParserVisitor extends BaseVisitor {
             componentPin = this.visitResult(ctxDataExprWithAssigment);
         }
         else {
-            const component = this.getExecutor().scope.currentComponent;
+            let component = this.getScope().currentComponent;
+            if (component._pointLinkComponent) {
+                component = component._pointLinkComponent;
+            }
             let pinId = null;
             const ctxPinSelectExpr = ctx.pin_select_expr();
             if (ctxPinSelectExpr) {
@@ -106,6 +114,92 @@ export class ParserVisitor extends BaseVisitor {
         return this.getExecutor().getCurrentPoint();
     };
     visitCreate_component_expr = (ctx) => {
+        const scope = this.getScope();
+        scope.setOnPropertyHandler((path, value, ctx) => {
+            if (path.length === 1) {
+                const [, keyName] = path[0];
+                switch (keyName) {
+                    case 'type':
+                        this.validateString(value, ctx);
+                        break;
+                    case 'angle':
+                    case 'width':
+                    case 'height':
+                        this.validateNumeric(value, ctx);
+                        break;
+                    case 'pins':
+                        if (!(value instanceof Map)) {
+                            this.validateNumeric(value, ctx);
+                        }
+                        break;
+                    case 'copy':
+                        if (value instanceof NumericValue) {
+                            this.validateNumeric(value, ctx);
+                        }
+                        else if (typeof value === 'boolean') {
+                            this.validateBoolean(value, ctx);
+                        }
+                        else {
+                            throw new RuntimeExecutionError("Invalid value for 'copy' property", ctx.start, ctx.end);
+                        }
+                        break;
+                }
+            }
+            else {
+                const [, keyName] = path[0];
+                if (keyName === 'arrange') {
+                    const [sideKeyCtx, sideKeyName] = path[1];
+                    if (ValidPinSides.indexOf(sideKeyName) === -1) {
+                        throw new RuntimeExecutionError(`Invalid side ${sideKeyName} in arrange`, sideKeyCtx.start, sideKeyCtx.stop);
+                    }
+                    else {
+                        if (path.length > 2 && path[2][0] === 'index') {
+                            if (Array.isArray(value)) {
+                                const goodBlank = value.length === 1 &&
+                                    value[0] instanceof NumericValue;
+                                if (!goodBlank) {
+                                    throw new RuntimeExecutionError(`Invalid blank specifier`, ctx.start, ctx.stop);
+                                }
+                            }
+                            else {
+                                if (!(value instanceof NumericValue)) {
+                                    throw new RuntimeExecutionError(`Invalid numeric value for arrange.${sideKeyName}`, ctx.start, ctx.stop);
+                                }
+                            }
+                        }
+                    }
+                }
+                else if (keyName === 'params') {
+                    const [, subKeyName] = path[1];
+                    switch (subKeyName) {
+                        case 'mpn':
+                        case 'refdes':
+                        case 'footprint':
+                            this.validateString(value, ctx);
+                            break;
+                        case 'place':
+                            this.validateBoolean(value, ctx);
+                            break;
+                    }
+                }
+                else if (keyName === 'pins') {
+                    if (path.length === 2) {
+                        if (value.length === 2) {
+                            const [pinType,] = value;
+                            if (pinType instanceof UndeclaredReference) {
+                                throw new RuntimeExecutionError(`Invalid pin type: ${pinType.reference.name}`, ctx.start, ctx.end);
+                            }
+                        }
+                    }
+                }
+            }
+        });
+        scope.enterContext(ctx);
+        ctx.property_expr().forEach(item => {
+            this.visitResult(item);
+        });
+        scope.exitContext();
+        scope.popOnPropertyHandler();
         const properties = this.getPropertyExprList(ctx.property_expr());
         const pins = this.parseCreateComponentPins(properties.get('pins'));
         let instanceName = this.getExecutor().getUniqueInstanceName();
@@ -140,8 +234,13 @@ export class ParserVisitor extends BaseVisitor {
             arrange, display, type, width, height, copy,
             angle, followWireOrientation
         };
-        const createdComponent = this.getExecutor().createComponent(instanceName, pins, params, props);
-        this.setResult(ctx, createdComponent);
+        try {
+            const createdComponent = this.getExecutor().createComponent(instanceName, pins, params, props);
+            this.setResult(ctx, createdComponent);
+        }
+        catch (error) {
+            this.throwWithContext(ctx, error.message);
+        }
     };
     visitCreate_graphic_expr = (ctx) => {
         const ctxId = ctx.ID();
@@ -149,7 +248,7 @@ export class ParserVisitor extends BaseVisitor {
         if (ctxId !== null) {
             const varName = ctxId.getText();
             paramIds.push(varName);
-            this.getExecutor().scope.variables.set(varName, {});
+            this.getScope().variables.set(varName, {});
         }
         const executor = this.getExecutor();
         const stack = [...this.executionStack];
@@ -251,7 +350,7 @@ export class ParserVisitor extends BaseVisitor {
                     useValueArray = [useValueArray];
                 }
                 useValueArray.forEach((value, index) => {
-                    this.getExecutor().scope.variables.set(forVariableNames[index], value);
+                    this.getScope().variables.set(forVariableNames[index], value);
                 });
                 const commands = this.visitResult(ctx.graphic_expressions_block());
                 allCommands = allCommands.concat(commands);
@@ -310,8 +409,16 @@ export class ParserVisitor extends BaseVisitor {
         this.setResult(ctx, [keyName, expressionsBlock]);
     };
     visitProperty_expr = (ctx) => {
-        const keyName = this.visitResult(ctx.property_key_expr());
-        const value = this.visitResult(ctx.property_value_expr());
+        const ctxKey = ctx.property_key_expr();
+        const ctxValue = ctx.property_value_expr();
+        const scope = this.getScope();
+        this.getScope().enterContext(ctxKey);
+        this.getScope().enterContext(ctxValue);
+        const keyName = this.visitResult(ctxKey);
+        const value = this.visitResult(ctxValue);
+        scope.triggerPropertyHandler(value, ctxValue);
+        this.getScope().exitContext();
+        this.getScope().exitContext();
         if (value instanceof UndeclaredReference && (value.reference.parentValue === undefined
             && value.reference.value === undefined)) {
             throw value.throwMessage();
@@ -321,15 +428,21 @@ export class ParserVisitor extends BaseVisitor {
         this.setResult(ctx, map);
     };
     visitSingle_line_property = (ctx) => {
+        this.getScope().enterContext(ctx);
         let value;
         if (ctx.data_expr().length === 1) {
             value = this.visitResult(ctx.data_expr(0));
         }
         else {
-            value = ctx.data_expr().map(item => {
-                return this.visitResult(item);
+            value = ctx.data_expr().map((item, index) => {
+                this.getScope().enterContext(index);
+                const result = this.visitResult(item);
+                this.getScope().triggerPropertyHandler(result, item);
+                this.getScope().exitContext();
+                return result;
             });
         }
+        this.getScope().exitContext();
         this.setResult(ctx, value);
     };
     visitNested_properties_inner = (ctx) => {
@@ -752,6 +865,9 @@ export class ParserVisitor extends BaseVisitor {
             }
             else if (ctxDataExpr) {
                 useValue = this.visitResult(ctxDataExpr);
+                if (useValue instanceof NumericValue) {
+                    useValue = useValue.toNumber();
+                }
             }
             if (useValue !== null) {
                 this.setResult(ctx, [direction, new UnitDimension(useValue)]);
@@ -893,7 +1009,7 @@ export class ParserVisitor extends BaseVisitor {
                     useValueArray = [useValueArray];
                 }
                 useValueArray.forEach((value, index) => {
-                    this.getExecutor().scope.variables.set(forVariableNames[index], value);
+                    this.getScope().variables.set(forVariableNames[index], value);
                 });
                 this.visit(ctx.expressions_block());
                 keepLooping = true;
@@ -1037,32 +1153,32 @@ export class ParserVisitor extends BaseVisitor {
         return result;
     }
     printNets() {
-        this.getExecutor().scope.printNets();
+        this.getScope().printNets();
     }
     dumpNets() {
-        return this.getExecutor().scope.dumpNets();
+        return this.getScope().dumpNets();
     }
     dumpUniqueNets() {
-        const nets = this.getExecutor().scope.getNets();
+        const nets = this.getScope().getNets();
         return nets.reduce((accum, [, , net]) => {
             accum.push(net);
             return accum;
         }, []);
     }
     dumpVariables() {
-        return this.getExecutor().scope.variables;
+        return this.getScope().variables;
     }
     dumpInstances() {
-        return this.getExecutor().scope.instances;
+        return this.getScope().instances;
     }
     dump2() {
-        const instances = this.getExecutor().scope.instances;
+        const instances = this.getScope().instances;
         const items = [];
         for (const [instanceName, instance] of instances) {
             if (instance.assignedRefDes === null) {
                 continue;
             }
-            const pinNets = this.resolveNets(this.getExecutor().scope, instance);
+            const pinNets = this.resolveNets(this.getScope(), instance);
             const componentItem = {
                 name: instanceName,
                 refdes: instance.assignedRefDes,
@@ -1077,9 +1193,9 @@ export class ParserVisitor extends BaseVisitor {
     }
     getNetList() {
         const netlist = [];
-        const instances = this.getExecutor().scope.instances;
+        const instances = this.getScope().instances;
         for (const [instanceName, instance] of instances) {
-            const pinNets = this.resolveNets(this.getExecutor().scope, instance);
+            const pinNets = this.resolveNets(this.getScope(), instance);
             const componentItem = {
                 instanceName,
                 instance,
@@ -1110,7 +1226,7 @@ export class ParserVisitor extends BaseVisitor {
     annotateComponents() {
         this.log('===== annotate components =====');
         const annotater = new ComponentAnnotater();
-        const instances = this.getExecutor().scope.instances;
+        const instances = this.getScope().instances;
         const toAnnotate = [];
         for (const [, instance] of instances) {
             if (instance.typeProp === ComponentTypes.net
@@ -1147,7 +1263,7 @@ export class ParserVisitor extends BaseVisitor {
         this.log('');
     }
     applySheetFrameComponent() {
-        const baseScope = this.getExecutor().scope;
+        const baseScope = this.getScope();
         const document = baseScope.variables.get(GlobalDocumentName);
         let frameComponent = null;
         if (document && document[FrameParamKeys.SheetType]) {