kuzzle 2.16.8 → 2.17.0

package/lib/api/openapi/{document → components/document}/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpenApiDocumentDeleteByQueryComponent = exports.OpenApiDocumentDeleteByQuery = exports.OpenApiDocumentDeleteComponent = exports.OpenApiDocumentDelete = exports.OpenApiDocumentScrollComponent = exports.OpenApiDocumentScroll = exports.OpenApiDocumentUpdateComponent = exports.OpenApiDocumentUpdate = exports.OpenApiDocumentExistsComponent = exports.OpenApiDocumentExists = exports.OpenApiDocumentReplaceComponent = exports.OpenApiDocumentReplace = exports.OpenApiDocumentGetComponent = exports.OpenApiDocumentGet = exports.OpenApiDocumentCreateOrReplaceComponent = exports.OpenApiDocumentCreateOrReplace = exports.OpenApiDocumentCreateComponent = exports.OpenApiDocumentCreate = exports.OpenApiDocumentCountComponent = exports.OpenApiDocumentCount = void 0;
-const readYamlFile_1 = require("../../../util/readYamlFile");
+exports.OpenApiDocumentValidateComponent = exports.OpenApiDocumentValidate = exports.OpenApiDocumentDeleteByQueryComponent = exports.OpenApiDocumentDeleteByQuery = exports.OpenApiDocumentDeleteComponent = exports.OpenApiDocumentDelete = exports.OpenApiDocumentScrollComponent = exports.OpenApiDocumentScroll = exports.OpenApiDocumentUpdateComponent = exports.OpenApiDocumentUpdate = exports.OpenApiDocumentExistsComponent = exports.OpenApiDocumentExists = exports.OpenApiDocumentReplaceComponent = exports.OpenApiDocumentReplace = exports.OpenApiDocumentGetComponent = exports.OpenApiDocumentGet = exports.OpenApiDocumentCreateOrReplaceComponent = exports.OpenApiDocumentCreateOrReplace = exports.OpenApiDocumentCreateComponent = exports.OpenApiDocumentCreate = exports.OpenApiDocumentCountComponent = exports.OpenApiDocumentCount = void 0;
+const readYamlFile_1 = require("../../../../util/readYamlFile");
 // reading the description of the Count action in the controller document.
 // The yaml objects are then stored in the variables below
 const countObject = (0, readYamlFile_1.readYamlFile)(__dirname + '/count.yaml');
@@ -52,4 +52,9 @@ exports.OpenApiDocumentDeleteComponent = deleteObject.components.schemas;
 const deleteByQueryObject = (0, readYamlFile_1.readYamlFile)(__dirname + '/deleteByQuery.yaml');
 exports.OpenApiDocumentDeleteByQuery = deleteByQueryObject.DocumentDeleteByQuery;
 exports.OpenApiDocumentDeleteByQueryComponent = deleteByQueryObject.components.schemas;
+// reading the description of the Validate action in the controller document.
+// The yaml objects are then stored in the variables below
+const validateObject = (0, readYamlFile_1.readYamlFile)(__dirname + '/validate.yaml');
+exports.OpenApiDocumentValidate = validateObject.DocumentValidate;
+exports.OpenApiDocumentValidateComponent = validateObject.components.schemas;
 //# sourceMappingURL=index.js.map

package/lib/api/openapi/{document → components/document}/replace.yaml

@@ -35,12 +35,12 @@ DocumentReplace:
       description: "Replaces the content of an existing document."
       required: true
       schema:
-        $ref: "#/components/schemas/DocumentReplaceRequest"
+        $ref: "#/components/document/DocumentReplaceRequest"
   responses:
     200:
       description: "Replaces the content of an existing document."
       schema:
-        $ref: "#/components/schemas/DocumentReplaceResponse"
+        $ref: "#/components/document/DocumentReplaceResponse"
 
 components:
   schemas:

package/lib/api/openapi/{document → components/document}/scroll.yaml

@@ -19,7 +19,7 @@ DocumentScroll:
     200:
       description: "Moves a search cursor forward."
       schema:
-        $ref: "#/components/schemas/DocumentScrollResponse"
+        $ref: "#/components/document/DocumentScrollResponse"
 
 components:
   schemas:

package/lib/api/openapi/{document → components/document}/update.yaml

@@ -47,12 +47,12 @@ DocumentUpdate:
       description: "Updates a document content."
       required: true
       schema:
