@comake/skl-js-engine 1.1.4 → 1.1.5

package/dist/storage/query-adapter/sparql/SparqlQueryBuilder.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SparqlQueryBuilder = void 0;
 const data_model_1 = __importDefault(require("@rdfjs/data-model"));
+const constants_1 = require("../../../constants");
 const SparqlUtil_1 = require("../../../util/SparqlUtil");
 const TripleUtil_1 = require("../../../util/TripleUtil");
 const Util_1 = require("../../../util/Util");
@@ -47,16 +48,16 @@ class SparqlQueryBuilder {
             const variable = this.createVariable();
             return {
                 variable,
-                expression: order.expression,
+                expression: order.expression
             };
         });
         const orders = selectVariables.map((selectVar, index) => ({
             expression: selectVar.variable,
-            descending: orderQueryData.orders[index].descending,
+            descending: orderQueryData.orders[index].descending
         }));
         if (orders.length > 0) {
             orders.push({
-                expression: SparqlUtil_1.entityVariable,
+                expression: SparqlUtil_1.entityVariable
             });
         }
         const returnData = {
@@ -64,7 +65,7 @@ class SparqlQueryBuilder {
             orders,
             group: orderQueryData.groupByParent ? subject : undefined,
             graphWhere: graphWherePatterns,
-            graphSelectionTriples: relationsQueryData.selectionTriples,
+            graphSelectionTriples: relationsQueryData.selectionTriples
         };
         if (selectVariables.length > 0) {
             returnData.selectVariables = selectVariables;
@@ -78,7 +79,7 @@ class SparqlQueryBuilder {
             if (subQuery.groupBy && Array.isArray(subQuery.groupBy)) {
                 subQuery.groupBy.forEach((group) => {
                     queryGroup.push({
-                        expression: data_model_1.default.variable(group),
+                        expression: data_model_1.default.variable(group)
                     });
                 });
             }
@@ -89,7 +90,7 @@ class SparqlQueryBuilder {
                 where: this.createWherePatternsFromQueryData(subQueryWhere.values, subQueryWhere.triples, subQueryWhere.filters, undefined, undefined, subQueryWhere.patterns ?? []),
                 group: queryGroup.length > 0 ? queryGroup : undefined,
                 having: subQuery.having ? this.createWhereQueryData(SparqlUtil_1.entityVariable, subQuery.having).filters : undefined,
-                prefixes: {},
+                prefixes: {}
             };
             return (0, SparqlUtil_1.createSparqlSelectGroup)([selectQuery]);
         });
@@ -109,7 +110,7 @@ class SparqlQueryBuilder {
             triples = [SparqlUtil_1.entityGraphTriple, ...graphSelectionTriples];
             where = [
                 ...graphWhere,
-                (0, SparqlUtil_1.createSparqlGraphPattern)(SparqlUtil_1.entityVariable, [(0, SparqlUtil_1.createSparqlBasicGraphPattern)([SparqlUtil_1.entityGraphTriple])]),
+                (0, SparqlUtil_1.createSparqlGraphPattern)(SparqlUtil_1.entityVariable, [(0, SparqlUtil_1.createSparqlBasicGraphPattern)([SparqlUtil_1.entityGraphTriple])])
             ];
         }
         // // Add select variables to the query
@@ -135,7 +136,7 @@ class SparqlQueryBuilder {
                 graphValues: values,
                 graphFilters: filters,
                 graphTriples: triples,
-                binds: [],
+                binds: []
             };
         }
         // Handle binds if specified in where options
