cloudcommerce 0.0.63 → 0.0.66

package/packages/apps/tiny-erp/src/event-to-tiny.ts

@@ -91,7 +91,6 @@ const handleApiEvent: ApiEventHandler = async ({
             const ids = actionQueues[queue];
             if (Array.isArray(ids) && ids.length) {
               const isHiddenQueue = action.charAt(0) === '_';
-              const mustUpdateAppQueue = evName === 'applications-dataSet';
               const handlerName = action.replace(/^_+/, '');
               const handler = integrationHandlers[handlerName][queue.toLowerCase()];
               const nextId = ids[0];
@@ -108,7 +107,6 @@ const handleApiEvent: ApiEventHandler = async ({
                   queue,
                   nextId,
                   key,
-                  mustUpdateAppQueue,
                   app,
                 };
                 return handler(

package/packages/apps/tiny-erp/src/integration/export-order-to-tiny.ts

@@ -75,12 +75,15 @@ export default async (apiDoc, queueEntry, appData, canCreateNew) => {
     });
   }
 
-  logger.info(`${orderId} found with tiny status ${tinyStatus}`);
-  if (tinyStatus) {
-    return postTiny('/pedido.alterar.situacao', {
-      id: originalTinyOrder.id,
-      situacao: tinyStatus,
-    });
+  if (originalTinyOrder) {
+    const { id, situacao } = originalTinyOrder;
+    logger.info(`${orderId} found with tiny status ${situacao} => ${tinyStatus}`);
+    if (tinyStatus && tinyStatus !== situacao) {
+      return postTiny('/pedido.alterar.situacao', {
+        id,
+        situacao: tinyStatus,
+      });
+    }
   }
   return null;
 };

package/packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/cli",
   "type": "module",
-  "version": "0.0.63",
+  "version": "0.0.66",
   "description": "E-Com Plus Cloud Commerce CLI tools",
   "bin": {
     "cloudcommerce": "./bin/run.mjs"

package/packages/config/CHANGELOG.md

@@ -0,0 +1 @@
+Please refer to GitHub [repository releases](https://github.com/ecomplus/cloud-commerce/releases) or monorepo unified [CHANGELOG.md](https://github.com/ecomplus/cloud-commerce/blob/main/CHANGELOG.md).

package/packages/config/README.md

@@ -0,0 +1 @@
+# `@cloudcommerce/config`

package/packages/config/lib/config.d.ts

@@ -0,0 +1,13 @@
+declare type BaseConfig = {
+    lang: string;
+    currency: string;
+    currencySymbol: string;
+    countryCode: string;
+    storeId: number;
+};
+declare const _default: {
+    get(): BaseConfig;
+    set(config: any): void;
+};
+export default _default;
+export type { BaseConfig };

package/packages/config/lib/config.js

@@ -0,0 +1,30 @@
+import Deepmerge from '@fastify/deepmerge';
+import {
+  DEFAULT_LANG, DEFAULT_CURRENCY, DEFAULT_CURRENCY_SYMBOL, DEFAULT_COUNTRY_CODE,
+} from './defaults.js';
+
+const _env = (typeof process === 'object' && process?.env) || globalThis;
+const deepmerge = Deepmerge();
+const self = globalThis.__cloudCommerce || {
+  config: {
+    lang: _env.ECOM_LANG || DEFAULT_LANG,
+    currency: _env.ECOM_CURRENCY || DEFAULT_CURRENCY,
+    currencySymbol: _env.ECOM_CURRENCY_SYMBOL || DEFAULT_CURRENCY_SYMBOL,
+    countryCode: _env.ECOM_COUNTRY_CODE || DEFAULT_COUNTRY_CODE,
+    storeId: Number(_env.ECOM_STORE_ID),
+  },
+};
+globalThis.__cloudCommerce = self;
+
+export default {
+  get() {
+    return self.config;
+  },
+  set(config) {
+    self.config = deepmerge(self.config, config);
+    if (config.storeId) {
+      _env.ECOM_STORE_ID = config.storeId;
+    }
+  },
+};
+// # sourceMappingURL=config.js.map

package/packages/config/lib/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,YAAY,CAAC;AAEpB,MAAM,IAAI,GAAwB,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,EAAE,GAAG,CAAC,IAAI,UAAU,CAAC;AAC9F,MAAM,SAAS,GAAG,SAAS,EAAE,CAAC;AAU9B,MAAM,IAAI,GAA2B,UAAU,CAAC,eAAe,IAAI;IACjE,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,SAAS,IAAI,YAAY;QACpC,QAAQ,EAAE,IAAI,CAAC,aAAa,IAAI,gBAAgB;QAChD,cAAc,EAAE,IAAI,CAAC,oBAAoB,IAAI,uBAAuB;QACpE,WAAW,EAAE,IAAI,CAAC,iBAAiB,IAAI,oBAAoB;QAC3D,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;KACpC;CACF,CAAC;AACF,UAAU,CAAC,eAAe,GAAG,IAAI,CAAC;AAElC,eAAe;IACb,GAAG;QACD,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IACD,GAAG,CAAC,MAAM;QACR,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC7C,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;SACrC;IACH,CAAC;CACF,CAAC"}

package/packages/config/lib/env.d.ts

@@ -0,0 +1,11 @@
+declare type Env = {
+    storeId: number;
+    apiAuth: {
+        authenticationId: string;
+        apiKey: string;
+    };
+    githubToken?: string;
+};
+declare const _default: () => Env;
+export default _default;
+export type { Env };

package/packages/config/lib/env.js

@@ -0,0 +1,30 @@
+const _env = (typeof process === 'object' && process?.env) || globalThis;
+
+export default () => {
+  const {
+    ECOM_STORE_ID, ECOM_AUTHENTICATION_ID, ECOM_API_KEY, GITHUB_TOKEN,
+  } = _env;
+  const storeId = ECOM_STORE_ID && parseInt(ECOM_STORE_ID, 10);
+  if (!storeId) {
+    throw new Error('ECOM_STORE_ID is not set or not a number');
+  }
+  if (!ECOM_AUTHENTICATION_ID) {
+    throw new Error('ECOM_AUTHENTICATION_ID is not set');
+  }
+  if (!ECOM_API_KEY) {
+    throw new Error('ECOM_API_KEY is not set');
+  }
+  const authenticationId = ECOM_AUTHENTICATION_ID;
+  const apiKey = ECOM_API_KEY;
+  const githubToken = GITHUB_TOKEN;
+  const env = {
+    storeId,
+    apiAuth: {
+      authenticationId,
+      apiKey,
+    },
+    githubToken,
+  };
+  return env;
+};
+// # sourceMappingURL=env.js.map

package/packages/config/lib/env.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AASA,MAAM,IAAI,GAAwB,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,EAAE,GAAG,CAAC,IAAI,UAAU,CAAC;AAE9F,eAAe,GAAG,EAAE;IAClB,MAAM,EACJ,aAAa,EACb,sBAAsB,EACtB,YAAY,EACZ,YAAY,GACb,GAAG,IAAI,CAAC;IACT,MAAM,OAAO,GAAG,aAAa,IAAI,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IAC7D,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;KAC7D;IACD,IAAI,CAAC,sBAAsB,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACtD;IACD,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;KAC5C;IACD,MAAM,gBAAgB,GAAG,sBAAsB,CAAC;IAChD,MAAM,MAAM,GAAG,YAAY,CAAC;IAC5B,MAAM,WAAW,GAAG,YAAY,CAAC;IACjC,MAAM,GAAG,GAAQ;QACf,OAAO;QACP,OAAO,EAAE;YACP,gBAAgB;YAChB,MAAM;SACP;QACD,WAAW;KACZ,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC"}

package/packages/config/package.json

@@ -0,0 +1,33 @@
+{
+  "name": "@cloudcommerce/config",
+  "type": "module",
+  "version": "0.0.66",
+  "description": "E-Com Plus Cloud Commerce base config",
+  "main": "lib/config.js",
+  "exports": {
+    ".": "./lib/config.js",
+    "./lib/config": "./lib/config.js",
+    "./lib/env": "./lib/env.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ecomplus/cloud-commerce.git",
+    "directory": "packages/config"
+  },
+  "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
+  "license": "Apache 2.0 with Commons Clause",
+  "bugs": {
+    "url": "https://github.com/ecomplus/cloud-commerce/issues"
+  },
+  "homepage": "https://github.com/ecomplus/cloud-commerce/tree/main/packages/config#readme",
+  "scripts": {
+    "build": "sh ../../scripts/build-lib.sh"
+  },
+  "dependencies": {
+    "@cloudcommerce/api": "workspace:*",
+    "@fastify/deepmerge": "^1.1.0"
+  },
+  "devDependencies": {
+    "@cloudcommerce/types": "workspace:*"
+  }
+}

package/packages/config/src/config.ts

@@ -0,0 +1,43 @@
+import Deepmerge from '@fastify/deepmerge';
+import {
+  DEFAULT_LANG,
+  DEFAULT_CURRENCY,
+  DEFAULT_CURRENCY_SYMBOL,
+  DEFAULT_COUNTRY_CODE,
+} from './defaults';
+
+const _env: Record<string, any> = (typeof process === 'object' && process?.env) || globalThis;
+const deepmerge = Deepmerge();
+
+type BaseConfig = {
+  lang: string,
+  currency: string,
+  currencySymbol: string,
+  countryCode: string,
+  storeId: number,
+};
+
+const self: { config: BaseConfig } = globalThis.__cloudCommerce || {
+  config: {
+    lang: _env.ECOM_LANG || DEFAULT_LANG,
+    currency: _env.ECOM_CURRENCY || DEFAULT_CURRENCY,
+    currencySymbol: _env.ECOM_CURRENCY_SYMBOL || DEFAULT_CURRENCY_SYMBOL,
+    countryCode: _env.ECOM_COUNTRY_CODE || DEFAULT_COUNTRY_CODE,
+    storeId: Number(_env.ECOM_STORE_ID),
+  },
+};
+globalThis.__cloudCommerce = self;
+
+export default {
+  get() {
+    return self.config;
+  },
+  set(config) {
+    self.config = deepmerge(self.config, config);
+    if (config.storeId) {
+      _env.ECOM_STORE_ID = config.storeId;
+    }
+  },
+};
+
+export type { BaseConfig };

package/packages/config/src/env.ts

@@ -0,0 +1,43 @@
+type Env = {
+  storeId: number;
+  apiAuth: {
+    authenticationId: string;
+    apiKey: string;
+  },
+  githubToken?: string;
+};
+
+const _env: Record<string, any> = (typeof process === 'object' && process?.env) || globalThis;
+
+export default () => {
+  const {
+    ECOM_STORE_ID,
+    ECOM_AUTHENTICATION_ID,
+    ECOM_API_KEY,
+    GITHUB_TOKEN,
+  } = _env;
+  const storeId = ECOM_STORE_ID && parseInt(ECOM_STORE_ID, 10);
+  if (!storeId) {
+    throw new Error('ECOM_STORE_ID is not set or not a number');
+  }
+  if (!ECOM_AUTHENTICATION_ID) {
+    throw new Error('ECOM_AUTHENTICATION_ID is not set');
+  }
+  if (!ECOM_API_KEY) {
+    throw new Error('ECOM_API_KEY is not set');
+  }
+  const authenticationId = ECOM_AUTHENTICATION_ID;
+  const apiKey = ECOM_API_KEY;
+  const githubToken = GITHUB_TOKEN;
+  const env: Env = {
+    storeId,
+    apiAuth: {
+      authenticationId,
+      apiKey,
+    },
+    githubToken,
+  };
+  return env;
+};
+
+export type { Env };

package/packages/config/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "declaration": true
+  }
+}

package/packages/events/lib/firebase.js.map

@@ -1 +1 @@
-{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,iDAAiD;AAEjD,OAAO,kCAAkC,CAAC;AAE1C,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,OAAO,kCAAkC,CAAC;AAE1C,cAAc,6BAA6B,CAAC"}

package/packages/events/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/events",
   "type": "module",
-  "version": "0.0.63",
+  "version": "0.0.66",
   "description": "E-Com Plus Cloud Commerce app events",
   "main": "lib/index.js",
   "exports": {

package/packages/events/src/firebase.ts

@@ -1,5 +1,4 @@
 /* eslint-disable import/prefer-default-export */
-
 import '@cloudcommerce/firebase/lib/init';
 
 export * from '@cloudcommerce/app-tiny-erp';

package/packages/firebase/lib/config.d.ts

@@ -1,25 +1,28 @@
 import type { ApiEventName } from '@cloudcommerce/types';
-declare const _default: {
-    get(): {
-        hello: string;
-        lang: string;
-        currency: string;
-        currencySymbol: string;
-        countryCode: string;
-        storeId: number;
-        httpsFunctionOptions: {
-            region: string;
+import { BaseConfig } from '@cloudcommerce/config';
+declare const mergeConfig: {
+    hello: string;
+    httpsFunctionOptions: {
+        region: string;
+    };
+    apps: {
+        discounts: {
+            appId: number;
+        };
+        correios: {
+            appId: number;
         };
-        apps: {
-            discounts: {
-                appId: number;
-            };
-            tinyErp: {
-                appId: number;
-                events: ApiEventName[];
-            };
+        customShipping: {
+            appId: number;
+        };
+        tinyErp: {
+            appId: number;
+            events: ApiEventName[];
         };
     };
+};
+declare const _default: {
+    get(): BaseConfig & typeof mergeConfig;
     set(config: any): void;
 };
 export default _default;

package/packages/firebase/lib/config.js

@@ -1,51 +1,33 @@
-import Deepmerge from '@fastify/deepmerge';
-import {
-  DEFAULT_LANG, DEFAULT_CURRENCY, DEFAULT_CURRENCY_SYMBOL, DEFAULT_COUNTRY_CODE,
-} from './defaults.js';
+import config from '@cloudcommerce/config';
 
-// @ts-ignore
-const env = (typeof process === 'object' && process?.env)
-    || (typeof window === 'object' && window)
-    || {};
-const deepmerge = Deepmerge();
 const tinyErpEvents = [
   'orders-anyStatusSet',
   'products-new',
   'products-priceSet',
   'applications-dataSet',
 ];
-const self = {
-  __config: {
-    hello: 'from @cloudcommerce/firebase',
-    lang: env.ECOM_LANG || DEFAULT_LANG,
-    currency: env.ECOM_CURRENCY || DEFAULT_CURRENCY,
-    currencySymbol: env.ECOM_CURRENCY_SYMBOL || DEFAULT_CURRENCY_SYMBOL,
-    countryCode: env.ECOM_COUNTRY_CODE || DEFAULT_COUNTRY_CODE,
-    storeId: Number(env.ECOM_STORE_ID),
-    httpsFunctionOptions: {
-      region: env.DEPLOY_REGION || 'southamerica-east1',
+const mergeConfig = {
+  hello: 'from @cloudcommerce/firebase',
+  httpsFunctionOptions: {
+    region: process.env.DEPLOY_REGION || 'southamerica-east1',
+  },
+  apps: {
+    discounts: {
+      appId: 1252,
+    },
+    correios: {
+      appId: 1248,
+    },
+    customShipping: {
+      appId: 1253,
     },
-    apps: {
-      discounts: {
-        appId: 1252,
-      },
-      tinyErp: {
-        appId: 105922,
-        events: tinyErpEvents,
-      },
+    tinyErp: {
+      appId: 105922,
+      events: tinyErpEvents,
     },
   },
 };
+config.set(mergeConfig);
 
-export default {
-  get() {
-    return self.__config;
-  },
-  set(config) {
-    self.__config = deepmerge(self.__config, config);
-    if (config.storeId) {
-      env.ECOM_STORE_ID = config.storeId;
-    }
-  },
-};
+export default config;
 // # sourceMappingURL=config.js.map

package/packages/firebase/lib/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,YAAY,CAAC;AAEpB,aAAa;AACb,MAAM,GAAG,GAA8B,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,EAAE,GAAG,CAAC;OAC/E,CAAC,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC;OACtC,EAAE,CAAC;AAER,MAAM,SAAS,GAAG,SAAS,EAAE,CAAC;AAE9B,MAAM,aAAa,GAAmB;IACpC,qBAAqB;IACrB,cAAc;IACd,mBAAmB;IACnB,sBAAsB;CACvB,CAAC;AAEF,MAAM,IAAI,GAAG;IACX,QAAQ,EAAE;QACR,KAAK,EAAE,8BAA8B;QACrC,IAAI,EAAE,GAAG,CAAC,SAAS,IAAI,YAAY;QACnC,QAAQ,EAAE,GAAG,CAAC,aAAa,IAAI,gBAAgB;QAC/C,cAAc,EAAE,GAAG,CAAC,oBAAoB,IAAI,uBAAuB;QACnE,WAAW,EAAE,GAAG,CAAC,iBAAiB,IAAI,oBAAoB;QAC1D,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC;QAClC,oBAAoB,EAAE;YACpB,MAAM,EAAE,GAAG,CAAC,aAAa,IAAI,oBAAoB;SAClD;QACD,IAAI,EAAE;YACJ,SAAS,EAAE;gBACT,KAAK,EAAE,IAAI;aACZ;YACD,OAAO,EAAE;gBACP,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,aAAa;aACtB;SACF;KACF;CACF,CAAC;AAEF,eAAe;IACb,GAAG;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IACD,GAAG,CAAC,MAAM;QACR,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjD,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;SACpC;IACH,CAAC;CACF,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,MAAsB,MAAM,uBAAuB,CAAC;AAE3D,MAAM,aAAa,GAAmB;IACpC,qBAAqB;IACrB,cAAc;IACd,mBAAmB;IACnB,sBAAsB;CACvB,CAAC;AAEF,MAAM,WAAW,GAAG;IAClB,KAAK,EAAE,8BAA8B;IACrC,oBAAoB,EAAE;QACpB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,oBAAoB;KAC1D;IACD,IAAI,EAAE;QACJ,SAAS,EAAE;YACT,KAAK,EAAE,IAAI;SACZ;QACD,QAAQ,EAAE;YACR,KAAK,EAAE,IAAI;SACZ;QACD,cAAc,EAAE;YACd,KAAK,EAAE,IAAI;SACZ;QACD,OAAO,EAAE;YACP,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,aAAa;SACtB;KACF;CACF,CAAC;AACF,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AAExB,eAAe,MAId,CAAC"}

package/packages/firebase/lib/env.d.ts

@@ -1,11 +1,3 @@
-declare type Env = {
-    storeId: number;
-    apiAuth: {
-        authenticationId: string;
-        apiKey: string;
-    };
-    githubToken?: string;
-};
-declare const _default: () => Env;
-export default _default;
+import getEnv, { Env } from '@cloudcommerce/config/lib/env';
+export default getEnv;
 export type { Env };

package/packages/firebase/lib/env.js

@@ -1,28 +1,4 @@
-export default () => {
-  const {
-    ECOM_STORE_ID, ECOM_AUTHENTICATION_ID, ECOM_API_KEY, GITHUB_TOKEN,
-  } = process.env;
-  const storeId = ECOM_STORE_ID && parseInt(ECOM_STORE_ID, 10);
-  if (!storeId) {
-    throw new Error('ECOM_STORE_ID is not set or not a number');
-  }
-  if (!ECOM_AUTHENTICATION_ID) {
-    throw new Error('ECOM_AUTHENTICATION_ID is not set');
-  }
-  if (!ECOM_API_KEY) {
-    throw new Error('ECOM_API_KEY is not set');
-  }
-  const authenticationId = ECOM_AUTHENTICATION_ID;
-  const apiKey = ECOM_API_KEY;
-  const githubToken = GITHUB_TOKEN;
-  const env = {
-    storeId,
-    apiAuth: {
-      authenticationId,
-      apiKey,
-    },
-    githubToken,
-  };
-  return env;
-};
+import getEnv from '@cloudcommerce/config/lib/env';
+
+export default getEnv;
 // # sourceMappingURL=env.js.map

package/packages/firebase/lib/env.js.map

@@ -1 +1 @@
-{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AASA,eAAe,GAAG,EAAE;IAClB,MAAM,EACJ,aAAa,EACb,sBAAsB,EACtB,YAAY,EACZ,YAAY,GACb,GAAG,OAAO,CAAC,GAAG,CAAC;IAChB,MAAM,OAAO,GAAG,aAAa,IAAI,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IAC7D,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;KAC7D;IACD,IAAI,CAAC,sBAAsB,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACtD;IACD,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;KAC5C;IACD,MAAM,gBAAgB,GAAG,sBAAsB,CAAC;IAChD,MAAM,MAAM,GAAG,YAAY,CAAC;IAC5B,MAAM,WAAW,GAAG,YAAY,CAAC;IACjC,MAAM,GAAG,GAAQ;QACf,OAAO;QACP,OAAO,EAAE;YACP,gBAAgB;YAChB,MAAM;SACP;QACD,WAAW;KACZ,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC"}
+{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAAA,OAAO,MAAe,MAAM,+BAA+B,CAAC;AAE5D,eAAe,MAAM,CAAC"}

package/packages/firebase/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,iDAAiD;AAEjD,OAAO,QAAQ,CAAC;AAChB,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,gBAAgB,MAAM,+BAA+B,CAAC;AAE7D,MAAM,EAAE,oBAAoB,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAE1D,MAAM,eAAe,GAAG,SAAS;KAC9B,MAAM,CAAC,MAAM,CAAC;KACd,OAAO,CAAC;IACP,cAAc,EAAE,GAAG;IACnB,MAAM,EAAE,OAAO;CAChB,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM;KAClD,QAAQ,CAAC,WAAW,CAAC;KACrB,KAAK,CAAC,GAAG,EAAE;IACV,OAAO,gBAAgB,EAAE,CAAC;AAC5B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,OAAO,QAAQ,CAAC;AAChB,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,gBAAgB,MAAM,+BAA+B,CAAC;AAE7D,MAAM,EAAE,oBAAoB,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAE1D,MAAM,eAAe,GAAG,SAAS;KAC9B,MAAM,CAAC,MAAM,CAAC;KACd,OAAO,CAAC;IACP,cAAc,EAAE,GAAG;IACnB,MAAM,EAAE,OAAO;CAChB,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM;KAClD,QAAQ,CAAC,WAAW,CAAC;KACrB,KAAK,CAAC,GAAG,EAAE;IACV,OAAO,gBAAgB,EAAE,CAAC;AAC5B,CAAC,CAAC,CAAC"}

package/packages/firebase/lib/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAEjC,OAAO,gCAAgC,CAAC;AACxC,OAAO,sCAAsC,CAAC;AAC9C,gEAAgE;AAChE,gDAAgD;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,aAAa,EAAE,CAAC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,OAAO,gCAAgC,CAAC;AACxC,OAAO,sCAAsC,CAAC;AAC9C,gEAAgE;AAChE,gDAAgD;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,aAAa,EAAE,CAAC"}

package/packages/firebase/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/firebase",
   "type": "module",
-  "version": "0.0.63",
+  "version": "0.0.66",
   "description": "E-Com Plus Cloud Commerce on Firebase",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
-    "@fastify/deepmerge": "^1.1.0",
+    "@cloudcommerce/config": "workspace:*",
     "@google-cloud/pubsub": "^3.1.0",
     "firebase-admin": "^11.0.1",
     "firebase-functions": "^3.22.0",

package/packages/firebase/src/config.ts

@@ -1,18 +1,5 @@
 import type { ApiEventName } from '@cloudcommerce/types';
-import Deepmerge from '@fastify/deepmerge';
-import {
-  DEFAULT_LANG,
-  DEFAULT_CURRENCY,
-  DEFAULT_CURRENCY_SYMBOL,
-  DEFAULT_COUNTRY_CODE,
-} from './defaults';
-
-// @ts-ignore
-const env: { [key: string]: string } = (typeof process === 'object' && process?.env)
-  || (typeof window === 'object' && window)
-  || {};
-
-const deepmerge = Deepmerge();
+import config, { BaseConfig } from '@cloudcommerce/config';
 
 const tinyErpEvents: ApiEventName[] = [
   'orders-anyStatusSet',
@@ -21,37 +8,31 @@ const tinyErpEvents: ApiEventName[] = [
   'applications-dataSet',
 ];
 
-const self = {
-  __config: {
-    hello: 'from @cloudcommerce/firebase',
-    lang: env.ECOM_LANG || DEFAULT_LANG,
-    currency: env.ECOM_CURRENCY || DEFAULT_CURRENCY,
-    currencySymbol: env.ECOM_CURRENCY_SYMBOL || DEFAULT_CURRENCY_SYMBOL,
-    countryCode: env.ECOM_COUNTRY_CODE || DEFAULT_COUNTRY_CODE,
-    storeId: Number(env.ECOM_STORE_ID),
-    httpsFunctionOptions: {
-      region: env.DEPLOY_REGION || 'southamerica-east1',
+const mergeConfig = {
+  hello: 'from @cloudcommerce/firebase',
+  httpsFunctionOptions: {
+    region: process.env.DEPLOY_REGION || 'southamerica-east1',
+  },
+  apps: {
+    discounts: {
+      appId: 1252,
+    },
+    correios: {
+      appId: 1248,
     },
-    apps: {
-      discounts: {
-        appId: 1252,
-      },
-      tinyErp: {
-        appId: 105922,
-        events: tinyErpEvents,
-      },
+    customShipping: {
+      appId: 1253,
+    },
+    tinyErp: {
+      appId: 105922,
+      events: tinyErpEvents,
     },
   },
 };
+config.set(mergeConfig);
 
-export default {
-  get() {
-    return self.__config;
-  },
-  set(config) {
-    self.__config = deepmerge(self.__config, config);
-    if (config.storeId) {
-      env.ECOM_STORE_ID = config.storeId;
-    }
-  },
+export default config as {
+  get(): BaseConfig & typeof mergeConfig;
+  // eslint-disable-next-line
+  set(config: any): void;
 };

package/packages/firebase/src/env.ts

@@ -1,41 +1,5 @@
-type Env = {
-  storeId: number;
-  apiAuth: {
-    authenticationId: string;
-    apiKey: string;
-  },
-  githubToken?: string;
-};
+import getEnv, { Env } from '@cloudcommerce/config/lib/env';
 
-export default () => {
-  const {
-    ECOM_STORE_ID,
-    ECOM_AUTHENTICATION_ID,
-    ECOM_API_KEY,
-    GITHUB_TOKEN,
-  } = process.env;
-  const storeId = ECOM_STORE_ID && parseInt(ECOM_STORE_ID, 10);
-  if (!storeId) {
-    throw new Error('ECOM_STORE_ID is not set or not a number');
-  }
-  if (!ECOM_AUTHENTICATION_ID) {
-    throw new Error('ECOM_AUTHENTICATION_ID is not set');
-  }
-  if (!ECOM_API_KEY) {
-    throw new Error('ECOM_API_KEY is not set');
-  }
-  const authenticationId = ECOM_AUTHENTICATION_ID;
-  const apiKey = ECOM_API_KEY;
-  const githubToken = GITHUB_TOKEN;
-  const env: Env = {
-    storeId,
-    apiAuth: {
-      authenticationId,
-      apiKey,
-    },
-    githubToken,
-  };
-  return env;
-};
+export default getEnv;
 
 export type { Env };