@ama-sdk/core 10.0.0-next.9 → 11.0.0-next.0

package/README.md

@@ -1,40 +1,36 @@
 # @ama-sdk Core
 
-This package contains all the [plugins](/packages/@ama-sdk/core/src/plugins), helpers and object definitions to dialog with an API following the `ama-sdk` architecture.
+This package contains all the [plugins](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins), helpers and object definitions to dialog with an API following the `ama-sdk` architecture.
 
-Please refer to the [generator-sdk](/packages/@ama-sdk/generator-sdk/README.md) package for getting started with an API based on `ama-sdk`.
+Please refer to the [ama-sdk-schematics](../schematics/README.md) package for getting started with an API based on `ama-sdk`.
 
 ## Available plugins
 
-- [additional-params](/packages/@ama-sdk/core/src/plugins/additional-params)
-- [api-configuration-override](/packages/@ama-sdk/core/src/plugins/api-configuration-override)
-- [api-key](/packages/@ama-sdk/core/src/plugins/api-key)
-- [bot-protection-fingerprint](/packages/@ama-sdk/core/src/plugins/bot-protection-fingerprint)
-- [concurrent](/packages/@ama-sdk/core/src/plugins/concurrent)
-- [core](/packages/@ama-sdk/core/src/plugins/core)
-- [client-facts](/packages/@ama-sdk/core/src/plugins/client-facts)
-- [custom-info](/packages/@ama-sdk/core/src/plugins/custom-info)
-- [exception](/packages/@ama-sdk/core/src/plugins/exception)
-- [fetch-cache](/packages/@ama-sdk/core/src/plugins/fetch-cache)
-- [fetch-credentials](/packages/@ama-sdk/core/src/plugins/fetch-credentials)
-- [fetch-options](/packages/@ama-sdk/core/src/plugins/fetch-options)
-- [gateway-token](/packages/@ama-sdk/core/src/plugins/gateway-token)
-- [imperva](/packages/@ama-sdk/core/src/plugins/imperva)
-- [json-token](/packages/@ama-sdk/core/src/plugins/json-token)
-- [keepalive](/packages/@ama-sdk/core/src/plugins/keepalive)
-- [mock-intercept](/packages/@ama-sdk/core/src/plugins/mock-intercept)
-- [perf-metric](/packages/@ama-sdk/core/src/plugins/perf-metric)
-- [pii-tokenizer](/packages/@ama-sdk/core/src/plugins/pii-tokenizer)
-- [public-facts](/packages/@ama-sdk/core/src/plugins/public-facts)
-- [raw-response-info](/packages/@ama-sdk/core/src/plugins/raw-response-info)
-- [retry](/packages/@ama-sdk/core/src/plugins/retry)
-- [reviver](/packages/@ama-sdk/core/src/plugins/reviver)
-- [session-id](/packages/@ama-sdk/core/src/plugins/session-id)
-- [si-token](/packages/@ama-sdk/core/src/plugins/si-token)
-- [simple-api-key-authentication](/packages/@ama-sdk/core/src/plugins/simple-api-key-authentication)
-- [url-rewrite](/packages/@ama-sdk/core/src/plugins/url-rewrite)
-- [wait-for](/packages/@ama-sdk/core/src/plugins/wait-for)
-- [timeout](/packages/@ama-sdk/core/src/plugins/timeout)
+- [additional-params](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/additional-params)
+- [api-configuration-override](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/api-configuration-override)
+- [api-key](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/api-key)
+- [bot-protection-fingerprint](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/bot-protection-fingerprint)
+- [concurrent](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/concurrent)
+- [core](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/core)
+- [client-facts](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/client-facts)
+- [custom-info](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/custom-info)
+- [exception](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/exception)
+- [fetch-cache](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/fetch-cache)
+- [fetch-credentials](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/fetch-credentials)
+- [json-token](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/json-token)
+- [keepalive](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/keepalive)
+- [mock-intercept](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/mock-intercept)
+- [perf-metric](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/perf-metric)
+- [pii-tokenizer](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/pii-tokenizer)
+- [raw-response-info](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/raw-response-info)
+- [retry](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/retry)
+- [reviver](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/reviver)
+- [session-id](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/session-id)
+- [si-token](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/si-token)
+- [simple-api-key-authentication](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/simple-api-key-authentication)
+- [url-rewrite](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/url-rewrite)
+- [wait-for](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/wait-for)
+- [timeout](https://github.com/AmadeusITGroup/otter/tree/main/packages/%40ama-sdk/core/src/plugins/timeout)
 
 ## Available API Client
 
@@ -46,3 +42,27 @@ A list of API Clients are provided by this package:
 | ApiFetchClient   | @ama-sdk/core                            | Default API Client based on the browser FetchApi                               |
 | ApiBeaconClient  | @ama-sdk/core                            | API Client based on the browser BeaconApi, it is processing synchronous call   |
 | ApiAngularClient | @ama-sdk/core/clients/api-angular-client | API Client using the HttpClient exposed by the `@angular/common` package       |
+
+### Logs
+
+In order to ease the logging in the ama-sdk plugins, it is possible to connect to third-party logging services.
+This can be achieved by adding a `Logger` [implementation](/packages/@ama-sdk/core/src/fwk/logger.ts) to the options of an API client.
+
+For example, in the Otter showcase application, we could add a `ConsoleLogger` (from `@o3r/core`) as a parameter to the ApiFetchClient:
+
+```typescript
+const logger = new ConsoleLogger();
+function petApiFactory() {
+  const apiConfig: ApiClient = new ApiFetchClient(
+    {
+      basePath: 'https://petstore3.swagger.io/api/v3',
+      requestPlugins: [new SessionIdRequest()],
+      fetchPlugins: [],
+      logger
+    }
+  );
+  return new PetApi(apiConfig);
+}
+```
+
+> *Note*: Adding a third-party logging service is optional. If undefined, the fallback is the console logger.

package/cjs/clients/api-angular-client.js

@@ -273,7 +273,9 @@ var ApiAngularClient = /*#__PURE__*/ function() {
                                 plugin = _step.value;
                                 return [
                                     4,
-                                    plugin.load().transform(opts)
+                                    plugin.load({
+                                        logger: _this.options.logger
+                                    }).transform(opts)
                                 ];
                             case 3:
                                 opts = _state.sent();
@@ -403,6 +405,7 @@ var ApiAngularClient = /*#__PURE__*/ function() {
                                     4
                                 ];
                             case 4:
+                                // eslint-disable-next-line no-console
                                 reviver = (0, _apihelpers.getResponseReviver)(revivers, response, operationId, {
                                     disableFallback: _this.options.disableFallback,
                                     log: console.error
@@ -424,7 +427,8 @@ var ApiAngularClient = /*#__PURE__*/ function() {
                                         exception: exception,
                                         operationId: operationId,
                                         url: url,
-                                        origin: origin
+                                        origin: origin,
+                                        logger: _this.options.logger
                                     });
                                 }) : [];
                                 parsedData = root;

package/cjs/clients/api-beacon-client.js

@@ -63,7 +63,6 @@ var DEFAULT_OPTIONS = {
 };
 /**
  * Determine if the given value is a promise
- *
  * @param value The value to test
  */ var isPromise = function(value) {
     return value && typeof value.then === "function";
@@ -106,7 +105,9 @@ var ApiBeaconClient = /*#__PURE__*/ function() {
                     try {
                         for(var _iterator = this.options.requestPlugins[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                             var plugin = _step.value;
-                            var changedOpt = plugin.load().transform(opts);
+                            var changedOpt = plugin.load({
+                                logger: this.options.logger
+                            }).transform(opts);
                             if (isPromise(changedOpt)) {
                                 throw new Error("Request plugin ".concat(plugin.constructor.name, " has async transform method. Only sync methods are supported with the Beacon client."));
                             } else {

package/cjs/clients/api-fetch-client.js

@@ -287,7 +287,9 @@ var ApiFetchClient = /*#__PURE__*/ function() {
                                 plugin = _step.value;
                                 return [
                                     4,
-                                    plugin.load().transform(opts)
+                                    plugin.load({
+                                        logger: _this.options.logger
+                                    }).transform(opts)
                                 ];
                             case 3:
                                 opts = _state.sent();
@@ -365,7 +367,7 @@ var ApiFetchClient = /*#__PURE__*/ function() {
                                     ,
                                     6
                                 ]);
-                                controller = typeof AbortController !== "undefined" ? new AbortController() : undefined;
+                                controller = new AbortController();
                                 if (controller) {
                                     options.signal = controller.signal;
                                 }
@@ -378,7 +380,8 @@ var ApiFetchClient = /*#__PURE__*/ function() {
                                             options: options,
                                             fetchPlugins: loadedPlugins,
                                             controller: controller,
-                                            apiClient: _this
+                                            apiClient: _this,
+                                            logger: _this.options.logger
                                         });
                                     })));
                                 }
@@ -465,6 +468,7 @@ var ApiFetchClient = /*#__PURE__*/ function() {
                                         origin: origin
                                     });
                                 }
