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
7 changes: 4 additions & 3 deletions packages/void/src/codegen/db-types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { mkdirSync, writeFileSync } from 'node:fs';
import { mkdirSync } from 'node:fs';
import { join } from 'pathe';
import type { SchemaLocation } from '../drizzle/discover.ts';
import { writeFileIfChanged } from './write-if-changed.ts';

export const DRIZZLE_OPERATORS =
'sql, eq, ne, gt, gte, lt, lte, and, or, not, desc, asc, like, ilike, notLike, inArray, notInArray, isNull, isNotNull, between, notBetween, exists, notExists, count, sum, avg, min, max';
Expand All @@ -19,7 +20,7 @@ export function generateDbDts(
outDir: string,
schema: SchemaLocation | null,
dialect: 'sqlite' | 'postgresql',
): void {
): boolean {
mkdirSync(outDir, { recursive: true });

const lines =
Expand Down Expand Up @@ -69,5 +70,5 @@ export function generateDbDts(
'',
];

writeFileSync(join(outDir, 'db.d.ts'), lines.join('\n'));
return writeFileIfChanged(join(outDir, 'db.d.ts'), lines.join('\n'));
}
44 changes: 26 additions & 18 deletions packages/void/src/codegen/prepare.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { existsSync, mkdirSync, rmSync, writeFileSync } from 'node:fs';
import { existsSync, mkdirSync, rmSync } from 'node:fs';
import { fileURLToPath } from 'node:url';
import { join } from 'pathe';
import { loadEnv } from 'vite';
Expand All @@ -14,6 +14,7 @@ import { findEnvFile, generateEnvTypes } from './env-types.ts';
import { ensureProjectTsconfig } from './project-tsconfig.ts';
import { generateQueueTypes } from './queue-types.ts';
import { generateRouteTypes } from './route-types.ts';
import { writeFileIfChanged } from './write-if-changed.ts';

export type PrepareProjectResult = {
written: Array<string>;
Expand All @@ -27,8 +28,9 @@ function writeGeneratedFile(
written: Array<string>,
): void {
mkdirSync(outDir, { recursive: true });
writeFileSync(join(outDir, fileName), content);
written.push(join('.void', fileName));
if (writeFileIfChanged(join(outDir, fileName), content)) {
written.push(join('.void', fileName));
}
}

function removeGeneratedFile(outDir: string, fileName: string, removed: Array<string>): void {
Expand Down Expand Up @@ -88,8 +90,9 @@ export async function prepareProject(root: string): Promise<PrepareProjectResult
const schema = discoverSchema(root, paths);
const hasDbRuntime = schema != null || authEnabled;
if (hasDbRuntime) {
generateDbDts(outDir, schema, dialect);
written.push(join('.void', 'db.d.ts'));
if (generateDbDts(outDir, schema, dialect)) {
written.push(join('.void', 'db.d.ts'));
}
} else {
removeGeneratedFile(outDir, 'db.d.ts', removed);
}
Expand All @@ -105,24 +108,29 @@ export async function prepareProject(root: string): Promise<PrepareProjectResult
const databasePath = join(outDir, 'better-auth-db.ts');
const drizzleAdapterPath = fileURLToPath(import.meta.resolve('better-auth/adapters/drizzle'));

writeFileSync(schemaPath, generateVoidAuthDrizzleSchema(authRuntime, env));
writeFileSync(
databasePath,
generateVoidAuthDatabaseModule({
dialect,
schemaImportPath: schemaPath,
drizzleAdapterPath,
}),
);
written.push(join('.void', 'better-auth-schema.ts'));
written.push(join('.void', 'better-auth-db.ts'));
if (writeFileIfChanged(schemaPath, generateVoidAuthDrizzleSchema(authRuntime, env))) {
written.push(join('.void', 'better-auth-schema.ts'));
}
if (
writeFileIfChanged(
databasePath,
generateVoidAuthDatabaseModule({
dialect,
schemaImportPath: schemaPath,
drizzleAdapterPath,
}),
)
) {
written.push(join('.void', 'better-auth-db.ts'));
}
} else {
removeGeneratedFile(outDir, 'better-auth-schema.ts', removed);
removeGeneratedFile(outDir, 'better-auth-db.ts', removed);
}

ensureProjectTsconfig(root, hasRouteTypes, hasDbRuntime, schema != null, { paths });
written.push(join('.void', 'tsconfig.json'));
if (ensureProjectTsconfig(root, hasRouteTypes, hasDbRuntime, schema != null, { paths })) {
written.push(join('.void', 'tsconfig.json'));
}

return { written, removed };
}
10 changes: 7 additions & 3 deletions packages/void/src/codegen/project-tsconfig.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
import { existsSync, mkdirSync } from 'node:fs';
import { join, relative } from 'pathe';
import { readProjectPaths, type ProjectPaths } from '../project-paths.ts';
import { writeFileIfChanged } from './write-if-changed.ts';

