@bleedingdev/modern-js-app-tools 3.5.0-ultramodern.32 → 3.5.0-ultramodern.34

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.
@@ -72,10 +72,19 @@ const mergeCompressionOptions = (base, next)=>{
72
72
  ...base,
73
73
  ...next
74
74
  };
75
- if (base.compressionOptions || next.compressionOptions) merged.compressionOptions = {
76
- ...base.compressionOptions,
77
- ...next.compressionOptions
78
- };
75
+ if (base.compressionOptions || next.compressionOptions) {
76
+ const baseCompressionOptions = base.compressionOptions;
77
+ const nextCompressionOptions = next.compressionOptions;
78
+ const mergedCompressionOptions = {
79
+ ...baseCompressionOptions,
80
+ ...nextCompressionOptions
81
+ };
82
+ if (baseCompressionOptions?.params || nextCompressionOptions?.params) mergedCompressionOptions.params = {
83
+ ...baseCompressionOptions?.params,
84
+ ...nextCompressionOptions?.params
85
+ };
86
+ merged.compressionOptions = mergedCompressionOptions;
87
+ }
79
88
  return merged;
80
89
  };
81
90
  const resolveCodecOptions = (codecConfig, createDefaultOptions)=>{
@@ -66,12 +66,15 @@ const resolveTopologyDeliveryUnit = async (appDirectory)=>{
66
66
  }
67
67
  if (!(0, external_utils_js_namespaceObject.isRecord)(compactConfig)) return;
68
68
  const topology = (0, external_utils_js_namespaceObject.isRecord)(compactConfig.topology) ? compactConfig.topology : void 0;
69
- const apps = Array.isArray(topology?.apps) ? topology.apps : [];
69
+ const apps = Array.isArray(topology?.apps) ? topology.apps : void 0;
70
70
  const resolvedAppDirectory = external_node_path_default().resolve(appDirectory);
71
- for (const app of apps){
72
- if (!(0, external_utils_js_namespaceObject.isRecord)(app)) continue;
73
- const appPath = (0, universal_namespaceObject.nonEmptyString)(app.path);
74
- if (appPath && external_node_path_default().resolve(workspaceRoot, appPath.replace(/^\.\/+/u, '')) === resolvedAppDirectory) return (0, universal_namespaceObject.toDeliveryUnitIdentity)(app.deliveryUnit);
71
+ if (apps) {
72
+ for (const app of apps){
73
+ if (!(0, external_utils_js_namespaceObject.isRecord)(app)) continue;
74
+ const appPath = (0, universal_namespaceObject.nonEmptyString)(app.path);
75
+ if (appPath && external_node_path_default().resolve(workspaceRoot, appPath.replace(/^\.\/+/u, '')) === resolvedAppDirectory) return (0, universal_namespaceObject.toDeliveryUnitIdentity)(app.deliveryUnit);
76
+ }
77
+ return;
75
78
  }
76
79
  return (0, universal_namespaceObject.toDeliveryUnitIdentity)(compactConfig.deliveryUnit);
77
80
  };
@@ -30,10 +30,19 @@ const mergeCompressionOptions = (base, next)=>{
30
30
  ...base,
31
31
  ...next
32
32
  };
33
- if (base.compressionOptions || next.compressionOptions) merged.compressionOptions = {
34
- ...base.compressionOptions,
35
- ...next.compressionOptions
36
- };
33
+ if (base.compressionOptions || next.compressionOptions) {
34
+ const baseCompressionOptions = base.compressionOptions;
35
+ const nextCompressionOptions = next.compressionOptions;
36
+ const mergedCompressionOptions = {
37
+ ...baseCompressionOptions,
38
+ ...nextCompressionOptions
39
+ };
40
+ if (baseCompressionOptions?.params || nextCompressionOptions?.params) mergedCompressionOptions.params = {
41
+ ...baseCompressionOptions?.params,
42
+ ...nextCompressionOptions?.params
43
+ };
44
+ merged.compressionOptions = mergedCompressionOptions;
45
+ }
37
46
  return merged;
38
47
  };
