@vmz/vmz 0.2.1 → 0.2.2

package/dist/cli/cli.js

@@ -68,7 +68,11 @@ function buildProductCli(opts = {}) {
     withWorkspaceOpts(cli.command('build', 'cli.cmd.build')).action((options) => cmdBuild(options));
     withWorkspaceOpts(cli.command('serve', 'cli.cmd.serve')).action((options) => cmdServe(options));
     withWorkspaceOpts(cli.command('dev', 'cli.cmd.dev')).action((options) => cmdDev(options));
-    withWorkspaceOpts(cli.command('format', 'cli.cmd.format')).action((options) => cmdFormat(options));
+    withWorkspaceOpts(cli.command('format', 'cli.cmd.format'))
+        .option('--no-javascript', 'cli.opt.format-no-javascript')
+        .option('--no-rust', 'cli.opt.format-no-rust')
+        .option('--no-vmz', 'cli.opt.format-no-vmz')
+        .action((options) => cmdFormat(options));
     withWorkspaceOpts(cli.command('lint', 'cli.cmd.lint')).action((options) => cmdLint(options));
     registerTestCommand(cli);
     registerDocumentCommands(cli.command('document|docs', 'cli.cmd.document'));
@@ -472,7 +476,7 @@ async function cmdDev(args) {
         await session.stop();
     }
 }
