@cloudcommerce/config 0.9.1 → 0.11.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/.turbo/turbo-build.log +1 -1
  2. package/lib/config.d.ts +2 -2
  3. package/lib/config.js +8 -19
  4. package/lib/config.js.map +1 -1
  5. package/lib/defaults.d.ts +0 -1
  6. package/lib/defaults.js +0 -2
  7. package/lib/defaults.js.map +1 -1
  8. package/package.json +3 -3
  9. package/src/config.ts +9 -21
  10. package/src/defaults.ts +0 -2
package/.turbo/turbo-build.log CHANGED
@@ -1,4 +1,4 @@
1
1
 
2
- > @cloudcommerce/config@0.9.0 build /home/leo/code/ecomplus/cloud-commerce/packages/config
2
+ > @cloudcommerce/config@0.10.0 build /home/leo/code/ecomplus/cloud-commerce/packages/config
3
3
  > bash ../../scripts/build-lib.sh
4
4
 
package/lib/config.d.ts CHANGED
@@ -1,11 +1,11 @@
1
- import type { CmsSettings } from '@cloudcommerce/types';
1
+ import type { SettingsContent } from '@cloudcommerce/types';
2
2
  type BaseConfig = {
3
3
  lang: string;
4
4
  currency: string;
5
5
  currencySymbol: string;
6
6
  countryCode: string;
7
7
  storeId: number;
8
- cmsSettings?: CmsSettings;
8
+ settingsContent?: SettingsContent;
9
9
  };