39
48
  const resolveCodecOptions = (codecConfig, createDefaultOptions)=>{
@@ -23,12 +23,15 @@ const resolveTopologyDeliveryUnit = async (appDirectory)=>{
23
23
  }
24
24
  if (!isRecord(compactConfig)) return;
25
25
  const topology = isRecord(compactConfig.topology) ? compactConfig.topology : void 0;
26
- const apps = Array.isArray(topology?.apps) ? topology.apps : [];
26
+ const apps = Array.isArray(topology?.apps) ? topology.apps : void 0;
27
27
  const resolvedAppDirectory = node_path.resolve(appDirectory);
28
- for (const app of apps){
29
- if (!isRecord(app)) continue;
30
- const appPath = nonEmptyString(app.path);
31
- if (appPath && node_path.resolve(workspaceRoot, appPath.replace(/^\.\/+/u, '')) === resolvedAppDirectory) return toDeliveryUnitIdentity(app.deliveryUnit);
28
+ if (apps) {
29
+ for (const app of apps){
30
+ if (!isRecord(app)) continue;
31
+ const appPath = nonEmptyString(app.path);
32
+ if (appPath && node_path.resolve(workspaceRoot, appPath.replace(/^\.\/+/u, '')) === resolvedAppDirectory) return toDeliveryUnitIdentity(app.deliveryUnit);
33
+ }
34
+ return;
32
35
  }
33
36
  return toDeliveryUnitIdentity(compactConfig.deliveryUnit);
34
37
  };
@@ -31,10 +31,19 @@ const mergeCompressionOptions = (base, next)=>{
31
31
  ...base,
32
32
  ...next
33
33
  };
34
- if (base.compressionOptions || next.compressionOptions) merged.compressionOptions = {
35
- ...base.compressionOptions,
36
- ...next.compressionOptions
37
- };
34
+ if (base.compressionOptions || next.compressionOptions) {
35
+ const baseCompressionOptions = base.compressionOptions;
36
+ const nextCompressionOptions = next.compressionOptions;
37
+ const mergedCompressionOptions = {
38
+ ...baseCompressionOptions,
39
+ ...nextCompressionOptions
40
+ };
41
+ if (baseCompressionOptions?.params || nextCompressionOptions?.params) mergedCompressionOptions.params = {
42
+ ...baseCompressionOptions?.params,
43
+ ...nextCompressionOptions?.params
44
+ };
45
+ merged.compressionOptions = mergedCompressionOptions;
46
+ }
38
47
  return merged;
39
48
  };
40
49
  const resolveCodecOptions = (codecConfig, createDefaultOptions)=>{
@@ -24,12 +24,15 @@ const resolveTopologyDeliveryUnit = async (appDirectory)=>{
24
24
  }
25
25
  if (!isRecord(compactConfig)) return;
26
26
  const topology = isRecord(compactConfig.topology) ? compactConfig.topology : void 0;
27
- const apps = Array.isArray(topology?.apps) ? topology.apps : [];
27
+ const apps = Array.isArray(topology?.apps) ? topology.apps : void 0;
28
28
  const resolvedAppDirectory = node_path.resolve(appDirectory);
29
- for (const app of apps){
30
- if (!isRecord(app)) continue;
31
- const appPath = nonEmptyString(app.path);
32
- if (appPath && node_path.resolve(workspaceRoot, appPath.replace(/^\.\/+/u, '')) === resolvedAppDirectory) return toDeliveryUnitIdentity(app.deliveryUnit);
29
+ if (apps) {
30
+ for (const app of apps){
31
+ if (!isRecord(app)) continue;
32
+ const appPath = nonEmptyString(app.path);
33
+ if (appPath && node_path.resolve(workspaceRoot, appPath.replace(/^\.\/+/u, '')) === resolvedAppDirectory) return toDeliveryUnitIdentity(app.deliveryUnit);
34
+ }
35
+ return;
33
36
  }
34
37
  return toDeliveryUnitIdentity(compactConfig.deliveryUnit);
35
38
  };
package/package.json CHANGED
@@ -17,7 +17,7 @@
17
17
  "modern",
18
18
  "modern.js"
19
19
  ],
20
- "version": "3.5.0-ultramodern.32",
20
+ "version": "3.5.0-ultramodern.34",
21
21
  "types": "./dist/types/index.d.ts",
22
22
  "main": "./dist/cjs/index.js",
23
23
  "exports": {
@@ -96,16 +96,16 @@
96
96
  "ndepe": "^0.1.13",
97
97
  "pkg-types": "^2.3.1",
98
98
  "std-env": "4.1.0",
99
- "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.5.0-ultramodern.32",
100
- "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.32",
101
- "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.5.0-ultramodern.32",
102
- "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.5.0-ultramodern.32",
103
- "@modern-js/server": "npm:@bleedingdev/modern-js-server@3.5.0-ultramodern.32",
104
- "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.32",
105
- "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.5.0-ultramodern.32",
106
- "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.32",
107
- "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.5.0-ultramodern.32",
108
- "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.32"
99
+ "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.5.0-ultramodern.34",
100
+ "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.34",
101
+ "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.5.0-ultramodern.34",
102
+ "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.34",
103
+ "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.5.0-ultramodern.34",
104
+ "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.5.0-ultramodern.34",
105
+ "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.5.0-ultramodern.34",
106
+ "@modern-js/server": "npm:@bleedingdev/modern-js-server@3.5.0-ultramodern.34",
107
+ "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.34",
108
+ "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.34"
109
109
  },
110
110
  "devDependencies": {
111
111
  "@rslib/core": "0.23.1",