swagger-client 3.15.0 → 3.18.0
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/LICENSE +2 -1
- package/NOTICE +2 -0
- package/README.md +1 -1
- package/dist/swagger-client.browser.js +6426 -8544
- package/dist/swagger-client.browser.min.js +1 -1
- package/dist/swagger-client.browser.min.js.map +1 -1
- package/es/commonjs.js +1 -1
- package/es/execute/index.js +15 -11
- package/es/execute/oas3/build-request.js +5 -3
- package/es/execute/oas3/parameter-builders.js +10 -4
- package/es/execute/oas3/style-serializer.js +6 -5
- package/es/execute/swagger2/build-request.js +5 -3
- package/es/helpers.js +12 -8
- package/es/http/fold-formdata-to-request.node.js +2 -2
- package/es/http/index.js +29 -12
- package/es/index.js +12 -11
- package/es/interfaces.js +9 -5
- package/es/resolver.js +4 -4
- package/es/specmap/helpers.js +2 -3
- package/es/specmap/index.js +22 -21
- package/es/specmap/lib/all-of.js +3 -3
- package/es/specmap/lib/parameters.js +1 -1
- package/es/specmap/lib/properties.js +1 -1
- package/es/specmap/lib/refs.js +17 -13
- package/es/subtree-resolver/index.js +2 -2
- package/lib/commonjs.js +1 -1
- package/lib/execute/index.js +22 -19
- package/lib/execute/oas3/build-request.js +11 -8
- package/lib/execute/oas3/parameter-builders.js +15 -8
- package/lib/execute/oas3/style-serializer.js +5 -7
- package/lib/execute/swagger2/build-request.js +9 -4
- package/lib/helpers.js +9 -15
- package/lib/http/fold-formdata-to-request.node.js +3 -3
- package/lib/http/index.js +37 -22
- package/lib/index.js +21 -25
- package/lib/interfaces.js +22 -17
- package/lib/resolver.js +14 -14
- package/lib/specmap/helpers.js +3 -5
- package/lib/specmap/index.js +32 -34
- package/lib/specmap/lib/all-of.js +4 -8
- package/lib/specmap/lib/context-tree.js +2 -2
- package/lib/specmap/lib/index.js +2 -2
- package/lib/specmap/lib/parameters.js +6 -6
- package/lib/specmap/lib/properties.js +4 -4
- package/lib/specmap/lib/refs.js +17 -17
- package/lib/subtree-resolver/index.js +4 -4
- package/package.json +28 -31
package/lib/index.js
CHANGED
|
@@ -1,25 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
|
-
exports.
|
|
5
|
-
|
|
6
|
-
var _assign = _interopRequireDefault(require("lodash/assign"));
|
|
7
|
-
|
|
8
|
-
var _startsWith = _interopRequireDefault(require("lodash/startsWith"));
|
|
4
|
+
exports.helpers = exports.default = void 0;
|
|
9
5
|
|
|
10
6
|
var _url = _interopRequireDefault(require("url"));
|
|
11
7
|
|
|
12
|
-
var
|
|
8
|
+
var _index = _interopRequireWildcard(require("./http/index.js"));
|
|
13
9
|
|
|
14
|
-
var _resolver = _interopRequireWildcard(require("./resolver"));
|
|
10
|
+
var _resolver = _interopRequireWildcard(require("./resolver.js"));
|
|
15
11
|
|
|
16
|
-
var
|
|
12
|
+
var _index2 = _interopRequireDefault(require("./subtree-resolver/index.js"));
|
|
17
13
|
|
|
18
|
-
var _interfaces = require("./interfaces");
|
|
14
|
+
var _interfaces = require("./interfaces.js");
|
|
19
15
|
|
|
20
|
-
var
|
|
16
|
+
var _index3 = require("./execute/index.js");
|
|
21
17
|
|
|
22
|
-
var _helpers = require("./helpers");
|
|
18
|
+
var _helpers = require("./helpers.js");
|
|
23
19
|
|
|
24
20
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
25
21
|
|
|
@@ -27,26 +23,26 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
|
27
23
|
|
|
28
24
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
29
25
|
|
|
30
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
26
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
31
27
|
|
|
32
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
28
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
33
29
|
|
|
34
30
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
35
31
|
|
|
36
|
-
Swagger.http =
|
|
37
|
-
Swagger.makeHttp =
|
|
32
|
+
Swagger.http = _index.default;
|
|
33
|
+
Swagger.makeHttp = _index.makeHttp.bind(null, Swagger.http);
|
|
38
34
|
Swagger.resolve = _resolver.default;
|
|
39
|
-
Swagger.resolveSubtree =
|
|
40
|
-
Swagger.execute =
|
|
41
|
-
Swagger.serializeRes =
|
|
42
|
-
Swagger.serializeHeaders =
|
|
35
|
+
Swagger.resolveSubtree = _index2.default;
|
|
36
|
+
Swagger.execute = _index3.execute;
|
|
37
|
+
Swagger.serializeRes = _index.serializeRes;
|
|
38
|
+
Swagger.serializeHeaders = _index.serializeHeaders;
|
|
43
39
|
Swagger.clearCache = _resolver.clearCache;
|
|
44
40
|
Swagger.makeApisTagOperation = _interfaces.makeApisTagOperation;
|
|
45
|
-
Swagger.buildRequest =
|
|
41
|
+
Swagger.buildRequest = _index3.buildRequest;
|
|
46
42
|
Swagger.helpers = {
|
|
47
43
|
opId: _helpers.opId
|
|
48
44
|
};
|
|
49
|
-
Swagger.getBaseUrl =
|
|
45
|
+
Swagger.getBaseUrl = _index3.baseUrl;
|
|
50
46
|
|
|
51
47
|
function Swagger(url, opts = {}) {
|
|
52
48
|
// Allow url as a separate argument
|
|
@@ -60,10 +56,10 @@ function Swagger(url, opts = {}) {
|
|
|
60
56
|
return new Swagger(opts);
|
|
61
57
|
}
|
|
62
58
|
|
|
63
|
-
|
|
59
|
+
Object.assign(this, opts);
|
|
64
60
|
const prom = this.resolve().then(() => {
|
|
65
61
|
if (!this.disableInterfaces) {
|
|
66
|
-
|
|
62
|
+
Object.assign(this, Swagger.makeApisTagOperation(this));
|
|
67
63
|
}
|
|
68
64
|
|
|
69
65
|
return this;
|
|
@@ -74,7 +70,7 @@ function Swagger(url, opts = {}) {
|
|
|
74
70
|
}
|
|
75
71
|
|
|
76
72
|
Swagger.prototype = {
|
|
77
|
-
http:
|
|
73
|
+
http: _index.default,
|
|
78
74
|
|
|
79
75
|
execute(options) {
|
|
80
76
|
this.applyDefaults();
|
|
@@ -116,7 +112,7 @@ Swagger.prototype.applyDefaults = function applyDefaults() {
|
|
|
116
112
|
} = this;
|
|
117
113
|
const specUrl = this.url; // TODO: OAS3: support servers here
|
|
118
114
|
|
|
119
|
-
if (specUrl &&
|
|
115
|
+
if (specUrl && specUrl.startsWith('http')) {
|
|
120
116
|
const parsed = _url.default.parse(specUrl);
|
|
121
117
|
|
|
122
118
|
if (!spec.host) {
|
package/lib/interfaces.js
CHANGED
|
@@ -1,21 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
|
-
exports.makeExecute = makeExecute;
|
|
5
|
-
exports.makeApisTagOperationsOperationExecute = makeApisTagOperationsOperationExecute;
|
|
6
4
|
exports.makeApisTagOperation = makeApisTagOperation;
|
|
5
|
+
exports.makeApisTagOperationsOperationExecute = makeApisTagOperationsOperationExecute;
|
|
6
|
+
exports.makeExecute = makeExecute;
|
|
7
7
|
exports.mapTagOperations = mapTagOperations;
|
|
8
8
|
exports.self = void 0;
|
|
9
9
|
|
|
10
|
-
var
|
|
11
|
-
|
|
12
|
-
var _helpers = require("./helpers");
|
|
13
|
-
|
|
14
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
10
|
+
var _helpers = require("./helpers.js");
|
|
15
11
|
|
|
16
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
12
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
17
13
|
|
|
18
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
14
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
19
15
|
|
|
20
16
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
21
17
|
|
|
@@ -36,14 +32,23 @@ function makeExecute(swaggerJs = {}) {
|
|
|
36
32
|
pathName,
|
|
37
33
|
method,
|
|
38
34
|
operationId
|
|
39
|
-
}) => (parameters, opts = {}) =>
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
35
|
+
}) => (parameters, opts = {}) => {
|
|
36
|
+
const {
|
|
37
|
+
requestInterceptor,
|
|
38
|
+
responseInterceptor,
|
|
39
|
+
userFetch
|
|
40
|
+
} = swaggerJs;
|
|
41
|
+
return swaggerJs.execute(_objectSpread({
|
|
42
|
+
spec: swaggerJs.spec,
|
|
43
|
+
requestInterceptor,
|
|
44
|
+
responseInterceptor,
|
|
45
|
+
userFetch,
|
|
46
|
+
pathName,
|
|
47
|
+
method,
|
|
48
|
+
parameters,
|
|
49
|
+
operationId
|
|
50
|
+
}, opts));
|
|
51
|
+
};
|
|
47
52
|
} // Creates an interface with tags+operations = execute
|
|
48
53
|
// The shape
|
|
49
54
|
// { apis: { [tag]: { operations: [operation]: { execute }}}}
|
package/lib/resolver.js
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
|
-
exports.makeFetchJSON = makeFetchJSON;
|
|
5
4
|
exports.clearCache = clearCache;
|
|
6
5
|
exports.default = resolve;
|
|
6
|
+
exports.makeFetchJSON = makeFetchJSON;
|
|
7
7
|
|
|
8
|
-
var
|
|
8
|
+
var _index = _interopRequireDefault(require("./http/index.js"));
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _index2 = _interopRequireWildcard(require("./specmap/index.js"));
|
|
11
11
|
|
|
12
|
-
var _helpers = require("./helpers");
|
|
12
|
+
var _helpers = require("./helpers.js");
|
|
13
13
|
|
|
14
|
-
var _constants = require("./constants");
|
|
14
|
+
var _constants = require("./constants.js");
|
|
15
15
|
|
|
16
16
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
17
17
|
|
|
@@ -40,7 +40,7 @@ function makeFetchJSON(http, opts = {}) {
|
|
|
40
40
|
|
|
41
41
|
|
|
42
42
|
function clearCache() {
|
|
43
|
-
|
|
43
|
+
_index2.plugins.refs.clearCache();
|
|
44
44
|
}
|
|
45
45
|
|
|
46
46
|
function resolve(obj) {
|
|
@@ -67,7 +67,7 @@ function resolve(obj) {
|
|
|
67
67
|
baseDoc = baseDoc || url; // Provide a default fetch implementation
|
|
68
68
|
// TODO fetch should be removed, and http used instead
|
|
69
69
|
|
|
70
|
-
http = fetch || http ||
|
|
70
|
+
http = fetch || http || _index.default;
|
|
71
71
|
|
|
72
72
|
if (!spec) {
|
|
73
73
|
return makeFetchJSON(http, {
|
|
@@ -80,30 +80,30 @@ function resolve(obj) {
|
|
|
80
80
|
|
|
81
81
|
function doResolve(_spec) {
|
|
82
82
|
if (baseDoc) {
|
|
83
|
-
|
|
83
|
+
_index2.plugins.refs.docCache[baseDoc] = _spec;
|
|
84
84
|
} // Build a json-fetcher ( ie: give it a URL and get json out )
|
|
85
85
|
|
|
86
86
|
|
|
87
|
-
|
|
87
|
+
_index2.plugins.refs.fetchJSON = makeFetchJSON(http, {
|
|
88
88
|
requestInterceptor,
|
|
89
89
|
responseInterceptor
|
|
90
90
|
});
|
|
91
|
-
const plugs = [
|
|
91
|
+
const plugs = [_index2.plugins.refs];
|
|
92
92
|
|
|
93
93
|
if (typeof parameterMacro === 'function') {
|
|
94
|
-
plugs.push(
|
|
94
|
+
plugs.push(_index2.plugins.parameters);
|
|
95
95
|
}
|
|
96
96
|
|
|
97
97
|
if (typeof modelPropertyMacro === 'function') {
|
|
98
|
-
plugs.push(
|
|
98
|
+
plugs.push(_index2.plugins.properties);
|
|
99
99
|
}
|
|
100
100
|
|
|
101
101
|
if (mode !== 'strict') {
|
|
102
|
-
plugs.push(
|
|
102
|
+
plugs.push(_index2.plugins.allOf);
|
|
103
103
|
} // mapSpec is where the hard work happens
|
|
104
104
|
|
|
105
105
|
|
|
106
|
-
return (0,
|
|
106
|
+
return (0, _index2.default)({
|
|
107
107
|
spec: _spec,
|
|
108
108
|
context: {
|
|
109
109
|
baseDoc
|
package/lib/specmap/helpers.js
CHANGED
|
@@ -1,16 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
|
-
exports.isFreelyNamed = isFreelyNamed;
|
|
5
|
-
exports.generateAbsoluteRefPatches = generateAbsoluteRefPatches;
|
|
6
4
|
exports.absolutifyPointer = absolutifyPointer;
|
|
5
|
+
exports.generateAbsoluteRefPatches = generateAbsoluteRefPatches;
|
|
6
|
+
exports.isFreelyNamed = isFreelyNamed;
|
|
7
7
|
|
|
8
8
|
var _traverse = _interopRequireDefault(require("traverse"));
|
|
9
9
|
|
|
10
10
|
var _url = _interopRequireDefault(require("url"));
|
|
11
11
|
|
|
12
|
-
var _isString = _interopRequireDefault(require("lodash/isString"));
|
|
13
|
-
|
|
14
12
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
15
13
|
|
|
16
14
|
// This will match if the direct parent's key exactly matches an item.
|
|
@@ -47,7 +45,7 @@ function generateAbsoluteRefPatches(obj, basePath, {
|
|
|
47
45
|
} = {}) {
|
|
48
46
|
const patches = [];
|
|
49
47
|
(0, _traverse.default)(obj).forEach(function callback() {
|
|
50
|
-
if (targetKeys.includes(this.key) &&
|
|
48
|
+
if (targetKeys.includes(this.key) && typeof this.node === 'string') {
|
|
51
49
|
const nodePath = this.path; // this node's path, relative to `obj`
|
|
52
50
|
|
|
53
51
|
const fullPath = basePath.concat(this.path);
|
package/lib/specmap/index.js
CHANGED
|
@@ -1,35 +1,34 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
|
+
exports.SpecMap = void 0;
|
|
4
5
|
exports.default = mapSpec;
|
|
5
|
-
exports.plugins =
|
|
6
|
+
exports.plugins = void 0;
|
|
6
7
|
|
|
7
|
-
var
|
|
8
|
+
var _index = _interopRequireDefault(require("./lib/index.js"));
|
|
8
9
|
|
|
9
|
-
var
|
|
10
|
+
var _refs = _interopRequireDefault(require("./lib/refs.js"));
|
|
10
11
|
|
|
11
|
-
var
|
|
12
|
+
var _allOf = _interopRequireDefault(require("./lib/all-of.js"));
|
|
12
13
|
|
|
13
|
-
var
|
|
14
|
+
var _parameters = _interopRequireDefault(require("./lib/parameters.js"));
|
|
14
15
|
|
|
15
|
-
var
|
|
16
|
+
var _properties = _interopRequireDefault(require("./lib/properties.js"));
|
|
16
17
|
|
|
17
|
-
var
|
|
18
|
-
|
|
19
|
-
var _properties = _interopRequireDefault(require("./lib/properties"));
|
|
20
|
-
|
|
21
|
-
var _contextTree = _interopRequireDefault(require("./lib/context-tree"));
|
|
18
|
+
var _contextTree = _interopRequireDefault(require("./lib/context-tree.js"));
|
|
22
19
|
|
|
23
20
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
24
21
|
|
|
25
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
22
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
26
23
|
|
|
27
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
24
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
28
25
|
|
|
29
26
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
30
27
|
|
|
31
28
|
const HARD_LIMIT = 100;
|
|
32
29
|
|
|
30
|
+
const noop = () => {};
|
|
31
|
+
|
|
33
32
|
class SpecMap {
|
|
34
33
|
static getPluginName(plugin) {
|
|
35
34
|
return plugin.pluginName;
|
|
@@ -56,7 +55,7 @@ class SpecMap {
|
|
|
56
55
|
allPatches: [],
|
|
57
56
|
// only populated if showDebug is true
|
|
58
57
|
pluginProp: 'specMap',
|
|
59
|
-
libMethods: Object.assign(Object.create(this),
|
|
58
|
+
libMethods: Object.assign(Object.create(this), _index.default, {
|
|
60
59
|
getInstance: () => this
|
|
61
60
|
}),
|
|
62
61
|
allowMetaPatches: false
|
|
@@ -68,10 +67,10 @@ class SpecMap {
|
|
|
68
67
|
|
|
69
68
|
this.hasRun = this._hasRun.bind(this); // eslint-disable-line no-underscore-dangle
|
|
70
69
|
|
|
71
|
-
this.wrappedPlugins = this.plugins.map(this.wrapPlugin.bind(this)).filter(
|
|
70
|
+
this.wrappedPlugins = this.plugins.map(this.wrapPlugin.bind(this)).filter(_index.default.isFunction); // Initial patch(s)
|
|
72
71
|
|
|
73
|
-
this.patches.push(
|
|
74
|
-
this.patches.push(
|
|
72
|
+
this.patches.push(_index.default.add([], this.spec));
|
|
73
|
+
this.patches.push(_index.default.context([], this.context));
|
|
75
74
|
this.updatePatches(this.patches);
|
|
76
75
|
}
|
|
77
76
|
|
|
@@ -97,15 +96,15 @@ class SpecMap {
|
|
|
97
96
|
if (plugin[this.pluginProp]) {
|
|
98
97
|
ctx = plugin;
|
|
99
98
|
fn = plugin[this.pluginProp];
|
|
100
|
-
} else if (
|
|
99
|
+
} else if (_index.default.isFunction(plugin)) {
|
|
101
100
|
fn = plugin;
|
|
102
|
-
} else if (
|
|
101
|
+
} else if (_index.default.isObject(plugin)) {
|
|
103
102
|
fn = createKeyBasedPlugin(plugin);
|
|
104
103
|
}
|
|
105
104
|
|
|
106
105
|
return Object.assign(fn.bind(ctx), {
|
|
107
106
|
pluginName: plugin.name || name,
|
|
108
|
-
isGenerator:
|
|
107
|
+
isGenerator: _index.default.isGenerator(fn)
|
|
109
108
|
}); // Expected plugin interface: {key: string, plugin: fn*}
|
|
110
109
|
// This traverses depth-first and immediately applies yielded patches.
|
|
111
110
|
// This strategy should work well for most plugins (including the built-ins).
|
|
@@ -123,12 +122,12 @@ class SpecMap {
|
|
|
123
122
|
return function* generator(patches, specmap) {
|
|
124
123
|
const refCache = {}; // eslint-disable-next-line no-restricted-syntax
|
|
125
124
|
|
|
126
|
-
for (const patch of patches.filter(
|
|
125
|
+
for (const patch of patches.filter(_index.default.isAdditiveMutation)) {
|
|
127
126
|
yield* traverse(patch.value, patch.path, patch);
|
|
128
127
|
}
|
|
129
128
|
|
|
130
129
|
function* traverse(obj, path, patch) {
|
|
131
|
-
if (!
|
|
130
|
+
if (!_index.default.isObject(obj)) {
|
|
132
131
|
if (pluginObj.key === path[path.length - 1]) {
|
|
133
132
|
yield pluginObj.plugin(obj, pluginObj.key, path, specmap);
|
|
134
133
|
}
|
|
@@ -143,7 +142,7 @@ class SpecMap {
|
|
|
143
142
|
const val = obj[key];
|
|
144
143
|
const updatedPath = path.concat(key);
|
|
145
144
|
|
|
146
|
-
const isObj =
|
|
145
|
+
const isObj = _index.default.isObject(val);
|
|
147
146
|
|
|
148
147
|
const objRef = obj.$$ref;
|
|
149
148
|
|
|
@@ -173,8 +172,7 @@ class SpecMap {
|
|
|
173
172
|
}
|
|
174
173
|
|
|
175
174
|
nextPlugin() {
|
|
176
|
-
|
|
177
|
-
return (0, _find.default)(this.wrappedPlugins, plugin => {
|
|
175
|
+
return this.wrappedPlugins.find(plugin => {
|
|
178
176
|
const mutations = this.getMutationsForPlugin(plugin);
|
|
179
177
|
return mutations.length > 0;
|
|
180
178
|
});
|
|
@@ -215,14 +213,14 @@ class SpecMap {
|
|
|
215
213
|
}
|
|
216
214
|
|
|
217
215
|
updatePatches(patches) {
|
|
218
|
-
|
|
216
|
+
_index.default.normalizeArray(patches).forEach(patch => {
|
|
219
217
|
if (patch instanceof Error) {
|
|
220
218
|
this.errors.push(patch);
|
|
221
219
|
return;
|
|
222
220
|
}
|
|
223
221
|
|
|
224
222
|
try {
|
|
225
|
-
if (!
|
|
223
|
+
if (!_index.default.isObject(patch)) {
|
|
226
224
|
this.debug('updatePatches', 'Got a non-object patch', patch);
|
|
227
225
|
return;
|
|
228
226
|
}
|
|
@@ -231,18 +229,18 @@ class SpecMap {
|
|
|
231
229
|
this.allPatches.push(patch);
|
|
232
230
|
}
|
|
233
231
|
|
|
234
|
-
if (
|
|
232
|
+
if (_index.default.isPromise(patch.value)) {
|
|
235
233
|
this.promisedPatches.push(patch);
|
|
236
234
|
this.promisedPatchThen(patch);
|
|
237
235
|
return;
|
|
238
236
|
}
|
|
239
237
|
|
|
240
|
-
if (
|
|
238
|
+
if (_index.default.isContextPatch(patch)) {
|
|
241
239
|
this.setContext(patch.path, patch.value);
|
|
242
240
|
return;
|
|
243
241
|
}
|
|
244
242
|
|
|
245
|
-
if (
|
|
243
|
+
if (_index.default.isMutation(patch)) {
|
|
246
244
|
this.updateMutations(patch);
|
|
247
245
|
return;
|
|
248
246
|
}
|
|
@@ -259,7 +257,7 @@ class SpecMap {
|
|
|
259
257
|
patch.value = _objectSpread({}, patch.value);
|
|
260
258
|
}
|
|
261
259
|
|
|
262
|
-
const result =
|
|
260
|
+
const result = _index.default.applyPatch(this.state, patch, {
|
|
263
261
|
allowMetaPatches: this.allowMetaPatches
|
|
264
262
|
});
|
|
265
263
|
|
|
@@ -324,7 +322,7 @@ class SpecMap {
|
|
|
324
322
|
|
|
325
323
|
|
|
326
324
|
_get(path) {
|
|
327
|
-
return
|
|
325
|
+
return _index.default.getIn(this.state, path);
|
|
328
326
|
} // eslint-disable-next-line no-underscore-dangle
|
|
329
327
|
|
|
330
328
|
|
|
@@ -381,7 +379,7 @@ class SpecMap {
|
|
|
381
379
|
if (plugin !== this.currentPlugin && this.promisedPatches.length) {
|
|
382
380
|
const promises = this.promisedPatches.map(p => p.value); // Waits for all to settle instead of Promise.all which stops on rejection
|
|
383
381
|
|
|
384
|
-
return Promise.all(promises.map(promise => promise.then(
|
|
382
|
+
return Promise.all(promises.map(promise => promise.then(noop, noop))).then(() => this.dispatch());
|
|
385
383
|
} // Ok, run the plugin
|
|
386
384
|
|
|
387
385
|
|
|
@@ -419,7 +417,7 @@ class SpecMap {
|
|
|
419
417
|
|
|
420
418
|
function updatePatches(patches) {
|
|
421
419
|
if (patches) {
|
|
422
|
-
patches =
|
|
420
|
+
patches = _index.default.fullyNormalizeArray(patches);
|
|
423
421
|
that.updatePatches(patches, plugin);
|
|
424
422
|
}
|
|
425
423
|
}
|
|
@@ -3,15 +3,11 @@
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
exports.default = void 0;
|
|
5
5
|
|
|
6
|
-
var
|
|
6
|
+
var _helpers = require("../helpers.js");
|
|
7
7
|
|
|
8
|
-
var
|
|
8
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
9
9
|
|
|
10
|
-
function
|
|
11
|
-
|
|
12
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
|
|
13
|
-
|
|
14
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
10
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
15
11
|
|
|
16
12
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
17
13
|
|
|
@@ -49,7 +45,7 @@ var _default = {
|
|
|
49
45
|
});
|
|
50
46
|
originalDefinitionObj = _objectSpread({}, originalDefinitionObj); // when we've lost sight, interrupt prematurely
|
|
51
47
|
|
|
52
|
-
if (
|
|
48
|
+
if (Object.keys(originalDefinitionObj).length === 0) {
|
|
53
49
|
return undefined;
|
|
54
50
|
}
|
|
55
51
|
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
exports.default = void 0;
|
|
5
5
|
|
|
6
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
6
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
7
7
|
|
|
8
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
8
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
9
9
|
|
|
10
10
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
11
11
|
|
package/lib/specmap/lib/index.js
CHANGED
|
@@ -15,9 +15,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
15
15
|
|
|
16
16
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
17
17
|
|
|
18
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
18
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
19
19
|
|
|
20
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
20
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
21
21
|
|
|
22
22
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
23
23
|
|
|
@@ -3,13 +3,13 @@
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
exports.default = void 0;
|
|
5
5
|
|
|
6
|
-
var
|
|
6
|
+
var _index = _interopRequireDefault(require("./index.js"));
|
|
7
7
|
|
|
8
8
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
9
9
|
|
|
10
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
10
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
11
11
|
|
|
12
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
12
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
13
13
|
|
|
14
14
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
15
15
|
|
|
@@ -20,7 +20,7 @@ var _default = {
|
|
|
20
20
|
const val = Object.assign([], parameters);
|
|
21
21
|
const opPath = fullPath.slice(0, -1);
|
|
22
22
|
|
|
23
|
-
const op = _objectSpread({},
|
|
23
|
+
const op = _objectSpread({}, _index.default.getIn(specmap.spec, opPath));
|
|
24
24
|
|
|
25
25
|
parameters.forEach((param, i) => {
|
|
26
26
|
try {
|
|
@@ -33,10 +33,10 @@ var _default = {
|
|
|
33
33
|
|
|
34
34
|
return undefined;
|
|
35
35
|
});
|
|
36
|
-
return
|
|
36
|
+
return _index.default.replace(fullPath, val);
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
-
return
|
|
39
|
+
return _index.default.replace(fullPath, parameters);
|
|
40
40
|
}
|
|
41
41
|
};
|
|
42
42
|
exports.default = _default;
|
|
@@ -3,13 +3,13 @@
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
exports.default = void 0;
|
|
5
5
|
|
|
6
|
-
var
|
|
6
|
+
var _index = _interopRequireDefault(require("./index.js"));
|
|
7
7
|
|
|
8
8
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
9
9
|
|
|
10
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
10
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
11
11
|
|
|
12
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
12
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
13
13
|
|
|
14
14
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
15
15
|
|
|
@@ -30,7 +30,7 @@ var _default = {
|
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
const patch =
|
|
33
|
+
const patch = _index.default.replace(fullPath, val);
|
|
34
34
|
|
|
35
35
|
return patch;
|
|
36
36
|
}
|