npm - @guanghechen/commander - Versions diffs - 4.7.8 → 4.7.9 - Mend

@guanghechen/commander 4.7.8 → 4.7.9

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 (8) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,12 @@
 # Change Log
+## 4.7.9
+### Patch Changes
+- Support preset profile fallback by command-path suffix using dot notation, and expose resolved
+  preset envFile path metadata in input sources.
 ## 4.7.8
 ### Patch Changes

package/lib/cjs/browser.cjs CHANGED Viewed

@@ -1774,11 +1774,14 @@ class CommandPresetProfileParser {
             return undefined;
         }
         const manifest = this.#parsePresetProfileManifest(content, profileFile.displayPath, commandPath);
-        const resolvedProfileSelector = presetProfile ?? manifest.defaults?.profile;
-        if (resolvedProfileSelector === undefined) {
-            throw new CommanderError('ConfigurationError', `missing profile for preset file "${profileFile.displayPath}": provide "${PRESET_PROFILE_FLAG}" or defaults.profile`, commandPath);
-        }
-        const { profileName: resolvedProfileName, variantName: explicitVariantName } = this.#parsePresetProfileSelector(resolvedProfileSelector, presetProfileSourceName ?? 'defaults.profile', commandPath);
+        const resolvedProfileSelector = this.#resolvePresetProfileSelector({
+            presetProfile,
+            presetProfileSourceName,
+            manifest,
+            commandPath,
+            presetFileDisplayPath: profileFile.displayPath,
+        });
+        const { profileName: resolvedProfileName, variantName: explicitVariantName } = this.#parsePresetProfileSelector(resolvedProfileSelector.selector, resolvedProfileSelector.sourceName, commandPath);
         const profile = manifest.profiles[resolvedProfileName];
         if (profile === undefined) {
             throw new CommanderError('ConfigurationError', `unknown preset profile "${resolvedProfileName}" in "${profileFile.displayPath}"`, commandPath);
@@ -1859,6 +1862,52 @@ class CommandPresetProfileParser {
             }
         }
     }
