Merge branch 'feature/oas' into ju/remove-api-family

Author: joeluong-sfcc

.nycrc.json

@@ -6,6 +6,7 @@
     "src/updateApis.ts",
     "src/lib/config.ts",
     "src/generate-oas.ts",
+    "src/removeInternalOas.ts",
     "src/static/helpers/index.ts",
     "src/lib/utils.ts"
   ],

README.md

@@ -137,10 +137,10 @@ async function getGuestUserAuthToken(): Promise<ShopperLoginTypes.TokenResponse>
 }
 
 // Alternatively you may use the SLAS helper functions to generate JWT/access token
-const guestTokenResponse = await slasHelpers.loginGuestUser(
-    new ShopperLogin(config), 
-    { redirectURI: 'http://localhost:3000/callback' }
-  )
+const guestTokenResponse = await slasHelpers.loginGuestUser({
+    slasClient: new ShopperLogin(config), 
+    parameters: { redirectURI: 'http://localhost:3000/callback' }
+  })
   .then((guestTokenResponse) => {
     console.log("Guest Token Response: ", guestTokenResponse);
     return guestTokenResponse;

src/generate-oas.ts

@@ -48,8 +48,8 @@ function appendVersionIfV2(name: string, version: string): string {
  * @param version
  */
 export function resolveApiName(name: string, version: string): string {
-  if (name === "Shopper Baskets OAS") {
-    return version === "v2" ? "ShopperBasketsV2" : "ShopperBasketsV1";
+  if (name === "Shopper Baskets OAS" && version === "v2") {
+    return "ShopperBasketsV2";
   }
   if (name === "CDN API - Process APIs OAS") {
     return "CDNZones";
@@ -84,10 +84,7 @@ export function getAPIDetailsFromExchange(directory: string): ApiSpecDetail {
     ) as download.ExchangeConfig;
 
     return {
-      filepath: path.join(
-        directory,
-        exchangeConfig.main.replace("-public.yaml", "-internal.yaml")
-      ),
+      filepath: path.join(directory, exchangeConfig.main),
       filename: exchangeConfig.main,
       directoryName: kebabToCamelCase(
         appendVersionIfV2(

templates/index.ts.hbs

@@ -4,7 +4,5 @@ import type * as {{apiName}}Types from "./{{directoryName}}";
 export type { {{apiName}}Types };
 {{/each}}
 
-import * as helpers from "./helpers";
-export { helpers };
-
+export { helpers, slasHelpers } from "./helpers";
 export { ClientConfig, CommonParameters, sdkLogger } from "@commerce-apps/core"