sparql-blockly 1.0.2 → 2.0.0

package/dist/BlockGenerator.js

@@ -916,7 +916,6 @@ class BlockGenerator {
         return quads.reduce(process, new Set);
     }
 }
-exports.default = BlockGenerator;
 BlockGenerator.hierarchy = {
     unaryexpression: {
         operators: ["UMINUS", "!"],
@@ -947,6 +946,7 @@ BlockGenerator.hierarchy = {
         }
     }
 };
+exports.default = BlockGenerator;
 function toCamel(value) {
     return value.charAt(0).toLowerCase() + value.substr(1);
 }

package/dist/CodeGenerator.js

@@ -34,7 +34,7 @@ class CodeGenerator extends Blockly.Generator {
         const toWrappedGenerator = generatorName => block => this[generatorName](block);
         const addPropertyName = generatorName => [toPropertyName(generatorName), generatorName];
         const closeOverThis = ([propertyName, generatorName]) => [propertyName, toWrappedGenerator(generatorName)];
-        const addToInstance = ([propertyName, generatorFunction]) => this[propertyName] = generatorFunction;
+        const addToInstance = ([propertyName, generatorFunction]) => this.forBlock[propertyName] = generatorFunction;
         // Generator functions on this class are the ones prefixed with 'sparql'.
         // Blockly expects them to be properties of the generator instance.
         // They need to be named exactly as the block type.

package/dist/aliases.js

@@ -8,7 +8,7 @@ var RDF;
     RDF["nil"] = "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil";
     RDF["first"] = "http://www.w3.org/1999/02/22-rdf-syntax-ns#first";
     RDF["rest"] = "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest";
-})(RDF = exports.RDF || (exports.RDF = {}));
+})(RDF || (exports.RDF = RDF = {}));
 var XSD;
 (function (XSD) {
     XSD["string"] = "http://www.w3.org/2001/XMLSchema#string";
@@ -16,9 +16,9 @@ var XSD;
     XSD["decimal"] = "http://www.w3.org/2001/XMLSchema#decimal";
     XSD["double"] = "http://www.w3.org/2001/XMLSchema#double";
     XSD["boolean"] = "http://www.w3.org/2001/XMLSchema#boolean";
-})(XSD = exports.XSD || (exports.XSD = {}));
+})(XSD || (exports.XSD = XSD = {}));
 var Order;
 (function (Order) {
     Order[Order["None"] = 0] = "None";
     Order[Order["Atomic"] = 1] = "Atomic";
-})(Order = exports.Order || (exports.Order = {}));
+})(Order || (exports.Order = Order = {}));

package/dist/contextMenuUtils.js

@@ -1,32 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.collection = exports.property = exports.workspace = exports.separator = exports.primaryPaths = exports.eltPaths = exports.eltOrInversePaths = exports.sequencePaths = exports.paths = exports.verbs = exports.functionExpressions = exports.constraints = exports.primaryExpressions = exports.unaryExpressions = exports.multiplicativeExpressions = exports.additiveExpressions = exports.relationalExpressions = exports.andExpressions = exports.expressions = exports.updateGraph = exports.updateGraphOrDefault = exports.updateGraphRefAll = exports.groupGraphPattern = exports.groupGraphPatternSubs = exports.iriRefs = exports.iris = exports.triplesNodes = exports.sameSubjectTriples = exports.terms = exports.graphNodes = exports.graphTerms = exports.varsOrIris = exports.vars = void 0;
+exports.vars = vars;
+exports.varsOrIris = varsOrIris;
+exports.graphTerms = graphTerms;
+exports.graphNodes = graphNodes;
+exports.terms = terms;
+exports.sameSubjectTriples = sameSubjectTriples;
+exports.triplesNodes = triplesNodes;
+exports.iris = iris;
+exports.iriRefs = iriRefs;
+exports.groupGraphPatternSubs = groupGraphPatternSubs;
+exports.groupGraphPattern = groupGraphPattern;
+exports.updateGraphRefAll = updateGraphRefAll;
+exports.updateGraphOrDefault = updateGraphOrDefault;
+exports.updateGraph = updateGraph;
+exports.expressions = expressions;
+exports.andExpressions = andExpressions;
+exports.relationalExpressions = relationalExpressions;
+exports.additiveExpressions = additiveExpressions;
+exports.multiplicativeExpressions = multiplicativeExpressions;
+exports.unaryExpressions = unaryExpressions;
+exports.primaryExpressions = primaryExpressions;
+exports.constraints = constraints;
+exports.functionExpressions = functionExpressions;
+exports.verbs = verbs;
+exports.paths = paths;
+exports.sequencePaths = sequencePaths;
+exports.eltOrInversePaths = eltOrInversePaths;
+exports.eltPaths = eltPaths;
+exports.primaryPaths = primaryPaths;
+exports.separator = separator;
+exports.workspace = workspace;
+exports.property = property;
+exports.collection = collection;
 const Blockly = require("blockly");
 let separatorCounter = 0;
 function vars(parentBlockType, inputName, prefix) {
     property(parentBlockType, "sparql11_var1", inputName, "?s", prefix);
     property(parentBlockType, "sparql11_var2", inputName, "$s", prefix);
 }
