ldkit 0.6.5 → 0.8.0

package/README.md

@@ -37,18 +37,12 @@ For Deno environment, you can import LDkit like this:
 import * as ldkit from "https://deno.land/x/ldkit/mod.ts";
 ```
 
-### Set up RDF source and create data schema
+### Create data schema and set up RDF source
 
 ```ts
-import { type Context, createResource } from "ldkit";
+import { type Context, createLens } from "ldkit";
 import { dbo, rdfs, xsd } from "ldkit/namespaces";
 
-// Create a context for query engine
-const context: Context = {
-  sources: ["https://dbpedia.org/sparql"], // SPARQL endpoint
-  language: "en", // Preferred language
-};
-
 // Create a schema
 const PersonSchema = {
   "@type": dbo.Person,
@@ -60,22 +54,28 @@ const PersonSchema = {
   },
 } as const;
 
+// Create a context for query engine
+const context: Context = {
+  sources: ["https://dbpedia.org/sparql"], // SPARQL endpoint
+  language: "en", // Preferred language
+};
+
 // Create a resource using the data schema and context above
-const Person = createResource(PersonSchema, context);
+const Persons = createLens(PersonSchema, context);
 ```
 
 ### List all available data
 
 ```ts
 // List all persons
-const persons = await Person.find();
+const persons = await Persons.find();
 for (const person of persons) {
   console.log(person.name); // string
   console.log(person.birthDate); // Date
 }
 
 // Get total count of all persons
-const count = await Person.count();
+const count = await Persons.count();
 console.log(count); // number
 ```
 
@@ -83,7 +83,7 @@ console.log(count); // number
 
 ```ts
 // Get a particular person identified by IRI
-const ada = await Person.findByIri("http://dbpedia.org/resource/Ada_Lovelace");
+const ada = await Persons.findByIri("http://dbpedia.org/resource/Ada_Lovelace");
 console.log(ada?.name); // string "Ada Lovelace"
 console.log(ada?.birthDate); // Date object of 1815-12-10
 ```
@@ -92,20 +92,20 @@ console.log(ada?.birthDate); // Date object of 1815-12-10
 
 ```ts
 // Insert a new person