-        $ref: "#/components/schemas/DocumentUpdateRequest"
+        $ref: "#/components/document/DocumentUpdateRequest"
   responses:
     200:
       description: "Updates a document content."
       schema:
-        $ref: "#/components/schemas/DocumentUpdateResponse"
+        $ref: "#/components/document/DocumentUpdateResponse"
 
 components:
   schemas:

package/lib/api/openapi/components/document/validate.yaml

@@ -0,0 +1,42 @@
+DocumentValidate:
+  summary: "Validates data against existing validation rules."
+  tags:
+    - document
+  parameters:
+    - in: path
+      name: index
+      schema:
+        type: string
+    - in: path
+      name: collection
+      schema:
+        type: string
+    - in: body
+      name: "body"
+      description: "Document content to check."
+      required: true
+      schema:
+        $ref: "#/components/document/DocumentValidateRequest"
+  responses:
+    200:
+      description: "Returns the document validation status."
+      schema:
+        $ref: "#/components/document/DocumentValidateResponse"
+
+components:
+  schemas:
+    DocumentValidateRequest:
+      allOf:
+        - type: "object"
+          description: "document content"
+
+    DocumentValidateResponse:
+      allOf:
+        - $ref: "#/components/ResponsePayload"
+        - type: "object"
+          properties:
+            result:
+              type: "object"
+              properties:
+                valid:
+                  type: "boolean"

package/lib/api/openapi/components/index.d.ts

@@ -0,0 +1,2 @@
+export * from './document';
+export declare const OpenApiPayloadsDefinitions: any;

package/lib/api/openapi/components/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpenApiPayloadsDefinitions = void 0;
+const readYamlFile_1 = require("../../../util/readYamlFile");
+__exportStar(require("./document"), exports);
+// Document definitions (reusable object for KuzzleRequest and KuzzleResponse)
+exports.OpenApiPayloadsDefinitions = (0, readYamlFile_1.readYamlFile)(__dirname + '/payloads.yaml').definitions;
+//# sourceMappingURL=index.js.map

package/lib/api/openapi/index.d.ts

@@ -1,2 +1 @@
-export * from './document';
-export declare const OpenApiPayloadsDefinitions: any;
+export * from './OpenApiManager';

package/lib/api/openapi/index.js

@@ -10,9 +10,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpenApiPayloadsDefinitions = void 0;
-const readYamlFile_1 = require("../../util/readYamlFile");
-__exportStar(require("./document"), exports);
-// Document definitions (reusable object for KuzzleRequest and KuzzleResponse)
-exports.OpenApiPayloadsDefinitions = (0, readYamlFile_1.readYamlFile)(__dirname + '/payloads.yaml').definitions;
+__exportStar(require("./OpenApiManager"), exports);
 //# sourceMappingURL=index.js.map

package/lib/api/openapi/openApiGenerator.d.ts

@@ -0,0 +1,7 @@
+import { JSONObject } from '../../../index';
+/**
+ * Generates JSON OpenApi object
+ *
+ * @returns {object} openApi object
+ */
+export declare function generateOpenApi(routes: JSONObject[], definition: JSONObject): JSONObject;

package/lib/api/openapi/openApiGenerator.js

