@metamask/snaps-utils 0.35.0-flask.1 → 1.0.0-prerelease.1

package/dist/{esm/manifest → manifest}/manifest.js

@@ -1,22 +1,27 @@
-import { assertExhaustive, assert, isPlainObject } from '@metamask/utils';
-import deepEqual from 'fast-deep-equal';
-import { promises as fs } from 'fs';
-import pathUtils from 'path';
-import { deepClone } from '../deep-clone';
-import { readJsonFile } from '../fs';
-import { validateNpmSnap } from '../npm';
-import { getSnapChecksum, ProgrammaticallyFixableSnapError, validateSnapShasum } from '../snaps';
-import { NpmSnapFileNames, SnapValidationFailureReason } from '../types';
-import { readVirtualFile, VirtualFile } from '../virtual-file';
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateNpmSnapManifest = exports.getWritableManifest = exports.getSnapIcon = exports.getSnapSourceCode = exports.fixManifest = exports.checkManifest = void 0;
+const utils_1 = require("@metamask/utils");
+const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
+const fs_1 = require("fs");
+const path_1 = __importDefault(require("path"));
+const deep_clone_1 = require("../deep-clone");
+const fs_2 = require("../fs");
+const npm_1 = require("../npm");
+const snaps_1 = require("../snaps");
+const types_1 = require("../types");
+const virtual_file_1 = require("../virtual-file");
 const MANIFEST_SORT_ORDER = {
-    $schema: 1,
-    version: 2,
-    description: 3,
-    proposedName: 4,
-    repository: 5,
-    source: 6,
-    initialPermissions: 7,
-    manifestVersion: 8
+    version: 1,
+    description: 2,
+    proposedName: 3,
+    repository: 4,
+    source: 5,
+    initialPermissions: 6,
+    manifestVersion: 7,
 };
 /**
  * Validates a snap.manifest.json file. Attempts to fix the manifest and write
@@ -28,70 +33,70 @@ const MANIFEST_SORT_ORDER = {
  * @param sourceCode - The source code of the Snap.
  * @returns Whether the manifest was updated, and an array of warnings that
  * were encountered during processing of the manifest files.
- */ export async function checkManifest(basePath, writeManifest = true, sourceCode) {
+ */
+async function checkManifest(basePath, writeManifest = true, sourceCode) {
     const warnings = [];
     const errors = [];
     let updated = false;
-    const manifestPath = pathUtils.join(basePath, NpmSnapFileNames.Manifest);
-    const manifestFile = await readJsonFile(manifestPath);
+    const manifestPath = path_1.default.join(basePath, types_1.NpmSnapFileNames.Manifest);
+    const manifestFile = await (0, fs_2.readJsonFile)(manifestPath);
     const unvalidatedManifest = manifestFile.result;
-    const packageFile = await readJsonFile(pathUtils.join(basePath, NpmSnapFileNames.PackageJson));
+    const packageFile = await (0, fs_2.readJsonFile)(path_1.default.join(basePath, types_1.NpmSnapFileNames.PackageJson));
     const snapFiles = {
         manifest: manifestFile,
         packageJson: packageFile,
         sourceCode: await getSnapSourceCode(basePath, unvalidatedManifest, sourceCode),
-        svgIcon: await getSnapIcon(basePath, unvalidatedManifest)
+        svgIcon: await getSnapIcon(basePath, unvalidatedManifest),
     };
     let manifest;
     try {
-        ({ manifest } = validateNpmSnap(snapFiles));
-    } catch (error) {
-        if (error instanceof ProgrammaticallyFixableSnapError) {
+        ({ manifest } = (0, npm_1.validateNpmSnap)(snapFiles));
+    }
+    catch (error) {
+        if (error instanceof snaps_1.ProgrammaticallyFixableSnapError) {
             errors.push(error.message);
             // If we get here, the files at least have the correct shape.
             const partiallyValidatedFiles = snapFiles;
             let isInvalid = true;
             let currentError = error;
-            const maxAttempts = Object.keys(SnapValidationFailureReason).length;
+            const maxAttempts = Object.keys(types_1.SnapValidationFailureReason).length;
             // Attempt to fix all fixable validation failure reasons. All such reasons
             // are enumerated by the `SnapValidationFailureReason` enum, so we only
             // attempt to fix the manifest the same amount of times as there are
             // reasons in the enum.
-            for(let attempts = 1; isInvalid && attempts <= maxAttempts; attempts++){
-                manifest = fixManifest(manifest ? {
-                    ...partiallyValidatedFiles,
-                    manifest
-                } : partiallyValidatedFiles, currentError);
+            for (let attempts = 1; isInvalid && attempts <= maxAttempts; attempts++) {
+                manifest = fixManifest(manifest
+                    ? { ...partiallyValidatedFiles, manifest }
+                    : partiallyValidatedFiles, currentError);
                 try {
-                    validateNpmSnapManifest({
-                        ...partiallyValidatedFiles,
-                        manifest
-                    });
+                    validateNpmSnapManifest({ ...partiallyValidatedFiles, manifest });
                     isInvalid = false;
-                } catch (nextValidationError) {
+                }
+                catch (nextValidationError) {
                     currentError = nextValidationError;
-                    /* istanbul ignore next: this should be impossible */ if (!(nextValidationError instanceof ProgrammaticallyFixableSnapError) || attempts === maxAttempts && !isInvalid) {
+                    /* istanbul ignore next: this should be impossible */
+                    if (!(nextValidationError instanceof snaps_1.ProgrammaticallyFixableSnapError) ||
+                        (attempts === maxAttempts && !isInvalid)) {
                         throw new Error(`Internal error: Failed to fix manifest. This is a bug, please report it. Reason:\n${error.message}`);
                     }
                     errors.push(currentError.message);
                 }
             }
             updated = true;
-        } else {
+        }
+        else {
             throw error;
         }
     }
     // TypeScript assumes `manifest` can still be undefined, that is not the case.
     // But we assert to keep TypeScript happy.
-    assert(manifest);
+    (0, utils_1.assert)(manifest);
     const validatedManifest = manifest.result;
     // Check presence of recommended keys
-    const recommendedFields = [
-        'repository'
-    ];
-    const missingRecommendedFields = recommendedFields.filter((key)=>!validatedManifest[key]);
+    const recommendedFields = ['repository'];
+    const missingRecommendedFields = recommendedFields.filter((key) => !validatedManifest[key]);
     if (missingRecommendedFields.length > 0) {
-        warnings.push(`Missing recommended package.json properties:\n${missingRecommendedFields.reduce((allMissing, currentField)=>{
+        warnings.push(`Missing recommended package.json properties:\n${missingRecommendedFields.reduce((allMissing, currentField) => {
             return `${allMissing}\t${currentField}\n`;
         }, '')}`);
     }
@@ -99,21 +104,18 @@ const MANIFEST_SORT_ORDER = {
         try {
             const newManifest = `${JSON.stringify(getWritableManifest(validatedManifest), null, 2)}\n`;
             if (updated || newManifest !== manifestFile.value) {
-                await fs.writeFile(pathUtils.join(basePath, NpmSnapFileNames.Manifest), newManifest);
+                await fs_1.promises.writeFile(path_1.default.join(basePath, types_1.NpmSnapFileNames.Manifest), newManifest);
             }
-        } catch (error) {
+        }
+        catch (error) {
             // Note: This error isn't pushed to the errors array, because it's not an
             // error in the manifest itself.
             throw new Error(`Failed to update snap.manifest.json: ${error.message}`);
         }
     }
-    return {
-        manifest: validatedManifest,
-        updated,
-        warnings,
-        errors
-    };
+    return { manifest: validatedManifest, updated, warnings, errors };
 }
+exports.checkManifest = checkManifest;
 /**
  * Given the relevant Snap files (manifest, `package.json`, and bundle) and a
  * Snap manifest validation error, fixes the fault in the manifest that caused
@@ -122,30 +124,35 @@ const MANIFEST_SORT_ORDER = {
  * @param snapFiles - The contents of all Snap files.
  * @param error - The {@link ProgrammaticallyFixableSnapError} that was thrown.
  * @returns A copy of the manifest file where the cause of the error is fixed.
- */ export function fixManifest(snapFiles, error) {
+ */
+function fixManifest(snapFiles, error) {
     const { manifest, packageJson } = snapFiles;
     const clonedFile = manifest.clone();
     const manifestCopy = clonedFile.result;
-    switch(error.reason){
-        case SnapValidationFailureReason.NameMismatch:
+    switch (error.reason) {
+        case types_1.SnapValidationFailureReason.NameMismatch:
             manifestCopy.source.location.npm.packageName = packageJson.result.name;
             break;
-        case SnapValidationFailureReason.VersionMismatch:
+        case types_1.SnapValidationFailureReason.VersionMismatch:
             manifestCopy.version = packageJson.result.version;
             break;
-        case SnapValidationFailureReason.RepositoryMismatch:
-            manifestCopy.repository = packageJson.result.repository ? deepClone(packageJson.result.repository) : undefined;
+        case types_1.SnapValidationFailureReason.RepositoryMismatch:
+            manifestCopy.repository = packageJson.result.repository
+                ? (0, deep_clone_1.deepClone)(packageJson.result.repository)
+                : undefined;
             break;
-        case SnapValidationFailureReason.ShasumMismatch:
-            manifestCopy.source.shasum = getSnapChecksum(snapFiles);
+        case types_1.SnapValidationFailureReason.ShasumMismatch:
+            manifestCopy.source.shasum = (0, snaps_1.getSnapChecksum)(snapFiles);
             break;
-        /* istanbul ignore next */ default:
-            assertExhaustive(error.reason);
+        /* istanbul ignore next */
+        default:
+            (0, utils_1.assertExhaustive)(error.reason);
     }
     clonedFile.result = manifestCopy;
     clonedFile.value = JSON.stringify(manifestCopy);
     return clonedFile;
 }
+exports.fixManifest = fixManifest;
 /**
  * Given an unvalidated Snap manifest, attempts to extract the location of the
  * bundle source file location and read the file.
@@ -154,27 +161,31 @@ const MANIFEST_SORT_ORDER = {
  * @param manifest - The unvalidated Snap manifest file contents.
  * @param sourceCode - Override source code for plugins.
  * @returns The contents of the bundle file, if any.
- */ export async function getSnapSourceCode(basePath, manifest, sourceCode) {
-    if (!isPlainObject(manifest)) {
+ */
+async function getSnapSourceCode(basePath, manifest, sourceCode) {
+    if (!(0, utils_1.isPlainObject)(manifest)) {
         return undefined;
     }
-    const sourceFilePath = manifest.source?.location?.npm?.filePath;
+    const sourceFilePath = manifest.source?.location
+        ?.npm?.filePath;
     if (!sourceFilePath) {
         return undefined;
     }
     if (sourceCode) {
-        return new VirtualFile({
-            path: pathUtils.join(basePath, sourceFilePath),
-            value: sourceCode
+        return new virtual_file_1.VirtualFile({
+            path: path_1.default.join(basePath, sourceFilePath),
+            value: sourceCode,
         });
     }
     try {
-        const virtualFile = await readVirtualFile(pathUtils.join(basePath, sourceFilePath), 'utf8');
+        const virtualFile = await (0, virtual_file_1.readVirtualFile)(path_1.default.join(basePath, sourceFilePath), 'utf8');
         return virtualFile;
-    } catch (error) {
+    }
+    catch (error) {
         throw new Error(`Failed to read Snap bundle file: ${error.message}`);
     }
 }
+exports.getSnapSourceCode = getSnapSourceCode;
 /**
  * Given an unvalidated Snap manifest, attempts to extract the location of the
  * icon and read the file.
@@ -182,39 +193,44 @@ const MANIFEST_SORT_ORDER = {
  * @param basePath - The path to the folder with the manifest files.
  * @param manifest - The unvalidated Snap manifest file contents.
  * @returns The contents of the icon, if any.
- */ export async function getSnapIcon(basePath, manifest) {
-    if (!isPlainObject(manifest)) {
+ */
+async function getSnapIcon(basePath, manifest) {
+    if (!(0, utils_1.isPlainObject)(manifest)) {
         return undefined;
     }
-    const iconPath = manifest.source?.location?.npm?.iconPath;
+    const iconPath = manifest.source?.location?.npm
+        ?.iconPath;
     if (!iconPath) {
         return undefined;
     }
     try {
-        const virtualFile = await readVirtualFile(pathUtils.join(basePath, iconPath), 'utf8');
+        const virtualFile = await (0, virtual_file_1.readVirtualFile)(path_1.default.join(basePath, iconPath), 'utf8');
         return virtualFile;
-    } catch (error) {
+    }
+    catch (error) {
         throw new Error(`Failed to read Snap icon file: ${error.message}`);
     }
 }
+exports.getSnapIcon = getSnapIcon;
 /**
  * Sorts the given manifest in our preferred sort order and removes the
  * `repository` field if it is falsy (it may be `null`).
  *
  * @param manifest - The manifest to sort and modify.
  * @returns The disk-ready manifest.
- */ export function getWritableManifest(manifest) {
+ */
+function getWritableManifest(manifest) {
     const { repository, ...remaining } = manifest;
-    const keys = Object.keys(repository ? {
-        ...remaining,
-        repository
-    } : remaining);
-    const writableManifest = keys.sort((a, b)=>MANIFEST_SORT_ORDER[a] - MANIFEST_SORT_ORDER[b]).reduce((result, key)=>({
-            ...result,
-            [key]: manifest[key]
-        }), {});
+    const keys = Object.keys(repository ? { ...remaining, repository } : remaining);
+    const writableManifest = keys
+        .sort((a, b) => MANIFEST_SORT_ORDER[a] - MANIFEST_SORT_ORDER[b])
+        .reduce((result, key) => ({
+        ...result,
+        [key]: manifest[key],
+    }), {});
     return writableManifest;
 }
+exports.getWritableManifest = getWritableManifest;
 /**
  * Validates the fields of an npm Snap manifest that has already passed JSON
  * Schema validation.
@@ -224,7 +240,8 @@ const MANIFEST_SORT_ORDER = {
  * @param snapFiles.packageJson - The npm Snap's `package.json`.
  * @param snapFiles.sourceCode - The Snap's source code.
  * @param snapFiles.svgIcon - The Snap's optional icon.
- */ export function validateNpmSnapManifest({ manifest, packageJson, sourceCode, svgIcon }) {
+ */
+function validateNpmSnapManifest({ manifest, packageJson, sourceCode, svgIcon, }) {
     const packageJsonName = packageJson.result.name;
     const packageJsonVersion = packageJson.result.version;
     const packageJsonRepository = packageJson.result.repository;
@@ -232,21 +249,19 @@ const MANIFEST_SORT_ORDER = {
     const manifestPackageVersion = manifest.result.version;
     const manifestRepository = manifest.result.repository;
     if (packageJsonName !== manifestPackageName) {
-        throw new ProgrammaticallyFixableSnapError(`"${NpmSnapFileNames.Manifest}" npm package name ("${manifestPackageName}") does not match the "${NpmSnapFileNames.PackageJson}" "name" field ("${packageJsonName}").`, SnapValidationFailureReason.NameMismatch);
+        throw new snaps_1.ProgrammaticallyFixableSnapError(`"${types_1.NpmSnapFileNames.Manifest}" npm package name ("${manifestPackageName}") does not match the "${types_1.NpmSnapFileNames.PackageJson}" "name" field ("${packageJsonName}").`, types_1.SnapValidationFailureReason.NameMismatch);
     }
     if (packageJsonVersion !== manifestPackageVersion) {
-        throw new ProgrammaticallyFixableSnapError(`"${NpmSnapFileNames.Manifest}" npm package version ("${manifestPackageVersion}") does not match the "${NpmSnapFileNames.PackageJson}" "version" field ("${packageJsonVersion}").`, SnapValidationFailureReason.VersionMismatch);
+        throw new snaps_1.ProgrammaticallyFixableSnapError(`"${types_1.NpmSnapFileNames.Manifest}" npm package version ("${manifestPackageVersion}") does not match the "${types_1.NpmSnapFileNames.PackageJson}" "version" field ("${packageJsonVersion}").`, types_1.SnapValidationFailureReason.VersionMismatch);
     }
-    if (// The repository may be `undefined` in package.json but can only be defined
+    if (
+    // The repository may be `undefined` in package.json but can only be defined
     // or `null` in the Snap manifest due to TS@<4.4 issues.
-    (packageJsonRepository || manifestRepository) && !deepEqual(packageJsonRepository, manifestRepository)) {
-        throw new ProgrammaticallyFixableSnapError(`"${NpmSnapFileNames.Manifest}" "repository" field does not match the "${NpmSnapFileNames.PackageJson}" "repository" field.`, SnapValidationFailureReason.RepositoryMismatch);
-    }
-    validateSnapShasum({
-        manifest,
-        sourceCode,
-        svgIcon
-    }, `"${NpmSnapFileNames.Manifest}" "shasum" field does not match computed shasum.`);
+    (packageJsonRepository || manifestRepository) &&
+        !(0, fast_deep_equal_1.default)(packageJsonRepository, manifestRepository)) {
+        throw new snaps_1.ProgrammaticallyFixableSnapError(`"${types_1.NpmSnapFileNames.Manifest}" "repository" field does not match the "${types_1.NpmSnapFileNames.PackageJson}" "repository" field.`, types_1.SnapValidationFailureReason.RepositoryMismatch);
+    }
+    (0, snaps_1.validateSnapShasum)({ manifest, sourceCode, svgIcon }, `"${types_1.NpmSnapFileNames.Manifest}" "shasum" field does not match computed shasum.`);
 }
-
+exports.validateNpmSnapManifest = validateNpmSnapManifest;
 //# sourceMappingURL=manifest.js.map

package/dist/manifest/manifest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../src/manifest/manifest.ts"],"names":[],"mappings":"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","sourcesContent":["import { Json, assertExhaustive, assert, isPlainObject } from '@metamask/utils';\nimport deepEqual from 'fast-deep-equal';\nimport { promises as fs } from 'fs';\nimport pathUtils from 'path';\n\nimport { deepClone } from '../deep-clone';\nimport { readJsonFile } from '../fs';\nimport { validateNpmSnap } from '../npm';\nimport {\n  getSnapChecksum,\n  ProgrammaticallyFixableSnapError,\n  validateSnapShasum,\n} from '../snaps';\nimport {\n  NpmSnapFileNames,\n  SnapFiles,\n  SnapValidationFailureReason,\n  UnvalidatedSnapFiles,\n} from '../types';\nimport { readVirtualFile, VirtualFile } from '../virtual-file';\nimport { SnapManifest } from './validation';\n\nconst MANIFEST_SORT_ORDER: Record<keyof SnapManifest, number> = {\n  version: 1,\n  description: 2,\n  proposedName: 3,\n  repository: 4,\n  source: 5,\n  initialPermissions: 6,\n  manifestVersion: 7,\n};\n\n/**\n * The result from the `checkManifest` function.\n *\n * @property manifest - The fixed manifest object.\n * @property updated - Whether the manifest was updated.\n * @property warnings - An array of warnings that were encountered during\n * processing of the manifest files. These warnings are not logged to the\n * console automatically, so depending on the environment the function is called\n * in, a different method for logging can be used.\n * @property errors - An array of errors that were encountered during\n * processing of the manifest files. These errors are not logged to the\n * console automatically, so depending on the environment the function is called\n * in, a different method for logging can be used.\n */\nexport type CheckManifestResult = {\n  manifest: SnapManifest;\n  updated?: boolean;\n  warnings: string[];\n  errors: string[];\n};\n\n/**\n * Validates a snap.manifest.json file. Attempts to fix the manifest and write\n * the fixed version to disk if `writeManifest` is true. Throws if validation\n * fails.\n *\n * @param basePath - The path to the folder with the manifest files.\n * @param writeManifest - Whether to write the fixed manifest to disk.\n * @param sourceCode - The source code of the Snap.\n * @returns Whether the manifest was updated, and an array of warnings that\n * were encountered during processing of the manifest files.\n */\nexport async function checkManifest(\n  basePath: string,\n  writeManifest = true,\n  sourceCode?: string,\n): Promise<CheckManifestResult> {\n  const warnings: string[] = [];\n  const errors: string[] = [];\n\n  let updated = false;\n\n  const manifestPath = pathUtils.join(basePath, NpmSnapFileNames.Manifest);\n  const manifestFile = await readJsonFile(manifestPath);\n  const unvalidatedManifest = manifestFile.result;\n\n  const packageFile = await readJsonFile(\n    pathUtils.join(basePath, NpmSnapFileNames.PackageJson),\n  );\n\n  const snapFiles: UnvalidatedSnapFiles = {\n    manifest: manifestFile,\n    packageJson: packageFile,\n    sourceCode: await getSnapSourceCode(\n      basePath,\n      unvalidatedManifest,\n      sourceCode,\n    ),\n    svgIcon: await getSnapIcon(basePath, unvalidatedManifest),\n  };\n\n  let manifest: VirtualFile<SnapManifest> | undefined;\n  try {\n    ({ manifest } = validateNpmSnap(snapFiles));\n  } catch (error) {\n    if (error instanceof ProgrammaticallyFixableSnapError) {\n      errors.push(error.message);\n\n      // If we get here, the files at least have the correct shape.\n      const partiallyValidatedFiles = snapFiles as SnapFiles;\n\n      let isInvalid = true;\n      let currentError = error;\n      const maxAttempts = Object.keys(SnapValidationFailureReason).length;\n\n      // Attempt to fix all fixable validation failure reasons. All such reasons\n      // are enumerated by the `SnapValidationFailureReason` enum, so we only\n      // attempt to fix the manifest the same amount of times as there are\n      // reasons in the enum.\n      for (let attempts = 1; isInvalid && attempts <= maxAttempts; attempts++) {\n        manifest = fixManifest(\n          manifest\n            ? { ...partiallyValidatedFiles, manifest }\n            : partiallyValidatedFiles,\n          currentError,\n        );\n\n        try {\n          validateNpmSnapManifest({ ...partiallyValidatedFiles, manifest });\n\n          isInvalid = false;\n        } catch (nextValidationError) {\n          currentError = nextValidationError;\n          /* istanbul ignore next: this should be impossible */\n          if (\n            !(\n              nextValidationError instanceof ProgrammaticallyFixableSnapError\n            ) ||\n            (attempts === maxAttempts && !isInvalid)\n          ) {\n            throw new Error(\n              `Internal error: Failed to fix manifest. This is a bug, please report it. Reason:\\n${error.message}`,\n            );\n          }\n\n          errors.push(currentError.message);\n        }\n      }\n\n      updated = true;\n    } else {\n      throw error;\n    }\n  }\n\n  // TypeScript assumes `manifest` can still be undefined, that is not the case.\n  // But we assert to keep TypeScript happy.\n  assert(manifest);\n\n  const validatedManifest = manifest.result;\n\n  // Check presence of recommended keys\n  const recommendedFields = ['repository'] as const;\n\n  const missingRecommendedFields = recommendedFields.filter(\n    (key) => !validatedManifest[key],\n  );\n\n  if (missingRecommendedFields.length > 0) {\n    warnings.push(\n      `Missing recommended package.json properties:\\n${missingRecommendedFields.reduce(\n        (allMissing, currentField) => {\n          return `${allMissing}\\t${currentField}\\n`;\n        },\n        '',\n      )}`,\n    );\n  }\n\n  if (writeManifest) {\n    try {\n      const newManifest = `${JSON.stringify(\n        getWritableManifest(validatedManifest),\n        null,\n        2,\n      )}\\n`;\n\n      if (updated || newManifest !== manifestFile.value) {\n        await fs.writeFile(\n          pathUtils.join(basePath, NpmSnapFileNames.Manifest),\n          newManifest,\n        );\n      }\n    } catch (error) {\n      // Note: This error isn't pushed to the errors array, because it's not an\n      // error in the manifest itself.\n      throw new Error(`Failed to update snap.manifest.json: ${error.message}`);\n    }\n  }\n\n  return { manifest: validatedManifest, updated, warnings, errors };\n}\n\n/**\n * Given the relevant Snap files (manifest, `package.json`, and bundle) and a\n * Snap manifest validation error, fixes the fault in the manifest that caused\n * the error.\n *\n * @param snapFiles - The contents of all Snap files.\n * @param error - The {@link ProgrammaticallyFixableSnapError} that was thrown.\n * @returns A copy of the manifest file where the cause of the error is fixed.\n */\nexport function fixManifest(\n  snapFiles: SnapFiles,\n  error: ProgrammaticallyFixableSnapError,\n): VirtualFile<SnapManifest> {\n  const { manifest, packageJson } = snapFiles;\n  const clonedFile = manifest.clone();\n  const manifestCopy = clonedFile.result;\n\n  switch (error.reason) {\n    case SnapValidationFailureReason.NameMismatch:\n      manifestCopy.source.location.npm.packageName = packageJson.result.name;\n      break;\n\n    case SnapValidationFailureReason.VersionMismatch:\n      manifestCopy.version = packageJson.result.version;\n      break;\n\n    case SnapValidationFailureReason.RepositoryMismatch:\n      manifestCopy.repository = packageJson.result.repository\n        ? deepClone(packageJson.result.repository)\n        : undefined;\n      break;\n\n    case SnapValidationFailureReason.ShasumMismatch:\n      manifestCopy.source.shasum = getSnapChecksum(snapFiles);\n      break;\n\n    /* istanbul ignore next */\n    default:\n      assertExhaustive(error.reason);\n  }\n\n  clonedFile.result = manifestCopy;\n  clonedFile.value = JSON.stringify(manifestCopy);\n  return clonedFile;\n}\n\n/**\n * Given an unvalidated Snap manifest, attempts to extract the location of the\n * bundle source file location and read the file.\n *\n * @param basePath - The path to the folder with the manifest files.\n * @param manifest - The unvalidated Snap manifest file contents.\n * @param sourceCode - Override source code for plugins.\n * @returns The contents of the bundle file, if any.\n */\nexport async function getSnapSourceCode(\n  basePath: string,\n  manifest: Json,\n  sourceCode?: string,\n): Promise<VirtualFile | undefined> {\n  if (!isPlainObject(manifest)) {\n    return undefined;\n  }\n\n  const sourceFilePath = (manifest as Partial<SnapManifest>).source?.location\n    ?.npm?.filePath;\n\n  if (!sourceFilePath) {\n    return undefined;\n  }\n\n  if (sourceCode) {\n    return new VirtualFile({\n      path: pathUtils.join(basePath, sourceFilePath),\n      value: sourceCode,\n    });\n  }\n\n  try {\n    const virtualFile = await readVirtualFile(\n      pathUtils.join(basePath, sourceFilePath),\n      'utf8',\n    );\n    return virtualFile;\n  } catch (error) {\n    throw new Error(`Failed to read Snap bundle file: ${error.message}`);\n  }\n}\n\n/**\n * Given an unvalidated Snap manifest, attempts to extract the location of the\n * icon and read the file.\n *\n * @param basePath - The path to the folder with the manifest files.\n * @param manifest - The unvalidated Snap manifest file contents.\n * @returns The contents of the icon, if any.\n */\nexport async function getSnapIcon(\n  basePath: string,\n  manifest: Json,\n): Promise<VirtualFile | undefined> {\n  if (!isPlainObject(manifest)) {\n    return undefined;\n  }\n\n  const iconPath = (manifest as Partial<SnapManifest>).source?.location?.npm\n    ?.iconPath;\n\n  if (!iconPath) {\n    return undefined;\n  }\n\n  try {\n    const virtualFile = await readVirtualFile(\n      pathUtils.join(basePath, iconPath),\n      'utf8',\n    );\n    return virtualFile;\n  } catch (error) {\n    throw new Error(`Failed to read Snap icon file: ${error.message}`);\n  }\n}\n\n/**\n * Sorts the given manifest in our preferred sort order and removes the\n * `repository` field if it is falsy (it may be `null`).\n *\n * @param manifest - The manifest to sort and modify.\n * @returns The disk-ready manifest.\n */\nexport function getWritableManifest(manifest: SnapManifest): SnapManifest {\n  const { repository, ...remaining } = manifest;\n\n  const keys = Object.keys(\n    repository ? { ...remaining, repository } : remaining,\n  ) as (keyof SnapManifest)[];\n\n  const writableManifest = keys\n    .sort((a, b) => MANIFEST_SORT_ORDER[a] - MANIFEST_SORT_ORDER[b])\n    .reduce<Partial<SnapManifest>>(\n      (result, key) => ({\n        ...result,\n        [key]: manifest[key],\n      }),\n      {},\n    );\n\n  return writableManifest as SnapManifest;\n}\n\n/**\n * Validates the fields of an npm Snap manifest that has already passed JSON\n * Schema validation.\n *\n * @param snapFiles - The relevant snap files to validate.\n * @param snapFiles.manifest - The npm Snap manifest to validate.\n * @param snapFiles.packageJson - The npm Snap's `package.json`.\n * @param snapFiles.sourceCode - The Snap's source code.\n * @param snapFiles.svgIcon - The Snap's optional icon.\n */\nexport function validateNpmSnapManifest({\n  manifest,\n  packageJson,\n  sourceCode,\n  svgIcon,\n}: SnapFiles) {\n  const packageJsonName = packageJson.result.name;\n  const packageJsonVersion = packageJson.result.version;\n  const packageJsonRepository = packageJson.result.repository;\n\n  const manifestPackageName = manifest.result.source.location.npm.packageName;\n  const manifestPackageVersion = manifest.result.version;\n  const manifestRepository = manifest.result.repository;\n\n  if (packageJsonName !== manifestPackageName) {\n    throw new ProgrammaticallyFixableSnapError(\n      `\"${NpmSnapFileNames.Manifest}\" npm package name (\"${manifestPackageName}\") does not match the \"${NpmSnapFileNames.PackageJson}\" \"name\" field (\"${packageJsonName}\").`,\n      SnapValidationFailureReason.NameMismatch,\n    );\n  }\n\n  if (packageJsonVersion !== manifestPackageVersion) {\n    throw new ProgrammaticallyFixableSnapError(\n      `\"${NpmSnapFileNames.Manifest}\" npm package version (\"${manifestPackageVersion}\") does not match the \"${NpmSnapFileNames.PackageJson}\" \"version\" field (\"${packageJsonVersion}\").`,\n      SnapValidationFailureReason.VersionMismatch,\n    );\n  }\n\n  if (\n    // The repository may be `undefined` in package.json but can only be defined\n    // or `null` in the Snap manifest due to TS@<4.4 issues.\n    (packageJsonRepository || manifestRepository) &&\n    !deepEqual(packageJsonRepository, manifestRepository)\n  ) {\n    throw new ProgrammaticallyFixableSnapError(\n      `\"${NpmSnapFileNames.Manifest}\" \"repository\" field does not match the \"${NpmSnapFileNames.PackageJson}\" \"repository\" field.`,\n      SnapValidationFailureReason.RepositoryMismatch,\n    );\n  }\n\n  validateSnapShasum(\n    { manifest, sourceCode, svgIcon },\n    `\"${NpmSnapFileNames.Manifest}\" \"shasum\" field does not match computed shasum.`,\n  );\n}\n"]}

package/dist/{types/manifest → manifest}/validation.d.ts

@@ -29,11 +29,6 @@ export declare const SnapGetBip32EntropyPermissionsStruct: Struct<{
         secp256k1: "secp256k1";
     }>;
 }>>;
-export declare const SemVerRangeStruct: Struct<string, null>;
-export declare const SnapIdsStruct: Struct<Record<string, {
-    version?: string | undefined;
-}>, null>;
-export declare type SnapIds = Infer<typeof SnapIdsStruct>;
 export declare const PermissionsStruct: Struct<{
     'endowment:long-running'?: {} | undefined;
     'endowment:network-access'?: {} | undefined;
@@ -59,7 +54,6 @@ export declare const PermissionsStruct: Struct<{
     snap_dialog?: {} | undefined;
     snap_confirm?: {} | undefined;
     snap_manageState?: {} | undefined;
-    snap_manageAccounts?: {} | undefined;
     snap_notify?: {} | undefined;
     snap_getBip32Entropy?: {
         path: string[];
@@ -73,9 +67,16 @@ export declare const PermissionsStruct: Struct<{
         coinType: number;
     }[] | undefined;
     snap_getEntropy?: {} | undefined;
-    wallet_snap?: Record<string, {
-        version?: string | undefined;
-    }> | undefined;
+    'endowment:keyring'?: {
+        namespaces: Record<string, {
+            chains: {
+                name: string;
+                id: string;
+            }[];
+            methods?: string[] | undefined;
+            events?: string[] | undefined;
+        }>;
+    } | undefined;
 }, {
     'endowment:long-running': Struct<{} | undefined, {}>;
     'endowment:network-access': Struct<{} | undefined, {}>;
@@ -137,7 +138,6 @@ export declare const PermissionsStruct: Struct<{
     snap_dialog: Struct<{} | undefined, {}>;
     snap_confirm: Struct<{} | undefined, {}>;
     snap_manageState: Struct<{} | undefined, {}>;
-    snap_manageAccounts: Struct<{} | undefined, {}>;
     snap_notify: Struct<{} | undefined, {}>;
     snap_getBip32Entropy: Struct<{
         path: string[];
@@ -173,9 +173,25 @@ export declare const PermissionsStruct: Struct<{
         coinType: Struct<number, null>;
     }>>;
     snap_getEntropy: Struct<{} | undefined, {}>;
-    wallet_snap: Struct<Record<string, {
-        version?: string | undefined;
-    }> | undefined, null>;
+    'endowment:keyring': Struct<{
+        namespaces: Record<string, {
+            chains: {
+                name: string;
+                id: string;
+            }[];
+            methods?: string[] | undefined;
+            events?: string[] | undefined;
+        }>;
+    } | undefined, {
+        namespaces: Struct<Record<string, {
+            chains: {
+                name: string;
+                id: string;
+            }[];
+            methods?: string[] | undefined;
+            events?: string[] | undefined;
+        }>, null>;
+    }>;
 }>;
 export declare type SnapPermissions = Infer<typeof PermissionsStruct>;
 export declare const SnapManifestStruct: Struct<{
@@ -185,9 +201,9 @@ export declare const SnapManifestStruct: Struct<{
     source: {
         location: {
             npm: {
-                registry: "https://registry.npmjs.org" | "https://registry.npmjs.org/";
                 filePath: string;
                 packageName: string;
+                registry: "https://registry.npmjs.org" | "https://registry.npmjs.org/";
                 iconPath?: string | undefined;
             };
         };
@@ -218,7 +234,6 @@ export declare const SnapManifestStruct: Struct<{
         snap_dialog?: {} | undefined;
         snap_confirm?: {} | undefined;
         snap_manageState?: {} | undefined;
-        snap_manageAccounts?: {} | undefined;
         snap_notify?: {} | undefined;
         snap_getBip32Entropy?: {
             path: string[];
@@ -232,16 +247,22 @@ export declare const SnapManifestStruct: Struct<{
             coinType: number;
         }[] | undefined;
         snap_getEntropy?: {} | undefined;
-        wallet_snap?: Record<string, {
-            version?: string | undefined;
-        }> | undefined;
+        'endowment:keyring'?: {
+            namespaces: Record<string, {
+                chains: {
+                    name: string;
+                    id: string;
+                }[];
+                methods?: string[] | undefined;
+                events?: string[] | undefined;
+            }>;
+        } | undefined;
     };
     manifestVersion: "0.1";
     repository?: {
         type: string;
         url: string;
     } | undefined;
-    $schema?: string | undefined;
 }, {
     version: Struct<import("@metamask/utils").SemVerVersion, null>;
     description: Struct<string, null>;
@@ -256,9 +277,9 @@ export declare const SnapManifestStruct: Struct<{
     source: Struct<{
         location: {
             npm: {
-                registry: "https://registry.npmjs.org" | "https://registry.npmjs.org/";
                 filePath: string;
                 packageName: string;
+                registry: "https://registry.npmjs.org" | "https://registry.npmjs.org/";
                 iconPath?: string | undefined;
             };
         };
@@ -267,16 +288,16 @@ export declare const SnapManifestStruct: Struct<{
         shasum: Struct<string, null>;
         location: Struct<{
             npm: {
-                registry: "https://registry.npmjs.org" | "https://registry.npmjs.org/";
                 filePath: string;
                 packageName: string;
+                registry: "https://registry.npmjs.org" | "https://registry.npmjs.org/";
                 iconPath?: string | undefined;
             };
         }, {
             npm: Struct<{
-                registry: "https://registry.npmjs.org" | "https://registry.npmjs.org/";
                 filePath: string;
                 packageName: string;
+                registry: "https://registry.npmjs.org" | "https://registry.npmjs.org/";
                 iconPath?: string | undefined;
             }, {
                 filePath: Struct<string, null>;
@@ -311,7 +332,6 @@ export declare const SnapManifestStruct: Struct<{
         snap_dialog?: {} | undefined;
         snap_confirm?: {} | undefined;
         snap_manageState?: {} | undefined;
-        snap_manageAccounts?: {} | undefined;
         snap_notify?: {} | undefined;
         snap_getBip32Entropy?: {
             path: string[];
@@ -325,9 +345,16 @@ export declare const SnapManifestStruct: Struct<{
             coinType: number;
         }[] | undefined;
         snap_getEntropy?: {} | undefined;
-        wallet_snap?: Record<string, {
-            version?: string | undefined;
-        }> | undefined;
+        'endowment:keyring'?: {
+            namespaces: Record<string, {
+                chains: {
+                    name: string;
+                    id: string;
+                }[];
+                methods?: string[] | undefined;
+                events?: string[] | undefined;
+            }>;
+        } | undefined;
     }, {
         'endowment:long-running': Struct<{} | undefined, {}>;
         'endowment:network-access': Struct<{} | undefined, {}>;
@@ -389,7 +416,6 @@ export declare const SnapManifestStruct: Struct<{
         snap_dialog: Struct<{} | undefined, {}>;
         snap_confirm: Struct<{} | undefined, {}>;
         snap_manageState: Struct<{} | undefined, {}>;
-        snap_manageAccounts: Struct<{} | undefined, {}>;
         snap_notify: Struct<{} | undefined, {}>;
         snap_getBip32Entropy: Struct<{
             path: string[];
@@ -425,12 +451,27 @@ export declare const SnapManifestStruct: Struct<{
             coinType: Struct<number, null>;
         }>>;
         snap_getEntropy: Struct<{} | undefined, {}>;
-        wallet_snap: Struct<Record<string, {
-            version?: string | undefined;
-        }> | undefined, null>;
+        'endowment:keyring': Struct<{
+            namespaces: Record<string, {
+                chains: {
+                    name: string;
+                    id: string;
+                }[];
+                methods?: string[] | undefined;
+                events?: string[] | undefined;
+            }>;
+        } | undefined, {
+            namespaces: Struct<Record<string, {
+                chains: {
+                    name: string;
+                    id: string;
+                }[];
+                methods?: string[] | undefined;
+                events?: string[] | undefined;
+            }>, null>;
+        }>;
     }>;
     manifestVersion: Struct<"0.1", "0.1">;
-    $schema: Struct<string | undefined, null>;
 }>;
 export declare type SnapManifest = Infer<typeof SnapManifestStruct>;
 /**
@@ -450,6 +491,7 @@ export declare function assertIsSnapManifest(value: unknown): asserts value is S
 /**
  * Creates a {@link SnapManifest} object from JSON.
  *
+ *
  * @param value - The value to check.
  * @throws If the value cannot be coerced to a {@link SnapManifest} object.
  * @returns The created {@link SnapManifest} object.