Fix describe/select *

langsamu · langsamu · commit 9dff0af82362 · 2021-04-10T14:56:21.000+01:00
diff --git a/package/package-lock.json b/package/package-lock.json
diff --git a/package/package.json b/package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sparql-blockly",
-  "version": "0.0.4-15",
+  "version": "0.0.4-16",
   "description": "A library for working with SPARQL in Blockly",
   "main": "dist/index.js",
   "license": "MIT",
diff --git a/package/src/BlockGenerator.ts b/package/src/BlockGenerator.ts
@@ -1047,7 +1047,7 @@ export default class BlockGenerator {
         return items
     }
     private static isWildcard(variables: SparqlJS.Variable[] | SparqlJS.Term[] | [SparqlJS.Wildcard]): variables is [SparqlJS.Wildcard] {
-        return variables[0] instanceof SparqlJS.Wildcard
+        return "termType" in variables[0] && variables[0].termType == "Wildcard"
     }
     private static toTriplesSameSubject(triples: SparqlJS.Triple[]): TriplesSameSubject {
         const process = (subjects: TriplesSameSubject, triple: SparqlJS.Triple) => {
diff --git a/package/test/BlockGeneratorTests.xml b/package/test/BlockGeneratorTests.xml
@@ -508,5 +508,48 @@ WHERE {
       </block>
     </xml>
   </test>
+  <test name="Describe all">
+    <sparql>
+      <![CDATA[
+DESCRIBE *
+]]>
+    </sparql>
+    <xml>
+      <block type="sparql11_query">
+        <value name="value">
+          <block type="sparql11_describequery">
+            <field name="star">*</field>
+          </block>
+        </value>
+      </block>
+    </xml>
+  </test>
+  <test name="Select all">
+    <sparql>
+      <![CDATA[
+SELECT * {}
+]]>
+    </sparql>
+    <xml>
+      <block type="sparql11_query">
+        <value name="value">
+          <block type="sparql11_selectquery">
+            <value name="select">
+              <block type="sparql11_selectclause">
+                <field name="star">*</field>
+              </block>
+            </value>
+            <value name="where">
+              <block type="sparql11_querycommon">
+                <value name="pattern">
+                  <block type="sparql11_groupgraphpattern"/>
+                </value>
+              </block>
+            </value>
+          </block>
+        </value>
+      </block>
+    </xml>
+  </test>
 </tests>
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sparql-blockly",`
`3`		`- "version": "0.0.4-15",`
	`3`	`+ "version": "0.0.4-16",`
`4`	`4`	`"description": "A library for working with SPARQL in Blockly",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1047,7 +1047,7 @@ export default class BlockGenerator {`
`1047`	`1047`	`return items`
`1048`	`1048`	`}`
`1049`	`1049`	`private static isWildcard(variables: SparqlJS.Variable[] \| SparqlJS.Term[] \| [SparqlJS.Wildcard]): variables is [SparqlJS.Wildcard] {`
`1050`		`- return variables[0] instanceof SparqlJS.Wildcard`
	`1050`	`+ return "termType" in variables[0] && variables[0].termType == "Wildcard"`
`1051`	`1051`	`}`
`1052`	`1052`	`private static toTriplesSameSubject(triples: SparqlJS.Triple[]): TriplesSameSubject {`
`1053`	`1053`	`const process = (subjects: TriplesSameSubject, triple: SparqlJS.Triple) => {`