on-zero 0.1.22 → 0.1.24

package/dist/esm/generate.test.mjs

@@ -0,0 +1,114 @@
+import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, describe, expect, test } from "vitest";
+import { generate } from "./generate.mjs";
+const testDir = join(tmpdir(), "on-zero-test-" + Date.now());
+beforeEach(() => {
+  mkdirSync(join(testDir, "models"), {
+    recursive: !0
+  }), mkdirSync(join(testDir, "queries"), {
+    recursive: !0
+  });
+});
+afterEach(() => {
+  rmSync(testDir, {
+    recursive: !0,
+    force: !0
+  });
+});
+describe("generate", () => {
+  test("generates models.ts, types.ts, tables.ts from model files", async () => {
+    writeFileSync(join(testDir, "models/post.ts"), `
+import { table, string, boolean } from 'on-zero'
+
+export const schema = table('post', {
+  id: string(),
+  title: string(),
+  published: boolean(),
+})
+`), writeFileSync(join(testDir, "models/comment.ts"), `
+import { table, string } from 'on-zero'
+
+export const schema = table('comment', {
+  id: string(),
+  postId: string(),
+  body: string(),
+})
+`);
+    const result = await generate({
+      dir: testDir,
+      silent: !0
+    });
+    expect(result.modelCount).toBe(2), expect(result.schemaCount).toBe(2), expect(result.filesChanged).toBeGreaterThan(0), expect(existsSync(join(testDir, "generated/models.ts"))).toBe(!0), expect(existsSync(join(testDir, "generated/types.ts"))).toBe(!0), expect(existsSync(join(testDir, "generated/tables.ts"))).toBe(!0);
+    const modelsContent = readFileSync(join(testDir, "generated/models.ts"), "utf-8");
+    expect(modelsContent).toContain("import * as comment from '../models/comment'"), expect(modelsContent).toContain("import * as post from '../models/post'"), expect(modelsContent).toContain("export const models = {");
+    const typesContent = readFileSync(join(testDir, "generated/types.ts"), "utf-8");
+    expect(typesContent).toContain("export type Post = TableInsertRow<typeof schema.post>"), expect(typesContent).toContain("export type Comment = TableInsertRow<typeof schema.comment>");
+    const tablesContent = readFileSync(join(testDir, "generated/tables.ts"), "utf-8");
+    expect(tablesContent).toContain("export { schema as post } from '../models/post'"), expect(tablesContent).toContain("export { schema as comment } from '../models/comment'");
+  }), test("generates query validators from query files", async () => {
+    writeFileSync(join(testDir, "models/post.ts"), "export const schema = table('post', { id: string() })"), writeFileSync(join(testDir, "queries/post.ts"), `
+import { zero } from '../zero'
+
+export const allPosts = () => zero.query.post
+
+export const postById = ({ id }: { id: string }) => zero.query.post.where('id', id)
+
+export const postsByAuthor = ({ authorId, limit }: { authorId: string; limit?: number }) =>
+  zero.query.post.where('authorId', authorId).limit(limit ?? 10)
+`);
+    const result = await generate({
+      dir: testDir,
+      silent: !0
+    });
+    expect(result.queryCount).toBe(3), expect(existsSync(join(testDir, "generated/groupedQueries.ts"))).toBe(!0), expect(existsSync(join(testDir, "generated/syncedQueries.ts"))).toBe(!0);
+    const groupedContent = readFileSync(join(testDir, "generated/groupedQueries.ts"), "utf-8");
+    expect(groupedContent).toContain("export * as post from '../queries/post'");
+    const syncedContent = readFileSync(join(testDir, "generated/syncedQueries.ts"), "utf-8");
+    expect(syncedContent).toContain("allPosts: defineQuery"), expect(syncedContent).toContain("postById: defineQuery"), expect(syncedContent).toContain("postsByAuthor: defineQuery"), expect(syncedContent).toContain("v.object");
+  }), test("skips permission exports in queries", async () => {
+    writeFileSync(join(testDir, "models/post.ts"), "export const schema = table('post', { id: string() })"), writeFileSync(join(testDir, "queries/post.ts"), `
+export const permission = () => ({ canRead: true })
+export const allPosts = () => zero.query.post
+`);
+    const result = await generate({
+      dir: testDir,
+      silent: !0
+    });
+    expect(result.queryCount).toBe(1);
+    const syncedContent = readFileSync(join(testDir, "generated/syncedQueries.ts"), "utf-8");
+    expect(syncedContent).toContain("allPosts"), expect(syncedContent).not.toContain("permission:");
+  }), test("handles user model special case (userPublic)", async () => {
+    writeFileSync(join(testDir, "models/user.ts"), "export const schema = table('user', { id: string(), name: string() })"), await generate({
+      dir: testDir,
+      silent: !0
+    });
+    const modelsContent = readFileSync(join(testDir, "generated/models.ts"), "utf-8");
+    expect(modelsContent).toContain("import * as userPublic from '../models/user'"), expect(modelsContent).toContain("userPublic,");
+    const typesContent = readFileSync(join(testDir, "generated/types.ts"), "utf-8");
+    expect(typesContent).toContain("typeof schema.userPublic");
+  }), test("runs after command when files change", async () => {
+    writeFileSync(join(testDir, "models/post.ts"), "export const schema = table('post', { id: string() })");
+    const markerFile = join(testDir, "after-ran"),
+      result = await generate({
+        dir: testDir,
+        silent: !0,
+        after: `touch ${markerFile}`
+      });
+    expect(result.filesChanged).toBeGreaterThan(0), expect(existsSync(markerFile)).toBe(!0);
+  }), test("does not regenerate when nothing changed", async () => {
+    writeFileSync(join(testDir, "models/post.ts"), "export const schema = table('post', { id: string() })");
+    const first = await generate({
+      dir: testDir,
+      silent: !0
+    });
+    expect(first.filesChanged).toBeGreaterThan(0);
+    const second = await generate({
+      dir: testDir,
+      silent: !0
+    });
+    expect(second.filesChanged).toBe(0);
+  });
+});
+//# sourceMappingURL=generate.test.mjs.map