@@ -144,7 +145,7 @@ class SparqlQueryBuilder {
             binds.push(...where.binds.map((bind) => ({
                 type: 'bind',
                 expression: bind.expression,
-                variable: bind.variable,
+                variable: bind.variable
             })));
             // Delete binds from where as it's a special key
             const { binds: _, ...restWhere } = where;
@@ -157,7 +158,7 @@ class SparqlQueryBuilder {
                 triples: [...obj.triples, ...whereQueryDataForField.triples],
                 filters: [...obj.filters, ...whereQueryDataForField.filters],
                 patterns: [...obj.patterns ?? [], ...whereQueryDataForField.patterns ?? []],
-                binds: [...obj.binds ?? [], ...whereQueryDataForField.binds ?? []],
+                binds: [...obj.binds ?? [], ...whereQueryDataForField.binds ?? []]
             };
         }, { values: [], triples: [], filters: [], patterns: [], binds });
         return {
@@ -166,7 +167,7 @@ class SparqlQueryBuilder {
             graphFilters: [],
             graphTriples: [],
             patterns: whereQueryData.patterns ?? [],
-            binds: whereQueryData.binds ?? [],
+            binds: whereQueryData.binds ?? []
         };
     }
     createWhereQueryDataForField(subject, field, value) {
@@ -192,16 +193,16 @@ class SparqlQueryBuilder {
                     type: 'values',
                     values: [
                         {
-                            [`?${term.value}`]: data_model_1.default.namedNode(value),
-                        },
-                    ],
-                },
+                            [`?${term.value}`]: data_model_1.default.namedNode(value)
+                        }
+                    ]
+                }
             ];
         }
         return {
             values,
             filters,
-            triples,
+            triples
         };
     }
     createWhereQueryDataForType(subject, value) {
@@ -215,13 +216,13 @@ class SparqlQueryBuilder {
                     return {
                         subject,
                         predicate: SparqlUtil_1.allTypesAndSuperTypesPath,
-                        object: data_model_1.default.namedNode(typeStr),
+                        object: data_model_1.default.namedNode(typeStr)
                     };
                 });
                 return {
                     values: [],
                     filters: [],
-                    triples,
+                    triples
                 };
             }
             if (value.operator === 'inverse') {
@@ -230,7 +231,7 @@ class SparqlQueryBuilder {
                 return {
                     values: inverseWhereQueryData.values,
                     filters: inverseWhereQueryData.filters,
-                    triples: inverseWhereQueryData.triples,
+                    triples: inverseWhereQueryData.triples
                 };
             }
             if (value.operator === 'sequence') {
@@ -241,12 +242,12 @@ class SparqlQueryBuilder {
                 const triples = value.map(typeVal => ({
                     subject,
                     predicate: SparqlUtil_1.allTypesAndSuperTypesPath,
-                    object: typeof typeVal === 'string' ? data_model_1.default.namedNode(typeVal) : data_model_1.default.namedNode(typeVal.toString()),
+                    object: typeof typeVal === 'string' ? data_model_1.default.namedNode(typeVal) : data_model_1.default.namedNode(typeVal.toString())
                 }));
                 return {
                     values: [],
                     filters: [],
-                    triples,
+                    triples
                 };
             }
             const variable = this.createVariable();
@@ -255,7 +256,7 @@ class SparqlQueryBuilder {
             return {
                 values: valuePattern ? [valuePattern] : [],
                 filters: filter ? [filter] : [],
-                triples: tripleInFilter ? [] : [triple],
+                triples: tripleInFilter ? [] : [triple]
             };
         }
         return {
@@ -265,9 +266,9 @@ class SparqlQueryBuilder {
                 {
                     subject,
                     predicate: SparqlUtil_1.allTypesAndSuperTypesPath,
-                    object: data_model_1.default.namedNode(value),
-                },
-            ],
+                    object: data_model_1.default.namedNode(value)
+                }
+            ]
         };
     }
     createWhereQueryDataFromKeyValue(subject, predicate, value) {
@@ -284,7 +285,7 @@ class SparqlQueryBuilder {
                     values: [...obj.values, ...valueWhereQueryData.values],
                     filters: [...obj.filters, ...valueWhereQueryData.filters],
                     triples: [...obj.triples, ...valueWhereQueryData.triples],
-                    patterns: [...obj.patterns ?? [], ...valueWhereQueryData.patterns ?? []],
+                    patterns: [...obj.patterns ?? [], ...valueWhereQueryData.patterns ?? []]
                 };
             }, { values: [], filters: [], triples: [], patterns: [] });
         }
