@ontrails/trails 1.0.0-beta.14 → 1.0.0-beta.15
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/.turbo/turbo-lint.log +1 -1
- package/CHANGELOG.md +13 -0
- package/__tests__/examples.test.ts +29 -4
- package/dist/src/app.js +2 -2
- package/dist/src/app.js.map +1 -1
- package/dist/src/clack.d.ts +1 -1
- package/dist/src/clack.js +1 -1
- package/dist/src/cli.js +4 -3
- package/dist/src/cli.js.map +1 -1
- package/dist/src/trails/add-surface.d.ts +3 -3
- package/dist/src/trails/add-surface.d.ts.map +1 -1
- package/dist/src/trails/add-surface.js +46 -24
- package/dist/src/trails/add-surface.js.map +1 -1
- package/dist/src/trails/add-trail.d.ts +3 -1
- package/dist/src/trails/add-trail.d.ts.map +1 -1
- package/dist/src/trails/add-trail.js +38 -11
- package/dist/src/trails/add-trail.js.map +1 -1
- package/dist/src/trails/add-trailhead.d.ts +1 -1
- package/dist/src/trails/add-trailhead.d.ts.map +1 -1
- package/dist/src/trails/add-trailhead.js +4 -4
- package/dist/src/trails/add-verify.d.ts +1 -1
- package/dist/src/trails/add-verify.d.ts.map +1 -1
- package/dist/src/trails/add-verify.js +7 -6
- package/dist/src/trails/add-verify.js.map +1 -1
- package/dist/src/trails/create-scaffold.d.ts +1 -1
- package/dist/src/trails/create-scaffold.d.ts.map +1 -1
- package/dist/src/trails/create-scaffold.js +10 -3
- package/dist/src/trails/create-scaffold.js.map +1 -1
- package/dist/src/trails/create.d.ts +10 -14
- package/dist/src/trails/create.d.ts.map +1 -1
- package/dist/src/trails/create.js +42 -37
- package/dist/src/trails/create.js.map +1 -1
- package/dist/src/trails/dev-clean.d.ts +4 -4
- package/dist/src/trails/dev-clean.d.ts.map +1 -1
- package/dist/src/trails/dev-clean.js +22 -21
- package/dist/src/trails/dev-clean.js.map +1 -1
- package/dist/src/trails/dev-reset.d.ts +1 -1
- package/dist/src/trails/dev-reset.d.ts.map +1 -1
- package/dist/src/trails/dev-reset.js +3 -2
- package/dist/src/trails/dev-reset.js.map +1 -1
- package/dist/src/trails/dev-stats.d.ts +4 -4
- package/dist/src/trails/dev-stats.d.ts.map +1 -1
- package/dist/src/trails/dev-stats.js +19 -19
- package/dist/src/trails/dev-stats.js.map +1 -1
- package/dist/src/trails/dev-support.d.ts +17 -17
- package/dist/src/trails/dev-support.d.ts.map +1 -1
- package/dist/src/trails/dev-support.js +60 -57
- package/dist/src/trails/dev-support.js.map +1 -1
- package/dist/src/trails/draft-promote.d.ts +1 -1
- package/dist/src/trails/draft-promote.d.ts.map +1 -1
- package/dist/src/trails/draft-promote.js +30 -16
- package/dist/src/trails/draft-promote.js.map +1 -1
- package/dist/src/trails/guide.d.ts +2 -2
- package/dist/src/trails/guide.d.ts.map +1 -1
- package/dist/src/trails/guide.js +1 -4
- package/dist/src/trails/guide.js.map +1 -1
- package/dist/src/trails/load-app.d.ts +7 -1
- package/dist/src/trails/load-app.d.ts.map +1 -1
- package/dist/src/trails/load-app.js +374 -26
- package/dist/src/trails/load-app.js.map +1 -1
- package/dist/src/trails/survey.d.ts +5 -5
- package/dist/src/trails/survey.d.ts.map +1 -1
- package/dist/src/trails/survey.js +51 -29
- package/dist/src/trails/survey.js.map +1 -1
- package/dist/src/trails/topo-export.d.ts +5 -4
- package/dist/src/trails/topo-export.d.ts.map +1 -1
- package/dist/src/trails/topo-export.js +4 -7
- package/dist/src/trails/topo-export.js.map +1 -1
- package/dist/src/trails/topo-history.d.ts +6 -10
- package/dist/src/trails/topo-history.d.ts.map +1 -1
- package/dist/src/trails/topo-history.js +7 -8
- package/dist/src/trails/topo-history.js.map +1 -1
- package/dist/src/trails/topo-pin.d.ts +5 -9
- package/dist/src/trails/topo-pin.d.ts.map +1 -1
- package/dist/src/trails/topo-pin.js +5 -9
- package/dist/src/trails/topo-pin.js.map +1 -1
- package/dist/src/trails/topo-read-support.d.ts +12 -8
- package/dist/src/trails/topo-read-support.d.ts.map +1 -1
- package/dist/src/trails/topo-read-support.js +71 -82
- package/dist/src/trails/topo-read-support.js.map +1 -1
- package/dist/src/trails/topo-reports.d.ts +15 -11
- package/dist/src/trails/topo-reports.d.ts.map +1 -1
- package/dist/src/trails/topo-reports.js +40 -34
- package/dist/src/trails/topo-reports.js.map +1 -1
- package/dist/src/trails/topo-show.d.ts +4 -4
- package/dist/src/trails/topo-show.d.ts.map +1 -1
- package/dist/src/trails/topo-show.js +8 -12
- package/dist/src/trails/topo-show.js.map +1 -1
- package/dist/src/trails/topo-store-support.d.ts +2 -2
- package/dist/src/trails/topo-store-support.d.ts.map +1 -1
- package/dist/src/trails/topo-store-support.js +22 -22
- package/dist/src/trails/topo-store-support.js.map +1 -1
- package/dist/src/trails/topo-support.d.ts +19 -30
- package/dist/src/trails/topo-support.d.ts.map +1 -1
- package/dist/src/trails/topo-support.js +63 -96
- package/dist/src/trails/topo-support.js.map +1 -1
- package/dist/src/trails/topo-unpin.d.ts +9 -4
- package/dist/src/trails/topo-unpin.d.ts.map +1 -1
- package/dist/src/trails/topo-unpin.js +9 -4
- package/dist/src/trails/topo-unpin.js.map +1 -1
- package/dist/src/trails/topo-verify.d.ts +2 -2
- package/dist/src/trails/topo-verify.d.ts.map +1 -1
- package/dist/src/trails/topo-verify.js +1 -5
- package/dist/src/trails/topo-verify.js.map +1 -1
- package/dist/src/trails/topo.d.ts +2 -2
- package/dist/src/trails/topo.d.ts.map +1 -1
- package/dist/src/trails/topo.js +6 -10
- package/dist/src/trails/topo.js.map +1 -1
- package/dist/src/trails/warden.d.ts +3 -2
- package/dist/src/trails/warden.d.ts.map +1 -1
- package/dist/src/trails/warden.js +11 -2
- package/dist/src/trails/warden.js.map +1 -1
- package/dist/src/versions.d.ts +12 -0
- package/dist/src/versions.d.ts.map +1 -0
- package/dist/src/versions.js +23 -0
- package/dist/src/versions.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +8 -8
- package/src/__tests__/add-trail.test.ts +97 -0
- package/src/__tests__/create.test.ts +91 -27
- package/src/__tests__/guide.test.ts +10 -5
- package/src/__tests__/load-app.test.ts +365 -4
- package/src/__tests__/survey.test.ts +143 -67
- package/src/__tests__/topo-dev.test.ts +48 -46
- package/src/app.ts +2 -2
- package/src/clack.ts +1 -1
- package/src/cli.ts +4 -3
- package/src/trails/add-surface.ts +150 -0
- package/src/trails/add-trail.ts +46 -10
- package/src/trails/add-verify.ts +11 -6
- package/src/trails/create-scaffold.ts +16 -3
- package/src/trails/create.ts +76 -71
- package/src/trails/dev-clean.ts +25 -21
- package/src/trails/dev-reset.ts +3 -2
- package/src/trails/dev-stats.ts +22 -19
- package/src/trails/dev-support.ts +88 -86
- package/src/trails/draft-promote.ts +70 -35
- package/src/trails/guide.ts +1 -4
- package/src/trails/load-app.ts +511 -32
- package/src/trails/survey.ts +60 -35
- package/src/trails/topo-export.ts +5 -9
- package/src/trails/topo-history.ts +8 -10
- package/src/trails/topo-pin.ts +9 -13
- package/src/trails/topo-read-support.ts +103 -106
- package/src/trails/topo-reports.ts +54 -47
- package/src/trails/topo-show.ts +8 -12
- package/src/trails/topo-store-support.ts +36 -28
- package/src/trails/topo-support.ts +90 -134
- package/src/trails/topo-unpin.ts +11 -6
- package/src/trails/topo-verify.ts +1 -5
- package/src/trails/topo.ts +6 -10
- package/src/trails/warden.ts +12 -3
- package/src/versions.ts +43 -0
- package/tsconfig.tests.json +10 -0
- package/src/trails/add-trailhead.ts +0 -121
package/.turbo/turbo-lint.log
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# trails
|
|
2
2
|
|
|
3
|
+
## 1.0.0-beta.15
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 2003fa5: Prepare the Trails CLI for beta.15 release publishing: derive the CLI version from package metadata, scaffold publishable package ranges, add HTTP surface generation, include the scaffold toolchain dependencies, and avoid generating unsupported Warden flags.
|
|
8
|
+
- Updated dependencies [4ad6b25]
|
|
9
|
+
- @ontrails/core@1.0.0-beta.15
|
|
10
|
+
- @ontrails/cli@1.0.0-beta.15
|
|
11
|
+
- @ontrails/tracing@1.0.0-beta.15
|
|
12
|
+
- @ontrails/warden@1.0.0-beta.15
|
|
13
|
+
- @ontrails/logging@1.0.0-beta.15
|
|
14
|
+
- @ontrails/schema@1.0.0-beta.15
|
|
15
|
+
|
|
3
16
|
## 1.0.0-beta.14
|
|
4
17
|
|
|
5
18
|
### Minor Changes
|
|
@@ -1,20 +1,45 @@
|
|
|
1
1
|
/* oxlint-disable eslint-plugin-jest/require-hook -- testExamples registers tests at module scope */
|
|
2
2
|
import { afterAll, beforeAll } from 'bun:test';
|
|
3
|
-
import { rmSync } from 'node:fs';
|
|
4
|
-
import { resolve } from 'node:path';
|
|
3
|
+
import { mkdirSync, rmSync, writeFileSync } from 'node:fs';
|
|
4
|
+
import { join, resolve } from 'node:path';
|
|
5
5
|
|
|
6
6
|
import { testExamples } from '@ontrails/testing';
|
|
7
7
|
|
|
8
8
|
import { app } from '../src/app.js';
|
|
9
9
|
|
|
10
10
|
const trailsWorkspaceDir = resolve(import.meta.dir, '..', '.trails');
|
|
11
|
+
const trailsGitignorePath = join(trailsWorkspaceDir, '.gitignore');
|
|
12
|
+
const trailsWorkspaceSubdirs = ['config', 'dev', 'generated'] as const;
|
|
13
|
+
const trailsGitignore = `# Local config overrides
|
|
14
|
+
config/
|
|
11
15
|
|
|
12
|
-
|
|
16
|
+
# Development state
|
|
17
|
+
dev/
|
|
18
|
+
|
|
19
|
+
# Generated artifacts
|
|
20
|
+
generated/
|
|
21
|
+
|
|
22
|
+
# Shared Trails database
|
|
23
|
+
trails.db
|
|
24
|
+
trails.db-shm
|
|
25
|
+
trails.db-wal
|
|
26
|
+
`;
|
|
27
|
+
|
|
28
|
+
const resetTrailsWorkspace = (): void => {
|
|
13
29
|
rmSync(trailsWorkspaceDir, { force: true, recursive: true });
|
|
30
|
+
mkdirSync(trailsWorkspaceDir, { recursive: true });
|
|
31
|
+
for (const subdir of trailsWorkspaceSubdirs) {
|
|
32
|
+
mkdirSync(join(trailsWorkspaceDir, subdir), { recursive: true });
|
|
33
|
+
}
|
|
34
|
+
writeFileSync(trailsGitignorePath, trailsGitignore);
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
beforeAll(() => {
|
|
38
|
+
resetTrailsWorkspace();
|
|
14
39
|
});
|
|
15
40
|
|
|
16
41
|
afterAll(() => {
|
|
17
|
-
|
|
42
|
+
resetTrailsWorkspace();
|
|
18
43
|
});
|
|
19
44
|
|
|
20
45
|
testExamples(app);
|
package/dist/src/app.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { topo } from '@ontrails/core';
|
|
2
|
-
import * as
|
|
2
|
+
import * as addSurface from './trails/add-surface.js';
|
|
3
3
|
import * as addTrail from './trails/add-trail.js';
|
|
4
4
|
import * as addVerify from './trails/add-verify.js';
|
|
5
5
|
import * as create from './trails/create.js';
|
|
@@ -18,5 +18,5 @@ import * as topoCommand from './trails/topo.js';
|
|
|
18
18
|
import * as topoUnpin from './trails/topo-unpin.js';
|
|
19
19
|
import * as topoVerify from './trails/topo-verify.js';
|
|
20
20
|
import * as warden from './trails/warden.js';
|
|
21
|
-
export const app = topo('trails', survey, topoCommand, topoShow, topoHistory, topoPin, topoUnpin, topoExport, topoVerify, devStats, devClean, devReset, guide, draftPromote, warden, create, createScaffold,
|
|
21
|
+
export const app = topo('trails', survey, topoCommand, topoShow, topoHistory, topoPin, topoUnpin, topoExport, topoVerify, devStats, devClean, devReset, guide, draftPromote, warden, create, createScaffold, addSurface, addVerify, addTrail);
|
|
22
22
|
//# sourceMappingURL=app.js.map
|
package/dist/src/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEtC,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEtC,OAAO,KAAK,UAAU,MAAM,yBAAyB,CAAC;AACtD,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,SAAS,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAC;AAC7C,OAAO,KAAK,cAAc,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,YAAY,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAC;AAC3C,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAC;AAC7C,OAAO,KAAK,UAAU,MAAM,yBAAyB,CAAC;AACtD,OAAO,KAAK,WAAW,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAC;AAChD,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC;AAChD,OAAO,KAAK,SAAS,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,UAAU,MAAM,yBAAyB,CAAC;AACtD,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAC;AAE7C,MAAM,CAAC,MAAM,GAAG,GAAG,IAAI,CACrB,QAAQ,EACR,MAAM,EACN,WAAW,EACX,QAAQ,EACR,WAAW,EACX,OAAO,EACP,SAAS,EACT,UAAU,EACV,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,YAAY,EACZ,MAAM,EACN,MAAM,EACN,cAAc,EACd,UAAU,EACV,SAAS,EACT,QAAQ,CACT,CAAC"}
|
package/dist/src/clack.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Clack-backed input resolver for the Trails CLI.
|
|
3
3
|
*
|
|
4
|
-
* This stays at the app
|
|
4
|
+
* This stays at the app layer so @ontrails/cli remains prompt-library agnostic.
|
|
5
5
|
*/
|
|
6
6
|
import type { InputResolver } from '@ontrails/cli';
|
|
7
7
|
/** Fill missing input by prompting with Clack when interactive. */
|
package/dist/src/clack.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Clack-backed input resolver for the Trails CLI.
|
|
3
3
|
*
|
|
4
|
-
* This stays at the app
|
|
4
|
+
* This stays at the app layer so @ontrails/cli remains prompt-library agnostic.
|
|
5
5
|
*/
|
|
6
6
|
import { isInteractive } from '@ontrails/cli';
|
|
7
7
|
import * as clack from '@clack/prompts';
|
package/dist/src/cli.js
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { outputModePreset } from '@ontrails/cli';
|
|
2
|
-
import {
|
|
2
|
+
import { surface } from '@ontrails/cli/commander';
|
|
3
3
|
import { app } from './app.js';
|
|
4
4
|
import { resolveInputWithClack } from './clack.js';
|
|
5
|
+
import { trailsPackageVersion } from './versions.js';
|
|
5
6
|
// oxlint-disable-next-line require-hook -- CLI entry point
|
|
6
|
-
|
|
7
|
+
await surface(app, {
|
|
7
8
|
description: 'Agent-native, contract-first TypeScript framework',
|
|
8
9
|
name: 'trails',
|
|
9
10
|
presets: [outputModePreset()],
|
|
10
11
|
resolveInput: resolveInputWithClack,
|
|
11
|
-
version:
|
|
12
|
+
version: trailsPackageVersion,
|
|
12
13
|
});
|
|
13
14
|
//# sourceMappingURL=cli.js.map
|
package/dist/src/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,2DAA2D;AAC3D,MAAM,OAAO,CAAC,GAAG,EAAE;IACjB,WAAW,EAAE,mDAAmD;IAChE,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7B,YAAY,EAAE,qBAAqB;IACnC,OAAO,EAAE,oBAAoB;CAC9B,CAAC,CAAC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* `add.surface` trail -- Add a surface to an existing project.
|
|
3
3
|
*
|
|
4
|
-
* Generates
|
|
4
|
+
* Generates surface entry points and updates package.json dependencies.
|
|
5
5
|
*/
|
|
6
6
|
export declare const addSurface: import("@ontrails/core").Trail<{
|
|
7
|
-
surface: "cli" | "mcp";
|
|
7
|
+
surface: "cli" | "http" | "mcp";
|
|
8
8
|
dir?: string | undefined;
|
|
9
9
|
}, {
|
|
10
10
|
created: string;
|
|
11
11
|
dependency: string;
|
|
12
|
-
}>;
|
|
12
|
+
}, never>;
|
|
13
13
|
//# sourceMappingURL=add-surface.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-surface.d.ts","sourceRoot":"","sources":["../../../src/trails/add-surface.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"add-surface.d.ts","sourceRoot":"","sources":["../../../src/trails/add-surface.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAqHH,eAAO,MAAM,UAAU;;;;;;SA4BrB,CAAC"}
|
|
@@ -1,37 +1,56 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* `add.surface` trail -- Add a surface to an existing project.
|
|
3
3
|
*
|
|
4
|
-
* Generates
|
|
4
|
+
* Generates surface entry points and updates package.json dependencies.
|
|
5
5
|
*/
|
|
6
6
|
import { existsSync, mkdirSync } from 'node:fs';
|
|
7
7
|
import { basename, dirname, join, resolve } from 'node:path';
|
|
8
8
|
import { Result, trail } from '@ontrails/core';
|
|
9
9
|
import { z } from 'zod';
|
|
10
|
+
import { ontrailsPackageRange, scaffoldDependencyVersions, } from '../versions.js';
|
|
10
11
|
import { findTopoPath } from './project.js';
|
|
11
|
-
const generateCliEntry = (appImportPath) => `import {
|
|
12
|
+
const generateCliEntry = (appImportPath) => `import { surface } from '@ontrails/cli/commander';
|
|
12
13
|
|
|
13
14
|
import { app } from '${appImportPath}';
|
|
14
15
|
|
|
15
|
-
|
|
16
|
+
await surface(app);
|
|
16
17
|
`;
|
|
17
|
-
const generateMcpEntry = (appImportPath) => `import {
|
|
18
|
+
const generateMcpEntry = (appImportPath) => `import { surface } from '@ontrails/mcp';
|
|
18
19
|
|
|
19
20
|
import { app } from '${appImportPath}';
|
|
20
21
|
|
|
21
|
-
await
|
|
22
|
+
await surface(app);
|
|
22
23
|
`;
|
|
24
|
+
const generateHttpEntry = (appImportPath) => `import { surface } from '@ontrails/hono';
|
|
25
|
+
|
|
26
|
+
import { app } from '${appImportPath}';
|
|
27
|
+
|
|
28
|
+
await surface(app, { port: 3000 });
|
|
29
|
+
`;
|
|
30
|
+
const surfaceEntryFiles = {
|
|
31
|
+
cli: 'src/cli.ts',
|
|
32
|
+
http: 'src/http.ts',
|
|
33
|
+
mcp: 'src/mcp.ts',
|
|
34
|
+
};
|
|
35
|
+
const surfaceDependencies = {
|
|
36
|
+
cli: ['@ontrails/cli'],
|
|
37
|
+
http: ['@ontrails/hono', '@ontrails/http'],
|
|
38
|
+
mcp: ['@ontrails/mcp'],
|
|
39
|
+
};
|
|
23
40
|
/** Resolve the entry file for a surface. */
|
|
24
|
-
const getEntryFile = (surface) => surface
|
|
41
|
+
const getEntryFile = (surface) => surfaceEntryFiles[surface];
|
|
25
42
|
// ---------------------------------------------------------------------------
|
|
26
43
|
// Trail definition
|
|
27
44
|
// ---------------------------------------------------------------------------
|
|
28
45
|
/** Patch deps and optionally bin in a parsed package.json. */
|
|
29
46
|
const patchPkgDeps = (pkg, surface, cwd) => {
|
|
30
|
-
const depName =
|
|
47
|
+
const [depName = ''] = surfaceDependencies[surface];
|
|
31
48
|
const deps = (pkg['dependencies'] ?? {});
|
|
32
|
-
|
|
49
|
+
for (const dependency of surfaceDependencies[surface]) {
|
|
50
|
+
deps[dependency] = ontrailsPackageRange;
|
|
51
|
+
}
|
|
33
52
|
if (surface === 'cli') {
|
|
34
|
-
deps['commander'] =
|
|
53
|
+
deps['commander'] = scaffoldDependencyVersions.commander;
|
|
35
54
|
pkg['bin'] = {
|
|
36
55
|
[pkg['name'] ?? basename(cwd)]: './src/cli.ts',
|
|
37
56
|
};
|
|
@@ -43,7 +62,7 @@ const patchPkgDeps = (pkg, surface, cwd) => {
|
|
|
43
62
|
const updatePkgJsonForSurface = async (cwd, surface) => {
|
|
44
63
|
const pkgPath = join(cwd, 'package.json');
|
|
45
64
|
if (!existsSync(pkgPath)) {
|
|
46
|
-
return surface
|
|
65
|
+
return surfaceDependencies[surface][0] ?? '';
|
|
47
66
|
}
|
|
48
67
|
const pkg = (await Bun.file(pkgPath).json());
|
|
49
68
|
const depName = patchPkgDeps(pkg, surface, cwd);
|
|
@@ -55,34 +74,37 @@ const writeSurfaceEntry = async (cwd, surface) => {
|
|
|
55
74
|
const entryFile = getEntryFile(surface);
|
|
56
75
|
const fullEntryPath = join(cwd, entryFile);
|
|
57
76
|
const appImport = (await findTopoPath(cwd)) ?? './app.js';
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
:
|
|
77
|
+
const generators = {
|
|
78
|
+
cli: generateCliEntry,
|
|
79
|
+
http: generateHttpEntry,
|
|
80
|
+
mcp: generateMcpEntry,
|
|
81
|
+
};
|
|
82
|
+
const content = generators[surface](appImport);
|
|
61
83
|
mkdirSync(dirname(fullEntryPath), { recursive: true });
|
|
62
84
|
await Bun.write(fullEntryPath, content);
|
|
63
85
|
return entryFile;
|
|
64
86
|
};
|
|
65
87
|
export const addSurface = trail('add.surface', {
|
|
66
|
-
|
|
67
|
-
input: z.object({
|
|
68
|
-
dir: z.string().optional().describe('Project directory'),
|
|
69
|
-
surface: z.enum(['cli', 'mcp']).describe('Surface to add'),
|
|
70
|
-
}),
|
|
71
|
-
output: z.object({
|
|
72
|
-
created: z.string(),
|
|
73
|
-
dependency: z.string(),
|
|
74
|
-
}),
|
|
75
|
-
run: async (input) => {
|
|
88
|
+
blaze: async (input) => {
|
|
76
89
|
const cwd = resolve(input.dir ?? '.');
|
|
77
90
|
const { surface } = input;
|
|
78
91
|
const entryFile = getEntryFile(surface);
|
|
79
92
|
if (existsSync(join(cwd, entryFile))) {
|
|
80
|
-
return Result.err(new Error(`${surface.toUpperCase()}
|
|
93
|
+
return Result.err(new Error(`${surface.toUpperCase()} surface already exists. Nothing to do.`));
|
|
81
94
|
}
|
|
82
95
|
return Result.ok({
|
|
83
96
|
created: await writeSurfaceEntry(cwd, surface),
|
|
84
97
|
dependency: await updatePkgJsonForSurface(cwd, surface),
|
|
85
98
|
});
|
|
86
99
|
},
|
|
100
|
+
description: 'Add a surface to an existing project',
|
|
101
|
+
input: z.object({
|
|
102
|
+
dir: z.string().optional().describe('Project directory'),
|
|
103
|
+
surface: z.enum(['cli', 'http', 'mcp']).describe('Surface to add'),
|
|
104
|
+
}),
|
|
105
|
+
output: z.object({
|
|
106
|
+
created: z.string(),
|
|
107
|
+
dependency: z.string(),
|
|
108
|
+
}),
|
|
87
109
|
});
|
|
88
110
|
//# sourceMappingURL=add-surface.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-surface.js","sourceRoot":"","sources":["../../../src/trails/add-surface.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE7D,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"add-surface.js","sourceRoot":"","sources":["../../../src/trails/add-surface.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,11 @@
|
|
|
2
2
|
* `add.trail` trail -- Scaffold a new trail file with tests.
|
|
3
3
|
*/
|
|
4
4
|
export declare const addTrail: import("@ontrails/core").Trail<{
|
|
5
|
+
description: string;
|
|
6
|
+
exampleName: string;
|
|
5
7
|
id: string;
|
|
6
8
|
intent: "read" | "write" | "destroy";
|
|
7
9
|
}, {
|
|
8
10
|
created: string[];
|
|
9
|
-
}>;
|
|
11
|
+
}, never>;
|
|
10
12
|
//# sourceMappingURL=add-trail.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-trail.d.ts","sourceRoot":"","sources":["../../../src/trails/add-trail.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"add-trail.d.ts","sourceRoot":"","sources":["../../../src/trails/add-trail.ts"],"names":[],"mappings":"AAAA;;GAEG;AA4EH,eAAO,MAAM,QAAQ;;;;;;;SAmDnB,CAAC"}
|
|
@@ -8,35 +8,44 @@ import { z } from 'zod';
|
|
|
8
8
|
// ---------------------------------------------------------------------------
|
|
9
9
|
// Helpers
|
|
10
10
|
// ---------------------------------------------------------------------------
|
|
11
|
-
const
|
|
11
|
+
const literal = (value) => JSON.stringify(value);
|
|
12
|
+
const deriveExampleMessage = (id) => `${id} completed`;
|
|
13
|
+
const generateTrailFile = (id, description, exampleName, intent) => {
|
|
12
14
|
const intentLine = intent === 'write' ? '' : `\n intent: '${intent}',`;
|
|
15
|
+
const exampleMessage = deriveExampleMessage(id);
|
|
13
16
|
return `import { Result, trail } from '@ontrails/core';
|
|
14
17
|
import { z } from 'zod';
|
|
15
18
|
|
|
16
19
|
export const ${id.replaceAll('.', '_')} = trail('${id}', {
|
|
17
|
-
|
|
20
|
+
blaze: async () => {
|
|
21
|
+
return Result.ok({ message: ${literal(exampleMessage)} });
|
|
22
|
+
},
|
|
23
|
+
description: ${literal(description)},
|
|
18
24
|
examples: [
|
|
19
25
|
{
|
|
26
|
+
expected: { message: ${literal(exampleMessage)} },
|
|
20
27
|
input: {},
|
|
21
|
-
name:
|
|
28
|
+
name: ${literal(exampleName)},
|
|
22
29
|
},
|
|
23
30
|
],
|
|
24
|
-
blaze: async (input) => {
|
|
25
|
-
return Result.ok({ message: 'TODO' });
|
|
26
|
-
},
|
|
27
31
|
input: z.object({}),${intentLine}
|
|
28
32
|
output: z.object({ message: z.string() }),
|
|
29
33
|
});
|
|
30
34
|
`;
|
|
31
35
|
};
|
|
32
|
-
const generateTestFile = (id) => {
|
|
36
|
+
const generateTestFile = (id, exampleName) => {
|
|
33
37
|
const moduleName = id.replaceAll('.', '-');
|
|
34
38
|
const trailName = id.replaceAll('.', '_');
|
|
39
|
+
const exampleMessage = deriveExampleMessage(id);
|
|
35
40
|
return `import { testTrail } from '@ontrails/testing';
|
|
36
41
|
import { ${trailName} } from '../src/trails/${moduleName}.js';
|
|
37
42
|
|
|
38
43
|
testTrail(${trailName}, [
|
|
39
|
-
{
|
|
44
|
+
{
|
|
45
|
+
description: ${literal(exampleName)},
|
|
46
|
+
expectValue: { message: ${literal(exampleMessage)} },
|
|
47
|
+
input: {},
|
|
48
|
+
},
|
|
40
49
|
]);
|
|
41
50
|
`;
|
|
42
51
|
};
|
|
@@ -49,13 +58,20 @@ const writeWithDirs = async (filePath, content) => {
|
|
|
49
58
|
await Bun.write(filePath, content);
|
|
50
59
|
};
|
|
51
60
|
export const addTrail = trail('add.trail', {
|
|
61
|
+
args: ['id'],
|
|
52
62
|
blaze: async (input, ctx) => {
|
|
53
63
|
const { id } = input;
|
|
54
64
|
const moduleName = id.replaceAll('.', '-');
|
|
55
65
|
const cwd = resolve(ctx.cwd ?? '.');
|
|
56
66
|
const files = new Map([
|
|
57
|
-
[
|
|
58
|
-
|
|
67
|
+
[
|
|
68
|
+
`src/trails/${moduleName}.ts`,
|
|
69
|
+
generateTrailFile(id, input.description, input.exampleName, input.intent),
|
|
70
|
+
],
|
|
71
|
+
[
|
|
72
|
+
`__tests__/${moduleName}.test.ts`,
|
|
73
|
+
generateTestFile(id, input.exampleName),
|
|
74
|
+
],
|
|
59
75
|
]);
|
|
60
76
|
for (const [relativePath, content] of files) {
|
|
61
77
|
await writeWithDirs(join(cwd, relativePath), content);
|
|
@@ -64,7 +80,18 @@ export const addTrail = trail('add.trail', {
|
|
|
64
80
|
},
|
|
65
81
|
description: 'Scaffold a new trail with tests and examples',
|
|
66
82
|
input: z.object({
|
|
67
|
-
|
|
83
|
+
description: z
|
|
84
|
+
.string()
|
|
85
|
+
.min(1, 'Trail description is required')
|
|
86
|
+
.describe('Trail description'),
|
|
87
|
+
exampleName: z
|
|
88
|
+
.string()
|
|
89
|
+
.min(1, 'Starter example name is required')
|
|
90
|
+
.describe('Starter example name'),
|
|
91
|
+
id: z
|
|
92
|
+
.string()
|
|
93
|
+
.min(1, 'Trail ID is required')
|
|
94
|
+
.describe('Trail ID (e.g., entity.update)'),
|
|
68
95
|
intent: z
|
|
69
96
|
.enum(['read', 'write', 'destroy'])
|
|
70
97
|
.default('write')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-trail.js","sourceRoot":"","sources":["../../../src/trails/add-trail.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEnD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,8EAA8E;AAC9E,UAAU;AACV,8EAA8E;AAE9E,MAAM,iBAAiB,GAAG,CACxB,EAAU,EACV,MAAoC,EAC5B,EAAE;IACV,MAAM,UAAU,GAAG,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"add-trail.js","sourceRoot":"","sources":["../../../src/trails/add-trail.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-trailhead.d.ts","sourceRoot":"","sources":["../../../src/trails/add-trailhead.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAwFH,eAAO,MAAM,YAAY;;;;;;
|
|
1
|
+
{"version":3,"file":"add-trailhead.d.ts","sourceRoot":"","sources":["../../../src/trails/add-trailhead.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAwFH,eAAO,MAAM,YAAY;;;;;;SA4BvB,CAAC"}
|
|
@@ -8,17 +8,17 @@ import { basename, dirname, join, resolve } from 'node:path';
|
|
|
8
8
|
import { Result, trail } from '@ontrails/core';
|
|
9
9
|
import { z } from 'zod';
|
|
10
10
|
import { findTopoPath } from './project.js';
|
|
11
|
-
const generateCliEntry = (appImportPath) => `import {
|
|
11
|
+
const generateCliEntry = (appImportPath) => `import { surface } from '@ontrails/cli/commander';
|
|
12
12
|
|
|
13
13
|
import { app } from '${appImportPath}';
|
|
14
14
|
|
|
15
|
-
|
|
15
|
+
await surface(app);
|
|
16
16
|
`;
|
|
17
|
-
const generateMcpEntry = (appImportPath) => `import {
|
|
17
|
+
const generateMcpEntry = (appImportPath) => `import { surface } from '@ontrails/mcp';
|
|
18
18
|
|
|
19
19
|
import { app } from '${appImportPath}';
|
|
20
20
|
|
|
21
|
-
await
|
|
21
|
+
await surface(app);
|
|
22
22
|
`;
|
|
23
23
|
/** Resolve the entry file for a trailhead. */
|
|
24
24
|
const getEntryFile = (trailhead) => trailhead === 'cli' ? 'src/cli.ts' : 'src/mcp.ts';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-verify.d.ts","sourceRoot":"","sources":["../../../src/trails/add-verify.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"add-verify.d.ts","sourceRoot":"","sources":["../../../src/trails/add-verify.ts"],"names":[],"mappings":"AAAA;;GAEG;AA2DH,eAAO,MAAM,SAAS;;;;;SA8BpB,CAAC"}
|
|
@@ -5,25 +5,26 @@ import { existsSync, mkdirSync } from 'node:fs';
|
|
|
5
5
|
import { dirname, join, resolve } from 'node:path';
|
|
6
6
|
import { Result, trail } from '@ontrails/core';
|
|
7
7
|
import { z } from 'zod';
|
|
8
|
+
import { ontrailsPackageRange, scaffoldDependencyVersions, } from '../versions.js';
|
|
8
9
|
// ---------------------------------------------------------------------------
|
|
9
10
|
// Content generators
|
|
10
11
|
// ---------------------------------------------------------------------------
|
|
11
|
-
const generateTestFile = () => `import {
|
|
12
|
+
const generateTestFile = () => `import { testAllEstablished } from '@ontrails/testing';
|
|
12
13
|
import { app } from '../src/app.js';
|
|
13
14
|
|
|
14
|
-
|
|
15
|
+
testAllEstablished(app);
|
|
15
16
|
`;
|
|
16
17
|
const generateLefthookYml = () => `pre-push:
|
|
17
18
|
commands:
|
|
18
19
|
warden:
|
|
19
|
-
run: bunx trails warden
|
|
20
|
+
run: bunx trails warden
|
|
20
21
|
`;
|
|
21
22
|
/** Add testing and warden devDependencies to package.json when present. */
|
|
22
23
|
const patchVerifyDeps = (pkg) => {
|
|
23
24
|
const devDeps = (pkg['devDependencies'] ?? {});
|
|
24
|
-
devDeps['@ontrails/testing'] =
|
|
25
|
-
devDeps['@ontrails/warden'] =
|
|
26
|
-
devDeps['lefthook'] =
|
|
25
|
+
devDeps['@ontrails/testing'] = ontrailsPackageRange;
|
|
26
|
+
devDeps['@ontrails/warden'] = ontrailsPackageRange;
|
|
27
|
+
devDeps['lefthook'] = scaffoldDependencyVersions.lefthook;
|
|
27
28
|
pkg['devDependencies'] = Object.fromEntries(Object.entries(devDeps).toSorted(([a], [b]) => a.localeCompare(b)));
|
|
28
29
|
};
|
|
29
30
|
/** Update package.json in the target project with verify dependencies. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-verify.js","sourceRoot":"","sources":["../../../src/trails/add-verify.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEnD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,8EAA8E;AAC9E,qBAAqB;AACrB,8EAA8E;AAE9E,MAAM,gBAAgB,GAAG,GAAW,EAAE,CACpC;;;;CAID,CAAC;AAEF,MAAM,mBAAmB,GAAG,GAAW,EAAE,CACvC;;;;CAID,CAAC;AAEF,2EAA2E;AAC3E,MAAM,eAAe,GAAG,CAAC,GAA4B,EAAQ,EAAE;IAC7D,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAA2B,CAAC;IACzE,OAAO,CAAC,mBAAmB,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"add-verify.js","sourceRoot":"","sources":["../../../src/trails/add-verify.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-scaffold.d.ts","sourceRoot":"","sources":["../../../src/trails/create-scaffold.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"create-scaffold.d.ts","sourceRoot":"","sources":["../../../src/trails/create-scaffold.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA2UH,eAAO,MAAM,cAAc;;;;;;;;SA6BzB,CAAC"}
|
|
@@ -7,16 +7,23 @@ import { mkdirSync } from 'node:fs';
|
|
|
7
7
|
import { dirname, join, resolve } from 'node:path';
|
|
8
8
|
import { Result, trail } from '@ontrails/core';
|
|
9
9
|
import { z } from 'zod';
|
|
10
|
+
import { ontrailsPackageRange, scaffoldDependencyVersions, } from '../versions.js';
|
|
10
11
|
// ---------------------------------------------------------------------------
|
|
11
12
|
// Content generators
|
|
12
13
|
// ---------------------------------------------------------------------------
|
|
13
14
|
const generatePackageJson = (name) => {
|
|
14
15
|
const deps = {
|
|
15
|
-
'@ontrails/core':
|
|
16
|
-
zod:
|
|
16
|
+
'@ontrails/core': ontrailsPackageRange,
|
|
17
|
+
zod: scaffoldDependencyVersions.zod,
|
|
17
18
|
};
|
|
18
19
|
const pkg = {
|
|
19
20
|
dependencies: Object.fromEntries(Object.entries(deps).toSorted(([a], [b]) => a.localeCompare(b))),
|
|
21
|
+
devDependencies: Object.fromEntries(Object.entries({
|
|
22
|
+
'@types/bun': scaffoldDependencyVersions.bunTypes,
|
|
23
|
+
oxlint: scaffoldDependencyVersions.oxlint,
|
|
24
|
+
typescript: scaffoldDependencyVersions.typescript,
|
|
25
|
+
ultracite: scaffoldDependencyVersions.ultracite,
|
|
26
|
+
}).toSorted(([a], [b]) => a.localeCompare(b))),
|
|
20
27
|
name,
|
|
21
28
|
scripts: {
|
|
22
29
|
build: 'tsc -b',
|
|
@@ -47,7 +54,7 @@ const TSCONFIG_CONTENT = JSON.stringify({
|
|
|
47
54
|
const GITIGNORE_CONTENT = `node_modules/
|
|
48
55
|
dist/
|
|
49
56
|
*.tsbuildinfo
|
|
50
|
-
.trails/
|
|
57
|
+
.trails/_surface.json
|
|
51
58
|
`;
|
|
52
59
|
const OXLINTRC_CONTENT = JSON.stringify({
|
|
53
60
|
extends: ['ultracite'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-scaffold.js","sourceRoot":"","sources":["../../../src/trails/create-scaffold.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEnD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAcxB,8EAA8E;AAC9E,qBAAqB;AACrB,8EAA8E;AAE9E,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAU,EAAE;IACnD,MAAM,IAAI,GAA2B;QACnC,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"create-scaffold.js","sourceRoot":"","sources":["../../../src/trails/create-scaffold.ts"],"names":[],"mappings":"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"}
|