@eagleoutice/flowr 2.2.14 → 2.2.16

package/util/range.js

@@ -8,6 +8,7 @@ exports.rangeStartsCompletelyBefore = rangeStartsCompletelyBefore;
 exports.rangesOverlap = rangesOverlap;
 exports.addRanges = addRanges;
 exports.rangeCompare = rangeCompare;
+exports.rangeIsSubsetOf = rangeIsSubsetOf;
 const assert_1 = require("./assert");
 function getRangeStart(p) {
     return p === undefined ? undefined : [p[0], p[1]];
@@ -27,11 +28,12 @@ function rangeFrom(sl, sc, el, ec) {
     return [Number(sl), Number(sc), Number(el), Number(ec)];
 }
 function mergeRanges(...rs) {
-    (0, assert_1.guard)(rs.length > 0, 'Cannot merge no ranges');
-    return rs.reduce(([sl, sc, el, ec], [nsl, nsc, nel, nec]) => [
+    const rsSafe = rs.filter(assert_1.isNotUndefined);
+    (0, assert_1.guard)(rsSafe.length > 0, 'Cannot merge no ranges');
+    return rsSafe.reduce(([sl, sc, el, ec], [nsl, nsc, nel, nec]) => [
         ...(sl < nsl || (sl === nsl && sc < nsc) ? [sl, sc] : [nsl, nsc]),
         ...(el > nel || (el === nel && ec > nec) ? [el, ec] : [nel, nec])
-    ], rs[0]);
+    ], rsSafe[0]);
 }
 /**
  * @returns true iff `r1` starts and ends before `r2` starts (i.e., if `r1` and `r2` do not overlap and `r1` comes before `r2`
@@ -64,4 +66,10 @@ function rangeCompare([r1sl, r1sc, ,], [r2sl, r2sc, ,]) {
         return r1sl - r2sl;
     }
 }
+/**
+ * Checks if the first range is a subset of the second range.
+ */
+function rangeIsSubsetOf([r1sl, r1sc, r1el, r1ec], [r2sl, r2sc, r2el, r2ec]) {
+    return r1sl >= r2sl && r1sc >= r2sc && r1el <= r2el && r1ec <= r2ec;
+}
 //# sourceMappingURL=range.js.map

package/util/text/strings.d.ts

@@ -19,3 +19,9 @@ export declare function joinWithLast(strs: readonly string[], { join, last, join
     last?: string;
     joinTwo?: string;
 }): string;
+/**
+ * Check if the given path is an absolute path.
+ */
+export declare function isAbsolutePath(p: string, regex: RegExp | undefined): boolean;
+/** collect '-' at the start until '[' or '(' is reached, then drop the same from the end if present otherwise return the value as is */
+export declare function dropRawStringSurround(value: string): string;

package/util/text/strings.js

@@ -1,9 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startAndEndsWith = startAndEndsWith;
 exports.withoutWhitespace = withoutWhitespace;
 exports.longestCommonPrefix = longestCommonPrefix;
 exports.joinWithLast = joinWithLast;
+exports.isAbsolutePath = isAbsolutePath;
+exports.dropRawStringSurround = dropRawStringSurround;
+const path_1 = __importDefault(require("path"));
 /**
  * Check if the given string starts and ends with the given letter
  */
@@ -51,4 +57,33 @@ function joinWithLast(strs, { join = ', ', last = ', and ', joinTwo = ' and ' }
     }
     return strs.slice(0, -1).join(join) + last + strs[strs.length - 1];
 }
+/**
+ * Check if the given path is an absolute path.
+ */
+function isAbsolutePath(p, regex) {
+    return regex?.test(p) || p.startsWith('/') || p.startsWith('\\') ||
+        /[a-zA-Z]:[\\/]/.test(p) || // Windows absolute path
+        path_1.default.normalize(p + '/') === path_1.default.normalize(path_1.default.resolve(p) + '/');
+}
+const CorrespondingClose = {
+    '(': ')',
+    '[': ']',
+    '{': '}'
+};
+/** collect '-' at the start until '[' or '(' is reached, then drop the same from the end if present otherwise return the value as is */
+function dropRawStringSurround(value) {
+    const dashCount = value.match(/^-*/)?.[0].length ?? 0;
+    const open = value[dashCount];
+    if (open === '[' || open === '(' || open === '{') {
+        // if the value starts with a dash and then a bracket, we drop the dashes at the end
+        const end = value.endsWith(CorrespondingClose[open] + '-'.repeat(dashCount)) ? dashCount : undefined;
+        if (end !== undefined) {
+            return value.slice(dashCount + 1, -end - 1);
+        }
+        else {
+            return value;
+        }
+    }
+    return value;
+}
 //# sourceMappingURL=strings.js.map