@@ -298,7 +299,7 @@ class SparqlQueryBuilder {
         return {
             values: [],
             filters: [],
-            triples: [{ subject, predicate, object: term }],
+            triples: [{ subject, predicate, object: term }]
         };
     }
     createWhereQueryDataForFindOperator(subject, predicate, operator) {
@@ -321,7 +322,7 @@ class SparqlQueryBuilder {
         return {
             values: valuePattern ? [valuePattern] : [],
             filters: filter ? [filter] : [],
-            triples: tripleInFilter ? [] : [triple],
+            triples: tripleInFilter ? [] : [triple]
         };
     }
     pathOperatorToPropertyPath(operator) {
@@ -376,7 +377,7 @@ class SparqlQueryBuilder {
         const whereQueryData = {
             values: [],
             filters: [],
-            triples: [triple],
+            triples: [triple]
         };
         return operators.reduce((obj, operator) => {
             const { filter, valuePattern } = this.resolveFindOperatorAsExpressionWithMultipleValues(variable, operator, triple);
@@ -396,7 +397,7 @@ class SparqlQueryBuilder {
             values: [...subWhereQueryData.values, ...subWhereQueryData.graphValues],
             filters: subWhereQueryData.filters,
             triples: [{ subject, predicate, object: subNodeVariable }, ...subWhereQueryData.triples],
-            patterns: [...subWhereQueryData.patterns ?? []],
+            patterns: [...subWhereQueryData.patterns ?? []]
         };
     }
     createWhereQueryDataForValueObject(subject, predicate, valueObject) {
@@ -406,13 +407,13 @@ class SparqlQueryBuilder {
                 values: [],
                 filters: [],
                 triples: [],
-                patterns: [(0, SparqlUtil_1.createSparqlOptional)([(0, SparqlUtil_1.createSparqlBasicGraphPattern)([{ subject, predicate, object: term }])])],
+                patterns: [(0, SparqlUtil_1.createSparqlOptional)([(0, SparqlUtil_1.createSparqlBasicGraphPattern)([{ subject, predicate, object: term }])])]
             };
         }
         return {
             values: [],
             filters: [],
-            triples: [{ subject, predicate, object: term }],
+            triples: [{ subject, predicate, object: term }]
         };
     }
     valueObjectToTerm(valueObject) {
@@ -439,7 +440,7 @@ class SparqlQueryBuilder {
             if (values.length === 1) {
                 // If only one value, treat as equality
                 return {
-                    filter: (0, SparqlUtil_1.createSparqlEqualOperation)(leftSide, this.resolveValueToExpression(values[0])),
+                    filter: (0, SparqlUtil_1.createSparqlEqualOperation)(leftSide, this.resolveValueToExpression(values[0]))
                 };
             }
             // Create individual equality conditions for each value
@@ -449,8 +450,8 @@ class SparqlQueryBuilder {
                 filter: {
                     type: 'operation',
                     operator: '&&',
-                    args: equalityConditions,
-                },
+                    args: equalityConditions
+                }
             };
         }
         if (operator.operator === 'in') {
@@ -459,25 +460,25 @@ class SparqlQueryBuilder {
                 return {
                     valuePattern: {
                         type: 'values',
-                        values: resolvedValue.map((value) => ({ [`?${leftSide.value}`]: value })),
-                    },
+                        values: resolvedValue.map((value) => ({ [`?${leftSide.value}`]: value }))
+                    }
                 };
             }
             return {
-                filter: (0, SparqlUtil_1.createSparqlInOperation)(leftSide, resolvedValue),
+                filter: (0, SparqlUtil_1.createSparqlInOperation)(leftSide, resolvedValue)
             };
         }
         if (operator.operator === 'not') {
             const resolvedExpression = this.resolveValueToExpression(operator.value);
             return {
                 filter: this.buildNotOperationForMultiValued(leftSide, resolvedExpression, triple),
-                tripleInFilter: true,
+                tripleInFilter: true
             };
         }
         if (operator.operator === 'exists') {
             return {
                 filter: (0, SparqlUtil_1.createSparqlExistsOperation)([(0, SparqlUtil_1.createSparqlBasicGraphPattern)([triple])]),
-                tripleInFilter: true,
+                tripleInFilter: true
             };
         }
         if (operator.operator === 'contains') {
@@ -486,7 +487,7 @@ class SparqlQueryBuilder {
             // Directly use the variable as an expression
             (0, SparqlUtil_1.createSparqlLcaseOperation)(data_model_1.default.variable(leftSide.value)), (0, SparqlUtil_1.createSparqlLcaseOperation)(data_model_1.default.literal(searchString.value.toLowerCase())));
             return {
-                filter,
+                filter
             };
         }
         const resolvedExpression = this.resolveValueToExpression(operator.value);
@@ -519,7 +520,7 @@ class SparqlQueryBuilder {
                     values: [
                         {
                             type: 'values',
-                            values: resolvedValue.map((value) => ({ [`?${leftSide.value}`]: value })),
+                            values: resolvedValue.map((value) => ({ [`?${leftSide.value}`]: value }))
                         },
                     ],
                 };
@@ -536,7 +537,7 @@ class SparqlQueryBuilder {
                 return {
                     triples: [],
                     values: [],
-                    filters: [(0, SparqlUtil_1.createSparqlEqualOperation)(leftSide, this.resolveValueToExpression(operator.value))],
+                    filters: [(0, SparqlUtil_1.createSparqlEqualOperation)(leftSide, this.resolveValueToExpression(operator.value))]
                 };
             default:
                 throw new Error(`Unsupported operator "${operator.operator}"`);
@@ -571,7 +572,7 @@ class SparqlQueryBuilder {
             filterExpression = (0, SparqlUtil_1.createSparqlFilterWithExpression)((0, SparqlUtil_1.createSparqlEqualOperation)(leftSide, rightSide));
         }
         return (0, SparqlUtil_1.createSparqlNotExistsOperation)([
-            (0, SparqlUtil_1.createSparqlSelectGroup)([(0, SparqlUtil_1.createSparqlBasicGraphPattern)([triple]), filterExpression]),
+            (0, SparqlUtil_1.createSparqlSelectGroup)([(0, SparqlUtil_1.createSparqlBasicGraphPattern)([triple]), filterExpression])
         ]);
     }
     buildNotOperationForId(leftSide, rightSide) {
@@ -617,7 +618,7 @@ class SparqlQueryBuilder {
             const inverseRelationTriple = {
                 subject,
                 predicate: (0, SparqlUtil_1.createSparqlInversePredicate)([predicate]),
-                object: variable,
+                object: variable
             };
             const subRelationOperatorValue = orderValue
                 .value;
@@ -632,11 +633,11 @@ class SparqlQueryBuilder {
                 const aggregateExpression = {
                     type: 'aggregate',
                     expression: baseExpression,
-                    aggregation: order.descending ? 'max' : 'min',
+                    aggregation: order.descending ? 'max' : 'min'
                 };
                 return {
                     expression: aggregateExpression,
-                    descending: order.descending,
+                    descending: order.descending
                 };
             });
             return {
@@ -644,7 +645,7 @@ class SparqlQueryBuilder {
                 filters: subRelationWhereQueryData.filters,
                 orders: aggregateOrders,
                 groupByParent: true,
-                patterns: [...subRelationWhereQueryData.patterns ?? [], ...subRelationOrderQueryData.patterns ?? []],
+                patterns: [...subRelationWhereQueryData.patterns ?? [], ...subRelationOrderQueryData.patterns ?? []]
             };
         }
         if (property === 'id') {
@@ -654,9 +655,9 @@ class SparqlQueryBuilder {
                 orders: [
                     {
                         expression: subject,
-                        descending: orderValue === 'DESC' || orderValue === 'desc',
-                    },
-                ],
+                        descending: orderValue === 'DESC' || orderValue === 'desc'
+                    }
+                ]
             };
         }
         const variable = this.createVariable();
@@ -670,12 +671,12 @@ class SparqlQueryBuilder {
                         ? {
                             type: 'aggregate',
                             expression: variable,
-                            aggregation: isDescending ? 'max' : 'min',
+                            aggregation: isDescending ? 'max' : 'min'
                         }
                         : variable,
-                    descending: isDescending,
-                },
-            ],
+                    descending: isDescending
+                }
+            ]
         };
     }
     createRelationsQueryData(subject, relations) {
@@ -689,28 +690,28 @@ class SparqlQueryBuilder {
                     const { patterns, selectionTriples } = this.createRelationsQueryDataForInverseRelation(subject, predicate, relationsValue);
                     return {
                         patterns: [...obj.patterns, ...patterns],
-                        selectionTriples: [...obj.selectionTriples, ...selectionTriples],
+                        selectionTriples: [...obj.selectionTriples, ...selectionTriples]
                     };
                 }
                 const { patterns, selectionTriples } = this.createRelationsQueryDataForNestedRelation(subject, predicate, relationsValue);
                 return {
                     patterns: [...obj.patterns, ...patterns],
-                    selectionTriples: [...obj.selectionTriples, ...selectionTriples],
+                    selectionTriples: [...obj.selectionTriples, ...selectionTriples]
                 };
             }
             const variable = this.createVariable();
             const graphTriple = {
                 subject: this.createVariable(),
                 predicate: this.createVariable(),
-                object: this.createVariable(),
+                object: this.createVariable()
             };
             const relationPattern = (0, SparqlUtil_1.createSparqlOptional)([
                 (0, SparqlUtil_1.createSparqlBasicGraphPattern)([{ subject, predicate, object: variable }]),
-                (0, SparqlUtil_1.createSparqlGraphPattern)(variable, [(0, SparqlUtil_1.createSparqlBasicGraphPattern)([graphTriple])]),
+                (0, SparqlUtil_1.createSparqlGraphPattern)(variable, [(0, SparqlUtil_1.createSparqlBasicGraphPattern)([graphTriple])])
             ]);
             return {
                 patterns: [...obj.patterns, relationPattern],
-                selectionTriples: [...obj.selectionTriples, graphTriple],
+                selectionTriples: [...obj.selectionTriples, graphTriple]
             };
         }, { patterns: [], selectionTriples: [] });
     }
