@ikas/storefront 0.0.98 → 0.0.100

package/build/index.es.js

@@ -28275,7 +28275,9 @@ var IkasStorefrontThemeLocalization = /** @class */ (function () {
         this.locale = data.locale || "";
         this.storefrontId = data.storefrontId || "";
         this.storefrontThemeId = data.storefrontThemeId || "";
-        this.themeJson = data.themeJson || "";
+        this.themeJson = data.themeJson
+            ? new IkasTheme(data.themeJson)
+            : new IkasTheme();
         this.privacyPolicy = data.privacyPolicy || null;
         this.returnPolicy = data.returnPolicy || null;
         this.termsOfService = data.termsOfService || null;
@@ -28362,7 +28364,7 @@ var SettingsHelper = /** @class */ (function () {
     SettingsHelper.getSettings = function (locale) {
         var _this = this;
         return new Promise(function (resolve) { return __awaiter(_this, void 0, void 0, function () {
-            var settings, storefront, salesChannel, localizationMap, themeJSONPath, routing;
+            var settings, storefront, salesChannel, localizationMap, themeLocalizationPath, routing;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, SettingsHelper.readSettingsFile()];
@@ -28373,24 +28375,24 @@ var SettingsHelper = /** @class */ (function () {
                         storefront = new IkasStorefront(settings.storefront);
                         salesChannel = new IkasSalesChannel(settings.salesChannel);
                         localizationMap = settings.localizationMap;
-                        themeJSONPath = localizationMap[locale];
+                        themeLocalizationPath = localizationMap[locale];
                         routing = storefront.routings.find(function (r) { return r.id === locale || r.path === locale; });
-                        if (!themeJSONPath || !routing) {
-                            console.error("THEMEJSONPATH OR ROUTING MISSING!!!");
+                        if (!themeLocalizationPath || !routing) {
+                            console.error("THEME LOCALIZATION PATH OR ROUTING MISSING!!!");
                             return [2 /*return*/, resolve(null)];
                         }
-                        fs.readFile(themeJSONPath, {
+                        fs.readFile(themeLocalizationPath, {
                             flag: "a+",
                         }, function (err, file) {
                             if (err) {
-                                console.error("THEMEJSON FILE RED ERROR!!!");
+                                console.error("THEME LOCALZIATION FILE READ ERROR!!!");
                                 console.error(err);
                                 return resolve(null);
                             }
                             var result = file.length ? JSON.parse(file.toString()) : {};
                             resolve({
                                 storefront: storefront,
-                                theme: new IkasTheme(result),
+                                themeLocalization: new IkasStorefrontThemeLocalization(result),
                                 salesChannel: salesChannel,
                                 routing: routing,
                             });
@@ -28403,7 +28405,7 @@ var SettingsHelper = /** @class */ (function () {
     SettingsHelper.getPageData = function (context, isServer, pageType) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var locale, settings, storefront, theme, salesChannel, routing, provider;
+            var locale, settings, storefront, themeLocalization, salesChannel, routing, provider;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -28419,14 +28421,14 @@ var SettingsHelper = /** @class */ (function () {
                                     notFound: true,
                                 }];
                         }
-                        storefront = settings.storefront, theme = settings.theme, salesChannel = settings.salesChannel, routing = settings.routing;
+                        storefront = settings.storefront, themeLocalization = settings.themeLocalization, salesChannel = settings.salesChannel, routing = settings.routing;
                         IkasStorefrontConfig.storefrontId = storefront.id;
                         IkasStorefrontConfig.storefrontRoutingId = routing.id;
                         IkasStorefrontConfig.storefrontThemeId = storefront.mainStorefrontThemeId;
                         IkasStorefrontConfig.salesChannelId = storefront.salesChannelId;
                         IkasStorefrontConfig.priceListId = routing.priceListId || undefined;
                         IkasStorefrontConfig.stockLocationIds = (_a = salesChannel.stockLocations) === null || _a === void 0 ? void 0 : _a.map(function (sl) { return sl.id; });
-                        provider = new IkasPageDataProvider(theme, context.params, pageType);
+                        provider = new IkasPageDataProvider(themeLocalization.themeJson, context.params, pageType);
                         return [4 /*yield*/, provider.getPageData()];
                     case 2:
                         _b.sent();
@@ -28633,10 +28635,10 @@ var getStaticPaths$1 = function (context) { return __awaiter(void 0, void 0, voi
                 allSettings = (_a.sent());
                 customPagePaths = [];
                 allSettings.forEach(function (_a) {
-                    var theme = _a.theme, routing = _a.routing;
-                    if (!theme)
+                    var themeLocalization = _a.themeLocalization, routing = _a.routing;
+                    if (!themeLocalization)
                         return;
-                    var customPages = theme.pages.filter(function (p) { return p.type === IkasThemePageType.CUSTOM; });
+                    var customPages = themeLocalization.themeJson.pages.filter(function (p) { return p.type === IkasThemePageType.CUSTOM; });
                     customPages.forEach(function (customPage) {
                         if (customPage.slug &&
                             !customPagePaths.some(function (p) { return p.params.slug === customPage.slug; })) {
@@ -28681,7 +28683,7 @@ var CheckoutPage = function (_a) {
 };
 var _id_ = observer(CheckoutPage);
 var getServerSideProps = function (context) { return __awaiter(void 0, void 0, void 0, function () {
-    var id, locale, settings, storefront, routing, redirect, checkout, region;
+    var id, locale, settings, storefront, themeLocalization, routing, redirect, checkout;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -28693,19 +28695,17 @@ var getServerSideProps = function (context) { return __awaiter(void 0, void 0, v
                 // TODO maybe remove this and convert this page to static
                 if (!settings ||
                     !settings.storefront.mainStorefrontThemeId ||
-                    !settings.storefront.salesChannelId ||
-                    !settings.routing.priceListId) {
+                    !settings.storefront.salesChannelId) {
                     return [2 /*return*/, {
                             props: {},
                             notFound: true,
                         }];
                 }
-                storefront = settings.storefront, routing = settings.routing;
+                storefront = settings.storefront, themeLocalization = settings.themeLocalization, routing = settings.routing;
                 IkasStorefrontConfig.storefrontId = storefront.id;
                 IkasStorefrontConfig.storefrontRoutingId = routing.id;
                 IkasStorefrontConfig.storefrontThemeId = storefront.mainStorefrontThemeId;
                 IkasStorefrontConfig.salesChannelId = storefront.salesChannelId;
-                IkasStorefrontConfig.priceListId = routing.priceListId;
                 redirect = function () {
                     context.res.writeHead(302, { Location: "/" });
                     context.res.end();
@@ -28718,13 +28718,12 @@ var getServerSideProps = function (context) { return __awaiter(void 0, void 0, v
             case 2:
                 checkout = _a.sent();
                 if (checkout) {
-                    region = settings.storefront.regions.find(function (r) { return r.id === storefront.mainStorefrontThemeId; });
                     return [2 /*return*/, {
                             props: {
                                 checkoutStr: JSON.stringify(checkout),
-                                returnPolicy: (region === null || region === void 0 ? void 0 : region.returnPolicy) || "",
-                                privacyPolicy: (region === null || region === void 0 ? void 0 : region.privacyPolicy) || "",
-                                termsOfService: (region === null || region === void 0 ? void 0 : region.termsOfService) || "",
+                                returnPolicy: themeLocalization.returnPolicy || "",
+                                privacyPolicy: themeLocalization.privacyPolicy || "",
+                                termsOfService: themeLocalization.termsOfService || "",
                                 queryParams: context.query,
                             },
                         }];

package/build/index.js

@@ -28255,7 +28255,9 @@ var IkasStorefrontThemeLocalization = /** @class */ (function () {
         this.locale = data.locale || "";
         this.storefrontId = data.storefrontId || "";
         this.storefrontThemeId = data.storefrontThemeId || "";
-        this.themeJson = data.themeJson || "";
+        this.themeJson = data.themeJson
+            ? new IkasTheme(data.themeJson)
+            : new IkasTheme();
         this.privacyPolicy = data.privacyPolicy || null;
         this.returnPolicy = data.returnPolicy || null;
         this.termsOfService = data.termsOfService || null;
@@ -28342,7 +28344,7 @@ var SettingsHelper = /** @class */ (function () {
     SettingsHelper.getSettings = function (locale) {
         var _this = this;
         return new Promise(function (resolve) { return __awaiter(_this, void 0, void 0, function () {
-            var settings, storefront, salesChannel, localizationMap, themeJSONPath, routing;
+            var settings, storefront, salesChannel, localizationMap, themeLocalizationPath, routing;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, SettingsHelper.readSettingsFile()];
@@ -28353,24 +28355,24 @@ var SettingsHelper = /** @class */ (function () {
                         storefront = new IkasStorefront(settings.storefront);
                         salesChannel = new IkasSalesChannel(settings.salesChannel);
                         localizationMap = settings.localizationMap;
-                        themeJSONPath = localizationMap[locale];
+                        themeLocalizationPath = localizationMap[locale];
                         routing = storefront.routings.find(function (r) { return r.id === locale || r.path === locale; });
-                        if (!themeJSONPath || !routing) {
-                            console.error("THEMEJSONPATH OR ROUTING MISSING!!!");
+                        if (!themeLocalizationPath || !routing) {
+                            console.error("THEME LOCALIZATION PATH OR ROUTING MISSING!!!");
                             return [2 /*return*/, resolve(null)];
                         }
-                        fs__default['default'].readFile(themeJSONPath, {
+                        fs__default['default'].readFile(themeLocalizationPath, {
                             flag: "a+",
                         }, function (err, file) {
                             if (err) {
-                                console.error("THEMEJSON FILE RED ERROR!!!");
+                                console.error("THEME LOCALZIATION FILE READ ERROR!!!");
                                 console.error(err);
                                 return resolve(null);
                             }
                             var result = file.length ? JSON.parse(file.toString()) : {};
                             resolve({
                                 storefront: storefront,
-                                theme: new IkasTheme(result),
+                                themeLocalization: new IkasStorefrontThemeLocalization(result),
                                 salesChannel: salesChannel,
                                 routing: routing,
                             });
@@ -28383,7 +28385,7 @@ var SettingsHelper = /** @class */ (function () {
     SettingsHelper.getPageData = function (context, isServer, pageType) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var locale, settings, storefront, theme, salesChannel, routing, provider;
+            var locale, settings, storefront, themeLocalization, salesChannel, routing, provider;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -28399,14 +28401,14 @@ var SettingsHelper = /** @class */ (function () {
                                     notFound: true,
                                 }];
                         }
-                        storefront = settings.storefront, theme = settings.theme, salesChannel = settings.salesChannel, routing = settings.routing;
+                        storefront = settings.storefront, themeLocalization = settings.themeLocalization, salesChannel = settings.salesChannel, routing = settings.routing;
                         IkasStorefrontConfig.storefrontId = storefront.id;
                         IkasStorefrontConfig.storefrontRoutingId = routing.id;
                         IkasStorefrontConfig.storefrontThemeId = storefront.mainStorefrontThemeId;
                         IkasStorefrontConfig.salesChannelId = storefront.salesChannelId;
                         IkasStorefrontConfig.priceListId = routing.priceListId || undefined;
                         IkasStorefrontConfig.stockLocationIds = (_a = salesChannel.stockLocations) === null || _a === void 0 ? void 0 : _a.map(function (sl) { return sl.id; });
-                        provider = new IkasPageDataProvider(theme, context.params, pageType);
+                        provider = new IkasPageDataProvider(themeLocalization.themeJson, context.params, pageType);
                         return [4 /*yield*/, provider.getPageData()];
                     case 2:
                         _b.sent();
@@ -28613,10 +28615,10 @@ var getStaticPaths$1 = function (context) { return __awaiter(void 0, void 0, voi
                 allSettings = (_a.sent());
                 customPagePaths = [];
                 allSettings.forEach(function (_a) {
-                    var theme = _a.theme, routing = _a.routing;
-                    if (!theme)
+                    var themeLocalization = _a.themeLocalization, routing = _a.routing;
+                    if (!themeLocalization)
                         return;
-                    var customPages = theme.pages.filter(function (p) { return p.type === exports.IkasThemePageType.CUSTOM; });
+                    var customPages = themeLocalization.themeJson.pages.filter(function (p) { return p.type === exports.IkasThemePageType.CUSTOM; });
                     customPages.forEach(function (customPage) {
                         if (customPage.slug &&
                             !customPagePaths.some(function (p) { return p.params.slug === customPage.slug; })) {
@@ -28661,7 +28663,7 @@ var CheckoutPage = function (_a) {
 };
 var _id_ = mobxReactLite.observer(CheckoutPage);
 var getServerSideProps = function (context) { return __awaiter(void 0, void 0, void 0, function () {
-    var id, locale, settings, storefront, routing, redirect, checkout, region;
+    var id, locale, settings, storefront, themeLocalization, routing, redirect, checkout;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -28673,19 +28675,17 @@ var getServerSideProps = function (context) { return __awaiter(void 0, void 0, v
                 // TODO maybe remove this and convert this page to static
                 if (!settings ||
                     !settings.storefront.mainStorefrontThemeId ||
-                    !settings.storefront.salesChannelId ||
-                    !settings.routing.priceListId) {
+                    !settings.storefront.salesChannelId) {
                     return [2 /*return*/, {
                             props: {},
                             notFound: true,
                         }];
                 }
-                storefront = settings.storefront, routing = settings.routing;
+                storefront = settings.storefront, themeLocalization = settings.themeLocalization, routing = settings.routing;
                 IkasStorefrontConfig.storefrontId = storefront.id;
                 IkasStorefrontConfig.storefrontRoutingId = routing.id;
                 IkasStorefrontConfig.storefrontThemeId = storefront.mainStorefrontThemeId;
                 IkasStorefrontConfig.salesChannelId = storefront.salesChannelId;
-                IkasStorefrontConfig.priceListId = routing.priceListId;
                 redirect = function () {
                     context.res.writeHead(302, { Location: "/" });
                     context.res.end();
@@ -28698,13 +28698,12 @@ var getServerSideProps = function (context) { return __awaiter(void 0, void 0, v
             case 2:
                 checkout = _a.sent();
                 if (checkout) {
-                    region = settings.storefront.regions.find(function (r) { return r.id === storefront.mainStorefrontThemeId; });
                     return [2 /*return*/, {
                             props: {
                                 checkoutStr: JSON.stringify(checkout),
-                                returnPolicy: (region === null || region === void 0 ? void 0 : region.returnPolicy) || "",
-                                privacyPolicy: (region === null || region === void 0 ? void 0 : region.privacyPolicy) || "",
-                                termsOfService: (region === null || region === void 0 ? void 0 : region.termsOfService) || "",
+                                returnPolicy: themeLocalization.returnPolicy || "",
+                                privacyPolicy: themeLocalization.privacyPolicy || "",
+                                termsOfService: themeLocalization.termsOfService || "",
                                 queryParams: context.query,
                             },
                         }];

package/build/models/data/storefront/theme-localization/index.d.ts

@@ -1,9 +1,10 @@
+import { IkasTheme } from "../../../theme/index";
 export declare class IkasStorefrontThemeLocalization {
     id: string;
     locale: string;
     storefrontId: string;
     storefrontThemeId: string;
-    themeJson: string;
+    themeJson: IkasTheme;
     privacyPolicy: string | null;
     returnPolicy: string | null;
     termsOfService: string | null;

package/build/utils/settings.d.ts

@@ -1,10 +1,11 @@
 /// <reference types="node" />
 import { GetServerSidePropsContext, GetStaticPropsContext } from "next";
 import { ParsedUrlQuery } from "querystring";
-import { IkasTheme, IkasThemePageType } from "../models/index";
+import { IkasThemePageType } from "../models/index";
 import { IkasStorefront } from "../models/data/storefront/index";
 import { IkasSalesChannel } from "../models/data/sales-channel/index";
 import { IkasStorefrontRouting } from "../models/data/storefront/routing/index";
+import { IkasStorefrontThemeLocalization } from "../models/data/storefront/theme-localization/index";
 export declare class SettingsHelper {
     static readSettingsFile(): Promise<any>;
     static getSettings(locale: string): Promise<SettingsData | null>;
@@ -77,7 +78,7 @@ export declare class SettingsHelper {
 }
 export declare type SettingsData = {
     storefront: IkasStorefront;
-    theme: IkasTheme;
+    themeLocalization: IkasStorefrontThemeLocalization;
     salesChannel: IkasSalesChannel;
     routing: IkasStorefrontRouting;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikas/storefront",
-  "version": "0.0.98",
+  "version": "0.0.100",
   "main": "./build/index.js",
   "module": "./build/index.es.js",
   "author": "Umut Ozan Yıldırım",