@telorun/kernel 0.12.0 → 0.13.2
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/LICENSE +2 -2
- package/dist/application-env.d.ts +24 -0
- package/dist/application-env.d.ts.map +1 -0
- package/dist/application-env.js +156 -0
- package/dist/application-env.js.map +1 -0
- package/dist/controller-loaders/npm-loader.d.ts +32 -8
- package/dist/controller-loaders/npm-loader.d.ts.map +1 -1
- package/dist/controller-loaders/npm-loader.js +74 -101
- package/dist/controller-loaders/npm-loader.js.map +1 -1
- package/dist/controllers/module/import-controller.d.ts +3 -2
- package/dist/controllers/module/import-controller.d.ts.map +1 -1
- package/dist/controllers/module/import-controller.js +23 -25
- package/dist/controllers/module/import-controller.js.map +1 -1
- package/dist/controllers/resource-definition/resource-definition-controller.d.ts +1 -0
- package/dist/controllers/resource-definition/resource-definition-controller.d.ts.map +1 -1
- package/dist/controllers/resource-definition/resource-definition-controller.js +3 -0
- package/dist/controllers/resource-definition/resource-definition-controller.js.map +1 -1
- package/dist/controllers/resource-definition/resource-template-controller.d.ts +5 -0
- package/dist/controllers/resource-definition/resource-template-controller.d.ts.map +1 -1
- package/dist/controllers/resource-definition/resource-template-controller.js +67 -6
- package/dist/controllers/resource-definition/resource-template-controller.js.map +1 -1
- package/dist/internal-context.d.ts +25 -0
- package/dist/internal-context.d.ts.map +1 -0
- package/dist/internal-context.js +2 -0
- package/dist/internal-context.js.map +1 -0
- package/dist/kernel.d.ts +21 -1
- package/dist/kernel.d.ts.map +1 -1
- package/dist/kernel.js +109 -5
- package/dist/kernel.js.map +1 -1
- package/dist/manifest-schemas.d.ts +7 -23
- package/dist/manifest-schemas.d.ts.map +1 -1
- package/dist/manifest-schemas.js +18 -8
- package/dist/manifest-schemas.js.map +1 -1
- package/dist/manifest-sources/analysis-stamp.d.ts +25 -0
- package/dist/manifest-sources/analysis-stamp.d.ts.map +1 -0
- package/dist/manifest-sources/analysis-stamp.js +151 -0
- package/dist/manifest-sources/analysis-stamp.js.map +1 -0
- package/dist/resource-context.d.ts +2 -0
- package/dist/resource-context.d.ts.map +1 -1
- package/dist/resource-context.js +28 -0
- package/dist/resource-context.js.map +1 -1
- package/dist/schema-validator.d.ts +28 -0
- package/dist/schema-validator.d.ts.map +1 -1
- package/dist/schema-validator.js +161 -1
- package/dist/schema-validator.js.map +1 -1
- package/package.json +9 -6
- package/src/application-env.ts +216 -0
- package/src/controller-loaders/npm-loader.ts +78 -103
- package/src/controllers/module/import-controller.ts +33 -36
- package/src/controllers/resource-definition/resource-definition-controller.ts +6 -0
- package/src/controllers/resource-definition/resource-template-controller.ts +95 -7
- package/src/internal-context.ts +25 -0
- package/src/kernel.ts +130 -5
- package/src/manifest-schemas.ts +31 -11
- package/src/manifest-sources/analysis-stamp.ts +169 -0
- package/src/resource-context.ts +34 -0
- package/src/schema-validator.ts +178 -2
- package/dist/generated/runtime-deps.json +0 -6
|
@@ -81,10 +81,13 @@ export interface NpmControllerLoaderOptions {
|
|
|
81
81
|
}
|
|
82
82
|
|
|
83
83
|
/**
|
|
84
|
-
* The npm-loader maintains a single install root per kernel process
|
|
85
|
-
*
|
|
86
|
-
*
|
|
87
|
-
*
|
|
84
|
+
* The npm-loader maintains a single install root per kernel process. For a
|
|
85
|
+
* local entry manifest (`file://` URL or bare path) the root lives at
|
|
86
|
+
* `<entry-manifest-dir>/.telo/npm/`; for an HTTP(S) entry URL it lives in a
|
|
87
|
+
* user-level cache keyed by `sha256(entryUrl)` (see `computeInstallRoot`).
|
|
88
|
+
* Every controller — registry tag or `local_path` — is installed via
|
|
89
|
+
* `npm install <spec>` into this root, then imported from
|
|
90
|
+
* `<root>/node_modules/<pkg>`. This collapses two parallel
|
|
88
91
|
* module realms (kernel-side @telorun/sdk vs. controller-side @telorun/sdk)
|
|
89
92
|
* into one: the kernel's own SDK is wired in as a `file:` dep, npm/pnpm
|
|
90
93
|
* symlink it, and Node's ESM resolver follows the symlink to the same
|
|
@@ -190,36 +193,24 @@ export class NpmControllerLoader {
|
|
|
190
193
|
);
|
|
191
194
|
}
|
|
192
195
|
const entryUrlStr = this.entryUrl;
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
//
|
|
196
|
-
//
|
|
197
|
-
//
|
|
198
|
-
//
|
|
199
|
-
//
|
|
200
|
-
|
|
201
|
-
const entryDir = path.dirname(path.resolve(entryPath));
|
|
202
|
-
const installRoot = path.join(entryDir, ".telo", "npm");
|
|
203
|
-
|
|
204
|
-
// Build the install-root package.json: kernel-runtime deps as `file:` refs,
|
|
205
|
-
// `overrides` + `pnpm.overrides` pinning every name to `$<name>`. This is
|
|
206
|
-
// the realm-collapse mechanism — npm's `file:` symlinks the kernel's own
|
|
207
|
-
// package locations, the resolver follows symlinks to the realpath, and
|
|
208
|
-
// every controller transitively resolving these names lands on the
|
|
209
|
-
// identical module instance the kernel itself is using.
|
|
210
|
-
const runtimeDeps = await loadRuntimeDeps();
|
|
196
|
+
const installRoot = computeInstallRoot(entryUrlStr);
|
|
197
|
+
|
|
198
|
+
// Build the install-root package.json: kernel-runtime deps as `file:` refs
|
|
199
|
+
// pointing at the kernel-side realpath. Modules declare these names as
|
|
200
|
+
// `peerDependencies`, so npm/pnpm resolve each controller's `import` to the
|
|
201
|
+
// single copy provided here — the realm-collapse mechanism that gives
|
|
202
|
+
// class-identity-sensitive types (today: `Stream`) one constructor across
|
|
203
|
+
// the kernel/controller boundary.
|
|
211
204
|
const dependencies: Record<string, string> = {};
|
|
212
|
-
const
|
|
213
|
-
for (const name of runtimeDeps) {
|
|
205
|
+
for (const name of REALM_COLLAPSE_NAMES) {
|
|
214
206
|
const resolvedPkgRoot = await resolveKernelPackageRoot(name);
|
|
215
207
|
if (!resolvedPkgRoot) {
|
|
216
208
|
// A kernel runtime dep that can't be resolved at boot is unusual but
|
|
217
|
-
// not fatal — the realm-collapse story degrades to "rely on
|
|
218
|
-
//
|
|
209
|
+
// not fatal — the realm-collapse story degrades to "rely on whatever
|
|
210
|
+
// the package manager picks" for that name. Don't crash the loader.
|
|
219
211
|
continue;
|
|
220
212
|
}
|
|
221
213
|
dependencies[name] = `file:${resolvedPkgRoot}`;
|
|
222
|
-
overrides[name] = `$${name}`;
|
|
223
214
|
}
|
|
224
215
|
|
|
225
216
|
const packageJson = {
|
|
@@ -227,8 +218,6 @@ export class NpmControllerLoader {
|
|
|
227
218
|
private: true,
|
|
228
219
|
version: "0.0.0",
|
|
229
220
|
dependencies,
|
|
230
|
-
overrides,
|
|
231
|
-
pnpm: { overrides },
|
|
232
221
|
};
|
|
233
222
|
const packageJsonPath = path.join(installRoot, "package.json");
|
|
234
223
|
const stateFile = path.join(installRoot, ".telo-state.json");
|
|
@@ -405,54 +394,18 @@ export class NpmControllerLoader {
|
|
|
405
394
|
}
|
|
406
395
|
|
|
407
396
|
/**
|
|
408
|
-
*
|
|
409
|
-
*
|
|
410
|
-
*
|
|
411
|
-
*
|
|
412
|
-
*
|
|
413
|
-
*
|
|
414
|
-
*
|
|
397
|
+
* Names of packages whose realpath must be shared between the kernel and every
|
|
398
|
+
* loaded controller. Each name here becomes a `file:` dep in the install-root
|
|
399
|
+
* `package.json`, pinned at the kernel's own resolution; controllers declare
|
|
400
|
+
* these names as `peerDependencies` so npm/pnpm resolves them to that single
|
|
401
|
+
* copy instead of nesting their own.
|
|
402
|
+
*
|
|
403
|
+
* Add a name here if you ship another shared runtime symbol whose `instanceof`
|
|
404
|
+
* or constructor identity matters across module boundaries. Today the only
|
|
405
|
+
* such name is `@telorun/sdk` (carries the `Stream` class registered with
|
|
406
|
+
* `@marcbachmann/cel-js`).
|
|
415
407
|
*/
|
|
416
|
-
|
|
417
|
-
const here = fileURLToPath(import.meta.url);
|
|
418
|
-
// Walk up from this file's location to the kernel-package root (the dir
|
|
419
|
-
// that contains package.json). In dev: `kernel/nodejs/`. In published:
|
|
420
|
-
// the installed package root inside `node_modules/@telorun/kernel/`.
|
|
421
|
-
// Walk-until-root rather than a fixed depth — the directory tree depth
|
|
422
|
-
// depends on whether we're in a workspace or installed tree.
|
|
423
|
-
const pkgDir = await walkUpToPackageRoot(path.dirname(here));
|
|
424
|
-
if (!pkgDir) return [];
|
|
425
|
-
|
|
426
|
-
const generated = path.join(pkgDir, "dist", "generated", "runtime-deps.json");
|
|
427
|
-
if (!(await pathExists(generated))) return [];
|
|
428
|
-
// The file is generated by `scripts/generate-runtime-deps.mjs`; if it
|
|
429
|
-
// exists but is malformed, that's a kernel-build bug. Don't swallow —
|
|
430
|
-
// surface so the cause is debuggable. Realm collapse is the whole point
|
|
431
|
-
// of this code path; quietly degrading to "no realm collapse" would
|
|
432
|
-
// silently re-introduce the very bug the file fixes.
|
|
433
|
-
const data = JSON.parse(await fs.readFile(generated, "utf8"));
|
|
434
|
-
if (!Array.isArray(data?.names)) {
|
|
435
|
-
throw new Error(
|
|
436
|
-
`[telo] ${generated} is malformed: expected { names: string[] } at top level. ` +
|
|
437
|
-
`Re-run \`node scripts/generate-runtime-deps.mjs <pkg-dir>\` to regenerate.`,
|
|
438
|
-
);
|
|
439
|
-
}
|
|
440
|
-
return data.names as string[];
|
|
441
|
-
}
|
|
442
|
-
|
|
443
|
-
/**
|
|
444
|
-
* Walk up from `from` until the directory contains a `package.json`.
|
|
445
|
-
* Returns null at filesystem root if none found.
|
|
446
|
-
*/
|
|
447
|
-
async function walkUpToPackageRoot(from: string): Promise<string | null> {
|
|
448
|
-
let dir = from;
|
|
449
|
-
while (true) {
|
|
450
|
-
if (await pathExists(path.join(dir, "package.json"))) return dir;
|
|
451
|
-
const parent = path.dirname(dir);
|
|
452
|
-
if (parent === dir) return null;
|
|
453
|
-
dir = parent;
|
|
454
|
-
}
|
|
455
|
-
}
|
|
408
|
+
const REALM_COLLAPSE_NAMES: ReadonlyArray<string> = ["@telorun/sdk"];
|
|
456
409
|
|
|
457
410
|
/**
|
|
458
411
|
* Resolve a kernel-runtime dep name to the realpath of its package directory.
|
|
@@ -675,35 +628,56 @@ async function readDepSpec(installRoot: string, packageName: string): Promise<st
|
|
|
675
628
|
}
|
|
676
629
|
|
|
677
630
|
/**
|
|
678
|
-
*
|
|
679
|
-
*
|
|
680
|
-
*
|
|
681
|
-
*
|
|
682
|
-
*
|
|
683
|
-
* `
|
|
631
|
+
* Decide where the per-kernel install root lives for a given entry URL.
|
|
632
|
+
*
|
|
633
|
+
* - `file://` URL or bare filesystem path: anchored next to the manifest at
|
|
634
|
+
* `<entry-dir>/.telo/npm/`. Same as before — keeps the "install lives with
|
|
635
|
+
* the project" story for local development and Docker builds where the
|
|
636
|
+
* tree is `COPY`-d into the image.
|
|
637
|
+
* - `http(s)://` URL: there is no on-disk anchor next to the manifest, so
|
|
638
|
+
* the install root lives in a user-level cache keyed by the SHA-256 of
|
|
639
|
+
* the entry URL: `<cacheDir>/<hash>/npm/`. Repeat runs of the same URL
|
|
640
|
+
* hit the same cache; distinct URLs get isolated trees so two unrelated
|
|
641
|
+
* remote apps don't share `node_modules` (different controller versions,
|
|
642
|
+
* different realm-collapse pins).
|
|
684
643
|
*
|
|
685
|
-
*
|
|
686
|
-
*
|
|
687
|
-
*
|
|
644
|
+
* Cache location, in priority order:
|
|
645
|
+
* 1. `$TELO_NPM_CACHE_DIR` (explicit override — tests use this to avoid
|
|
646
|
+
* polluting the developer's `~/.cache`).
|
|
647
|
+
* 2. `$XDG_CACHE_HOME/telo/remote` (standard XDG path on Linux).
|
|
648
|
+
* 3. `<os.homedir()>/.cache/telo/remote` (POSIX fallback / macOS).
|
|
649
|
+
*
|
|
650
|
+
* Unrecognised schemes (anything that isn't `file://`, `http://`, or
|
|
651
|
+
* `https://`) still throw `ControllerEnvMissingError` so the dispatcher can
|
|
652
|
+
* advance to a non-npm candidate.
|
|
688
653
|
*/
|
|
689
|
-
function
|
|
690
|
-
if (entryUrl.startsWith("file://"))
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
const schemeMatch = entryUrl.match(/^([a-zA-Z][a-zA-Z0-9+.-]*):\/\//);
|
|
694
|
-
if (schemeMatch) {
|
|
695
|
-
// Env-missing rather than a hard error: the dispatcher should advance
|
|
696
|
-
// to the next candidate when an HTTP-sourced manifest is paired with a
|
|
697
|
-
// `pkg:cargo` (or other non-npm) fallback. Hard-failing would lock the
|
|
698
|
-
// whole resolve chain to this branch.
|
|
699
|
-
throw new ControllerEnvMissingError(
|
|
700
|
-
`[telo] entry URL scheme '${schemeMatch[1]}' is not supported by the npm controller ` +
|
|
701
|
-
`loader. The install root must live next to a local manifest; HTTP-sourced manifests ` +
|
|
702
|
-
`have no such anchor. Resolve the manifest to disk first, or use file:// directly. ` +
|
|
703
|
-
`(entryUrl: ${entryUrl})`,
|
|
704
|
-
);
|
|
654
|
+
function computeInstallRoot(entryUrl: string): string {
|
|
655
|
+
if (entryUrl.startsWith("file://")) {
|
|
656
|
+
const entryPath = fileURLToPath(entryUrl);
|
|
657
|
+
return path.join(path.dirname(path.resolve(entryPath)), ".telo", "npm");
|
|
705
658
|
}
|
|
706
|
-
|
|
659
|
+
const schemeMatch = entryUrl.match(/^([a-zA-Z][a-zA-Z0-9+.-]*):\/\//);
|
|
660
|
+
if (!schemeMatch) {
|
|
661
|
+
// Bare filesystem path: same anchor as `file://`.
|
|
662
|
+
return path.join(path.dirname(path.resolve(entryUrl)), ".telo", "npm");
|
|
663
|
+
}
|
|
664
|
+
const scheme = schemeMatch[1].toLowerCase();
|
|
665
|
+
if (scheme === "http" || scheme === "https") {
|
|
666
|
+
const cacheBase =
|
|
667
|
+
process.env.TELO_NPM_CACHE_DIR ||
|
|
668
|
+
(process.env.XDG_CACHE_HOME
|
|
669
|
+
? path.join(process.env.XDG_CACHE_HOME, "telo", "remote")
|
|
670
|
+
: path.join(os.homedir(), ".cache", "telo", "remote"));
|
|
671
|
+
return path.join(cacheBase, sha256(entryUrl), "npm");
|
|
672
|
+
}
|
|
673
|
+
// Env-missing rather than a hard error: the dispatcher should advance to
|
|
674
|
+
// the next candidate when a non-npm scheme is paired with a `pkg:cargo`
|
|
675
|
+
// (or other) fallback.
|
|
676
|
+
throw new ControllerEnvMissingError(
|
|
677
|
+
`[telo] entry URL scheme '${schemeMatch[1]}' is not supported by the npm controller ` +
|
|
678
|
+
`loader. Supported schemes: file://, http://, https://, or a bare filesystem path. ` +
|
|
679
|
+
`(entryUrl: ${entryUrl})`,
|
|
680
|
+
);
|
|
707
681
|
}
|
|
708
682
|
|
|
709
683
|
/**
|
|
@@ -954,7 +928,8 @@ export const __testing__ = {
|
|
|
954
928
|
resolvePackageExportTarget,
|
|
955
929
|
resolveExportTargetValue,
|
|
956
930
|
tryResolveFile,
|
|
957
|
-
|
|
931
|
+
computeInstallRoot,
|
|
958
932
|
EXPORTS_MAX_DEPTH,
|
|
959
933
|
DEFAULT_RESOLVER_CONDITIONS,
|
|
934
|
+
REALM_COLLAPSE_NAMES,
|
|
960
935
|
};
|
|
@@ -1,26 +1,14 @@
|
|
|
1
1
|
import { DiagnosticSeverity, StaticAnalyzer } from "@telorun/analyzer";
|
|
2
|
-
import type {
|
|
2
|
+
import type { ResourceInstance } from "@telorun/sdk";
|
|
3
3
|
import { RuntimeError } from "@telorun/sdk";
|
|
4
|
+
import type { BuiltinControllerContext } from "../../internal-context.js";
|
|
4
5
|
import { ModuleContext } from "../../module-context.js";
|
|
5
6
|
import { isDefaultPolicy, normalizeRuntime } from "../../runtime-registry.js";
|
|
6
7
|
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
>
|
|
11
|
-
|
|
12
|
-
// Only resolve relative/absolute-path sources against the importer's URL. Registry refs
|
|
13
|
-
// (std/foo@1.2.3) and absolute URLs (https://, file://) must pass through unchanged so the
|
|
14
|
-
// loader's source chain can dispatch them — otherwise `new URL("std/foo@1", "file:///srv/telo.yaml")`
|
|
15
|
-
// turns a registry ref into a bogus file path and LocalFileSource ENOENTs on it.
|
|
16
|
-
function resolveImportSource(source: string, baseSource: string): string {
|
|
17
|
-
if (source.startsWith(".") || source.startsWith("/")) {
|
|
18
|
-
return new URL(source, baseSource).toString();
|
|
19
|
-
}
|
|
20
|
-
return source;
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
export async function create(resource: any, ctx: ResourceContext): Promise<ResourceInstance> {
|
|
8
|
+
export async function create(
|
|
9
|
+
resource: any,
|
|
10
|
+
ctx: BuiltinControllerContext,
|
|
11
|
+
): Promise<ResourceInstance> {
|
|
24
12
|
const alias = resource.metadata.name as string;
|
|
25
13
|
|
|
26
14
|
const moduleSource: string = resource.module ?? resource.source;
|
|
@@ -36,27 +24,36 @@ export async function create(resource: any, ctx: ResourceContext): Promise<Resou
|
|
|
36
24
|
// Validate the imported module and all its transitive imports before loading for runtime.
|
|
37
25
|
// loadManifests() follows Telo.Import chains so definitions from sub-imports are present,
|
|
38
26
|
// preventing false UNDEFINED_KIND errors for kinds that come from the module's own imports.
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
27
|
+
//
|
|
28
|
+
// Route URL resolution through the kernel/loader's own helper rather than
|
|
29
|
+
// a hand-rolled `new URL(...).toString()`. For LocalFileSource the
|
|
30
|
+
// outputs match; for any custom `ManifestSource` with a non-trivial
|
|
31
|
+
// `resolveRelative`, only this path produces the canonical URL the
|
|
32
|
+
// loader keyed its caches under — without which fast paths like
|
|
33
|
+
// `isImportValidatedAtLoad` silently miss.
|
|
34
|
+
const resolvedUrl = ctx.resolveImportUrl(base, moduleSource);
|
|
35
|
+
|
|
36
|
+
// Fast path: when the kernel's load-time `analyzeErrors` already covered
|
|
37
|
+
// this import's subtree (the common case — every Telo.Import declared in
|
|
38
|
+
// the entry graph is walked by `loadGraph` and validated by
|
|
39
|
+
// `kernel.load`), skip the redundant per-import StaticAnalyzer pass.
|
|
40
|
+
// Falls through to the full analysis for URLs that arrived
|
|
41
|
+
// programmatically after `load()` (e.g. dynamically constructed imports
|
|
42
|
+
// in tests). Two Telo.Imports with the same source but distinct
|
|
43
|
+
// metadata.name would each re-run analysis here — a memoisation hook
|
|
44
|
+
// can be reintroduced if that turns into a measurable cost.
|
|
45
|
+
if (!ctx.isImportValidatedAtLoad(resolvedUrl)) {
|
|
46
|
+
const analysisManifests = await ctx.loadManifests(resolvedUrl);
|
|
48
47
|
const diagnostics = new StaticAnalyzer().analyze(analysisManifests);
|
|
49
|
-
errors = diagnostics
|
|
48
|
+
const errors = diagnostics
|
|
50
49
|
.filter((d) => d.severity === DiagnosticSeverity.Error)
|
|
51
50
|
.map((d) => d.message);
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
errors.join("\n"),
|
|
59
|
-
);
|
|
51
|
+
if (errors.length > 0) {
|
|
52
|
+
throw new RuntimeError(
|
|
53
|
+
"ERR_MANIFEST_VALIDATION_FAILED",
|
|
54
|
+
errors.join("\n"),
|
|
55
|
+
);
|
|
56
|
+
}
|
|
60
57
|
}
|
|
61
58
|
|
|
62
59
|
// Load target module manifests for runtime. Inject variables/secrets as compile context so
|
|
@@ -18,6 +18,7 @@ type ResourceDefinitionResource = RuntimeResource & {
|
|
|
18
18
|
schema: Record<string, any>;
|
|
19
19
|
capability?: string;
|
|
20
20
|
controllers?: Array<string>;
|
|
21
|
+
provide?: unknown;
|
|
21
22
|
};
|
|
22
23
|
|
|
23
24
|
/**
|
|
@@ -31,6 +32,11 @@ class ResourceDefinition implements ResourceInstance {
|
|
|
31
32
|
|
|
32
33
|
async init(ctx: ResourceContext) {
|
|
33
34
|
if (!this.resource.controllers?.length) {
|
|
35
|
+
if (this.resource.capability === "Telo.Provider" && this.resource.provide == null) {
|
|
36
|
+
throw new Error(
|
|
37
|
+
`Telo.Definition '${this.resource.metadata.name}': 'capability: Telo.Provider' requires either 'controllers:' (TS-backed) or 'provide:' (template-backed).`,
|
|
38
|
+
);
|
|
39
|
+
}
|
|
34
40
|
const controllerInstance = createTemplateController(this.resource as any);
|
|
35
41
|
ctx.registerDefinition(this.resource);
|
|
36
42
|
await ctx.registerController(
|
|
@@ -1,12 +1,32 @@
|
|
|
1
1
|
import type { ControllerInstance, ResourceContext, ResourceInstance } from "@telorun/sdk";
|
|
2
2
|
import { isCompiledValue } from "@telorun/sdk";
|
|
3
3
|
|
|
4
|
+
/** Reports the resources: entries available to dispatch against, by expanded
|
|
5
|
+
* name and kind. Used in error messages to guide the developer back to the
|
|
6
|
+
* template's `resources:` array when a dispatch target doesn't match. */
|
|
7
|
+
function describeAvailableTargets(
|
|
8
|
+
ctx: ResourceContext,
|
|
9
|
+
resources: any[] | undefined,
|
|
10
|
+
self: Record<string, unknown>,
|
|
11
|
+
): string {
|
|
12
|
+
if (!resources || resources.length === 0) return "<none>";
|
|
13
|
+
return resources
|
|
14
|
+
.map((r) => {
|
|
15
|
+
const expanded = ctx.moduleContext.expandWith(r?.metadata?.name ?? "", { self }) as string;
|
|
16
|
+
const kind = typeof r?.kind === "string" ? r.kind : "<unknown-kind>";
|
|
17
|
+
return `'${expanded || "<unnamed>"}' (${kind})`;
|
|
18
|
+
})
|
|
19
|
+
.join(", ");
|
|
20
|
+
}
|
|
21
|
+
|
|
4
22
|
export function createTemplateController(definition: {
|
|
5
23
|
schema: Record<string, any>;
|
|
6
24
|
resources?: any[];
|
|
7
25
|
invoke?: string | { kind?: string; name: string };
|
|
8
26
|
inputs?: Record<string, any>;
|
|
9
27
|
run?: string;
|
|
28
|
+
provide?: { kind: string; name: string };
|
|
29
|
+
result?: Record<string, any>;
|
|
10
30
|
}): ControllerInstance {
|
|
11
31
|
return {
|
|
12
32
|
schema: definition.schema ?? { type: "object", additionalProperties: true },
|
|
@@ -32,6 +52,9 @@ export function createTemplateController(definition: {
|
|
|
32
52
|
const runTarget = definition.run
|
|
33
53
|
? (ctx.moduleContext.expandWith(definition.run, { self }) as string)
|
|
34
54
|
: null;
|
|
55
|
+
const provideTarget = definition.provide?.name
|
|
56
|
+
? (ctx.moduleContext.expandWith(definition.provide.name, { self }) as string)
|
|
57
|
+
: null;
|
|
35
58
|
|
|
36
59
|
const persistentManifests: any[] = [];
|
|
37
60
|
let ephemeralTemplate: any = null;
|
|
@@ -40,7 +63,10 @@ export function createTemplateController(definition: {
|
|
|
40
63
|
const expandedName = ctx.moduleContext.expandWith(template.metadata?.name ?? "", {
|
|
41
64
|
self,
|
|
42
65
|
}) as string;
|
|
43
|
-
const isTarget =
|
|
66
|
+
const isTarget =
|
|
67
|
+
expandedName === invokeTarget ||
|
|
68
|
+
expandedName === runTarget ||
|
|
69
|
+
expandedName === provideTarget;
|
|
44
70
|
if (isTarget) {
|
|
45
71
|
ephemeralTemplate = template;
|
|
46
72
|
} else {
|
|
@@ -84,7 +110,8 @@ export function createTemplateController(definition: {
|
|
|
84
110
|
invoke: async (inputs: any) => {
|
|
85
111
|
if (!ephemeralTemplate) {
|
|
86
112
|
throw new Error(
|
|
87
|
-
`Template '${resource.metadata.name}':
|
|
113
|
+
`Template '${resource.metadata.name}': 'invoke:' targets '${invokeTarget}' ` +
|
|
114
|
+
`but no entry in 'resources:' has that metadata.name. Available: ${describeAvailableTargets(ctx, definition.resources, self)}.`,
|
|
88
115
|
);
|
|
89
116
|
}
|
|
90
117
|
const extraContext = { self, inputs };
|
|
@@ -95,7 +122,13 @@ export function createTemplateController(definition: {
|
|
|
95
122
|
return withEphemeral(expanded, async (name) => {
|
|
96
123
|
const entry = ctx.moduleContext.resourceInstances.get(name);
|
|
97
124
|
if (!entry?.instance?.invoke) {
|
|
98
|
-
|
|
125
|
+
const targetKind = (entry?.resource?.kind ?? expanded?.kind ?? "<unknown-kind>") as string;
|
|
126
|
+
const targetDef = ctx.moduleContext.getDefinition?.(targetKind);
|
|
127
|
+
const actualCap = typeof targetDef?.capability === "string" ? targetDef.capability : "<unknown>";
|
|
128
|
+
throw new Error(
|
|
129
|
+
`Template '${resource.metadata.name}': 'invoke:' target '${targetKind}/${invokeTarget}' ` +
|
|
130
|
+
`has capability '${actualCap}', not Telo.Invocable. Update 'invoke:' to a Telo.Invocable kind, or change the target's kind in 'resources:'.`,
|
|
131
|
+
);
|
|
99
132
|
}
|
|
100
133
|
// Top-level `inputs:` (sibling of `invoke:`) carries the values passed
|
|
101
134
|
// to the dispatch target's invoke(). When absent, fall back to the
|
|
@@ -108,7 +141,13 @@ export function createTemplateController(definition: {
|
|
|
108
141
|
extraContext,
|
|
109
142
|
)
|
|
110
143
|
: expanded.inputs ?? inputs;
|
|
111
|
-
|
|
144
|
+
const raw = await entry.instance.invoke(invokeInputs);
|
|
145
|
+
if (definition.result == null) return raw;
|
|
146
|
+
const resultContext = { self, result: raw };
|
|
147
|
+
return ctx.moduleContext.expandWith(
|
|
148
|
+
ctx.moduleContext.expandWith(definition.result, resultContext),
|
|
149
|
+
resultContext,
|
|
150
|
+
);
|
|
112
151
|
});
|
|
113
152
|
},
|
|
114
153
|
}),
|
|
@@ -117,24 +156,73 @@ export function createTemplateController(definition: {
|
|
|
117
156
|
run: async () => {
|
|
118
157
|
if (!ephemeralTemplate) {
|
|
119
158
|
throw new Error(
|
|
120
|
-
`Template '${resource.metadata.name}':
|
|
159
|
+
`Template '${resource.metadata.name}': 'run:' targets '${runTarget}' ` +
|
|
160
|
+
`but no entry in 'resources:' has that metadata.name. Available: ${describeAvailableTargets(ctx, definition.resources, self)}.`,
|
|
121
161
|
);
|
|
122
162
|
}
|
|
123
163
|
const extraContext = { self };
|
|
124
164
|
const expanded = ctx.moduleContext.expandWith(
|
|
125
165
|
ctx.moduleContext.expandWith(ephemeralTemplate, extraContext),
|
|
126
166
|
extraContext,
|
|
127
|
-
);
|
|
167
|
+
) as any;
|
|
128
168
|
return withEphemeral(expanded, async (name) => {
|
|
129
169
|
const entry = ctx.moduleContext.resourceInstances.get(name);
|
|
130
170
|
if (!entry?.instance?.run) {
|
|
131
|
-
|
|
171
|
+
const targetKind = (entry?.resource?.kind ?? expanded?.kind ?? "<unknown-kind>") as string;
|
|
172
|
+
const targetDef = ctx.moduleContext.getDefinition?.(targetKind);
|
|
173
|
+
const actualCap = typeof targetDef?.capability === "string" ? targetDef.capability : "<unknown>";
|
|
174
|
+
throw new Error(
|
|
175
|
+
`Template '${resource.metadata.name}': 'run:' target '${targetKind}/${runTarget}' ` +
|
|
176
|
+
`has capability '${actualCap}', not Telo.Runnable. Update 'run:' to a Telo.Runnable kind, or change the target's kind in 'resources:'.`,
|
|
177
|
+
);
|
|
132
178
|
}
|
|
133
179
|
return entry.instance.run();
|
|
134
180
|
});
|
|
135
181
|
},
|
|
136
182
|
}),
|
|
137
183
|
|
|
184
|
+
...(provideTarget && {
|
|
185
|
+
provide: async () => {
|
|
186
|
+
if (!ephemeralTemplate) {
|
|
187
|
+
throw new Error(
|
|
188
|
+
`Template '${resource.metadata.name}': 'provide:' targets '${provideTarget}' ` +
|
|
189
|
+
`but no entry in 'resources:' has that metadata.name. Available: ${describeAvailableTargets(ctx, definition.resources, self)}.`,
|
|
190
|
+
);
|
|
191
|
+
}
|
|
192
|
+
const extraContext = { self };
|
|
193
|
+
const expanded = ctx.moduleContext.expandWith(
|
|
194
|
+
ctx.moduleContext.expandWith(ephemeralTemplate, extraContext),
|
|
195
|
+
extraContext,
|
|
196
|
+
) as any;
|
|
197
|
+
return withEphemeral(expanded, async (name) => {
|
|
198
|
+
const entry = ctx.moduleContext.resourceInstances.get(name);
|
|
199
|
+
if (!entry?.instance?.invoke) {
|
|
200
|
+
const targetKind = (entry?.resource?.kind ?? expanded?.kind ?? "<unknown-kind>") as string;
|
|
201
|
+
const targetDef = ctx.moduleContext.getDefinition?.(targetKind);
|
|
202
|
+
const actualCap = typeof targetDef?.capability === "string" ? targetDef.capability : "<unknown>";
|
|
203
|
+
throw new Error(
|
|
204
|
+
`Template '${resource.metadata.name}': 'provide:' target '${targetKind}/${provideTarget}' ` +
|
|
205
|
+
`has capability '${actualCap}', not Telo.Invocable. Update 'provide:' to a Telo.Invocable kind, or change the target's kind in 'resources:'.`,
|
|
206
|
+
);
|
|
207
|
+
}
|
|
208
|
+
const provideInputs: any =
|
|
209
|
+
definition.inputs != null
|
|
210
|
+
? ctx.moduleContext.expandWith(
|
|
211
|
+
ctx.moduleContext.expandWith(definition.inputs, extraContext),
|
|
212
|
+
extraContext,
|
|
213
|
+
)
|
|
214
|
+
: {};
|
|
215
|
+
const raw = await entry.instance.invoke(provideInputs);
|
|
216
|
+
if (definition.result == null) return raw;
|
|
217
|
+
const resultContext = { self, result: raw };
|
|
218
|
+
return ctx.moduleContext.expandWith(
|
|
219
|
+
ctx.moduleContext.expandWith(definition.result, resultContext),
|
|
220
|
+
resultContext,
|
|
221
|
+
);
|
|
222
|
+
});
|
|
223
|
+
},
|
|
224
|
+
}),
|
|
225
|
+
|
|
138
226
|
teardown: async () => {
|
|
139
227
|
await childContext.teardownResources();
|
|
140
228
|
},
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import type { ResourceContext } from "@telorun/sdk";
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Context interface used by built-in kernel controllers (Telo.Application /
|
|
5
|
+
* Telo.Library / Telo.Import / Telo.Definition / Telo.Abstract) that need
|
|
6
|
+
* privileged access to load-time graph identity. These methods are
|
|
7
|
+
* intentionally *not* on the public `ResourceContext` exposed to module
|
|
8
|
+
* authors — they couple the caller to the kernel's load-time view of the
|
|
9
|
+
* world, and the import-controller is the only consumer today.
|
|
10
|
+
*
|
|
11
|
+
* `ResourceContextImpl` in this package implements both interfaces, so a
|
|
12
|
+
* controller authored against this type still works under the generic
|
|
13
|
+
* `controller.create(resource, ctx)` dispatch — the kernel just types it
|
|
14
|
+
* locally as `BuiltinControllerContext` instead of `ResourceContext`.
|
|
15
|
+
*/
|
|
16
|
+
export interface BuiltinControllerContext extends ResourceContext {
|
|
17
|
+
/** True when `url` resolved (via the loader's URL → canonical-source
|
|
18
|
+
* map) to a module that was part of the entry graph successfully
|
|
19
|
+
* analyzed during `Kernel.load()`. */
|
|
20
|
+
isImportValidatedAtLoad(url: string): boolean;
|
|
21
|
+
/** Resolve `importSource` against `fromSource` through the loader's
|
|
22
|
+
* source-chain `resolveRelative`. Identical to what `loadGraph` used
|
|
23
|
+
* internally — so the produced URL agrees with the loader's caches. */
|
|
24
|
+
resolveImportUrl(fromSource: string, importSource: string): string;
|
|
25
|
+
}
|