package/dist/esm/generate.test.mjs.map

@@ -0,0 +1 @@
+{"version":3,"names":["existsSync","mkdirSync","readFileSync","rmSync","writeFileSync","tmpdir","join","afterEach","beforeEach","describe","expect","test","generate","testDir","Date","now","recursive","force","result","dir","silent","modelCount","toBe","schemaCount","filesChanged","toBeGreaterThan","modelsContent","toContain","typesContent","tablesContent","queryCount","groupedContent","syncedContent","not","markerFile","after","first","second"],"sources":["../../src/generate.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/generate.test.native.js

@@ -0,0 +1,114 @@
+import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "fs";
+import { tmpdir } from "os";
+import { join } from "path";
+import { afterEach, beforeEach, describe, expect, test } from "vitest";
+import { generate } from "./generate.native.js";
+var testDir = join(tmpdir(), "on-zero-test-" + Date.now());
+beforeEach(function () {
+  mkdirSync(join(testDir, "models"), {
+    recursive: !0
+  }), mkdirSync(join(testDir, "queries"), {
+    recursive: !0
+  });
+});
+afterEach(function () {
+  rmSync(testDir, {
+    recursive: !0,
+    force: !0
+  });
+});
+describe("generate", function () {
+  test("generates models.ts, types.ts, tables.ts from model files", async function () {
+    writeFileSync(join(testDir, "models/post.ts"), `
+import { table, string, boolean } from 'on-zero'
+
+export const schema = table('post', {
+  id: string(),
+  title: string(),
+  published: boolean(),
+})
+`), writeFileSync(join(testDir, "models/comment.ts"), `
+import { table, string } from 'on-zero'
+
+export const schema = table('comment', {
+  id: string(),
+  postId: string(),
+  body: string(),
+})
+`);
+    var result = await generate({
+      dir: testDir,
+      silent: !0
+    });
+    expect(result.modelCount).toBe(2), expect(result.schemaCount).toBe(2), expect(result.filesChanged).toBeGreaterThan(0), expect(existsSync(join(testDir, "generated/models.ts"))).toBe(!0), expect(existsSync(join(testDir, "generated/types.ts"))).toBe(!0), expect(existsSync(join(testDir, "generated/tables.ts"))).toBe(!0);
+    var modelsContent = readFileSync(join(testDir, "generated/models.ts"), "utf-8");
+    expect(modelsContent).toContain("import * as comment from '../models/comment'"), expect(modelsContent).toContain("import * as post from '../models/post'"), expect(modelsContent).toContain("export const models = {");
+    var typesContent = readFileSync(join(testDir, "generated/types.ts"), "utf-8");
+    expect(typesContent).toContain("export type Post = TableInsertRow<typeof schema.post>"), expect(typesContent).toContain("export type Comment = TableInsertRow<typeof schema.comment>");
+    var tablesContent = readFileSync(join(testDir, "generated/tables.ts"), "utf-8");
+    expect(tablesContent).toContain("export { schema as post } from '../models/post'"), expect(tablesContent).toContain("export { schema as comment } from '../models/comment'");
+  }), test("generates query validators from query files", async function () {
+    writeFileSync(join(testDir, "models/post.ts"), "export const schema = table('post', { id: string() })"), writeFileSync(join(testDir, "queries/post.ts"), `
+import { zero } from '../zero'
+
+export const allPosts = () => zero.query.post
+
+export const postById = ({ id }: { id: string }) => zero.query.post.where('id', id)
+
+export const postsByAuthor = ({ authorId, limit }: { authorId: string; limit?: number }) =>
+  zero.query.post.where('authorId', authorId).limit(limit ?? 10)
+`);
+    var result = await generate({
+      dir: testDir,
+      silent: !0
+    });
+    expect(result.queryCount).toBe(3), expect(existsSync(join(testDir, "generated/groupedQueries.ts"))).toBe(!0), expect(existsSync(join(testDir, "generated/syncedQueries.ts"))).toBe(!0);
+    var groupedContent = readFileSync(join(testDir, "generated/groupedQueries.ts"), "utf-8");
+    expect(groupedContent).toContain("export * as post from '../queries/post'");
+    var syncedContent = readFileSync(join(testDir, "generated/syncedQueries.ts"), "utf-8");
+    expect(syncedContent).toContain("allPosts: defineQuery"), expect(syncedContent).toContain("postById: defineQuery"), expect(syncedContent).toContain("postsByAuthor: defineQuery"), expect(syncedContent).toContain("v.object");
+  }), test("skips permission exports in queries", async function () {
+    writeFileSync(join(testDir, "models/post.ts"), "export const schema = table('post', { id: string() })"), writeFileSync(join(testDir, "queries/post.ts"), `
+export const permission = () => ({ canRead: true })
+export const allPosts = () => zero.query.post
+`);
+    var result = await generate({
+      dir: testDir,
+      silent: !0
+    });
+    expect(result.queryCount).toBe(1);
+    var syncedContent = readFileSync(join(testDir, "generated/syncedQueries.ts"), "utf-8");
+    expect(syncedContent).toContain("allPosts"), expect(syncedContent).not.toContain("permission:");
+  }), test("handles user model special case (userPublic)", async function () {
+    writeFileSync(join(testDir, "models/user.ts"), "export const schema = table('user', { id: string(), name: string() })"), await generate({
+      dir: testDir,
+      silent: !0
+    });
+    var modelsContent = readFileSync(join(testDir, "generated/models.ts"), "utf-8");
+    expect(modelsContent).toContain("import * as userPublic from '../models/user'"), expect(modelsContent).toContain("userPublic,");
+    var typesContent = readFileSync(join(testDir, "generated/types.ts"), "utf-8");
+    expect(typesContent).toContain("typeof schema.userPublic");
+  }), test("runs after command when files change", async function () {
+    writeFileSync(join(testDir, "models/post.ts"), "export const schema = table('post', { id: string() })");
+    var markerFile = join(testDir, "after-ran"),
+      result = await generate({
+        dir: testDir,
+        silent: !0,
+        after: `touch ${markerFile}`
+      });
+    expect(result.filesChanged).toBeGreaterThan(0), expect(existsSync(markerFile)).toBe(!0);
+  }), test("does not regenerate when nothing changed", async function () {
+    writeFileSync(join(testDir, "models/post.ts"), "export const schema = table('post', { id: string() })");
+    var first = await generate({
+      dir: testDir,
+      silent: !0
+    });
+    expect(first.filesChanged).toBeGreaterThan(0);
+    var second = await generate({
+      dir: testDir,
+      silent: !0
+    });
+    expect(second.filesChanged).toBe(0);
+  });
+});
+//# sourceMappingURL=generate.test.native.js.map

package/dist/esm/generate.test.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["existsSync","mkdirSync","readFileSync","rmSync","writeFileSync","tmpdir","join","afterEach","beforeEach","describe","expect","test","generate","testDir","Date","now","recursive","force","result","dir","silent","modelCount","toBe","schemaCount","filesChanged","toBeGreaterThan","modelsContent","toContain","typesContent","tablesContent","queryCount","groupedContent","syncedContent","not","markerFile","after","first","second"],"sources":["../../src/generate.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/vite-plugin.js

@@ -1,127 +1,67 @@
-import { createHash } from "node:crypto";
-import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
-import { basename, resolve } from "node:path";
-const hash = (s) => createHash("sha256").update(s).digest("hex");
-let generateCache = {};
-function writeFileIfChanged(filePath, content) {
-  const contentHash = hash(content);
-  return generateCache[filePath] === contentHash && existsSync(filePath) ? !1 : (writeFileSync(filePath, content, "utf-8"), generateCache[filePath] = contentHash, !0);
-}
-function generateModelsFile(modelFiles) {
-  const modelNames = modelFiles.map((f) => basename(f, ".ts")).sort(), getImportName = (name) => name === "user" ? "userPublic" : name, imports = modelNames.map((name) => `import * as ${getImportName(name)} from '../models/${name}'`).join(`
-`), modelsObj = `export const models = {
-${[...modelNames].sort(
-    (a, b) => getImportName(a).localeCompare(getImportName(b))
-  ).map((name) => `  ${getImportName(name)},`).join(`
-`)}
-}`;
-  return `// auto-generated by on-zero vite plugin
-${imports}
-
-${modelsObj}
-
-if (import.meta.hot) {
-  import.meta.hot.accept()
-}
-`;
-}
-function generateTypesFile(modelFiles) {
-  const modelNames = modelFiles.map((f) => basename(f, ".ts")).sort(), getSchemaName = (name) => name === "user" ? "userPublic" : name;
-  return `import type { TableInsertRow, TableUpdateRow } from 'on-zero'
-import type * as schema from './tables'
-
-${modelNames.map((name) => {
-    const pascalName = name.charAt(0).toUpperCase() + name.slice(1), schemaName = getSchemaName(name);
-    return `export type ${pascalName} = TableInsertRow<typeof schema.${schemaName}>
-export type ${pascalName}Update = TableUpdateRow<typeof schema.${schemaName}>`;
-  }).join(`
-
-`)}
-`;
-}
-function generateTablesFile(modelFiles) {
-  const modelNames = modelFiles.map((f) => basename(f, ".ts")).sort(), getExportName = (name) => name === "user" ? "userPublic" : name;
-  return `// auto-generated by on-zero vite plugin
-
-${modelNames.map((name) => `export { schema as ${getExportName(name)} } from '../models/${name}'`).join(`
-`)}
-`;
+import { isAbsolute, relative, resolve } from "node:path";
+import { generate } from "./generate";
+function createOnZeroHmrPlugin(hmrInclude = []) {
+  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)) && 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
+        };
+    }
+  };
 }
