@looker/sdk-codegen 21.8.2 → 21.9.2

package/lib/sdkModels.js

@@ -3,28 +3,27 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.typeRefs = exports.typeOfType = exports.titleCase = exports.tagTypes = exports.strWrite = exports.strRequest = exports.strBody = exports.setToCriteria = exports.safeName = exports.methodRefs = exports.mayQuote = exports.keyValues = exports.isSpecialName = exports.firstMethodRef = exports.firstCase = exports.describeParam = exports.criteriaToSet = exports.camelCase = exports.WriteType = exports.TypeOfType = exports.Type = exports.SearchCriterion = exports.SearchAll = exports.RequestType = exports.Property = exports.Parameter = exports.Method = exports.MetaType = exports.IntrinsicType = exports.HashType = exports.EnumType = exports.DelimArrayType = exports.ArrayType = exports.ApiModel = void 0;
+exports.typeRefs = exports.typeOfType = exports.titleCase = exports.tagTypes = exports.strWrite = exports.strRequest = exports.strBody = exports.specToModel = exports.setToCriteria = exports.safeName = exports.parseFields = exports.methodRefs = exports.mayQuote = exports.keyValues = exports.isSpecialName = exports.firstMethodRef = exports.firstCase = exports.describeParam = exports.criteriaToSet = exports.camelCase = exports.WriteType = exports.TypeOfType = exports.Type = exports.SearchCriterion = exports.SearchAll = exports.RequestType = exports.Property = exports.Parameter = exports.Method = exports.MetaType = exports.IntrinsicType = exports.HashType = exports.EnumType = exports.DelimArrayType = exports.ArrayType = exports.ApiModel = void 0;
 var OAS = _interopRequireWildcard(require("openapi3-ts"));
 var _blueimpMd = _interopRequireDefault(require("blueimp-md5"));
+var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
 var _sdkRtl = require("@looker/sdk-rtl");
+var _specConverter = require("./specConverter");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-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; }
-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; }
-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; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-var strBody = 'body';
-exports.strBody = strBody;
-var strRequest = 'Request';
-exports.strRequest = strRequest;
-var strWrite = 'Write';
-exports.strWrite = strWrite;
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var strBody = exports.strBody = 'body';
+var strRequest = exports.strRequest = 'Request';
+var strWrite = exports.strWrite = 'Write';
 var lookerValuesTag = 'x-looker-values';
 var enumTag = 'enum';
 var simpleName = /^[a-z_][a-z_\d]*(\[])?$/im;
