@oml/cli 0.12.0 → 0.14.0

package/out/commands/reason.js

@@ -1,60 +1,64 @@
 // Copyright (c) 2026 Modelware. All rights reserved.
-import { createOmlServices } from '@oml/language';
 import chalk from 'chalk';
-import { NodeFileSystem } from 'langium/node';
-import { URI } from 'langium';
-import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
-import { buildWorkspaceDocuments, collectWorkspaceOntologyEntries, normalizeFormatExtension, OntologyInconsistencyError, reasonWorkspaceOntologies } from '../backend/reasoned-output.js';
 import { failCli } from '../cli-error.js';
 import { formatDuration } from '../util.js';
-import { compileAction, resolveCompileOutputRoot, resolveCompileWorkspaceRoot } from './compile.js';
+import { restPost } from './server/rest.js';
+import { formatLintSummary, printLintDiagnostics } from './lint.js';
 export const reasonAction = async (opts) => {
-    const workspaceRoot = resolveCompileWorkspaceRoot(opts.workspace);
-    const outputRoot = resolveCompileOutputRoot(workspaceRoot, opts.owl);
-    const format = normalizeFormatExtension(opts.format);
-    if (opts.only && opts.clean) {
-        failCli(chalk.red('Cannot combine --only with --clean for reason.'));
-    }
-    if (!opts.only) {
-        await compileAction({
-            workspace: workspaceRoot,
-            owl: outputRoot,
-            format,
-            clean: opts.clean,
-            pretty: opts.pretty
-        });
-    }
-    const outputStat = await fs.stat(outputRoot).catch(() => undefined);
-    if (!outputStat || !outputStat.isDirectory()) {
-        failCli(chalk.red(`OWL output folder does not exist: ${outputRoot}`));
-    }
     const startedAt = Date.now();
-    const servicesBundle = createOmlServices(NodeFileSystem);
-    await servicesBundle.Oml.shared.workspace.WorkspaceManager.initializeWorkspace([
-        { uri: URI.file(workspaceRoot).toString(), name: path.basename(workspaceRoot) }
-    ]);
-    const documents = await buildWorkspaceDocuments(servicesBundle.Oml, workspaceRoot, true);
-    const entries = collectWorkspaceOntologyEntries(documents, outputRoot, format);
-    let result;
-    try {
-        result = await reasonWorkspaceOntologies(entries, {
-            outputRoot,
-            format,
-            pretty: opts.pretty ?? false,
-            explanations: opts.explanations ?? true,
-            uniqueNamesAssumption: opts.uniqueNamesAssumption ?? true,
-            checkOnly: opts.checkOnly ?? false,
-            profile: opts.profile ?? false,
-        });
+    const result = await restPost('/v0/reason', opts, opts.authToken);
+    if (result.validate?.lint) {
+        const lint = result.validate.lint;
+        if (lint.filesChecked <= 0) {
+            console.log(chalk.yellow('No .oml files found in server workspace.'));
+        }
+        else {
+            printLintDiagnostics(lint);
+            const lintElapsedMs = typeof lint.elapsedMs === 'number' && Number.isFinite(lint.elapsedMs) && lint.elapsedMs >= 0
+                ? lint.elapsedMs
+                : Date.now() - startedAt;
+            const lintSummary = formatLintSummary(lint, lintElapsedMs);
+            if (lint.errors > 0) {
+                failCli(chalk.red(lintSummary));
+            }
+            if (lint.warnings > 0) {
+                failCli(chalk.yellow(lintSummary));
+            }
+            console.log(chalk.green(lintSummary));
+        }
     }
-    catch (error) {
-        if (error instanceof OntologyInconsistencyError) {
-            failCli(chalk.red(error.message));
+    if (result.validate && result.validate.success) {
+        if (result.validate.filesChecked === 0) {
+            console.log(chalk.yellow('No markdown/table-editor targets found in server workspace.'));
         }
-        throw error;
+        else {
+            const validateElapsedMs = typeof result.validate.elapsedMs === 'number'
+                && Number.isFinite(result.validate.elapsedMs)
+                && result.validate.elapsedMs >= 0
+                ? result.validate.elapsedMs
+                : Date.now() - startedAt;
+            console.log(chalk.green(`validate: ${result.validate.filesChecked} item(s) checked. [${formatDuration(validateElapsedMs)}]`));
+        }
+    }
+    if (!result.success) {
+        for (const item of result.failed) {
+            const modelUri = String(item.modelUri ?? '').trim();
+            console.log(chalk.red(`reason failed: ${modelUri || '<workspace>'}: ${item.error}`));
+        }
+        for (const item of result.inconsistent) {
+            const warnings = item.validationWarnings.length > 0 ? ` warnings=${item.validationWarnings.join('; ')}` : '';
+            console.log(chalk.red(`reason inconsistency detected: ${item.modelUri}.${warnings}`));
+        }
+        failCli(chalk.red(result.validate?.error?.trim() || 'reason failed.'));
+    }
+    if (result.ontologiesReasoned === 0) {
+        console.log(chalk.yellow(`No .oml files found under ${path.resolve('.')}.`));
+        return;
     }
-    const action = opts.checkOnly ? 'checked in' : 'generated in';
-    console.log(chalk.green(`reason: ${result.ontologiesReasoned} ontology file(s) ${action} ${path.relative(process.cwd(), outputRoot) || outputRoot} [${formatDuration(Date.now() - startedAt)}]`));
+    const reasonElapsedMs = typeof result.elapsedMs === 'number' && Number.isFinite(result.elapsedMs) && result.elapsedMs >= 0
+        ? result.elapsedMs
+        : Date.now() - startedAt;
+    console.log(chalk.green(`reason: ${result.ontologiesReasoned} ontology file(s) checked [${formatDuration(reasonElapsedMs)}]`));
 };
 //# sourceMappingURL=reason.js.map

package/out/commands/reason.js.map

@@ -1 +1 @@
-{"version":3,"file":"reason.js","sourceRoot":"","sources":["../../src/commands/reason.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reason.js","sourceRoot":"","sources":["../../src/commands/reason.ts"],"names":[],"mappings":"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"}

package/out/commands/render.d.ts

@@ -1,15 +1,7 @@
 export type RenderOptions = {
-    workspace?: string;
     md: string;
     web: string;
-    owl?: string;
-    format?: string;
     context?: string;
-    clean?: boolean;
-    only?: boolean;
-    pretty?: boolean;
-    uniqueNamesAssumption?: boolean;
-    explanations?: boolean;
-    profile?: boolean;
+    authToken?: string;
 };
 export declare const renderAction: (opts: RenderOptions) => Promise<void>;