entities with same name #1528
entities with same name #1528
Conversation
src/export/CodeSystemExporter.ts
Outdated
| if ( | ||
| this.pkg.codeSystems.some(cs => cs.name === fshDefinition.name) || | ||
| this.pkg.instances.some(instance => fshDefinition.name === instance._instanceMeta.name) || | ||
| this.pkg.profiles.some(prof => fshDefinition.name === prof.name) || | ||
| this.pkg.extensions.some(extn => fshDefinition.name === extn.name) || | ||
| this.pkg.logicals.some(logical => fshDefinition.name === logical.name) || | ||
| this.pkg.resources.some(resource => fshDefinition.name === resource.name) || | ||
| this.pkg.valueSets.some(valueSet => fshDefinition.name === valueSet.name) | ||
| ) { |
There was a problem hiding this comment.
I think it would be possible to write this condition by checking this.pkg.fshMap rather than each of the package's lists of FSH entities individually.
src/export/CodeSystemExporter.ts
Outdated
| this.pkg.resources.some(resource => fshDefinition.name === resource.name) || | ||
| this.pkg.valueSets.some(valueSet => fshDefinition.name === valueSet.name) | ||
| ) { | ||
| logger.error(`Multiple FSH entities created with name ${fshDefinition.name}.`); |
There was a problem hiding this comment.
For the message, it might be useful to rephrase it so that it gives some more details about name overlap. Maybe something like "Cannot export [entity type] [name]: an [entity type] with this name already exists." Also, it would be useful to include the source info for the entity that can't be exported.
test/export/InstanceExporter.test.ts
Outdated
| expect(loggerSpy.getAllLogs('error')).toHaveLength(0); | ||
| expect(loggerSpy.getAllLogs('error')).toHaveLength(1); | ||
| expect(loggerSpy.getMessageAtIndex(0, 'error')).toMatch( | ||
| /Multiple FSH entities created with name/ | ||
| ); |
There was a problem hiding this comment.
I'm a little confused by this. Why is this error appearing for these tests? There don't appear to be any entities with the same names defined.
There was a problem hiding this comment.
This error is occurring for a different reason than below.
Stepping through this test, I see that when export is called in this group of tests, it adds the profile (CarProfile) and the logical (Car) at the same time, so when calling export for the Logical, its already in the this.pkg.FshMap when it checks for it, and throws the error.
test/export/InstanceExporter.test.ts
Outdated
| @@ -2217,7 +2248,7 @@ describe('InstanceExporter', () => { | |||
| thisIsName.isInstance = true; | |||
| thisIsSeacow.rules.push(thisIsName); | |||
| const exported = exportInstance(thisIsSeacow); | |||
| expect(loggerSpy.getAllMessages('error')).toHaveLength(0); | |||
| // expect(loggerSpy.getAllMessages('error')).toHaveLength(0); | |||
There was a problem hiding this comment.
I think this should still be producing 0 errors.
test/export/InstanceExporter.test.ts
Outdated
| expect(loggerSpy.getMessageAtIndex(1, 'error')).toMatch( | ||
| expect(loggerSpy.getMessageAtIndex(7, 'error')).toMatch( |
There was a problem hiding this comment.
What's causing the six additional errors here?
There was a problem hiding this comment.
I believe the extra error messages were due to how this test was calling exportInstance multiple times (exportInstance is defined as a function in the beforeEach that when called, calls export for cs, vs, and sd and the instance given) so on the second time, it logged the errors. I adjusted this test (and the one above) to just call export within the function instead.
Description: This PR adds conditionals to check for entities that exist with the same name, and logs an error when entities are defined with a duplicate name.
Testing Instructions: jest unit tests
Related Issue: Fixes #1469