Skip to content

Commit 3f8807d

Browse files
JosXaJosXa
committed
Road to 0
1 parent 433a7e1 commit 3f8807d

16 files changed

+120
-125
lines changed

‎biome.json

+10-3
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,26 @@
1111
"enabled": true
1212
},
1313
"linter": {
14-
"ignore": ["assets"],
14+
"ignore": ["assets", ".erb"],
1515
"enabled": true,
1616
"rules": {
1717
"all": true,
1818
"complexity": {
1919
"noExcessiveCognitiveComplexity": "off",
2020
"noForEach": "off"
2121
},
22+
"a11y": {
23+
"useMediaCaption": "off",
24+
"useKeyWithMouseEvents": "off"
25+
},
2226
"correctness": {
2327
"noUndeclaredVariables": "off",
2428
"noConstantCondition": "off",
2529
"noUnusedVariables": "off",
2630
"noUnusedImports": "off",
2731
"noNodejsModules": "off",
28-
"useExhaustiveDependencies": "off"
32+
"useExhaustiveDependencies": "off",
33+
"useJsxKeyInIterable": "off"
2934
},
3035
"style": {
3136
"noDefaultExport": "off",
@@ -46,10 +51,12 @@
4651
"suspicious": {
4752
"noEmptyBlockStatements": "off",
4853
"noDebugger": "off",
54+
"noArrayIndexKey": "off",
4955
"noConsoleLog": "off",
5056
"noExplicitAny": "off",
5157
"noAssignInExpressions": "off",
52-
"noImplicitAnyLet": "off"
58+
"noImplicitAnyLet": "off",
59+
"noControlCharactersInRegex": "off"
5360
},
5461
"security": {
5562
"noDangerouslySetInnerHtml": "off"

‎src/main/helpers.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ Attempted to convert to a valid shortcut, but result was invalid:
130130
Please open ${path.basename(filePath)} and try again or ask a question in our [Github Discussions](https://github.com/johnlindquist/kit/discussions)
131131
`;
132132

133+
// biome-ignore lint/suspicious/useAwait: Keep it like this for now
133134
export const shortcutInfo = async (
134135
shortcut: string,
135136
targetScriptPath: string,
@@ -157,7 +158,7 @@ export const convertShortcut = (shortcut: string, filePath: string): string => {
157158
// log.info({ shortcut, normalizedShortcut });
158159
const [sourceKey, ...mods] = normalizedShortcut
159160
.trim()
160-
?.split(/\+| /)
161+
.split(/\+| /)
161162
.map((str: string) => str.trim())
162163
.filter(Boolean)
163164
.reverse();

‎src/main/index.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,6 @@ const checkKit = async () => {
720720
const storedVersion = await getStoredVersion();
721721
log.info(`Stored version: ${storedVersion}`);
722722

723-
const isMac = os.platform() === 'darwin';
724723
if (!(await kitExists()) || storedVersion === '0.0.0') {
725724
if (!process.env.KIT_SPLASH) {
726725
log.info(`🌑 shouldUseDarkColors: ${nativeTheme.shouldUseDarkColors ? 'true' : 'false'}`);
@@ -962,7 +961,7 @@ const checkKit = async () => {
962961
await cacheMainScripts();
963962
}, 1000);
964963
} catch (error) {
965-
ohNo(error);
964+
ohNo(error).then();
966965
}
967966
};
968967

@@ -972,7 +971,7 @@ emitter.on(KitEvent.SetScriptTimestamp, async (stamp) => {
972971

973972
app.whenReady().then(loadSupportedOptionalLibraries).then(checkKit).catch(ohNo);
974973

975-
app?.on('will-quit', (e) => {
974+
app?.on('will-quit', (_e) => {
976975
log.info('🚪 will-quit');
977976
});
978977

‎src/main/io.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export const toKey = (keycode: number, shift = false) => {
101101
export const registerIO = async (handler: (event: any) => void) => {
102102
const { UiohookKey, uIOhook } = shims['uiohook-napi'];
103103

104-
const notAuthorized = await getAccessibilityAuthorized();
104+
const notAuthorized = getAccessibilityAuthorized();
105105
if (!notAuthorized) {
106106
log.info('Requesting accessibility access...');
107107

‎src/main/ipc.ts

+42-42
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import log from 'electron-log';
2323
import { debounce } from 'lodash-es';
2424
import { DownloaderHelper } from 'node-downloader-helper';
2525
import { KitEvent, emitter } from '../shared/events';
26-
import { type ProcessAndPrompt, cachePreview, ensureIdleProcess, processes } from './process';
26+
import { type ProcessAndPrompt, ensureIdleProcess, processes } from './process';
2727

2828
import { getAssetPath } from '../shared/assets';
2929
import { noChoice } from '../shared/defaults';
@@ -33,7 +33,7 @@ import { runPromptProcess } from './kit';
3333
import type { KitPrompt } from './prompt';
3434
import { prompts } from './prompts';
3535
import { debounceInvokeSearch, invokeFlagSearch, invokeSearch } from './search';
36-
import { kitCache, kitState } from './state';
36+
import { kitState } from './state';
3737

3838
let actionsOpenTimeout: NodeJS.Timeout;
3939
let prevTransformedInput = '';
@@ -197,26 +197,26 @@ export const startIpc = () => {
197197
ipcMain.on(
198198
AppChannel.ERROR_RELOAD,
199199
debounce(
200-
async (event, data: any) => {
200+
(_event, data: any) => {
201201
log.info('AppChannel.ERROR_RELOAD');
202-
const { scriptPath, pid } = data;
202+
const { /*scriptPath,*/ pid } = data;
203203
const prompt = prompts.get(pid);
204-
const onReload = async () => {
205-
const markdown = `# Error
206-
207-
${data.message}
208-
209-
${data.error}
210-
`;
211-
emitter.emit(KitEvent.RunPromptProcess, {
212-
scriptPath: kitPath('cli', 'info.js'),
213-
args: [path.basename(scriptPath), 'Error... ', markdown],
214-
options: {
215-
force: true,
216-
trigger: Trigger.Info,
217-
},
218-
});
219-
};
204+
// const onReload = async () => {
205+
// const markdown = `# Error
206+
//
207+
// ${data.message}
208+
//
209+
// ${data.error}
210+
// `;
211+
// emitter.emit(KitEvent.RunPromptProcess, {
212+
// scriptPath: kitPath('cli', 'info.js'),
213+
// args: [path.basename(scriptPath), 'Error... ', markdown],
214+
// options: {
215+
// force: true,
216+
// trigger: Trigger.Info,
217+
// },
218+
// });
219+
// };
220220

221221
// TODO: Reimplement
222222
if (prompt) {
@@ -257,7 +257,7 @@ ${data.error}
257257
event.sender.send(AppChannel.GET_ASSET, { assetPath });
258258
});
259259

260-
ipcMain.on(AppChannel.RESIZE, (event, resizeData: ResizeData) => {
260+
ipcMain.on(AppChannel.RESIZE, (_event, resizeData: ResizeData) => {
261261
const prompt = prompts.get(resizeData.pid);
262262
// log.info(`>>>>>>>>>>>>> AppChannel.RESIZE`, {
263263
// prompt,
@@ -282,7 +282,7 @@ ${data.error}
282282
});
283283
});
284284

285-
ipcMain.on(AppChannel.OPEN_SCRIPT_LOG, async (event, script: Script) => {
285+
ipcMain.on(AppChannel.OPEN_SCRIPT_LOG, async (_event, script: Script) => {
286286
const logPath = getLogFromScriptPath((script as Script).filePath);
287287
await runPromptProcess(kitPath('cli/edit-file.js'), [logPath], {
288288
force: true,
@@ -291,14 +291,14 @@ ${data.error}
291291
});
292292
});
293293

294-
ipcMain.on(AppChannel.END_PROCESS, (event, { pid }) => {
294+
ipcMain.on(AppChannel.END_PROCESS, (_event, { pid }) => {
295295
const processInfo = processes.getByPid(pid);
296296
if (processInfo) {
297297
processes.removeByPid(pid);
298298
}
299299
});
300300

301-
ipcMain.on(AppChannel.OPEN_SCRIPT_DB, async (event, { focused, script }: AppState) => {
301+
ipcMain.on(AppChannel.OPEN_SCRIPT_DB, async (_event, { focused, script }: AppState) => {
302302
const filePath = (focused as any)?.filePath || script?.filePath;
303303
const dbPath = path.resolve(filePath, '..', '..', 'db', `_${path.basename(filePath).replace(/js$/, 'json')}`);
304304
await runPromptProcess(kitPath('cli/edit-file.js'), [dbPath], {
@@ -308,7 +308,7 @@ ${data.error}
308308
});
309309
});
310310

311-
ipcMain.on(AppChannel.OPEN_SCRIPT, async (event, { script, description, input }: Required<AppState>) => {
311+
ipcMain.on(AppChannel.OPEN_SCRIPT, async (_event, { script, description, input }: Required<AppState>) => {
312312
// When the editor is editing a script. Toggle back to running the script.
313313
const descriptionIsFile = await isFile(description);
314314
const descriptionIsInKenv = isInDir(kenvPath())(description);
@@ -340,8 +340,8 @@ ${data.error}
340340
});
341341
});
342342

343-
ipcMain.on(AppChannel.EDIT_SCRIPT, async (event, { script }: Required<AppState>) => {
344-
if ((isInDir(kitPath()), script.filePath)) {
343+
ipcMain.on(AppChannel.EDIT_SCRIPT, async (_event, { script }: Required<AppState>) => {
344+
if (isInDir(kitPath())(script.filePath)) {
345345
return;
346346
}
347347
await runPromptProcess(kitPath('main/edit.js'), [script.filePath], {
@@ -351,7 +351,7 @@ ${data.error}
351351
});
352352
});
353353

354-
ipcMain.on(AppChannel.OPEN_FILE, async (event, { script, focused }: Required<AppState>) => {
354+
ipcMain.on(AppChannel.OPEN_FILE, async (_event, { script, focused }: Required<AppState>) => {
355355
const filePath = (focused as any)?.filePath || script?.filePath;
356356

357357
await runPromptProcess(kitPath('cli/edit-file.js'), [filePath], {
@@ -361,21 +361,21 @@ ${data.error}
361361
});
362362
});
363363

364-
ipcMain.on(AppChannel.RUN_MAIN_SCRIPT, async () => {
364+
ipcMain.on(AppChannel.RUN_MAIN_SCRIPT, () =>
365365
runPromptProcess(getMainScriptPath(), [], {
366366
force: true,
367367
trigger: Trigger.Kit,
368368
sponsorCheck: false,
369-
});
370-
});
369+
}),
370+
);
371371

372-
ipcMain.on(AppChannel.RUN_PROCESSES_SCRIPT, async () => {
372+
ipcMain.on(AppChannel.RUN_PROCESSES_SCRIPT, () =>
373373
runPromptProcess(kitPath('cli', 'processes.js'), [], {
374374
force: true,
375375
trigger: Trigger.Kit,
376376
sponsorCheck: false,
377-
});
378-
});
377+
}),
378+
);
379379

380380
for (const channel of [
381381
Channel.ACTIONS_INPUT,
@@ -460,7 +460,7 @@ ${data.error}
460460
}
461461

462462
const isArg = message.state.ui === UI.arg;
463-
const hasFlag = message.state.flaggedValue;
463+
// const hasFlag = message.state.flaggedValue;
464464

465465
if (isArg) {
466466
const shouldSearch = checkShortcodesAndKeywords(prompt, input);
@@ -510,7 +510,7 @@ ${data.error}
510510
}
511511

512512
if (channel === Channel.ABANDON) {
513-
log.info('⚠️ ABANDON', message.pid);
513+
log.info('! ABANDON', message.pid);
514514
}
515515
// log.info({ channel, message });
516516
if ([Channel.VALUE_SUBMITTED, Channel.TAB_CHANGED].includes(channel)) {
@@ -582,11 +582,11 @@ ${data.error}
582582
);
583583
}
584584

585-
ipcMain.on(AppChannel.DRAG_FILE_PATH, async (event, { filePath, icon }: { filePath: string; icon: string }) => {
585+
ipcMain.on(AppChannel.DRAG_FILE_PATH, async (event, { filePath }: { filePath: string; icon: string }) => {
586586
try {
587587
let newPath = filePath;
588588
if (filePath.startsWith('http')) {
589-
newPath = await new Promise((resolve, reject) => {
589+
newPath = await new Promise((resolve) => {
590590
const dl = new DownloaderHelper(filePath, tmpDownloadsDir, {
591591
override: true,
592592
});
@@ -626,7 +626,7 @@ ${data.error}
626626
}
627627
});
628628

629-
ipcMain.on(AppChannel.FEEDBACK, async (event, data: Survey) => {
629+
ipcMain.on(AppChannel.FEEDBACK, async (_event, data: Survey) => {
630630
// runScript(kitPath('cli', 'feedback.js'), JSON.stringify(data));
631631

632632
try {
@@ -646,19 +646,19 @@ ${data.error}
646646
});
647647

648648
type levelType = 'debug' | 'info' | 'warn' | 'error' | 'silly';
649-
ipcMain.on(AppChannel.LOG, async (event, { message, level }: { message: any; level: levelType }) => {
649+
ipcMain.on(AppChannel.LOG, (_event, { message, level }: { message: any; level: levelType }) => {
650650
log[level](message);
651651
});
652652

653-
ipcMain.on(AppChannel.LOGIN, async () => {
653+
ipcMain.on(AppChannel.LOGIN, () => {
654654
runPromptProcess(kitPath('pro', 'login.js'), [], {
655655
force: true,
656656
trigger: Trigger.App,
657657
sponsorCheck: false,
658658
});
659659
});
660660

661-
ipcMain.on(AppChannel.APPLY_UPDATE, async (event, data: any) => {
661+
ipcMain.on(AppChannel.APPLY_UPDATE, (_event, _data: any) => {
662662
log.info('🚀 Applying update');
663663
kitState.applyUpdate = true;
664664
});

‎src/main/kit.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { setShortcodes } from './search';
3131
import { getKitScript, kitCache, kitState, kitStore, sponsorCheck } from './state';
3232
import { TrackEvent, trackEvent } from './track';
3333

34-
app.on('second-instance', async (_event, argv) => {
34+
app.on('second-instance', (_event, argv) => {
3535
log.info('second-instance', argv);
3636
const { _ } = minimist(argv);
3737
const [, , argScript, ...argArgs] = _;
@@ -54,7 +54,7 @@ app.on('second-instance', async (_event, argv) => {
5454
});
5555
});
5656

57-
app.on('activate', async (_event, hasVisibleWindows) => {
57+
app.on('activate', (_event, hasVisibleWindows) => {
5858
kitState.isActivated = true;
5959
runPromptProcess(getMainScriptPath(), [], {
6060
force: true,

‎src/main/logs.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import fs from 'node:fs';
2-
import * as path from 'node:path';
2+
import path from 'node:path';
33
import { getLogFromScriptPath, kenvPath } from '@johnlindquist/kit/core/utils';
44
import { app } from 'electron';
55
/* eslint-disable import/no-cycle */

‎src/main/pty.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ipcMain } from 'electron';
22
/* eslint-disable no-nested-ternary */
33
import log from 'electron-log';
44
import { debounce } from 'lodash-es';
5-
import * as pty from 'node-pty';
5+
import pty from 'node-pty';
66
import { AppChannel } from '../shared/enums';
77
import { KitEvent, emitter } from '../shared/events';
88
import type { TermConfig } from '../shared/types';
@@ -174,7 +174,7 @@ export const createPty = (prompt: KitPrompt) => {
174174
return;
175175
}
176176
try {
177-
t.write(data?.data);
177+
t?.write(data?.data);
178178
} catch (error) {
179179
log.error('Error writing to pty', error);
180180
}
@@ -206,7 +206,7 @@ export const createPty = (prompt: KitPrompt) => {
206206
}
207207
};
208208

209-
const handleTermReady = async (event, config: TermConfig) => {
209+
const handleTermReady = async (_event, config: TermConfig) => {
210210
log.info({
211211
termConfig: {
212212
command: config?.command || '<no command>',
@@ -342,7 +342,7 @@ export const createPty = (prompt: KitPrompt) => {
342342
config.command = '';
343343
}, 200);
344344

345-
t.onData(async (data: any) => {
345+
t.onData((data: any) => {
346346
try {
347347
sendData(data);
348348
} catch (ex) {

0 commit comments

Comments
 (0)