@galaxy-tool-util/cli 0.2.0 → 1.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bin/gxwf.js +51 -19
- package/dist/bin/gxwf.js.map +1 -1
- package/dist/commands/add.js +2 -2
- package/dist/commands/add.js.map +1 -1
- package/dist/commands/clean-tree.d.ts +3 -17
- package/dist/commands/clean-tree.d.ts.map +1 -1
- package/dist/commands/clean-tree.js +30 -29
- package/dist/commands/clean-tree.js.map +1 -1
- package/dist/commands/clean.d.ts +3 -0
- package/dist/commands/clean.d.ts.map +1 -1
- package/dist/commands/clean.js +12 -2
- package/dist/commands/clean.js.map +1 -1
- package/dist/commands/clear.js +4 -4
- package/dist/commands/clear.js.map +1 -1
- package/dist/commands/convert-tree.d.ts +2 -1
- package/dist/commands/convert-tree.d.ts.map +1 -1
- package/dist/commands/convert-tree.js +23 -7
- package/dist/commands/convert-tree.js.map +1 -1
- package/dist/commands/convert.d.ts +2 -1
- package/dist/commands/convert.d.ts.map +1 -1
- package/dist/commands/convert.js +36 -4
- package/dist/commands/convert.js.map +1 -1
- package/dist/commands/info.d.ts.map +1 -1
- package/dist/commands/info.js +5 -4
- package/dist/commands/info.js.map +1 -1
- package/dist/commands/lint-tree.d.ts +3 -19
- package/dist/commands/lint-tree.d.ts.map +1 -1
- package/dist/commands/lint-tree.js +46 -58
- package/dist/commands/lint-tree.js.map +1 -1
- package/dist/commands/lint.d.ts +8 -4
- package/dist/commands/lint.d.ts.map +1 -1
- package/dist/commands/lint.js +61 -13
- package/dist/commands/lint.js.map +1 -1
- package/dist/commands/list.js +3 -3
- package/dist/commands/list.js.map +1 -1
- package/dist/commands/mermaid.d.ts +6 -0
- package/dist/commands/mermaid.d.ts.map +1 -0
- package/dist/commands/mermaid.js +22 -0
- package/dist/commands/mermaid.js.map +1 -0
- package/dist/commands/populate-workflow.js +2 -2
- package/dist/commands/populate-workflow.js.map +1 -1
- package/dist/commands/render-results.d.ts +3 -3
- package/dist/commands/render-results.d.ts.map +1 -1
- package/dist/commands/render-results.js +8 -4
- package/dist/commands/render-results.js.map +1 -1
- package/dist/commands/report-output.d.ts +34 -0
- package/dist/commands/report-output.d.ts.map +1 -0
- package/dist/commands/report-output.js +70 -0
- package/dist/commands/report-output.js.map +1 -0
- package/dist/commands/resolve-tool.d.ts +2 -1
- package/dist/commands/resolve-tool.d.ts.map +1 -1
- package/dist/commands/resolve-tool.js +1 -1
- package/dist/commands/resolve-tool.js.map +1 -1
- package/dist/commands/roundtrip-tree.d.ts +3 -1
- package/dist/commands/roundtrip-tree.d.ts.map +1 -1
- package/dist/commands/roundtrip-tree.js +67 -5
- package/dist/commands/roundtrip-tree.js.map +1 -1
- package/dist/commands/roundtrip.d.ts +2 -1
- package/dist/commands/roundtrip.d.ts.map +1 -1
- package/dist/commands/roundtrip.js +30 -8
- package/dist/commands/roundtrip.js.map +1 -1
- package/dist/commands/schema.js +2 -2
- package/dist/commands/schema.js.map +1 -1
- package/dist/commands/strict-options.d.ts +22 -0
- package/dist/commands/strict-options.d.ts.map +1 -0
- package/dist/commands/strict-options.js +18 -0
- package/dist/commands/strict-options.js.map +1 -0
- package/dist/commands/validate-tests-tree.d.ts +36 -0
- package/dist/commands/validate-tests-tree.d.ts.map +1 -0
- package/dist/commands/validate-tests-tree.js +191 -0
- package/dist/commands/validate-tests-tree.js.map +1 -0
- package/dist/commands/validate-tests.d.ts +21 -0
- package/dist/commands/validate-tests.d.ts.map +1 -0
- package/dist/commands/validate-tests.js +83 -0
- package/dist/commands/validate-tests.js.map +1 -0
- package/dist/commands/validate-tree.d.ts +3 -20
- package/dist/commands/validate-tree.d.ts.map +1 -1
- package/dist/commands/validate-tree.js +53 -47
- package/dist/commands/validate-tree.js.map +1 -1
- package/dist/commands/validate-workflow-json-schema.d.ts +8 -2
- package/dist/commands/validate-workflow-json-schema.d.ts.map +1 -1
- package/dist/commands/validate-workflow-json-schema.js +104 -58
- package/dist/commands/validate-workflow-json-schema.js.map +1 -1
- package/dist/commands/validate-workflow.d.ts +17 -10
- package/dist/commands/validate-workflow.d.ts.map +1 -1
- package/dist/commands/validate-workflow.js +185 -59
- package/dist/commands/validate-workflow.js.map +1 -1
- package/dist/commands/workflow-io.d.ts +2 -11
- package/dist/commands/workflow-io.d.ts.map +1 -1
- package/dist/commands/workflow-io.js +7 -16
- package/dist/commands/workflow-io.js.map +1 -1
- package/dist/index.d.ts +15 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +12 -0
- package/dist/index.js.map +1 -1
- package/dist/workflow/_templates-bundled.d.ts +2 -0
- package/dist/workflow/_templates-bundled.d.ts.map +1 -0
- package/dist/workflow/_templates-bundled.js +324 -0
- package/dist/workflow/_templates-bundled.js.map +1 -0
- package/dist/workflow/report-templates.d.ts +13 -0
- package/dist/workflow/report-templates.d.ts.map +1 -0
- package/dist/workflow/report-templates.js +91 -0
- package/dist/workflow/report-templates.js.map +1 -0
- package/package.json +7 -5
package/dist/commands/convert.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* `gxwf convert` — convert between native (.ga) and format2 (.gxwf.yml) formats.
|
|
3
3
|
*/
|
|
4
|
-
import {
|
|
5
|
-
import { toFormat2, toFormat2Stateful, toNative, toNativeStateful, } from "@galaxy-tool-util/schema";
|
|
4
|
+
import { makeNodeToolCache } from "@galaxy-tool-util/core/node";
|
|
5
|
+
import { toFormat2, toFormat2Stateful, toNative, toNativeStateful, checkStrictEncoding, checkStrictStructure, } from "@galaxy-tool-util/schema";
|
|
6
6
|
import { dirname } from "node:path";
|
|
7
7
|
import { loadToolInputsForWorkflow } from "./stateful-tool-inputs.js";
|
|
8
8
|
import { createDefaultResolver } from "./url-resolver.js";
|
|
9
|
+
import { resolveStrictOptions } from "./strict-options.js";
|
|
9
10
|
import { readWorkflowFile, resolveFormat, serializeWorkflow, writeWorkflowOutput, } from "./workflow-io.js";
|
|
10
11
|
export async function runConvert(filePath, opts) {
|
|
11
12
|
const data = await readWorkflowFile(filePath);
|
|
@@ -13,6 +14,28 @@ export async function runConvert(filePath, opts) {
|
|
|
13
14
|
return;
|
|
14
15
|
const sourceFormat = resolveFormat(data, opts.format);
|
|
15
16
|
const targetFormat = resolveTargetFormat(sourceFormat, opts.to);
|
|
17
|
+
const strict = resolveStrictOptions(opts);
|
|
18
|
+
// Pre-conversion strict checks on input
|
|
19
|
+
if (strict.strictEncoding) {
|
|
20
|
+
const encErrors = checkStrictEncoding(data, sourceFormat);
|
|
21
|
+
if (encErrors.length > 0) {
|
|
22
|
+
console.error("Encoding errors:");
|
|
23
|
+
for (const e of encErrors)
|
|
24
|
+
console.error(` ${e}`);
|
|
25
|
+
process.exitCode = 2;
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
if (strict.strictStructure) {
|
|
30
|
+
const structErrors = checkStrictStructure(data, sourceFormat);
|
|
31
|
+
if (structErrors.length > 0) {
|
|
32
|
+
console.error("Structure errors (strict):");
|
|
33
|
+
for (const e of structErrors)
|
|
34
|
+
console.error(` ${e}`);
|
|
35
|
+
process.exitCode = 2;
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
16
39
|
if (sourceFormat === targetFormat) {
|
|
17
40
|
console.error(`Source and target formats are both ${sourceFormat}. ` +
|
|
18
41
|
`Use --to to specify the target format.`);
|
|
@@ -22,9 +45,9 @@ export async function runConvert(filePath, opts) {
|
|
|
22
45
|
let result;
|
|
23
46
|
let stepStatuses = null;
|
|
24
47
|
if (opts.stateful) {
|
|
25
|
-
const cache =
|
|
48
|
+
const cache = makeNodeToolCache({ cacheDir: opts.cacheDir });
|
|
26
49
|
await cache.index.load();
|
|
27
|
-
if (cache.index.listAll().length === 0) {
|
|
50
|
+
if ((await cache.index.listAll()).length === 0) {
|
|
28
51
|
console.warn("Tool cache is empty — stateful conversion will fall back for every step");
|
|
29
52
|
}
|
|
30
53
|
const expansionOpts = {
|
|
@@ -63,6 +86,15 @@ export async function runConvert(filePath, opts) {
|
|
|
63
86
|
await writeWorkflowOutput(output, opts.output, "Converted workflow");
|
|
64
87
|
if (stepStatuses !== null) {
|
|
65
88
|
reportStepStatuses(stepStatuses);
|
|
89
|
+
// --strict-state: require all steps to convert successfully
|
|
90
|
+
if (strict.strictState) {
|
|
91
|
+
const hasFailures = stepStatuses.some((s) => !s.converted);
|
|
92
|
+
if (hasFailures) {
|
|
93
|
+
console.error("Strict state: all steps must convert successfully");
|
|
94
|
+
process.exitCode = 2;
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
66
98
|
}
|
|
67
99
|
}
|
|
68
100
|
function reportStepStatuses(statuses) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../src/commands/convert.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../src/commands/convert.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"info.d.ts","sourceRoot":"","sources":["../../src/commands/info.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"info.d.ts","sourceRoot":"","sources":["../../src/commands/info.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAsB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CA+B9E"}
|
package/dist/commands/info.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { cacheKey } from "@galaxy-tool-util/core";
|
|
2
|
+
import { makeNodeToolCache } from "@galaxy-tool-util/core/node";
|
|
2
3
|
export async function runInfo(toolId, opts) {
|
|
3
|
-
const cache =
|
|
4
|
+
const cache = makeNodeToolCache({ cacheDir: opts.cacheDir });
|
|
4
5
|
await cache.index.load();
|
|
5
6
|
const coords = cache.resolveToolCoordinates(toolId, opts.version);
|
|
6
7
|
if (coords.version === null) {
|
|
@@ -8,14 +9,14 @@ export async function runInfo(toolId, opts) {
|
|
|
8
9
|
process.exitCode = 1;
|
|
9
10
|
return;
|
|
10
11
|
}
|
|
11
|
-
const key = cacheKey(coords.toolshedUrl, coords.trsToolId, coords.version);
|
|
12
|
+
const key = await cacheKey(coords.toolshedUrl, coords.trsToolId, coords.version);
|
|
12
13
|
const tool = await cache.loadCached(key);
|
|
13
14
|
if (tool === null) {
|
|
14
15
|
console.error(`Tool not found in cache: ${toolId}`);
|
|
15
16
|
process.exitCode = 1;
|
|
16
17
|
return;
|
|
17
18
|
}
|
|
18
|
-
const indexEntry = cache.index.listAll().find((e) => e.cache_key === key);
|
|
19
|
+
const indexEntry = (await cache.index.listAll()).find((e) => e.cache_key === key);
|
|
19
20
|
console.log(`Name: ${tool.name}`);
|
|
20
21
|
console.log(`ID: ${tool.id}`);
|
|
21
22
|
console.log(`Version: ${tool.version ?? "unknown"}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"info.js","sourceRoot":"","sources":["../../src/commands/info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"info.js","sourceRoot":"","sources":["../../src/commands/info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAOhE,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,MAAc,EAAE,IAAiB;IAC7D,MAAM,KAAK,GAAG,iBAAiB,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7D,MAAM,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IACzB,MAAM,MAAM,GAAG,KAAK,CAAC,sBAAsB,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAClE,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;QAC5B,OAAO,CAAC,KAAK,CAAC,kCAAkC,MAAM,EAAE,CAAC,CAAC;QAC1D,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,OAAO;IACT,CAAC;IACD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACjF,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAClB,OAAO,CAAC,KAAK,CAAC,4BAA4B,MAAM,EAAE,CAAC,CAAC;QACpD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,OAAO;IACT,CAAC;IAED,MAAM,UAAU,GAAG,CAAC,MAAM,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,GAAG,CAAC,CAAC;IAElF,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACzC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,OAAO,IAAI,SAAS,EAAE,CAAC,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACnD,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,OAAO,IAAI,MAAM,EAAE,CAAC,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,OAAO,IAAI,MAAM,EAAE,CAAC,CAAC;IACtD,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,CAAC,gBAAgB,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QACjD,OAAO,CAAC,GAAG,CAAC,gBAAgB,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC;IACtD,CAAC;AACH,CAAC"}
|
|
@@ -1,27 +1,11 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
import { type
|
|
3
|
-
export interface LintTreeOptions {
|
|
1
|
+
import { type StrictOptions } from "./strict-options.js";
|
|
2
|
+
import { type ReportOutputOptions } from "./report-output.js";
|
|
3
|
+
export interface LintTreeOptions extends StrictOptions, ReportOutputOptions {
|
|
4
4
|
format?: string;
|
|
5
5
|
skipBestPractices?: boolean;
|
|
6
6
|
skipStateValidation?: boolean;
|
|
7
7
|
cacheDir?: string;
|
|
8
8
|
json?: boolean;
|
|
9
9
|
}
|
|
10
|
-
export interface WorkflowLintResult {
|
|
11
|
-
relativePath: string;
|
|
12
|
-
report: LintReport;
|
|
13
|
-
}
|
|
14
|
-
export interface LintTreeReport {
|
|
15
|
-
root: string;
|
|
16
|
-
results: (WorkflowLintResult | {
|
|
17
|
-
relativePath: string;
|
|
18
|
-
error: string;
|
|
19
|
-
})[];
|
|
20
|
-
summary: TreeSummary & {
|
|
21
|
-
lintErrors: number;
|
|
22
|
-
lintWarnings: number;
|
|
23
|
-
stateFail: number;
|
|
24
|
-
};
|
|
25
|
-
}
|
|
26
10
|
export declare function runLintTree(dir: string, opts: LintTreeOptions): Promise<void>;
|
|
27
11
|
//# sourceMappingURL=lint-tree.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint-tree.d.ts","sourceRoot":"","sources":["../../src/commands/lint-tree.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lint-tree.d.ts","sourceRoot":"","sources":["../../src/commands/lint-tree.ts"],"names":[],"mappings":"AAcA,OAAO,EAAwB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAG/E,OAAO,EAAsC,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAElG,MAAM,WAAW,eAAgB,SAAQ,aAAa,EAAE,mBAAmB;IACzE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAUD,wBAAsB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAyEnF"}
|
|
@@ -1,18 +1,25 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
*/
|
|
4
|
-
import { ToolCache } from "@galaxy-tool-util/core";
|
|
1
|
+
import { makeNodeToolCache } from "@galaxy-tool-util/core/node";
|
|
2
|
+
import { buildLintWorkflowResult, buildLintTreeReport as schemaBuildLintTreeReport, } from "@galaxy-tool-util/schema";
|
|
5
3
|
import { resolveFormat } from "./workflow-io.js";
|
|
4
|
+
import { resolveStrictOptions } from "./strict-options.js";
|
|
6
5
|
import { lintWorkflowReport } from "./lint.js";
|
|
7
|
-
import { collectTree
|
|
6
|
+
import { collectTree } from "./tree.js";
|
|
7
|
+
import { writeReportOutput, writeReportHtml } from "./report-output.js";
|
|
8
|
+
/** Map internal LintReport to schema's flat LintWorkflowResult fields. */
|
|
9
|
+
function toLintWorkflowResult(relativePath, lr) {
|
|
10
|
+
const lint_errors = lr.structural.error_count + (lr.bestPractices?.error_count ?? 0);
|
|
11
|
+
const lint_warnings = lr.structural.warn_count + (lr.bestPractices?.warn_count ?? 0);
|
|
12
|
+
const stepResults = lr.stateValidation ?? [];
|
|
13
|
+
return buildLintWorkflowResult(relativePath, lint_errors, lint_warnings, stepResults);
|
|
14
|
+
}
|
|
8
15
|
export async function runLintTree(dir, opts) {
|
|
9
16
|
// Load tool cache once for all files
|
|
10
17
|
let cache;
|
|
11
18
|
if (!opts.skipStateValidation) {
|
|
12
19
|
try {
|
|
13
|
-
cache =
|
|
20
|
+
cache = makeNodeToolCache({ cacheDir: opts.cacheDir });
|
|
14
21
|
await cache.index.load();
|
|
15
|
-
if (cache.index.listAll().length === 0) {
|
|
22
|
+
if ((await cache.index.listAll()).length === 0) {
|
|
16
23
|
console.warn("Tool cache is empty — skipping tool state validation for all files");
|
|
17
24
|
cache = undefined;
|
|
18
25
|
}
|
|
@@ -22,94 +29,75 @@ export async function runLintTree(dir, opts) {
|
|
|
22
29
|
console.warn(`Failed to load tool cache: ${msg}`);
|
|
23
30
|
}
|
|
24
31
|
}
|
|
32
|
+
const strict = resolveStrictOptions(opts);
|
|
25
33
|
const treeResult = await collectTree(dir, async (info, data) => {
|
|
26
34
|
const format = resolveFormat(data, opts.format);
|
|
27
|
-
const
|
|
35
|
+
const lr = await lintWorkflowReport(info.path, data, format, {
|
|
28
36
|
skipBestPractices: opts.skipBestPractices,
|
|
29
37
|
skipStateValidation: opts.skipStateValidation,
|
|
30
38
|
cache,
|
|
39
|
+
strict,
|
|
31
40
|
});
|
|
32
|
-
return
|
|
41
|
+
return toLintWorkflowResult(info.relativePath, lr);
|
|
33
42
|
});
|
|
34
|
-
const report =
|
|
43
|
+
const report = buildReport(treeResult);
|
|
44
|
+
await writeReportOutput("lint_tree.md.j2", report, { reportMarkdown: opts.reportMarkdown });
|
|
45
|
+
await writeReportHtml("lint-tree", report, opts.reportHtml);
|
|
35
46
|
if (opts.json) {
|
|
36
47
|
console.log(JSON.stringify(report, null, 2));
|
|
37
48
|
process.exitCode = computeLintExitCode(report);
|
|
38
49
|
return;
|
|
39
50
|
}
|
|
40
51
|
// Text output
|
|
41
|
-
for (const
|
|
42
|
-
if (
|
|
43
|
-
console.error(` ${
|
|
52
|
+
for (const wf of report.workflows) {
|
|
53
|
+
if (wf.error) {
|
|
54
|
+
console.error(` ${wf.path}: ERROR (${wf.error})`);
|
|
44
55
|
continue;
|
|
45
56
|
}
|
|
46
|
-
if (
|
|
47
|
-
console.warn(` ${
|
|
57
|
+
if (wf.skipped_reason) {
|
|
58
|
+
console.warn(` ${wf.path}: SKIPPED (${wf.skipped_reason})`);
|
|
48
59
|
continue;
|
|
49
60
|
}
|
|
50
|
-
const
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
if (errors > 0 || stateFails > 0) {
|
|
56
|
-
console.error(` ${r.relativePath}: ${errors} errors, ${warnings} warnings, ${stateFails} state failures`);
|
|
57
|
-
for (const e of lr.structural.errors)
|
|
58
|
-
console.error(` [structural] ${e}`);
|
|
59
|
-
if (lr.bestPractices) {
|
|
60
|
-
for (const e of lr.bestPractices.errors)
|
|
61
|
-
console.error(` [best-practices] ${e}`);
|
|
62
|
-
}
|
|
63
|
-
if (lr.stateValidation) {
|
|
64
|
-
for (const s of lr.stateValidation.filter((s) => s.status === "fail")) {
|
|
65
|
-
for (const err of s.errors)
|
|
66
|
-
console.error(` [state] Step ${s.stepLabel} (${s.toolId}): ${err}`);
|
|
67
|
-
}
|
|
68
|
-
}
|
|
61
|
+
const stateFails = wf.results.filter((s) => s.status === "fail").length;
|
|
62
|
+
if (wf.lint_errors > 0 || stateFails > 0) {
|
|
63
|
+
console.error(` ${wf.path}: ${wf.lint_errors} errors, ${wf.lint_warnings} warnings, ${stateFails} state failures`);
|
|
64
|
+
// Detailed error output would require the internal LintReport;
|
|
65
|
+
// for tree output we show the summary counts per workflow.
|
|
69
66
|
}
|
|
70
|
-
else if (
|
|
71
|
-
console.warn(` ${
|
|
67
|
+
else if (wf.lint_warnings > 0) {
|
|
68
|
+
console.warn(` ${wf.path}: ${wf.lint_warnings} warnings`);
|
|
72
69
|
}
|
|
73
70
|
else {
|
|
74
|
-
console.log(` ${
|
|
71
|
+
console.log(` ${wf.path}: OK`);
|
|
75
72
|
}
|
|
76
73
|
}
|
|
77
74
|
const s = report.summary;
|
|
78
|
-
|
|
75
|
+
const total = report.workflows.length;
|
|
76
|
+
console.log(`\nSummary: ${total} workflows | ${s.lint_errors} errors, ${s.lint_warnings} warnings, ${s.state_fail} state failures`);
|
|
79
77
|
process.exitCode = computeLintExitCode(report);
|
|
80
78
|
}
|
|
81
|
-
function
|
|
82
|
-
const
|
|
83
|
-
let lintErrors = 0;
|
|
84
|
-
let lintWarnings = 0;
|
|
85
|
-
let stateFail = 0;
|
|
79
|
+
function buildReport(treeResult) {
|
|
80
|
+
const workflows = [];
|
|
86
81
|
for (const o of treeResult.outcomes) {
|
|
87
82
|
if (o.error) {
|
|
88
|
-
|
|
83
|
+
workflows.push(buildLintWorkflowResult(o.info.relativePath, 0, 0, [], { error: o.error }));
|
|
89
84
|
continue;
|
|
90
85
|
}
|
|
91
86
|
if (o.skipped) {
|
|
92
|
-
|
|
87
|
+
workflows.push(buildLintWorkflowResult(o.info.relativePath, 0, 0, [], {
|
|
88
|
+
skipped_reason: o.skipReason ?? null,
|
|
89
|
+
}));
|
|
93
90
|
continue;
|
|
94
91
|
}
|
|
95
|
-
|
|
96
|
-
results.push(r);
|
|
97
|
-
lintErrors += r.report.structural.error_count + (r.report.bestPractices?.error_count ?? 0);
|
|
98
|
-
lintWarnings += r.report.structural.warn_count + (r.report.bestPractices?.warn_count ?? 0);
|
|
99
|
-
stateFail += r.report.stateValidation?.filter((s) => s.status === "fail").length ?? 0;
|
|
92
|
+
workflows.push(o.result);
|
|
100
93
|
}
|
|
101
|
-
|
|
102
|
-
return {
|
|
103
|
-
root: treeResult.root,
|
|
104
|
-
results,
|
|
105
|
-
summary: { ...wfSummary, lintErrors, lintWarnings, stateFail },
|
|
106
|
-
};
|
|
94
|
+
return schemaBuildLintTreeReport(treeResult.root, workflows);
|
|
107
95
|
}
|
|
108
96
|
function computeLintExitCode(report) {
|
|
109
97
|
const s = report.summary;
|
|
110
|
-
if (s.
|
|
98
|
+
if (s.lint_errors > 0 || s.state_fail > 0 || s.errors > 0)
|
|
111
99
|
return 2;
|
|
112
|
-
if (s.
|
|
100
|
+
if (s.lint_warnings > 0)
|
|
113
101
|
return 1;
|
|
114
102
|
return 0;
|
|
115
103
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint-tree.js","sourceRoot":"","sources":["../../src/commands/lint-tree.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lint-tree.js","sourceRoot":"","sources":["../../src/commands/lint-tree.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/lint.d.ts
CHANGED
|
@@ -2,26 +2,30 @@
|
|
|
2
2
|
* `gxwf lint` — unified lint combining structural checks, best practices,
|
|
3
3
|
* and tool state validation.
|
|
4
4
|
*/
|
|
5
|
-
import { ToolCache } from "@galaxy-tool-util/core";
|
|
6
|
-
import { type LintResult } from "@galaxy-tool-util/schema";
|
|
7
|
-
import { type
|
|
8
|
-
export interface LintOptions {
|
|
5
|
+
import type { ToolCache } from "@galaxy-tool-util/core";
|
|
6
|
+
import { type LintResult, type ValidationStepResult as StepValidationResult } from "@galaxy-tool-util/schema";
|
|
7
|
+
import { type StrictOptions, type ResolvedStrictOptions } from "./strict-options.js";
|
|
8
|
+
export interface LintOptions extends StrictOptions {
|
|
9
9
|
format?: string;
|
|
10
10
|
skipBestPractices?: boolean;
|
|
11
11
|
skipStateValidation?: boolean;
|
|
12
12
|
cacheDir?: string;
|
|
13
13
|
json?: boolean;
|
|
14
|
+
reportHtml?: string | boolean;
|
|
14
15
|
}
|
|
15
16
|
export interface LintReportOptions {
|
|
16
17
|
skipBestPractices?: boolean;
|
|
17
18
|
skipStateValidation?: boolean;
|
|
18
19
|
cache?: ToolCache;
|
|
20
|
+
strict?: ResolvedStrictOptions;
|
|
19
21
|
}
|
|
20
22
|
export interface LintReport {
|
|
21
23
|
structural: LintResult;
|
|
22
24
|
bestPractices: LintResult | null;
|
|
23
25
|
stateValidation: StepValidationResult[] | null;
|
|
24
26
|
stateSkipped: boolean;
|
|
27
|
+
encodingErrors: string[];
|
|
28
|
+
structureErrors: string[];
|
|
25
29
|
exitCode: number;
|
|
26
30
|
}
|
|
27
31
|
export declare function runLint(filePath: string, opts: LintOptions): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../src/commands/lint.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../src/commands/lint.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAQL,KAAK,UAAU,EAGf,KAAK,oBAAoB,IAAI,oBAAoB,EAClD,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,qBAAqB,EAC3B,MAAM,qBAAqB,CAAC;AAS7B,MAAM,WAAW,WAAY,SAAQ,aAAa;IAChD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,iBAAiB;IAChC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,MAAM,CAAC,EAAE,qBAAqB,CAAC;CAChC;AAED,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,UAAU,GAAG,IAAI,CAAC;IACjC,eAAe,EAAE,oBAAoB,EAAE,GAAG,IAAI,CAAC;IAC/C,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAaD,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CA4GhF;AAED,+EAA+E;AAC/E,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,UAAU,CAAC,CA8ErB"}
|
package/dist/commands/lint.js
CHANGED
|
@@ -1,14 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
* and tool state validation.
|
|
4
|
-
*/
|
|
5
|
-
import { ToolCache } from "@galaxy-tool-util/core";
|
|
6
|
-
import { lintWorkflow, lintBestPracticesNative, lintBestPracticesFormat2, } from "@galaxy-tool-util/schema";
|
|
1
|
+
import { makeNodeToolCache } from "@galaxy-tool-util/core/node";
|
|
2
|
+
import { lintWorkflow, lintBestPracticesNative, lintBestPracticesFormat2, checkStrictEncoding, checkStrictStructure, buildSingleLintReport, } from "@galaxy-tool-util/schema";
|
|
7
3
|
import { dirname } from "node:path";
|
|
8
4
|
import { renderStepResults } from "./render-results.js";
|
|
9
5
|
import { readWorkflowFile, resolveFormat } from "./workflow-io.js";
|
|
10
6
|
import { createDefaultResolver } from "./url-resolver.js";
|
|
11
|
-
import {
|
|
7
|
+
import { resolveStrictOptions, } from "./strict-options.js";
|
|
8
|
+
import { validateNativeSteps, validateFormat2Steps, decodeStructureErrors, detectEncodingErrors, } from "./validate-workflow.js";
|
|
9
|
+
import { writeReportHtml } from "./report-output.js";
|
|
12
10
|
function mergeLintResults(...results) {
|
|
13
11
|
const errors = [];
|
|
14
12
|
const warnings = [];
|
|
@@ -29,7 +27,7 @@ export async function runLint(filePath, opts) {
|
|
|
29
27
|
let cache;
|
|
30
28
|
if (!opts.skipStateValidation) {
|
|
31
29
|
try {
|
|
32
|
-
cache =
|
|
30
|
+
cache = makeNodeToolCache({ cacheDir: opts.cacheDir });
|
|
33
31
|
await cache.index.load();
|
|
34
32
|
}
|
|
35
33
|
catch (e) {
|
|
@@ -37,16 +35,45 @@ export async function runLint(filePath, opts) {
|
|
|
37
35
|
console.warn(`Failed to load tool cache: ${msg}`);
|
|
38
36
|
}
|
|
39
37
|
}
|
|
38
|
+
const strict = resolveStrictOptions(opts);
|
|
40
39
|
const report = await lintWorkflowReport(filePath, data, format, {
|
|
41
40
|
skipBestPractices: opts.skipBestPractices,
|
|
42
41
|
skipStateValidation: opts.skipStateValidation,
|
|
43
42
|
cache,
|
|
43
|
+
strict,
|
|
44
44
|
});
|
|
45
|
-
if (opts.json) {
|
|
46
|
-
|
|
45
|
+
if (opts.json || opts.reportHtml) {
|
|
46
|
+
const lintErrors = report.structural.error_count + (report.bestPractices?.error_count ?? 0);
|
|
47
|
+
const lintWarnings = report.structural.warn_count + (report.bestPractices?.warn_count ?? 0);
|
|
48
|
+
// Effect Schema decode for structure_errors
|
|
49
|
+
const structureErrors = decodeStructureErrors(data, format);
|
|
50
|
+
// Legacy encoding detection for encoding_errors
|
|
51
|
+
let encodingErrors = [];
|
|
52
|
+
if (cache && !opts.skipStateValidation) {
|
|
53
|
+
const expansionOpts = {
|
|
54
|
+
resolver: createDefaultResolver({ workflowDirectory: dirname(filePath) }),
|
|
55
|
+
};
|
|
56
|
+
encodingErrors = await detectEncodingErrors(data, cache, format, expansionOpts);
|
|
57
|
+
}
|
|
58
|
+
const singleReport = buildSingleLintReport(filePath, lintErrors, lintWarnings, report.stateValidation ?? [], { structure_errors: structureErrors, encoding_errors: encodingErrors });
|
|
59
|
+
if (opts.json) {
|
|
60
|
+
console.log(JSON.stringify(singleReport, null, 2));
|
|
61
|
+
}
|
|
62
|
+
await writeReportHtml("lint", singleReport, opts.reportHtml);
|
|
47
63
|
process.exitCode = report.exitCode;
|
|
48
64
|
return;
|
|
49
65
|
}
|
|
66
|
+
// Strict checks
|
|
67
|
+
if (report.encodingErrors.length > 0) {
|
|
68
|
+
console.error("Encoding errors:");
|
|
69
|
+
for (const e of report.encodingErrors)
|
|
70
|
+
console.error(` ${e}`);
|
|
71
|
+
}
|
|
72
|
+
if (report.structureErrors.length > 0) {
|
|
73
|
+
console.error("Structure errors (strict):");
|
|
74
|
+
for (const e of report.structureErrors)
|
|
75
|
+
console.error(` ${e}`);
|
|
76
|
+
}
|
|
50
77
|
// Structural lint
|
|
51
78
|
const { structural } = report;
|
|
52
79
|
if (structural.error_count > 0) {
|
|
@@ -93,6 +120,16 @@ export async function runLint(filePath, opts) {
|
|
|
93
120
|
}
|
|
94
121
|
/** Lint a workflow, returning a structured report. Pure logic — no CLI I/O. */
|
|
95
122
|
export async function lintWorkflowReport(filePath, data, format, opts) {
|
|
123
|
+
const strict = opts.strict ?? {
|
|
124
|
+
strictStructure: false,
|
|
125
|
+
strictEncoding: false,
|
|
126
|
+
strictState: false,
|
|
127
|
+
};
|
|
128
|
+
const fmt = format;
|
|
129
|
+
// Strict encoding check
|
|
130
|
+
const encodingErrors = strict.strictEncoding ? checkStrictEncoding(data, fmt) : [];
|
|
131
|
+
// Strict structure check
|
|
132
|
+
const structureErrors = strict.strictStructure ? checkStrictStructure(data, fmt) : [];
|
|
96
133
|
// Phase 1: Structural lint (always runs)
|
|
97
134
|
const structural = lintWorkflow(data);
|
|
98
135
|
// Phase 2: Best practices
|
|
@@ -111,7 +148,7 @@ export async function lintWorkflowReport(filePath, data, format, opts) {
|
|
|
111
148
|
}
|
|
112
149
|
else {
|
|
113
150
|
try {
|
|
114
|
-
const isEmpty = cache.index.listAll().length === 0;
|
|
151
|
+
const isEmpty = (await cache.index.listAll()).length === 0;
|
|
115
152
|
if (isEmpty) {
|
|
116
153
|
console.warn("Tool cache is empty — skipping tool state validation");
|
|
117
154
|
stateSkipped = true;
|
|
@@ -139,9 +176,20 @@ export async function lintWorkflowReport(filePath, data, format, opts) {
|
|
|
139
176
|
// Compute exit code: 0 = clean, 1 = warnings only, 2 = errors
|
|
140
177
|
const merged = mergeLintResults(structural, bestPractices);
|
|
141
178
|
const hasStateErrors = stateValidation?.some((r) => r.status === "fail") ?? false;
|
|
142
|
-
const
|
|
179
|
+
const hasStrictErrors = encodingErrors.length > 0 || structureErrors.length > 0;
|
|
180
|
+
const hasStrictStateSkips = strict.strictState &&
|
|
181
|
+
(stateValidation?.some((r) => r.status !== "ok" && r.status !== "fail") ?? false);
|
|
182
|
+
const hasErrors = merged.error_count > 0 || hasStateErrors || hasStrictErrors || hasStrictStateSkips;
|
|
143
183
|
const hasWarnings = merged.warn_count > 0;
|
|
144
184
|
const exitCode = hasErrors ? 2 : hasWarnings ? 1 : 0;
|
|
145
|
-
return {
|
|
185
|
+
return {
|
|
186
|
+
structural,
|
|
187
|
+
bestPractices,
|
|
188
|
+
stateValidation,
|
|
189
|
+
stateSkipped,
|
|
190
|
+
encodingErrors,
|
|
191
|
+
structureErrors,
|
|
192
|
+
exitCode,
|
|
193
|
+
};
|
|
146
194
|
}
|
|
147
195
|
//# sourceMappingURL=lint.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../src/commands/lint.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../src/commands/lint.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/list.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { makeNodeToolCache } from "@galaxy-tool-util/core/node";
|
|
2
2
|
export async function runList(opts) {
|
|
3
|
-
const cache =
|
|
3
|
+
const cache = makeNodeToolCache({ cacheDir: opts.cacheDir });
|
|
4
4
|
await cache.index.load();
|
|
5
|
-
const entries = cache.listCached();
|
|
5
|
+
const entries = await cache.listCached();
|
|
6
6
|
if (entries.length === 0) {
|
|
7
7
|
console.log("Cache is empty.");
|
|
8
8
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/commands/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/commands/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAOhE,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAiB;IAC7C,MAAM,KAAK,GAAG,iBAAiB,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7D,MAAM,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IACzB,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;IAEzC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC/B,OAAO;IACT,CAAC;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9C,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC7D,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAEpF,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACzF,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAExD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mermaid.d.ts","sourceRoot":"","sources":["../../src/commands/mermaid.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB7F"}
|