Skip to content

Commit 412463f

Browse files
mesqueebmesqueeb
authored
Merge pull request #315 from mesqueeb/dev
v1.35.6 - allow more methods of importing getters/actions/mutations
2 parents 0cf6ae7 + a293e99 commit 412463f

File tree

5 files changed

+155
-155
lines changed

5 files changed

+155
-155
lines changed

‎dist/index.cjs.js‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,77 @@ var compareAnything = require('compare-anything');
1616
var findAndReplaceAnything = require('find-and-replace-anything');
1717
var filter = _interopDefault(require('filter-anything'));
1818

19+
/*! *****************************************************************************
20+
Copyright (c) Microsoft Corporation. All rights reserved.
21+
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
22+
this file except in compliance with the License. You may obtain a copy of the
23+
License at http://www.apache.org/licenses/LICENSE-2.0
24+
25+
THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
26+
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
27+
WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
28+
MERCHANTABLITY OR NON-INFRINGEMENT.
29+
30+
See the Apache Version 2.0 License for specific language governing permissions
31+
and limitations under the License.
32+
***************************************************************************** */
33+
34+
var __assign = function() {
35+
__assign = Object.assign || function __assign(t) {
36+
for (var s, i = 1, n = arguments.length; i < n; i++) {
37+
s = arguments[i];
38+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
39+
}
40+
return t;
41+
};
42+
return __assign.apply(this, arguments);
43+
};
44+
45+
function __awaiter(thisArg, _arguments, P, generator) {
46+
return new (P || (P = Promise))(function (resolve, reject) {
47+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
48+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
49+
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
50+
step((generator = generator.apply(thisArg, _arguments || [])).next());
51+
});
52+
}
53+
54+
function __generator(thisArg, body) {
55+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
56+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
57+
function verb(n) { return function (v) { return step([n, v]); }; }
58+
function step(op) {
59+
if (f) throw new TypeError("Generator is already executing.");
60+
while (_) try {
61+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
62+
if (y = 0, t) op = [op[0] & 2, t.value];
63+
switch (op[0]) {
64+
case 0: case 1: t = op; break;
65+
case 4: _.label++; return { value: op[1], done: false };
66+
case 5: _.label++; y = op[1]; op = [0]; continue;
67+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
68+
default:
69+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
70+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
71+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
72+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
73+
if (t[2]) _.ops.pop();
74+
_.trys.pop(); continue;
75+
}
76+
op = body.call(thisArg, _);
77+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
78+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
79+
}
80+
}
81+
82+
function __spreadArrays() {
83+
for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
84+
for (var r = Array(s), k = 0, i = 0; i < il; i++)
85+
for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
86+
r[k] = a[j];
87+
return r;
88+
}
89+
1990
var defaultConfig = {
2091
firestorePath: '',
2192
// The path to a collection or doc in firestore. You can use `{userId}` which will be replaced with the user Id.
@@ -146,77 +217,6 @@ function error (errorId, error) {
146217
return errorId;
147218
}
148219

149-
/*! *****************************************************************************
150-
Copyright (c) Microsoft Corporation. All rights reserved.
151-
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
152-
this file except in compliance with the License. You may obtain a copy of the
153-
License at http://www.apache.org/licenses/LICENSE-2.0
154-
155-
THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
156-
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
157-
WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
158-
MERCHANTABLITY OR NON-INFRINGEMENT.
159-
160-
See the Apache Version 2.0 License for specific language governing permissions
161-
and limitations under the License.
162-
***************************************************************************** */
163-
164-
var __assign = function() {
165-
__assign = Object.assign || function __assign(t) {
166-
for (var s, i = 1, n = arguments.length; i < n; i++) {
167-
s = arguments[i];
168-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
169-
}
170-
return t;
171-
};
172-
return __assign.apply(this, arguments);
173-
};
174-
175-
function __awaiter(thisArg, _arguments, P, generator) {
176-
return new (P || (P = Promise))(function (resolve, reject) {
177-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
178-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
179-
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
180-
step((generator = generator.apply(thisArg, _arguments || [])).next());
181-
});
182-
}
183-
184-
function __generator(thisArg, body) {
185-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
186-
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
187-
function verb(n) { return function (v) { return step([n, v]); }; }
188-
function step(op) {
189-
if (f) throw new TypeError("Generator is already executing.");
190-
while (_) try {
191-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
192-
if (y = 0, t) op = [op[0] & 2, t.value];
193-
switch (op[0]) {
194-
case 0: case 1: t = op; break;
195-
case 4: _.label++; return { value: op[1], done: false };
196-
case 5: _.label++; y = op[1]; op = [0]; continue;
197-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
198-
default:
199-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
200-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
201-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
202-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
203-
if (t[2]) _.ops.pop();
204-
_.trys.pop(); continue;
205-
}
206-
op = body.call(thisArg, _);
207-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
208-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
209-
}
210-
}
211-
212-
function __spreadArrays() {
213-
for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
214-
for (var r = Array(s), k = 0, i = 0; i < il; i++)
215-
for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
216-
r[k] = a[j];
217-
return r;
218-
}
219-
220220
var Firebase = firebase;
221221
function setFirebaseDependency(firebaseDependency) {
222222
Firebase = firebaseDependency;
@@ -2126,9 +2126,9 @@ function iniModule (userConfig, FirebaseDependency) {
21262126
return {
21272127
namespaced: true,
21282128
state: mergeAnything.merge(pluginState(), restOfState, { _conf: conf }),
2129-
mutations: mergeAnything.merge(userMutations, pluginMutations(mergeAnything.merge(userState, { _conf: conf }))),
2130-
actions: mergeAnything.merge(userActions, pluginActions(FirebaseDependency)),
2131-
getters: mergeAnything.merge(userGetters, pluginGetters(FirebaseDependency)),
2129+
mutations: __assign(__assign({}, userMutations), pluginMutations(mergeAnything.merge(userState, { _conf: conf }))),
2130+
actions: __assign(__assign({}, userActions), pluginActions(FirebaseDependency)),
2131+
getters: __assign(__assign({}, userGetters), pluginGetters(FirebaseDependency)),
21322132
};
21332133
}
21342134

‎dist/index.esm.js‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,77 @@ import { compareObjectProps } from 'compare-anything';
1010
import { findAndReplace, findAndReplaceIf } from 'find-and-replace-anything';
1111
import filter from 'filter-anything';
1212

13+
/*! *****************************************************************************
14+
Copyright (c) Microsoft Corporation. All rights reserved.
15+
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
16+
this file except in compliance with the License. You may obtain a copy of the
17+
License at http://www.apache.org/licenses/LICENSE-2.0
18+
19+
THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
20+
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
21+
WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
22+
MERCHANTABLITY OR NON-INFRINGEMENT.
23+
24+
See the Apache Version 2.0 License for specific language governing permissions
25+
and limitations under the License.
26+
***************************************************************************** */
27+
28+
var __assign = function() {
29+
__assign = Object.assign || function __assign(t) {
30+
for (var s, i = 1, n = arguments.length; i < n; i++) {
31+
s = arguments[i];
32+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
33+
}
34+
return t;
35+
};
36+
return __assign.apply(this, arguments);
37+
};
38+
39+
function __awaiter(thisArg, _arguments, P, generator) {
40+
return new (P || (P = Promise))(function (resolve, reject) {
41+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
42+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
43+
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
44+
step((generator = generator.apply(thisArg, _arguments || [])).next());
45+
});
46+
}
47+
48+
function __generator(thisArg, body) {
49+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
50+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
51+
function verb(n) { return function (v) { return step([n, v]); }; }
52+
function step(op) {
53+
if (f) throw new TypeError("Generator is already executing.");
54+
while (_) try {
55+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
56+
if (y = 0, t) op = [op[0] & 2, t.value];
57+
switch (op[0]) {
58+
case 0: case 1: t = op; break;
59+
case 4: _.label++; return { value: op[1], done: false };
60+
case 5: _.label++; y = op[1]; op = [0]; continue;
61+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
62+
default:
63+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
64+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
65+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
66+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
67+
if (t[2]) _.ops.pop();
68+
_.trys.pop(); continue;
69+
}
70+
op = body.call(thisArg, _);
71+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
72+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
73+
}
74+
}
75+
76+
function __spreadArrays() {
77+
for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
78+
for (var r = Array(s), k = 0, i = 0; i < il; i++)
79+
for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
80+
r[k] = a[j];
81+
return r;
82+
}
83+
1384
var defaultConfig = {
1485
firestorePath: '',
1586
// The path to a collection or doc in firestore. You can use `{userId}` which will be replaced with the user Id.
@@ -140,77 +211,6 @@ function error (errorId, error) {
140211
return errorId;
141212
}
142213

143-
/*! *****************************************************************************
144-
Copyright (c) Microsoft Corporation. All rights reserved.
145-
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
146-
this file except in compliance with the License. You may obtain a copy of the
147-
License at http://www.apache.org/licenses/LICENSE-2.0
148-
149-
THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
150-
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
151-
WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
152-
MERCHANTABLITY OR NON-INFRINGEMENT.
153-
154-
See the Apache Version 2.0 License for specific language governing permissions
155-
and limitations under the License.
156-
***************************************************************************** */
157-
158-
var __assign = function() {
159-
__assign = Object.assign || function __assign(t) {
160-
for (var s, i = 1, n = arguments.length; i < n; i++) {
161-
s = arguments[i];
162-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
163-
}
164-
return t;
165-
};
166-
return __assign.apply(this, arguments);
167-
};
168-
169-
function __awaiter(thisArg, _arguments, P, generator) {
170-
return new (P || (P = Promise))(function (resolve, reject) {
171-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
172-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
173-
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
174-
step((generator = generator.apply(thisArg, _arguments || [])).next());
175-
});
176-
}
177-
178-
function __generator(thisArg, body) {
179-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
180-
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
181-
function verb(n) { return function (v) { return step([n, v]); }; }
182-
function step(op) {
183-
if (f) throw new TypeError("Generator is already executing.");
184-
while (_) try {
185-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
186-
if (y = 0, t) op = [op[0] & 2, t.value];
187-
switch (op[0]) {
188-
case 0: case 1: t = op; break;
189-
case 4: _.label++; return { value: op[1], done: false };
190-
case 5: _.label++; y = op[1]; op = [0]; continue;
191-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
192-
default:
193-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
194-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
195-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
196-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
197-
if (t[2]) _.ops.pop();
198-
_.trys.pop(); continue;
199-
}
200-
op = body.call(thisArg, _);
201-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
202-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
203-
}
204-
}
205-
206-
function __spreadArrays() {
207-
for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
208-
for (var r = Array(s), k = 0, i = 0; i < il; i++)
209-
for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
210-
r[k] = a[j];
211-
return r;
212-
}
213-
214214
var Firebase = firebase;
215215
function setFirebaseDependency(firebaseDependency) {
216216
Firebase = firebaseDependency;
@@ -2120,9 +2120,9 @@ function iniModule (userConfig, FirebaseDependency) {
21202120
return {
21212121
namespaced: true,
21222122
state: merge(pluginState(), restOfState, { _conf: conf }),
2123-
mutations: merge(userMutations, pluginMutations(merge(userState, { _conf: conf }))),
2124-
actions: merge(userActions, pluginActions(FirebaseDependency)),
2125-
getters: merge(userGetters, pluginGetters(FirebaseDependency)),
2123+
mutations: __assign(__assign({}, userMutations), pluginMutations(merge(userState, { _conf: conf }))),
2124+
actions: __assign(__assign({}, userActions), pluginActions(FirebaseDependency)),
2125+
getters: __assign(__assign({}, userGetters), pluginGetters(FirebaseDependency)),
21262126
};
21272127
}
21282128

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vuex-easy-firestore",
3-
"version": "1.35.5",
3+
"version": "1.35.6",
44
"description": "Easy coupling of firestore and a vuex module. 2-way sync with 0 boilerplate!",
55
"main": "dist/index.cjs.js",
66
"module": "dist/index.esm.js",

‎src/module/index.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ export default function (userConfig: IEasyFirestoreModule, FirebaseDependency: a
4242
return {
4343
namespaced: true,
4444
state: merge(pluginState(), restOfState, { _conf: conf }),
45-
mutations: merge(userMutations, pluginMutations(merge(userState, { _conf: conf }))),
46-
actions: merge(userActions, pluginActions(FirebaseDependency)),
47-
getters: merge(userGetters, pluginGetters(FirebaseDependency)),
45+
mutations: { ...userMutations, ...pluginMutations(merge(userState, { _conf: conf })) },
46+
actions: { ...userActions, ...pluginActions(FirebaseDependency) },
47+
getters: { ...userGetters, ...pluginGetters(FirebaseDependency) },
4848
}
4949
}

‎test/helpers/index.cjs.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2645,9 +2645,9 @@ function iniModule (userConfig, FirebaseDependency) {
26452645
return {
26462646
namespaced: true,
26472647
state: mergeAnything.merge(pluginState(), restOfState, { _conf: conf }),
2648-
mutations: mergeAnything.merge(userMutations, pluginMutations(mergeAnything.merge(userState, { _conf: conf }))),
2649-
actions: mergeAnything.merge(userActions, pluginActions(FirebaseDependency)),
2650-
getters: mergeAnything.merge(userGetters, pluginGetters(FirebaseDependency)),
2648+
mutations: __assign(__assign({}, userMutations), pluginMutations(mergeAnything.merge(userState, { _conf: conf }))),
2649+
actions: __assign(__assign({}, userActions), pluginActions(FirebaseDependency)),
2650+
getters: __assign(__assign({}, userGetters), pluginGetters(FirebaseDependency)),
26512651
};
26522652
}
26532653

0 commit comments

Comments
 (0)