circuitscript 0.1.31 → 0.1.33

package/dist/cjs/visitor.js

@@ -167,137 +167,20 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             if (ctxNotPathBlock) {
                 this.visit(ctxNotPathBlock);
             }
+            if (ctx.start && ctx.stop) {
+                const startToken = ctx.start;
+                const stopToken = ctx.stop;
+                const annotationKey = this.getRefdesFileAnnotation(this.getCurrentFile(), startToken.line, startToken.column, stopToken.line, stopToken.column);
+                if (this.refdesFileAnnotations.has(annotationKey)) {
+                    let refdesValue = this.refdesFileAnnotations.get(annotationKey);
+                    refdesValue = refdesValue.split(',')[0];
+                    this.setCurrentComponentRefdes(refdesValue, true);
+                }
+            }
         };
         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];
-                    switch (keyName) {
-                        case 'type':
-                            this.validateString(value, ctx);
-                            break;
-                        case 'angle':
-                        case 'width':
-                        case 'height':
-                            this.validateNumeric(value, ctx);
-                            break;
-                        case 'display':
-                            if (didDefineArrangeProp) {
-                                throw new utils_js_2.RuntimeExecutionError("arrange property has already been defined", ctx);
-                            }
-                            didDefineDisplayProp = true;
-                            break;
-                        case 'arrange':
-                            if (didDefineDisplayProp) {
-                                throw new utils_js_2.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':
-                            if (value instanceof ParamDefinition_js_1.NumericValue) {
-                                this.validateNumeric(value, ctx);
-                            }
-                            else if (typeof value === 'boolean') {
-                                this.validateBoolean(value, ctx);
-                            }
-                            else {
-                                throw new utils_js_2.RuntimeExecutionError("Invalid value for 'copy' property", ctx);
-                            }
-                            break;
-                    }
-                }
-                else {
-                    const [, keyName] = path[0];
-                    if (keyName === 'arrange') {
-                        const [sideKeyCtx, sideKeyName] = path[1];
-                        if (globals_js_1.ValidPinSides.indexOf(sideKeyName) === -1) {
-                            throw new utils_js_2.RuntimeExecutionError(`Invalid side ${sideKeyName} in arrange`, sideKeyCtx);
-                        }
-                        else {
-                            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_2.RuntimeExecutionError(`Invalid blank specifier`, ctx);
-                                    }
-                                }
-                                else {
-                                    if (!(value instanceof ParamDefinition_js_1.NumericValue) && !(typeof value === 'string')) {
-                                        throw new utils_js_2.RuntimeExecutionError(`Invalid numeric value for arrange.${sideKeyName}`, ctx);
-                                    }
-                                    else {
-                                        let useValue;
-                                        if (value instanceof ParamDefinition_js_1.NumericValue) {
-                                            useValue = value.toNumber();
-                                        }
-                                        else if (typeof value === 'string') {
-                                            useValue = value;
-                                        }
-                                        value && checkPinExistsAndNotDuplicated(useValue, ctx);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    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) {
-                            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_2.RuntimeExecutionError(`Invalid pin type: ${pinType.reference.name}`, ctx);
-                                }
-                            }
-                        }
-                    }
-                }
-            });
+            scope.setOnPropertyHandler(this.createComponentPropertyValidator());
             scope.enterContext(ctx);
             ctx.property_expr().forEach(item => {
                 this.visitResult(item);
@@ -317,49 +200,16 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 }
                 instanceName += `${globals_js_1.Delimiter1}${appendValue}`;
             }