package/util/version.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.flowrVersion = flowrVersion;
 const semver_1 = require("semver");
 // this is automatically replaced with the current version by release-it
-const version = '2.2.14';
+const version = '2.2.16';
 function flowrVersion() {
     return new semver_1.SemVer(version);
 }

package/linter/rules/1-deprecated-functions.d.ts

@@ -1,34 +0,0 @@
-import type { LintingResult } from '../linter-format';
-import { LintingCertainty } from '../linter-format';
-import type { MergeableRecord } from '../../util/objects';
-import type { SourceRange } from '../../util/range';
-import type { Identifier } from '../../dataflow/environments/identifier';
-export interface DeprecatedFunctionsResult extends LintingResult {
-    function: string;
-    range: SourceRange;
-}
-export interface DeprecatedFunctionsConfig extends MergeableRecord {
-    /**
-     * The list of function names that should be marked as deprecated.
-     */
-    deprecatedFunctions: string[];
-}
-export interface DeprecatedFunctionsMetadata extends MergeableRecord {
-    totalRelevant: number;
-    totalNotDeprecated: number;
-}
-export declare const R1_DEPRECATED_FUNCTIONS: {
-    readonly createSearch: (_config: DeprecatedFunctionsConfig) => import("../../search/flowr-search-builder").FlowrSearchBuilder<"all", ["with"], import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../search/flowr-search").FlowrSearchElements<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../search/search-executor/search-enrichers").EnrichedFlowrSearchElement<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>>;
-    readonly processSearchResult: (elements: import("../../search/flowr-search").FlowrSearchElements<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../search/flowr-search").FlowrSearchElement<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>, config: DeprecatedFunctionsConfig) => {
-        results: {
-            certainty: LintingCertainty.Definitely;
-            function: Identifier;
-            range: SourceRange;
-        }[];
-        '.meta': DeprecatedFunctionsMetadata;
-    };
-    readonly prettyPrint: (result: DeprecatedFunctionsResult) => string;
-    readonly defaultConfig: {
-        readonly deprecatedFunctions: ["all_equal", "arrange_all", "distinct_all", "filter_all", "group_by_all", "summarise_all", "mutate_all", "select_all", "vars", "all_vars", "id", "failwith", "select_vars", "rename_vars", "select_var", "current_vars", "bench_tbls", "compare_tbls", "compare_tbls2", "eval_tbls", "eval_tbls2", "location", "changes", "combine", "do", "funs", "add_count_", "add_tally_", "arrange_", "count_", "distinct_", "do_", "filter_", "funs_", "group_by_", "group_indices_", "mutate_", "tally_", "transmute_", "rename_", "rename_vars_", "select_", "select_vars_", "slice_", "summarise_", "summarize_", "summarise_each", "src_local", "tbl_df", "add_rownames", "group_nest", "group_split", "with_groups", "nest_by", "progress_estimated", "recode", "sample_n", "top_n", "transmute", "fct_explicit_na", "aes_", "aes_auto", "annotation_logticks", "is.Coord", "coord_flip", "coord_map", "is.facet", "fortify", "is.ggproto", "guide_train", "is.ggplot", "qplot", "is.theme", "gg_dep", "liply", "isplit2", "list_along", "cross", "invoke", "at_depth", "prepend", "rerun", "splice", "`%@%`", "rbernoulli", "rdunif", "when", "update_list", "map_raw", "accumulate", "reduce_right", "flatten", "map_dfr", "as_vector", "transpose", "melt_delim", "melt_fwf", "melt_table", "read_table2", "str_interp", "as_tibble", "data_frame", "tibble_", "data_frame_", "lst_", "as_data_frame", "as.tibble", "frame_data", "trunc_mat", "is.tibble", "tidy_names", "set_tidy_names", "repair_names", "extract_numeric", "complete_", "drop_na_", "expand_", "crossing_", "nesting_", "extract_", "fill_", "gather_", "nest_", "separate_rows_", "separate_", "spread_", "unite_", "unnest_", "extract", "gather", "nest_legacy", "separate_rows", "separate", "spread"];
-    };
-};