-async function runGenerate(options) {
-  const { modelsDir, generatedDir, silent } = options;
-  existsSync(generatedDir) || mkdirSync(generatedDir, { recursive: !0 });
-  const allModelFiles = readdirSync(modelsDir).filter((f) => f.endsWith(".ts")).sort(), filesWithSchema = allModelFiles.filter(
-    (f) => readFileSync(resolve(modelsDir, f), "utf-8").includes("export const schema = table(")
-  ), filesChanged = [
-    writeFileIfChanged(
-      resolve(generatedDir, "models.ts"),
-      generateModelsFile(allModelFiles)
-    ),
-    writeFileIfChanged(
-      resolve(generatedDir, "types.ts"),
-      generateTypesFile(filesWithSchema)
-    ),
-    writeFileIfChanged(
-      resolve(generatedDir, "tables.ts"),
-      generateTablesFile(filesWithSchema)
-    )
-  ].filter(Boolean).length;
-  return filesChanged > 0 && !silent && console.info(`[on-zero] generated ${filesChanged} file(s)`), filesChanged;
+function isWithinDirectory(file, dir) {
+  const rel = relative(dir, file);
+  return rel !== "" && !rel.startsWith("..") && !isAbsolute(rel);
 }
 function onZeroPlugin(options = {}) {
-  const dataDir = options.dataDir || "src/data", hmrPaths = ["/models/", "/generated/", ...options.hmrInclude || []];
-  let modelsDir, generatedDir;
+  const dir = options.dir ?? "src/data";
+  let dataDir, modelsDir, queriesDir;
+  const runGenerate = (silent) => 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() {
-        options.disableGenerate || await runGenerate({ modelsDir, generatedDir, silent: !1 });
+        options.disableGenerate || await runGenerate(!1);
       },
       configureServer(server) {
-        options.disableGenerate || (server.watcher.on("change", async (file) => {
-          file.includes(modelsDir) && await runGenerate({ modelsDir, generatedDir, silent: !1 });
-        }), server.watcher.on("add", async (file) => {
-          file.includes(modelsDir) && await runGenerate({ modelsDir, generatedDir, silent: !1 });
-        }), server.watcher.on("unlink", async (file) => {
-          file.includes(modelsDir) && await runGenerate({ modelsDir, generatedDir, silent: !1 });
-        }));
+        if (options.disableGenerate) return;
+        const handler = async (file) => {
+          /\.tsx?$/.test(file) && (isWithinDirectory(file, modelsDir) || isWithinDirectory(file, queriesDir)) && await runGenerate(!1);
+        };
+        server.watcher.on("change", handler), server.watcher.on("add", handler), server.watcher.on("unlink", handler);
       }
     },
-    // HMR plugin - removes invalidate calls to prevent cascade
-    {
-      name: "on-zero:hmr",
-      apply: "serve",
-      enforce: "post",
-      transform(code, id) {
-        if (hmrPaths.some((p) => id.includes(p)) && /\.tsx?$/.test(id) && 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");
+        dataDir = resolve(config.root, dir);
       },
       async buildStart() {
-        options.disableGenerate || await runGenerate({ modelsDir, generatedDir, silent: !0 });
+        options.disableGenerate || await runGenerate(!0);
       }
-    }
+    },
+    createOnZeroHmrPlugin(options.hmrInclude)
   ];
 }