-function cmdFormat(args) {
+async function cmdFormat(args) {
     const pathArg = args._[0] ?? '.';
     const { project, outDir } = resolveWorkspaceDirs({
         path: pathArg,
@@ -480,20 +484,18 @@ function cmdFormat(args) {
     });
     const checkOnly = Boolean(args.check);
     log.info(`format ${project}${checkOnly ? ' --check' : ''}`);
-    const ws = createWorkspace({ root: project, outDir });
-    try {
-        const report = ws.format(checkOnly);
-        const errors = log.diagnostics(report.diagnostics ?? []);
-        if (checkOnly) {
-            log.info(`checked ${report.filesChecked} file(s); ${report.filesNeedWrite} need write`);
-            return errors || report.filesNeedWrite > 0 ? 1 : 0;
-        }
-        log.info(`formatted ${report.filesWritten}/${report.filesChecked} file(s)`);
-        return errors ? 1 : 0;
-    }
-    finally {
-        ws.dispose();
-    }
+    const { runFormatCommand } = await import('./format-cmd.js');
+    return runFormatCommand({
+        project,
+        outDir,
+        check: checkOnly,
+        overrides: {
+            javascript: args['no-javascript'] ? false : undefined,
+            rust: args['no-rust'] ? false : undefined,
+            vmz: args['no-vmz'] ? false : undefined,
+        },
+        createWorkspace,
+    });
 }
 function cmdLint(args) {
     const pathArg = args._[0] ?? '.';

package/dist/cli/format-cmd.d.ts

@@ -0,0 +1,28 @@
+/**
+ * `vmz format` — workspace surfaces (JS/TS + Rust) + `.vmz` authoring formatter.
+ */
+export type FormatCommandOptions = {
+    project: string;
+    outDir: string;
+    check: boolean;
+    overrides?: {
+        javascript?: boolean;
+        rust?: boolean;
+        vmz?: boolean;
+    };
+    createWorkspace: (opts: {
+        root: string;
+        outDir: string;
+    }) => {
+        format: (checkOnly?: boolean) => {
+            filesChecked: number;
+            filesWritten: number;
+            filesNeedWrite: number;
+            diagnostics?: Array<{
+                severity?: string;
+            }>;
+        };
+        dispose: () => void;
+    };
+};
+export declare function runFormatCommand(opts: FormatCommandOptions): Promise<number>;

package/dist/cli/format-cmd.js

@@ -0,0 +1,65 @@
+/**
+ * `vmz format` — workspace surfaces (JS/TS + Rust) + `.vmz` authoring formatter.
+ */
+import { loadNative } from '../workspace/public-api.js';
+import { loadVmzConfig } from '../workspace/plugin-host.js';
+import { log } from '../workspace/log.js';
+import { resolveFormatConfig } from './format-config.js';
+export async function runFormatCommand(opts) {
+    const { project, outDir, check, createWorkspace } = opts;
+    const { format: formatConfig } = await loadVmzConfig(project);
+    const resolved = resolveFormatConfig(project, formatConfig);
+    if (opts.overrides?.javascript !== undefined)
+        resolved.javascript = opts.overrides.javascript;
+    if (opts.overrides?.rust !== undefined)
+        resolved.rust = opts.overrides.rust;
+    if (opts.overrides?.vmz !== undefined)
+        resolved.vmz = opts.overrides.vmz;
+    const native = loadNative();
+    let exit = 0;
+    if (resolved.javascript || resolved.rust) {
+        const report = native.formatWorkspaceRun({
+            cwd: project,
+            check,
+            includes: resolved.includes,
+            excludes: resolved.excludes,
+            rust: resolved.rust,
+            javascript: resolved.javascript,
+            styleConfig: resolved.style,
+        });
+        if (report.errors.length > 0) {
+            for (const message of report.errors) {
+                log.error(message);
+            }
+            exit = 1;
+        }
+        else if (check && report.formatted === 0 && report.unchanged > 0) {
+            log.info(`workspace format: no changes needed (${report.unchanged} file(s) checked)`);
+        }
+        else if (!check) {
+            log.info(`workspace format: ${report.formatted} file(s) updated, ${report.unchanged} unchanged`);
+        }
+    }
+    if (resolved.vmz) {
+        log.info(`format .vmz ${project}${check ? ' --check' : ''}`);
+        const ws = createWorkspace({ root: project, outDir });
+        try {
+            const report = ws.format(check);
+            const errors = log.diagnostics(report.diagnostics ?? []);
+            if (check) {
+                log.info(`checked ${report.filesChecked} .vmz file(s); ${report.filesNeedWrite} need write`);
+                if (report.filesNeedWrite > 0)
+                    exit = 1;
+            }
+            else {
+                log.info(`formatted ${report.filesWritten}/${report.filesChecked} .vmz file(s)`);
+            }
+            if (errors)
+                exit = 1;
+        }
+        finally {
+            ws.dispose();
+        }
+    }
+    return exit;
+}

package/dist/cli/format-config.d.ts

@@ -0,0 +1,16 @@
+/**
+ * `vmz.config` `format` resolution for `vmz format`.
+ */
+import type { VmzFormatConfig } from '@vmz/plugin';
+export type ResolvedFormatOptions = {
+    includes?: string[];
+    excludes: string[];
+    rust: boolean;
+    javascript: boolean;
+    vmz: boolean;
+    style: string;
+};
+/** VMZ hybrid monorepo — JS/TS surfaces only, never whole-repo walk. */
+export declare const VMZ_FRAMEWORK_INCLUDES: readonly ["scripts/**", "packages/runtimes/**", "packages/examples/**", "packages/editors/**", "packages/ui/**", "packages/plugins/**", "packages/content/**", "packages/homepage/**", "package.json", "biome.json", "vmz.config.ts", "nifty.config.ts"];
+/** Merge `vmz.config` `format` with framework monorepo defaults. */
+export declare function resolveFormatConfig(projectRoot: string, format?: VmzFormatConfig): ResolvedFormatOptions;

package/dist/cli/format-config.js

@@ -0,0 +1,38 @@
+/**
+ * `vmz.config` `format` resolution for `vmz format`.
+ */
+import { existsSync } from 'node:fs';
+import path from 'node:path';
+/** VMZ hybrid monorepo — JS/TS surfaces only, never whole-repo walk. */
+export const VMZ_FRAMEWORK_INCLUDES = [
+    'scripts/**',
+    'packages/runtimes/**',
+    'packages/examples/**',
+    'packages/editors/**',
+    'packages/ui/**',
+    'packages/plugins/**',
+    'packages/content/**',
+    'packages/homepage/**',
+    'package.json',
+    'biome.json',
+    'vmz.config.ts',
+    'nifty.config.ts',
+];
+const DEFAULT_EXCLUDES = ['**/fixtures/**'];
+function isFrameworkMonorepoRoot(projectRoot) {
+    return existsSync(path.join(projectRoot, 'packages', 'runtimes'));
+}
+/** Merge `vmz.config` `format` with framework monorepo defaults. */
+export function resolveFormatConfig(projectRoot, format) {
+    const frameworkRoot = isFrameworkMonorepoRoot(projectRoot);
+    const hasCargo = existsSync(path.join(projectRoot, 'Cargo.toml'));
+    const hasFormatSection = format !== undefined;
+    return {
+        includes: format?.includes ?? (frameworkRoot ? [...VMZ_FRAMEWORK_INCLUDES] : undefined),
+        excludes: [...DEFAULT_EXCLUDES, ...(format?.excludes ?? [])],
+        rust: format?.rust ?? (hasCargo && (frameworkRoot || hasFormatSection)),
+        javascript: format?.javascript ?? (frameworkRoot || hasFormatSection),
+        vmz: format?.vmz ?? true,
+        style: format?.style ?? 'biome.json',
+    };
+}

package/dist/workspace/plugin-host.d.ts

@@ -17,6 +17,7 @@ export declare function importMaybeTs(full: any): Promise<any>;
  *   engines: import('@vmz/plugin').VmzEngines,
  *   delivery: import('@vmz/plugin').DeliveryAuthoring | null,
  *   application: { id?: string } | null,
+ *   format: import('@vmz/plugin').VmzFormatConfig | null,
  *   path: string | null,
  *   pluginPath: string | null,
  * }>}
@@ -26,6 +27,7 @@ export declare function loadVmzConfig(project: any): Promise<{
     engines: {};
     delivery: any;
     application: any;
+    format: any;
     path: any;
     pluginPath: any;
 }>;

package/dist/workspace/plugin-host.js

@@ -36,6 +36,7 @@ export async function importMaybeTs(full) {
  *   engines: import('@vmz/plugin').VmzEngines,
  *   delivery: import('@vmz/plugin').DeliveryAuthoring | null,
  *   application: { id?: string } | null,
+ *   format: import('@vmz/plugin').VmzFormatConfig | null,
  *   path: string | null,
  *   pluginPath: string | null,
  * }>}
