@traqula/test-utils 1.1.0 → 1.1.2

package/dist/esm/lib/generators/generators.js.map

@@ -1 +1 @@
-{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../../lib/generators/generators.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable import/no-nodejs-modules */\nimport { readdirSync } from 'node:fs';\nimport { join } from 'node:path';\nimport { readFile } from '../fileUtils.js';\nimport { getStaticFilePath } from './utils.js';\n\ninterface PositiveTest {\n  name: string;\n  statics: () => Promise<{\n    query: string;\n    astWithSource: unknown;\n    astNoSource: unknown;\n    autoGen: string;\n    autoGenCompact: string;\n  }>;\n}\n\nexport function* positiveTest(\n  type: 'paths' | 'sparql-1-1' | 'sparql-1-2',\n  filter?: (name: string) => boolean,\n): Generator<PositiveTest> {\n  const astDir = getStaticFilePath('ast');\n  const jsonSourceTrackedDir = join(astDir, 'ast-source-tracked', type);\n  const jsonNonSourceTrackedDir = join(astDir, 'ast-no-source-tracked', type);\n  const sparqlDir = join(astDir, 'sparql', type);\n  const sparqlGeneratedDir = join(astDir, 'sparql-generated', type);\n  const sparqlGenCompactDir = join(astDir, 'sparql-generated-compact', type);\n  const statics = readdirSync(jsonSourceTrackedDir);\n  for (const file of statics) {\n    if (filter && !filter(file.replace('.json', ''))) {\n      continue;\n    }\n    const name = file.replace(/\\.json$/u, '');\n    yield {\n      name,\n      statics: async() => {\n        const query = await readFile(join(sparqlDir, `${name}.sparql`));\n        const sourceTracked = await readFile(join(jsonSourceTrackedDir, file));\n        let noSourceTracked: string;\n        try {\n          noSourceTracked = await readFile(join(jsonNonSourceTrackedDir, file));\n        } catch {\n          noSourceTracked = '{}';\n        }\n        let autoGen = '';\n        try {\n          autoGen = await readFile(join(sparqlGeneratedDir, `${name}.sparql`));\n        } catch { /* Already initialized */ }\n        let autoGenCompact = '';\n        try {\n          autoGenCompact = await readFile(join(sparqlGenCompactDir, `${name}.sparql`));\n        } catch { /* Already initialized */ }\n        return {\n          query,\n          astWithSource: JSON.parse(sourceTracked),\n          astNoSource: JSON.parse(noSourceTracked),\n          autoGen,\n          autoGenCompact,\n        };\n      },\n    };\n  }\n}\n\nexport interface NegativeTest {\n  name: string;\n  statics: () => Promise<{\n    query: string;\n  }>;\n}\n\nexport function* negativeTest(\n  type: 'sparql-1-1-invalid' | 'sparql-1-2-invalid',\n  filter?: (name: string) => boolean,\n): Generator<NegativeTest> {\n  const astDir = getStaticFilePath('ast');\n  const sparqlGeneratedDir = join(astDir, 'sparql', type);\n  const statics = readdirSync(sparqlGeneratedDir).filter(f => f.endsWith('.sparql'));\n  for (const file of statics) {\n    if (filter && !filter(file.replace('.sparql', ''))) {\n      continue;\n    }\n    const name = file.replace(/\\.sparql$/u, '');\n    yield {\n      name,\n      statics: async() => {\n        const query = await readFile(join(sparqlGeneratedDir, file));\n        return {\n          query,\n        };\n      },\n    };\n  }\n}\n"]}
+{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../../lib/generators/generators.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable import/no-nodejs-modules */\nimport { readdirSync } from 'node:fs';\nimport { join } from 'node:path';\nimport { readFile } from '../fileUtils.js';\nimport { getStaticFilePath } from './utils.js';\n\ninterface PositiveTest {\n  name: string;\n  statics: () => Promise<{\n    query: string;\n    astWithSource: unknown;\n    astNoSource: unknown;\n    autoGen: string;\n    autoGenCompact: string;\n  }>;\n}\n\n/**\n * Yields test cases for positive SPARQL parser tests.\n * Each test provides the query string, expected ASTs (with and without source tracking),\n * and auto-generated query strings (pretty-printed and compact).\n * @param type - The test suite to use.\n * @param filter - Optional filter predicate applied to the test file name (without extension).\n */\nexport function* positiveTest(\n  type: 'paths' | 'sparql-1-1' | 'sparql-1-2',\n  filter?: (name: string) => boolean,\n): Generator<PositiveTest> {\n  const astDir = getStaticFilePath('ast');\n  const jsonSourceTrackedDir = join(astDir, 'ast-source-tracked', type);\n  const jsonNonSourceTrackedDir = join(astDir, 'ast-no-source-tracked', type);\n  const sparqlDir = join(astDir, 'sparql', type);\n  const sparqlGeneratedDir = join(astDir, 'sparql-generated', type);\n  const sparqlGenCompactDir = join(astDir, 'sparql-generated-compact', type);\n  const statics = readdirSync(jsonSourceTrackedDir);\n  for (const file of statics) {\n    if (filter && !filter(file.replace('.json', ''))) {\n      continue;\n    }\n    const name = file.replace(/\\.json$/u, '');\n    yield {\n      name,\n      statics: async() => {\n        const query = await readFile(join(sparqlDir, `${name}.sparql`));\n        const sourceTracked = await readFile(join(jsonSourceTrackedDir, file));\n        let noSourceTracked: string;\n        try {\n          noSourceTracked = await readFile(join(jsonNonSourceTrackedDir, file));\n        } catch {\n          noSourceTracked = '{}';\n        }\n        let autoGen = '';\n        try {\n          autoGen = await readFile(join(sparqlGeneratedDir, `${name}.sparql`));\n        } catch { /* Already initialized */ }\n        let autoGenCompact = '';\n        try {\n          autoGenCompact = await readFile(join(sparqlGenCompactDir, `${name}.sparql`));\n        } catch { /* Already initialized */ }\n        return {\n          query,\n          astWithSource: JSON.parse(sourceTracked),\n          astNoSource: JSON.parse(noSourceTracked),\n          autoGen,\n          autoGenCompact,\n        };\n      },\n    };\n  }\n}\n\nexport interface NegativeTest {\n  name: string;\n  statics: () => Promise<{\n    query: string;\n  }>;\n}\n\n/**\n * Yields test cases for negative (invalid) SPARQL parser tests.\n * Each test provides a query string that should fail to parse.\n * @param type - The test suite to use.\n * @param filter - Optional filter predicate applied to the test file name (without extension).\n */\nexport function* negativeTest(\n  type: 'sparql-1-1-invalid' | 'sparql-1-2-invalid',\n  filter?: (name: string) => boolean,\n): Generator<NegativeTest> {\n  const astDir = getStaticFilePath('ast');\n  const sparqlGeneratedDir = join(astDir, 'sparql', type);\n  const statics = readdirSync(sparqlGeneratedDir).filter(f => f.endsWith('.sparql'));\n  for (const file of statics) {\n    if (filter && !filter(file.replace('.sparql', ''))) {\n      continue;\n    }\n    const name = file.replace(/\\.sparql$/u, '');\n    yield {\n      name,\n      statics: async() => {\n        const query = await readFile(join(sparqlGeneratedDir, file));\n        return {\n          query,\n        };\n      },\n    };\n  }\n}\n"]}

package/dist/esm/lib/generators/utils.d.ts

@@ -1 +1,6 @@
+/**
+ * Resolve a path relative to the test-utils statics directory.
+ * @param paths - Path segments to join after the statics root.
+ * @returns The absolute path to the static fixture.
+ */
 export declare function getStaticFilePath(...paths: string[]): string;

package/dist/esm/lib/generators/utils.js

@@ -3,6 +3,11 @@ import path from 'node:path';
 // Path.resolve() returns process.cwd() — the monorepo root when running via vitest.
 // This avoids __dirname (CJS-only) and import.meta.url (ESM-only).
 const staticsPath = path.resolve('packages/test-utils/statics');
+/**
+ * Resolve a path relative to the test-utils statics directory.
+ * @param paths - Path segments to join after the statics root.
+ * @returns The absolute path to the static fixture.
+ */
 export function getStaticFilePath(...paths) {
     return path.join(staticsPath, ...paths);
 }

package/dist/esm/lib/generators/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/generators/utils.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,oFAAoF;AACpF,mEAAmE;AACnE,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;AAEhE,MAAM,UAAU,iBAAiB,CAAC,GAAG,KAAe;IAClD,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,CAAC;AAC1C,CAAC","sourcesContent":["/* eslint-disable import/no-nodejs-modules */\nimport path from 'node:path';\n\n// Path.resolve() returns process.cwd() — the monorepo root when running via vitest.\n// This avoids __dirname (CJS-only) and import.meta.url (ESM-only).\nconst staticsPath = path.resolve('packages/test-utils/statics');\n\nexport function getStaticFilePath(...paths: string[]): string {\n  return path.join(staticsPath, ...paths);\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/generators/utils.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,oFAAoF;AACpF,mEAAmE;AACnE,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;AAEhE;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,GAAG,KAAe;IAClD,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,CAAC;AAC1C,CAAC","sourcesContent":["/* eslint-disable import/no-nodejs-modules */\nimport path from 'node:path';\n\n// Path.resolve() returns process.cwd() — the monorepo root when running via vitest.\n// This avoids __dirname (CJS-only) and import.meta.url (ESM-only).\nconst staticsPath = path.resolve('packages/test-utils/statics');\n\n/**\n * Resolve a path relative to the test-utils statics directory.\n * @param paths - Path segments to join after the statics root.\n * @returns The absolute path to the static fixture.\n */\nexport function getStaticFilePath(...paths: string[]): string {\n  return path.join(staticsPath, ...paths);\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@traqula/test-utils",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Test utils used by the Traqula monorepo",
   "lsd:module": true,
   "license": "MIT",
@@ -49,5 +49,5 @@
   "devDependencies": {
     "@rdfjs/types": "^2.0.0"
   },
-  "gitHead": "ecbed266b9247b7600d4d7185a98b2ead74e33b9"
+  "gitHead": "4a8a40e902755a39eab0d9f4f144e2e46d44b4d2"
 }

package/statics/algebra/algebra/sparql12/select-variable-reuse.json

@@ -0,0 +1,137 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "group",
+        "input": {
+          "type": "values",
+          "variables": [
+            {
+              "termType": "Variable",
+              "value": "v"
+            }
+          ],
+          "bindings": [
+            {
+              "v": {
+                "termType": "Literal",
+                "value": "0",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            },
+            {
+              "v": {
+                "termType": "Literal",
+                "value": "1",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            },
+            {
+              "v": {
+                "termType": "Literal",
+                "value": "2",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            },
+            {
+              "v": {
+                "termType": "Literal",
+                "value": "3",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            }
+          ]
+        },
+        "variables": [],
+        "aggregates": [
+          {
+            "type": "expression",
+            "subType": "aggregate",
+            "aggregator": "count",
+            "expression": {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "v"
+              }
+            },
+            "distinct": false,
+            "variable": {
+              "termType": "Variable",
+              "value": "var0"
+            }
+          }
+        ]
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "count"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "var0"
+        }
+      }
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "countPlusOne"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "+",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "count"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "1",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "count"
+    },
+    {
+      "termType": "Variable",
+      "value": "countPlusOne"
+    }
+  ]
+}