-const onZeroHmrPlugin = (options) => onZeroPlugin({ hmrInclude: options?.include, disableGenerate: !0 })[1];
+const onZeroHmrPlugin = (options) => createOnZeroHmrPlugin(options?.include);
 var vite_plugin_default = onZeroPlugin;
 export {
   vite_plugin_default as default,

package/dist/esm/vite-plugin.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/vite-plugin.ts"],
-  "mappings": "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",
+  "mappings": "AAAA,SAAS,YAAY,UAAU,eAAe;AAE9C,SAAS,gBAAsC;AAa/C,SAAS,sBAAsB,aAAuB,CAAC,GAAW;AAChE,QAAM,WAAW,CAAC,YAAY,eAAe,aAAa,GAAG,UAAU;AAEvE,SAAO;AAAA,IACL,MAAM;AAAA,IACN,OAAO;AAAA,IACP,SAAS;AAAA,IAET,UAAU,MAAM,IAAI;AAClB,UAAI,GAAC,SAAS,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,KAAK,CAAC,UAAU,KAAK,EAAE,MAC1D,KAAK,SAAS,4BAA4B;AAE/C,eAAO;AAAA,UACL,MAAM,KAAK;AAAA,YACT;AAAA,YACA;AAAA,UACF;AAAA,UACA,KAAK;AAAA,QACP;AAAA,IACF;AAAA,EACF;AACF;AAEA,SAAS,kBAAkB,MAAc,KAAsB;AAC7D,QAAM,MAAM,SAAS,KAAK,IAAI;AAC9B,SAAO,QAAQ,MAAM,CAAC,IAAI,WAAW,IAAI,KAAK,CAAC,WAAW,GAAG;AAC/D;AAEO,SAAS,aAAa,UAA+B,CAAC,GAAa;AACxE,QAAM,MAAM,QAAQ,OAAO;AAE3B,MAAI,SACA,WACA;AAEJ,QAAM,cAAc,CAAC,WACnB,SAAS;AAAA,IACP,KAAK;AAAA,IACL,OAAO,QAAQ;AAAA,IACf;AAAA,EACF,CAAC;AAEH,SAAO;AAAA,IACL;AAAA,MACE,MAAM;AAAA,MACN,OAAO;AAAA,MAEP,eAAe,QAAQ;AACrB,kBAAU,QAAQ,OAAO,MAAM,GAAG,GAClC,YAAY,QAAQ,SAAS,QAAQ,GACrC,aAAa,QAAQ,SAAS,SAAS;AAAA,MACzC;AAAA,MAEA,MAAM,aAAa;AACjB,QAAK,QAAQ,mBAAiB,MAAM,YAAY,EAAK;AAAA,MACvD;AAAA,MAEA,gBAAgB,QAAQ;AACtB,YAAI,QAAQ,gBAAiB;AAE7B,cAAM,UAAU,OAAO,SAAiB;AACtC,UAAK,UAAU,KAAK,IAAI,MACpB,kBAAkB,MAAM,SAAS,KAAK,kBAAkB,MAAM,UAAU,MAC1E,MAAM,YAAY,EAAK;AAAA,QAE3B;AAEA,eAAO,QAAQ,GAAG,UAAU,OAAO,GACnC,OAAO,QAAQ,GAAG,OAAO,OAAO,GAChC,OAAO,QAAQ,GAAG,UAAU,OAAO;AAAA,MACrC;AAAA,IACF;AAAA,IAEA;AAAA,MACE,MAAM;AAAA,MACN,OAAO;AAAA,MAEP,eAAe,QAAQ;AACrB,kBAAU,QAAQ,OAAO,MAAM,GAAG;AAAA,MACpC;AAAA,MAEA,MAAM,aAAa;AACjB,QAAK,QAAQ,mBAAiB,MAAM,YAAY,EAAI;AAAA,MACtD;AAAA,IACF;AAAA,IAEA,sBAAsB,QAAQ,UAAU;AAAA,EAC1C;AACF;AAEO,MAAM,kBAAkB,CAAC,YACvB,sBAAsB,SAAS,OAAO;AAG/C,IAAO,sBAAQ;",
   "names": []
 }