@@ -49,6 +50,8 @@ export async function loadVmzConfig(project) {
     let delivery = null;
     /** @type {{ id?: string } | null} */
     let application = null;
+    /** @type {import('@vmz/plugin').VmzFormatConfig | null} */
+    let format = null;
     /** @type {string | null} */
     let configPath = null;
     /** @type {string | null} */
@@ -67,6 +70,9 @@ export async function loadVmzConfig(project) {
         if (cfg?.application && typeof cfg.application === 'object') {
             application = cfg.application;
         }
+        if (cfg?.format && typeof cfg.format === 'object') {
+            format = cfg.format;
+        }
         for (const entry of raw) {
             plugins.push(await resolvePluginEntry(project, entry));
         }
@@ -80,7 +86,7 @@ export async function loadVmzConfig(project) {
         plugins.push(await resolvePluginEntry(project, full));
         break;
     }
-    return { plugins, engines, delivery, application, path: configPath, pluginPath };
+    return { plugins, engines, delivery, application, format, path: configPath, pluginPath };
 }
 /**
  * @param {string} project

package/locales/en-US/cli.json

@@ -5,7 +5,10 @@
     "cli.cmd.build": "Build project via Workspace",
     "cli.cmd.serve": "Serve dist (optional --build)",
     "cli.cmd.dev": "Rebuild session",
-    "cli.cmd.format": "Format .vmz via N-API",
+    "cli.cmd.format": "Format workspace surfaces and .vmz via vmz.config format",
+    "cli.opt.format-no-javascript": "Skip JS/TS workspace format",
+    "cli.opt.format-no-rust": "Skip cargo fmt",
+    "cli.opt.format-no-vmz": "Skip .vmz author format",
     "cli.cmd.lint": "Lint (= check) via N-API",
     "cli.cmd.test": "Native test discover / report",
     "cli.cmd.document": "Project /documents domain",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vmz/vmz",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "type": "module",
   "description": "VMZ Node toolchain — N-API workspace session + CLI (publish name @vmz/vmz)",
   "license": "MIT",
@@ -48,16 +48,16 @@
     }
   },
   "dependencies": {
-    "@vmz/commander": "0.2.1",
-    "@vmz/core": "0.2.1",
-    "@vmz/diagnostic": "0.2.1",
-    "@vmz/plugin": "0.2.1",
-    "@vmz/protocol": "0.2.1",
+    "@vmz/commander": "0.2.2",
+    "@vmz/core": "0.2.2",
+    "@vmz/diagnostic": "0.2.2",
+    "@vmz/plugin": "0.2.2",
+    "@vmz/protocol": "0.2.2",
     "jiti": "^2.6.1"
   },
   "peerDependencies": {
-    "@vmz/plugin-markdown-it": "0.2.1",
-    "@vmz/test": "0.2.1",
+    "@vmz/plugin-markdown-it": "0.2.2",
+    "@vmz/test": "0.2.2",
     "typescript": "^5.8.3"
   },
   "peerDependenciesMeta": {
@@ -92,12 +92,12 @@
     "cli"
   ],
   "optionalDependencies": {
-    "@vmz/vmz-win32-x64": "0.2.1",
-    "@vmz/vmz-win32-arm64": "0.2.1",
-    "@vmz/vmz-darwin-x64": "0.2.1",
-    "@vmz/vmz-darwin-arm64": "0.2.1",
-    "@vmz/vmz-linux-x64": "0.2.1",
-    "@vmz/vmz-linux-arm64": "0.2.1"
+    "@vmz/vmz-win32-x64": "0.2.2",
+    "@vmz/vmz-win32-arm64": "0.2.2",
+    "@vmz/vmz-darwin-x64": "0.2.2",
+    "@vmz/vmz-darwin-arm64": "0.2.2",
+    "@vmz/vmz-linux-x64": "0.2.2",
+    "@vmz/vmz-linux-arm64": "0.2.2"
   },
   "publishConfig": {
     "access": "public"