export type ProjectTsconfigOptions = {
redirectDbModule?: boolean;
Expand Down Expand Up @@ -112,9 +113,12 @@ export function ensureProjectTsconfig(
hasDb?: boolean,
hasSchema?: boolean,
options: ProjectTsconfigOptions = {},
): void {
): boolean {
const outDir = join(root, '.void');
mkdirSync(outDir, { recursive: true });
const tsconfig = createProjectTsconfig(root, hasRouteTypes, hasDb, hasSchema, options);
writeFileSync(join(outDir, 'tsconfig.json'), JSON.stringify(tsconfig, null, 2) + '\n');
return writeFileIfChanged(
join(outDir, 'tsconfig.json'),
JSON.stringify(tsconfig, null, 2) + '\n',
);
}
22 changes: 22 additions & 0 deletions packages/void/src/codegen/write-if-changed.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
import { dirname } from 'pathe';

export function writeFileIfChanged(path: string, content: string): boolean {
let existing: string | null = null;

try {
existing = readFileSync(path, 'utf8');
} catch (err) {
if ((err as NodeJS.ErrnoException).code !== 'ENOENT') {
throw err;
}
}

if (existing === content) {
return false;
}

mkdirSync(dirname(path), { recursive: true });
writeFileSync(path, content);
return true;
}
17 changes: 5 additions & 12 deletions packages/void/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
import {
closeSync,
existsSync,
mkdirSync,
openSync,
readFileSync,
writeFileSync,
writeSync,
} from 'node:fs';
import { closeSync, existsSync, mkdirSync, openSync, readFileSync, writeSync } from 'node:fs';
import { fileURLToPath } from 'node:url';
import { cloudflare, type PluginConfig, type WorkerConfig } from '@cloudflare/vite-plugin';
import { join } from 'pathe';
Expand Down Expand Up @@ -34,6 +26,7 @@ import {
resolveLiveBindingConfig,
syncWranglerBindings,
} from './cli/wrangler.ts';
import { writeFileIfChanged } from './codegen/write-if-changed.ts';
import { readConfig, resolveBindingNames, isNodeTarget, getDatabaseDialect } from './config.ts';
import { scanJobsSync } from './crons/scan.ts';
import { inferBindingsFromSource } from './inference/walk.ts';
Expand Down Expand Up @@ -285,7 +278,7 @@ export default {
},
};
`;
writeFileSync(wrapperPath, body);
writeFileIfChanged(wrapperPath, body);
return wrapperPath;
}

Expand All @@ -294,7 +287,7 @@ function generateVinextPagesEntry(root: string): string {
const outDir = join(root, '.void');
mkdirSync(outDir, { recursive: true });
const entryPath = join(outDir, 'vinext-pages-entry.ts');
writeFileSync(
writeFileIfChanged(
entryPath,
`// Auto-generated by Void — vinext Pages Router worker entry
// @ts-expect-error virtual module resolved by vinext at build time
Expand Down Expand Up @@ -324,7 +317,7 @@ function generateReactRouterEntry(root: string): string {
const outDir = join(root, '.void');
mkdirSync(outDir, { recursive: true });
const entryPath = join(outDir, 'react-router-entry.ts');
writeFileSync(
writeFileIfChanged(
entryPath,
`// Auto-generated by Void — React Router v7 worker entry
import { createRequestHandler } from "react-router";
Expand Down
5 changes: 3 additions & 2 deletions packages/void/src/plugin-env-schema.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { mkdirSync, writeFileSync } from 'node:fs';
import { mkdirSync } from 'node:fs';
import { join } from 'pathe';
import { type Plugin, type ResolvedConfig } from 'vite';
import { findEnvFile, generateEnvTypes } from './codegen/env-types.ts';
import { writeFileIfChanged } from './codegen/write-if-changed.ts';
import { loadUserEnvFile } from './host/load-user-env.ts';
import { voidLog, voidWarn } from './log.ts';
import { filterLoadedEnv } from './shared/env.ts';
Expand Down Expand Up @@ -93,7 +94,7 @@ export function envSchemaPlugin(root: string, options: EnvSchemaPluginOptions =
}
mkdirSync(outDir, { recursive: true });
const { dts } = generateEnvTypes(envFile, outDir);
writeFileSync(join(outDir, 'env.d.ts'), dts);
writeFileIfChanged(join(outDir, 'env.d.ts'), dts);
}

async function importUserEnv() {
Expand Down
29 changes: 15 additions & 14 deletions packages/void/src/plugin-routing.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
import { existsSync, mkdirSync } from 'node:fs';
import { homedir } from 'node:os';
import { fileURLToPath } from 'node:url';
import { dirname, join, relative } from 'pathe';
Expand All @@ -15,6 +15,7 @@ import { lintDestinationSplats, lintDuplicateSources, mergeRoutingRules } from '
import { findEnvFileForPaths } from './codegen/env-types.ts';
import { generateQueueTypes } from './codegen/queue-types.ts';
import { generateRouteTypes } from './codegen/route-types.ts';
import { writeFileIfChanged } from './codegen/write-if-changed.ts';
import { readConfig, getDatabaseDialect } from './config.ts';
import { readProjectPaths } from './project-paths.ts';
import {
Expand Down Expand Up @@ -127,15 +128,15 @@ export function routingPlugin(root: string, options: RoutingPluginOptions): Plug
return;
}
const { dts } = generateRouteTypes(scan, routesDir, outDir, pagesDir);
writeFileSync(join(outDir, 'routes.d.ts'), dts);
writeFileIfChanged(join(outDir, 'routes.d.ts'), dts);
}

function writeQueueTypes() {
if (!scan) {
return;
}
const dts = generateQueueTypes(scan.queues, queuesDir, outDir);
writeFileSync(join(outDir, 'queues.d.ts'), dts);
writeFileIfChanged(join(outDir, 'queues.d.ts'), dts);
}

async function rescan() {
Expand Down Expand Up @@ -276,8 +277,8 @@ export function routingPlugin(root: string, options: RoutingPluginOptions): Plug
const schemaPath = join(outDir, 'better-auth-schema.ts');
const databasePath = join(outDir, 'better-auth-db.ts');

writeFileSync(schemaPath, generateVoidAuthDrizzleSchema(authRuntime, env));
writeFileSync(
writeFileIfChanged(schemaPath, generateVoidAuthDrizzleSchema(authRuntime, env));
writeFileIfChanged(
databasePath,
generateVoidAuthDatabaseModule({
dialect: compileOptions.auth.dialect,
Expand Down Expand Up @@ -397,13 +398,13 @@ export function routingPlugin(root: string, options: RoutingPluginOptions): Plug
mkdirSync(outDir, { recursive: true });
// Write initial entry — will be re-written with hasQueues once scan completes
if (options.target) {
writeFileSync(
writeFileIfChanged(
join(outDir, 'app.ts'),
compileNodeApp(options.target, compileOptions.honoPath, getEnvSchemaModule()),
);
writeFileSync(join(outDir, 'index.ts'), compileNodeServer(options.target));
writeFileIfChanged(join(outDir, 'index.ts'), compileNodeServer(options.target));
} else {
writeFileSync(
writeFileIfChanged(
join(outDir, 'entry.ts'),
compileWorkerEntry(
false,
Expand Down Expand Up @@ -513,13 +514,13 @@ export function routingPlugin(root: string, options: RoutingPluginOptions): Plug
}
// Re-write entry with queue handler if needed
if (options.target) {
writeFileSync(
writeFileIfChanged(
join(outDir, 'app.ts'),
compileNodeApp(options.target, compileOptions.honoPath, getEnvSchemaModule()),
);
writeFileSync(join(outDir, 'index.ts'), compileNodeServer(options.target));
writeFileIfChanged(join(outDir, 'index.ts'), compileNodeServer(options.target));
} else {
writeFileSync(
writeFileIfChanged(
join(outDir, 'entry.ts'),
compileWorkerEntry(
scan!.queues.length > 0,
Expand Down Expand Up @@ -647,13 +648,13 @@ export function routingPlugin(root: string, options: RoutingPluginOptions): Plug
writeRouteTypes();
writeQueueTypes();
if (options.target) {
writeFileSync(
writeFileIfChanged(
join(outDir, 'app.ts'),
compileNodeApp(options.target, compileOptions.honoPath, getEnvSchemaModule()),
);
writeFileSync(join(outDir, 'index.ts'), compileNodeServer(options.target));
writeFileIfChanged(join(outDir, 'index.ts'), compileNodeServer(options.target));
} else {
writeFileSync(
writeFileIfChanged(
join(outDir, 'entry.ts'),
compileWorkerEntry(
scan!.queues.length > 0,
Expand Down
25 changes: 24 additions & 1 deletion packages/void/test/unit/project-tsconfig.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
import {
existsSync,
mkdirSync,
readFileSync,
rmSync,
statSync,
utimesSync,
writeFileSync,
} from 'node:fs';
import { tmpdir } from 'node:os';
import { join } from 'pathe';
import { afterEach, beforeEach, describe, expect, it } from 'vite-plus/test';
Expand Down Expand Up @@ -113,6 +121,21 @@ describe('ensureProjectTsconfig', () => {
expect(tsconfig.compilerOptions.paths['@void/md/pages']).toEqual(['./md.d.ts']);
});

it('does not rewrite tsconfig.json when generated content is unchanged', () => {
const tsconfigPath = join(root, '.void', 'tsconfig.json');
const oldTime = new Date('2024-01-01T00:00:00.000Z');

ensureProjectTsconfig(root);
utimesSync(tsconfigPath, oldTime, oldTime);

ensureProjectTsconfig(root);
expect(statSync(tsconfigPath).mtimeMs).toBe(oldTime.getTime());

mkdirSync(join(root, 'routes'), { recursive: true });
ensureProjectTsconfig(root);
expect(statSync(tsconfigPath).mtimeMs).not.toBe(oldTime.getTime());
});

it('combines routes, queues, and md when all present', () => {
mkdirSync(join(root, 'routes'), { recursive: true });
mkdirSync(join(root, 'queues'), { recursive: true });
Expand Down