rulesync 36.0.0 → 36.0.1

package/dist/cli/index.cjs

@@ -1691,7 +1691,8 @@ async function listDirectoryRecursive(params) {
 	else if (entry.type === "dir") directories.push(entry);
 	else dropped = true;
 	if (dropped) onIncompleteDirectory?.(path);
-	const subResults = await Promise.all(directories.map((dir) => listDirectoryRecursive({
+	const failures = [];
+	const settled = await Promise.allSettled(directories.map((dir) => listDirectoryRecursive({
 		client,
 		owner,
 		repo,
@@ -1700,7 +1701,12 @@ async function listDirectoryRecursive(params) {
 		depth: depth + 1,
 		semaphore,
 		onIncompleteDirectory
+	}).catch((error) => {
+		failures.push(error);
+		throw error;
 	})));
+	if (failures.length > 0) throw failures[0];
+	const subResults = settled.flatMap((result) => result.status === "fulfilled" ? [result.value] : []);
 	return [...files, ...subResults.flat()];
 }
 /**
@@ -2411,6 +2417,12 @@ async function resolveAndFetchSources(params) {
 		failedSourceCount
 	};
 }
+/**
+* The claim of a source the prefetch does not list -- a git or npm transport
+* source -- whose selection is a wildcard: it may take any
+* name, so later sources download nothing a name decides.
+*/
+const ANY_NAME = Symbol("any name");
 function createNameClaim() {
 	let settle = () => {};
 	return {
@@ -2425,7 +2437,12 @@ function createClaimSlot(params) {
 	return {
 		earlier: async () => {
 			const claimed = await Promise.all(earlier.map((claim) => claim.names));
-			return /* @__PURE__ */ new Set([...reserved, ...claimed.flat()]);
+			const mayTakeAny = claimed.includes(ANY_NAME);
+			const names = /* @__PURE__ */ new Set([...reserved, ...claimed.flatMap((claim) => claim === ANY_NAME ? [] : claim)]);
+			return {
+				names,
+				has: (name) => mayTakeAny || names.has(name)
+			};
 		},
 		settle: own.settle
 	};
@@ -2450,13 +2467,30 @@ async function prefetchGithubSources(params) {
 		...rest,
 		semaphore: new es_toolkit_promise.Semaphore(10)
 	};
-	const items = sources.filter((sourceEntry) => (sourceEntry.transport ?? "github") === "github" && !hasEmptySelection(sourceEntry)).map((sourceEntry) => ({
+	const items = sources.filter((sourceEntry) => !hasEmptySelection(sourceEntry)).map((sourceEntry) => ({
 		sourceEntry,
+		listedThroughApi: isListedThroughGithubApi(sourceEntry),
 		skills: createNameClaim(),
 		rules: createNameClaim()
 	}));
+	for (const item of items.filter((candidate) => !candidate.listedThroughApi)) {
+		if (isGitlabSource(item.sourceEntry)) {
+			item.skills.settle([]);
+			item.rules.settle([]);
+			continue;
+		}
+		const filters = getSourceFilters(item.sourceEntry);
+		item.skills.settle(getSelectionClaim({
+			selection: filters.skills,
+			normalize: (name) => name
+		}));
+		item.rules.settle(getSelectionClaim({
+			selection: filters.rules,
+			normalize: normalizeRuleFilterName
+		}));
+	}
 	await require_import.mapWithConcurrency({
-		items,
+		items: items.filter((item) => item.listedThroughApi),
 		limit: 4,
 		mapper: async (item) => {
 			const earlier = items.slice(0, items.indexOf(item));
@@ -2485,10 +2519,33 @@ async function prefetchGithubSources(params) {
 		}
 	});
 }
+/** Whether the prefetch lists and downloads this source through the GitHub API. */
+function isListedThroughGithubApi(sourceEntry) {
+	if ((sourceEntry.transport ?? "github") !== "github") return false;
+	try {
+		return parseSource(sourceEntry.source).provider !== "gitlab";
+	} catch {
+		return true;
+	}
+}
+/** Whether this is a GitLab source, which the serial pass does not support yet. */
+function isGitlabSource(sourceEntry) {
+	if ((sourceEntry.transport ?? "github") !== "github") return false;
+	try {
+		return parseSource(sourceEntry.source).provider === "gitlab";
+	} catch {
+		return false;
+	}
+}
+/** What a source the prefetch does not list may take, judged by its selection alone. */
+function getSelectionClaim(params) {
+	const { selection, normalize } = params;
+	if (selection === void 0) return [];
+	return selection.includes("*") ? ANY_NAME : selection.map(normalize);
+}
 async function prefetchGithubSource(params) {
 	const { sourceEntry, lock, context, skillClaim, ruleClaim } = params;
 	const parsedFromSource = parseSource(sourceEntry.source);
-	if (parsedFromSource.provider === "gitlab") return;
 	const parsed = {
 		...parsedFromSource,
 		ref: sourceEntry.ref ?? parsedFromSource.ref,
@@ -2624,7 +2681,7 @@ async function prefetchGithubRules(params) {
 		sourceEntry,
 		lockedRuleNames: getLockedRuleNames(locked),
 		localRuleNames: context.localRuleNames,
-		alreadyFetchedRuleNames: claimed,
+		alreadyFetchedRuleNames: claimed.names,
 		curatedDir: (0, node_path.join)(context.projectRoot, require_import.RULESYNC_CURATED_RULES_RELATIVE_DIR_PATH)
 	})) {
 		claim.settle(getLockedRuleNames(locked));
@@ -14033,7 +14090,7 @@ function wrapCommand$1({ name, errorCode, handler, getVersion, loggerFactory = c
 }
 //#endregion
 //#region src/cli/program.ts
-const getVersion = () => "36.0.0";
+const getVersion = () => "36.0.1";
 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

@@ -1688,7 +1688,8 @@ async function listDirectoryRecursive(params) {
 	else if (entry.type === "dir") directories.push(entry);
 	else dropped = true;
 	if (dropped) onIncompleteDirectory?.(path);
-	const subResults = await Promise.all(directories.map((dir) => listDirectoryRecursive({
+	const failures = [];
+	const settled = await Promise.allSettled(directories.map((dir) => listDirectoryRecursive({
 		client,
 		owner,
 		repo,
@@ -1697,7 +1698,12 @@ async function listDirectoryRecursive(params) {
 		depth: depth + 1,
 		semaphore,
 		onIncompleteDirectory
+	}).catch((error) => {
+		failures.push(error);
+		throw error;
 	})));
+	if (failures.length > 0) throw failures[0];
+	const subResults = settled.flatMap((result) => result.status === "fulfilled" ? [result.value] : []);
 	return [...files, ...subResults.flat()];
 }
 /**
@@ -2408,6 +2414,12 @@ async function resolveAndFetchSources(params) {
 		failedSourceCount
 	};
 }
+/**
+* The claim of a source the prefetch does not list -- a git or npm transport
+* source -- whose selection is a wildcard: it may take any
+* name, so later sources download nothing a name decides.
+*/
+const ANY_NAME = Symbol("any name");
 function createNameClaim() {
 	let settle = () => {};
 	return {
@@ -2422,7 +2434,12 @@ function createClaimSlot(params) {
 	return {
 		earlier: async () => {
 			const claimed = await Promise.all(earlier.map((claim) => claim.names));
-			return /* @__PURE__ */ new Set([...reserved, ...claimed.flat()]);
+			const mayTakeAny = claimed.includes(ANY_NAME);
+			const names = /* @__PURE__ */ new Set([...reserved, ...claimed.flatMap((claim) => claim === ANY_NAME ? [] : claim)]);
+			return {
+				names,
+				has: (name) => mayTakeAny || names.has(name)
+			};
 		},
 		settle: own.settle
 	};
@@ -2447,13 +2464,30 @@ async function prefetchGithubSources(params) {
 		...rest,
 		semaphore: new Semaphore(10)
 	};
-	const items = sources.filter((sourceEntry) => (sourceEntry.transport ?? "github") === "github" && !hasEmptySelection(sourceEntry)).map((sourceEntry) => ({
+	const items = sources.filter((sourceEntry) => !hasEmptySelection(sourceEntry)).map((sourceEntry) => ({
 		sourceEntry,
+		listedThroughApi: isListedThroughGithubApi(sourceEntry),
 		skills: createNameClaim(),
 		rules: createNameClaim()
 	}));
+	for (const item of items.filter((candidate) => !candidate.listedThroughApi)) {
+		if (isGitlabSource(item.sourceEntry)) {
+			item.skills.settle([]);
+			item.rules.settle([]);
+			continue;
+		}
+		const filters = getSourceFilters(item.sourceEntry);
+		item.skills.settle(getSelectionClaim({
+			selection: filters.skills,
+			normalize: (name) => name
+		}));
+		item.rules.settle(getSelectionClaim({
+			selection: filters.rules,
+			normalize: normalizeRuleFilterName
+		}));
+	}
 	await mapWithConcurrency({
-		items,
+		items: items.filter((item) => item.listedThroughApi),
 		limit: 4,
 		mapper: async (item) => {
 			const earlier = items.slice(0, items.indexOf(item));
@@ -2482,10 +2516,33 @@ async function prefetchGithubSources(params) {
 		}
 	});
 }
+/** Whether the prefetch lists and downloads this source through the GitHub API. */
+function isListedThroughGithubApi(sourceEntry) {
+	if ((sourceEntry.transport ?? "github") !== "github") return false;
+	try {
+		return parseSource(sourceEntry.source).provider !== "gitlab";
+	} catch {
+		return true;
+	}
+}
+/** Whether this is a GitLab source, which the serial pass does not support yet. */
+function isGitlabSource(sourceEntry) {
+	if ((sourceEntry.transport ?? "github") !== "github") return false;
+	try {
+		return parseSource(sourceEntry.source).provider === "gitlab";
+	} catch {
+		return false;
+	}
+}
+/** What a source the prefetch does not list may take, judged by its selection alone. */
+function getSelectionClaim(params) {
+	const { selection, normalize } = params;
+	if (selection === void 0) return [];
+	return selection.includes("*") ? ANY_NAME : selection.map(normalize);
+}
 async function prefetchGithubSource(params) {
 	const { sourceEntry, lock, context, skillClaim, ruleClaim } = params;
 	const parsedFromSource = parseSource(sourceEntry.source);
-	if (parsedFromSource.provider === "gitlab") return;
 	const parsed = {
 		...parsedFromSource,
 		ref: sourceEntry.ref ?? parsedFromSource.ref,
@@ -2621,7 +2678,7 @@ async function prefetchGithubRules(params) {
 		sourceEntry,
 		lockedRuleNames: getLockedRuleNames(locked),
 		localRuleNames: context.localRuleNames,
-		alreadyFetchedRuleNames: claimed,
+		alreadyFetchedRuleNames: claimed.names,
 		curatedDir: join(context.projectRoot, RULESYNC_CURATED_RULES_RELATIVE_DIR_PATH)
 	})) {
 		claim.settle(getLockedRuleNames(locked));
@@ -14030,7 +14087,7 @@ function wrapCommand$1({ name, errorCode, handler, getVersion, loggerFactory = c
 }
 //#endregion
 //#region src/cli/program.ts
-const getVersion = () => "36.0.0";
+const getVersion = () => "36.0.1";
 const FEATURES_HELP = `${ALL_FEATURES.join(",")}; ignore is deprecated, use permissions`;
 function wrapCommand(name, errorCode, handler) {
 	return wrapCommand$1({