+    #resolvePresetProfileSelector(params) {
+        const { presetProfile, presetProfileSourceName, manifest, commandPath, presetFileDisplayPath } = params;
+        if (presetProfile !== undefined) {
+            return {
+                selector: presetProfile,
+                sourceName: presetProfileSourceName ?? PRESET_PROFILE_FLAG,
+            };
+        }
+        const commandPathSuffixProfile = this.#resolveProfileNameByCommandPathSuffix({
+            commandPath,
+            profiles: manifest.profiles,
+        });
+        if (commandPathSuffixProfile !== undefined) {
+            return {
+                selector: commandPathSuffixProfile,
+                sourceName: 'commandPath.suffix',
+            };
+        }
+        if (manifest.defaults?.profile !== undefined) {
+            return {
+                selector: manifest.defaults.profile,
+                sourceName: 'defaults.profile',
+            };
+        }
+        if (manifest.profiles.default !== undefined) {
+            return {
+                selector: 'default',
+                sourceName: 'profiles["default"]',
+            };
+        }
+        throw new CommanderError('ConfigurationError', `missing profile for preset file "${presetFileDisplayPath}": provide "${PRESET_PROFILE_FLAG}", define command-path suffix profile, defaults.profile, or profile "default"`, commandPath);
+    }
+    #resolveProfileNameByCommandPathSuffix(params) {
+        const { commandPath, profiles } = params;
+        const commandNames = commandPath
+            .split(' ')
+            .map(value => value.trim())
+            .filter(Boolean);
+        for (let index = 0; index < commandNames.length; index += 1) {
+            const profileName = commandNames.slice(index).join('.');
+            if (profiles[profileName] !== undefined) {
+                return profileName;
+            }
+        }
+        return undefined;
+    }
     #parsePresetProfileManifest(content, filepath, commandPath) {
         let parsed;
         try {
@@ -2786,7 +2835,7 @@ function scanPresetDirectives(params) {
     return { cleanArgv, presetFile, presetProfile };
 }
 function buildPresetSources(params) {
-    const { userCmds, userArgv, userEnvs, presetArgv, presetEnvs, presetMeta } = params;
+    const { userCmds, userArgv, userEnvs, presetArgv, presetEnvs, presetMeta, presetResolvedEnvFile, } = params;
     const presetSourceMeta = presetMeta === undefined
         ? undefined
         : {
@@ -2794,6 +2843,11 @@ function buildPresetSources(params) {
             file: presetMeta.file,
             profile: presetMeta.profile,
             variant: presetMeta.variant,
+            ...(presetResolvedEnvFile === undefined
+                ? {}
+                : {
+                    resolvedEnvFile: presetResolvedEnvFile,
+                }),
         };
     const presetState = presetSourceMeta === undefined ? 'none' : 'applied';
     const sources = {
@@ -2900,9 +2954,17 @@ async function runPresetStage(params) {
         presetArgv,
         presetEnvs,
         presetMeta: resolvedProfile?.issueMeta,
+        presetResolvedEnvFile: resolvePresetEnvFilePath(resolvedProfile),
     });
     return { tailArgv, envs, segments, sources };
 }
+function resolvePresetEnvFilePath(resolvedProfile) {
+    if (!resolvedProfile) {
+        return undefined;
+    }
+    return (resolvedProfile.variantEnvFileSource?.absolutePath ??
+        resolvedProfile.profileEnvFileSource?.absolutePath);
+}
 function findSubcommandEntry(entries, token) {
     return entries.find(entry => entry.name === token || entry.aliases.includes(token));

package/lib/cjs/node.cjs CHANGED Viewed

@@ -1787,11 +1787,14 @@ class CommandPresetProfileParser {
             return undefined;
         }
         const manifest = this.#parsePresetProfileManifest(content, profileFile.displayPath, commandPath);
-        const resolvedProfileSelector = presetProfile ?? manifest.defaults?.profile;
-        if (resolvedProfileSelector === undefined) {
-            throw new CommanderError('ConfigurationError', `missing profile for preset file "${profileFile.displayPath}": provide "${PRESET_PROFILE_FLAG}" or defaults.profile`, commandPath);
-        }
-        const { profileName: resolvedProfileName, variantName: explicitVariantName } = this.#parsePresetProfileSelector(resolvedProfileSelector, presetProfileSourceName ?? 'defaults.profile', commandPath);
+        const resolvedProfileSelector = this.#resolvePresetProfileSelector({
+            presetProfile,
+            presetProfileSourceName,
+            manifest,
+            commandPath,
+            presetFileDisplayPath: profileFile.displayPath,
+        });
+        const { profileName: resolvedProfileName, variantName: explicitVariantName } = this.#parsePresetProfileSelector(resolvedProfileSelector.selector, resolvedProfileSelector.sourceName, commandPath);
         const profile = manifest.profiles[resolvedProfileName];
         if (profile === undefined) {
             throw new CommanderError('ConfigurationError', `unknown preset profile "${resolvedProfileName}" in "${profileFile.displayPath}"`, commandPath);
@@ -1872,6 +1875,52 @@ class CommandPresetProfileParser {
             }
         }
     }
