The extractModuleNames function and env corrections.

Author: PaulDalek

lib/cache.js

@@ -52,15 +52,14 @@ export const extractVersion = (cache) => {
 
 /**
  * Extracts the Highcharts module name based on the scriptPath.
+ *
+ * @param {string} scriptPath - The path to the module.
+ *
+ * @returns {string} The name of a module.
  */
 export const extractModuleName = (scriptPath) => {
-  return scriptPath
-    .replace(/\\/g, '/')
-    .replace(
-      /(.*)\/|(.*)modules\/|stock\/(.*)indicators\/|maps\/(.*)modules\//gi,
-      ''
-    )
-    .replace(/\.min\.js$|\.js$/i, '');
+  // Normalize slashes, get part after the last '/' and remove .js extension
+  return scriptPath.replace(/\\/g, '/').split('/').pop().replace(/\.js$/i, '');
 };
 
 /**

lib/envs.js

@@ -141,6 +141,7 @@ export const Config = z.object({
       })
     )
     .transform((value) => (value !== '' ? value : undefined)),
+  HIGHCHARTS_USE_NPM: v.boolean(),
   HIGHCHARTS_CORE_SCRIPTS: v.array(scriptsNames.core),
   HIGHCHARTS_MODULE_SCRIPTS: v.array(scriptsNames.modules),
   HIGHCHARTS_INDICATOR_SCRIPTS: v.array(scriptsNames.indicators),

lib/schemas/config.js

@@ -168,6 +168,12 @@ export const defaultConfig = {
       envLink: 'HIGHCHARTS_CDN_URL',
       description: 'The CDN URL for Highcharts scripts to be used.'
     },
+    useNpm: {
+      value: false,
+      type: 'boolean',
+      envLink: 'HIGHCHARTS_USE_NPM',
+      description: 'Flag to use Highcharts scripts from NPM package'
+    },
     coreScripts: {
       value: scriptsNames.core,
       type: 'string[]',
@@ -191,12 +197,6 @@ export const defaultConfig = {
       type: 'string[]',
       description: 'Additional custom scripts or dependencies to fetch.'
     },
-    useNpm: {
-      value: false,
-      type: 'boolean',
-      envLink: 'HIGHCHARTS_USE_NPM',
-      description: 'Flag to use Highcharts scripts from NPM package'
-    },
     forceFetch: {
       value: false,
       type: 'boolean',
@@ -759,6 +759,12 @@ export const promptsConfig = {
       message: 'The URL of CDN',
       initial: defaultConfig.highcharts.cdnURL.value
     },
+    {
+      type: 'toggle',
+      name: 'useNpm',
+      message: 'Flag to use Highcharts scripts from NPM package',
+      initial: defaultConfig.highcharts.useNpm.value
+    },
     {
       type: 'multiselect',
       name: 'coreScripts',
@@ -787,12 +793,6 @@ export const promptsConfig = {
       initial: defaultConfig.highcharts.customScripts.value.join(','),
       separator: ','
     },
-    {
-      type: 'toggle',
-      name: 'useNpm',
-      message: 'Flag to use Highcharts scripts from NPM package',
-      initial: defaultConfig.highcharts.useNpm.value
-    },
     {
       type: 'toggle',
       name: 'forceFetch',

tests/unit/cache.test.js

@@ -13,8 +13,8 @@ describe('extractVersion', () => {
 describe('extractModuleName', () => {
   it('should extract the module name from a given script path', () => {
     const paths = [
-      { input: 'modules/exporting', expected: 'exporting' },
-      { input: 'maps/modules/map', expected: 'map' }
+      { input: 'modules/exporting.js', expected: 'exporting' },
+      { input: 'maps/modules/map.js', expected: 'map' }
     ];
 
     paths.forEach(({ input, expected }) => {