@@ -719,32 +720,32 @@ class SparqlQueryBuilder {
         const graphTriple = {
             subject: this.createVariable(),
             predicate: this.createVariable(),
-            object: this.createVariable(),
+            object: this.createVariable()
         };
         const inverseRelationTriple = {
             subject,
             predicate: (0, SparqlUtil_1.createSparqlInversePredicate)([predicate]),
-            object: variable,
+            object: variable
         };
         if (typeof relationsValue.value === 'object' && relationsValue.value.relations) {
             const subRelationsQueryData = this.createRelationsQueryData(variable, relationsValue.value.relations);
             const relationPattern = (0, SparqlUtil_1.createSparqlOptional)([
                 (0, SparqlUtil_1.createSparqlBasicGraphPattern)([inverseRelationTriple]),
                 (0, SparqlUtil_1.createSparqlGraphPattern)(variable, [(0, SparqlUtil_1.createSparqlBasicGraphPattern)([graphTriple])]),
-                ...subRelationsQueryData.patterns,
+                ...subRelationsQueryData.patterns
             ]);
             return {
                 patterns: [relationPattern],
-                selectionTriples: [graphTriple, ...subRelationsQueryData.selectionTriples],
+                selectionTriples: [graphTriple, ...subRelationsQueryData.selectionTriples]
             };
         }
         const relationPattern = (0, SparqlUtil_1.createSparqlOptional)([
             (0, SparqlUtil_1.createSparqlBasicGraphPattern)([inverseRelationTriple]),
-            (0, SparqlUtil_1.createSparqlGraphPattern)(variable, [(0, SparqlUtil_1.createSparqlBasicGraphPattern)([graphTriple])]),
+            (0, SparqlUtil_1.createSparqlGraphPattern)(variable, [(0, SparqlUtil_1.createSparqlBasicGraphPattern)([graphTriple])])
         ]);
         return {
             patterns: [relationPattern],
-            selectionTriples: [graphTriple],
+            selectionTriples: [graphTriple]
         };
     }
     createRelationsQueryDataForNestedRelation(subject, predicate, relationsValue) {
@@ -752,18 +753,18 @@ class SparqlQueryBuilder {
         const graphTriple = {
             subject: this.createVariable(),
             predicate: this.createVariable(),
-            object: this.createVariable(),
+            object: this.createVariable()
         };
         const relationTriple = { subject, predicate, object: variable };
         const subRelationsQueryData = this.createRelationsQueryData(variable, relationsValue);
         const relationPattern = (0, SparqlUtil_1.createSparqlOptional)([
             (0, SparqlUtil_1.createSparqlBasicGraphPattern)([relationTriple]),
             (0, SparqlUtil_1.createSparqlGraphPattern)(variable, [(0, SparqlUtil_1.createSparqlBasicGraphPattern)([graphTriple])]),
-            ...subRelationsQueryData.patterns,
+            ...subRelationsQueryData.patterns
         ]);
         return {
             patterns: [relationPattern],
-            selectionTriples: [graphTriple, ...subRelationsQueryData.selectionTriples],
+            selectionTriples: [graphTriple, ...subRelationsQueryData.selectionTriples]
         };
     }
     createVariable() {
@@ -774,7 +775,7 @@ class SparqlQueryBuilder {
             return select.map((selectPredicate) => ({
                 subject,
                 predicate: data_model_1.default.namedNode(selectPredicate),
-                object: this.createVariable(),
+                object: this.createVariable()
             }));
         }
         return Object.entries(select).reduce((arr, [key, value]) => {
@@ -828,22 +829,22 @@ class SparqlQueryBuilder {
                     {
                         subject: currentSubject,
                         predicate: data_model_1.default.namedNode(predicate),
-                        object,
-                    },
-                ],
+                        object
+                    }
+                ]
             });
             currentSubject = object;
         });
         // Return the final variable (last object) and all patterns
         return {
             variable: currentSubject,
-            patterns,
+            patterns
         };
     }
     async buildGroupByQuery(options) {
         const entityVariable = data_model_1.default.variable('entity');
         const queryData = this.buildEntitySelectPatternsFromOptions(entityVariable, {
-            where: options.where || {},
+            where: options.where || {}
         });
         // Add group variables and patterns with mapping
         const groupVariables = [];
@@ -866,10 +867,10 @@ class SparqlQueryBuilder {
                 triples: [
                     {
                         subject: entityVariable,
-                        predicate: data_model_1.default.namedNode('http://purl.org/dc/terms/created'),
-                        object: dateVar,
-                    },
-                ],
+                        predicate: data_model_1.default.namedNode(constants_1.EngineConstants.prop.dateCreated),
+                        object: dateVar
+                    }
+                ]
             };
             const dateFilter = {
                 type: 'filter',
@@ -882,16 +883,16 @@ class SparqlQueryBuilder {
                             operator: '>=',
                             args: [
                                 dateVar,
-                                data_model_1.default.literal(options.dateRange.start, 'http://www.w3.org/2001/XMLSchema#dateTime'),
-                            ],
+                                data_model_1.default.literal(options.dateRange.start, constants_1.XSD.dateTime)
+                            ]
                         },
                         {
                             type: 'operation',
                             operator: '<=',
-                            args: [dateVar, data_model_1.default.literal(options.dateRange.end, 'http://www.w3.org/2001/XMLSchema#dateTime')],
-                        },
-                    ],
-                },
+                            args: [dateVar, data_model_1.default.literal(options.dateRange.end, constants_1.XSD.dateTime)]
+                        }
+                    ]
+                }
             };
             groupPatterns.push(datePattern, dateFilter);
             if (options.dateGrouping) {
@@ -917,9 +918,9 @@ class SparqlQueryBuilder {
                     type: 'aggregate',
                     aggregation: 'count',
                     distinct: true,
-                    expression: entityVariable,
+                    expression: entityVariable
                 },
-                variable: countVar,
+                variable: countVar
             },
             {
                 expression: {
@@ -927,10 +928,10 @@ class SparqlQueryBuilder {
                     aggregation: 'group_concat',
                     distinct: true,
                     separator: ' ',
-                    expression: entityVariable,
+                    expression: entityVariable
                 },
-                variable: entityIdsVar,
-            },
+                variable: entityIdsVar
+            }
         ], combinedWhere, [], // Orders
         groupVariables.length > 0 ? groupVariables : undefined, // Group by
         options.limit, options.offset);