+    #resolvePresetProfileSelector(params) {
+        const { presetProfile, presetProfileSourceName, manifest, commandPath, presetFileDisplayPath } = params;
+        if (presetProfile !== undefined) {
+            return {
+                selector: presetProfile,
+                sourceName: presetProfileSourceName ?? PRESET_PROFILE_FLAG,
+            };
+        }
+        const commandPathSuffixProfile = this.#resolveProfileNameByCommandPathSuffix({
+            commandPath,
+            profiles: manifest.profiles,
+        });
+        if (commandPathSuffixProfile !== undefined) {
+            return {
+                selector: commandPathSuffixProfile,
+                sourceName: 'commandPath.suffix',
+            };
+        }
+        if (manifest.defaults?.profile !== undefined) {
+            return {
+                selector: manifest.defaults.profile,
+                sourceName: 'defaults.profile',
+            };
+        }
+        if (manifest.profiles.default !== undefined) {
+            return {
+                selector: 'default',
+                sourceName: 'profiles["default"]',
+            };
+        }
+        throw new CommanderError('ConfigurationError', `missing profile for preset file "${presetFileDisplayPath}": provide "${PRESET_PROFILE_FLAG}", define command-path suffix profile, defaults.profile, or profile "default"`, commandPath);
+    }
+    #resolveProfileNameByCommandPathSuffix(params) {
+        const { commandPath, profiles } = params;
+        const commandNames = commandPath
+            .split(' ')
+            .map(value => value.trim())
+            .filter(Boolean);
+        for (let index = 0; index < commandNames.length; index += 1) {
+            const profileName = commandNames.slice(index).join('.');
+            if (profiles[profileName] !== undefined) {
+                return profileName;
+            }
+        }
+        return undefined;
+    }
     #parsePresetProfileManifest(content, filepath, commandPath) {
         let parsed;
         try {
@@ -2799,7 +2848,7 @@ function scanPresetDirectives(params) {
     return { cleanArgv, presetFile, presetProfile };
 }
 function buildPresetSources(params) {
-    const { userCmds, userArgv, userEnvs, presetArgv, presetEnvs, presetMeta } = params;
+    const { userCmds, userArgv, userEnvs, presetArgv, presetEnvs, presetMeta, presetResolvedEnvFile, } = params;
     const presetSourceMeta = presetMeta === undefined
         ? undefined
         : {
@@ -2807,6 +2856,11 @@ function buildPresetSources(params) {
             file: presetMeta.file,
             profile: presetMeta.profile,
             variant: presetMeta.variant,
+            ...(presetResolvedEnvFile === undefined
+                ? {}
+                : {
+                    resolvedEnvFile: presetResolvedEnvFile,
+                }),
         };
     const presetState = presetSourceMeta === undefined ? 'none' : 'applied';
     const sources = {
@@ -2913,9 +2967,17 @@ async function runPresetStage(params) {
         presetArgv,
         presetEnvs,
         presetMeta: resolvedProfile?.issueMeta,
+        presetResolvedEnvFile: resolvePresetEnvFilePath(resolvedProfile),
     });
     return { tailArgv, envs, segments, sources };
 }
+function resolvePresetEnvFilePath(resolvedProfile) {
+    if (!resolvedProfile) {
+        return undefined;
+    }
+    return (resolvedProfile.variantEnvFileSource?.absolutePath ??
+        resolvedProfile.profileEnvFileSource?.absolutePath);
+}
 function findSubcommandEntry(entries, token) {
     return entries.find(entry => entry.name === token || entry.aliases.includes(token));

package/lib/esm/browser.mjs CHANGED Viewed

@@ -1772,11 +1772,14 @@ class CommandPresetProfileParser {
             return undefined;
         }
         const manifest = this.#parsePresetProfileManifest(content, profileFile.displayPath, commandPath);
-        const resolvedProfileSelector = presetProfile ?? manifest.defaults?.profile;
-        if (resolvedProfileSelector === undefined) {
-            throw new CommanderError('ConfigurationError', `missing profile for preset file "${profileFile.displayPath}": provide "${PRESET_PROFILE_FLAG}" or defaults.profile`, commandPath);
-        }
-        const { profileName: resolvedProfileName, variantName: explicitVariantName } = this.#parsePresetProfileSelector(resolvedProfileSelector, presetProfileSourceName ?? 'defaults.profile', commandPath);
+        const resolvedProfileSelector = this.#resolvePresetProfileSelector({
+            presetProfile,
+            presetProfileSourceName,
+            manifest,
+            commandPath,
+            presetFileDisplayPath: profileFile.displayPath,
+        });
+        const { profileName: resolvedProfileName, variantName: explicitVariantName } = this.#parsePresetProfileSelector(resolvedProfileSelector.selector, resolvedProfileSelector.sourceName, commandPath);
         const profile = manifest.profiles[resolvedProfileName];
         if (profile === undefined) {
             throw new CommanderError('ConfigurationError', `unknown preset profile "${resolvedProfileName}" in "${profileFile.displayPath}"`, commandPath);
@@ -1857,6 +1860,52 @@ class CommandPresetProfileParser {
             }
         }
     }
