on-zero 0.1.22 → 0.1.23

package/dist/cjs/vite-plugin.js

@@ -19,127 +19,68 @@ __export(vite_plugin_exports, {
   onZeroPlugin: () => onZeroPlugin
 });
 module.exports = __toCommonJS(vite_plugin_exports);
-var import_node_crypto = require("node:crypto"), import_node_fs = require("node:fs"), import_node_path = require("node:path");
-const hash = (s) => (0, import_node_crypto.createHash)("sha256").update(s).digest("hex");
-let generateCache = {};
-function writeFileIfChanged(filePath, content) {
-  const contentHash = hash(content);
-  return generateCache[filePath] === contentHash && (0, import_node_fs.existsSync)(filePath) ? !1 : ((0, import_node_fs.writeFileSync)(filePath, content, "utf-8"), generateCache[filePath] = contentHash, !0);
-}
-function generateModelsFile(modelFiles) {
-  const modelNames = modelFiles.map((f) => (0, import_node_path.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) => (0, import_node_path.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) => (0, import_node_path.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(`
-`)}
-`;
+var import_node_path = require("node:path"), import_generate = require("./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;
-  (0, import_node_fs.existsSync)(generatedDir) || (0, import_node_fs.mkdirSync)(generatedDir, { recursive: !0 });
-  const allModelFiles = (0, import_node_fs.readdirSync)(modelsDir).filter((f) => f.endsWith(".ts")).sort(), filesWithSchema = allModelFiles.filter(
-    (f) => (0, import_node_fs.readFileSync)((0, import_node_path.resolve)(modelsDir, f), "utf-8").includes("export const schema = table(")
-  ), filesChanged = [
-    writeFileIfChanged(
-      (0, import_node_path.resolve)(generatedDir, "models.ts"),
-      generateModelsFile(allModelFiles)
-    ),
-    writeFileIfChanged(
-      (0, import_node_path.resolve)(generatedDir, "types.ts"),
-      generateTypesFile(filesWithSchema)
-    ),
-    writeFileIfChanged(
-      (0, import_node_path.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 = (0, import_node_path.relative)(dir, file);
+  return rel !== "" && !rel.startsWith("..") && !(0, import_node_path.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) => (0, import_generate.generate)({
+    dir: dataDir,
+    after: options.after,
+    silent
+  });
   return [
-    // generation plugin
     {
-      name: "on-zero:generate",
+      name: "on-zero:serve",
       apply: "serve",
       configResolved(config) {
-        modelsDir = (0, import_node_path.resolve)(config.root, dataDir, "models"), generatedDir = (0, import_node_path.resolve)(config.root, dataDir, "generated");
+        dataDir = (0, import_node_path.resolve)(config.root, dir), modelsDir = (0, import_node_path.resolve)(dataDir, "models"), queriesDir = (0, import_node_path.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 = (0, import_node_path.resolve)(config.root, dataDir, "models"), generatedDir = (0, import_node_path.resolve)(config.root, dataDir, "generated");
+        dataDir = (0, import_node_path.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;
 //# sourceMappingURL=vite-plugin.js.map

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/vite-plugin.ts"],
-  "mappings": "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",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA8C,sBAE9C,kBAA+C;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,UAAM,2BAAS,KAAK,IAAI;AAC9B,SAAO,QAAQ,MAAM,CAAC,IAAI,WAAW,IAAI,KAAK,KAAC,6BAAW,GAAG;AAC/D;AAEO,SAAS,aAAa,UAA+B,CAAC,GAAa;AACxE,QAAM,MAAM,QAAQ,OAAO;AAE3B,MAAI,SACA,WACA;AAEJ,QAAM,cAAc,CAAC,eACnB,0BAAS;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,sBAAU,0BAAQ,OAAO,MAAM,GAAG,GAClC,gBAAY,0BAAQ,SAAS,QAAQ,GACrC,iBAAa,0BAAQ,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,sBAAU,0BAAQ,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/cjs/vite-plugin.native.js

@@ -27,183 +27,73 @@ __export(vite_plugin_exports, {
   onZeroPlugin: () => onZeroPlugin
 });
 module.exports = __toCommonJS(vite_plugin_exports);
-var import_crypto = require("crypto"),
-  import_fs = require("fs"),
-  import_path = require("path"),
-  hash = function (s) {
-    return (0, import_crypto.createHash)("sha256").update(s).digest("hex");
-  },
-  generateCache = {};
-function writeFileIfChanged(filePath, content) {
-  var contentHash = hash(content);
-  return generateCache[filePath] === contentHash && (0, import_fs.existsSync)(filePath) ? !1 : ((0, import_fs.writeFileSync)(filePath, content, "utf-8"), generateCache[filePath] = contentHash, !0);
-}
-function generateModelsFile(modelFiles) {
-  var modelNames = modelFiles.map(function (f) {
-      return (0, import_path.basename)(f, ".ts");
-    }).sort(),
-    getImportName = function (name) {
-      return name === "user" ? "userPublic" : name;
-    },
-    imports = modelNames.map(function (name) {
-      return `import * as ${getImportName(name)} from '../models/${name}'`;
-    }).join(`
-`),
-    sortedByImportName = [...modelNames].sort(function (a, b) {
-      return getImportName(a).localeCompare(getImportName(b));
-    }),
-    modelsObj = `export const models = {
-${sortedByImportName.map(function (name) {
-      return `  ${getImportName(name)},`;
-    }).join(`
-`)}
-}`,
-    hmrBoundary = `
-if (import.meta.hot) {
-  import.meta.hot.accept()
-}
-`;
-  return `// auto-generated by on-zero vite plugin
-${imports}
-
-${modelsObj}
-${hmrBoundary}`;
-}
-function generateTypesFile(modelFiles) {
-  var modelNames = modelFiles.map(function (f) {
-      return (0, import_path.basename)(f, ".ts");
-    }).sort(),
-    getSchemaName = function (name) {
-      return name === "user" ? "userPublic" : name;
-    },
-    typeExports = modelNames.map(function (name) {
-      var 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(`
-
-`);
-  return `import type { TableInsertRow, TableUpdateRow } from 'on-zero'
-import type * as schema from './tables'
-
-${typeExports}
-`;
-}
-function generateTablesFile(modelFiles) {
-  var modelNames = modelFiles.map(function (f) {
-      return (0, import_path.basename)(f, ".ts");
-    }).sort(),
-    getExportName = function (name) {
-      return name === "user" ? "userPublic" : name;
-    },
-    exports = modelNames.map(function (name) {
-      return `export { schema as ${getExportName(name)} } from '../models/${name}'`;
-    }).join(`
-`);
-  return `// auto-generated by on-zero vite plugin
-
-${exports}
-`;
+var import_path = require("path"),
+  import_generate = require("./generate.native.js");
+function createOnZeroHmrPlugin() {
+  var hmrInclude = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [],
+    hmrPaths = ["/models/", "/generated/", "/queries/", ...hmrInclude];
+  return {
+    name: "on-zero:hmr",
+    apply: "serve",
+    enforce: "post",
+    transform(code, id) {
+      if (!(!hmrPaths.some(function (p) {
+        return 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) {
-  var {
-    modelsDir,
-    generatedDir,
-    silent
-  } = options;
-  (0, import_fs.existsSync)(generatedDir) || (0, import_fs.mkdirSync)(generatedDir, {
-    recursive: !0
-  });
-  var allModelFiles = (0, import_fs.readdirSync)(modelsDir).filter(function (f) {
-      return f.endsWith(".ts");
-    }).sort(),
-    filesWithSchema = allModelFiles.filter(function (f) {
-      return (0, import_fs.readFileSync)((0, import_path.resolve)(modelsDir, f), "utf-8").includes("export const schema = table(");
-    }),
-    writeResults = [writeFileIfChanged((0, import_path.resolve)(generatedDir, "models.ts"), generateModelsFile(allModelFiles)), writeFileIfChanged((0, import_path.resolve)(generatedDir, "types.ts"), generateTypesFile(filesWithSchema)), writeFileIfChanged((0, import_path.resolve)(generatedDir, "tables.ts"), generateTablesFile(filesWithSchema))],
-    filesChanged = writeResults.filter(Boolean).length;
-  return filesChanged > 0 && !silent && console.info(`[on-zero] generated ${filesChanged} file(s)`), filesChanged;
+function isWithinDirectory(file, dir) {
+  var rel = (0, import_path.relative)(dir, file);
+  return rel !== "" && !rel.startsWith("..") && !(0, import_path.isAbsolute)(rel);
 }
 function onZeroPlugin() {
   var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {},
-    dataDir = options.dataDir || "src/data",
-    hmrPaths = ["/models/", "/generated/", ...(options.hmrInclude || [])],
+    _options_dir,
+    dir = (_options_dir = options.dir) !== null && _options_dir !== void 0 ? _options_dir : "src/data",
+    dataDir,
     modelsDir,
-    generatedDir;
-  return [
-  // generation plugin
-  {
-    name: "on-zero:generate",
+    queriesDir,
+    runGenerate = function (silent) {
+      return (0, import_generate.generate)({
+        dir: dataDir,
+        after: options.after,
+        silent
+      });
+    };
+  return [{
+    name: "on-zero:serve",
     apply: "serve",
     configResolved(config) {
-      modelsDir = (0, import_path.resolve)(config.root, dataDir, "models"), generatedDir = (0, import_path.resolve)(config.root, dataDir, "generated");
+      dataDir = (0, import_path.resolve)(config.root, dir), modelsDir = (0, import_path.resolve)(dataDir, "models"), queriesDir = (0, import_path.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 function (file) {
-        file.includes(modelsDir) && (await runGenerate({
-          modelsDir,
-          generatedDir,
-          silent: !1
-        }));
-      }), server.watcher.on("add", async function (file) {
-        file.includes(modelsDir) && (await runGenerate({
-          modelsDir,
-          generatedDir,
-          silent: !1
-        }));
-      }), server.watcher.on("unlink", async function (file) {
-        file.includes(modelsDir) && (await runGenerate({
-          modelsDir,
-          generatedDir,
-          silent: !1
-        }));
-      }));
+      if (!options.disableGenerate) {
+        var handler = async function (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) {
-      var shouldTransform = hmrPaths.some(function (p) {
-        return 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 = (0, import_path.resolve)(config.root, dataDir, "models"), generatedDir = (0, import_path.resolve)(config.root, dataDir, "generated");
+      dataDir = (0, import_path.resolve)(config.root, dir);
     },
     async buildStart() {
-      options.disableGenerate || (await runGenerate({
-        modelsDir,
-        generatedDir,
-        silent: !0
-      }));
+      options.disableGenerate || (await runGenerate(!0));
     }
-  }];
+  }, createOnZeroHmrPlugin(options.hmrInclude)];
 }
 var onZeroHmrPlugin = function (options) {
-    return onZeroPlugin({
-      hmrInclude: options?.include,
-      disableGenerate: !0
-    })[1];
+    return createOnZeroHmrPlugin(options?.include);
   },
   vite_plugin_default = onZeroPlugin;
 //# sourceMappingURL=vite-plugin.native.js.map

package/dist/cjs/vite-plugin.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","vite_plugin_exports","__export","default","vite_plugin_default","onZeroHmrPlugin","onZeroPlugin","module","exports","import_crypto","require","import_fs","import_path","hash","s","createHash","update","digest","generateCache","writeFileIfChanged","filePath","content","contentHash","existsSync","writeFileSync","generateModelsFile","modelFiles","modelNames","map","f","basename","sort","getImportName","name","imports","join","sortedByImportName","a","b","localeCompare","modelsObj","hmrBoundary","generateTypesFile","getSchemaName","typeExports","pascalName","charAt","toUpperCase","slice","schemaName","generateTablesFile","getExportName","runGenerate","options","modelsDir","generatedDir","silent","mkdirSync","recursive","allModelFiles","readdirSync","filter","endsWith","filesWithSchema","readFileSync","resolve","includes","writeResults","filesChanged","Boolean","length","console","info","arguments","dataDir","hmrPaths","hmrInclude","apply","configResolved","config","root","buildStart","disableGenerate","configureServer","server","watcher","on","file"],"sources":["../../src/vite-plugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","vite_plugin_exports","__export","default","vite_plugin_default","onZeroHmrPlugin","onZeroPlugin","module","exports","import_path","require","import_generate","createOnZeroHmrPlugin","hmrInclude","arguments","length","hmrPaths","name","apply","enforce","transform","code","id","some","p","includes","test","replace","map","isWithinDirectory","file","dir","rel","relative","startsWith","isAbsolute","options","_options_dir","dataDir","modelsDir","queriesDir","runGenerate","silent","generate","after","configResolved","config","resolve","root","buildStart","disableGenerate","configureServer","server","handler","watcher","on"],"sources":["../../src/vite-plugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}