@looker/sdk-codegen 21.2.0 → 21.2.1

package/lib/sdkModels.d.ts

@@ -348,7 +348,7 @@ export declare class ArrayType extends Type {
 export declare class EnumType extends Type implements IEnumType {
     elementType: IType;
     readonly values: EnumValueType[];
-    constructor(elementType: IType, schema: OAS.SchemaObject, types: TypeList, typeName?: string, methodName?: string);
+    constructor(elementType: IType, schema: OAS.SchemaObject, api: ApiModel, typeName?: string, methodName?: string);
     private findName;
     searchString(criteria: SearchCriteria): string;
     get className(): string;
@@ -419,6 +419,7 @@ export declare class ApiModel implements ISymbolTable, IApiModel {
     registerEnum(type: IType, methodName?: string): IType;
     private _getRequestType;
     getRequestType(method: IMethod): IType | undefined;
+    getEnumList(): TypeList;
     makeWriteableType(hash: string, type: IType): WriteType;
     mayGetWriteableType(type: IType): IType | WriteType | undefined;
     loadDynamicTypes(): void;

package/lib/sdkModels.js

@@ -1028,7 +1028,7 @@ class Type {
   load(api) {
     Object.entries(this.schema.properties || {}).forEach(_ref7 => {
       var [propName, propSchema] = _ref7;
-      var propType = api.resolveType(propSchema, undefined, propName);
+      var propType = api.resolveType(propSchema, undefined, propName, this.name);
 
       if (propType.instanceOf('EnumType')) {
         api.registerEnum(propType, propName);
@@ -1146,7 +1146,7 @@ class ArrayType extends Type {
 exports.ArrayType = ArrayType;
 
 class EnumType extends Type {
-  constructor(elementType, schema, types, typeName, methodName) {
+  constructor(elementType, schema, api, typeName, methodName) {
     super(schema, schema.name);
     this.elementType = elementType;
 
@@ -1163,27 +1163,36 @@ class EnumType extends Type {
     }
 
     if (methodName) {
-      this.description = "Type defined in ".concat(methodName, "\n").concat(this.description);
+      this.description = "".concat(this.description).concat(this.description ? ' ' : '', "(Enum defined in ").concat(methodName, ")");
     }
 
-    this.name = this.findName(types, typeName, methodName);
+    this.name = this.findName(api, typeName, methodName);
   }
 
-  findName(types, typeName, methodName) {
+  findName(api, typeName, methodName) {
+    var hash = (0, _blueimpMd.default)(this.asHashString());
+    var enums = api.getEnumList();
     var name = titleCase(this.name || typeName || 'Enum');
 
-    if (name in types) {
+    if (name in api.types) {
+      var matched = enums[hash];
+
+      if ((matched === null || matched === void 0 ? void 0 : matched.name) === name) {
+        return name;
+      }
+
       var baseName = methodName ? titleCase("".concat(methodName, "_").concat(name)) : name;
       var newName = baseName;
       var i = 0;
 
-      while (newName in types) {
+      while (newName in api.types) {
         newName = "".concat(baseName).concat(++i);
       }
 
       name = newName;
     }
 
+    enums[hash] = this;
     return name;
   }
 
@@ -1535,7 +1544,7 @@ class ApiModel {
         }
 
         if (this.schemaHasEnums(schema)) {
-          var num = new EnumType(resolved, schema, this.types, typeName, methodName);
+          var num = new EnumType(resolved, schema, this, typeName, methodName);
           this.registerEnum(num, methodName);
           var result = new ArrayType(num, schema);
           return result;
@@ -1545,7 +1554,9 @@ class ApiModel {
       }
 
       if (this.schemaHasEnums(schema)) {
-        var _result = new EnumType(this.resolveType(schema.type), schema, this.types, typeName, methodName);
+        var _resolved = this.resolveType(schema.type, style, typeName, methodName);
+
+        var _result = new EnumType(_resolved, schema, this, typeName, methodName);
 
         if (_result) {
           return this.registerEnum(_result, methodName);
@@ -1587,10 +1598,14 @@ class ApiModel {
 
   registerEnum(type, methodName) {
     if (!(type instanceof EnumType)) return type;
-    var hash = (0, _blueimpMd.default)(type.asHashString());
 
-    if (hash in this.enumTypes) {
-      return this.enumTypes[hash];
+    if (type.name in this.types) {
+      var hash = (0, _blueimpMd.default)(type.asHashString());
+      var matched = this.enumTypes[hash];
+
+      if ((matched === null || matched === void 0 ? void 0 : matched.name) === type.name) {
+        return this.enumTypes[hash];
+      }
     }
 
     if (methodName) {
@@ -1603,7 +1618,6 @@ class ApiModel {
       }
     }
 
-    this.enumTypes[hash] = type;
     this.types[type.name] = type;
     return type;
   }
@@ -1625,6 +1639,10 @@ class ApiModel {
     return result;
   }
 
+  getEnumList() {
+    return this.enumTypes;
+  }
+
   makeWriteableType(hash, type) {
     var writer = new WriteType(this, type);
     this.types[writer.name] = writer;