@nymphjs/nymph 1.0.0-beta.1 → 1.0.0-beta.2
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/CHANGELOG.md +6 -0
- package/dist/Nymph.js +19 -19
- package/dist/Nymph.js.map +1 -1
- package/dist/Nymph.types.d.ts +19 -19
- package/dist/Nymph.types.js.map +1 -1
- package/package.json +3 -3
- package/src/Nymph.ts +19 -19
- package/src/Nymph.types.ts +25 -19
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,12 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [1.0.0-beta.2](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.1...v1.0.0-beta.2) (2022-11-21)
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
- migrate all callbacks to async so errors are properly caught ([7dc8241](https://github.com/sciactive/nymphjs/commit/7dc82411eab381ad81ece044d0998b0c0707749c))
|
|
11
|
+
|
|
6
12
|
# [1.0.0-beta.1](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.0...v1.0.0-beta.1) (2022-11-21)
|
|
7
13
|
|
|
8
14
|
### Bug Fixes
|
package/dist/Nymph.js
CHANGED
|
@@ -102,7 +102,7 @@ class Nymph {
|
|
|
102
102
|
const result = this.driver.connect();
|
|
103
103
|
for (let callback of this.connectCallbacks) {
|
|
104
104
|
if (callback) {
|
|
105
|
-
callback(this, result);
|
|
105
|
+
await callback(this, result);
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
108
|
return await result;
|
|
@@ -111,7 +111,7 @@ class Nymph {
|
|
|
111
111
|
const result = this.driver.disconnect();
|
|
112
112
|
for (let callback of this.disconnectCallbacks) {
|
|
113
113
|
if (callback) {
|
|
114
|
-
callback(this, result);
|
|
114
|
+
await callback(this, result);
|
|
115
115
|
}
|
|
116
116
|
}
|
|
117
117
|
return await result;
|
|
@@ -119,7 +119,7 @@ class Nymph {
|
|
|
119
119
|
async runQueryCallbacks(options, selectors) {
|
|
120
120
|
for (let callback of this.queryCallbacks) {
|
|
121
121
|
if (callback) {
|
|
122
|
-
callback(this, options, selectors);
|
|
122
|
+
await callback(this, options, selectors);
|
|
123
123
|
}
|
|
124
124
|
}
|
|
125
125
|
}
|
|
@@ -138,13 +138,13 @@ class Nymph {
|
|
|
138
138
|
async newUID(name) {
|
|
139
139
|
for (let callback of this.beforeNewUIDCallbacks) {
|
|
140
140
|
if (callback) {
|
|
141
|
-
callback(this, name);
|
|
141
|
+
await callback(this, name);
|
|
142
142
|
}
|
|
143
143
|
}
|
|
144
144
|
const result = this.driver.newUID(name);
|
|
145
145
|
for (let callback of this.afterNewUIDCallbacks) {
|
|
146
146
|
if (callback) {
|
|
147
|
-
callback(this, result);
|
|
147
|
+
await callback(this, result);
|
|
148
148
|
}
|
|
149
149
|
}
|
|
150
150
|
return await result;
|
|
@@ -155,13 +155,13 @@ class Nymph {
|
|
|
155
155
|
async setUID(name, value) {
|
|
156
156
|
for (let callback of this.beforeSetUIDCallbacks) {
|
|
157
157
|
if (callback) {
|
|
158
|
-
callback(this, name, value);
|
|
158
|
+
await callback(this, name, value);
|
|
159
159
|
}
|
|
160
160
|
}
|
|
161
161
|
const result = this.driver.setUID(name, value);
|
|
162
162
|
for (let callback of this.afterSetUIDCallbacks) {
|
|
163
163
|
if (callback) {
|
|
164
|
-
callback(this, result);
|
|
164
|
+
await callback(this, result);
|
|
165
165
|
}
|
|
166
166
|
}
|
|
167
167
|
return await result;
|
|
@@ -169,13 +169,13 @@ class Nymph {
|
|
|
169
169
|
async deleteUID(name) {
|
|
170
170
|
for (let callback of this.beforeDeleteUIDCallbacks) {
|
|
171
171
|
if (callback) {
|
|
172
|
-
callback(this, name);
|
|
172
|
+
await callback(this, name);
|
|
173
173
|
}
|
|
174
174
|
}
|
|
175
175
|
const result = this.driver.deleteUID(name);
|
|
176
176
|
for (let callback of this.afterDeleteUIDCallbacks) {
|
|
177
177
|
if (callback) {
|
|
178
|
-
callback(this, result);
|
|
178
|
+
await callback(this, result);
|
|
179
179
|
}
|
|
180
180
|
}
|
|
181
181
|
return await result;
|
|
@@ -183,13 +183,13 @@ class Nymph {
|
|
|
183
183
|
async renameUID(oldName, newName) {
|
|
184
184
|
for (let callback of this.beforeRenameUIDCallbacks) {
|
|
185
185
|
if (callback) {
|
|
186
|
-
callback(this, oldName, newName);
|
|
186
|
+
await callback(this, oldName, newName);
|
|
187
187
|
}
|
|
188
188
|
}
|
|
189
189
|
const result = this.driver.renameUID(oldName, newName);
|
|
190
190
|
for (let callback of this.afterRenameUIDCallbacks) {
|
|
191
191
|
if (callback) {
|
|
192
|
-
callback(this, result);
|
|
192
|
+
await callback(this, result);
|
|
193
193
|
}
|
|
194
194
|
}
|
|
195
195
|
return await result;
|
|
@@ -197,13 +197,13 @@ class Nymph {
|
|
|
197
197
|
async saveEntity(entity) {
|
|
198
198
|
for (let callback of this.beforeSaveEntityCallbacks) {
|
|
199
199
|
if (callback) {
|
|
200
|
-
callback(this, entity);
|
|
200
|
+
await callback(this, entity);
|
|
201
201
|
}
|
|
202
202
|
}
|
|
203
203
|
const result = this.driver.saveEntity(entity);
|
|
204
204
|
for (let callback of this.afterSaveEntityCallbacks) {
|
|
205
205
|
if (callback) {
|
|
206
|
-
callback(this, result);
|
|
206
|
+
await callback(this, result);
|
|
207
207
|
}
|
|
208
208
|
}
|
|
209
209
|
return await result;
|
|
@@ -211,7 +211,7 @@ class Nymph {
|
|
|
211
211
|
async getEntities(options = {}, ...selectors) {
|
|
212
212
|
for (let callback of this.beforeGetEntitiesCallbacks) {
|
|
213
213
|
if (callback) {
|
|
214
|
-
callback(this, options, selectors);
|
|
214
|
+
await callback(this, options, selectors);
|
|
215
215
|
}
|
|
216
216
|
}
|
|
217
217
|
return await this.driver.getEntities(options, ...selectors);
|
|
@@ -223,7 +223,7 @@ class Nymph {
|
|
|
223
223
|
options.limit = 1;
|
|
224
224
|
for (let callback of this.beforeGetEntityCallbacks) {
|
|
225
225
|
if (callback) {
|
|
226
|
-
callback(this, options, selectors);
|
|
226
|
+
await callback(this, options, selectors);
|
|
227
227
|
}
|
|
228
228
|
}
|
|
229
229
|
const entities = await this.driver.getEntities(options, ...selectors);
|
|
@@ -238,13 +238,13 @@ class Nymph {
|
|
|
238
238
|
async deleteEntity(entity) {
|
|
239
239
|
for (let callback of this.beforeDeleteEntityCallbacks) {
|
|
240
240
|
if (callback) {
|
|
241
|
-
callback(this, entity);
|
|
241
|
+
await callback(this, entity);
|
|
242
242
|
}
|
|
243
243
|
}
|
|
244
244
|
const result = this.driver.deleteEntity(entity);
|
|
245
245
|
for (let callback of this.afterDeleteEntityCallbacks) {
|
|
246
246
|
if (callback) {
|
|
247
|
-
callback(this, result);
|
|
247
|
+
await callback(this, result);
|
|
248
248
|
}
|
|
249
249
|
}
|
|
250
250
|
return await result;
|
|
@@ -252,13 +252,13 @@ class Nymph {
|
|
|
252
252
|
async deleteEntityByID(guid, className) {
|
|
253
253
|
for (let callback of this.beforeDeleteEntityByIDCallbacks) {
|
|
254
254
|
if (callback) {
|
|
255
|
-
callback(this, guid, className);
|
|
255
|
+
await callback(this, guid, className);
|
|
256
256
|
}
|
|
257
257
|
}
|
|
258
258
|
const result = this.driver.deleteEntityByID(guid, className);
|
|
259
259
|
for (let callback of this.afterDeleteEntityByIDCallbacks) {
|
|
260
260
|
if (callback) {
|
|
261
|
-
callback(this, result);
|
|
261
|
+
await callback(this, result);
|
|
262
262
|
}
|
|
263
263
|
}
|
|
264
264
|
return await result;
|
package/dist/Nymph.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Nymph.js","sourceRoot":"","sources":["../src/Nymph.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Nymph.js","sourceRoot":"","sources":["../src/Nymph.ts"],"names":[],"mappings":";;;;;AAAA,iCAA4D;AAE5D,sDAA8B;AAE9B,qCAAkD;AAqClD,MAAqB,KAAK;IAgDjB,cAAc,CAAC,WAA8B;QAClD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC;QACpD,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC;IAC3B,CAAC;IAEM,cAAc,CAAC,SAAiB;QACrC,IAAI,SAAS,IAAI,IAAI,CAAC,aAAa,EAAE;YACnC,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAClD,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC;YACzB,OAAO,WAAW,CAAC;SACpB;QACD,MAAM,IAAI,+BAAsB,CAAC,sBAAsB,GAAG,SAAS,CAAC,CAAC;IACvE,CAAC;IASD,YACE,MAAuB,EACvB,MAAmB,EACnB,OAA0B;QA1DrB,YAAO,GAAsB,SAAS,CAAC;QAKtC,kBAAa,GAAuC,EAAE,CAAC;QAKxD,WAAM,GAAkB,gBAAM,CAAC;QAE9B,qBAAgB,GAA2B,EAAE,CAAC;QAC9C,wBAAmB,GAA8B,EAAE,CAAC;QACpD,mBAAc,GAAyB,EAAE,CAAC;QAC1C,6BAAwB,GAAmC,EAAE,CAAC;QAC9D,+BAA0B,GAAqC,EAAE,CAAC;QAClE,8BAAyB,GAAoC,EAAE,CAAC;QAChE,6BAAwB,GAAmC,EAAE,CAAC;QAC9D,gCAA2B,GAAsC,EAAE,CAAC;QACpE,+BAA0B,GAAqC,EAAE,CAAC;QAClE,oCAA+B,GACrC,EAAE,CAAC;QACG,mCAA8B,GACpC,EAAE,CAAC;QACG,0BAAqB,GAAgC,EAAE,CAAC;QACxD,yBAAoB,GAA+B,EAAE,CAAC;QACtD,0BAAqB,GAAgC,EAAE,CAAC;QACxD,yBAAoB,GAA+B,EAAE,CAAC;QACtD,6BAAwB,GAAmC,EAAE,CAAC;QAC9D,4BAAuB,GAAkC,EAAE,CAAC;QAC5D,6BAAwB,GAAmC,EAAE,CAAC;QAC9D,4BAAuB,GAAkC,EAAE,CAAC;QA4BlE,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,qBAAQ,EAAE,GAAG,MAAM,EAAE,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;YAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;SACxB;QAED,MAAM,WAA+C,SAAQ,gBAAS;SAAG;QACzE,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC;QAC1B,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAEjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;IAOM,KAAK;QACV,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACzE,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,aAAa,EAAE;YACrC,IAAI,IAAI,KAAK,QAAQ,IAAK,IAAI,CAAC,aAAa,CAAC,IAAI,CAAS,CAAC,WAAW,EAAE;gBACtE,SAAS;aACV;YACD,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;SAChD;QAED,MAAM,MAAM,GAAG;YACb,SAAS;YACT,YAAY;YACZ,OAAO;YACP,iBAAiB;YACjB,mBAAmB;YACnB,kBAAkB;YAClB,iBAAiB;YACjB,oBAAoB;YACpB,mBAAmB;YACnB,wBAAwB;YACxB,uBAAuB;YACvB,cAAc;YACd,aAAa;YACb,cAAc;YACd,aAAa;YACb,iBAAiB;YACjB,gBAAgB;YAChB,iBAAiB;YACjB,gBAAgB;SACjB,CAAC;QAEF,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;YACxB,MAAM,IAAI,GAAG,KAAK,GAAG,WAAW,CAAC;YAEjC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,KAAK,IAAI,QAAQ,IAAI,SAAS,EAAE;gBAC9B,IAAI,QAAQ,CAAC,WAAW,EAAE;oBACxB,SAAS;iBACV;gBACD,KAAK,CAAC,EAAE,CAAC,KAAuB,EAAE,QAAQ,CAAC,CAAC;aAC7C;SACF;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAOM,KAAK,CAAC,OAAO;QAClB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACrC,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,gBAAgB,EAAE;YAC1C,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAC9B;SACF;QACD,OAAO,MAAM,MAAM,CAAC;IACtB,CAAC;IAOM,KAAK,CAAC,UAAU;QACrB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACxC,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,mBAAmB,EAAE;YAC7C,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAC9B;SACF;QACD,OAAO,MAAM,MAAM,CAAC;IACtB,CAAC;IAKM,KAAK,CAAC,iBAAiB,CAC5B,OAAgB,EAChB,SAA8B;QAE9B,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,cAAc,EAAE;YACxC,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;aAC1C;SACF;IACH,CAAC;IAcM,KAAK,CAAC,gBAAgB,CAAC,IAAY;QACxC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAOM,KAAK,CAAC,MAAM,CAAC,IAAY;QAC9B,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAOM,KAAK,CAAC,QAAQ,CAAC,IAAY;QAChC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAOM,KAAK,CAAC,aAAa;QACxB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;IAC3C,CAAC;IAuBM,KAAK,CAAC,MAAM,CAAC,IAAY;QAC9B,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,qBAAqB,EAAE;YAC/C,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aAC5B;SACF;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACxC,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,oBAAoB,EAAE;YAC9C,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAC9B;SACF;QACD,OAAO,MAAM,MAAM,CAAC;IACtB,CAAC;IAOM,KAAK,CAAC,MAAM,CAAC,IAAY;QAC9B,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IASM,KAAK,CAAC,MAAM,CAAC,IAAY,EAAE,KAAa;QAC7C,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,qBAAqB,EAAE;YAC/C,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;aACnC;SACF;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC/C,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,oBAAoB,EAAE;YAC9C,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAC9B;SACF;QACD,OAAO,MAAM,MAAM,CAAC;IACtB,CAAC;IAQM,KAAK,CAAC,SAAS,CAAC,IAAY;QACjC,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,wBAAwB,EAAE;YAClD,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aAC5B;SACF;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC3C,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,uBAAuB,EAAE;YACjD,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAC9B;SACF;QACD,OAAO,MAAM,MAAM,CAAC;IACtB,CAAC;IASM,KAAK,CAAC,SAAS,CAAC,OAAe,EAAE,OAAe;QACrD,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,wBAAwB,EAAE;YAClD,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;aACxC;SACF;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACvD,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,uBAAuB,EAAE;YACjD,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAC9B;SACF;QACD,OAAO,MAAM,MAAM,CAAC;IACtB,CAAC;IAaM,KAAK,CAAC,UAAU,CAAC,MAAuB;QAC7C,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,yBAAyB,EAAE;YACnD,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAC9B;SACF;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC9C,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,wBAAwB,EAAE;YAClD,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAC9B;SACF;QACD,OAAO,MAAM,MAAM,CAAC;IACtB,CAAC;IA6KM,KAAK,CAAC,WAAW,CACtB,UAAsB,EAAE,EACxB,GAAG,SAAqB;QAExB,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,0BAA0B,EAAE;YACpD,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;aAC1C;SACF;QACD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,CAAC;IAC9D,CAAC;IAmCM,KAAK,CAAC,SAAS,CACpB,UAAsB,EAAE,EACxB,GAAG,SAAgC;QAGnC,IAAI,OAAO,SAAS,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;YACpC,SAAS,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SACjD;QACD,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC;QAClB,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,wBAAwB,EAAE;YAClD,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,SAAuB,CAAC,CAAC;aACxD;SACF;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAC5C,OAAO,EACP,GAAI,SAAwB,CAC7B,CAAC;QACF,IAAI,OAAO,CAAC,MAAM,KAAK,OAAO,EAAE;YAC9B,OAAO,QAA6B,CAAC;SACtC;QACD,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YACjC,OAAO,IAAI,CAAC;SACb;QACD,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;IAQM,KAAK,CAAC,YAAY,CAAC,MAAuB;QAC/C,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,2BAA2B,EAAE;YACrD,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAC9B;SACF;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAChD,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,0BAA0B,EAAE;YACpD,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAC9B;SACF;QACD,OAAO,MAAM,MAAM,CAAC;IACtB,CAAC;IASM,KAAK,CAAC,gBAAgB,CAC3B,IAAY,EACZ,SAAkB;QAElB,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,+BAA+B,EAAE;YACzD,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;aACvC;SACF;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC7D,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,8BAA8B,EAAE;YACxD,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAC9B;SACF;QACD,OAAO,MAAM,MAAM,CAAC;IACtB,CAAC;IAsCM,KAAK,CAAC,MAAM,CAAC,QAAgB;QAClC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAOM,KAAK,CAAC,WAAW;QACtB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;IACzC,CAAC;IAQM,KAAK,CAAC,MAAM,CAAC,QAAgB;QAClC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAEM,EAAE,CACP,KAAQ,EACR,QAsCS;QAET,MAAM,IAAI,GAAG,CAAC,KAAK,GAAG,WAAW,CAsCxB,CAAC;QACV,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;SACxC;QAED,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1B,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;IAEM,GAAG,CACR,KAAQ,EACR,QAsCS;QAET,MAAM,IAAI,GAAG,CAAC,KAAK,GAAG,WAAW,CAsCxB,CAAC;QACV,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE;YACnB,OAAO,KAAK,CAAC;SACd;QAED,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACvC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;YAEV,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SACzB;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA93BD,wBA83BC"}
|
package/dist/Nymph.types.d.ts
CHANGED
|
@@ -1,25 +1,25 @@
|
|
|
1
1
|
import { EntityConstructor, EntityInterface } from './Entity.types';
|
|
2
2
|
import Nymph from './Nymph';
|
|
3
3
|
export type NymphEventType = 'connect' | 'disconnect' | 'query' | 'beforeGetEntity' | 'beforeGetEntities' | 'beforeSaveEntity' | 'afterSaveEntity' | 'beforeDeleteEntity' | 'afterDeleteEntity' | 'beforeDeleteEntityByID' | 'afterDeleteEntityByID' | 'beforeNewUID' | 'afterNewUID' | 'beforeSetUID' | 'afterSetUID' | 'beforeRenameUID' | 'afterRenameUID' | 'beforeDeleteUID' | 'afterDeleteUID';
|
|
4
|
-
export type NymphConnectCallback = (nymph: Nymph, result: Promise<boolean>) => void
|
|
5
|
-
export type NymphDisconnectCallback = (nymph: Nymph, result: Promise<boolean>) => void
|
|
6
|
-
export type NymphQueryCallback = (nymph: Nymph, options: Options, selectors: FormattedSelector[]) => void
|
|
7
|
-
export type NymphBeforeGetEntityCallback = (nymph: Nymph, options: Options, selectors: Selector[]) => void
|
|
8
|
-
export type NymphBeforeGetEntitiesCallback = (nymph: Nymph, options: Options, selectors: Selector[]) => void
|
|
9
|
-
export type NymphBeforeSaveEntityCallback = (nymph: Nymph, entity: EntityInterface) => void
|
|
10
|
-
export type NymphAfterSaveEntityCallback = (nymph: Nymph, result: Promise<boolean>) => void
|
|
11
|
-
export type NymphBeforeDeleteEntityCallback = (nymph: Nymph, entity: EntityInterface) => void
|
|
12
|
-
export type NymphAfterDeleteEntityCallback = (nymph: Nymph, result: Promise<boolean>) => void
|
|
13
|
-
export type NymphBeforeDeleteEntityByIDCallback = (nymph: Nymph, guid: string, className?: string) => void
|
|
14
|
-
export type NymphAfterDeleteEntityByIDCallback = (nymph: Nymph, result: Promise<boolean>) => void
|
|
15
|
-
export type NymphBeforeNewUIDCallback = (nymph: Nymph, name: string) => void
|
|
16
|
-
export type NymphAfterNewUIDCallback = (nymph: Nymph, result: Promise<number | null>) => void
|
|
17
|
-
export type NymphBeforeSetUIDCallback = (nymph: Nymph, name: string, value: number) => void
|
|
18
|
-
export type NymphAfterSetUIDCallback = (nymph: Nymph, result: Promise<boolean>) => void
|
|
19
|
-
export type NymphBeforeRenameUIDCallback = (nymph: Nymph, oldName: string, newName: string) => void
|
|
20
|
-
export type NymphAfterRenameUIDCallback = (nymph: Nymph, result: Promise<boolean>) => void
|
|
21
|
-
export type NymphBeforeDeleteUIDCallback = (nymph: Nymph, name: string) => void
|
|
22
|
-
export type NymphAfterDeleteUIDCallback = (nymph: Nymph, result: Promise<boolean>) => void
|
|
4
|
+
export type NymphConnectCallback = (nymph: Nymph, result: Promise<boolean>) => Promise<void>;
|
|
5
|
+
export type NymphDisconnectCallback = (nymph: Nymph, result: Promise<boolean>) => Promise<void>;
|
|
6
|
+
export type NymphQueryCallback = (nymph: Nymph, options: Options, selectors: FormattedSelector[]) => Promise<void>;
|
|
7
|
+
export type NymphBeforeGetEntityCallback = (nymph: Nymph, options: Options, selectors: Selector[]) => Promise<void>;
|
|
8
|
+
export type NymphBeforeGetEntitiesCallback = (nymph: Nymph, options: Options, selectors: Selector[]) => Promise<void>;
|
|
9
|
+
export type NymphBeforeSaveEntityCallback = (nymph: Nymph, entity: EntityInterface) => Promise<void>;
|
|
10
|
+
export type NymphAfterSaveEntityCallback = (nymph: Nymph, result: Promise<boolean>) => Promise<void>;
|
|
11
|
+
export type NymphBeforeDeleteEntityCallback = (nymph: Nymph, entity: EntityInterface) => Promise<void>;
|
|
12
|
+
export type NymphAfterDeleteEntityCallback = (nymph: Nymph, result: Promise<boolean>) => Promise<void>;
|
|
13
|
+
export type NymphBeforeDeleteEntityByIDCallback = (nymph: Nymph, guid: string, className?: string) => Promise<void>;
|
|
14
|
+
export type NymphAfterDeleteEntityByIDCallback = (nymph: Nymph, result: Promise<boolean>) => Promise<void>;
|
|
15
|
+
export type NymphBeforeNewUIDCallback = (nymph: Nymph, name: string) => Promise<void>;
|
|
16
|
+
export type NymphAfterNewUIDCallback = (nymph: Nymph, result: Promise<number | null>) => Promise<void>;
|
|
17
|
+
export type NymphBeforeSetUIDCallback = (nymph: Nymph, name: string, value: number) => Promise<void>;
|
|
18
|
+
export type NymphAfterSetUIDCallback = (nymph: Nymph, result: Promise<boolean>) => Promise<void>;
|
|
19
|
+
export type NymphBeforeRenameUIDCallback = (nymph: Nymph, oldName: string, newName: string) => Promise<void>;
|
|
20
|
+
export type NymphAfterRenameUIDCallback = (nymph: Nymph, result: Promise<boolean>) => Promise<void>;
|
|
21
|
+
export type NymphBeforeDeleteUIDCallback = (nymph: Nymph, name: string) => Promise<void>;
|
|
22
|
+
export type NymphAfterDeleteUIDCallback = (nymph: Nymph, result: Promise<boolean>) => Promise<void>;
|
|
23
23
|
export type Options<T extends EntityConstructor = EntityConstructor> = {
|
|
24
24
|
class?: T;
|
|
25
25
|
limit?: number;
|
package/dist/Nymph.types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Nymph.types.js","sourceRoot":"","sources":["../src/Nymph.types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"Nymph.types.js","sourceRoot":"","sources":["../src/Nymph.types.ts"],"names":[],"mappings":";;;AA8RA,IAAY,mBAMX;AAND,WAAY,mBAAmB;IAC7B,uEAAa,CAAA;IACb,2EAAe,CAAA;IACf,6EAAgB,CAAA;IAEhB,2EAAe,CAAA;AACjB,CAAC,EANW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAM9B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nymphjs/nymph",
|
|
3
|
-
"version": "1.0.0-beta.
|
|
3
|
+
"version": "1.0.0-beta.2",
|
|
4
4
|
"description": "NymphJS - Nymph ORM",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
},
|
|
32
32
|
"license": "Apache-2.0",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nymphjs/guid": "^1.0.0-beta.
|
|
34
|
+
"@nymphjs/guid": "^1.0.0-beta.2",
|
|
35
35
|
"joi": "^17.7.0",
|
|
36
36
|
"locutus": "^2.0.16",
|
|
37
37
|
"lodash": "^4.17.21",
|
|
@@ -47,5 +47,5 @@
|
|
|
47
47
|
"ts-jest": "^29.0.3",
|
|
48
48
|
"typescript": "^4.9.3"
|
|
49
49
|
},
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "431d1aaa620a4f1d4ef0227aaad717665dfd6a6d"
|
|
51
51
|
}
|
package/src/Nymph.ts
CHANGED
|
@@ -190,7 +190,7 @@ export default class Nymph {
|
|
|
190
190
|
const result = this.driver.connect();
|
|
191
191
|
for (let callback of this.connectCallbacks) {
|
|
192
192
|
if (callback) {
|
|
193
|
-
callback(this, result);
|
|
193
|
+
await callback(this, result);
|
|
194
194
|
}
|
|
195
195
|
}
|
|
196
196
|
return await result;
|
|
@@ -205,7 +205,7 @@ export default class Nymph {
|
|
|
205
205
|
const result = this.driver.disconnect();
|
|
206
206
|
for (let callback of this.disconnectCallbacks) {
|
|
207
207
|
if (callback) {
|
|
208
|
-
callback(this, result);
|
|
208
|
+
await callback(this, result);
|
|
209
209
|
}
|
|
210
210
|
}
|
|
211
211
|
return await result;
|
|
@@ -220,7 +220,7 @@ export default class Nymph {
|
|
|
220
220
|
) {
|
|
221
221
|
for (let callback of this.queryCallbacks) {
|
|
222
222
|
if (callback) {
|
|
223
|
-
callback(this, options, selectors);
|
|
223
|
+
await callback(this, options, selectors);
|
|
224
224
|
}
|
|
225
225
|
}
|
|
226
226
|
}
|
|
@@ -292,13 +292,13 @@ export default class Nymph {
|
|
|
292
292
|
public async newUID(name: string): Promise<number | null> {
|
|
293
293
|
for (let callback of this.beforeNewUIDCallbacks) {
|
|
294
294
|
if (callback) {
|
|
295
|
-
callback(this, name);
|
|
295
|
+
await callback(this, name);
|
|
296
296
|
}
|
|
297
297
|
}
|
|
298
298
|
const result = this.driver.newUID(name);
|
|
299
299
|
for (let callback of this.afterNewUIDCallbacks) {
|
|
300
300
|
if (callback) {
|
|
301
|
-
callback(this, result);
|
|
301
|
+
await callback(this, result);
|
|
302
302
|
}
|
|
303
303
|
}
|
|
304
304
|
return await result;
|
|
@@ -323,13 +323,13 @@ export default class Nymph {
|
|
|
323
323
|
public async setUID(name: string, value: number): Promise<boolean> {
|
|
324
324
|
for (let callback of this.beforeSetUIDCallbacks) {
|
|
325
325
|
if (callback) {
|
|
326
|
-
callback(this, name, value);
|
|
326
|
+
await callback(this, name, value);
|
|
327
327
|
}
|
|
328
328
|
}
|
|
329
329
|
const result = this.driver.setUID(name, value);
|
|
330
330
|
for (let callback of this.afterSetUIDCallbacks) {
|
|
331
331
|
if (callback) {
|
|
332
|
-
callback(this, result);
|
|
332
|
+
await callback(this, result);
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
return await result;
|
|
@@ -344,13 +344,13 @@ export default class Nymph {
|
|
|
344
344
|
public async deleteUID(name: string): Promise<boolean> {
|
|
345
345
|
for (let callback of this.beforeDeleteUIDCallbacks) {
|
|
346
346
|
if (callback) {
|
|
347
|
-
callback(this, name);
|
|
347
|
+
await callback(this, name);
|
|
348
348
|
}
|
|
349
349
|
}
|
|
350
350
|
const result = this.driver.deleteUID(name);
|
|
351
351
|
for (let callback of this.afterDeleteUIDCallbacks) {
|
|
352
352
|
if (callback) {
|
|
353
|
-
callback(this, result);
|
|
353
|
+
await callback(this, result);
|
|
354
354
|
}
|
|
355
355
|
}
|
|
356
356
|
return await result;
|
|
@@ -366,13 +366,13 @@ export default class Nymph {
|
|
|
366
366
|
public async renameUID(oldName: string, newName: string): Promise<boolean> {
|
|
367
367
|
for (let callback of this.beforeRenameUIDCallbacks) {
|
|
368
368
|
if (callback) {
|
|
369
|
-
callback(this, oldName, newName);
|
|
369
|
+
await callback(this, oldName, newName);
|
|
370
370
|
}
|
|
371
371
|
}
|
|
372
372
|
const result = this.driver.renameUID(oldName, newName);
|
|
373
373
|
for (let callback of this.afterRenameUIDCallbacks) {
|
|
374
374
|
if (callback) {
|
|
375
|
-
callback(this, result);
|
|
375
|
+
await callback(this, result);
|
|
376
376
|
}
|
|
377
377
|
}
|
|
378
378
|
return await result;
|
|
@@ -392,13 +392,13 @@ export default class Nymph {
|
|
|
392
392
|
public async saveEntity(entity: EntityInterface): Promise<boolean> {
|
|
393
393
|
for (let callback of this.beforeSaveEntityCallbacks) {
|
|
394
394
|
if (callback) {
|
|
395
|
-
callback(this, entity);
|
|
395
|
+
await callback(this, entity);
|
|
396
396
|
}
|
|
397
397
|
}
|
|
398
398
|
const result = this.driver.saveEntity(entity);
|
|
399
399
|
for (let callback of this.afterSaveEntityCallbacks) {
|
|
400
400
|
if (callback) {
|
|
401
|
-
callback(this, result);
|
|
401
|
+
await callback(this, result);
|
|
402
402
|
}
|
|
403
403
|
}
|
|
404
404
|
return await result;
|
|
@@ -581,7 +581,7 @@ export default class Nymph {
|
|
|
581
581
|
): Promise<ReturnType<T['factorySync']>[] | string[] | number> {
|
|
582
582
|
for (let callback of this.beforeGetEntitiesCallbacks) {
|
|
583
583
|
if (callback) {
|
|
584
|
-
callback(this, options, selectors);
|
|
584
|
+
await callback(this, options, selectors);
|
|
585
585
|
}
|
|
586
586
|
}
|
|
587
587
|
return await this.driver.getEntities(options, ...selectors);
|
|
@@ -631,7 +631,7 @@ export default class Nymph {
|
|
|
631
631
|
options.limit = 1;
|
|
632
632
|
for (let callback of this.beforeGetEntityCallbacks) {
|
|
633
633
|
if (callback) {
|
|
634
|
-
callback(this, options, selectors as Selector[]);
|
|
634
|
+
await callback(this, options, selectors as Selector[]);
|
|
635
635
|
}
|
|
636
636
|
}
|
|
637
637
|
const entities = await this.driver.getEntities(
|
|
@@ -656,13 +656,13 @@ export default class Nymph {
|
|
|
656
656
|
public async deleteEntity(entity: EntityInterface): Promise<boolean> {
|
|
657
657
|
for (let callback of this.beforeDeleteEntityCallbacks) {
|
|
658
658
|
if (callback) {
|
|
659
|
-
callback(this, entity);
|
|
659
|
+
await callback(this, entity);
|
|
660
660
|
}
|
|
661
661
|
}
|
|
662
662
|
const result = this.driver.deleteEntity(entity);
|
|
663
663
|
for (let callback of this.afterDeleteEntityCallbacks) {
|
|
664
664
|
if (callback) {
|
|
665
|
-
callback(this, result);
|
|
665
|
+
await callback(this, result);
|
|
666
666
|
}
|
|
667
667
|
}
|
|
668
668
|
return await result;
|
|
@@ -681,13 +681,13 @@ export default class Nymph {
|
|
|
681
681
|
): Promise<boolean> {
|
|
682
682
|
for (let callback of this.beforeDeleteEntityByIDCallbacks) {
|
|
683
683
|
if (callback) {
|
|
684
|
-
callback(this, guid, className);
|
|
684
|
+
await callback(this, guid, className);
|
|
685
685
|
}
|
|
686
686
|
}
|
|
687
687
|
const result = this.driver.deleteEntityByID(guid, className);
|
|
688
688
|
for (let callback of this.afterDeleteEntityByIDCallbacks) {
|
|
689
689
|
if (callback) {
|
|
690
|
-
callback(this, result);
|
|
690
|
+
await callback(this, result);
|
|
691
691
|
}
|
|
692
692
|
}
|
|
693
693
|
return await result;
|
package/src/Nymph.types.ts
CHANGED
|
@@ -24,80 +24,86 @@ export type NymphEventType =
|
|
|
24
24
|
export type NymphConnectCallback = (
|
|
25
25
|
nymph: Nymph,
|
|
26
26
|
result: Promise<boolean>
|
|
27
|
-
) => void
|
|
27
|
+
) => Promise<void>;
|
|
28
28
|
export type NymphDisconnectCallback = (
|
|
29
29
|
nymph: Nymph,
|
|
30
30
|
result: Promise<boolean>
|
|
31
|
-
) => void
|
|
31
|
+
) => Promise<void>;
|
|
32
32
|
/** The NymphQueryCallback will be called on both top level and qref queries. */
|
|
33
33
|
export type NymphQueryCallback = (
|
|
34
34
|
nymph: Nymph,
|
|
35
35
|
options: Options,
|
|
36
36
|
selectors: FormattedSelector[]
|
|
37
|
-
) => void
|
|
37
|
+
) => Promise<void>;
|
|
38
38
|
export type NymphBeforeGetEntityCallback = (
|
|
39
39
|
nymph: Nymph,
|
|
40
40
|
options: Options,
|
|
41
41
|
selectors: Selector[]
|
|
42
|
-
) => void
|
|
42
|
+
) => Promise<void>;
|
|
43
43
|
export type NymphBeforeGetEntitiesCallback = (
|
|
44
44
|
nymph: Nymph,
|
|
45
45
|
options: Options,
|
|
46
46
|
selectors: Selector[]
|
|
47
|
-
) => void
|
|
47
|
+
) => Promise<void>;
|
|
48
48
|
export type NymphBeforeSaveEntityCallback = (
|
|
49
49
|
nymph: Nymph,
|
|
50
50
|
entity: EntityInterface
|
|
51
|
-
) => void
|
|
51
|
+
) => Promise<void>;
|
|
52
52
|
export type NymphAfterSaveEntityCallback = (
|
|
53
53
|
nymph: Nymph,
|
|
54
54
|
result: Promise<boolean>
|
|
55
|
-
) => void
|
|
55
|
+
) => Promise<void>;
|
|
56
56
|
export type NymphBeforeDeleteEntityCallback = (
|
|
57
57
|
nymph: Nymph,
|
|
58
58
|
entity: EntityInterface
|
|
59
|
-
) => void
|
|
59
|
+
) => Promise<void>;
|
|
60
60
|
export type NymphAfterDeleteEntityCallback = (
|
|
61
61
|
nymph: Nymph,
|
|
62
62
|
result: Promise<boolean>
|
|
63
|
-
) => void
|
|
63
|
+
) => Promise<void>;
|
|
64
64
|
export type NymphBeforeDeleteEntityByIDCallback = (
|
|
65
65
|
nymph: Nymph,
|
|
66
66
|
guid: string,
|
|
67
67
|
className?: string
|
|
68
|
-
) => void
|
|
68
|
+
) => Promise<void>;
|
|
69
69
|
export type NymphAfterDeleteEntityByIDCallback = (
|
|
70
70
|
nymph: Nymph,
|
|
71
71
|
result: Promise<boolean>
|
|
72
|
-
) => void
|
|
73
|
-
export type NymphBeforeNewUIDCallback = (
|
|
72
|
+
) => Promise<void>;
|
|
73
|
+
export type NymphBeforeNewUIDCallback = (
|
|
74
|
+
nymph: Nymph,
|
|
75
|
+
name: string
|
|
76
|
+
) => Promise<void>;
|
|
74
77
|
export type NymphAfterNewUIDCallback = (
|
|
75
78
|
nymph: Nymph,
|
|
76
79
|
result: Promise<number | null>
|
|
77
|
-
) => void
|
|
80
|
+
) => Promise<void>;
|
|
78
81
|
export type NymphBeforeSetUIDCallback = (
|
|
79
82
|
nymph: Nymph,
|
|
80
83
|
name: string,
|
|
81
84
|
value: number
|
|
82
|
-
) => void
|
|
85
|
+
) => Promise<void>;
|
|
83
86
|
export type NymphAfterSetUIDCallback = (
|
|
84
87
|
nymph: Nymph,
|
|
85
88
|
result: Promise<boolean>
|
|
86
|
-
) => void
|
|
89
|
+
) => Promise<void>;
|
|
87
90
|
export type NymphBeforeRenameUIDCallback = (
|
|
88
91
|
nymph: Nymph,
|
|
89
92
|
oldName: string,
|
|
90
93
|
newName: string
|
|
91
|
-
) => void
|
|
94
|
+
) => Promise<void>;
|
|
92
95
|
export type NymphAfterRenameUIDCallback = (
|
|
93
96
|
nymph: Nymph,
|
|
94
97
|
result: Promise<boolean>
|
|
95
|
-
) => void
|
|
96
|
-
export type NymphBeforeDeleteUIDCallback = (
|
|
98
|
+
) => Promise<void>;
|
|
99
|
+
export type NymphBeforeDeleteUIDCallback = (
|
|
100
|
+
nymph: Nymph,
|
|
101
|
+
name: string
|
|
102
|
+
) => Promise<void>;
|
|
97
103
|
export type NymphAfterDeleteUIDCallback = (
|
|
98
104
|
nymph: Nymph,
|
|
99
105
|
result: Promise<boolean>
|
|
100
|
-
) => void
|
|
106
|
+
) => Promise<void>;
|
|
101
107
|
|
|
102
108
|
export type Options<T extends EntityConstructor = EntityConstructor> = {
|
|
103
109
|
class?: T;
|