10
10
  declare const _default: {
11
11
  get(): BaseConfig;
package/lib/config.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import Deepmerge from '@fastify/deepmerge';
2
2
  import {
3
- DEFAULT_LANG, DEFAULT_CURRENCY, DEFAULT_CURRENCY_SYMBOL, DEFAULT_COUNTRY_CODE, DEV_FALLBACK_STORE_ID,
3
+ DEFAULT_LANG, DEFAULT_CURRENCY, DEFAULT_CURRENCY_SYMBOL, DEFAULT_COUNTRY_CODE,
4
4
  } from './defaults.js';
5
5
 
6
6
  // @ts-ignore
@@ -16,11 +16,10 @@ _env.ECOM_LANG = _env.ECOM_LANG || DEFAULT_LANG;
16
16
  _env.ECOM_CURRENCY = _env.ECOM_CURRENCY || DEFAULT_CURRENCY;
17
17
  _env.ECOM_CURRENCY_SYMBOL = _env.ECOM_CURRENCY_SYMBOL || DEFAULT_CURRENCY_SYMBOL;
18
18
  _env.ECOM_COUNTRY_CODE = _env.ECOM_COUNTRY_CODE || DEFAULT_COUNTRY_CODE;
19
- let isNoStoreWarned = false;
20
19
 
21
20
  export default {
22
21
  get() {
23
- const config = {
22
+ return {
24
23
  lang: _env.ECOM_LANG,
25
24
  currency: _env.ECOM_CURRENCY,
26
25
  currencySymbol: _env.ECOM_CURRENCY_SYMBOL,
@@ -28,24 +27,14 @@ export default {
28
27
  storeId: Number(_env.ECOM_STORE_ID),
29
28
  ...self.config,
30
29
  };
31
- if (!config.storeId && _env.DEV === true) {
32
- config.storeId = DEV_FALLBACK_STORE_ID;
33
- if (!isNoStoreWarned) {
34
- // eslint-disable-next-line no-console
35
- console.warn('[@cloudcommerce/config] `storeId` is not set, '
36
- + `using dev-only fallback ${DEV_FALLBACK_STORE_ID}`);
37
- isNoStoreWarned = true;
38
- }
39
- }
40
- return config;
41
30
  },
42
31
  set(config) {
43
- const { cmsSettings } = config;
44
- if (cmsSettings) {
45
- config.lang = config.lang || cmsSettings.lang;
46
- config.currency = config.currency || cmsSettings.currency;
47
- config.currencySymbol = config.currencySymbol || cmsSettings.currency_symbol;
48
- config.countryCode = config.currencySymbol || cmsSettings.country_code;
32
+ const { settingsContent } = config;
33
+ if (settingsContent) {
34
+ config.lang = config.lang || settingsContent.lang;
35
+ config.currency = config.currency || settingsContent.currency;
36
+ config.currencySymbol = config.currencySymbol || settingsContent.currency_symbol;
37
+ config.countryCode = config.currencySymbol || settingsContent.country_code;
49
38
  }
50
39
  self.config = deepmerge(self.config, config);
51
40
  if (config.storeId) {
package/lib/config.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
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;AAWpB,aAAa;AACb,MAAM,IAAI,GAAwB,MAAM,CAAC,IAAI,CAAC,GAAG;OAC5C,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,EAAE,GAAG,CAAC;OAC7C,UAAU,CAAC;AAEhB,MAAM,SAAS,GAAG,SAAS,EAAE,CAAC;AAE9B,MAAM,IAAI,GAAG,UAAU,CAAC,eAAe,IAAI;IACzC,MAAM,EAAE,EAAE;CACX,CAAC;AACF,UAAU,CAAC,eAAe,GAAG,IAAI,CAAC;AAClC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,YAAY,CAAC;AAChD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,gBAAgB,CAAC;AAC5D,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,IAAI,uBAAuB,CAAC;AACjF,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,IAAI,oBAAoB,CAAC;AAExE,eAAe;IACb,GAAG;QACD,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,SAAS;YACpB,QAAQ,EAAE,IAAI,CAAC,aAAa;YAC5B,cAAc,EAAE,IAAI,CAAC,oBAAoB;YACzC,WAAW,EAAE,IAAI,CAAC,iBAAiB;YACnC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;YACnC,GAAG,IAAI,CAAC,MAAM;SACf,CAAC;IACJ,CAAC;IACD,GAAG,CAAC,MAA2B;QAC7B,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;QACnC,IAAI,eAAe,EAAE;YACnB,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,eAAe,CAAC,IAAI,CAAC;YAClD,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,eAAe,CAAC,QAAQ,CAAC;YAC9D,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,eAAe,CAAC,eAAe,CAAC;YACjF,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,cAAc,IAAI,eAAe,CAAC,YAAY,CAAC;SAC5E;QACD,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;QACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QACpD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChE,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;QACpF,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;IAC7E,CAAC;CACF,CAAC"}
package/lib/defaults.d.ts CHANGED
@@ -2,4 +2,3 @@ export declare const DEFAULT_LANG = "pt_br";
2
2
  export declare const DEFAULT_CURRENCY = "BRL";
3
3
  export declare const DEFAULT_CURRENCY_SYMBOL = "R$";
4
4
  export declare const DEFAULT_COUNTRY_CODE = "BR";
5
- export declare const DEV_FALLBACK_STORE_ID = 1011;
package/lib/defaults.js CHANGED
@@ -5,6 +5,4 @@ export const DEFAULT_CURRENCY = 'BRL';
5
5
  export const DEFAULT_CURRENCY_SYMBOL = 'R$';
6
6
 
7
7
  export const DEFAULT_COUNTRY_CODE = 'BR';
8
-
9
- export const DEV_FALLBACK_STORE_ID = 1011;
10
8
  // # sourceMappingURL=defaults.js.map
package/lib/defaults.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"defaults.js","sourceRoot":"","sources":["../src/defaults.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG,OAAO,CAAC;AAEpC,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAEtC,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,CAAC;AAE5C,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAC;AAEzC,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,CAAC"}
1
+ {"version":3,"file":"defaults.js","sourceRoot":"","sources":["../src/defaults.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG,OAAO,CAAC;AAEpC,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAEtC,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,CAAC;AAE5C,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@cloudcommerce/config",
3
3
  "type": "module",
4
- "version": "0.9.1",
4
+ "version": "0.11.0",
5
5
  "description": "E-Com Plus Cloud Commerce base config",
6
6
  "main": "lib/config.js",
7
7
  "exports": {
@@ -22,10 +22,10 @@
22
22
  "homepage": "https://github.com/ecomplus/cloud-commerce/tree/main/packages/config#readme",
23
23
  "dependencies": {
24
24
  "@fastify/deepmerge": "^1.3.0",
25
- "@cloudcommerce/api": "0.9.1"
25
+ "@cloudcommerce/api": "0.11.0"
26
26
  },
27
27
  "devDependencies": {
28
- "@cloudcommerce/types": "0.9.1"
28
+ "@cloudcommerce/types": "0.11.0"
29
29
  },
30
30
  "scripts": {
31
31
  "build": "bash ../../scripts/build-lib.sh"
package/src/config.ts CHANGED
@@ -1,11 +1,10 @@
1
- import type { CmsSettings } from '@cloudcommerce/types';
1
+ import type { SettingsContent } from '@cloudcommerce/types';
2
2
  import Deepmerge from '@fastify/deepmerge';
3
3
  import {
4
4
  DEFAULT_LANG,
5
5
  DEFAULT_CURRENCY,
6
6
  DEFAULT_CURRENCY_SYMBOL,
7
7
  DEFAULT_COUNTRY_CODE,
8
- DEV_FALLBACK_STORE_ID,
9
8
  } from './defaults';
10
9
 
11
10
  type BaseConfig = {
@@ -14,7 +13,7 @@ type BaseConfig = {
14
13
  currencySymbol: string,
15
14
  countryCode: string,
16
15
  storeId: number,
17
- cmsSettings?: CmsSettings,
16
+ settingsContent?: SettingsContent,
18
17
  };
19
18
 
20
19
  // @ts-ignore
@@ -32,11 +31,10 @@ _env.ECOM_LANG = _env.ECOM_LANG || DEFAULT_LANG;
32
31
  _env.ECOM_CURRENCY = _env.ECOM_CURRENCY || DEFAULT_CURRENCY;
33
32
  _env.ECOM_CURRENCY_SYMBOL = _env.ECOM_CURRENCY_SYMBOL || DEFAULT_CURRENCY_SYMBOL;
34
33
  _env.ECOM_COUNTRY_CODE = _env.ECOM_COUNTRY_CODE || DEFAULT_COUNTRY_CODE;
35
- let isNoStoreWarned = false;
36
34
 
37
35
  export default {
38
36
  get(): BaseConfig {
39
- const config = {
37
+ return {
40
38
  lang: _env.ECOM_LANG,
41
39
  currency: _env.ECOM_CURRENCY,
42
40
  currencySymbol: _env.ECOM_CURRENCY_SYMBOL,
@@ -44,24 +42,14 @@ export default {
44
42
  storeId: Number(_env.ECOM_STORE_ID),
45
43
  ...self.config,
46
44
  };
47
- if (!config.storeId && _env.DEV === true) {
48
- config.storeId = DEV_FALLBACK_STORE_ID;
49
- if (!isNoStoreWarned) {
50
- // eslint-disable-next-line no-console
51
- console.warn('[@cloudcommerce/config] `storeId` is not set, '
52
- + `using dev-only fallback ${DEV_FALLBACK_STORE_ID}`);
53
- isNoStoreWarned = true;
54
- }
55
- }
56
- return config;
57
45
  },
58
46
  set(config: Partial<BaseConfig>) {
59
- const { cmsSettings } = config;
60
- if (cmsSettings) {
61
- config.lang = config.lang || cmsSettings.lang;
62
- config.currency = config.currency || cmsSettings.currency;
63
- config.currencySymbol = config.currencySymbol || cmsSettings.currency_symbol;
64
- config.countryCode = config.currencySymbol || cmsSettings.country_code;
47
+ const { settingsContent } = config;
48
+ if (settingsContent) {
49
+ config.lang = config.lang || settingsContent.lang;
50
+ config.currency = config.currency || settingsContent.currency;
51
+ config.currencySymbol = config.currencySymbol || settingsContent.currency_symbol;
52
+ config.countryCode = config.currencySymbol || settingsContent.country_code;
65
53
  }
66
54
  self.config = deepmerge(self.config, config);
67
55
  if (config.storeId) {
package/src/defaults.ts CHANGED
@@ -5,5 +5,3 @@ export const DEFAULT_CURRENCY = 'BRL';
5
5
  export const DEFAULT_CURRENCY_SYMBOL = 'R$';
6
6
 
7
7
  export const DEFAULT_COUNTRY_CODE = 'BR';
8
-
9
- export const DEV_FALLBACK_STORE_ID = 1011;