@ikas/storefront-api 4.0.0-alpha.44 → 4.0.0-alpha.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikas/storefront-api",
-  "version": "4.0.0-alpha.44",
+  "version": "4.0.0-alpha.45",
   "author": "Umut Ozan Yıldırım",
   "license": "ISC",
   "description": "API functions that returns models from the ikas-storefront-models package.",
@@ -21,8 +21,8 @@
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^22.0.0",
-    "@ikas/storefront-config": "^4.0.0-alpha.44",
-    "@ikas/storefront-models": "^4.0.0-alpha.44",
+    "@ikas/storefront-config": "^4.0.0-alpha.45",
+    "@ikas/storefront-models": "^4.0.0-alpha.45",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "prettier": "^2.2.1",
     "rollup": "^2.75.6",
@@ -35,8 +35,8 @@
     "axios": "^0.26.0"
   },
   "peerDependencies": {
-    "@ikas/storefront-config": "^4.0.0-alpha.44",
-    "@ikas/storefront-models": "^4.0.0-alpha.44",
+    "@ikas/storefront-config": "^4.0.0-alpha.45",
+    "@ikas/storefront-models": "^4.0.0-alpha.45",
     "axios": "^0.26.0"
   }
 }

package/src/__api/models/SearchProduct.ts

@@ -1,9 +1,9 @@
 import { DeepReadonly } from "ts-essentials";
 import { SearchProductAttributeValueData } from "./SearchProductAttributeValue";
+import { ProductBaseUnitModelData } from "./ProductBaseUnitModel";
 import { SearchProductBrandData } from "./SearchProductBrand";
 import { SearchCategoryData } from "./SearchCategory";
 import { SearchHTMLMetaDataData } from "./SearchHTMLMetaData";
-import { ProductBaseUnitModelData } from "./ProductBaseUnitModel";
 import { SearchProductVariantTypeData } from "./SearchProductVariantType";
 import { SearchProductTagData } from "./SearchProductTag";
 import { ProductTranslationData } from "./ProductTranslation";
