on-zero 0.1.22 → 0.1.24

package/src/vite-plugin.ts

@@ -1,238 +1,110 @@
-import { createHash } from 'node:crypto'
-import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from 'node:fs'
-import { basename, resolve } from 'node:path'
+import { isAbsolute, relative, resolve } from 'node:path'
 
-import type { Plugin } from 'vite'
-
-const hash = (s: string) => createHash('sha256').update(s).digest('hex')
-
-// cache to avoid unnecessary writes
-let generateCache: Record<string, string> = {}
-
-function writeFileIfChanged(filePath: string, content: string): boolean {
-  const contentHash = hash(content)
-  if (generateCache[filePath] === contentHash && existsSync(filePath)) {
-    return false
-  }
-  writeFileSync(filePath, content, 'utf-8')
-  generateCache[filePath] = contentHash
-  return true
-}
-
-function generateModelsFile(modelFiles: string[]) {
-  const modelNames = modelFiles.map((f) => basename(f, '.ts')).sort()
-  const getImportName = (name: string) => (name === 'user' ? 'userPublic' : name)
-
-  const imports = modelNames
-    .map((name) => `import * as ${getImportName(name)} from '../models/${name}'`)
-    .join('\n')
-
-  const sortedByImportName = [...modelNames].sort((a, b) =>
-    getImportName(a).localeCompare(getImportName(b))
-  )
-  const modelsObj = `export const models = {\n${sortedByImportName.map((name) => `  ${getImportName(name)},`).join('\n')}\n}`
-
-  const hmrBoundary = `
-if (import.meta.hot) {
-  import.meta.hot.accept()
-}
-`
-
-  return `// auto-generated by on-zero vite plugin\n${imports}\n\n${modelsObj}\n${hmrBoundary}`
-}
+import { generate, type GenerateOptions } from './generate'
 
