@liangmi/mo 1.0.0 → 1.0.2

package/README.md

@@ -47,8 +47,21 @@ mo setup
 
 `mo cd`, `mo edit`, and `mo open` open an interactive selector when called without arguments.
 
+> [!TIP]
+> If you are using `mo` with VS Code based editors, you can add this line to your editor config to prevent `mo edit` popping up a new separated window.
+>
+> ```json
+> "window.openFoldersInNewWindow": "off"
+> ```
+>
+> Setting `code -r` as your editor in `mo setup` have the same effect as well.
+
 ## Config
 
+The config file should be generated by running `mo setup`. Modifying `~/.config/morc.json` manually is not recommended.
+
+Please follow the [config_schema.json](./config_schema.json) if you are developing `mo`.
+
 `~/.config/morc.json`:
 
 ```json

package/dist/mo.mjs

@@ -1,7 +1,7 @@
 import { n as __require, r as __toESM, t as __commonJSMin } from "./chunk-CBBoxR_p.mjs";
 import { C as untildify, S as parseAliasInput, _ as require_picocolors, a as ensureToolReady, b as defaultAliases, c as getDefaultConfigPath, d as error, f as icons, g as toTildePath, h as success, i as preventRunning, l as loadConfig, m as stopSpinner, n as getRestartFlagPath, o as runCommand, p as startSpinner, r as innerBinName, s as R, t as checkRestartRequired, u as supportedShells, v as aliasCommands, w as cac, x as getAliasPromptLabel } from "./runner-DW0Q4OMK.mjs";
 import * as fs$1 from "node:fs";
-import fs, { existsSync, mkdirSync, readdirSync, statSync, writeFileSync } from "node:fs";
+import fs, { existsSync, mkdirSync, readdirSync, rmSync, rmdirSync, statSync, writeFileSync } from "node:fs";
 import os, { tmpdir } from "node:os";
 import path from "node:path";
 import { execFileSync, spawnSync } from "node:child_process";
@@ -13,7 +13,7 @@ import { Buffer as Buffer$1 } from "node:buffer";
 import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import prompts from "prompts";
 //#region package.json
-var version = "1.0.0";
+var version = "1.0.2";
 //#endregion
 //#region src/commands/clone.ts
 var import_picocolors = /* @__PURE__ */ __toESM(require_picocolors(), 1);
@@ -21,8 +21,9 @@ async function runCloneCommand(repo, config) {
 	const parsedRepo = parseRepo(repo);
 	const ownerDir = path.join(config.root, parsedRepo.owner);
 	const targetDir = path.join(ownerDir, parsedRepo.name);
+	const ownerExisted = existsSync(ownerDir);
 	if (existsSync(targetDir)) error(`Repository already exists at ${import_picocolors.default.cyan(toTildePath(targetDir))}`);
-	mkdirSync(ownerDir, { recursive: true });
+	if (!ownerExisted) mkdirSync(ownerDir, { recursive: true });
 	const cloneUrl = `https://github.com/${parsedRepo.owner}/${parsedRepo.name}.git`;
 	const spinner = startSpinner(`Cloning ${import_picocolors.default.bold(`${parsedRepo.owner}/${parsedRepo.name}`)}...`);
 	try {
@@ -32,10 +33,20 @@ async function runCloneCommand(repo, config) {
 		console.log(`  ${import_picocolors.default.dim("→")} ${import_picocolors.default.cyan(toTildePath(targetDir))}`);
 	} catch (err) {
 		stopSpinner(spinner);
+		cleanupFailedClone(targetDir, ownerDir, ownerExisted);
 		const details = err instanceof Error ? `: ${err.message}` : "";
 		error(`Git clone failed for ${parsedRepo.owner}/${parsedRepo.name}${details}`);
 	}
 }
