@mbler/mcx-core 0.1.2-rc.11 → 0.1.2-rc.13

package/README.md

@@ -1,40 +1,40 @@
-# @mbler/mcx-core
-
-The MCX DSL compiler — the core of the MCX ecosystem. Compiles `.mcx` source files into MCBE-compatible JSON components, UI forms, and event systems.
-
-## Pipeline
-
-`.mcx` file → **parser** → AST → **transform** (Babel) → compiled JS → MCBE JSON
-
-## Features
-
-- **MCX Parser** — Parses `.mcx` source into a tokenized AST (`tag`, `prop`)
-- **Transform Pipeline** — Detects file type (`event`, `ui`, `component`, `app`) and generates compiled Babel AST
-- **Component Compilation** — Runs component scripts in a sandboxed VM, generates MCBE JSON, executes file edit operations
-- **CJS Transform** — Rewrites ESM imports to CommonJS `require()` for VM execution
-- **Image Assets** — Compiles PNG, JPG, SVG, GIF image references into MCBE texture assets
-- **Rollup/Rolldown Plugin** — Seamless `.mcx` file resolution and transformation in your build pipeline
-
-## Installation
-
-```bash
-pnpm add -D @mbler/mcx-core
-```
-
-## Usage
-
-Add the plugin to your Rollup or Rolldown config:
-
-```ts
-import { rollupPlugin } from '@mbler/mcx-core'
-
-export default {
-  plugins: [rollupPlugin({ moduleDir: './modules', tsconfigPath: './tsconfig.json' })],
-}
-```
-
-For full documentation, visit the **[Docs](https://mbler-docs.ruanhor.dpdns.org/guide/mcx)**.
-
-## License
-
-MIT
+# @mbler/mcx-core
+
+The MCX DSL compiler — the core of the MCX ecosystem. Compiles `.mcx` source files into MCBE-compatible JSON components, UI forms, and event systems.
+
+## Pipeline
+
+`.mcx` file → **parser** → AST → **transform** (Babel) → compiled JS → MCBE JSON
+
+## Features
+
+- **MCX Parser** — Parses `.mcx` source into a tokenized AST (`tag`, `prop`)
+- **Transform Pipeline** — Detects file type (`event`, `ui`, `component`, `app`) and generates compiled Babel AST
+- **Component Compilation** — Runs component scripts in a sandboxed VM, generates MCBE JSON, executes file edit operations
+- **CJS Transform** — Rewrites ESM imports to CommonJS `require()` for VM execution
+- **Image Assets** — Compiles PNG, JPG, SVG, GIF image references into MCBE texture assets
+- **Rollup/Rolldown Plugin** — Seamless `.mcx` file resolution and transformation in your build pipeline
+
+## Installation
+
+```bash
+pnpm add -D @mbler/mcx-core
+```
+
+## Usage
+
+Add the plugin to your Rollup or Rolldown config:
+
+```ts
+import { rollupPlugin } from '@mbler/mcx-core'
+
+export default {
+  plugins: [rollupPlugin({ moduleDir: './modules', tsconfigPath: './tsconfig.json' })],
+}
+```
+
+For full documentation, visit the **[Docs](https://mbler-docs.ruanhor.dpdns.org/guide/mcx)**.
+
+## License
+
+MIT

package/client.d.ts

@@ -1,17 +1,17 @@
-import type * as mcx from "."
-
-declare module "*.png" {
-  export default mcx.PNGImageComponent
-}
-declare module "*.svg" {
-  export default mcx.SVGImageComponent
-}
-declare module "*.jpg" {
-  export default mcx.JPGImageComponent
-}
-declare module "*.jpeg" {
-  export default mcx.JPGImageComponent
-}
-declare module "*.gif" {
-  export default mcx.GIFImageComponent
-}
+import type * as mcx from "."
+
+declare module "*.png" {
+  export default mcx.PNGImageComponent
+}
+declare module "*.svg" {
+  export default mcx.SVGImageComponent
+}
+declare module "*.jpg" {
+  export default mcx.JPGImageComponent
+}
+declare module "*.jpeg" {
+  export default mcx.JPGImageComponent
+}
+declare module "*.gif" {
+  export default mcx.GIFImageComponent
+}

package/dist/index.js

@@ -13510,23 +13510,23 @@ var import_compiler_core = (/* @__PURE__ */ __commonJSMin(((exports, module) =>
 	if (process.env.NODE_ENV === "production") module.exports = require_compiler_core_cjs_prod();
 	else module.exports = require_compiler_core_cjs();
 })))();
-function createTagToken() {
-	return {
-		data: "",
-		type: "Tag",
-		start: {
-			line: 0,
-			column: 0
-		},
-		end: {
-			line: 0,
-			column: 0
-		}
-	};
-}
 function getExpressionContent(expr) {
 	return expr?.content ?? "true";
 }
+/** Convert absolute character offset in source to MCX position (line: 1-indexed, column: 0-indexed) */
+function absOffsetToMCXPos(source, absOffset) {
+	let line = 1;
+	let col = 0;
+	const len = Math.min(absOffset, source.length);
+	for (let i = 0; i < len; i++) if (source.charCodeAt(i) === 10) {
+		line++;
+		col = 0;
+	} else col++;
+	return {
+		line,
+		column: col
+	};
+}
 var McxAst = class McxAst {
 	text;
 	includeComments;
@@ -13535,7 +13535,10 @@ var McxAst = class McxAst {
 		this.includeComments = includeComments;
 	}
 	parseAST() {
-		const ast = (0, import_compiler_core.baseParse)(this.text, { comments: true });
+		const ast = (0, import_compiler_core.baseParse)(this.text, {
+			comments: true,
+			whitespace: "preserve"
+		});
 		const result = [];
 		for (const child of ast.children) {
 			const node = this.convertTemplateChild(child);
@@ -13592,12 +13595,56 @@ var McxAst = class McxAst {
 			}
 		}
 		const children = this.convertVueChildren(node.children);
+		const fullSource = this.text;
+		const baseOffset = node.loc.start.offset;
+		const elementSource = node.loc.source;
+		let openEnd = elementSource.length;
+		let inQuote = null;
+		for (let i = 0; i < elementSource.length; i++) {
+			const c = elementSource[i];
+			if (inQuote) {
+				if (c === "\\") {
+					i++;
+					continue;
+				}
+				if (c === inQuote) inQuote = null;
+			} else if (c === "\"" || c === "'") inQuote = c;
+			else if (c === ">") {
+				openEnd = i + 1;
+				break;
+			}
+		}
+		let closeStart = -1;
+		if (!node.isSelfClosing) {
+			for (let i = elementSource.length - 2; i >= 0; i--) if (elementSource[i] === "<" && elementSource[i + 1] === "/") {
+				closeStart = i;
+				break;
+			}
+		}
+		const openTagStartAbs = baseOffset;
+		const openTagEndAbs = baseOffset + openEnd;
+		let endToken = null;
+		if (closeStart >= 0) {
+			const closeTagStartAbs = baseOffset + closeStart;
+			const closeTagEndAbs = baseOffset + elementSource.length;
+			endToken = {
+				data: elementSource.slice(closeStart),
+				type: "TagEnd",
+				start: absOffsetToMCXPos(fullSource, closeTagStartAbs),
+				end: absOffsetToMCXPos(fullSource, closeTagEndAbs)
+			};
+		}
 		return {
-			start: createTagToken(),
+			start: {
+				data: elementSource.slice(0, openEnd),
+				type: "Tag",
+				start: absOffsetToMCXPos(fullSource, openTagStartAbs),
+				end: absOffsetToMCXPos(fullSource, openTagEndAbs)
+			},
 			name: node.tag,
 			arr: attrs,
 			content: children,
-			end: null,
+			end: endToken,
 			loc: {
 				start: {
 					line: node.loc.start.line,