-function generateTypesFile(modelFiles: string[]) {
-  const modelNames = modelFiles.map((f) => basename(f, '.ts')).sort()
-  const getSchemaName = (name: string) => (name === 'user' ? 'userPublic' : name)
-
-  const typeExports = modelNames
-    .map((name) => {
-      const pascalName = name.charAt(0).toUpperCase() + name.slice(1)
-      const schemaName = getSchemaName(name)
-      return `export type ${pascalName} = TableInsertRow<typeof schema.${schemaName}>\nexport type ${pascalName}Update = TableUpdateRow<typeof schema.${schemaName}>`
-    })
-    .join('\n\n')
-
-  return `import type { TableInsertRow, TableUpdateRow } from 'on-zero'\nimport type * as schema from './tables'\n\n${typeExports}\n`
-}
-
-function generateTablesFile(modelFiles: string[]) {
-  const modelNames = modelFiles.map((f) => basename(f, '.ts')).sort()
-  const getExportName = (name: string) => (name === 'user' ? 'userPublic' : name)
-
-  const exports = modelNames
-    .map((name) => `export { schema as ${getExportName(name)} } from '../models/${name}'`)
-    .join('\n')
+import type { Plugin } from 'vite'
 
-  return `// auto-generated by on-zero vite plugin\n\n${exports}\n`
+export interface OnZeroPluginOptions extends Omit<GenerateOptions, 'dir' | 'silent'> {
+  /** base data directory. defaults to src/data */
+  dir?: string
+  /** additional paths to apply HMR fix to */
+  hmrInclude?: string[]
+  /** disable code generation (HMR only) */
+  disableGenerate?: boolean
 }
 
-async function runGenerate(options: {
-  modelsDir: string
-  generatedDir: string
-  silent?: boolean
-}) {
-  const { modelsDir, generatedDir, silent } = options
-
-  if (!existsSync(generatedDir)) {
-    mkdirSync(generatedDir, { recursive: true })
-  }
-
-  const allModelFiles = readdirSync(modelsDir)
-    .filter((f) => f.endsWith('.ts'))
-    .sort()
-
-  const filesWithSchema = allModelFiles.filter((f) =>
-    readFileSync(resolve(modelsDir, f), 'utf-8').includes('export const schema = table(')
-  )
-
-  const writeResults = [
-    writeFileIfChanged(
-      resolve(generatedDir, 'models.ts'),
-      generateModelsFile(allModelFiles)
-    ),
-    writeFileIfChanged(
-      resolve(generatedDir, 'types.ts'),
-      generateTypesFile(filesWithSchema)
-    ),
-    writeFileIfChanged(
-      resolve(generatedDir, 'tables.ts'),
-      generateTablesFile(filesWithSchema)
-    ),
-  ]
-
-  const filesChanged = writeResults.filter(Boolean).length
-  if (filesChanged > 0 && !silent) {
-    console.info(`[on-zero] generated ${filesChanged} file(s)`)
+function createOnZeroHmrPlugin(hmrInclude: string[] = []): Plugin {
+  const hmrPaths = ['/models/', '/generated/', '/queries/', ...hmrInclude]
+
+  return {
+    name: 'on-zero:hmr',
+    apply: 'serve',
+    enforce: 'post',
+
+    transform(code, id) {
+      if (!hmrPaths.some((p) => id.includes(p)) || !/\.tsx?$/.test(id)) return
+      if (!code.includes('import.meta.hot.invalidate')) return
+
+      return {
+        code: code.replace(
+          /if\s*\(invalidateMessage\)\s*import\.meta\.hot\.invalidate\(invalidateMessage\);?/g,
+          '/* on-zero: HMR invalidate disabled */'
+        ),
+        map: null,
+      }
+    },
   }
-
-  return filesChanged
 }
 
-export interface OnZeroPluginOptions {
-  /**
-   * Path to data directory containing models/ and generated/
-   * @default 'src/data'
-   */
-  dataDir?: string
-
-  /**
-   * Additional paths to apply HMR fix to
-   */
-  hmrInclude?: string[]
-
-  /**
-   * Disable code generation (HMR only)
-   */
-  disableGenerate?: boolean
+function isWithinDirectory(file: string, dir: string): boolean {
+  const rel = relative(dir, file)
+  return rel !== '' && !rel.startsWith('..') && !isAbsolute(rel)
 }
 
-/**
- * Vite plugin for on-zero that handles:
- * 1. Code generation (models.ts, types.ts, tables.ts)
- * 2. HMR support for model files (prevents cascade, enables hot-swap)
- *
- * @example
- * ```ts
- * import { onZeroPlugin } from 'on-zero/vite'
- *
- * export default {
- *   plugins: [
- *     onZeroPlugin(),
- *     // ... other plugins
- *   ]
- * }
- * ```
- */
 export function onZeroPlugin(options: OnZeroPluginOptions = {}): Plugin[] {
-  const dataDir = options.dataDir || 'src/data'
-  const hmrPaths = ['/models/', '/generated/', ...(options.hmrInclude || [])]
+  const dir = options.dir ?? 'src/data'
 
+  let dataDir: string
   let modelsDir: string
-  let generatedDir: string
+  let queriesDir: string
+
+  const runGenerate = (silent: boolean) =>
+    generate({
+      dir: dataDir,
+      after: options.after,
+      silent,
+    })
 
   return [
-    // generation plugin
     {
-      name: 'on-zero:generate',
+      name: 'on-zero:serve',
       apply: 'serve',
 
       configResolved(config) {
-        modelsDir = resolve(config.root, dataDir, 'models')
-        generatedDir = resolve(config.root, dataDir, 'generated')
+        dataDir = resolve(config.root, dir)
+        modelsDir = resolve(dataDir, 'models')
+        queriesDir = resolve(dataDir, 'queries')
       },
 
       async buildStart() {
-        if (options.disableGenerate) return
-        await runGenerate({ modelsDir, generatedDir, silent: false })
+        if (!options.disableGenerate) await runGenerate(false)
       },
 
       configureServer(server) {
         if (options.disableGenerate) return
 
-        // watch for model changes
-        server.watcher.on('change', async (file) => {
-          if (file.includes(modelsDir)) {
-            await runGenerate({ modelsDir, generatedDir, silent: false })
-          }
-        })
-
-        server.watcher.on('add', async (file) => {
-          if (file.includes(modelsDir)) {
-            await runGenerate({ modelsDir, generatedDir, silent: false })
-          }
-        })
-
-        server.watcher.on('unlink', async (file) => {
-          if (file.includes(modelsDir)) {
-            await runGenerate({ modelsDir, generatedDir, silent: false })
-          }
-        })
-      },
-    },
-
-    // HMR plugin - removes invalidate calls to prevent cascade
-    {
-      name: 'on-zero:hmr',
-      apply: 'serve',
-      enforce: 'post',
-
-      transform(code, id) {
-        const shouldTransform = hmrPaths.some((p) => id.includes(p)) && /\.tsx?$/.test(id)
-
-        if (shouldTransform && code.includes('import.meta.hot.invalidate')) {
-          return {
-            code: code.replace(
-              /if\s*\(invalidateMessage\)\s*import\.meta\.hot\.invalidate\(invalidateMessage\);?/g,
-              '/* on-zero: HMR invalidate disabled */'
-            ),
-            map: null,
+        const handler = async (file: string) => {
+          if (!/\.tsx?$/.test(file)) return
+          if (isWithinDirectory(file, modelsDir) || isWithinDirectory(file, queriesDir)) {
+            await runGenerate(false)
           }
         }
+
+        server.watcher.on('change', handler)
+        server.watcher.on('add', handler)
+        server.watcher.on('unlink', handler)
       },
     },
 
-    // build plugin - generate once before build
     {
       name: 'on-zero:build',
       apply: 'build',
 
       configResolved(config) {
-        modelsDir = resolve(config.root, dataDir, 'models')
-        generatedDir = resolve(config.root, dataDir, 'generated')
+        dataDir = resolve(config.root, dir)
       },
 
       async buildStart() {
-        if (options.disableGenerate) return
-        await runGenerate({ modelsDir, generatedDir, silent: true })
+        if (!options.disableGenerate) await runGenerate(true)
       },
     },
+
+    createOnZeroHmrPlugin(options.hmrInclude),
   ]
 }
 
-// legacy export for backwards compat
 export const onZeroHmrPlugin = (options?: { include?: string[] }): Plugin => {
-  return onZeroPlugin({ hmrInclude: options?.include, disableGenerate: true })[1]
+  return createOnZeroHmrPlugin(options?.include)
 }
 
 export default onZeroPlugin

package/types/generate.d.ts

@@ -0,0 +1,21 @@
+export interface GenerateOptions {
+    /** base data directory */
+    dir: string;
+    /** run after generation */
+    after?: string;
+    /** suppress output */
+    silent?: boolean;
+}
+export interface WatchOptions extends GenerateOptions {
+    /** debounce delay in ms */
+    debounce?: number;
+}
+export interface GenerateResult {
+    filesChanged: number;
+    modelCount: number;
+    schemaCount: number;
+    queryCount: number;
+}
+export declare function generate(options: GenerateOptions): Promise<GenerateResult>;
+export declare function watch(options: WatchOptions): Promise<import("chokidar").FSWatcher>;
+//# sourceMappingURL=generate.d.ts.map

package/types/generate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAsRA,MAAM,WAAW,eAAe;IAC9B,0BAA0B;IAC1B,GAAG,EAAE,MAAM,CAAA;IACX,2BAA2B;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,sBAAsB;IACtB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AAED,MAAM,WAAW,YAAa,SAAQ,eAAe;IACnD,2BAA2B;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CA2JhF;AAED,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,yCAkChD"}

package/types/generate.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=generate.test.d.ts.map

package/types/generate.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate.test.d.ts","sourceRoot":"","sources":["../src/generate.test.ts"],"names":[],"mappings":""}

package/types/vite-plugin.d.ts

@@ -1,36 +1,13 @@
+import { type GenerateOptions } from './generate';
 import type { Plugin } from 'vite';
-export interface OnZeroPluginOptions {
-    /**
-     * Path to data directory containing models/ and generated/
-     * @default 'src/data'
-     */
-    dataDir?: string;
-    /**
-     * Additional paths to apply HMR fix to
-     */
+export interface OnZeroPluginOptions extends Omit<GenerateOptions, 'dir' | 'silent'> {
+    /** base data directory. defaults to src/data */
+    dir?: string;
+    /** additional paths to apply HMR fix to */
     hmrInclude?: string[];
-    /**
-     * Disable code generation (HMR only)
-     */
+    /** disable code generation (HMR only) */
     disableGenerate?: boolean;
 }
-/**
- * Vite plugin for on-zero that handles:
- * 1. Code generation (models.ts, types.ts, tables.ts)
- * 2. HMR support for model files (prevents cascade, enables hot-swap)
- *
- * @example
- * ```ts
- * import { onZeroPlugin } from 'on-zero/vite'
- *
- * export default {
- *   plugins: [
- *     onZeroPlugin(),
- *     // ... other plugins
- *   ]
- * }
- * ```
- */
 export declare function onZeroPlugin(options?: OnZeroPluginOptions): Plugin[];
 export declare const onZeroHmrPlugin: (options?: {
     include?: string[];

package/types/vite-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AA2GlC,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IAErB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,YAAY,CAAC,OAAO,GAAE,mBAAwB,GAAG,MAAM,EAAE,CAoFxE;AAGD,eAAO,MAAM,eAAe,GAAI,UAAU;IAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,KAAG,MAElE,CAAA;AAED,eAAe,YAAY,CAAA"}
+{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,KAAK,eAAe,EAAE,MAAM,YAAY,CAAA;AAE3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAAC,eAAe,EAAE,KAAK,GAAG,QAAQ,CAAC;IAClF,gDAAgD;IAChD,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,2CAA2C;IAC3C,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,yCAAyC;IACzC,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B;AA8BD,wBAAgB,YAAY,CAAC,OAAO,GAAE,mBAAwB,GAAG,MAAM,EAAE,CA4DxE;AAED,eAAO,MAAM,eAAe,GAAI,UAAU;IAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,KAAG,MAElE,CAAA;AAED,eAAe,YAAY,CAAA"}