package/dist/esm/vite-plugin.mjs

@@ -1,143 +1,59 @@
-import { createHash } from "node:crypto";
-import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
-import { basename, resolve } from "node:path";
-const hash = s => createHash("sha256").update(s).digest("hex");
-let generateCache = {};
-function writeFileIfChanged(filePath, content) {
-  const contentHash = hash(content);
-  return generateCache[filePath] === contentHash && existsSync(filePath) ? !1 : (writeFileSync(filePath, content, "utf-8"), generateCache[filePath] = contentHash, !0);
-}
-function generateModelsFile(modelFiles) {
-  const modelNames = modelFiles.map(f => basename(f, ".ts")).sort(),
-    getImportName = name => name === "user" ? "userPublic" : name,
-    imports = modelNames.map(name => `import * as ${getImportName(name)} from '../models/${name}'`).join(`
-`),
-    modelsObj = `export const models = {
-${[...modelNames].sort((a, b) => getImportName(a).localeCompare(getImportName(b))).map(name => `  ${getImportName(name)},`).join(`
-`)}
-}`;
-  return `// auto-generated by on-zero vite plugin
-${imports}
-
-${modelsObj}
-
-if (import.meta.hot) {
-  import.meta.hot.accept()
-}
-`;
-}
-function generateTypesFile(modelFiles) {
-  const modelNames = modelFiles.map(f => basename(f, ".ts")).sort(),
-    getSchemaName = name => name === "user" ? "userPublic" : name;
-  return `import type { TableInsertRow, TableUpdateRow } from 'on-zero'
-import type * as schema from './tables'
-
-${modelNames.map(name => {
-    const pascalName = name.charAt(0).toUpperCase() + name.slice(1),
-      schemaName = getSchemaName(name);
-    return `export type ${pascalName} = TableInsertRow<typeof schema.${schemaName}>
-export type ${pascalName}Update = TableUpdateRow<typeof schema.${schemaName}>`;
-  }).join(`
-
-`)}
-`;
+import { isAbsolute, relative, resolve } from "node:path";
+import { generate } from "./generate.mjs";
+function createOnZeroHmrPlugin(hmrInclude = []) {
+  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)) && 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
+      };
+    }
+  };
 }
