jsrepo 1.12.0 → 1.12.2

package/dist/index.js

@@ -802,7 +802,7 @@ var parsePackageName = (input) => {
 // src/utils/language-support.ts
 var typescript = {
   matches: (fileName) => fileName.endsWith(".ts") || fileName.endsWith(".js") || fileName.endsWith(".tsx") || fileName.endsWith(".jsx"),
-  resolveDependencies: ({ filePath, isSubDir, excludeDeps, cwd }) => {
+  resolveDependencies: ({ filePath, isSubDir, excludeDeps }) => {
     const project = new Project();
     const blockFile = project.addSourceFileAtPath(filePath);
     const imports = blockFile.getImportDeclarations();
@@ -812,9 +812,9 @@ var typescript = {
     const localDeps = /* @__PURE__ */ new Set();
     for (const relativeImport of relativeImports) {
       const mod = relativeImport.getModuleSpecifierValue();
-      const localDep = resolveLocalImport(mod, isSubDir, { filePath, cwd });
+      const localDep = resolveLocalImport(mod, isSubDir, { filePath });
       if (localDep.isErr()) return Err(localDep.unwrapErr());
-      if (localDep) localDeps.add(localDep.unwrap());
+      if (localDep.unwrap()) localDeps.add(localDep.unwrap());
     }
     const deps = imports.filter((declaration) => !declaration.getModuleSpecifierValue().startsWith(".")).map((declaration) => declaration.getModuleSpecifierValue());
     const { devDependencies, dependencies } = resolveRemoteDeps(
@@ -847,7 +847,7 @@ ${join(get(content), { prefix: () => "	" })}
 };
 var svelte = {
   matches: (fileName) => fileName.endsWith(".svelte"),
-  resolveDependencies: ({ filePath, isSubDir, excludeDeps, cwd }) => {
+  resolveDependencies: ({ filePath, isSubDir, excludeDeps }) => {
     const sourceCode = fs2.readFileSync(filePath).toString();
     const root = sv.parse(sourceCode, { modern: true, filename: filePath });
     if (!root.instance) return Ok({ dependencies: [], devDependencies: [], local: [] });
@@ -859,11 +859,10 @@ var svelte = {
           if (typeof node.source.value === "string") {
             if (node.source.value.startsWith(".")) {
               const localDep = resolveLocalImport(node.source.value, isSubDir, {
-                filePath,
-                cwd
+                filePath
               });
               if (localDep.isErr()) return Err(localDep.unwrapErr());
-              if (localDep) localDeps.add(localDep.unwrap());
+              if (localDep.unwrap()) localDeps.add(localDep.unwrap());
             } else {
               deps.add(node.source.value);
             }
@@ -894,7 +893,7 @@ ${join(get(content), { prefix: () => "	" })}
 };
 var vue = {
   matches: (fileName) => fileName.endsWith(".vue"),
-  resolveDependencies: ({ filePath, isSubDir, excludeDeps, cwd }) => {
+  resolveDependencies: ({ filePath, isSubDir, excludeDeps }) => {
     const sourceCode = fs2.readFileSync(filePath).toString();
     const parsed = v.parse(sourceCode, { filename: filePath });
     if (!parsed.descriptor.script?.content && !parsed.descriptor.scriptSetup?.content)
@@ -912,11 +911,10 @@ var vue = {
     for (const imp of imports) {
       if (imp.source.startsWith(".")) {
         const localDep = resolveLocalImport(imp.source, isSubDir, {
-          filePath,
-          cwd
+          filePath
         });
         if (localDep.isErr()) return Err(localDep.unwrapErr());
-        if (localDep) localDeps.add(localDep.unwrap());
+        if (localDep.unwrap()) localDeps.add(localDep.unwrap());
       } else {
         deps.add(imp.source);
       }
@@ -954,10 +952,11 @@ var yaml = {
     return code;
   }
 };
-var resolveLocalImport = (mod, isSubDir, { filePath, cwd }) => {
+var resolveLocalImport = (mod, isSubDir, { filePath }) => {
+  if (isSubDir && (mod.startsWith("./") || mod === ".")) return Ok(void 0);
   const categoryDir = isSubDir ? path2.join(filePath, "../../") : path2.join(filePath, "../");
   const modPath = path2.join(path2.join(filePath, "../"), mod);
-  const fullDir = path2.join(cwd, path2.join(categoryDir, "../"));
+  const fullDir = path2.join(categoryDir, "../");
   if (modPath.startsWith(fullDir)) {
     let [category, block] = modPath.slice(fullDir.length).split("/");
     if (block.includes(".")) {
@@ -1091,7 +1090,6 @@ var buildBlocksDirectory = (blocksPath, { cwd, excludeDeps, includeBlocks, inclu
         );
         const { dependencies, devDependencies, local } = lang.resolveDependencies({
           filePath: blockDir,
-          category: categoryName,
           isSubDir: false,
           excludeDeps,
           cwd
@@ -1164,7 +1162,6 @@ var buildBlocksDirectory = (blocksPath, { cwd, excludeDeps, includeBlocks, inclu
           }
           const { local, dependencies, devDependencies } = lang.resolveDependencies({
             filePath: path3.join(blockDir, f),
-            category: categoryName,
             isSubDir: true,
             excludeDeps,
             cwd
@@ -3298,7 +3295,7 @@ ${prefix?.() ?? ""}
           }
         });
         process.stdout.write(formattedDiff);
-        if (changes.length > 1) {
+        if (changes.length > 1 || localContent === "") {
           const confirmResult = await confirm6({
             message: "Accept changes?",
             initialValue: true

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jsrepo",
   "description": "A CLI to add shared code from remote repositories.",
-  "version": "1.12.0",
+  "version": "1.12.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ieedan/jsrepo"

package/src/commands/update.ts

@@ -290,7 +290,7 @@ const _update = async (blockNames: string[], options: Options) => {
 				process.stdout.write(formattedDiff);
 
 				// if there are no changes then don't ask
-				if (changes.length > 1) {
+				if (changes.length > 1 || localContent === '') {
 					const confirmResult = await confirm({
 						message: 'Accept changes?',
 						initialValue: true,

package/src/utils/build.ts

@@ -128,7 +128,6 @@ const buildBlocksDirectory = (
 				const { dependencies, devDependencies, local } = lang
 					.resolveDependencies({
 						filePath: blockDir,
-						category: categoryName,
 						isSubDir: false,
 						excludeDeps,
 						cwd,
@@ -222,7 +221,6 @@ const buildBlocksDirectory = (
 					const { local, dependencies, devDependencies } = lang
 						.resolveDependencies({
 							filePath: path.join(blockDir, f),
-							category: categoryName,
 							isSubDir: true,
 							excludeDeps,
 							cwd,

package/src/utils/language-support.ts

@@ -25,7 +25,6 @@ export type ResolvedDependencies = {
 
 export type ResolveDependencyOptions = {
 	filePath: string;
-	category: string;
 	isSubDir: boolean;
 	excludeDeps: string[];
 	cwd: string;
@@ -55,7 +54,7 @@ const typescript: Lang = {
 		fileName.endsWith('.js') ||
 		fileName.endsWith('.tsx') ||
 		fileName.endsWith('.jsx'),
-	resolveDependencies: ({ filePath, isSubDir, excludeDeps, cwd }) => {
+	resolveDependencies: ({ filePath, isSubDir, excludeDeps }) => {
 		const project = new Project();
 
 		const blockFile = project.addSourceFileAtPath(filePath);
@@ -71,11 +70,11 @@ const typescript: Lang = {
 		for (const relativeImport of relativeImports) {
 			const mod = relativeImport.getModuleSpecifierValue();
 
-			const localDep = resolveLocalImport(mod, isSubDir, { filePath, cwd });
+			const localDep = resolveLocalImport(mod, isSubDir, { filePath });
 
 			if (localDep.isErr()) return Err(localDep.unwrapErr());
 
-			if (localDep) localDeps.add(localDep.unwrap());
+			if (localDep.unwrap()) localDeps.add(localDep.unwrap()!);
 		}
 
 		const deps = imports
@@ -116,7 +115,7 @@ const typescript: Lang = {
 
 const svelte: Lang = {
 	matches: (fileName) => fileName.endsWith('.svelte'),
-	resolveDependencies: ({ filePath, isSubDir, excludeDeps, cwd }) => {
+	resolveDependencies: ({ filePath, isSubDir, excludeDeps }) => {
 		const sourceCode = fs.readFileSync(filePath).toString();
 
 		const root = sv.parse(sourceCode, { modern: true, filename: filePath });
@@ -135,12 +134,11 @@ const svelte: Lang = {
 						if (node.source.value.startsWith('.')) {
 							const localDep = resolveLocalImport(node.source.value, isSubDir, {
 								filePath,
-								cwd,
 							});
 
 							if (localDep.isErr()) return Err(localDep.unwrapErr());
 
-							if (localDep) localDeps.add(localDep.unwrap());
+							if (localDep.unwrap()) localDeps.add(localDep.unwrap()!);
 						} else {
 							deps.add(node.source.value);
 						}
@@ -179,7 +177,7 @@ const svelte: Lang = {
 
 const vue: Lang = {
 	matches: (fileName) => fileName.endsWith('.vue'),
-	resolveDependencies: ({ filePath, isSubDir, excludeDeps, cwd }) => {
+	resolveDependencies: ({ filePath, isSubDir, excludeDeps }) => {
 		const sourceCode = fs.readFileSync(filePath).toString();
 
 		const parsed = v.parse(sourceCode, { filename: filePath });
@@ -205,12 +203,11 @@ const vue: Lang = {
 			if (imp.source.startsWith('.')) {
 				const localDep = resolveLocalImport(imp.source, isSubDir, {
 					filePath,
-					cwd,
 				});
 
 				if (localDep.isErr()) return Err(localDep.unwrapErr());
 
-				if (localDep) localDeps.add(localDep.unwrap());
+				if (localDep.unwrap()) localDeps.add(localDep.unwrap()!);
 			} else {
 				deps.add(imp.source);
 			}
@@ -258,8 +255,10 @@ const yaml: Lang = {
 const resolveLocalImport = (
 	mod: string,
 	isSubDir: boolean,
-	{ filePath, cwd }: { filePath: string; cwd: string }
-): Result<string, string> => {
+	{ filePath }: { filePath: string }
+): Result<string | undefined, string> => {
+	if (isSubDir && (mod.startsWith('./') || mod === '.')) return Ok(undefined);
+
 	// get the path to the current category
 	const categoryDir = isSubDir ? path.join(filePath, '../../') : path.join(filePath, '../');
 
@@ -267,7 +266,7 @@ const resolveLocalImport = (
 	const modPath = path.join(path.join(filePath, '../'), mod);
 
 	// get the full path to the current category
-	const fullDir = path.join(cwd, path.join(categoryDir, '../'));
+	const fullDir = path.join(categoryDir, '../');
 
 	// mod paths that reference outside of the current blocks directory are invalid
 	if (modPath.startsWith(fullDir)) {