package/linter/rules/1-deprecated-functions.js

@@ -1,54 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.R1_DEPRECATED_FUNCTIONS = void 0;
-const linter_format_1 = require("../linter-format");
-const flowr_search_builder_1 = require("../../search/flowr-search-builder");
-const dfg_1 = require("../../util/mermaid/dfg");
-const search_enrichers_1 = require("../../search/search-executor/search-enrichers");
-exports.R1_DEPRECATED_FUNCTIONS = {
-    createSearch: (_config) => flowr_search_builder_1.Q.all().with(search_enrichers_1.Enrichment.CallTargets),
-    processSearchResult: (elements, config) => {
-        const metadata = {
-            totalRelevant: 0,
-            totalNotDeprecated: 0
-        };
-        return {
-            results: elements.getElements()
-                .flatMap(element => {
-                const targets = (0, search_enrichers_1.enrichmentContent)(element, search_enrichers_1.Enrichment.CallTargets).targets;
-                // if there is a call target that is not built-in (ie a custom function), we don't want to mark it as deprecated
-                // eventually we'd want to solve this with an argument to the CallTargets enrichment like satisfiesCallTargets does!
-                if (targets.some(t => typeof t !== 'string')) {
-                    return [];
-                }
-                return targets.map(target => {
-                    metadata.totalRelevant++;
-                    return {
-                        range: element.node.info.fullRange,
-                        target: target
-                    };
-                });
-            })
-                .filter(element => {
-                if (config.deprecatedFunctions.includes(element.target)) {
-                    return true;
-                }
-                else {
-                    metadata.totalNotDeprecated++;
-                    return false;
-                }
-            })
-                .map(element => ({
-                certainty: linter_format_1.LintingCertainty.Definitely,
-                function: element.target,
-                range: element.range
-            })),
-            '.meta': metadata
-        };
-    },
-    prettyPrint: result => `Function ${result.function} at ${(0, dfg_1.formatRange)(result.range)}`,
-    defaultConfig: {
-        deprecatedFunctions: ['all_equal', 'arrange_all', 'distinct_all', 'filter_all', 'group_by_all', 'summarise_all', 'mutate_all', 'select_all', 'vars', 'all_vars', 'id', 'failwith', 'select_vars', 'rename_vars', 'select_var', 'current_vars', 'bench_tbls', 'compare_tbls', 'compare_tbls2', 'eval_tbls', 'eval_tbls2', 'location', 'changes', 'combine', 'do', 'funs', 'add_count_', 'add_tally_', 'arrange_', 'count_', 'distinct_', 'do_', 'filter_', 'funs_', 'group_by_', 'group_indices_', 'mutate_', 'tally_', 'transmute_', 'rename_', 'rename_vars_', 'select_', 'select_vars_', 'slice_', 'summarise_', 'summarize_', 'summarise_each', 'src_local', 'tbl_df', 'add_rownames', 'group_nest', 'group_split', 'with_groups', 'nest_by', 'progress_estimated', 'recode', 'sample_n', 'top_n', 'transmute', 'fct_explicit_na', 'aes_', 'aes_auto', 'annotation_logticks', 'is.Coord', 'coord_flip', 'coord_map', 'is.facet', 'fortify', 'is.ggproto', 'guide_train', 'is.ggplot', 'qplot', 'is.theme', 'gg_dep', 'liply', 'isplit2', 'list_along', 'cross', 'invoke', 'at_depth', 'prepend', 'rerun', 'splice', '`%@%`', 'rbernoulli', 'rdunif', 'when', 'update_list', 'map_raw', 'accumulate', 'reduce_right', 'flatten', 'map_dfr', 'as_vector', 'transpose', 'melt_delim', 'melt_fwf', 'melt_table', 'read_table2', 'str_interp', 'as_tibble', 'data_frame', 'tibble_', 'data_frame_', 'lst_', 'as_data_frame', 'as.tibble', 'frame_data', 'trunc_mat', 'is.tibble', 'tidy_names', 'set_tidy_names', 'repair_names', 'extract_numeric', 'complete_', 'drop_na_', 'expand_', 'crossing_', 'nesting_', 'extract_', 'fill_', 'gather_', 'nest_', 'separate_rows_', 'separate_', 'spread_', 'unite_', 'unnest_', 'extract', 'gather', 'nest_legacy', 'separate_rows', 'separate', 'spread',]
-    }
-};
-//# sourceMappingURL=1-deprecated-functions.js.map