@fluid-app/fluid-cli-theme-dev 0.1.11 → 0.1.13

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @fluid-app/fluid-cli-theme-dev@0.1.11 build /home/runner/_work/fluid-mono/fluid-mono/packages/cli/theme-dev
+> @fluid-app/fluid-cli-theme-dev@0.1.13 build /home/runner/_work/fluid-mono/fluid-mono/packages/cli/theme-dev
 > tsdown
 
 ℹ tsdown v0.21.0 powered by rolldown v1.0.0-rc.7
@@ -8,11 +8,9 @@
 ℹ target: node24
 ℹ tsconfig: tsconfig.json
 ℹ Build start
-ℹ dist/index.mjs         54.76 kB │ gzip: 15.09 kB
-ℹ dist/index.mjs.map    140.30 kB │ gzip: 31.59 kB
+ℹ dist/index.mjs         62.63 kB │ gzip: 17.02 kB
+ℹ dist/index.mjs.map    161.08 kB │ gzip: 36.15 kB
 ℹ dist/index.d.mts.map    0.11 kB │ gzip:  0.12 kB
 ℹ dist/index.d.mts        0.19 kB │ gzip:  0.16 kB
-ℹ 4 files, total: 195.36 kB
-[PLUGIN_TIMINGS] Warning: Your build spent significant time in plugin `rolldown-plugin-dts:generate`. See https://rolldown.rs/options/checks#plugintimings for more details.
-✔ Build complete in 3560ms
-
+ℹ 4 files, total: 224.01 kB
+✔ Build complete in 1278ms

package/dist/index.mjs

@@ -295,6 +295,225 @@ function mimeTypeFor(ext) {
 	};
 }
 //#endregion