+    #resolvePresetProfileSelector(params) {
+        const { presetProfile, presetProfileSourceName, manifest, commandPath, presetFileDisplayPath } = params;
+        if (presetProfile !== undefined) {
+            return {
+                selector: presetProfile,
+                sourceName: presetProfileSourceName ?? PRESET_PROFILE_FLAG,
+            };
+        }
+        const commandPathSuffixProfile = this.#resolveProfileNameByCommandPathSuffix({
+            commandPath,
+            profiles: manifest.profiles,
+        });
+        if (commandPathSuffixProfile !== undefined) {
+            return {
+                selector: commandPathSuffixProfile,
+                sourceName: 'commandPath.suffix',
+            };
+        }
+        if (manifest.defaults?.profile !== undefined) {
+            return {
+                selector: manifest.defaults.profile,
+                sourceName: 'defaults.profile',
+            };
+        }
+        if (manifest.profiles.default !== undefined) {
+            return {
+                selector: 'default',
+                sourceName: 'profiles["default"]',
+            };
+        }
+        throw new CommanderError('ConfigurationError', `missing profile for preset file "${presetFileDisplayPath}": provide "${PRESET_PROFILE_FLAG}", define command-path suffix profile, defaults.profile, or profile "default"`, commandPath);
+    }
+    #resolveProfileNameByCommandPathSuffix(params) {
+        const { commandPath, profiles } = params;
+        const commandNames = commandPath
+            .split(' ')
+            .map(value => value.trim())
+            .filter(Boolean);
+        for (let index = 0; index < commandNames.length; index += 1) {
+            const profileName = commandNames.slice(index).join('.');
+            if (profiles[profileName] !== undefined) {
+                return profileName;
+            }
+        }
+        return undefined;
+    }
     #parsePresetProfileManifest(content, filepath, commandPath) {
         let parsed;
         try {
@@ -2784,7 +2833,7 @@ function scanPresetDirectives(params) {
     return { cleanArgv, presetFile, presetProfile };
 }
 function buildPresetSources(params) {
-    const { userCmds, userArgv, userEnvs, presetArgv, presetEnvs, presetMeta } = params;
+    const { userCmds, userArgv, userEnvs, presetArgv, presetEnvs, presetMeta, presetResolvedEnvFile, } = params;
     const presetSourceMeta = presetMeta === undefined
         ? undefined
         : {
@@ -2792,6 +2841,11 @@ function buildPresetSources(params) {
             file: presetMeta.file,
             profile: presetMeta.profile,
             variant: presetMeta.variant,
+            ...(presetResolvedEnvFile === undefined
+                ? {}
+                : {
+                    resolvedEnvFile: presetResolvedEnvFile,
+                }),
         };
     const presetState = presetSourceMeta === undefined ? 'none' : 'applied';
     const sources = {
@@ -2898,9 +2952,17 @@ async function runPresetStage(params) {
         presetArgv,
         presetEnvs,
         presetMeta: resolvedProfile?.issueMeta,
+        presetResolvedEnvFile: resolvePresetEnvFilePath(resolvedProfile),
     });
     return { tailArgv, envs, segments, sources };
 }
+function resolvePresetEnvFilePath(resolvedProfile) {
+    if (!resolvedProfile) {
+        return undefined;
+    }
+    return (resolvedProfile.variantEnvFileSource?.absolutePath ??
+        resolvedProfile.profileEnvFileSource?.absolutePath);
+}
 function findSubcommandEntry(entries, token) {
     return entries.find(entry => entry.name === token || entry.aliases.includes(token));

package/lib/esm/node.mjs CHANGED Viewed

@@ -1785,11 +1785,14 @@ class CommandPresetProfileParser {
             return undefined;
         }
         const manifest = this.#parsePresetProfileManifest(content, profileFile.displayPath, commandPath);
-        const resolvedProfileSelector = presetProfile ?? manifest.defaults?.profile;
-        if (resolvedProfileSelector === undefined) {
-            throw new CommanderError('ConfigurationError', `missing profile for preset file "${profileFile.displayPath}": provide "${PRESET_PROFILE_FLAG}" or defaults.profile`, commandPath);
-        }
-        const { profileName: resolvedProfileName, variantName: explicitVariantName } = this.#parsePresetProfileSelector(resolvedProfileSelector, presetProfileSourceName ?? 'defaults.profile', commandPath);
+        const resolvedProfileSelector = this.#resolvePresetProfileSelector({
+            presetProfile,
+            presetProfileSourceName,
+            manifest,
+            commandPath,
+            presetFileDisplayPath: profileFile.displayPath,
+        });
+        const { profileName: resolvedProfileName, variantName: explicitVariantName } = this.#parsePresetProfileSelector(resolvedProfileSelector.selector, resolvedProfileSelector.sourceName, commandPath);
         const profile = manifest.profiles[resolvedProfileName];
         if (profile === undefined) {
             throw new CommanderError('ConfigurationError', `unknown preset profile "${resolvedProfileName}" in "${profileFile.displayPath}"`, commandPath);
@@ -1870,6 +1873,52 @@ class CommandPresetProfileParser {
             }
         }
     }
