on-zero 0.6.15 → 0.6.17

package/dist/cjs/createZeroServer.test.cjs

@@ -100,7 +100,7 @@ function pushRequest(mutationIDs) {
             touch: async ({
               server
             }) => {
-              server?.asyncTasks.push(async () => {
+              server?.enqueueTask(async () => {
                 effectRuns++;
               });
               throw new Error("rejected");
@@ -123,6 +123,182 @@ function pushRequest(mutationIDs) {
     (0, import_vitest.expect)(result.asyncTasks).toEqual([]);
     (0, import_vitest.expect)(effectRuns).toBe(0);
   });
+  (0, import_vitest.test)("awaits barrier tasks before resolving the push response", async () => {
+    const pg = new FakePgClient();
+    let releaseBarrier;
+    let markBarrierStarted;
+    const barrierStarted = new Promise(resolve => {
+      markBarrierStarted = resolve;
+    });
+    const barrier = new Promise(resolve => {
+      releaseBarrier = resolve;
+    });
+    const zeroServer = (0, import_createZeroServer.createZeroServer)({
+      schema: import_fixtureSchema.zeroHttpFixtureSchema,
+      models: {
+        project: {
+          mutate: {
+            touch: async ({
+              server
+            }) => {
+              server?.enqueueTask(async () => {
+                markBarrierStarted();
+                await barrier;
+              }, {
+                barrier: true
+              });
+            }
+          }
+        }
+      },
+      createServerActions: () => ({}),
+      pool: pg
+    });
+    let responseResolved = false;
+    const resultPromise = zeroServer.handleMutationRequest({
+      authData: null,
+      request: pushRequest(1)
+    }).then(result2 => {
+      responseResolved = true;
+      return result2;
+    });
+    await barrierStarted;
+    await Promise.resolve();
+    (0, import_vitest.expect)(responseResolved).toBe(false);
+    releaseBarrier();
+    const result = await resultPromise;
+    (0, import_vitest.expect)(result.response.mutations[0].result).toEqual({});
+  });
+  (0, import_vitest.test)("does not fail the push when a background task rejects", async () => {
+    const pg = new FakePgClient();
+    const error = new Error("background failed");
+    const consoleError = import_vitest.vi.spyOn(console, "error").mockImplementation(() => {});
+    const zeroServer = (0, import_createZeroServer.createZeroServer)({
+      schema: import_fixtureSchema.zeroHttpFixtureSchema,
+      models: {
+        project: {
+          mutate: {
+            touch: async ({
+              server
+            }) => {
+              server?.enqueueTask(async () => {
+                throw error;
+              });
+            }
+          }
+        }
+      },
+      createServerActions: () => ({}),
+      pool: pg
+    });
+    const result = await zeroServer.handleMutationRequest({
+      authData: null,
+      request: pushRequest(1)
+    });
+    (0, import_vitest.expect)(result.response.mutations[0].result).toEqual({});
+    await import_vitest.vi.waitFor(() => {
+      (0, import_vitest.expect)(consoleError).toHaveBeenCalledWith("[on-zero] async task failed", error);
+    });
+    consoleError.mockRestore();
+  });
+  (0, import_vitest.test)("registers a promise that settles every background task with the request scheduler", async () => {
+    const pg = new FakePgClient();
+    const error = new Error("background failed");
+    const consoleError = import_vitest.vi.spyOn(console, "error").mockImplementation(() => {});
+    let releaseSibling;
+    const siblingGate = new Promise(resolve => {
+      releaseSibling = resolve;
+    });
+    let siblingFinished = false;
+    let scheduled;
+    const zeroServer = (0, import_createZeroServer.createZeroServer)({
+      schema: import_fixtureSchema.zeroHttpFixtureSchema,
+      models: {
+        project: {
+          mutate: {
+            touch: async ({
+              server
+            }) => {
+              server?.enqueueTask(async () => {
+                throw error;
+              });
+              server?.enqueueTask(async () => {
+                await siblingGate;
+                siblingFinished = true;
+              });
+            }
+          }
+        }
+      },
+      createServerActions: () => ({}),
+      pool: pg
+    });
+    const result = await zeroServer.handleMutationRequest({
+      authData: null,
+      request: pushRequest(1),
+      scheduleBackgroundTask: promise => {
+        scheduled = promise;
+      }
+    });
+    (0, import_vitest.expect)(result.response.mutations[0].result).toEqual({});
+    (0, import_vitest.expect)(scheduled).toBeInstanceOf(Promise);
+    (0, import_vitest.expect)(siblingFinished).toBe(false);
+    let scheduledSettled = false;
+    void scheduled.then(() => {
+      scheduledSettled = true;
+    });
+    await Promise.resolve();
+    (0, import_vitest.expect)(scheduledSettled).toBe(false);
+    releaseSibling();
+    await scheduled;
+    (0, import_vitest.expect)(siblingFinished).toBe(true);
+    (0, import_vitest.expect)(consoleError).toHaveBeenCalledWith("[on-zero] async task failed", error);
+    consoleError.mockRestore();
+  });
+  (0, import_vitest.test)("awaits background tasks when the request has no scheduler", async () => {
+    const pg = new FakePgClient();
+    let markTaskStarted;
+    const taskStarted = new Promise(resolve => {
+      markTaskStarted = resolve;
+    });
+    let releaseTask;
+    const taskGate = new Promise(resolve => {
+      releaseTask = resolve;
+    });
+    const zeroServer = (0, import_createZeroServer.createZeroServer)({
+      schema: import_fixtureSchema.zeroHttpFixtureSchema,
+      models: {
+        project: {
+          mutate: {
+            touch: async ({
+              server
+            }) => {
+              server?.enqueueTask(async () => {
+                markTaskStarted();
+                await taskGate;
+              });
+            }
+          }
+        }
+      },
+      createServerActions: () => ({}),
+      pool: pg
+    });
+    let responseResolved = false;
+    const resultPromise = zeroServer.handleMutationRequest({
+      authData: null,
+      request: pushRequest(1)
+    }).then(result2 => {
+      responseResolved = true;
+      return result2;
+    });
+    await taskStarted;
+    await Promise.resolve();
+    (0, import_vitest.expect)(responseResolved).toBe(false);
+    releaseTask();
+    const result = await resultPromise;
+    (0, import_vitest.expect)(result.response.mutations[0].result).toEqual({});
+  });
   (0, import_vitest.test)("persists alreadyProcessed duplicate results for zero-cache recovery rows", async () => {
     const pg = new FakePgClient();
     const zeroServer = (0, import_createZeroServer.createZeroServer)({

package/dist/cjs/createZeroServer.test.native.js

@@ -149,7 +149,7 @@ function pushRequest(mutationIDs) {
               var {
                 server
               } = param;
-              server === null || server === void 0 ? void 0 : server.asyncTasks.push(async function () {
+              server === null || server === void 0 ? void 0 : server.enqueueTask(async function () {
                 effectRuns++;
               });
               throw new Error("rejected");
@@ -174,6 +174,194 @@ function pushRequest(mutationIDs) {
     (0, import_vitest.expect)(result.asyncTasks).toEqual([]);
     (0, import_vitest.expect)(effectRuns).toBe(0);
   });
+  (0, import_vitest.test)("awaits barrier tasks before resolving the push response", async function () {
+    var pg = new FakePgClient();
+    var releaseBarrier;
+    var markBarrierStarted;
+    var barrierStarted = new Promise(function (resolve) {
+      markBarrierStarted = resolve;
+    });
+    var barrier = new Promise(function (resolve) {
+      releaseBarrier = resolve;
+    });
+    var zeroServer = (0, import_createZeroServer.createZeroServer)({
+      schema: import_fixtureSchema.zeroHttpFixtureSchema,
+      models: {
+        project: {
+          mutate: {
+            touch: async function (param) {
+              var {
+                server
+              } = param;
+              server === null || server === void 0 ? void 0 : server.enqueueTask(async function () {
+                markBarrierStarted();
+                await barrier;
+              }, {
+                barrier: true
+              });
+            }
+          }
+        }
+      },
+      createServerActions: function () {
+        return {};
+      },
+      pool: pg
+    });
+    var responseResolved = false;
+    var resultPromise = zeroServer.handleMutationRequest({
+      authData: null,
+      request: pushRequest(1)
+    }).then(function (result2) {
+      responseResolved = true;
+      return result2;
+    });
+    await barrierStarted;
+    await Promise.resolve();
+    (0, import_vitest.expect)(responseResolved).toBe(false);
+    releaseBarrier();
+    var result = await resultPromise;
+    (0, import_vitest.expect)(result.response.mutations[0].result).toEqual({});
+  });
+  (0, import_vitest.test)("does not fail the push when a background task rejects", async function () {
+    var pg = new FakePgClient();
+    var error = new Error("background failed");
+    var consoleError = import_vitest.vi.spyOn(console, "error").mockImplementation(function () {});
+    var zeroServer = (0, import_createZeroServer.createZeroServer)({
+      schema: import_fixtureSchema.zeroHttpFixtureSchema,
+      models: {
+        project: {
+          mutate: {
+            touch: async function (param) {
+              var {
+                server
+              } = param;
+              server === null || server === void 0 ? void 0 : server.enqueueTask(async function () {
+                throw error;
+              });
+            }
+          }
+        }
+      },
+      createServerActions: function () {
+        return {};
+      },
+      pool: pg
+    });
+    var result = await zeroServer.handleMutationRequest({
+      authData: null,
+      request: pushRequest(1)
+    });
+    (0, import_vitest.expect)(result.response.mutations[0].result).toEqual({});
+    await import_vitest.vi.waitFor(function () {
+      (0, import_vitest.expect)(consoleError).toHaveBeenCalledWith("[on-zero] async task failed", error);
+    });
+    consoleError.mockRestore();
+  });
+  (0, import_vitest.test)("registers a promise that settles every background task with the request scheduler", async function () {
+    var pg = new FakePgClient();
+    var error = new Error("background failed");
+    var consoleError = import_vitest.vi.spyOn(console, "error").mockImplementation(function () {});
+    var releaseSibling;
+    var siblingGate = new Promise(function (resolve) {
+      releaseSibling = resolve;
+    });
+    var siblingFinished = false;
+    var scheduled;
+    var zeroServer = (0, import_createZeroServer.createZeroServer)({
+      schema: import_fixtureSchema.zeroHttpFixtureSchema,
+      models: {
+        project: {
+          mutate: {
+            touch: async function (param) {
+              var {
+                server
+              } = param;
+              server === null || server === void 0 ? void 0 : server.enqueueTask(async function () {
+                throw error;
+              });
+              server === null || server === void 0 ? void 0 : server.enqueueTask(async function () {
+                await siblingGate;
+                siblingFinished = true;
+              });
+            }
+          }
+        }
+      },
+      createServerActions: function () {
+        return {};
+      },
+      pool: pg
+    });
+    var result = await zeroServer.handleMutationRequest({
+      authData: null,
+      request: pushRequest(1),
+      scheduleBackgroundTask: function (promise) {
+        scheduled = promise;
+      }
+    });
+    (0, import_vitest.expect)(result.response.mutations[0].result).toEqual({});
+    (0, import_vitest.expect)(scheduled).toBeInstanceOf(Promise);
+    (0, import_vitest.expect)(siblingFinished).toBe(false);
+    var scheduledSettled = false;
+    void scheduled.then(function () {
+      scheduledSettled = true;
+    });
+    await Promise.resolve();
+    (0, import_vitest.expect)(scheduledSettled).toBe(false);
+    releaseSibling();
+    await scheduled;
+    (0, import_vitest.expect)(siblingFinished).toBe(true);
+    (0, import_vitest.expect)(consoleError).toHaveBeenCalledWith("[on-zero] async task failed", error);
+    consoleError.mockRestore();
+  });
+  (0, import_vitest.test)("awaits background tasks when the request has no scheduler", async function () {
+    var pg = new FakePgClient();
+    var markTaskStarted;
+    var taskStarted = new Promise(function (resolve) {
+      markTaskStarted = resolve;
+    });
+    var releaseTask;
+    var taskGate = new Promise(function (resolve) {
+      releaseTask = resolve;
+    });
+    var zeroServer = (0, import_createZeroServer.createZeroServer)({
+      schema: import_fixtureSchema.zeroHttpFixtureSchema,
+      models: {
+        project: {
+          mutate: {
+            touch: async function (param) {
+              var {
+                server
+              } = param;
+              server === null || server === void 0 ? void 0 : server.enqueueTask(async function () {
+                markTaskStarted();
+                await taskGate;
+              });
+            }
+          }
+        }
+      },
+      createServerActions: function () {
+        return {};
+      },
+      pool: pg
+    });
+    var responseResolved = false;
+    var resultPromise = zeroServer.handleMutationRequest({
+      authData: null,
+      request: pushRequest(1)
+    }).then(function (result2) {
+      responseResolved = true;
+      return result2;
+    });
+    await taskStarted;
+    await Promise.resolve();
+    (0, import_vitest.expect)(responseResolved).toBe(false);
+    releaseTask();
+    var result = await resultPromise;
+    (0, import_vitest.expect)(result.response.mutations[0].result).toEqual({});
+  });
   (0, import_vitest.test)("persists alreadyProcessed duplicate results for zero-cache recovery rows", async function () {
     var pg = new FakePgClient();
     var zeroServer = (0, import_createZeroServer.createZeroServer)({

package/dist/cjs/createZeroServer.test.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["import_vitest","require","import_createZeroServer","import_fixtureSchema","_class_call_check","instance","Constructor","TypeError","_defineProperties","target","props","i","length","descriptor","enumerable","configurable","writable","Object","defineProperty","key","_create_class","protoProps","staticProps","prototype","_define_property","obj","value","FakePgClient","FakePgClient2","query","sql","params","arguments","pendingLastMutationID","rows","lastMutationID","includes","nextMutationID","schemaRows","mutationResultInserts","push","Error","table","columns","map","column","schema","dataType","precision","scale","typtype","typename","elemTyptype","elemTypname","pushRequest","mutationIDs","ids","Array","isArray","Request","method","headers","body","JSON","stringify","clientGroupID","mutations","mutationID","type","id","clientID","name","args","timestamp","pushVersion","requestID","join","describe","test","pg","effectRuns","zeroServer","createZeroServer","zeroHttpFixtureSchema","models","project","mutate","touch","param","server","asyncTasks","createServerActions","pool","result","handleMutationRequest","authData","request","skipAsyncTasks","expect","response","toMatchObject","error","message","toEqual","toBe"],"sources":["../../src/createZeroServer.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["import_vitest","require","import_createZeroServer","import_fixtureSchema","_class_call_check","instance","Constructor","TypeError","_defineProperties","target","props","i","length","descriptor","enumerable","configurable","writable","Object","defineProperty","key","_create_class","protoProps","staticProps","prototype","_define_property","obj","value","FakePgClient","FakePgClient2","query","sql","params","arguments","pendingLastMutationID","rows","lastMutationID","includes","nextMutationID","schemaRows","mutationResultInserts","push","Error","table","columns","map","column","schema","dataType","precision","scale","typtype","typename","elemTyptype","elemTypname","pushRequest","mutationIDs","ids","Array","isArray","Request","method","headers","body","JSON","stringify","clientGroupID","mutations","mutationID","type","id","clientID","name","args","timestamp","pushVersion","requestID","join","describe","test","pg","effectRuns","zeroServer","createZeroServer","zeroHttpFixtureSchema","models","project","mutate","touch","param","server","enqueueTask","createServerActions","pool","result","handleMutationRequest","authData","request","skipAsyncTasks","expect","response","toMatchObject","error","message","asyncTasks","toEqual","toBe","releaseBarrier","markBarrierStarted","barrierStarted","Promise","resolve","barrier","responseResolved","resultPromise","then","result2","consoleError","vi","spyOn","console","mockImplementation","waitFor","toHaveBeenCalledWith","mockRestore","releaseSibling","siblingGate","siblingFinished","scheduled","scheduleBackgroundTask","promise","toBeInstanceOf","scheduledSettled","markTaskStarted","taskStarted","releaseTask","taskGate"],"sources":["../../src/createZeroServer.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/createZeroServerCore.cjs

@@ -26,6 +26,7 @@ __export(createZeroServerCore_exports, {
 });
 module.exports = __toCommonJS(createZeroServerCore_exports);
 var import_server = require("@rocicorp/zero/server");
+var import_asyncTasks = require("./asyncTasks.cjs");
 var import_createZeroDirectServer = require("./createZeroDirectServer.cjs");
 var import_createMutators = require("./helpers/createMutators.cjs");
 var import_mutatorContext = require("./helpers/mutatorContext.cjs");
@@ -61,12 +62,13 @@ function createZeroServerCore({
   const handleMutationRequest = async ({
     authData,
     request,
+    scheduleBackgroundTask,
     skipAsyncTasks
   }) => {
     const tasks = (0, import_createZeroDirectServer.createAsyncTaskCollector)();
     const recoveryRequest = request.clone();
     const mutators = (0, import_createMutators.createMutators)({
-      asyncTasks: tasks.queue,
+      enqueueTask: tasks.enqueueTask,
       can: permissions.can,
       createServerActions,
       environment: "server",
@@ -82,8 +84,12 @@ function createZeroServerCore({
       if (parsed) await persistAlreadyProcessed(parsed);
     }
     if (!skipAsyncTasks && tasks.committed.length) {
-      Promise.all(tasks.committed.map(task => (0, import_mutatorContext.runWithAuthScope)(authData, task))).catch(err => {
-        console.error("[push] async tasks failed", err);
+      const entries = tasks.committed.map(entry => ({
+        ...entry,
+        task: () => (0, import_mutatorContext.runWithAuthScope)(authData, entry.task)
+      }));
+      await (0, import_asyncTasks.runAsyncTaskEntries)(entries, {
+        background: scheduleBackgroundTask
       });
     }
     return {

package/dist/cjs/createZeroServerCore.native.js

@@ -28,6 +28,7 @@ __export(createZeroServerCore_exports, {
 });
 module.exports = __toCommonJS(createZeroServerCore_exports);
 var import_server = require("@rocicorp/zero/server");
+var import_asyncTasks = require("./asyncTasks.native.js");
 var import_createZeroDirectServer = require("./createZeroDirectServer.native.js");
 var import_createMutators = require("./helpers/createMutators.native.js");
 var import_mutatorContext = require("./helpers/mutatorContext.native.js");
@@ -70,12 +71,13 @@ function createZeroServerCore(param) {
     var {
       authData,
       request,
+      scheduleBackgroundTask,
       skipAsyncTasks
     } = param2;
     var tasks = (0, import_createZeroDirectServer.createAsyncTaskCollector)();
     var recoveryRequest = request.clone();
     var mutators = (0, import_createMutators.createMutators)({
-      asyncTasks: tasks.queue,
+      enqueueTask: tasks.enqueueTask,
       can: permissions.can,
       createServerActions,
       environment: "server",
@@ -91,10 +93,16 @@ function createZeroServerCore(param) {
       if (parsed) await persistAlreadyProcessed(parsed);
     }
     if (!skipAsyncTasks && tasks.committed.length) {
-      Promise.all(tasks.committed.map(function (task) {
-        return (0, import_mutatorContext.runWithAuthScope)(authData, task);
-      })).catch(function (err) {
-        console.error("[push] async tasks failed", err);
+      var entries = tasks.committed.map(function (entry) {
+        return {
+          ...entry,
+          task: function () {
+            return (0, import_mutatorContext.runWithAuthScope)(authData, entry.task);
+          }
+        };
+      });
+      await (0, import_asyncTasks.runAsyncTaskEntries)(entries, {
+        background: scheduleBackgroundTask
       });
     }
     return {

package/dist/cjs/createZeroServerCore.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createZeroServerCore_exports","__export","createZeroServerCore","module","exports","import_server","require","import_createZeroDirectServer","import_createMutators","import_mutatorContext","import_queryContext","_type_of","obj","Symbol","constructor","param","createDatabase","createServerActions","defaultAllowAdminRole","defaultMutateAuthData","models","mutations","mutationValidators","persistAlreadyProcessed","queries","schema","validateMutation","validateQuery","permissions","server","createZeroDirectServerRuntime","handleMutationRequest","param2","authData","request","skipAsyncTasks","tasks","createAsyncTaskCollector","recoveryRequest","clone","mutators","createMutators","asyncTasks","queue","can","environment","processor","PushProcessor","withTransactionLifecycle","lifecycle","response","process","parsed","parseAlreadyProcessed","committed","length","Promise","all","map","task","runWithAuthScope","catch","err","console","error","handleQueryRequest","Error","handler","name","args","resolveServerQuery","userID","id","runWithQueryContext","database","transaction","callback","input","tx","hooks","beginAttempt","result","completeAttempt","rollbackAttempt","commitTransaction","rollbackTransaction","alreadyProcessedMutations","upstreamSchema","URL","url","searchParams","get","body","json","clientGroupID","Array","isArray","filter","mutation","clientID"],"sources":["../../src/createZeroServerCore.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createZeroServerCore_exports","__export","createZeroServerCore","module","exports","import_server","require","import_asyncTasks","import_createZeroDirectServer","import_createMutators","import_mutatorContext","import_queryContext","_type_of","obj","Symbol","constructor","param","createDatabase","createServerActions","defaultAllowAdminRole","defaultMutateAuthData","models","mutations","mutationValidators","persistAlreadyProcessed","queries","schema","validateMutation","validateQuery","permissions","server","createZeroDirectServerRuntime","handleMutationRequest","param2","authData","request","scheduleBackgroundTask","skipAsyncTasks","tasks","createAsyncTaskCollector","recoveryRequest","clone","mutators","createMutators","enqueueTask","can","environment","processor","PushProcessor","withTransactionLifecycle","lifecycle","response","process","parsed","parseAlreadyProcessed","committed","length","entries","map","entry","task","runWithAuthScope","runAsyncTaskEntries","background","asyncTasks","handleQueryRequest","Error","handler","name","args","resolveServerQuery","userID","id","runWithQueryContext","database","transaction","callback","input","tx","hooks","beginAttempt","result","completeAttempt","error","rollbackAttempt","commitTransaction","rollbackTransaction","alreadyProcessedMutations","upstreamSchema","URL","url","searchParams","get","body","json","clientGroupID","Array","isArray","filter","mutation","clientID"],"sources":["../../src/createZeroServerCore.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/generate.cjs

@@ -43,6 +43,7 @@ var import_node_fs = require("node:fs");
 var import_node_path = require("node:path");
 var import_generate_helpers = require("./generate-helpers.cjs");
 const hash = s => (0, import_node_crypto.createHash)("sha256").update(s).digest("hex");
+const GENERATOR_CACHE_VERSION = "1";
 const isGeneratorSourceFile = name => name.endsWith(".ts") && !name.endsWith(".d.ts") && !name.endsWith(".test.ts") && !name.endsWith(".spec.ts");
 function hashInputTree(baseDir, generatedDir) {
   const parts = [];
@@ -553,7 +554,8 @@ async function generate(options) {
   const {
     dir,
     after,
-    silent
+    silent,
+    force
   } = options;
   const baseDir = (0, import_node_path.resolve)(dir);
   const mutationsDir = (0, import_node_path.resolve)(baseDir, "mutations");
@@ -569,7 +571,7 @@ async function generate(options) {
   }
   loadCache();
   const inputHash = hashInputTree(baseDir, generatedDir);
-  if (generateCache.__inputHash === inputHash && (0, import_node_fs.existsSync)((0, import_node_path.resolve)(generatedDir, "models.ts"))) {
+  if (!force && generateCache.__generatorVersion === GENERATOR_CACHE_VERSION && generateCache.__inputHash === inputHash && (0, import_node_fs.existsSync)((0, import_node_path.resolve)(generatedDir, "models.ts"))) {
     let counts = {};
     try {
       counts = JSON.parse(generateCache.__counts || "{}");
@@ -766,6 +768,7 @@ async function generate(options) {
       if (!silent) console.error(`Error running after command: ${err}`);
     }
   }
+  generateCache.__generatorVersion = GENERATOR_CACHE_VERSION;
   generateCache.__inputHash = inputHash;
   generateCache.__counts = JSON.stringify({
     modelCount: allModelFiles.length,

package/dist/cjs/generate.native.js

@@ -47,6 +47,7 @@ var import_generate_helpers = require("./generate-helpers.native.js");
 var hash = function (s) {
   return (0, import_crypto.createHash)("sha256").update(s).digest("hex");
 };
+var GENERATOR_CACHE_VERSION = "1";
 var isGeneratorSourceFile = function (name) {
   return name.endsWith(".ts") && !name.endsWith(".d.ts") && !name.endsWith(".test.ts") && !name.endsWith(".spec.ts");
 };
@@ -813,7 +814,8 @@ async function generate(options) {
   var {
     dir,
     after,
-    silent
+    silent,
+    force
   } = options;
   var baseDir = (0, import_path.resolve)(dir);
   var mutationsDir = (0, import_path.resolve)(baseDir, "mutations");
@@ -829,7 +831,7 @@ async function generate(options) {
   }
   loadCache();
   var inputHash = hashInputTree(baseDir, generatedDir);
-  if (generateCache.__inputHash === inputHash && (0, import_fs.existsSync)((0, import_path.resolve)(generatedDir, "models.ts"))) {
+  if (!force && generateCache.__generatorVersion === GENERATOR_CACHE_VERSION && generateCache.__inputHash === inputHash && (0, import_fs.existsSync)((0, import_path.resolve)(generatedDir, "models.ts"))) {
     var counts = {};
     try {
       counts = JSON.parse(generateCache.__counts || "{}");
@@ -1143,6 +1145,7 @@ async function generate(options) {
       if (!silent) console.error(`Error running after command: ${err}`);
     }
   }
+  generateCache.__generatorVersion = GENERATOR_CACHE_VERSION;
   generateCache.__inputHash = inputHash;
   generateCache.__counts = JSON.stringify({
     modelCount: allModelFiles.length,