fix: sort path templates, ignore useless templates (#231)

Co-authored-by: Summer Ji <summerji@google.com>
googleapis · Feb 6, 2020 · 401e3b5 · 401e3b5
1 parent 5621dc8
commit 401e3b5
Show file tree

Hide file tree

Showing 5 changed files with 546 additions and 550 deletions.
diff --git a/typescript/src/schema/proto.ts b/typescript/src/schema/proto.ts
@@ -611,7 +611,21 @@ function augmentService(
       }
     }
   }
-  augmentedService.pathTemplates = Object.values(uniqueResources).sort();
+  augmentedService.pathTemplates = Object.values(uniqueResources).sort(
+    (resourceA, resourceB) => {
+      // Path templates names can be cased differently
+      // (e.g. 'Project' and 'project_deidentify_template'),
+      // so we use camel case for comparison.
+      if (resourceA.name.toCamelCase() < resourceB.name.toCamelCase()) {
+        return -1;
+      }
+      if (resourceA.name.toCamelCase() > resourceB.name.toCamelCase()) {
+        return 1;
+      }
+      return 0;
+    }
+  );
+  console.warn(augmentedService.pathTemplates);
   return augmentedService;
 }
 

diff --git a/typescript/src/schema/resourceDatabase.ts b/typescript/src/schema/resourceDatabase.ts
@@ -74,15 +74,22 @@ export class ResourceDatabase {
         params,
         resource
       );
-      this.patterns[patterns?.[0]] = resourceDescriptor;
-      this.types[resourceDescriptor.type!] = resourceDescriptor;
+      // We ignore resources with no parameters (e.g. pattern = '*').
+      if (params.length > 0) {
+        this.patterns[patterns?.[0]] = resourceDescriptor;
+        this.types[resourceDescriptor.type!] = resourceDescriptor;
+      }
     }
     // resource: {name, type, pattern: [p1, p2]}
     // register resource does: in type map {type: { name, type, pattern: [p1, p2]} }
     //                         in pattern map {p1: { name1, type, p1} , p2: { name2, type, p2}}
     else {
       for (const pattern of patterns!) {
         const params = this.getParams(pattern);
+        // We ignore resources with no parameters (e.g. pattern = '*').
+        if (params.length === 0) {
+          continue;
+        }
         const name = params.join('_');
         let resourceDescriptor: ResourceDescriptor = {
           name,
@@ -177,6 +184,7 @@ export class ResourceDatabase {
     params = params.map(p => p.replace(/{([a-zA-Z_]+).*/, '$1'));
     return params;
   }
+
   private getResourceDescriptor(
     name: string,
     params: string[],