2020-02-13 22:34:29 +01:00
|
|
|
const util = require("./util");
|
2019-11-02 00:06:25 +01:00
|
|
|
let previous_pinned;
|
|
|
|
let previous_normal;
|
|
|
|
let previous_dormant;
|
|
|
|
let all_streams = [];
|
2017-04-18 17:08:59 +02:00
|
|
|
|
|
|
|
exports.get_streams = function () {
|
|
|
|
// Right now this is only used for testing, but we should
|
|
|
|
// use it for things like hotkeys that cycle through streams.
|
|
|
|
return all_streams;
|
|
|
|
};
|
|
|
|
|
|
|
|
function filter_streams_by_search(streams, search_term) {
|
|
|
|
if (search_term === '') {
|
|
|
|
return streams;
|
|
|
|
}
|
|
|
|
|
2019-11-02 00:06:25 +01:00
|
|
|
let search_terms = search_term.toLowerCase().split(",");
|
js: Convert _.map(a, …) to a.map(…).
And convert the corresponding function expressions to arrow style
while we’re here.
import * as babelParser from "recast/parsers/babel";
import * as recast from "recast";
import * as tsParser from "recast/parsers/typescript";
import { builders as b, namedTypes as n } from "ast-types";
import K from "ast-types/gen/kinds";
import fs from "fs";
import path from "path";
import process from "process";
const checkExpression = (node: n.Node): node is K.ExpressionKind =>
n.Expression.check(node);
for (const file of process.argv.slice(2)) {
console.log("Parsing", file);
const ast = recast.parse(fs.readFileSync(file, { encoding: "utf8" }), {
parser: path.extname(file) === ".ts" ? tsParser : babelParser,
});
let changed = false;
recast.visit(ast, {
visitCallExpression(path) {
const { callee, arguments: args } = path.node;
if (
n.MemberExpression.check(callee) &&
!callee.computed &&
n.Identifier.check(callee.object) &&
callee.object.name === "_" &&
n.Identifier.check(callee.property) &&
callee.property.name === "map" &&
args.length === 2 &&
checkExpression(args[0]) &&
checkExpression(args[1])
) {
const [arr, fn] = args;
path.replace(
b.callExpression(b.memberExpression(arr, b.identifier("map")), [
n.FunctionExpression.check(fn) ||
n.ArrowFunctionExpression.check(fn)
? b.arrowFunctionExpression(
fn.params,
n.BlockStatement.check(fn.body) &&
fn.body.body.length === 1 &&
n.ReturnStatement.check(fn.body.body[0])
? fn.body.body[0].argument || b.identifier("undefined")
: fn.body
)
: fn,
])
);
changed = true;
}
this.traverse(path);
},
});
if (changed) {
console.log("Writing", file);
fs.writeFileSync(file, recast.print(ast).code, { encoding: "utf8" });
}
}
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-02-08 02:43:49 +01:00
|
|
|
search_terms = search_terms.map(s => s.trim());
|
2017-04-18 17:08:59 +02:00
|
|
|
|
2020-02-08 04:08:04 +01:00
|
|
|
const filtered_streams = streams.filter(stream => search_terms.some(search_term => {
|
2020-02-08 03:33:46 +01:00
|
|
|
const lower_stream_name = stream.toLowerCase();
|
|
|
|
const cands = lower_stream_name.split(" ");
|
|
|
|
cands.push(lower_stream_name);
|
2020-02-08 04:08:04 +01:00
|
|
|
return cands.some(name => name.startsWith(search_term));
|
2020-02-08 03:33:46 +01:00
|
|
|
}));
|
2017-04-18 17:08:59 +02:00
|
|
|
|
|
|
|
return filtered_streams;
|
|
|
|
}
|
|
|
|
|
2019-12-27 21:45:28 +01:00
|
|
|
exports.sort_groups = function (streams, search_term) {
|
2017-04-18 17:08:59 +02:00
|
|
|
if (streams.length === 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
streams = filter_streams_by_search(streams, search_term);
|
|
|
|
|
2017-04-28 15:38:02 +02:00
|
|
|
function is_normal(sub) {
|
|
|
|
return stream_data.is_active(sub);
|
2017-04-18 17:08:59 +02:00
|
|
|
}
|
|
|
|
|
2019-11-02 00:06:25 +01:00
|
|
|
const pinned_streams = [];
|
|
|
|
const normal_streams = [];
|
|
|
|
const dormant_streams = [];
|
2017-04-18 17:08:59 +02:00
|
|
|
|
js: Automatically convert _.each to for…of.
This commit was automatically generated by the following script,
followed by lint --fix and a few small manual lint-related cleanups.
import * as babelParser from "recast/parsers/babel";
import * as recast from "recast";
import * as tsParser from "recast/parsers/typescript";
import { builders as b, namedTypes as n } from "ast-types";
import { Context } from "ast-types/lib/path-visitor";
import K from "ast-types/gen/kinds";
import { NodePath } from "ast-types/lib/node-path";
import assert from "assert";
import fs from "fs";
import path from "path";
import process from "process";
const checkExpression = (node: n.Node): node is K.ExpressionKind =>
n.Expression.check(node);
const checkStatement = (node: n.Node): node is K.StatementKind =>
n.Statement.check(node);
for (const file of process.argv.slice(2)) {
console.log("Parsing", file);
const ast = recast.parse(fs.readFileSync(file, { encoding: "utf8" }), {
parser: path.extname(file) === ".ts" ? tsParser : babelParser,
});
let changed = false;
let inLoop = false;
let replaceReturn = false;
const visitLoop = (...args: string[]) =>
function(this: Context, path: NodePath) {
for (const arg of args) {
this.visit(path.get(arg));
}
const old = { inLoop };
inLoop = true;
this.visit(path.get("body"));
inLoop = old.inLoop;
return false;
};
recast.visit(ast, {
visitDoWhileStatement: visitLoop("test"),
visitExpressionStatement(path) {
const { expression, comments } = path.node;
let valueOnly;
if (
n.CallExpression.check(expression) &&
n.MemberExpression.check(expression.callee) &&
!expression.callee.computed &&
n.Identifier.check(expression.callee.object) &&
expression.callee.object.name === "_" &&
n.Identifier.check(expression.callee.property) &&
["each", "forEach"].includes(expression.callee.property.name) &&
[2, 3].includes(expression.arguments.length) &&
checkExpression(expression.arguments[0]) &&
(n.FunctionExpression.check(expression.arguments[1]) ||
n.ArrowFunctionExpression.check(expression.arguments[1])) &&
[1, 2].includes(expression.arguments[1].params.length) &&
n.Identifier.check(expression.arguments[1].params[0]) &&
((valueOnly = expression.arguments[1].params[1] === undefined) ||
n.Identifier.check(expression.arguments[1].params[1])) &&
(expression.arguments[2] === undefined ||
n.ThisExpression.check(expression.arguments[2]))
) {
const old = { inLoop, replaceReturn };
inLoop = false;
replaceReturn = true;
this.visit(
path
.get("expression")
.get("arguments")
.get(1)
.get("body")
);
inLoop = old.inLoop;
replaceReturn = old.replaceReturn;
const [right, { body, params }] = expression.arguments;
const loop = b.forOfStatement(
b.variableDeclaration("let", [
b.variableDeclarator(
valueOnly ? params[0] : b.arrayPattern([params[1], params[0]])
),
]),
valueOnly
? right
: b.callExpression(
b.memberExpression(right, b.identifier("entries")),
[]
),
checkStatement(body) ? body : b.expressionStatement(body)
);
loop.comments = comments;
path.replace(loop);
changed = true;
}
this.traverse(path);
},
visitForStatement: visitLoop("init", "test", "update"),
visitForInStatement: visitLoop("left", "right"),
visitForOfStatement: visitLoop("left", "right"),
visitFunction(path) {
this.visit(path.get("params"));
const old = { replaceReturn };
replaceReturn = false;
this.visit(path.get("body"));
replaceReturn = old.replaceReturn;
return false;
},
visitReturnStatement(path) {
if (replaceReturn) {
assert(!inLoop); // could use labeled continue if this ever fires
const { argument, comments } = path.node;
if (argument === null) {
const s = b.continueStatement();
s.comments = comments;
path.replace(s);
} else {
const s = b.expressionStatement(argument);
s.comments = comments;
path.replace(s, b.continueStatement());
}
return false;
}
this.traverse(path);
},
visitWhileStatement: visitLoop("test"),
});
if (changed) {
console.log("Writing", file);
fs.writeFileSync(file, recast.print(ast).code, { encoding: "utf8" });
}
}
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-02-06 06:19:47 +01:00
|
|
|
for (const stream of streams) {
|
2019-11-02 00:06:25 +01:00
|
|
|
const sub = stream_data.get_sub(stream);
|
|
|
|
const pinned = sub.pin_to_top;
|
2017-04-18 17:08:59 +02:00
|
|
|
if (pinned) {
|
|
|
|
pinned_streams.push(stream);
|
2017-04-28 15:38:02 +02:00
|
|
|
} else if (is_normal(sub)) {
|
2017-04-18 17:08:59 +02:00
|
|
|
normal_streams.push(stream);
|
|
|
|
} else {
|
|
|
|
dormant_streams.push(stream);
|
|
|
|
}
|
js: Automatically convert _.each to for…of.
This commit was automatically generated by the following script,
followed by lint --fix and a few small manual lint-related cleanups.
import * as babelParser from "recast/parsers/babel";
import * as recast from "recast";
import * as tsParser from "recast/parsers/typescript";
import { builders as b, namedTypes as n } from "ast-types";
import { Context } from "ast-types/lib/path-visitor";
import K from "ast-types/gen/kinds";
import { NodePath } from "ast-types/lib/node-path";
import assert from "assert";
import fs from "fs";
import path from "path";
import process from "process";
const checkExpression = (node: n.Node): node is K.ExpressionKind =>
n.Expression.check(node);
const checkStatement = (node: n.Node): node is K.StatementKind =>
n.Statement.check(node);
for (const file of process.argv.slice(2)) {
console.log("Parsing", file);
const ast = recast.parse(fs.readFileSync(file, { encoding: "utf8" }), {
parser: path.extname(file) === ".ts" ? tsParser : babelParser,
});
let changed = false;
let inLoop = false;
let replaceReturn = false;
const visitLoop = (...args: string[]) =>
function(this: Context, path: NodePath) {
for (const arg of args) {
this.visit(path.get(arg));
}
const old = { inLoop };
inLoop = true;
this.visit(path.get("body"));
inLoop = old.inLoop;
return false;
};
recast.visit(ast, {
visitDoWhileStatement: visitLoop("test"),
visitExpressionStatement(path) {
const { expression, comments } = path.node;
let valueOnly;
if (
n.CallExpression.check(expression) &&
n.MemberExpression.check(expression.callee) &&
!expression.callee.computed &&
n.Identifier.check(expression.callee.object) &&
expression.callee.object.name === "_" &&
n.Identifier.check(expression.callee.property) &&
["each", "forEach"].includes(expression.callee.property.name) &&
[2, 3].includes(expression.arguments.length) &&
checkExpression(expression.arguments[0]) &&
(n.FunctionExpression.check(expression.arguments[1]) ||
n.ArrowFunctionExpression.check(expression.arguments[1])) &&
[1, 2].includes(expression.arguments[1].params.length) &&
n.Identifier.check(expression.arguments[1].params[0]) &&
((valueOnly = expression.arguments[1].params[1] === undefined) ||
n.Identifier.check(expression.arguments[1].params[1])) &&
(expression.arguments[2] === undefined ||
n.ThisExpression.check(expression.arguments[2]))
) {
const old = { inLoop, replaceReturn };
inLoop = false;
replaceReturn = true;
this.visit(
path
.get("expression")
.get("arguments")
.get(1)
.get("body")
);
inLoop = old.inLoop;
replaceReturn = old.replaceReturn;
const [right, { body, params }] = expression.arguments;
const loop = b.forOfStatement(
b.variableDeclaration("let", [
b.variableDeclarator(
valueOnly ? params[0] : b.arrayPattern([params[1], params[0]])
),
]),
valueOnly
? right
: b.callExpression(
b.memberExpression(right, b.identifier("entries")),
[]
),
checkStatement(body) ? body : b.expressionStatement(body)
);
loop.comments = comments;
path.replace(loop);
changed = true;
}
this.traverse(path);
},
visitForStatement: visitLoop("init", "test", "update"),
visitForInStatement: visitLoop("left", "right"),
visitForOfStatement: visitLoop("left", "right"),
visitFunction(path) {
this.visit(path.get("params"));
const old = { replaceReturn };
replaceReturn = false;
this.visit(path.get("body"));
replaceReturn = old.replaceReturn;
return false;
},
visitReturnStatement(path) {
if (replaceReturn) {
assert(!inLoop); // could use labeled continue if this ever fires
const { argument, comments } = path.node;
if (argument === null) {
const s = b.continueStatement();
s.comments = comments;
path.replace(s);
} else {
const s = b.expressionStatement(argument);
s.comments = comments;
path.replace(s, b.continueStatement());
}
return false;
}
this.traverse(path);
},
visitWhileStatement: visitLoop("test"),
});
if (changed) {
console.log("Writing", file);
fs.writeFileSync(file, recast.print(ast).code, { encoding: "utf8" });
}
}
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-02-06 06:19:47 +01:00
|
|
|
}
|
2017-04-18 17:08:59 +02:00
|
|
|
|
|
|
|
pinned_streams.sort(util.strcmp);
|
|
|
|
normal_streams.sort(util.strcmp);
|
|
|
|
dormant_streams.sort(util.strcmp);
|
|
|
|
|
2019-11-02 00:06:25 +01:00
|
|
|
const same_as_before =
|
2017-04-18 17:08:59 +02:00
|
|
|
previous_pinned !== undefined &&
|
|
|
|
util.array_compare(previous_pinned, pinned_streams) &&
|
|
|
|
util.array_compare(previous_normal, normal_streams) &&
|
2018-06-06 18:19:09 +02:00
|
|
|
util.array_compare(previous_dormant, dormant_streams);
|
2017-04-18 17:08:59 +02:00
|
|
|
|
|
|
|
if (!same_as_before) {
|
|
|
|
previous_pinned = pinned_streams;
|
|
|
|
previous_normal = normal_streams;
|
|
|
|
previous_dormant = dormant_streams;
|
|
|
|
|
|
|
|
all_streams = pinned_streams.concat(normal_streams, dormant_streams);
|
|
|
|
}
|
|
|
|
|
|
|
|
return {
|
|
|
|
same_as_before: same_as_before,
|
|
|
|
pinned_streams: pinned_streams,
|
|
|
|
normal_streams: normal_streams,
|
|
|
|
dormant_streams: dormant_streams,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
2018-04-24 16:59:01 +02:00
|
|
|
function pos(stream_id) {
|
2019-11-02 00:06:25 +01:00
|
|
|
const sub = stream_data.get_sub_by_id(stream_id);
|
|
|
|
const name = sub.name;
|
|
|
|
const i = all_streams.indexOf(name);
|
2018-04-24 16:59:01 +02:00
|
|
|
|
|
|
|
if (i < 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
|
|
|
function maybe_get_stream_id(i) {
|
|
|
|
if (i < 0 || i >= all_streams.length) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-11-02 00:06:25 +01:00
|
|
|
const name = all_streams[i];
|
|
|
|
const stream_id = stream_data.get_stream_id(name);
|
2018-04-24 16:59:01 +02:00
|
|
|
return stream_id;
|
|
|
|
}
|
|
|
|
|
|
|
|
exports.first_stream_id = function () {
|
|
|
|
return maybe_get_stream_id(0);
|
|
|
|
};
|
|
|
|
|
|
|
|
exports.prev_stream_id = function (stream_id) {
|
2019-11-02 00:06:25 +01:00
|
|
|
const i = pos(stream_id);
|
2018-04-24 16:59:01 +02:00
|
|
|
|
|
|
|
if (i === undefined) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
return maybe_get_stream_id(i - 1);
|
|
|
|
};
|
|
|
|
|
|
|
|
exports.next_stream_id = function (stream_id) {
|
2019-11-02 00:06:25 +01:00
|
|
|
const i = pos(stream_id);
|
2018-04-24 16:59:01 +02:00
|
|
|
|
|
|
|
if (i === undefined) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
return maybe_get_stream_id(i + 1);
|
|
|
|
};
|
|
|
|
|
2019-10-25 09:45:13 +02:00
|
|
|
window.stream_sort = exports;
|