on-zero 0.7.10 → 0.8.0

package/dist/esm/vite-plugin.mjs

@@ -1,7 +1,8 @@
 import { isAbsolute, relative, resolve } from "node:path";
 import { generate } from "./generate.mjs";
-function createOnZeroHmrPlugin(hmrInclude = []) {
-  const hmrPaths = ["/mutations/", "/models/", "/generated/", "/queries/", ...hmrInclude];
+function createOnZeroHmrPlugin(hmrInclude = [], dataDir = "src/data") {
+  const normalizedDataDir = `/${dataDir.replaceAll("\\", "/").replace(/^\/+|\/+$/g, "")}/`;
+  const hmrPaths = [normalizedDataDir, ...hmrInclude];
   return {
     name: "on-zero:hmr",
     apply: "serve",
@@ -34,8 +35,7 @@ function isWithinDirectory(file, dir) {
 function onZeroPlugin(options = {}) {
   const dir = options.dir ?? "src/data";
   let dataDir;
-  let modelsDir;
-  let queriesDir;
+  let databaseDir;
   const runGenerate = silent => generate({
     dir: dataDir,
     after: options.after,
@@ -47,8 +47,7 @@ function onZeroPlugin(options = {}) {
     apply: "serve",
     configResolved(config) {
       dataDir = resolve(config.root, dir);
-      modelsDir = resolve(dataDir, "models");
-      queriesDir = resolve(dataDir, "queries");
+      databaseDir = resolve(dataDir, "../database");
     },
     async buildStart() {
       if (!options.disableGenerate) await runGenerate(false);
@@ -57,7 +56,7 @@ function onZeroPlugin(options = {}) {
       if (options.disableGenerate) return;
       const handler = async file => {
         if (!/\.tsx?$/.test(file)) return;
-        if (isWithinDirectory(file, modelsDir) || isWithinDirectory(file, queriesDir)) {
+        if (isWithinDirectory(file, dataDir) && !isWithinDirectory(file, resolve(dataDir, "generated")) || isWithinDirectory(file, databaseDir)) {
           await runGenerate(false);
         }
       };
@@ -74,7 +73,7 @@ function onZeroPlugin(options = {}) {
     async buildStart() {
       if (!options.disableGenerate) await runGenerate(true);
     }
-  }, createOnZeroHmrPlugin(options.hmrInclude)];
+  }, createOnZeroHmrPlugin(options.hmrInclude, dir)];
 }
 const onZeroHmrPlugin = options => {
   return createOnZeroHmrPlugin(options?.include);

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

@@ -1 +1 @@
-{"version":3,"names":["isAbsolute","relative","resolve","generate","createOnZeroHmrPlugin","hmrInclude","hmrPaths","name","apply","enforce","transform","code","id","some","p","includes","test","transformed","replace","map","isWithinDirectory","file","dir","rel","startsWith","onZeroPlugin","options","dataDir","modelsDir","queriesDir","runGenerate","silent","after","force","configResolved","config","root","buildStart","disableGenerate","configureServer","server","handler","watcher","on","onZeroHmrPlugin","include","vite_plugin_default"],"sources":["../../src/vite-plugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["isAbsolute","relative","resolve","generate","createOnZeroHmrPlugin","hmrInclude","dataDir","normalizedDataDir","replaceAll","replace","hmrPaths","name","apply","enforce","transform","code","id","some","p","includes","test","transformed","map","isWithinDirectory","file","dir","rel","startsWith","onZeroPlugin","options","databaseDir","runGenerate","silent","after","force","configResolved","config","root","buildStart","disableGenerate","configureServer","server","handler","watcher","on","onZeroHmrPlugin","include","vite_plugin_default"],"sources":["../../src/vite-plugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

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

@@ -1,8 +1,10 @@
 import { isAbsolute, relative, resolve } from "path";
 import { generate } from "./generate.native.js";
 function createOnZeroHmrPlugin() {
-  var hmrInclude = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [];
-  var hmrPaths = ["/mutations/", "/models/", "/generated/", "/queries/", ...hmrInclude];
+  var hmrInclude = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [],
+    dataDir = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "src/data";
+  var normalizedDataDir = `/${dataDir.replaceAll("\\", "/").replace(/^\/+|\/+$/g, "")}/`;
+  var hmrPaths = [normalizedDataDir, ...hmrInclude];
   return {
     name: "on-zero:hmr",
     apply: "serve",
@@ -39,9 +41,8 @@ function onZeroPlugin() {
   var _options_dir;
   var dir = (_options_dir = options.dir) !== null && _options_dir !== void 0 ? _options_dir : "src/data";
   var dataDir;
-  var modelsDir;
-  var queriesDir;
-  var runGenerate = function (silent) {
+  var databaseDir;
+  var runGenerate = function runGenerate2(silent) {
     return generate({
       dir: dataDir,
       after: options.after,
@@ -54,17 +55,16 @@ function onZeroPlugin() {
     apply: "serve",
     configResolved(config) {
       dataDir = resolve(config.root, dir);
-      modelsDir = resolve(dataDir, "models");
-      queriesDir = resolve(dataDir, "queries");
+      databaseDir = resolve(dataDir, "../database");
     },
     async buildStart() {
       if (!options.disableGenerate) await runGenerate(false);
     },
     configureServer(server) {
       if (options.disableGenerate) return;
-      var handler = async function (file) {
+      var handler = async function handler2(file) {
         if (!/\.tsx?$/.test(file)) return;
-        if (isWithinDirectory(file, modelsDir) || isWithinDirectory(file, queriesDir)) {
+        if (isWithinDirectory(file, dataDir) && !isWithinDirectory(file, resolve(dataDir, "generated")) || isWithinDirectory(file, databaseDir)) {
           await runGenerate(false);
         }
       };
@@ -81,9 +81,9 @@ function onZeroPlugin() {
     async buildStart() {
       if (!options.disableGenerate) await runGenerate(true);
     }
-  }, createOnZeroHmrPlugin(options.hmrInclude)];
+  }, createOnZeroHmrPlugin(options.hmrInclude, dir)];
 }
-var onZeroHmrPlugin = function (options) {
+var onZeroHmrPlugin = function onZeroHmrPlugin2(options) {
   return createOnZeroHmrPlugin(options === null || options === void 0 ? void 0 : options.include);
 };
 var vite_plugin_default = onZeroPlugin;

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

@@ -1 +1 @@
-{"version":3,"names":["isAbsolute","relative","resolve","generate","createOnZeroHmrPlugin","hmrInclude","arguments","length","hmrPaths","name","apply","enforce","transform","code","id","some","p","includes","test","transformed","replace","map","isWithinDirectory","file","dir","rel","startsWith","onZeroPlugin","options","_options_dir","dataDir","modelsDir","queriesDir","runGenerate","silent","after","force","configResolved","config","root","buildStart","disableGenerate","configureServer","server","handler","watcher","on"],"sources":["../../src/vite-plugin.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,UAAA,EAAYC,QAAA,EAAUC,OAAA,QAAe;AAE9C,SAASC,QAAA,QAAsC;AAa/C,SAASC,sBAAA,EAAsB;EAC7B,IAAAC,UAAM,GAAWC,SAAC,CAAAC,MAAe,QAAAD,SAAY,aAAe,IAAAA,SAAgB;EAE5E,IAAAE,QAAO,IACL,aAAM,EACN,UAAO,EACP,aAAS,EAET,WAAU,EACR,GAAAH,UAAK,CAEL;EAGA;IACEI,IAAA,eAAc;IAAYC,KAAA,EACxB;IAAAC,OACA;IAAAC,SACFA,CAAAC,IAAA,EAAAC,EAAA;MACF,KAAAN,QAAA,CAAAO,IAAA,WAAAC,CAAA;QAGA,OAAOF,EAAA,CAAAG,QAAS,CAAAD,CAAA;MACd,iBAAeE,IAAA,CAAAJ,EAAA;MAAA,IAAAK,WAAA,GAAAN,IAAA;MAAA,IAAAA,IAAA,CAAAI,QAAA;QAAAE,WAAA,GAAAA,WAAA,CAAAC,OAAA;MAAA;MACjB,IAAAN,EAAA,CAAAG,QAAA,2BAAAJ,IAAA,CAAAI,QAAA;QAEAE,WAAI;AACJ;AAAsC;AACxC;AAEJ;MAEA;MACE,IAAMA,WAAM,KAASN,IAAK,EAAI;MAC9B,OAAO;QACTA,IAAA,EAAAM,WAAA;QAEOE,GAAS;MACd;IAEA;EACA;AACA;AAEA,SAAMC,iBAAeA,CAAAC,IAAA,EAAAC,GACnB;EAAS,IACPC,GAAK,GAAAxB,QAAA,CAAAuB,GAAA,EAAAD,IAAA;EAAA,OACLE,GAAO,OAAQ,KAAAA,GAAA,CAAAC,UAAA,WAAA1B,UAAA,CAAAyB,GAAA;AAAA;AACf,SACAE,YAAeA,CAAA;EACjB,IAACC,OAAA,GAAAtB,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;EAEH,IAAAuB,YAAO;EAAA,IACLL,GAAA,IAAAK,YAAA,GAAAD,OAAA,CAAAJ,GAAA,cAAAK,YAAA,cAAAA,YAAA;EAAA,IACEC,OAAM;EAAA,IACNC,SAAO;EAAA,IAEPC,UAAA;EACE,IAAAC,WAAA,GAAU,SAAAA,CAAQC,MAAO;IACzB,OAAA/B,QAAA,CAAY;MACZqB,GAAA,EAAAM,OAAA;MACFK,KAAA,EAAAP,OAAA,CAAAO,KAAA;MAEAD,MAAM;MACJE,KAAA,EAAKR,OAAA,CAAQQ;IAAwC,EACvD;EAAA;EAGE,QAEA;IACE3B,IAAA,iBAAe;IACfC,KAAA,SAAI;IACF2B,cAAMA,CAAAC,MAAA;MAAiBR,OACzB,GAAA5B,OAAA,CAAAoC,MAAA,CAAAC,IAAA,EAAAf,GAAA;MACFO,SAAA,GAAA7B,OAAA,CAAA4B,OAAA;MAEAE,UAAO,GAAA9B,OAAW,CAAA4B,OAAU,WAAO;IACnC;IACA,MAAAU,UAAOA,CAAA,EAAQ;MACjB,KAAAZ,OAAA,CAAAa,eAAA,QAAAR,WAAA;IACF;IAEAS,gBAAAC,MAAA;MACE,IAAMf,OAAA,CAAAa,eAAA;MACN,IAAAG,OAAO,kBAAAA,CAAArB,IAAA;QAEP,cAAe,CAAAL,IAAQ,CAAAK,IAAA;QACrB,IAAAD,iBAAkB,CAAAC,IAAO,EAAAQ,SAAS,KAAAT,iBAAA,CAAAC,IAAA,EAAAS,UAAA;UACpC,MAAAC,WAAA;QAEA;MACE;MACFU,MAAA,CAAAE,OAAA,CAAAC,EAAA,WAAAF,OAAA;MACFD,MAAA,CAAAE,OAAA,CAAAC,EAAA,QAAAF,OAAA;MAEAD,MAAA,CAAAE,OAAA,CAAAC,EAAA,CAAsB,QAAQ,EAAAF,OAAA,CAAU;IAC1C;EACF,GAEO;IACLnC,IAAO;IACTC,KAAA;IAEO2B,eAAAC,MAAQ","ignoreList":[]}
+{"version":3,"names":["isAbsolute","relative","resolve","generate","createOnZeroHmrPlugin","hmrInclude","arguments","length","dataDir","normalizedDataDir","replaceAll","replace","hmrPaths","name","apply","enforce","transform","code","id","some","p","includes","test","transformed","map","isWithinDirectory","file","dir","rel","startsWith","onZeroPlugin","options","_options_dir","databaseDir","runGenerate","runGenerate2","silent","after","force","configResolved","config","root","buildStart","disableGenerate","configureServer","server","handler","handler2","watcher","on"],"sources":["../../src/vite-plugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/where.mjs

@@ -1,5 +1,5 @@
-import { globalValue } from "@take-out/helpers";
 import { getAuth } from "./helpers/getAuth.mjs";
+import { globalValue } from "./helpers/globalValue.mjs";
 import { getEnvironment } from "./state.mjs";
 let _evaluatingPermission = false;
 function setEvaluatingPermission(value) {

package/dist/esm/where.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["globalValue","getAuth","getEnvironment","_evaluatingPermission","setEvaluatingPermission","value","where","a","b","isServerOnly","whereFn","wrappedWhereFn","a2","b2","and","result","cmpLit","WhereRawBuilderMap","set","WhereTableNameMap","WeakMap","getWhereTableName","where2","get","getRawWhere"],"sources":["../../src/where.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAE5B,SAASC,OAAA,QAAe;AACxB,SAASC,cAAA,QAAsB;AAO/B,IAAIC,qBAAA,GAAwB;AAErB,SAASC,wBAAwBC,KAAA,EAAgB;EACtDF,qBAAA,GAAwBE,KAAA;AAC1B;AAYO,SAASC,MACdC,CAAA,EACAC,CAAA,EACAC,YAAA,GAAe,OACc;EAC7B,MAAMC,OAAA,GAAWF,CAAA,IAAKD,CAAA;EAEtB,MAAMI,cAAA,GAAkBA,CAACC,EAAA,EAAgCC,EAAA,GAAIZ,OAAA,CAAQ,MAAM;IACzE,IAAIC,cAAA,CAAe,MAAM,YAAYO,YAAA,IAAgB,CAACN,qBAAA,EAAuB;MAE3E,OAAOS,EAAA,CAAEE,GAAA,CAAI;IACf;IAEA,MAAMC,MAAA,GAASL,OAAA,CAAQE,EAAA,EAAGC,EAAC;IAC3B,IAAI,OAAOE,MAAA,KAAW,WAAW;MAC/B,IAAIA,MAAA,EAAQ;QACV,OAAOH,EAAA,CAAEI,MAAA,CAAO,GAAG,KAAK,CAAC;MAC3B,OAAO;QACL,OAAOJ,EAAA,CAAEI,MAAA,CAAO,GAAG,KAAK,CAAC;MAC3B;IACF;IACA,OAAOD,MAAA;EACT;EAGAE,kBAAA,CAAmBC,GAAA,CAAIP,cAAA,EAAgBD,OAAO;EAE9C,IAAIF,CAAA,EAAG;IACLW,iBAAA,CAAkBD,GAAA,CAAIP,cAAA,EAAgBJ,CAAU;EAClD;EAEA,OAAOI,cAAA;AACT;AAIA,MAAMQ,iBAAA,GAAoBnB,WAAA,CACxB,sBACA,MAAM,mBAAIoB,OAAA,CAA0B,CACtC;AAEA,MAAMH,kBAAA,GAAqBjB,WAAA,CACzB,qBACA,MAAM,mBAAIoB,OAAA,CAAsB,CAClC;AAEO,SAASC,kBAAkBC,MAAA,EAAc;EAC9C,OAAOH,iBAAA,CAAkBI,GAAA,CAAID,MAAK;AACpC;AAGO,SAASE,YAAYF,MAAA,EAAiC;EAC3D,OAAOL,kBAAA,CAAmBM,GAAA,CAAID,MAAK;AACrC","ignoreList":[]}
+{"version":3,"names":["getAuth","globalValue","getEnvironment","_evaluatingPermission","setEvaluatingPermission","value","where","a","b","isServerOnly","whereFn","wrappedWhereFn","b2","and","result","cmpLit","WhereRawBuilderMap","set","WhereTableNameMap","WeakMap","getWhereTableName","where2","get","getRawWhere"],"sources":["../../src/where.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,OAAA,QAAe;AACxB,SAASC,WAAA,QAAmB;AAC5B,SAASC,cAAA,QAAsB;AAO/B,IAAIC,qBAAA,GAAwB;AAErB,SAASC,wBAAwBC,KAAA,EAAgB;EACtDF,qBAAA,GAAwBE,KAAA;AAC1B;AAYO,SAASC,MACdC,CAAA,EACAC,CAAA,EACAC,YAAA,GAAe,OACc;EAC7B,MAAMC,OAAA,GAAWF,CAAA,IAAKD,CAAA;EAEtB,MAAMI,cAAA,GAAkBA,CAACJ,EAAA,EAAgCK,EAAA,GAAIZ,OAAA,CAAQ,MAAM;IACzE,IAAIE,cAAA,CAAe,MAAM,YAAYO,YAAA,IAAgB,CAACN,qBAAA,EAAuB;MAE3E,OAAOI,EAAA,CAAEM,GAAA,CAAI;IACf;IAEA,MAAMC,MAAA,GAASJ,OAAA,CAAQH,EAAA,EAAGK,EAAC;IAC3B,IAAI,OAAOE,MAAA,KAAW,WAAW;MAC/B,IAAIA,MAAA,EAAQ;QACV,OAAOP,EAAA,CAAEQ,MAAA,CAAO,GAAG,KAAK,CAAC;MAC3B,OAAO;QACL,OAAOR,EAAA,CAAEQ,MAAA,CAAO,GAAG,KAAK,CAAC;MAC3B;IACF;IACA,OAAOD,MAAA;EACT;EAGAE,kBAAA,CAAmBC,GAAA,CAAIN,cAAA,EAAgBD,OAAO;EAE9C,IAAIF,CAAA,EAAG;IACLU,iBAAA,CAAkBD,GAAA,CAAIN,cAAA,EAAgBJ,CAAU;EAClD;EAEA,OAAOI,cAAA;AACT;AAIA,MAAMO,iBAAA,GAAoBjB,WAAA,CACxB,sBACA,MAAM,mBAAIkB,OAAA,CAA0B,CACtC;AAEA,MAAMH,kBAAA,GAAqBf,WAAA,CACzB,qBACA,MAAM,mBAAIkB,OAAA,CAAsB,CAClC;AAEO,SAASC,kBAAkBC,MAAA,EAAc;EAC9C,OAAOH,iBAAA,CAAkBI,GAAA,CAAIhB,MAAK;AACpC;AAGO,SAASiB,YAAYF,MAAA,EAAiC;EAC3D,OAAOL,kBAAA,CAAmBM,GAAA,CAAIhB,MAAK;AACrC","ignoreList":[]}

package/dist/esm/where.native.js

@@ -1,5 +1,5 @@
-import { globalValue } from "@take-out/helpers";
 import { getAuth } from "./helpers/getAuth.native.js";
+import { globalValue } from "./helpers/globalValue.native.js";
 import { getEnvironment } from "./state.native.js";
 var _evaluatingPermission = false;
 function setEvaluatingPermission(value) {
@@ -8,7 +8,7 @@ function setEvaluatingPermission(value) {
 function where(a, b) {
   var isServerOnly = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
   var whereFn = b || a;
-  var wrappedWhereFn = function (a2) {
+  var wrappedWhereFn = function wrappedWhereFn2(a2) {
     var _$b = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : getAuth();
     if (getEnvironment() !== "server" && isServerOnly && !_evaluatingPermission) {
       return a2.and();

package/dist/esm/where.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["globalValue","getAuth","getEnvironment","_evaluatingPermission","setEvaluatingPermission","value","where","a","b","isServerOnly","arguments","length","whereFn","wrappedWhereFn","a2","_$b","and","result","cmpLit","WhereRawBuilderMap","set","WhereTableNameMap","WeakMap","getWhereTableName","where2","get","getRawWhere"],"sources":["../../src/where.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAE5B,SAASC,OAAA,QAAe;AACxB,SAASC,cAAA,QAAsB;AAO/B,IAAIC,qBAAA,GAAwB;AAErB,SAASC,wBAAwBC,KAAA,EAAgB;EACtDF,qBAAA,GAAwBE,KAAA;AAC1B;AAYO,SAASC,MACdC,CAAA,EACAC,CAAA,EACA;EAEA,IAAAC,YAAiB,GAAAC,SAAK,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;EAEtB,IAAAE,OAAM,GAAAJ,CAAA,IAAAD,CAAA;EACJ,IAAAM,cAAI,GAAe,SAAAA,CAAMC,EAAA;IAEvB,IAAAC,GAAA,GAAOL,SAAM,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA,MAAAT,OAAA;IACf,IAAAC,cAAA,mBAAAO,YAAA,KAAAN,qBAAA;MAEA,OAAMW,EAAA,CAAAE,GAAS;IACf;IACE,IAAAC,MAAI,GAAAL,OAAQ,CAAAE,EAAA,EAAAC,GAAA;IACV,WAAOE,MAAE,KAAO,SAAS;MAC3B,IAAAA,MAAO;QACL,OAAOH,EAAA,CAAEI,MAAA,CAAO,GAAG,KAAK,CAAC;MAC3B;QACF,OAAAJ,EAAA,CAAAI,MAAA;MACA;IACF;IAGA,OAAAD,MAAA;EAEA;EACEE,kBAAA,CAAAC,GAAkB,CAAAP,cAAI,EAAAD,OAA0B;EAClD,IAAAJ,CAAA;IAEAa,iBAAO,CAAAD,GAAA,CAAAP,cAAA,EAAAN,CAAA;EACT;EAIA,OAAMM,cAAA;AAAoB;AACxB,IACAQ,iBAAM,GAAArB,WAAI,CAA0B;EACtC,0BAAAsB,OAAA;AAEA;AAA2B,IACzBH,kBAAA,GAAAnB,WAAA;EACA,OAAM,mBAAIsB,OAAsB;AAClC;AAEO,SAASC,kBAAkBC,MAAA,EAAc;EAC9C,OAAOH,iBAAA,CAAkBI,GAAA,CAAID,MAAK;AACpC;AAGO,SAASE,YAAYF,MAAA,EAAiC;EAC3D,OAAOL,kBAAA,CAAmBM,GAAA,CAAID,MAAK;AACrC","ignoreList":[]}
+{"version":3,"names":["getAuth","globalValue","getEnvironment","_evaluatingPermission","setEvaluatingPermission","value","where","a","b","isServerOnly","arguments","length","whereFn","wrappedWhereFn","wrappedWhereFn2","a2","_$b","and","result","cmpLit","WhereRawBuilderMap","set","WhereTableNameMap","WeakMap","getWhereTableName","where2","get","getRawWhere"],"sources":["../../src/where.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,OAAA,QAAe;AACxB,SAASC,WAAA,QAAmB;AAC5B,SAASC,cAAA,QAAsB;AAO/B,IAAIC,qBAAA,GAAwB;AAErB,SAASC,wBAAwBC,KAAA,EAAgB;EACtDF,qBAAA,GAAwBE,KAAA;AAC1B;AAYO,SAASC,MACdC,CAAA,EACAC,CAAA,EACA;EAEA,IAAAC,YAAiB,GAAAC,SAAK,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;EAEtB,IAAAE,OAAM,GAAAJ,CAAA,IAAAD,CAAA;EACJ,IAAAM,cAAI,GAAe,SAAMC,eAAYA,CAAAC,EAAA;IAEnC,IAAAC,GAAA,GAAON,SAAM,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA,MAAAV,OAAA;IACf,IAAAE,cAAA,mBAAAO,YAAA,KAAAN,qBAAA;MAEA,OAAMY,EAAA,CAAAE,GAAS;IACf;IACE,IAAAC,MAAI,GAAAN,OAAQ,CAAAG,EAAA,EAAAC,GAAA;IACV,WAAOT,MAAE,KAAO,SAAS;MAC3B,IAAAW,MAAO;QACL,OAAOX,EAAA,CAAEY,MAAA,CAAO,GAAG,KAAK,CAAC;MAC3B;QACF,OAAAJ,EAAA,CAAAI,MAAA;MACA;IACF;IAGA,OAAAD,MAAA;EAEA;EACEE,kBAAA,CAAAC,GAAkB,CAAAR,cAAI,EAAAD,OAA0B;EAClD,IAAAJ,CAAA;IAEAc,iBAAO,CAAAD,GAAA,CAAAR,cAAA,EAAAN,CAAA;EACT;EAIA,OAAMM,cAAA;AAAoB;AACxB,IACAS,iBAAM,GAAArB,WAAI,CAA0B;EACtC,0BAAAsB,OAAA;AAEA;AAA2B,IACzBH,kBAAA,GAAAnB,WAAA;EACA,OAAM,mBAAIsB,OAAsB;AAClC;AAEO,SAASC,kBAAkBC,MAAA,EAAc;EAC9C,OAAOH,iBAAA,CAAkBI,GAAA,CAAIpB,MAAK;AACpC;AAGO,SAASqB,YAAYF,MAAA,EAAiC;EAC3D,OAAOL,kBAAA,CAAmBM,GAAA,CAAIpB,MAAK;AACrC","ignoreList":[]}

package/package.json

@@ -1,8 +1,14 @@
 {
   "name": "on-zero",
-  "version": "0.7.10",
+  "version": "0.8.0",
   "description": "A typed layer over @rocicorp/zero with queries, mutations, and permissions",
   "sideEffects": false,
+  "files": [
+    "dist",
+    "types",
+    "src",
+    "cli.cjs"
+  ],
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -16,12 +22,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/tamagui/takeout2.git",
+    "url": "git+https://github.com/natew/orez.git",
     "directory": "packages/on-zero"
   },
-  "homepage": "https://github.com/onejs/on-zero#readme",
+  "homepage": "https://github.com/natew/orez/tree/main/packages/on-zero#readme",
   "bugs": {
-    "url": "https://github.com/onejs/on-zero/issues"
+    "url": "https://github.com/natew/orez/issues"
   },
   "keywords": [
     "zero",
@@ -80,18 +86,24 @@
       "types": "./types/generate-lite.d.ts",
       "import": "./dist/esm/generate-lite.mjs",
       "require": "./dist/cjs/generate-lite.cjs"
+    },
+    "./generate": {
+      "types": "./types/generate.d.ts",
+      "import": "./dist/esm/generate.mjs",
+      "require": "./dist/cjs/generate.cjs"
     }
   },
   "dependencies": {
-    "@take-out/helpers": "0.7.10",
+    "@rocicorp/logger": "6.2.0",
     "chokidar": "^4.0.3",
     "citty": "^0.1.6",
+    "dequal": "^2.0.3",
     "valibot": "^1.1.0"
   },
   "peerDependencies": {
     "@rocicorp/zero": ">=1.7.0",
     "drizzle-orm": ">=1.0.0-beta.0 <2",
-    "drizzle-zero-sqlite": "^0.5.20",
+    "drizzle-zero-sqlite": "^0.6.0",
     "react": "*",
     "react-native": "*"
   },

package/src/cli.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { resolve } from 'node:path'
+import { basename, dirname, resolve } from 'node:path'
 
 import { defineCommand, runMain } from 'citty'
 
@@ -13,7 +13,8 @@ const generateCommand = defineCommand({
   args: {
     dir: {
       type: 'positional',
-      description: 'Base directory (defaults to src/data)',
+      description:
+        'Data directory or explicit on-zero.config.ts path (defaults to src/data)',
       required: false,
       default: 'src/data',
     },
@@ -37,7 +38,14 @@ const generateCommand = defineCommand({
   },
 
   async run({ args }) {
-    const opts = { dir: resolve(args.dir), after: args.after, force: args.force }
+    const target = resolve(args.dir)
+    const config = basename(target) === 'on-zero.config.ts' ? target : undefined
+    const opts = {
+      dir: config ? dirname(config) : target,
+      config,
+      after: args.after,
+      force: args.force,
+    }
 
     if (args.watch) {
       await watch(opts)

package/src/combineZeroClients.tsx

@@ -1,9 +1,8 @@
-import { createEmitter, type Emitter } from '@take-out/helpers'
-
+import { createEmitter } from './helpers/emitter'
 import { getInstanceForNamespace, getInstanceForQueryFn } from './instanceRegistry'
 import { run } from './run'
 
-import type { ZeroEvent } from './types'
+import type { ZeroEvent, ZeroEventsEmitter } from './types'
 import type { ReactNode } from 'react'
 
 // combines multiple createZeroClient instances into one consumer surface:
@@ -41,7 +40,7 @@ type CombinableZeroClient = {
   zero: any
   preload: (...args: any[]) => any
   getQuery: (...args: any[]) => any
-  zeroEvents: Emitter<ZeroEvent | null>
+  zeroEvents: ZeroEventsEmitter
   ControlQueries: (props: ControlQueriesProps) => ReactNode
 }
 
@@ -52,19 +51,28 @@ export type CombineZeroClientsOptions = {
 }
 
 type UnionToIntersection<U> = (U extends any ? (x: U) => void : never) extends (
-  x: infer I,
+  x: infer I
 ) => void
   ? I
   : never
 
+type WithoutMutate<Zero> = Zero extends unknown ? Omit<Zero, 'mutate'> : never
+type MutationsOf<Zero> = Zero extends { mutate: infer Mutations } ? Mutations : never
+
+type CombinedZero<Clients extends readonly CombinableZeroClient[]> = UnionToIntersection<
+  WithoutMutate<Clients[number]['zero']>
+> & {
+  mutate: UnionToIntersection<MutationsOf<Clients[number]['zero']>>
+}
+
 export type CombinedZeroClients<Clients extends readonly CombinableZeroClient[]> = {
   useQuery: UnionToIntersection<Clients[number]['useQuery']>
   usePermission: UnionToIntersection<Clients[number]['usePermission']>
-  zero: UnionToIntersection<Clients[number]['zero']>
+  zero: CombinedZero<Clients>
   preload: UnionToIntersection<Clients[number]['preload']>
   getQuery: UnionToIntersection<Clients[number]['getQuery']>
   run: typeof run
-  zeroEvents: Emitter<ZeroEvent | null>
+  zeroEvents: ZeroEventsEmitter
   ControlQueries: (props: ControlQueriesProps) => ReactNode
 }
 
@@ -89,7 +97,7 @@ export function combineZeroClients<
 
   if (!clientsByName.has(innerName)) {
     throw new Error(
-      `[on-zero] combineZeroClients inner instance '${innerName}' is not one of the passed clients`,
+      `[on-zero] combineZeroClients inner instance '${innerName}' is not one of the passed clients`
     )
   }
 
@@ -153,7 +161,7 @@ export function combineZeroClients<
   // one events stream relaying every instance's emitter
   const zeroEvents = createEmitter<ZeroEvent | null>(
     `zero:combined(${clients.map((client) => client.instanceName).join('+')})`,
-    null,
+    null
   )
   for (const client of clients) {
     client.zeroEvents.listen((event) => zeroEvents.emit(event))
@@ -164,7 +172,7 @@ export function combineZeroClients<
       (inner: ReactNode, client) => (
         <client.ControlQueries {...props}>{inner}</client.ControlQueries>
       ),
-      children,
+      children
     )
 
   const combined = {

package/src/config.ts

@@ -0,0 +1,72 @@
+/**
+ * Configuration for one independently synchronized Zero instance.
+ *
+ * An instance owns every namespace discovered directly under `dir`, including
+ * tables reached through `related()`. A root instance may contain nested
+ * instance directories because namespace discovery does not recurse through
+ * another instance's directory.
+ */
+export type DataInstanceConfig<Scope extends string = string> = {
+  /**
+   * Directory containing this instance's namespace files and folders.
+   * Relative paths are resolved from `on-zero.config.ts`. When omitted, the
+   * instance key is used as `./<key>`.
+   *
+   * Use `dir: '.'` for an explicitly configured root instance. Namespace
+   * files may use either `<name>.ts` or `<name>/queries.ts` plus
+   * `<name>/mutations.ts`. The directory name itself has no runtime meaning;
+   * the config key is the generated instance name.
+   */
+  dir?: string
+  /**
+   * Column that partitions every table synchronized by this instance.
+   * Generation fails when a namespace table or a table reached through
+   * `related()` does not declare this column. Server-only support tables are
+   * intentionally exempt because they are never synchronized to clients.
+   */
+  scope?: Scope
+  /**
+   * Server-only tables this instance reads or writes that static mutation
+   * analysis cannot discover, such as tables reached through dynamic helpers
+   * or server actions. These tables are included in schema generation and
+   * server push typing, but they do not become client query namespaces or enter
+   * this instance's synchronized table set.
+   */
+  supportTables?: readonly string[]
+}
+
+/**
+ * Root configuration for a multi-instance on-zero data layout.
+ *
+ * Keep this in `on-zero.config.ts` at the data root. The file is the single
+ * configuration surface for current and future data-generation options.
+ * Single-instance applications should omit it and keep namespaces directly in
+ * the data root.
+ */
+export type DataConfig<
+  Instances extends Record<string, DataInstanceConfig> = Record<
+    string,
+    DataInstanceConfig
+  >,
+> = {
+  /**
+   * Explicit independently synchronized instances, keyed by their generated
+   * client name. Every namespace must live under one of the configured `dir`
+   * paths. Each configured directory must exist. The data root may be one of
+   * those directories when declared explicitly with `dir: '.'`.
+   */
+  instances: Instances
+}
+
+/**
+ * Defines `on-zero.config.ts` with literal instance names, directory paths,
+ * scope columns, and support tables preserved for generated types.
+ *
+ * This function returns its input unchanged. Its purpose is validation,
+ * editor documentation, and one stable home for on-zero data configuration.
+ */
+export function defineConfig<const Instances extends Record<string, DataInstanceConfig>>(
+  config: DataConfig<Instances>
+): DataConfig<Instances> {
+  return config
+}

package/src/createPermissions.ts

@@ -1,5 +1,4 @@
-import { ensure } from '@take-out/helpers'
-
+import { ensure } from './helpers/ensure'
 import { mutatorContext } from './helpers/mutatorContext'
 import { prettyFormatZeroQuery } from './helpers/prettyFormatZeroQuery'
 import { getZQL } from './state'
@@ -37,7 +36,7 @@ export function createPermissions<Schema extends ZeroSchema>({
     permissionWhere: PermissionWhere,
     // TODO until i can get a working PickPrimaryKeys<'message'>
     objOrId: Record<string, any> | string,
-    tableNameOverride?: TableName,
+    tableNameOverride?: TableName
   ) {
     // check admin bypass for queries
     const adminBypassQueries = adminRoleMode === 'all' || adminRoleMode === 'queries'
@@ -113,7 +112,7 @@ export function createPermissions<Schema extends ZeroSchema>({
     authData: AuthData | null,
     tableName: TableName,
     where: Where,
-    obj: any, // TODO until i can get a working PickPrimaryKeys<'message'>
+    obj: any // TODO until i can get a working PickPrimaryKeys<'message'>
   ): Promise<void> {
     // check admin bypass for mutations
     const adminBypassMutations = adminRoleMode === 'all' || adminRoleMode === 'mutations'

package/src/createUseQuery.tsx

@@ -1,8 +1,8 @@
-import { useQuery as zeroUseQuery } from '@rocicorp/zero/react'
 import { addContextToQuery, asQueryInternals } from '@rocicorp/zero/bindings'
-import { IS_SERVER_RUNTIME } from '@take-out/helpers'
+import { useQuery as zeroUseQuery } from '@rocicorp/zero/react'
 import { useContext, useMemo, useRef, type Context } from 'react'
 
+import { IS_SERVER_RUNTIME } from './helpers/platform'
 import { useZeroDebug } from './helpers/useZeroDebug'
 import { resolveQuery, type PlainQueryFn } from './resolveQuery'
 
@@ -32,13 +32,13 @@ export type UseQueryHook<Schema extends ZeroSchema> = {
   <TArg, TTable extends keyof Schema['tables'] & string, TReturn>(
     fn: PlainQueryFn<TArg, Query<TTable, Schema, TReturn>>,
     params: TArg,
-    options?: UseQueryOptions | boolean,
-  ): QueryResult<TReturn>;
+    options?: UseQueryOptions | boolean
+  ): QueryResult<TReturn>
 
   // overload 2: plain function with no params
   <TTable extends keyof Schema['tables'] & string, TReturn>(
     fn: PlainQueryFn<void, Query<TTable, Schema, TReturn>>,
-    options?: UseQueryOptions | boolean,
+    options?: UseQueryOptions | boolean
   ): QueryResult<TReturn>
 }
 
@@ -58,7 +58,7 @@ const EMPTY_RESPONSE_SINGULAR = Object.freeze([undefined, RESULT_UNKNOWN]) as ne
 // user-authored query body (`.one()` vs not), so passing an empty `ctx` is
 // safe here.
 export function emptyResponseFor(
-  queryRequest: unknown,
+  queryRequest: unknown
 ): readonly [unknown, { type: string }] {
   try {
     const query = addContextToQuery(queryRequest as any, {} as never)
@@ -129,7 +129,7 @@ export function createUseQuery<Schema extends ZeroSchema>({
     const queryRequest = useMemo(
       () => resolveQuery({ customQueries, fn, params }),
       // eslint-disable-next-line react-hooks/exhaustive-deps
-      [fn, paramsKey],
+      [fn, paramsKey]
     )
 
     // extract option values as primitives — a fresh options object each render
@@ -152,7 +152,7 @@ export function createUseQuery<Schema extends ZeroSchema>({
     const effectiveEnabled = disableMode ? false : optionEnabled
     const effectiveOptions = useMemo(
       () => ({ enabled: effectiveEnabled, ttl: optionTTL }),
-      [effectiveEnabled, optionTTL],
+      [effectiveEnabled, optionTTL]
     )
     const rawOut = zeroUseQuery(queryRequest, effectiveOptions)
 

package/src/createUseQueryDirect.tsx

@@ -4,7 +4,6 @@ import {
   DEFAULT_TTL_MS,
   deepClone,
 } from '@rocicorp/zero/bindings'
-import { IS_SERVER_RUNTIME, useEmitterValue, type Emitter } from '@take-out/helpers'
 import { useContext, useMemo, useRef, useSyncExternalStore, type Context } from 'react'
 
 import {
@@ -14,6 +13,8 @@ import {
   type UseQueryHook,
   type UseQueryOptions,
 } from './createUseQuery'
+import { useEmitterValue, type Emitter } from './helpers/emitter'
+import { IS_SERVER_RUNTIME } from './helpers/platform'
 import { resolveQuery } from './resolveQuery'
 
 import type {
@@ -43,10 +44,10 @@ export type MaterializableZero = {
   context: unknown
   materialize(
     query: any,
-    options?: { ttl?: any },
+    options?: { ttl?: any }
   ): {
     addListener(
-      cb: (data: any, resultType: string, error?: DirectQueryError) => void,
+      cb: (data: any, resultType: string, error?: DirectQueryError) => void
     ): void
     destroy(): void
     updateTTL(ttl: any): void
@@ -101,7 +102,7 @@ function getSnapshot(
   data: unknown,
   resultType: DirectResultType,
   retry: () => void,
-  error?: DirectQueryError,
+  error?: DirectQueryError
 ): DirectSnapshot {
   if (singular && data === undefined) {
     if (resultType === 'complete') return emptySnapshotSingularComplete
@@ -138,7 +139,7 @@ class DirectViewWrapper implements DirectView {
     private readonly zero: MaterializableZero,
     private ttl: UseQueryOptions['ttl'] | number,
     private readonly singular: boolean,
-    private readonly onDematerialized: (view: DirectViewWrapper) => void,
+    private readonly onDematerialized: (view: DirectViewWrapper) => void
   ) {
     this.snapshot = getDefaultSnapshot(singular)
     this.materializeIfNeeded()
@@ -151,7 +152,7 @@ class DirectViewWrapper implements DirectView {
       cloned,
       resultType as DirectResultType,
       this.retry,
-      error,
+      error
     )
     for (const listener of this.listeners) {
       listener()
@@ -216,7 +217,7 @@ class DirectViewStore {
     zero: MaterializableZero,
     queryRequest: unknown,
     enabled: boolean,
-    ttl: UseQueryOptions['ttl'] | number,
+    ttl: UseQueryOptions['ttl'] | number
   ): DirectView {
     const query = addContextToQuery(queryRequest as any, zero.context as any)
     const queryInternals = asQueryInternals(query)
@@ -241,7 +242,7 @@ class DirectViewStore {
           if (this.views.get(hash) === dematerialized) {
             this.views.delete(hash)
           }
-        },
+        }
       )
       this.views.set(hash, view)
     } else {
@@ -299,7 +300,7 @@ export function createUseQueryDirect<Schema extends ZeroSchema>({
       () => resolveQuery({ customQueries, fn, params }),
       // params is keyed by paramsKey
       // eslint-disable-next-line react-hooks/exhaustive-deps
-      [fn, paramsKey],
+      [fn, paramsKey]
     )
 
     const emptyForQuery = useMemo(() => emptyResponseFor(queryRequest), [queryRequest])
@@ -330,7 +331,7 @@ export function createUseQueryDirect<Schema extends ZeroSchema>({
     const out = useSyncExternalStore(
       view ? view.subscribe : DISABLED_SUBSCRIBE,
       view ? view.getSnapshot : getEmpty,
-      view ? view.getSnapshot : getEmpty,
+      view ? view.getSnapshot : getEmpty
     )
 
     if (!disableMode) {

package/src/createZeroClient.authData.test.tsx

@@ -54,7 +54,7 @@ function renderWith(props: {
         userID={props.userID}
       >
         <span>ok</span>
-      </client.ProvideZero>,
+      </client.ProvideZero>
     )
   })
 }