on-zero 0.4.35 → 0.4.36
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/multiInstance.test.cjs +75 -0
- package/dist/cjs/multiInstance.test.native.js +111 -0
- package/dist/cjs/multiInstance.test.native.js.map +1 -1
- package/dist/cjs/run.cjs +6 -1
- package/dist/cjs/run.native.js +6 -1
- package/dist/cjs/run.native.js.map +1 -1
- package/dist/cjs/zeroRunner.cjs +4 -0
- package/dist/cjs/zeroRunner.native.js +4 -0
- package/dist/cjs/zeroRunner.native.js.map +1 -1
- package/dist/esm/multiInstance.test.mjs +75 -0
- package/dist/esm/multiInstance.test.mjs.map +1 -1
- package/dist/esm/multiInstance.test.native.js +111 -0
- package/dist/esm/multiInstance.test.native.js.map +1 -1
- package/dist/esm/run.mjs +7 -2
- package/dist/esm/run.mjs.map +1 -1
- package/dist/esm/run.native.js +7 -2
- package/dist/esm/run.native.js.map +1 -1
- package/dist/esm/zeroRunner.mjs +4 -1
- package/dist/esm/zeroRunner.mjs.map +1 -1
- package/dist/esm/zeroRunner.native.js +4 -1
- package/dist/esm/zeroRunner.native.js.map +1 -1
- package/package.json +2 -2
- package/src/multiInstance.test.tsx +69 -0
- package/src/run.ts +10 -2
- package/src/zeroRunner.ts +4 -0
- package/types/run.d.ts.map +1 -1
- package/types/zeroRunner.d.ts +3 -0
- package/types/zeroRunner.d.ts.map +1 -1
|
@@ -3,10 +3,12 @@ var import_helpers = require("@take-out/helpers");
|
|
|
3
3
|
var import_vitest = require("vitest");
|
|
4
4
|
var import_combineZeroClients = require("./combineZeroClients.cjs");
|
|
5
5
|
var import_createZeroClient = require("./createZeroClient.cjs");
|
|
6
|
+
var import_mutatorContext = require("./helpers/mutatorContext.cjs");
|
|
6
7
|
var import_instanceRegistry = require("./instanceRegistry.cjs");
|
|
7
8
|
var import_queryRegistry = require("./queryRegistry.cjs");
|
|
8
9
|
var import_run = require("./run.cjs");
|
|
9
10
|
var import_zeroRunner = require("./zeroRunner.cjs");
|
|
11
|
+
var import_zql = require("./zql.cjs");
|
|
10
12
|
const userTable = (0, import_zero.table)("user").columns({
|
|
11
13
|
id: (0, import_zero.string)(),
|
|
12
14
|
name: (0, import_zero.string)()
|
|
@@ -87,6 +89,79 @@ function fakeClient(name, namespaces, zeroStub) {
|
|
|
87
89
|
const request = controlRunner.mock.calls[0][0];
|
|
88
90
|
(0, import_vitest.expect)(request.query.queryName).toBe("runUser.byId");
|
|
89
91
|
});
|
|
92
|
+
(0, import_vitest.test)("run() rejects named queries inside server mutation context", async () => {
|
|
93
|
+
const {
|
|
94
|
+
byId
|
|
95
|
+
} = makeClient("run-ctx-owner", "runCtxThing");
|
|
96
|
+
const ownerRunner = import_vitest.vi.fn(async (..._args) => ({
|
|
97
|
+
from: "owner"
|
|
98
|
+
}));
|
|
99
|
+
(0, import_instanceRegistry.getInstanceForNamespace)("runCtxThing").runner = ownerRunner;
|
|
100
|
+
const txRun = import_vitest.vi.fn(async (..._args) => ({
|
|
101
|
+
from: "tx"
|
|
102
|
+
}));
|
|
103
|
+
await (0, import_vitest.expect)((0, import_mutatorContext.runWithContext)({
|
|
104
|
+
authData: null,
|
|
105
|
+
environment: "server",
|
|
106
|
+
can: async () => {},
|
|
107
|
+
tx: {
|
|
108
|
+
run: txRun
|
|
109
|
+
}
|
|
110
|
+
}, () => (0, import_run.run)(byId, {
|
|
111
|
+
id: "1"
|
|
112
|
+
}))).rejects.toThrow(/run\(namedQuery\) cannot be used inside a Zero mutation/);
|
|
113
|
+
(0, import_vitest.expect)(ownerRunner).not.toHaveBeenCalled();
|
|
114
|
+
(0, import_vitest.expect)(txRun).not.toHaveBeenCalled();
|
|
115
|
+
});
|
|
116
|
+
(0, import_vitest.test)("run() keeps named queries on their owning client runner when browser context leaks", async () => {
|
|
117
|
+
const {
|
|
118
|
+
byId
|
|
119
|
+
} = makeClient("run-client-leak-owner", "runClientLeakThing");
|
|
120
|
+
const ownerRunner = import_vitest.vi.fn(async (..._args) => ({
|
|
121
|
+
from: "owner"
|
|
122
|
+
}));
|
|
123
|
+
(0, import_instanceRegistry.getInstanceForNamespace)("runClientLeakThing").runner = ownerRunner;
|
|
124
|
+
const txRun = import_vitest.vi.fn(async (..._args) => ({
|
|
125
|
+
from: "tx"
|
|
126
|
+
}));
|
|
127
|
+
await (0, import_vitest.expect)((0, import_mutatorContext.runWithContext)({
|
|
128
|
+
authData: null,
|
|
129
|
+
environment: "client",
|
|
130
|
+
can: async () => {},
|
|
131
|
+
tx: {
|
|
132
|
+
run: txRun
|
|
133
|
+
}
|
|
134
|
+
}, () => (0, import_run.run)(byId, {
|
|
135
|
+
id: "1"
|
|
136
|
+
}))).resolves.toEqual({
|
|
137
|
+
from: "owner"
|
|
138
|
+
});
|
|
139
|
+
(0, import_vitest.expect)(ownerRunner).toHaveBeenCalledTimes(1);
|
|
140
|
+
(0, import_vitest.expect)(txRun).not.toHaveBeenCalled();
|
|
141
|
+
});
|
|
142
|
+
(0, import_vitest.test)("run() keeps inline zql on the active transaction runner", async () => {
|
|
143
|
+
makeClient("run-inline-context", "runInlineThing");
|
|
144
|
+
const ambientRunner = import_vitest.vi.fn(async (..._args) => ({
|
|
145
|
+
from: "ambient"
|
|
146
|
+
}));
|
|
147
|
+
(0, import_zeroRunner.setRunner)(ambientRunner);
|
|
148
|
+
const txRun = import_vitest.vi.fn(async (..._args) => ({
|
|
149
|
+
from: "tx"
|
|
150
|
+
}));
|
|
151
|
+
const query = import_zql.zql.user.where("id", "1");
|
|
152
|
+
await (0, import_vitest.expect)((0, import_mutatorContext.runWithContext)({
|
|
153
|
+
authData: null,
|
|
154
|
+
environment: "client",
|
|
155
|
+
can: async () => {},
|
|
156
|
+
tx: {
|
|
157
|
+
run: txRun
|
|
158
|
+
}
|
|
159
|
+
}, () => (0, import_run.run)(query))).resolves.toEqual({
|
|
160
|
+
from: "tx"
|
|
161
|
+
});
|
|
162
|
+
(0, import_vitest.expect)(txRun).toHaveBeenCalledWith(query, void 0);
|
|
163
|
+
(0, import_vitest.expect)(ambientRunner).not.toHaveBeenCalled();
|
|
164
|
+
});
|
|
90
165
|
(0, import_vitest.test)("a claimed namespace with an unmounted instance uses the ambient runner (server path)", async () => {
|
|
91
166
|
const {
|
|
92
167
|
byId
|
|
@@ -5,10 +5,12 @@ var import_helpers = require("@take-out/helpers");
|
|
|
5
5
|
var import_vitest = require("vitest");
|
|
6
6
|
var import_combineZeroClients = require("./combineZeroClients.native.js");
|
|
7
7
|
var import_createZeroClient = require("./createZeroClient.native.js");
|
|
8
|
+
var import_mutatorContext = require("./helpers/mutatorContext.native.js");
|
|
8
9
|
var import_instanceRegistry = require("./instanceRegistry.native.js");
|
|
9
10
|
var import_queryRegistry = require("./queryRegistry.native.js");
|
|
10
11
|
var import_run = require("./run.native.js");
|
|
11
12
|
var import_zeroRunner = require("./zeroRunner.native.js");
|
|
13
|
+
var import_zql = require("./zql.native.js");
|
|
12
14
|
var userTable = (0, import_zero.table)("user").columns({
|
|
13
15
|
id: (0, import_zero.string)(),
|
|
14
16
|
name: (0, import_zero.string)()
|
|
@@ -123,6 +125,115 @@ function fakeClient(name, namespaces, zeroStub) {
|
|
|
123
125
|
var request = controlRunner.mock.calls[0][0];
|
|
124
126
|
(0, import_vitest.expect)(request.query.queryName).toBe("runUser.byId");
|
|
125
127
|
});
|
|
128
|
+
(0, import_vitest.test)("run() rejects named queries inside server mutation context", async function () {
|
|
129
|
+
var {
|
|
130
|
+
byId
|
|
131
|
+
} = makeClient("run-ctx-owner", "runCtxThing");
|
|
132
|
+
var ownerRunner = import_vitest.vi.fn(async function () {
|
|
133
|
+
for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
134
|
+
_args[_key] = arguments[_key];
|
|
135
|
+
}
|
|
136
|
+
return {
|
|
137
|
+
from: "owner"
|
|
138
|
+
};
|
|
139
|
+
});
|
|
140
|
+
(0, import_instanceRegistry.getInstanceForNamespace)("runCtxThing").runner = ownerRunner;
|
|
141
|
+
var txRun = import_vitest.vi.fn(async function () {
|
|
142
|
+
for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
143
|
+
_args[_key] = arguments[_key];
|
|
144
|
+
}
|
|
145
|
+
return {
|
|
146
|
+
from: "tx"
|
|
147
|
+
};
|
|
148
|
+
});
|
|
149
|
+
await (0, import_vitest.expect)((0, import_mutatorContext.runWithContext)({
|
|
150
|
+
authData: null,
|
|
151
|
+
environment: "server",
|
|
152
|
+
can: async function () {},
|
|
153
|
+
tx: {
|
|
154
|
+
run: txRun
|
|
155
|
+
}
|
|
156
|
+
}, function () {
|
|
157
|
+
return (0, import_run.run)(byId, {
|
|
158
|
+
id: "1"
|
|
159
|
+
});
|
|
160
|
+
})).rejects.toThrow(/run\(namedQuery\) cannot be used inside a Zero mutation/);
|
|
161
|
+
(0, import_vitest.expect)(ownerRunner).not.toHaveBeenCalled();
|
|
162
|
+
(0, import_vitest.expect)(txRun).not.toHaveBeenCalled();
|
|
163
|
+
});
|
|
164
|
+
(0, import_vitest.test)("run() keeps named queries on their owning client runner when browser context leaks", async function () {
|
|
165
|
+
var {
|
|
166
|
+
byId
|
|
167
|
+
} = makeClient("run-client-leak-owner", "runClientLeakThing");
|
|
168
|
+
var ownerRunner = import_vitest.vi.fn(async function () {
|
|
169
|
+
for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
170
|
+
_args[_key] = arguments[_key];
|
|
171
|
+
}
|
|
172
|
+
return {
|
|
173
|
+
from: "owner"
|
|
174
|
+
};
|
|
175
|
+
});
|
|
176
|
+
(0, import_instanceRegistry.getInstanceForNamespace)("runClientLeakThing").runner = ownerRunner;
|
|
177
|
+
var txRun = import_vitest.vi.fn(async function () {
|
|
178
|
+
for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
179
|
+
_args[_key] = arguments[_key];
|
|
180
|
+
}
|
|
181
|
+
return {
|
|
182
|
+
from: "tx"
|
|
183
|
+
};
|
|
184
|
+
});
|
|
185
|
+
await (0, import_vitest.expect)((0, import_mutatorContext.runWithContext)({
|
|
186
|
+
authData: null,
|
|
187
|
+
environment: "client",
|
|
188
|
+
can: async function () {},
|
|
189
|
+
tx: {
|
|
190
|
+
run: txRun
|
|
191
|
+
}
|
|
192
|
+
}, function () {
|
|
193
|
+
return (0, import_run.run)(byId, {
|
|
194
|
+
id: "1"
|
|
195
|
+
});
|
|
196
|
+
})).resolves.toEqual({
|
|
197
|
+
from: "owner"
|
|
198
|
+
});
|
|
199
|
+
(0, import_vitest.expect)(ownerRunner).toHaveBeenCalledTimes(1);
|
|
200
|
+
(0, import_vitest.expect)(txRun).not.toHaveBeenCalled();
|
|
201
|
+
});
|
|
202
|
+
(0, import_vitest.test)("run() keeps inline zql on the active transaction runner", async function () {
|
|
203
|
+
makeClient("run-inline-context", "runInlineThing");
|
|
204
|
+
var ambientRunner = import_vitest.vi.fn(async function () {
|
|
205
|
+
for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
206
|
+
_args[_key] = arguments[_key];
|
|
207
|
+
}
|
|
208
|
+
return {
|
|
209
|
+
from: "ambient"
|
|
210
|
+
};
|
|
211
|
+
});
|
|
212
|
+
(0, import_zeroRunner.setRunner)(ambientRunner);
|
|
213
|
+
var txRun = import_vitest.vi.fn(async function () {
|
|
214
|
+
for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
215
|
+
_args[_key] = arguments[_key];
|
|
216
|
+
}
|
|
217
|
+
return {
|
|
218
|
+
from: "tx"
|
|
219
|
+
};
|
|
220
|
+
});
|
|
221
|
+
var query = import_zql.zql.user.where("id", "1");
|
|
222
|
+
await (0, import_vitest.expect)((0, import_mutatorContext.runWithContext)({
|
|
223
|
+
authData: null,
|
|
224
|
+
environment: "client",
|
|
225
|
+
can: async function () {},
|
|
226
|
+
tx: {
|
|
227
|
+
run: txRun
|
|
228
|
+
}
|
|
229
|
+
}, function () {
|
|
230
|
+
return (0, import_run.run)(query);
|
|
231
|
+
})).resolves.toEqual({
|
|
232
|
+
from: "tx"
|
|
233
|
+
});
|
|
234
|
+
(0, import_vitest.expect)(txRun).toHaveBeenCalledWith(query, void 0);
|
|
235
|
+
(0, import_vitest.expect)(ambientRunner).not.toHaveBeenCalled();
|
|
236
|
+
});
|
|
126
237
|
(0, import_vitest.test)("a claimed namespace with an unmounted instance uses the ambient runner (server path)", async function () {
|
|
127
238
|
var {
|
|
128
239
|
byId
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["import_zero","require","import_helpers","import_vitest","import_combineZeroClients","import_createZeroClient","import_instanceRegistry","import_queryRegistry","import_run","import_zeroRunner","userTable","table","columns","id","string","name","primaryKey","taskTable","title","schema","createSchema","tables","makeQueryFn","args","makeClient","instanceName","namespace","byId","client","createZeroClient","models","groupedQueries","fakeClient","namespaces","zeroStub","registerClientInstance","customQueries","useQuery","vi","fn","useQueryDirect","usePermission","usePermissionDirect","zero","preload","getQuery","zeroEvents","createEmitter","ControlQueries","param","children","describe","test","control","project","controlRunner","_len","arguments","length","_args","Array","_key","from","projectRunner","getInstanceForNamespace","runner","ambientRunner","setRunner","expect","run","resolves","toEqual","not","toHaveBeenCalled","request","mock","calls","query","queryName","toBe","
|
|
1
|
+
{"version":3,"names":["import_zero","require","import_helpers","import_vitest","import_combineZeroClients","import_createZeroClient","import_mutatorContext","import_instanceRegistry","import_queryRegistry","import_run","import_zeroRunner","import_zql","userTable","table","columns","id","string","name","primaryKey","taskTable","title","schema","createSchema","tables","makeQueryFn","args","makeClient","instanceName","namespace","byId","client","createZeroClient","models","groupedQueries","fakeClient","namespaces","zeroStub","registerClientInstance","customQueries","useQuery","vi","fn","useQueryDirect","usePermission","usePermissionDirect","zero","preload","getQuery","zeroEvents","createEmitter","ControlQueries","param","children","describe","test","control","project","controlRunner","_len","arguments","length","_args","Array","_key","from","projectRunner","getInstanceForNamespace","runner","ambientRunner","setRunner","expect","run","resolves","toEqual","not","toHaveBeenCalled","request","mock","calls","query","queryName","toBe","ownerRunner","txRun","runWithContext","authData","environment","can","tx","rejects","toThrow","toHaveBeenCalledTimes","zql","user","where","toHaveBeenCalledWith","ambient","_getInstanceForNamespace","mdlThing","mutate","insert"],"sources":["../../src/multiInstance.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/cjs/run.cjs
CHANGED
|
@@ -28,6 +28,7 @@ __export(run_exports, {
|
|
|
28
28
|
module.exports = __toCommonJS(run_exports);
|
|
29
29
|
var import_instanceRegistry = require("./instanceRegistry.cjs");
|
|
30
30
|
var import_resolveQuery = require("./resolveQuery.cjs");
|
|
31
|
+
var import_mutatorContext = require("./helpers/mutatorContext.cjs");
|
|
31
32
|
var import_zeroRunner = require("./zeroRunner.cjs");
|
|
32
33
|
let customQueriesRef = null;
|
|
33
34
|
function setCustomQueries(queries) {
|
|
@@ -49,6 +50,10 @@ function run(queryOrFn, paramsOrMode, modeArg) {
|
|
|
49
50
|
if (queryOrFn && queryOrFn["ast"]) {
|
|
50
51
|
return (0, import_zeroRunner.getRunner)()(queryOrFn, options);
|
|
51
52
|
}
|
|
53
|
+
const inMutation = (0, import_mutatorContext.isInZeroMutation)();
|
|
54
|
+
if (inMutation && (0, import_mutatorContext.mutatorContext)().environment === "server") {
|
|
55
|
+
throw new Error("run(namedQuery) cannot be used inside a Zero mutation. Use tx.run(zql...) for transactional mutation reads.");
|
|
56
|
+
}
|
|
52
57
|
const instance = (0, import_instanceRegistry.getInstanceForQueryFn)(queryOrFn);
|
|
53
58
|
const customQueries = instance?.customQueries ?? getCustomQueries();
|
|
54
59
|
const queryRequest = (0, import_resolveQuery.resolveQuery)({
|
|
@@ -56,5 +61,5 @@ function run(queryOrFn, paramsOrMode, modeArg) {
|
|
|
56
61
|
fn: queryOrFn,
|
|
57
62
|
params
|
|
58
63
|
});
|
|
59
|
-
return (0, import_zeroRunner.
|
|
64
|
+
return (0, import_zeroRunner.getAmbientRunner)(instance)(queryRequest, options);
|
|
60
65
|
}
|
package/dist/cjs/run.native.js
CHANGED
|
@@ -30,6 +30,7 @@ __export(run_exports, {
|
|
|
30
30
|
module.exports = __toCommonJS(run_exports);
|
|
31
31
|
var import_instanceRegistry = require("./instanceRegistry.native.js");
|
|
32
32
|
var import_resolveQuery = require("./resolveQuery.native.js");
|
|
33
|
+
var import_mutatorContext = require("./helpers/mutatorContext.native.js");
|
|
33
34
|
var import_zeroRunner = require("./zeroRunner.native.js");
|
|
34
35
|
var customQueriesRef = null;
|
|
35
36
|
function setCustomQueries(queries) {
|
|
@@ -51,6 +52,10 @@ function run(queryOrFn, paramsOrMode, modeArg) {
|
|
|
51
52
|
if (queryOrFn && queryOrFn["ast"]) {
|
|
52
53
|
return (0, import_zeroRunner.getRunner)()(queryOrFn, options);
|
|
53
54
|
}
|
|
55
|
+
var inMutation = (0, import_mutatorContext.isInZeroMutation)();
|
|
56
|
+
if (inMutation && (0, import_mutatorContext.mutatorContext)().environment === "server") {
|
|
57
|
+
throw new Error("run(namedQuery) cannot be used inside a Zero mutation. Use tx.run(zql...) for transactional mutation reads.");
|
|
58
|
+
}
|
|
54
59
|
var instance = (0, import_instanceRegistry.getInstanceForQueryFn)(queryOrFn);
|
|
55
60
|
var _instance_customQueries;
|
|
56
61
|
var customQueries = (_instance_customQueries = instance === null || instance === void 0 ? void 0 : instance.customQueries) !== null && _instance_customQueries !== void 0 ? _instance_customQueries : getCustomQueries();
|
|
@@ -59,6 +64,6 @@ function run(queryOrFn, paramsOrMode, modeArg) {
|
|
|
59
64
|
fn: queryOrFn,
|
|
60
65
|
params
|
|
61
66
|
});
|
|
62
|
-
return (0, import_zeroRunner.
|
|
67
|
+
return (0, import_zeroRunner.getAmbientRunner)(instance)(queryRequest, options);
|
|
63
68
|
}
|
|
64
69
|
//# sourceMappingURL=run.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","run_exports","__export","run","setCustomQueries","module","exports","import_instanceRegistry","require","import_resolveQuery","import_zeroRunner","customQueriesRef","queries","getCustomQueries","Error","queryOrFn","paramsOrMode","modeArg","hasParams","params","mode","options","type","getRunner","instance","getInstanceForQueryFn","_instance_customQueries","customQueries","queryRequest","resolveQuery","fn"],"sources":["../../src/run.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,WAAA;AAAAC,QAAA,CAAAD,WAAA;EAAAE,GAAA,EAAAA,CAAA,KAAAA,GAAA;EAAAC,gBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAV,YAAA,CAAsCK,WAAA;AACtC,IAAAM,uBAAgD,GAAAC,OAAA;AAChD,IAAAC,mBAAA,
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","run_exports","__export","run","setCustomQueries","module","exports","import_instanceRegistry","require","import_resolveQuery","import_mutatorContext","import_zeroRunner","customQueriesRef","queries","getCustomQueries","Error","queryOrFn","paramsOrMode","modeArg","hasParams","params","mode","options","type","getRunner","inMutation","isInZeroMutation","mutatorContext","environment","instance","getInstanceForQueryFn","_instance_customQueries","customQueries","queryRequest","resolveQuery","fn"],"sources":["../../src/run.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,WAAA;AAAAC,QAAA,CAAAD,WAAA;EAAAE,GAAA,EAAAA,CAAA,KAAAA,GAAA;EAAAC,gBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAV,YAAA,CAAsCK,WAAA;AACtC,IAAAM,uBAAgD,GAAAC,OAAA;AAChD,IAAAC,mBAAA,GAAAD,OAAiD;AACjD,IAAAE,qBAA4C,GAAAF,OAAA;AAS5C,IAAIG,iBAAA,GAA4CH,OAAA;AAEzC,IAAAI,gBAAS,OAAiB;AAC/B,SAAAR,gBAAmBA,CAAAS,OAAA;EACrBD,gBAAA,GAAAC,OAAA;AAEA;AACE,SAAKC,gBAAkBA,CAAA;EACrB,KAAAF,gBAAU;IAAA,MACR,IAAAG,KAAA;EAAA;EAEJ,OAAAH,gBAAA;AACA;AACF,SAAAT,IAAAa,SAAA,EAAAC,YAAA,EAAAC,OAAA;EAiCO,IAAAC,SACL,GAAAD,OACA,eACAD,YACc,IAAAA,YAAA;EACd,IAAAG,MAAM,GAAAD,SAAY,GAAAF,YAAY,GAAc;EAC5C,IAAAI,IAAM,GAAAF,SAAS,GAAAD,OAAY,GAAAD,YAAe;EAC1C,IAAAK,OAAM,GAAOD,IAAA,eAAY,GAAU;IACnCE,IAAM;EAEC,IACC,KAAM;EACR,IACAP,SAAA,IAAAA,SAAA;IAEN,OAAI,IAAAL,iBAAuB,CAAAa,SAAQ,IAAAR,SAAA,EAAAM,OAAA;EAEjC;EACF,IAAAG,UAAA,OAAAf,qBAAA,CAAAgB,gBAAA;EAEA,IAAAD,UAAM,QAAAf,qBAAa,CAAAiB,cAAA,IAAAC,WAAiB;IACpC,MAAI,IAAAb,KAAA,8GAAyD;EAC3D;EAAU,IACRc,QAAA,OAAAtB,uBAAA,CAAAuB,qBAAA,EAAAd,SAAA;EAAA,IACFe,uBAAA;EACF,IAAAC,aAAA,IAAAD,uBAAA,GAAAF,QAAA,aAAAA,QAAA,uBAAAA,QAAA,CAAAG,aAAA,cAAAD,uBAAA,cAAAA,uBAAA,GAAAjB,gBAAA;EAIA,IAAAmB,YAAM,KAAW,EAAAxB,mBAAA,CAAAyB,YAAA;IACjBF,aAAM;IACNG,EAAA,EAAMnB,SAAA;IAENI;EACF","ignoreList":[]}
|
package/dist/cjs/zeroRunner.cjs
CHANGED
|
@@ -22,6 +22,7 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
|
|
|
22
22
|
}), mod);
|
|
23
23
|
var zeroRunner_exports = {};
|
|
24
24
|
__export(zeroRunner_exports, {
|
|
25
|
+
getAmbientRunner: () => getAmbientRunner,
|
|
25
26
|
getRunner: () => getRunner,
|
|
26
27
|
setRunner: () => setRunner
|
|
27
28
|
});
|
|
@@ -35,6 +36,9 @@ function getRunner(instance) {
|
|
|
35
36
|
if ((0, import_mutatorContext.isInZeroMutation)()) {
|
|
36
37
|
return (q, o) => (0, import_mutatorContext.mutatorContext)().tx.run(q, o);
|
|
37
38
|
}
|
|
39
|
+
return getAmbientRunner(instance);
|
|
40
|
+
}
|
|
41
|
+
function getAmbientRunner(instance) {
|
|
38
42
|
if (instance?.runner) {
|
|
39
43
|
return instance.runner;
|
|
40
44
|
}
|
|
@@ -24,6 +24,7 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
|
|
|
24
24
|
}), mod);
|
|
25
25
|
var zeroRunner_exports = {};
|
|
26
26
|
__export(zeroRunner_exports, {
|
|
27
|
+
getAmbientRunner: () => getAmbientRunner,
|
|
27
28
|
getRunner: () => getRunner,
|
|
28
29
|
setRunner: () => setRunner
|
|
29
30
|
});
|
|
@@ -39,6 +40,9 @@ function getRunner(instance) {
|
|
|
39
40
|
return (0, import_mutatorContext.mutatorContext)().tx.run(q, o);
|
|
40
41
|
};
|
|
41
42
|
}
|
|
43
|
+
return getAmbientRunner(instance);
|
|
44
|
+
}
|
|
45
|
+
function getAmbientRunner(instance) {
|
|
42
46
|
if (instance === null || instance === void 0 ? void 0 : instance.runner) {
|
|
43
47
|
return instance.runner;
|
|
44
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","zeroRunner_exports","__export","getRunner","setRunner","module","exports","import_mutatorContext","require","runner","r","instance","isInZeroMutation","q","o","mutatorContext","tx","run","Error"],"sources":["../../src/zeroRunner.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,kBAAA;AAAAC,QAAA,CAAAD,kBAAA;EAAAE,SAAA,EAAAA,CAAA,KAAAA,SAAA;EAAAC,SAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","zeroRunner_exports","__export","getAmbientRunner","getRunner","setRunner","module","exports","import_mutatorContext","require","runner","r","instance","isInZeroMutation","q","o","mutatorContext","tx","run","Error"],"sources":["../../src/zeroRunner.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,kBAAA;AAAAC,QAAA,CAAAD,kBAAA;EAAAE,gBAAA,EAAAA,CAAA,KAAAA,gBAAA;EAAAC,SAAA,EAAAA,CAAA,KAAAA,SAAA;EAAAC,SAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAX,YAAiD,CAAAK,kBAAA;AAgBjD,IAAIO,qBAA4B,GAAAC,OAAA;AAEzB,IAAAC,MAAS;AACd,SAAAL,SAASA,CAAAM,CAAA;EACXD,MAAA,GAAAC,CAAA;AAEO;AACL,SAAAP,SAAIA,CAAAQ,QAAA;EACF,QAAAJ,qBAAiB,CAAAK,gBAAA;IACnB,iBAAAC,CAAA,EAAAC,CAAA;MAEA,OAAO,IAAAP,qBAAyB,CAAAQ,cAAA,IAAAC,EAAA,CAAAC,GAAA,CAAAJ,CAAA,EAAAC,CAAA;IAClC;EAEO;EAGL,OAAIZ,gBAAkB,CAAAS,QAAA;AACpB;AAAgB,SAClBT,iBAAAS,QAAA;EAEA,IAAIA,QAAC,KAAQ,QAAAA,QAAA,uBAAAA,QAAA,CAAAF,MAAA;IACX,OAAME,QAAI,CAAAF,MAAA;EAAA;EACR,IACF,CAAAA,MAAA;IACF,UAAAS,KAAA;EAEA;EACF,OAAAT,MAAA","ignoreList":[]}
|
|
@@ -3,10 +3,12 @@ import { createEmitter } from "@take-out/helpers";
|
|
|
3
3
|
import { describe, expect, test, vi } from "vitest";
|
|
4
4
|
import { combineZeroClients } from "./combineZeroClients.mjs";
|
|
5
5
|
import { createZeroClient } from "./createZeroClient.mjs";
|
|
6
|
+
import { runWithContext } from "./helpers/mutatorContext.mjs";
|
|
6
7
|
import { getInstanceForNamespace, registerClientInstance } from "./instanceRegistry.mjs";
|
|
7
8
|
import { registerQuery } from "./queryRegistry.mjs";
|
|
8
9
|
import { run } from "./run.mjs";
|
|
9
10
|
import { setRunner } from "./zeroRunner.mjs";
|
|
11
|
+
import { zql } from "./zql.mjs";
|
|
10
12
|
const userTable = table("user").columns({
|
|
11
13
|
id: string(),
|
|
12
14
|
name: string()
|
|
@@ -87,6 +89,79 @@ describe("multi-instance namespace dispatch", () => {
|
|
|
87
89
|
const request = controlRunner.mock.calls[0][0];
|
|
88
90
|
expect(request.query.queryName).toBe("runUser.byId");
|
|
89
91
|
});
|
|
92
|
+
test("run() rejects named queries inside server mutation context", async () => {
|
|
93
|
+
const {
|
|
94
|
+
byId
|
|
95
|
+
} = makeClient("run-ctx-owner", "runCtxThing");
|
|
96
|
+
const ownerRunner = vi.fn(async (..._args) => ({
|
|
97
|
+
from: "owner"
|
|
98
|
+
}));
|
|
99
|
+
getInstanceForNamespace("runCtxThing").runner = ownerRunner;
|
|
100
|
+
const txRun = vi.fn(async (..._args) => ({
|
|
101
|
+
from: "tx"
|
|
102
|
+
}));
|
|
103
|
+
await expect(runWithContext({
|
|
104
|
+
authData: null,
|
|
105
|
+
environment: "server",
|
|
106
|
+
can: async () => {},
|
|
107
|
+
tx: {
|
|
108
|
+
run: txRun
|
|
109
|
+
}
|
|
110
|
+
}, () => run(byId, {
|
|
111
|
+
id: "1"
|
|
112
|
+
}))).rejects.toThrow(/run\(namedQuery\) cannot be used inside a Zero mutation/);
|
|
113
|
+
expect(ownerRunner).not.toHaveBeenCalled();
|
|
114
|
+
expect(txRun).not.toHaveBeenCalled();
|
|
115
|
+
});
|
|
116
|
+
test("run() keeps named queries on their owning client runner when browser context leaks", async () => {
|
|
117
|
+
const {
|
|
118
|
+
byId
|
|
119
|
+
} = makeClient("run-client-leak-owner", "runClientLeakThing");
|
|
120
|
+
const ownerRunner = vi.fn(async (..._args) => ({
|
|
121
|
+
from: "owner"
|
|
122
|
+
}));
|
|
123
|
+
getInstanceForNamespace("runClientLeakThing").runner = ownerRunner;
|
|
124
|
+
const txRun = vi.fn(async (..._args) => ({
|
|
125
|
+
from: "tx"
|
|
126
|
+
}));
|
|
127
|
+
await expect(runWithContext({
|
|
128
|
+
authData: null,
|
|
129
|
+
environment: "client",
|
|
130
|
+
can: async () => {},
|
|
131
|
+
tx: {
|
|
132
|
+
run: txRun
|
|
133
|
+
}
|
|
134
|
+
}, () => run(byId, {
|
|
135
|
+
id: "1"
|
|
136
|
+
}))).resolves.toEqual({
|
|
137
|
+
from: "owner"
|
|
138
|
+
});
|
|
139
|
+
expect(ownerRunner).toHaveBeenCalledTimes(1);
|
|
140
|
+
expect(txRun).not.toHaveBeenCalled();
|
|
141
|
+
});
|
|
142
|
+
test("run() keeps inline zql on the active transaction runner", async () => {
|
|
143
|
+
makeClient("run-inline-context", "runInlineThing");
|
|
144
|
+
const ambientRunner = vi.fn(async (..._args) => ({
|
|
145
|
+
from: "ambient"
|
|
146
|
+
}));
|
|
147
|
+
setRunner(ambientRunner);
|
|
148
|
+
const txRun = vi.fn(async (..._args) => ({
|
|
149
|
+
from: "tx"
|
|
150
|
+
}));
|
|
151
|
+
const query = zql.user.where("id", "1");
|
|
152
|
+
await expect(runWithContext({
|
|
153
|
+
authData: null,
|
|
154
|
+
environment: "client",
|
|
155
|
+
can: async () => {},
|
|
156
|
+
tx: {
|
|
157
|
+
run: txRun
|
|
158
|
+
}
|
|
159
|
+
}, () => run(query))).resolves.toEqual({
|
|
160
|
+
from: "tx"
|
|
161
|
+
});
|
|
162
|
+
expect(txRun).toHaveBeenCalledWith(query, void 0);
|
|
163
|
+
expect(ambientRunner).not.toHaveBeenCalled();
|
|
164
|
+
});
|
|
90
165
|
test("a claimed namespace with an unmounted instance uses the ambient runner (server path)", async () => {
|
|
91
166
|
const {
|
|
92
167
|
byId
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createSchema","string","table","createEmitter","describe","expect","test","vi","combineZeroClients","createZeroClient","getInstanceForNamespace","registerClientInstance","registerQuery","run","setRunner","userTable","columns","id","name","primaryKey","taskTable","title","schema","tables","makeQueryFn","args","makeClient","instanceName","namespace","byId","client","models","groupedQueries","fakeClient","namespaces","zeroStub","customQueries","useQuery","fn","useQueryDirect","usePermission","usePermissionDirect","zero","preload","getQuery","zeroEvents","ControlQueries","children","control","project","controlRunner","_args","from","projectRunner","runner","ambientRunner","resolves","toEqual","not","toHaveBeenCalled","request","mock","calls","query","queryName","toBe","ambient","toHaveBeenCalledTimes","toThrow","mdlThing","mutate","insert","a","b","options","seenByB","listen","event","push","emit","type","message","value","clientID","insertSpy","updateSpy","fzUser","userID","fzTask","update","combined","toHaveBeenCalledWith","unknownNs","userQuery","taskQuery","anonymous","aQuery","bQuery","inner","seen","messageOf","map"],"sources":["../../src/multiInstance.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["createSchema","string","table","createEmitter","describe","expect","test","vi","combineZeroClients","createZeroClient","runWithContext","getInstanceForNamespace","registerClientInstance","registerQuery","run","setRunner","zql","userTable","columns","id","name","primaryKey","taskTable","title","schema","tables","makeQueryFn","args","makeClient","instanceName","namespace","byId","client","models","groupedQueries","fakeClient","namespaces","zeroStub","customQueries","useQuery","fn","useQueryDirect","usePermission","usePermissionDirect","zero","preload","getQuery","zeroEvents","ControlQueries","children","control","project","controlRunner","_args","from","projectRunner","runner","ambientRunner","resolves","toEqual","not","toHaveBeenCalled","request","mock","calls","query","queryName","toBe","ownerRunner","txRun","authData","environment","can","tx","rejects","toThrow","toHaveBeenCalledTimes","user","where","toHaveBeenCalledWith","ambient","mdlThing","mutate","insert","a","b","options","seenByB","listen","event","push","emit","type","message","value","clientID","insertSpy","updateSpy","fzUser","userID","fzTask","update","combined","unknownNs","userQuery","taskQuery","anonymous","aQuery","bQuery","inner","seen","messageOf","map"],"sources":["../../src/multiInstance.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -3,10 +3,12 @@ import { createEmitter } from "@take-out/helpers";
|
|
|
3
3
|
import { describe, expect, test, vi } from "vitest";
|
|
4
4
|
import { combineZeroClients } from "./combineZeroClients.native.js";
|
|
5
5
|
import { createZeroClient } from "./createZeroClient.native.js";
|
|
6
|
+
import { runWithContext } from "./helpers/mutatorContext.native.js";
|
|
6
7
|
import { getInstanceForNamespace, registerClientInstance } from "./instanceRegistry.native.js";
|
|
7
8
|
import { registerQuery } from "./queryRegistry.native.js";
|
|
8
9
|
import { run } from "./run.native.js";
|
|
9
10
|
import { setRunner } from "./zeroRunner.native.js";
|
|
11
|
+
import { zql } from "./zql.native.js";
|
|
10
12
|
var userTable = table("user").columns({
|
|
11
13
|
id: string(),
|
|
12
14
|
name: string()
|
|
@@ -121,6 +123,115 @@ describe("multi-instance namespace dispatch", function () {
|
|
|
121
123
|
var request = controlRunner.mock.calls[0][0];
|
|
122
124
|
expect(request.query.queryName).toBe("runUser.byId");
|
|
123
125
|
});
|
|
126
|
+
test("run() rejects named queries inside server mutation context", async function () {
|
|
127
|
+
var {
|
|
128
|
+
byId
|
|
129
|
+
} = makeClient("run-ctx-owner", "runCtxThing");
|
|
130
|
+
var ownerRunner = vi.fn(async function () {
|
|
131
|
+
for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
132
|
+
_args[_key] = arguments[_key];
|
|
133
|
+
}
|
|
134
|
+
return {
|
|
135
|
+
from: "owner"
|
|
136
|
+
};
|
|
137
|
+
});
|
|
138
|
+
getInstanceForNamespace("runCtxThing").runner = ownerRunner;
|
|
139
|
+
var txRun = vi.fn(async function () {
|
|
140
|
+
for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
141
|
+
_args[_key] = arguments[_key];
|
|
142
|
+
}
|
|
143
|
+
return {
|
|
144
|
+
from: "tx"
|
|
145
|
+
};
|
|
146
|
+
});
|
|
147
|
+
await expect(runWithContext({
|
|
148
|
+
authData: null,
|
|
149
|
+
environment: "server",
|
|
150
|
+
can: async function () {},
|
|
151
|
+
tx: {
|
|
152
|
+
run: txRun
|
|
153
|
+
}
|
|
154
|
+
}, function () {
|
|
155
|
+
return run(byId, {
|
|
156
|
+
id: "1"
|
|
157
|
+
});
|
|
158
|
+
})).rejects.toThrow(/run\(namedQuery\) cannot be used inside a Zero mutation/);
|
|
159
|
+
expect(ownerRunner).not.toHaveBeenCalled();
|
|
160
|
+
expect(txRun).not.toHaveBeenCalled();
|
|
161
|
+
});
|
|
162
|
+
test("run() keeps named queries on their owning client runner when browser context leaks", async function () {
|
|
163
|
+
var {
|
|
164
|
+
byId
|
|
165
|
+
} = makeClient("run-client-leak-owner", "runClientLeakThing");
|
|
166
|
+
var ownerRunner = vi.fn(async function () {
|
|
167
|
+
for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
168
|
+
_args[_key] = arguments[_key];
|
|
169
|
+
}
|
|
170
|
+
return {
|
|
171
|
+
from: "owner"
|
|
172
|
+
};
|
|
173
|
+
});
|
|
174
|
+
getInstanceForNamespace("runClientLeakThing").runner = ownerRunner;
|
|
175
|
+
var txRun = vi.fn(async function () {
|
|
176
|
+
for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
177
|
+
_args[_key] = arguments[_key];
|
|
178
|
+
}
|
|
179
|
+
return {
|
|
180
|
+
from: "tx"
|
|
181
|
+
};
|
|
182
|
+
});
|
|
183
|
+
await expect(runWithContext({
|
|
184
|
+
authData: null,
|
|
185
|
+
environment: "client",
|
|
186
|
+
can: async function () {},
|
|
187
|
+
tx: {
|
|
188
|
+
run: txRun
|
|
189
|
+
}
|
|
190
|
+
}, function () {
|
|
191
|
+
return run(byId, {
|
|
192
|
+
id: "1"
|
|
193
|
+
});
|
|
194
|
+
})).resolves.toEqual({
|
|
195
|
+
from: "owner"
|
|
196
|
+
});
|
|
197
|
+
expect(ownerRunner).toHaveBeenCalledTimes(1);
|
|
198
|
+
expect(txRun).not.toHaveBeenCalled();
|
|
199
|
+
});
|
|
200
|
+
test("run() keeps inline zql on the active transaction runner", async function () {
|
|
201
|
+
makeClient("run-inline-context", "runInlineThing");
|
|
202
|
+
var ambientRunner = vi.fn(async function () {
|
|
203
|
+
for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
204
|
+
_args[_key] = arguments[_key];
|
|
205
|
+
}
|
|
206
|
+
return {
|
|
207
|
+
from: "ambient"
|
|
208
|
+
};
|
|
209
|
+
});
|
|
210
|
+
setRunner(ambientRunner);
|
|
211
|
+
var txRun = vi.fn(async function () {
|
|
212
|
+
for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
213
|
+
_args[_key] = arguments[_key];
|
|
214
|
+
}
|
|
215
|
+
return {
|
|
216
|
+
from: "tx"
|
|
217
|
+
};
|
|
218
|
+
});
|
|
219
|
+
var query = zql.user.where("id", "1");
|
|
220
|
+
await expect(runWithContext({
|
|
221
|
+
authData: null,
|
|
222
|
+
environment: "client",
|
|
223
|
+
can: async function () {},
|
|
224
|
+
tx: {
|
|
225
|
+
run: txRun
|
|
226
|
+
}
|
|
227
|
+
}, function () {
|
|
228
|
+
return run(query);
|
|
229
|
+
})).resolves.toEqual({
|
|
230
|
+
from: "tx"
|
|
231
|
+
});
|
|
232
|
+
expect(txRun).toHaveBeenCalledWith(query, void 0);
|
|
233
|
+
expect(ambientRunner).not.toHaveBeenCalled();
|
|
234
|
+
});
|
|
124
235
|
test("a claimed namespace with an unmounted instance uses the ambient runner (server path)", async function () {
|
|
125
236
|
var {
|
|
126
237
|
byId
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createSchema","string","table","createEmitter","describe","expect","test","vi","combineZeroClients","createZeroClient","getInstanceForNamespace","registerClientInstance","registerQuery","run","setRunner","userTable","columns","id","name","primaryKey","taskTable","title","schema","tables","makeQueryFn","args","makeClient","instanceName","namespace","byId","client","models","groupedQueries","fakeClient","namespaces","zeroStub","customQueries","useQuery","fn","useQueryDirect","usePermission","usePermissionDirect","zero","preload","getQuery","zeroEvents","ControlQueries","param","children","control","project","controlRunner","_len","arguments","length","_args","Array","_key","from","projectRunner","runner","ambientRunner","resolves","toEqual","not","toHaveBeenCalled","request","mock","calls","query","queryName","toBe","
|
|
1
|
+
{"version":3,"names":["createSchema","string","table","createEmitter","describe","expect","test","vi","combineZeroClients","createZeroClient","runWithContext","getInstanceForNamespace","registerClientInstance","registerQuery","run","setRunner","zql","userTable","columns","id","name","primaryKey","taskTable","title","schema","tables","makeQueryFn","args","makeClient","instanceName","namespace","byId","client","models","groupedQueries","fakeClient","namespaces","zeroStub","customQueries","useQuery","fn","useQueryDirect","usePermission","usePermissionDirect","zero","preload","getQuery","zeroEvents","ControlQueries","param","children","control","project","controlRunner","_len","arguments","length","_args","Array","_key","from","projectRunner","runner","ambientRunner","resolves","toEqual","not","toHaveBeenCalled","request","mock","calls","query","queryName","toBe","ownerRunner","txRun","authData","environment","can","tx","rejects","toThrow","toHaveBeenCalledTimes","user","where","toHaveBeenCalledWith","ambient","_getInstanceForNamespace","mdlThing","mutate","insert"],"sources":["../../src/multiInstance.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/esm/run.mjs
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { getInstanceForQueryFn } from "./instanceRegistry.mjs";
|
|
2
2
|
import { resolveQuery } from "./resolveQuery.mjs";
|
|
3
|
-
import {
|
|
3
|
+
import { isInZeroMutation, mutatorContext } from "./helpers/mutatorContext.mjs";
|
|
4
|
+
import { getAmbientRunner, getRunner } from "./zeroRunner.mjs";
|
|
4
5
|
let customQueriesRef = null;
|
|
5
6
|
function setCustomQueries(queries) {
|
|
6
7
|
customQueriesRef = queries;
|
|
@@ -21,6 +22,10 @@ function run(queryOrFn, paramsOrMode, modeArg) {
|
|
|
21
22
|
if (queryOrFn && queryOrFn["ast"]) {
|
|
22
23
|
return getRunner()(queryOrFn, options);
|
|
23
24
|
}
|
|
25
|
+
const inMutation = isInZeroMutation();
|
|
26
|
+
if (inMutation && mutatorContext().environment === "server") {
|
|
27
|
+
throw new Error("run(namedQuery) cannot be used inside a Zero mutation. Use tx.run(zql...) for transactional mutation reads.");
|
|
28
|
+
}
|
|
24
29
|
const instance = getInstanceForQueryFn(queryOrFn);
|
|
25
30
|
const customQueries = instance?.customQueries ?? getCustomQueries();
|
|
26
31
|
const queryRequest = resolveQuery({
|
|
@@ -28,7 +33,7 @@ function run(queryOrFn, paramsOrMode, modeArg) {
|
|
|
28
33
|
fn: queryOrFn,
|
|
29
34
|
params
|
|
30
35
|
});
|
|
31
|
-
return
|
|
36
|
+
return getAmbientRunner(instance)(queryRequest, options);
|
|
32
37
|
}
|
|
33
38
|
export { run, setCustomQueries };
|
|
34
39
|
//# sourceMappingURL=run.mjs.map
|
package/dist/esm/run.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["getInstanceForQueryFn","resolveQuery","getRunner","customQueriesRef","setCustomQueries","queries","getCustomQueries","Error","run","queryOrFn","paramsOrMode","modeArg","hasParams","params","mode","options","type","instance","customQueries","queryRequest","fn"],"sources":["../../src/run.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,qBAAA,QAA6B;AACtC,SAASC,YAAA,QAAuC;AAChD,SAASC,SAAA,QAAiB;
|
|
1
|
+
{"version":3,"names":["getInstanceForQueryFn","resolveQuery","isInZeroMutation","mutatorContext","getAmbientRunner","getRunner","customQueriesRef","setCustomQueries","queries","getCustomQueries","Error","run","queryOrFn","paramsOrMode","modeArg","hasParams","params","mode","options","type","inMutation","environment","instance","customQueries","queryRequest","fn"],"sources":["../../src/run.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,qBAAA,QAA6B;AACtC,SAASC,YAAA,QAAuC;AAChD,SAASC,gBAAA,EAAkBC,cAAA,QAAsB;AACjD,SAASC,gBAAA,EAAkBC,SAAA,QAAiB;AAS5C,IAAIC,gBAAA,GAA4C;AAEzC,SAASC,iBAAiBC,OAAA,EAA2B;EAC1DF,gBAAA,GAAmBE,OAAA;AACrB;AAEA,SAASC,iBAAA,EAAqC;EAC5C,IAAI,CAACH,gBAAA,EAAkB;IACrB,MAAM,IAAII,KAAA,CACR,8FACF;EACF;EACA,OAAOJ,gBAAA;AACT;AAiCO,SAASK,IACdC,SAAA,EACAC,YAAA,EACAC,OAAA,EACc;EACd,MAAMC,SAAA,GAAYD,OAAA,KAAY,UAAcD,YAAA,IAAgBA,YAAA,KAAiB;EAC7E,MAAMG,MAAA,GAASD,SAAA,GAAYF,YAAA,GAAe;EAC1C,MAAMI,IAAA,GAAOF,SAAA,GAAYD,OAAA,GAAUD,YAAA;EACnC,MAAMK,OAAA,GACJD,IAAA,KAAS,aACJ;IACCE,IAAA,EAAM;EACR,IACA;EAEN,IAAIP,SAAA,IAAaA,SAAA,CAAU,KAAK,GAAG;IAEjC,OAAOP,SAAA,CAAU,EAAEO,SAAA,EAAWM,OAAO;EACvC;EAEA,MAAME,UAAA,GAAalB,gBAAA,CAAiB;EACpC,IAAIkB,UAAA,IAAcjB,cAAA,CAAe,EAAEkB,WAAA,KAAgB,UAAU;IAC3D,MAAM,IAAIX,KAAA,CACR,6GACF;EACF;EAIA,MAAMY,QAAA,GAAWtB,qBAAA,CAAsBY,SAAS;EAChD,MAAMW,aAAA,GAAgBD,QAAA,EAAUC,aAAA,IAAiBd,gBAAA,CAAiB;EAClE,MAAMe,YAAA,GAAevB,YAAA,CAAa;IAAEsB,aAAA;IAAeE,EAAA,EAAIb,SAAA;IAAWI;EAAO,CAAC;EAE1E,OAAOZ,gBAAA,CAAiBkB,QAAQ,EAAEE,YAAA,EAAqBN,OAAO;AAChE","ignoreList":[]}
|
package/dist/esm/run.native.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { getInstanceForQueryFn } from "./instanceRegistry.native.js";
|
|
2
2
|
import { resolveQuery } from "./resolveQuery.native.js";
|
|
3
|
-
import {
|
|
3
|
+
import { isInZeroMutation, mutatorContext } from "./helpers/mutatorContext.native.js";
|
|
4
|
+
import { getAmbientRunner, getRunner } from "./zeroRunner.native.js";
|
|
4
5
|
var customQueriesRef = null;
|
|
5
6
|
function setCustomQueries(queries) {
|
|
6
7
|
customQueriesRef = queries;
|
|
@@ -21,6 +22,10 @@ function run(queryOrFn, paramsOrMode, modeArg) {
|
|
|
21
22
|
if (queryOrFn && queryOrFn["ast"]) {
|
|
22
23
|
return getRunner()(queryOrFn, options);
|
|
23
24
|
}
|
|
25
|
+
var inMutation = isInZeroMutation();
|
|
26
|
+
if (inMutation && mutatorContext().environment === "server") {
|
|
27
|
+
throw new Error("run(namedQuery) cannot be used inside a Zero mutation. Use tx.run(zql...) for transactional mutation reads.");
|
|
28
|
+
}
|
|
24
29
|
var instance = getInstanceForQueryFn(queryOrFn);
|
|
25
30
|
var _instance_customQueries;
|
|
26
31
|
var customQueries = (_instance_customQueries = instance === null || instance === void 0 ? void 0 : instance.customQueries) !== null && _instance_customQueries !== void 0 ? _instance_customQueries : getCustomQueries();
|
|
@@ -29,7 +34,7 @@ function run(queryOrFn, paramsOrMode, modeArg) {
|
|
|
29
34
|
fn: queryOrFn,
|
|
30
35
|
params
|
|
31
36
|
});
|
|
32
|
-
return
|
|
37
|
+
return getAmbientRunner(instance)(queryRequest, options);
|
|
33
38
|
}
|
|
34
39
|
export { run, setCustomQueries };
|
|
35
40
|
//# sourceMappingURL=run.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["getInstanceForQueryFn","resolveQuery","getRunner","customQueriesRef","setCustomQueries","queries","getCustomQueries","Error","run","queryOrFn","paramsOrMode","modeArg","hasParams","params","mode","options","type","instance","_instance_customQueries","customQueries","queryRequest","fn"],"sources":["../../src/run.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,qBAAA,QAA6B;AACtC,SAASC,YAAA,QAAuC;AAChD,SAASC,SAAA,QAAiB;
|
|
1
|
+
{"version":3,"names":["getInstanceForQueryFn","resolveQuery","isInZeroMutation","mutatorContext","getAmbientRunner","getRunner","customQueriesRef","setCustomQueries","queries","getCustomQueries","Error","run","queryOrFn","paramsOrMode","modeArg","hasParams","params","mode","options","type","inMutation","environment","instance","_instance_customQueries","customQueries","queryRequest","fn"],"sources":["../../src/run.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,qBAAA,QAA6B;AACtC,SAASC,YAAA,QAAuC;AAChD,SAASC,gBAAA,EAAkBC,cAAA,QAAsB;AACjD,SAASC,gBAAA,EAAkBC,SAAA,QAAiB;AAS5C,IAAIC,gBAAA,GAA4C;AAEzC,SAASC,iBAAiBC,OAAA,EAA2B;EAC1DF,gBAAA,GAAmBE,OAAA;AACrB;AAEA,SAASC,iBAAA,EAAqC;EAC5C,IAAI,CAACH,gBAAA,EAAkB;IACrB,MAAM,IAAII,KAAA;EAAA;EACR,OACFJ,gBAAA;AAAA;AAEF,SAAOK,IAAAC,SAAA,EAAAC,YAAA,EAAAC,OAAA;EACT,IAAAC,SAAA,GAAAD,OAAA,eAAAD,YAAA,IAAAA,YAAA;EAiCO,IAAAG,MAAS,GACdD,SACA,GAAAF,YACA,QACc;EACd,IAAAI,IAAM,GAAAF,SAAY,GAAAD,OAAY,GAAAD,YAAc;EAC5C,IAAAK,OAAM,GAAAD,IAAS,eAAY;IAC3BE,IAAM;EACN,SAAM;EAEC,IACCP,SAAM,IAAAA,SAAA;IACR,OACAP,SAAA,GAAAO,SAAA,EAAAM,OAAA;EAEN;EAEE,IAAAE,UAAO,GAAAlB,gBAAuB;EAChC,IAAAkB,UAAA,IAAAjB,cAAA,GAAAkB,WAAA;IAEA,MAAM,IAAAX,KAAA,8GAA8B;EACpC;EACE,IAAAY,QAAU,GAAAtB,qBAAA,CAAAY,SAAA;EAAA,IACRW,uBAAA;EAAA,IACFC,aAAA,IAAAD,uBAAA,GAAAD,QAAA,aAAAA,QAAA,uBAAAA,QAAA,CAAAE,aAAA,cAAAD,uBAAA,cAAAA,uBAAA,GAAAd,gBAAA;EACF,IAAAgB,YAAA,GAAAxB,YAAA;IAIAuB,aAAM;IACNE,EAAA,EAAMd,SAAA;IACNI;EAEA;EACF,OAAAZ,gBAAA,CAAAkB,QAAA,EAAAG,YAAA,EAAAP,OAAA","ignoreList":[]}
|
package/dist/esm/zeroRunner.mjs
CHANGED
|
@@ -7,6 +7,9 @@ function getRunner(instance) {
|
|
|
7
7
|
if (isInZeroMutation()) {
|
|
8
8
|
return (q, o) => mutatorContext().tx.run(q, o);
|
|
9
9
|
}
|
|
10
|
+
return getAmbientRunner(instance);
|
|
11
|
+
}
|
|
12
|
+
function getAmbientRunner(instance) {
|
|
10
13
|
if (instance?.runner) {
|
|
11
14
|
return instance.runner;
|
|
12
15
|
}
|
|
@@ -15,5 +18,5 @@ function getRunner(instance) {
|
|
|
15
18
|
}
|
|
16
19
|
return runner;
|
|
17
20
|
}
|
|
18
|
-
export { getRunner, setRunner };
|
|
21
|
+
export { getAmbientRunner, getRunner, setRunner };
|
|
19
22
|
//# sourceMappingURL=zeroRunner.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["isInZeroMutation","mutatorContext","runner","setRunner","r","getRunner","instance","q","o","tx","run","Error"],"sources":["../../src/zeroRunner.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,EAAkBC,cAAA,QAAsB;AAgBjD,IAAIC,MAAA,GAA4B;AAEzB,SAASC,UAAUC,CAAA,EAAe;EACvCF,MAAA,GAASE,CAAA;AACX;AAEO,SAASC,UAAUC,QAAA,EAAsD;EAC9E,IAAIN,gBAAA,CAAiB,GAAG;IACtB,OAAO,CAACO,CAAA,EAAGC,CAAA,KAAMP,cAAA,CAAe,EAAEQ,EAAA,CAAGC,GAAA,CAAIH,CAAA,EAAGC,CAAC;EAC/C;
|
|
1
|
+
{"version":3,"names":["isInZeroMutation","mutatorContext","runner","setRunner","r","getRunner","instance","q","o","tx","run","getAmbientRunner","Error"],"sources":["../../src/zeroRunner.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,EAAkBC,cAAA,QAAsB;AAgBjD,IAAIC,MAAA,GAA4B;AAEzB,SAASC,UAAUC,CAAA,EAAe;EACvCF,MAAA,GAASE,CAAA;AACX;AAEO,SAASC,UAAUC,QAAA,EAAsD;EAC9E,IAAIN,gBAAA,CAAiB,GAAG;IACtB,OAAO,CAACO,CAAA,EAAGC,CAAA,KAAMP,cAAA,CAAe,EAAEQ,EAAA,CAAGC,GAAA,CAAIH,CAAA,EAAGC,CAAC;EAC/C;EAEA,OAAOG,gBAAA,CAAiBL,QAAQ;AAClC;AAEO,SAASK,iBAAiBL,QAAA,EAAsD;EAGrF,IAAIA,QAAA,EAAUJ,MAAA,EAAQ;IACpB,OAAOI,QAAA,CAASJ,MAAA;EAClB;EAEA,IAAI,CAACA,MAAA,EAAQ;IACX,MAAM,IAAIU,KAAA,CACR,6GACF;EACF;EAEA,OAAOV,MAAA;AACT","ignoreList":[]}
|
|
@@ -9,6 +9,9 @@ function getRunner(instance) {
|
|
|
9
9
|
return mutatorContext().tx.run(q, o);
|
|
10
10
|
};
|
|
11
11
|
}
|
|
12
|
+
return getAmbientRunner(instance);
|
|
13
|
+
}
|
|
14
|
+
function getAmbientRunner(instance) {
|
|
12
15
|
if (instance === null || instance === void 0 ? void 0 : instance.runner) {
|
|
13
16
|
return instance.runner;
|
|
14
17
|
}
|
|
@@ -17,5 +20,5 @@ function getRunner(instance) {
|
|
|
17
20
|
}
|
|
18
21
|
return runner;
|
|
19
22
|
}
|
|
20
|
-
export { getRunner, setRunner };
|
|
23
|
+
export { getAmbientRunner, getRunner, setRunner };
|
|
21
24
|
//# sourceMappingURL=zeroRunner.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["isInZeroMutation","mutatorContext","runner","setRunner","r","getRunner","instance","q","o","tx","run","Error"],"sources":["../../src/zeroRunner.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,EAAkBC,cAAA,QAAsB;AAgBjD,IAAIC,MAAA,GAA4B;AAEzB,SAASC,UAAUC,CAAA,EAAe;EACvCF,MAAA,GAASE,CAAA;AACX;AAEO,SAASC,UAAUC,QAAA,EAAsD;EAC9E,IAAIN,gBAAA,CAAiB,GAAG;IACtB,OAAO,UAAIO,CAAM,EAAAC,CAAA;MACnB,OAAAP,cAAA,GAAAQ,EAAA,CAAAC,GAAA,CAAAH,CAAA,EAAAC,CAAA;
|
|
1
|
+
{"version":3,"names":["isInZeroMutation","mutatorContext","runner","setRunner","r","getRunner","instance","q","o","tx","run","getAmbientRunner","Error"],"sources":["../../src/zeroRunner.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,EAAkBC,cAAA,QAAsB;AAgBjD,IAAIC,MAAA,GAA4B;AAEzB,SAASC,UAAUC,CAAA,EAAe;EACvCF,MAAA,GAASE,CAAA;AACX;AAEO,SAASC,UAAUC,QAAA,EAAsD;EAC9E,IAAIN,gBAAA,CAAiB,GAAG;IACtB,OAAO,UAAIO,CAAM,EAAAC,CAAA;MACnB,OAAAP,cAAA,GAAAQ,EAAA,CAAAC,GAAA,CAAAH,CAAA,EAAAC,CAAA;IAEA;EACF;EAEO,OAASG,gBAAA,CAAiBL,QAAA;AAG/B;AACE,SAAAK,gBAAgBA,CAAAL,QAAA;EAClB,IAAAA,QAAA,aAAAA,QAAA,uBAAAA,QAAA,CAAAJ,MAAA;IAEA,OAAKI,QAAQ,CAAAJ,MAAA;EACX;EAAU,IACR,CAAAA,MAAA;IACF,UAAAU,KAAA;EACF;EAEA,OAAOV,MAAA;AACT","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "on-zero",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.36",
|
|
4
4
|
"description": "A typed layer over @rocicorp/zero with queries, mutations, and permissions",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"source": "src/index.ts",
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
}
|
|
78
78
|
},
|
|
79
79
|
"dependencies": {
|
|
80
|
-
"@take-out/helpers": "0.4.
|
|
80
|
+
"@take-out/helpers": "0.4.36",
|
|
81
81
|
"chokidar": "^4.0.3",
|
|
82
82
|
"citty": "^0.1.6",
|
|
83
83
|
"valibot": "^1.1.0"
|
|
@@ -4,10 +4,12 @@ import { describe, expect, test, vi } from 'vitest'
|
|
|
4
4
|
|
|
5
5
|
import { combineZeroClients } from './combineZeroClients'
|
|
6
6
|
import { createZeroClient } from './createZeroClient'
|
|
7
|
+
import { runWithContext } from './helpers/mutatorContext'
|
|
7
8
|
import { getInstanceForNamespace, registerClientInstance } from './instanceRegistry'
|
|
8
9
|
import { registerQuery } from './queryRegistry'
|
|
9
10
|
import { run } from './run'
|
|
10
11
|
import { setRunner, type ZeroRunner } from './zeroRunner'
|
|
12
|
+
import { zql } from './zql'
|
|
11
13
|
|
|
12
14
|
import type { ZeroEvent } from './types'
|
|
13
15
|
import type { AnyQueryRegistry, Query } from '@rocicorp/zero'
|
|
@@ -89,6 +91,73 @@ describe('multi-instance namespace dispatch', () => {
|
|
|
89
91
|
expect(request.query.queryName).toBe('runUser.byId')
|
|
90
92
|
})
|
|
91
93
|
|
|
94
|
+
test('run() rejects named queries inside server mutation context', async () => {
|
|
95
|
+
const { byId } = makeClient('run-ctx-owner', 'runCtxThing')
|
|
96
|
+
const ownerRunner = vi.fn(async (..._args: unknown[]) => ({ from: 'owner' }))
|
|
97
|
+
getInstanceForNamespace('runCtxThing')!.runner = ownerRunner as ZeroRunner
|
|
98
|
+
const txRun = vi.fn(async (..._args: unknown[]) => ({ from: 'tx' }))
|
|
99
|
+
|
|
100
|
+
await expect(
|
|
101
|
+
runWithContext(
|
|
102
|
+
{
|
|
103
|
+
authData: null,
|
|
104
|
+
environment: 'server',
|
|
105
|
+
can: async () => {},
|
|
106
|
+
tx: { run: txRun },
|
|
107
|
+
} as any,
|
|
108
|
+
() => run(byId, { id: '1' }),
|
|
109
|
+
),
|
|
110
|
+
).rejects.toThrow(/run\(namedQuery\) cannot be used inside a Zero mutation/)
|
|
111
|
+
|
|
112
|
+
expect(ownerRunner).not.toHaveBeenCalled()
|
|
113
|
+
expect(txRun).not.toHaveBeenCalled()
|
|
114
|
+
})
|
|
115
|
+
|
|
116
|
+
test('run() keeps named queries on their owning client runner when browser context leaks', async () => {
|
|
117
|
+
const { byId } = makeClient('run-client-leak-owner', 'runClientLeakThing')
|
|
118
|
+
const ownerRunner = vi.fn(async (..._args: unknown[]) => ({ from: 'owner' }))
|
|
119
|
+
getInstanceForNamespace('runClientLeakThing')!.runner = ownerRunner as ZeroRunner
|
|
120
|
+
const txRun = vi.fn(async (..._args: unknown[]) => ({ from: 'tx' }))
|
|
121
|
+
|
|
122
|
+
await expect(
|
|
123
|
+
runWithContext(
|
|
124
|
+
{
|
|
125
|
+
authData: null,
|
|
126
|
+
environment: 'client',
|
|
127
|
+
can: async () => {},
|
|
128
|
+
tx: { run: txRun },
|
|
129
|
+
} as any,
|
|
130
|
+
() => run(byId, { id: '1' }),
|
|
131
|
+
),
|
|
132
|
+
).resolves.toEqual({ from: 'owner' })
|
|
133
|
+
|
|
134
|
+
expect(ownerRunner).toHaveBeenCalledTimes(1)
|
|
135
|
+
expect(txRun).not.toHaveBeenCalled()
|
|
136
|
+
})
|
|
137
|
+
|
|
138
|
+
test('run() keeps inline zql on the active transaction runner', async () => {
|
|
139
|
+
makeClient('run-inline-context', 'runInlineThing')
|
|
140
|
+
const ambientRunner = vi.fn(async (..._args: unknown[]) => ({ from: 'ambient' }))
|
|
141
|
+
setRunner(ambientRunner as ZeroRunner)
|
|
142
|
+
const txRun = vi.fn(async (..._args: unknown[]) => ({ from: 'tx' }))
|
|
143
|
+
const query = zql.user.where('id', '1')
|
|
144
|
+
|
|
145
|
+
await expect(
|
|
146
|
+
runWithContext(
|
|
147
|
+
{
|
|
148
|
+
authData: null,
|
|
149
|
+
environment: 'client',
|
|
150
|
+
can: async () => {},
|
|
151
|
+
tx: { run: txRun },
|
|
152
|
+
} as any,
|
|
153
|
+
() => run(query),
|
|
154
|
+
),
|
|
155
|
+
).resolves.toEqual({ from: 'tx' })
|
|
156
|
+
|
|
157
|
+
expect(txRun).toHaveBeenCalledWith(query, undefined)
|
|
158
|
+
expect(ambientRunner).not.toHaveBeenCalled()
|
|
159
|
+
})
|
|
160
|
+
|
|
92
161
|
test('a claimed namespace with an unmounted instance uses the ambient runner (server path)', async () => {
|
|
93
162
|
const { byId } = makeClient('srv-instance', 'srvThing')
|
|
94
163
|
const ambient = vi.fn(async (..._args: unknown[]) => ({ from: 'ambient' }))
|
package/src/run.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { getInstanceForQueryFn } from './instanceRegistry'
|
|
2
2
|
import { resolveQuery, type PlainQueryFn } from './resolveQuery'
|
|
3
|
-
import {
|
|
3
|
+
import { isInZeroMutation, mutatorContext } from './helpers/mutatorContext'
|
|
4
|
+
import { getAmbientRunner, getRunner } from './zeroRunner'
|
|
4
5
|
|
|
5
6
|
import type {
|
|
6
7
|
AnyQueryRegistry,
|
|
@@ -75,11 +76,18 @@ export function run(
|
|
|
75
76
|
return getRunner()(queryOrFn, options)
|
|
76
77
|
}
|
|
77
78
|
|
|
79
|
+
const inMutation = isInZeroMutation()
|
|
80
|
+
if (inMutation && mutatorContext().environment === 'server') {
|
|
81
|
+
throw new Error(
|
|
82
|
+
'run(namedQuery) cannot be used inside a Zero mutation. Use tx.run(zql...) for transactional mutation reads.',
|
|
83
|
+
)
|
|
84
|
+
}
|
|
85
|
+
|
|
78
86
|
// with multiple client instances mounted, a named query executes against
|
|
79
87
|
// the instance that claimed its namespace, not whichever mounted last
|
|
80
88
|
const instance = getInstanceForQueryFn(queryOrFn)
|
|
81
89
|
const customQueries = instance?.customQueries ?? getCustomQueries()
|
|
82
90
|
const queryRequest = resolveQuery({ customQueries, fn: queryOrFn, params })
|
|
83
91
|
|
|
84
|
-
return
|
|
92
|
+
return getAmbientRunner(instance)(queryRequest as any, options)
|
|
85
93
|
}
|
package/src/zeroRunner.ts
CHANGED
|
@@ -25,6 +25,10 @@ export function getRunner(instance?: { runner: ZeroRunner | null }): ZeroRunner
|
|
|
25
25
|
return (q, o) => mutatorContext().tx.run(q, o)
|
|
26
26
|
}
|
|
27
27
|
|
|
28
|
+
return getAmbientRunner(instance)
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export function getAmbientRunner(instance?: { runner: ZeroRunner | null }): ZeroRunner {
|
|
28
32
|
// a mounted instance's own runner wins; otherwise the ambient runner
|
|
29
33
|
// (single-instance client, or the server transaction runner)
|
|
30
34
|
if (instance?.runner) {
|
package/types/run.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAIhE,OAAO,KAAK,EACV,gBAAgB,EAChB,aAAa,EACb,KAAK,EACL,MAAM,IAAI,UAAU,EACrB,MAAM,gBAAgB,CAAA;AAIvB,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,QAEzD;AAaD,wBAAgB,GAAG,CACjB,MAAM,SAAS,UAAU,EACzB,MAAM,SAAS,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC9C,OAAO,EAEP,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EACrC,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;AAElC,wBAAgB,GAAG,CACjB,MAAM,SAAS,UAAU,EACzB,IAAI,EACJ,MAAM,SAAS,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC9C,OAAO,EAEP,EAAE,EAAE,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,EACtD,MAAM,EAAE,IAAI,EACZ,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;AAElC,wBAAgB,GAAG,CACjB,MAAM,SAAS,UAAU,EACzB,MAAM,SAAS,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC9C,OAAO,EAEP,EAAE,EAAE,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,EACtD,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA"}
|
package/types/zeroRunner.d.ts
CHANGED
|
@@ -5,4 +5,7 @@ export declare function setRunner(r: ZeroRunner): void;
|
|
|
5
5
|
export declare function getRunner(instance?: {
|
|
6
6
|
runner: ZeroRunner | null;
|
|
7
7
|
}): ZeroRunner;
|
|
8
|
+
export declare function getAmbientRunner(instance?: {
|
|
9
|
+
runner: ZeroRunner | null;
|
|
10
|
+
}): ZeroRunner;
|
|
8
11
|
//# sourceMappingURL=zeroRunner.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zeroRunner.d.ts","sourceRoot":"","sources":["../src/zeroRunner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EACL,UAAU,EACV,MAAM,IAAI,UAAU,EACrB,MAAM,gBAAgB,CAAA;AAEvB,YAAY,EAAE,UAAU,EAAE,CAAA;AAE1B,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,EAC/B,KAAK,EAAE,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,EACtC,OAAO,CAAC,EAAE,UAAU,KACjB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;AAIpC,wBAAgB,SAAS,CAAC,CAAC,EAAE,UAAU,QAEtC;AAED,wBAAgB,SAAS,CAAC,QAAQ,CAAC,EAAE;IAAE,MAAM,EAAE,UAAU,GAAG,IAAI,CAAA;CAAE,GAAG,UAAU,
|
|
1
|
+
{"version":3,"file":"zeroRunner.d.ts","sourceRoot":"","sources":["../src/zeroRunner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EACL,UAAU,EACV,MAAM,IAAI,UAAU,EACrB,MAAM,gBAAgB,CAAA;AAEvB,YAAY,EAAE,UAAU,EAAE,CAAA;AAE1B,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,EAC/B,KAAK,EAAE,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,EACtC,OAAO,CAAC,EAAE,UAAU,KACjB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;AAIpC,wBAAgB,SAAS,CAAC,CAAC,EAAE,UAAU,QAEtC;AAED,wBAAgB,SAAS,CAAC,QAAQ,CAAC,EAAE;IAAE,MAAM,EAAE,UAAU,GAAG,IAAI,CAAA;CAAE,GAAG,UAAU,CAM9E;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,CAAC,EAAE;IAAE,MAAM,EAAE,UAAU,GAAG,IAAI,CAAA;CAAE,GAAG,UAAU,CAcrF"}
|