cluaupp 2.0.0-beta.1 → 2.0.0-beta.2

package/src/target/datamodel-generate.ts

@@ -6,6 +6,7 @@ import fs from "node:fs";
 import path from "node:path";
 import type { DatamodelNode, DatamodelProfile } from "./datamodel.js";
 import { buildDatamodelProfile } from "./datamodel.js";
+import { collectSources } from "../clpp/paths.js";
 
 function safeIdent(name: string): string {
 	const cleaned = name.replace(/[^A-Za-z0-9_]/g, "_");
@@ -58,7 +59,7 @@ export function profileWithoutIndex(profile: DatamodelProfile): Omit<DatamodelPr
 export function writeDatamodelArtifacts(
 	projectRoot: string,
 	opts?: { projectJson?: string; outDir?: string; headerPath?: string },
-): { profile: DatamodelProfile; profilePath: string; headerPath: string } | null {
+): { profile: DatamodelProfile; profilePath: string; headerPath: string | null } | null {
 	const profile = buildDatamodelProfile(projectRoot, opts?.projectJson);
 	if (!profile) {
 		return null;
@@ -68,6 +69,16 @@ export function writeDatamodelArtifacts(
 	const profilePath = path.join(outDir, "datamodel-profile.json");
 	fs.writeFileSync(profilePath, JSON.stringify(profileWithoutIndex(profile), null, "\t") + "\n", "utf8");
 
+	let sourceRoot = "src";
+	const configPath = path.join(projectRoot, "cluaupp.config.json");
+	if (fs.existsSync(configPath)) {
+		const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
+		if (typeof config.rootDir === "string") sourceRoot = config.rootDir;
+	}
+	const sources = collectSources(path.resolve(projectRoot, sourceRoot));
+	const modern = sources.some(file => /\.clp$/i.test(file)) && !sources.some(file => /\.clpp$/i.test(file));
+	if (modern && !opts?.headerPath) return { profile, profilePath, headerPath: null };
+
 	const headerPath =
 		opts?.headerPath ||
 		path.join(projectRoot, "include", "clpp", "generated", "datamodel.clh");

package/src/utils/project.ts

@@ -338,6 +338,11 @@ function compileOptions(root: string, config: ProjectConfig, file: string, rel:
 	};
 }
 
+function needsLegacyHeaders(srcDir: string): boolean {
+	const sources = collectSources(srcDir);
+	return sources.some(file => /\.clpp$/i.test(file)) || !sources.some(file => /\.clp$/i.test(file));
+}
+
 function compileSchemaJobs(root: string, config: ProjectConfig, srcDir: string) {
 	const jobs: Array<{ rel: string; files: CompiledArtifact[]; stale: string[] }> = [];
 	const errors: Array<{ rel: string; prefixes: string[]; message: string }> = [];
@@ -352,7 +357,7 @@ function compileSchemaJobs(root: string, config: ProjectConfig, srcDir: string)
 			if (!isInside(path.resolve(root, config.rootDir), headerDest) && !isInside(srcDir, headerDest)) {
 				throw new Error(`cluaupp schema: skip unsafe header ${emit.headerRel}`);
 			}
-			writeTextIfChanged(headerDest, emit.header);
+			if (needsLegacyHeaders(srcDir)) writeTextIfChanged(headerDest, emit.header);
 			jobs.push({
 				rel,
 				files: [{ name: emit.luauRel, contents: emit.luau }],
@@ -380,7 +385,7 @@ function compileFlareJobs(root: string, config: ProjectConfig, srcDir: string) {
 			if (!isInside(path.resolve(root, config.rootDir), headerDest) && !isInside(srcDir, headerDest)) {
 				throw new Error(`cluaupp flare: skip unsafe header ${emit.headerRel}`);
 			}
-			writeTextIfChanged(headerDest, emit.header);
+			if (needsLegacyHeaders(srcDir)) writeTextIfChanged(headerDest, emit.header);
 			jobs.push({
 				rel,
 				files: [{ name: emit.luauRel, contents: emit.luau }],
@@ -638,7 +643,10 @@ function writeJobs(root: string, config: ProjectConfig, jobs: Array<{ rel: strin
 
 function ensureVendor(root: string): void {
 	copyRuntime(root);
-	copyHeaders(root);
+	const config = loadConfig(root);
+	if (collectSources(path.join(root, config.rootDir)).some(file => /\.clpp$/i.test(file))) {
+		copyHeaders(root);
+	}
 }
 
 function finishBuild(
@@ -778,10 +786,15 @@ export async function buildAsync(root: string, options: BuildOptions = {}): Prom
 
 export async function init(dest: string): Promise<void> {
 	const target = assertInitDest(dest);
+	if (fs.existsSync(path.join(target, "cluaupp.config.json")) || fs.existsSync(path.join(target, "src"))) {
+		throw new Error("cluaupp init: project already exists; choose a new folder. Existing .clpp/.clh sources require migration, not another init.");
+	}
 	const template = path.join(__dirname, "..", "..", "templates", "game-modern");
-	const include = path.join(__dirname, "..", "..", "include");
 	copyDir(template, target);
-	copyDir(include, path.join(target, "include"));
+	const packageFile = path.join(target, "package.json");
+	const projectPackage = JSON.parse(fs.readFileSync(packageFile, "utf8"));
+	projectPackage.devDependencies = { ...projectPackage.devDependencies, cluaupp: pkg.version };
+	fs.writeFileSync(packageFile, JSON.stringify(projectPackage, null, "\t") + "\n");
 	const skills = path.join(__dirname, "..", "..", "skills");
 	if (fs.existsSync(skills)) {
 		copyDir(skills, path.join(target, ".cursor", "skills"));
@@ -795,7 +808,8 @@ export async function init(dest: string): Promise<void> {
 	console.log("  CL++ 0.10 editor extension provides syntax highlighting; Cluaupp compiles Roblox .clp files");
 	console.log("  cluaupp intellisense  (schema .flare .hive .mint .bloom .helm .shift .axiom)");
 	console.log("  rokit install");
-	console.log("  cluaupp build");
+	console.log("  npm install");
+	console.log("  npm run build");
 	console.log("  rojo serve");
 }