Consolidate

Author: chrmarti

build/check-image-tags.ts

@@ -9,16 +9,13 @@
 
 import * as fs from 'fs';
 import * as path from 'path';
+import { IMAGE_REF_PATTERN, TEMPLATE_OPTION_PATTERN, TemplateJson, findFiles } from './utils';
 
 const RED = '\x1b[0;31m';
 const GREEN = '\x1b[0;32m';
 const YELLOW = '\x1b[0;33m';
 const NC = '\x1b[0m';
 
-const MCR_PREFIX = 'mcr.microsoft.com/devcontainers/';
-const IMAGE_REF_PATTERN = /mcr\.microsoft\.com\/devcontainers\/([^"]+)/g;
-const TEMPLATE_OPTION_PATTERN = /\$\{templateOption:([^}]+)\}/;
-
 interface ImageManifest {
 	version: string;
 	variants?: string[];
@@ -28,13 +25,6 @@ interface ImageManifest {
 	};
 }
 
-interface TemplateJson {
-	options?: Record<string, {
-		default?: string;
-		proposals?: string[];
-	}>;
-}
-
 interface TemplateTag {
 	templateName: string;
 	relFile: string;
@@ -110,22 +100,6 @@ function computeImageTags(imagesRepo: string): Set<string> {
 
 // --- Step 2: Compute all tags that templates would produce ---
 
-function findFiles(dir: string, names: string[]): string[] {
-	const results: string[] = [];
-	function walk(d: string) {
-		for (const entry of fs.readdirSync(d, { withFileTypes: true })) {
-			const full = path.join(d, entry.name);
-			if (entry.isDirectory()) {
-				walk(full);
-			} else if (names.includes(entry.name) || names.some(n => n.startsWith('*.') && entry.name.endsWith(n.slice(1)))) {
-				results.push(full);
-			}
-		}
-	}
-	walk(dir);
-	return results;
-}
-
 function computeTemplateTags(templatesDir: string): TemplateTag[] {
 	const results: TemplateTag[] = [];
 

build/list-template-images.ts

@@ -7,33 +7,7 @@
 
 import * as fs from 'fs';
 import * as path from 'path';
-
-const MCR_PREFIX = 'mcr.microsoft.com/devcontainers/';
-const IMAGE_REF_PATTERN = /mcr\.microsoft\.com\/devcontainers\/([^"]+)/g;
-const TEMPLATE_OPTION_PATTERN = /\$\{templateOption:([^}]+)\}/;
-
-interface TemplateJson {
-	options?: Record<string, {
-		default?: string;
-		proposals?: string[];
-	}>;
-}
-
-function findFiles(dir: string, names: string[]): string[] {
-	const results: string[] = [];
-	function walk(d: string) {
-		for (const entry of fs.readdirSync(d, { withFileTypes: true })) {
-			const full = path.join(d, entry.name);
-			if (entry.isDirectory()) {
-				walk(full);
-			} else if (names.includes(entry.name) || names.some(n => n.startsWith('*.') && entry.name.endsWith(n.slice(1)))) {
-				results.push(full);
-			}
-		}
-	}
-	walk(dir);
-	return results;
-}
+import { MCR_PREFIX, IMAGE_REF_PATTERN, TEMPLATE_OPTION_PATTERN, TemplateJson, findFiles } from './utils';
 
 function main() {
 	const templatesDir = path.resolve(__dirname, '..', 'src');

build/utils.ts

@@ -0,0 +1,29 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+export const MCR_PREFIX = 'mcr.microsoft.com/devcontainers/';
+export const IMAGE_REF_PATTERN = /mcr\.microsoft\.com\/devcontainers\/([^"]+)/g;
+export const TEMPLATE_OPTION_PATTERN = /\$\{templateOption:([^}]+)\}/;
+
+export interface TemplateJson {
+	options?: Record<string, {
+		default?: string;
+		proposals?: string[];
+	}>;
+}
+
+export function findFiles(dir: string, names: string[]): string[] {
+	const results: string[] = [];
+	function walk(d: string) {
+		for (const entry of fs.readdirSync(d, { withFileTypes: true })) {
+			const full = path.join(d, entry.name);
+			if (entry.isDirectory()) {
+				walk(full);
+			} else if (names.includes(entry.name) || names.some(n => n.startsWith('*.') && entry.name.endsWith(n.slice(1)))) {
+				results.push(full);
+			}
+		}
+	}
+	walk(dir);
+	return results;
+}