-exports.vars = vars;
 function varsOrIris(parentBlockType, inputName, prefix) {
     vars(parentBlockType, inputName, prefix);
     iris(parentBlockType, inputName, prefix);
 }
-exports.varsOrIris = varsOrIris;
 function graphTerms(parentBlockType, inputName, prefix) {
     terms(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_anon", inputName, "[]", prefix);
     property(parentBlockType, "sparql11_blanknodelabel", inputName, "_:label", prefix);
     property(parentBlockType, "sparql11_nil", inputName, "()", prefix);
 }
-exports.graphTerms = graphTerms;
 function graphNodes(parentBlockType, inputName, prefix) {
     vars(parentBlockType, inputName, prefix);
     graphTerms(parentBlockType, inputName, prefix);
     triplesNodes(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_embtp", inputName, "<< >>", prefix);
 }
-exports.graphNodes = graphNodes;
 function terms(parentBlockType, inputName, prefix) {
     iris(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_typedliteral", inputName, "''^^<>", prefix);
@@ -35,17 +63,14 @@ function terms(parentBlockType, inputName, prefix) {
     property(parentBlockType, "sparql11_booleanliteral", inputName, "✓", prefix);
     property(parentBlockType, "sparql11_string", inputName, "''", prefix);
 }
-exports.terms = terms;
 function sameSubjectTriples(parentBlockType, inputName, prefix) {
     property(parentBlockType, "sparql11_triplessamesubject", inputName, "Triples same subject", prefix);
     triplesNodes(parentBlockType, inputName, prefix);
 }
-exports.sameSubjectTriples = sameSubjectTriples;
 function triplesNodes(parentBlockType, inputName, prefix) {
     property(parentBlockType, "sparql11_blanknodepropertylist", inputName, "Blank node property list", prefix);
     property(parentBlockType, "sparql11_collection", inputName, "Collection", prefix);
 }
-exports.triplesNodes = triplesNodes;
 function iris(parentBlockType, inputName, prefix) {
     iriRefs(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_prefixedname", inputName, ":", prefix);
@@ -53,12 +78,10 @@ function iris(parentBlockType, inputName, prefix) {
     property(parentBlockType, "sparql11_prefixednamelocalname", inputName, ":name", prefix);
     property(parentBlockType, "sparql11_prefixednameprefixlocalname", inputName, "prefix:name", prefix);
 }
-exports.iris = iris;
 function iriRefs(parentBlockType, inputName, prefix) {
     property(parentBlockType, "sparql11_iriref", inputName, "<iri>", prefix);
     property(parentBlockType, "sparql11_irirefdefault", inputName, "<>", prefix);
 }
-exports.iriRefs = iriRefs;
 function groupGraphPatternSubs(parentBlockType, inputName, prefix) {
     sameSubjectTriples(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_graphgraphpattern", inputName, "Graph", prefix);
@@ -70,68 +93,55 @@ function groupGraphPatternSubs(parentBlockType, inputName, prefix) {
     property(parentBlockType, "sparql11_optionalgraphpattern", inputName, "Optional", prefix);
     groupGraphPattern(parentBlockType, inputName, prefix);
 }
-exports.groupGraphPatternSubs = groupGraphPatternSubs;
 function groupGraphPattern(parentBlockType, inputName, prefix) {
     property(parentBlockType, "sparql11_groupgraphpattern", inputName, "{}", prefix);
 }
-exports.groupGraphPattern = groupGraphPattern;
 function updateGraphRefAll(parentBlockType, inputName, prefix) {
     updateGraphOrDefault(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_graphrefallnamed", inputName, "Named", prefix);
     property(parentBlockType, "sparql11_graphrefallall", inputName, "All", prefix);
 }
-exports.updateGraphRefAll = updateGraphRefAll;
 function updateGraphOrDefault(parentBlockType, inputName, prefix) {
     updateGraph(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_graphordefault", inputName, "Default", prefix);
 }
-exports.updateGraphOrDefault = updateGraphOrDefault;
 function updateGraph(parentBlockType, inputName, prefix) {
     property(parentBlockType, "sparql11_graphref", inputName, "Graph", prefix);
 }
-exports.updateGraph = updateGraph;
 function expressions(parentBlockType, inputName, prefix) {
     andExpressions(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_conditionalorexpression", inputName, "∨", prefix);
 }
-exports.expressions = expressions;
 function andExpressions(parentBlockType, inputName, prefix) {
     relationalExpressions(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_conditionalandexpression", inputName, "∧", prefix);
 }
-exports.andExpressions = andExpressions;
 function relationalExpressions(parentBlockType, inputName, prefix) {
     additiveExpressions(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_relationalexpression", inputName, "=≠<>≤≥", prefix);
     property(parentBlockType, "sparql11_relationalexpressionin", inputName, "in/not in", prefix);
 }
-exports.relationalExpressions = relationalExpressions;
 function additiveExpressions(parentBlockType, inputName, prefix) {
     multiplicativeExpressions(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_additiveexpression", inputName, "+−", prefix);
 }
-exports.additiveExpressions = additiveExpressions;
 function multiplicativeExpressions(parentBlockType, inputName, prefix) {
     unaryExpressions(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_multiplicativeexpression", inputName, "×÷", prefix);
 }
-exports.multiplicativeExpressions = multiplicativeExpressions;
 function unaryExpressions(parentBlockType, inputName, prefix) {
     primaryExpressions(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_unaryexpression", inputName, "¬+−", prefix);
 }
-exports.unaryExpressions = unaryExpressions;
 function primaryExpressions(parentBlockType, inputName, prefix) {
     vars(parentBlockType, inputName, prefix);
     terms(parentBlockType, inputName, prefix);
     constraints(parentBlockType, inputName, prefix);
 }
-exports.primaryExpressions = primaryExpressions;
 function constraints(parentBlockType, inputName, prefix) {
     functionExpressions(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_brackettedexpression", inputName, "()", prefix);
 }
-exports.constraints = constraints;
 function functionExpressions(parentBlockType, inputName, prefix) {
     property(parentBlockType, "sparql11_builtincall0", inputName, "𝛌0", prefix);
     property(parentBlockType, "sparql11_builtincall1", inputName, "𝛌1", prefix);
@@ -146,39 +156,32 @@ function functionExpressions(parentBlockType, inputName, prefix) {
     property(parentBlockType, "sparql11_count", inputName, "Count", prefix);
     property(parentBlockType, "sparql11_group_concat", inputName, "Group concatenation", prefix);
 }
-exports.functionExpressions = functionExpressions;
 function verbs(parentBlockType, inputName, prefix) {
     vars(parentBlockType, inputName, prefix);
     paths(parentBlockType, inputName, prefix);
 }
-exports.verbs = verbs;
 function paths(parentBlockType, inputName, prefix) {
     sequencePaths(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_pathalternative", inputName, "|", prefix);
 }
-exports.paths = paths;
 function sequencePaths(parentBlockType, inputName, prefix) {
     eltOrInversePaths(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_pathsequence", inputName, "/", prefix);
 }
-exports.sequencePaths = sequencePaths;
 function eltOrInversePaths(parentBlockType, inputName, prefix) {
     eltPaths(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_inversepath", inputName, "^", prefix);
 }
-exports.eltOrInversePaths = eltOrInversePaths;
 function eltPaths(parentBlockType, inputName, prefix) {
     primaryPaths(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_pathwithmodifier", inputName, "?*+", prefix);
 }
-exports.eltPaths = eltPaths;
 function primaryPaths(parentBlockType, inputName, prefix) {
     iris(parentBlockType, inputName, prefix);
     property(parentBlockType, "sparql11_a", inputName, "a", prefix);
     property(parentBlockType, "sparql11_negatedpath", inputName, "!", prefix);
     property(parentBlockType, "sparql11_bracketedpath", inputName, "()", prefix);
 }
-exports.primaryPaths = primaryPaths;
 function separator(parentBlockType) {
     const menuItem = {
         displayText: () => "==========",
@@ -191,7 +194,6 @@ function separator(parentBlockType) {
     };
     Blockly.ContextMenuRegistry.registry.register(menuItem);
 }
-exports.separator = separator;
 function workspace(displayText, newBlockType) {
     Blockly.ContextMenuRegistry.registry.register({
         displayText: () => displayText,
@@ -206,7 +208,6 @@ function workspace(displayText, newBlockType) {
         weight: 0,
     });
 }
-exports.workspace = workspace;
 function property(parentBlockType, newBlockType, inputName, displayText, prefix) {
     const callback = (scope) => {
         const block = scope.block.workspace.newBlock(newBlockType);
@@ -217,7 +218,6 @@ function property(parentBlockType, newBlockType, inputName, displayText, prefix)
     };
     block(parentBlockType, newBlockType, inputName, displayText, callback, prefix);
 }
-exports.property = property;
 function collection(parentBlockType, newBlockType, inputName, displayText, prefix) {
     const callback = (scope) => {
         const block = scope.block.workspace.newBlock(newBlockType);
@@ -233,7 +233,6 @@ function collection(parentBlockType, newBlockType, inputName, displayText, prefi
     };
     block(parentBlockType, newBlockType, inputName, displayText, callback, prefix);
 }
-exports.collection = collection;
 function block(parentBlockType, newBlockType, inputName, displayText, callback, prefix) {
     if (prefix) {
         displayText = `${prefix}: ${displayText}`;

package/dist/defineCustomBlocks.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const blockly_1 = require("blockly");
+const field_multilineinput_1 = require("@blockly/field-multilineinput");
 // #region Prologue
 blockly_1.Blocks["sparql11_prologueitem"] = {
     init: function () {
@@ -1270,7 +1271,7 @@ blockly_1.Blocks["sparql11_var2"] = {
 blockly_1.Blocks["sparql11_numericliteral"] = {
     init: function () {
         const valueField = new blockly_1.FieldTextInput("");
-        valueField.setValidator(value => (isNaN(parseFloat(value)) || !isFinite(value)) ? null : value);
+        valueField.setValidator(value => (isNaN(parseFloat(value)) || !isFinite(Number(value))) ? null : value);
         this.appendDummyInput()
             .appendField(valueField, "value");
         this.setInputsInline(true);
@@ -1290,7 +1291,7 @@ blockly_1.Blocks["sparql11_booleanliteral"] = {
 blockly_1.Blocks["sparql11_string"] = {
     init: function () {
         this.appendDummyInput()
-            .appendField(new blockly_1.FieldMultilineInput(""), "value");
+            .appendField(new field_multilineinput_1.FieldMultilineInput(""), "value");
         this.setInputsInline(true);
         this.setOutput(true, ["EmbSubjectOrObject", "DataValueTerm", "VarOrTermOrEmbTP", "string", "RDFLiteral", "GraphNode", "VarOrTerm", "GraphTerm", "DataBlockValue", "Expression", "ConditionalOrExpression", "ConditionalAndExpression", "RelationalExpression", "AdditiveExpression", "MultiplicativeExpression", "UnaryExpression", "PrimaryExpression"]);
         this.setColour(163);

package/dist/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.blocklyToSparql = exports.sparqlToBlockly = void 0;
+exports.sparqlToBlockly = sparqlToBlockly;
+exports.blocklyToSparql = blocklyToSparql;
 require("./initialiseBlockly");
 const BlockGenerator_1 = require("./BlockGenerator");
 const CodeGenerator_1 = require("./CodeGenerator");
@@ -11,9 +12,7 @@ function sparqlToBlockly(sparql) {
     const query = parser.parse(sparql);
     return (_a = new BlockGenerator_1.default().visit(query)) === null || _a === void 0 ? void 0 : _a.xml;
 }
-exports.sparqlToBlockly = sparqlToBlockly;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function blocklyToSparql(block) {
     return new CodeGenerator_1.default().blockToCode(block);
 }
-exports.blocklyToSparql = blocklyToSparql;