@smoothbricks/nx-plugin 0.7.11 → 0.7.13
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/README.md +87 -25
- package/dist/.build-inputs.json +25 -17
- package/dist/built-output-packages.d.ts +27 -0
- package/dist/built-output-packages.d.ts.map +1 -0
- package/dist/built-output-packages.js +97 -0
- package/dist/cross-check-policy.d.ts +13 -1
- package/dist/cross-check-policy.d.ts.map +1 -1
- package/dist/cross-check-policy.js +13 -1
- package/dist/executors/bounded-exec/admission-queue.d.ts +68 -0
- package/dist/executors/bounded-exec/admission-queue.d.ts.map +1 -0
- package/dist/executors/bounded-exec/admission-queue.js +131 -0
- package/dist/executors/bounded-exec/cpu-grant.d.ts +14 -0
- package/dist/executors/bounded-exec/cpu-grant.d.ts.map +1 -0
- package/dist/executors/bounded-exec/cpu-grant.js +18 -0
- package/dist/executors/bounded-exec/cpu-pool-thread.d.ts +5 -4
- package/dist/executors/bounded-exec/cpu-pool-thread.d.ts.map +1 -1
- package/dist/executors/bounded-exec/cpu-pool.d.ts +26 -24
- package/dist/executors/bounded-exec/cpu-pool.d.ts.map +1 -1
- package/dist/executors/bounded-exec/cpu-pool.js +88 -72
- package/dist/executors/bounded-exec/executor.d.ts +5 -7
- package/dist/executors/bounded-exec/executor.d.ts.map +1 -1
- package/dist/executors/bounded-exec/executor.js +69 -133
- package/dist/executors/bounded-exec/host-memory.d.ts +22 -0
- package/dist/executors/bounded-exec/host-memory.d.ts.map +1 -1
- package/dist/executors/bounded-exec/host-memory.darwin.d.ts.map +1 -1
- package/dist/executors/bounded-exec/host-memory.darwin.js +7 -1
- package/dist/executors/bounded-exec/host-memory.js +6 -0
- package/dist/executors/bounded-exec/host-memory.linux.d.ts +3 -1
- package/dist/executors/bounded-exec/host-memory.linux.d.ts.map +1 -1
- package/dist/executors/bounded-exec/host-memory.linux.js +43 -1
- package/dist/executors/bounded-exec/memory-retry.d.ts +39 -0
- package/dist/executors/bounded-exec/memory-retry.d.ts.map +1 -0
- package/dist/executors/bounded-exec/memory-retry.js +33 -0
- package/dist/executors/bounded-exec/parent-grant.d.ts +43 -0
- package/dist/executors/bounded-exec/parent-grant.d.ts.map +1 -0
- package/dist/executors/bounded-exec/parent-grant.js +37 -0
- package/dist/executors/bounded-exec/peak-charge.d.ts +17 -0
- package/dist/executors/bounded-exec/peak-charge.d.ts.map +1 -0
- package/dist/executors/bounded-exec/peak-charge.js +20 -0
- package/dist/executors/bounded-exec/pool-admission.d.ts +31 -7
- package/dist/executors/bounded-exec/pool-admission.d.ts.map +1 -1
- package/dist/executors/bounded-exec/pool-admission.js +44 -8
- package/dist/executors/bounded-exec/pool-environment.d.ts +25 -0
- package/dist/executors/bounded-exec/pool-environment.d.ts.map +1 -0
- package/dist/executors/bounded-exec/pool-environment.js +34 -0
- package/dist/executors/bounded-exec/run-cpu-pool.d.ts.map +1 -1
- package/dist/executors/bounded-exec/run-cpu-pool.js +2 -2
- package/dist/executors/bounded-exec/verdict.d.ts +5 -18
- package/dist/executors/bounded-exec/verdict.d.ts.map +1 -1
- package/dist/executors/bounded-exec/verdict.js +12 -16
- package/dist/index.d.ts +4 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +62 -21
- package/dist/managed-files/ci-workflow.d.ts +29 -5
- package/dist/managed-files/ci-workflow.d.ts.map +1 -1
- package/dist/managed-files/ci-workflow.js +111 -16
- package/dist/managed-files/context.d.ts.map +1 -1
- package/dist/managed-files/context.js +1 -0
- package/dist/managed-files/files.d.ts +3 -1
- package/dist/managed-files/files.d.ts.map +1 -1
- package/dist/managed-files/files.js +2 -0
- package/dist/managed-files/publish-workflow.d.ts +6 -1
- package/dist/managed-files/publish-workflow.d.ts.map +1 -1
- package/dist/managed-files/publish-workflow.js +16 -11
- package/dist/owned-installation.d.ts.map +1 -1
- package/dist/owned-installation.js +48 -14
- package/dist/typecheck-route.d.ts +28 -0
- package/dist/typecheck-route.d.ts.map +1 -0
- package/dist/typecheck-route.js +109 -0
- package/dist/workspace-manifest.d.ts +50 -5
- package/dist/workspace-manifest.d.ts.map +1 -1
- package/executors.json +10 -0
- package/managed/raw/patches/nx@24.0.3.patch +16 -0
- package/managed/raw/patches/ttsc@0.34.1.patch +93 -8
- package/managed/raw/tooling/direnv/apple-developer.sh +8 -1
- package/managed/raw/tooling/direnv/compiler-variables.sh +1 -1
- package/managed/raw/tooling/direnv/github-actions-bootstrap.sh +4 -2
- package/managed/raw/tooling/direnv/secret-references.ts +19 -5
- package/managed/raw/tooling/git-hooks/pre-push.sh +20 -10
- package/managed/templates/github/actions/forgejo-artifact.cjs +9 -9
- package/managed/templates/github/actions/setup-devenv/action.yml +53 -0
- package/package.json +2 -2
- package/src/built-output-packages.ts +125 -0
- package/src/cross-check-policy.ts +14 -1
- package/src/executors/bounded-exec/admission-queue.ts +163 -0
- package/src/executors/bounded-exec/cpu-grant.ts +32 -0
- package/src/executors/bounded-exec/cpu-pool-thread.ts +5 -4
- package/src/executors/bounded-exec/cpu-pool.ts +123 -58
- package/src/executors/bounded-exec/executor.ts +93 -168
- package/src/executors/bounded-exec/host-memory.darwin.ts +7 -1
- package/src/executors/bounded-exec/host-memory.linux.ts +42 -2
- package/src/executors/bounded-exec/host-memory.ts +25 -0
- package/src/executors/bounded-exec/memory-retry.ts +63 -0
- package/src/executors/bounded-exec/parent-grant.ts +75 -0
- package/src/executors/bounded-exec/peak-charge.ts +25 -0
- package/src/executors/bounded-exec/pool-admission.ts +66 -11
- package/src/executors/bounded-exec/pool-environment.ts +45 -0
- package/src/executors/bounded-exec/run-cpu-pool.ts +5 -4
- package/src/executors/bounded-exec/verdict.ts +17 -25
- package/src/index.ts +70 -21
- package/src/managed-files/ci-workflow.ts +143 -16
- package/src/managed-files/context.ts +1 -0
- package/src/managed-files/files.ts +5 -0
- package/src/managed-files/publish-workflow.ts +26 -10
- package/src/owned-installation.ts +63 -14
- package/src/typecheck-route.ts +64 -0
- package/src/workspace-manifest.ts +56 -5
- package/test-timings.json +141 -137
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { isMap, isScalar, parseDocument } from 'yaml';
|
|
3
3
|
import { LINUX_PLATFORM_TARGET_GLOBS, MACOS_PLATFORM_TARGET_GLOBS, RELEASE_CONFIGURATION, } from '../platform-targets.js';
|
|
4
4
|
import { isSmoothBricksCodebasePackageName } from '../workspace-package-policy.js';
|
|
5
|
-
import { artifactStepLines, CI_JOB_ID, CI_WORKFLOW_NAME, CiWorkflowStepKind, cargoCredentialJobEnvLines, cargoCredentialStepLines, deployStepSecretEnvLines, githubActionPins, remoteCacheJobEnvLines, sourceCheckoutsStepLines, TRACE_DB_ARTIFACT_GLOB, } from './ci-workflow.js';
|
|
5
|
+
import { artifactStepLines, CI_JOB_ID, CI_WORKFLOW_NAME, CiWorkflowStepKind, cargoCredentialJobEnvLines, cargoCredentialStepLines, deployStepSecretEnvLines, githubActionPins, mbxRemoteJobEnvLines, remoteCacheJobEnvLines, sourceCheckoutsStepLines, TRACE_DB_ARTIFACT_GLOB, } from './ci-workflow.js';
|
|
6
6
|
import { GITHUB_HOSTED_LINUX_RUNNER, renderRunsOnLine } from './github-runs-on.js';
|
|
7
7
|
/**
|
|
8
8
|
* Carried by every step that builds what ships: the build aggregate and each
|
|
@@ -345,7 +345,7 @@ ${options.release === false ? renderRunsOnLine(options.runsOn) : publishJobRunsO
|
|
|
345
345
|
timeout-minutes: ${options.platformTargetGlobs?.length ? 90 : 45}
|
|
346
346
|
env:
|
|
347
347
|
LMAO_GIT_REVISION: ${githubExpression('github.sha')}
|
|
348
|
-
GH_TOKEN: ${githubExpression('github.token')}${remoteCacheJobEnv(options)}${cargoCredentialsJobEnv(options)}${privateNpmInstallJobEnv(options)}
|
|
348
|
+
GH_TOKEN: ${githubExpression('github.token')}${remoteCacheJobEnv(options, options.release === false ? 'internal' : publisherReach(options))}${cargoCredentialsJobEnv(options)}${privateNpmInstallJobEnv(options)}
|
|
349
349
|
steps:
|
|
350
350
|
`;
|
|
351
351
|
}
|
|
@@ -601,13 +601,14 @@ function cargoCredentialsJobEnv(options) {
|
|
|
601
601
|
return rendered === '' ? '' : `\n${rendered}`;
|
|
602
602
|
}
|
|
603
603
|
/**
|
|
604
|
-
* The remote
|
|
605
|
-
* reads
|
|
606
|
-
*
|
|
607
|
-
*
|
|
604
|
+
* The remote caches are job env for the same reason: every Nx target in the job
|
|
605
|
+
* reads the Nx cache and every Cargo build the mbx one, and a release build
|
|
606
|
+
* that missed them would rebuild what CI already built for the identical
|
|
607
|
+
* inputs. Only `${{ secrets.NAME }}` is rendered for a token. Malformed
|
|
608
|
+
* declarations throw here, not in CI.
|
|
608
609
|
*/
|
|
609
|
-
function remoteCacheJobEnv(options) {
|
|
610
|
-
const rendered = remoteCacheJobEnvLines(options.remoteCache).trimEnd();
|
|
610
|
+
function remoteCacheJobEnv(options, reach) {
|
|
611
|
+
const rendered = (remoteCacheJobEnvLines(options.remoteCache, reach) + mbxRemoteJobEnvLines(options.mbxRemote, reach)).trimEnd();
|
|
611
612
|
return rendered === '' ? '' : `\n${rendered}`;
|
|
612
613
|
}
|
|
613
614
|
function renderSingleJobPublishWorkflowSteps(steps, options) {
|
|
@@ -704,7 +705,7 @@ ${renderRunsOnLine(options.runsOn)}
|
|
|
704
705
|
release-sha: ${githubExpression('steps.release-state.outputs.sha')}
|
|
705
706
|
env:
|
|
706
707
|
LMAO_GIT_REVISION: ${githubExpression('github.sha')}
|
|
707
|
-
GH_TOKEN: ${githubExpression('github.token')}${remoteCacheJobEnv(options)}${cargoCredentialsJobEnv(options)}${privateNpmInstallJobEnv(options)}
|
|
708
|
+
GH_TOKEN: ${githubExpression('github.token')}${remoteCacheJobEnv(options, 'internal')}${cargoCredentialsJobEnv(options)}${privateNpmInstallJobEnv(options)}
|
|
708
709
|
steps:
|
|
709
710
|
${renderLinuxReleaseCandidateSteps(steps, options)}
|
|
710
711
|
|
|
@@ -716,7 +717,7 @@ ${renderMacosJobHeaderLines(options)}
|
|
|
716
717
|
id-token: none
|
|
717
718
|
env:
|
|
718
719
|
LMAO_GIT_REVISION: ${githubExpression('github.sha')}
|
|
719
|
-
GH_TOKEN: ${githubExpression('github.token')}${remoteCacheJobEnv(options)}${cargoCredentialsJobEnv(options)}${privateNpmInstallJobEnv(options)}
|
|
720
|
+
GH_TOKEN: ${githubExpression('github.token')}${remoteCacheJobEnv(options, options.platformProducer?.kind === 'linux-cross' ? 'internal' : 'public')}${cargoCredentialsJobEnv(options)}${privateNpmInstallJobEnv(options)}
|
|
720
721
|
steps:
|
|
721
722
|
${renderMacosPlatformSteps(options)}
|
|
722
723
|
|
|
@@ -730,7 +731,7 @@ ${publishJobRunsOnLine(options)}
|
|
|
730
731
|
env:
|
|
731
732
|
LMAO_GIT_REVISION: ${githubExpression('github.sha')}
|
|
732
733
|
TTSC_TSGO_BINARY: ${githubExpression('github.workspace')}/node_modules/@typescript/native/bin/tsc
|
|
733
|
-
GH_TOKEN: ${githubExpression('github.token')}${remoteCacheJobEnv(options)}${cargoCredentialsJobEnv(options)}${privateNpmInstallJobEnv(options)}
|
|
734
|
+
GH_TOKEN: ${githubExpression('github.token')}${remoteCacheJobEnv(options, publisherReach(options))}${cargoCredentialsJobEnv(options)}${privateNpmInstallJobEnv(options)}
|
|
734
735
|
steps:
|
|
735
736
|
${renderFinalLinuxPublishSteps(options)}
|
|
736
737
|
`;
|
|
@@ -994,6 +995,10 @@ function hasLinuxPlatformTargets(options) {
|
|
|
994
995
|
function publishJobRunsOnLine(options) {
|
|
995
996
|
return renderRunsOnLine(options.actionsProvider === 'forgejo' ? options.runsOn : GITHUB_HOSTED_LINUX_RUNNER);
|
|
996
997
|
}
|
|
998
|
+
/** The remote-cache reach of the runner publishJobRunsOnLine picks: Forgejo's own runners, or a GitHub-hosted one. */
|
|
999
|
+
function publisherReach(options) {
|
|
1000
|
+
return options.actionsProvider === 'forgejo' ? 'internal' : 'public';
|
|
1001
|
+
}
|
|
997
1002
|
function githubExpression(expression) {
|
|
998
1003
|
return ['$', '{{ ', expression, ' }}'].join('');
|
|
999
1004
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"owned-installation.d.ts","sourceRoot":"","sources":["../src/owned-installation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"owned-installation.d.ts","sourceRoot":"","sources":["../src/owned-installation.ts"],"names":[],"mappings":"AA8iBA,wHAAwH;AACxH,MAAM,WAAW,oBAAoB;IACnC,oDAAoD;IACpD,QAAQ,CAAC,WAAW,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,+FAA+F;IAC/F,QAAQ,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,oBAAoB,CAoBxF"}
|
|
@@ -12,7 +12,8 @@ const __typia_transform__accessExpressionAsString = _accessExpressionAsString_1.
|
|
|
12
12
|
* test reads it. A fixture must not take an input it does not own.
|
|
13
13
|
*
|
|
14
14
|
* So the closure is copied, exactly as the witness's own census resolves it from the workspace that names it: each
|
|
15
|
-
* package once,
|
|
15
|
+
* package once, as the nodes the census holds of it (what it publishes, never its tools' state beside it), each
|
|
16
|
+
* dependency edge relinked beside
|
|
16
17
|
* its copy as Bun's isolated layout does, the top-level packages' bins in `.bin`. Every copy is a new inode, cloned
|
|
17
18
|
* where the volume allows and written otherwise, so no link count is shared with anything outside its owner.
|
|
18
19
|
*
|
|
@@ -38,7 +39,7 @@ const __typia_transform__accessExpressionAsString = _accessExpressionAsString_1.
|
|
|
38
39
|
import { spawn } from 'node:child_process';
|
|
39
40
|
import { randomUUID } from 'node:crypto';
|
|
40
41
|
import { constants, rmSync } from 'node:fs';
|
|
41
|
-
import { cp, mkdir, readdir, readFile, realpath, rename, rm, symlink, writeFile } from 'node:fs/promises';
|
|
42
|
+
import { chmod, copyFile, cp, lstat, mkdir, readdir, readFile, readlink, realpath, rename, rm, symlink, writeFile, } from 'node:fs/promises';
|
|
42
43
|
import { basename, dirname, join, relative, resolve } from 'node:path';
|
|
43
44
|
import { expandOutputs } from 'nx/src/native';
|
|
44
45
|
import { readModulePackageJson } from 'nx/src/utils/package-json';
|
|
@@ -359,16 +360,48 @@ async function sweep(kept, keep) {
|
|
|
359
360
|
}
|
|
360
361
|
}
|
|
361
362
|
}
|
|
362
|
-
/**
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
363
|
+
/**
|
|
364
|
+
* Make the copy of the host package root `source` at its place under `root` from exactly the nodes the host census
|
|
365
|
+
* holds for it (`censused`, every node of the closure in the census's walk order, a directory before what it holds):
|
|
366
|
+
* for a package declaring `files`, what it publishes, never `node_modules` or `.git`. A censused directory's `.nx` is
|
|
367
|
+
* copied whole: @nx/workspace 24.0.3 ships templates under one, which the census does not walk, but what its `files`
|
|
368
|
+
* select there (expandOutputs) selects the directory that holds it, so a copy without it censuses less. Nothing else of the package root
|
|
369
|
+
* is content of the closure, and a workspace package's root also holds its own tools' state (a `.cache/` its tests
|
|
370
|
+
* write and remove while this copy reads), which a copy of the whole root would race. A link is copied as it reads;
|
|
371
|
+
* the nodes it reaches are the census's own. A file is cloned where the volume allows.
|
|
372
|
+
*/
|
|
373
|
+
async function copyPackage(source, root, { place }, censused) {
|
|
374
|
+
const target = join(root, place);
|
|
375
|
+
for (const path of censused) {
|
|
376
|
+
if (path !== source && !path.startsWith(`${source}/`))
|
|
377
|
+
continue;
|
|
378
|
+
const destination = join(target, relative(source, path));
|
|
379
|
+
const stats = await lstat(path);
|
|
380
|
+
if (stats.isSymbolicLink()) {
|
|
381
|
+
await symlink(await readlink(path), destination);
|
|
382
|
+
}
|
|
383
|
+
else if (stats.isDirectory()) {
|
|
384
|
+
await mkdir(destination, { recursive: true });
|
|
385
|
+
await chmod(destination, stats.mode & 0o7777);
|
|
386
|
+
// The one absence expected here: most directories hold no .nx.
|
|
387
|
+
const dotNx = join(path, '.nx');
|
|
388
|
+
const held = await lstat(dotNx).catch((error) => {
|
|
389
|
+
if (error instanceof Error && 'code' in error && error.code === 'ENOENT')
|
|
390
|
+
return null;
|
|
391
|
+
throw error;
|
|
392
|
+
});
|
|
393
|
+
if (held?.isDirectory()) {
|
|
394
|
+
await cp(dotNx, join(destination, '.nx'), {
|
|
395
|
+
recursive: true,
|
|
396
|
+
verbatimSymlinks: true,
|
|
397
|
+
mode: constants.COPYFILE_FICLONE,
|
|
398
|
+
});
|
|
399
|
+
}
|
|
400
|
+
}
|
|
401
|
+
else {
|
|
402
|
+
await copyFile(path, destination, constants.COPYFILE_FICLONE);
|
|
403
|
+
}
|
|
404
|
+
}
|
|
372
405
|
}
|
|
373
406
|
/** Link every resolution edge of `host` beside its copy under `root`, and the top-level packages' bins in `.bin`. */
|
|
374
407
|
async function linkCopies(censusRoot, root, { resolutions }, placed) {
|
|
@@ -432,6 +465,7 @@ async function proveOrCopy(censusRoot, kept, inUse) {
|
|
|
432
465
|
if (host === null)
|
|
433
466
|
throw new Error(`the Nx installation closure of ${censusRoot} cannot be read: ${unread}`);
|
|
434
467
|
const placed = await placements(host);
|
|
468
|
+
const censused = host.nodes.map(({ path }) => path);
|
|
435
469
|
const wanted = holdings(host, censusRoot, new Map([...placed].map(([source, { place }]) => [source, place])));
|
|
436
470
|
const placesIn = (root) => new Map([...placed.values()].map(({ place }) => [join(root, place), place]));
|
|
437
471
|
// Only a recorded copy is censused: a census of none would resolve the host's packages through the ancestor lookup.
|
|
@@ -472,11 +506,11 @@ async function proveOrCopy(censusRoot, kept, inUse) {
|
|
|
472
506
|
if (root === current && stale !== null) {
|
|
473
507
|
for (const [, { place }] of stale)
|
|
474
508
|
await rm(join(root, place), { recursive: true, force: true });
|
|
475
|
-
await Promise.all(stale.map(([source, placement]) => copyPackage(source, root, placement)));
|
|
509
|
+
await Promise.all(stale.map(([source, placement]) => copyPackage(source, root, placement, censused)));
|
|
476
510
|
}
|
|
477
511
|
else {
|
|
478
512
|
await sweep(kept, inUse);
|
|
479
|
-
await Promise.all([...placed].map(([source, placement]) => copyPackage(source, root, placement)));
|
|
513
|
+
await Promise.all([...placed].map(([source, placement]) => copyPackage(source, root, placement, censused)));
|
|
480
514
|
await linkCopies(censusRoot, root, host, placed);
|
|
481
515
|
}
|
|
482
516
|
const census = copyCensus(root, root === current ? (found ?? undefined) : undefined, (detail) => {
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* What a package whose ttsc plugin lowers a dialect declares in its manifest, as `smoo.typecheck`: every project that
|
|
3
|
+
* depends on it directly compiles sources the stock checker refuses (a construct the plugin's ProgramPlugin rewrites
|
|
4
|
+
* before emit, its refusal withdrawn through the driver's DiagnosticPlugin seam), so that project's typecheck runs
|
|
5
|
+
* through ttsc, never the pinned native compiler, which cannot judge the dialect.
|
|
6
|
+
*/
|
|
7
|
+
export interface DialectTypecheck {
|
|
8
|
+
/** The compiler a dependent project's typecheck runs. */
|
|
9
|
+
readonly compiler: 'ttsc';
|
|
10
|
+
/**
|
|
11
|
+
* The Nx targets (`project:target`) that prepare the plugin binaries ttsc loads, so a typecheck loads built bytes
|
|
12
|
+
* and never compiles the plugin inside the check. The declaring package names them; the inference guesses none.
|
|
13
|
+
*/
|
|
14
|
+
readonly dependsOn: readonly string[];
|
|
15
|
+
}
|
|
16
|
+
/** A project's typecheck route: the direct dependencies that declare a dialect, and the targets they name, once each. */
|
|
17
|
+
export interface TypecheckRoute {
|
|
18
|
+
readonly declaredBy: readonly string[];
|
|
19
|
+
readonly dependsOn: readonly string[];
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* The typecheck route of the project whose manifest is `packageJsonPath`, over its direct dependencies (the ones ttsc
|
|
23
|
+
* discovers plugins on: `dependencies` and `devDependencies`). Each dependency's manifest is the one Node resolution
|
|
24
|
+
* reaches from the project, as ttsc reads it; a dependency that is not installed declares nothing. A manifest that
|
|
25
|
+
* declares `smoo.typecheck` in another shape refuses the inference by its path and the field it got wrong.
|
|
26
|
+
*/
|
|
27
|
+
export declare function typecheckRoute(packageJsonPath: string, dependencies: readonly string[]): TypecheckRoute;
|
|
28
|
+
//# sourceMappingURL=typecheck-route.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"typecheck-route.d.ts","sourceRoot":"","sources":["../src/typecheck-route.ts"],"names":[],"mappings":"AAKA;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B,yDAAyD;IACzD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC;AASD,yHAAyH;AACzH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,MAAM,EAAE,GAAG,cAAc,CAuBvG"}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
import * as _validateReport_1 from "typia/lib/internal/_validateReport";
|
|
2
|
+
import * as _createStandardSchema_1 from "typia/lib/internal/_createStandardSchema";
|
|
3
|
+
import { existsSync, readFileSync } from 'node:fs';
|
|
4
|
+
import { createRequire } from 'node:module';
|
|
5
|
+
import { join } from 'node:path';
|
|
6
|
+
import typia from 'typia';
|
|
7
|
+
const validateManifest = (() => {
|
|
8
|
+
let errors;
|
|
9
|
+
let _report;
|
|
10
|
+
const _io0 = input => undefined === input.smoo || "object" === typeof input.smoo && null !== input.smoo && false === Array.isArray(input.smoo) && _io1(input.smoo);
|
|
11
|
+
const _io1 = input => undefined === input.typecheck || "object" === typeof input.typecheck && null !== input.typecheck && _io2(input.typecheck);
|
|
12
|
+
const _io2 = input => "ttsc" === input.compiler && (Array.isArray(input.dependsOn) && input.dependsOn.every(elem => "string" === typeof elem));
|
|
13
|
+
const _vo0 = (input, _path, _exceptionable = true) => [undefined === input.smoo || ("object" === typeof input.smoo && null !== input.smoo && false === Array.isArray(input.smoo) || _report(_exceptionable, {
|
|
14
|
+
path: _path + ".smoo",
|
|
15
|
+
expected: "(undefined | { readonly typecheck?: DialectTypecheck | undefined; })",
|
|
16
|
+
value: input.smoo
|
|
17
|
+
})) && _vo1(input.smoo, _path + ".smoo", true && _exceptionable) || _report(_exceptionable, {
|
|
18
|
+
path: _path + ".smoo",
|
|
19
|
+
expected: "(undefined | { readonly typecheck?: DialectTypecheck | undefined; })",
|
|
20
|
+
value: input.smoo
|
|
21
|
+
})].every(flag => flag);
|
|
22
|
+
const _vo1 = (input, _path, _exceptionable = true) => [undefined === input.typecheck || ("object" === typeof input.typecheck && null !== input.typecheck || _report(_exceptionable, {
|
|
23
|
+
path: _path + ".typecheck",
|
|
24
|
+
expected: "(DialectTypecheck | undefined)",
|
|
25
|
+
value: input.typecheck
|
|
26
|
+
})) && _vo2(input.typecheck, _path + ".typecheck", true && _exceptionable) || _report(_exceptionable, {
|
|
27
|
+
path: _path + ".typecheck",
|
|
28
|
+
expected: "(DialectTypecheck | undefined)",
|
|
29
|
+
value: input.typecheck
|
|
30
|
+
})].every(flag => flag);
|
|
31
|
+
const _vo2 = (input, _path, _exceptionable = true) => ["ttsc" === input.compiler || _report(_exceptionable, {
|
|
32
|
+
path: _path + ".compiler",
|
|
33
|
+
expected: "\"ttsc\"",
|
|
34
|
+
value: input.compiler
|
|
35
|
+
}), (Array.isArray(input.dependsOn) || _report(_exceptionable, {
|
|
36
|
+
path: _path + ".dependsOn",
|
|
37
|
+
expected: "ReadonlyArray<string>",
|
|
38
|
+
value: input.dependsOn
|
|
39
|
+
})) && input.dependsOn.map((elem, _index2) => "string" === typeof elem || _report(_exceptionable, {
|
|
40
|
+
path: _path + ".dependsOn[" + _index2 + "]",
|
|
41
|
+
expected: "string",
|
|
42
|
+
value: elem
|
|
43
|
+
})).every(flag => flag) || _report(_exceptionable, {
|
|
44
|
+
path: _path + ".dependsOn",
|
|
45
|
+
expected: "ReadonlyArray<string>",
|
|
46
|
+
value: input.dependsOn
|
|
47
|
+
})].every(flag => flag);
|
|
48
|
+
const __is = input => "object" === typeof input && null !== input && false === Array.isArray(input) && _io0(input);
|
|
49
|
+
return _createStandardSchema_1._createStandardSchema(input => {
|
|
50
|
+
if (false === __is(input)) {
|
|
51
|
+
errors = [];
|
|
52
|
+
_report = _validateReport_1._validateReport(errors);
|
|
53
|
+
((input, _path, _exceptionable = true) => ("object" === typeof input && null !== input && false === Array.isArray(input) || _report(true, {
|
|
54
|
+
path: _path + "",
|
|
55
|
+
expected: "DeclaringManifest",
|
|
56
|
+
value: input
|
|
57
|
+
})) && _vo0(input, _path + "", true) || _report(true, {
|
|
58
|
+
path: _path + "",
|
|
59
|
+
expected: "DeclaringManifest",
|
|
60
|
+
value: input
|
|
61
|
+
}))(input, "$input", true);
|
|
62
|
+
const success = 0 === errors.length;
|
|
63
|
+
return success ? {
|
|
64
|
+
success,
|
|
65
|
+
data: input
|
|
66
|
+
} : {
|
|
67
|
+
success,
|
|
68
|
+
errors,
|
|
69
|
+
data: input
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
return {
|
|
73
|
+
success: true,
|
|
74
|
+
data: input
|
|
75
|
+
};
|
|
76
|
+
});
|
|
77
|
+
})();
|
|
78
|
+
/**
|
|
79
|
+
* The typecheck route of the project whose manifest is `packageJsonPath`, over its direct dependencies (the ones ttsc
|
|
80
|
+
* discovers plugins on: `dependencies` and `devDependencies`). Each dependency's manifest is the one Node resolution
|
|
81
|
+
* reaches from the project, as ttsc reads it; a dependency that is not installed declares nothing. A manifest that
|
|
82
|
+
* declares `smoo.typecheck` in another shape refuses the inference by its path and the field it got wrong.
|
|
83
|
+
*/
|
|
84
|
+
export function typecheckRoute(packageJsonPath, dependencies) {
|
|
85
|
+
const declaredBy = [];
|
|
86
|
+
const dependsOn = [];
|
|
87
|
+
const lookup = createRequire(packageJsonPath);
|
|
88
|
+
for (const name of new Set(dependencies)) {
|
|
89
|
+
const manifest = (lookup.resolve.paths(name) ?? [])
|
|
90
|
+
.map((root) => join(root, ...name.split('/'), 'package.json'))
|
|
91
|
+
.find((candidate) => existsSync(candidate));
|
|
92
|
+
if (manifest === undefined)
|
|
93
|
+
continue;
|
|
94
|
+
const checked = validateManifest(JSON.parse(readFileSync(manifest, 'utf-8')));
|
|
95
|
+
if (!checked.success) {
|
|
96
|
+
throw new Error(`${manifest}: smoo.typecheck must be { compiler: 'ttsc', dependsOn: ['<project>:<target>', ...] }: ${checked.errors
|
|
97
|
+
.map((error) => `${error.path} expected ${error.expected}`)
|
|
98
|
+
.join('; ')}`);
|
|
99
|
+
}
|
|
100
|
+
const declared = checked.data.smoo?.typecheck;
|
|
101
|
+
if (declared === undefined)
|
|
102
|
+
continue;
|
|
103
|
+
declaredBy.push(name);
|
|
104
|
+
for (const target of declared.dependsOn)
|
|
105
|
+
if (!dependsOn.includes(target))
|
|
106
|
+
dependsOn.push(target);
|
|
107
|
+
}
|
|
108
|
+
return { declaredBy, dependsOn };
|
|
109
|
+
}
|
|
@@ -166,7 +166,9 @@ export interface PackagePrivateNpmConfig {
|
|
|
166
166
|
* miss, but a server without a working credential fails every task with 401
|
|
167
167
|
* rather than missing quietly.
|
|
168
168
|
*/
|
|
169
|
-
export
|
|
169
|
+
export type PackageRemoteCacheConfig = RemoteCacheDeclaration & (LiteralCacheOrigin | VariableCacheOrigin);
|
|
170
|
+
/** The public origin written out, for a cache whose address may be published. */
|
|
171
|
+
export interface LiteralCacheOrigin {
|
|
170
172
|
/**
|
|
171
173
|
* Origin every runner and developer machine can reach, e.g.
|
|
172
174
|
* `https://nx-cache.example.net`. Credential-free, no path, and no trailing
|
|
@@ -174,12 +176,24 @@ export interface PackageRemoteCacheConfig {
|
|
|
174
176
|
* `//v1/cache/<hash>`, which is a different route and answers 404 forever.
|
|
175
177
|
*/
|
|
176
178
|
server: string;
|
|
179
|
+
}
|
|
180
|
+
/**
|
|
181
|
+
* The public origin named by a repository variable, for a public repository whose cache address is private: managed
|
|
182
|
+
* CI reads it as `${{ vars.<serverVariable> }}`, and a developer shell that wants the cache exports the same name.
|
|
183
|
+
*/
|
|
184
|
+
export interface VariableCacheOrigin {
|
|
185
|
+
/** Repository variable (and shell variable) holding the public origin, in the shape `server` takes. */
|
|
186
|
+
serverVariable: RepositorySecretName;
|
|
187
|
+
}
|
|
188
|
+
/** What every declaration carries, whichever way it names the public origin. */
|
|
189
|
+
export interface RemoteCacheDeclaration {
|
|
177
190
|
/**
|
|
178
|
-
* Origin
|
|
191
|
+
* Origin the repository's own runners reach instead of the public one, e.g.
|
|
179
192
|
* `http://10.89.0.1:8765` across a container bridge. Same declaration as a
|
|
180
|
-
* git origin's `internalMirror`: declaring it says
|
|
181
|
-
*
|
|
182
|
-
* keep
|
|
193
|
+
* git origin's `internalMirror`: declaring it says those runners are inside
|
|
194
|
+
* that network, so managed CI jobs on them use it, and jobs on other runners
|
|
195
|
+
* and shells outside keep the public origin. Omitted means CI uses the public
|
|
196
|
+
* origin too.
|
|
183
197
|
*/
|
|
184
198
|
internalServer?: string;
|
|
185
199
|
/**
|
|
@@ -190,6 +204,35 @@ export interface PackageRemoteCacheConfig {
|
|
|
190
204
|
*/
|
|
191
205
|
tokenSecret: RepositorySecretName;
|
|
192
206
|
}
|
|
207
|
+
/**
|
|
208
|
+
* Declared mbx remote cache (`smoo.mbxRemote`): the compiler-action cache every Cargo build under mbx reads and the
|
|
209
|
+
* default branch's own runs publish into. Managed CI puts mbx's remote settings in each job's environment, and
|
|
210
|
+
* setup-devenv routes Cargo through mbx's Cargo shim whenever they are set, so a crate any runner already compiled is a
|
|
211
|
+
* download for every other runner and a one-crate change recompiles that crate. Absent means CI builds Cargo without
|
|
212
|
+
* mbx.
|
|
213
|
+
*
|
|
214
|
+
* Two tokens because the server's grants, not mbx's client-side write policy, are the access boundary: a job on the
|
|
215
|
+
* default branch (a push to it, or a release dispatched on it) gets `writeTokenSecret` and is trusted to publish
|
|
216
|
+
* (`MBX_REMOTE_TRUST_WRITES`); every other job gets `readTokenSecret`, which the server refuses to write with.
|
|
217
|
+
*/
|
|
218
|
+
export type PackageMbxRemoteConfig = MbxRemoteDeclaration & (LiteralCacheOrigin | VariableCacheOrigin);
|
|
219
|
+
/** What every mbx remote declaration carries, whichever way it names the public origin. */
|
|
220
|
+
export interface MbxRemoteDeclaration {
|
|
221
|
+
/**
|
|
222
|
+
* Origin the repository's own runners reach instead of the public one. mbx sends a token over plain HTTP only to a
|
|
223
|
+
* loopback address, so this is an `https://` origin or a loopback one such as `http://127.0.0.1:8766` that each
|
|
224
|
+
* runner forwards to the cache host.
|
|
225
|
+
*/
|
|
226
|
+
internalServer?: string;
|
|
227
|
+
/** Cache namespace (`MBX_REMOTE_NAMESPACE`); repositories that declare the same one reuse each other's compilations. */
|
|
228
|
+
namespace: MbxNamespace;
|
|
229
|
+
/** Repository secret holding the read+write token, given only to the default branch's own runs. */
|
|
230
|
+
writeTokenSecret: RepositorySecretName;
|
|
231
|
+
/** Repository secret holding the read-only token every other job gets. */
|
|
232
|
+
readTokenSecret: RepositorySecretName;
|
|
233
|
+
}
|
|
234
|
+
/** `name` or `owner/name`: slash-separated segments of letters, digits, `.`, `_` and `-`, each starting alphanumeric. */
|
|
235
|
+
export type MbxNamespace = string & typia.tags.Pattern<'^[A-Za-z0-9][A-Za-z0-9._-]*(/[A-Za-z0-9][A-Za-z0-9._-]*)*$'>;
|
|
193
236
|
/**
|
|
194
237
|
* A `smoo.secrets` group: which operation resolves the credential. One argv
|
|
195
238
|
* word of `smoo secrets run <group> <command...>`, so whitespace would make
|
|
@@ -246,6 +289,8 @@ export interface PackageSmooConfig {
|
|
|
246
289
|
privateNpm?: PackagePrivateNpmConfig;
|
|
247
290
|
/** Declared self-hosted Nx remote cache; absent means local caching only. */
|
|
248
291
|
remoteCache?: PackageRemoteCacheConfig;
|
|
292
|
+
/** Declared mbx remote cache for Cargo builds; absent means CI builds Cargo without mbx. */
|
|
293
|
+
mbxRemote?: PackageMbxRemoteConfig;
|
|
249
294
|
/** Provider-neutral local secret commands. CI supplies these variables externally. */
|
|
250
295
|
secrets?: Record<string, PackageSecretCommand>;
|
|
251
296
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-manifest.d.ts","sourceRoot":"","sources":["../src/workspace-manifest.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"workspace-manifest.d.ts","sourceRoot":"","sources":["../src/workspace-manifest.ts"],"names":[],"mappings":"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"}
|
package/executors.json
CHANGED
|
@@ -5,9 +5,19 @@
|
|
|
5
5
|
"schema": "./src/executors/bounded-exec/schema.json",
|
|
6
6
|
"description": "Run a command with bounded timeout and force-kill behavior",
|
|
7
7
|
"outputNeutral": [
|
|
8
|
+
"./dist/executors/bounded-exec/admission-queue.js",
|
|
9
|
+
"./dist/executors/bounded-exec/cpu-grant.js",
|
|
10
|
+
"./dist/executors/bounded-exec/cpu-pool.js",
|
|
8
11
|
"./dist/executors/bounded-exec/disk-lease.js",
|
|
9
12
|
"./dist/executors/bounded-exec/gateway-lease.js",
|
|
10
13
|
"./dist/executors/bounded-exec/hang-diagnostics.js",
|
|
14
|
+
"./dist/executors/bounded-exec/host-memory.js",
|
|
15
|
+
"./dist/executors/bounded-exec/lease-wait.js",
|
|
16
|
+
"./dist/executors/bounded-exec/mbx-queue.js",
|
|
17
|
+
"./dist/executors/bounded-exec/memory-retry.js",
|
|
18
|
+
"./dist/executors/bounded-exec/parent-grant.js",
|
|
19
|
+
"./dist/executors/bounded-exec/peak-charge.js",
|
|
20
|
+
"./dist/executors/bounded-exec/pool-admission.js",
|
|
11
21
|
"./dist/executors/bounded-exec/ram-attach.js",
|
|
12
22
|
"./dist/executors/bounded-exec/ram-detach.js",
|
|
13
23
|
"./dist/executors/bounded-exec/ram-temp-held.js",
|
|
@@ -4000,6 +4000,22 @@ index 2000bbcd5d707c5435c2bc47573528d7a31ae606..524a82cae46a6028baceaa985097fe59
|
|
|
4000
4000
|
}
|
|
4001
4001
|
function setErrorTimeout(timeoutMs, errorMessage) {
|
|
4002
4002
|
if (environment.NX_PLUGIN_NO_TIMEOUTS === 'true') {
|
|
4003
|
+
diff --git a/dist/src/project-graph/plugins/loaded-nx-plugin.js b/dist/src/project-graph/plugins/loaded-nx-plugin.js
|
|
4004
|
+
index 9fa6b993ac4dbe918c163092c12f77f87eaccb27..d93538310c4dc2622cde88cd9da983bcc1e3e63c 100644
|
|
4005
|
+
--- a/dist/src/project-graph/plugins/loaded-nx-plugin.js
|
|
4006
|
+
+++ b/dist/src/project-graph/plugins/loaded-nx-plugin.js
|
|
4007
|
+
@@ -85,7 +85,10 @@ class LoadedNxPlugin {
|
|
4008
|
+
this.preTasksExecution = async (context) => {
|
|
4009
|
+
const updates = {};
|
|
4010
|
+
let originalEnv = process.env;
|
|
4011
|
+
- if ((0, enabled_1.isIsolationEnabled)() || (0, client_1.isDaemonEnabled)()) {
|
|
4012
|
+
+ // A plugin worker records the hook's writes whatever the isolation setting and the daemon say: the
|
|
4013
|
+
+ // patched Nx loads a local plugin in one under every setting, and these recorded writes are how the
|
|
4014
|
+
+ // hook's environment reaches the client that applies it.
|
|
4015
|
+
+ if ((0, enabled_1.isIsolationEnabled)() || (0, client_1.isDaemonEnabled)() || global.NX_PLUGIN_WORKER) {
|
|
4016
|
+
process.env = new Proxy(originalEnv, {
|
|
4017
|
+
set: (target, key, value) => {
|
|
4018
|
+
target[key] = value;
|
|
4003
4019
|
diff --git a/dist/src/project-graph/plugins/local-plugin-source.d.ts b/dist/src/project-graph/plugins/local-plugin-source.d.ts
|
|
4004
4020
|
new file mode 100644
|
|
4005
4021
|
index 0000000000000000000000000000000000000000..1a84106509d0e05a2f0d6c595b79ecc781ff21d1
|