Improve CLI

.vscode/tasks.json

@@ -6,10 +6,7 @@
 			"type": "npm",
 			"script": "play",
 			"isBackground": true,
-			"group": {
-				"kind": "build",
-				"isDefault": true,
-			}
+			"group": "build"
 		},
 	],
 }

package.json

@@ -7,7 +7,8 @@
 	"main": "out/chiri.js",
 	"types": "out/chiri.d.ts",
 	"scripts": {
-		"play": "node tsc2.js && concurrently --prefix none \"node tsc2.js --watch\" \"chiri playground -w\""
+		"play": "node tsc2.js && concurrently --prefix none \"node tsc2.js --watch\" \"chiri playground -w\"",
+		"watch": "node tsc2.js --watch"
 	},
 	"dependencies": {
 		"source-map": "0.7.4",

src/args.ts

@@ -0,0 +1,21 @@
+const args: Record<string, string | true> = {}
+const allArgs: string[] = []
+
+for (let i = 2; i < process.argv.length; i++) {
+	const arg = process.argv[i]
+	if (arg[0] === "-" && (arg[2] || arg[1] !== "-")) {
+		if (arg[1] === "-") {
+			args[arg.slice(2)] = process.argv[++i]
+			continue
+		}
+
+		args[arg.slice(1)] = true
+		continue
+	}
+
+	allArgs.push(arg)
+}
+
+export default args
+export { allArgs }
+

src/chc/write/CSSWriter.ts

@@ -1,3 +1,5 @@
+import path from "path"
+import args from "../../args"
 import type { ChiriAST } from "../read/ChiriReader"
 import type { ChiriProperty } from "../read/consume/consumePropertyOptional"
 import type { ChiriWord } from "../read/consume/consumeWord"
@@ -25,6 +27,10 @@ export default class CSSWriter extends Writer {
 		super(ast, dest, { extension: ".css", ...config })
 	}
 
+	override createDestPath (outFile: string): string {
+		return typeof args["out-css"] === "string" ? path.resolve(args["out-css"], outFile) : super.createDestPath(outFile)
+	}
+
 	writingTo (writingTo: "default" | "root", dowhile: () => any) {
 		if (this.writingToType === writingTo)
 			return

src/chc/write/DTSWriter.ts

@@ -1,3 +1,5 @@
+import path from "path"
+import args from "../../args"
 import type { ChiriAST } from "../read/ChiriReader"
 import type ChiriCompiler from "./ChiriCompiler"
 import type { ChiriWriteConfig } from "./Writer"
@@ -9,6 +11,10 @@ export default class DTSWriter extends Writer {
 		super(ast, dest, { extension: ".d.ts", ...config })
 	}
 
+	override createDestPath (outFile: string): string {
+		return typeof args["out-dts"] === "string" ? path.resolve(args["out-dts"], outFile) : super.createDestPath(outFile)
+	}
+
 	override onCompileStart (compiler: ChiriCompiler): void {
 		this.writeLineStartBlock("declare const _default: {")
 	}

src/chc/write/ESWriter.ts

@@ -1,3 +1,5 @@
+import path from "path"
+import args from "../../args"
 import type { ChiriAST } from "../read/ChiriReader"
 import type ChiriCompiler from "./ChiriCompiler"
 import type { ChiriWriteConfig } from "./Writer"
@@ -27,6 +29,10 @@ export default class ESWriter extends Writer {
 		super(ast, dest, { extension: ".js", ...config })
 	}
 
+	override createDestPath (outFile: string): string {
+		return typeof args["out-es"] === "string" ? path.resolve(args["out-es"], outFile) : super.createDestPath(outFile)
+	}
+
 	override onCompileStart (compiler: ChiriCompiler): void {
 		this.writeLineStartBlock(UMD_PREFIX)
 		this.writeLineStartBlock("exports.default = {")

src/chc/write/Writer.ts

@@ -1,10 +1,13 @@
 import fsp from "fs/promises"
+import path from "path"
 import { SourceMapGenerator } from "source-map"
 import ansi from "../../ansi"
+import args from "../../args"
 import type { ChiriAST, ChiriPosition } from "../read/ChiriReader"
 import type { ChiriDocumentation } from "../read/consume/consumeDocumentationOptional"
 import type { ChiriValueText } from "../read/consume/consumeValueText"
 import type { ChiriWord } from "../read/consume/consumeWord"
+import relToCwd from "../util/relToCwd"
 import stringifyText from "../util/stringifyText"
 import type ChiriCompiler from "./ChiriCompiler"
 
@@ -49,13 +52,19 @@ export default class Writer {
 	}
 
 	constructor (ast: ChiriAST, dest: string, public readonly config: ChiriWriteConfig) {
-		this.dest = dest + config.extension
+		this.dest = this.createDestPath(relToCwd(dest)) + config.extension
 
 		this.map = new SourceMapGenerator({ file: this.dest })
 		for (const [filename, source] of Object.entries(ast.source))
 			this.map.setSourceContent(filename, source)
 	}
 
+	createDestPath (outFile: string): string {
+		if (typeof args.out === "string")
+			outFile = path.join(args.out, outFile)
+		return path.resolve(outFile)
+	}
+
 	indent (amount = 1) {
 		this.#indent += amount
 	}
@@ -67,7 +76,7 @@ export default class Writer {
 				this.currentWrite.output = this.currentWrite.output.slice(0, -1)
 	}
 
-	writeFile () {
+	async writeFile () {
 		this.output = ""
 		for (const queued of this.queue) {
 			if (queued.mapping) {
@@ -82,6 +91,7 @@ export default class Writer {
 			this.output += queued.output
 		}
 
+		await fsp.mkdir(path.dirname(this.dest), { recursive: true })
 		return fsp.writeFile(this.dest, this.output)
 	}
 

src/chiri.ts

@@ -6,12 +6,13 @@ import dotenv from "dotenv"
 import path from "path"
 import sourceMapSupport from "source-map-support"
 import ansi from "./ansi"
+import args, { allArgs } from "./args"
 import type ChiriReaderType from "./chc/read/ChiriReader"
 import prefixError from "./chc/util/prefixError.js"
 import relToCwd from "./chc/util/relToCwd.js"
 import type streamJsonType from "./chc/util/streamJson"
 import type ChiriCompilerType from "./chc/write/ChiriCompiler"
-import { CHC_ROOT, LIB_ROOT } from "./constants"
+import { CHC_ROOT, LIB_ROOT, PACKAGE_ROOT } from "./constants"
 
 dotenv.config()
 
@@ -20,22 +21,10 @@ Error.stackTraceLimit = Math.max(Error.stackTraceLimit, +process.env.CHIRI_STACK
 if (process.env.CHIRI_ENV === "dev")
 	sourceMapSupport.install()
 
-const args: Record<string, string | true> = {}
-const allArgs: string[] = []
-
-for (let i = 2; i < process.argv.length; i++) {
-	const arg = process.argv[i]
-	if (arg[0] === "-" && (arg[2] || arg[1] !== "-")) {
-		if (arg[1] === "-") {
-			args[arg.slice(2)] = process.argv[++i]
-			continue
-		}
-
-		args[arg.slice(1)] = true
-		continue
-	}
-
-	allArgs.push(arg)
+if (args.v) {
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+	console.log(require(path.join(PACKAGE_ROOT, "package.json")).version)
+	process.exit()
 }
 
 let compilationPromise: Promise<any> | undefined = undefined
@@ -109,16 +98,14 @@ async function compile (filename: string) {
 			.catch(e => { throw prefixError(e, "Failed to write AST JSON file") })
 	}
 
-	const outFile = reader.basename
-
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 	const ChiriCompilerClass = rerequire<typeof ChiriCompilerType>("./chc/write/ChiriCompiler.js")
-	const compiler = ChiriCompilerClass(ast, outFile)
+	const compiler = ChiriCompilerClass(ast, reader.basename)
 	compiler.compile()
 	await compiler.writeFiles()
 
 	const elapsed = performance.now() - start
-	console.log(ansi.label + "chiri", ansi.path + relToCwd(reader.filename), ansi.label + "=>", ansi.path + relToCwd(outFile), ansi.label + formatElapsed(elapsed))
+	console.log(ansi.label + "chiri", ansi.path + relToCwd(reader.filename), ansi.label + formatElapsed(elapsed))
 }
 
 function formatElapsed (elapsed: number) {