package/statics/algebra/algebra-blank-to-var/sparql12/select-variable-reuse.json

@@ -0,0 +1,137 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "group",
+        "input": {
+          "type": "values",
+          "variables": [
+            {
+              "termType": "Variable",
+              "value": "v"
+            }
+          ],
+          "bindings": [
+            {
+              "v": {
+                "termType": "Literal",
+                "value": "0",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            },
+            {
+              "v": {
+                "termType": "Literal",
+                "value": "1",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            },
+            {
+              "v": {
+                "termType": "Literal",
+                "value": "2",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            },
+            {
+              "v": {
+                "termType": "Literal",
+                "value": "3",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            }
+          ]
+        },
+        "variables": [],
+        "aggregates": [
+          {
+            "type": "expression",
+            "subType": "aggregate",
+            "aggregator": "count",
+            "expression": {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "v"
+              }
+            },
+            "distinct": false,
+            "variable": {
+              "termType": "Variable",
+              "value": "var0"
+            }
+          }
+        ]
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "count"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "var0"
+        }
+      }
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "countPlusOne"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "+",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "count"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "1",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "count"
+    },
+    {
+      "termType": "Variable",
+      "value": "countPlusOne"
+    }
+  ]
+}

package/statics/algebra/canonical-sparql/base/sparql-1.1/values/values-many-once.sparql

