more testing

perl-actions · Sep 13, 2024 · 983a88d · 983a88d
1 parent 5334d87
commit 983a88d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/dist/main.js b/dist/main.js
@@ -24423,12 +24423,14 @@ var getPrereqs = async ({
     if (content === null) {
       continue;
     }
-    const parser = source == "prereqs.json" ? parsePrereqsJSON : source == "prereqs.yml" ? parsePrereqsYAML : source.match(/\.json$/) ? parseMetaJSON : source.match(/\.ya?ml$/) ? parseMetaYAML : source.match(/makefile$/i) ? parseMakefile : source.match(/cpanfile/i) ? parseCPANfile : null;
+    const parser = source.match(/prereqs\.json$/) ? parsePrereqsJSON : source.match(/prereqs\.yml/) ? parsePrereqsYAML : source.match(/\.json$/) ? parseMetaJSON : source.match(/\.ya?ml$/) ? parseMetaYAML : source.match(/makefile$/i) ? parseMakefile : source.match(/cpanfile/i) ? parseCPANfile : null;
     if (parser === null) {
       throw new Error(`Don't know how to parse ${source}`);
     }
+    const reqs = await parser(content);
+    console.log(reqs);
     const filteredPrereqs = filterPrereqs({
-      prereqs: await parser(content),
+      prereqs: reqs,
       phases: new Set(phases),
       relationships: new Set(relationships),
       features: new Set(features)

diff --git a/src/get-prereqs.mjs b/src/get-prereqs.mjs
@@ -126,8 +126,8 @@ export const getPrereqs = async ({
     }
 
     const parser =
-      source == 'prereqs.json'        ? parsePrereqsJSON
-      : source == 'prereqs.yml'       ? parsePrereqsYAML
+      source.match(/prereqs\.json$/)  ? parsePrereqsJSON
+      : source.match(/prereqs\.yml/)  ? parsePrereqsYAML
       : source.match(/\.json$/)       ? parseMetaJSON
       : source.match(/\.ya?ml$/)      ? parseMetaYAML
       : source.match(/makefile$/i)    ? parseMakefile
@@ -137,8 +137,12 @@ export const getPrereqs = async ({
       throw new Error(`Don't know how to parse ${source}`);
     }
 
+    const reqs = await parser(content);
+
+    console.log(reqs);
+
     const filteredPrereqs = filterPrereqs({
-      prereqs: await parser(content),
+      prereqs: reqs,
       phases: new Set(phases),
       relationships: new Set(relationships),
       features: new Set(features),