jinaga-server 1.0.0 → 1.1.0

package/test/postgres/postgresSpec.ts

@@ -51,7 +51,7 @@ describe('Postgres', () => {
   });
 
   it('should parse successor query with type', () => {
-    const { sql, parameters, pathLength, factTypes, roleMap } = sqlFor('S.predecessor F.type="IntegrationTest.Successor"');
+    const { sql, parameters, pathLength, factTypes, roleMap } = sqlFor('S.predecessor F.type="IntegrationTest.Successor"')!;
     expect(sql).toEqual(
       'SELECT f2.hash as hash2 ' +
       'FROM public.fact f1 ' +
@@ -66,7 +66,7 @@ describe('Postgres', () => {
   });
 
   it('should parse predecessor query with type', () => {
-    const { sql, parameters, pathLength, factTypes, roleMap } = sqlFor('P.parent F.type="Parent"');
+    const { sql, parameters, pathLength, factTypes, roleMap } = sqlFor('P.parent F.type="Parent"')!;
     expect(sql).toEqual(
       'SELECT f2.hash as hash2 ' +
       'FROM public.fact f1 ' +
@@ -81,7 +81,7 @@ describe('Postgres', () => {
   });
 
   it('should parse successor query with existential', () => {
-    const { sql, parameters, pathLength, factTypes, roleMap } = sqlFor('S.predecessor F.type="IntegrationTest.Successor" E(S.successor F.type="IntegrationTest.Grandchild")');
+    const { sql, parameters, pathLength, factTypes, roleMap } = sqlFor('S.predecessor F.type="IntegrationTest.Successor" E(S.successor F.type="IntegrationTest.Grandchild")')!;
     expect(sql).toEqual(
       'SELECT f2.hash as hash2 ' +
       'FROM public.fact f1 ' +
@@ -100,7 +100,7 @@ describe('Postgres', () => {
   });
 
   it('should parse successor query with negative existential', () => {
-    const { sql, parameters, pathLength, factTypes, roleMap } = sqlFor('S.predecessor F.type="IntegrationTest.Successor" N(S.successor F.type="IntegrationTest.Grandchild")');
+    const { sql, parameters, pathLength, factTypes, roleMap } = sqlFor('S.predecessor F.type="IntegrationTest.Successor" N(S.successor F.type="IntegrationTest.Grandchild")')!;
     expect(sql).toEqual(
       'SELECT f2.hash as hash2 ' +
       'FROM public.fact f1 ' +
@@ -119,7 +119,7 @@ describe('Postgres', () => {
   });
 
   it('should parse successor query with existential predecessor', () => {
-    const { sql, parameters, pathLength, factTypes, roleMap } = sqlFor('S.parent F.type="Child" E(P.uncle F.type="Uncle")');
+    const { sql, parameters, pathLength, factTypes, roleMap } = sqlFor('S.parent F.type="Child" E(P.uncle F.type="Uncle")')!;
     expect(sql).toEqual(
       'SELECT f2.hash as hash2 ' +
       'FROM public.fact f1 ' +
@@ -138,7 +138,7 @@ describe('Postgres', () => {
   });
 
   it('should parse successor query with negative existential predecessor', () => {
-    const { sql, parameters, pathLength, factTypes, roleMap } = sqlFor('S.parent F.type="Child" N(P.uncle F.type="Uncle")');
+    const { sql, parameters, pathLength, factTypes, roleMap } = sqlFor('S.parent F.type="Child" N(P.uncle F.type="Uncle")')!;
     expect(sql).toEqual(
       'SELECT f2.hash as hash2 ' +
       'FROM public.fact f1 ' +
@@ -157,7 +157,7 @@ describe('Postgres', () => {
   });
 
   it('should parse consecutive existential queries', () => {
-    const { sql, parameters, factTypes, roleMap } = sqlFor('S.parent F.type="Child" N(S.condition F.type="Condition") N(S.other F.type="Other")');
+    const { sql, parameters, factTypes, roleMap } = sqlFor('S.parent F.type="Child" N(S.condition F.type="Condition") N(S.other F.type="Other")')!;
     expect(sql).toEqual(
       'SELECT f2.hash as hash2 ' +
       'FROM public.fact f1 ' +
@@ -181,7 +181,7 @@ describe('Postgres', () => {
   });
 
   it('should parse existential query form predecessor', () => {
-    const { sql, parameters, factTypes, roleMap } = sqlFor('S.root F.type="Identifier" N(S.prior F.type="Identifier") P.identified F.type="Identified" N(S.identified F.type="Delete")');
+    const { sql, parameters, factTypes, roleMap } = sqlFor('S.root F.type="Identifier" N(S.prior F.type="Identifier") P.identified F.type="Identified" N(S.identified F.type="Delete")')!;
     expect(sql).toEqual(
       'SELECT f2.hash as hash2, f3.hash as hash3 ' +
       'FROM public.fact f1 ' +
@@ -213,7 +213,7 @@ describe('Postgres', () => {
   });
 
   it('should parse zig-zag pipeline', () => {
-    const { sql, parameters, pathLength, factTypes, roleMap } = sqlFor('S.user F.type="Assignment" P.project F.type="Project" S.project F.type="Task" S.task F.type="Task.Title"');
+    const { sql, parameters, pathLength, factTypes, roleMap } = sqlFor('S.user F.type="Assignment" P.project F.type="Project" S.project F.type="Task" S.task F.type="Task.Title"')!;
     expect(sql).toEqual(
       'SELECT f2.hash as hash2, f3.hash as hash3, f4.hash as hash4, f5.hash as hash5 ' +
       'FROM public.fact f1 ' +
@@ -239,37 +239,37 @@ describe('Postgres', () => {
   });
 
   it('should parse query with unknown successor type', () => {
-    const { empty } = sqlFor('S.root F.type="Unknown"');
+    const { empty } = sqlFor('S.root F.type="Unknown"')!;
     expect(empty).toBeTruthy();
   });
 
   it('should parse query with unknown predecessor type', () => {
-    const { empty } = sqlFor('S.root F.type="Assignment" P.pred F.type="Unknown" P.user F.type="Jinaga.User"');
+    const { empty } = sqlFor('S.root F.type="Assignment" P.pred F.type="Unknown" P.user F.type="Jinaga.User"')!;
     expect(empty).toBeTruthy();
   });
 
   it('should parse query with some unknown types', () => {
-    const { empty } = sqlFor('S.root F.type="Unknown" P.user F.type="Jinaga.User"');
+    const { empty } = sqlFor('S.root F.type="Unknown" P.user F.type="Jinaga.User"')!;
     expect(empty).toBeTruthy();
   });
 
   it('should parse query with unknown successor role', () => {
-    const { empty } = sqlFor('S.unknown F.type="Successor"');
+    const { empty } = sqlFor('S.unknown F.type="Successor"')!;
     expect(empty).toBeTruthy();
   });
 
   it('should parse query with unknown predecessor role', () => {
-    const { empty } = sqlFor('S.root F.type="Assignment" P.unknown F.type="Jinaga.User"');
+    const { empty } = sqlFor('S.root F.type="Assignment" P.unknown F.type="Jinaga.User"')!;
     expect(empty).toBeTruthy();
   });
 
   it('should parse query with some unknown predecessor roles', () => {
-    const { empty } = sqlFor('S.root F.type="Assignment" P.predecessor F.type="Predecessor" P.unknown F.type="Jinaga.User"');
+    const { empty } = sqlFor('S.root F.type="Assignment" P.predecessor F.type="Predecessor" P.unknown F.type="Jinaga.User"')!;
     expect(empty).toBeTruthy();
   });
 
   it('should ignore negative existential with unknown type', () => {
-    const { empty, sql, parameters, factTypes, roleMap } = sqlFor('S.root F.type="Assignment" N(S.assignment F.type="Unknown")');
+    const { empty, sql, parameters, factTypes, roleMap } = sqlFor('S.root F.type="Assignment" N(S.assignment F.type="Unknown")')!;
     expect(empty).toBeFalsy();
     expect(sql).toEqual(
       'SELECT f2.hash as hash2 ' +
@@ -286,7 +286,7 @@ describe('Postgres', () => {
   });
 
   it('should ignore negative existential with unknown role', () => {
-    const { empty, sql, parameters, factTypes, roleMap } = sqlFor('S.root F.type="Assignment" N(S.unknown F.type="Assignment.Delete")');
+    const { empty, sql, parameters, factTypes, roleMap } = sqlFor('S.root F.type="Assignment" N(S.unknown F.type="Assignment.Delete")')!;
     expect(empty).toBeFalsy();
     expect(sql).toEqual(
       'SELECT f2.hash as hash2 ' +
@@ -303,17 +303,17 @@ describe('Postgres', () => {
   });
 
   it('should elevate positive existential with unknown type', () => {
-    const { empty } = sqlFor('S.root F.type="Assignment" E(S.assignment F.type="Unknown")');
+    const { empty } = sqlFor('S.root F.type="Assignment" E(S.assignment F.type="Unknown")')!;
     expect(empty).toBeTruthy();
   });
 
   it('should elevate positive existential with unknown role', () => {
-    const { empty } = sqlFor('S.root F.type="Assignment" E(S.unknown F.type="Assignment.Delete")');
+    const { empty } = sqlFor('S.root F.type="Assignment" E(S.unknown F.type="Assignment.Delete")')!;
     expect(empty).toBeTruthy();
   });
 
   it('should parse nested existential condition', () => {
-    const { sql, parameters, factTypes, roleMap } = sqlFor('S.catalog F.type="ImprovingU.Idea" N(S.idea F.type="ImprovingU.Idea.Deletion" N(S.ideaDeletion F.type="ImprovingU.Idea.Restore"))');
+    const { sql, parameters, factTypes, roleMap } = sqlFor('S.catalog F.type="ImprovingU.Idea" N(S.idea F.type="ImprovingU.Idea.Deletion" N(S.ideaDeletion F.type="ImprovingU.Idea.Restore"))')!;
 
     expect(sql).toEqual(
       'SELECT f2.hash as hash2 ' +
@@ -353,22 +353,26 @@ function allFactTypes(steps: Step[]): string[] {
 
 function allRoles(steps: Step[], initialType: string) {
   let roles: { type: string; role: string }[] = [];
-  let type: string = initialType;
-  let role: string = undefined;
+  let type: string | undefined = initialType;
+  let role: string | undefined = undefined;
 
   for (const step of steps) {
     if (step instanceof PropertyCondition) {
       if (step.name === 'type') {
         type = step.value;
         if (role) {
-          roles.push({ type, role });
+          if (type) {
+            roles.push({ type, role });
+          }
           role = undefined;
         }
       }
     }
     else if (step instanceof Join) {
       if (step.direction === Direction.Predecessor) {
-        roles.push({ type, role: step.role });
+        if (type) {
+          roles.push({ type, role: step.role });
+        }
         role = undefined;
       }
       else {
@@ -377,7 +381,9 @@ function allRoles(steps: Step[], initialType: string) {
       type = undefined;
     }
     else if (step instanceof ExistentialCondition) {
-      roles = roles.concat(allRoles(step.steps, type));
+      if (type) {
+        roles = roles.concat(allRoles(step.steps, type));
+      }
     }
   }
 

package/test/postgres/postgresSpecificationSpec.ts

@@ -1,7 +1,6 @@
-import { dehydrateReference, FactBookmark, getAllFactTypes, getAllRoles, SpecificationParser } from "jinaga";
+import { dehydrateReference, getAllFactTypes, getAllRoles, SpecificationParser } from "jinaga";
 
 import { addFactType, addRole, emptyFactTypeMap, emptyRoleMap, getFactTypeId, getRoleId } from "../../src/postgres/maps";
-import { SpecificationSqlQuery } from "../../src/postgres/query-description";
 import { sqlFromSpecification } from "../../src/postgres/specification-sql";
 
 const root = dehydrateReference({ type: 'Root' });
@@ -15,7 +14,7 @@ function parseSpecification(input: string) {
     return parser.parseSpecification();
 }
 
-function sqlFor(descriptiveString: string, bookmarks: FactBookmark[] = []) {
+function sqlFor(descriptiveString: string, bookmarks: string[] = []) {
     const specification = parseSpecification(descriptiveString);
     const factTypeNames = getAllFactTypes(specification);
 
@@ -45,7 +44,7 @@ function sqlFor(descriptiveString: string, bookmarks: FactBookmark[] = []) {
         }
         throw new Error(`Unknown input type ${input.type}`);
     });
-    const sqlQueries: SpecificationSqlQuery[] = sqlFromSpecification(start, bookmarks, 100, specification, factTypes, roleMap);
+    const sqlQueries = sqlFromSpecification(start, bookmarks, 100, specification, factTypes, roleMap);
     return { sqlQueries, factTypes, roleMap };
 }
 
@@ -91,7 +90,6 @@ describe("Postgres query generator", () => {
         ]);
         expect(query.labels).toEqual([
             {
-                name: 'successor',
                 type: 'IntegrationTest.Successor',
                 index: 2
             }
@@ -134,12 +132,10 @@ describe("Postgres query generator", () => {
             ]);
             expect(sqlQueries[0].labels).toEqual([
                 {
-                    name: "successor",
                     type: "IntegrationTest.Successor",
                     index: 2
                 },
                 {
-                    name: "other",
                     type: "IntegrationTest.OtherPredecessor",
                     index: 3
                 }
@@ -185,12 +181,10 @@ describe("Postgres query generator", () => {
         ]);
         expect(sqlQueries[0].labels).toEqual([
             {
-                name: "project",
                 type: "MyApplication.Project",
                 index: 2
             },
             {
-                name: "assignment",
                 type: "MyApplication.Assignment",
                 index: 3
             }
@@ -236,12 +230,10 @@ describe("Postgres query generator", () => {
         ]);
         expect(sqlQueries[0].labels).toEqual([
             {
-                name: "project",
                 type: "MyApplication.Project",
                 index: 2
             },
             {
-                name: "deleted",
                 type: "MyApplication.Project.Deleted",
                 index: 3
             }
@@ -274,7 +266,6 @@ describe("Postgres query generator", () => {
         ]);
         expect(sqlQueries[1].labels).toEqual([
             {
-                name: "project",
                 type: "MyApplication.Project",
                 index: 2
             }
@@ -296,43 +287,41 @@ describe("Postgres query generator", () => {
 
         expect(sqlQueries.length).toEqual(1);
         expect(sqlQueries[0].sql).toEqual(
-            'SELECT f3.hash as hash3, ' +
-            'f4.hash as hash4, ' +
-            'sort(array[f3.fact_id, f4.fact_id], \'desc\') as bookmark ' +
+            'SELECT f2.hash as hash2, ' +
+            'f3.hash as hash3, ' +
+            'sort(array[f2.fact_id, f3.fact_id], \'desc\') as bookmark ' +
             'FROM public.fact f1 ' +
-            'JOIN public.edge e1 ON e1.predecessor_fact_id = f1.fact_id AND e1.role_id = $3 ' +
-            'JOIN public.fact f3 ON f3.fact_id = e1.successor_fact_id ' +
-            'JOIN public.edge e2 ON e2.predecessor_fact_id = f3.fact_id AND e2.role_id = $4 ' +
-            'JOIN public.fact f4 ON f4.fact_id = e2.successor_fact_id ' +
-            'JOIN public.edge e3 ON e3.successor_fact_id = f4.fact_id AND e3.role_id = $7 ' +
-            'JOIN public.fact f2 ON f2.fact_id = e3.predecessor_fact_id ' +
+            'JOIN public.edge e1 ON e1.predecessor_fact_id = f1.fact_id AND e1.role_id = $5 ' +
+            'JOIN public.fact f2 ON f2.fact_id = e1.successor_fact_id ' +
+            'JOIN public.edge e2 ON e2.predecessor_fact_id = f2.fact_id AND e2.role_id = $6 ' +
+            'JOIN public.fact f3 ON f3.fact_id = e2.successor_fact_id ' +
+            'JOIN public.edge e3 ON e3.successor_fact_id = f3.fact_id AND e3.role_id = $7 ' +
+            'JOIN public.fact f4 ON f4.fact_id = e3.predecessor_fact_id ' +
             'WHERE f1.fact_type_id = $1 AND f1.hash = $2 ' +
-            'AND f2.fact_type_id = $5 AND f2.hash = $6 ' +
-            'AND sort(array[f3.fact_id, f4.fact_id], \'desc\') > $8 ' +
+            'AND f4.fact_type_id = $3 AND f4.hash = $4 ' +
+            'AND sort(array[f2.fact_id, f3.fact_id], \'desc\') > $8 ' +
             'ORDER BY bookmark ASC ' +
             'LIMIT $9'
         );
         expect(sqlQueries[0].parameters).toEqual([
             getFactTypeId(factTypes, "Root"),
             rootHash,
-            roleParameter(roleMap, factTypes, "MyApplication.Project", "root"),
-            roleParameter(roleMap, factTypes, "MyApplication.Assignment", "project"),
             getFactTypeId(factTypes, "Jinaga.User"),
             userHash,
+            roleParameter(roleMap, factTypes, "MyApplication.Project", "root"),
+            roleParameter(roleMap, factTypes, "MyApplication.Assignment", "project"),
             roleParameter(roleMap, factTypes, "MyApplication.Assignment", "user"),
             [],
             100
         ]);
         expect(sqlQueries[0].labels).toEqual([
             {
-                name: "project",
                 type: "MyApplication.Project",
-                index: 3
+                index: 2
             },
             {
-                name: "assignment",
                 type: "MyApplication.Assignment",
-                index: 4
+                index: 3
             }
         ]);
     });
@@ -352,43 +341,41 @@ describe("Postgres query generator", () => {
 
         expect(sqlQueries.length).toEqual(1);
         expect(sqlQueries[0].sql).toEqual(
-            'SELECT f3.hash as hash3, ' +
-            'f4.hash as hash4, ' +
-            'sort(array[f3.fact_id, f4.fact_id], \'desc\') as bookmark ' +
-            'FROM public.fact f2 ' +
-            'JOIN public.edge e1 ON e1.predecessor_fact_id = f2.fact_id AND e1.role_id = $3 ' +
-            'JOIN public.fact f3 ON f3.fact_id = e1.successor_fact_id ' +
-            'JOIN public.edge e2 ON e2.predecessor_fact_id = f3.fact_id AND e2.role_id = $4 ' +
-            'JOIN public.fact f4 ON f4.fact_id = e2.successor_fact_id ' +
-            'JOIN public.edge e3 ON e3.successor_fact_id = f4.fact_id AND e3.role_id = $7 ' +
-            'JOIN public.fact f1 ON f1.fact_id = e3.predecessor_fact_id ' +
-            'WHERE f1.fact_type_id = $5 AND f1.hash = $6 ' +
-            'AND f2.fact_type_id = $1 AND f2.hash = $2 ' +
-            'AND sort(array[f3.fact_id, f4.fact_id], \'desc\') > $8 ' +
+            'SELECT f2.hash as hash2, ' +
+            'f3.hash as hash3, ' +
+            'sort(array[f2.fact_id, f3.fact_id], \'desc\') as bookmark ' +
+            'FROM public.fact f1 ' +
+            'JOIN public.edge e1 ON e1.predecessor_fact_id = f1.fact_id AND e1.role_id = $5 ' +
+            'JOIN public.fact f2 ON f2.fact_id = e1.successor_fact_id ' +
+            'JOIN public.edge e2 ON e2.predecessor_fact_id = f2.fact_id AND e2.role_id = $6 ' +
+            'JOIN public.fact f3 ON f3.fact_id = e2.successor_fact_id ' +
+            'JOIN public.edge e3 ON e3.successor_fact_id = f3.fact_id AND e3.role_id = $7 ' +
+            'JOIN public.fact f4 ON f4.fact_id = e3.predecessor_fact_id ' +
+            'WHERE f1.fact_type_id = $1 AND f1.hash = $2 ' +
+            'AND f4.fact_type_id = $3 AND f4.hash = $4 ' +
+            'AND sort(array[f2.fact_id, f3.fact_id], \'desc\') > $8 ' +
             'ORDER BY bookmark ASC ' +
             'LIMIT $9'
         );
         expect(sqlQueries[0].parameters).toEqual([
             getFactTypeId(factTypes, "Root"),
             rootHash,
-            roleParameter(roleMap, factTypes, "MyApplication.Project", "root"),
-            roleParameter(roleMap, factTypes, "MyApplication.Assignment", "project"),
             getFactTypeId(factTypes, "Jinaga.User"),
             userHash,
+            roleParameter(roleMap, factTypes, "MyApplication.Project", "root"),
+            roleParameter(roleMap, factTypes, "MyApplication.Assignment", "project"),
             roleParameter(roleMap, factTypes, "MyApplication.Assignment", "user"),
             [],
             100
         ]);
         expect(sqlQueries[0].labels).toEqual([
             {
-                name: "project",
                 type: "MyApplication.Project",
-                index: 3
+                index: 2
             },
             {
-                name: "assignment",
                 type: "MyApplication.Assignment",
-                index: 4
+                index: 3
             }
         ]);
     });
@@ -428,7 +415,6 @@ describe("Postgres query generator", () => {
         ]);
         expect(sqlQueries[0].labels).toEqual([
             {
-                name: "project",
                 type: "MyApplication.Project",
                 index: 2
             }
@@ -456,12 +442,10 @@ describe("Postgres query generator", () => {
         ]);
         expect(sqlQueries[1].labels).toEqual([
             {
-                name: "project",
                 type: "MyApplication.Project",
                 index: 2
             },
             {
-                name: "names.name",
                 type: "MyApplication.Project.Name",
                 index: 3
             }
@@ -486,18 +470,9 @@ describe("Postgres query generator", () => {
                     ]
                 }
             }`, [
-                {
-                    labels: [ "project" ],
-                    bookmark: "123"
-                },
-                {
-                    labels: [ "project", "names.name", "names.next" ],
-                    bookmark: "456.345.234"
-                },
-                {
-                    labels: [ "project", "names.name" ],
-                    bookmark: "789.678"
-                }
+                "123",
+                "456.345.234",
+                "789.678"
             ]);
 
         expect(sqlQueries.length).toEqual(3);
@@ -521,7 +496,6 @@ describe("Postgres query generator", () => {
         ]);
         expect(sqlQueries[0].labels).toEqual([
             {
-                name: "project",
                 type: "MyApplication.Project",
                 index: 2
             }
@@ -560,7 +534,6 @@ describe("Postgres query generator", () => {
         ]);
         expect(sqlQueries[0].labels).toEqual([
             {
-                name: "project",
                 type: "MyApplication.Project",
                 index: 2
             }
@@ -645,7 +618,7 @@ describe("Postgres query generator", () => {
         const { sqlQueries } = sqlFor(`
             (root: Root) {
                 successor: MyApplication.Successor [
-                    successor = root->intermediate: Unknown->root: Root
+                    successor = root->intermediate: Unknown->successor: MyApplication.Successor
                 ]
             }`);
 
@@ -667,7 +640,7 @@ describe("Postgres query generator", () => {
         const { sqlQueries } = sqlFor(`
             (root: Root) {
                 successor: MyApplication.Successor [
-                    successor = root->unknown: Intermediate->root: Root
+                    successor = root->unknown: Intermediate->successor: MyApplication.Successor
                 ]
             }`);
 
@@ -733,7 +706,6 @@ describe("Postgres query generator", () => {
         ]);
         expect(sqlQueries[0].labels).toEqual([
             {
-                name: "project",
                 type: "MyApplication.Project",
                 index: 2
             }

package/dist/postgres/query-description-builder.d.ts

@@ -1,13 +0,0 @@
-import { Label, PathCondition } from "jinaga";
-import { FactTypeMap, RoleMap } from "./maps";
-import { QueryDescription } from "./query-description";
-import { FactByIdentifier } from "./specification-result-sql";
-export declare class QueryDescriptionBuilder {
-    protected readonly factTypes: FactTypeMap;
-    protected readonly roleMap: RoleMap;
-    constructor(factTypes: FactTypeMap, roleMap: RoleMap);
-    protected addPathCondition(queryDescription: QueryDescription, knownFacts: FactByIdentifier, path: number[], unknown: Label, prefix: string, condition: PathCondition): {
-        queryDescription: QueryDescription;
-        knownFacts: FactByIdentifier;
-    };
-}

package/dist/postgres/query-description-builder.js

@@ -1,104 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryDescriptionBuilder = void 0;
-const maps_1 = require("./maps");
-const query_description_1 = require("./query-description");
-class QueryDescriptionBuilder {
-    constructor(factTypes, roleMap) {
-        this.factTypes = factTypes;
-        this.roleMap = roleMap;
-    }
-    addPathCondition(queryDescription, knownFacts, path, unknown, prefix, condition) {
-        // If no input parameter has been allocated, allocate one now.
-        const input = queryDescription.inputByLabel(condition.labelRight);
-        if (input && input.factTypeParameter === 0) {
-            queryDescription = queryDescription.withInputParameter(input.label);
-        }
-        // Determine whether we have already written the output.
-        const knownFact = knownFacts[unknown.name];
-        const roleCount = condition.rolesLeft.length + condition.rolesRight.length;
-        // Walk up the right-hand side.
-        // This generates predecessor joins from a given or prior label.
-        let fact = knownFacts[condition.labelRight];
-        if (!fact) {
-            throw new Error(`Label ${condition.labelRight} not found. Known labels: ${Object.keys(knownFacts).join(", ")}`);
-        }
-        let type = fact.type;
-        let factIndex = fact.factIndex;
-        for (const [i, role] of condition.rolesRight.entries()) {
-            // If the type or role is not known, then no facts matching the condition can
-            // exist. The query is unsatisfiable.
-            const typeId = (0, maps_1.getFactTypeId)(this.factTypes, type);
-            if (!typeId) {
-                return { queryDescription: query_description_1.QueryDescription.unsatisfiable, knownFacts };
-            }
-            const roleId = (0, maps_1.getRoleId)(this.roleMap, typeId, role.name);
-            if (!roleId) {
-                return { queryDescription: query_description_1.QueryDescription.unsatisfiable, knownFacts };
-            }
-            const { query: queryWithParameter, parameterIndex: roleParameter } = queryDescription.withParameter(roleId);
-            if (i === roleCount - 1 && knownFact) {
-                // If we have already written the output, we can use the fact index.
-                queryDescription = queryWithParameter.withEdge(knownFact.factIndex, factIndex, roleParameter, path);
-                factIndex = knownFact.factIndex;
-            }
-            else {
-                // If we have not written the fact, we need to write it now.
-                const { query, factIndex: predecessorFactIndex } = queryWithParameter.withFact(role.targetType);
-                queryDescription = query.withEdge(predecessorFactIndex, factIndex, roleParameter, path);
-                factIndex = predecessorFactIndex;
-            }
-            type = role.targetType;
-        }
-        const rightType = type;
-        // Walk up the left-hand side.
-        // We will need to reverse this walk to generate successor joins.
-        type = unknown.type;
-        const newEdges = [];
-        for (const role of condition.rolesLeft) {
-            // If the type or role is not known, then no facts matching the condition can
-            // exist. The query is unsatisfiable.
-            const typeId = (0, maps_1.getFactTypeId)(this.factTypes, type);
-            if (!typeId) {
-                return { queryDescription: query_description_1.QueryDescription.unsatisfiable, knownFacts };
-            }
-            const roleId = (0, maps_1.getRoleId)(this.roleMap, typeId, role.name);
-            if (!roleId) {
-                return { queryDescription: query_description_1.QueryDescription.unsatisfiable, knownFacts };
-            }
-            newEdges.push({
-                roleId,
-                declaringType: type
-            });
-            type = role.targetType;
-        }
-        if (type !== rightType) {
-            throw new Error(`Type mismatch: ${type} is compared to ${rightType}`);
-        }
-        newEdges.reverse().forEach(({ roleId, declaringType }, i) => {
-            const { query: queryWithParameter, parameterIndex: roleParameter } = queryDescription.withParameter(roleId);
-            if (condition.rolesRight.length + i === roleCount - 1 && knownFact) {
-                queryDescription = queryWithParameter.withEdge(factIndex, knownFact.factIndex, roleParameter, path);
-                factIndex = knownFact.factIndex;
-            }
-            else {
-                const { query: queryWithFact, factIndex: successorFactIndex } = queryWithParameter.withFact(declaringType);
-                queryDescription = queryWithFact.withEdge(factIndex, successorFactIndex, roleParameter, path);
-                factIndex = successorFactIndex;
-            }
-        });
-        // If we have not captured the known fact, add it now.
-        if (!knownFact) {
-            knownFacts = Object.assign(Object.assign({}, knownFacts), { [unknown.name]: { factIndex, type: unknown.type } });
-            // If we have not written the output, write it now.
-            // Only write the output if we are not inside of an existential condition.
-            // Use the prefix, which will be set for projections.
-            if (path.length === 0) {
-                queryDescription = queryDescription.withOutput(prefix + unknown.name, unknown.type, factIndex);
-            }
-        }
-        return { queryDescription, knownFacts };
-    }
-}
-exports.QueryDescriptionBuilder = QueryDescriptionBuilder;
-//# sourceMappingURL=query-description-builder.js.map

package/dist/postgres/query-description-builder.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"query-description-builder.js","sourceRoot":"","sources":["../../src/postgres/query-description-builder.ts"],"names":[],"mappings":"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"}