+//#region ../../platform/theme-schema/src/types.ts
+const VALID_SETTING_TYPES = Object.values({
+	"input": [
+		"text",
+		"rich_text",
+		"richtext",
+		"textarea",
+		"html",
+		"html_textarea",
+		"url"
+	],
+	"number_and_selection": [
+		"range",
+		"select",
+		"radio",
+		"checkbox"
+	],
+	"visual_and_media": [
+		"color",
+		"color_background",
+		"font_picker",
+		"image",
+		"image_picker",
+		"video_picker",
+		"media_picker",
+		"text_alignment"
+	],
+	"layout": [
+		"media_fit",
+		"corner_radius",
+		"padding",
+		"border",
+		"gradient_overlay"
+	],
+	"organization": ["header"],
+	"resource_single": [
+		"product",
+		"products",
+		"collection",
+		"collections",
+		"category",
+		"categories",
+		"blog",
+		"posts",
+		"enrollment",
+		"enrollments",
+		"enrollment_pack",
+		"forms",
+		"media",
+		"link_list"
+	],
+	"resource_list": [
+		"product_list",
+		"products_list",
+		"collection_list",
+		"collections_list",
+		"category_list",
+		"categories_list",
+		"posts_list",
+		"enrollment_list",
+		"enrollments_list"
+	]
+}).flat();
+//#endregion
+//#region ../../platform/theme-schema/src/validate-settings.ts
+function validateSettings(settings) {
+	const diagnostics = [];
+	const ids = /* @__PURE__ */ new Set();
+	for (let index = 0; index < settings.length; index++) {
+		const raw = settings[index];
+		const setting = raw !== null && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
+		const id = setting.id;
+		const type = setting.type;
+		if (typeof id === "string" && id.trim() === "") diagnostics.push({
+			severity: "error",
+			message: "Error in settings: id cannot be empty"
+		});
+		else if (id && ids.has(id)) diagnostics.push({
+			severity: "error",
+			message: `Error in settings: duplicate id '${id}' found`
+		});
+		else if (id) ids.add(id);
+		if (!type) diagnostics.push({
+			severity: "error",
+			message: `Error in setting '${id ?? index}': missing required field 'type'`
+		});
+		else if (!VALID_SETTING_TYPES.includes(type)) diagnostics.push({
+			severity: "error",
+			message: `Invalid settings type: '${type}'`
+		});
+	}
+	return diagnostics;
+}
+//#endregion
+//#region ../../platform/theme-schema/src/validate-blocks.ts
+function validateBlocks(blocks) {
+	const diagnostics = [];
+	const types = /* @__PURE__ */ new Set();
+	for (let index = 0; index < blocks.length; index++) {
+		const raw = blocks[index];
+		const block = raw !== null && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
+		const type = block.type;
+		const name = block.name;
+		const settings = block.settings;
+		if (!type) diagnostics.push({
+			severity: "error",
+			message: `Error in blocks at index ${index}: missing required field 'type'`
+		});
+		else if (types.has(type)) diagnostics.push({
+			severity: "warning",
+			message: `Warning in blocks: duplicate type '${type}' found`
+		});
+		else types.add(type);
+		if (!name && type !== "@app" && type !== "@theme" && !(!name && !settings)) diagnostics.push({
+			severity: "error",
+			message: `Error in block '${type ?? index}': missing required field 'name'`
+		});
+		if (Array.isArray(settings)) diagnostics.push(...validateSettings(settings));
+		if (Array.isArray(block.blocks)) diagnostics.push(...validateBlocks(block.blocks));
+	}
+	return diagnostics;
+}
+//#endregion
+//#region ../../platform/theme-schema/src/validate.ts
+function stripLiquidComments(text) {
+	return text.replace(/\{%-?\s*comment\s*-?%\}[\s\S]*?\{%-?\s*endcomment\s*-?%\}/g, "");
+}
+function findDuplicateBlocksKeys(jsonText) {
+	let count = 0;
+	const stack = [];
+	let i = 0;
+	while (i < jsonText.length) {
+		const ch = jsonText.charCodeAt(i);
+		if (ch === 32 || ch === 10 || ch === 13 || ch === 9) {
+			i++;
+			continue;
+		}
+		if (ch === 123) {
+			stack.push({
+				type: "object",
+				keys: /* @__PURE__ */ new Set(),
+				expectingKey: true
+			});
+			i++;
+		} else if (ch === 125) {
+			stack.pop();
+			i++;
+		} else if (ch === 91) {
+			stack.push({
+				type: "array",
+				keys: /* @__PURE__ */ new Set(),
+				expectingKey: false
+			});
+			i++;
+		} else if (ch === 93) {
+			stack.pop();
+			i++;
+		} else if (ch === 58) i++;
+		else if (ch === 44) {
+			const top = stack[stack.length - 1];
+			if (top?.type === "object") top.expectingKey = true;
+			i++;
+		} else if (ch === 34) {
+			let j = i + 1;
+			while (j < jsonText.length) {
+				if (jsonText.charCodeAt(j) === 34 && jsonText.charCodeAt(j - 1) !== 92) break;
+				j++;
+			}
+			const str = jsonText.slice(i + 1, j);
+			i = j + 1;
+			const top = stack[stack.length - 1];
+			if (top?.type === "object" && top.expectingKey) {
+				if (str === "blocks" && top.keys.has(str)) count++;
+				top.keys.add(str);
+				top.expectingKey = false;
+			}
+		} else i++;
+	}
+	return count;
+}
+function validateSchemaText(text, options) {
+	const blocksSchemaType = options?.blocksSchemaType ?? "unknown";
+	const diagnostics = [];
+	const match = stripLiquidComments(text).match(/\{%-?\s*schema\s*-?%\}([\s\S]*?)\{%-?\s*endschema\s*-?%\}/);
+	if (!match) return diagnostics;
+	const jsonText = match[1] ?? "";
+	let schema;
+	try {
+		schema = JSON.parse(jsonText);
+	} catch (e) {
+		diagnostics.push({
+			severity: "error",
+			message: `Invalid JSON:\n ${e.message}`
+		});
+		return diagnostics;
+	}
+	const dupes = findDuplicateBlocksKeys(jsonText);
+	for (let d = 0; d < dupes; d++) diagnostics.push({
+		severity: "error",
+		message: "Error in blocks: duplicate 'blocks' key in the same object"
+	});
+	if (schema !== null && typeof schema === "object" && Array.isArray(schema.settings)) diagnostics.push(...validateSettings(schema.settings));
+	if (schema !== null && typeof schema === "object" && "blocks" in schema) {
+		const blocks = schema.blocks;
+		if (blocksSchemaType === "array") if (!Array.isArray(blocks)) diagnostics.push({
+			severity: "error",
+			message: "Error in blocks: expected an array ([])"
+		});
+		else diagnostics.push(...validateBlocks(blocks));
+		else if (blocksSchemaType === "object") {
+			if (Array.isArray(blocks) || typeof blocks !== "object" || blocks === null) diagnostics.push({
+				severity: "error",
+				message: "Error in blocks: expected an object ({})"
+			});
+		} else if (Array.isArray(blocks)) diagnostics.push(...validateBlocks(blocks));
+	}
+	return diagnostics;
+}
+//#endregion
 //#region src/theme/file.ts
 var ThemeFile = class {
 	absolutePath;
@@ -338,6 +557,15 @@ var ThemeFile = class {
 	size() {
 		return statSync(this.absolutePath).size;
 	}
+	get isTemplate() {
+		const parts = this.relativePath.split(/[/\\]/);
+		return parts[0] === "templates" && parts.length >= 3 && parts[1] !== "sections" && parts[1] !== "blocks" && parts[1] !== "components";
+	}
+	validateSchema() {
+		if (!this.isLiquid) return [];
+		const blocksSchemaType = this.isTemplate ? "object" : "array";
+		return validateSchemaText(this.read(), { blocksSchemaType });
+	}
 };
 //#endregion
 //#region src/theme/fluid-ignore.ts
@@ -836,8 +1064,20 @@ var Syncer = class {
 			uploaded: 0,
 			deleted: 0,
 			downloaded: 0,
-			errors: []
+			errors: [],
+			validationFailed: false
 		};
+		if (opts.validate) {
+			for (const file of localFiles) {
+				if (!file.isLiquid) continue;
+				const errors = file.validateSchema().filter((d) => d.severity === "error");
+				for (const d of errors) result.errors.push(`${file.relativePath}: ${d.message}`);
+			}
+			if (result.errors.length > 0) {
+				result.validationFailed = true;
+				return result;
+			}
+		}
 		const toUpload = localFiles.filter((f) => f.exists && this.hasChanged(f));
 		let done = 0;
 		for (const file of toUpload) {
@@ -868,7 +1108,8 @@ var Syncer = class {
 			deleted: 0,
 			downloaded: 0,
 			skipped: 0,
-			errors: []
+			errors: [],
+			validationFailed: false
 		};
 		let done = 0;
 		for (const resource of resources) {
@@ -915,16 +1156,29 @@ async function startDevServer(api, theme, themeRoot, opts, onReady) {
 	const syncer = new Syncer(api, theme.id, themeRoot);
 	const pendingUpdates = /* @__PURE__ */ new Set();
 	console.log(`\nSyncing theme ${theme.name} (#${theme.id})…`);
-	await syncer.uploadTheme({
+	const syncResult = await syncer.uploadTheme({
 		delete: true,
+		validate: opts.validate,
 		onProgress: (done, total) => {
 			process.stdout.write(`\r  Uploading ${done}/${total} files…`);
 		}
 	});
 	process.stdout.write("\n");
+	if (syncResult.validationFailed) {
+		console.error(`\nSchema validation failed (${syncResult.errors.length} error(s)). Use --force to skip.\n`);
+		for (const e of syncResult.errors) console.error(`  ${e}`);
+		process.exit(1);
+	} else if (syncResult.errors.length > 0) for (const e of syncResult.errors) console.error(`  ${e}`);
 	const stopWatcher = watchTheme(themeRoot, async (modified, added, removed) => {
 		const changed = [...modified, ...added];
 		for (const file of changed) {
+			if (opts.validate && file.isLiquid) {
+				const diagnostics = file.validateSchema();
+				for (const d of diagnostics) {
+					const prefix = d.severity === "error" ? "Schema error" : "Schema warning";
+					console.warn(`\n[${prefix}] ${file.relativePath}: ${d.message}`);
+				}
+			}
 			pendingUpdates.add(file.relativePath);
 			try {
 				await syncer.uploadFile(file);
@@ -1198,7 +1452,8 @@ function createDevCommand() {
 		}, themeRoot, {
 			host: opts.host,
 			port,
-			reloadMode
+			reloadMode,
+			validate: !opts.force
 		}, (address) => {
 			console.log(`\n  Dev server: ${address}`);
 			console.log(`  Web editor: ${editorUrl}`);
@@ -1307,11 +1562,16 @@ function createPushCommand() {
 		const spinner = ora(`Pushing to ${theme.name} (#${theme.id})…`).start();
 		const result = await syncer.uploadTheme({
 			delete: !opts.nodelete,
+			validate: !opts.force,
 			onProgress: (d, total) => {
 				spinner.text = `Pushing ${d}/${total} files…`;
 			}
 		});
-		if (result.errors.length) {
+		if (result.validationFailed) {
+			spinner.fail(`Schema validation failed (${result.errors.length} error(s)). Use --force to skip.`);
+			for (const e of result.errors) console.error(`  ${e}`);
+			process.exit(1);
+		} else if (result.errors.length) {
 			spinner.warn(`Pushed with ${result.errors.length} error(s).`);
 			for (const e of result.errors) console.error(`  ${e}`);
 		} else spinner.succeed(`Pushed ${result.uploaded} file(s), deleted ${result.deleted} remote file(s).`);