-Person.insert({
+Persons.insert({
   $id: "http://dbpedia.org/resource/Alan_Turing",
   name: "Alan Turing",
   birthDate: new Date("1912-06-23"),
 });
 
 // Modify a person's name
-Person.update({
+Persons.update({
   $id: "http://dbpedia.org/resource/Alan_Turing",
   name: "Not Alan Turing",
 });
 
 // Delete a person
-Person.delete("http://dbpedia.org/resource/Alan_Turing");
+Persons.delete("http://dbpedia.org/resource/Alan_Turing");
 ```
 
 More complex examples can be found in [documentation](https://ldkit.io/docs).

package/esm/library/global.js

@@ -6,7 +6,7 @@ export const setDefaultContext = (context) => {
 };
 export const resolveContext = (context) => {
     if (!context && !defaultContext) {
-        throw new Error("No context found. Please create a default context or pass one to createResource function");
+        throw new Error("No context found. Please create a default context or pass one to createLens function");
     }
     return context || defaultContext;
 };
@@ -18,7 +18,7 @@ export const resolveEngine = (engine) => {
         setDefaultEngine(new QueryEngine());
         // TODO: consider the consequences here, maybe log a warning?
         /*throw new Error(
-          "No engine found. Please create a default engine or pass one to createResource function",
+          "No engine found. Please create a default engine or pass one to createLens function",
         );*/
     }
     return engine || defaultEngine;

package/esm/library/{resource/resource.js → lens/lens.js}

@@ -3,8 +3,23 @@ import { expandSchema, } from "../schema/mod.js";
 import { decode } from "../decoder.js";
 import { QueryBuilder } from "./query_builder.js";
 import { QueryEngineProxy } from "../engine/query_engine_proxy.js";
-export const createResource = (spec, context, engine) => new Resource(spec, context, engine);
-export class Resource {
+/**
+ * Lens lets you query and update RDF data via data schema using TypeScript native data types.
+ *
+ * https://ldkit.io/docs/components/lens
+ *
+ * @param schema data schema which extends `SchemaPrototype`
+ * @param context optional `Context` - contains LDkit and query engine configuration
+ * @param engine optional Query Engine
+ * @returns Lens instance
+ */
+export const createLens = (schema, context, engine) => new Lens(schema, context, engine);
+/**
+ * @deprecated
+ * Use `createLens` instead
+ */
+export const createResource = (schema, context, engine) => new Lens(schema, context, engine);
+export class Lens {
     constructor(schema, context, engine) {
         Object.defineProperty(this, "schema", {
             enumerable: true,

package/esm/library/lens/mod.js

@@ -0,0 +1 @@
+export { createLens, createResource } from "./lens.js";

package/esm/library/rdf.js

@@ -1,5 +1,5 @@
 export { fromRdf, toRdf } from "rdf-literal";
-import { DataFactory, DefaultGraph, } from "rdf-data-factory";
+import { DataFactory, DefaultGraph } from "rdf-data-factory";
 export { DataFactory, DefaultGraph };
 export const quadsToGraph = (quads) => {
     const graph = new Map();

package/esm/library/sparql/sparql_query_builders.js

@@ -1,35 +1,73 @@
-import { build, createNumericBuilder, createTemplateBuilder, } from "./sparql_shared_builders.js";
-const OFFSET = createNumericBuilder((value) => `OFFSET ${value}\n`, { build });
-const LIMIT = createNumericBuilder((value) => `LIMIT ${value}\n`, { build, OFFSET });
-const ORDER_BY = createTemplateBuilder((value) => `ORDER BY ${value}\n`, { build, LIMIT });
-const HAVING = createTemplateBuilder((value) => `HAVING(${value})\n`, { build, LIMIT });
-const GROUP_BY = createTemplateBuilder((value) => `GROUP BY ${value}\n`, { build, HAVING, ORDER_BY, LIMIT });
-const WHERE = createTemplateBuilder((value) => `WHERE {\n${value}\n}\n`, { build, GROUP_BY, ORDER_BY, LIMIT });
-const FROM_NAMED = createTemplateBuilder((value) => `FROM NAMED ${value}\n`, { WHERE });
-const FROM = createTemplateBuilder((value) => `FROM ${value}\n`, { FROM_NAMED, WHERE });
-const _SELECT = createTemplateBuilder((value) => `SELECT ${value}\n`, { FROM, FROM_NAMED, WHERE });
-const DISTINCT = createTemplateBuilder((value) => `SELECT DISTINCT ${value}\n`, { FROM, WHERE });
-const REDUCED = createTemplateBuilder((value) => `SELECT REDUCED ${value}\n`, {
-    FROM,
-    WHERE,
+import { braces, parentheses, SparqlBuilder, } from "./sparql_shared_builders.js";
+class SparqlQueryBuilder extends SparqlBuilder {
+    OFFSET(number) {
+        return this.number(number, "OFFSET");
+    }
+    LIMIT(number) {
+        return this.number(number, "LIMIT");
+    }
+    ORDER_BY(strings, ...values) {
+        return this.template(strings, values, "ORDER BY");
+    }
+    HAVING(strings, ...values) {
+        return this.template(strings, values, "HAVING", parentheses);
+    }
+    GROUP_BY(strings, ...values) {
+        return this.template(strings, values, "GROUP BY");
+    }
+    WHERE(strings, ...values) {
+        return this.template(strings, values, "WHERE", braces);
+    }
+    FROM_NAMED(stringOrNamedNode) {
+        return this.namedNode(stringOrNamedNode, "FROM NAMED");
+    }
+    FROM(stringOrNamedNode) {
+        return this.namedNode(stringOrNamedNode, "FROM");
+    }
+    SELECT(strings, ...values) {
+        return this.template(strings, values, "SELECT");
+    }
+    SELECT_DISTINCT(strings, ...values) {
+        return this.template(strings, values, "SELECT DISTINCT");
+    }
+    SELECT_REDUCED(strings, ...values) {
+        return this.template(strings, values, "SELECT REDUCED");
+    }
+    CONSTRUCT(strings, ...values) {
+        return this.template(strings, values, "CONSTRUCT", braces);
+    }
+    CONSTRUCT_WHERE(strings, ...values) {
+        return this.template(strings, values, "CONSTRUCT WHERE", braces);
+    }
+    ASK(strings, ...values) {
+        return this.template(strings, values, "ASK", braces);
+    }
+    ASK_FROM(stringOrNamedNode) {
+        return this.namedNode(stringOrNamedNode, "ASK\nFROM");
+    }
+    ASK_FROM_NAMED(stringOrNamedNode) {
+        return this.namedNode(stringOrNamedNode, "ASK\nFROM NAMED");
+    }
+    ASK_WHERE(strings, ...values) {
+        return this.template(strings, values, "ASK\nWHERE", braces);
+    }
+    DESCRIBE(strings, ...values) {
+        return this.template(strings, values, "DESCRIBE");
+    }
+}
+export const SELECT = Object.assign((strings, ...values) => new SparqlQueryBuilder().SELECT(strings, ...values), {
+    DISTINCT: (strings, ...values) => new SparqlQueryBuilder().SELECT_DISTINCT(strings, ...values),
+    REDUCED: (strings, ...values) => new SparqlQueryBuilder().SELECT_REDUCED(strings, ...values),
+    get ALL() {
+        return new SparqlQueryBuilder().SELECT `*`;
+    },
 });
-export const SELECT = Object.assign(_SELECT, {
-    DISTINCT,
-    REDUCED,
-    ALL: _SELECT `*`,
+export const CONSTRUCT = Object.assign((strings, ...values) => new SparqlQueryBuilder().CONSTRUCT(strings, ...values), {
+    WHERE: (strings, ...values) => new SparqlQueryBuilder().CONSTRUCT_WHERE(strings, ...values),
 });
-const _CONSTRUCT = createTemplateBuilder((value) => `CONSTRUCT {\n${value}\n}\n`, { WHERE });
-const _CONSTRUCT_WHERE = createTemplateBuilder((value) => `CONSTRUCT WHERE {\n${value}\n}\n`, { build, GROUP_BY, ORDER_BY, LIMIT });
-export const CONSTRUCT = Object.assign(_CONSTRUCT, {
-    WHERE: _CONSTRUCT_WHERE,
+export const ASK = Object.assign((strings, ...values) => new SparqlQueryBuilder().ASK(strings, ...values), {
+    FROM: (stringOrNamedNode) => new SparqlQueryBuilder().ASK_FROM(stringOrNamedNode),
+    FROM_NAMED: (stringOrNamedNode) => new SparqlQueryBuilder().ASK_FROM_NAMED(stringOrNamedNode),
+    WHERE: (strings, ...values) => new SparqlQueryBuilder().ASK_WHERE(strings, ...values),
 });
-const _ASK = createTemplateBuilder((value) => `ASK {\n${value}\n}\n`, { build });
-const _ASK_FROM = createTemplateBuilder((value) => `ASK\nFROM ${value}\n`, { FROM_NAMED, WHERE });
-const _ASK_FROM_NAMED = createTemplateBuilder((value) => `ASK\nFROM NAMED ${value}\n`, { FROM_NAMED, WHERE });
-const _ASK_WHERE = createTemplateBuilder((value) => `ASK\nWHERE {\n${value}\n}\n`, { build, GROUP_BY, ORDER_BY, LIMIT });
-export const ASK = Object.assign(_ASK, {
-    FROM: _ASK_FROM,
-    FROM_NAMED: _ASK_FROM_NAMED,
-    WHERE: _ASK_WHERE,
-});
-export const DESCRIBE = createTemplateBuilder((value) => `DESCRIBE ${value}\n`, { build, FROM, FROM_NAMED, WHERE });
+export const DESCRIBE = (strings, ...values) => new SparqlQueryBuilder().DESCRIBE(strings, ...values);

package/esm/library/sparql/sparql_shared_builders.js

@@ -1,40 +1,46 @@
 import { DataFactory } from "../rdf.js";
 import { sparql } from "./sparql_tag.js";
-const createContext = (self, current, builders) => {
-    const previousQuery = self?.$partialQuery || "";
-    const context = { $partialQuery: previousQuery + current };
-    return Object.keys(builders).reduce((acc, key) => {
-        acc[key] = builders[key].bind(context);
-        return acc;
-    }, {});
-};
-export const createTemplateBuilder = (wrap, builders) => {
-    return function (strings, ...values) {
-        const self = this;
-        const inner = sparql(strings, ...values);
-        const current = wrap(inner);
-        return createContext(self, current, builders);
-    };
-};
-export const createNumericBuilder = (wrap, builders) => {
-    return function (number) {
-        const self = this;
-        const current = wrap(number);
-        return createContext(self, current, builders);
-    };
-};
-const df = new DataFactory();
-export const createNamedNodeBuilder = (wrap, builders) => {
-    return function (stringOrNamedNode) {
-        const self = this;
+export const braces = (keyword, value) => `${keyword} {\n${value}\n}\n`;
+export const parentheses = (keyword, value) => `${keyword} (${value})\n`;
+const none = (keyword, value) => `${keyword} ${value}\n`;
+export class SparqlBuilder {
+    constructor() {
+        Object.defineProperty(this, "value", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: ""
+        });
+        Object.defineProperty(this, "dataFactory", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new DataFactory()
+        });
+    }
+    build() {
+        return this.value;
+    }
+    sparql(strings, ...values) {
+        return !values || values.length < 1
+            ? sparql(strings)
+            : sparql(strings, ...values);
+    }
+    template(strings, values, keyword, wrap = none) {
+        const inputSparql = this.sparql(strings, ...values);
+        this.value += wrap(keyword, inputSparql);
+        return this;
+    }
+    namedNode(stringOrNamedNode, keyword, wrap = none) {
         const namedNode = typeof stringOrNamedNode === "string"
-            ? df.namedNode(stringOrNamedNode)
+            ? this.dataFactory.namedNode(stringOrNamedNode)
             : stringOrNamedNode;
-        const inner = sparql `${namedNode}`;
-        const current = wrap(inner);
-        return createContext(self, current, builders);
-    };
-};
-export const build = function () {
-    return this?.$partialQuery || "";
-};
+        const inputSparql = this.sparql `${namedNode}`;
+        this.value += wrap(keyword, inputSparql);
+        return this;
+    }
+    number(number, keyword, wrap = none) {
+        this.value += wrap(keyword, number.toString());
+        return this;
+    }
+}

package/esm/library/sparql/sparql_update_builders.js

@@ -1,15 +1,34 @@
-import { build, createNamedNodeBuilder, createTemplateBuilder, } from "./sparql_shared_builders.js";
-const WHERE = createTemplateBuilder((value) => `WHERE {\n${value}\n}\n`, { build });
-const USING_NAMED = createNamedNodeBuilder((value) => `USING NAMED ${value}\n`, { WHERE });
-const USING = createNamedNodeBuilder((value) => `USING ${value}\n`, { USING_NAMED, WHERE });
-const _INSERT = createTemplateBuilder((value) => `INSERT {\n${value}\n}\n`, { USING, USING_NAMED, WHERE });
-const _INSERT_DATA = createTemplateBuilder((value) => `INSERT DATA {\n${value}\n}\n`, { build });
-export const INSERT = Object.assign(_INSERT, {
-    DATA: _INSERT_DATA,
+import { braces, SparqlBuilder } from "./sparql_shared_builders.js";
+class SparqlUpdateBuilder extends SparqlBuilder {
+    WHERE(strings, ...values) {
+        return this.template(strings, values, "WHERE", braces);
+    }
+    USING_NAMED(stringOrNamedNode) {
+        return this.namedNode(stringOrNamedNode, "USING NAMED");
+    }
+    USING(stringOrNamedNode) {
+        return this.namedNode(stringOrNamedNode, "USING");
+    }
+    INSERT(strings, ...values) {
+        return this.template(strings, values, "INSERT", braces);
+    }
+    INSERT_DATA(strings, ...values) {
+        return this.template(strings, values, "INSERT DATA", braces);
+    }
+    DELETE(strings, ...values) {
+        return this.template(strings, values, "DELETE", braces);
+    }
+    DELETE_DATA(strings, ...values) {
+        return this.template(strings, values, "DELETE DATA", braces);
+    }
+    WITH(stringOrNamedNode) {
+        return this.namedNode(stringOrNamedNode, "WITH");
+    }
+}
+export const INSERT = Object.assign((strings, ...values) => new SparqlUpdateBuilder().INSERT(strings, ...values), {
+    DATA: (strings, ...values) => new SparqlUpdateBuilder().INSERT_DATA(strings, ...values),
 });
-const _DELETE = createTemplateBuilder((value) => `DELETE {\n${value}\n}\n`, { INSERT: _INSERT, USING, USING_NAMED, WHERE });
-const _DELETE_DATA = createTemplateBuilder((value) => `DELETE DATA {\n${value}\n}\n`, { build });
-export const DELETE = Object.assign(_DELETE, {
-    DATA: _DELETE_DATA,
+export const DELETE = Object.assign((strings, ...values) => new SparqlUpdateBuilder().DELETE(strings, ...values), {
+    DATA: (strings, ...values) => new SparqlUpdateBuilder().DELETE_DATA(strings, ...values),
 });
-export const WITH = createNamedNodeBuilder((value) => `WITH ${value}\n`, { build, INSERT: _INSERT, DELETE: _DELETE });
+export const WITH = (stringOrNamedNode) => new SparqlUpdateBuilder().WITH(stringOrNamedNode);

package/esm/mod.js

@@ -1,3 +1,3 @@
 export { setDefaultContext, setDefaultEngine } from "./library/global.js";
-export { createResource } from "./library/resource/mod.js";
+export { createLens, createResource } from "./library/lens/mod.js";
 export { createNamespace } from "./library/namespaces/namespace.js";

package/package.json

@@ -3,7 +3,7 @@
   "main": "./script/mod.js",
   "types": "./types/mod.d.ts",
   "name": "ldkit",
-  "version": "0.6.5",
+  "version": "0.8.0",
   "description": "LDkit, a Linked Data query toolkit for TypeScript developers",
   "homepage": "https://ldkit.io",
   "author": "Karel Klima <karelklima@gmail.com> (https://karelklima.com)",
@@ -23,31 +23,51 @@
   },
   "exports": {
     ".": {
-      "import": "./esm/mod.js",
-      "require": "./script/mod.js",
-      "types": "./types/mod.d.ts"
+      "import": {
+        "types": "./types/mod.d.ts",
+        "default": "./esm/mod.js"
+      },
+      "require": {
+        "types": "./types/mod.d.ts",
+        "default": "./script/mod.js"
+      }
     },
     "./namespaces": {
-      "import": "./esm/namespaces.js",
-      "require": "./script/namespaces.js",
-      "types": "./types/namespaces.d.ts"
+      "import": {
+        "types": "./types/namespaces.d.ts",
+        "default": "./esm/namespaces.js"
+      },
+      "require": {
+        "types": "./types/namespaces.d.ts",
+        "default": "./script/namespaces.js"
+      }
     },
     "./rdf": {
-      "import": "./esm/rdf.js",
-      "require": "./script/rdf.js",
-      "types": "./types/rdf.d.ts"
+      "import": {
+        "types": "./types/rdf.d.ts",
+        "default": "./esm/rdf.js"
+      },
+      "require": {
+        "types": "./types/rdf.d.ts",
+        "default": "./script/rdf.js"
+      }
     },
     "./sparql": {
-      "import": "./esm/sparql.js",
-      "require": "./script/sparql.js",
-      "types": "./types/sparql.d.ts"
+      "import": {
+        "types": "./types/sparql.d.ts",
+        "default": "./esm/sparql.js"
+      },
+      "require": {
+        "types": "./types/sparql.d.ts",
+        "default": "./script/sparql.js"
+      }
     }
   },
   "dependencies": {
-    "@comunica/types": "2.4.0",
-    "asynciterator": "3.7.0",
+    "@comunica/types": "2.6.8",
+    "asynciterator": "3.8.0",
     "rdf-data-factory": "1.1.1",
     "rdf-js": "4.0.2",
-    "rdf-literal": "1.3.0"
+    "rdf-literal": "1.3.1"
   }
 }

package/script/library/global.js

@@ -10,7 +10,7 @@ const setDefaultContext = (context) => {
 exports.setDefaultContext = setDefaultContext;
 const resolveContext = (context) => {
     if (!context && !defaultContext) {
-        throw new Error("No context found. Please create a default context or pass one to createResource function");
+        throw new Error("No context found. Please create a default context or pass one to createLens function");
     }
     return context || defaultContext;
 };
@@ -24,7 +24,7 @@ const resolveEngine = (engine) => {
         (0, exports.setDefaultEngine)(new mod_js_1.QueryEngine());
         // TODO: consider the consequences here, maybe log a warning?
         /*throw new Error(
-          "No engine found. Please create a default engine or pass one to createResource function",
+          "No engine found. Please create a default engine or pass one to createLens function",
         );*/
     }
     return engine || defaultEngine;

package/script/library/{resource/resource.js → lens/lens.js}

@@ -1,14 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Resource = exports.createResource = void 0;
+exports.Lens = exports.createResource = exports.createLens = void 0;
 const global_js_1 = require("../global.js");
 const mod_js_1 = require("../schema/mod.js");
 const decoder_js_1 = require("../decoder.js");
 const query_builder_js_1 = require("./query_builder.js");
 const query_engine_proxy_js_1 = require("../engine/query_engine_proxy.js");
-const createResource = (spec, context, engine) => new Resource(spec, context, engine);
+/**
+ * Lens lets you query and update RDF data via data schema using TypeScript native data types.
+ *
+ * https://ldkit.io/docs/components/lens
+ *
+ * @param schema data schema which extends `SchemaPrototype`
+ * @param context optional `Context` - contains LDkit and query engine configuration
+ * @param engine optional Query Engine
+ * @returns Lens instance
+ */
+const createLens = (schema, context, engine) => new Lens(schema, context, engine);
+exports.createLens = createLens;
+/**
+ * @deprecated
+ * Use `createLens` instead
+ */
+const createResource = (schema, context, engine) => new Lens(schema, context, engine);
 exports.createResource = createResource;
-class Resource {
+class Lens {
     constructor(schema, context, engine) {
         Object.defineProperty(this, "schema", {
             enumerable: true,
@@ -97,4 +113,4 @@ class Resource {
         return this.updateQuery(q);
     }
 }
-exports.Resource = Resource;
+exports.Lens = Lens;

package/script/library/lens/mod.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createResource = exports.createLens = void 0;
+var lens_js_1 = require("./lens.js");
+Object.defineProperty(exports, "createLens", { enumerable: true, get: function () { return lens_js_1.createLens; } });
+Object.defineProperty(exports, "createResource", { enumerable: true, get: function () { return lens_js_1.createResource; } });

package/script/library/sparql/sparql_query_builders.js

@@ -2,37 +2,76 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DESCRIBE = exports.ASK = exports.CONSTRUCT = exports.SELECT = void 0;
 const sparql_shared_builders_js_1 = require("./sparql_shared_builders.js");
-const OFFSET = (0, sparql_shared_builders_js_1.createNumericBuilder)((value) => `OFFSET ${value}\n`, { build: sparql_shared_builders_js_1.build });
-const LIMIT = (0, sparql_shared_builders_js_1.createNumericBuilder)((value) => `LIMIT ${value}\n`, { build: sparql_shared_builders_js_1.build, OFFSET });
-const ORDER_BY = (0, sparql_shared_builders_js_1.createTemplateBuilder)((value) => `ORDER BY ${value}\n`, { build: sparql_shared_builders_js_1.build, LIMIT });
-const HAVING = (0, sparql_shared_builders_js_1.createTemplateBuilder)((value) => `HAVING(${value})\n`, { build: sparql_shared_builders_js_1.build, LIMIT });
-const GROUP_BY = (0, sparql_shared_builders_js_1.createTemplateBuilder)((value) => `GROUP BY ${value}\n`, { build: sparql_shared_builders_js_1.build, HAVING, ORDER_BY, LIMIT });
-const WHERE = (0, sparql_shared_builders_js_1.createTemplateBuilder)((value) => `WHERE {\n${value}\n}\n`, { build: sparql_shared_builders_js_1.build, GROUP_BY, ORDER_BY, LIMIT });
-const FROM_NAMED = (0, sparql_shared_builders_js_1.createTemplateBuilder)((value) => `FROM NAMED ${value}\n`, { WHERE });
-const FROM = (0, sparql_shared_builders_js_1.createTemplateBuilder)((value) => `FROM ${value}\n`, { FROM_NAMED, WHERE });
-const _SELECT = (0, sparql_shared_builders_js_1.createTemplateBuilder)((value) => `SELECT ${value}\n`, { FROM, FROM_NAMED, WHERE });
-const DISTINCT = (0, sparql_shared_builders_js_1.createTemplateBuilder)((value) => `SELECT DISTINCT ${value}\n`, { FROM, WHERE });
-const REDUCED = (0, sparql_shared_builders_js_1.createTemplateBuilder)((value) => `SELECT REDUCED ${value}\n`, {
-    FROM,
-    WHERE,
+class SparqlQueryBuilder extends sparql_shared_builders_js_1.SparqlBuilder {
+    OFFSET(number) {
+        return this.number(number, "OFFSET");
+    }
+    LIMIT(number) {
+        return this.number(number, "LIMIT");
+    }
+    ORDER_BY(strings, ...values) {
+        return this.template(strings, values, "ORDER BY");
+    }
+    HAVING(strings, ...values) {
+        return this.template(strings, values, "HAVING", sparql_shared_builders_js_1.parentheses);
+    }
+    GROUP_BY(strings, ...values) {
+        return this.template(strings, values, "GROUP BY");
+    }
+    WHERE(strings, ...values) {
+        return this.template(strings, values, "WHERE", sparql_shared_builders_js_1.braces);
+    }
+    FROM_NAMED(stringOrNamedNode) {
+        return this.namedNode(stringOrNamedNode, "FROM NAMED");
+    }
+    FROM(stringOrNamedNode) {
+        return this.namedNode(stringOrNamedNode, "FROM");
+    }
+    SELECT(strings, ...values) {
+        return this.template(strings, values, "SELECT");
+    }
+    SELECT_DISTINCT(strings, ...values) {
+        return this.template(strings, values, "SELECT DISTINCT");
+    }
+    SELECT_REDUCED(strings, ...values) {
+        return this.template(strings, values, "SELECT REDUCED");
+    }
+    CONSTRUCT(strings, ...values) {
+        return this.template(strings, values, "CONSTRUCT", sparql_shared_builders_js_1.braces);
+    }
+    CONSTRUCT_WHERE(strings, ...values) {
+        return this.template(strings, values, "CONSTRUCT WHERE", sparql_shared_builders_js_1.braces);
+    }
+    ASK(strings, ...values) {
+        return this.template(strings, values, "ASK", sparql_shared_builders_js_1.braces);
+    }
+    ASK_FROM(stringOrNamedNode) {
+        return this.namedNode(stringOrNamedNode, "ASK\nFROM");
+    }
+    ASK_FROM_NAMED(stringOrNamedNode) {
+        return this.namedNode(stringOrNamedNode, "ASK\nFROM NAMED");
+    }
+    ASK_WHERE(strings, ...values) {
+        return this.template(strings, values, "ASK\nWHERE", sparql_shared_builders_js_1.braces);
+    }
+    DESCRIBE(strings, ...values) {
+        return this.template(strings, values, "DESCRIBE");
+    }
+}
+exports.SELECT = Object.assign((strings, ...values) => new SparqlQueryBuilder().SELECT(strings, ...values), {
+    DISTINCT: (strings, ...values) => new SparqlQueryBuilder().SELECT_DISTINCT(strings, ...values),
+    REDUCED: (strings, ...values) => new SparqlQueryBuilder().SELECT_REDUCED(strings, ...values),
+    get ALL() {
+        return new SparqlQueryBuilder().SELECT `*`;
+    },
 });
-exports.SELECT = Object.assign(_SELECT, {
-    DISTINCT,
-    REDUCED,
-    ALL: _SELECT `*`,
+exports.CONSTRUCT = Object.assign((strings, ...values) => new SparqlQueryBuilder().CONSTRUCT(strings, ...values), {
+    WHERE: (strings, ...values) => new SparqlQueryBuilder().CONSTRUCT_WHERE(strings, ...values),
 });
-const _CONSTRUCT = (0, sparql_shared_builders_js_1.createTemplateBuilder)((value) => `CONSTRUCT {\n${value}\n}\n`, { WHERE });
-const _CONSTRUCT_WHERE = (0, sparql_shared_builders_js_1.createTemplateBuilder)((value) => `CONSTRUCT WHERE {\n${value}\n}\n`, { build: sparql_shared_builders_js_1.build, GROUP_BY, ORDER_BY, LIMIT });
-exports.CONSTRUCT = Object.assign(_CONSTRUCT, {
-    WHERE: _CONSTRUCT_WHERE,
+exports.ASK = Object.assign((strings, ...values) => new SparqlQueryBuilder().ASK(strings, ...values), {
+    FROM: (stringOrNamedNode) => new SparqlQueryBuilder().ASK_FROM(stringOrNamedNode),
+    FROM_NAMED: (stringOrNamedNode) => new SparqlQueryBuilder().ASK_FROM_NAMED(stringOrNamedNode),
+    WHERE: (strings, ...values) => new SparqlQueryBuilder().ASK_WHERE(strings, ...values),
 });
-const _ASK = (0, sparql_shared_builders_js_1.createTemplateBuilder)((value) => `ASK {\n${value}\n}\n`, { build: sparql_shared_builders_js_1.build });
-const _ASK_FROM = (0, sparql_shared_builders_js_1.createTemplateBuilder)((value) => `ASK\nFROM ${value}\n`, { FROM_NAMED, WHERE });
-const _ASK_FROM_NAMED = (0, sparql_shared_builders_js_1.createTemplateBuilder)((value) => `ASK\nFROM NAMED ${value}\n`, { FROM_NAMED, WHERE });
-const _ASK_WHERE = (0, sparql_shared_builders_js_1.createTemplateBuilder)((value) => `ASK\nWHERE {\n${value}\n}\n`, { build: sparql_shared_builders_js_1.build, GROUP_BY, ORDER_BY, LIMIT });
-exports.ASK = Object.assign(_ASK, {
-    FROM: _ASK_FROM,
-    FROM_NAMED: _ASK_FROM_NAMED,
-    WHERE: _ASK_WHERE,
-});
-exports.DESCRIBE = (0, sparql_shared_builders_js_1.createTemplateBuilder)((value) => `DESCRIBE ${value}\n`, { build: sparql_shared_builders_js_1.build, FROM, FROM_NAMED, WHERE });
+const DESCRIBE = (strings, ...values) => new SparqlQueryBuilder().DESCRIBE(strings, ...values);
+exports.DESCRIBE = DESCRIBE;