@traqula/test-utils 0.0.1-alpha.148 → 0.0.1-alpha.9

package/lib/index.d.ts

@@ -2,3 +2,4 @@ export * from './matchers/toEqualParsedQuery';
 export * from './matchers/vitest';
 export * from './statics/generators';
 export * from './Sparql11NotesTest';
+export * from './fileUtils';

package/lib/index.js

@@ -2,4 +2,5 @@ export * from './matchers/toEqualParsedQuery';
 export * from './matchers/vitest';
 export * from './statics/generators';
 export * from './Sparql11NotesTest';
+export * from './fileUtils';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC","sourcesContent":["export * from './matchers/toEqualParsedQuery';\nexport * from './matchers/vitest';\nexport * from './statics/generators';\nexport * from './Sparql11NotesTest';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC","sourcesContent":["export * from './matchers/toEqualParsedQuery';\nexport * from './matchers/vitest';\nexport * from './statics/generators';\nexport * from './Sparql11NotesTest';\nexport * from './fileUtils';\n"]}

package/lib/matchers/toEqualParsedQuery.js

@@ -1,9 +1,24 @@
-import { BlankNode, DefaultGraph, NamedNode, Quad, Variable } from 'rdf-data-factory';
 import { expect } from 'vitest';
-import { Wildcard } from '@traqula/core';
 expect.extend({
     toEqualParsedQuery(received, expected) {
-        const pass = objectsEqual(received, expected);
+        const pass = objectsEqual(received, expected, () => false, []);
+        const message = pass ?
+            () => `${this.utils.matcherHint('toEqualParsedQuery')}\n\n` +
+                `Expected: ${this.utils.printExpected(expected)}\n` +
+                `Received: ${this.utils.printReceived(received)}` :
+            () => {
+                const diffString = this.utils.diff(expected, received, {
+                    expand: this.expand,
+                });
+                return (`${this.utils.matcherHint('toEqualParsedQuery')}\n\n${diffString && diffString.includes('- Expect') ?
+                    `Difference:\n\n${diffString}` :
+                    `Expected: ${this.utils.printExpected(expected)}\n` +
+                        `Received: ${this.utils.printReceived(received)}`}`);
+            };
+        return { pass, message };
+    },
+    toEqualParsedQueryIgnoring(received, selector, ignoreKeys, expected) {
+        const pass = objectsEqual(received, expected, selector, ignoreKeys);
         const message = pass ?
             () => `${this.utils.matcherHint('toEqualParsedQuery')}\n\n` +
                 `Expected: ${this.utils.printExpected(expected)}\n` +
@@ -21,7 +36,7 @@ expect.extend({
     },
 });
 // We cannot use native instanceOf to test whether expected is a Term!
-function objectsEqual(received, expected) {
+function objectsEqual(received, expected, selector, ignoreKeys) {
     if (received === undefined || received === null || isPrimitive(received)) {
         return received === expected;
     }
@@ -45,7 +60,7 @@ function objectsEqual(received, expected) {
             return false;
         }
         for (const [i, element] of received.entries()) {
-            if (!objectsEqual(element, expected[i])) {
+            if (!objectsEqual(element, expected[i], selector, ignoreKeys)) {
                 return false;
             }
         }
@@ -56,10 +71,14 @@ function objectsEqual(received, expected) {
             return false;
         }
         const keys_first = Object.keys(received);
+        const receivedMatches = selector(received);
         for (const key of keys_first) {
+            if (receivedMatches && ignoreKeys.includes(key)) {
+                continue;
+            }
             // eslint-disable-next-line ts/ban-ts-comment
             // @ts-expect-error TS7053
-            if (!objectsEqual(received[key], expected[key])) {
+            if (!objectsEqual(received[key], expected[key], selector, ignoreKeys)) {
                 return false;
             }
         }
@@ -68,7 +87,7 @@ function objectsEqual(received, expected) {
         for (const key of keys_second) {
             // eslint-disable-next-line ts/ban-ts-comment
             // @ts-expect-error TS7053
-            if (!objectsEqual(received[key], expected[key])) {
+            if (!objectsEqual(received[key], expected[key], selector, ignoreKeys)) {
                 return false;
             }
         }
@@ -77,12 +96,7 @@ function objectsEqual(received, expected) {
 }
 // If true, the value is a term. With ts annotation
 function isTerm(value) {
-    return value instanceof DefaultGraph ||
-        value instanceof NamedNode ||
-        value instanceof BlankNode ||
-        value instanceof Variable ||
-        value instanceof Wildcard ||
-        value instanceof Quad;
+    return false;
 }
 function isPrimitive(value) {
     return typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean';

package/lib/matchers/toEqualParsedQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"toEqualParsedQuery.js","sourceRoot":"","sources":["toEqualParsedQuery.ts"],"names":[],"mappings":"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","sourcesContent":["import { BlankNode, DefaultGraph, NamedNode, Quad, Variable } from 'rdf-data-factory';\nimport { expect } from 'vitest';\nimport { Wildcard } from '@traqula/core';\n\nexpect.extend({\n  toEqualParsedQuery(received, expected) {\n    const pass = objectsEqual(received, expected);\n    const message = pass ?\n        () =>\n          `${this.utils.matcherHint('toEqualParsedQuery')\n        }\\n\\n` +\n        `Expected: ${this.utils.printExpected(expected)}\\n` +\n        `Received: ${this.utils.printReceived(received)}` :\n        () => {\n          const diffString = this.utils.diff(expected, received, {\n            expand: this.expand,\n          });\n          return (\n            `${this.utils.matcherHint('toEqualParsedQuery')\n          }\\n\\n${\n          diffString && diffString.includes('- Expect') ?\n            `Difference:\\n\\n${diffString}` :\n            `Expected: ${this.utils.printExpected(expected)}\\n` +\n            `Received: ${this.utils.printReceived(received)}`}`\n          );\n        };\n\n    return { pass, message };\n  },\n});\n\n// We cannot use native instanceOf to test whether expected is a Term!\nfunction objectsEqual(received: unknown, expected: unknown): boolean {\n  if (received === undefined || received === null || isPrimitive(received)) {\n    return received === expected;\n  }\n\n  if (isTerm(received)) {\n    // eslint-disable-next-line ts/ban-ts-comment\n    // @ts-expect-error TS2345\n    return received.equals(expected);\n  }\n  if (isTerm(expected)) {\n    // eslint-disable-next-line ts/ban-ts-comment\n    // @ts-expect-error TS2345\n    return expected.equals(received);\n  }\n  //  York\n  // test\n  if (Array.isArray(received)) {\n    if (!Array.isArray(expected)) {\n      return false;\n    }\n    if (received.length !== expected.length) {\n      return false;\n    }\n    for (const [ i, element ] of received.entries()) {\n      if (!objectsEqual(element, expected[i])) {\n        return false;\n      }\n    }\n  } else {\n    // Received == object\n    if (expected === undefined || expected === null || isPrimitive(expected) || Array.isArray(expected)) {\n      return false;\n    }\n    const keys_first = Object.keys(received);\n\n    for (const key of keys_first) {\n      // eslint-disable-next-line ts/ban-ts-comment\n      // @ts-expect-error TS7053\n      if (!objectsEqual(received[key], expected[key])) {\n        return false;\n      }\n    }\n\n    // We do this to make sure that we are not missing keys in the received object\n    const keys_second = Object.keys(expected);\n    for (const key of keys_second) {\n      // eslint-disable-next-line ts/ban-ts-comment\n      // @ts-expect-error TS7053\n      if (!objectsEqual(received[key], expected[key])) {\n        return false;\n      }\n    }\n  }\n  return true;\n}\n\n// If true, the value is a term. With ts annotation\nfunction isTerm(value: unknown): value is { equals: (other: { termType: unknown } | undefined | null) => boolean } {\n  return value instanceof DefaultGraph ||\n    value instanceof NamedNode ||\n    value instanceof BlankNode ||\n    value instanceof Variable ||\n    value instanceof Wildcard ||\n    value instanceof Quad;\n}\n\nfunction isPrimitive(value: unknown): value is string | number | boolean {\n  return typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean';\n}\n"]}
+{"version":3,"file":"toEqualParsedQuery.js","sourceRoot":"","sources":["toEqualParsedQuery.ts"],"names":[],"mappings":"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","sourcesContent":["import { expect } from 'vitest';\n\nexpect.extend({\n  toEqualParsedQuery(received: unknown, expected: unknown) {\n    const pass = objectsEqual(received, expected, () => false, []);\n    const message = pass ?\n        () =>\n          `${this.utils.matcherHint('toEqualParsedQuery')\n        }\\n\\n` +\n        `Expected: ${this.utils.printExpected(expected)}\\n` +\n        `Received: ${this.utils.printReceived(received)}` :\n        () => {\n          const diffString = this.utils.diff(expected, received, {\n            expand: this.expand,\n          });\n          return (\n            `${this.utils.matcherHint('toEqualParsedQuery')\n          }\\n\\n${\n          diffString && diffString.includes('- Expect') ?\n            `Difference:\\n\\n${diffString}` :\n            `Expected: ${this.utils.printExpected(expected)}\\n` +\n            `Received: ${this.utils.printReceived(received)}`}`\n          );\n        };\n\n    return { pass, message };\n  },\n  toEqualParsedQueryIgnoring(\n    received: unknown,\n    selector: (obj: object) => boolean,\n    ignoreKeys: string[],\n    expected: unknown,\n  ) {\n    const pass = objectsEqual(received, expected, selector, ignoreKeys);\n    const message = pass ?\n        () =>\n        `${this.utils.matcherHint('toEqualParsedQuery')\n        }\\n\\n` +\n        `Expected: ${this.utils.printExpected(expected)}\\n` +\n        `Received: ${this.utils.printReceived(received)}` :\n        () => {\n          const diffString = this.utils.diff(expected, received, {\n            expand: this.expand,\n          });\n          return (\n          `${this.utils.matcherHint('toEqualParsedQuery')\n          }\\n\\n${\n            diffString && diffString.includes('- Expect') ?\n              `Difference:\\n\\n${diffString}` :\n              `Expected: ${this.utils.printExpected(expected)}\\n` +\n              `Received: ${this.utils.printReceived(received)}`}`\n          );\n        };\n\n    return { pass, message };\n  },\n});\n\n// We cannot use native instanceOf to test whether expected is a Term!\nfunction objectsEqual(\n  received: unknown,\n  expected: unknown,\n  selector: (obj: object) => boolean,\n  ignoreKeys: string[],\n): boolean {\n  if (received === undefined || received === null || isPrimitive(received)) {\n    return received === expected;\n  }\n\n  if (isTerm(received)) {\n    // eslint-disable-next-line ts/ban-ts-comment\n    // @ts-expect-error TS2345\n    return received.equals(expected);\n  }\n  if (isTerm(expected)) {\n    // eslint-disable-next-line ts/ban-ts-comment\n    // @ts-expect-error TS2345\n    return expected.equals(received);\n  }\n  //  York\n  // test\n  if (Array.isArray(received)) {\n    if (!Array.isArray(expected)) {\n      return false;\n    }\n    if (received.length !== expected.length) {\n      return false;\n    }\n    for (const [ i, element ] of received.entries()) {\n      if (!objectsEqual(element, expected[i], selector, ignoreKeys)) {\n        return false;\n      }\n    }\n  } else {\n    // Received == object\n    if (expected === undefined || expected === null || isPrimitive(expected) || Array.isArray(expected)) {\n      return false;\n    }\n    const keys_first = Object.keys(received);\n    const receivedMatches = selector(received);\n\n    for (const key of keys_first) {\n      if (receivedMatches && ignoreKeys.includes(key)) {\n        continue;\n      }\n      // eslint-disable-next-line ts/ban-ts-comment\n      // @ts-expect-error TS7053\n      if (!objectsEqual(received[key], expected[key], selector, ignoreKeys)) {\n        return false;\n      }\n    }\n\n    // We do this to make sure that we are not missing keys in the received object\n    const keys_second = Object.keys(expected);\n    for (const key of keys_second) {\n      // eslint-disable-next-line ts/ban-ts-comment\n      // @ts-expect-error TS7053\n      if (!objectsEqual(received[key], expected[key], selector, ignoreKeys)) {\n        return false;\n      }\n    }\n  }\n  return true;\n}\n\n// If true, the value is a term. With ts annotation\nfunction isTerm(value: unknown): value is { equals: (other: { termType: unknown } | undefined | null) => boolean } {\n  return false;\n}\n\nfunction isPrimitive(value: unknown): value is string | number | boolean {\n  return typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean';\n}\n"]}

package/lib/matchers/vitest.d.ts

@@ -1,6 +1,7 @@
 import 'vitest';
 interface CustomMatchers<R = unknown> {
     toEqualParsedQuery: (expected: unknown) => R;
+    toEqualParsedQueryIgnoring: (selector: (obj: object) => boolean, keys: string[], expected: unknown) => R;
 }
 declare module 'vitest' {
     interface Assertion<T = any> extends CustomMatchers<T> {

package/lib/matchers/vitest.js.map

@@ -1 +1 @@
-{"version":3,"file":"vitest.js","sourceRoot":"","sources":["vitest.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,CAAC","sourcesContent":["import 'vitest';\n\ninterface CustomMatchers<R = unknown> {\n  toEqualParsedQuery: (expected: unknown) => R;\n}\n\ndeclare module 'vitest' {\n  interface Assertion<T = any> extends CustomMatchers<T> {}\n  interface AsymmetricMatchersContaining extends CustomMatchers {}\n}\n"]}
+{"version":3,"file":"vitest.js","sourceRoot":"","sources":["vitest.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,CAAC","sourcesContent":["import 'vitest';\n\ninterface CustomMatchers<R = unknown> {\n  toEqualParsedQuery: (expected: unknown) => R;\n  toEqualParsedQueryIgnoring: (selector: (obj: object) => boolean, keys: string[], expected: unknown) => R;\n}\n\ndeclare module 'vitest' {\n  interface Assertion<T = any> extends CustomMatchers<T> {}\n  interface AsymmetricMatchersContaining extends CustomMatchers {}\n}\n"]}

package/lib/statics/generators.d.ts

@@ -2,15 +2,16 @@ interface PositiveTest {
     name: string;
     statics: () => Promise<{
         query: string;
-        result: unknown;
+        ast: unknown;
+        autoGen: string;
     }>;
 }
-export declare function positiveTest(type: 'paths' | 'sparql-1-1' | 'sparql-1-2'): Generator<PositiveTest>;
+export declare function positiveTest(type: 'paths' | 'sparql-1-1' | 'sparql-1-2', filter?: (name: string) => boolean): Generator<PositiveTest>;
 interface NegativeTest {
     name: string;
     statics: () => Promise<{
         query: string;
     }>;
 }
-export declare function negativeTest(type: 'sparql-1-2-invalid'): Generator<NegativeTest>;
+export declare function negativeTest(type: 'sparql-1-2-invalid', filter?: (name: string) => boolean): Generator<NegativeTest>;
 export {};

package/lib/statics/generators.js

@@ -1,38 +1,54 @@
-import * as fs from "node:fs";
-import fsp from "node:fs/promises";
-export function* positiveTest(type) {
-    const dir = `${__dirname}/${type}`;
+/* eslint-disable import/no-nodejs-modules,no-sync */
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { readFile } from '../fileUtils';
+export function* positiveTest(type, filter) {
+    const dir = path.join(__dirname, type);
     const statics = fs.readdirSync(dir);
     for (const file of statics) {
-        if (file.endsWith('.sparql')) {
+        if (file.endsWith('.json')) {
+            if (filter && !filter(file.replace('.json', ''))) {
+                continue;
+            }
             yield {
-                name: file.replace(/\.sparql$/, ''),
+                name: file.replace(/\.json$/u, ''),
                 statics: async () => {
-                    const query = await fsp.readFile(`${dir}/${file}`, 'utf-8');
-                    const result = await fsp.readFile(`${dir}/${file.replace('.sparql', '.json')}`, 'utf-8');
+                    const query = await readFile(`${dir}/${file.replace('.json', '.sparql')}`);
+                    const result = await readFile(`${dir}/${file}`);
+                    let autoGen;
+                    try {
+                        autoGen = await readFile(`${dir}/${file.replace('.json', '-generated.sparql')}`);
+                    }
+                    catch {
+                        autoGen = query;
+                    }
                     const json = JSON.parse(result);
                     return {
-                        query: query,
-                        result: json,
+                        query,
+                        ast: json,
+                        autoGen,
                     };
-                }
+                },
             };
         }
     }
 }
-export function* negativeTest(type) {
-    const dir = `${__dirname}/${type}`;
+export function* negativeTest(type, filter) {
+    const dir = path.join(__dirname, type);
     const statics = fs.readdirSync(dir);
     for (const file of statics) {
         if (file.endsWith('.sparql')) {
+            if (filter && !filter(file.replace('.sparql', ''))) {
+                continue;
+            }
             yield {
-                name: file.replace(/\.sparql$/, ''),
+                name: file.replace(/\.sparql$/u, ''),
                 statics: async () => {
-                    const query = await fsp.readFile(`${dir}/${file}`, 'utf-8');
+                    const query = await readFile(`${dir}/${file}`);
                     return {
-                        query: query,
+                        query,
                     };
-                }
+                },
             };
         }
     }

package/lib/statics/generators.js.map

@@ -1 +1 @@
-{"version":3,"file":"generators.js","sourceRoot":"","sources":["generators.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,GAAG,MAAM,kBAAkB,CAAC;AAUnC,MAAM,SAAS,CAAC,CAAC,YAAY,CAAC,IAA2C;IACvE,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,IAAI,EAAE,CAAC;IACnC,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACpC,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,MAAM;gBACJ,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;gBACnC,OAAO,EAAE,KAAK,IAAI,EAAE;oBAClB,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;oBAC5D,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;oBACzF,MAAM,IAAI,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;oBACzC,OAAO;wBACL,KAAK,EAAE,KAAK;wBACZ,MAAM,EAAE,IAAI;qBACb,CAAA;gBACH,CAAC;aACF,CAAA;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAUD,MAAM,SAAS,CAAC,CAAC,YAAY,CAAC,IAA0B;IACtD,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,IAAI,EAAE,CAAC;IACnC,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACpC,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,MAAM;gBACJ,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;gBACnC,OAAO,EAAE,KAAK,IAAI,EAAE;oBAClB,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;oBAC5D,OAAO;wBACL,KAAK,EAAE,KAAK;qBACb,CAAA;gBACH,CAAC;aACF,CAAA;QACH,CAAC;IACH,CAAC;AACH,CAAC","sourcesContent":["import * as fs from \"node:fs\";\nimport fsp from \"node:fs/promises\";\n\ninterface PositiveTest {\n  name: string;\n  statics: () => Promise<{\n    query: string;\n    result: unknown;\n  }>\n}\n\nexport function* positiveTest(type: 'paths' | 'sparql-1-1' | 'sparql-1-2'): Generator<PositiveTest> {\n  const dir = `${__dirname}/${type}`;\n  const statics = fs.readdirSync(dir);\n  for (const file of statics) {\n    if (file.endsWith('.sparql')) {\n      yield {\n        name: file.replace(/\\.sparql$/, ''),\n        statics: async () => {\n          const query = await fsp.readFile(`${dir}/${file}`, 'utf-8');\n          const result = await fsp.readFile(`${dir}/${file.replace('.sparql', '.json')}`, 'utf-8');\n          const json: unknown = JSON.parse(result);\n          return {\n            query: query,\n            result: json,\n          }\n        }\n      }\n    }\n  }\n}\n\ninterface NegativeTest {\n  name: string;\n  statics: () => Promise<{\n    query: string;\n  }>\n}\n\n\nexport function* negativeTest(type: 'sparql-1-2-invalid'): Generator<NegativeTest> {\n  const dir = `${__dirname}/${type}`;\n  const statics = fs.readdirSync(dir);\n  for (const file of statics) {\n    if (file.endsWith('.sparql')) {\n      yield {\n        name: file.replace(/\\.sparql$/, ''),\n        statics: async () => {\n          const query = await fsp.readFile(`${dir}/${file}`, 'utf-8');\n          return {\n            query: query,\n          }\n        }\n      }\n    }\n  }\n}"]}
+{"version":3,"file":"generators.js","sourceRoot":"","sources":["generators.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAWxC,MAAM,SAAS,CAAC,CAAC,YAAY,CAC3B,IAA2C,EAC3C,MAAkC;IAElC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACpC,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC;gBACjD,SAAS;YACX,CAAC;YACD,MAAM;gBACJ,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;gBAClC,OAAO,EAAE,KAAK,IAAG,EAAE;oBACjB,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;oBAC3E,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC;oBAChD,IAAI,OAAe,CAAC;oBACpB,IAAI,CAAC;wBACH,OAAO,GAAG,MAAM,QAAQ,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,mBAAmB,CAAC,EAAE,CAAC,CAAC;oBACnF,CAAC;oBAAC,MAAM,CAAC;wBACP,OAAO,GAAG,KAAK,CAAC;oBAClB,CAAC;oBACD,MAAM,IAAI,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;oBACzC,OAAO;wBACL,KAAK;wBACL,GAAG,EAAE,IAAI;wBACT,OAAO;qBACR,CAAC;gBACJ,CAAC;aACF,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AASD,MAAM,SAAS,CAAC,CAAC,YAAY,CAC3B,IAA0B,EAC1B,MAAkC;IAElC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACpC,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC;gBACnD,SAAS;YACX,CAAC;YACD,MAAM;gBACJ,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;gBACpC,OAAO,EAAE,KAAK,IAAG,EAAE;oBACjB,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC;oBAC/C,OAAO;wBACL,KAAK;qBACN,CAAC;gBACJ,CAAC;aACF,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC","sourcesContent":["/* eslint-disable import/no-nodejs-modules,no-sync */\nimport * as fs from 'node:fs';\nimport * as path from 'node:path';\nimport { readFile } from '../fileUtils';\n\ninterface PositiveTest {\n  name: string;\n  statics: () => Promise<{\n    query: string;\n    ast: unknown;\n    autoGen: 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 dir = path.join(__dirname, type);\n  const statics = fs.readdirSync(dir);\n  for (const file of statics) {\n    if (file.endsWith('.json')) {\n      if (filter && !filter(file.replace('.json', ''))) {\n        continue;\n      }\n      yield {\n        name: file.replace(/\\.json$/u, ''),\n        statics: async() => {\n          const query = await readFile(`${dir}/${file.replace('.json', '.sparql')}`);\n          const result = await readFile(`${dir}/${file}`);\n          let autoGen: string;\n          try {\n            autoGen = await readFile(`${dir}/${file.replace('.json', '-generated.sparql')}`);\n          } catch {\n            autoGen = query;\n          }\n          const json: unknown = JSON.parse(result);\n          return {\n            query,\n            ast: json,\n            autoGen,\n          };\n        },\n      };\n    }\n  }\n}\n\ninterface NegativeTest {\n  name: string;\n  statics: () => Promise<{\n    query: string;\n  }>;\n}\n\nexport function* negativeTest(\n  type: 'sparql-1-2-invalid',\n  filter?: (name: string) => boolean,\n): Generator<NegativeTest> {\n  const dir = path.join(__dirname, type);\n  const statics = fs.readdirSync(dir);\n  for (const file of statics) {\n    if (file.endsWith('.sparql')) {\n      if (filter && !filter(file.replace('.sparql', ''))) {\n        continue;\n      }\n      yield {\n        name: file.replace(/\\.sparql$/u, ''),\n        statics: async() => {\n          const query = await readFile(`${dir}/${file}`);\n          return {\n            query,\n          };\n        },\n      };\n    }\n  }\n}\n"]}

package/lib/statics/generators.ts

@@ -1,31 +1,47 @@
-import * as fs from "node:fs";
-import fsp from "node:fs/promises";
+/* eslint-disable import/no-nodejs-modules,no-sync */
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { readFile } from '../fileUtils';
 
 interface PositiveTest {
   name: string;
   statics: () => Promise<{
     query: string;
-    result: unknown;
-  }>
+    ast: unknown;
+    autoGen: string;
+  }>;
 }
 
-export function* positiveTest(type: 'paths' | 'sparql-1-1' | 'sparql-1-2'): Generator<PositiveTest> {
-  const dir = `${__dirname}/${type}`;
+export function* positiveTest(
+  type: 'paths' | 'sparql-1-1' | 'sparql-1-2',
+  filter?: (name: string) => boolean,
+): Generator<PositiveTest> {
+  const dir = path.join(__dirname, type);
   const statics = fs.readdirSync(dir);
   for (const file of statics) {
-    if (file.endsWith('.sparql')) {
+    if (file.endsWith('.json')) {
+      if (filter && !filter(file.replace('.json', ''))) {
+        continue;
+      }
       yield {
-        name: file.replace(/\.sparql$/, ''),
-        statics: async () => {
-          const query = await fsp.readFile(`${dir}/${file}`, 'utf-8');
-          const result = await fsp.readFile(`${dir}/${file.replace('.sparql', '.json')}`, 'utf-8');
+        name: file.replace(/\.json$/u, ''),
+        statics: async() => {
+          const query = await readFile(`${dir}/${file.replace('.json', '.sparql')}`);
+          const result = await readFile(`${dir}/${file}`);
+          let autoGen: string;
+          try {
+            autoGen = await readFile(`${dir}/${file.replace('.json', '-generated.sparql')}`);
+          } catch {
+            autoGen = query;
+          }
           const json: unknown = JSON.parse(result);
           return {
-            query: query,
-            result: json,
-          }
-        }
-      }
+            query,
+            ast: json,
+            autoGen,
+          };
+        },
+      };
     }
   }
 }
@@ -34,24 +50,29 @@ interface NegativeTest {
   name: string;
   statics: () => Promise<{
     query: string;
-  }>
+  }>;
 }
 
-
-export function* negativeTest(type: 'sparql-1-2-invalid'): Generator<NegativeTest> {
-  const dir = `${__dirname}/${type}`;
+export function* negativeTest(
+  type: 'sparql-1-2-invalid',
+  filter?: (name: string) => boolean,
+): Generator<NegativeTest> {
+  const dir = path.join(__dirname, type);
   const statics = fs.readdirSync(dir);
   for (const file of statics) {
     if (file.endsWith('.sparql')) {
+      if (filter && !filter(file.replace('.sparql', ''))) {
+        continue;
+      }
       yield {
-        name: file.replace(/\.sparql$/, ''),
-        statics: async () => {
-          const query = await fsp.readFile(`${dir}/${file}`, 'utf-8');
+        name: file.replace(/\.sparql$/u, ''),
+        statics: async() => {
+          const query = await readFile(`${dir}/${file}`);
           return {
-            query: query,
-          }
-        }
-      }
+            query,
+          };
+        },
+      };
     }
   }
-}
+}

package/lib/statics/paths/a-generated.sparql

@@ -0,0 +1 @@
+<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>

package/lib/statics/paths/a-opt-generated.sparql

@@ -0,0 +1 @@
+(<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>?)

package/lib/statics/paths/a-opt.json

@@ -1,11 +1,22 @@
 {
+  "type": "path",
+  "loc": {
+    "sourceLocationType": "source",
+    "start": 0,
+    "end": 2
+  },
   "items": [
     {
-      "termType": "NamedNode",
-      "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+      "type": "term",
+      "subType": "namedNode",
+      "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type",
+      "loc": {
+        "sourceLocationType": "source",
+        "start": 0,
+        "end": 1
+      }
     }
   ],
-  "pathType": "?",
-  "prefixes": {},
-  "type": "path"
+  "subType": "?",
+  "prefixes": {}
 }

package/lib/statics/paths/a-star-generated.sparql

@@ -0,0 +1 @@
+(<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>*)

package/lib/statics/paths/a-star.json

@@ -1,11 +1,22 @@
 {
+  "type": "path",
+  "loc": {
+    "sourceLocationType": "source",
+    "start": 0,
+    "end": 2
+  },
   "items": [
     {
-      "termType": "NamedNode",
-      "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+      "type": "term",
+      "subType": "namedNode",
+      "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type",
+      "loc": {
+        "sourceLocationType": "source",
+        "start": 0,
+        "end": 1
+      }
     }
   ],
-  "pathType": "*",
-  "prefixes": {},
-  "type": "path"
+  "subType": "*",
+  "prefixes": {}
 }

package/lib/statics/paths/a.json

@@ -1,5 +1,10 @@
 {
-  "prefixes": {},
-  "termType": "NamedNode",
-  "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+  "type": "term",
+  "subType": "namedNode",
+  "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type",
+  "loc": {
+    "sourceLocationType": "source",
+    "start": 0,
+    "end": 1
+  }
 }

package/lib/statics/paths/named-node-generated.sparql

@@ -0,0 +1 @@
+<http://example.org/a>

package/lib/statics/paths/named-node-sequence-generated.sparql

@@ -0,0 +1 @@
+(<http://example.org/a>/<http://example.org/b>)

package/lib/statics/paths/named-node-sequence.json

@@ -0,0 +1,32 @@
+{
+  "type": "path",
+  "loc": {
+    "sourceLocationType": "source",
+    "start": 0,
+    "end": 45
+  },
+  "items": [
+    {
+      "type": "term",
+      "subType": "namedNode",
+      "value": "http://example.org/a",
+      "loc": {
+        "sourceLocationType": "source",
+        "start": 0,
+        "end": 22
+      }
+    },
+    {
+      "type": "term",
+      "subType": "namedNode",
+      "value": "http://example.org/b",
+      "loc": {
+        "sourceLocationType": "source",
+        "start": 23,
+        "end": 45
+      }
+    }
+  ],
+  "subType": "/",
+  "prefixes": {}
+}

package/lib/statics/paths/named-node.json

@@ -0,0 +1,10 @@
+{
+  "type": "term",
+  "subType": "namedNode",
+  "value": "http://example.org/a",
+  "loc": {
+    "sourceLocationType": "source",
+    "start": 0,
+    "end": 22
+  }
+}

package/lib/statics/paths/prefixed-generated.sparql

@@ -0,0 +1 @@
+( ex:a | ex:b )

package/lib/statics/paths/prefixed.json

@@ -1,15 +1,34 @@
 {
+  "type": "path",
+  "loc": {
+    "sourceLocationType": "source",
+    "start": 0,
+    "end": 9
+  },
   "items": [
     {
-      "termType": "NamedNode",
-      "value": "http://example.org/a"
+      "type": "term",
+      "subType": "namedNode",
+      "value": "a",
+      "loc": {
+        "sourceLocationType": "source",
+        "start": 0,
+        "end": 4
+      },
+      "prefix": "ex"
     },
     {
-    "termType": "NamedNode",
-    "value": "http://example.org/b"
+      "type": "term",
+      "subType": "namedNode",
+      "value": "b",
+      "loc": {
+        "sourceLocationType": "source",
+        "start": 5,
+        "end": 9
+      },
+      "prefix": "ex"
     }
   ],
-  "pathType": "|",
-  "prefixes": {},
-  "type": "path"
+  "subType": "|",
+  "prefixes": {}
 }

package/lib/statics/sparql-1-1/all-generated.sparql

@@ -0,0 +1 @@
+SELECT * WHERE { ?s ?p ?o . }