-            const arrangeProp = properties.has('arrange') ?
-                properties.get('arrange') : null;
-            const displayProp = properties.has('display') ?
-                properties.get('display') : null;
-            const typeProp = properties.has('type') ?
-                properties.get('type') : null;
-            const copy = properties.has('copy') ?
-                properties.get('copy') : false;
-            const width = properties.has('width') ?
-                properties.get('width') : null;
-            const height = properties.has('height') ?
-                properties.get('height') : null;
-            const angle = properties.has(globals_js_1.ParamKeys.angle) ?
-                properties.get(globals_js_1.ParamKeys.angle) : null;
-            const followWireOrientation = properties.has('followWireOrientation') ?
-                properties.get('followWireOrientation') : true;
-            let pins = [];
-            if (displayProp !== null && arrangeProp === null
-                && typeProp !== types_js_1.TypeProps.Graphic) {
-                const drawCommands = displayProp.getCommands();
-                drawCommands.forEach(command => {
-                    const [commandValue,] = command;
-                    if (commandValue === draw_symbols_js_1.PlaceHolderCommands.vpin
-                        || commandValue === draw_symbols_js_1.PlaceHolderCommands.hpin
-                        || commandValue === draw_symbols_js_1.PlaceHolderCommands.pin) {
-                        const id = PinDefinition_js_1.PinId.from(command[1][0]);
-                        const pinType = id.getType();
-                        const pinName = id.toString();
-                        pins.push(new PinDefinition_js_1.PinDefinition(id, pinType, pinName, PinTypes_js_1.PinTypes.Any));
-                    }
-                });
-            }
-            else {
-                pins = this.parseCreateComponentPins(properties.get('pins'));
-            }
+            const typeProp = properties.get('type') ?? null;
+            const copy = properties.get('copy') ?? false;
+            const unitDefinitions = this.extractComponentUnitProperties(properties, typeProp);
             const props = {
-                arrange: arrangeProp,
-                display: displayProp,
-                type: typeProp, width, height, copy,
-                angle, followWireOrientation
+                type: typeProp,
+                copy,
+                units: unitDefinitions
             };
             try {
-                const createdComponent = this.getExecutor().createComponent(instanceName, pins, params, props);
+                const createdComponent = this.getExecutor().createComponent(instanceName, [], params, props);
                 this.setResult(ctx, createdComponent);
                 createdComponent._creationIndex = this.componentCreationIndex++;
             }
@@ -501,19 +351,18 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 return new PinDefinition_js_1.PinDefinition(index + 1, PinDefinition_js_1.PinIdType.Int, portName, PinTypes_js_1.PinTypes.Any);
             });
             const arrange = this.getArrangePropFromModulePorts(modulePorts, nameToPinId);
-            const width = properties.has('width') ?
-                properties.get('width') : null;
-            const height = properties.has('height') ?
-                properties.get('height') : null;
+            const unitProperties = this.extractComponentUnitProperties(properties, types_js_1.TypeProps.Module);
+            const firstUnitDef = unitProperties[0][1];
+            firstUnitDef.pins = tmpPorts;
+            firstUnitDef.arrange = arrange;
             const blankParams = [];
             const props = {
-                arrange, width, height,
                 copy: false,
-                followWireOrientation: true,
+                units: unitProperties,
             };
             const moduleInstanceName = this.getExecutor().getUniqueInstanceName();
             const moduleComponent = this.getExecutor().createComponent(moduleInstanceName, tmpPorts, blankParams, props, true);
