rulesync 36.0.1 → 36.0.2

package/dist/cli/index.cjs

@@ -2548,8 +2548,7 @@ async function prefetchGithubSource(params) {
 	const parsedFromSource = parseSource(sourceEntry.source);
 	const parsed = {
 		...parsedFromSource,
-		ref: sourceEntry.ref ?? parsedFromSource.ref,
-		path: sourceEntry.path ?? parsedFromSource.path
+		ref: sourceEntry.ref ?? parsedFromSource.ref
 	};
 	const locked = getLockedSource(lock, sourceEntry.source);
 	const ref = await resolvePrefetchRef({
@@ -2612,7 +2611,7 @@ async function prefetchGithubSkills(params) {
 	}
 	const skillFilter = sourceEntry.skills ?? ["*"];
 	const isWildcard = skillFilter.length === 1 && skillFilter[0] === "*";
-	const entries = await withSemaphore(semaphore, () => client.listDirectory(parsed.owner, parsed.repo, parsed.path ?? "skills", ref));
+	const entries = await withSemaphore(semaphore, () => client.listDirectory(parsed.owner, parsed.repo, resolveSkillsSourcePath(sourceEntry), ref));
 	const skillDirs = entries.filter((entry) => entry.type === "dir" && (isWildcard || skillFilter.includes(entry.name)));
 	const useRootFallback = shouldUseRootFallback({
 		skillFilter,
@@ -2687,7 +2686,7 @@ async function prefetchGithubRules(params) {
 		claim.settle(getLockedRuleNames(locked));
 		return;
 	}
-	const entries = await withSemaphore(context.semaphore, () => context.client.listDirectory(parsed.owner, parsed.repo, sourceEntry.rulesPath ?? "rules", ref));
+	const entries = await withSemaphore(context.semaphore, () => context.client.listDirectory(parsed.owner, parsed.repo, resolveRulesSourcePath(sourceEntry), ref));
 	const ruleFilter = (sourceEntry.rules ?? []).map(normalizeRuleFilterName);
 	const isWildcard = ruleFilter.length === 1 && ruleFilter[0] === "*";
 	const files = entries.filter((entry) => {
@@ -3532,16 +3531,31 @@ async function canReuseLockedSkills(params) {
 	}) && await checkLockedSkillsExist(curatedDir, lockedSkillNames);
 }
 /**
-* The normalized path the skills of a source are read from: the source's
+* The path the skills of a source are read from, as declared: the source's
 * `path`, else (for the github transport) the path embedded in the source
-* spec, else `skills`.
+* spec, else `skills`. Every transport fetches from this path, and the
+* lockfile records its normalized form ({@link resolveSkillsPath}), so the
+* fetch and the lock comparison cannot pick different paths.
 */
-function resolveSkillsPath(sourceEntry) {
+function resolveSkillsSourcePath(sourceEntry) {
 	const embeddedPath = (sourceEntry.transport ?? "github") === "github" ? parseSource(sourceEntry.source).path : void 0;
-	return normalizeSourceDirPath(sourceEntry.path ?? embeddedPath ?? "skills");
+	return sourceEntry.path ?? embeddedPath ?? "skills";
+}
+/** The skills path of a source in the form the lockfile records and compares. */
+function resolveSkillsPath(sourceEntry) {
+	return normalizeSourceDirPath(resolveSkillsSourcePath(sourceEntry));
 }
-function normalizeRulesPath(rulesPath) {
-	return normalizeSourceDirPath(rulesPath ?? "rules");
+/**
+* The path the rules of a source are read from, as declared: the source's
+* `rulesPath`, else `rules`. The rules counterpart of
+* {@link resolveSkillsSourcePath}.
+*/
+function resolveRulesSourcePath(sourceEntry) {
+	return sourceEntry.rulesPath ?? "rules";
+}
+/** The rules path of a source in the form the lockfile records and compares. */
+function resolveRulesPath(sourceEntry) {
+	return normalizeSourceDirPath(resolveRulesSourcePath(sourceEntry));
 }
 /**
 * The form a source directory path is recorded in the lockfile and compared
@@ -3554,7 +3568,7 @@ function lockedRuleConfigMatches(params) {
 	const rules = getSourceFilters(params.sourceEntry).rules;
 	if (rules === void 0 || params.locked.ruleSelection === void 0) return false;
 	const selection = normalizeRuleSelection(rules);
-	return selection.length === params.locked.ruleSelection.length && selection.every((ruleName, index) => ruleName === params.locked.ruleSelection?.[index]) && normalizeRulesPath(params.sourceEntry.rulesPath) === params.locked.rulesPath;
+	return selection.length === params.locked.ruleSelection.length && selection.every((ruleName, index) => ruleName === params.locked.ruleSelection?.[index]) && resolveRulesPath(params.sourceEntry) === params.locked.rulesPath;
 }
 function assertMatchingRulesFound(params) {
 	if (params.ruleNames.length === 0) throw new Error(`No matching rules found in ${params.source}.`);
@@ -3600,7 +3614,7 @@ async function fetchRulesViaGithub(params) {
 	}
 	const ruleFilter = (sourceEntry.rules ?? []).map(normalizeRuleFilterName);
 	const isWildcard = ruleFilter.length === 1 && ruleFilter[0] === "*";
-	const rulesPath = sourceEntry.rulesPath ?? "rules";
+	const rulesPath = resolveRulesSourcePath(sourceEntry);
 	let entries;
 	try {
 		entries = await client.listDirectory(parsed.owner, parsed.repo, rulesPath, ref);
@@ -3655,7 +3669,7 @@ async function fetchRulesViaGithub(params) {
 		requestedRef,
 		resolvedRef: resolvedSha,
 		ruleSelection: normalizeRuleSelection(sourceEntry.rules ?? []),
-		rulesPath: normalizeRulesPath(sourceEntry.rulesPath),
+		rulesPath: resolveRulesPath(sourceEntry),
 		resolvedRuleNames: remoteRuleNames,
 		logger
 	});
@@ -3700,7 +3714,7 @@ async function fetchRulesViaGit(params) {
 		url: sourceKey,
 		ref: requestedRef,
 		resolvedRef,
-		skillsPath: sourceEntry.rulesPath ?? "rules",
+		skillsPath: resolveRulesSourcePath(sourceEntry),
 		logger
 	});
 	const ruleFilter = (sourceEntry.rules ?? []).map(normalizeRuleFilterName);
@@ -3733,7 +3747,7 @@ async function fetchRulesViaGit(params) {
 		requestedRef,
 		resolvedRef,
 		ruleSelection: normalizeRuleSelection(sourceEntry.rules ?? []),
-		rulesPath: normalizeRulesPath(sourceEntry.rulesPath),
+		rulesPath: resolveRulesPath(sourceEntry),
 		resolvedRuleNames: remoteRuleNames,
 		logger
 	});
@@ -3880,8 +3894,7 @@ async function fetchGithubSkillDir(params) {
 * names already written into `fetchedSkills`.
 */
 async function discoverGithubSkillDirs(params) {
-	const { parsed, ref, resolvedSha, skillFilter, isWildcard, curatedDir, locked, sourceKey, localSkillNames, alreadyFetchedSkillNames, client, semaphore, getExecutablePaths, fetchedSkills, logger } = params;
-	const skillsBasePath = parsed.path ?? "skills";
+	const { parsed, skillsBasePath, ref, resolvedSha, skillFilter, isWildcard, curatedDir, locked, sourceKey, localSkillNames, alreadyFetchedSkillNames, client, semaphore, getExecutablePaths, fetchedSkills, logger } = params;
 	try {
 		const entries = await client.listDirectory(parsed.owner, parsed.repo, skillsBasePath, ref);
 		const remoteSkillDirs = entries.filter((e) => e.type === "dir").map((e) => ({
@@ -3946,8 +3959,7 @@ async function fetchSource(params) {
 	const parsedFromSource = parseSource(sourceEntry.source);
 	const parsed = {
 		...parsedFromSource,
-		ref: sourceEntry.ref ?? parsedFromSource.ref,
-		path: sourceEntry.path ?? parsedFromSource.path
+		ref: sourceEntry.ref ?? parsedFromSource.ref
 	};
 	if (parsed.provider === "gitlab") throw new Error(`GitLab sources are not yet supported: "${sourceEntry.source}".`);
 	const sourceKey = sourceEntry.source;
@@ -3991,6 +4003,7 @@ async function fetchSource(params) {
 	const fetchedSkills = {};
 	const discovery = await discoverGithubSkillDirs({
 		parsed,
+		skillsBasePath: resolveSkillsSourcePath(sourceEntry),
 		ref,
 		resolvedSha,
 		skillFilter,
@@ -4103,7 +4116,7 @@ async function fetchSourceViaGit(params) {
 			url,
 			ref: requestedRef,
 			resolvedRef: resolvedSha,
-			skillsPath: sourceEntry.path ?? "skills",
+			skillsPath: resolveSkillsSourcePath(sourceEntry),
 			logger
 		}),
 		skillFilter,
@@ -4327,7 +4340,7 @@ function buildNpmLockEntry(params) {
 		...sourceEntry.rules !== void 0 && {
 			rules: mergedRules,
 			ruleSelection: normalizeRuleSelection(sourceEntry.rules),
-			rulesPath: normalizeRulesPath(sourceEntry.rulesPath),
+			rulesPath: resolveRulesPath(sourceEntry),
 			resolvedRuleNames
 		}
 	};
@@ -4342,7 +4355,7 @@ async function fetchNpmSkills(params) {
 	const declaredWildcard = skillFilter.length === 1 && skillFilter[0] === "*";
 	const selectedFiles = selectNpmSkillFiles({
 		allFiles,
-		skillsPath: sourceEntry.path ?? "skills",
+		skillsPath: resolveSkillsSourcePath(sourceEntry),
 		skillFilter,
 		isWildcard: declaredWildcard,
 		packageName
@@ -4390,7 +4403,7 @@ async function fetchNpmRules(params) {
 		resolvedRuleNames: []
 	};
 	const { allFiles, sourceEntry, packageName, lockedForIntegrityCheck, lockedRuleNames, curatedRulesDir, localRuleNames, alreadyFetchedRuleNames, resolvedVersion, updateSources, logger } = params;
-	const normalizedRulesPath = normalizeRulesPath(sourceEntry.rulesPath);
+	const normalizedRulesPath = resolveRulesPath(sourceEntry);
 	const rulePrefix = normalizedRulesPath === "." ? "" : `${normalizedRulesPath}/`;
 	const ruleFilter = (sourceEntry.rules ?? []).map(normalizeRuleFilterName);
 	const isWildcard = ruleFilter.length === 1 && ruleFilter[0] === "*";
@@ -14090,7 +14103,7 @@ function wrapCommand$1({ name, errorCode, handler, getVersion, loggerFactory = c
 }
 //#endregion
 //#region src/cli/program.ts
-const getVersion = () => "36.0.1";
+const getVersion = () => "36.0.2";
 const FEATURES_HELP = `${require_import.ALL_FEATURES.join(",")}; ignore is deprecated, use permissions`;
 function wrapCommand(name, errorCode, handler) {
 	return wrapCommand$1({

package/dist/cli/index.js

@@ -2545,8 +2545,7 @@ async function prefetchGithubSource(params) {
 	const parsedFromSource = parseSource(sourceEntry.source);
 	const parsed = {
 		...parsedFromSource,
-		ref: sourceEntry.ref ?? parsedFromSource.ref,
-		path: sourceEntry.path ?? parsedFromSource.path
+		ref: sourceEntry.ref ?? parsedFromSource.ref
 	};
 	const locked = getLockedSource(lock, sourceEntry.source);
 	const ref = await resolvePrefetchRef({
@@ -2609,7 +2608,7 @@ async function prefetchGithubSkills(params) {
 	}
 	const skillFilter = sourceEntry.skills ?? ["*"];
 	const isWildcard = skillFilter.length === 1 && skillFilter[0] === "*";
-	const entries = await withSemaphore(semaphore, () => client.listDirectory(parsed.owner, parsed.repo, parsed.path ?? "skills", ref));
+	const entries = await withSemaphore(semaphore, () => client.listDirectory(parsed.owner, parsed.repo, resolveSkillsSourcePath(sourceEntry), ref));
 	const skillDirs = entries.filter((entry) => entry.type === "dir" && (isWildcard || skillFilter.includes(entry.name)));
 	const useRootFallback = shouldUseRootFallback({
 		skillFilter,
@@ -2684,7 +2683,7 @@ async function prefetchGithubRules(params) {
 		claim.settle(getLockedRuleNames(locked));
 		return;
 	}
-	const entries = await withSemaphore(context.semaphore, () => context.client.listDirectory(parsed.owner, parsed.repo, sourceEntry.rulesPath ?? "rules", ref));
+	const entries = await withSemaphore(context.semaphore, () => context.client.listDirectory(parsed.owner, parsed.repo, resolveRulesSourcePath(sourceEntry), ref));
 	const ruleFilter = (sourceEntry.rules ?? []).map(normalizeRuleFilterName);
 	const isWildcard = ruleFilter.length === 1 && ruleFilter[0] === "*";
 	const files = entries.filter((entry) => {
@@ -3529,16 +3528,31 @@ async function canReuseLockedSkills(params) {
 	}) && await checkLockedSkillsExist(curatedDir, lockedSkillNames);
 }
 /**
-* The normalized path the skills of a source are read from: the source's
+* The path the skills of a source are read from, as declared: the source's
 * `path`, else (for the github transport) the path embedded in the source
-* spec, else `skills`.
+* spec, else `skills`. Every transport fetches from this path, and the
+* lockfile records its normalized form ({@link resolveSkillsPath}), so the
+* fetch and the lock comparison cannot pick different paths.
 */
-function resolveSkillsPath(sourceEntry) {
+function resolveSkillsSourcePath(sourceEntry) {
 	const embeddedPath = (sourceEntry.transport ?? "github") === "github" ? parseSource(sourceEntry.source).path : void 0;
-	return normalizeSourceDirPath(sourceEntry.path ?? embeddedPath ?? "skills");
+	return sourceEntry.path ?? embeddedPath ?? "skills";
+}
+/** The skills path of a source in the form the lockfile records and compares. */
+function resolveSkillsPath(sourceEntry) {
+	return normalizeSourceDirPath(resolveSkillsSourcePath(sourceEntry));
 }
-function normalizeRulesPath(rulesPath) {
-	return normalizeSourceDirPath(rulesPath ?? "rules");
+/**
+* The path the rules of a source are read from, as declared: the source's
+* `rulesPath`, else `rules`. The rules counterpart of
+* {@link resolveSkillsSourcePath}.
+*/
+function resolveRulesSourcePath(sourceEntry) {
+	return sourceEntry.rulesPath ?? "rules";
+}
+/** The rules path of a source in the form the lockfile records and compares. */
+function resolveRulesPath(sourceEntry) {
+	return normalizeSourceDirPath(resolveRulesSourcePath(sourceEntry));
 }
 /**
 * The form a source directory path is recorded in the lockfile and compared
@@ -3551,7 +3565,7 @@ function lockedRuleConfigMatches(params) {
 	const rules = getSourceFilters(params.sourceEntry).rules;
 	if (rules === void 0 || params.locked.ruleSelection === void 0) return false;
 	const selection = normalizeRuleSelection(rules);
-	return selection.length === params.locked.ruleSelection.length && selection.every((ruleName, index) => ruleName === params.locked.ruleSelection?.[index]) && normalizeRulesPath(params.sourceEntry.rulesPath) === params.locked.rulesPath;
+	return selection.length === params.locked.ruleSelection.length && selection.every((ruleName, index) => ruleName === params.locked.ruleSelection?.[index]) && resolveRulesPath(params.sourceEntry) === params.locked.rulesPath;
 }
 function assertMatchingRulesFound(params) {
 	if (params.ruleNames.length === 0) throw new Error(`No matching rules found in ${params.source}.`);
@@ -3597,7 +3611,7 @@ async function fetchRulesViaGithub(params) {
 	}
 	const ruleFilter = (sourceEntry.rules ?? []).map(normalizeRuleFilterName);
 	const isWildcard = ruleFilter.length === 1 && ruleFilter[0] === "*";
-	const rulesPath = sourceEntry.rulesPath ?? "rules";
+	const rulesPath = resolveRulesSourcePath(sourceEntry);
 	let entries;
 	try {
 		entries = await client.listDirectory(parsed.owner, parsed.repo, rulesPath, ref);
@@ -3652,7 +3666,7 @@ async function fetchRulesViaGithub(params) {
 		requestedRef,
 		resolvedRef: resolvedSha,
 		ruleSelection: normalizeRuleSelection(sourceEntry.rules ?? []),
-		rulesPath: normalizeRulesPath(sourceEntry.rulesPath),
+		rulesPath: resolveRulesPath(sourceEntry),
 		resolvedRuleNames: remoteRuleNames,
 		logger
 	});
@@ -3697,7 +3711,7 @@ async function fetchRulesViaGit(params) {
 		url: sourceKey,
 		ref: requestedRef,
 		resolvedRef,
-		skillsPath: sourceEntry.rulesPath ?? "rules",
+		skillsPath: resolveRulesSourcePath(sourceEntry),
 		logger
 	});
 	const ruleFilter = (sourceEntry.rules ?? []).map(normalizeRuleFilterName);
@@ -3730,7 +3744,7 @@ async function fetchRulesViaGit(params) {
 		requestedRef,
 		resolvedRef,
 		ruleSelection: normalizeRuleSelection(sourceEntry.rules ?? []),
-		rulesPath: normalizeRulesPath(sourceEntry.rulesPath),
+		rulesPath: resolveRulesPath(sourceEntry),
 		resolvedRuleNames: remoteRuleNames,
 		logger
 	});
@@ -3877,8 +3891,7 @@ async function fetchGithubSkillDir(params) {
 * names already written into `fetchedSkills`.
 */
 async function discoverGithubSkillDirs(params) {
-	const { parsed, ref, resolvedSha, skillFilter, isWildcard, curatedDir, locked, sourceKey, localSkillNames, alreadyFetchedSkillNames, client, semaphore, getExecutablePaths, fetchedSkills, logger } = params;
-	const skillsBasePath = parsed.path ?? "skills";
+	const { parsed, skillsBasePath, ref, resolvedSha, skillFilter, isWildcard, curatedDir, locked, sourceKey, localSkillNames, alreadyFetchedSkillNames, client, semaphore, getExecutablePaths, fetchedSkills, logger } = params;
 	try {
 		const entries = await client.listDirectory(parsed.owner, parsed.repo, skillsBasePath, ref);
 		const remoteSkillDirs = entries.filter((e) => e.type === "dir").map((e) => ({
@@ -3943,8 +3956,7 @@ async function fetchSource(params) {
 	const parsedFromSource = parseSource(sourceEntry.source);
 	const parsed = {
 		...parsedFromSource,
-		ref: sourceEntry.ref ?? parsedFromSource.ref,
-		path: sourceEntry.path ?? parsedFromSource.path
+		ref: sourceEntry.ref ?? parsedFromSource.ref
 	};
 	if (parsed.provider === "gitlab") throw new Error(`GitLab sources are not yet supported: "${sourceEntry.source}".`);
 	const sourceKey = sourceEntry.source;
@@ -3988,6 +4000,7 @@ async function fetchSource(params) {
 	const fetchedSkills = {};
 	const discovery = await discoverGithubSkillDirs({
 		parsed,
+		skillsBasePath: resolveSkillsSourcePath(sourceEntry),
 		ref,
 		resolvedSha,
 		skillFilter,
@@ -4100,7 +4113,7 @@ async function fetchSourceViaGit(params) {
 			url,
 			ref: requestedRef,
 			resolvedRef: resolvedSha,
-			skillsPath: sourceEntry.path ?? "skills",
+			skillsPath: resolveSkillsSourcePath(sourceEntry),
 			logger
 		}),
 		skillFilter,
@@ -4324,7 +4337,7 @@ function buildNpmLockEntry(params) {
 		...sourceEntry.rules !== void 0 && {
 			rules: mergedRules,
 			ruleSelection: normalizeRuleSelection(sourceEntry.rules),
-			rulesPath: normalizeRulesPath(sourceEntry.rulesPath),
+			rulesPath: resolveRulesPath(sourceEntry),
 			resolvedRuleNames
 		}
 	};
@@ -4339,7 +4352,7 @@ async function fetchNpmSkills(params) {
 	const declaredWildcard = skillFilter.length === 1 && skillFilter[0] === "*";
 	const selectedFiles = selectNpmSkillFiles({
 		allFiles,
-		skillsPath: sourceEntry.path ?? "skills",
+		skillsPath: resolveSkillsSourcePath(sourceEntry),
 		skillFilter,
 		isWildcard: declaredWildcard,
 		packageName
@@ -4387,7 +4400,7 @@ async function fetchNpmRules(params) {
 		resolvedRuleNames: []
 	};
 	const { allFiles, sourceEntry, packageName, lockedForIntegrityCheck, lockedRuleNames, curatedRulesDir, localRuleNames, alreadyFetchedRuleNames, resolvedVersion, updateSources, logger } = params;
-	const normalizedRulesPath = normalizeRulesPath(sourceEntry.rulesPath);
+	const normalizedRulesPath = resolveRulesPath(sourceEntry);
 	const rulePrefix = normalizedRulesPath === "." ? "" : `${normalizedRulesPath}/`;
 	const ruleFilter = (sourceEntry.rules ?? []).map(normalizeRuleFilterName);
 	const isWildcard = ruleFilter.length === 1 && ruleFilter[0] === "*";
@@ -14087,7 +14100,7 @@ function wrapCommand$1({ name, errorCode, handler, getVersion, loggerFactory = c
 }
 //#endregion
 //#region src/cli/program.ts
-const getVersion = () => "36.0.1";
+const getVersion = () => "36.0.2";
 const FEATURES_HELP = `${ALL_FEATURES.join(",")}; ignore is deprecated, use permissions`;
 function wrapCommand(name, errorCode, handler) {
 	return wrapCommand$1({