fix failing tests

Author: mrkvon

packages/schema-converter-shex/src/typing/ShexJTypingTransformer.ts

@@ -14,7 +14,7 @@ export interface ShexJTypeTransformerContext {
     importIri: string,
   ) => Promise<[TypeingReturn, ContextDefinition] | undefined>;
   refsToImport: Set<string>;
-  getImportPath: (importIri: string) => string;
+  getImportPath: (importIri: string) => string | undefined;
 }
 
 export function commentFromAnnotations(
@@ -121,8 +121,9 @@ export const ShexJTypingTransformer = ShexJTraverser.createTransformer<
             const as = context.getNameFromIri(shapeId); // local rename
             const from = context.getImportPath(importIri); // relative import path
 
-            // add import to interfaces
-            interfaces.push(dom.create.importNamed(name, as, from));
+            if (name && as && from)
+              // add import to interfaces
+              interfaces.push(dom.create.importNamed(name, as, from));
           }
         }
       }

packages/schema-converter-shex/src/typing/shexjToTyping.ts

@@ -24,9 +24,9 @@ export async function shexjToTyping(
     nameMap,
   }: {
     imports?: Map<string, Schema>;
-    getImportPaths: (importIri: string) => { typings: string };
+    getImportPaths?: (importIri: string) => { typings: string };
     nameMap?: Record<string, string>;
-  },
+  } = {},
 ): Promise<[TypeingReturn, ContextDefinition, IriNameMap | undefined]> {
   const processedShexj: Schema = (await jsonld2graphobject(
     {
@@ -56,7 +56,7 @@ export async function shexjToTyping(
         return [importTypings[0], importTypings[1]];
       },
       refsToImport: jsonLdContextBuilder.refsToImport,
-      getImportPath: (importIri: string) => getImportPaths(importIri).typings,
+      getImportPath: (importIri: string) => getImportPaths?.(importIri).typings,
     },
   );
 

packages/schema-converter-shex/test/testData/activityPub.ts

@@ -65,5 +65,5 @@ export const andSimple: TestData = {
     },
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface MediaContainer {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "MediaContainer";\n    }>;\n    videoImage: Video & Image;\n}\n\nexport interface Video {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Video";\n    }>;\n}\n\nexport interface Image {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Image";\n    }>;\n}\n\n',
+    'import type { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface MediaContainer {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "MediaContainer";\n    }>;\n    videoImage: Video & Image;\n}\n\nexport interface Video {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Video";\n    }>;\n}\n\nexport interface Image {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Image";\n    }>;\n}\n\n',
 };

packages/schema-converter-shex/test/testData/andSimple.ts

@@ -71,5 +71,5 @@ export const circular: TestData = {
     },
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface Parent {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type?: LdSet<{\n        "@id": "Parent";\n    }>;\n    hasChild: Child;\n}\n\nexport interface Child {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type?: LdSet<{\n        "@id": "Child";\n    }>;\n    hasParent: Parent;\n}\n\n',
+    'import type { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface Parent {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type?: LdSet<{\n        "@id": "Parent";\n    }>;\n    hasChild: Child;\n}\n\nexport interface Child {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type?: LdSet<{\n        "@id": "Child";\n    }>;\n    hasParent: Parent;\n}\n\n',
 };

packages/schema-converter-shex/test/testData/circular.ts

@@ -56,5 +56,5 @@ export const eachOfAndSimple: TestData = {
     },
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface MediaContainer {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "MediaContainer";\n    }>;\n}\n\nexport interface Video {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Video";\n    }>;\n}\n\nexport interface Image {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Image";\n    }>;\n}\n\n',
+    'import type { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface MediaContainer {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "MediaContainer";\n    }>;\n}\n\nexport interface Video {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Video";\n    }>;\n}\n\nexport interface Image {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Image";\n    }>;\n}\n\n',
 };

packages/schema-converter-shex/test/testData/eachOfAndSimple.ts