@@ -11,6 +11,7 @@ import { SearchVariantData } from "./SearchVariant";
 
 export class SearchProductData {
   attributes: SearchProductAttributeValueData[] | null;
+  baseUnit: ProductBaseUnitModelData | null;
   brand: SearchProductBrandData | null;
   categories: SearchCategoryData[] | null;
   deleted: boolean | null;
@@ -20,7 +21,6 @@ export class SearchProductData {
   metaData: SearchHTMLMetaDataData | null;
   name: string;
   productOptionSetId: string | null;
-  productUnit: ProductBaseUnitModelData | null;
   productVariantTypes: SearchProductVariantTypeData[];
   salesChannelIds: string[] | null;
   shortDescription: string | null;
@@ -34,6 +34,9 @@ export class SearchProductData {
     this.attributes = data.attributes
       ? data.attributes.map((s) => new SearchProductAttributeValueData(s))
       : null;
+    this.baseUnit = data.baseUnit
+      ? new ProductBaseUnitModelData(data.baseUnit)
+      : null;
     this.brand = data.brand ? new SearchProductBrandData(data.brand) : null;
     this.categories = data.categories
       ? data.categories.map((s) => new SearchCategoryData(s))
@@ -49,9 +52,6 @@ export class SearchProductData {
       : null;
     this.name = data.name || "";
     this.productOptionSetId = data.productOptionSetId || null;
-    this.productUnit = data.productUnit
-      ? new ProductBaseUnitModelData(data.productUnit)
-      : null;
     this.productVariantTypes = data.productVariantTypes
       ? data.productVariantTypes.map((s) => new SearchProductVariantTypeData(s))
       : [];

package/src/__api/mutations/customerForgotPassword.ts

@@ -16,10 +16,12 @@ const customerForgotPassword = async (
       variables,
       query: `
 				mutation customerForgotPassword (
+					$captchaToken: String,
 					$email: String!,
 					$locale: String,
 				) {
 					customerForgotPassword (
+						captchaToken: $captchaToken,
 						email: $email,
 						locale: $locale,
 					)
@@ -36,6 +38,7 @@ const customerForgotPassword = async (
 export default customerForgotPassword;
 
 export type QueryParams = {
+  captchaToken?: string | null;
   email: string;
   locale?: string | null;
 };

package/src/__api/mutations/customerLogin.ts

@@ -20,10 +20,12 @@ const customerLogin = async (
       fields,
       query: (returnFields: string) => `
 				mutation customerLogin (
+					$captchaToken: String,
 					$email: String!,
 					$password: String!,
 				) {
 					customerLogin (
+						captchaToken: $captchaToken,
 						email: $email,
 						password: $password,
 					) ${returnFields}
@@ -40,6 +42,7 @@ const customerLogin = async (
 export default customerLogin;
 
 export type QueryParams = {
+  captchaToken?: string | null;
   email: string;
   password: string;
 };

package/src/__api/mutations/customerRecoverPassword.ts

@@ -16,11 +16,13 @@ const customerRecoverPassword = async (
       variables,
       query: `
 				mutation customerRecoverPassword (
+					$captchaToken: String,
 					$password: String!,
 					$passwordAgain: String!,
 					$token: String!,
 				) {
 					customerRecoverPassword (
+						captchaToken: $captchaToken,
 						password: $password,
 						passwordAgain: $passwordAgain,
 						token: $token,
@@ -38,6 +40,7 @@ const customerRecoverPassword = async (
 export default customerRecoverPassword;
 
 export type QueryParams = {
+  captchaToken?: string | null;
   password: string;
   passwordAgain: string;
   token: string;

package/src/__api/mutations/registerCustomer.ts

@@ -21,6 +21,7 @@ const registerCustomer = async (
       query: (returnFields: string) => `
 				mutation registerCustomer (
 					$attributes: [CustomerAttributeValueInput!],
+					$captchaToken: String,
 					$email: String!,
 					$firstName: String!,
 					$isAcceptMarketing: Boolean,
@@ -30,6 +31,7 @@ const registerCustomer = async (
 				) {
 					registerCustomer (
 						attributes: $attributes,
+						captchaToken: $captchaToken,
 						email: $email,
 						firstName: $firstName,
 						isAcceptMarketing: $isAcceptMarketing,
@@ -54,6 +56,7 @@ export default registerCustomer;
 
 export type QueryParams = {
   attributes?: CustomerAttributeValueInput[] | null;
+  captchaToken?: string | null;
   email: string;
   firstName: string;
   isAcceptMarketing?: boolean | null;

package/src/__api/mutations/sendContactFormToMerchant.ts

@@ -16,6 +16,7 @@ const sendContactFormToMerchant = async (
       variables,
       query: `
 				mutation sendContactFormToMerchant (
+					$captchaToken: String,
 					$email: String!,
 					$firstName: String!,
 					$lastName: String!,
@@ -24,6 +25,7 @@ const sendContactFormToMerchant = async (
 					$referer: String,
 				) {
 					sendContactFormToMerchant (
+						captchaToken: $captchaToken,
 						email: $email,
 						firstName: $firstName,
 						lastName: $lastName,
@@ -44,6 +46,7 @@ const sendContactFormToMerchant = async (
 export default sendContactFormToMerchant;
 
 export type QueryParams = {
+  captchaToken?: string | null;
   email: string;
   firstName: string;
   lastName: string;

package/src/__api/queries/checkCustomerEmail.ts

@@ -20,10 +20,12 @@ const checkCustomerEmail = async (
       fields,
       query: (returnFields: string) => `
 				query checkCustomerEmail (
+					$captchaToken: String,
 					$email: String!,
 					$locale: String,
 				) {
 					checkCustomerEmail (
+						captchaToken: $captchaToken,
 						email: $email,
 						locale: $locale,
 					) ${returnFields}
@@ -43,6 +45,7 @@ const checkCustomerEmail = async (
 export default checkCustomerEmail;
 
 export type QueryParams = {
+  captchaToken?: string | null;
   email: string;
   locale?: string | null;
 };

package/src/__api/queries/searchProducts.ts

@@ -42,7 +42,7 @@ export type QueryParams = {
 };
 
 const allReturnFields =
-  "{count data facets {id values {count id } } limit page results {attributes {imageIds productAttribute {id name tableTemplate {columns {id name } rows {id name } } translations {description locale name options {id name } } type } productAttributeOption {id name } value } brand {id name slug translations {description locale name } } categories {id name path {id name slug translations {description locale name } } slug translations {description locale name } } deleted description groupVariantsByVariantTypeId id metaData {canonicals description disableIndex metadataOverrides {description language pageTitle storefrontId storefrontRegionId } pageTitle redirectTo slug translations {description locale pageTitle } } name productOptionSetId productUnit {baseAmount type unitId } productVariantTypes {order variantType {id name selectionType translations {locale name values {id name } } values {colorCode id name thumbnailImageId } } variantValueIds } salesChannelIds shortDescription tags {id name translations {description locale name } } translations {description locale name } type variants {attributes {imageIds productAttribute {id name tableTemplate {columns {id name } rows {id name } } translations {description locale name options {id name } } type } productAttributeOption {id name } value } barcodeList deleted id images {id isMain isVideo order } isActive prices {buyPrice currency currencyCode currencySymbol discountPrice priceListId sellPrice unitPrice } sellIfOutOfStock sku stocks {stockCount stockLocationId } unit {amount type } variantValues {variantTypeId variantValueId } weight } weight } totalCount }";
+  "{count data facets {id values {count id } } limit page results {attributes {imageIds productAttribute {id name tableTemplate {columns {id name } rows {id name } } translations {description locale name options {id name } } type } productAttributeOption {id name } value } baseUnit {baseAmount type unitId } brand {id name slug translations {description locale name } } categories {id name path {id name slug translations {description locale name } } slug translations {description locale name } } deleted description groupVariantsByVariantTypeId id metaData {canonicals description disableIndex metadataOverrides {description language pageTitle storefrontId storefrontRegionId } pageTitle redirectTo slug translations {description locale pageTitle } } name productOptionSetId productVariantTypes {order variantType {id name selectionType translations {locale name values {id name } } values {colorCode id name thumbnailImageId } } variantValueIds } salesChannelIds shortDescription tags {id name translations {description locale name } } translations {description locale name } type variants {attributes {imageIds productAttribute {id name tableTemplate {columns {id name } rows {id name } } translations {description locale name options {id name } } type } productAttributeOption {id name } value } barcodeList deleted id images {id isMain isVideo order } isActive prices {buyPrice currency currencyCode currencySymbol discountPrice priceListId sellPrice unitPrice } sellIfOutOfStock sku stocks {stockCount stockLocationId } unit {amount type } variantValues {variantTypeId variantValueId } weight } weight } totalCount }";
 
 export enum ResponseField {
   COUNT = "count",
@@ -68,6 +68,9 @@ export enum ResponseField {
   RESULTS__ATTRIBUTES__PRODUCT_ATTRIBUTE_OPTION__ID = "results.attributes.productAttributeOption.id",
   RESULTS__ATTRIBUTES__PRODUCT_ATTRIBUTE_OPTION__NAME = "results.attributes.productAttributeOption.name",
   RESULTS__ATTRIBUTES__VALUE = "results.attributes.value",
+  RESULTS__BASE_UNIT__BASE_AMOUNT = "results.baseUnit.baseAmount",
+  RESULTS__BASE_UNIT__TYPE = "results.baseUnit.type",
+  RESULTS__BASE_UNIT__UNIT_ID = "results.baseUnit.unitId",
   RESULTS__BRAND__ID = "results.brand.id",
   RESULTS__BRAND__NAME = "results.brand.name",
   RESULTS__BRAND__SLUG = "results.brand.slug",
@@ -106,9 +109,6 @@ export enum ResponseField {
   RESULTS__META_DATA__TRANSLATIONS__PAGE_TITLE = "results.metaData.translations.pageTitle",
   RESULTS__NAME = "results.name",
   RESULTS__PRODUCT_OPTION_SET_ID = "results.productOptionSetId",
-  RESULTS__PRODUCT_UNIT__BASE_AMOUNT = "results.productUnit.baseAmount",
-  RESULTS__PRODUCT_UNIT__TYPE = "results.productUnit.type",
-  RESULTS__PRODUCT_UNIT__UNIT_ID = "results.productUnit.unitId",
   RESULTS__PRODUCT_VARIANT_TYPES__ORDER = "results.productVariantTypes.order",
   RESULTS__PRODUCT_VARIANT_TYPES__VARIANT_TYPE__ID = "results.productVariantTypes.variantType.id",
   RESULTS__PRODUCT_VARIANT_TYPES__VARIANT_TYPE__NAME = "results.productVariantTypes.variantType.name",

package/src/__api/types/index.ts

@@ -2270,6 +2270,7 @@ export interface SearchHTMLMetaDataOverride {
 
 export interface SearchProduct {
   attributes: SearchProductAttributeValue[] | null;
+  baseUnit: ProductBaseUnitModel | null;
   brand: SearchProductBrand | null;
   categories: SearchCategory[] | null;
   deleted: boolean | null;
@@ -2279,7 +2280,6 @@ export interface SearchProduct {
   metaData: SearchHTMLMetaData | null;
   name: string;
   productOptionSetId: string | null;
-  productUnit: ProductBaseUnitModel | null;
   productVariantTypes: SearchProductVariantType[];
   salesChannelIds: string[] | null;
   shortDescription: string | null;

package/src/api/product/index.ts

@@ -256,7 +256,7 @@ function simpleToProduct(simple: SearchProduct): IkasProduct {
       })) || [],
     tags: simple.tags || [],
     description: simple.description || "",
-    baseUnit: simple.productUnit as unknown as IkasProductBaseUnit,
+    baseUnit: simple.baseUnit as unknown as IkasProductBaseUnit,
     metaData:
       {
         ...simple.metaData,