@smoothbricks/nx-plugin 0.6.2 → 0.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +417 -171
- package/dist/.build-inputs.json +39 -28
- package/dist/bin/smoo-nx-go-test-build.d.ts +3 -0
- package/dist/bin/smoo-nx-go-test-build.d.ts.map +1 -0
- package/dist/bin/smoo-nx-go-test-build.js +79 -0
- package/dist/bin/smoo-nx-go-test-run.d.ts +3 -0
- package/dist/bin/smoo-nx-go-test-run.d.ts.map +1 -0
- package/dist/bin/smoo-nx-go-test-run.js +129 -0
- package/dist/bin/smoo-nx-publish.d.ts +3 -0
- package/dist/bin/smoo-nx-publish.d.ts.map +1 -0
- package/dist/bin/smoo-nx-publish.js +3 -0
- package/dist/bounded-test-policy.d.ts +1 -1
- package/dist/bounded-test-policy.d.ts.map +1 -1
- package/dist/bounded-test-policy.js +9 -8
- package/dist/cargo-retention-hook.d.ts +6 -2
- package/dist/cargo-retention-hook.d.ts.map +1 -1
- package/dist/cargo-retention-hook.js +13 -7
- package/dist/cargo-workspace.d.ts +10 -20
- package/dist/cargo-workspace.d.ts.map +1 -1
- package/dist/cargo-workspace.js +12 -22
- package/dist/cross-check-policy.d.ts +2 -2
- package/dist/cross-check-policy.js +2 -2
- package/dist/deploy-policy.d.ts +6 -0
- package/dist/deploy-policy.d.ts.map +1 -1
- package/dist/deploy-policy.js +11 -0
- package/dist/eslint-file-set.d.ts +4 -1
- package/dist/eslint-file-set.d.ts.map +1 -1
- package/dist/eslint-sources.d.ts +25 -0
- package/dist/eslint-sources.d.ts.map +1 -0
- package/dist/eslint-sources.js +99 -0
- package/dist/executors/all-verdicts/executor.d.ts +2 -1
- package/dist/executors/all-verdicts/executor.d.ts.map +1 -1
- package/dist/executors/all-verdicts/executor.js +48 -2
- package/dist/executors/all-verdicts/schema.d.ts +13 -0
- package/dist/executors/all-verdicts/schema.d.ts.map +1 -1
- package/dist/executors/all-verdicts/schema.js +7 -0
- package/dist/executors/bounded-exec/bounds.d.ts +57 -8
- package/dist/executors/bounded-exec/bounds.d.ts.map +1 -1
- package/dist/executors/bounded-exec/bounds.js +100 -11
- package/dist/executors/bounded-exec/executor.d.ts +2 -1
- package/dist/executors/bounded-exec/executor.d.ts.map +1 -1
- package/dist/executors/bounded-exec/executor.js +289 -34
- package/dist/executors/bounded-exec/hang-diagnostics.d.ts +2 -0
- package/dist/executors/bounded-exec/hang-diagnostics.d.ts.map +1 -1
- package/dist/executors/bounded-exec/hang-diagnostics.js +2 -2
- package/dist/executors/bounded-exec/mbx-pool.d.ts +56 -10
- package/dist/executors/bounded-exec/mbx-pool.d.ts.map +1 -1
- package/dist/executors/bounded-exec/mbx-pool.js +145 -11
- package/dist/executors/bounded-exec/mbx-queue.d.ts +30 -0
- package/dist/executors/bounded-exec/mbx-queue.d.ts.map +1 -0
- package/dist/executors/bounded-exec/mbx-queue.js +229 -0
- package/dist/executors/bounded-exec/progress.d.ts +9 -2
- package/dist/executors/bounded-exec/progress.d.ts.map +1 -1
- package/dist/executors/bounded-exec/progress.js +151 -25
- package/dist/executors/bounded-exec/runner-sizing.d.ts +40 -2
- package/dist/executors/bounded-exec/runner-sizing.d.ts.map +1 -1
- package/dist/executors/bounded-exec/runner-sizing.js +55 -4
- package/dist/executors/bounded-exec/runtime-pin.js +1 -1
- package/dist/executors/bounded-exec/test-result-writer.d.ts +30 -0
- package/dist/executors/bounded-exec/test-result-writer.d.ts.map +1 -0
- package/dist/executors/bounded-exec/test-result-writer.js +126 -0
- package/dist/executors/bounded-exec/test-results.d.ts +33 -0
- package/dist/executors/bounded-exec/test-results.d.ts.map +1 -0
- package/dist/executors/bounded-exec/test-results.js +33 -0
- package/dist/executors/bounded-exec/verdict.d.ts +26 -2
- package/dist/executors/bounded-exec/verdict.d.ts.map +1 -1
- package/dist/executors/bounded-exec/verdict.js +108 -4
- package/dist/executors/wrangler-deploy/deploy-hash.d.ts +10 -0
- package/dist/executors/wrangler-deploy/deploy-hash.d.ts.map +1 -0
- package/dist/executors/wrangler-deploy/deploy-hash.js +14 -0
- package/dist/executors/wrangler-deploy/executor.d.ts +24 -0
- package/dist/executors/wrangler-deploy/executor.d.ts.map +1 -0
- package/dist/executors/wrangler-deploy/executor.js +43 -0
- package/dist/executors/wrangler-deploy/hasher.d.ts +27 -0
- package/dist/executors/wrangler-deploy/hasher.d.ts.map +1 -0
- package/dist/executors/wrangler-deploy/hasher.js +90 -0
- package/dist/executors/wrangler-deploy/schema.d.ts +5 -0
- package/dist/executors/wrangler-deploy/schema.d.ts.map +1 -0
- package/dist/go-tests.d.ts +30 -0
- package/dist/go-tests.d.ts.map +1 -0
- package/dist/go-tests.js +43 -0
- package/dist/index.d.ts +12 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +338 -295
- package/dist/managed-files/files.d.ts.map +1 -1
- package/dist/managed-files/files.js +5 -0
- package/dist/nx-publish.d.ts +24 -0
- package/dist/nx-publish.d.ts.map +1 -0
- package/dist/nx-publish.js +150 -0
- package/dist/process-group.js +2 -2
- package/dist/runtime-input-policy.d.ts +17 -3
- package/dist/runtime-input-policy.d.ts.map +1 -1
- package/dist/runtime-input-policy.js +4 -4
- package/dist/test-timings.d.ts +23 -4
- package/dist/test-timings.d.ts.map +1 -1
- package/dist/test-timings.js +72 -12
- package/dist/tool-bins.d.ts +6 -8
- package/dist/tool-bins.d.ts.map +1 -1
- package/dist/tool-bins.js +7 -5
- package/dist/version-actions.cjs +10 -11
- package/dist/version-actions.d.cts.map +1 -1
- package/dist/workspace-config-policy.d.ts.map +1 -1
- package/dist/workspace-config-policy.js +17 -22
- package/dist/workspace-index.d.ts +7 -0
- package/dist/workspace-index.d.ts.map +1 -1
- package/dist/workspace-index.js +11 -0
- package/dist/workspace-manifest.js +3 -3
- package/executors.json +7 -6
- package/managed/raw/patches/nx@23.2.1.patch +118 -24
- package/managed/raw/patches/ttsc@0.34.1.patch +139 -0
- package/managed/raw/tooling/devenv +1 -2
- package/managed/raw/tooling/direnv/developer-links.ts +124 -51
- package/managed/raw/tooling/direnv/devenv.smoo.nix +34 -15
- package/managed/raw/tooling/direnv/github-actions-bootstrap.sh +20 -10
- package/managed/raw/tooling/direnv/installed-bun-links.ts +7 -6
- package/managed/raw/tooling/direnv/setup-environment.ts +49 -24
- package/managed/raw/tooling/direnv/ttsc-env.sh +8 -6
- package/managed/raw/tooling/git-hooks/pinned-revisions-served.ts +252 -0
- package/managed/raw/tooling/git-hooks/pre-push.sh +34 -32
- package/managed/templates/github/actions/cache-node-modules/action.yml +1 -1
- package/managed/templates/github/actions/cache-ttsc-plugins/action.yml +12 -11
- package/package.json +277 -11
- package/runtime/nx-publish/.build-inputs.json +11 -0
- package/runtime/nx-publish/cache_adapter.js +45 -0
- package/runtime/nx-publish/nx_publish.js +60 -0
- package/runtime-input.sh +62 -26
- package/src/bin/smoo-nx-go-test-build.ts +83 -0
- package/src/bin/smoo-nx-go-test-run.ts +140 -0
- package/src/bin/smoo-nx-publish.ts +4 -0
- package/src/bounded-test-policy.ts +9 -8
- package/src/cargo-retention-hook.ts +16 -10
- package/src/cargo-workspace.ts +12 -24
- package/src/cross-check-policy.ts +2 -2
- package/src/deploy-policy.ts +11 -0
- package/src/eslint-file-set.ts +4 -1
- package/src/eslint-sources.ts +134 -0
- package/src/executors/all-verdicts/executor.ts +58 -3
- package/src/executors/all-verdicts/schema.json +4 -0
- package/src/executors/all-verdicts/schema.ts +14 -0
- package/src/executors/bounded-exec/bounds.ts +132 -15
- package/src/executors/bounded-exec/executor.ts +329 -34
- package/src/executors/bounded-exec/hang-diagnostics.ts +3 -2
- package/src/executors/bounded-exec/mbx-pool.ts +158 -17
- package/src/executors/bounded-exec/mbx-queue.ts +170 -0
- package/src/executors/bounded-exec/progress.ts +171 -18
- package/src/executors/bounded-exec/runner-sizing.ts +73 -7
- package/src/executors/bounded-exec/runtime-pin.ts +1 -1
- package/src/executors/bounded-exec/test-result-writer.ts +152 -0
- package/src/executors/bounded-exec/test-results.ts +39 -0
- package/src/executors/bounded-exec/verdict.ts +115 -5
- package/src/executors/wrangler-deploy/deploy-hash.ts +15 -0
- package/src/executors/wrangler-deploy/executor.ts +63 -0
- package/src/executors/wrangler-deploy/hasher.ts +111 -0
- package/src/executors/wrangler-deploy/schema.json +16 -0
- package/src/executors/wrangler-deploy/schema.ts +4 -0
- package/src/go-tests.ts +67 -0
- package/src/index.ts +368 -323
- package/src/managed-files/files.ts +5 -0
- package/src/nx-publish.ts +157 -0
- package/src/process-group.ts +2 -2
- package/src/runtime-input-policy.ts +4 -4
- package/src/test-timings.ts +72 -14
- package/src/tool-bins.ts +13 -9
- package/src/version-actions.cts +10 -11
- package/src/workspace-config-policy.ts +20 -29
- package/src/workspace-index.ts +12 -0
- package/src/workspace-manifest.ts +3 -3
- package/test-timings.json +131 -125
- package/dist/executors/clean-outputs/executor.d.ts +0 -26
- package/dist/executors/clean-outputs/executor.d.ts.map +0 -1
- package/dist/executors/clean-outputs/executor.js +0 -83
- package/dist/executors/clean-outputs/schema.d.ts +0 -4
- package/dist/executors/clean-outputs/schema.d.ts.map +0 -1
- package/src/executors/clean-outputs/executor.ts +0 -131
- package/src/executors/clean-outputs/schema.json +0 -15
- package/src/executors/clean-outputs/schema.ts +0 -3
- /package/dist/executors/{clean-outputs → wrangler-deploy}/schema.js +0 -0
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
import { execFile } from 'node:child_process';
|
|
2
|
+
import { randomBytes } from 'node:crypto';
|
|
3
|
+
import { delimiter, join } from 'node:path';
|
|
4
|
+
import { promisify } from 'node:util';
|
|
5
|
+
import type { HasherContext } from 'nx/src/config/misc-interfaces';
|
|
6
|
+
import type { Task } from 'nx/src/config/task-graph';
|
|
7
|
+
import type { Hash } from 'nx/src/hasher/task-hasher';
|
|
8
|
+
import { workspaceRoot } from 'nx/src/utils/workspace-root';
|
|
9
|
+
import { deployVersionTag } from '../../deploy-policy.js';
|
|
10
|
+
import { isRecord } from '../../type-guards.js';
|
|
11
|
+
import { unconfirmedDeployHash } from './deploy-hash.js';
|
|
12
|
+
|
|
13
|
+
const execFileAsync = promisify(execFile);
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* `smoo wrangler deployed-version` asks Cloudflare twice through wrangler, in seconds. The bound is for one that never
|
|
17
|
+
* answers: the live version is then unknown, the hash misses, and the deploy reads Cloudflare itself.
|
|
18
|
+
*/
|
|
19
|
+
const LIVE_TAG_DEADLINE_MS = 120_000;
|
|
20
|
+
|
|
21
|
+
/** What serves a stage: the tag of the version taking all its traffic (null for a version deployed untagged), or why that is not known. */
|
|
22
|
+
export type LiveTag =
|
|
23
|
+
| { readonly kind: 'tag'; readonly tag: string | null }
|
|
24
|
+
| { readonly kind: 'unknown'; readonly reason: string };
|
|
25
|
+
|
|
26
|
+
/** The hash detail that says what the stage served when it was not the artifact's version. */
|
|
27
|
+
export const LIVE_VERSION_NODE = 'wrangler:live-version';
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* A deploy's hash: `artifact`, Nx's hash of what the deploy uploads and the stage it names, while the stage serves the
|
|
31
|
+
* version tagged with it, so a cache hit replays a deploy that would change nothing. Any other live version, or none
|
|
32
|
+
* known, makes it `unconfirmedDeployHash`, which no cache holds, so the run deploys; a rollback is never answered
|
|
33
|
+
* from the cache. Hashing the live tag in instead would never converge: the deployed version is tagged with the hash.
|
|
34
|
+
*/
|
|
35
|
+
export function deployHash(artifact: Hash, live: LiveTag, nonce: string): Hash {
|
|
36
|
+
const expected = deployVersionTag(artifact.value);
|
|
37
|
+
if (live.kind === 'tag' && expected !== null && live.tag === expected) return artifact;
|
|
38
|
+
const served =
|
|
39
|
+
expected === null
|
|
40
|
+
? `the artifact hash ${artifact.value} names no version tag`
|
|
41
|
+
: live.kind === 'unknown'
|
|
42
|
+
? live.reason
|
|
43
|
+
: `${live.tag ?? 'an untagged version'} is live, not ${expected}`;
|
|
44
|
+
return {
|
|
45
|
+
...artifact,
|
|
46
|
+
value: unconfirmedDeployHash(artifact.value, nonce),
|
|
47
|
+
details: { ...artifact.details, nodes: { ...artifact.details.nodes, [LIVE_VERSION_NODE]: served } },
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/** `env`'s PATH with the workspace's own bins first, as nx:run-commands runs a command. */
|
|
52
|
+
export function workspaceBinPath(root: string, env: NodeJS.ProcessEnv): string {
|
|
53
|
+
const bins = join(root, 'node_modules', '.bin');
|
|
54
|
+
return env.PATH === undefined || env.PATH === '' ? bins : `${bins}${delimiter}${env.PATH}`;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/** The tag serving `stage` for the project at `projectRoot`, read from Cloudflare now, never from a cached answer. */
|
|
58
|
+
export async function probeLiveTag(
|
|
59
|
+
root: string,
|
|
60
|
+
projectRoot: string,
|
|
61
|
+
stage: string,
|
|
62
|
+
env: NodeJS.ProcessEnv = process.env,
|
|
63
|
+
): Promise<LiveTag> {
|
|
64
|
+
const args = ['wrangler', 'deployed-version', '--stage', stage, '--refresh'];
|
|
65
|
+
const command = `smoo ${args.join(' ')}`;
|
|
66
|
+
try {
|
|
67
|
+
const { stdout } = await execFileAsync('smoo', args, {
|
|
68
|
+
cwd: join(root, projectRoot),
|
|
69
|
+
env: { ...env, PATH: workspaceBinPath(root, env) },
|
|
70
|
+
encoding: 'utf8',
|
|
71
|
+
timeout: LIVE_TAG_DEADLINE_MS,
|
|
72
|
+
killSignal: 'SIGKILL',
|
|
73
|
+
maxBuffer: 64 * 1024,
|
|
74
|
+
});
|
|
75
|
+
const tag = stdout.trim();
|
|
76
|
+
if (tag === '' || /\s/.test(tag)) {
|
|
77
|
+
return { kind: 'unknown', reason: `\`${command}\` printed no single tag: ${JSON.stringify(stdout)}` };
|
|
78
|
+
}
|
|
79
|
+
// `deployed-version` says `untagged` for a version deployed outside Nx.
|
|
80
|
+
return { kind: 'tag', tag: tag === 'untagged' ? null : tag };
|
|
81
|
+
} catch (error) {
|
|
82
|
+
if (error instanceof Error && 'killed' in error && error.killed === true) {
|
|
83
|
+
return { kind: 'unknown', reason: `\`${command}\` gave no answer within ${LIVE_TAG_DEADLINE_MS} ms` };
|
|
84
|
+
}
|
|
85
|
+
const said =
|
|
86
|
+
error instanceof Error && 'stderr' in error && typeof error.stderr === 'string' ? error.stderr.trim() : '';
|
|
87
|
+
const reason = said !== '' ? said : error instanceof Error ? error.message : String(error);
|
|
88
|
+
return { kind: 'unknown', reason: `\`${command}\` failed: ${reason}` };
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
/** The stage the task deploys: its `--stage` override, else its target's `stage` option. */
|
|
93
|
+
function deployStage(task: Task, options: unknown): string | null {
|
|
94
|
+
const overrides: unknown = task.overrides;
|
|
95
|
+
if (isRecord(overrides) && typeof overrides.stage === 'string') return overrides.stage;
|
|
96
|
+
return isRecord(options) && typeof options.stage === 'string' ? options.stage : null;
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
/** Nx's custom hasher of `@smoothbricks/nx-plugin:wrangler-deploy`: `deployHash` of the task's own hash and its stage's live tag. */
|
|
100
|
+
export default async function wranglerDeployHasher(task: Task, context: HasherContext): Promise<Hash> {
|
|
101
|
+
const artifact = await context.hasher.hashTask(task, context.taskGraph);
|
|
102
|
+
const project = context.projectsConfigurations.projects[task.target.project];
|
|
103
|
+
const stage = deployStage(task, project?.targets?.[task.target.target]?.options);
|
|
104
|
+
const live: LiveTag =
|
|
105
|
+
project === undefined
|
|
106
|
+
? { kind: 'unknown', reason: `Nx names no project ${task.target.project}` }
|
|
107
|
+
: stage === null
|
|
108
|
+
? { kind: 'unknown', reason: 'the task names no --stage' }
|
|
109
|
+
: await probeLiveTag(workspaceRoot, project.root, stage);
|
|
110
|
+
return deployHash(artifact, live, randomBytes(8).toString('hex'));
|
|
111
|
+
}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "https://json-schema.org/schema",
|
|
3
|
+
"version": 2,
|
|
4
|
+
"title": "Wrangler Deploy Executor",
|
|
5
|
+
"description": "Deploy a stage with smoo wrangler deploy-stage, cached on the artifact and the stage while the stage serves that artifact's version.",
|
|
6
|
+
"type": "object",
|
|
7
|
+
"cli": "nx",
|
|
8
|
+
"required": ["stage"],
|
|
9
|
+
"properties": {
|
|
10
|
+
"stage": {
|
|
11
|
+
"type": "string",
|
|
12
|
+
"description": "staging, production, or prN: the stage this run deploys, given with --stage."
|
|
13
|
+
}
|
|
14
|
+
},
|
|
15
|
+
"additionalProperties": false
|
|
16
|
+
}
|
package/src/go-tests.ts
ADDED
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { readFileSync } from 'node:fs';
|
|
2
|
+
import { dirname, isAbsolute, resolve } from 'node:path';
|
|
3
|
+
import { isRecord } from './type-guards.js';
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* The manifest `smoo-nx-go-test-build` writes beside the test binaries it builds with `go test -c`, and
|
|
7
|
+
* `smoo-nx-go-test-run` runs. Every path in it is relative to the manifest's own directory, so the binaries and the
|
|
8
|
+
* packages they test are found wherever both are restored together, as an Nx cache restore puts them back.
|
|
9
|
+
*/
|
|
10
|
+
export const GO_TESTS_MANIFEST = 'go-tests.json';
|
|
11
|
+
|
|
12
|
+
/** One package's test binary. */
|
|
13
|
+
export interface GoTestBinary {
|
|
14
|
+
/** The binary `go test -c` built for the package. */
|
|
15
|
+
readonly binary: string;
|
|
16
|
+
/** The package directory: `go test` runs a package's binary there, so its relative test data resolves alike. */
|
|
17
|
+
readonly dir: string;
|
|
18
|
+
/** The package's import path, every event's `Package`. */
|
|
19
|
+
readonly importPath: string;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
export interface GoTestsManifest {
|
|
23
|
+
readonly version: 1;
|
|
24
|
+
/** One entry per package with test files, sorted by import path. */
|
|
25
|
+
readonly tests: readonly GoTestBinary[];
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
export type GoTestsRead =
|
|
29
|
+
| { readonly ok: true; readonly tests: readonly GoTestBinary[] }
|
|
30
|
+
| { readonly ok: false; readonly reason: string };
|
|
31
|
+
|
|
32
|
+
/** The binaries the manifest at `path` lists, their paths resolved against its directory, or why it lists none. */
|
|
33
|
+
export function readGoTestsManifest(path: string): GoTestsRead {
|
|
34
|
+
let parsed: unknown;
|
|
35
|
+
try {
|
|
36
|
+
parsed = JSON.parse(readFileSync(path, 'utf8'));
|
|
37
|
+
} catch (error) {
|
|
38
|
+
return { ok: false, reason: `${path} cannot be read: ${error instanceof Error ? error.message : String(error)}` };
|
|
39
|
+
}
|
|
40
|
+
if (!isRecord(parsed) || parsed.version !== 1 || !Array.isArray(parsed.tests)) {
|
|
41
|
+
return { ok: false, reason: `${path} is no version 1 ${GO_TESTS_MANIFEST}: it needs {"version":1,"tests":[…]}` };
|
|
42
|
+
}
|
|
43
|
+
const base = dirname(path);
|
|
44
|
+
const tests: GoTestBinary[] = [];
|
|
45
|
+
const listed = new Set<string>();
|
|
46
|
+
for (const [index, entry] of parsed.tests.entries()) {
|
|
47
|
+
if (
|
|
48
|
+
!isRecord(entry) ||
|
|
49
|
+
!isRelativePath(entry.binary) ||
|
|
50
|
+
!isRelativePath(entry.dir) ||
|
|
51
|
+
typeof entry.importPath !== 'string' ||
|
|
52
|
+
entry.importPath === ''
|
|
53
|
+
) {
|
|
54
|
+
return { ok: false, reason: `${path}: tests[${index}] needs a relative binary and dir and an importPath` };
|
|
55
|
+
}
|
|
56
|
+
if (listed.has(entry.importPath)) {
|
|
57
|
+
return { ok: false, reason: `${path}: ${entry.importPath} is listed twice` };
|
|
58
|
+
}
|
|
59
|
+
listed.add(entry.importPath);
|
|
60
|
+
tests.push({ binary: resolve(base, entry.binary), dir: resolve(base, entry.dir), importPath: entry.importPath });
|
|
61
|
+
}
|
|
62
|
+
return { ok: true, tests };
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
function isRelativePath(value: unknown): value is string {
|
|
66
|
+
return typeof value === 'string' && value !== '' && !isAbsolute(value);
|
|
67
|
+
}
|