@@ -79,5 +79,5 @@ export const extendsSimple: TestData = {
     employeeNumber: "https://example.com/employeeNumber",
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface Entity {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Entity";\n    }>;\n    entityId: any;\n}\n\nexport interface Person {\n    "@id"?: LdSet<string | string>;\n    "@context"?: LdSet<LdoJsonldContext | LdoJsonldContext>;\n    type: LdSet<{\n        "@id": "Entity";\n    } | {\n        "@id": "Person";\n    }>;\n    entityId: any;\n    name: any;\n}\n\nexport interface Employee {\n    "@id"?: LdSet<string | string | string>;\n    "@context"?: LdSet<LdoJsonldContext | LdoJsonldContext | LdoJsonldContext>;\n    type: LdSet<{\n        "@id": "Entity";\n    } | {\n        "@id": "Person";\n    } | {\n        "@id": "Employee";\n    }>;\n    entityId: any;\n    name: any;\n    employeeNumber: any;\n}\n\n',
+    'import type { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface Entity {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Entity";\n    }>;\n    entityId: any;\n}\n\nexport interface Person {\n    "@id"?: LdSet<string | string>;\n    "@context"?: LdSet<LdoJsonldContext | LdoJsonldContext>;\n    type: LdSet<{\n        "@id": "Entity";\n    } | {\n        "@id": "Person";\n    }>;\n    entityId: any;\n    name: any;\n}\n\nexport interface Employee {\n    "@id"?: LdSet<string | string | string>;\n    "@context"?: LdSet<LdoJsonldContext | LdoJsonldContext | LdoJsonldContext>;\n    type: LdSet<{\n        "@id": "Entity";\n    } | {\n        "@id": "Person";\n    } | {\n        "@id": "Employee";\n    }>;\n    entityId: any;\n    name: any;\n    employeeNumber: any;\n}\n\n',
 };

packages/schema-converter-shex/test/testData/extendsSimple.ts

@@ -56,5 +56,5 @@ export const multipleSharedPredicates: TestData = {
     Thing3: "https://example.com/Thing3",
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface MediaContainer {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Media";\n    } | {\n        "@id": "Video";\n    }>;\n    something: LdSet<{\n        "@id": "OtherThing";\n    } | {\n        "@id": "Thing3";\n    }>;\n}\n\n',
+    'import type { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface MediaContainer {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Media";\n    } | {\n        "@id": "Video";\n    }>;\n    something: LdSet<{\n        "@id": "OtherThing";\n    } | {\n        "@id": "Thing3";\n    }>;\n}\n\n',
 };

packages/schema-converter-shex/test/testData/multipleSharedPredicates.ts

@@ -84,5 +84,5 @@ export const oldExtends: TestData = {
     employeeNumber: "https://example.com/employeeNumber",
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface Entity {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Entity";\n    }>;\n    entityId: any;\n}\n\nexport interface Person {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Entity";\n    } | {\n        "@id": "Person";\n    }>;\n    entityId: any;\n    name: any;\n}\n\nexport interface Employee {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Entity";\n    } | {\n        "@id": "Person";\n    } | {\n        "@id": "Employee";\n    }>;\n    entityId: any;\n    name: any;\n    employeeNumber: any;\n}\n\n',
+    'import type { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface Entity {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Entity";\n    }>;\n    entityId: any;\n}\n\nexport interface Person {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Entity";\n    } | {\n        "@id": "Person";\n    }>;\n    entityId: any;\n    name: any;\n}\n\nexport interface Employee {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Entity";\n    } | {\n        "@id": "Person";\n    } | {\n        "@id": "Employee";\n    }>;\n    entityId: any;\n    name: any;\n    employeeNumber: any;\n}\n\n',
 };

packages/schema-converter-shex/test/testData/oldExtends.ts

@@ -76,5 +76,5 @@ export const orSimple: TestData = {
     },
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface MediaContainer {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "MediaContainer";\n    }>;\n    primaryMedia: Video | Image;\n    media?: LdSet<Video | Image>;\n}\n\nexport interface Video {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Video";\n    }>;\n}\n\nexport interface Image {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Image";\n    }>;\n}\n\n',
+    'import type { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface MediaContainer {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "MediaContainer";\n    }>;\n    primaryMedia: Video | Image;\n    media?: LdSet<Video | Image>;\n}\n\nexport interface Video {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Video";\n    }>;\n}\n\nexport interface Image {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Image";\n    }>;\n}\n\n',
 };