@traqula/test-utils 0.0.23 → 0.0.25

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

@@ -1,50 +1,63 @@
-/* eslint-disable import/no-nodejs-modules,no-sync */
-import * as fs from 'node:fs';
+/* eslint-disable import/no-nodejs-modules */
+import { readdirSync } from 'node:fs';
+import { join } from 'node:path';
 import { readFile } from '../fileUtils.js';
 import { getStaticFilePath } from './utils.js';
 export function* positiveTest(type, filter) {
-    const dir = getStaticFilePath(type);
-    const statics = fs.readdirSync(dir);
+    const astDir = getStaticFilePath('ast');
+    const jsonSourceTrackedDir = join(astDir, 'ast-source-tracked', type);
+    const jsonNonSourceTrackedDir = join(astDir, 'ast-no-source-tracked', type);
+    const sparqlDir = join(astDir, 'sparql', type);
+    const sparqlGeneratedDir = join(astDir, 'sparql-generated', type);
+    const statics = readdirSync(jsonSourceTrackedDir);
     for (const file of statics) {
-        if (file.endsWith('.json')) {
-            if (filter && !filter(file.replace('.json', ''))) {
-                continue;
-            }
-            yield {
-                name: file.replace(/\.json$/u, ''),
-                statics: async () => {
-                    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,
-                        ast: json,
-                        autoGen,
-                    };
-                },
-            };
+        if (filter && !filter(file.replace('.json', ''))) {
+            continue;
         }
+        const name = file.replace(/\.json$/u, '');
+        yield {
+            name,
+            statics: async () => {
+                const query = await readFile(join(sparqlDir, `${name}.sparql`));
+                const sourceTracked = await readFile(join(jsonSourceTrackedDir, file));
+                let noSourceTracked;
+                try {
+                    noSourceTracked = await readFile(join(jsonNonSourceTrackedDir, file));
+                }
+                catch {
+                    noSourceTracked = '{}';
+                }
+                let autoGen;
+                try {
+                    autoGen = await readFile(join(sparqlGeneratedDir, `${name}.sparql`));
+                }
+                catch {
+                    autoGen = '';
+                }
+                return {
+                    query,
+                    astWithSource: JSON.parse(sourceTracked),
+                    astNoSource: JSON.parse(noSourceTracked),
+                    autoGen,
+                };
+            },
+        };
     }
 }
 export function* negativeTest(type, filter) {
-    const dir = getStaticFilePath(type);
-    const statics = fs.readdirSync(dir);
+    const astDir = getStaticFilePath('ast');
+    const sparqlGeneratedDir = join(astDir, 'sparql', type);
+    const statics = readdirSync(sparqlGeneratedDir);
     for (const file of statics) {
         if (file.endsWith('.sparql')) {
             if (filter && !filter(file.replace('.sparql', ''))) {
                 continue;
             }
+            const name = file.replace(/\.sparql$/u, '');
             yield {
-                name: file.replace(/\.sparql$/u, ''),
+                name,
                 statics: async () => {
-                    const query = await readFile(`${dir}/${file}`);
+                    const query = await readFile(join(sparqlGeneratedDir, file));
                     return {
                         query,
                     };

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

@@ -1 +1 @@
-{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../../lib/generators/generators.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAW/C,MAAM,SAAS,CAAC,CAAC,YAAY,CAC3B,IAA2C,EAC3C,MAAkC;IAElC,MAAM,GAAG,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACpC,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,IAAiD,EACjD,MAAkC;IAElC,MAAM,GAAG,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACpC,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 { readFile } from '../fileUtils.js';\nimport { getStaticFilePath } from './utils.js';\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 = getStaticFilePath(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-1-invalid' | 'sparql-1-2-invalid',\n  filter?: (name: string) => boolean,\n): Generator<NegativeTest> {\n  const dir = getStaticFilePath(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"]}
+{"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  }>;\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 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: string;\n        try {\n          autoGen = await readFile(join(sparqlGeneratedDir, `${name}.sparql`));\n        } catch {\n          autoGen = '';\n        }\n        return {\n          query,\n          astWithSource: JSON.parse(sourceTracked),\n          astNoSource: JSON.parse(noSourceTracked),\n          autoGen,\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-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);\n  for (const file of statics) {\n    if (file.endsWith('.sparql')) {\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}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@traqula/test-utils",
   "type": "module",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "description": "Test utils used by the Traqula monorepo",
   "lsd:module": true,
   "license": "MIT",
@@ -26,10 +26,10 @@
   },
   "main": "dist/esm/lib/index.js",
   "files": [
-    "dist/**/*.d.ts",
-    "dist/**/*.js",
-    "dist/**/*.js.map",
-    "dist/**/package.json",
+    "dist/*/lib/**/*.d.ts",
+    "dist/*/lib/**/*.js",
+    "dist/*/lib/**/*.js.map",
+    "dist/cjs/package.json",
     "lib/generators/**/*.json",
     "lib/generators/**/*.sparql"
   ],
@@ -37,9 +37,9 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "scripts": {
-    "build": "yarn build:ts && yarn build:transpile",
+    "build": "yarn build:ts && yarn build:cjs",
     "build:ts": "node \"../../node_modules/typescript/bin/tsc\" -b",
-    "build:transpile": "esbuild \"dist/esm/**/*.js\" --outdir=dist/cjs/lib --platform=node --format=cjs"
+    "build:cjs": "node \"../../node_modules/typescript/bin/tsc\" -b tsconfig.cjs.json"
   },
   "dependencies": {
     "rdf-data-factory": "^2.0.1",
@@ -48,5 +48,5 @@
   "devDependencies": {
     "@rdfjs/types": "^2.0.0"
   },
-  "gitHead": "36ec1aae80524a84f044182811a55ebeef6d9cda"
+  "gitHead": "52cfb2b513294dc154febc0209ac811ceeb6785b"
 }