+    #resolvePresetProfileSelector(params) {
+        const { presetProfile, presetProfileSourceName, manifest, commandPath, presetFileDisplayPath } = params;
+        if (presetProfile !== undefined) {
+            return {
+                selector: presetProfile,
+                sourceName: presetProfileSourceName ?? PRESET_PROFILE_FLAG,
+            };
+        }
+        const commandPathSuffixProfile = this.#resolveProfileNameByCommandPathSuffix({
+            commandPath,
+            profiles: manifest.profiles,
+        });
+        if (commandPathSuffixProfile !== undefined) {
+            return {
+                selector: commandPathSuffixProfile,
+                sourceName: 'commandPath.suffix',
+            };
+        }
+        if (manifest.defaults?.profile !== undefined) {
+            return {
+                selector: manifest.defaults.profile,
+                sourceName: 'defaults.profile',
+            };
+        }
+        if (manifest.profiles.default !== undefined) {
+            return {
+                selector: 'default',
+                sourceName: 'profiles["default"]',
+            };
+        }
+        throw new CommanderError('ConfigurationError', `missing profile for preset file "${presetFileDisplayPath}": provide "${PRESET_PROFILE_FLAG}", define command-path suffix profile, defaults.profile, or profile "default"`, commandPath);
+    }
+    #resolveProfileNameByCommandPathSuffix(params) {
+        const { commandPath, profiles } = params;
+        const commandNames = commandPath
+            .split(' ')
+            .map(value => value.trim())
+            .filter(Boolean);
+        for (let index = 0; index < commandNames.length; index += 1) {
+            const profileName = commandNames.slice(index).join('.');
+            if (profiles[profileName] !== undefined) {
+                return profileName;
+            }
+        }
+        return undefined;
+    }
     #parsePresetProfileManifest(content, filepath, commandPath) {
         let parsed;
         try {
@@ -2797,7 +2846,7 @@ function scanPresetDirectives(params) {
     return { cleanArgv, presetFile, presetProfile };
 }
 function buildPresetSources(params) {
-    const { userCmds, userArgv, userEnvs, presetArgv, presetEnvs, presetMeta } = params;
+    const { userCmds, userArgv, userEnvs, presetArgv, presetEnvs, presetMeta, presetResolvedEnvFile, } = params;
     const presetSourceMeta = presetMeta === undefined
         ? undefined
         : {
@@ -2805,6 +2854,11 @@ function buildPresetSources(params) {
             file: presetMeta.file,
             profile: presetMeta.profile,
             variant: presetMeta.variant,
+            ...(presetResolvedEnvFile === undefined
+                ? {}
+                : {
+                    resolvedEnvFile: presetResolvedEnvFile,
+                }),
         };
     const presetState = presetSourceMeta === undefined ? 'none' : 'applied';
     const sources = {
@@ -2911,9 +2965,17 @@ async function runPresetStage(params) {
         presetArgv,
         presetEnvs,
         presetMeta: resolvedProfile?.issueMeta,
+        presetResolvedEnvFile: resolvePresetEnvFilePath(resolvedProfile),
     });
     return { tailArgv, envs, segments, sources };
 }
+function resolvePresetEnvFilePath(resolvedProfile) {
+    if (!resolvedProfile) {
+        return undefined;
+    }
+    return (resolvedProfile.variantEnvFileSource?.absolutePath ??
+        resolvedProfile.profileEnvFileSource?.absolutePath);
+}
 function findSubcommandEntry(entries, token) {
     return entries.find(entry => entry.name === token || entry.aliases.includes(token));

package/lib/types/browser.d.ts CHANGED Viewed

@@ -17,6 +17,7 @@ interface ICommandPresetSourceMeta {
     file?: string;
     profile?: string;
     variant?: string;
+    resolvedEnvFile?: string;
 }
 /** Preset execution state in input source snapshot */
 type ICommandPresetSourceState = 'skipped' | 'none' | 'applied';

package/lib/types/node.d.ts CHANGED Viewed

@@ -17,6 +17,7 @@ interface ICommandPresetSourceMeta {
     file?: string;
     profile?: string;
     variant?: string;
+    resolvedEnvFile?: string;
 }
 /** Preset execution state in input source snapshot */
 type ICommandPresetSourceState = 'skipped' | 'none' | 'applied';

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@guanghechen/commander",
-  "version": "4.7.8",
+  "version": "4.7.9",
   "description": "A minimal, type-safe command-line interface builder with fluent API",
   "author": {
     "name": "guanghechen",