@eagleoutice/flowr 2.8.12 → 2.8.13

package/search/search-executor/search-generators.js

@@ -82,15 +82,13 @@ async function generateFromQuery(input, args) {
         nodesByQuery.set(query, nodes);
     }
     // enrich elements with query data
-    const normalize = await input.normalize();
-    const dataflow = await input.dataflow();
-    const cfg = await input.controlflow();
-    const elements = await new flowr_search_1.FlowrSearchElements([...nodesByQuery]
-        .flatMap(([_, nodes]) => [...nodes]))
+    const nodearr = [...nodesByQuery];
+    const elements = await new flowr_search_1.FlowrSearchElements(nodearr
+        .flatMap(([_, nodes]) => Array.from(nodes)))
         .enrich(input, search_enrichers_1.Enrichment.QueryData, { queries: result });
     return elements.mutate(s => Promise.all(s.map(async (e) => {
-        const [query, _] = [...nodesByQuery].find(([_, nodes]) => nodes.has(e));
-        return await (0, search_enrichers_1.enrichElement)(e, elements, { normalize, dataflow, cfg, config: input.flowrConfig }, search_enrichers_1.Enrichment.QueryData, { query });
+        const [query, _] = nodearr.find(([_, nodes]) => nodes.has(e));
+        return await (0, search_enrichers_1.enrichElement)(e, elements, input, search_enrichers_1.Enrichment.QueryData, { query });
     })));
 }
 async function generateSyntax(input, args) {

package/search/search-executor/search-transformer.js

@@ -100,13 +100,7 @@ async function getFilter(data, elements, { filter }) {
     return elements.mutate(e => e.filter(e => (0, flowr_search_filters_1.evalFilter)(filter, { element: e, data: { dataflow } })));
 }
 async function getWith(input, elements, { info, args }) {
-    const data = {
-        normalize: await input.normalize(),
-        dataflow: await input.dataflow(),
-        cfg: await input.controlflow(),
-        config: input.flowrConfig
-    };
-    return (await elements.enrich(input, info, args)).mutate(async (s) => await Promise.all(s.map(e => (0, search_enrichers_1.enrichElement)(e, elements, data, info, args))));
+    return (await elements.enrich(input, info, args)).mutate(async (s) => await Promise.all(s.map(e => (0, search_enrichers_1.enrichElement)(e, elements, input, info, args))));
 }
 function getMap(data, elements, { mapper, args }) {
     return elements.mutate(elements => elements.flatMap(e => (0, search_mappers_1.map)(e, data, mapper, args)));

package/util/schema.js

@@ -24,7 +24,7 @@ function genericDescription(level, formatter, name, desc) {
     }
     const lines = [...headerLine(level, formatter, name, desc.type ?? 'unknown', desc.flags)];
     if ('allow' in desc) {
-        lines.push({ level: level + 1, text: `Allows only the values: ${desc['allow'].map(v => "'" + v + "'").join(', ')}` });
+        lines.push({ level: level + 1, text: `Only allows: ${desc['allow'].map(v => "'" + v + "'").join(', ')}` });
     }
     switch (desc.type) {
         case 'object':
@@ -57,18 +57,16 @@ function printFlags(flags) {
     if ('presence' in flags) {
         flagText += String(flags['presence']);
     }
-    return flagText.trim().length > 0 ? '[' + flagText + ']' : '';
+    return flagText.trim().length > 0 ? '[' + flagText + '] ' : '';
 }
 /**
  * Creates the header line(s) for a schema description.
  */
 function headerLine(level, formatter, name, type, flags) {
-    const text = `- ${(0, ansi_1.bold)(name, formatter)} ${formatter.format(type, { effect: ansi_1.ColorEffect.Foreground, color: 7 /* Colors.White */ })} ${printFlags(flags)}`;
-    const baseLine = { level, text };
-    if (flags && 'description' in flags) {
-        return [baseLine, { level: level + 1, text: (0, ansi_1.italic)(flags['description'], formatter) }];
-    }
-    return [baseLine];
+    const fnam = name === '.' ? '' : (0, ansi_1.bold)(name, formatter) + ' ';
+    const fdesc = flags && 'description' in flags ? (0, ansi_1.italic)(flags['description'], formatter) + ' ' : '';
+    const text = `- ${fnam}${printFlags(flags)}${fdesc}(${formatter.format(type, { effect: ansi_1.ColorEffect.Foreground, color: 7 /* Colors.White */ })})`;
+    return [{ level, text }];
 }
 /**
  * Describes a Joi object schema.

package/util/version.js

@@ -6,7 +6,7 @@ exports.printVersionInformation = printVersionInformation;
 const semver_1 = require("semver");
 const assert_1 = require("./assert");
 // this is automatically replaced with the current version by release-it
-const version = '2.8.12';
+const version = '2.8.13';
 /**
  * Retrieves the current flowR version as a new {@link SemVer} object.
  */