fix(arcgis-rest-feature-layer): streamline promises

Esri · Jun 17, 2021 · ebb8380 · ebb8380
1 parent 1d3d2fa
commit ebb8380
Showing 1 changed file with 19 additions and 23 deletions.
diff --git a/packages/arcgis-rest-feature-layer/src/decodeValues.ts b/packages/arcgis-rest-feature-layer/src/decodeValues.ts
@@ -60,18 +60,17 @@ export interface IDecodeValuesOptions extends IRequestOptions {
 export function decodeValues(
   requestOptions: IDecodeValuesOptions
 ): Promise<IQueryFeaturesResponse> {
-  return new Promise(resolve => {
-    if (!requestOptions.fields) {
-      // tslint:disable-next-line:no-floating-promises
-      getLayer({ url: requestOptions.url }).then(
-        (metadata: ILayerDefinition) => {
-          resolve((requestOptions.fields = metadata.fields));
-        }
-      );
-    } else {
-      resolve(requestOptions.fields);
-    }
-  }).then(fields => {
+  let prms;
+  if (requestOptions.fields) {
+    prms = Promise.resolve(requestOptions.fields);
+  } else {
+    prms = getLayer({ url: requestOptions.url }).then(
+      (metadata: ILayerDefinition) => {
+        return metadata.fields;
+      }
+    );
+  }
+  return prms.then((fields) => {
     // extract coded value domains
     const domains = extractCodedValueDomains(fields as IField[]);
     if (Object.keys(domains).length < 1) {
@@ -98,22 +97,19 @@ export function decodeValues(
     // merge decoded features into the response
     return {
       ...requestOptions.queryResponse,
-      ...{ features: decodedFeatures }
+      ...{ features: decodedFeatures },
     };
   });
 }
 
 function extractCodedValueDomains(fields: IField[]) {
-  return fields.reduce(
-    (domains, field) => {
-      const domain = field.domain;
-      if (domain && domain.type === "codedValue") {
-        domains[field.name] = domain;
-      }
-      return domains;
-    },
-    {} as { [index: string]: any }
-  );
+  return fields.reduce((domains, field) => {
+    const domain = field.domain;
+    if (domain && domain.type === "codedValue") {
+      domains[field.name] = domain;
+    }
+    return domains;
+  }, {} as { [index: string]: any });
 }
 
 // TODO: add type for domain?