@napi-rs/cli 3.0.0-alpha.89 → 3.0.0-alpha.90

package/dist/api/new.js

@@ -1,10 +1,225 @@
-import { execSync } from 'node:child_process';
+import { exec, execSync } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import { homedir } from 'node:os';
 import path from 'node:path';
+import { promises as fs } from 'node:fs';
+import { load as yamlLoad, dump as yamlDump } from 'js-yaml';
 import { applyDefaultNewOptions, } from '../def/new.js';
-import { AVAILABLE_TARGETS, CLI_VERSION, debugFactory, DEFAULT_TARGETS, mkdirAsync, readdirAsync, statAsync, writeFileAsync, } from '../utils/index.js';
+import { AVAILABLE_TARGETS, debugFactory, DEFAULT_TARGETS, mkdirAsync, readdirAsync, statAsync, } from '../utils/index.js';
 import { napiEngineRequirement } from '../utils/version.js';
-import { createBuildRs, createCargoToml, createGithubActionsCIYml, createLibRs, createPackageJson, gitIgnore, npmIgnore, } from './templates/index.js';
+import { renameProject } from './rename.js';
+// Template imports removed as we're now using external templates
 const debug = debugFactory('new');
+const TEMPLATE_REPOS = {
+    yarn: 'https://github.com/napi-rs/package-template',
+    pnpm: 'https://github.com/napi-rs/package-template-pnpm',
+};
+async function checkGitCommand() {
+    try {
+        await new Promise((resolve) => {
+            const cp = exec('git --version');
+            cp.on('error', () => {
+                resolve(false);
+            });
+            cp.on('exit', (code) => {
+                if (code === 0) {
+                    resolve(true);
+                }
+                else {
+                    resolve(false);
+                }
+            });
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+async function ensureCacheDir(packageManager) {
+    const cacheDir = path.join(homedir(), '.napi-rs', 'template', packageManager);
+    await mkdirAsync(cacheDir, { recursive: true });
+    return cacheDir;
+}
+async function downloadTemplate(packageManager, cacheDir) {
+    const repoUrl = TEMPLATE_REPOS[packageManager];
+    const templatePath = path.join(cacheDir, 'repo');
+    if (existsSync(templatePath)) {
+        debug(`Template cache found at ${templatePath}, updating...`);
+        try {
+            // Fetch latest changes and reset to remote
+            await new Promise((resolve, reject) => {
+                const cp = exec('git fetch origin', { cwd: templatePath });
+                cp.on('error', reject);
+                cp.on('exit', (code) => {
+                    if (code === 0) {
+                        resolve();
+                    }
+                    else {
+                        reject(new Error(`Failed to fetch latest changes, git process exited with code ${code}`));
+                    }
+                });
+            });
+            execSync('git reset --hard origin/main', {
+                cwd: templatePath,
+                stdio: 'ignore',
+            });
+            debug('Template updated successfully');
+        }
+        catch (error) {
+            debug(`Failed to update template: ${error}`);
+            throw new Error(`Failed to update template from ${repoUrl}: ${error}`);
+        }
+    }
+    else {
+        debug(`Cloning template from ${repoUrl}...`);
+        try {
+            execSync(`git clone ${repoUrl} repo`, { cwd: cacheDir, stdio: 'inherit' });
+            debug('Template cloned successfully');
+        }
+        catch (error) {
+            throw new Error(`Failed to clone template from ${repoUrl}: ${error}`);
+        }
+    }
+}
+async function copyDirectory(src, dest, includeWasiBindings) {
+    await mkdirAsync(dest, { recursive: true });
+    const entries = await fs.readdir(src, { withFileTypes: true });
+    for (const entry of entries) {
+        const srcPath = path.join(src, entry.name);
+        const destPath = path.join(dest, entry.name);
+        // Skip .git directory
+        if (entry.name === '.git') {
+            continue;
+        }
+        if (entry.isDirectory()) {
+            await copyDirectory(srcPath, destPath, includeWasiBindings);
+        }
+        else {
+            if (!includeWasiBindings &&
+                (entry.name.endsWith('.wasi-browser.js') ||
+                    entry.name.endsWith('.wasi.cjs') ||
+                    entry.name.endsWith('wasi-worker.browser.mjs ') ||
+                    entry.name.endsWith('wasi-worker.mjs') ||
+                    entry.name.endsWith('browser.js'))) {
+                continue;
+            }
+            await fs.copyFile(srcPath, destPath);
+        }
+    }
+}
+async function filterTargetsInPackageJson(filePath, enabledTargets) {
+    const content = await fs.readFile(filePath, 'utf-8');
+    const packageJson = JSON.parse(content);
+    // Filter napi.targets
+    if (packageJson.napi?.targets) {
+        packageJson.napi.targets = packageJson.napi.targets.filter((target) => enabledTargets.includes(target));
+    }
+    await fs.writeFile(filePath, JSON.stringify(packageJson, null, 2) + '\n');
+}
+async function filterTargetsInGithubActions(filePath, enabledTargets) {
+    const content = await fs.readFile(filePath, 'utf-8');
+    const yaml = yamlLoad(content);
+    const macOSAndWindowsTargets = new Set([
+        'x86_64-pc-windows-msvc',
+        'aarch64-pc-windows-msvc',
+        'x86_64-apple-darwin',
+    ]);
+    const linuxTargets = new Set([
+        'x86_64-unknown-linux-gnu',
+        'x86_64-unknown-linux-musl',
+        'aarch64-unknown-linux-gnu',
+        'aarch64-unknown-linux-musl',
+        'armv7-unknown-linux-gnueabihf',
+        'armv7-unknown-linux-musleabihf',
+        'riscv64gc-unknown-linux-gnu',
+        'powerpc64le-unknown-linux-gnu',
+        's390x-unknown-linux-gnu',
+        'aarch64-linux-android',
+        'armv7-linux-androideabi',
+    ]);
+    // Check if any Linux targets are enabled
+    const hasLinuxTargets = enabledTargets.some((target) => linuxTargets.has(target));
+    // Filter the matrix configurations in the build job
+    if (yaml?.jobs?.build?.strategy?.matrix?.settings) {
+        yaml.jobs.build.strategy.matrix.settings =
+            yaml.jobs.build.strategy.matrix.settings.filter((setting) => {
+                if (setting.target) {
+                    return enabledTargets.includes(setting.target);
+                }
+                return true;
+            });
+    }
+    const jobsToRemove = [];
+    if (enabledTargets.every((target) => !macOSAndWindowsTargets.has(target))) {
+        jobsToRemove.push('test-macOS-windows-binding');
+    }
+    else {
+        // Filter the matrix configurations in the test-macOS-windows-binding job
+        if (yaml?.jobs?.['test-macOS-windows-binding']?.strategy?.matrix?.settings) {
+            yaml.jobs['test-macOS-windows-binding'].strategy.matrix.settings =
+                yaml.jobs['test-macOS-windows-binding'].strategy.matrix.settings.filter((setting) => {
+                    if (setting.target) {
+                        return enabledTargets.includes(setting.target);
+                    }
+                    return true;
+                });
+        }
+    }
+    // If no Linux targets are enabled, remove Linux-specific jobs
+    if (!hasLinuxTargets) {
+        // Remove test-linux-binding job
+        if (yaml?.jobs?.['test-linux-binding']) {
+            jobsToRemove.push('test-linux-binding');
+        }
+    }
+    else {
+        // Filter the matrix configurations in the test-linux-x64-gnu-binding job
+        if (yaml?.jobs?.['test-linux-binding']?.strategy?.matrix?.target) {
+            yaml.jobs['test-linux-binding'].strategy.matrix.target = yaml.jobs['test-linux-binding'].strategy.matrix.target.filter((target) => {
+                if (target) {
+                    return enabledTargets.includes(target);
+                }
+                return true;
+            });
+        }
+    }
+    if (!enabledTargets.includes('wasm32-wasip1-threads')) {
+        jobsToRemove.push('test-wasi');
+    }
+    if (!enabledTargets.includes('x86_64-unknown-freebsd')) {
+        jobsToRemove.push('build-freebsd');
+    }
+    // Filter other test jobs based on target
+    for (const [jobName, jobConfig] of Object.entries(yaml.jobs || {})) {
+        if (jobName.startsWith('test-') &&
+            jobName !== 'test-macOS-windows-binding' &&
+            jobName !== 'test-linux-x64-gnu-binding') {
+            // Extract target from job name or config
+            const job = jobConfig;
+            if (job.strategy?.matrix?.settings?.[0]?.target) {
+                const target = job.strategy.matrix.settings[0].target;
+                if (!enabledTargets.includes(target)) {
+                    jobsToRemove.push(jobName);
+                }
+            }
+        }
+    }
+    // Remove jobs for disabled targets
+    for (const jobName of jobsToRemove) {
+        delete yaml.jobs[jobName];
+    }
+    if (Array.isArray(yaml.jobs?.publish?.needs)) {
+        yaml.jobs.publish.needs = yaml.jobs.publish.needs.filter((need) => !jobsToRemove.includes(need));
+    }
+    // Write back the filtered YAML
+    const updatedYaml = yamlDump(yaml, {
+        lineWidth: -1,
+        noRefs: true,
+        sortKeys: false,
+    });
+    await fs.writeFile(filePath, updatedYaml);
+}
 function processOptions(options) {
     debug('Processing options...');
     if (!options.path) {
@@ -34,7 +249,7 @@ function processOptions(options) {
             encoding: 'utf8',
         });
         if (out.includes('wasm32-wasip1-threads')) {
-            options.targets.map((target) => target === 'wasm32-wasi-preview1-threads'
+            options.targets = options.targets.map((target) => target === 'wasm32-wasi-preview1-threads'
                 ? 'wasm32-wasip1-threads'
                 : target);
         }
@@ -47,9 +262,68 @@ export async function newProject(userOptions) {
     const options = processOptions(userOptions);
     debug('Targets to be enabled:');
     debug(options.targets);
-    const outputs = await generateFiles(options);
+    // Check if git is available
+    if (!(await checkGitCommand())) {
+        throw new Error('Git is not installed or not available in PATH. Please install Git to continue.');
+    }
+    const packageManager = options.packageManager;
+    // Ensure target directory exists and is empty
     await ensurePath(options.path, options.dryRun);
-    await dumpOutputs(outputs, options.dryRun);
+    if (!options.dryRun) {
+        try {
+            // Download or update template
+            const cacheDir = await ensureCacheDir(packageManager);
+            await downloadTemplate(packageManager, cacheDir);
+            // Copy template files to target directory
+            const templatePath = path.join(cacheDir, 'repo');
+            await copyDirectory(templatePath, options.path, options.targets.includes('wasm32-wasip1-threads'));
+            // Rename project using the rename API
+            await renameProject({
+                cwd: options.path,
+                name: options.name,
+                binaryName: getBinaryName(options.name),
+            });
+            // Filter targets in package.json
+            const packageJsonPath = path.join(options.path, 'package.json');
+            if (existsSync(packageJsonPath)) {
+                await filterTargetsInPackageJson(packageJsonPath, options.targets);
+            }
+            // Filter targets in GitHub Actions CI
+            const ciPath = path.join(options.path, '.github', 'workflows', 'CI.yml');
+            if (existsSync(ciPath) && options.enableGithubActions) {
+                await filterTargetsInGithubActions(ciPath, options.targets);
+            }
+            else if (!options.enableGithubActions &&
+                existsSync(path.join(options.path, '.github'))) {
+                // Remove .github directory if GitHub Actions is not enabled
+                await fs.rm(path.join(options.path, '.github'), {
+                    recursive: true,
+                    force: true,
+                });
+            }
+            // Update package.json with additional configurations
+            const pkgJsonContent = await fs.readFile(packageJsonPath, 'utf-8');
+            const pkgJson = JSON.parse(pkgJsonContent);
+            // Update engine requirement
+            if (!pkgJson.engines) {
+                pkgJson.engines = {};
+            }
+            pkgJson.engines.node = napiEngineRequirement(options.minNodeApiVersion);
+            // Update license if different from template
+            if (options.license && pkgJson.license !== options.license) {
+                pkgJson.license = options.license;
+            }
+            // Update test framework if needed
+            if (options.testFramework !== 'ava') {
+                // This would require more complex logic to update test scripts and dependencies
+                debug(`Test framework ${options.testFramework} requested but not yet implemented`);
+            }
+            await fs.writeFile(packageJsonPath, JSON.stringify(pkgJson, null, 2) + '\n');
+        }
+        catch (error) {
+            throw new Error(`Failed to create project: ${error}`);
+        }
+    }
     debug(`Project created at: ${options.path}`);
 }
 async function ensurePath(path, dryRun = false) {
@@ -80,112 +354,6 @@ async function ensurePath(path, dryRun = false) {
         }
     }
 }
-async function generateFiles(options) {
-    const packageJson = await generatePackageJson(options);
-    return [
-        generateCargoToml,
-        generateLibRs,
-        generateBuildRs,
-        generateGithubWorkflow,
-        generateIgnoreFiles,
-    ]
-        .flatMap((generator) => {
-        const output = generator(options);
-        if (!output) {
-            return [];
-        }
-        if (Array.isArray(output)) {
-            return output.map((o) => ({
-                ...o,
-                target: path.join(options.path, o.target),
-            }));
-        }
-        else {
-            return [{ ...output, target: path.join(options.path, output.target) }];
-        }
-    })
-        .concat([
-        { ...packageJson, target: path.join(options.path, packageJson.target) },
-    ]);
-}
-function generateCargoToml(options) {
-    return {
-        target: './Cargo.toml',
-        content: createCargoToml({
-            name: options.name,
-            license: options.license,
-            features: [`napi${options.minNodeApiVersion}`],
-            deriveFeatures: options.enableTypeDef ? ['type-def'] : [],
-        }),
-    };
-}
-function generateLibRs(_options) {
-    return {
-        target: './src/lib.rs',
-        content: createLibRs(),
-    };
-}
-function generateBuildRs(_options) {
-    return {
-        target: './build.rs',
-        content: createBuildRs(),
-    };
-}
-async function generatePackageJson(options) {
-    return {
-        target: './package.json',
-        content: await createPackageJson({
-            name: options.name,
-            binaryName: getBinaryName(options.name),
-            targets: options.targets,
-            license: options.license,
-            engineRequirement: napiEngineRequirement(options.minNodeApiVersion),
-            cliVersion: CLI_VERSION,
-            testFramework: options.testFramework,
-        }),
-    };
-}
-function generateGithubWorkflow(options) {
-    if (!options.enableGithubActions) {
-        return null;
-    }
-    return {
-        target: './.github/workflows/ci.yml',
-        content: createGithubActionsCIYml(options.targets, options.packageManager, options.targets.find((t) => t.includes('wasm32-wasi')) ?? 'wasm32-wasi-preview1-threads'),
-    };
-}
-function generateIgnoreFiles(_options) {
-    return [
-        {
-            target: './.gitignore',
-            content: gitIgnore,
-        },
-        {
-            target: './.npmignore',
-            content: npmIgnore,
-        },
-    ];
-}
-async function dumpOutputs(outputs, dryRun) {
-    for (const output of outputs) {
-        if (!output) {
-            continue;
-        }
-        debug(`Writing project file: ${output.target}`);
-        // only output content to logger instead of writing to file system
-        if (dryRun) {
-            debug(output.content);
-            continue;
-        }
-        try {
-            await mkdirAsync(path.dirname(output.target), { recursive: true });
-            await writeFileAsync(output.target, output.content, 'utf-8');
-        }
-        catch (e) {
-            throw new Error(`Failed to write file: ${output.target}`, { cause: e });
-        }
-    }
-}
 function getBinaryName(name) {
     return name.split('/').pop();
 }

package/dist/api/new.js.map

@@ -1 +1 @@
-{"version":3,"file":"new.js","sourceRoot":"","sources":["../../src/api/new.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"new.js","sourceRoot":"","sources":["../../src/api/new.ts"],"names":[],"mappings":"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"}

package/dist/api/rename.js

@@ -1,10 +1,16 @@
-import { resolve } from 'node:path';
+import { existsSync } from 'node:fs';
+import { rename } from 'node:fs/promises';
+import { resolve, join } from 'node:path';
+import { parse as parseToml, stringify as stringifyToml } from '@std/toml';
+import { load as yamlParse, dump as yamlStringify } from 'js-yaml';
 import { isNil, merge, omitBy, pick } from 'lodash-es';
+import { findUp } from 'find-up';
 import { applyDefaultRenameOptions } from '../def/rename.js';
-import { readFileAsync, writeFileAsync } from '../utils/index.js';
-import { createNpmDirs } from './create-npm-dirs.js';
+import { readConfig, readFileAsync, writeFileAsync } from '../utils/index.js';
 export async function renameProject(userOptions) {
     const options = applyDefaultRenameOptions(userOptions);
+    const napiConfig = await readConfig(options);
+    const oldName = napiConfig.binaryName;
     const packageJsonPath = resolve(options.cwd, options.packageJsonPath);
     const cargoTomlPath = resolve(options.cwd, options.manifestPath);
     const packageJsonContent = await readFileAsync(packageJsonPath, 'utf8');
@@ -24,14 +30,62 @@ export async function renameProject(userOptions) {
         await writeFileAsync(configPath, JSON.stringify(configData, null, 2));
     }
     await writeFileAsync(packageJsonPath, JSON.stringify(packageJsonData, null, 2));
-    let tomlContent = await readFileAsync(cargoTomlPath, 'utf8');
-    tomlContent = tomlContent.replace(/name\s?=\s?"([\w+])"/, `name = "${options.binaryName}"`);
-    await writeFileAsync(cargoTomlPath, tomlContent);
-    await createNpmDirs({
-        cwd: options.cwd,
-        packageJsonPath: options.packageJsonPath,
-        npmDir: options.npmDir,
-        dryRun: false,
-    });
+    const tomlContent = await readFileAsync(cargoTomlPath, 'utf8');
+    const cargoToml = parseToml(tomlContent);
+    // Update the package name
+    if (cargoToml.package && options.binaryName) {
+        // Sanitize the binary name for Rust package naming conventions
+        const sanitizedName = options.binaryName
+            .replace('@', '')
+            .replace('/', '_')
+            .replace(/-/g, '_')
+            .toLowerCase();
+        cargoToml.package.name = sanitizedName;
+    }
+    // Stringify the updated TOML
+    const updatedTomlContent = stringifyToml(cargoToml);
+    await writeFileAsync(cargoTomlPath, updatedTomlContent);
+    if (oldName !== options.binaryName) {
+        const githubActionsPath = await findUp('.github', {
+            cwd: options.cwd,
+            type: 'directory',
+        });
+        if (githubActionsPath) {
+            const githubActionsCIYmlPath = join(githubActionsPath, 'workflows', 'CI.yml');
+            if (existsSync(githubActionsCIYmlPath)) {
+                const githubActionsContent = await readFileAsync(githubActionsCIYmlPath, 'utf8');
+                const githubActionsData = yamlParse(githubActionsContent);
+                if (githubActionsData.env?.APP_NAME) {
+                    githubActionsData.env.APP_NAME = options.binaryName;
+                    await writeFileAsync(githubActionsCIYmlPath, yamlStringify(githubActionsData, {
+                        lineWidth: -1,
+                        noRefs: true,
+                        sortKeys: false,
+                    }));
+                }
+            }
+        }
+        const oldWasiBrowserBindingPath = join(options.cwd, `${oldName}.wasi-browser.js`);
+        if (existsSync(oldWasiBrowserBindingPath)) {
+            await rename(oldWasiBrowserBindingPath, join(options.cwd, `${options.binaryName}.wasi-browser.js`));
+        }
+        const oldWasiBindingPath = join(options.cwd, `${oldName}.wasi.cjs`);
+        if (existsSync(oldWasiBindingPath)) {
+            await rename(oldWasiBindingPath, join(options.cwd, `${options.binaryName}.wasi.cjs`));
+        }
+        const gitAttributesPath = join(options.cwd, '.gitattributes');
+        if (existsSync(gitAttributesPath)) {
+            const gitAttributesContent = await readFileAsync(gitAttributesPath, 'utf8');
+            const gitAttributesData = gitAttributesContent
+                .split('\n')
+                .map((line) => {
+                return line
+                    .replace(`${oldName}.wasi-browser.js`, `${options.binaryName}.wasi-browser.js`)
+                    .replace(`${oldName}.wasi.cjs`, `${options.binaryName}.wasi.cjs`);
+            })
+                .join('\n');
+            await writeFileAsync(gitAttributesPath, gitAttributesData);
+        }
+    }
 }
 //# sourceMappingURL=rename.js.map

package/dist/api/rename.js.map

@@ -1 +1 @@
-{"version":3,"file":"rename.js","sourceRoot":"","sources":["../../src/api/rename.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEtD,OAAO,EAAE,yBAAyB,EAAiB,MAAM,kBAAkB,CAAA;AAC3E,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAEjE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAEpD,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,WAA0B;IAC5D,MAAM,OAAO,GAAG,yBAAyB,CAAC,WAAW,CAAC,CAAA;IAEtD,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IACrE,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;IAEhE,MAAM,kBAAkB,GAAG,MAAM,aAAa,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;IACvE,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;IAEtD,KAAK,CACH,eAAe,EACf,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,EAC1E;QACE,IAAI,EAAE,MAAM,CACV;YACE,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,EACD,KAAK,CACN;KACF,CACF,CAAA;IAED,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;QAC3D,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;QAC7D,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QAC5C,UAAU,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAA;QAC1C,UAAU,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAA;QAC5C,MAAM,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IACvE,CAAC;IAED,MAAM,cAAc,CAClB,eAAe,EACf,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,CACzC,CAAA;IAED,IAAI,WAAW,GAAG,MAAM,aAAa,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;IAC5D,WAAW,GAAG,WAAW,CAAC,OAAO,CAC/B,sBAAsB,EACtB,WAAW,OAAO,CAAC,UAAU,GAAG,CACjC,CAAA;IACD,MAAM,cAAc,CAAC,aAAa,EAAE,WAAW,CAAC,CAAA;IAEhD,MAAM,aAAa,CAAC;QAClB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,eAAe,EAAE,OAAO,CAAC,eAAe;QACxC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,KAAK;KACd,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"rename.js","sourceRoot":"","sources":["../../src/api/rename.ts"],"names":[],"mappings":"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"}