@@ -0,0 +1,133 @@
+"use strict";
+/*
+ * Kuzzle, a backend software, self-hostable and ready to use
+ * to power modern apps
+ *
+ * Copyright 2015-2020 Kuzzle
+ * mailto: support AT kuzzle.io
+ * website: http://kuzzle.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateOpenApi = void 0;
+const lodash_1 = __importDefault(require("lodash"));
+const inflector_1 = require("../../util/inflector");
+const routeUrlMatch = /:([^/]*)/g;
+/**
+ * Generate basic openApi Controller
+ */
+function generateController(route, definition) {
+    if (route.controller === undefined) {
+        return;
+    }
+    if (!lodash_1.default.some(definition.tags, { name: route.controller })) {
+        const capitalizedController = inflector_1.Inflector.pascalCase(route.controller);
+        definition.tags.push({
+            description: `${capitalizedController} Controller`,
+            name: route.controller
+        });
+    }
+    if (route.openapi.tags === undefined) {
+        route.openapi.tags = [];
+    }
+    if (!route.openapi.tags.includes(route.controller)) {
+        route.openapi.tags.push(route.controller);
+    }
+}
+/**
+ * Generate basic openApi Summary
+ */
+function generateSummary(route) {
+    if (route.openapi.description === undefined) {
+        route.openapi.description = `Controller: ${route.controller}.`;
+    }
+    if (route.openapi.summary === undefined) {
+        route.openapi.summary = `Action: ${route.action}.`;
+    }
+}
+/**
+ * Generate basic openApi Parameters
+ */
+function generateParameters(route) {
+    if (route.openapi.parameters === undefined) {
+        route.openapi.parameters = [];
+        let m = routeUrlMatch.exec(route.path);
+        while (m !== null) {
+            routeUrlMatch.lastIndex++;
+            route.openapi.parameters.push({
+                in: 'path',
+                name: m[1],
+                required: true,
+                schema: { type: 'string' }
+            });
+            m = routeUrlMatch.exec(route.path);
+        }
+    }
+    if (route.openapi.parameters.length === 0) {
+        route.openapi.parameters = undefined;
+    }
+}
+/**
+ * Generate basic openApi Response
+ */
+function generateResponse(route) {
+    if (route.openapi.responses === undefined) {
+        route.openapi.responses = {
+            '200': {
+                description: 'OK'
+            }
+        };
+    }
+}
+/**
+ * Generates JSON OpenApi object
+ *
+ * @returns {object} openApi object
+ */
+function generateOpenApi(routes, definition) {
+    for (const route of routes) {
+        // Make sure route verbs are lowercase
+        if (route.verb !== undefined) {
+            route.verb = route.verb.toLowerCase();
+        }
+        // Set :param notation to {param}
+        route.formattedPath = route.path.replace(routeUrlMatch, '{$1}');
+        if (definition.paths[route.formattedPath] === undefined) {
+            definition.paths[route.formattedPath] = {};
+        }
+        if (definition.paths[route.formattedPath][route.verb] !== undefined) {
+            continue;
+        }
+        // If custom specification, return as it is
+        if (route.openapi) {
+            generateController(route, definition);
+            definition.paths[route.formattedPath][route.verb] = route.openapi;
+            continue;
+        }
+        if (route.openapi === undefined) {
+            route.openapi = {};
+        }
+        generateController(route, definition);
+        generateSummary(route);
+        generateParameters(route);
+        generateResponse(route);
+        definition.paths[route.formattedPath][route.verb] = route.openapi;
+    }
+    return definition;
+}
+exports.generateOpenApi = generateOpenApi;
+//# sourceMappingURL=openApiGenerator.js.map

package/lib/api/request/kuzzleRequest.d.ts

@@ -161,7 +161,7 @@ export declare class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not a number
      */
-    getBodyNumber(name: string, def?: number | null): number;
+    getBodyNumber(name: string, def?: number | undefined): number;
     /**
      * Gets a parameter from a request body and checks that it is a integer
      *
@@ -174,7 +174,7 @@ export declare class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not an integer
      */
-    getBodyInteger(name: string, def?: number | null): number;
+    getBodyInteger(name: string, def?: number | undefined): number;
     /**
      * Gets a parameter from a request body and checks that it is a string
      *
@@ -187,7 +187,7 @@ export declare class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not a string
      */
-    getBodyString(name: string, def?: string | null): string;
+    getBodyString(name: string, def?: string | undefined): string;
     /**
      * Gets a parameter from a request body and checks that it is an array
      *
@@ -200,7 +200,7 @@ export declare class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not an array
      */
-    getBodyArray(name: string, def?: [] | null): any[];
+    getBodyArray(name: string, def?: [] | undefined): any[];
     /**
      * Gets a parameter from a request body and checks that it is an object
      *
@@ -213,7 +213,7 @@ export declare class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not an object
      */
-    getBodyObject(name: string, def?: JSONObject | null): JSONObject;
+    getBodyObject(name: string, def?: JSONObject | undefined): JSONObject;
     /**
      * Gets a parameter from a request arguments and checks that it is a boolean
      * Contrary to other parameter types, an unset boolean does not trigger an
@@ -232,7 +232,7 @@ export declare class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not a number
      */
-    getNumber(name: string, def?: number | null): number;
+    getNumber(name: string, def?: number | undefined): number;
     /**
      * Gets a parameter from a request arguments and checks that it is an integer
      *
@@ -243,7 +243,7 @@ export declare class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not an integer
      */
-    getInteger(name: string, def?: number | null): number;
+    getInteger(name: string, def?: number | undefined): number;
     /**
      * Gets a parameter from a request arguments and checks that it is a string
      *
@@ -254,7 +254,7 @@ export declare class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not a string
      */
