@layerzerolabs/vm-tooling 0.2.104 → 0.2.106
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/dist/{5PWUQUE5.js → DVALPAAO.js} +25 -3
- package/dist/DVALPAAO.js.map +1 -0
- package/dist/{3IQB2ZZF.js → E35WFC4E.js} +3 -3
- package/dist/{3IQB2ZZF.js.map → E35WFC4E.js.map} +1 -1
- package/dist/{TMKE5ARZ.js → EY2G7NK4.js} +3 -3
- package/dist/{TMKE5ARZ.js.map → EY2G7NK4.js.map} +1 -1
- package/dist/{SQYDOF2V.js → GFKRACRT.js} +3 -3
- package/dist/{SQYDOF2V.js.map → GFKRACRT.js.map} +1 -1
- package/dist/GIFXFMSS.js +13 -0
- package/dist/GIFXFMSS.js.map +1 -0
- package/dist/{TSEHDOF7.js → GMN3ZEOV.js} +14 -6
- package/dist/GMN3ZEOV.js.map +1 -0
- package/dist/{INYD2E56.js → HN2JUVAX.js} +94 -29
- package/dist/HN2JUVAX.js.map +1 -0
- package/dist/KN3TRHEZ.js +107 -0
- package/dist/KN3TRHEZ.js.map +1 -0
- package/dist/{HOFCGMNS.js → TMIYMQW3.js} +27 -9
- package/dist/TMIYMQW3.js.map +1 -0
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +6 -5
- package/dist/config.d.ts +12 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +2 -1
- package/dist/core/index.js +5 -4
- package/dist/core/local-executor.test.js +1 -1
- package/dist/core/lock.test.js +1 -1
- package/dist/core/tool-executor.d.ts +14 -2
- package/dist/core/tool-executor.d.ts.map +1 -1
- package/dist/core/tool-executor.js +5 -4
- package/dist/core/tool-executor.test.js +180 -0
- package/dist/core/tool-executor.test.js.map +1 -0
- package/dist/environment.d.ts +4 -0
- package/dist/environment.d.ts.map +1 -0
- package/dist/environment.js +4 -0
- package/dist/environment.js.map +1 -0
- package/dist/github/index.js +5 -4
- package/dist/github/matrix.js +4 -3
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -8
- package/dist/index.js.map +1 -1
- package/dist/test.js +4 -3
- package/dist/utils/docker.d.ts +30 -3
- package/dist/utils/docker.d.ts.map +1 -1
- package/dist/utils/docker.js +3 -2
- package/dist/utils/docker.test.js +272 -0
- package/dist/utils/docker.test.js.map +1 -0
- package/package.json +5 -5
- package/dist/5PWUQUE5.js.map +0 -1
- package/dist/HOFCGMNS.js.map +0 -1
- package/dist/INYD2E56.js.map +0 -1
- package/dist/RVVZQC34.js +0 -56
- package/dist/RVVZQC34.js.map +0 -1
- package/dist/TSEHDOF7.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/utils/docker.ts"],"names":["resolveDockerPlatform","dockerPlatform","undefined","archSegment","split","arch","value","namespace","replace","resolveEffectiveDockerPlatformValue","toolDockerPlatform","envDockerPlatform","env","DOCKER_DEFAULT_PLATFORM","DOCKER_PLATFORM_NATIVE","resolveDockerPlatformExecution","options","_dockerDefaultPlatform","processEnv","args","volumeNameOptions","platform","findImageForTool","context","toolName","version","image","versionCombinations","flatMap","combination","imageId","images","findToolVersionsForCombination","Error","getImageUri","join","getRegistry","getImageDirectory","getImageName","name","getImageTag","versions","patch","Object","entries","sort","flat","qualifyVolumeName","volume","cacheKey","type","components","shared","toolchainKeyed","push","packageName","npm_package_name","basename","architectureIndependent"],"mappings":"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","file":"KN3TRHEZ.js","sourcesContent":["import { basename, join } from 'node:path';\nimport { env } from 'node:process';\n\nimport type { DockerPlatformOverride, DockerPlatformValue, Image, VolumeMapping } from '../config';\nimport { DOCKER_PLATFORM_NATIVE, getImageDirectory, getRegistry } from '../config';\nimport type { ChainContext } from '../context';\nimport { findToolVersionsForCombination, getImageName } from './finder';\n\nexport interface DockerPlatform {\n /** Raw value, e.g. `linux/amd64`, for Docker `--platform`. */\n value: string;\n /** Filesystem-safe token for cache volume names, e.g. `linux-amd64`. */\n namespace: string;\n /** Architecture as `docker inspect --format {{.Architecture}}` reports it, e.g. `amd64`. */\n arch: string;\n}\n\nexport type DockerProcessEnv = Record<string, string | undefined>;\n\nexport interface QualifyVolumeNameOptions {\n cacheKey?: string;\n dockerPlatform?: string;\n}\n\nexport interface DockerPlatformResolutionOptions {\n dockerPlatform?: DockerPlatformOverride;\n toolDockerPlatform?: DockerPlatformValue;\n envDockerPlatform?: string;\n}\n\nexport interface DockerPlatformExecution {\n platform?: DockerPlatform;\n args: string[];\n processEnv?: DockerProcessEnv;\n volumeNameOptions: QualifyVolumeNameOptions;\n}\n\nexport const resolveDockerPlatform = (dockerPlatform?: string): DockerPlatform | undefined => {\n if (!dockerPlatform) {\n return undefined;\n }\n\n const [, archSegment] = dockerPlatform.split('/');\n const arch = archSegment || dockerPlatform;\n\n return {\n value: dockerPlatform,\n namespace: dockerPlatform.replace(/\\//g, '-'),\n arch,\n };\n};\n\n// Platform precedence is intentional: CLI override > tool default > DOCKER_DEFAULT_PLATFORM.\n// A tool default is an explicit choice made by the tool config (for example Anchor's amd64 pin),\n// so a user's shell env should not override it by accident. DOCKER_DEFAULT_PLATFORM only applies\n// when the tool does not declare a platform.\n// `native` is an escape hatch from forced platform selection: it resolves to no\n// platform value, so Docker commands run without `--platform`.\nexport const resolveEffectiveDockerPlatformValue = ({\n dockerPlatform,\n toolDockerPlatform,\n envDockerPlatform = env.DOCKER_DEFAULT_PLATFORM,\n}: DockerPlatformResolutionOptions): string | undefined => {\n if (dockerPlatform === DOCKER_PLATFORM_NATIVE) {\n return undefined;\n }\n\n return dockerPlatform ?? toolDockerPlatform ?? envDockerPlatform;\n};\n\nexport const resolveDockerPlatformExecution = (\n options: DockerPlatformResolutionOptions,\n): DockerPlatformExecution => {\n if (options.dockerPlatform === DOCKER_PLATFORM_NATIVE) {\n // Clear DOCKER_DEFAULT_PLATFORM as well, otherwise Docker would still be forced\n // to use that platform even though this run requested native execution.\n const { DOCKER_DEFAULT_PLATFORM: _dockerDefaultPlatform, ...processEnv } = env;\n\n return {\n args: [],\n processEnv,\n volumeNameOptions: { dockerPlatform: undefined },\n };\n }\n\n const platform = resolveDockerPlatform(resolveEffectiveDockerPlatformValue(options));\n\n return {\n platform,\n args: platform ? ['--platform', platform.value] : [],\n volumeNameOptions: { dockerPlatform: platform?.value },\n };\n};\n\nexport const findImageForTool = <TImageId extends string>(\n context: ChainContext<TImageId>,\n toolName: string,\n version: string,\n): Image => {\n const [image] = context.versionCombinations.flatMap((combination) => {\n const imageId = combination.images[toolName];\n\n if (!imageId) {\n return [];\n }\n\n const image = context.images[imageId];\n\n return image && findToolVersionsForCombination(context, combination)[toolName] === version\n ? [image]\n : [];\n });\n\n if (!image) {\n throw new Error(\n `No version combination found for tool ${toolName} with version ${version}`,\n );\n }\n\n return image;\n};\n\nexport const getImageUri = async (image: Image): Promise<string> =>\n join(\n await getRegistry(),\n await getImageDirectory(),\n `${getImageName(image.name)}:${getImageTag(image)}`,\n );\n\nexport const getImageTag = ({ versions, patch }: Image): string =>\n [...Object.entries(versions).sort().flat(), ...(patch ? ['patch', patch] : [])].join('-');\n\nexport const qualifyVolumeName = (\n volume: VolumeMapping,\n { cacheKey, dockerPlatform }: QualifyVolumeNameOptions = {\n dockerPlatform: env.DOCKER_DEFAULT_PLATFORM,\n },\n): VolumeMapping => {\n if (volume.type !== 'isolate') {\n return volume;\n }\n\n const components = ['lz-tooling-cache', volume.name];\n\n if (!volume.shared) {\n // Opted-in volumes key on the toolchain (image tag) so same-toolchain packages share one\n // cache; the rest stay package-private. Falls back to package-private without a cacheKey.\n if (volume.toolchainKeyed && cacheKey) {\n components.push(cacheKey);\n } else {\n const packageName = env.npm_package_name;\n\n if (!packageName) {\n throw new Error('npm_package_name environment variable not defined');\n }\n\n components.push(basename(packageName));\n }\n }\n\n const platform = resolveDockerPlatform(dockerPlatform);\n if (platform && !volume.architectureIndependent) {\n components.push(platform.namespace);\n }\n\n return { ...volume, name: components.join('-') };\n};\n"]}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { registry, imageDirectory } from './GIFXFMSS.js';
|
|
1
2
|
import { init_esm_shims, __name } from './CWKWODSW.js';
|
|
2
3
|
import { join } from 'path';
|
|
3
4
|
import * as z from 'zod';
|
|
@@ -8,12 +9,10 @@ init_esm_shims();
|
|
|
8
9
|
var registryConfigCache;
|
|
9
10
|
var getRegistryConfig = /* @__PURE__ */ __name(async () => {
|
|
10
11
|
if (!registryConfigCache) {
|
|
11
|
-
|
|
12
|
-
const envImageDirectory = process.env.VM_TOOLING_IMAGE_DIRECTORY;
|
|
13
|
-
if (envRegistry && envImageDirectory) {
|
|
12
|
+
if (registry && imageDirectory) {
|
|
14
13
|
registryConfigCache = {
|
|
15
|
-
registry
|
|
16
|
-
imageDirectory
|
|
14
|
+
registry,
|
|
15
|
+
imageDirectory
|
|
17
16
|
};
|
|
18
17
|
} else {
|
|
19
18
|
const workspaceRoot = await getFullyQualifiedRepoRootPath();
|
|
@@ -24,6 +23,7 @@ var getRegistryConfig = /* @__PURE__ */ __name(async () => {
|
|
|
24
23
|
}
|
|
25
24
|
return registryConfigCache;
|
|
26
25
|
}, "getRegistryConfig");
|
|
26
|
+
var CARGO_TARGET_CACHE_PATH = "/cargo-target";
|
|
27
27
|
var volumeMappingBaseSchema = z.object({
|
|
28
28
|
containerPath: z.string()
|
|
29
29
|
});
|
|
@@ -35,12 +35,30 @@ var isolateVolumeMappingSchema = volumeMappingBaseSchema.extend({
|
|
|
35
35
|
type: z.literal("isolate"),
|
|
36
36
|
name: z.string(),
|
|
37
37
|
shared: z.optional(z.boolean()),
|
|
38
|
-
locked: z.optional(z.boolean())
|
|
38
|
+
locked: z.optional(z.boolean()),
|
|
39
|
+
// Share this cache across packages on the same toolchain instead of per-package. See
|
|
40
|
+
// qualifyVolumeName. Opt-in — omit to keep it package-private.
|
|
41
|
+
toolchainKeyed: z.optional(z.boolean()),
|
|
42
|
+
// Opt out of arch-namespacing for volumes holding no compiled artifacts (config/state).
|
|
43
|
+
// Suffixing is the safe default: under-splitting an arch-sensitive cache poisons it.
|
|
44
|
+
architectureIndependent: z.optional(z.boolean())
|
|
39
45
|
});
|
|
40
46
|
var volumeMappingSchema = z.union([
|
|
41
47
|
hostVolumeMappingSchema,
|
|
42
48
|
isolateVolumeMappingSchema
|
|
43
49
|
]);
|
|
50
|
+
var DOCKER_PLATFORM_VALUES = [
|
|
51
|
+
"linux/amd64",
|
|
52
|
+
"linux/arm64"
|
|
53
|
+
];
|
|
54
|
+
var DOCKER_PLATFORM_NATIVE = "native";
|
|
55
|
+
var DOCKER_PLATFORM_OVERRIDE_VALUES = [
|
|
56
|
+
DOCKER_PLATFORM_NATIVE,
|
|
57
|
+
...DOCKER_PLATFORM_VALUES
|
|
58
|
+
];
|
|
59
|
+
var DOCKER_PLATFORM_OVERRIDE_VALUES_DESCRIPTION = DOCKER_PLATFORM_OVERRIDE_VALUES.join(", ");
|
|
60
|
+
var dockerPlatformOverrideValueSet = new Set(DOCKER_PLATFORM_OVERRIDE_VALUES);
|
|
61
|
+
var isDockerPlatformOverride = /* @__PURE__ */ __name((input) => typeof input === "string" && dockerPlatformOverrideValueSet.has(input), "isDockerPlatformOverride");
|
|
44
62
|
var DockerRegistryMirror = /* @__PURE__ */ (function(DockerRegistryMirror2) {
|
|
45
63
|
DockerRegistryMirror2["PUBLIC_GAR"] = "public-gar";
|
|
46
64
|
return DockerRegistryMirror2;
|
|
@@ -48,6 +66,6 @@ var DockerRegistryMirror = /* @__PURE__ */ (function(DockerRegistryMirror2) {
|
|
|
48
66
|
var getImageDirectory = /* @__PURE__ */ __name(async () => (await getRegistryConfig()).imageDirectory, "getImageDirectory");
|
|
49
67
|
var getRegistry = /* @__PURE__ */ __name(async () => (await getRegistryConfig()).registry, "getRegistry");
|
|
50
68
|
|
|
51
|
-
export { DockerRegistryMirror, getImageDirectory, getRegistry, volumeMappingSchema };
|
|
52
|
-
//# sourceMappingURL=
|
|
53
|
-
//# sourceMappingURL=
|
|
69
|
+
export { CARGO_TARGET_CACHE_PATH, DOCKER_PLATFORM_NATIVE, DOCKER_PLATFORM_OVERRIDE_VALUES, DOCKER_PLATFORM_OVERRIDE_VALUES_DESCRIPTION, DOCKER_PLATFORM_VALUES, DockerRegistryMirror, getImageDirectory, getRegistry, isDockerPlatformOverride, volumeMappingSchema };
|
|
70
|
+
//# sourceMappingURL=TMIYMQW3.js.map
|
|
71
|
+
//# sourceMappingURL=TMIYMQW3.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/config.ts"],"names":["registryConfigCache","getRegistryConfig","registry","imageDirectory","workspaceRoot","getFullyQualifiedRepoRootPath","configPath","join","module","default","CARGO_TARGET_CACHE_PATH","volumeMappingBaseSchema","object","containerPath","string","hostVolumeMappingSchema","extend","type","literal","hostPath","isolateVolumeMappingSchema","name","shared","optional","boolean","locked","toolchainKeyed","architectureIndependent","volumeMappingSchema","union","DOCKER_PLATFORM_VALUES","DOCKER_PLATFORM_NATIVE","DOCKER_PLATFORM_OVERRIDE_VALUES","DOCKER_PLATFORM_OVERRIDE_VALUES_DESCRIPTION","dockerPlatformOverrideValueSet","Set","isDockerPlatformOverride","input","has","DockerRegistryMirror","getImageDirectory","getRegistry"],"mappings":";;;;;;;AAAA,cAAA,EAAA;AAcA,IAAIA,mBAAAA;AAEJ,IAAMC,oCAAoB,MAAA,CAAA,YAAA;AACtB,EAAA,IAAI,CAACD,mBAAAA,EAAqB;AACtB,IAAA,IAAgBE,YAAwBC,cAAAA,EAAgB;AACpDH,MAAAA,mBAAAA,GAAsB;AAClBE,QAAAA,QAAAA;AACAC,QAAAA;AACJ,OAAA;IACJ,CAAA,MAAO;AACH,MAAA,MAAMC,aAAAA,GAAgB,MAAMC,6BAAAA,EAAAA;AAC5B,MAAA,MAAMC,aAAaC,IAAAA,CACfH,aAAAA,EACA,SAAA,EACA,YAAA,EACA,UACA,sBAAA,CAAA;AAGJ,MAAA,MAAMI,MAAAA,GAAS,MAAM,OAAOF,UAAAA,CAAAA;AAC5BN,MAAAA,mBAAAA,GAAsBQ,MAAAA,CAAOC,OAAAA;AACjC,IAAA;AACJ,EAAA;AACA,EAAA,OAAOT,mBAAAA;AACX,CAAA,EAtB0B,mBAAA,CAAA;AA2BnB,IAAMU,uBAAAA,GAA0B;AAEvC,IAAMC,0BAA4BC,CAAAA,CAAAA,MAAAA,CAAO;AACrCC,EAAAA,aAAAA,EAAiBC,CAAAA,CAAAA,MAAAA;AACrB,CAAA,CAAA;AAEA,IAAMC,uBAAAA,GAA0BJ,wBAAwBK,MAAAA,CAAO;AAC3DC,EAAAA,IAAAA,EAAQC,UAAQ,MAAA,CAAA;AAChBC,EAAAA,QAAAA,EAAYL,CAAAA,CAAAA,MAAAA;AAChB,CAAA,CAAA;AAEA,IAAMM,0BAAAA,GAA6BT,wBAAwBK,MAAAA,CAAO;AAC9DC,EAAAA,IAAAA,EAAQC,UAAQ,SAAA,CAAA;AAChBG,EAAAA,IAAAA,EAAQP,CAAAA,CAAAA,MAAAA,EAAM;EACdQ,MAAAA,EAAUC,CAAAA,CAAAA,QAAAA,CAAWC,WAAO,CAAA;EAC5BC,MAAAA,EAAUF,CAAAA,CAAAA,QAAAA,CAAWC,WAAO,CAAA;;;EAG5BE,cAAAA,EAAkBH,CAAAA,CAAAA,QAAAA,CAAWC,WAAO,CAAA;;;EAGpCG,uBAAAA,EAA2BJ,CAAAA,CAAAA,QAAAA,CAAWC,WAAO;AACjD,CAAA,CAAA;AAEO,IAAMI,sBAAwBC,CAAAA,CAAAA,KAAAA,CAAM;AAACd,EAAAA,uBAAAA;AAAyBK,EAAAA;AAA2B,CAAA;AAYzF,IAAMU,sBAAAA,GAAyB;AAAC,EAAA,aAAA;AAAe,EAAA;;AAC/C,IAAMC,sBAAAA,GAAyB;AAC/B,IAAMC,+BAAAA,GAAkC;AAC3CD,EAAAA,sBAAAA;AACGD,EAAAA,GAAAA;;AAEA,IAAMG,2CAAAA,GACTD,+BAAAA,CAAgCzB,IAAAA,CAAK,IAAA;AAEzC,IAAM2B,8BAAAA,GAAiC,IAAIC,GAAAA,CAAYH,+BAAAA,CAAAA;AAKhD,IAAMI,wBAAAA,2BAA4BC,KAAAA,KACrC,OAAOA,UAAU,QAAA,IAAYH,8BAAAA,CAA+BI,GAAAA,CAAID,KAAAA,CAAAA,EAD5B,0BAAA;AA4BjC,IAAWE,oBAAAA,6BAAAA,qBAAAA,EAAAA;;AAAAA,EAAAA,OAAAA,qBAAAA;;AAkBX,IAAMC,iBAAAA,mBAAoB,MAAA,CAAA,YAAA,CAAa,MAAMvC,iBAAAA,IAAqBE,cAAAA,EAAxC,mBAAA;AAC1B,IAAMsC,WAAAA,mBAAc,MAAA,CAAA,YAAA,CAAa,MAAMxC,iBAAAA,IAAqBC,QAAAA,EAAxC,aAAA","file":"TMIYMQW3.js","sourcesContent":["import { join } from 'node:path';\nimport * as z from 'zod';\n\nimport { getFullyQualifiedRepoRootPath } from '@layerzerolabs/common-node-utils';\n\nimport type { ChainContext } from './context';\nimport type { ToolCommandExecutionOptions } from './core/tool-executor';\nimport * as environment from './environment';\n\ninterface RegistryConfig {\n registry: string;\n imageDirectory: string;\n}\n\nlet registryConfigCache: RegistryConfig | undefined;\n\nconst getRegistryConfig = async (): Promise<RegistryConfig> => {\n if (!registryConfigCache) {\n if (environment.registry && environment.imageDirectory) {\n registryConfigCache = {\n registry: environment.registry,\n imageDirectory: environment.imageDirectory,\n };\n } else {\n const workspaceRoot = await getFullyQualifiedRepoRootPath();\n const configPath = join(\n workspaceRoot,\n 'configs',\n 'vm-tooling',\n 'values',\n 'docker-image-repo.ts',\n );\n\n const module = await import(configPath);\n registryConfigCache = module.default;\n }\n }\n return registryConfigCache!;\n};\n\n// Container path for the shared cargo build-artifact cache. A VM mounts its toolchain `target/`\n// cache at this path; resolveCargoCacheEnv keys on it to inject CARGO_TARGET_DIR. Single source so\n// the helper's lookup and each VM config's containerPath can't drift apart.\nexport const CARGO_TARGET_CACHE_PATH = '/cargo-target';\n\nconst volumeMappingBaseSchema = z.object({\n containerPath: z.string(),\n});\n\nconst hostVolumeMappingSchema = volumeMappingBaseSchema.extend({\n type: z.literal('host'),\n hostPath: z.string(),\n});\n\nconst isolateVolumeMappingSchema = volumeMappingBaseSchema.extend({\n type: z.literal('isolate'),\n name: z.string(),\n shared: z.optional(z.boolean()),\n locked: z.optional(z.boolean()),\n // Share this cache across packages on the same toolchain instead of per-package. See\n // qualifyVolumeName. Opt-in — omit to keep it package-private.\n toolchainKeyed: z.optional(z.boolean()),\n // Opt out of arch-namespacing for volumes holding no compiled artifacts (config/state).\n // Suffixing is the safe default: under-splitting an arch-sensitive cache poisons it.\n architectureIndependent: z.optional(z.boolean()),\n});\n\nexport const volumeMappingSchema = z.union([hostVolumeMappingSchema, isolateVolumeMappingSchema]);\n\nexport type VolumeMapping = z.infer<typeof volumeMappingSchema>;\n\nexport interface EnvironmentVariable {\n name: string;\n value: string;\n}\n\n// Explicit platform pins currently supported by tool config and the CLI.\n// `native` is a CLI-only escape hatch that runs Docker without `--platform`\n// and clears DOCKER_DEFAULT_PLATFORM for that invocation.\nexport const DOCKER_PLATFORM_VALUES = ['linux/amd64', 'linux/arm64'] as const;\nexport const DOCKER_PLATFORM_NATIVE = 'native';\nexport const DOCKER_PLATFORM_OVERRIDE_VALUES = [\n DOCKER_PLATFORM_NATIVE,\n ...DOCKER_PLATFORM_VALUES,\n] as const;\nexport const DOCKER_PLATFORM_OVERRIDE_VALUES_DESCRIPTION =\n DOCKER_PLATFORM_OVERRIDE_VALUES.join(', ');\n\nconst dockerPlatformOverrideValueSet = new Set<string>(DOCKER_PLATFORM_OVERRIDE_VALUES);\n\nexport type DockerPlatformValue = (typeof DOCKER_PLATFORM_VALUES)[number];\nexport type DockerPlatformOverride = (typeof DOCKER_PLATFORM_OVERRIDE_VALUES)[number];\n\nexport const isDockerPlatformOverride = (input: unknown): input is DockerPlatformOverride =>\n typeof input === 'string' && dockerPlatformOverrideValueSet.has(input);\n\nexport interface Tool {\n name: string;\n privileged?: boolean;\n\n // Docker platform to use when running this tool's image\n dockerPlatform?: DockerPlatformValue;\n\n // Default isolate volumes for caching (user volumes can override these)\n defaultVolumes?: readonly VolumeMapping[];\n\n // Default environment variables (user env vars can override these)\n defaultEnv?: readonly EnvironmentVariable[];\n\n // Optional version parsing and validation functions\n getSecondaryVersion?: (args: { cwd: string }) => Promise<string>;\n\n getLocalVersion?: (args: { cwd: string }) => Promise<string>;\n\n // Optional hook called before every tool command execution (e.g., toolchain sync)\n preExecute?: (\n context: ChainContext<string>,\n options: ToolCommandExecutionOptions,\n ) => Promise<void>;\n}\n\nexport const enum DockerRegistryMirror {\n PUBLIC_GAR = 'public-gar',\n}\n\nexport interface Image {\n name: string;\n versions: Record<string, string>;\n dependencies?: Record<string, string>;\n patch?: number;\n mirrorRegistries?: DockerRegistryMirror[];\n}\n\nexport interface VersionCombination<TImageId> {\n images: Record<string, TImageId>;\n description?: string;\n stable?: boolean;\n}\n\nexport const getImageDirectory = async () => (await getRegistryConfig()).imageDirectory;\nexport const getRegistry = async () => (await getRegistryConfig()).registry;\n"]}
|
package/dist/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYpC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,QAAQ,CAAC;AAkB1D,KAAK,qBAAqB,GAAG,CACzB,OAAO,EAAE,OAAO,EAChB,kBAAkB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,2BAA2B,CAAC,KAC7E,IAAI,CAAC;AAgNV,eAAO,MAAM,MAAM,GAAU,QAAQ,SAAS,MAAM,EAChD,QAAQ,YAAY,CAAC,QAAQ,CAAC,EAC9B,wBAAwB,qBAAqB,KAC9C,OAAO,CAAC,IAAI,CAOd,CAAC"}
|
package/dist/cli.js
CHANGED
|
@@ -1,17 +1,18 @@
|
|
|
1
|
-
export { runCli } from './
|
|
1
|
+
export { runCli } from './GMN3ZEOV.js';
|
|
2
2
|
import './CAPBDIIE.js';
|
|
3
3
|
import './QH3FM6DD.js';
|
|
4
4
|
import './S7YAUZ26.js';
|
|
5
5
|
import './2MO4PR4P.js';
|
|
6
|
-
import './
|
|
6
|
+
import './HN2JUVAX.js';
|
|
7
7
|
import './2XGBQPKA.js';
|
|
8
|
+
import './HC7LYTHL.js';
|
|
8
9
|
import './4SFAVHVD.js';
|
|
9
10
|
import './6L6NUQMM.js';
|
|
10
|
-
import './
|
|
11
|
-
import './
|
|
11
|
+
import './KN3TRHEZ.js';
|
|
12
|
+
import './TMIYMQW3.js';
|
|
13
|
+
import './GIFXFMSS.js';
|
|
12
14
|
import './UBUQDI5Q.js';
|
|
13
15
|
import './3XEUJAQB.js';
|
|
14
|
-
import './HC7LYTHL.js';
|
|
15
16
|
import './CWKWODSW.js';
|
|
16
17
|
//# sourceMappingURL=cli.js.map
|
|
17
18
|
//# sourceMappingURL=cli.js.map
|
package/dist/config.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as z from 'zod';
|
|
2
2
|
import type { ChainContext } from './context';
|
|
3
3
|
import type { ToolCommandExecutionOptions } from './core/tool-executor';
|
|
4
|
+
export declare const CARGO_TARGET_CACHE_PATH = "/cargo-target";
|
|
4
5
|
export declare const volumeMappingSchema: z.ZodUnion<readonly [z.ZodObject<{
|
|
5
6
|
containerPath: z.ZodString;
|
|
6
7
|
type: z.ZodLiteral<"host">;
|
|
@@ -11,15 +12,25 @@ export declare const volumeMappingSchema: z.ZodUnion<readonly [z.ZodObject<{
|
|
|
11
12
|
name: z.ZodString;
|
|
12
13
|
shared: z.ZodOptional<z.ZodBoolean>;
|
|
13
14
|
locked: z.ZodOptional<z.ZodBoolean>;
|
|
15
|
+
toolchainKeyed: z.ZodOptional<z.ZodBoolean>;
|
|
16
|
+
architectureIndependent: z.ZodOptional<z.ZodBoolean>;
|
|
14
17
|
}, z.core.$strip>]>;
|
|
15
18
|
export type VolumeMapping = z.infer<typeof volumeMappingSchema>;
|
|
16
19
|
export interface EnvironmentVariable {
|
|
17
20
|
name: string;
|
|
18
21
|
value: string;
|
|
19
22
|
}
|
|
23
|
+
export declare const DOCKER_PLATFORM_VALUES: readonly ["linux/amd64", "linux/arm64"];
|
|
24
|
+
export declare const DOCKER_PLATFORM_NATIVE = "native";
|
|
25
|
+
export declare const DOCKER_PLATFORM_OVERRIDE_VALUES: readonly ["native", "linux/amd64", "linux/arm64"];
|
|
26
|
+
export declare const DOCKER_PLATFORM_OVERRIDE_VALUES_DESCRIPTION: string;
|
|
27
|
+
export type DockerPlatformValue = (typeof DOCKER_PLATFORM_VALUES)[number];
|
|
28
|
+
export type DockerPlatformOverride = (typeof DOCKER_PLATFORM_OVERRIDE_VALUES)[number];
|
|
29
|
+
export declare const isDockerPlatformOverride: (input: unknown) => input is DockerPlatformOverride;
|
|
20
30
|
export interface Tool {
|
|
21
31
|
name: string;
|
|
22
32
|
privileged?: boolean;
|
|
33
|
+
dockerPlatform?: DockerPlatformValue;
|
|
23
34
|
defaultVolumes?: readonly VolumeMapping[];
|
|
24
35
|
defaultEnv?: readonly EnvironmentVariable[];
|
|
25
36
|
getSecondaryVersion?: (args: {
|
|
@@ -30,7 +41,7 @@ export interface Tool {
|
|
|
30
41
|
}) => Promise<string>;
|
|
31
42
|
preExecute?: (context: ChainContext<string>, options: ToolCommandExecutionOptions) => Promise<void>;
|
|
32
43
|
}
|
|
33
|
-
export declare enum DockerRegistryMirror {
|
|
44
|
+
export declare const enum DockerRegistryMirror {
|
|
34
45
|
PUBLIC_GAR = "public-gar"
|
|
35
46
|
}
|
|
36
47
|
export interface Image {
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAIzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAIzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AAqCxE,eAAO,MAAM,uBAAuB,kBAAkB,CAAC;AAwBvD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;mBAAiE,CAAC;AAElG,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,MAAM,WAAW,mBAAmB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACjB;AAKD,eAAO,MAAM,sBAAsB,yCAA0C,CAAC;AAC9E,eAAO,MAAM,sBAAsB,WAAW,CAAC;AAC/C,eAAO,MAAM,+BAA+B,mDAGlC,CAAC;AACX,eAAO,MAAM,2CAA2C,QACV,CAAC;AAI/C,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,sBAAsB,CAAC,CAAC,MAAM,CAAC,CAAC;AAC1E,MAAM,MAAM,sBAAsB,GAAG,CAAC,OAAO,+BAA+B,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtF,eAAO,MAAM,wBAAwB,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,sBACO,CAAC;AAE3E,MAAM,WAAW,IAAI;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IAGrB,cAAc,CAAC,EAAE,mBAAmB,CAAC;IAGrC,cAAc,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;IAG1C,UAAU,CAAC,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAG5C,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAEjE,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAG7D,UAAU,CAAC,EAAE,CACT,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,EAC7B,OAAO,EAAE,2BAA2B,KACnC,OAAO,CAAC,IAAI,CAAC,CAAC;CACtB;AAED,0BAAkB,oBAAoB;IAClC,UAAU,eAAe;CAC5B;AAED,MAAM,WAAW,KAAK;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,oBAAoB,EAAE,CAAC;CAC7C;AAED,MAAM,WAAW,kBAAkB,CAAC,QAAQ;IACxC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,iBAAiB,uBAAyD,CAAC;AACxF,eAAO,MAAM,WAAW,uBAAmD,CAAC"}
|
package/dist/config.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
export { DockerRegistryMirror, getImageDirectory, getRegistry, volumeMappingSchema } from './
|
|
1
|
+
export { CARGO_TARGET_CACHE_PATH, DOCKER_PLATFORM_NATIVE, DOCKER_PLATFORM_OVERRIDE_VALUES, DOCKER_PLATFORM_OVERRIDE_VALUES_DESCRIPTION, DOCKER_PLATFORM_VALUES, DockerRegistryMirror, getImageDirectory, getRegistry, isDockerPlatformOverride, volumeMappingSchema } from './TMIYMQW3.js';
|
|
2
|
+
import './GIFXFMSS.js';
|
|
2
3
|
import './CWKWODSW.js';
|
|
3
4
|
//# sourceMappingURL=config.js.map
|
|
4
5
|
//# sourceMappingURL=config.js.map
|
package/dist/core/index.js
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import '../2MO4PR4P.js';
|
|
2
|
-
export { executeToolCommand } from '../
|
|
2
|
+
export { executeToolCommand, mergeToolEnv, resolveCargoCacheEnv } from '../HN2JUVAX.js';
|
|
3
3
|
import '../2XGBQPKA.js';
|
|
4
|
+
export { executeLocally } from '../HC7LYTHL.js';
|
|
4
5
|
import '../4SFAVHVD.js';
|
|
5
6
|
export { resolveTypeVersions } from '../6L6NUQMM.js';
|
|
6
|
-
import '../
|
|
7
|
-
import '../
|
|
7
|
+
import '../KN3TRHEZ.js';
|
|
8
|
+
import '../TMIYMQW3.js';
|
|
9
|
+
import '../GIFXFMSS.js';
|
|
8
10
|
import '../UBUQDI5Q.js';
|
|
9
11
|
import '../3XEUJAQB.js';
|
|
10
|
-
export { executeLocally } from '../HC7LYTHL.js';
|
|
11
12
|
import '../CWKWODSW.js';
|
|
12
13
|
//# sourceMappingURL=index.js.map
|
|
13
14
|
//# sourceMappingURL=index.js.map
|
package/dist/core/lock.test.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import { it, globalExpect } from '../DVALPAAO.js';
|
|
1
2
|
import { lock, buildLockFilePath } from '../4SFAVHVD.js';
|
|
2
|
-
import { it, globalExpect } from '../5PWUQUE5.js';
|
|
3
3
|
import { init_esm_shims } from '../CWKWODSW.js';
|
|
4
4
|
import { mkdir, writeFile, stat } from 'fs/promises';
|
|
5
5
|
import { dirname } from 'path';
|
|
@@ -1,6 +1,17 @@
|
|
|
1
1
|
import { type ProcessOutput } from 'zx';
|
|
2
|
-
import type { EnvironmentVariable, VolumeMapping } from '../config';
|
|
2
|
+
import type { DockerPlatformOverride, EnvironmentVariable, VolumeMapping } from '../config';
|
|
3
3
|
import type { ChainContext } from '../context';
|
|
4
|
+
/**
|
|
5
|
+
* Merge env layers, highest precedence first. On a name collision the earlier layer wins — so the
|
|
6
|
+
* cache redirect (passed last) can never clobber a user --env or a tool default for the same var.
|
|
7
|
+
*/
|
|
8
|
+
export declare const mergeToolEnv: (...layers: readonly (readonly EnvironmentVariable[])[]) => EnvironmentVariable[];
|
|
9
|
+
/**
|
|
10
|
+
* Redirect a cache-safe cargo `--script` to the shared `/cargo-target` mount via CARGO_TARGET_DIR.
|
|
11
|
+
* Skips scripts containing a build (CARGO_BUILD_RE): a build's .so/IDL must reach the host-mounted
|
|
12
|
+
* target/, not the cache. No-ops for tools that don't mount the cache.
|
|
13
|
+
*/
|
|
14
|
+
export declare const resolveCargoCacheEnv: (script: string | undefined, volumes: readonly VolumeMapping[]) => EnvironmentVariable[];
|
|
4
15
|
export interface ToolCommandExecutionOptions {
|
|
5
16
|
cwd: string;
|
|
6
17
|
volumes: readonly VolumeMapping[];
|
|
@@ -12,9 +23,10 @@ export interface ToolCommandExecutionOptions {
|
|
|
12
23
|
versions?: Record<string, string>;
|
|
13
24
|
defaultVolumesEnabled?: boolean;
|
|
14
25
|
local?: boolean;
|
|
26
|
+
dockerPlatform?: DockerPlatformOverride;
|
|
15
27
|
}
|
|
16
28
|
/**
|
|
17
29
|
* Enhanced tool command execution using the new version compatibility matrix system
|
|
18
30
|
*/
|
|
19
|
-
export declare function executeToolCommand<TImageId extends string>(context: ChainContext<TImageId>, toolName: string, args: string[], { cwd, volumes: userVolumes, customEntrypoint: entrypoint, env: customEnvVars, script, publish, versions, defaultVolumesEnabled, local, }: ToolCommandExecutionOptions): Promise<ProcessOutput>;
|
|
31
|
+
export declare function executeToolCommand<TImageId extends string>(context: ChainContext<TImageId>, toolName: string, args: string[], { cwd, volumes: userVolumes, customEntrypoint: entrypoint, env: customEnvVars, script, publish, versions, defaultVolumesEnabled, local, dockerPlatform: dockerPlatformOverride, }: ToolCommandExecutionOptions): Promise<ProcessOutput>;
|
|
20
32
|
//# sourceMappingURL=tool-executor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-executor.d.ts","sourceRoot":"","sources":["../../src/core/tool-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAK,KAAK,aAAa,EAAE,MAAM,IAAI,CAAC;AAE3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"tool-executor.d.ts","sourceRoot":"","sources":["../../src/core/tool-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAK,KAAK,aAAa,EAAE,MAAM,IAAI,CAAC;AAE3C,OAAO,KAAK,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE5F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AA6C/C;;;GAGG;AACH,eAAO,MAAM,YAAY,GACrB,GAAG,QAAQ,SAAS,CAAC,SAAS,mBAAmB,EAAE,CAAC,EAAE,KACvD,mBAAmB,EAA+C,CAAC;AAYtE;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAC7B,QAAQ,MAAM,GAAG,SAAS,EAC1B,SAAS,SAAS,aAAa,EAAE,KAClC,mBAAmB,EAarB,CAAC;AAmIF,MAAM,WAAW,2BAA2B;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,SAAS,aAAa,EAAE,CAAC;IAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,GAAG,EAAE,mBAAmB,EAAE,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,sBAAsB,CAAC;CAC3C;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,QAAQ,SAAS,MAAM,EAC5D,OAAO,EAAE,YAAY,CAAC,QAAQ,CAAC,EAC/B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EAAE,EACd,EACI,GAAG,EACH,OAAO,EAAE,WAAW,EACpB,gBAAgB,EAAE,UAAU,EAC5B,GAAG,EAAE,aAAa,EAClB,MAAM,EACN,OAAO,EACP,QAAa,EACb,qBAA4B,EAC5B,KAAK,EACL,cAAc,EAAE,sBAAsB,GACzC,EAAE,2BAA2B,GAC/B,OAAO,CAAC,aAAa,CAAC,CAuMxB"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
|
-
export { executeToolCommand } from '../
|
|
1
|
+
export { executeToolCommand, mergeToolEnv, resolveCargoCacheEnv } from '../HN2JUVAX.js';
|
|
2
2
|
import '../2XGBQPKA.js';
|
|
3
|
+
import '../HC7LYTHL.js';
|
|
3
4
|
import '../4SFAVHVD.js';
|
|
4
5
|
import '../6L6NUQMM.js';
|
|
5
|
-
import '../
|
|
6
|
-
import '../
|
|
6
|
+
import '../KN3TRHEZ.js';
|
|
7
|
+
import '../TMIYMQW3.js';
|
|
8
|
+
import '../GIFXFMSS.js';
|
|
7
9
|
import '../UBUQDI5Q.js';
|
|
8
10
|
import '../3XEUJAQB.js';
|
|
9
|
-
import '../HC7LYTHL.js';
|
|
10
11
|
import '../CWKWODSW.js';
|
|
11
12
|
//# sourceMappingURL=tool-executor.js.map
|
|
12
13
|
//# sourceMappingURL=tool-executor.js.map
|
|
@@ -0,0 +1,180 @@
|
|
|
1
|
+
import { describe, it, globalExpect } from '../DVALPAAO.js';
|
|
2
|
+
import { resolveCargoCacheEnv, mergeToolEnv } from '../HN2JUVAX.js';
|
|
3
|
+
import '../2XGBQPKA.js';
|
|
4
|
+
import '../HC7LYTHL.js';
|
|
5
|
+
import '../4SFAVHVD.js';
|
|
6
|
+
import '../6L6NUQMM.js';
|
|
7
|
+
import '../KN3TRHEZ.js';
|
|
8
|
+
import { CARGO_TARGET_CACHE_PATH } from '../TMIYMQW3.js';
|
|
9
|
+
import '../GIFXFMSS.js';
|
|
10
|
+
import '../UBUQDI5Q.js';
|
|
11
|
+
import '../3XEUJAQB.js';
|
|
12
|
+
import { init_esm_shims } from '../CWKWODSW.js';
|
|
13
|
+
|
|
14
|
+
// src/core/tool-executor.test.ts
|
|
15
|
+
init_esm_shims();
|
|
16
|
+
var cacheVolume = {
|
|
17
|
+
type: "isolate",
|
|
18
|
+
containerPath: CARGO_TARGET_CACHE_PATH,
|
|
19
|
+
name: "solana-target"
|
|
20
|
+
};
|
|
21
|
+
var withCache = [
|
|
22
|
+
cacheVolume
|
|
23
|
+
];
|
|
24
|
+
var cacheEnv = [
|
|
25
|
+
{
|
|
26
|
+
name: "CARGO_TARGET_DIR",
|
|
27
|
+
value: CARGO_TARGET_CACHE_PATH
|
|
28
|
+
}
|
|
29
|
+
];
|
|
30
|
+
describe(resolveCargoCacheEnv, () => {
|
|
31
|
+
describe("cache-safe scripts redirect at the shared cache", () => {
|
|
32
|
+
it.each([
|
|
33
|
+
"cargo test -p anchor-trait --lib --tests",
|
|
34
|
+
"cargo test --manifest-path macros/examples/vault/Cargo.toml --lib --tests",
|
|
35
|
+
"cargo test -p rbac --test trybuild -- --ignored",
|
|
36
|
+
"cargo test --package onesig -- tests --nocapture",
|
|
37
|
+
"cargo test-ellipse",
|
|
38
|
+
"cargo test-triangle",
|
|
39
|
+
"cargo check",
|
|
40
|
+
"cargo nextest run",
|
|
41
|
+
"cargo +nightly-2025-06-01 fmt -- --check && cargo clippy --all-targets",
|
|
42
|
+
// builtin t=test / c=check aliases.
|
|
43
|
+
"cargo t",
|
|
44
|
+
"cargo c",
|
|
45
|
+
"cargo +nightly-2025-06-01 t --lib"
|
|
46
|
+
])("%s", (script) => {
|
|
47
|
+
globalExpect(resolveCargoCacheEnv(script, withCache)).toEqual(cacheEnv);
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
describe("artifact-producing builds are never redirected", () => {
|
|
51
|
+
it.each([
|
|
52
|
+
"anchor build --no-idl --ignore-keys",
|
|
53
|
+
"cargo build",
|
|
54
|
+
"cargo build-sbf",
|
|
55
|
+
// test-sbf/test-bpf build .so despite the `test-` prefix.
|
|
56
|
+
"cargo test-sbf",
|
|
57
|
+
"cargo test-bpf --features foo",
|
|
58
|
+
// Dashed binary forms (the real protocol `test` script is `cargo-test-sbf`) — the
|
|
59
|
+
// space-anchored cargo branch misses these, so they need their own alternative.
|
|
60
|
+
"cargo-test-sbf",
|
|
61
|
+
"cargo-build-sbf",
|
|
62
|
+
"cargo-build-bpf --features x"
|
|
63
|
+
])("%s", (script) => {
|
|
64
|
+
globalExpect(resolveCargoCacheEnv(script, withCache)).toEqual([]);
|
|
65
|
+
});
|
|
66
|
+
it("skips when a build and a test share one script (build half must reach the host)", () => {
|
|
67
|
+
globalExpect(resolveCargoCacheEnv("cargo build && cargo test", withCache)).toEqual([]);
|
|
68
|
+
globalExpect(resolveCargoCacheEnv("anchor build && cargo test --lib", withCache)).toEqual([]);
|
|
69
|
+
globalExpect(resolveCargoCacheEnv("cargo b && cargo test", withCache)).toEqual([]);
|
|
70
|
+
globalExpect(resolveCargoCacheEnv("cargo b && cargo t", withCache)).toEqual([]);
|
|
71
|
+
globalExpect(resolveCargoCacheEnv("cargo test --lib && anchor idl build -o x.json", withCache)).toEqual([]);
|
|
72
|
+
globalExpect(resolveCargoCacheEnv("cargo test --lib && cargo-build-sbf", withCache)).toEqual([]);
|
|
73
|
+
globalExpect(resolveCargoCacheEnv("anchor test && cargo test --lib", withCache)).toEqual([]);
|
|
74
|
+
globalExpect(resolveCargoCacheEnv("cargo rustc -- --emit=obj && cargo test", withCache)).toEqual([]);
|
|
75
|
+
});
|
|
76
|
+
it.each([
|
|
77
|
+
"cargo build; cargo test",
|
|
78
|
+
"cargo build&&cargo test",
|
|
79
|
+
"cargo build-sbf;cargo test",
|
|
80
|
+
"cargo b;cargo test",
|
|
81
|
+
"cargo b&&cargo t"
|
|
82
|
+
])("%s", (script) => {
|
|
83
|
+
globalExpect(resolveCargoCacheEnv(script, withCache)).toEqual([]);
|
|
84
|
+
});
|
|
85
|
+
});
|
|
86
|
+
describe("commands outside the cache-safe allowlist are not redirected", () => {
|
|
87
|
+
it.each([
|
|
88
|
+
"cargo +nightly-2025-06-01 fmt",
|
|
89
|
+
"cargo +nightly-2025-06-01 fmt -- --check"
|
|
90
|
+
])("%s", (script) => {
|
|
91
|
+
globalExpect(resolveCargoCacheEnv(script, withCache)).toEqual([]);
|
|
92
|
+
});
|
|
93
|
+
});
|
|
94
|
+
it("does nothing when the tool mounts no /cargo-target cache volume", () => {
|
|
95
|
+
const otherVolumes = [
|
|
96
|
+
{
|
|
97
|
+
type: "isolate",
|
|
98
|
+
containerPath: "/usr/local/cargo",
|
|
99
|
+
name: "solana-cargo"
|
|
100
|
+
}
|
|
101
|
+
];
|
|
102
|
+
globalExpect(resolveCargoCacheEnv("cargo test -p oft --lib --tests", otherVolumes)).toEqual([]);
|
|
103
|
+
});
|
|
104
|
+
it("returns nothing for an empty or absent script (non --script invocations)", () => {
|
|
105
|
+
globalExpect(resolveCargoCacheEnv(void 0, withCache)).toEqual([]);
|
|
106
|
+
globalExpect(resolveCargoCacheEnv("", withCache)).toEqual([]);
|
|
107
|
+
});
|
|
108
|
+
it("does not match cargo substrings inside other words", () => {
|
|
109
|
+
globalExpect(resolveCargoCacheEnv("mycargo testlike", withCache)).toEqual([]);
|
|
110
|
+
});
|
|
111
|
+
it("tolerates irregular whitespace around the command", () => {
|
|
112
|
+
globalExpect(resolveCargoCacheEnv(" cargo test --lib", withCache)).toEqual(cacheEnv);
|
|
113
|
+
globalExpect(resolveCargoCacheEnv("cargo test", withCache)).toEqual(cacheEnv);
|
|
114
|
+
globalExpect(resolveCargoCacheEnv("cargo build && cargo test", withCache)).toEqual([]);
|
|
115
|
+
});
|
|
116
|
+
it("finds the cache volume by containerPath, regardless of its name", () => {
|
|
117
|
+
const renamed = [
|
|
118
|
+
{
|
|
119
|
+
type: "isolate",
|
|
120
|
+
containerPath: CARGO_TARGET_CACHE_PATH,
|
|
121
|
+
name: "custom-target"
|
|
122
|
+
}
|
|
123
|
+
];
|
|
124
|
+
globalExpect(resolveCargoCacheEnv("cargo test", renamed)).toEqual([
|
|
125
|
+
{
|
|
126
|
+
name: "CARGO_TARGET_DIR",
|
|
127
|
+
value: CARGO_TARGET_CACHE_PATH
|
|
128
|
+
}
|
|
129
|
+
]);
|
|
130
|
+
});
|
|
131
|
+
});
|
|
132
|
+
describe(mergeToolEnv, () => {
|
|
133
|
+
const cacheEnv2 = [
|
|
134
|
+
{
|
|
135
|
+
name: "CARGO_TARGET_DIR",
|
|
136
|
+
value: CARGO_TARGET_CACHE_PATH
|
|
137
|
+
}
|
|
138
|
+
];
|
|
139
|
+
it("keeps the higher-precedence (earlier) layer on a name collision", () => {
|
|
140
|
+
const userEnv = [
|
|
141
|
+
{
|
|
142
|
+
name: "CARGO_TARGET_DIR",
|
|
143
|
+
value: "/host/target"
|
|
144
|
+
}
|
|
145
|
+
];
|
|
146
|
+
globalExpect(mergeToolEnv(userEnv, [], [], cacheEnv2)).toEqual(userEnv);
|
|
147
|
+
});
|
|
148
|
+
it("applies the cache redirect only when nothing upstream sets the var", () => {
|
|
149
|
+
globalExpect(mergeToolEnv([], [], [], cacheEnv2)).toEqual(cacheEnv2);
|
|
150
|
+
});
|
|
151
|
+
it("preserves order and de-dupes across layers", () => {
|
|
152
|
+
globalExpect(mergeToolEnv([
|
|
153
|
+
{
|
|
154
|
+
name: "A",
|
|
155
|
+
value: "1"
|
|
156
|
+
}
|
|
157
|
+
], [
|
|
158
|
+
{
|
|
159
|
+
name: "B",
|
|
160
|
+
value: "2"
|
|
161
|
+
}
|
|
162
|
+
], [
|
|
163
|
+
{
|
|
164
|
+
name: "A",
|
|
165
|
+
value: "shadowed"
|
|
166
|
+
}
|
|
167
|
+
])).toEqual([
|
|
168
|
+
{
|
|
169
|
+
name: "A",
|
|
170
|
+
value: "1"
|
|
171
|
+
},
|
|
172
|
+
{
|
|
173
|
+
name: "B",
|
|
174
|
+
value: "2"
|
|
175
|
+
}
|
|
176
|
+
]);
|
|
177
|
+
});
|
|
178
|
+
});
|
|
179
|
+
//# sourceMappingURL=tool-executor.test.js.map
|
|
180
|
+
//# sourceMappingURL=tool-executor.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/core/tool-executor.test.ts"],"names":["cacheVolume","type","containerPath","CARGO_TARGET_CACHE_PATH","name","withCache","cacheEnv","value","describe","resolveCargoCacheEnv","it","each","script","expect","toEqual","otherVolumes","undefined","renamed","mergeToolEnv","userEnv"],"mappings":"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","file":"tool-executor.test.js","sourcesContent":["import { describe, expect, it } from 'vitest';\n\nimport type { EnvironmentVariable, VolumeMapping } from '../config';\nimport { CARGO_TARGET_CACHE_PATH } from '../config';\nimport { mergeToolEnv, resolveCargoCacheEnv } from './tool-executor';\n\nconst cacheVolume: VolumeMapping = {\n type: 'isolate',\n containerPath: CARGO_TARGET_CACHE_PATH,\n name: 'solana-target',\n};\n\nconst withCache: readonly VolumeMapping[] = [cacheVolume];\nconst cacheEnv = [{ name: 'CARGO_TARGET_DIR', value: CARGO_TARGET_CACHE_PATH }];\n\ndescribe(resolveCargoCacheEnv, () => {\n describe('cache-safe scripts redirect at the shared cache', () => {\n it.each([\n 'cargo test -p anchor-trait --lib --tests',\n 'cargo test --manifest-path macros/examples/vault/Cargo.toml --lib --tests',\n 'cargo test -p rbac --test trybuild -- --ignored',\n 'cargo test --package onesig -- tests --nocapture',\n 'cargo test-ellipse',\n 'cargo test-triangle',\n 'cargo check',\n 'cargo nextest run',\n 'cargo +nightly-2025-06-01 fmt -- --check && cargo clippy --all-targets',\n // builtin t=test / c=check aliases.\n 'cargo t',\n 'cargo c',\n 'cargo +nightly-2025-06-01 t --lib',\n ])('%s', (script) => {\n expect(resolveCargoCacheEnv(script, withCache)).toEqual(cacheEnv);\n });\n });\n\n describe('artifact-producing builds are never redirected', () => {\n it.each([\n 'anchor build --no-idl --ignore-keys',\n 'cargo build',\n 'cargo build-sbf',\n // test-sbf/test-bpf build .so despite the `test-` prefix.\n 'cargo test-sbf',\n 'cargo test-bpf --features foo',\n // Dashed binary forms (the real protocol `test` script is `cargo-test-sbf`) — the\n // space-anchored cargo branch misses these, so they need their own alternative.\n 'cargo-test-sbf',\n 'cargo-build-sbf',\n 'cargo-build-bpf --features x',\n ])('%s', (script) => {\n expect(resolveCargoCacheEnv(script, withCache)).toEqual([]);\n });\n\n it('skips when a build and a test share one script (build half must reach the host)', () => {\n expect(resolveCargoCacheEnv('cargo build && cargo test', withCache)).toEqual([]);\n expect(resolveCargoCacheEnv('anchor build && cargo test --lib', withCache)).toEqual([]);\n // builtin b=build alias must still defeat the redirect when paired with a test.\n expect(resolveCargoCacheEnv('cargo b && cargo test', withCache)).toEqual([]);\n expect(resolveCargoCacheEnv('cargo b && cargo t', withCache)).toEqual([]);\n // `anchor idl build` emits host IDL JSON — must defeat the redirect like any build.\n expect(\n resolveCargoCacheEnv('cargo test --lib && anchor idl build -o x.json', withCache),\n ).toEqual([]);\n // Dashed sbf binary glued to a cache-safe verb must still defeat the redirect.\n expect(resolveCargoCacheEnv('cargo test --lib && cargo-build-sbf', withCache)).toEqual(\n [],\n );\n // `anchor test` builds the program + IDL before running, and `cargo rustc` compiles —\n // both must defeat the redirect when paired with a cache-safe verb.\n expect(resolveCargoCacheEnv('anchor test && cargo test --lib', withCache)).toEqual([]);\n expect(\n resolveCargoCacheEnv('cargo rustc -- --emit=obj && cargo test', withCache),\n ).toEqual([]);\n });\n\n // The build must be detected even when glued straight to a shell separator with no space\n // (`;`, `&&`) — otherwise the build half silently redirects its .so/IDL into the cache.\n it.each([\n 'cargo build; cargo test',\n 'cargo build&&cargo test',\n 'cargo build-sbf;cargo test',\n 'cargo b;cargo test',\n 'cargo b&&cargo t',\n ])('%s', (script) => {\n expect(resolveCargoCacheEnv(script, withCache)).toEqual([]);\n });\n });\n\n describe('commands outside the cache-safe allowlist are not redirected', () => {\n it.each(['cargo +nightly-2025-06-01 fmt', 'cargo +nightly-2025-06-01 fmt -- --check'])(\n '%s',\n (script) => {\n expect(resolveCargoCacheEnv(script, withCache)).toEqual([]);\n },\n );\n });\n\n it('does nothing when the tool mounts no /cargo-target cache volume', () => {\n const otherVolumes: readonly VolumeMapping[] = [\n { type: 'isolate', containerPath: '/usr/local/cargo', name: 'solana-cargo' },\n ];\n expect(resolveCargoCacheEnv('cargo test -p oft --lib --tests', otherVolumes)).toEqual([]);\n });\n\n it('returns nothing for an empty or absent script (non --script invocations)', () => {\n expect(resolveCargoCacheEnv(undefined, withCache)).toEqual([]);\n expect(resolveCargoCacheEnv('', withCache)).toEqual([]);\n });\n\n it('does not match cargo substrings inside other words', () => {\n expect(resolveCargoCacheEnv('mycargo testlike', withCache)).toEqual([]);\n });\n\n it('tolerates irregular whitespace around the command', () => {\n // \\s+ / \\b mean extra spaces, tabs, and leading whitespace do not defeat matching.\n expect(resolveCargoCacheEnv(' cargo test --lib', withCache)).toEqual(cacheEnv);\n expect(resolveCargoCacheEnv('cargo\\ttest', withCache)).toEqual(cacheEnv);\n // ...and the build exclusion is equally whitespace-insensitive.\n expect(resolveCargoCacheEnv('cargo build && cargo test', withCache)).toEqual([]);\n });\n\n it('finds the cache volume by containerPath, regardless of its name', () => {\n // Lookup is keyed on the mount path, not the 'solana-target' name — any isolate volume\n // mounted at the cache path triggers the redirect.\n const renamed: readonly VolumeMapping[] = [\n { type: 'isolate', containerPath: CARGO_TARGET_CACHE_PATH, name: 'custom-target' },\n ];\n expect(resolveCargoCacheEnv('cargo test', renamed)).toEqual([\n { name: 'CARGO_TARGET_DIR', value: CARGO_TARGET_CACHE_PATH },\n ]);\n });\n});\n\ndescribe(mergeToolEnv, () => {\n const cacheEnv: EnvironmentVariable[] = [\n { name: 'CARGO_TARGET_DIR', value: CARGO_TARGET_CACHE_PATH },\n ];\n\n it('keeps the higher-precedence (earlier) layer on a name collision', () => {\n const userEnv: EnvironmentVariable[] = [\n { name: 'CARGO_TARGET_DIR', value: '/host/target' },\n ];\n // cacheEnv is passed last (lowest precedence); a user override must survive.\n expect(mergeToolEnv(userEnv, [], [], cacheEnv)).toEqual(userEnv);\n });\n\n it('applies the cache redirect only when nothing upstream sets the var', () => {\n expect(mergeToolEnv([], [], [], cacheEnv)).toEqual(cacheEnv);\n });\n\n it('preserves order and de-dupes across layers', () => {\n expect(\n mergeToolEnv(\n [{ name: 'A', value: '1' }],\n [{ name: 'B', value: '2' }],\n [{ name: 'A', value: 'shadowed' }],\n ),\n ).toEqual([\n { name: 'A', value: '1' },\n { name: 'B', value: '2' },\n ]);\n });\n});\n"]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../src/environment.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,KAAK,EAAE,OAA4C,CAAC;AACjE,eAAO,MAAM,QAAQ,EAAE,MAAM,GAAG,SAAmC,CAAC;AACpE,eAAO,MAAM,cAAc,EAAE,MAAM,GAAG,SAA0C,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":[],"names":[],"mappings":"","file":"environment.js"}
|
package/dist/github/index.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
export { runGithubMatrixGenerator } from '../
|
|
2
|
-
import '../
|
|
3
|
-
import '../
|
|
4
|
-
import '../
|
|
1
|
+
export { runGithubMatrixGenerator } from '../GFKRACRT.js';
|
|
2
|
+
import '../E35WFC4E.js';
|
|
3
|
+
import '../KN3TRHEZ.js';
|
|
4
|
+
import '../TMIYMQW3.js';
|
|
5
|
+
import '../GIFXFMSS.js';
|
|
5
6
|
import '../3XEUJAQB.js';
|
|
6
7
|
import '../CWKWODSW.js';
|
|
7
8
|
//# sourceMappingURL=index.js.map
|
package/dist/github/matrix.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
export { generateGithubMatrix } from '../
|
|
2
|
-
import '../
|
|
3
|
-
import '../
|
|
1
|
+
export { generateGithubMatrix } from '../E35WFC4E.js';
|
|
2
|
+
import '../KN3TRHEZ.js';
|
|
3
|
+
import '../TMIYMQW3.js';
|
|
4
|
+
import '../GIFXFMSS.js';
|
|
4
5
|
import '../3XEUJAQB.js';
|
|
5
6
|
import '../CWKWODSW.js';
|
|
6
7
|
//# sourceMappingURL=matrix.js.map
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export * from './cli';
|
|
2
|
-
export type { EnvironmentVariable, Image, Tool, VersionCombination, VolumeMapping } from './config';
|
|
3
|
-
export { DockerRegistryMirror } from './config';
|
|
2
|
+
export type { DockerPlatformOverride, DockerPlatformValue, EnvironmentVariable, Image, Tool, VersionCombination, VolumeMapping, } from './config';
|
|
3
|
+
export { CARGO_TARGET_CACHE_PATH, DOCKER_PLATFORM_NATIVE, DOCKER_PLATFORM_OVERRIDE_VALUES, DOCKER_PLATFORM_OVERRIDE_VALUES_DESCRIPTION, DOCKER_PLATFORM_VALUES, DockerRegistryMirror, isDockerPlatformOverride, } from './config';
|
|
4
4
|
export type * from './context';
|
|
5
5
|
export * from './core';
|
|
6
6
|
export type * from './core/tool-executor';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,YAAY,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,YAAY,EACR,sBAAsB,EACtB,mBAAmB,EACnB,mBAAmB,EACnB,KAAK,EACL,IAAI,EACJ,kBAAkB,EAClB,aAAa,GAChB,MAAM,UAAU,CAAC;AAClB,OAAO,EACH,uBAAuB,EACvB,sBAAsB,EACtB,+BAA+B,EAC/B,2CAA2C,EAC3C,sBAAsB,EACtB,oBAAoB,EACpB,wBAAwB,GAC3B,MAAM,UAAU,CAAC;AAClB,mBAAmB,WAAW,CAAC;AAC/B,cAAc,QAAQ,CAAC;AACvB,mBAAmB,sBAAsB,CAAC;AAC1C,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,OAAO,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,20 +1,21 @@
|
|
|
1
|
-
export { runGithubMatrixGenerator } from './
|
|
2
|
-
import './
|
|
3
|
-
export { runCli } from './
|
|
1
|
+
export { runGithubMatrixGenerator } from './GFKRACRT.js';
|
|
2
|
+
import './E35WFC4E.js';
|
|
3
|
+
export { runCli } from './GMN3ZEOV.js';
|
|
4
4
|
import './CAPBDIIE.js';
|
|
5
5
|
import './QH3FM6DD.js';
|
|
6
6
|
import './S7YAUZ26.js';
|
|
7
|
-
export { testTools } from './
|
|
7
|
+
export { testTools } from './EY2G7NK4.js';
|
|
8
8
|
import './2MO4PR4P.js';
|
|
9
|
-
export { executeToolCommand } from './
|
|
9
|
+
export { executeToolCommand, mergeToolEnv, resolveCargoCacheEnv } from './HN2JUVAX.js';
|
|
10
10
|
import './2XGBQPKA.js';
|
|
11
|
+
export { executeLocally } from './HC7LYTHL.js';
|
|
11
12
|
import './4SFAVHVD.js';
|
|
12
13
|
export { resolveTypeVersions } from './6L6NUQMM.js';
|
|
13
|
-
import './
|
|
14
|
-
export { DockerRegistryMirror } from './
|
|
14
|
+
import './KN3TRHEZ.js';
|
|
15
|
+
export { CARGO_TARGET_CACHE_PATH, DOCKER_PLATFORM_NATIVE, DOCKER_PLATFORM_OVERRIDE_VALUES, DOCKER_PLATFORM_OVERRIDE_VALUES_DESCRIPTION, DOCKER_PLATFORM_VALUES, DockerRegistryMirror, isDockerPlatformOverride } from './TMIYMQW3.js';
|
|
16
|
+
import './GIFXFMSS.js';
|
|
15
17
|
export { findFileInParentDirectory } from './UBUQDI5Q.js';
|
|
16
18
|
import './3XEUJAQB.js';
|
|
17
|
-
export { executeLocally } from './HC7LYTHL.js';
|
|
18
19
|
import { init_esm_shims } from './CWKWODSW.js';
|
|
19
20
|
|
|
20
21
|
// src/index.ts
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,cAAA,EAAA","file":"index.js","sourcesContent":["export * from './cli';\nexport type {\n DockerPlatformOverride,\n DockerPlatformValue,\n EnvironmentVariable,\n Image,\n Tool,\n VersionCombination,\n VolumeMapping,\n} from './config';\nexport {\n CARGO_TARGET_CACHE_PATH,\n DOCKER_PLATFORM_NATIVE,\n DOCKER_PLATFORM_OVERRIDE_VALUES,\n DOCKER_PLATFORM_OVERRIDE_VALUES_DESCRIPTION,\n DOCKER_PLATFORM_VALUES,\n DockerRegistryMirror,\n isDockerPlatformOverride,\n} from './config';\nexport type * from './context';\nexport * from './core';\nexport type * from './core/tool-executor';\nexport * from './github';\nexport * from './test';\nexport { findFileInParentDirectory } from './utils';\n"]}
|