Fix empty context shortcuts being generated in some cases

LinkedSoftwareDependencies · Jan 25, 2022 · 458d2de · 458d2de
1 parent 6654e77
commit 458d2de
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/lib/serialize/ContextConstructor.ts b/lib/serialize/ContextConstructor.ts
@@ -101,9 +101,11 @@ export class ContextConstructor {
             longestCommonPrefix = longestCommonPrefixNew.join(prefixDelimiter);
           }
         }
-        if (longestCommonPrefix) {
+        if (longestCommonPrefix && longestCommonPrefix.length > 0) {
           for (const shortcut of shortcutAliases) {
-            typeScopedContext[shortcut.slice(longestCommonPrefix.length + 1)] = typeScopedContext[shortcut];
+            if (shortcut.length > longestCommonPrefix.length) {
+              typeScopedContext[shortcut.slice(longestCommonPrefix.length + 1)] = typeScopedContext[shortcut];
+            }
           }
         }
 

diff --git a/test/serialize/ContextConstructor.test.ts b/test/serialize/ContextConstructor.test.ts
@@ -502,6 +502,46 @@ describe('ContextConstructor', () => {
         });
       });
 
+      it('should handle non-empty component definitions without shared prefixes', () => {
+        expect(ctor.constructComponentShortcuts({
+          '/docs/package/components/file1': {
+            '@context': [
+              'https://linkedsoftwaredependencies.org/bundles/npm/my-package/context.jsonld',
+            ],
+            '@id': 'npmd:my-package',
+            components: [
+              {
+                '@id': 'mp:file1#MyClass1',
+                '@type': 'Class',
+                constructorArguments: [],
+                parameters: [
+                  {
+                    '@id': 'mp:file1#MyClass1_param1',
+                    range: {
+                      '@type': 'ParameterRangeArray',
+                      parameterRangeValue: 'xsd:float',
+                    },
+                  },
+                ],
+                memberKeys: [],
+                requireElement: 'MyClass1',
+              },
+            ],
+          },
+        })).toEqual({
+          MyClass1: {
+            '@id': 'mp:file1#MyClass1',
+            '@prefix': true,
+            '@context': {
+              param1: {
+                '@id': 'mp:file1#MyClass1_param1',
+                '@container': '@list',
+              },
+            },
+          },
+        });
+      });
+
       it('should handle non-empty component definitions for JSON ranges', () => {
         expect(ctor.constructComponentShortcuts({
           '/docs/package/components/file1': {