Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@
"pathe": "^2.0.3",
"pkg-types": "^2.1.0",
"rimraf": "^6.0.1",
"scule": "^1.3.0"
"scule": "^1.3.0",
"untyped": "^2.0.0"
},
"lint-staged": {
"*.{js,ts}": [
Expand Down
3 changes: 3 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 0 additions & 34 deletions src/bootstrap.ts

This file was deleted.

77 changes: 16 additions & 61 deletions src/cli.ts
Original file line number Diff line number Diff line change
@@ -1,74 +1,19 @@
#!/usr/bin/env node

import type { DevOptions } from './types';
import fs from 'node:fs';
import { defineCommand, runMain } from 'citty';
import { resolve } from 'pathe';
import { version } from '../package.json';
import { bootstrap } from './bootstrap';
import { build as buildApp } from './build';
import { runProd } from './run-prod';
import { getStorage, setStorage } from './storage';
import { consola, getPkgInfo, parseConfig } from './utils';

function debounce<F extends (...args: any[]) => any>(fn: F, delay = 200) {
let timer: NodeJS.Timeout;
return ((...args: any[]) => {
clearTimeout(timer);
timer = setTimeout(() => fn(...args), delay);
}) as F;
}

function errorHandler(e: Error) {
consola.error(e);
}

async function restart(options: DevOptions) {
try {
const oldServer = getStorage('server');
oldServer.closeAllConnections();
oldServer.close();
const { app, router } = await bootstrap();
setStorage('server', app.listen(options.port));
return { app, router };
}
catch (e: any) {
errorHandler(e);
return {};
}
}

const watchHandler = debounce(async (options: DevOptions) => {
consola.start('Watching for changes...');
await restart(options);
consola.success('Restarted');
});

async function devHandler(options: DevOptions) {
const { pkgPath, sourceDir } = options;
fs.watchFile(resolve(pkgPath, 'main.ts'), () => watchHandler(options));
fs.watch(sourceDir, { recursive: true }, async (_, filename) => {
if (filename?.endsWith('module.d.ts'))
return;
watchHandler(options);
});
}
import { bootstrapCli } from './cli/bootstrap';
import { build as buildApp } from './cli/build';
import { generateRequestScriptCli } from './cli/generate-request-script';
import { runProd } from './cli/run-prod';

const dev = defineCommand({
meta: {
name: 'dev',
description: 'Start development server',
},
async run() {
const { port, sourceDir } = await parseConfig();
const { pkgPath } = await getPkgInfo();
const devOptions = { pkgPath, sourceDir, port, isCli: true };
setStorage('devOptions', devOptions);
const { app } = await bootstrap();
await devHandler(devOptions);
setStorage('server', app.listen(port, () => {
consola.box('live server', `http://localhost:${port}`);
}));
await bootstrapCli();
},
});

Expand All @@ -92,13 +37,23 @@ const run = defineCommand({
},
});

const generateRequestScript = defineCommand({
meta: {
name: 'generateRequestScript',
description: 'Generate request script',
},
async run() {
await generateRequestScriptCli();
},
});

const main = defineCommand({
meta: {
name: 'tee',
version,
description: '@cmtlyt/tee cli',
},
subCommands: { dev, build, run },
subCommands: { dev, build, run, grs: generateRequestScript },
});

runMain(main);
89 changes: 89 additions & 0 deletions src/cli/bootstrap.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
import type { DevOptions, GenerateTypeOptions, TeeKoa } from '../types';
import fs from 'node:fs';
import KoaRouter from '@koa/router';
import Koa from 'koa';
import { resolve } from 'pathe';
import { getStorage, setStorage } from '../storage';
import { consola, getPkgInfo, loadModule, parseConfig, parseOptions, runSourceMain } from '../utils';

export async function bootstrap(_options?: GenerateTypeOptions) {
const options = await parseOptions(_options);

const app = new Koa() as TeeKoa.Application;
const router = new KoaRouter();

setStorage('app', app);
setStorage('router', router);

const { typeDeclarations, sourcePath } = await loadModule(app, router, options);

app.middlewares ||= {};

const devOptions = getStorage('devOptions');
if (devOptions?.isCli) {
await runSourceMain(devOptions);
}

app.use(router.routes()).use(router.allowedMethods());

if (!getStorage('isProd', false)) {
fs.writeFileSync(resolve(sourcePath, 'module.d.ts'), typeDeclarations, 'utf-8');
}

return { app, router };
}

function debounce<F extends (...args: any[]) => any>(fn: F, delay = 200) {
let timer: NodeJS.Timeout;
return ((...args: any[]) => {
clearTimeout(timer);
timer = setTimeout(() => fn(...args), delay);
}) as F;
}

function errorHandler(e: Error) {
consola.error(e);
}

async function restart(options: DevOptions) {
try {
const oldServer = getStorage('server');
oldServer.closeAllConnections();
oldServer.close();
const { app, router } = await bootstrap();
setStorage('server', app.listen(options.port));
return { app, router };
}
catch (e: any) {
errorHandler(e);
return {};
}
}

const watchHandler = debounce(async (options: DevOptions) => {
consola.start('Watching for changes...');
await restart(options);
consola.success('Restarted');
});

async function devHandler(options: DevOptions) {
const { pkgPath, sourceDir } = options;
fs.watchFile(resolve(pkgPath, 'main.ts'), () => watchHandler(options));
fs.watch(sourceDir, { recursive: true }, async (_, filename) => {
if (filename?.endsWith('module.d.ts'))
return;
watchHandler(options);
});
}

export async function bootstrapCli() {
const { port, sourceDir } = await parseConfig();
const { pkgPath } = await getPkgInfo();
const devOptions = { pkgPath, sourceDir, port, isCli: true };
setStorage('devOptions', devOptions);
const { app } = await bootstrap();
await devHandler(devOptions);
setStorage('server', app.listen(port, () => {
consola.box('live server', `http://localhost:${port}`);
}));
}
4 changes: 2 additions & 2 deletions src/build.ts → src/cli/build.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { BuildConfig, FileInfoMap, ModuleType } from './types';
import type { BuildConfig, FileInfoMap, ModuleType } from '../types';
import { existsSync } from 'node:fs';
import { build as esbuild } from 'esbuild';
import { basename, resolve } from 'pathe';
import { rimraf } from 'rimraf';
import { defu, getFileInfoMap, getPkgInfo, parseConfig } from './utils';
import { defu, getFileInfoMap, getPkgInfo, parseConfig } from '../utils';

interface BuildOptions extends BuildConfig {
sourceDir?: string;
Expand Down
Loading