jsrepo 1.4.0 → 1.4.1

package/dist/index.js

@@ -1,17 +1,17 @@
 // src/index.ts
 import fs12 from "node:fs";
-import path12 from "node:path";
 import { fileURLToPath } from "node:url";
 import { program as program6 } from "commander";
+import path12 from "pathe";
 
 // src/commands/add.ts
 import fs6 from "node:fs";
-import path6 from "node:path";
 import { cancel, confirm, isCancel, multiselect, outro, spinner as spinner2 } from "@clack/prompts";
 import color7 from "chalk";
 import { Command, program as program2 } from "commander";
 import { resolveCommand as resolveCommand2 } from "package-manager-detector/commands";
 import { detect } from "package-manager-detector/detect";
+import path6 from "pathe";
 import * as v5 from "valibot";
 
 // src/utils/ascii.ts
@@ -28,8 +28,8 @@ var INFO = color.bgBlueBright.white("INFO");
 
 // src/utils/blocks.ts
 import fs4 from "node:fs";
-import path4 from "node:path";
 import color4 from "chalk";
+import path4 from "pathe";
 
 // src/utils/blocks/types/result.ts
 var Result = class {
@@ -684,25 +684,25 @@ import * as v3 from "valibot";
 
 // src/utils/build.ts
 import fs3 from "node:fs";
-import path3 from "node:path";
 import color3 from "chalk";
 import { program } from "commander";
+import path3 from "pathe";
 import * as v2 from "valibot";
 
 // src/utils/language-support.ts
 import fs2 from "node:fs";
 import { builtinModules } from "node:module";
-import path2 from "node:path";
 import * as v from "@vue/compiler-sfc";
 import color2 from "chalk";
 import { walk } from "estree-walker";
+import path2 from "pathe";
 import * as sv from "svelte/compiler";
 import { Project } from "ts-morph";
 import validatePackageName from "validate-npm-package-name";
 
 // src/utils/package.ts
 import fs from "node:fs";
-import path from "node:path";
+import path from "pathe";
 var findNearestPackageJson = (startDir, until) => {
   const packagePath = path.join(startDir, "package.json");
   if (fs.existsSync(packagePath)) return packagePath;
@@ -1200,7 +1200,7 @@ var getInstalled = (blocks, config, cwd) => {
 
 // src/utils/config.ts
 import fs5 from "node:fs";
-import path5 from "node:path";
+import path5 from "pathe";
 import * as v4 from "valibot";
 var CONFIG_NAME = "jsrepo.json";
 var schema = v4.object({
@@ -1622,10 +1622,10 @@ ${content}`;
 
 // src/commands/build.ts
 import fs7 from "node:fs";
-import path7 from "node:path";
 import { outro as outro2, spinner as spinner3 } from "@clack/prompts";
 import color8 from "chalk";
 import { Command as Command2 } from "commander";
+import path7 from "pathe";
 import * as v6 from "valibot";
 var schema3 = v6.object({
   dirs: v6.array(v6.string()),
@@ -1672,11 +1672,11 @@ var _build = async (options) => {
 
 // src/commands/diff.ts
 import fs8 from "node:fs";
-import path8 from "node:path";
 import { cancel as cancel2, confirm as confirm2, isCancel as isCancel2, outro as outro3, spinner as spinner4 } from "@clack/prompts";
 import color10 from "chalk";
 import { Command as Command3, program as program3 } from "commander";
 import { diffLines } from "diff";
+import path8 from "pathe";
 import * as v7 from "valibot";
 
 // src/utils/diff.ts
@@ -1966,11 +1966,10 @@ ${remoteContent}`;
         const from = path8.join(
           `${providerInfo.name}/${providerInfo.owner}/${providerInfo.repoName}`,
           sourcePath
-        ).replaceAll("\\", "/");
-        const to = prettyLocalPath.replaceAll("\\", "/");
+        );
         const formattedDiff = formatDiff({
           from,
-          to,
+          to: prettyLocalPath,
           changes,
           expand: options.expand,
           maxUnchanged: options.maxUnchanged,
@@ -1979,11 +1978,11 @@ ${remoteContent}`;
           colorCharsAdded: color10.bgGreenBright,
           colorCharsRemoved: color10.bgRedBright,
           prefix: () => `${VERTICAL_LINE}  `,
-          onUnchanged: ({ from: from2, to: to2, prefix }) => `${prefix?.() ?? ""}${color10.cyan(from2)} \u2192 ${color10.gray(to2)} ${color10.gray("(unchanged)")}
+          onUnchanged: ({ from: from2, to, prefix }) => `${prefix?.() ?? ""}${color10.cyan(from2)} \u2192 ${color10.gray(to)} ${color10.gray("(unchanged)")}
 `,
-          intro: ({ from: from2, to: to2, changes: changes2, prefix }) => {
+          intro: ({ from: from2, to, changes: changes2, prefix }) => {
             const totalChanges = changes2.filter((a) => a.added).length;
-            return `${prefix?.() ?? ""}${color10.cyan(from2)} \u2192 ${color10.gray(to2)} (${totalChanges} change${totalChanges === 1 ? "" : "s"})
+            return `${prefix?.() ?? ""}${color10.cyan(from2)} \u2192 ${color10.gray(to)} (${totalChanges} change${totalChanges === 1 ? "" : "s"})
 ${prefix?.() ?? ""}
 `;
           }
@@ -2002,10 +2001,10 @@ ${prefix?.() ?? ""}
 
 // src/commands/init.ts
 import fs9 from "node:fs";
-import path9 from "node:path";
 import { cancel as cancel3, confirm as confirm3, isCancel as isCancel3, outro as outro4, spinner as spinner5, text } from "@clack/prompts";
 import color11 from "chalk";
 import { Command as Command4 } from "commander";
+import path9 from "pathe";
 import * as v8 from "valibot";
 var schema5 = v8.object({
   path: v8.optional(v8.string()),
@@ -2088,13 +2087,13 @@ var _init = async (options) => {
 
 // src/commands/test.ts
 import fs10 from "node:fs";
-import path10 from "node:path";
 import { cancel as cancel4, confirm as confirm4, isCancel as isCancel4, outro as outro5, spinner as spinner6 } from "@clack/prompts";
 import color12 from "chalk";
 import { Argument, Command as Command5, program as program4 } from "commander";
 import { execa as execa2 } from "execa";
 import { resolveCommand as resolveCommand3 } from "package-manager-detector/commands";
 import { detect as detect2 } from "package-manager-detector/detect";
+import path10 from "pathe";
 import { Project as Project2 } from "ts-morph";
 import * as v9 from "valibot";
 var schema6 = v9.object({
@@ -2344,13 +2343,13 @@ var _test = async (blockNames, options) => {
 
 // src/commands/update.ts
 import fs11 from "node:fs";
-import path11 from "node:path";
 import { cancel as cancel5, confirm as confirm5, isCancel as isCancel5, multiselect as multiselect2, outro as outro6, spinner as spinner7 } from "@clack/prompts";
 import color13 from "chalk";
 import { Command as Command6, program as program5 } from "commander";
 import { diffLines as diffLines2 } from "diff";
 import { resolveCommand as resolveCommand4 } from "package-manager-detector/commands";
 import { detect as detect3 } from "package-manager-detector/detect";
+import path11 from "pathe";
 import * as v10 from "valibot";
 var schema7 = v10.object({
   all: v10.boolean(),
@@ -2507,8 +2506,8 @@ ${remoteContent}`;
         const from = path11.join(
           `${providerInfo.name}/${providerInfo.owner}/${providerInfo.repoName}`,
           file.fileName
-        ).replaceAll("\\", "/");
-        const to = path11.relative(options.cwd, file.destPath).replaceAll("\\", "/");
+        );
+        const to = path11.relative(options.cwd, file.destPath);
         const formattedDiff = formatDiff({
           from,
           to,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jsrepo",
   "description": "A CLI to add shared code from remote repositories.",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ieedan/jsrepo"
@@ -48,6 +48,7 @@
     "execa": "^9.5.1",
     "octokit": "^4.0.2",
     "package-manager-detector": "^0.2.4",
+    "pathe": "^1.1.2",
     "svelte": "^5.2.3",
     "ts-morph": "^24.0.0",
     "valibot": "^0.42.1",

package/src/commands/add.ts

@@ -1,10 +1,10 @@
 import fs from 'node:fs';
-import path from 'node:path';
 import { cancel, confirm, isCancel, multiselect, outro, spinner } from '@clack/prompts';
 import color from 'chalk';
 import { Command, program } from 'commander';
 import { resolveCommand } from 'package-manager-detector/commands';
 import { detect } from 'package-manager-detector/detect';
+import path from 'pathe';
 import * as v from 'valibot';
 import { context } from '..';
 import * as ascii from '../utils/ascii';

package/src/commands/build.ts

@@ -1,8 +1,8 @@
 import fs from 'node:fs';
-import path from 'node:path';
 import { outro, spinner } from '@clack/prompts';
 import color from 'chalk';
 import { Command } from 'commander';
+import path from 'pathe';
 import * as v from 'valibot';
 import { context } from '..';
 import { type Category, buildBlocksDirectory } from '../utils/build';

package/src/commands/diff.ts

@@ -1,9 +1,9 @@
 import fs from 'node:fs';
-import path from 'node:path';
 import { cancel, confirm, isCancel, outro, spinner } from '@clack/prompts';
 import color from 'chalk';
 import { Command, program } from 'commander';
 import { diffLines } from 'diff';
+import path from 'pathe';
 import * as v from 'valibot';
 import { context } from '..';
 import * as ascii from '../utils/ascii';
@@ -156,18 +156,14 @@ const _diff = async (options: Options) => {
 
 				const changes = diffLines(fileContent, remoteContent);
 
-				const from = path
-					.join(
-						`${providerInfo.name}/${providerInfo.owner}/${providerInfo.repoName}`,
-						sourcePath
-					)
-					.replaceAll('\\', '/');
-
-				const to = prettyLocalPath.replaceAll('\\', '/');
+				const from = path.join(
+					`${providerInfo.name}/${providerInfo.owner}/${providerInfo.repoName}`,
+					sourcePath
+				);
 
 				const formattedDiff = formatDiff({
 					from,
-					to,
+					to: prettyLocalPath,
 					changes,
 					expand: options.expand,
 					maxUnchanged: options.maxUnchanged,

package/src/commands/init.ts

@@ -1,8 +1,8 @@
 import fs from 'node:fs';
-import path from 'node:path';
 import { cancel, confirm, isCancel, outro, spinner, text } from '@clack/prompts';
 import color from 'chalk';
 import { Command } from 'commander';
+import path from 'pathe';
 import * as v from 'valibot';
 import { context } from '..';
 import { CONFIG_NAME, type Config, getConfig } from '../utils/config';

package/src/commands/test.ts

@@ -1,11 +1,11 @@
 import fs from 'node:fs';
-import path from 'node:path';
 import { cancel, confirm, isCancel, outro, spinner } from '@clack/prompts';
 import color from 'chalk';
 import { Argument, Command, program } from 'commander';
 import { execa } from 'execa';
 import { resolveCommand } from 'package-manager-detector/commands';
 import { detect } from 'package-manager-detector/detect';
+import path from 'pathe';
 import { Project } from 'ts-morph';
 import * as v from 'valibot';
 import { context } from '..';

package/src/commands/update.ts

@@ -1,11 +1,11 @@
 import fs from 'node:fs';
-import path from 'node:path';
 import { cancel, confirm, isCancel, multiselect, outro, spinner } from '@clack/prompts';
 import color from 'chalk';
 import { Command, program } from 'commander';
 import { diffLines } from 'diff';
 import { resolveCommand } from 'package-manager-detector/commands';
 import { detect } from 'package-manager-detector/detect';
+import path from 'pathe';
 import * as v from 'valibot';
 import { context } from '..';
 import * as ascii from '../utils/ascii';
@@ -239,14 +239,12 @@ const _update = async (blockNames: string[], options: Options) => {
 
 				const changes = diffLines(localContent, remoteContent);
 
-				const from = path
-					.join(
-						`${providerInfo.name}/${providerInfo.owner}/${providerInfo.repoName}`,
-						file.fileName
-					)
-					.replaceAll('\\', '/');
+				const from = path.join(
+					`${providerInfo.name}/${providerInfo.owner}/${providerInfo.repoName}`,
+					file.fileName
+				);
 
-				const to = path.relative(options.cwd, file.destPath).replaceAll('\\', '/');
+				const to = path.relative(options.cwd, file.destPath);
 
 				const formattedDiff = formatDiff({
 					from,

package/src/index.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
-import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { program } from 'commander';
+import path from 'pathe';
 import * as commands from './commands';
 import type { CLIContext } from './utils/context';
 

package/src/utils/blocks.ts

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
-import path from 'node:path';
 import color from 'chalk';
+import path from 'pathe';
 import { Err, Ok, type Result } from './blocks/types/result';
 import { mapToArray } from './blocks/utils/map-to-array';
 import type { Block } from './build';

package/src/utils/build.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
-import path from 'node:path';
 import color from 'chalk';
 import { program } from 'commander';
+import path from 'pathe';
 import * as v from 'valibot';
 import * as ascii from './ascii';
 import { languages } from './language-support';

package/src/utils/config.ts

@@ -1,5 +1,5 @@
 import fs from 'node:fs';
-import path from 'node:path';
+import path from 'pathe';
 import * as v from 'valibot';
 import { Err, Ok, type Result } from './blocks/types/result';
 

package/src/utils/language-support.ts

@@ -1,9 +1,9 @@
 import fs from 'node:fs';
 import { builtinModules } from 'node:module';
-import path from 'node:path';
 import * as v from '@vue/compiler-sfc';
 import color from 'chalk';
 import { walk } from 'estree-walker';
+import path from 'pathe';
 import * as sv from 'svelte/compiler';
 import { Project } from 'ts-morph';
 import validatePackageName from 'validate-npm-package-name';

package/src/utils/package.ts

@@ -1,5 +1,5 @@
 import fs from 'node:fs';
-import path from 'node:path';
+import path from 'pathe';
 
 const findNearestPackageJson = (startDir: string, until: string): string | undefined => {
 	const packagePath = path.join(startDir, 'package.json');