-            moduleComponent.typeProp = globals_js_1.ComponentTypes.module;
+            moduleComponent.typeProp = types_js_1.TypeProps.Module;
             const ctxPropertyBlock = ctx.property_block_expr();
             if (ctxPropertyBlock) {
                 const [firstBlock] = ctxPropertyBlock;
@@ -536,6 +385,10 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         this.visitProperty_expr = (ctx) => {
             const ctxKey = ctx.property_key_expr();
             const ctxValue = ctx.property_value_expr();
+            const extraValue = ctx._extra;
+            if (extraValue) {
+                console.log('extra', extraValue.text);
+            }
             const scope = this.getScope();
             this.getScope().enterContext(ctxKey);
             this.getScope().enterContext(ctxValue);
@@ -630,6 +483,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 dataResult = this.getExecutor().copyComponent(dataResult);
             }
             if (dataResult && dataResult instanceof ClassComponent_js_1.ClassComponent) {
+                const defaultUnit = dataResult.getUnit();
                 const modifiers = ctx.component_modifier_expr();
                 modifiers.forEach(modifier => {
                     const modifierText = modifier.ID(0).getText();
@@ -646,23 +500,23 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     if (modifierText === globals_js_1.ParamKeys.flip) {
                         const flipValue = result;
                         if (flipValue.indexOf('x') !== -1) {
-                            dataResult.setParam(globals_js_1.ParamKeys.flipX, 1);
+                            defaultUnit.setParam(globals_js_1.ParamKeys.flipX, (0, ParamDefinition_js_1.numeric)(1));
                             shouldIgnoreWireOrientation = true;
                         }
                         if (flipValue.indexOf('y') !== -1) {
-                            dataResult.setParam(globals_js_1.ParamKeys.flipY, 1);
+                            defaultUnit.setParam(globals_js_1.ParamKeys.flipY, (0, ParamDefinition_js_1.numeric)(1));
                             shouldIgnoreWireOrientation = true;
                         }
                     }
                     else if (modifierText === globals_js_1.ParamKeys.angle) {
-                        dataResult.setParam(globals_js_1.ParamKeys.angle, result);
+                        defaultUnit.setParam(globals_js_1.ParamKeys.angle, result);
                         shouldIgnoreWireOrientation = true;
                     }
                     else if (modifierText === 'anchor') {
                         dataResult.setParam('anchor', result);
                     }
                     if (shouldIgnoreWireOrientation) {
-                        dataResult.useWireOrientationAngle = false;
+                        defaultUnit.useWireOrientationAngle = false;
                     }
                 });
             }
@@ -1155,15 +1009,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         };
         this.visitAnnotation_comment_expr = (ctx) => {
             const refdesID = ctx.ID().getText();
-            const currentComponent = this.getScope().currentComponent;
-            if (currentComponent !== null) {
-                if (refdesID.indexOf('_') === -1) {
-                    currentComponent.setParam('refdes', refdesID);
-                }
-                else {
-                    currentComponent.placeHolderRefDes = refdesID;
-                }
-            }
+            this.setCurrentComponentRefdes(refdesID);
         };
         this.visitPart_set_expr = (ctx) => {
             const paramKeys = ctx.data_expr().map(ctx => {
@@ -1293,6 +1139,192 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.log('-----------------');
         }
     }
+    extractComponentUnitDefinition(properties, typeProp = null, lastNumericPinId = 0) {
+        const width = properties.get('width') ?? null;
+        const height = properties.get('height') ?? null;
+        const angle = properties.get(globals_js_1.ParamKeys.angle) ?? null;
+        const followWireOrientation = properties.get('followWireOrientation') ?? true;
+        const arrange = properties.get('arrange') ?? null;
+        const display = properties.get('display') ?? null;
+        const suffix = properties.get('suffix') ?? null;
+        let pins = [];
+        if (display !== null && arrange === null && typeProp !== types_js_1.TypeProps.Graphic) {
+            const drawCommands = display.getCommands();
+            drawCommands.forEach(command => {
+                const [commandValue,] = command;
+                if (commandValue === draw_symbols_js_1.PlaceHolderCommands.vpin
+                    || commandValue === draw_symbols_js_1.PlaceHolderCommands.hpin
+                    || commandValue === draw_symbols_js_1.PlaceHolderCommands.pin) {
+                    const id = PinDefinition_js_1.PinId.from(command[1][0]);
+                    const pinType = id.getType();
+                    const pinName = id.toString();
+                    pins.push(new PinDefinition_js_1.PinDefinition(id, pinType, pinName, PinTypes_js_1.PinTypes.Any));
+                }
+            });
+        }
+        else {
+            pins = this.extractPinDefintion(properties.get('pins'), lastNumericPinId);
+        }
+        return {
+            width,
+            height,
+            angle,
+            followWireOrientation,
+            display, arrange,
+            pins,
+            suffix
+        };
+    }
+    extractComponentUnitProperties(properties, typeProp) {
+        let lastNumericPinId = 0;
+        const unitsProperties = [];
+        for (const [key, value] of properties) {
+            if (key.split(':')[0] === 'unit') {
+                const unitDef = this.extractComponentUnitDefinition(value, typeProp, lastNumericPinId);
+                unitDef.pins.forEach(pin => {
+                    if (pin.id.isNumeric()) {
+                        lastNumericPinId = Math.max(lastNumericPinId, pin.id.getValue());
+                    }
+                });
+                unitsProperties.push([key, unitDef]);
+            }
+        }
+        if (unitsProperties.length === 0) {
+            unitsProperties.push(['unit',
+                this.extractComponentUnitDefinition(properties, typeProp)]);
+        }
+        return unitsProperties;
+    }
+    createComponentPropertyValidator() {
+        const definedPinIds = [];
+        const arrangedPinIds = [];
+        let didDefineArrangeProp = false;
+        let didDefineDisplayProp = false;
+        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);
+        };
+        return (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 'display':
+                        if (didDefineArrangeProp) {
+                            throw new utils_js_2.RuntimeExecutionError("arrange property has already been defined", ctx);
+                        }
+                        didDefineDisplayProp = true;
+                        break;
+                    case 'arrange':
+                        if (didDefineDisplayProp) {
+                            throw new utils_js_2.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':
+                        if (value instanceof ParamDefinition_js_1.NumericValue) {
+                            this.validateNumeric(value, ctx);
+                        }
+                        else if (typeof value === 'boolean') {
+                            this.validateBoolean(value, ctx);
+                        }
+                        else {
+                            throw new utils_js_2.RuntimeExecutionError("Invalid value for 'copy' property", ctx);
+                        }
+                        break;
+                }
+            }
+            else {
+                const [, keyName] = path[0];
+                if (keyName === 'arrange') {
+                    const [sideKeyCtx, sideKeyName] = path[1];
+                    if (globals_js_1.ValidPinSides.indexOf(sideKeyName) === -1) {
+                        throw new utils_js_2.RuntimeExecutionError(`Invalid side ${sideKeyName} in arrange`, sideKeyCtx);
+                    }
+                    else {
+                        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_2.RuntimeExecutionError(`Invalid blank specifier`, ctx);
+                                }
+                            }
+                            else {
+                                if (!(value instanceof ParamDefinition_js_1.NumericValue) && !(typeof value === 'string')) {
+                                    throw new utils_js_2.RuntimeExecutionError(`Invalid numeric value for arrange.${sideKeyName}`, ctx);
+                                }
+                                else {
+                                    let useValue;
+                                    if (value instanceof ParamDefinition_js_1.NumericValue) {
+                                        useValue = value.toNumber();
+                                    }
+                                    else if (typeof value === 'string') {
+                                        useValue = value;
+                                    }
+                                    value && checkPinExistsAndNotDuplicated(useValue, ctx);
+                                }
+                            }
+                        }
+                    }
+                }
+                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) {
+                        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_2.RuntimeExecutionError(`Invalid pin type: ${pinType.reference.name}`, ctx);
+                            }
+                        }
+                    }
+                }
+            }
+        };
+    }
     expandModuleContains(component, netNamespace) {
         this.getExecutor().log('expanding module `contains`');
         const executionStack = this.executionStack;
@@ -1341,6 +1373,40 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             }
         }
     }