-function generateTablesFile(modelFiles) {
-  const modelNames = modelFiles.map(f => basename(f, ".ts")).sort(),
-    getExportName = name => name === "user" ? "userPublic" : name;
-  return `// auto-generated by on-zero vite plugin
-
-${modelNames.map(name => `export { schema as ${getExportName(name)} } from '../models/${name}'`).join(`
-`)}
-`;
+function isWithinDirectory(file, dir) {
+  const rel = relative(dir, file);
+  return rel !== "" && !rel.startsWith("..") && !isAbsolute(rel);
 }
-async function runGenerate(options) {
-  const {
-    modelsDir,
-    generatedDir,
+function onZeroPlugin(options = {}) {
+  const dir = options.dir ?? "src/data";
+  let dataDir, modelsDir, queriesDir;
+  const runGenerate = silent => generate({
+    dir: dataDir,
+    after: options.after,
     silent
-  } = options;
-  existsSync(generatedDir) || mkdirSync(generatedDir, {
-    recursive: !0
   });
-  const allModelFiles = readdirSync(modelsDir).filter(f => f.endsWith(".ts")).sort(),
-    filesWithSchema = allModelFiles.filter(f => readFileSync(resolve(modelsDir, f), "utf-8").includes("export const schema = table(")),
-    filesChanged = [writeFileIfChanged(resolve(generatedDir, "models.ts"), generateModelsFile(allModelFiles)), writeFileIfChanged(resolve(generatedDir, "types.ts"), generateTypesFile(filesWithSchema)), writeFileIfChanged(resolve(generatedDir, "tables.ts"), generateTablesFile(filesWithSchema))].filter(Boolean).length;
-  return filesChanged > 0 && !silent && console.info(`[on-zero] generated ${filesChanged} file(s)`), filesChanged;
-}
-function onZeroPlugin(options = {}) {
-  const dataDir = options.dataDir || "src/data",
-    hmrPaths = ["/models/", "/generated/", ...(options.hmrInclude || [])];
-  let modelsDir, generatedDir;
-  return [
-  // generation plugin
-  {
-    name: "on-zero:generate",
+  return [{
+    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() {
-      options.disableGenerate || (await runGenerate({
-        modelsDir,
-        generatedDir,
-        silent: !1
-      }));
+      options.disableGenerate || (await runGenerate(!1));
     },
     configureServer(server) {
-      options.disableGenerate || (server.watcher.on("change", async file => {
-        file.includes(modelsDir) && (await runGenerate({
-          modelsDir,
-          generatedDir,
-          silent: !1
-        }));
-      }), server.watcher.on("add", async file => {
-        file.includes(modelsDir) && (await runGenerate({
-          modelsDir,
-          generatedDir,
-          silent: !1
-        }));
-      }), server.watcher.on("unlink", async file => {
-        file.includes(modelsDir) && (await runGenerate({
-          modelsDir,
-          generatedDir,
-          silent: !1
-        }));
-      }));
-    }
-  },
-  // HMR plugin - removes invalidate calls to prevent cascade
-  {
-    name: "on-zero:hmr",
-    apply: "serve",
-    enforce: "post",
-    transform(code, id) {
-      if (hmrPaths.some(p => id.includes(p)) && /\.tsx?$/.test(id) && 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
+      if (options.disableGenerate) return;
+      const handler = async file => {
+        /\.tsx?$/.test(file) && (isWithinDirectory(file, modelsDir) || isWithinDirectory(file, queriesDir)) && (await runGenerate(!1));
       };
+      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() {
-      options.disableGenerate || (await runGenerate({
-        modelsDir,
-        generatedDir,
-        silent: !0
-      }));
+      options.disableGenerate || (await runGenerate(!0));
     }
-  }];
+  }, createOnZeroHmrPlugin(options.hmrInclude)];
 }
-const onZeroHmrPlugin = options => onZeroPlugin({
-  hmrInclude: options?.include,
-  disableGenerate: !0
-})[1];
+const onZeroHmrPlugin = options => createOnZeroHmrPlugin(options?.include);
 var vite_plugin_default = onZeroPlugin;
 export { vite_plugin_default as default, onZeroHmrPlugin, onZeroPlugin };
 //# sourceMappingURL=vite-plugin.mjs.map