-    getString(name: string, def?: string | null): string;
+    getString(name: string, def?: string | undefined): string;
     /**
      * Gets a parameter from a request arguments and checks that it is an array
      *
@@ -265,7 +265,7 @@ export declare class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not an array
      */
-    getArray(name: string, def?: [] | null): any[];
+    getArray(name: string, def?: [] | undefined): any[];
     /**
      * Gets a parameter from a request arguments and checks that it is an object
      *
@@ -276,7 +276,7 @@ export declare class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not an object
      */
-    getObject(name: string, def?: JSONObject | null): JSONObject;
+    getObject(name: string, def?: JSONObject | undefined): JSONObject;
     /**
      * Returns the index specified in the request
      */
@@ -300,7 +300,7 @@ export declare class KuzzleRequest {
      * @throws {api.assert.body_required} If the body is not set and if no default
      *                                    value is provided
      */
-    getBody(def?: JSONObject | null): JSONObject;
+    getBody(def?: JSONObject | undefined): JSONObject;
     /**
      * Returns the `_id` specified in the request.
      *

package/lib/api/request/kuzzleRequest.js

@@ -50,8 +50,10 @@ const requestResponse_1 = require("./requestResponse");
 const requestContext_1 = require("./requestContext");
 const errors_1 = require("../../kerror/errors");
 const kerror_1 = __importDefault(require("../../kerror"));
+const types_1 = require("../../types");
 const assert = __importStar(require("../../util/assertType"));
 const safeObject_1 = require("../../util/safeObject");
+const lodash_1 = require("lodash");
 const assertionError = kerror_1.default.wrap('api', 'assert');
 // private properties
 // \u200b is a zero width space, used to masquerade console.log output
@@ -216,6 +218,9 @@ class KuzzleRequest {
         if (result instanceof Error) {
             throw new errors_1.InternalError('cannot set an error as a request\'s response');
         }
+        if (this.context.connection.protocol !== 'http' && result instanceof types_1.HttpStream) {
+            throw kerror_1.default.get('api', 'assert', 'forbidden_stream');
+        }
         this.status = options.status || 200;
         if (options.headers) {
             this.response.setHeaders(options.headers);
@@ -349,10 +354,10 @@ class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not a number
      */
-    getBodyNumber(name, def = null) {
+    getBodyNumber(name, def = undefined) {
         const body = this.input.body;
         if (body === null) {
-            if (def !== null) {
+            if (def !== undefined) {
                 return def;
             }
             throw assertionError.get('body_required');
@@ -371,10 +376,10 @@ class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not an integer
      */
-    getBodyInteger(name, def = null) {
+    getBodyInteger(name, def = undefined) {
         const body = this.input.body;
         if (body === null) {
-            if (def !== null) {
+            if (def !== undefined) {
                 return def;
             }
             throw assertionError.get('body_required');
@@ -393,10 +398,10 @@ class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not a string
      */
-    getBodyString(name, def = null) {
+    getBodyString(name, def = undefined) {
         const body = this.input.body;
         if (body === null) {
-            if (def !== null) {
+            if (def !== undefined) {
                 return def;
             }
             throw assertionError.get('body_required');
@@ -415,10 +420,10 @@ class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not an array
      */
-    getBodyArray(name, def = null) {
+    getBodyArray(name, def = undefined) {
         const body = this.input.body;
         if (body === null) {
-            if (def !== null) {
+            if (def !== undefined) {
                 return def;
             }
             throw assertionError.get('body_required');
@@ -437,10 +442,10 @@ class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not an object
      */
-    getBodyObject(name, def = null) {
+    getBodyObject(name, def = undefined) {
         const body = this.input.body;
         if (body === null) {
-            if (def !== null) {
+            if (def !== undefined) {
                 return def;
             }
             throw assertionError.get('body_required');
@@ -467,7 +472,7 @@ class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not a number
      */
-    getNumber(name, def = null) {
+    getNumber(name, def = undefined) {
         return this._getNumber(this.input.args, name, name, def);
     }
     /**
@@ -480,7 +485,7 @@ class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not an integer
      */
-    getInteger(name, def = null) {
+    getInteger(name, def = undefined) {
         return this._getInteger(this.input.args, name, name, def);
     }
     /**
@@ -493,7 +498,7 @@ class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not a string
      */
-    getString(name, def = null) {
+    getString(name, def = undefined) {
         return this._getString(this.input.args, name, name, def);
     }
     /**
@@ -506,7 +511,7 @@ class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not an array
      */
-    getArray(name, def = null) {
+    getArray(name, def = undefined) {
         return this._getArray(this.input.args, name, name, def);
     }
     /**
@@ -519,7 +524,7 @@ class KuzzleRequest {
      *                                       value provided
      * @throws {api.assert.invalid_type} If the fetched parameter is not an object
      */
-    getObject(name, def = null) {
+    getObject(name, def = undefined) {
         return this._getObject(this.input.args, name, name, def);
     }
     /**
@@ -565,9 +570,9 @@ class KuzzleRequest {
      * @throws {api.assert.body_required} If the body is not set and if no default
      *                                    value is provided
      */
-    getBody(def = null) {
+    getBody(def = undefined) {
         if (this.input.body === null) {
-            if (def !== null) {
+            if (def !== undefined) {
                 return def;
             }
             throw assertionError.get('body_required');
@@ -685,7 +690,7 @@ class KuzzleRequest {
      * @param errorName name to use in error messages
      */
     _getBoolean(obj, name, errorName) {
-        let value = (0, safeObject_1.get)(obj, name);
+        let value = (0, lodash_1.get)(obj, name);
         // In HTTP, booleans are flags: if it's in the querystring, it's set,
         // whatever its value.
         // If a user needs to unset the option, they need to remove it from the
@@ -713,12 +718,9 @@ class KuzzleRequest {
      * @param errorName - name to use in error messages
      * @param def default value
      */
-    _getNumber(obj, name, errorName, def = null) {
-        let value = (0, safeObject_1.get)(obj, name);
-        if (value === undefined || value === null) {
-            if (def !== null) {
-                return def;
-            }
+    _getNumber(obj, name, errorName, def = undefined) {
+        let value = (0, lodash_1.get)(obj, name, def);
+        if (value === undefined) {
             throw assertionError.get('missing_argument', errorName);
         }
         value = Number.parseFloat(value);
@@ -735,12 +737,9 @@ class KuzzleRequest {
      * @param errorName name to use in error messages
      * @param def default value
      */
-    _getInteger(obj, name, errorName, def = null) {
-        let value = (0, safeObject_1.get)(obj, name);
-        if (value === undefined || value === null) {
-            if (def !== null) {
-                return def;
-            }
+    _getInteger(obj, name, errorName, def = undefined) {
+        let value = (0, lodash_1.get)(obj, name, def);
+        if (value === undefined) {
             throw assertionError.get('missing_argument', errorName);
         }
         value = Number.parseFloat(value);
@@ -757,12 +756,9 @@ class KuzzleRequest {
      * @param errorName name to use in error messages
      * @param def default value
      */
-    _getString(obj, name, errorName, def = null) {
-        const value = (0, safeObject_1.get)(obj, name);
-        if (value === undefined || value === null) {
-            if (def !== null) {
-                return def;
-            }
+    _getString(obj, name, errorName, def = undefined) {
+        const value = (0, lodash_1.get)(obj, name, def);
+        if (value === undefined) {
             throw assertionError.get('missing_argument', errorName);
         }
         if (typeof value !== 'string') {
@@ -778,12 +774,9 @@ class KuzzleRequest {
      * @param errorName name to use in error messages
      * @param def default value
      */
-    _getArray(obj, name, errorName, def = null) {
-        const value = (0, safeObject_1.get)(obj, name);
-        if (value === undefined || value === null) {
-            if (def !== null) {
-                return def;
-            }
+    _getArray(obj, name, errorName, def = undefined) {
+        const value = (0, lodash_1.get)(obj, name, def);
+        if (value === undefined) {
             throw assertionError.get('missing_argument', errorName);
         }
         if (!Array.isArray(value)) {
@@ -799,12 +792,9 @@ class KuzzleRequest {
      * @param errorName name to use in error messages
      * @param def default value
      */
-    _getObject(obj, name, errorName, def = null) {
-        const value = (0, safeObject_1.get)(obj, name);
-        if (value === undefined || value === null) {
-            if (def !== null) {
-                return def;
-            }
+    _getObject(obj, name, errorName, def = undefined) {
+        const value = (0, lodash_1.get)(obj, name, def);
+        if (value === undefined) {
             throw assertionError.get('missing_argument', errorName);
         }
         if (!(0, safeObject_1.isPlainObject)(value)) {