@eagleoutice/flowr 2.2.1 → 2.2.3

package/cli/flowr.js

@@ -23,6 +23,7 @@ const print_version_1 = require("./repl/print-version");
 const flowr_main_options_1 = require("./flowr-main-options");
 const tree_sitter_executor_1 = require("../r-bridge/lang-4.x/tree-sitter/tree-sitter-executor");
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 exports.toolName = 'flowr';
 exports.optionHelp = [
     {
@@ -63,7 +64,7 @@ if (options['config-json']) {
 if (!usedConfig) {
     if (options['config-file']) {
         // validate it exists
-        if (!fs_1.default.existsSync(options['config-file'])) {
+        if (!fs_1.default.existsSync(path_1.default.resolve(options['config-file']))) {
             log_1.log.error(`Config file '${options['config-file']}' does not exist`);
             process.exit(1);
         }

package/cli/repl/commands/repl-cfg.js

@@ -1,24 +1,41 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.controlflowStarCommand = exports.controlflowCommand = void 0;
 const cfg_1 = require("../../../util/cfg/cfg");
 const default_pipelines_1 = require("../../../core/steps/pipeline/default-pipelines");
 const retriever_1 = require("../../../r-bridge/retriever");
 const cfg_2 = require("../../../util/mermaid/cfg");
+const ansi_1 = require("../../../util/ansi");
+const clipboardy_1 = __importDefault(require("clipboardy"));
 async function controlflow(parser, remainingLine) {
-    return await (0, default_pipelines_1.createNormalizePipeline)(parser, {
+    return await (0, default_pipelines_1.createDataflowPipeline)(parser, {
         request: (0, retriever_1.requestFromInput)(remainingLine.trim())
     }).allRemainingSteps();
 }
+function handleString(code) {
+    return code.startsWith('"') ? JSON.parse(code) : code;
+}
+function formatInfo(out, type) {
+    return out.formatter.format(`Copied ${type} to clipboard.`, { color: 7 /* Colors.White */, effect: ansi_1.ColorEffect.Foreground, style: 3 /* FontStyles.Italic */ });
+}
 exports.controlflowCommand = {
     description: `Get mermaid code for the control-flow graph of R code, start with '${retriever_1.fileProtocol}' to indicate a file`,
     usageExample: ':controlflow',
     aliases: ['cfg', 'cf'],
     script: false,
     fn: async (output, shell, remainingLine) => {
-        const result = await controlflow(shell, remainingLine);
-        const cfg = (0, cfg_1.extractCFG)(result.normalize);
-        output.stdout((0, cfg_2.cfgToMermaid)(cfg, result.normalize));
+        const result = await controlflow(shell, handleString(remainingLine));
+        const cfg = (0, cfg_1.extractCFG)(result.normalize, result.dataflow.graph);
+        const mermaid = (0, cfg_2.cfgToMermaid)(cfg, result.normalize);
+        output.stdout(mermaid);
+        try {
+            clipboardy_1.default.writeSync(mermaid);
+            output.stdout(formatInfo(output, 'mermaid code'));
+        }
+        catch (e) { /* do nothing this is a service thing */ }
     }
 };
 exports.controlflowStarCommand = {
@@ -27,9 +44,15 @@ exports.controlflowStarCommand = {
     aliases: ['cfg*', 'cf*'],
     script: false,
     fn: async (output, shell, remainingLine) => {
-        const result = await controlflow(shell, remainingLine);
-        const cfg = (0, cfg_1.extractCFG)(result.normalize);
-        output.stdout((0, cfg_2.cfgToMermaidUrl)(cfg, result.normalize));
+        const result = await controlflow(shell, handleString(remainingLine));
+        const cfg = (0, cfg_1.extractCFG)(result.normalize, result.dataflow.graph);
+        const mermaid = (0, cfg_2.cfgToMermaidUrl)(cfg, result.normalize);
+        output.stdout(mermaid);
+        try {
+            clipboardy_1.default.writeSync(mermaid);
+            output.stdout(formatInfo(output, 'mermaid url'));
+        }
+        catch (e) { /* do nothing this is a service thing */ }
     }
 };
 //# sourceMappingURL=repl-cfg.js.map

package/cli/repl/commands/repl-dataflow.js

@@ -1,25 +1,42 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dataflowStarCommand = exports.dataflowCommand = void 0;
 const default_pipelines_1 = require("../../../core/steps/pipeline/default-pipelines");
 const retriever_1 = require("../../../r-bridge/retriever");
 const dfg_1 = require("../../../util/mermaid/dfg");
-async function dataflow(parser, remainingLine) {
+const clipboardy_1 = __importDefault(require("clipboardy"));
+const ansi_1 = require("../../../util/ansi");
+/**
+ * Obtain the dataflow graph using a known parser (such as the {@link RShell} or {@link TreeSitterExecutor}).
+ */
+async function replGetDataflow(parser, code) {
     return await (0, default_pipelines_1.createDataflowPipeline)(parser, {
-        request: (0, retriever_1.requestFromInput)(remainingLine.trim())
+        request: (0, retriever_1.requestFromInput)(code.trim())
     }).allRemainingSteps();
 }
 function handleString(code) {
     return code.startsWith('"') ? JSON.parse(code) : code;
 }
+function formatInfo(out, type, timing) {
+    return out.formatter.format(`Copied ${type} to clipboard (dataflow: ${timing}ms).`, { color: 7 /* Colors.White */, effect: ansi_1.ColorEffect.Foreground, style: 3 /* FontStyles.Italic */ });
+}
 exports.dataflowCommand = {
     description: `Get mermaid code for the dataflow graph of R code, start with '${retriever_1.fileProtocol}' to indicate a file`,
     usageExample: ':dataflow',
     aliases: ['d', 'df'],
     script: false,
     fn: async (output, shell, remainingLine) => {
-        const result = await dataflow(shell, handleString(remainingLine));
-        output.stdout((0, dfg_1.graphToMermaid)({ graph: result.dataflow.graph, includeEnvironments: false }).string);
+        const result = await replGetDataflow(shell, handleString(remainingLine));
+        const mermaid = (0, dfg_1.graphToMermaid)({ graph: result.dataflow.graph, includeEnvironments: false }).string;
+        output.stdout(mermaid);
+        try {
+            clipboardy_1.default.writeSync(mermaid);
+            output.stdout(formatInfo(output, 'mermaid code', result.dataflow['.meta'].timing));
+        }
+        catch (e) { /* do nothing this is a service thing */ }
     }
 };
 exports.dataflowStarCommand = {
@@ -28,8 +45,14 @@ exports.dataflowStarCommand = {
     aliases: ['d*', 'df*'],
     script: false,
     fn: async (output, shell, remainingLine) => {
-        const result = await dataflow(shell, handleString(remainingLine));
-        output.stdout((0, dfg_1.graphToMermaidUrl)(result.dataflow.graph, false));
+        const result = await replGetDataflow(shell, handleString(remainingLine));
+        const mermaid = (0, dfg_1.graphToMermaidUrl)(result.dataflow.graph, false);
+        output.stdout(mermaid);
+        try {
+            clipboardy_1.default.writeSync(mermaid);
+            output.stdout(formatInfo(output, 'mermaid url', result.dataflow['.meta'].timing));
+        }
+        catch (e) { /* do nothing this is a service thing */ }
     }
 };
 //# sourceMappingURL=repl-dataflow.js.map

package/cli/repl/commands/repl-normalize.js

@@ -1,9 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeStarCommand = exports.normalizeCommand = void 0;
 const default_pipelines_1 = require("../../../core/steps/pipeline/default-pipelines");
 const retriever_1 = require("../../../r-bridge/retriever");
 const ast_1 = require("../../../util/mermaid/ast");
+const clipboardy_1 = __importDefault(require("clipboardy"));
+const ansi_1 = require("../../../util/ansi");
 async function normalize(parser, remainingLine) {
     return await (0, default_pipelines_1.createNormalizePipeline)(parser, {
         request: (0, retriever_1.requestFromInput)(remainingLine.trim())
@@ -12,6 +17,9 @@ async function normalize(parser, remainingLine) {
 function handleString(code) {
     return code.startsWith('"') ? JSON.parse(code) : code;
 }
+function formatInfo(out, type, timing) {
+    return out.formatter.format(`Copied ${type} to clipboard (normalize: ${timing}ms).`, { color: 7 /* Colors.White */, effect: ansi_1.ColorEffect.Foreground, style: 3 /* FontStyles.Italic */ });
+}
 exports.normalizeCommand = {
     description: `Get mermaid code for the normalized AST of R code, start with '${retriever_1.fileProtocol}' to indicate a file`,
     usageExample: ':normalize',
@@ -19,7 +27,13 @@ exports.normalizeCommand = {
     script: false,
     fn: async (output, shell, remainingLine) => {
         const result = await normalize(shell, handleString(remainingLine));
-        output.stdout((0, ast_1.normalizedAstToMermaid)(result.normalize.ast));
+        const mermaid = (0, ast_1.normalizedAstToMermaid)(result.normalize.ast);
+        output.stdout(mermaid);
+        try {
+            clipboardy_1.default.writeSync(mermaid);
+            output.stdout(formatInfo(output, 'mermaid url', result.normalize['.meta'].timing));
+        }
+        catch (e) { /* do nothing this is a service thing */ }
     }
 };
 exports.normalizeStarCommand = {
@@ -29,7 +43,13 @@ exports.normalizeStarCommand = {
     script: false,
     fn: async (output, shell, remainingLine) => {
         const result = await normalize(shell, handleString(remainingLine));
-        output.stdout((0, ast_1.normalizedAstToMermaidUrl)(result.normalize.ast));
+        const mermaid = (0, ast_1.normalizedAstToMermaidUrl)(result.normalize.ast);
+        output.stdout(mermaid);
+        try {
+            clipboardy_1.default.writeSync(mermaid);
+            output.stdout(formatInfo(output, 'mermaid url', result.normalize['.meta'].timing));
+        }
+        catch (e) { /* do nothing this is a service thing */ }
     }
 };
 //# sourceMappingURL=repl-normalize.js.map

package/cli/repl/commands/repl-parse.js

@@ -17,7 +17,41 @@ function toDepthMap(entry) {
         result.push({ ...current, leaf: children.length === 0 });
         children.reverse();
         const nextDepth = current.depth + 1;
-        visit.push(...children.map(c => ({ depth: nextDepth, node: c })));
+        for (const c of children) {
+            visit.push({ depth: nextDepth, node: c });
+        }
+    }
+    return result;
+}
+function treeSitterToJsonEntry(node) {
+    return {
+        token: node.type,
+        children: [],
+        text: node.text,
+        id: node.id,
+        parent: node.parent?.id ?? -1,
+        terminal: node.isNamed,
+        line1: node.startPosition.row + 1,
+        col1: node.startPosition.column + 1,
+        line2: node.endPosition.row + 1,
+        col2: node.endPosition.column + 1
+    };
+}
+function treeSitterToDepthList(node) {
+    const visit = [{ depth: 0, node }];
+    const result = [];
+    while (visit.length > 0) {
+        const current = visit.pop();
+        if (current === undefined) {
+            continue;
+        }
+        const children = current.node.children;
+        result.push({ depth: current.depth, node: treeSitterToJsonEntry(current.node), leaf: children.length === 0 });
+        children.reverse();
+        const nextDepth = current.depth + 1;
+        for (const c of children) {
+            visit.push({ depth: nextDepth, node: c });
+        }
     }
     return result;
 }
@@ -57,6 +91,9 @@ function retrieveLocationString(locationRaw) {
     if (extracted[0] === extracted[2] && extracted[1] === extracted[3]) {
         return ` (${extracted[0]}:${extracted[1]})`;
     }
+    else if (extracted[0] === extracted[2]) {
+        return ` (${extracted[0]}:${extracted[1]}─${extracted[3]})`;
+    }
     else {
         return ` (${extracted[0]}:${extracted[1]}─${extracted[2]}:${extracted[3]})`;
     }
@@ -66,6 +103,10 @@ function depthListToTextTree(list, f) {
     const deadDepths = new Set();
     let i = 0;
     for (const { depth, node, leaf } of list) {
+        if (depth > 10) {
+            result += '...';
+            break;
+        }
         const nextDepth = i + 1 < list.length ? list[i + 1].depth : 0;
         deadDepths.delete(depth);
         result += initialIndentation(i, depth, deadDepths, nextDepth, list, f);
@@ -93,8 +134,14 @@ exports.parseCommand = {
         const result = await (0, default_pipelines_1.createParsePipeline)(parser, {
             request: (0, retriever_1.requestFromInput)((0, retriever_1.removeRQuotes)(remainingLine.trim()))
         }).allRemainingSteps();
-        const object = (0, format_1.convertPreparedParsedData)((0, format_1.prepareParsedData)(result.parse.parsed));
-        output.stdout(depthListToTextTree(toDepthMap(object), output.formatter));
+        if (parser.name === 'r-shell') {
+            const object = (0, format_1.convertPreparedParsedData)((0, format_1.prepareParsedData)(result.parse.parsed));
+            output.stdout(depthListToTextTree(toDepthMap(object), output.formatter));
+        }
+        else {
+            // print the tree-sitter ast
+            output.stdout(depthListToTextTree(treeSitterToDepthList(result.parse.parsed.rootNode), output.formatter));
+        }
     }
 };
 //# sourceMappingURL=repl-parse.js.map

package/cli/repl/core.js

@@ -48,6 +48,7 @@ const scripts_info_1 = require("../common/scripts-info");
 const retriever_1 = require("../../r-bridge/retriever");
 const repl_main_1 = require("./commands/repl-main");
 const shell_1 = require("../../r-bridge/shell");
+const log_1 = require("../../util/log");
 let _replCompleterKeywords = undefined;
 function replCompleterKeywords() {
     if (_replCompleterKeywords === undefined) {
@@ -107,6 +108,9 @@ async function replProcessStatement(output, statement, parser, allowRSessionAcce
             }
             catch (e) {
                 output.stdout(`${bold(`Failed to execute command ${command}`)}: ${e?.message}. Using the ${bold('--verbose')} flag on startup may provide additional information.\n`);
+                if (log_1.log.settings.minLevel < 6 /* LogLevel.Fatal */) {
+                    console.error(e);
+                }
             }
         }
         else {

package/cli/repl/print-version.d.ts

@@ -1,2 +1,3 @@
 import type { KnownParser } from '../../r-bridge/parser';
+export declare function versionReplString(parser: KnownParser): Promise<string>;
 export declare function printVersionRepl(parser: KnownParser): Promise<void>;

package/cli/repl/print-version.js

@@ -1,9 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.versionReplString = versionReplString;
 exports.printVersionRepl = printVersionRepl;
 const repl_version_1 = require("./commands/repl-version");
-async function printVersionRepl(parser) {
+async function versionReplString(parser) {
     const version = await (0, repl_version_1.retrieveVersionInformation)(parser);
-    console.log(`flowR repl using flowR ${version.flowr}, R ${version.r}, engine ${version.engine}`);
+    const rVersion = version.r === 'none' ? '' : version.r === 'unknown' ? ', R version unknown' : `, R v${version.r}`;
+    return `flowR repl using flowR v${version.flowr}${rVersion} (${version.engine} engine)`;
+}
+async function printVersionRepl(parser) {
+    console.log(await versionReplString(parser));
 }
 //# sourceMappingURL=print-version.js.map

package/cli/repl/server/connection.js

@@ -38,9 +38,6 @@ const core_1 = require("../core");
 const cfg_1 = require("../../../util/cfg/cfg");
 const quads_1 = require("../../../util/quads");
 const print_1 = require("../../../core/print/print");
-const _00_parse_1 = require("../../../core/steps/all/core/00-parse");
-const _10_normalize_1 = require("../../../core/steps/all/core/10-normalize");
-const _20_dataflow_1 = require("../../../core/steps/all/core/20-dataflow");
 const ansi_1 = require("../../../util/ansi");
 const default_pipelines_1 = require("../../../core/steps/pipeline/default-pipelines");
 const graph_1 = require("../../../dataflow/graph/graph");
@@ -136,7 +133,7 @@ class FlowRServerConnection {
         }
         const tempFile = tmp.fileSync({ postfix: '.R' });
         const slicer = this.createPipelineExecutorForRequest(message, tempFile.name);
-        await slicer.allRemainingSteps(false).then(async (results) => await this.sendFileAnalysisResponse(results, message))
+        await slicer.allRemainingSteps(false).then(async (results) => await this.sendFileAnalysisResponse(slicer, results, message))
             .catch(e => {
             this.logger.error(`[${this.name}] Error while analyzing file ${message.filename ?? 'unknown file'}: ${String(e)}`);
             (0, send_1.sendMessage)(this.socket, {
@@ -149,13 +146,18 @@ class FlowRServerConnection {
         // this is an interestingly named function that means "I am a callback that removes a file" - so this deletes the file
         tempFile.removeCallback();
     }
-    async sendFileAnalysisResponse(results, message) {
+    async sendFileAnalysisResponse(slicer, results, message) {
         let cfg = undefined;
         if (message.cfg) {
-            cfg = (0, cfg_1.extractCFG)(results.normalize);
+            cfg = (0, cfg_1.extractCFG)(results.normalize, results.dataflow?.graph);
         }
         const config = () => ({ context: message.filename ?? 'unknown', getId: (0, quads_1.defaultQuadIdGenerator)() });
         const sanitizedResults = sanitizeAnalysisResults(results);
+        const pipeline = slicer.getPipeline();
+        const parseStep = pipeline.steps.get('parse');
+        const normalizedStep = pipeline.steps.get('normalize');
+        const dataflowStep = pipeline.steps.get('dataflow');
+        (0, assert_1.guard)(parseStep !== undefined && normalizedStep !== undefined && dataflowStep !== undefined, 'All steps must be present');
         if (message.format === 'n-quads') {
             (0, send_1.sendMessage)(this.socket, {
                 type: 'response-file-analysis',
@@ -163,9 +165,9 @@ class FlowRServerConnection {
                 id: message.id,
                 cfg: cfg ? (0, cfg_1.cfg2quads)(cfg, config()) : undefined,
                 results: {
-                    parse: await (0, print_1.printStepResult)(_00_parse_1.PARSE_WITH_R_SHELL_STEP, sanitizedResults.parse, 5 /* StepOutputFormat.RdfQuads */, config()),
-                    normalize: await (0, print_1.printStepResult)(_10_normalize_1.NORMALIZE, sanitizedResults.normalize, 5 /* StepOutputFormat.RdfQuads */, config()),
-                    dataflow: await (0, print_1.printStepResult)(_20_dataflow_1.STATIC_DATAFLOW, sanitizedResults.dataflow, 5 /* StepOutputFormat.RdfQuads */, config())
+                    parse: await (0, print_1.printStepResult)(parseStep, sanitizedResults.parse, 5 /* StepOutputFormat.RdfQuads */, config()),
+                    normalize: await (0, print_1.printStepResult)(normalizedStep, sanitizedResults.normalize, 5 /* StepOutputFormat.RdfQuads */, config()),
+                    dataflow: await (0, print_1.printStepResult)(dataflowStep, sanitizedResults.dataflow, 5 /* StepOutputFormat.RdfQuads */, config())
                 }
             });
         }

package/cli/script-core/statistics-helper-core.js

@@ -59,7 +59,7 @@ async function getStatsForSingleFile(options) {
     if (stats.outputs.size === 1) {
         if (options['dump-json']) {
             const [, output] = [...stats.outputs.entries()][0];
-            const cfg = (0, cfg_1.extractCFG)(output.normalize);
+            const cfg = (0, cfg_1.extractCFG)(output.normalize, output.dataflow.graph);
             statistics_file_1.statisticsFileProvider.append('output-json', 'parse', await (0, print_1.printStepResult)(_00_parse_1.PARSE_WITH_R_SHELL_STEP, output.parse, 2 /* StepOutputFormat.Json */));
             statistics_file_1.statisticsFileProvider.append('output-json', 'normalize', await (0, print_1.printStepResult)(_10_normalize_1.NORMALIZE, output.normalize, 2 /* StepOutputFormat.Json */));
             statistics_file_1.statisticsFileProvider.append('output-json', 'dataflow', await (0, print_1.printStepResult)(_20_dataflow_1.STATIC_DATAFLOW, output.dataflow, 2 /* StepOutputFormat.Json */));

package/config.js

@@ -31,7 +31,6 @@ const defaultEngineConfigs = {
 };
 exports.defaultConfigOptions = {
     ignoreSourceCalls: false,
-    rPath: undefined,
     semantics: {
         environment: {
             overwriteBuiltIns: {
@@ -126,6 +125,14 @@ function getEngineConfig(engine) {
 }
 function loadConfigFromFile(configFile, workingDirectory) {
     if (configFile !== undefined) {
+        if (path_1.default.isAbsolute(configFile) && fs_1.default.existsSync(configFile)) {
+            log_1.log.trace(`Found config at ${configFile} (absolute)`);
+            const ret = parseConfig(fs_1.default.readFileSync(configFile, { encoding: 'utf-8' }));
+            if (ret) {
+                log_1.log.info(`Using config ${JSON.stringify(ret)}`);
+                return ret;
+            }
+        }
         let searchPath = path_1.default.resolve(workingDirectory);
         do {
             const configPath = path_1.default.join(searchPath, configFile);

package/core/pipeline-executor.d.ts

@@ -95,10 +95,16 @@ export declare class PipelineExecutor<P extends Pipeline> {
      * Construct a new pipeline executor.
      * The required additional input is specified by the {@link IPipelineStep#requiredInput|required input configuration} of each step in the `pipeline`.
      *
+     * Please see {@link createDataflowPipeline} and friends for engine agnostic shortcuts to create a pipeline executor.
+     *
      * @param pipeline - The {@link Pipeline} to execute, probably created with {@link createPipeline}.
      * @param input    - External {@link PipelineInput|configuration and input} required to execute the given pipeline.
      */
     constructor(pipeline: P, input: PipelineInput<P>);
+    /**
+     * Retrieve the {@link Pipeline|pipeline} that is currently being.
+     */
+    getPipeline(): P;
     /**
      * Retrieve the current {@link PipelineStepStage|stage} the pipeline executor is in.
      *

package/core/pipeline-executor.js

@@ -99,6 +99,8 @@ class PipelineExecutor {
      * Construct a new pipeline executor.
      * The required additional input is specified by the {@link IPipelineStep#requiredInput|required input configuration} of each step in the `pipeline`.
      *
+     * Please see {@link createDataflowPipeline} and friends for engine agnostic shortcuts to create a pipeline executor.
+     *
      * @param pipeline - The {@link Pipeline} to execute, probably created with {@link createPipeline}.
      * @param input    - External {@link PipelineInput|configuration and input} required to execute the given pipeline.
      */
@@ -114,6 +116,12 @@ class PipelineExecutor {
         }
         (0, built_in_config_1.registerBuiltInDefinitions)(builtIns.definitions);
     }
+    /**
+     * Retrieve the {@link Pipeline|pipeline} that is currently being.
+     */
+    getPipeline() {
+        return this.pipeline;
+    }
     /**
      * Retrieve the current {@link PipelineStepStage|stage} the pipeline executor is in.
      *

package/core/print/dataflow-printer.js

@@ -16,6 +16,9 @@ function mayObjectJson(d) {
     }
 }
 function objectJson(df) {
+    if (df === null) {
+        return 'null';
+    }
     const elems = [];
     for (const [key, value] of Object.entries(df)) {
         switch (typeof value) {

package/core/steps/all/core/01-parse-tree-sitter.d.ts

@@ -5,6 +5,13 @@ import type { ParseRequiredInput } from '../../../../r-bridge/parser';
 export interface ParseStepOutputTS {
     readonly parsed: Tree;
 }
+export interface TreeSitterParseJson {
+    readonly '.meta': {
+        readonly tokenCount: number;
+        readonly tokenCountNoComments: number;
+    };
+    readonly str: string;
+}
 export declare const PARSE_WITH_TREE_SITTER_STEP: {
     readonly name: "parse";
     readonly humanReadableName: "parse with tree-sitter";