@metamask/snaps-cli 0.22.3 → 0.24.0

package/dist/cmds/init/initUtils.js

@@ -3,290 +3,120 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isTemplateTypescript = exports.correctDefaultArgs = exports.prepareWorkingDirectory = exports.buildSnapManifest = exports.asyncPackageInit = void 0;
+exports.yarnInstall = exports.gitInit = exports.isInGitRepository = exports.isGitInstalled = exports.cloneTemplate = exports.prepareWorkingDirectory = exports.SNAP_LOCATION = exports.TEMPLATE_GIT_URL = void 0;
 const fs_1 = require("fs");
+const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
-const snap_utils_1 = require("@metamask/snap-utils");
-const init_package_json_1 = __importDefault(require("init-package-json"));
-const mkdirp_1 = __importDefault(require("mkdirp"));
-const slash_1 = __importDefault(require("slash"));
-const utils_1 = require("../../utils");
-const builders_1 = require("../../builders");
+exports.TEMPLATE_GIT_URL = 'https://github.com/MetaMask/template-snap-monorepo.git';
+exports.SNAP_LOCATION = 'packages/snap/';
 /**
- * This is a placeholder shasum that will be replaced at the end of the init command.
- */
-const PLACEHOLDER_SHASUM = '2QqUxo5joo4kKKr7yiCjdYsZOZcIFBnIBEdwU9Yx7+M=';
-const NPM_PUBLIC_REGISTRY_URL = 'https://registry.npmjs.org';
-/**
- * Initializes a `package.json` file for a Snap project. Will attempt to read
- * and parse the existing file if it already exists, otherwise will intialize
- * a brand new one.
+ * Checks if the destination folder exists and if it's empty. Otherwise create it.
  *
- * @param argv - Yargs arguments object.
- * @returns The contents of the `package.json` file.
+ * @param directory - The desination folder.
  */