+    setCurrentComponentRefdes(refdesValue, forceSave = false) {
+        const currentComponent = this.getScope().currentComponent;
+        if (currentComponent !== null) {
+            if (refdesValue.indexOf('_') === -1) {
+                currentComponent.setParam('refdes', refdesValue);
+            }
+            else {
+                currentComponent.placeHolderRefDes = refdesValue;
+            }
+            currentComponent.forceSaveRefdesAnnotation = forceSave;
+        }
+    }
+    async checkModuleHasRefdesFile(filePath) {
+        const dir = this.environment.dirname(filePath);
+        const ext = this.environment.extname(filePath);
+        const basename = this.environment.basename(filePath, ext);
+        const annotatedFilePath = this.environment.join(dir, `${basename}${globals_js_1.RefdesFileSuffix}`);
+        const exists = await this.environment.exists(annotatedFilePath);
+        if (exists) {
+            this.log(`Import has refdes file: ${annotatedFilePath}`);
+            const fileData = await this.environment.readFile(annotatedFilePath);
+            const jsonData = JSON.parse(fileData);
+            const baseFilePath = this.environment.getAbsolutePath(this.filePathStack[0]);
+            const basePathDirectory = this.environment.dirname(baseFilePath);
+            const { file, items } = jsonData;
+            for (const item of items) {
+                const parts = item.split(':');
+                const refdes = parts[4];
+                const useFilePath = this.environment.join(basePathDirectory, file);
+                const key = this.getRefdesFileAnnotation(useFilePath, Number(parts[0]), Number(parts[1]), Number(parts[2]), Number(parts[3]));
+                this.refdesFileAnnotations.set(key, refdes);
+            }
+        }
+    }
     resolveDataExpr(data_expr) {
         const value = this.visitResult(data_expr);
         if (value instanceof types_js_1.UndeclaredReference) {
@@ -1360,13 +1426,13 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             return value;
         }
     }