@@ -947,10 +948,10 @@ class SparqlQueryBuilder {
                     this.createYearExpression(dateVar),
                     data_model_1.default.literal('-'),
                     this.createMonthExpression(dateVar),
-                    ...this.createDayExpressionParts(dateVar, grouping),
-                ],
+                    ...this.createDayExpressionParts(dateVar, grouping)
+                ]
             },
-            variable: dateGroupVar,
+            variable: dateGroupVar
         };
     }
     createYearExpression(dateVar) {
@@ -961,9 +962,9 @@ class SparqlQueryBuilder {
                 {
                     type: 'operation',
                     operator: 'YEAR',
-                    args: [dateVar],
-                },
-            ],
+                    args: [dateVar]
+                }
+            ]
         };
     }
     createMonthExpression(dateVar) {
@@ -973,15 +974,15 @@ class SparqlQueryBuilder {
         return this.createPaddedDatePartExpression(dateVar, 'DAY');
     }
     createPaddedDatePartExpression(dateVar, datePart) {
-        const comparisonValue = data_model_1.default.literal('10', data_model_1.default.namedNode('http://www.w3.org/2001/XMLSchema#integer'));
+        const comparisonValue = data_model_1.default.literal('10', constants_1.XSD.integer);
         return {
             type: 'operation',
             operator: 'IF',
             args: [
                 this.createLessThanComparison(dateVar, datePart, comparisonValue),
                 this.createPaddedStringExpression(dateVar, datePart),
-                this.createUnpaddedStringExpression(dateVar, datePart),
-            ],
+                this.createUnpaddedStringExpression(dateVar, datePart)
+            ]
         };
     }
     createLessThanComparison(dateVar, datePart, comparisonValue) {
@@ -992,17 +993,17 @@ class SparqlQueryBuilder {
                 {
                     type: 'operation',
                     operator: datePart,
-                    args: [dateVar],
+                    args: [dateVar]
                 },
-                comparisonValue,
-            ],
+                comparisonValue
+            ]
         };
     }
     createPaddedStringExpression(dateVar, datePart) {
         return {
             type: 'operation',
             operator: 'CONCAT',
-            args: [data_model_1.default.literal('0'), this.createUnpaddedStringExpression(dateVar, datePart)],
+            args: [data_model_1.default.literal('0'), this.createUnpaddedStringExpression(dateVar, datePart)]
         };
     }
     createUnpaddedStringExpression(dateVar, datePart) {
@@ -1013,9 +1014,9 @@ class SparqlQueryBuilder {
                 {
                     type: 'operation',
                     operator: datePart,
-                    args: [dateVar],
-                },
-            ],
+                    args: [dateVar]
+                }
+            ]
         };
     }
     createDayExpressionParts(dateVar, grouping) {