@smoothbricks/nx-plugin 0.7.12 → 0.7.14
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 +91 -27
- package/dist/.build-inputs.json +20 -12
- 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.d.ts +1 -14
- package/dist/executors/bounded-exec/cpu-pool.d.ts.map +1 -1
- package/dist/executors/bounded-exec/cpu-pool.js +2 -49
- package/dist/executors/bounded-exec/executor.d.ts +5 -12
- package/dist/executors/bounded-exec/executor.d.ts.map +1 -1
- package/dist/executors/bounded-exec/executor.js +51 -154
- 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-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 +1 -1
- package/dist/executors/bounded-exec/verdict.d.ts +3 -18
- package/dist/executors/bounded-exec/verdict.d.ts.map +1 -1
- package/dist/executors/bounded-exec/verdict.js +4 -25
- package/dist/index.d.ts +4 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +97 -31
- 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/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.ts +2 -33
- package/src/executors/bounded-exec/executor.ts +60 -201
- 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-environment.ts +45 -0
- package/src/executors/bounded-exec/run-cpu-pool.ts +2 -1
- package/src/executors/bounded-exec/verdict.ts +7 -35
- package/src/index.ts +105 -31
- 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 -139
|
@@ -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",
|
|
@@ -93,10 +93,19 @@ index 3793b3a406c2bf2643567a755d34e66a26eac5c8..3c690ac3d9a99be7914ad9aed76e5890
|
|
|
93
93
|
|
|
94
94
|
// writePluginEmitOutput writes one artifact of the hand-assembled emit, passing
|
|
95
95
|
diff --git a/driver/plugins.go b/driver/plugins.go
|
|
96
|
-
index 1778e250d80d1316e108f1f36b6e1a38724922d5..
|
|
96
|
+
index 1778e250d80d1316e108f1f36b6e1a38724922d5..2964783d058000080d987044e1fe1db581bde3d2 100644
|
|
97
97
|
--- a/driver/plugins.go
|
|
98
98
|
+++ b/driver/plugins.go
|
|
99
|
-
@@ -
|
|
99
|
+
@@ -8,6 +8,8 @@ import (
|
|
100
|
+
"sort"
|
|
101
|
+
"strings"
|
|
102
|
+
"sync"
|
|
103
|
+
+
|
|
104
|
+
+ "github.com/microsoft/typescript-go/shim/ast"
|
|
105
|
+
)
|
|
106
|
+
|
|
107
|
+
// LinkedPluginsEnv is the environment variable ttsc sets to pass the JSON
|
|
108
|
+
@@ -169,6 +171,7 @@ type PluginContext struct {
|
|
100
109
|
reportFileDependencyRejected func(string)
|
|
101
110
|
reportFileComplete func(string)
|
|
102
111
|
reportEveryFileComplete func()
|
|
@@ -104,7 +113,7 @@ index 1778e250d80d1316e108f1f36b6e1a38724922d5..da2ec288afa9a4ae8ceebc1728f6119b
|
|
|
104
113
|
}
|
|
105
114
|
|
|
106
115
|
// ReportObservationIncomplete declares that this hook's input population could
|
|
107
|
-
@@ -195,6 +
|
|
116
|
+
@@ -195,6 +198,24 @@ func (ctx PluginContext) ReportObservationIncomplete() {
|
|
108
117
|
}
|
|
109
118
|
}
|
|
110
119
|
|
|
@@ -129,7 +138,29 @@ index 1778e250d80d1316e108f1f36b6e1a38724922d5..da2ec288afa9a4ae8ceebc1728f6119b
|
|
|
129
138
|
// ReportHostInputHash declares the exact file state consumed by a native
|
|
130
139
|
// plugin. hash is a lowercase SHA-256 digest for an observed file and nil for
|
|
131
140
|
// a missing candidate. Conflicting observations are retained as host inputs
|
|
132
|
-
@@ -
|
|
141
|
+
@@ -506,11 +527,29 @@ type EmitTransformPlugin interface {
|
|
142
|
+
EmitTransform(PluginContext) (PluginTransform, error)
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
+// DiagnosticPlugin is a linked plugin whose ProgramPlugin lowers a construct
|
|
146
|
+
+// the stock checker refuses, a dialect its compiles admit: a source spelling
|
|
147
|
+
+// the plugin rewrites before emit or a transform's output, which TypeScript has
|
|
148
|
+
+// no grammar for. The checker judges the parse tree before any ProgramPlugin
|
|
149
|
+
+// applies, so its refusal of such a construct names nothing the output holds,
|
|
150
|
+
+// and every lane that gates on the program's diagnostics (check, emit, a
|
|
151
|
+
+// transform) would refuse the dialect it was built to compile.
|
|
152
|
+
+// LoweredDiagnostics names those refusals among the diagnostics it is given;
|
|
153
|
+
+// the driver drops exactly the ones it names that it gave, and reports every
|
|
154
|
+
+// other diagnostic as it would without the plugin.
|
|
155
|
+
+type DiagnosticPlugin interface {
|
|
156
|
+
+ // LoweredDiagnostics returns the diagnostics, among those given, whose cause
|
|
157
|
+
+ // this plugin's ProgramPlugin removes. It reads the parse tree the checker
|
|
158
|
+
+ // judged, before any ProgramPlugin applies.
|
|
159
|
+
+ LoweredDiagnostics(*Program, PluginContext, []*ast.Diagnostic) []*ast.Diagnostic
|
|
160
|
+
+}
|
|
161
|
+
+
|
|
162
|
+
type linkedPluginState struct {
|
|
163
|
+
cwd string
|
|
133
164
|
declarations *pluginFileDeclarations
|
|
134
165
|
entries []PluginEntry
|
|
135
166
|
inputs *pluginHostInputScopes
|
|
@@ -137,7 +168,7 @@ index 1778e250d80d1316e108f1f36b6e1a38724922d5..da2ec288afa9a4ae8ceebc1728f6119b
|
|
|
137
168
|
tsconfig string
|
|
138
169
|
}
|
|
139
170
|
|
|
140
|
-
@@ -800,6 +
|
|
171
|
+
@@ -800,6 +839,7 @@ func loadLinkedPluginState(cwd, tsconfigPath string) (linkedPluginState, error)
|
|
141
172
|
cwd: cwd,
|
|
142
173
|
declarations: newPluginFileDeclarations(),
|
|
143
174
|
inputs: newPluginHostInputScopes(),
|
|
@@ -145,7 +176,7 @@ index 1778e250d80d1316e108f1f36b6e1a38724922d5..da2ec288afa9a4ae8ceebc1728f6119b
|
|
|
145
176
|
tsconfig: tsconfigPath,
|
|
146
177
|
}, nil
|
|
147
178
|
}
|
|
148
|
-
@@ -812,6 +
|
|
179
|
+
@@ -812,6 +852,7 @@ func loadLinkedPluginState(cwd, tsconfigPath string) (linkedPluginState, error)
|
|
149
180
|
declarations: newPluginFileDeclarations(),
|
|
150
181
|
entries: entries,
|
|
151
182
|
inputs: newPluginHostInputScopes(),
|
|
@@ -153,7 +184,50 @@ index 1778e250d80d1316e108f1f36b6e1a38724922d5..da2ec288afa9a4ae8ceebc1728f6119b
|
|
|
153
184
|
tsconfig: tsconfigPath,
|
|
154
185
|
}, nil
|
|
155
186
|
}
|
|
156
|
-
@@ -
|
|
187
|
+
@@ -896,6 +937,42 @@ func (state linkedPluginState) emitTransforms() ([]PluginTransform, error) {
|
|
188
|
+
return out, nil
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
+// dropLoweredDiagnostics removes from in every diagnostic a registered
|
|
192
|
+
+// DiagnosticPlugin names as lowered. Each plugin is asked, in registration
|
|
193
|
+
+// order, about what the plugins before it kept; a diagnostic it names that it
|
|
194
|
+
+// was not given is ignored, so a plugin can only withdraw a diagnostic, never
|
|
195
|
+
+// add one. An entry with no registration is skipped here: apply reports it.
|
|
196
|
+
+func (state linkedPluginState) dropLoweredDiagnostics(prog *Program, in []*ast.Diagnostic) []*ast.Diagnostic {
|
|
197
|
+
+ for index, entry := range state.entries {
|
|
198
|
+
+ if len(in) == 0 {
|
|
199
|
+
+ return in
|
|
200
|
+
+ }
|
|
201
|
+
+ plugin, ok := registeredPlugin(index)
|
|
202
|
+
+ if !ok {
|
|
203
|
+
+ continue
|
|
204
|
+
+ }
|
|
205
|
+
+ judge, ok := plugin.(DiagnosticPlugin)
|
|
206
|
+
+ if !ok {
|
|
207
|
+
+ continue
|
|
208
|
+
+ }
|
|
209
|
+
+ lowered := map[*ast.Diagnostic]struct{}{}
|
|
210
|
+
+ for _, diagnostic := range judge.LoweredDiagnostics(prog, state.contextAt(index, entry), in) {
|
|
211
|
+
+ lowered[diagnostic] = struct{}{}
|
|
212
|
+
+ }
|
|
213
|
+
+ if len(lowered) == 0 {
|
|
214
|
+
+ continue
|
|
215
|
+
+ }
|
|
216
|
+
+ kept := make([]*ast.Diagnostic, 0, len(in))
|
|
217
|
+
+ for _, diagnostic := range in {
|
|
218
|
+
+ if _, drop := lowered[diagnostic]; !drop {
|
|
219
|
+
+ kept = append(kept, diagnostic)
|
|
220
|
+
+ }
|
|
221
|
+
+ }
|
|
222
|
+
+ in = kept
|
|
223
|
+
+ }
|
|
224
|
+
+ return in
|
|
225
|
+
+}
|
|
226
|
+
+
|
|
227
|
+
// registeredPlugin returns the plugin registered at position index, or
|
|
228
|
+
// (nil, false) when the index is out of range. Registration order matches
|
|
229
|
+
// the order of linked Go init() calls.
|
|
230
|
+
@@ -931,7 +1008,43 @@ func (state linkedPluginState) contextAt(index int, entry PluginEntry) PluginCon
|
|
157
231
|
reportFileDependencyRejected: declaration.rejectDependency,
|
|
158
232
|
reportFileComplete: declaration.addComplete,
|
|
159
233
|
reportEveryFileComplete: declaration.completeEveryFile,
|
|
@@ -198,7 +272,7 @@ index 1778e250d80d1316e108f1f36b6e1a38724922d5..da2ec288afa9a4ae8ceebc1728f6119b
|
|
|
198
272
|
|
|
199
273
|
// hostInputs returns the exact native configuration inputs reported in this
|
|
200
274
|
diff --git a/driver/program.go b/driver/program.go
|
|
201
|
-
index f6ee81fb1af41deea022b92e838a7c4665eb9778..
|
|
275
|
+
index f6ee81fb1af41deea022b92e838a7c4665eb9778..6dc6b4d77b7cde5051782478cdc527a1e9c29c7f 100644
|
|
202
276
|
--- a/driver/program.go
|
|
203
277
|
+++ b/driver/program.go
|
|
204
278
|
@@ -738,6 +738,12 @@ func forceEmit(parsed *tsoptions.ParsedCommandLine) {
|
|
@@ -214,6 +288,17 @@ index f6ee81fb1af41deea022b92e838a7c4665eb9778..112faf913ce38b1f4624b38db3783937
|
|
|
214
288
|
}
|
|
215
289
|
|
|
216
290
|
// forceNoEmit sets noEmit so the program type-checks without writing files.
|
|
291
|
+
@@ -1124,6 +1130,10 @@ func (p *Program) diagnostics(files []*ast.SourceFile) []Diagnostic {
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
raw = filterDiagnostics(raw)
|
|
295
|
+
+ // A linked DiagnosticPlugin withdraws the checker's refusals of the dialect
|
|
296
|
+
+ // its ProgramPlugin lowers. It asks about the tree the checker judged, which
|
|
297
|
+
+ // the hooks have not mutated yet on every lane that gates on diagnostics.
|
|
298
|
+
+ raw = p.plugins.dropLoweredDiagnostics(p, raw)
|
|
299
|
+
// filterDiagnostics runs first because it resolves a node from the position
|
|
300
|
+
// tsgo recorded, which only makes sense against the tree tsgo parsed. The
|
|
301
|
+
// preamble correction happens inside convertProgramDiagnostics, once the
|
|
217
302
|
diff --git a/driver/rewrite.go b/driver/rewrite.go
|
|
218
303
|
index 79be74d24e879da216ad680d23ecfeb5f11a29db..6db9dddba05bd50e13ed92535ca442c3a4f0b28a 100644
|
|
219
304
|
--- a/driver/rewrite.go
|
|
@@ -16,6 +16,13 @@
|
|
|
16
16
|
# xcodebuild reads, which is why they go rather than being pointed somewhere
|
|
17
17
|
# else.
|
|
18
18
|
#
|
|
19
|
+
# AR/RANLIB go with them. An outer stdenv exports AR=ar and RANLIB=ranlib,
|
|
20
|
+
# which resolve on PATH into the store; cc-rs runs them for every build script
|
|
21
|
+
# and the cargo targets key on their store objects (nx-plugin's cargo toolchain
|
|
22
|
+
# input). A shell that kept them keyed every cargo task differently from the
|
|
23
|
+
# land gate, whose cleared environment never had them, and missed the gate's
|
|
24
|
+
# cache entries for the same tree.
|
|
25
|
+
#
|
|
19
26
|
# The Apple SDK is the same boundary, and dropping CC/CXX alone does not hold
|
|
20
27
|
# it. An outer nix stdenv exports SDKROOT and DEVELOPER_DIR pointing at
|
|
21
28
|
# nixpkgs' RECONSTRUCTED apple-sdk, so Xcode's own clang goes on to compile
|
|
@@ -49,7 +56,7 @@
|
|
|
49
56
|
# so under direnv the dropped directory comes back behind /usr/bin, where its
|
|
50
57
|
# xcrun is never the one that answers.
|
|
51
58
|
smoo_apple_store="$1"
|
|
52
|
-
unset CC CXX
|
|
59
|
+
unset CC CXX AR RANLIB
|
|
53
60
|
case "${SDKROOT:-}" in
|
|
54
61
|
"$smoo_apple_store"/*)
|
|
55
62
|
echo "devenv: dropping nix-store SDKROOT ($SDKROOT); Xcode holds the licensed macOS SDK" >&2
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
# direnv sources after this shell.
|
|
21
21
|
#
|
|
22
22
|
# The generic tool names stay where they are: on Linux the stdenv sets CC, CXX,
|
|
23
|
-
# AR and RANLIB, and on Darwin apple-developer.sh drops CC and
|
|
23
|
+
# AR and RANLIB, and on Darwin apple-developer.sh drops CC, CXX, AR and RANLIB.
|
|
24
24
|
smoo_compiler_declared=" $* "
|
|
25
25
|
for smoo_compiler_name in ${!CC_@} ${!CXX_@} ${!AR_@} ${!RANLIB_@} ${!CFLAGS@} ${!CXXFLAGS@} ${!ARFLAGS@} ${!RANLIBFLAGS@} ${!HOST_@} ${!TARGET_@}; do
|
|
26
26
|
# A target names a lowercase architecture; CC_ENABLE_DEBUG_OUTPUT and its
|
|
@@ -17,8 +17,10 @@ ttsc_cache_dir_default="${TTSC_CACHE_DIR:-$repo_root/.cache/ttsc-plugins}"
|
|
|
17
17
|
# locked to, so this installs the commit devenv.lock's `devenv` node names and
|
|
18
18
|
# nothing here restates it. `smoo monorepo check` holds that node to a release:
|
|
19
19
|
# it must name its remote and a commit that one of that remote's tags from
|
|
20
|
-
# v2.0.4 on names
|
|
21
|
-
#
|
|
20
|
+
# v2.0.4 on names. `git ls-remote` answers that once per locked commit, when
|
|
21
|
+
# `smoo devenv update` or `smoo monorepo update` writes the answer to
|
|
22
|
+
# tooling/direnv/devenv-release.json; `check` only verifies that record, offline.
|
|
23
|
+
# devenv.yaml declares such a lock as `github:cachix/devenv/v2.3.1?dir=src/modules`.
|
|
22
24
|
# devenv.cachix.org has pinned the aarch64-darwin, aarch64-linux and
|
|
23
25
|
# x86_64-linux builds of every release from v2.0.4 on for good, so on those
|
|
24
26
|
# three systems the install substitutes rather than compiles. From v2.2 on
|
|
@@ -290,10 +290,12 @@ function parseSecretSpec(name: string, spec: unknown): SecretSpec {
|
|
|
290
290
|
* The declared remote cache as a local shell needs it. `internalServer` is
|
|
291
291
|
* deliberately absent: it is the address a managed runner reaches inside its
|
|
292
292
|
* own network, and a shell that loads this file is by definition outside it,
|
|
293
|
-
* so a developer machine always takes the public `server
|
|
293
|
+
* so a developer machine always takes the public origin: `server`, or the
|
|
294
|
+
* value of the variable `serverVariable` names, which a public repository
|
|
295
|
+
* declares so its cache address is never committed.
|
|
294
296
|
*/
|
|
295
297
|
export interface RemoteCacheSpec {
|
|
296
|
-
readonly server: string;
|
|
298
|
+
readonly origin: { readonly server: string } | { readonly serverVariable: string };
|
|
297
299
|
/** Variable holding the cache token: an ambient value, or a `smoo.secrets` entry in group `nx-cache`. */
|
|
298
300
|
readonly tokenSecret: string;
|
|
299
301
|
}
|
|
@@ -310,23 +312,35 @@ export function parseSmooRemoteCache(packageJson: unknown): RemoteCacheSpec | nu
|
|
|
310
312
|
const remoteCache = smoo.remoteCache;
|
|
311
313
|
if (remoteCache === undefined) return null;
|
|
312
314
|
if (!isRecord(remoteCache)) {
|
|
313
|
-
throw new Error('smoo.remoteCache must be an object with { server, tokenSecret }');
|
|
315
|
+
throw new Error('smoo.remoteCache must be an object with { server or serverVariable, tokenSecret }');
|
|
314
316
|
}
|
|
315
317
|
const server = remoteCache.server;
|
|
318
|
+
const serverVariable = remoteCache.serverVariable;
|
|
316
319
|
const tokenSecret = remoteCache.tokenSecret;
|
|
320
|
+
if (server !== undefined && serverVariable !== undefined) {
|
|
321
|
+
throw new Error('smoo.remoteCache names its public origin twice; declare server or serverVariable, not both');
|
|
322
|
+
}
|
|
317
323
|
// A trailing slash is refused rather than trimmed: Nx appends
|
|
318
324
|
// `/v1/cache/<hash>`, so the doubled slash is a route that answers 404
|
|
319
325
|
// forever, and silently repairing the manifest here would leave managed CI
|
|
320
326
|
// — which reads the same field — disagreeing with this shell.
|
|
321
|
-
|
|
327
|
+
let origin: RemoteCacheSpec['origin'];
|
|
328
|
+
if (serverVariable !== undefined) {
|
|
329
|
+
if (typeof serverVariable !== 'string' || !ENV_NAME.test(serverVariable)) {
|
|
330
|
+
throw new Error('smoo.remoteCache.serverVariable must name the variable holding the public origin');
|
|
331
|
+
}
|
|
332
|
+
origin = { serverVariable };
|
|
333
|
+
} else if (typeof server !== 'string' || server.length === 0 || server.endsWith('/')) {
|
|
322
334
|
throw new Error(
|
|
323
335
|
'smoo.remoteCache.server must be an origin with no trailing slash, e.g. https://nx-cache.example.net',
|
|
324
336
|
);
|
|
337
|
+
} else {
|
|
338
|
+
origin = { server };
|
|
325
339
|
}
|
|
326
340
|
if (typeof tokenSecret !== 'string' || !ENV_NAME.test(tokenSecret)) {
|
|
327
341
|
throw new Error('smoo.remoteCache.tokenSecret must name the environment variable holding the cache token');
|
|
328
342
|
}
|
|
329
|
-
return {
|
|
343
|
+
return { origin, tokenSecret };
|
|
330
344
|
}
|
|
331
345
|
|
|
332
346
|
/** Every `${VAR}` referenced from `.npmrc` text; an absent file contributes nothing. */
|
|
@@ -17,15 +17,21 @@
|
|
|
17
17
|
# ran, builds them. A refusal names the one command that fixes it; any other
|
|
18
18
|
# failure is said as that, never as a cache miss.
|
|
19
19
|
#
|
|
20
|
-
# Nx runs in
|
|
21
|
-
#
|
|
22
|
-
#
|
|
23
|
-
#
|
|
24
|
-
# environment
|
|
25
|
-
#
|
|
26
|
-
#
|
|
27
|
-
#
|
|
28
|
-
#
|
|
20
|
+
# Nx runs in the environment the land gate runs in, never in the environment of
|
|
21
|
+
# whatever shell ran `git push`: cowshed clears a declared command's environment,
|
|
22
|
+
# keeping HOME, USER, LOGNAME, TERM, LANG and SSH_AUTH_SOCK and a PATH, and enters
|
|
23
|
+
# the checkout's devenv over it (specs/cowshed/02_workspaces.md, "The declared
|
|
24
|
+
# commands' environment"). The probe does the same: `env -i` with those
|
|
25
|
+
# variables and repo-path's PATH, then `direnv exec <checkout>`. devenv declares
|
|
26
|
+
# this checkout's tooling and the environment it builds with, and tasks key on
|
|
27
|
+
# that environment as well as on the tree. `direnv exec` alone only lays the
|
|
28
|
+
# checkout's variables over the caller's: a variable the checkout does not
|
|
29
|
+
# declare passes through. A push from a shell carrying another directory's
|
|
30
|
+
# devenv keyed the gate's tasks on that shell's SDKROOT and DEVELOPER_DIR; one
|
|
31
|
+
# from an agent shell carrying AR=ar and RANLIB=ranlib keyed every cargo task's
|
|
32
|
+
# toolchain input on them, so the probe missed the entry the gate wrote for the
|
|
33
|
+
# same tree. Under the gate's environment the keys are the gate's, and a
|
|
34
|
+
# dependency that does miss builds the way the gate builds it.
|
|
29
35
|
#
|
|
30
36
|
# Why the cross target never compiles here. Every checkout shell carries zig,
|
|
31
37
|
# cargo-zigbuild and the Linux rust-std the cross clippy needs, so a miss would
|
|
@@ -95,7 +101,11 @@ cross_gate() {
|
|
|
95
101
|
output=$(mktemp "${TMPDIR:-/tmp}/pre-push-cross.XXXXXX") || return 1
|
|
96
102
|
trap 'rm -f "$output"' EXIT
|
|
97
103
|
set -o pipefail
|
|
98
|
-
|
|
104
|
+
pure=(PATH="$PATH" SMOO_CROSS_LINT_REPLAY_ONLY=1)
|
|
105
|
+
for name in HOME USER LOGNAME TERM LANG SSH_AUTH_SOCK; do
|
|
106
|
+
[ -z "${!name+set}" ] || pure+=("$name=${!name}")
|
|
107
|
+
done
|
|
108
|
+
env -i "${pure[@]}" direnv exec "$PWD" nx run-many -t cargo-lint-cross --output-style=static 2>&1 | tee "$output"
|
|
99
109
|
status=$?
|
|
100
110
|
[ "$status" -eq 0 ] && return 0
|
|
101
111
|
|
|
@@ -17,13 +17,13 @@ const { join } = require('node:path');
|
|
|
17
17
|
const GIT_ENVIRONMENT_THAT_REDIRECTS_THE_REPOSITORY = ['GIT_DIR', 'GIT_WORK_TREE', 'GIT_INDEX_FILE'];
|
|
18
18
|
|
|
19
19
|
function fail(message, status = 1) {
|
|
20
|
-
process.stderr.write(
|
|
20
|
+
process.stderr.write(`forgejo-artifact: ${message}\n`);
|
|
21
21
|
process.exitCode = status;
|
|
22
22
|
}
|
|
23
23
|
function describeExit(result) {
|
|
24
|
-
if (result.error) return
|
|
25
|
-
if (result.signal) return
|
|
26
|
-
return
|
|
24
|
+
if (result.error) return `could not start: ${result.error.message}`;
|
|
25
|
+
if (result.signal) return `was killed by signal ${result.signal}`;
|
|
26
|
+
return `exited with status ${result.status}`;
|
|
27
27
|
}
|
|
28
28
|
|
|
29
29
|
function gitEnvironment() {
|
|
@@ -40,7 +40,7 @@ function git(directory, args, captureStdout = false) {
|
|
|
40
40
|
stdio: ['ignore', captureStdout ? 'pipe' : 'inherit', 'inherit'],
|
|
41
41
|
});
|
|
42
42
|
if (result.error || result.status !== 0) {
|
|
43
|
-
fail(
|
|
43
|
+
fail(`git ${args.join(' ')} ${describeExit(result)}`);
|
|
44
44
|
return null;
|
|
45
45
|
}
|
|
46
46
|
return captureStdout ? result.stdout : '';
|
|
@@ -58,7 +58,7 @@ function checkout(directory, pin) {
|
|
|
58
58
|
if (revision === null) return false;
|
|
59
59
|
const head = revision.trim();
|
|
60
60
|
if (head !== pin.commit) {
|
|
61
|
-
fail(
|
|
61
|
+
fail(`checked out HEAD ${head} is not the pinned commit ${pin.commit}`);
|
|
62
62
|
return false;
|
|
63
63
|
}
|
|
64
64
|
return true;
|
|
@@ -69,7 +69,7 @@ function run(pin) {
|
|
|
69
69
|
process.exitCode = 0;
|
|
70
70
|
const runnerTemp = process.env.RUNNER_TEMP;
|
|
71
71
|
if (!runnerTemp) {
|
|
72
|
-
fail(
|
|
72
|
+
fail(`RUNNER_TEMP is not set, so there is nowhere private to fetch ${pin.repository}`);
|
|
73
73
|
return;
|
|
74
74
|
}
|
|
75
75
|
let directory;
|
|
@@ -79,7 +79,7 @@ function run(pin) {
|
|
|
79
79
|
const result = spawnSync(process.execPath, [join(directory, pin.entry)], { stdio: 'inherit' });
|
|
80
80
|
if (result.error || result.status !== 0) {
|
|
81
81
|
fail(
|
|
82
|
-
pin.repository
|
|
82
|
+
`${pin.repository}@${pin.commit} ${pin.entry} ${describeExit(result)}`,
|
|
83
83
|
result.error || result.status === null ? 1 : result.status,
|
|
84
84
|
);
|
|
85
85
|
}
|
|
@@ -90,7 +90,7 @@ function run(pin) {
|
|
|
90
90
|
try {
|
|
91
91
|
rmSync(directory, { recursive: true, force: true });
|
|
92
92
|
} catch (error) {
|
|
93
|
-
fail(
|
|
93
|
+
fail(`could not remove ${directory}: ${String(error)}`, process.exitCode || 1);
|
|
94
94
|
}
|
|
95
95
|
}
|
|
96
96
|
}
|
|
@@ -235,6 +235,34 @@ runs:
|
|
|
235
235
|
echo "devenv state: $root (workspace at $GITHUB_WORKSPACE)"
|
|
236
236
|
fi
|
|
237
237
|
|
|
238
|
+
# Host runners keep the Cargo target directory on the shared bind as well, so a job reuses every unit its scope's
|
|
239
|
+
# last job compiled instead of building the dependency graph again. The scope is the Nx cache's (workflow, pull
|
|
240
|
+
# request or ref, job, platform): a publish and a CI run never share a mutable target, and two runs of one scope
|
|
241
|
+
# that overlap take turns on Cargo's own build-directory lock. The bind lands on the workspace path tasks see
|
|
242
|
+
# (DEVENV_WORKDIR, set above), not the checkout under it: a bind of the checkout carries no submount, so a target
|
|
243
|
+
# bound beneath it would be invisible at the stable path. A fresh checkout gives every source a new mtime, which
|
|
244
|
+
# Cargo's mtime freshness reads as changed, so a reused target is judged by file checksums instead
|
|
245
|
+
# (CARGO_UNSTABLE_CHECKSUM_FRESHNESS, a nightly key the managed toolchain carries). A refused bind leaves the job
|
|
246
|
+
# its checkout's own target/, built cold.
|
|
247
|
+
- name: 📂 Locate the Cargo target on the shared bind
|
|
248
|
+
if: steps.runner-kind.outputs.host == 'true' && hashFiles('Cargo.lock') != ''
|
|
249
|
+
shell: bash
|
|
250
|
+
env:
|
|
251
|
+
CARGO_TARGET_BIND: /var/cache/ci/cargo-target
|
|
252
|
+
CARGO_TARGET_REPO: ${{ github.repository }}
|
|
253
|
+
CARGO_TARGET_LANE: ${{ github.workflow }}
|
|
254
|
+
SCOPE_REF: ${{ github.event.pull_request.number || github.ref }}
|
|
255
|
+
run: |
|
|
256
|
+
lane=$(printf '%s' "$CARGO_TARGET_LANE" | tr '[:upper:]' '[:lower:]' | tr -cs 'a-z0-9._-' '-')
|
|
257
|
+
scope=$(printf '%s\0%s\0%s\0%s\0%s' "$GITHUB_WORKFLOW" "$SCOPE_REF" "$GITHUB_JOB" "$RUNNER_OS" "$RUNNER_ARCH" | git hash-object --stdin)
|
|
258
|
+
root="$CARGO_TARGET_BIND/$CARGO_TARGET_REPO/${lane:-default}/$scope"
|
|
259
|
+
target="$DEVENV_WORKDIR/target"
|
|
260
|
+
if mkdir -p "$root" "$target" && sudo mount --bind "$root" "$target"; then
|
|
261
|
+
echo "CARGO_UNSTABLE_CHECKSUM_FRESHNESS=true" >> "$GITHUB_ENV"
|
|
262
|
+
echo "cargo target: $root (bound at $target)"
|
|
263
|
+
else
|
|
264
|
+
echo "::warning::cargo target bind refused; this job builds $target from cold"
|
|
265
|
+
fi
|
|
238
266
|
- name: 📂 Devenv runs in the checkout
|
|
239
267
|
if: steps.runner-kind.outputs.host != 'true'
|
|
240
268
|
shell: bash
|
|
@@ -412,3 +440,28 @@ runs:
|
|
|
412
440
|
env:
|
|
413
441
|
SMOO_ROOT_BUILD_INPUTS: ${{ steps.runner-kind.outputs.host != 'true' }}
|
|
414
442
|
run: ./github-actions-bootstrap.sh build-shell
|
|
443
|
+
|
|
444
|
+
# smoo.mbxRemote: the job env names the mbx remote cache, and Cargo reaches it only through mbx's Cargo shim, so the
|
|
445
|
+
# shim goes first on PATH for every later step. mbx setup runs under a scratch HOME, where Linux's XDG_DATA_HOME and
|
|
446
|
+
# macOS's Application Support name the same directory, so it writes none of the runner's editor or mise
|
|
447
|
+
# configuration and the shim's path is known rather than parsed from its output. The shim records the shell's mbx.
|
|
448
|
+
- name: 🦀 Route Cargo through mbx
|
|
449
|
+
if: env.MBX_REMOTE_URL != '' && hashFiles('Cargo.lock') != ''
|
|
450
|
+
shell: bash
|
|
451
|
+
run: |
|
|
452
|
+
if ! mbx=$(command -v mbx); then
|
|
453
|
+
echo "::error::smoo.mbxRemote is declared but the devenv shell provides no mbx; add mbx to tooling/direnv/devenv.nix"
|
|
454
|
+
exit 1
|
|
455
|
+
fi
|
|
456
|
+
home="$RUNNER_TEMP/mbx-setup"
|
|
457
|
+
data="$home/Library/Application Support"
|
|
458
|
+
mkdir -p "$data"
|
|
459
|
+
HOME="$home" XDG_DATA_HOME="$data" XDG_CONFIG_HOME="$home/config" XDG_CACHE_HOME="$home/cache" \
|
|
460
|
+
MBX_CACHE_DIR="$home/cache/mbx" "$mbx" setup --yes
|
|
461
|
+
shim="$data/mbx/bin"
|
|
462
|
+
if [ ! -x "$shim/cargo" ]; then
|
|
463
|
+
echo "::error::$mbx setup --yes wrote no Cargo shim at $shim/cargo"
|
|
464
|
+
exit 1
|
|
465
|
+
fi
|
|
466
|
+
echo "$shim" >> "$GITHUB_PATH"
|
|
467
|
+
echo "Cargo runs through mbx ($mbx), remote $MBX_REMOTE_URL, namespace $MBX_REMOTE_NAMESPACE"
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@smoothbricks/nx-plugin",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.14",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"main": "./loader.js",
|
|
@@ -656,7 +656,7 @@
|
|
|
656
656
|
"@nx/js": "24.0.3",
|
|
657
657
|
"@smoothbricks/build-inputs": "0.0.3",
|
|
658
658
|
"@smoothbricks/cargo-retain": "0.0.2",
|
|
659
|
-
"@smoothbricks/cowshed": "0.4.
|
|
659
|
+
"@smoothbricks/cowshed": "0.4.9",
|
|
660
660
|
"@smoothbricks/nextest-extract": "0.0.2",
|
|
661
661
|
"jsonc-parser": "^3.3.1",
|
|
662
662
|
"minimatch": "10.2.5",
|