-var TypeOfType = function (TypeOfType) {
+var TypeOfType = exports.TypeOfType = function (TypeOfType) {
   TypeOfType[TypeOfType["Intrinsic"] = 0] = "Intrinsic";
   TypeOfType[TypeOfType["Array"] = 1] = "Array";
   TypeOfType[TypeOfType["Hash"] = 2] = "Hash";
@@ -33,7 +32,74 @@ var TypeOfType = function (TypeOfType) {
   TypeOfType[TypeOfType["Complex"] = 5] = "Complex";
   return TypeOfType;
 }({});
-exports.TypeOfType = TypeOfType;
+var parseFields = fields => {
+  function splitConsideringParentheses(segment) {
+    var parts = [];
+    var currentPart = '';
+    var openParentheses = 0;
+    var lastChar = '';
+    function charCheck(char) {
+      if (lastChar === char) {
+        if (char === '(' || char === ')' && openParentheses < 0) {
+          throw new Error("Unexpected '".concat(char, "' after '").concat(currentPart, "' parens:").concat(openParentheses));
+        }
+      }
+    }
+    for (var char of segment) {
+      if (char === '(') {
+        openParentheses++;
+        charCheck(char);
+      } else if (char === ')') {
+        openParentheses--;
+        charCheck(char);
+      }
+      if (char === ',' && openParentheses === 0) {
+        parts.push(currentPart);
+        currentPart = '';
+      } else {
+        currentPart += char;
+      }
+      lastChar = char;
+    }
+    if (currentPart) {
+      parts.push(currentPart);
+    }
+    return parts;
+  }
+  function parseSegment(segment) {
+    var parts = splitConsideringParentheses(segment);
+    var result = {};
+    parts.forEach(part => {
+      var [key, nestedStr] = part.split(/\((.+)/);
+      key = key.trim();
+      if (nestedStr) {
+        nestedStr = nestedStr.slice(0, -1);
+        if (key in result) {
+          throw new Error("Duplicate '".concat(key, "' found"));
+        }
+        result[key] = parseSegment(nestedStr);
+      } else {
+        var p = part.trim();
+        if (p in result) {
+          throw new Error("Duplicate '".concat(key, "' found"));
+        }
+        if (p) result[p] = p;
+      }
+    });
+    return result;
+  }
+  if (typeof fields === 'string') {
+    fields = fields.trim();
+    if (!fields) return {};
+    return parseSegment(fields);
+  } else if (Array.isArray(fields)) {
+    var result = {};
+    fields.forEach(f => result[f] = f);
+    return result;
+  }
+  return fields;
+};
+exports.parseFields = parseFields;
 var typeOfType = type => {
   if (type.intrinsic) return TypeOfType.Intrinsic;
   switch (type.className) {
@@ -73,13 +139,13 @@ exports.camelCase = camelCase;
 var titleCase = value => {
   if (!value) return '';
   value = camelCase(value);
-  return value[0].toLocaleUpperCase() + value.substr(1);
+  return value[0].toLocaleUpperCase() + value.substring(1);
 };
 exports.titleCase = titleCase;
 var firstCase = value => {
   if (!value) return '';
   value = camelCase(value);
-  return value[0].toLocaleUpperCase() + value.substr(1).toLocaleLowerCase();
+  return value[0].toLocaleUpperCase() + value.substring(1).toLocaleLowerCase();
 };
 exports.firstCase = firstCase;
 var searchIt = value => value ? value + '\t' : '';
@@ -100,13 +166,12 @@ var keyValues = list => {
   return Array.from(list.values()).sort();
 };
 exports.keyValues = keyValues;
-var mayQuote = function mayQuote(value) {
+var mayQuote = exports.mayQuote = function mayQuote(value) {
   var quoteChar = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "'";
   var str = value.toString();
   if (!isSpecialName(str)) return str;
   return "".concat(quoteChar).concat(str).concat(quoteChar);
 };
-exports.mayQuote = mayQuote;
 var methodRefs = (api, refs) => {
   var keys = keyValues(refs);
   var result = [];
@@ -130,7 +195,7 @@ var typeRefs = (api, refs) => {
   return result;
 };
 exports.typeRefs = typeRefs;
-var firstMethodRef = function firstMethodRef(api, type) {
+var firstMethodRef = exports.firstMethodRef = function firstMethodRef(api, type) {
   var stack = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new Set();
   stack.add(type.name);
   var method = methodRefs(api, type.methodRefs)[0];
@@ -145,7 +210,6 @@ var firstMethodRef = function firstMethodRef(api, type) {
   }
   return method;
 };
-exports.firstMethodRef = firstMethodRef;
 var anyWriter = function anyWriter(api, type) {
   var stack = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new Set();
   var result;
@@ -171,7 +235,7 @@ var anyWriter = function anyWriter(api, type) {
   }
   return result;
 };
-var SearchCriterion = function (SearchCriterion) {
+var SearchCriterion = exports.SearchCriterion = function (SearchCriterion) {
   SearchCriterion[SearchCriterion["method"] = 0] = "method";
   SearchCriterion[SearchCriterion["type"] = 1] = "type";
   SearchCriterion[SearchCriterion["name"] = 2] = "name";
@@ -184,9 +248,7 @@ var SearchCriterion = function (SearchCriterion) {
   SearchCriterion[SearchCriterion["response"] = 9] = "response";
   return SearchCriterion;
 }({});
-exports.SearchCriterion = SearchCriterion;
-var SearchAll = new Set([SearchCriterion.method, SearchCriterion.type, SearchCriterion.name, SearchCriterion.description, SearchCriterion.argument, SearchCriterion.property, SearchCriterion.title, SearchCriterion.activityType, SearchCriterion.status, SearchCriterion.response]);
-exports.SearchAll = SearchAll;
+var SearchAll = exports.SearchAll = new Set([SearchCriterion.method, SearchCriterion.type, SearchCriterion.name, SearchCriterion.description, SearchCriterion.argument, SearchCriterion.property, SearchCriterion.title, SearchCriterion.activityType, SearchCriterion.status, SearchCriterion.response]);
 var criteriaToSet = criteria => {
   var result = new Set();
   criteria.forEach(name => {
@@ -202,7 +264,7 @@ var setToCriteria = criteria => {
   return result;
 };
 exports.setToCriteria = setToCriteria;
-var MetaType = function (MetaType) {
+var MetaType = exports.MetaType = function (MetaType) {
   MetaType["Intrinsic"] = "Intrinsic";
   MetaType["Specification"] = "Specification";
   MetaType["Write"] = "Write";
@@ -210,7 +272,6 @@ var MetaType = function (MetaType) {
   MetaType["Enumerated"] = "Enumerated";
   return MetaType;
 }({});
-exports.MetaType = MetaType;
 var tagTypes = (api, types) => {
   var typeTags = {};
   Object.entries(types).filter(_ref => {
@@ -305,6 +366,150 @@ class SchemadSymbol extends _Symbol {
     return this.deprecated ? 'deprecated' : '';
   }
 }
+var mockData = function mockData(propertyName, type, override) {
+  var _dataMocks$type$name;
+  var empty = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var over = override !== undefined;
+  var stringer = mocked => {
+    if (over) {
+      return String(override);
+    }
+    if (empty) {
+      return '';
+    }
+    return mocked;
+  };
+  var inter = mocked => {
+    if (over) {
+      return parseInt(override, 10);
+    }
+    if (empty) {
+      return 0;
+    }
+    return mocked;
+  };
+  var floater = mocked => {
+    if (over) {
+      return parseFloat(override);
+    }
+    if (empty) {
+      return 0.0;
+    }
+    return mocked;
+  };
+  var dater = mocked => {
+    if (over) {
+      return new Date(override);
+    }
+    if (empty) {
+      return new Date(1970, 0, 1);
+    }
+    return mocked;
+  };
+  var booler = mocked => {
+    if (over) {
+      return Boolean(override);
+    }
+    if (empty) {
+      return false;
+    }
+    return mocked;
+  };
+  var anyer = mocked => {
+    if (over) {
+      return override;
+    }
+    if (empty) {
+      return {};
+    }
+    return mocked;
+  };
+  var dataMocks = {
+    any: {
+      value: anyer({
+        a: 1,
+        b: 'two'
+      })
+    },
+    boolean: {
+      value: booler(true)
+    },
+    byte: {
+      value: stringer('A')
+    },
+    binary: {
+      value: stringer('01')
+    },
+    date: {
+      value: dater(new Date(2024, 0, 5))
+    },
+    datetime: {
+      value: dater(new Date(2024, 0, 5, 1))
+    },
+    double: {
+      value: floater(2.2)
+    },
+    float: {
+      value: floater(1.1)
+    },
+    int32: {
+      value: inter(32)
+    },
+    int64: {
+      value: inter(64)
+    },
+    integer: {
+      value: inter(1)
+    },
+    number: {
+      value: inter(2)
+    },
+    object: {
+      value: anyer({
+        [propertyName]: 1
+      })
+    },
+    password: {
+      value: stringer('*')
+    },
+    string: {
+      value: stringer(propertyName)
+    },
+    uri: {
+      value: stringer("urn:".concat(propertyName))
+    },
+    url: {
+      value: stringer("https://".concat(propertyName, ".mock"))
+    },
+    email: {
+      value: stringer("".concat(propertyName, "@example.com"))
+    },
+    uuid: {
+      value: stringer("uuid-".concat(propertyName))
+    },
+    hostname: {
+      value: stringer("https://".concat(propertyName))
+    },
+    ipv4: {
+      value: stringer('127.0.0.1')
+    },
+    ipv6: {
+      value: stringer('::1')
+    },
+    void: {
+      value: over ? override : null
+    }
+  };
+  return (_dataMocks$type$name = dataMocks[type.name]) !== null && _dataMocks$type$name !== void 0 ? _dataMocks$type$name : override;
+};
+var mockOptions = options => {
+  var _options$override, _options$empty;
+  return {
+    fields: options !== null && options !== void 0 && options.fields ? options === null || options === void 0 ? void 0 : options.fields : '',
+    override: (_options$override = options === null || options === void 0 ? void 0 : options.override) !== null && _options$override !== void 0 ? _options$override : {},
+    empty: (_options$empty = options === null || options === void 0 ? void 0 : options.empty) !== null && _options$empty !== void 0 ? _options$empty : false
+  };
+};
 class Property extends SchemadSymbol {
   constructor(name, type, schema) {
     var _schema$required;
@@ -315,7 +520,7 @@ class Property extends SchemadSymbol {
     _defineProperty(this, "nullable", false);
     _defineProperty(this, "readOnly", false);
     _defineProperty(this, "writeOnly", false);
-    this.required = !!(required.includes(name) || (_schema$required = schema.required) !== null && _schema$required !== void 0 && _schema$required.includes(name));
+    this.required = Boolean(required.includes(name) || ((_schema$required = schema.required) === null || _schema$required === void 0 ? void 0 : _schema$required.includes(name)));
     this.nullable = this.schema.nullable || this.schema['x-looker-nullable'] || false;
     this.readOnly = this.schema.readOnly || false;
     this.writeOnly = this.schema.writeOnly || false;
@@ -338,6 +543,56 @@ class Property extends SchemadSymbol {
   search(rx, criteria) {
     return rx.test(this.searchString(criteria)) || this.type.search(rx, criteria);
   }
+  mock() {
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var {
+      fields,
+      override,
+      empty
+    } = mockOptions(options);
+    if ((0, _isEmpty.default)(fields) && !this.required) return undefined;
+    var keys = parseFields(fields);
+    if (!(0, _isEmpty.default)(fields) && !(this.name in keys)) return undefined;
+    var type = this.type;
+    if (type.elementType) {
+      var el = type.elementType;
+      var over = el.intrinsic && el.isString ? this.name : override;
+      var scope = typeof keys[this.name] === 'string' ? undefined : keys[this.name];
+      var opts = el.intrinsic ? {
+        fields: el.name,
+        override: over
+      } : {
+        fields: scope,
+        override
+      };
+      var val = el.mock(opts);
+      switch (type.className) {
+        case 'ArrayType':
+          return empty ? [] : [val];
+        case 'HashType':
+          return empty ? {} : {
+            a: val
+          };
+        case 'DelimArrayType':
+          return empty ? new _sdkRtl.DelimArray([]) : new _sdkRtl.DelimArray([val]);
+        case 'EnumType':
+          return type.values[0];
+      }
+      throw new Error("Don't know how to handle: ".concat(JSON.stringify(type)));
+    }
+    if (type.name) {
+      if (type.intrinsic) {
+        var data = mockData(this.name, type, undefined, empty);
+        return data.value;
+      }
+      return type.mock({
+        override,
+        empty
+      });
+    } else {
+      throw new Error('Cannot output a nameless type.');
+    }
+  }
 }
 exports.Property = Property;
 class Parameter extends SchemadSymbol {
@@ -726,7 +981,7 @@ class Type {
       var type = prop.type;
       var w = type.intrinsic ? undefined : api.mayGetWriteableType(type);
       if (w) {
-        var writeProp = _objectSpread(_objectSpread({}, prop), {
+        var writeProp = _objectSpread(_objectSpread({}, prop), {}, {
           type: w
         });
         result.push(writeProp);
@@ -790,6 +1045,74 @@ class Type {
       return prop.hasSpecialNeeds;
     });
   }
+  mock() {
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var {
+      fields,
+      override,
+      empty
+    } = mockOptions(options);
+    var isArray = this.className === 'ArrayType';
+    var props = isArray ? this.elementType.properties : this.properties;
+    if (typeof override !== 'string' && typeof override !== 'function') {
+      for (var _key in override) {
+        if (!(_key in props)) {
+          delete override[_key];
+        } else {
+          var prop = props[_key];
+          if (prop.type.intrinsic) {
+            override[_key] = mockData(_key, prop.type, override[_key], empty).value;
+          }
+        }
+      }
+    }
+    var keys = parseFields(fields);
+    if (keys['*']) {
+      var merge = {};
+      Object.keys(props).forEach(k => merge[k] = k);
+      keys = _objectSpread(_objectSpread({}, merge), keys);
+      delete keys['*'];
+    } else if ((0, _isEmpty.default)(fields)) {
+      for (var [_key2, _prop] of Object.entries(props)) {
+        if (_prop.required) {
+          keys[_key2] = _key2;
+        }
+      }
+    }
+    var overKeys = typeof override === 'string' || typeof override === 'function';
+    var result = {};
+    Object.keys(keys).forEach(k => {
+      var v = keys[k];
+      var over = overKeys ? undefined : override[k];
+      var p = props[k];
+      var scope = v === k ? k : {
+        [k]: v
+      };
+      if (!p) {
+        throw new Error("No property named '".concat(k, "' in type ").concat(this.name));
+      }
+      var val = typeof override === 'function' ? p.mock({
+        fields: scope,
+        empty
+      }) : p.mock({
+        fields: scope,
+        override: over,
+        empty
+      });
+      if (val !== undefined) {
+        result[k] = val;
+      }
+    });
+    if (typeof override !== 'string') {
+      result = _objectSpread(_objectSpread({}, result), override);
+    }
+    return result;
+  }
+  mockType() {
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var result = this.mock(options);
+    return result;
+  }
   load(api) {
     Object.entries(this.schema.properties || {}).forEach(_ref7 => {
       var [propName, propSchema] = _ref7;
@@ -883,6 +1206,14 @@ class ArrayType extends Type {
   get readOnly() {
     return this.elementType.readOnly;
   }
+  mock() {
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var result = super.mock(options);
+    if (Array.isArray(result)) {
+      return result;
+    }
+    return [result];
+  }
 }
 exports.ArrayType = ArrayType;
 class EnumType extends Type {
@@ -923,6 +1254,10 @@ class EnumType extends Type {
     enums[hash] = this;
     return name;
   }
+  mock() {
+    var _options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    return this.values[0];
+  }
   searchString(criteria) {
     var result = super.searchString(criteria);
     if (criteria.has(SearchCriterion.property)) {
@@ -980,6 +1315,15 @@ class IntrinsicType extends Type {
     this.customType = '';
     this.isString = IntrinsicType.stringTypes.includes(name);
   }
+  mock() {
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var {
+      override,
+      empty
+    } = mockOptions(options);
+    if (this.isString && typeof override === 'string') return override;
+    return mockData(this.name, this, undefined, empty).value;
+  }
   get className() {
     return 'IntrinsicType';
   }
@@ -991,7 +1335,7 @@ class IntrinsicType extends Type {
   }
 }
 exports.IntrinsicType = IntrinsicType;
-_defineProperty(IntrinsicType, "stringTypes", ['string', 'uri', 'email', 'uuid', 'uri', 'hostname', 'ipv4', 'ipv6']);
+_defineProperty(IntrinsicType, "stringTypes", ['string', 'uri', 'url', 'email', 'uuid', 'hostname', 'password', 'ipv4', 'ipv6', 'byte', 'binary']);
 class RequestType extends Type {
   constructor(api, name, params) {
     var description = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
@@ -1042,6 +1386,15 @@ _defineProperty(WriteType, "readonlyProps", properties => {
   });
   return result;
 });
+var specToModel = spec => {
+  if (typeof spec === 'string') {
+    spec = JSON.parse(spec);
+  }
+  var json = (0, _specConverter.upgradeSpecObject)(spec);
+  var obj = new OAS.OpenApiBuilder(json).getSpec();
+  return new ApiModel(obj);
+};
+exports.specToModel = specToModel;
 class ApiModel {
   constructor(spec) {
     this.spec = spec;
@@ -1051,8 +1404,7 @@ class ApiModel {
     _defineProperty(this, "types", {});
     _defineProperty(this, "tags", {});
     _defineProperty(this, "typeTags", {});
-    ;
-    ['string', 'integer', 'int64', 'boolean', 'object', 'uri', 'float', 'double', 'void', 'datetime', 'email', 'uuid', 'uri', 'hostname', 'ipv4', 'ipv6', 'any'].forEach(name => this.types[name] = new IntrinsicType(name));
+    ['string', 'integer', 'int64', 'boolean', 'object', 'float', 'double', 'void', 'date', 'datetime', 'binary', 'byte', 'email', 'uuid', 'uri', 'url', 'hostname', 'password', 'ipv4', 'ipv6', 'any'].forEach(name => this.types[name] = new IntrinsicType(name));
     this.load();
   }
   get version() {
@@ -1064,12 +1416,10 @@ class ApiModel {
     return ((_this$spec2 = this.spec) === null || _this$spec2 === void 0 ? void 0 : (_this$spec2$info = _this$spec2.info) === null || _this$spec2$info === void 0 ? void 0 : (_this$spec2$info$desc = _this$spec2$info.description) === null || _this$spec2$info$desc === void 0 ? void 0 : _this$spec2$info$desc.trim()) || '';
   }
   static fromString(specContent) {
-    var json = JSON.parse(specContent);
-    return ApiModel.fromJson(json);
+    return specToModel(specContent);
   }
   static fromJson(json) {
-    var spec = new OAS.OpenApiBuilder(json).getSpec();
-    return new ApiModel(spec);
+    return specToModel(json);
   }
   static isMethodSearch(criteria) {
     return criteria.has(SearchCriterion.method) || criteria.has(SearchCriterion.argument) || criteria.has(SearchCriterion.response) || criteria.has(SearchCriterion.status) || criteria.has(SearchCriterion.activityType);
@@ -1142,9 +1492,9 @@ class ApiModel {
     if (!(path instanceof Array)) {
       keys = path.split(splitter);
     }
-    for (var _key of keys) {
-      if (_key === '#') continue;
-      item = item[_key];
+    for (var _key3 of keys) {
+      if (_key3 === '#') continue;
+      item = item[_key3];
       if (item == null) return null;
     }
     return item;
@@ -1166,7 +1516,7 @@ class ApiModel {
       return result;
     };
     if (typeof schema === 'string') {
-      if (schema.indexOf('/requestBodies/') < 0) return this.types[schema.substr(schema.lastIndexOf('/') + 1)];
+      if (schema.indexOf('/requestBodies/') < 0) return this.types[schema.substring(schema.lastIndexOf('/') + 1)];
       var deref = this.jsonPath(schema);
       if (deref) {
         var ref = this.jsonPath(['content', 'application/json', 'schema', '$ref'], deref);
@@ -1178,8 +1528,9 @@ class ApiModel {
       if (schema.type === 'integer' && schema.format === 'int64') {
         return this.types.int64;
       }
-      if (schema.type === 'number' && schema.format) {
-        return this.types[schema.format];
+      if (schema.type === 'number') {
+        if (schema.format) return this.types[schema.format];
+        return this.types.float;
       }
       if (schema.type === 'array' && schema.items) {
         var resolved = this.resolveType(schema.items);
@@ -1306,8 +1657,8 @@ class ApiModel {
   sortList(list) {
     var result = {};
     var sortedKeys = Object.keys(list).sort(localeSort);
-    for (var _key2 of sortedKeys) {
-      result[_key2] = list[_key2];
+    for (var _key4 of sortedKeys) {
+      result[_key4] = list[_key4];
     }
     return result;
   }
@@ -1422,7 +1773,7 @@ class ApiModel {
     if (!OAS.isReferenceObject(obj)) {
       var req = obj;
       if ('required' in req) {
-        required = req.required;
+        required = Boolean(req.required);
       }
     }
     var typeSchema = {
@@ -1452,7 +1803,7 @@ class ApiModel {
       description: '',
       location: strBody,
       name: strBody,
-      required: required
+      required
     }, type);
   }
 }