@salla.sa/twilight 2.0.291 → 2.0.293

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salla.sa/twilight",
-    "version": "2.0.291",
+    "version": "2.0.293",
     "description": "Salla Theme Toolkit, Webcomponents, Events, Requests, Utils",
     "main": "dist/cjs/index.js",
     "module": "dist/esm/index.js",

package/types/actions.d.ts

@@ -1,10 +1,10 @@
 import {
     AuthApi, CartApi, CommentApi, CurrencyApi, DocumentApi, RatingApi, GiftApi, OrderApi,
-    ProductApi, ProfileApi, TwilightApi, WishlistApi, LoyaltyApi
+    ProductApi, ProfileApi, TwilightApi, WishlistApi, LoyaltyApi,
 } from "./api";
 import {
     AuthEvent, CartEvent, CommentEvent, CurrencyEvent, DocumentEvent, RatingEvent, GiftEvent,
-    InfiniteScrollEvent, OrderEvent, ProductEvent, ProfileEvent, TwilightEvent, WishlistEvent, LoyaltyEvent
+    InfiniteScrollEvent, OrderEvent, ProductEvent, ProfileEvent, TwilightEvent, WishlistEvent, LoyaltyEvent,
 } from "./event";
 
 export default interface SallaActions {

package/types/api/product/response.d.ts

@@ -6,6 +6,10 @@ type paymentMethod = {
     slug: 'bank';
     name: 'BankTransfer';
 };
+export interface SizeGuide {
+    name: string;
+    description: string;
+}
 export interface Offer {
     id: number;
     name: string;
@@ -59,4 +63,11 @@ export namespace ProductResponse {
     export interface offers extends SuccessResponse {
         data: Offer[] | [];
     }
+
+    export interface sizeGuides extends SuccessResponse {
+        data: Array<SizeGuide>;
+    }
+    
+
+
 }

package/types/event/index.d.ts

@@ -105,7 +105,7 @@ export type EventName = string
     | 'wishlist::added'
     | 'wishlist::removed'
     | 'wishlist::addition.failed'
-    | 'wishlist::removing.failed';
+    | 'wishlist::removing.failed'
 export {
     AuthEvent,
     CartEvent,

package/types/event/product.d.ts

@@ -1,6 +1,6 @@
+import {OfferSummary} from "../api/cart";
 import {ProductResponse} from "../api/product";
 import {RequestError, RequestErrorEvent, RequestErrorEventWithData, SuccessResponse} from "../common";
-import {OfferSummary} from "../api/cart";
 
 export default interface ProductEvent {
     onPriceUpdated: (callback: (response: ProductResponse.getPrice, product_id: number) => void) => void;
@@ -15,4 +15,7 @@ export default interface ProductEvent {
     onOfferExisted: (callback: (offer: OfferSummary) => void) => void;
     onOffersFetched: (callback: (response: ProductResponse.offers) => void) => void;
     onFetchOffersFailed: RequestErrorEvent;
+
+    onsizeGuideFetched: (callback: (response: ProductResponse.sizeGuides, prod_id: number) => void) => void;
+    onSizeGuideFetchFailed: RequestErrorEvent;
 }

package/watcher.js

@@ -60,6 +60,16 @@ class WatcherPlugin {
       this.upload_url = upload_url;
       this.store_id = store_id;
       this.draft_id = draft_id;
+      
+      if(typeof theme_id === "undefined"){
+        // a hacky way to get args from process.env.npm_lifecycle_script
+        let args = parseNpmScriptsPassedArgs(process.env.npm_lifecycle_script);
+        this.theme_id = args.theme_id;
+        this.upload_url = args.upload_url;
+        this.store_id = args.store_id;
+        this.draft_id = args.draft_id;
+        port = args.port || 8000;
+      }
 
       let client = new WebSocketClient();
 
@@ -103,7 +113,7 @@ class WatcherPlugin {
 
                 files.map((file)=>{
                     if(file.toLowerCase().endsWith('.twig'))
-                        execSync(`${this.sallaCli} theme sync -f "${file}" -id ${this.theme_id}  -store_id=${this.store_id} -draft_id=${this.draft_id}  -upload_url=${this.upload_url}`, {stdio: 'inherit'});
+                        execSync(`${this.sallaCli} theme sync -f "${file}" -id ${this.theme_id}  -store_id ${this.store_id} -draft_id ${this.draft_id}  -upload_url ${this.upload_url}`, {stdio: 'inherit'});
 
                     if(this.connection) this.connection.sendUTF(JSON.stringify({msg:"reload"}));
                 });
@@ -122,7 +132,7 @@ class WatcherPlugin {
     }
 
     getEntry() {
-        let viewsPath = path.join(process.cwd(), "views");
+        let viewsPath = path.join(process.cwd(), "src/views");
         return this.isWin && this.isWebpack5
             ? viewsPath
             : glob.sync(path.join(viewsPath, "**/*.twig"), {absolute: true});
@@ -132,13 +142,37 @@ class WatcherPlugin {
      * @param {{mode:'development'|'none'|'production', watch:boolean, ...}} options - @see https://webpack.js.org/configuration
      * @return {boolean}
      */
-     canWatch(options) {
+    canWatch(options) {
         if (options.mode !== 'development' || !options.watch) {
             console.log(color.green, `✓ Skipping Watching Theme files in production.`, color.normal);
             return false;
         }
-        return true;
+
+        return !!this.theme_id;
     }
 }
-
+function parseNpmScriptsPassedArgs(str){
+    // get all strings between equal sign
+    let strs = str.match(/"([^"]*)"/g);
+
+    if(strs===null) return {};
+    // remove quotes
+    strs = strs.map(str => str.replace(/"/g, ''));
+
+    // split by =
+    strs = strs.map(str => str.split('='));
+    // to be object
+    strs = strs.map(str => {
+        let obj = {};
+        let key = str[0];
+        // remove index 0
+        str.shift();
+        obj[key] = str.join('=');
+        return obj;
+    });
+    // reduce to one object
+    return strs.reduce((acc, curr) => {
+        return {...acc, ...curr};
+    })
+}
 module.exports = WatcherPlugin;