-async function asyncPackageInit(argv) {
-    if ((0, fs_1.existsSync)(snap_utils_1.NpmSnapFileNames.PackageJson)) {
-        console.log(`Init: Attempting to use existing '${snap_utils_1.NpmSnapFileNames.PackageJson}'...`);
-        try {
-            const packageJson = await (0, snap_utils_1.readJsonFile)(snap_utils_1.NpmSnapFileNames.PackageJson);
-            (0, snap_utils_1.validateSnapJsonFile)(snap_utils_1.NpmSnapFileNames.PackageJson, packageJson);
-            console.log(`Init: Successfully parsed '${snap_utils_1.NpmSnapFileNames.PackageJson}'!`);
-            return packageJson;
+async function prepareWorkingDirectory(directory) {
+    try {
+        const isCurrentDirectory = directory === process.cwd();
+        if (!isCurrentDirectory) {
+            try {
+                await fs_1.promises.mkdir(directory, { recursive: true });
+            }
+            catch (err) {
+                throw new Error('Init Error: Failed to create new directory.');
+            }
         }
-        catch (error) {
-            (0, utils_1.logError)(`Init Error: Could not parse '${snap_utils_1.NpmSnapFileNames.PackageJson}'. Please verify that the file is correctly formatted and try again.`, error);
-            throw error;
+        const existingFiles = await fs_1.promises.readdir(directory);
+        if (existingFiles.length > 0) {
+            throw new Error(`Directory ${directory} not empty.`);
         }
     }
-    // Exit if yarn.lock is found, or we'll be in trouble
-    if ((0, fs_1.existsSync)('yarn.lock')) {
-        (0, utils_1.logError)(`Init Error: Found a 'yarn.lock' file but no '${snap_utils_1.NpmSnapFileNames.PackageJson}'. Please run 'yarn init' and try again.`);
-        throw new Error('Already existing yarn.lock file found');
+    catch (err) {
+        throw new Error(`Init Error: Failed to prepare working directory with message: ${err.message}`);
     }
-    // Run 'npm init'
-    return new Promise((resolve, reject) => {
-        (0, init_package_json_1.default)(process.cwd(), '', {
-            'init.main': argv.src,
-        }, (err, data) => {
-            if (err) {
-                reject(err);
-            }
-            else {
-                resolve(data);
-            }
-        });
-    });
 }
-exports.asyncPackageInit = asyncPackageInit;
-const YES = 'yes';
-const YES_VALUES = new Set([YES, 'y']);
+exports.prepareWorkingDirectory = prepareWorkingDirectory;
 /**
- * Checks if user input provided over a prompt is "yes", i.e., if the value is
- * truthy and in the {@link YES_VALUES} set.
+ * Clones the template in a directory.
  *
- * @param userInput - The user input to check.
- * @returns `true` if the user input is "yes", `false` otherwise.
+ * @param directory - The directory to clone the template in.
  */
-function isYes(userInput) {
-    return userInput && YES_VALUES.has(userInput.toLowerCase());
+async function cloneTemplate(directory) {
+    try {
+        (0, child_process_1.execSync)(`git clone --depth=1 ${exports.TEMPLATE_GIT_URL} ${directory}`, {
+            stdio: [2],
+        });
+    }
+    catch (err) {
+        throw new Error('Init Error: Failed to clone the template.');
+    }
 }
-const DEFAULT_PERMISSION_KEY = 'snap_confirm';
+exports.cloneTemplate = cloneTemplate;
 /**
- * Get the default permissions to write to the snap manifest.
+ * Check if git is installed.
  *
- * @returns An object containing the default permissions.
+ * @returns True if git is installed, or false otherwise.
  */
-const getDefaultPermissions = () => {
-    return { [DEFAULT_PERMISSION_KEY]: {} };
-};
+function isGitInstalled() {
+    try {
+        (0, child_process_1.execSync)('git --version', { stdio: 'ignore' });
+        return true;
+    }
+    catch (e) {
+        return false;
+    }
+}
+exports.isGitInstalled = isGitInstalled;
 /**
- * Interactively constructs a Snap manifest file by prompting the user.
+ * Check if the actual working dir is a git repository.
  *
- * @param argv - The `yargs` `argv` object.
- * @param packageJson - The `package.json` object.
- * @returns A tuple of the resulting Snap manifest object and a new `argv`
- * object with properties to match the manifest.
+ * @param directory - The directory to check.
+ * @returns True if it's a git repository otherwise false.
  */
-async function buildSnapManifest(argv, packageJson) {
-    const { outfileName } = argv;
-    let { dist } = argv;
-    let initialPermissions = getDefaultPermissions();
-    let { description, name: proposedName } = packageJson;
-    if (!description) {
-        description = `The ${proposedName} Snap.`;
-    }
+function isInGitRepository(directory) {
     try {
-        const userInput = await (0, utils_1.prompt)({
-            question: `Use default Snap manifest values?`,
-            defaultValue: YES,
-            shouldClose: false,
+        (0, child_process_1.execSync)('git rev-parse --is-inside-work-tree', {
+            stdio: 'ignore',
+            cwd: path_1.default.resolve(__dirname, directory),
         });
-        if (isYes(userInput)) {
-            console.log('Using default values...');
-            try {
-                await (0, mkdirp_1.default)(dist);
-            }
-            catch (err) {
-                (0, utils_1.logError)(`Init Error: Could not write default 'dist' '${dist}'. Maybe check your local ${utils_1.CONFIG_FILE} file?`);
-                throw err;
-            }
-            return endSnapManifest();
-        }
+        return true;
     }
     catch (err) {
-        (0, utils_1.logError)(`Init Error: ${err.message}`, err);
-        throw err;
-    }
-    let invalidProposedName = true;
-    while (invalidProposedName) {
-        // eslint-disable-next-line require-atomic-updates
-        proposedName = await (0, utils_1.prompt)({
-            question: `Proposed Snap name:`,
-            defaultValue: proposedName,
-        });
-        if (proposedName.length > 0 &&
-            proposedName.length <= 214 &&
-            snap_utils_1.PROPOSED_NAME_REGEX.test(proposedName)) {
-            invalidProposedName = false;
-        }
-        else {
-            (0, utils_1.logError)(`The proposed name must adhere to npm package naming conventions, except that capital letters are allowed. For details, see: https://docs.npmjs.com/cli/v6/configuring-npm/package-json#name`);
-        }
-    }
-    let invalidDescription = true;
-    while (invalidDescription) {
-        // eslint-disable-next-line require-atomic-updates
-        description = await (0, utils_1.prompt)({
-            question: `Description:`,
-            defaultValue: description,
-        });
-        if (description.length === 0 || description.length <= 280) {
-            invalidDescription = false;
-        }
-        else {
-            (0, utils_1.logError)(`The description must be a non-empty string less than or equal to 280 characters.`);
-        }
-    }
-    let invalidDist = true;
-    while (invalidDist) {
-        // eslint-disable-next-line require-atomic-updates
-        dist = await (0, utils_1.prompt)({ question: `Output directory:`, defaultValue: dist });
-        try {
-            dist = (0, utils_1.trimPathString)(dist);
-            await (0, mkdirp_1.default)(dist);
-            invalidDist = false;
-        }
-        catch (distError) {
-            (0, utils_1.logError)(`Unable to create directory '${dist}'. Ensure that the path is valid and try again.`, distError);
-        }
-    }
-    let invalidPermissions = true;
-    while (invalidPermissions) {
-        const inputPermissions = await (0, utils_1.prompt)({
-            // We add the parenthetical default value ourselves
-            question: `Initial permissions: [perm1 perm2 ...] ([snap_confirm])`,
-        });
-        if (!inputPermissions ||
-            inputPermissions.trim() === DEFAULT_PERMISSION_KEY) {
-            break;
-        }
-        try {
-            initialPermissions = inputPermissions
-                .split(' ')
-                .reduce((allPermissions, permission) => {
-                if (typeof permission === 'string' &&
-                    permission.match(/^[\w\d_:]+$/iu)) {
-                    allPermissions[permission] = {};
-                }
-                else {
-                    throw new Error(`Invalid permission: ${permission}`);
-                }
-                return allPermissions;
-            }, {});
-            invalidPermissions = false;
-        }
-        catch (err) {
-            (0, utils_1.logError)(`Invalid permissions '${inputPermissions}'.\nThe permissions must be specified as a space-separated list of strings with only characters, digits, underscores ('_'), and colons (':').`, err);
-        }
-    }
-    return endSnapManifest();
-    /**
-     * Get the final snap manifest object and return it, along with the dist and
-     * file names.
-     *
-     * @returns A tuple of the resulting snap manifest object and an object
-     * containing the dist and file names.
-     */
-    function endSnapManifest() {
-        const manifest = {
-            version: packageJson.version,
-            description,
-            proposedName,
-            repository: packageJson.repository
-                ? (0, snap_utils_1.deepClone)(packageJson.repository)
-                : null,
-            source: {
-                shasum: PLACEHOLDER_SHASUM,
-                location: {
-                    npm: {
-                        filePath: (0, slash_1.default)(path_1.default.join(dist, outfileName)),
-                        packageName: packageJson.name,
-                        registry: NPM_PUBLIC_REGISTRY_URL,
-                        iconPath: 'images/icon.svg',
-                    },
-                },
-            },
-            initialPermissions,
-            manifestVersion: '0.1',
-        };
-        try {
-            (0, snap_utils_1.validateSnapJsonFile)(snap_utils_1.NpmSnapFileNames.Manifest, manifest);
-        }
-        catch (error) {
-            /* istanbul ignore next */
-            throw new Error(`Internal Error: Validation of constructed manifest failed. This is a bug, please report it. Reason:\n${error.message}`);
-        }
-        return [
-            manifest,
-            { dist, outfileName, src: packageJson.main || 'src/index.js' },
-        ];
+        return false;
     }
 }
-exports.buildSnapManifest = buildSnapManifest;
-const INIT_FILE_NAMES = new Set([
-    'src',
-    'index.html',
-    utils_1.CONFIG_FILE,
-    'dist',
-    snap_utils_1.NpmSnapFileNames.Manifest,
-]);
+exports.isInGitRepository = isInGitRepository;
 /**
- * Checks whether any files in the current working directory will be overwritten
- * by the initialization process, and asks the user whether to continue if so.
+ * Init a git repository.
+ *
+ * @param directory - The directory to init.
  */
-async function prepareWorkingDirectory() {
-    const existingFiles = (await fs_1.promises.readdir(process.cwd())).filter((item) => INIT_FILE_NAMES.has(item.toString()));
-    if (existingFiles.length > 0) {
-        (0, utils_1.logWarning)(`\nInit Warning: Existing files and/or directories may be overwritten:\n${existingFiles.reduce((message, currentFile) => {
-            return `${message}\t${currentFile}\n`;
-        }, '')}`);
-        const continueInput = await (0, utils_1.prompt)({
-            question: `Continue?`,
-            defaultValue: YES,
+async function gitInit(directory) {
+    try {
+        (0, child_process_1.execSync)('git init', {
+            stdio: 'ignore',
+            cwd: path_1.default.resolve(__dirname, directory),
         });
-        const shouldContinue = continueInput && isYes(continueInput);
-        if (!shouldContinue) {
-            console.log(`Init: Exiting...`);
-            throw new Error('User refused to continue');
-        }
     }
-}
-exports.prepareWorkingDirectory = prepareWorkingDirectory;
-/**
- * In case when TypeScript version is used, default source file
- * will be updated if previous was not correct.
- *
- * @param yargsArgv - The Yargs arguments object.
- * @returns Modified Yargs arguments object.
- */
-function correctDefaultArgs(yargsArgv) {
-    if (yargsArgv.template === builders_1.TemplateType.TypeScript &&
-        yargsArgv.src === 'src/index.js') {
-        yargsArgv.src = 'src/index.ts';
-        yargsArgv.s = 'src/index.ts';
+    catch (err) {
+        throw new Error('Init Error: Failed to init a new git repository.');
     }
-    return yargsArgv;
 }
-exports.correctDefaultArgs = correctDefaultArgs;
+exports.gitInit = gitInit;
 /**
- * Check if template argument is TemplateType.TypeScript.
+ * Install dependencies in a yarn project.
  *
- * @param templateType - TemplateType value of the template argument passed from CLI.
- * @returns True or false.
+ * @param directory - The directory containing the project.
  */
-function isTemplateTypescript(templateType) {
-    return templateType === builders_1.TemplateType.TypeScript;
+async function yarnInstall(directory) {
+    try {
+        (0, child_process_1.execSync)('yarn install', {
+            stdio: [0, 1, 2],
+            cwd: path_1.default.resolve(__dirname, directory),
+        });
+    }
+    catch (err) {
+        throw new Error('Init Error: Failed to install dependencies.');
+    }
 }
-exports.isTemplateTypescript = isTemplateTypescript;
+exports.yarnInstall = yarnInstall;
 //# sourceMappingURL=initUtils.js.map

package/dist/cmds/init/initUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"initUtils.js","sourceRoot":"","sources":["../../../src/cmds/init/initUtils.ts"],"names":[],"mappings":"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","sourcesContent":["import { existsSync, promises as fs } from 'fs';\nimport pathUtils from 'path';\nimport {\n  PROPOSED_NAME_REGEX,\n  NpmSnapFileNames,\n  SnapManifest,\n  NpmSnapPackageJson,\n  validateSnapJsonFile,\n  readJsonFile,\n  deepClone,\n} from '@metamask/snap-utils';\nimport initPackageJson from 'init-package-json';\nimport mkdirp from 'mkdirp';\nimport slash from 'slash';\nimport { Arguments } from 'yargs';\nimport { YargsArgs } from '../../types/yargs';\nimport {\n  CONFIG_FILE,\n  logError,\n  logWarning,\n  prompt,\n  trimPathString,\n} from '../../utils';\nimport { TemplateType } from '../../builders';\n\n/**\n * This is a placeholder shasum that will be replaced at the end of the init command.\n */\nconst PLACEHOLDER_SHASUM = '2QqUxo5joo4kKKr7yiCjdYsZOZcIFBnIBEdwU9Yx7+M=';\n\nconst NPM_PUBLIC_REGISTRY_URL = 'https://registry.npmjs.org';\n\n/**\n * Initializes a `package.json` file for a Snap project. Will attempt to read\n * and parse the existing file if it already exists, otherwise will intialize\n * a brand new one.\n *\n * @param argv - Yargs arguments object.\n * @returns The contents of the `package.json` file.\n */\nexport async function asyncPackageInit(\n  argv: YargsArgs,\n): Promise<Readonly<NpmSnapPackageJson>> {\n  if (existsSync(NpmSnapFileNames.PackageJson)) {\n    console.log(\n      `Init: Attempting to use existing '${NpmSnapFileNames.PackageJson}'...`,\n    );\n\n    try {\n      const packageJson = await readJsonFile(NpmSnapFileNames.PackageJson);\n      validateSnapJsonFile(NpmSnapFileNames.PackageJson, packageJson);\n\n      console.log(\n        `Init: Successfully parsed '${NpmSnapFileNames.PackageJson}'!`,\n      );\n      return packageJson as NpmSnapPackageJson;\n    } catch (error) {\n      logError(\n        `Init Error: Could not parse '${NpmSnapFileNames.PackageJson}'. Please verify that the file is correctly formatted and try again.`,\n        error,\n      );\n      throw error;\n    }\n  }\n\n  // Exit if yarn.lock is found, or we'll be in trouble\n  if (existsSync('yarn.lock')) {\n    logError(\n      `Init Error: Found a 'yarn.lock' file but no '${NpmSnapFileNames.PackageJson}'. Please run 'yarn init' and try again.`,\n    );\n    throw new Error('Already existing yarn.lock file found');\n  }\n\n  // Run 'npm init'\n  return new Promise((resolve, reject) => {\n    initPackageJson(\n      process.cwd(),\n      '',\n      {\n        'init.main': argv.src,\n      },\n      (err, data) => {\n        if (err) {\n          reject(err);\n        } else {\n          resolve(data);\n        }\n      },\n    );\n  });\n}\n\nconst YES = 'yes';\nconst YES_VALUES = new Set([YES, 'y']);\n\n/**\n * Checks if user input provided over a prompt is \"yes\", i.e., if the value is\n * truthy and in the {@link YES_VALUES} set.\n *\n * @param userInput - The user input to check.\n * @returns `true` if the user input is \"yes\", `false` otherwise.\n */\nfunction isYes(userInput: string | undefined) {\n  return userInput && YES_VALUES.has(userInput.toLowerCase());\n}\n\nconst DEFAULT_PERMISSION_KEY = 'snap_confirm';\n\n/**\n * Get the default permissions to write to the snap manifest.\n *\n * @returns An object containing the default permissions.\n */\nconst getDefaultPermissions = () => {\n  return { [DEFAULT_PERMISSION_KEY]: {} };\n};\n\n/**\n * Interactively constructs a Snap manifest file by prompting the user.\n *\n * @param argv - The `yargs` `argv` object.\n * @param packageJson - The `package.json` object.\n * @returns A tuple of the resulting Snap manifest object and a new `argv`\n * object with properties to match the manifest.\n */\nexport async function buildSnapManifest(\n  argv: YargsArgs,\n  packageJson: NpmSnapPackageJson,\n): Promise<[SnapManifest, { dist: string; outfileName: string; src: string }]> {\n  const { outfileName } = argv;\n  let { dist } = argv;\n  let initialPermissions: Record<string, unknown> = getDefaultPermissions();\n  let { description, name: proposedName } = packageJson;\n\n  if (!description) {\n    description = `The ${proposedName} Snap.`;\n  }\n\n  try {\n    const userInput = await prompt({\n      question: `Use default Snap manifest values?`,\n      defaultValue: YES,\n      shouldClose: false,\n    });\n\n    if (isYes(userInput)) {\n      console.log('Using default values...');\n      try {\n        await mkdirp(dist);\n      } catch (err) {\n        logError(\n          `Init Error: Could not write default 'dist' '${dist}'. Maybe check your local ${CONFIG_FILE} file?`,\n        );\n        throw err;\n      }\n      return endSnapManifest();\n    }\n  } catch (err) {\n    logError(`Init Error: ${err.message}`, err);\n    throw err;\n  }\n\n  let invalidProposedName = true;\n  while (invalidProposedName) {\n    // eslint-disable-next-line require-atomic-updates\n    proposedName = await prompt({\n      question: `Proposed Snap name:`,\n      defaultValue: proposedName,\n    });\n\n    if (\n      proposedName.length > 0 &&\n      proposedName.length <= 214 &&\n      PROPOSED_NAME_REGEX.test(proposedName)\n    ) {\n      invalidProposedName = false;\n    } else {\n      logError(\n        `The proposed name must adhere to npm package naming conventions, except that capital letters are allowed. For details, see: https://docs.npmjs.com/cli/v6/configuring-npm/package-json#name`,\n      );\n    }\n  }\n\n  let invalidDescription = true;\n  while (invalidDescription) {\n    // eslint-disable-next-line require-atomic-updates\n    description = await prompt({\n      question: `Description:`,\n      defaultValue: description,\n    });\n\n    if (description.length === 0 || description.length <= 280) {\n      invalidDescription = false;\n    } else {\n      logError(\n        `The description must be a non-empty string less than or equal to 280 characters.`,\n      );\n    }\n  }\n\n  let invalidDist = true;\n  while (invalidDist) {\n    // eslint-disable-next-line require-atomic-updates\n    dist = await prompt({ question: `Output directory:`, defaultValue: dist });\n    try {\n      dist = trimPathString(dist);\n      await mkdirp(dist);\n      invalidDist = false;\n    } catch (distError) {\n      logError(\n        `Unable to create directory '${dist}'. Ensure that the path is valid and try again.`,\n        distError,\n      );\n    }\n  }\n\n  let invalidPermissions = true;\n  while (invalidPermissions) {\n    const inputPermissions = await prompt({\n      // We add the parenthetical default value ourselves\n      question: `Initial permissions: [perm1 perm2 ...] ([snap_confirm])`,\n    });\n\n    if (\n      !inputPermissions ||\n      inputPermissions.trim() === DEFAULT_PERMISSION_KEY\n    ) {\n      break;\n    }\n\n    try {\n      initialPermissions = inputPermissions\n        .split(' ')\n        .reduce((allPermissions, permission) => {\n          if (\n            typeof permission === 'string' &&\n            permission.match(/^[\\w\\d_:]+$/iu)\n          ) {\n            allPermissions[permission] = {};\n          } else {\n            throw new Error(`Invalid permission: ${permission}`);\n          }\n          return allPermissions;\n        }, {} as Record<string, unknown>);\n\n      invalidPermissions = false;\n    } catch (err) {\n      logError(\n        `Invalid permissions '${inputPermissions}'.\\nThe permissions must be specified as a space-separated list of strings with only characters, digits, underscores ('_'), and colons (':').`,\n        err,\n      );\n    }\n  }\n\n  return endSnapManifest();\n\n  /**\n   * Get the final snap manifest object and return it, along with the dist and\n   * file names.\n   *\n   * @returns A tuple of the resulting snap manifest object and an object\n   * containing the dist and file names.\n   */\n  function endSnapManifest(): [\n    SnapManifest,\n    {\n      dist: string;\n      outfileName: string;\n      src: string;\n    },\n  ] {\n    const manifest = {\n      version: packageJson.version,\n      description,\n      proposedName,\n      repository: packageJson.repository\n        ? deepClone(packageJson.repository)\n        : null,\n      source: {\n        shasum: PLACEHOLDER_SHASUM,\n        location: {\n          npm: {\n            filePath: slash(pathUtils.join(dist, outfileName)),\n            packageName: packageJson.name,\n            registry: NPM_PUBLIC_REGISTRY_URL,\n            iconPath: 'images/icon.svg',\n          } as const,\n        },\n      },\n      initialPermissions,\n      manifestVersion: '0.1' as const,\n    };\n\n    try {\n      validateSnapJsonFile(NpmSnapFileNames.Manifest, manifest);\n    } catch (error) {\n      /* istanbul ignore next */\n      throw new Error(\n        `Internal Error: Validation of constructed manifest failed. This is a bug, please report it. Reason:\\n${error.message}`,\n      );\n    }\n\n    return [\n      manifest,\n      { dist, outfileName, src: packageJson.main || 'src/index.js' },\n    ];\n  }\n}\n\nconst INIT_FILE_NAMES = new Set([\n  'src',\n  'index.html',\n  CONFIG_FILE,\n  'dist',\n  NpmSnapFileNames.Manifest,\n]);\n\n/**\n * Checks whether any files in the current working directory will be overwritten\n * by the initialization process, and asks the user whether to continue if so.\n */\nexport async function prepareWorkingDirectory(): Promise<void> {\n  const existingFiles = (await fs.readdir(process.cwd())).filter((item) =>\n    INIT_FILE_NAMES.has(item.toString()),\n  );\n\n  if (existingFiles.length > 0) {\n    logWarning(\n      `\\nInit Warning: Existing files and/or directories may be overwritten:\\n${existingFiles.reduce(\n        (message, currentFile) => {\n          return `${message}\\t${currentFile}\\n`;\n        },\n        '',\n      )}`,\n    );\n\n    const continueInput = await prompt({\n      question: `Continue?`,\n      defaultValue: YES,\n    });\n    const shouldContinue = continueInput && isYes(continueInput);\n\n    if (!shouldContinue) {\n      console.log(`Init: Exiting...`);\n      throw new Error('User refused to continue');\n    }\n  }\n}\n\n/**\n * In case when TypeScript version is used, default source file\n * will be updated if previous was not correct.\n *\n * @param yargsArgv - The Yargs arguments object.\n * @returns Modified Yargs arguments object.\n */\nexport function correctDefaultArgs(yargsArgv: Arguments): Arguments {\n  if (\n    yargsArgv.template === TemplateType.TypeScript &&\n    yargsArgv.src === 'src/index.js'\n  ) {\n    yargsArgv.src = 'src/index.ts';\n    yargsArgv.s = 'src/index.ts';\n  }\n\n  return yargsArgv;\n}\n\n/**\n * Check if template argument is TemplateType.TypeScript.\n *\n * @param templateType - TemplateType value of the template argument passed from CLI.\n * @returns True or false.\n */\nexport function isTemplateTypescript(templateType: TemplateType): boolean {\n  return templateType === TemplateType.TypeScript;\n}\n"]}
+{"version":3,"file":"initUtils.js","sourceRoot":"","sources":["../../../src/cmds/init/initUtils.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAoC;AACpC,iDAAyC;AACzC,gDAA6B;AAEhB,QAAA,gBAAgB,GAC3B,wDAAwD,CAAC;AAE9C,QAAA,aAAa,GAAG,gBAAgB,CAAC;AAE9C;;;;GAIG;AACI,KAAK,UAAU,uBAAuB,CAC3C,SAAiB;IAEjB,IAAI;QACF,MAAM,kBAAkB,GAAG,SAAS,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC;QAEvD,IAAI,CAAC,kBAAkB,EAAE;YACvB,IAAI;gBACF,MAAM,aAAE,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;aAChD;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;aAChE;SACF;QAED,MAAM,aAAa,GAAG,MAAM,aAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAElD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,aAAa,SAAS,aAAa,CAAC,CAAC;SACtD;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,KAAK,CACb,iEAAiE,GAAG,CAAC,OAAO,EAAE,CAC/E,CAAC;KACH;AACH,CAAC;AAxBD,0DAwBC;AAED;;;;GAIG;AACI,KAAK,UAAU,aAAa,CAAC,SAAiB;IACnD,IAAI;QACF,IAAA,wBAAQ,EAAC,uBAAuB,wBAAgB,IAAI,SAAS,EAAE,EAAE;YAC/D,KAAK,EAAE,CAAC,CAAC,CAAC;SACX,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;KAC9D;AACH,CAAC;AARD,sCAQC;AAED;;;;GAIG;AACH,SAAgB,cAAc;IAC5B,IAAI;QACF,IAAA,wBAAQ,EAAC,eAAe,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAPD,wCAOC;AAED;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,SAAiB;IACjD,IAAI;QACF,IAAA,wBAAQ,EAAC,qCAAqC,EAAE;YAC9C,KAAK,EAAE,QAAQ;YACf,GAAG,EAAE,cAAS,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;SAC7C,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAVD,8CAUC;AAED;;;;GAIG;AACI,KAAK,UAAU,OAAO,CAAC,SAAiB;IAC7C,IAAI;QACF,IAAA,wBAAQ,EAAC,UAAU,EAAE;YACnB,KAAK,EAAE,QAAQ;YACf,GAAG,EAAE,cAAS,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;SAC7C,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;AACH,CAAC;AATD,0BASC;AAED;;;;GAIG;AACI,KAAK,UAAU,WAAW,CAAC,SAAiB;IACjD,IAAI;QACF,IAAA,wBAAQ,EAAC,cAAc,EAAE;YACvB,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAChB,GAAG,EAAE,cAAS,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;SAC7C,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;KAChE;AACH,CAAC;AATD,kCASC","sourcesContent":["import { promises as fs } from 'fs';\nimport { execSync } from 'child_process';\nimport pathUtils from 'path';\n\nexport const TEMPLATE_GIT_URL =\n  'https://github.com/MetaMask/template-snap-monorepo.git';\n\nexport const SNAP_LOCATION = 'packages/snap/';\n\n/**\n * Checks if the destination folder exists and if it's empty. Otherwise create it.\n *\n * @param directory - The desination folder.\n */\nexport async function prepareWorkingDirectory(\n  directory: string,\n): Promise<void> {\n  try {\n    const isCurrentDirectory = directory === process.cwd();\n\n    if (!isCurrentDirectory) {\n      try {\n        await fs.mkdir(directory, { recursive: true });\n      } catch (err) {\n        throw new Error('Init Error: Failed to create new directory.');\n      }\n    }\n\n    const existingFiles = await fs.readdir(directory);\n\n    if (existingFiles.length > 0) {\n      throw new Error(`Directory ${directory} not empty.`);\n    }\n  } catch (err) {\n    throw new Error(\n      `Init Error: Failed to prepare working directory with message: ${err.message}`,\n    );\n  }\n}\n\n/**\n * Clones the template in a directory.\n *\n * @param directory - The directory to clone the template in.\n */\nexport async function cloneTemplate(directory: string) {\n  try {\n    execSync(`git clone --depth=1 ${TEMPLATE_GIT_URL} ${directory}`, {\n      stdio: [2],\n    });\n  } catch (err) {\n    throw new Error('Init Error: Failed to clone the template.');\n  }\n}\n\n/**\n * Check if git is installed.\n *\n * @returns True if git is installed, or false otherwise.\n */\nexport function isGitInstalled() {\n  try {\n    execSync('git --version', { stdio: 'ignore' });\n    return true;\n  } catch (e) {\n    return false;\n  }\n}\n\n/**\n * Check if the actual working dir is a git repository.\n *\n * @param directory - The directory to check.\n * @returns True if it's a git repository otherwise false.\n */\nexport function isInGitRepository(directory: string) {\n  try {\n    execSync('git rev-parse --is-inside-work-tree', {\n      stdio: 'ignore',\n      cwd: pathUtils.resolve(__dirname, directory),\n    });\n    return true;\n  } catch (err) {\n    return false;\n  }\n}\n\n/**\n * Init a git repository.\n *\n * @param directory - The directory to init.\n */\nexport async function gitInit(directory: string) {\n  try {\n    execSync('git init', {\n      stdio: 'ignore',\n      cwd: pathUtils.resolve(__dirname, directory),\n    });\n  } catch (err) {\n    throw new Error('Init Error: Failed to init a new git repository.');\n  }\n}\n\n/**\n * Install dependencies in a yarn project.\n *\n * @param directory - The directory containing the project.\n */\nexport async function yarnInstall(directory: string) {\n  try {\n    execSync('yarn install', {\n      stdio: [0, 1, 2],\n      cwd: pathUtils.resolve(__dirname, directory),\n    });\n  } catch (err) {\n    throw new Error('Init Error: Failed to install dependencies.');\n  }\n}\n"]}

package/dist/cmds/manifest/manifestHandler.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.manifestHandler = void 0;
-const snap_utils_1 = require("@metamask/snap-utils");
+const snaps_utils_1 = require("@metamask/snaps-utils");
 const ERROR_PREFIX = 'Manifest Error: ';
 /**
  * Validates a snap.manifest.json file. Attempts to fix the manifest and write
@@ -13,7 +13,7 @@ const ERROR_PREFIX = 'Manifest Error: ';
  */
 async function manifestHandler({ writeManifest }) {
     try {
-        const { warnings, errors } = await (0, snap_utils_1.checkManifest)(process.cwd(), Boolean(writeManifest));
+        const { warnings, errors } = await (0, snaps_utils_1.checkManifest)(process.cwd(), Boolean(writeManifest));
         if (!writeManifest && errors.length > 0) {
             console.error(`${ERROR_PREFIX}The manifest is invalid.`);
             errors.forEach(logManifestError);

package/dist/cmds/manifest/manifestHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifestHandler.js","sourceRoot":"","sources":["../../../src/cmds/manifest/manifestHandler.ts"],"names":[],"mappings":";;;AAAA,qDAAqD;AAGrD,MAAM,YAAY,GAAG,kBAAkB,CAAC;AAExC;;;;;;;GAOG;AACI,KAAK,UAAU,eAAe,CAAC,EAAE,aAAa,EAAa;IAChE,IAAI;QACF,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,0BAAa,EAC9C,OAAO,CAAC,GAAG,EAAE,EACb,OAAO,CAAC,aAAa,CAAC,CACvB,CAAC;QAEF,IAAI,CAAC,aAAa,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACvC,OAAO,CAAC,KAAK,CAAC,GAAG,YAAY,0BAA0B,CAAC,CAAC;YACzD,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;YAEjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;QAED,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,CAAC,GAAG,CACT,6EAA6E,CAC9E,CAAC;YACF,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;SACtC;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,GAAG,YAAY,GAAG,KAAK,EAAE,CAAC,CAAC;KAC5C;AACH,CAAC;AAvBD,0CAuBC;AAED;;;;GAIG;AACH,SAAS,kBAAkB,CAAC,OAAe;IACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE;QAClC,OAAO,CAAC,GAAG,CAAC,qBAAqB,OAAO,EAAE,CAAC,CAAC;KAC7C;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,gBAAgB,CAAC,OAAe;IACvC,OAAO,CAAC,KAAK,CAAC,GAAG,YAAY,GAAG,OAAO,EAAE,CAAC,CAAC;AAC7C,CAAC","sourcesContent":["import { checkManifest } from '@metamask/snap-utils';\nimport { YargsArgs } from '../../types/yargs';\n\nconst ERROR_PREFIX = 'Manifest Error: ';\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 argv - The Yargs `argv` object.\n * @param argv.writeManifest - Whether to write the fixed manifest to disk.\n */\nexport async function manifestHandler({ writeManifest }: YargsArgs) {\n  try {\n    const { warnings, errors } = await checkManifest(\n      process.cwd(),\n      Boolean(writeManifest),\n    );\n\n    if (!writeManifest && errors.length > 0) {\n      console.error(`${ERROR_PREFIX}The manifest is invalid.`);\n      errors.forEach(logManifestError);\n\n      process.exit(1);\n    }\n\n    if (warnings.length > 0) {\n      console.log(\n        'Manifest Warning: Validation of snap.manifest.json completed with warnings.',\n      );\n      warnings.forEach(logManifestWarning);\n    }\n  } catch (error) {\n    throw new Error(`${ERROR_PREFIX}${error}`);\n  }\n}\n\n/**\n * Logs a manifest warning, if `suppressWarnings` is not enabled.\n *\n * @param message - The message to log.\n */\nfunction logManifestWarning(message: string) {\n  if (!global.snaps.suppressWarnings) {\n    console.log(`Manifest Warning: ${message}`);\n  }\n}\n\n/**\n * Logs a manifest error.\n *\n * @param message - The message to log.\n */\nfunction logManifestError(message: string) {\n  console.error(`${ERROR_PREFIX}${message}`);\n}\n"]}
+{"version":3,"file":"manifestHandler.js","sourceRoot":"","sources":["../../../src/cmds/manifest/manifestHandler.ts"],"names":[],"mappings":";;;AAAA,uDAAsD;AAGtD,MAAM,YAAY,GAAG,kBAAkB,CAAC;AAExC;;;;;;;GAOG;AACI,KAAK,UAAU,eAAe,CAAC,EAAE,aAAa,EAAa;IAChE,IAAI;QACF,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,2BAAa,EAC9C,OAAO,CAAC,GAAG,EAAE,EACb,OAAO,CAAC,aAAa,CAAC,CACvB,CAAC;QAEF,IAAI,CAAC,aAAa,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACvC,OAAO,CAAC,KAAK,CAAC,GAAG,YAAY,0BAA0B,CAAC,CAAC;YACzD,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;YAEjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;QAED,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,CAAC,GAAG,CACT,6EAA6E,CAC9E,CAAC;YACF,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;SACtC;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,GAAG,YAAY,GAAG,KAAK,EAAE,CAAC,CAAC;KAC5C;AACH,CAAC;AAvBD,0CAuBC;AAED;;;;GAIG;AACH,SAAS,kBAAkB,CAAC,OAAe;IACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE;QAClC,OAAO,CAAC,GAAG,CAAC,qBAAqB,OAAO,EAAE,CAAC,CAAC;KAC7C;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,gBAAgB,CAAC,OAAe;IACvC,OAAO,CAAC,KAAK,CAAC,GAAG,YAAY,GAAG,OAAO,EAAE,CAAC,CAAC;AAC7C,CAAC","sourcesContent":["import { checkManifest } from '@metamask/snaps-utils';\nimport { YargsArgs } from '../../types/yargs';\n\nconst ERROR_PREFIX = 'Manifest Error: ';\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 argv - The Yargs `argv` object.\n * @param argv.writeManifest - Whether to write the fixed manifest to disk.\n */\nexport async function manifestHandler({ writeManifest }: YargsArgs) {\n  try {\n    const { warnings, errors } = await checkManifest(\n      process.cwd(),\n      Boolean(writeManifest),\n    );\n\n    if (!writeManifest && errors.length > 0) {\n      console.error(`${ERROR_PREFIX}The manifest is invalid.`);\n      errors.forEach(logManifestError);\n\n      process.exit(1);\n    }\n\n    if (warnings.length > 0) {\n      console.log(\n        'Manifest Warning: Validation of snap.manifest.json completed with warnings.',\n      );\n      warnings.forEach(logManifestWarning);\n    }\n  } catch (error) {\n    throw new Error(`${ERROR_PREFIX}${error}`);\n  }\n}\n\n/**\n * Logs a manifest warning, if `suppressWarnings` is not enabled.\n *\n * @param message - The message to log.\n */\nfunction logManifestWarning(message: string) {\n  if (!global.snaps.suppressWarnings) {\n    console.log(`Manifest Warning: ${message}`);\n  }\n}\n\n/**\n * Logs a manifest error.\n *\n * @param message - The message to log.\n */\nfunction logManifestError(message: string) {\n  console.error(`${ERROR_PREFIX}${message}`);\n}\n"]}

package/dist/cmds/serve/serveHandler.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.serve = void 0;
 const http_1 = __importDefault(require("http"));
 const serve_handler_1 = __importDefault(require("serve-handler"));
-const snap_utils_1 = require("@metamask/snap-utils");
+const snaps_utils_1 = require("@metamask/snaps-utils");
 const serveUtils_1 = require("./serveUtils");
 /**
  * Starts a local, static HTTP server on the given port with the given root
@@ -18,7 +18,7 @@ const serveUtils_1 = require("./serveUtils");
  */
 async function serve(argv) {
     const { port, root: rootDir } = argv;
-    await (0, snap_utils_1.validateDirPath)(rootDir, true);
+    await (0, snaps_utils_1.validateDirPath)(rootDir, true);
     console.log(`\nStarting server...`);
     const server = http_1.default.createServer(async (req, res) => {
         await (0, serve_handler_1.default)(req, res, {

package/dist/cmds/serve/serveHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"serveHandler.js","sourceRoot":"","sources":["../../../src/cmds/serve/serveHandler.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,kEAAyC;AACzC,qDAAuD;AAEvD,6CAA8E;AAE9E;;;;;;;GAOG;AACI,KAAK,UAAU,KAAK,CAAC,IAAe;IACzC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAErC,MAAM,IAAA,4BAAe,EAAC,OAAiB,EAAE,IAAI,CAAC,CAAC;IAE/C,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IAEpC,MAAM,MAAM,GAAG,cAAI,CAAC,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QAClD,MAAM,IAAA,uBAAY,EAAC,GAAG,EAAE,GAAG,EAAE;YAC3B,MAAM,EAAE,OAAiB;YACzB,OAAO,EAAE;gBACP;oBACE,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE;wBACP;4BACE,GAAG,EAAE,eAAe;4BACpB,KAAK,EAAE,UAAU;yBAClB;wBACD;4BACE,GAAG,EAAE,6BAA6B;4BAClC,KAAK,EAAE,GAAG;yBACX;qBACF;iBACF;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC,CAAC;IAExD,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,uBAAU,EAAC,OAAO,CAAC,CAAC,CAAC;IAEvD,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QAC3B,IAAA,2BAAc,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC7B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;AACL,CAAC;AAzCD,sBAyCC","sourcesContent":["import http from 'http';\nimport serveHandler from 'serve-handler';\nimport { validateDirPath } from '@metamask/snap-utils';\nimport { YargsArgs } from '../../types/yargs';\nimport { logRequest, logServerError, logServerListening } from './serveUtils';\n\n/**\n * Starts a local, static HTTP server on the given port with the given root\n * directory.\n *\n * @param argv - Arguments as an object generated by Yargs.\n * @param argv.root - The root directory path string.\n * @param argv.port - The server port.\n */\nexport async function serve(argv: YargsArgs): Promise<void> {\n  const { port, root: rootDir } = argv;\n\n  await validateDirPath(rootDir as string, true);\n\n  console.log(`\\nStarting server...`);\n\n  const server = http.createServer(async (req, res) => {\n    await serveHandler(req, res, {\n      public: rootDir as string,\n      headers: [\n        {\n          source: '**/*',\n          headers: [\n            {\n              key: 'Cache-Control',\n              value: 'no-cache',\n            },\n            {\n              key: 'Access-Control-Allow-Origin',\n              value: '*',\n            },\n          ],\n        },\n      ],\n    });\n  });\n\n  server.listen({ port }, () => logServerListening(port));\n\n  server.on('request', (request) => logRequest(request));\n\n  server.on('error', (error) => {\n    logServerError(error, argv.port);\n    process.exitCode = 1;\n  });\n\n  server.on('close', () => {\n    console.log('Server closed');\n    process.exitCode = 1;\n  });\n}\n"]}
+{"version":3,"file":"serveHandler.js","sourceRoot":"","sources":["../../../src/cmds/serve/serveHandler.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,kEAAyC;AACzC,uDAAwD;AAExD,6CAA8E;AAE9E;;;;;;;GAOG;AACI,KAAK,UAAU,KAAK,CAAC,IAAe;IACzC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAErC,MAAM,IAAA,6BAAe,EAAC,OAAiB,EAAE,IAAI,CAAC,CAAC;IAE/C,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IAEpC,MAAM,MAAM,GAAG,cAAI,CAAC,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QAClD,MAAM,IAAA,uBAAY,EAAC,GAAG,EAAE,GAAG,EAAE;YAC3B,MAAM,EAAE,OAAiB;YACzB,OAAO,EAAE;gBACP;oBACE,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE;wBACP;4BACE,GAAG,EAAE,eAAe;4BACpB,KAAK,EAAE,UAAU;yBAClB;wBACD;4BACE,GAAG,EAAE,6BAA6B;4BAClC,KAAK,EAAE,GAAG;yBACX;qBACF;iBACF;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC,CAAC;IAExD,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,uBAAU,EAAC,OAAO,CAAC,CAAC,CAAC;IAEvD,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QAC3B,IAAA,2BAAc,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC7B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;AACL,CAAC;AAzCD,sBAyCC","sourcesContent":["import http from 'http';\nimport serveHandler from 'serve-handler';\nimport { validateDirPath } from '@metamask/snaps-utils';\nimport { YargsArgs } from '../../types/yargs';\nimport { logRequest, logServerError, logServerListening } from './serveUtils';\n\n/**\n * Starts a local, static HTTP server on the given port with the given root\n * directory.\n *\n * @param argv - Arguments as an object generated by Yargs.\n * @param argv.root - The root directory path string.\n * @param argv.port - The server port.\n */\nexport async function serve(argv: YargsArgs): Promise<void> {\n  const { port, root: rootDir } = argv;\n\n  await validateDirPath(rootDir as string, true);\n\n  console.log(`\\nStarting server...`);\n\n  const server = http.createServer(async (req, res) => {\n    await serveHandler(req, res, {\n      public: rootDir as string,\n      headers: [\n        {\n          source: '**/*',\n          headers: [\n            {\n              key: 'Cache-Control',\n              value: 'no-cache',\n            },\n            {\n              key: 'Access-Control-Allow-Origin',\n              value: '*',\n            },\n          ],\n        },\n      ],\n    });\n  });\n\n  server.listen({ port }, () => logServerListening(port));\n\n  server.on('request', (request) => logRequest(request));\n\n  server.on('error', (error) => {\n    logServerError(error, argv.port);\n    process.exitCode = 1;\n  });\n\n  server.on('close', () => {\n    console.log('Server closed');\n    process.exitCode = 1;\n  });\n}\n"]}

package/dist/cmds/watch/watchHandler.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.watch = void 0;
 const chokidar_1 = __importDefault(require("chokidar"));
-const snap_utils_1 = require("@metamask/snap-utils");
+const snaps_utils_1 = require("@metamask/snaps-utils");
 const utils_1 = require("../../utils");
 const bundle_1 = require("../build/bundle");
 const evalHandler_1 = require("../eval/evalHandler");
@@ -26,12 +26,12 @@ const serveHandler_1 = require("../serve/serveHandler");
 async function watch(argv) {
     const { dist, eval: shouldEval, manifest, outfileName, src, serve: shouldServe, } = argv;
     if (outfileName) {
-        (0, snap_utils_1.validateOutfileName)(outfileName);
+        (0, snaps_utils_1.validateOutfileName)(outfileName);
     }
-    await (0, snap_utils_1.validateFilePath)(src);
-    await (0, snap_utils_1.validateDirPath)(dist, true);
+    await (0, snaps_utils_1.validateFilePath)(src);
+    await (0, snaps_utils_1.validateDirPath)(dist, true);
     const rootDir = src.indexOf('/') === -1 ? '.' : src.substring(0, src.lastIndexOf('/') + 1);
-    const outfilePath = (0, snap_utils_1.getOutfilePath)(dist, outfileName);
+    const outfilePath = (0, snaps_utils_1.getOutfilePath)(dist, outfileName);
     const buildSnap = async (path, logMessage) => {
         if (logMessage !== undefined) {
             console.log(logMessage);

package/dist/cmds/watch/watchHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"watchHandler.js","sourceRoot":"","sources":["../../../src/cmds/watch/watchHandler.ts"],"names":[],"mappings":"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","sourcesContent":["import chokidar from 'chokidar';\nimport {\n  getOutfilePath,\n  validateDirPath,\n  validateFilePath,\n  validateOutfileName,\n} from '@metamask/snap-utils';\nimport { YargsArgs } from '../../types/yargs';\nimport { loadConfig, logError } from '../../utils';\nimport { bundle } from '../build/bundle';\nimport { evalHandler } from '../eval/evalHandler';\nimport { manifestHandler } from '../manifest/manifestHandler';\nimport { serve } from '../serve/serveHandler';\n\n/**\n * Watch a directory and its subdirectories for changes, and build when files\n * are added or changed.\n *\n * Ignores 'node_modules' and dotfiles.\n * Creates destination directory if it doesn't exist.\n *\n * @param argv - Arguments as an object generated by Yargs.\n * @param argv.src - The source file path.\n * @param argv.dist - The output directory path.\n * @param argv.'outfileName' - The output file name.\n */\nexport async function watch(argv: YargsArgs): Promise<void> {\n  const {\n    dist,\n    eval: shouldEval,\n    manifest,\n    outfileName,\n    src,\n    serve: shouldServe,\n  } = argv;\n  if (outfileName) {\n    validateOutfileName(outfileName as string);\n  }\n  await validateFilePath(src);\n  await validateDirPath(dist, true);\n  const rootDir =\n    src.indexOf('/') === -1 ? '.' : src.substring(0, src.lastIndexOf('/') + 1);\n  const outfilePath = getOutfilePath(dist, outfileName as string);\n\n  const buildSnap = async (path?: string, logMessage?: string) => {\n    if (logMessage !== undefined) {\n      console.log(logMessage);\n    }\n\n    try {\n      await bundle(src, outfilePath, argv, loadConfig().bundlerCustomizer);\n\n      if (manifest) {\n        await manifestHandler(argv);\n      }\n\n      if (shouldEval) {\n        await evalHandler({ ...argv, bundle: outfilePath });\n      }\n    } catch (error) {\n      logError(\n        `Error ${\n          path === undefined\n            ? 'during initial build'\n            : `while processing \"${path}\"`\n        }.`,\n        error,\n      );\n    }\n  };\n\n  chokidar\n    .watch(rootDir, {\n      ignoreInitial: true,\n      ignored: [\n        '**/node_modules/**',\n        `**/${dist}/**`,\n        `**/test/**`,\n        `**/tests/**`,\n        `**/*.test.js`,\n        `**/*.test.ts`,\n        /* istanbul ignore next */\n        (str: string) => str !== '.' && str.startsWith('.'),\n      ],\n    })\n\n    .on('ready', async () => {\n      await buildSnap();\n      if (shouldServe) {\n        await serve(argv);\n      }\n    })\n    .on('add', (path) => buildSnap(path, `File added: ${path}`))\n    .on('change', (path) => buildSnap(path, `File changed: ${path}`))\n    .on('unlink', (path) => console.log(`File removed: ${path}`))\n    .on('error', (error: Error) => {\n      logError(`Watcher error: ${error.message}`, error);\n    })\n\n    .add(rootDir);\n\n  console.log(`Watching '${rootDir}' for changes...`);\n}\n"]}
+{"version":3,"file":"watchHandler.js","sourceRoot":"","sources":["../../../src/cmds/watch/watchHandler.ts"],"names":[],"mappings":"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","sourcesContent":["import chokidar from 'chokidar';\nimport {\n  getOutfilePath,\n  validateDirPath,\n  validateFilePath,\n  validateOutfileName,\n} from '@metamask/snaps-utils';\nimport { YargsArgs } from '../../types/yargs';\nimport { loadConfig, logError } from '../../utils';\nimport { bundle } from '../build/bundle';\nimport { evalHandler } from '../eval/evalHandler';\nimport { manifestHandler } from '../manifest/manifestHandler';\nimport { serve } from '../serve/serveHandler';\n\n/**\n * Watch a directory and its subdirectories for changes, and build when files\n * are added or changed.\n *\n * Ignores 'node_modules' and dotfiles.\n * Creates destination directory if it doesn't exist.\n *\n * @param argv - Arguments as an object generated by Yargs.\n * @param argv.src - The source file path.\n * @param argv.dist - The output directory path.\n * @param argv.'outfileName' - The output file name.\n */\nexport async function watch(argv: YargsArgs): Promise<void> {\n  const {\n    dist,\n    eval: shouldEval,\n    manifest,\n    outfileName,\n    src,\n    serve: shouldServe,\n  } = argv;\n  if (outfileName) {\n    validateOutfileName(outfileName as string);\n  }\n  await validateFilePath(src);\n  await validateDirPath(dist, true);\n  const rootDir =\n    src.indexOf('/') === -1 ? '.' : src.substring(0, src.lastIndexOf('/') + 1);\n  const outfilePath = getOutfilePath(dist, outfileName as string);\n\n  const buildSnap = async (path?: string, logMessage?: string) => {\n    if (logMessage !== undefined) {\n      console.log(logMessage);\n    }\n\n    try {\n      await bundle(src, outfilePath, argv, loadConfig().bundlerCustomizer);\n\n      if (manifest) {\n        await manifestHandler(argv);\n      }\n\n      if (shouldEval) {\n        await evalHandler({ ...argv, bundle: outfilePath });\n      }\n    } catch (error) {\n      logError(\n        `Error ${\n          path === undefined\n            ? 'during initial build'\n            : `while processing \"${path}\"`\n        }.`,\n        error,\n      );\n    }\n  };\n\n  chokidar\n    .watch(rootDir, {\n      ignoreInitial: true,\n      ignored: [\n        '**/node_modules/**',\n        `**/${dist}/**`,\n        `**/test/**`,\n        `**/tests/**`,\n        `**/*.test.js`,\n        `**/*.test.ts`,\n        /* istanbul ignore next */\n        (str: string) => str !== '.' && str.startsWith('.'),\n      ],\n    })\n\n    .on('ready', async () => {\n      await buildSnap();\n      if (shouldServe) {\n        await serve(argv);\n      }\n    })\n    .on('add', (path) => buildSnap(path, `File added: ${path}`))\n    .on('change', (path) => buildSnap(path, `File changed: ${path}`))\n    .on('unlink', (path) => console.log(`File removed: ${path}`))\n    .on('error', (error: Error) => {\n      logError(`Watcher error: ${error.message}`, error);\n    })\n\n    .add(rootDir);\n\n  console.log(`Watching '${rootDir}' for changes...`);\n}\n"]}

package/dist/utils/index.d.ts

@@ -1,3 +1,2 @@
 export * from './misc';
-export * from './readline';
 export * from './snap-config';

package/dist/utils/index.js

@@ -15,6 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./misc"), exports);
-__exportStar(require("./readline"), exports);
 __exportStar(require("./snap-config"), exports);
 //# sourceMappingURL=index.js.map

package/dist/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,6CAA2B;AAC3B,gDAA8B","sourcesContent":["export * from './misc';\nexport * from './readline';\nexport * from './snap-config';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,gDAA8B","sourcesContent":["export * from './misc';\nexport * from './snap-config';\n"]}

package/dist/utils/misc.d.ts

@@ -32,7 +32,7 @@ export declare function sanitizeInputs(argv: Arguments): void;
  * @param msg - The error message.
  * @param err - The original error.
  */
-export declare function logError(msg: string, err?: Error): void;
+export declare function logError(msg: string | null, err?: Error): void;
 /**
  * Logs a warning message to console.
  *

package/dist/utils/misc.js

@@ -99,10 +99,15 @@ exports.sanitizeInputs = sanitizeInputs;
  * @param err - The original error.
  */
 function logError(msg, err) {
-    console.error(msg);
+    if (msg !== null) {
+        console.error(msg);
+    }
     if (err && global.snaps.verboseErrors) {
         console.error(err);
     }
+    if (msg === null && (!err || (err && !global.snaps.verboseErrors))) {
+        console.error('Unknown error.');
+    }
 }
 exports.logError = logError;
 /**