allow specifying skill subscriptions in file-system hierarchy

lib/events/register_skill.ts

@@ -377,27 +377,36 @@ export function fullImageName(
 	}${digest ? `@${digest}` : ""}`;
 }
 
-export async function inlineDatalogResources(
+type DatalogSubscription = {
+	name: string;
+	query: string;
+	limit?: number;
+};
+
+async function getDatalogSubscriptionFileMatches(
 	p: project.Project,
-	skill: AtomistSkillInput,
-): Promise<void> {
-	const datalogSubscriptions = [];
-	datalogSubscriptions.push(
-		...(await project.withGlobMatches<{
-			name: string;
-			query: string;
-			limit?: number;
-		}>(p, "datalog/subscription/*.edn", async file => {
-			const filePath = p.path(file);
-			const fileName = path.basename(filePath);
-			const extName = path.extname(fileName);
-			return {
-				query: (await fs.readFile(filePath)).toString(),
-				name: fileName.replace(extName, ""),
-			};
-		})),
-	);
-	(skill.datalogSubscriptions || []).forEach(d => {
+	matchPath: string,
+): Promise<Array<DatalogSubscription>> {
+	return await project.withGlobMatches<{
+		name: string;
+		query: string;
+		limit?: number;
+	}>(p, matchPath, async file => {
+		const filePath = p.path(file);
+		const fileName = path.basename(filePath);
+		const extName = path.extname(fileName);
+		return {
+			query: (await fs.readFile(filePath)).toString(),
+			name: fileName.replace(extName, ""),
+		};
+	});
+}
+
+function updateSubscriptions(
+	datalogSubscriptions: Array<DatalogSubscription>,
+	updates: Array<DatalogSubscription>,
+): void {
+	updates.forEach(d => {
 		const eds = datalogSubscriptions.find(ds => d.name === ds.name);
 		if (eds) {
 			eds.query = d.query;
@@ -406,6 +415,34 @@ export async function inlineDatalogResources(
 			datalogSubscriptions.push(d);
 		}
 	});
+}
+
+export async function inlineDatalogResources(
+	p: project.Project,
+	skill: AtomistYaml["skill"],
+): Promise<void> {
+	const datalogSubscriptions: Array<DatalogSubscription> = [];
+
+	// common subscriptions
+	datalogSubscriptions.push(
+		...(await getDatalogSubscriptionFileMatches(
+			p,
+			"datalog/subscription/*.edn",
+		)),
+	);
+
+	// subscription paths defined in yaml
+	for (const subscriptionPath of skill.datalogSubscriptionPaths || []) {
+		const subscriptionPathMatches = await getDatalogSubscriptionFileMatches(
+			p,
+			`datalog/subscription/${subscriptionPath}`,
+		);
+		updateSubscriptions(datalogSubscriptions, subscriptionPathMatches);
+	}
+	delete skill.datalogSubscriptionPaths;
+
+	// subscriptions defined in yaml
+	updateSubscriptions(datalogSubscriptions, skill.datalogSubscriptions || []);
 	skill.datalogSubscriptions = datalogSubscriptions;
 
 	const schemata = [...(skill.schemata || [])];

lib/util.ts

@@ -15,6 +15,7 @@
  */
 
 import { handle } from "@atomist/skill";
+import { AtomistSkillInput } from "@atomist/skill/lib/definition/subscription/typings/types";
 import { Project } from "@atomist/skill/lib/project/project";
 import * as fs from "fs-extra";
 import * as yaml from "js-yaml";
@@ -23,7 +24,7 @@ import { Configuration } from "./configuration";
 import { RegisterSkill } from "./types";
 
 export interface AtomistYaml {
-	skill: any;
+	skill: AtomistSkillInput & { datalogSubscriptionPaths?: string[] };
 }
 
 export const AtomistYamlFileName = "skill.package.yaml";