@looker/sdk-codegen 21.2.0 → 21.2.1

package/CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [21.2.1](https://www.github.com/looker-open-source/sdk-codegen/compare/sdk-codegen-v21.2.0...sdk-codegen-v21.2.1) (2021-12-06)
+
+
+### Bug Fixes
+
+* enum naming and registration ([#918](https://www.github.com/looker-open-source/sdk-codegen/issues/918)) ([9d4a6cb](https://www.github.com/looker-open-source/sdk-codegen/commit/9d4a6cbfac5defad3a35389e2d46947d2135d349))
+
 ## [21.2.0](https://www.github.com/looker-open-source/sdk-codegen/compare/sdk-codegen-v21.1.1...sdk-codegen-v21.2.0) (2021-11-10)
 
 
@@ -243,4 +250,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- [API spec diff utility](https://github.com/looker-open-source/sdk-codegen/pull/380)
+- [API spec diff utility](https://github.com/looker-open-source/sdk-codegen/pull/380)

package/lib/esm/sdkModels.js

@@ -957,7 +957,7 @@ export 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);
@@ -1069,7 +1069,7 @@ export class ArrayType extends Type {
 
 }
 export class EnumType extends Type {
-  constructor(elementType, schema, types, typeName, methodName) {
+  constructor(elementType, schema, api, typeName, methodName) {
     super(schema, schema.name);
     this.elementType = elementType;
 
@@ -1086,27 +1086,36 @@ export 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 = md5(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;
   }
 
@@ -1442,7 +1451,7 @@ export 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;
@@ -1452,7 +1461,9 @@ export 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);
@@ -1494,10 +1505,14 @@ export class ApiModel {
 
   registerEnum(type, methodName) {
     if (!(type instanceof EnumType)) return type;
-    var hash = md5(type.asHashString());
 
-    if (hash in this.enumTypes) {
-      return this.enumTypes[hash];
+    if (type.name in this.types) {
+      var hash = md5(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) {
@@ -1510,7 +1525,6 @@ export class ApiModel {
       }
     }
 
-    this.enumTypes[hash] = type;
     this.types[type.name] = type;
     return type;
   }
@@ -1532,6 +1546,10 @@ export class ApiModel {
     return result;
   }
 
+  getEnumList() {
+    return this.enumTypes;
+  }
+
   makeWriteableType(hash, type) {
     var writer = new WriteType(this, type);
     this.types[writer.name] = writer;