cloudcommerce 0.14.1 → 0.15.1

package/packages/modules/src/firebase/checkout.ts

@@ -1,10 +1,8 @@
 import type { Request, Response } from 'firebase-functions';
-import type { CheckoutBody } from '@cloudcommerce/types';
+import type { OrderSet, CheckoutBody } from '@cloudcommerce/types';
 import type {
   CheckoutBodyWithItems,
-  BodyOrder,
   Amount,
-  Item,
   Payment,
 } from '../types/index';
 import config from '@cloudcommerce/firebase/lib/config';
@@ -23,12 +21,14 @@ import {
 } from './functions-checkout/utils';
 import createOrder from './functions-checkout/new-order';
 
+type Item = Exclude<OrderSet['items'], undefined>[number]
+
 export default async (req: Request, res: Response) => {
   const { httpsFunctionOptions } = config.get();
   const modulesBaseURL = req.hostname !== 'localhost'
     ? `https://${req.hostname}${req.url.replace(/\/checkout[^/]*/i, '')}`
     : `http://localhost:5001/${process.env.GCLOUD_PROJECT}`
-      + `/${(process.env.FUNCTION_REGION || httpsFunctionOptions.region)}/modules`;
+    + `/${(process.env.FUNCTION_REGION || httpsFunctionOptions.region)}/modules`;
 
   const validate = ajv.compile(checkoutSchema.params);
   const checkoutBody = req.body as CheckoutBody;
@@ -41,7 +41,7 @@ export default async (req: Request, res: Response) => {
     return sendRequestError(res, '@checkout', validate.errors);
   }
   const { items, ...newBody } = checkoutBody;
-  const newItems = await fixItems(items);
+  const newItems = await fixItems(items) as Exclude<OrderSet['items'], undefined>;
   const amount: Amount = {
     subtotal: 0,
     discount: 0,
@@ -63,7 +63,7 @@ export default async (req: Request, res: Response) => {
       // start mounting order body
       // https://developers.e-com.plus/docs/api/#/store/orders/orders
       const dateTime = new Date().toISOString();
-      const orderBody: BodyOrder = {
+      const orderBody: OrderSet = {
         opened_at: dateTime,
         buyers: [
           // received customer info
@@ -94,7 +94,7 @@ export default async (req: Request, res: Response) => {
         }
       });
       if (orderBody.domain) {
-      // consider default Storefront app routes
+        // consider default Storefront app routes
         if (!orderBody.checkout_link) {
           orderBody.checkout_link = `https://${orderBody.domain}/app/#/checkout/(_id)`;
         }
@@ -106,7 +106,7 @@ export default async (req: Request, res: Response) => {
       // count subtotal value
       let subtotal = 0;
       newItems.forEach(
-        (item:Item) => {
+        (item: Item) => {
           subtotal += (item.final_price || item.price * item.quantity);
           // pass each item to prevent object overwrite
           if (orderBody.items) {
@@ -136,7 +136,7 @@ export default async (req: Request, res: Response) => {
         listShipping = getValidResults(listShipping, 'shipping_services');
         handleShippingServices(body, listShipping, amount, orderBody);
       } else {
-      // problem with shipping response object
+        // problem with shipping response object
         return sendError(
           res,
           msgErr?.status || 400,

package/packages/modules/src/firebase/functions-checkout/fix-items.ts

@@ -1,4 +1,4 @@
-import type { Products, CheckoutBody } from '@cloudcommerce/types';
+import type { ResourceId, Products, CheckoutBody } from '@cloudcommerce/types';
 import type { Items, Item } from '../../types';
 import api from '@cloudcommerce/api';
 import logger from 'firebase-functions/logger';
@@ -248,7 +248,7 @@ export default async (
       const kitProductId = item.kit_product._id;
       try {
       // eslint-disable-next-line no-await-in-loop
-        const kitProduct = (await api.get(`products/${kitProductId as string}`, {
+        const kitProduct = (await api.get(`products/${kitProductId}`, {
           isNoAuth: true,
         })).data;
 
@@ -266,7 +266,7 @@ export default async (
       // GET public product object
       try {
         // eslint-disable-next-line no-await-in-loop
-        const product = (await api.get(`products/${item.product_id}`, {
+        const product = (await api.get(`products/${item.product_id as ResourceId}`, {
           isNoAuth: true,
         })).data;
 

package/packages/modules/src/firebase/functions-checkout/handle-order-transaction.ts

@@ -1,7 +1,7 @@
 import type { Response } from 'firebase-functions';
-import type { Orders } from '@cloudcommerce/types';
+import type { Orders, OrderSet } from '@cloudcommerce/types';
 import type {
-  Amount, BodyOrder,
+  Amount,
   PaymentHistory,
   OrderPaymentHistory,
   TransactionOrder,
@@ -12,7 +12,7 @@ import { sendError } from './utils';
 
 const checkoutRespond = async (
   res: Response,
-  orderId:string & {length: 24},
+  orderId: Orders['_id'],
   orderNumber: number | undefined,
   usrMsg: { en_us: string, pt_br: string },
   transaction?: TransactionOrder,
@@ -47,10 +47,10 @@ const checkoutRespond = async (
   });
 };
 
-const newOrder = async (orderBody: BodyOrder) => {
+const newOrder = async (orderBody: OrderSet) => {
   try {
     const orderId = (await api.post('orders', orderBody)).data._id;
-    return new Promise<{ order: Orders | null, err?: any} >((resolve) => {
+    return new Promise<{ order: Orders | null, err?: any }>((resolve) => {
       setTimeout(async () => {
         try {
           const order = (await api.get(`orders/${orderId}`)).data as Orders;
@@ -68,7 +68,7 @@ const newOrder = async (orderBody: BodyOrder) => {
 
 const cancelOrder = async (
   staffNotes: string,
-  orderId: string & {length: 24},
+  orderId: Orders['_id'],
   isOrderCancelled: boolean,
   res: Response,
   usrMsg: { en_us: string, pt_br: string },
@@ -110,7 +110,7 @@ const cancelOrder = async (
 };
 
 const saveTransaction = (
-  orderId: string,
+  orderId: Orders['_id'],
   transactionBody: any, // TODO: error type 'status' incompatible
 ) => {
   return new Promise((resolve, reject) => {
@@ -128,7 +128,7 @@ const saveTransaction = (
 };
 
 const addPaymentHistory = async (
-  orderId: string,
+  orderId: Orders['_id'],
   listPaymentsHistory: PaymentHistory[],
   isFirstTransaction: boolean,
   paymentEntry: PaymentHistory,

package/packages/modules/src/firebase/functions-checkout/new-order.ts

@@ -1,7 +1,6 @@
 import type { Response } from 'firebase-functions';
-import type { CheckoutBody } from '@cloudcommerce/types';
+import type { OrderSet, CheckoutBody } from '@cloudcommerce/types';
 import type {
-  BodyOrder,
   Amount,
   CheckoutTransaction,
   TransactionOrder,
@@ -30,7 +29,7 @@ const createOrder = async (
   modulesBaseURL: string,
   amount: Amount,
   checkoutBody: CheckoutBody,
-  orderBody:BodyOrder,
+  orderBody: OrderSet,
   transactions: CheckoutTransaction[],
   dateTime: string,
 ) => {
@@ -65,7 +64,7 @@ const createOrder = async (
       newTransaction.amount_part = newTransaction.amount_part || 0;
       if (transactionBody.amount && newTransaction.amount_part > 0
         && newTransaction.amount_part < 1) {
-      // fix amount for multiple transactions
+        // fix amount for multiple transactions
         const partialAmount = transactionBody.amount.total * newTransaction.amount_part;
         transactionBody.amount.discount = transactionBody.amount.discount || 0;
         transactionBody.amount.discount += transactionBody.amount.total - partialAmount;
@@ -91,7 +90,7 @@ const createOrder = async (
           const { response } = result;
           const transaction: TransactionOrder = response && response.transaction;
           if (transaction) {
-          // complete transaction object with some request body fields
+            // complete transaction object with some request body fields
             [
               'type',
               'payment_method',
@@ -125,7 +124,7 @@ const createOrder = async (
                   }
                 });
               }
-            // logger.log(transaction.app)
+              // logger.log(transaction.app)
             }
 
             // check for transaction status
@@ -208,7 +207,7 @@ const createOrder = async (
         if (firstResult) {
           const { response } = firstResult;
           if (response) {
-          // send devMsg with app response
+            // send devMsg with app response
             if (response.message) {
               errorMessage = response.message;
               if (response.error) {

package/packages/modules/src/firebase/functions-checkout/request-to-module.ts

@@ -1,5 +1,3 @@
-// eslint-disable-next-line no-unused-vars
-import type { AxiosError } from 'axios';
 import logger from 'firebase-functions/logger';
 import axios from 'axios';
 
@@ -65,9 +63,9 @@ export default async (
         }
       }
       return resp.result;
-    } catch (err: any | AxiosError) {
-      msgErr.moreInfo = 'Unexpected error ';
+    } catch (err: any) {
       logger.error(err);
+      msgErr.moreInfo = 'Unexpected error ';
       if (axios.isAxiosError(err)) {
         msgErr.moreInfo = err.message;
         if (err.code) {

package/packages/modules/src/firebase/functions-checkout/utils.ts

@@ -1,7 +1,7 @@
 import type { Response } from 'firebase-functions';
+import type { OrderSet } from '@cloudcommerce/types';
 import type {
   CheckoutBodyWithItems,
-  BodyOrder,
   Payment,
   PaymentGateways,
   PaymentMethod,
@@ -12,15 +12,15 @@ import type {
 } from '../../types/index';
 import logger from 'firebase-functions/logger';
 
-type BodyResouce = {[key:string]:any}
+type BodyResouce = { [key: string]: any }
 
 const sendError = (
-  res:Response,
+  res: Response,
   status: number,
   errorCode: string | number,
   message: string,
-  userMessage?: {[key:string]:string},
-  moreInfo?:string,
+  userMessage?: { [key: string]: string },
+  moreInfo?: string,
 ) => {
   return res.status(status)
     .send({
@@ -35,7 +35,7 @@ const sendError = (
 const fixAmount = (
   amount: Amount,
   body: CheckoutBodyWithItems,
-  orderBody: BodyOrder,
+  orderBody: OrderSet,
 ) => {
   Object.keys(amount).forEach((field) => {
     if (amount[field] > 0 && field !== 'total') {
@@ -55,12 +55,12 @@ const fixAmount = (
 };
 
 const getValidResults = (
-  results: {[key:string]:any} [],
-  checkProp?:string,
+  results: { [key: string]: any }[],
+  checkProp?: string,
 ) => {
   // results array returned from module
   // see ./#applications.js
-  const validResults: {[key:string]:any}[] = [];
+  const validResults: { [key: string]: any }[] = [];
   if (Array.isArray(results)) {
     for (let i = 0; i < results.length; i++) {
       const result = results[i];
@@ -86,20 +86,20 @@ const getValidResults = (
 
 const handleListPayments = (
   body: CheckoutBodyWithItems,
-  listPayment: {[key:string]:any},
+  listPayment: { [key: string]: any },
   paymentsBody: Payment,
-  amount:Amount,
-  orderBody: BodyOrder,
+  amount: Amount,
+  orderBody: OrderSet,
 ) => {
   for (let i = 0; i < listPayment.length; i++) {
     const result = listPayment[i];
     // treat list payments response
     const { response } = result;
     if (response && response.payment_gateways) {
-    // check chosen payment method code and name
+      // check chosen payment method code and name
       const paymentMethod: PaymentMethod = paymentsBody.transaction.payment_method;
       let paymentMethodCode: PaymentMethod['code'];
-      let paymentMethodName:PaymentMethod['name'];
+      let paymentMethodName: PaymentMethod['name'];
       if (paymentMethod) {
         paymentMethodCode = paymentMethod.code;
         paymentMethodName = paymentMethod.name;
@@ -110,12 +110,12 @@ const handleListPayments = (
         (paymentGatewayFound: PaymentGateways[number]) => {
           const paymentMethodFound = paymentGatewayFound.payment_method;
           return !paymentMethodCode
-        || (paymentMethodFound && paymentMethodFound.code === paymentMethodCode);
+            || (paymentMethodFound && paymentMethodFound.code === paymentMethodCode);
         },
       );
       let paymentGateway: PaymentGateways[number] | undefined;
       if (possibleGateways.length > 1 && paymentMethodName) {
-      // prefer respective method name
+        // prefer respective method name
         paymentGateway = possibleGateways.find(
           (paymentGatewayFound: PaymentGateways[number]) => {
             return paymentGatewayFound.payment_method.name === paymentMethodName;
@@ -150,7 +150,7 @@ const handleListPayments = (
         // add to order body
         orderBody.payment_method_label = paymentGateway.label || '';
 
-      // finally start creating new order
+        // finally start creating new order
       }
     }
   }
@@ -160,8 +160,8 @@ const handleListPayments = (
 const handleShippingServices = (
   body: CheckoutBodyWithItems,
   listShipping: BodyResouce,
-  amount:Amount,
-  orderBody: BodyOrder,
+  amount: Amount,
+  orderBody: OrderSet,
 ) => {
   for (let i = 0; i < listShipping.length; i++) {
     const result = listShipping[i];
@@ -199,7 +199,7 @@ const handleShippingServices = (
           let maxProductionDays = 0;
           if (orderBody.items) {
             orderBody.items.forEach(
-              (item:Item) => {
+              (item: Item) => {
                 const productionTime = item.production_time;
                 if (productionTime) {
                   let productionDays = productionTime.days;
@@ -244,8 +244,8 @@ const handleShippingServices = (
 const handleApplyDiscount = (
   body: CheckoutBodyWithItems,
   listDiscount: BodyResouce,
-  amount:Amount,
-  orderBody: BodyOrder,
+  amount: Amount,
+  orderBody: OrderSet,
 ) => {
   // simulate request to apply discount endpoint to get extra discount value
   for (let i = 0; i < listDiscount.length; i++) {
@@ -273,7 +273,7 @@ const handleApplyDiscount = (
 
         if (response.freebie_product_ids) {
           // mark items provided for free
-          orderBody.items.forEach((item) => {
+          orderBody.items?.forEach((item) => {
             if (!item.flags) {
               item.flags = [];
             }

package/packages/modules/src/types/index.d.ts

@@ -1,6 +1,6 @@
 import type {
-  CheckoutBody, 
-  Carts, 
+  CheckoutBody,
+  Carts,
   Orders,
   CalculateShippingResponse,
   ListPaymentsResponse,
@@ -20,9 +20,6 @@ type CheckoutBodyWithItems = Omit<CheckoutBody, 'items'> & {
 }
 
 type CustomerCheckout = Exclude<CheckoutBody['customer'], undefined>
-type BodyOrder = Omit<Orders, '_id' | 'created_at' | 'updated_at' | 'store_id' | 'items' > & { 
-  items : Items
-}
 
 type TransactionOrder = Exclude<Orders['transactions'], undefined>[number]
 type StatusTransactionOrder = Pick<TransactionOrder, 'status'>['status']
@@ -30,8 +27,8 @@ type BodyTransactionOrder = Omit<TransactionOrder, 'status'> & {
   status: StatusTransactionOrder
 }
 
-type OrderPaymentHistory = Pick<Orders,'payments_history'| 'financial_status' | 'amount'>
-type PaymentHistory = Exclude<Pick<Orders,'payments_history'>['payments_history'], undefined>[number]
+type OrderPaymentHistory = Pick<Orders, 'payments_history' | 'financial_status' | 'amount'>
+type PaymentHistory = Exclude<Pick<Orders, 'payments_history'>['payments_history'], undefined>[number]
 
 type CheckoutTransaction = Exclude<CheckoutBody['transaction'], Transaction[]>
 
@@ -54,7 +51,6 @@ export {
   Items,
   Item,
   CustomerCheckout,
-  BodyOrder,
   PaymentMethod,
   Amount,
   ShippingSerive,

package/packages/modules/tests/modules.test.mjs

@@ -1,7 +1,7 @@
 import assert from 'node:assert';
 import test, { describe } from 'node:test';
 
-const baseUrl = 'http://127.0.0.1:5001/ecom2-002/southamerica-east1/modules';
+const baseUrl = 'http://127.0.0.1:5001/ecom2-003/us-east4/modules';
 
 describe('Test Schemas', async () => {
   test('@checkout', async (/* t */) => {

package/packages/passport/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/passport",
   "type": "module",
-  "version": "0.14.1",
+  "version": "0.15.1",
   "description": "E-Com Plus Cloud Commerce customers authentication (passport) API",
   "main": "lib/index.js",
   "exports": {
@@ -25,8 +25,8 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "firebase-admin": "^11.8.0",
-    "firebase-functions": "^4.4.0",
+    "firebase-admin": "^11.9.0",
+    "firebase-functions": "^4.4.1",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {

package/packages/ssr/lib/firebase/serve-storefront.js

@@ -1,5 +1,5 @@
-import { join as joinPath } from 'path';
-import { readFile } from 'fs/promises';
+import { join as joinPath } from 'node:path';
+import { readFile } from 'node:fs/promises';
 import logger from 'firebase-functions/logger';
 
 const { STOREFRONT_BASE_DIR } = process.env;

package/packages/ssr/lib/firebase/serve-storefront.js.map

@@ -1 +1 @@
-{"version":3,"file":"serve-storefront.js","sourceRoot":"","sources":["../../src/firebase/serve-storefront.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"serve-storefront.js","sourceRoot":"","sources":["../../src/firebase/serve-storefront.ts"],"names":[],"mappings":"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"}

package/packages/ssr/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/ssr",
   "type": "module",
-  "version": "0.14.1",
+  "version": "0.15.1",
   "description": "E-Com Plus Cloud Commerce storefront SSR",
   "main": "lib/index.js",
   "exports": {
@@ -23,18 +23,18 @@
     "build": "bash ../../scripts/build-lib.sh"
   },
   "dependencies": {
-    "@astrojs/node": "5.1.3",
+    "@astrojs/node": "5.3.0",
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
     "@cloudcommerce/i18n": "workspace:*",
-    "@ecomplus/utils": "1.5.0-rc.3",
-    "@headlessui/vue": "^1.7.13",
-    "@vueuse/core": "10.1.2",
-    "astro": "2.4.5",
-    "firebase-admin": "^11.8.0",
-    "firebase-functions": "^4.4.0",
-    "semver": "^7.5.1",
-    "vue": "^3.3.2"
+    "@ecomplus/utils": "1.5.0-rc.5",
+    "@headlessui/vue": "^1.7.14",
+    "@vueuse/core": "10.2.1",
+    "astro": "2.7.3",
+    "firebase-admin": "^11.9.0",
+    "firebase-functions": "^4.4.1",
+    "semver": "^7.5.3",
+    "vue": "^3.3.4"
   },
   "devDependencies": {
     "@cloudcommerce/types": "workspace:*",

package/packages/ssr/src/firebase/serve-storefront.ts

@@ -1,6 +1,6 @@
 import type { Request, Response } from 'firebase-functions';
-import { join as joinPath } from 'path';
-import { readFile } from 'fs/promises';
+import { join as joinPath } from 'node:path';
+import { readFile } from 'node:fs/promises';
 import logger from 'firebase-functions/logger';
 
 declare global {

package/packages/storefront/.base.eslintrc.cjs

@@ -42,6 +42,8 @@ module.exports = {
           'firebase-admin/auth',
           '@astrojs/[^/]+$',
           'astro/config',
+          'astro/middleware',
+          'astro:content',
           'unocss/astro',
           '@@.*',
           'content/.*',
@@ -54,6 +56,8 @@ module.exports = {
     'no-nested-ternary': 'warn',
     'no-await-in-loop': 'warn',
     'no-shadow': 'warn',
+    'quote-props': 'warn',
+    'quotes': 'warn',
     'prefer-template': 'off',
     'no-param-reassign': 'off',
     'no-underscore-dangle': 'off',

package/packages/storefront/.eslintrc.cjs

@@ -2,14 +2,17 @@ module.exports = {
   extends: './.base.eslintrc.cjs',
   rules: {
     'no-console': 'off',
-    semi: 'warn',
+    'semi': 'warn',
     'arrow-parens': 'warn',
     'object-curly-newline': 'warn',
     'comma-dangle': 'warn',
     'consistent-return': 'warn',
     'array-bracket-spacing': 'warn',
+    'quote-props': 'off',
+    'quotes': 'off',
     'global-require': 'off',
     'import/no-dynamic-require': 'off',
+    'import/prefer-default-export': 'warn',
     'vue/multi-word-component-names': ['error', {
       ignores: ['Fade', 'Carousel', 'Drawer', 'Prices'],
     }],

package/packages/storefront/astro.config.mjs

@@ -1,5 +1,5 @@
 import { lstatSync, readFileSync } from 'node:fs';
-import { join as joinPath } from 'path';
+import { join as joinPath } from 'node:path';
 import * as dotenv from 'dotenv';
 import { defineConfig } from 'astro/config';
 import node from '@astrojs/node';
@@ -8,7 +8,7 @@ import image from '@astrojs/image';
 import UnoCSS from 'unocss/astro';
 import AstroPWA from '@vite-pwa/astro';
 import dictionaryDir from '@cloudcommerce/i18n/lib/dirname';
-import getConfig from './storefront.config.mjs';
+import getConfig from './config/storefront.config.mjs';
 
 const __dirname = new URL('.', import.meta.url).pathname;
 dotenv.config();
@@ -185,6 +185,10 @@ const genAstroConfig = ({
     outDir,
     integrations,
     site,
+    compressHTML: isToServerless,
+    build: {
+      inlineStylesheets: 'never',
+    },
     vite: {
       plugins: [
         {

package/packages/storefront/config/{storefront.cms.cjs → storefront.cms.js}

@@ -1,7 +1,4 @@
-const fs = require('fs');
-const { resolve: resolvePath } = require('path');
-
-module.exports = () => {
+global.__storefrontCMS = (fs, resolvePath) => {
   const { STOREFRONT_BASE_DIR } = process.env;
   let baseDir;
   if (STOREFRONT_BASE_DIR) {
@@ -28,11 +25,15 @@ module.exports = () => {
             resolve(slugs);
           });
         }
+        // @TODO: Also parse Markdown with front matter
         const filepath = resolvePath(dirContent, `${filename}.json`);
         content = fs.existsSync(filepath)
           ? JSON.parse(fs.readFileSync(filepath, 'utf8'))
           : null;
-        contentCache[filename] = content;
+        if (!filename.includes('/')) {
+          // Caching root content only (not collections)
+          contentCache[filename] = content;
+        }
       }
       return filename === 'settings'
         ? content

package/packages/storefront/{storefront.config.mjs → config/storefront.config.mjs}

@@ -1,7 +1,7 @@
-import { readFileSync } from 'node:fs';
-import { join as joinPath } from 'node:path';
+import fs from 'node:fs';
+import { join as joinPath, resolve as resolvePath } from 'node:path';
 import config from '@cloudcommerce/config';
-import getCMS from './config/storefront.cms.mjs';
+import './storefront.cms.js';
 
 export default () => {
   const { VITE_ECOM_STORE_ID } = import.meta.env || process.env;
@@ -15,14 +15,14 @@ export default () => {
     secondaryColor,
     settings,
     getContent,
-  } = getCMS();
+  } = global.__storefrontCMS(fs, resolvePath);
   config.set({ settingsContent: settings });
 
   let { storeId } = config.get();
   if (!storeId) {
     const configFilepath = joinPath(process.cwd(), 'config.json');
     try {
-      const mergeConfig = JSON.parse(readFileSync(configFilepath), 'utf8');
+      const mergeConfig = JSON.parse(fs.readFileSync(configFilepath), 'utf8');
       if (mergeConfig.storeId) {
         storeId = mergeConfig.storeId;
       }