+                                // eslint-disable-next-line no-console
                                 reviver = (0, _apihelpers.getResponseReviver)(revivers, response, operationId, {
                                     disableFallback: _this.options.disableFallback,
                                     log: console.error
@@ -479,7 +483,8 @@ var ApiFetchClient = /*#__PURE__*/ function() {
                                         exception: exception,
                                         operationId: operationId,
                                         url: url,
-                                        origin: origin
+                                        origin: origin,
+                                        logger: _this.options.logger
                                     });
                                 }) : [];
                                 parsedData = root;

package/cjs/fwk/Reviver.js

@@ -9,14 +9,14 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    reviveMap: function() {
-        return reviveMap;
-    },
     reviveArray: function() {
         return reviveArray;
     },
     reviveDictionarizedArray: function() {
         return reviveDictionarizedArray;
+    },
+    reviveMap: function() {
+        return reviveMap;
     }
 });
 function reviveMap(data) {

package/cjs/fwk/api.helpers.js

@@ -9,8 +9,8 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    prepareUrl: function() {
-        return prepareUrl;
+    computePiiParameterTokens: function() {
+        return computePiiParameterTokens;
     },
     extractQueryParams: function() {
         return extractQueryParams;
@@ -18,17 +18,17 @@ _export(exports, {
     filterUndefinedValues: function() {
         return filterUndefinedValues;
     },
+    getResponseReviver: function() {
+        return getResponseReviver;
+    },
+    prepareUrl: function() {
+        return prepareUrl;
+    },
     processFormData: function() {
         return processFormData;
     },
-    computePiiParameterTokens: function() {
-        return computePiiParameterTokens;
-    },
     tokenizeRequestOptions: function() {
         return tokenizeRequestOptions;
-    },
-    getResponseReviver: function() {
-        return getResponseReviver;
     }
 });
 function _array_like_to_array(arr, len) {
@@ -180,7 +180,6 @@ endpoint) {
         disableFallback: false,
         log: console.error
     };
-    var _options;
     var logPrefix = "API status code error for ".concat(endpoint || "unknown", " endpoint");
     var logMsg = options.log || function() {};
     if (!response || !response.ok) {
@@ -192,7 +191,7 @@ endpoint) {
     if (response.status && revivers[response.status]) {
         return revivers[response.status];
     }
-    if ((_options = options) === null || _options === void 0 ? void 0 : _options.disableFallback) {
+    if (options === null || options === void 0 ? void 0 : options.disableFallback) {
         logMsg("".concat(logPrefix, " - Missing ").concat(response.status, " from API specification - fallback is deactivated, no revive will run on this response"));
         return undefined;
     }

package/cjs/fwk/api.js

@@ -10,6 +10,6 @@ Object.defineProperty(exports, "ApiTypes", {
 });
 var ApiTypes;
 (function(ApiTypes) {
-    ApiTypes[ApiTypes[/** Digital API */ "DAPI"] = 0] = "DAPI";
-    ApiTypes[ApiTypes[/** External API */ "DEFAULT"] = 1] = "DEFAULT";
+    /** Digital API */ ApiTypes[ApiTypes["DAPI"] = 0] = "DAPI";
+    /** External API */ ApiTypes[ApiTypes["DEFAULT"] = 1] = "DEFAULT";
 })(ApiTypes || (ApiTypes = {}));

package/cjs/fwk/date.js

@@ -9,8 +9,8 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    utils: function() {
-        return utils;
+    CommonDate: function() {
+        return CommonDate;
     },
     _NativeDateClass: function() {
         return _NativeDateClass;
@@ -18,8 +18,8 @@ _export(exports, {
     pad: function() {
         return pad;
     },
-    CommonDate: function() {
-        return CommonDate;
+    utils: function() {
+        return utils;
     }
 });
 function _array_like_to_array(arr, len) {
@@ -228,12 +228,6 @@ var CommonDate = /*#__PURE__*/ function(Date1) {
         ].concat(_to_consumable_array(args)));
     }
     _create_class(CommonDate, [
-        {
-            key: "dateInstance",
-            get: /** @deprecated will be removed in v10 */ function get() {
-                return this;
-            }
-        },
         {
             key: "toJSON",
             value: /**
@@ -248,24 +242,6 @@ var CommonDate = /*#__PURE__*/ function(Date1) {
 var utils;
 (function(utils) {
     "use strict";
-    var processFormData = function processFormData(headers, data, type) {
-        var encodedData;
-        if (type === "multipart/form-data") {
-            var formData = new FormData();
-            for(var i in data){
-                formData.append(i, data[i]);
-            }
-            encodedData = formData;
-        } else {
-            headers.set("Content-Type", "application/x-www-form-urlencoded");
-            var formData1 = [];
-            for(var i1 in data){
-                formData1.push("".concat(i1, "=").concat(encodeURIComponent(data[i1])));
-            }
-            encodedData = formData1.join("&");
-        }
-        return encodedData;
-    };
     var _$Date = /*#__PURE__*/ function(CommonDate) {
         _inherits(Date1, CommonDate);
         var _super = _create_super(Date1);
@@ -334,20 +310,9 @@ var utils;
                 value: /**
      * To ensure that users cannot use a standard Date instead of utils.DateTime
      */ function _DateTime() {}
-            },
-            {
-                key: "getUtilsDate",
-                value: /**
-     * Get an instance of utils.Date base on the current date
-     *
-     * @deprecated will be removed in v10
-     */ function getUtilsDate() {
-                    return new _$Date(this);
-                }
             }
         ]);
         return DateTime;
     }(CommonDate);
     utils.DateTime = DateTime;
-    utils.processFormData = processFormData;
 })(utils || (utils = {}));

package/cjs/fwk/errors.js

@@ -11,23 +11,23 @@ function _export(target, all) {
     });
 }
 _export(exports, {
+    CanceledCallError: function() {
+        return CanceledCallError;
+    },
+    EmptyResponseError: function() {
+        return EmptyResponseError;
+    },
     GenericError: function() {
         return GenericError;
     },
     RequestFailedError: function() {
         return RequestFailedError;
     },
-    EmptyResponseError: function() {
-        return EmptyResponseError;
-    },
-    ResponseTimeoutError: function() {
-        return ResponseTimeoutError;
-    },
     ResponseJSONParseError: function() {
         return ResponseJSONParseError;
     },
-    CanceledCallError: function() {
-        return CanceledCallError;
+    ResponseTimeoutError: function() {
+        return ResponseTimeoutError;
     }
 });
 function _assert_this_initialized(self) {
@@ -166,10 +166,9 @@ var GenericError = /*#__PURE__*/ function(Error1) {
     var _super = _create_super(GenericError);
     function GenericError(message, context) {
         _class_call_check(this, GenericError);
-        var _context, _context1;
         var httpRegexp = /^https?:\/\//;
-        var baseUrl = ((_context = context) === null || _context === void 0 ? void 0 : _context.url) ? context.url.replace(httpRegexp, "") : "unknown";
-        var origin = ((_context1 = context) === null || _context1 === void 0 ? void 0 : _context1.origin) ? context.origin.replace(httpRegexp, "") : "unknown";
+        var baseUrl = (context === null || context === void 0 ? void 0 : context.url) ? context.url.replace(httpRegexp, "") : "unknown";
+        var origin = (context === null || context === void 0 ? void 0 : context.origin) ? context.origin.replace(httpRegexp, "") : "unknown";
         return _super.call(this, context ? "[SDK] [apiName: ".concat(context.apiName || "unknown", "] [operationId: ").concat(context.operationId || "unknown", "] [baseUrl: ").concat(baseUrl, "] [origin: ").concat(origin, "] [errorType: SDK] ").concat(message) : "[SDK] ".concat(message));
     }
     return GenericError;

package/cjs/fwk/index.js

@@ -9,6 +9,7 @@ _export_star(require("./core/index"), exports);
 _export_star(require("./date"), exports);
 _export_star(require("./errors"), exports);
 _export_star(require("./ignore-enum.type"), exports);
+_export_star(require("./logger"), exports);
 _export_star(require("./mocks/index"), exports);
 _export_star(require("./Reviver"), exports);
 function _export_star(from, to) {

package/cjs/fwk/logger.js

@@ -0,0 +1,9 @@
+/**
+ * Logger Client interface.
+ *
+ * Duplicate from [@o3r/core]{@link https://github.com/AmadeusITGroup/otter/blob/main/packages/%40o3r/core/src/log/logger.ts}
+ * All modifications should be made in both interfaces
+ */ "use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});

package/cjs/fwk/mocks/alf-mock-adapter.js

@@ -203,7 +203,6 @@ function _ts_generator(thisArg, body) {
  */ var requestResponseJsonRegexp = RegExp(/(^{.*}$)/m);
 /**
  * Split the logs
- *
  * @param log alf log
  * @returns an array containing one message each
  */ function splitCalls(log) {
@@ -211,7 +210,6 @@ function _ts_generator(thisArg, body) {
 }
 /**
  * Get AlfCall corresponding to this log if it is a request received by the SI
- *
  * @param log alf log
  * @param corrId correlationId
  * @param operationAdapter operation adapter to bind each request with its operationId
@@ -237,7 +235,6 @@ function _ts_generator(thisArg, body) {
 }
 /**
  * Returns true if log is detected as a HTTP response
- *
  * @param log alf log
  * @returns true if found
  */ function isResponse(log) {
@@ -246,7 +243,6 @@ function _ts_generator(thisArg, body) {
 }
 /**
  * Return JSON data found
- *
  * @param log alf log
  * @returns JSON data that can be either the request or the response
  */ function getData(log) {
@@ -257,7 +253,6 @@ function _ts_generator(thisArg, body) {
  * Retrieve path from logPath and parse it to find all the calls.
  * If the logs file contains more than one entry point this methods will separate them in Steps.
  * First call will represent the request and last call the response.
- *
  * @param log Content of the alf logs
  * @param operationAdapter operation adapter to bind each request/response with its operationId
  * @returns an array of AlfCall found in the logs
@@ -270,10 +265,9 @@ function _ts_generator(thisArg, body) {
     try {
         var _loop = function() {
             var callMatch = _step.value;
-            var _match;
             // we look for corrID to be able to match request and response
             var match = callMatch.match(correlationIdRegex);
-            var corrId = (_match = match) === null || _match === void 0 ? void 0 : _match[1];
+            var corrId = match === null || match === void 0 ? void 0 : match[1];
             if (!corrId) {
                 // without correlationId it will be impossible to match the response with the request
                 return "continue";
@@ -319,7 +313,6 @@ function _ts_generator(thisArg, body) {
 }
 /**
  * Build the actual mock map corresponding to these alfCalls
- *
  * @param log Content of the alf logs
  * @param operationAdapter operation adapter to bind each request/response with its operationId
  * @returns mock map, key is the operation id, value is an array of the API replies

package/cjs/fwk/mocks/base-mock-adapter.js

@@ -194,18 +194,6 @@ var BaseMockAdapter = /*#__PURE__*/ function() {
                 return id;
             }
         },
-        {
-            key: "getOperationId",
-            value: /**
-   * @inheritDoc
-   */ function getOperationId(request) {
-                if (typeof this.pathObjects === "function") {
-                    throw new Error("The pathObjects argument must be of type PathObject[]");
-                }
-                var object = (0, _helpers.getPath)(request.basePath, this.pathObjects, request.method);
-                return this.extractOperationIdFromPath(request, object);
-            }
-        },
         {
             key: "retrieveOperationId",
             value: /**

package/cjs/plugins/additional-params/additional-params.request.js

@@ -9,11 +9,11 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    isStringOrUndefined: function() {
-        return isStringOrUndefined;
-    },
     AdditionalParamsRequest: function() {
         return AdditionalParamsRequest;
+    },
+    isStringOrUndefined: function() {
+        return isStringOrUndefined;
     }
 });
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
@@ -106,13 +106,13 @@ function _ts_generator(thisArg, body) {
         trys: [],
         ops: []
     };
-    return(g = {
+    return g = {
         next: verb(0),
         "throw": verb(1),
         "return": verb(2)
     }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
         return this;
-    }), g);
+    }), g;
     function verb(n) {
         return function(v) {
             return step([

package/cjs/plugins/api-configuration-override/api-configuration-override.request.js

@@ -79,13 +79,13 @@ function _ts_generator(thisArg, body) {
         trys: [],
         ops: []
     };
-    return(g = {
+    return g = {
         next: verb(0),
         "throw": verb(1),
         "return": verb(2)
     }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
         return this;
-    }), g);
+    }), g;
     function verb(n) {
         return function(v) {
             return step([

package/cjs/plugins/api-key/api-key.request.js

@@ -79,13 +79,13 @@ function _ts_generator(thisArg, body) {
         trys: [],
         ops: []
     };
-    return(g = {
+    return g = {
         next: verb(0),
         "throw": verb(1),
         "return": verb(2)
     }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
         return this;
-    }), g);
+    }), g;
     function verb(n) {
         return function(v) {
             return step([