+function cleanupFailedClone(targetDir, ownerDir, ownerExisted) {
+	try {
+		if (existsSync(targetDir)) rmSync(targetDir, {
+			recursive: true,
+			force: true
+		});
+		if (!ownerExisted && existsSync(ownerDir) && readdirSync(ownerDir).length === 0) rmdirSync(ownerDir);
+	} catch {}
+}
 async function runGitClone(url, targetDir) {
 	const result = await R("git", [
 		"clone",
@@ -25187,6 +25198,53 @@ const useInput = (inputHandler, options = {}) => {
 	]);
 };
 //#endregion
+//#region src/utils/search.ts
+function getMatchScore(text, query) {
+	const normalizedText = text.toLowerCase();
+	const normalizedQuery = query.trim().toLowerCase();
+	if (!normalizedQuery) return null;
+	if (!normalizedText.includes(normalizedQuery)) return null;
+	if (normalizedText === normalizedQuery) return 0;
+	if (normalizedText.startsWith(normalizedQuery)) return 1;
+	return 2;
+}
+function searchReposByName(query, groups) {
+	const matches = [];
+	for (const group of groups) for (const repo of group.repos) {
+		const score = getMatchScore(repo.name, query);
+		if (score === null) continue;
+		matches.push({
+			repo,
+			score
+		});
+	}
+	matches.sort((a, b) => {
+		if (a.score !== b.score) return a.score - b.score;
+		if (a.repo.name.length !== b.repo.name.length) return a.repo.name.length - b.repo.name.length;
+		const byName = a.repo.name.localeCompare(b.repo.name);
+		if (byName !== 0) return byName;
+		return a.repo.owner.localeCompare(b.repo.owner);
+	});
+	return matches;
+}
+function searchOwnerGroupsByName(query, groups) {
+	const matches = [];
+	for (const group of groups) {
+		const score = getMatchScore(group.owner, query);
+		if (score === null) continue;
+		matches.push({
+			group,
+			score
+		});
+	}
+	matches.sort((a, b) => {
+		if (a.score !== b.score) return a.score - b.score;
+		if (a.group.owner.length !== b.group.owner.length) return a.group.owner.length - b.group.owner.length;
+		return a.group.owner.localeCompare(b.group.owner);
+	});
+	return matches.map((match) => match.group);
+}
+//#endregion
 //#region node_modules/.pnpm/react@19.2.4/node_modules/react/cjs/react-jsx-runtime.production.js
 /**
 * @license React
@@ -25464,28 +25522,17 @@ function buildListItems(root, groups) {
 function searchItems(query, groups, root) {
 	const q = query.toLowerCase();
 	const items = [];
-	const matchedOwners = /* @__PURE__ */ new Set();
-	const projectMatches = [];
-	for (const group of groups) for (const repo of group.repos) {
-		const name = repo.name.toLowerCase();
-		if (!name.includes(q)) continue;
-		const score = name === q ? 0 : name.startsWith(q) ? 1 : 2;
-		projectMatches.push({
-			score,
-			item: {
-				type: "project",
-				label: repo.name,
-				owner: repo.owner,
-				path: repo.path,
-				selectable: true
-			}
-		});
-		matchedOwners.add(repo.owner);
-	}
-	projectMatches.sort((a, b) => a.score - b.score || a.item.label.length - b.item.label.length);
-	const sortedProjects = projectMatches.map((m) => m.item);
+	const projectMatches = searchReposByName(query, groups);
+	const sortedProjects = projectMatches.map((match) => ({
+		type: "project",
+		label: match.repo.name,
+		owner: match.repo.owner,
+		path: match.repo.path,
+		selectable: true
+	}));
+	const matchedOwners = new Set(projectMatches.map((match) => match.repo.owner));
 	if ("<root>".includes(q)) {
-		const rootScore = "<root>" === q ? 0 : "<root>".startsWith(q) ? 1 : 2;
+		const rootScore = getMatchScore("<root>", query) ?? 3;
 		const rootItem = {
 			type: "project",
 			label: "<root>",
@@ -25824,9 +25871,10 @@ function resolveTarget(root, target, groups) {
 		const candidate = path.join(root, ...segments);
 		if (existsSync(candidate) && statSync(candidate).isDirectory()) return candidate;
 	}
-	const q = target.toLowerCase();
-	for (const group of groups) for (const repo of group.repos) if (repo.name.toLowerCase().includes(q)) return repo.path;
-	for (const group of groups) if (group.owner.toLowerCase().includes(q)) return group.path;
+	const repoMatches = searchReposByName(target, groups);
+	if (repoMatches.length) return repoMatches[0].repo.path;
+	const ownerMatches = searchOwnerGroupsByName(target, groups);
+	if (ownerMatches.length) return ownerMatches[0].path;
 	return null;
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liangmi/mo",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Manage your open source projects",
   "homepage": "https://github.com/liangmiQwQ/mo#readme",
   "bugs": {