-    parseCreateComponentPins(pinData) {
+    extractPinDefintion(pinData, lastNumericPinId = 0) {
         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;
+                const pinId = lastNumericPinId + i + 1;
                 tmpMap.set(pinId, (0, ParamDefinition_js_1.numeric)(pinId));
             }
             pinData = tmpMap;
@@ -1539,6 +1605,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     const refdes = instance.getParam('refdes');
                     if (refdes) {
                         instance.assignedRefDes = refdes;
+                        this.setComponentUnitRefdesSuffix(instance);
                         annotater.trackRefDes(refdes);
                         this.log(refdes, '-', instance.instanceName);
                         continue;
@@ -1552,6 +1619,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             if (newRefDes !== null) {
                 instance.assignedRefDes = newRefDes;
                 this.log(newRefDes, '-', instance.instanceName);
+                this.setComponentUnitRefdesSuffix(instance);
             }
             else {
                 this.log('Failed to annotate:', instance.instanceName);
@@ -1562,6 +1630,24 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         this.renameNetsWithRefdes();
         this.log('===== rename nets done =====');
     }
+    setComponentUnitRefdesSuffix(instance) {
+        if (instance.assignedRefDes) {
+            const { units } = instance;
+            if (units.length > 1) {
+                units.forEach((unit, index) => {
+                    let useRefdes = String.fromCharCode("A".charCodeAt(0) + index);
+                    if (unit.suffix !== null) {
+                        useRefdes = unit.suffix;
+                    }
+                    unit.refdesSuffix = useRefdes;
+                });
+            }
+            else {
+                const [firstUnit] = units;
+                firstUnit.refdesSuffix = '';
+            }
+        }
+    }
     renameNetsWithRefdes() {
         const nets = this.getScope().getNets();
         const seenNets = [];
@@ -1620,10 +1706,17 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
     }
     getPropertyExprList(items) {
         const properties = new Map();
+        const keyCounter = new Map();
         items.forEach((item) => {
             const result = this.visitResult(item);
             for (const [key, value] of result) {
-                properties.set(key, value);
+                let useKey = key;
+                const counterValue = keyCounter.get(key) ?? 0;
+                keyCounter.set(key, counterValue + 1);
+                if (counterValue > 0) {
+                    useKey = key + ':' + counterValue;
+                }
+                properties.set(useKey, value);
             }
         });
         return properties;