on-zero 0.1.21 → 0.1.22

package/src/mutations.ts

@@ -10,6 +10,59 @@ import type {
 } from './types'
 import type { TableBuilderWithColumns } from '@rocicorp/zero'
 
+// HMR registry - stores mutation implementations and proxies by table name
+// allows hot-swapping implementations without changing object references
+// stored on globalThis to persist across HMR module reloads
+const registryKey = '__onZeroMutationRegistry__'
+const proxyKey = '__onZeroProxyRegistry__'
+
+// @ts-ignore
+const mutationRegistry: Map<string, Record<string, Function>> = globalThis[registryKey] ||
+(globalThis[registryKey] = new Map())
+// @ts-ignore
+const proxyRegistry: Map<string, any> =
+  globalThis[proxyKey] || (globalThis[proxyKey] = new Map())
+
+// get or create a proxy that delegates to the registry
+// returns the SAME proxy object on subsequent calls so HMR works
+function getOrCreateMutationProxy<T extends Record<string, Function>>(
+  tableName: string,
+  implementations: T
+): T {
+  // always update implementations (supports HMR)
+  mutationRegistry.set(tableName, implementations)
+
+  // return existing proxy if we have one (HMR case)
+  const existing = proxyRegistry.get(tableName)
+  if (existing) {
+    return existing as T
+  }
+
+  // first time - create the proxy
+  const proxy = new Proxy({} as T, {
+    get(_, key: string) {
+      return mutationRegistry.get(tableName)?.[key]
+    },
+    ownKeys() {
+      const current = mutationRegistry.get(tableName)
+      return current ? Object.keys(current) : []
+    },
+    getOwnPropertyDescriptor(_, key: string) {
+      const current = mutationRegistry.get(tableName)
+      if (current && key in current) {
+        return { enumerable: true, configurable: true, value: current[key] }
+      }
+    },
+    has(_, key: string) {
+      const current = mutationRegistry.get(tableName)
+      return current ? key in current : false
+    },
+  })
+
+  proxyRegistry.set(tableName, proxy)
+  return proxy
+}
+
 // two ways to use it:
 //  - mutations({}) which doesn't add the "allowed" helper or add CRUD
 //  - mutation('tableName', permissions) adds CRUD with permissions, adds allowed
@@ -122,16 +175,16 @@ export function mutations<
       upsert: createCRUDMutation('upsert'),
     }
 
-    const finalMutations = Object.freeze({
+    const finalMutations = {
       ...mutations,
       // overwrite regular mutations but call them if they are defined by user
       ...crudMutations,
-      // expose permissions for usePermission hook
-    }) as any as Mutations
+    } as any as Mutations
 
     setMutationsPermissions(tableName, permissions)
 
-    return finalMutations
+    // return proxy for HMR support - allows swapping implementations at runtime
+    return getOrCreateMutationProxy(tableName, finalMutations)
   }
 
   // no schema/permissions don't add CRUD

package/src/vite-plugin.ts