@@ -1,5 +1,5 @@
 SELECT ?y ?z WHERE {
   VALUES( ?y ?z ){
-    ( <http://example.com/ns#a><http://example.com/ns#b> )
+    ( <http://example.com/ns#a> <http://example.com/ns#b> )
   }
 }

package/statics/algebra/canonical-sparql/base/sparql12/select-variable-reuse.sparql

@@ -0,0 +1,8 @@
+SELECT ( COUNT( ?v ) AS ?count ) ( ( ?count + "1"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?countPlusOne ) WHERE {
+  VALUES ?v {
+    "0"^^<http://www.w3.org/2001/XMLSchema#integer>
+    "1"^^<http://www.w3.org/2001/XMLSchema#integer>
+    "2"^^<http://www.w3.org/2001/XMLSchema#integer>
+    "3"^^<http://www.w3.org/2001/XMLSchema#integer>
+  }
+}

package/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/values-many-once.sparql

@@ -1,5 +1,5 @@
 SELECT ?y ?z WHERE {
   VALUES( ?y ?z ){
-    ( <http://example.com/ns#a><http://example.com/ns#b> )
+    ( <http://example.com/ns#a> <http://example.com/ns#b> )
   }
 }

package/statics/algebra/canonical-sparql/blank-to-var/sparql12/select-variable-reuse.sparql

@@ -0,0 +1,8 @@
+SELECT ( COUNT( ?v ) AS ?count ) ( ( ?count + "1"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?countPlusOne ) WHERE {
+  VALUES ?v {
+    "0"^^<http://www.w3.org/2001/XMLSchema#integer>
+    "1"^^<http://www.w3.org/2001/XMLSchema#integer>
+    "2"^^<http://www.w3.org/2001/XMLSchema#integer>
+    "3"^^<http://www.w3.org/2001/XMLSchema#integer>
+  }
+}

package/statics/algebra/sparql/sparql12/select-variable-reuse.sparql

@@ -0,0 +1,3 @@
+SELECT (COUNT(?v) AS ?count) (?count + 1 AS ?countPlusOne) WHERE {
+  VALUES ?v { 0 1 2 3 }
+}

package/statics/ast/ast-source-tracked/sparql-1-1/note-as-var-not-in-term-subquery.json

@@ -0,0 +1,166 @@
+{
+  "context": [],
+  "subType": "select",
+  "where": {
+    "type": "pattern",
+    "subType": "group",
+    "patterns": [
+      {
+        "type": "query",
+        "subType": "select",
+        "where": {
+          "type": "pattern",
+          "subType": "group",
+          "patterns": [
+            {
+              "type": "pattern",
+              "subType": "bgp",
+              "triples": [
+                {
+                  "type": "triple",
+                  "subject": {
+                    "type": "term",
+                    "subType": "variable",
+                    "value": "y",
+                    "loc": {
+                      "sourceLocationType": "source",
+                      "start": 43,
+                      "end": 45
+                    }
+                  },
+                  "predicate": {
+                    "type": "term",
+                    "subType": "variable",
+                    "value": "p",
+                    "loc": {
+                      "sourceLocationType": "source",
+                      "start": 46,
+                      "end": 48
+                    }
+                  },
+                  "object": {
+                    "type": "term",
+                    "subType": "variable",
+                    "value": "o",
+                    "loc": {
+                      "sourceLocationType": "source",
+                      "start": 49,
+                      "end": 51
+                    }
+                  },
+                  "loc": {
+                    "sourceLocationType": "source",
+                    "start": 43,
+                    "end": 51
+                  }
+                }
+              ],
+              "loc": {
+                "sourceLocationType": "source",
+                "start": 43,
+                "end": 51
+              }
+            }
+          ],
+          "loc": {
+            "sourceLocationType": "source",
+            "start": 41,
+            "end": 53
+          }
+        },
+        "datasets": {
+          "type": "datasetClauses",
+          "clauses": [],
+          "loc": {
+            "sourceLocationType": "noMaterialize"
+          }
+        },
+        "context": [],
+        "solutionModifiers": {},
+        "variables": [
+          {
+            "type": "term",
+            "subType": "variable",
+            "value": "y",
+            "loc": {
+              "sourceLocationType": "source",
+              "start": 32,
+              "end": 34
+            }
+          }
+        ],
+        "loc": {
+          "sourceLocationType": "source",
+          "start": 25,
+          "end": 53
+        }
+      }
+    ],
+    "loc": {
+      "sourceLocationType": "source",
+      "start": 23,
+      "end": 55
+    }
+  },
+  "solutionModifiers": {},
+  "datasets": {
+    "type": "datasetClauses",
+    "clauses": [],
+    "loc": {
+      "sourceLocationType": "noMaterialize"
+    }
+  },
+  "variables": [
+    {
+      "type": "pattern",
+      "subType": "bind",
+      "expression": {
+        "type": "term",
+        "subType": "literal",
+        "value": "1",
+        "langOrIri": {
+          "type": "term",
+          "subType": "namedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#integer",
+          "loc": {
+            "sourceLocationType": "noMaterialize"
+          }
+        },
+        "loc": {
+          "sourceLocationType": "source",
+          "start": 8,
+          "end": 9
+        }
+      },
+      "variable": {
+        "type": "term",
+        "subType": "variable",
+        "value": "x",
+        "loc": {
+          "sourceLocationType": "source",
+          "start": 13,
+          "end": 15
+        }
+      },
+      "loc": {
+        "sourceLocationType": "source",
+        "start": 7,
+        "end": 16
+      }
+    }
+  ],
+  "loc": {
+    "sourceLocationType": "inlinedSource",
+    "newSource": "SELECT (1 AS ?x) WHERE { SELECT ?y WHERE { ?y ?p ?o } }\n",
+    "start": 0,
+    "end": 9007199254740991,
+    "loc": {
+      "sourceLocationType": "source",
+      "start": 0,
+      "end": 55
+    },
+    "startOnNew": 0,
+    "endOnNew": 55
+  },
+  "type": "query"
+}