cloudcommerce 2.5.0 → 2.6.0

package/packages/feeds/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/feeds",
   "type": "module",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "E-Com Plus Cloud Commerce catalog feeds",
   "main": "lib/index.js",
   "exports": {

package/packages/firebase/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/firebase",
   "type": "module",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "E-Com Plus Cloud Commerce on Firebase",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/packages/i18n/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/i18n",
   "type": "module",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "E-Com Plus Cloud Commerce i18n",
   "main": "lib/all.js",
   "exports": {

package/packages/modules/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/modules",
   "type": "module",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "E-Com Plus Cloud Commerce modules API",
   "main": "lib/index.cjs",
   "exports": {

package/packages/passport/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/passport",
   "type": "module",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "E-Com Plus Cloud Commerce customers authentication (passport) API",
   "main": "lib/index.js",
   "exports": {

package/packages/ssr/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/ssr",
   "type": "module",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "E-Com Plus Cloud Commerce storefront SSR",
   "main": "lib/index.js",
   "exports": {
@@ -31,8 +31,8 @@
     "@cloudcommerce/firebase": "workspace:*",
     "@cloudcommerce/i18n": "workspace:*",
     "@ecomplus/utils": "1.5.0-rc.6",
-    "@vueuse/core": "10.7.2",
-    "astro": "4.4.0",
+    "@vueuse/core": "10.8.0",
+    "astro": "4.4.1",
     "astro-capo": "^0.0.1",
     "axios": "^1.6.7",
     "firebase-admin": "^12.0.0",

package/packages/storefront/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/storefront",
   "type": "module",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "E-Com Plus Cloud Commerce storefront with Astro",
   "bin": {
     "storefront": "./scripts/build-prod.sh"
@@ -42,8 +42,9 @@
     "@iconify-json/logos": "^1.1.42",
     "@types/gtag.js": "^0.0.19",
     "@vite-pwa/astro": "^0.3.0",
-    "@vueuse/core": "10.7.2",
-    "astro": "4.4.0",
+    "@vueuse/core": "10.8.0",
+    "@webcontainer/api": "^1.1.9",
+    "astro": "4.4.1",
     "astro-capo": "^0.0.1",
     "chroma-js": "^2.4.2",
     "dotenv": "^16.4.4",

package/packages/storefront/src/__fixtures__/calculate_shipping.json

@@ -0,0 +1,161 @@
+{
+  "meta": {
+    "to": {
+      "zip": "30333111"
+    },
+    "items": [
+      {
+        "product_id": "5c701c8ac626be23430d4fe5",
+        "sku": "hd-csr-303",
+        "name": "Headset Gamer Corsair HS40 Raptor CA-9011122-NA(AP)",
+        "quantity": 1,
+        "currency_id": "BRL",
+        "currency_symbol": "R$",
+        "price": 285,
+        "dimensions": {
+          "width": {
+            "value": 10,
+            "unit": "cm"
+          },
+          "height": {
+            "value": 10,
+            "unit": "cm"
+          },
+          "length": {
+            "value": 10,
+            "unit": "cm"
+          }
+        },
+        "weight": {
+          "value": 500,
+          "unit": "g"
+        }
+      }
+    ],
+    "subtotal": 285,
+    "own_hand": false,
+    "receipt": false,
+    "is_checkout_confirmation": false
+  },
+  "result": [
+    {
+      "_id": "645e84cf0332fe172e2d7c75",
+      "app_id": 1253,
+      "queue_took": 45,
+      "took": 69,
+      "version": "1.3.0",
+      "validated": false,
+      "response_errors": null,
+      "error": true,
+      "error_message": "Request failed with status code 400",
+      "response": {
+        "error": "CALCULATE_ERR",
+        "message": "Zip code is unset on app hidden data (merchant must configure the app)"
+      }
+    },
+    {
+      "_id": "5fc529c069274c73fcdebb61",
+      "app_id": 1248,
+      "queue_took": 25,
+      "took": 423,
+      "version": "1.0.5",
+      "validated": false,
+      "response_errors": null,
+      "error": true,
+      "error_message": "Request failed with status code 400",
+      "response": {
+        "error": "CALCULATE_FAILED",
+        "message": "undefined- connect ECONNREFUSED 201.48.198.97:80- Results from offline data invalidated"
+      }
+    },
+    {
+      "_id": "5f15da8614ff772fde810435",
+      "app_id": 119348,
+      "queue_took": 5,
+      "took": 526,
+      "version": "1.1.2",
+      "validated": true,
+      "response_errors": null,
+      "error": false,
+      "error_message": null,
+      "response": {
+        "shipping_services": [
+          {
+            "label": "SEDEX",
+            "carrier": "Correios (Manda Bem)",
+            "service_name": "SEDEX",
+            "shipping_line": {
+              "from": {
+                "zip": "35701399"
+              },
+              "to": {
+                "zip": "30333111"
+              },
+              "price": 11.73,
+              "total_price": 11.73,
+              "declared_value": 285,
+              "discount": 0,
+              "delivery_time": {
+                "days": 1,
+                "working_days": true
+              },
+              "posting_deadline": {
+                "days": 3,
+                "working_days": true,
+                "after_approval": true
+              },
+              "package": {
+                "weight": {
+                  "value": 0.5,
+                  "unit": "kg"
+                }
+              },
+              "flags": [
+                "mandabem-ws"
+              ],
+              "own_hand": false,
+              "receipt": false
+            }
+          },
+          {
+            "label": "PAC",
+            "carrier": "Correios (Manda Bem)",
+            "service_name": "PAC",
+            "shipping_line": {
+              "from": {
+                "zip": "35701399"
+              },
+              "to": {
+                "zip": "30333111"
+              },
+              "price": 0,
+              "total_price": 0,
+              "declared_value": 285,
+              "discount": 0,
+              "delivery_time": {
+                "days": 5,
+                "working_days": true
+              },
+              "posting_deadline": {
+                "days": 3,
+                "working_days": true,
+                "after_approval": true
+              },
+              "package": {
+                "weight": {
+                  "value": 0.5,
+                  "unit": "kg"
+                }
+              },
+              "flags": [
+                "mandabem-ws"
+              ],
+              "own_hand": false,
+              "receipt": false
+            }
+          }
+        ]
+      }
+    }
+  ]
+}

package/packages/storefront/src/helpers/afetch.ts

@@ -32,6 +32,7 @@ const afetch = (url: FetchParams[0], init?: AFetchInit, timeout = 10000) => {
     let query = '';
     Object.keys(init.params).forEach((key) => {
       const value: string | number | (string | number)[] = init.params![key];
+      if (value === undefined) return;
       if (Array.isArray(value)) {
         value.forEach((val) => {
           query += `&${key}=${val}`;

package/packages/storefront/src/lib/components/Spinner.vue

@@ -0,0 +1,16 @@
+<template>
+  <div role="status">
+    <svg
+      aria-hidden="true"
+      class="size-8 max-h-full max-w-full animate-spin fill-secondary text-base-300"
+      viewBox="0 0 100 101"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <!-- eslint-disable max-len -->
+      <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
+      <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
+    </svg>
+    <span class="sr-only">Loading...</span>
+  </div>
+</template>

package/packages/storefront/src/lib/components/globals/Skeleton.vue

@@ -4,10 +4,13 @@ import { computed } from 'vue';
 export interface Props {
   isBold?: boolean;
   isLarge?: boolean;
+  numRows?: number;
 }
 
-const props = defineProps<Props>();
-const rowClassName = 'bg-gray-200 rounded-md dark:bg-gray-700';
+const props = withDefaults(defineProps<Props>(), {
+  numRows: 6,
+});
+const rowClassName = 'bg-base-200 rounded-md';
 const firstRowClassName = computed(() => {
   return `${rowClassName} ${(props.isBold ? 'h-8 mb-6' : 'h-2.5 mb-4')}`;
 });
@@ -19,11 +22,26 @@ const nextRowsClassName = computed(() => {
 <template>
   <div role="status" class="animate-pulse" :class="isLarge ? 'max-w-4xl' : 'max-w-sm'">
     <div :class="[firstRowClassName, isLarge ? 'w-96' : 'w-48']"></div>
-    <div :class="[nextRowsClassName, isLarge ? 'max-w-[680px]' : 'max-w-[340px]']"></div>
-    <div :class="nextRowsClassName"></div>
-    <div :class="[nextRowsClassName, isLarge ? 'max-w-[660px]' : 'max-w-[330px]']"></div>
-    <div :class="[nextRowsClassName, isLarge ? 'max-w-[600px]' : 'max-w-[300px]']"></div>
-    <div :class="[nextRowsClassName, isLarge ? 'max-w-[720px]' : 'max-w-[360px]']"></div>
+    <div
+      v-if="numRows > 1"
+      :class="[nextRowsClassName, isLarge ? 'max-w-[680px]' : 'max-w-[340px]']"
+    ></div>
+    <div
+      v-if="numRows > 2"
+      :class="nextRowsClassName"
+    ></div>
+    <div
+      v-if="numRows > 3"
+      :class="[nextRowsClassName, isLarge ? 'max-w-[660px]' : 'max-w-[330px]']"
+    ></div>
+    <div
+      v-if="numRows > 4"
+      :class="[nextRowsClassName, isLarge ? 'max-w-[600px]' : 'max-w-[300px]']"
+    ></div>
+    <div
+      v-for="n in (numRows - 5)" :key="n"
+      :class="[nextRowsClassName, isLarge ? 'max-w-[720px]' : 'max-w-[360px]']"
+    ></div>
     <span class="sr-only">Loading...</span>
   </div>
 </template>

package/packages/storefront/src/lib/composables/use-shipping-calculator.ts

@@ -14,24 +14,34 @@ import {
   toRef,
 } from 'vue';
 import { useDebounceFn, watchOnce } from '@vueuse/core';
-import { price as getPrice } from '@ecomplus/utils';
+import { price as getPrice, formatMoney } from '@ecomplus/utils';
 import config from '@cloudcommerce/config';
+import {
+  i19days,
+  i19free,
+  i19freeShipping,
+  i19pickUpToday,
+  i19receiveToday,
+  i19untilTomorrow,
+  i19upTo,
+  i19workingDays,
+} from '@@i18n';
 import { fetchModule } from '@@sf/state/modules-info';
 
 export type ShippedItem = Exclude<CalculateShippingParams['items'], undefined>[0];
 
 export type ShippingService = CalculateShippingResponse['shipping_services'][0];
 
-type CartOrProductItem = Carts['items'][0] | (Partial<Products> & {
-  product_id: string & { length: 24 },
-  price: number,
-  quantity: number,
-});
+type CartOrProductItem = Carts['items'][0]
+  | (Partial<Products>
+    & { price: number, quantity: number }
+    & ({ product_id: string & { length: 24 } } | { _id: string & { length: 24 } })
+  );
 
 export interface Props {
-  zipInput?: Ref<HTMLInputElement | null>;
-  zipCode?: string;
-  canSelectService?: boolean;
+  zipCode?: Ref<string>;
+  canAutoSubmit?: boolean;
+  // canSelectService?: boolean;
   countryCode?: string;
   shippedItems?: (ShippedItem | CartOrProductItem)[];
   shippingResult?: ModuleApiResult<'calculate_shipping'>['result'];
@@ -62,6 +72,9 @@ const sortApps = (results: any, order: number[]) => {
   });
 };
 const reduceItemBody = (itemOrProduct: Record<string, any>) => {
+  if (!itemOrProduct.product_id) {
+    itemOrProduct.product_id = itemOrProduct._id;
+  }
   const shippedItem = {};
   const fields: (keyof ShippedItem)[] = [
     'product_id',
@@ -86,12 +99,11 @@ const reduceItemBody = (itemOrProduct: Record<string, any>) => {
 };
 
 export const useShippingCalculator = (props: Props) => {
-  const localZipCode = ref(props.zipCode);
-  const zipCode = ref<string | null>(null);
-  if (!localZipCode.value && localStorage) {
+  const zipCode = props.zipCode || ref('');
+  if (!zipCode.value && localStorage) {
     const storedZip = localStorage.getItem(ZIP_STORAGE_KEY);
     if (storedZip) {
-      localZipCode.value = storedZip;
+      zipCode.value = storedZip;
     }
   }
   const countryCode = props.countryCode || config.get().countryCode;
@@ -117,7 +129,7 @@ export const useShippingCalculator = (props: Props) => {
       ...props.baseParams,
       to: {
         ...props.baseParams?.to,
-        zip: localZipCode.value!,
+        zip: zipCode.value,
       },
     };
     if (shippedItems.value.length) {
@@ -125,6 +137,17 @@ export const useShippingCalculator = (props: Props) => {
       body.subtotal = amountSubtotal.value;
     }
     isFetching.value = true;
+    if (import.meta.env.DEV) {
+      // eslint-disable-next-line
+      return import('../../__fixtures__/calculate_shipping.json')
+        .then(({ default: data }) => {
+          setTimeout(() => {
+            isFetching.value = false;
+            // eslint-disable-next-line no-use-before-define
+            parseShippingResult(data.result as any, isRetry);
+          }, 1500);
+        });
+    }
     fetchModule('calculate_shipping', {
       method: 'POST',
       params: {
@@ -133,6 +156,7 @@ export const useShippingCalculator = (props: Props) => {
       body,
     })
       .then(async (response) => {
+        if (response.status === 501) return;
         const data = await response.json();
         // eslint-disable-next-line no-use-before-define
         parseShippingResult(data.result, isRetry);
@@ -220,43 +244,74 @@ export const useShippingCalculator = (props: Props) => {
   };
 
   const submitZipCode = () => {
-    const _zipCode = localZipCode.value;
+    const _zipCode = zipCode.value;
     if (countryCode === 'BR') {
       if (_zipCode?.replace(/\D/g, '').length !== 8) return;
     } else if (!_zipCode) {
       return;
     }
-    zipCode.value = _zipCode;
     if (localStorage) {
-      localStorage.setItem(ZIP_STORAGE_KEY, zipCode.value);
+      localStorage.setItem(ZIP_STORAGE_KEY, _zipCode);
     }
     fetchShippingServices();
   };
-  watch(localZipCode, submitZipCode, {
+  watch(zipCode, (value) => {
+    if (value.length) {
+      if (countryCode === 'BR') {
+        const fmt = value.replace(/\D/g, '');
+        if (fmt.length > 5) {
+          zipCode.value = fmt.substring(0, 5) + '-' + fmt.substring(5, 8);
+          if (props.canAutoSubmit) submitZipCode();
+        }
+      } else {
+        zipCode.value = value.substring(0, 30);
+      }
+    }
+  }, {
     immediate: !props.shippingResult,
   });
   watch(toRef(props, 'shippingResult'), (shippingResult) => {
     if (!shippingResult?.length) return;
-    if (localZipCode.value) zipCode.value = localZipCode.value;
     parseShippingResult(shippingResult);
   }, {
     immediate: true,
   });
-  const zipInput = props.zipInput?.value;
-  if (zipInput) {
-    zipInput.addEventListener('input', (ev) => {
-      const value = (ev.target as HTMLInputElement).value;
-      if (value.length) {
-        if (countryCode === 'BR') {
-          const fmt = value.replace(/\D/g, '').padEnd(8, '_');
-          zipInput.innerHTML = fmt.substring(0, 5) + '-' + fmt.substring(5, 8);
-        } else {
-          zipInput.innerHTML = value.substring(0, 30);
+
+  const productionDeadline = computed(() => {
+    let maxDeadline = 0;
+    _shippedItems.value?.forEach((item: Partial<Products>) => {
+      if (item.quantity && item.production_time) {
+        const { days, cumulative } = item.production_time;
+        const itemDeadline = cumulative ? days * item.quantity : days;
+        if (itemDeadline > maxDeadline) {
+          maxDeadline = itemDeadline;
         }
       }
-      localZipCode.value = value;
     });
-  }
+    return maxDeadline;
+  });
+  const getShippingDeadline = (shipping: ShippingService['shipping_line']) => {
+    const isWorkingDays = Boolean(shipping.posting_deadline?.working_days
+      || shipping.delivery_time?.working_days);
+    let days = shipping.posting_deadline?.days || 0;
+    if (shipping.delivery_time) {
+      days += shipping.delivery_time.days;
+    }
+    days += productionDeadline.value;
+    if (days > 1) {
+      return `${i19upTo} ${days} `
+        + (isWorkingDays ? i19workingDays : i19days).toLowerCase();
+    }
+    if (days === 1) return i19untilTomorrow;
+    return shipping.pick_up ? i19pickUpToday : i19receiveToday;
+  };
+  const getShippingPrice = (shipping: ShippingService['shipping_line']) => {
+    const freight = typeof shipping.total_price === 'number'
+      ? shipping.total_price
+      : shipping.price;
+    if (freight) return formatMoney(freight);
+    return shipping.pick_up ? i19free : i19freeShipping;
+  };
 
   return {
     zipCode,
@@ -264,9 +319,13 @@ export const useShippingCalculator = (props: Props) => {
     amountSubtotal,
     submitZipCode,
     fetchShippingServices,
+    isFetching,
     freeFromValue,
     shippingServices,
     parseShippingResult,
+    productionDeadline,
+    getShippingDeadline,
+    getShippingPrice,
   };
 };
 

package/packages/storefront/src/lib/layouts/BaseBody.astro

@@ -1,7 +1,4 @@
 ---
-import * as url from 'node:url';
-import { join as joinPath } from 'node:path';
-import { readFileSync } from 'node:fs';
 import '@@sf/assets/reset.css';
 import '@@sf/assets/base.css';
 import '@@sf/assets/forms.css';
@@ -10,15 +7,6 @@ import '@@sf/assets/tooltip.css';
 // import 'uno.css';
 import Picture from '@@sf/components/Picture.astro';
 
-const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
-const pkgJson = readFileSync(joinPath(__dirname, '../../../package.json'), 'utf-8');
-const {
-  name: pkgName,
-  version: pkgVersion,
-} = JSON.parse(pkgJson);
-const getInlineVersionLog = () => {
-  return `console.log('%c${pkgName} v${pkgVersion}', 'font-weight:bold')`;
-};
 const { settings } = Astro.locals.routeContext;
 ---
 
@@ -40,5 +28,4 @@ const { settings } = Astro.locals.routeContext;
       hasImg={false}
     />
   }
-  <script is:inline set:html={getInlineVersionLog()} />
 </body>

package/packages/storefront/src/lib/scripts/experimental-web-ide.ts

@@ -0,0 +1,29 @@
+import { initVM } from '../../web-ide/webcontainer';
+
+const cliTextareaId = 'IDEcli';
+const serverIframeId = 'IDEserver';
+
+if (!import.meta.env.SSR) {
+  const cliTextarea = document.createElement('textarea');
+  cliTextarea.id = cliTextareaId;
+  document.body.appendChild(cliTextarea);
+  const serverIframe = document.createElement('iframe');
+  serverIframe.id = serverIframeId;
+  serverIframe.width = '100%';
+  serverIframe.height = '100%';
+  serverIframe.style.cssText = 'border: 1px solid #EEE; height: calc(100vh - 30px)';
+  document.body.appendChild(serverIframe);
+
+  const initIDE = async () => {
+    const repo = 'ecomplus/store';
+    const { vm, startDevServer } = await initVM({ repo, cliTextarea });
+    vm.on('server-ready', (port, href) => {
+      console.log({ port, href });
+      const url = new URL(href);
+      url.searchParams.set('webcontainer', 'dev');
+      serverIframe.src = `${url}`;
+    });
+    startDevServer();
+  };
+  initIDE();
+}

package/packages/storefront/src/lib/ssr-context.ts

@@ -296,6 +296,15 @@ const loadRouteContext = async (
   } else {
     setResponseCache(Astro, 120, 180);
   }
+  if (
+    Astro.url.searchParams.get('webcontainer') !== null
+    || urlPath.startsWith('/admin/ide')
+  ) {
+    // https://webcontainers.io/guides/quickstart#cross-origin-isolation
+    Astro.response.headers.set('Cross-Origin-Embedder-Policy', 'require-corp');
+    Astro.response.headers.set('Cross-Origin-Opener-Policy', 'same-origin');
+    Astro.response.headers.set('Cross-Origin-Resource-Policy', 'cross-origin');
+  }
   const routeContext = {
     ...config,
     isHomepage,