@@ -0,0 +1,238 @@
+import { createHash } from 'node:crypto'
+import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { basename, 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}`
+}
+
+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')
+
+  return `// auto-generated by on-zero vite plugin\n\n${exports}\n`
+}
+
+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)`)
+  }
+
+  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
+}
+
+/**
+ * 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 || [])]
+
+  let modelsDir: string
+  let generatedDir: string
+
+  return [
+    // generation plugin
+    {
+      name: 'on-zero:generate',
+      apply: 'serve',
+
+      configResolved(config) {
+        modelsDir = resolve(config.root, dataDir, 'models')
+        generatedDir = resolve(config.root, dataDir, 'generated')
+      },
+
+      async buildStart() {
+        if (options.disableGenerate) return
+        await runGenerate({ modelsDir, generatedDir, silent: 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,
+          }
+        }
+      },
+    },
+
+    // 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')
+      },
+
+      async buildStart() {
+        if (options.disableGenerate) return
+        await runGenerate({ modelsDir, generatedDir, silent: true })
+      },
+    },
+  ]
+}
+
+// legacy export for backwards compat
+export const onZeroHmrPlugin = (options?: { include?: string[] }): Plugin => {
+  return onZeroPlugin({ hmrInclude: options?.include, disableGenerate: true })[1]
+}
+
+export default onZeroPlugin

package/types/helpers/createMutators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createMutators.d.ts","sourceRoot":"","sources":["../../src/helpers/createMutators.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,QAAQ,EACR,GAAG,EACH,aAAa,EACb,eAAe,EAGhB,MAAM,UAAU,CAAA;AAEjB,MAAM,MAAM,kBAAkB,GAAG,CAAC,IAAI,EAAE;IACtC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAA;IACzB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,OAAO,CAAA;CACd,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AAE1B,YAAY,EAAE,kBAAkB,IAAI,wBAAwB,EAAE,CAAA;AAE9D,wBAAgB,cAAc,CAAC,MAAM,SAAS,aAAa,EAAE,EAC3D,WAAW,EACX,QAAQ,EACR,mBAAmB,EACnB,UAAe,EACf,GAAG,EACH,MAAM,EACN,gBAAgB,GACjB,EAAE;IACD,WAAW,EAAE,QAAQ,GAAG,QAAQ,CAAA;IAChC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAA;IACzB,GAAG,EAAE,GAAG,CAAA;IACR,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;IACvC,mBAAmB,CAAC,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC/C,gBAAgB,CAAC,EAAE,kBAAkB,CAAA;CACtC,GAAG,eAAe,CAAC,MAAM,CAAC,CA2I1B"}
+{"version":3,"file":"createMutators.d.ts","sourceRoot":"","sources":["../../src/helpers/createMutators.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,QAAQ,EACR,GAAG,EACH,aAAa,EACb,eAAe,EAGhB,MAAM,UAAU,CAAA;AAEjB,MAAM,MAAM,kBAAkB,GAAG,CAAC,IAAI,EAAE;IACtC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAA;IACzB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,OAAO,CAAA;CACd,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AAE1B,YAAY,EAAE,kBAAkB,IAAI,wBAAwB,EAAE,CAAA;AAE9D,wBAAgB,cAAc,CAAC,MAAM,SAAS,aAAa,EAAE,EAC3D,WAAW,EACX,QAAQ,EACR,mBAAmB,EACnB,UAAe,EACf,GAAG,EACH,MAAM,EACN,gBAAgB,GACjB,EAAE;IACD,WAAW,EAAE,QAAQ,GAAG,QAAQ,CAAA;IAChC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAA;IACzB,GAAG,EAAE,GAAG,CAAA;IACR,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;IACvC,mBAAmB,CAAC,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC/C,gBAAgB,CAAC,EAAE,kBAAkB,CAAA;CACtC,GAAG,eAAe,CAAC,MAAM,CAAC,CAiJ1B"}

package/types/mutations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutations.d.ts","sourceRoot":"","sources":["../src/mutations.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EAEd,cAAc,EACd,KAAK,EACN,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAM7D,KAAK,eAAe,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AACnF,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;AAevD,KAAK,YAAY,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAA;AAEhD,KAAK,aAAa,CAAC,KAAK,SAAS,YAAY,IAAI;IAC/C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;CAC/C,CAAA;AAED,KAAK,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAE1D,KAAK,iBAAiB,CAAC,KAAK,SAAS,YAAY,EAAE,SAAS,SAAS,gBAAgB,IAAI;KACtF,GAAG,IAAI,SAAS,GAAG,MAAM,SAAS,GAAG,GAAG,SAAS,MAAM,SAAS,GAC7D,SAAS,CAAC,GAAG,CAAC,GACd,GAAG,SAAS,MAAM,aAAa,CAAC,GAAG,CAAC,GAClC,aAAa,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GACzB,KAAK;CACZ,CAAA;AAED,wBAAgB,SAAS,CAAC,SAAS,SAAS,gBAAgB,EAC1D,SAAS,EAAE,SAAS,GACnB,SAAS,CAAA;AACZ,wBAAgB,SAAS,CAAC,KAAK,SAAS,YAAY,EAAE,WAAW,SAAS,KAAK,EAC7E,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,GACvB,iBAAiB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;AAC/B,wBAAgB,SAAS,CACvB,KAAK,SAAS,YAAY,EAC1B,WAAW,SAAS,KAAK,EACzB,SAAS,SAAS,gBAAgB,EAElC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,GACnB,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA"}
+{"version":3,"file":"mutations.d.ts","sourceRoot":"","sources":["../src/mutations.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EAEd,cAAc,EACd,KAAK,EACN,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AA2D7D,KAAK,eAAe,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AACnF,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;AAevD,KAAK,YAAY,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAA;AAEhD,KAAK,aAAa,CAAC,KAAK,SAAS,YAAY,IAAI;IAC/C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;CAC/C,CAAA;AAED,KAAK,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAE1D,KAAK,iBAAiB,CAAC,KAAK,SAAS,YAAY,EAAE,SAAS,SAAS,gBAAgB,IAAI;KACtF,GAAG,IAAI,SAAS,GAAG,MAAM,SAAS,GAAG,GAAG,SAAS,MAAM,SAAS,GAC7D,SAAS,CAAC,GAAG,CAAC,GACd,GAAG,SAAS,MAAM,aAAa,CAAC,GAAG,CAAC,GAClC,aAAa,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GACzB,KAAK;CACZ,CAAA;AAED,wBAAgB,SAAS,CAAC,SAAS,SAAS,gBAAgB,EAC1D,SAAS,EAAE,SAAS,GACnB,SAAS,CAAA;AACZ,wBAAgB,SAAS,CAAC,KAAK,SAAS,YAAY,EAAE,WAAW,SAAS,KAAK,EAC7E,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,GACvB,iBAAiB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;AAC/B,wBAAgB,SAAS,CACvB,KAAK,SAAS,YAAY,EAC1B,WAAW,SAAS,KAAK,EACzB,SAAS,SAAS,gBAAgB,EAElC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,GACnB,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA"}

package/types/vite-plugin.d.ts

@@ -0,0 +1,39 @@
+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
+     */
+    hmrInclude?: string[];
+    /**
+     * 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[];
+}) => Plugin;
+export default onZeroPlugin;
+//# sourceMappingURL=vite-plugin.d.ts.map

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

@@ -0,0 +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"}