@eagleoutice/flowr 2.2.1 → 2.2.3

package/dataflow/internal/process/functions/call/built-in/built-in-access.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processAccess = processAccess;
-const assert_1 = require("../../../../../../util/assert");
 const known_call_handling_1 = require("../known-call-handling");
 const r_function_call_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
 const logger_1 = require("../../../../../logger");
@@ -35,9 +34,12 @@ function processAccess(name, args, rootId, data, config) {
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, forceArgs: config.forceArgs }).information;
     }
     const head = args[0];
-    (0, assert_1.guard)(head !== r_function_call_1.EmptyArgument, () => `Access ${name.content} has no source, impossible!`);
     let fnCall;
-    if (!config.treatIndicesAsString) {
+    if (head === r_function_call_1.EmptyArgument) {
+        // in this case we may be within a pipe
+        fnCall = (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, forceArgs: config.forceArgs });
+    }
+    else if (!config.treatIndicesAsString) {
         /* within an access operation which treats its fields, we redefine the table assignment ':=' as a trigger if this is to be treated as a definition */
         // do we have a local definition that needs to be recovered?
         fnCall = processNumberBasedAccess(data, name, args, rootId, config, head);
@@ -46,7 +48,9 @@ function processAccess(name, args, rootId, data, config) {
         fnCall = processStringBasedAccess(args, data, name, rootId, config);
     }
     const info = fnCall.information;
-    info.graph.addEdge(name.info.id, fnCall.processedArguments[0]?.entryPoint ?? head.info.id, edge_1.EdgeType.Returns);
+    if (head !== r_function_call_1.EmptyArgument) {
+        info.graph.addEdge(name.info.id, fnCall.processedArguments[0]?.entryPoint ?? head.info.id, edge_1.EdgeType.Returns);
+    }
     /* access always reads all of its indices */
     for (const arg of fnCall.processedArguments) {
         if (arg !== undefined) {
@@ -70,7 +74,7 @@ function processAccess(name, args, rootId, data, config) {
         unknownReferences: (0, environment_1.makeAllMaybe)(info.unknownReferences, info.graph, info.environment, false),
         entryPoint: rootId,
         /** it is, to be precise, the accessed element we want to map to maybe */
-        in: info.in.map(ref => {
+        in: head === r_function_call_1.EmptyArgument ? info.in : info.in.map(ref => {
             if (ref.nodeId === head.value?.info.id) {
                 return (0, environment_1.makeReferenceMaybe)(ref, info.graph, info.environment, false);
             }

package/dataflow/internal/process/functions/call/built-in/built-in-if-then-else.js

@@ -33,7 +33,7 @@ function processIfThenElse(name, args, rootId, data) {
     let then;
     let makeThenMaybe = false;
     // we should defer this to the abstract interpretation
-    const values = (0, resolve_by_name_1.resolveValueOfVariable)(condArg?.lexeme, data.environment, cond.graph);
+    const values = (0, resolve_by_name_1.resolveValueOfVariable)(condArg?.lexeme, data.environment, data.completeAst.idMap);
     const conditionIsAlwaysFalse = values?.every(d => d === false) ?? false;
     const conditionIsAlwaysTrue = values?.every(d => d === true) ?? false;
     if (!conditionIsAlwaysFalse) {

package/dataflow/internal/process/functions/call/built-in/built-in-source.js

@@ -21,6 +21,8 @@ const log_1 = require("../../../../../../util/log");
 const fs_1 = __importDefault(require("fs"));
 const parser_1 = require("../../../../../../r-bridge/lang-4.x/ast/parser/json/parser");
 const shell_executor_1 = require("../../../../../../r-bridge/shell-executor");
+const resolve_by_name_1 = require("../../../../../environments/resolve-by-name");
+const assert_1 = require("../../../../../../util/assert");
 let sourceProvider = (0, retriever_1.requestProviderFromFile)();
 function setSourceProvider(provider) {
     sourceProvider = provider;
@@ -29,14 +31,28 @@ function processSourceCall(name, args, rootId, data, config) {
     const information = config.includeFunctionCall ?
         (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data }).information
         : (0, info_1.initializeCleanDataflowInformation)(rootId, data);
-    const sourceFile = args[0];
+    const sourceFileArgument = args[0];
     if (!config.forceFollow && (0, config_1.getConfig)().ignoreSourceCalls) {
-        (0, log_1.expensiveTrace)(logger_1.dataflowLogger, () => `Skipping source call ${JSON.stringify(sourceFile)} (disabled in config file)`);
+        (0, log_1.expensiveTrace)(logger_1.dataflowLogger, () => `Skipping source call ${JSON.stringify(sourceFileArgument)} (disabled in config file)`);
         information.graph.markIdForUnknownSideEffects(rootId);
         return information;
     }
-    if (sourceFile !== r_function_call_1.EmptyArgument && sourceFile?.value?.type === type_1.RType.String) {
-        const path = (0, retriever_1.removeRQuotes)(sourceFile.lexeme);
+    let sourceFile;
+    if (sourceFileArgument !== r_function_call_1.EmptyArgument && sourceFileArgument?.value?.type === type_1.RType.String) {
+        sourceFile = [(0, retriever_1.removeRQuotes)(sourceFileArgument.lexeme)];
+    }
+    else if (sourceFileArgument !== r_function_call_1.EmptyArgument) {
+        sourceFile = (0, resolve_by_name_1.resolveValueOfVariable)(sourceFileArgument.value?.lexeme, data.environment, data.completeAst.idMap)?.map(x => {
+            if (typeof x === 'object' && x && 'str' in x) {
+                return x.str;
+            }
+            else {
+                return undefined;
+            }
+        }).filter(assert_1.isNotUndefined);
+    }
+    if (sourceFile && sourceFile.length === 1) {
+        const path = (0, retriever_1.removeRQuotes)(sourceFile[0]);
         const request = sourceProvider.createRequest(path);
         // check if the sourced file has already been dataflow analyzed, and if so, skip it
         if (data.referenceChain.includes((0, retriever_1.requestFingerprint)(request))) {
@@ -83,10 +99,10 @@ function sourceRequest(rootId, request, data, information, getId) {
     }
     // take the entry point as well as all the written references, and give them a control dependency to the source call to show that they are conditional
     if (dataflow.graph.hasVertex(dataflow.entryPoint)) {
-        dataflow.graph.addControlDependency(dataflow.entryPoint, rootId);
+        dataflow.graph.addControlDependency(dataflow.entryPoint, rootId, true);
     }
     for (const out of dataflow.out) {
-        dataflow.graph.addControlDependency(out.nodeId, rootId);
+        dataflow.graph.addControlDependency(out.nodeId, rootId, true);
     }
     // update our graph with the sourced file's information
     const newInformation = { ...information };

package/documentation/doc-util/doc-cfg.js

@@ -6,12 +6,12 @@ const pipeline_executor_1 = require("../../core/pipeline-executor");
 const default_pipelines_1 = require("../../core/steps/pipeline/default-pipelines");
 const retriever_1 = require("../../r-bridge/retriever");
 async function getCfg(shell, code) {
-    const steps = await new pipeline_executor_1.PipelineExecutor(default_pipelines_1.DEFAULT_NORMALIZE_PIPELINE, {
+    const steps = await new pipeline_executor_1.PipelineExecutor(default_pipelines_1.DEFAULT_DATAFLOW_PIPELINE, {
         parser: shell,
         request: (0, retriever_1.requestFromInput)(code)
     }).allRemainingSteps();
     return {
-        info: (0, cfg_1.extractCFG)(steps.normalize),
+        info: (0, cfg_1.extractCFG)(steps.normalize, steps.dataflow?.graph),
         ast: steps.normalize
     };
 }

package/documentation/doc-util/doc-dfg.d.ts

@@ -3,19 +3,21 @@ import type { RShell } from '../../r-bridge/shell';
 import type { MermaidMarkdownMark } from '../../util/mermaid/dfg';
 import { DEFAULT_DATAFLOW_PIPELINE } from '../../core/steps/pipeline/default-pipelines';
 import type { PipelineOutput } from '../../core/steps/pipeline/pipeline';
-export declare function printDfGraph(graph: DataflowGraph, mark?: ReadonlySet<MermaidMarkdownMark>): string;
+import type { KnownParser } from '../../r-bridge/parser';
+export declare function printDfGraph(graph: DataflowGraph, mark?: ReadonlySet<MermaidMarkdownMark>, simplified?: boolean): string;
 export interface PrintDataflowGraphOptions {
     readonly mark?: ReadonlySet<MermaidMarkdownMark>;
     readonly showCode?: boolean;
     readonly codeOpen?: boolean;
     readonly exposeResult?: boolean;
     readonly switchCodeAndGraph?: boolean;
+    readonly simplified?: boolean;
 }
 export declare function formatSideEffect(ef: UnknownSidEffect): string;
-export declare function printDfGraphForCode(shell: RShell, code: string, options: PrintDataflowGraphOptions & {
+export declare function printDfGraphForCode(parser: KnownParser, code: string, options: PrintDataflowGraphOptions & {
     exposeResult: true;
 }): Promise<[string, PipelineOutput<typeof DEFAULT_DATAFLOW_PIPELINE>]>;
-export declare function printDfGraphForCode(shell: RShell, code: string, options?: PrintDataflowGraphOptions & {
+export declare function printDfGraphForCode(parser: KnownParser, code: string, options?: PrintDataflowGraphOptions & {
     exposeResult?: false | undefined;
 }): Promise<string>;
 /** returns resolved expected df graph */

package/documentation/doc-util/doc-dfg.js

@@ -13,13 +13,15 @@ const resolve_graph_1 = require("../../dataflow/graph/resolve-graph");
 const diff_1 = require("../../dataflow/graph/diff");
 const assert_1 = require("../../util/assert");
 const time_1 = require("../../util/time");
-function printDfGraph(graph, mark) {
+const doc_files_1 = require("./doc-files");
+function printDfGraph(graph, mark, simplified = false) {
     return `
 \`\`\`mermaid
 ${(0, dfg_1.graphToMermaid)({
         graph,
         prefix: 'flowchart LR',
-        mark
+        mark,
+        simplified
     }).string}
 \`\`\`
 	`;
@@ -32,18 +34,18 @@ function formatSideEffect(ef) {
         return `${ef}`;
     }
 }
-async function printDfGraphForCode(shell, code, { mark, showCode = true, codeOpen = false, exposeResult, switchCodeAndGraph = false } = {}) {
+async function printDfGraphForCode(parser, code, { simplified = false, mark, showCode = true, codeOpen = false, exposeResult, switchCodeAndGraph = false } = {}) {
     const now = performance.now();
-    const result = await new pipeline_executor_1.PipelineExecutor(default_pipelines_1.DEFAULT_DATAFLOW_PIPELINE, {
-        parser: shell,
+    const result = await (0, default_pipelines_1.createDataflowPipeline)(parser, {
         request: (0, retriever_1.requestFromInput)(code)
     }).allRemainingSteps();
     const duration = performance.now() - now;
     if (switchCodeAndGraph) {
         (0, assert_1.guard)(showCode, 'can not switch code and graph if code is not shown');
     }
-    const metaInfo = `The analysis required _${(0, time_1.printAsMs)(duration)}_ (including parse and normalize) within the generation environment.`;
-    const dfGraph = printDfGraph(result.dataflow.graph, mark);
+    const metaInfo = `The analysis required _${(0, time_1.printAsMs)(duration)}_ (including parse and normalize, using the [${parser.name}](${doc_files_1.FlowrWikiBaseRef}/Engines) engine) within the generation environment.`;
+    const dfGraph = printDfGraph(result.dataflow.graph, mark, simplified);
+    const simplyText = simplified ? '(simplified) ' : '';
     let resultText = '\n\n';
     if (showCode) {
         const codeText = `\`\`\`r
@@ -53,7 +55,7 @@ ${code}
         resultText += `
 <details${codeOpen ? ' open' : ''}>
 
-<summary style="color:gray">${switchCodeAndGraph ? 'Dataflow Graph of the R Code' : 'R Code of the Dataflow Graph'}</summary>
+<summary style="color:gray">${switchCodeAndGraph ? `${simplyText}Dataflow Graph of the R Code` : `R Code of the ${simplyText}Dataflow Graph`}</summary>
 
 ${metaInfo} ${mark ? `The following marks are used in the graph to highlight sub-parts (uses ids): {${[...mark].join(', ')}}.` : ''}
 We encountered ${result.dataflow.graph.unknownSideEffects.size > 0 ? 'unknown side effects (with ids: ' + [...result.dataflow.graph.unknownSideEffects].map(formatSideEffect).join(', ') + ')' : 'no unknown side effects'} during the analysis.

package/documentation/doc-util/doc-files.d.ts

@@ -1,7 +1,7 @@
 export declare const FlowrGithubBaseRef = "https://github.com/flowr-analysis";
 export declare const FlowrSiteBaseRef = "https://flowr-analysis.github.io/flowr";
 export declare const RemoteFlowrFilePathBaseRef = "https://github.com/flowr-analysis/flowr/tree/main/";
-export declare const FlowrWikiBaseRef = "https://github.com/flowr-analysis/flowr/wiki/";
+export declare const FlowrWikiBaseRef = "https://github.com/flowr-analysis/flowr/wiki";
 export declare const FlowrNpmRef = "https://www.npmjs.com/package/@eagleoutice/flowr";
 export declare const FlowrDockerRef = "https://hub.docker.com/r/eagleoutice/flowr";
 export declare const FlowrCodecovRef = "https://app.codecov.io/gh/flowr-analysis/flowr";

package/documentation/doc-util/doc-files.js

@@ -11,7 +11,7 @@ const fs_1 = __importDefault(require("fs"));
 exports.FlowrGithubBaseRef = 'https://github.com/flowr-analysis';
 exports.FlowrSiteBaseRef = 'https://flowr-analysis.github.io/flowr';
 exports.RemoteFlowrFilePathBaseRef = `${exports.FlowrGithubBaseRef}/flowr/tree/main/`;
-exports.FlowrWikiBaseRef = `${exports.FlowrGithubBaseRef}/flowr/wiki/`;
+exports.FlowrWikiBaseRef = `${exports.FlowrGithubBaseRef}/flowr/wiki`;
 exports.FlowrNpmRef = 'https://www.npmjs.com/package/@eagleoutice/flowr';
 exports.FlowrDockerRef = 'https://hub.docker.com/r/eagleoutice/flowr';
 exports.FlowrCodecovRef = 'https://app.codecov.io/gh/flowr-analysis/flowr';

package/documentation/doc-util/doc-normalized-ast.d.ts

@@ -1,11 +1,12 @@
 import type { DataflowGraph } from '../../dataflow/graph/graph';
 import type { RShell } from '../../r-bridge/shell';
 import type { RNodeWithParent } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
+import type { KnownParser } from '../../r-bridge/parser';
 export declare function printNormalizedAst(ast: RNodeWithParent, prefix?: string): string;
 export interface PrintNormalizedAstOptions {
     readonly showCode?: boolean;
     readonly prefix?: string;
 }
-export declare function printNormalizedAstForCode(shell: RShell, code: string, { showCode, prefix }?: PrintNormalizedAstOptions): Promise<string>;
+export declare function printNormalizedAstForCode(parser: KnownParser, code: string, { showCode, prefix }?: PrintNormalizedAstOptions): Promise<string>;
 /** returns resolved expected df graph */
 export declare function verifyExpectedSubgraph(shell: RShell, code: string, expectedSubgraph: DataflowGraph): Promise<DataflowGraph>;

package/documentation/doc-util/doc-normalized-ast.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.printNormalizedAst = printNormalizedAst;
 exports.printNormalizedAstForCode = printNormalizedAstForCode;
 exports.verifyExpectedSubgraph = verifyExpectedSubgraph;
-const pipeline_executor_1 = require("../../core/pipeline-executor");
 const default_pipelines_1 = require("../../core/steps/pipeline/default-pipelines");
 const retriever_1 = require("../../r-bridge/retriever");
 const decorate_1 = require("../../r-bridge/lang-4.x/ast/model/processing/decorate");
@@ -12,6 +11,7 @@ const diff_1 = require("../../dataflow/graph/diff");
 const assert_1 = require("../../util/assert");
 const ast_1 = require("../../util/mermaid/ast");
 const time_1 = require("../../util/time");
+const doc_files_1 = require("./doc-files");
 function printNormalizedAst(ast, prefix = 'flowchart TD\n') {
     return `
 \`\`\`mermaid
@@ -19,14 +19,13 @@ ${(0, ast_1.normalizedAstToMermaid)(ast, prefix)}
 \`\`\`
 	`;
 }
-async function printNormalizedAstForCode(shell, code, { showCode = true, prefix = 'flowchart TD\n' } = {}) {
+async function printNormalizedAstForCode(parser, code, { showCode = true, prefix = 'flowchart TD\n' } = {}) {
     const now = performance.now();
-    const result = await new pipeline_executor_1.PipelineExecutor(default_pipelines_1.DEFAULT_NORMALIZE_PIPELINE, {
-        parser: shell,
+    const result = await (0, default_pipelines_1.createNormalizePipeline)(parser, {
         request: (0, retriever_1.requestFromInput)(code)
     }).allRemainingSteps();
     const duration = performance.now() - now;
-    const metaInfo = `The analysis required _${(0, time_1.printAsMs)(duration)}_ (including parsing with the R shell) within the generation environment.`;
+    const metaInfo = `The analysis required _${(0, time_1.printAsMs)(duration)}_ (including parsing with the [${parser.name}](${doc_files_1.FlowrWikiBaseRef}/Engines) engine) within the generation environment.`;
     return '\n\n' + printNormalizedAst(result.normalize.ast, prefix) + (showCode ? `
 <details>
 

package/documentation/doc-util/doc-repl.d.ts

@@ -1,13 +1,17 @@
-import type { RShell } from '../../r-bridge/shell';
+import type { KnownParser } from '../../r-bridge/parser';
 export declare function printReplHelpAsMarkdownTable(): string;
 export interface DocumentReplSessionOptions {
     /** defaults to false and shows starting the repl */
     hideEntry?: boolean;
     /** defaults to false and allows access to the R session */
     allowRSessionAccess?: boolean;
+    /** defaults to false and opens the details section by default */
+    openOutput?: boolean;
+    /** additional arguments to pass to the repl */
+    args?: string;
 }
 export interface DocumentReplCommand {
     command: string;
     description: string;
 }
-export declare function documentReplSession(shell: RShell, commands: readonly DocumentReplCommand[], options?: DocumentReplSessionOptions): Promise<string>;
+export declare function documentReplSession(parser: KnownParser, commands: readonly DocumentReplCommand[], options?: DocumentReplSessionOptions): Promise<string>;

package/documentation/doc-util/doc-repl.js

@@ -10,6 +10,7 @@ const ansi_1 = require("../../util/ansi");
 const doc_docker_1 = require("./doc-docker");
 const prompt_1 = require("../../cli/repl/prompt");
 const doc_code_1 = require("./doc-code");
+const print_version_1 = require("../../cli/repl/print-version");
 function printHelpForScript(script, starredVersion) {
     let base = `| **${(0, doc_cli_option_1.getReplCommand)(script[0], false, starredVersion !== undefined)}** | ${script[1].description}`;
     if (starredVersion) {
@@ -37,7 +38,7 @@ function printReplHelpAsMarkdownTable() {
 ${scriptHelp.sort().join('\n')}
 `;
 }
-async function documentReplSession(shell, commands, options) {
+async function documentReplSession(parser, commands, options) {
     const collect = [];
     for (const command of commands) {
         const entry = { command, lines: [] };
@@ -50,11 +51,14 @@ async function documentReplSession(shell, commands, options) {
                 entry.lines.push(msg);
             }
         };
-        await (0, core_1.replProcessAnswer)(collectingOutput, command.command, shell, options?.allowRSessionAccess ?? false);
+        await (0, core_1.replProcessAnswer)(collectingOutput, command.command, parser, options?.allowRSessionAccess ?? false);
         collect.push(entry);
     }
     let result = '';
-    let cache = options?.hideEntry ? '' : `docker run -it --rm ${doc_docker_1.DockerName}\n`;
+    let cache = options?.hideEntry ? '' : `$ docker run -it --rm ${doc_docker_1.DockerName} ${options?.args ? options?.args + ' ' : ''}# or npm run flowr ${options?.args ? '-- ' + options?.args : ''}\n`;
+    if (!options?.hideEntry) {
+        cache += await (0, print_version_1.versionReplString)(parser) + '\n';
+    }
     for (const { command, lines } of collect) {
         if (lines.length === 0) {
             cache += prompt_1.rawPrompt + ' ' + command.command + '\n';
@@ -62,13 +66,13 @@ async function documentReplSession(shell, commands, options) {
         }
         result += `
 ${(0, doc_code_1.codeBlock)('shell', cache + prompt_1.rawPrompt + ' ' + command.command)}
-<details>
+<details${options?.openOutput ? ' open' : ''}>
 <summary style='color:gray'>Output</summary>
 
-${command.description}
-
 ${(0, doc_code_1.codeBlock)('text', lines.join('\n'))}
 
+${command.description}
+
 </details>
 
 `;

package/documentation/doc-util/doc-structure.d.ts

@@ -6,7 +6,7 @@ export interface DetailsOptions {
 }
 export declare function details(title: string, content: string, { color, open, hideIfEmpty, prefixInit }?: DetailsOptions): string;
 export interface BlockOptions {
-    readonly type: 'NOTE' | 'WARNING' | 'INFO' | 'TIP';
+    readonly type: 'NOTE' | 'WARNING' | 'TIP';
     readonly content: string;
 }
 export declare function block({ type, content }: BlockOptions): string;

package/documentation/doc-util/doc-types.d.ts

@@ -25,22 +25,24 @@ export interface MermaidTypeReport {
     program: ts.Program;
 }
 export declare function getTypesFromFolderAsMermaid(options: GetTypesAsMermaidOption): MermaidTypeReport;
-export declare function implSnippet(node: TypeElementInSource | undefined, program: ts.Program, showName?: boolean, nesting?: number): string;
+export declare function implSnippet(node: TypeElementInSource | undefined, program: ts.Program, showName?: boolean, nesting?: number, open?: boolean): string;
 export interface PrintHierarchyArguments {
     readonly program: ts.Program;
-    readonly hierarchy: TypeElementInSource[];
+    readonly info: TypeElementInSource[];
     readonly root: string;
     readonly collapseFromNesting?: number;
     readonly initialNesting?: number;
     readonly maxDepth?: number;
+    readonly openTop?: boolean;
 }
 export declare const mermaidHide: string[];
-export declare function printHierarchy({ program, hierarchy, root, collapseFromNesting, initialNesting, maxDepth }: PrintHierarchyArguments): string;
+export declare function printHierarchy({ program, info, root, collapseFromNesting, initialNesting, maxDepth, openTop }: PrintHierarchyArguments): string;
 /**
  * Create a short link to a type in the documentation
- * @param name      - The name of the type, e.g. `MyType`, may include a container, e.g. `MyContainer::MyType` (this works with function nestings too)
+ * @param name      - The name of the type, e.g. `MyType`, may include a container, e.g.,`MyContainer::MyType` (this works with function nestings too)
  * @param hierarchy - The hierarchy of types to search in
  * @param codeStyle - Whether to use code style for the link
+ * @param realNameWrapper - How to highlight the function in name in the `x::y` format?
  */
-export declare function shortLink(name: string, hierarchy: TypeElementInSource[], codeStyle?: boolean): string;
+export declare function shortLink(name: string, hierarchy: readonly TypeElementInSource[], codeStyle?: boolean, realNameWrapper?: string): string;
 export declare function getDocumentationForType(name: string, hierarchy: TypeElementInSource[]): string;

package/documentation/doc-util/doc-types.js

@@ -305,33 +305,36 @@ function getTypesFromFolderAsMermaid(options) {
     }
     return getTypesFromFileAsMermaid(files, options);
 }
-function implSnippet(node, program, showName = true, nesting = 0) {
+function implSnippet(node, program, showName = true, nesting = 0, open = false) {
     (0, assert_1.guard)(node !== undefined, 'Node must be defined => invalid change of type name?');
     const indent = ' '.repeat(nesting * 2);
     const bold = node.kind === 'interface' || node.kind === 'enum' ? '**' : '';
     const sep = node.comments ? '  \n' : '\n';
     let text = node.comments?.join('\n') ?? '';
+    if (text.trim() !== '') {
+        text = '  ' + text;
+    }
     const code = node.node.getFullText(program.getSourceFile(node.node.getSourceFile().fileName));
-    text += `\n<details><summary style="color:gray">Defined at <a href="${getTypePathLink(node)}">${getTypePathLink(node, '.')}</a></summary>\n\n${(0, doc_code_1.codeBlock)('ts', code)}\n\n</details>\n`;
-    const init = showName ? ` * ${bold}[${node.name}](${getTypePathLink(node)})${bold} ${sep}${indent}` : '';
-    return ` ${indent} ${showName ? init : ''} ${text.replaceAll('\t', '    ').split(/\n/g).join(`\n${indent}   `)}`;
+    text += `\n<details${open ? ' open' : ''}><summary style="color:gray">Defined at <a href="${getTypePathLink(node)}">${getTypePathLink(node, '.')}</a></summary>\n\n${(0, doc_code_1.codeBlock)('ts', code)}\n\n</details>\n`;
+    const init = showName ? `* ${bold}[${node.name}](${getTypePathLink(node)})${bold} ${sep}${indent}` : '';
+    return ` ${indent}${showName ? init : ''} ${text.replaceAll('\t', '    ').split(/\n/g).join(`\n${indent}   `)}`;
 }
 exports.mermaidHide = ['Leaf', 'Location', 'Namespace', 'Base', 'WithChildren', 'Partial', 'RAccessBase'];
-function printHierarchy({ program, hierarchy, root, collapseFromNesting = 1, initialNesting = 0, maxDepth = 20 }) {
+function printHierarchy({ program, info, root, collapseFromNesting = 1, initialNesting = 0, maxDepth = 20, openTop }) {
     if (initialNesting > maxDepth) {
         return '';
     }
-    const node = hierarchy.find(e => e.name === root);
+    const node = info.find(e => e.name === root);
     if (!node) {
         return '';
     }
-    const thisLine = implSnippet(node, program, true, initialNesting);
+    const thisLine = implSnippet(node, program, true, initialNesting, initialNesting === 0 && openTop);
     const result = [];
     for (const baseType of node.extends) {
         if (exports.mermaidHide.includes(baseType)) {
             continue;
         }
-        const res = printHierarchy({ program, hierarchy, root: baseType, collapseFromNesting, initialNesting: initialNesting + 1, maxDepth });
+        const res = printHierarchy({ program, info: info, root: baseType, collapseFromNesting, initialNesting: initialNesting + 1, maxDepth });
         result.push(res);
     }
     const out = result.join('\n');
@@ -358,19 +361,21 @@ function retrieveNode(name, hierarchy) {
 }
 /**
  * Create a short link to a type in the documentation
- * @param name      - The name of the type, e.g. `MyType`, may include a container, e.g. `MyContainer::MyType` (this works with function nestings too)
+ * @param name      - The name of the type, e.g. `MyType`, may include a container, e.g.,`MyContainer::MyType` (this works with function nestings too)
  * @param hierarchy - The hierarchy of types to search in
  * @param codeStyle - Whether to use code style for the link
+ * @param realNameWrapper - How to highlight the function in name in the `x::y` format?
  */
-function shortLink(name, hierarchy, codeStyle = true) {
+function shortLink(name, hierarchy, codeStyle = true, realNameWrapper = 'b') {
     const res = retrieveNode(name, hierarchy);
     if (!res) {
+        console.error(`Could not find node ${name} when resolving short link!`);
         return '';
     }
     const [pkg, mainName, node] = res;
-    const comments = node.comments?.join('\n').replace(/\\?\n|```[a-zA-Z]*|\s\s*/g, ' ').replace(/<\/?code>|`/g, '').replace(/"/g, '\'') ?? '';
+    const comments = node.comments?.join('\n').replace(/\\?\n|```[a-zA-Z]*|\s\s*/g, ' ').replace(/<\/?code>|`/g, '').replace(/<\/?p\/?>/g, ' ').replace(/"/g, '\'') ?? '';
     return `[${codeStyle ? '<code>' : ''}${(node.comments?.length ?? 0) > 0 ?
-        (0, html_hover_over_1.textWithTooltip)(pkg ? `${pkg}::<b>${mainName}</b>` : mainName, comments.length > 400 ? comments.slice(0, 400) + '...' : comments) : node.name}${codeStyle ? '</code>' : ''}](${getTypePathLink(node)})`;
+        (0, html_hover_over_1.textWithTooltip)(pkg ? `${pkg}::<${realNameWrapper}>${mainName}</${realNameWrapper}>` : mainName, comments.length > 400 ? comments.slice(0, 400) + '...' : comments) : node.name}${codeStyle ? '</code>' : ''}](${getTypePathLink(node)})`;
 }
 function getDocumentationForType(name, hierarchy) {
     const res = retrieveNode(name, hierarchy);

package/documentation/index.d.ts

@@ -0,0 +1,9 @@
+export * from './print-core-wiki';
+export * from './print-query-wiki';
+export * from './print-search-wiki';
+export * from './print-engines-wiki';
+export * from './print-interface-wiki';
+export * from './print-dataflow-graph-wiki';
+export * from './print-normalized-ast-wiki';
+export * from './print-capabilities-markdown';
+export * from './print-linting-and-testing-wiki';

package/documentation/index.js

@@ -0,0 +1,26 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./print-core-wiki"), exports);
+__exportStar(require("./print-query-wiki"), exports);
+__exportStar(require("./print-search-wiki"), exports);
+__exportStar(require("./print-engines-wiki"), exports);
+__exportStar(require("./print-interface-wiki"), exports);
+__exportStar(require("./print-dataflow-graph-wiki"), exports);
+__exportStar(require("./print-normalized-ast-wiki"), exports);
+__exportStar(require("./print-capabilities-markdown"), exports);
+__exportStar(require("./print-linting-and-testing-wiki"), exports);
+//# sourceMappingURL=index.js.map