[everything] run prettier.

master
Drake 2 years ago
parent d50b3ef708
commit 428886645f

@ -3,7 +3,7 @@
"singleQuote": false, "singleQuote": false,
"semi": true, "semi": true,
"bracketSpacing": true, "bracketSpacing": true,
"trailingComma": "none", "trailingComma": "none",
"overrides": [ "overrides": [
{ {
"files": "*.js", "files": "*.js",

@ -1,3 +1,3 @@
{ {
"presets": ["@babel/preset-flow", "@babel/preset-react"] "presets": ["@babel/preset-flow", "@babel/preset-react"]
} }

@ -1,22 +1,22 @@
import esbuild from 'esbuild' import esbuild from "esbuild";
import babel from 'esbuild-plugin-babel' import babel from "esbuild-plugin-babel";
(async ()=>{ (async () => {
try { try {
await esbuild.build({ await esbuild.build({
entryPoints: ["src/index.js"], entryPoints: ["src/index.js"],
bundle: true, bundle: true,
minify: true, minify: true,
format: "iife", format: "iife",
target: "es2021", target: "es2021",
outfile: "dist/build.js", outfile: "dist/build.js",
plugins: [babel()] plugins: [babel()]
}) });
console.log("Build succeeded!") console.log("Build succeeded!");
process.exit(0) process.exit(0);
} catch (e) { } catch (e) {
console.error(e) console.error(e);
console.log("Build failed!") console.log("Build failed!");
process.exit(1) process.exit(1);
} }
})() //IIFE to shutup lsp })(); //IIFE to shutup lsp

@ -1,33 +1,33 @@
{ {
"name": "demoncord", "name": "demoncord",
"version": "0.0.1-indev", "version": "0.0.1-indev",
"description": "a devilesque client mod 😈", "description": "a devilesque client mod 😈",
"main": "src/index.js", "main": "src/index.js",
"scripts": { "scripts": {
"build": "node build.mjs", "build": "node build.mjs",
"flow": "flow" "flow": "flow"
}, },
"author": "Drake", "author": "Drake",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"devDependencies": { "devDependencies": {
"@babel/core": "^7.16.7", "@babel/core": "^7.16.7",
"@babel/preset-flow": "^7.16.7", "@babel/preset-flow": "^7.16.7",
"@babel/preset-react": "^7.16.7", "@babel/preset-react": "^7.16.7",
"@rollup/plugin-babel": "^5.3.0", "@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^21.0.1", "@rollup/plugin-commonjs": "^21.0.1",
"@rollup/plugin-node-resolve": "^13.1.3", "@rollup/plugin-node-resolve": "^13.1.3",
"demonpatcher": "^0.1.0", "demonpatcher": "^0.1.0",
"esbuild": "^0.14.11", "esbuild": "^0.14.11",
"esbuild-plugin-babel": "^0.2.3", "esbuild-plugin-babel": "^0.2.3",
"flow-bin": "^0.169.0", "flow-bin": "^0.169.0",
"flow-remove-types": "^2.169.0", "flow-remove-types": "^2.169.0",
"idb-keyval": "^6.0.3", "idb-keyval": "^6.0.3",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"rollup": "^2.63.0", "rollup": "^2.63.0",
"rollup-plugin-esbuild": "^4.8.2", "rollup-plugin-esbuild": "^4.8.2",
"rollup-plugin-flow": "^1.1.1", "rollup-plugin-flow": "^1.1.1",
"rollup-plugin-uglify": "^6.0.4", "rollup-plugin-uglify": "^6.0.4",
"simian": "^1.4.3" "simian": "^1.4.3"
} }
} }

File diff suppressed because it is too large Load Diff

4
shims/react.js vendored

@ -1,3 +1,3 @@
import { React } from "../src/api/common.js" import { React } from "../src/api/common.js";
export { React } export { React };

@ -28,7 +28,7 @@ function init(obj: Object) {
// } // }
function add(command: { function add(command: {
name: string, name: string,
callback: (args: Array<any>) => string, callback: (args: Array<any>) => string
}): () => void { }): () => void {
let sym = Symbol(command.name); let sym = Symbol(command.name);
window.demon[commandsSym][sym] = command; window.demon[commandsSym][sym] = command;
@ -39,5 +39,5 @@ function add(command: {
export default { export default {
add: add, add: add,
init: init, init: init
}; };

@ -1,18 +1,18 @@
// @flow // @flow
import webpack from "./webpack.js" import webpack from "./webpack.js";
import * as idb from "idb-keyval"; import * as idb from "idb-keyval";
const common: {React: Object, ReactDOM: Object} = { const common: { React: Object, ReactDOM: Object } = {
React: webpack.findByProps( React: webpack.findByProps(
"__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED", "__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED",
"createElement" "createElement"
), ),
ReactDOM: webpack.findByProps( ReactDOM: webpack.findByProps(
"__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED", "__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED",
"hydrate" "hydrate"
), ),
"idb_keyval": idb idb_keyval: idb
} };
export default common; export default common;

@ -18,12 +18,12 @@
// return map; // return map;
//})(); //})();
function getAllClasses() { function getAllClasses() {
return document.styleSheets[0].rules || document.styleSheets[0].cssRules return document.styleSheets[0].rules || document.styleSheets[0].cssRules;
} }
function getClassListByName(className) { function getClassListByName(className) {
const classes = getAllClasses() const classes = getAllClasses();
return classes return classes;
} }
//how to define getters and setters on an object: //how to define getters and setters on an object:
@ -41,20 +41,16 @@ function getClassListByName(className) {
// }, // },
//}); //});
function getProxyObj(classes) { function getProxyObj(classes) {}
}
function init(obj: Object) { function init(obj: Object) {
obj.demon.css = { obj.demon.css = {
classes: { classes: {
get: (className) => { get: (className) => {}
}
} };
}
}
} }
export default { export default {
init init
} };

@ -24,13 +24,13 @@ async function init(obj: Object): Promise<boolean> {
async function addPlugin(iife: string): Promise<boolean> { async function addPlugin(iife: string): Promise<boolean> {
// expected metadata: {name: "name", desc: "description", author: "author"} // expected metadata: {name: "name", desc: "description", author: "author"}
const exports: Object = (0, eval)(iife); const exports: Object = (0, eval)(iife);
const metadata: Object = exports.metadata; const metadata: Object = exports.metadata;
const obj: Object = { const obj: Object = {
// whether the plugin is started or stopped isn't going to be stored in the iDB, so it can be accessed more easily by all components // whether the plugin is started or stopped isn't going to be stored in the iDB, so it can be accessed more easily by all components
metadata: metadata, metadata: metadata,
iife: iife, iife: iife,
enabled: false, // should plugins be enabled by default? not sure enabled: false // should plugins be enabled by default? not sure
}; };
const globalSettings: Object = await get("demoncord"); const globalSettings: Object = await get("demoncord");
/*try { /*try {
@ -69,9 +69,9 @@ async function startPlugin(name: string): Promise<boolean> {
const exports: Object = (0, eval)(plug.iife); const exports: Object = (0, eval)(plug.iife);
const onStart: (ctx: Object) => void = exports.onStart; const onStart: (ctx: Object) => void = exports.onStart;
let ctx = {}; // ctx is how you're going to store things that need to be accessed in both onStart and onStop. dumb, i know let ctx = {}; // ctx is how you're going to store things that need to be accessed in both onStart and onStop. dumb, i know
if (plug.metadata.cumcord) { if (plug.metadata.cumcord) {
ctx.cumcord = window.demon //TODO: explicit cumcord compat layer. ctx.cumcord = window.demon; //TODO: explicit cumcord compat layer.
} }
onStart(ctx); onStart(ctx);
if (exports.settings) if (exports.settings)
settingsInj.registerSettingsEntry( settingsInj.registerSettingsEntry(
@ -89,7 +89,7 @@ async function stopPlugin(name: string): Promise<boolean> {
const globalSettings = await get("demoncord"); const globalSettings = await get("demoncord");
if (globalSettings["plugin"][name] === undefined) { if (globalSettings["plugin"][name] === undefined) {
logger.error("Cannot stop non-existant or non-running plugin!", [ logger.error("Cannot stop non-existant or non-running plugin!", [
"Plugins", "Plugins"
]); ]);
return false; return false;
} else { } else {
@ -123,5 +123,5 @@ export default {
delPlugin, delPlugin,
startPlugin, startPlugin,
stopPlugin, stopPlugin,
togglePlugin, togglePlugin
}; };

@ -1,18 +1,16 @@
// @flow // @flow
import webpack from "../../webpack.js" import webpack from "../../webpack.js";
import common from "../../common.js" import common from "../../common.js";
const React = common.React const React = common.React;
const FormTitle = webpack.findByDisplayName("FormTitle") const FormTitle = webpack.findByDisplayName("FormTitle");
const FormDivider = webpack.findByDisplayName("FormDivider") const FormDivider = webpack.findByDisplayName("FormDivider");
const FormSection = webpack.findByDisplayName("FormSection") const FormSection = webpack.findByDisplayName("FormSection");
export default function(): any { export default function (): any {
return ( return (
<FormSection> <FormSection>
<FormTitle tag="h1"> <FormTitle tag="h1">Demoncord Settings</FormTitle>
Demoncord Settings </FormSection>
</FormTitle> );
</FormSection>
)
} }

@ -1,17 +1,17 @@
// @flow // @flow
import tmp from "./settingsInj.js" import tmp from "./settingsInj.js";
const registerSettingsEntry = tmp.registerSettingsEntry const registerSettingsEntry = tmp.registerSettingsEntry;
import common from "../common.js" import common from "../common.js";
const React = common.React const React = common.React;
import Settings from "./components/settings.jsx" import Settings from "./components/settings.jsx";
function init() { function init() {
console.log(Settings) console.log(Settings);
console.log(Settings()) console.log(Settings());
registerSettingsEntry("General Settings", undefined, Settings) registerSettingsEntry("General Settings", undefined, Settings);
} }
export default { export default {
init init
} };

@ -1,7 +1,7 @@
// @flow // @flow
import webpack from "../webpack.js"; import webpack from "../webpack.js";
import common from "../common.js" import common from "../common.js";
const React = common.React; const React = common.React;
const settingsSym = Symbol("__settings"); const settingsSym = Symbol("__settings");
@ -9,33 +9,32 @@ const settingsSym = Symbol("__settings");
// super secret value that shouldnt be exposed, used internally to avoid section conflicts and the like // super secret value that shouldnt be exposed, used internally to avoid section conflicts and the like
const ovrwrtSctnSym: symbol = Symbol("__overwriteSection"); const ovrwrtSctnSym: symbol = Symbol("__overwriteSection");
const settingsView = webpack.findByDisplayName("SettingsView") const settingsView = webpack.findByDisplayName("SettingsView");
type getPredicateSectionsEntry = type getPredicateSectionsEntry =
| { | {
section: "HEADER", section: "HEADER",
label: string, label: string
} }
| { | {
section: "DIVIDER", section: "DIVIDER"
} }
| { | {
section: string, section: string,
label: string, label: string,
component: Function, component: Function
}; };
function patch(args: mixed, ret: getPredicateSectionsEntry[]) { function patch(args: mixed, ret: getPredicateSectionsEntry[]) {
const processedEntries = window.demon[settingsSym].entries.map((e) => ({ const processedEntries = window.demon[settingsSym].entries.map((e) => ({
section: section: (e[ovrwrtSctnSym] ?? "DEMON_SETTINGS_LOADER_") + e.name,
(e[ovrwrtSctnSym] ?? "DEMON_SETTINGS_LOADER_") +
e.name,
label: e.name, label: e.name,
element: e.component, element: e.component
})); }));
processedEntries.map((e) => {console.log(e)}) processedEntries.map((e) => {
console.log(e);
});
const injectionIndex = const injectionIndex =
2 + ret.findIndex((section) => section.section === "Game Activity"); 2 + ret.findIndex((section) => section.section === "Game Activity");
@ -56,7 +55,7 @@ function init() {
settingsView.default.prototype, settingsView.default.prototype,
patch patch
), ),
entries: [], entries: []
}; };
// debug // debug
@ -70,9 +69,7 @@ function unInit() {
function unregisterSettingsEntry(name: string) { function unregisterSettingsEntry(name: string) {
let s = window.demon[settingsSym]; let s = window.demon[settingsSym];
s.entries = s.entries.filter( s.entries = s.entries.filter((e) => (e[ovrwrtSctnSym] ?? e.name) !== name);
(e) => (e[ovrwrtSctnSym] ?? e.name) !== name
);
} }
function registerSettingsEntry( function registerSettingsEntry(
@ -82,8 +79,8 @@ function registerSettingsEntry(
): () => void { ): () => void {
let entry: { [symbol | string]: any } = { name, component }; let entry: { [symbol | string]: any } = { name, component };
if (section) entry[ovrwrtSctnSym] = section; if (section) entry[ovrwrtSctnSym] = section;
//entry.component.type = entry.component.type.default //entry.component.type = entry.component.type.default
console.log(entry) console.log(entry);
window.demon[settingsSym].entries.push(entry); window.demon[settingsSym].entries.push(entry);
return () => unregisterSettingsEntry(name); return () => unregisterSettingsEntry(name);
} }
@ -93,5 +90,5 @@ export default {
unInit, unInit,
registerSettingsEntry, registerSettingsEntry,
unregisterSettingsEntry, unregisterSettingsEntry,
ovrwrtSctnSymm: ovrwrtSctnSym, ovrwrtSctnSymm: ovrwrtSctnSym
}; };

@ -79,5 +79,5 @@ export default {
warn, warn,
error, error,
trace, trace,
group, group
}; };

@ -1,64 +1,64 @@
// @flow // @flow
type ModuleType = Object/* { [symbol]: any } */; type ModuleType = Object /* { [symbol]: any } */;
type FilterFunc = (module: ModuleType) => boolean; type FilterFunc = (module: ModuleType) => boolean;
function getModules(): any { function getModules(): any {
let modules: { c: mixed[] } = {}; let modules: { c: mixed[] } = {};
window.webpackChunkdiscord_app.push([ window.webpackChunkdiscord_app.push([
[Math.random().toString(36)], [Math.random().toString(36)],
{}, {},
(e) => { (e) => {
modules = e; modules = e;
}, }
]); ]);
return modules.c; return modules.c;
} }
function filter(filter: FilterFunc, moduleList: any): Array<Object> { function filter(filter: FilterFunc, moduleList: any): Array<Object> {
let modules: Array<mixed[]> = []; let modules: Array<mixed[]> = [];
for (const mod in moduleList) { for (const mod in moduleList) {
const module = moduleList[mod].exports; const module = moduleList[mod].exports;
if (module) { if (module) {
if (module.default && module.__esModule && filter(module.default)) { if (module.default && module.__esModule && filter(module.default)) {
modules.push(module.default); modules.push(module.default);
} else if (filter(module)) { } else if (filter(module)) {
modules.push(module); modules.push(module);
} }
}
} }
} return modules;
return modules;
} }
type WebpackModules = { type WebpackModules = {
modules: () => any, modules: () => any,
filter: (filter: FilterFunc, moduleList: any) => Object[], filter: (filter: FilterFunc, moduleList: any) => Object[],
find: (filter: FilterFunc) => Object, find: (filter: FilterFunc) => Object,
findAll: (filter: FilterFunc) => Object[], findAll: (filter: FilterFunc) => Object[],
findByProps: (...props: string[]) => Object, findByProps: (...props: string[]) => Object,
findByPropsAll: (...props: string[]) => Object[], findByPropsAll: (...props: string[]) => Object[],
findByDisplayName: (prop: string) => Object[], findByDisplayName: (prop: string) => Object[]
}; };
let webpack: WebpackModules = { let webpack: WebpackModules = {
modules: getModules(), modules: getModules(),
filter: filter, filter: filter,
find: (filter: FilterFunc) => webpack.filter(filter, webpack.modules)[0], find: (filter: FilterFunc) => webpack.filter(filter, webpack.modules)[0],
findAll: (filter: FilterFunc) => webpack.filter(filter, webpack.modules), findAll: (filter: FilterFunc) => webpack.filter(filter, webpack.modules),
findByProps: (...props: Array<string>) => { findByProps: (...props: Array<string>) => {
return webpack.find((module) => { return webpack.find((module) => {
return props.every((prop) => module[prop] !== undefined); return props.every((prop) => module[prop] !== undefined);
}); });
}, },
findByPropsAll: (...props: Array<string>) => { findByPropsAll: (...props: Array<string>) => {
return webpack.findAll((module) => return webpack.findAll((module) =>
props.every((prop) => module[prop] !== undefined) props.every((prop) => module[prop] !== undefined)
); );
}, },
findByDisplayName: (prop: string) => { findByDisplayName: (prop: string) => {
return webpack.find((m) => m?.default?.displayName === prop) return webpack.find((m) => m?.default?.displayName === prop);
} }
}; };
export default webpack; export default webpack;

@ -1,7 +1,7 @@
import init from "./init.js" import init from "./init.js";
if (window.demon) { if (window.demon) {
delete window.demon; // this is a very good idea delete window.demon; // this is a very good idea
} }
init(window) init(window);

@ -1,12 +1,12 @@
// @flow // @flow
import Patcher from "simian"; import Patcher from "simian";
import webpack from "./api/webpack"; import webpack from "./api/webpack";
import common from "./api/common"; import common from "./api/common";
import commands from "./api/commands"; import commands from "./api/commands";
import plugins from "./api/plugins"; import plugins from "./api/plugins";
import settingsInj from "./api/settings/settingsInj"; import settingsInj from "./api/settings/settingsInj";
import settings from "./api/settings/settings" import settings from "./api/settings/settings";
import css from "./api/css" import css from "./api/css";
async function init(obj: Object): Promise<void> { async function init(obj: Object): Promise<void> {
const patcher = new Patcher(); const patcher = new Patcher();
@ -32,22 +32,22 @@ async function init(obj: Object): Promise<void> {
}, },
before: patcher.before, before: patcher.before,
instead: patcher.instead, instead: patcher.instead,
after: patcher.after, after: patcher.after
}, },
webpack, webpack,
common, common,
commands: { commands: {
add: commands.add, add: commands.add
}, },
__DO_NOT_USE_OR_YOU_WILL_BE_FIRED_UNTO_THE_DEPTHS_OF_HELL: { __DO_NOT_USE_OR_YOU_WILL_BE_FIRED_UNTO_THE_DEPTHS_OF_HELL: {
plugins, plugins
} }
}; };
commands.init(obj); commands.init(obj);
settingsInj.init(); settingsInj.init();
plugins.init(obj); plugins.init(obj);
settings.init(); settings.init();
css.init(obj) css.init(obj);
} }
export default init; export default init;

Loading…
Cancel
Save