@a35hie/ts-pkg 0.2.0 → 0.2.1

package/dist/cli.js

@@ -278,6 +278,15 @@ ${deps.map((d) => `${indent}'${d}',`).join(`
 `)}
   ]`;
 }
+function formatDepsObject(deps, indent = "    ") {
+  const entries = Object.entries(deps).sort(([a], [b]) => a.localeCompare(b));
+  if (entries.length === 0)
+    return "{}";
+  return `{
+${entries.map(([name, version]) => `${indent}'${name}': '${version}',`).join(`
+`)}
+  }`;
+}
 async function syncDependencies(options = {}) {
   const {
     packageJsonPath = "package.json",
@@ -318,9 +327,9 @@ async function syncDependencies(options = {}) {
   const devDeps = depsObjectToArray(packageJson.devDependencies);
   const peerDeps = depsObjectToArray(packageJson.peerDependencies);
   let updatedContent = configContent;
-  updatedContent = updateDepsInConfig(updatedContent, "dependencies", deps);
-  updatedContent = updateDepsInConfig(updatedContent, "devDependencies", devDeps);
-  updatedContent = updateDepsInConfig(updatedContent, "peerDependencies", peerDeps);
+  updatedContent = updateDepsInConfig(updatedContent, "dependencies", deps, packageJson.dependencies);
+  updatedContent = updateDepsInConfig(updatedContent, "devDependencies", devDeps, packageJson.devDependencies);
+  updatedContent = updateDepsInConfig(updatedContent, "peerDependencies", peerDeps, packageJson.peerDependencies);
   await writeFile(absoluteConfigPath, updatedContent);
   if (!quiet) {
     console.log(`✨ Synced dependencies to ${configPath}`);
@@ -332,12 +341,12 @@ async function syncDependencies(options = {}) {
       console.log(`   peerDependencies: ${peerDeps.length} packages`);
   }
 }
-function findArrayEnd(content, startIndex) {
+function findBracketEnd(content, startIndex, openChar, closeChar) {
   let depth = 0;
   for (let i = startIndex;i < content.length; i++) {
-    if (content[i] === "[")
+    if (content[i] === openChar)
       depth++;
-    else if (content[i] === "]") {
+    else if (content[i] === closeChar) {
       depth--;
       if (depth === 0)
         return i;
@@ -345,22 +354,33 @@ function findArrayEnd(content, startIndex) {
   }
   return -1;
 }
-function updateDepsInConfig(content, depType, deps) {
-  const formattedDeps = formatDepsArray(deps);
-  const fieldPattern = new RegExp(`(${depType}:\\s*)\\[`);
-  const match = fieldPattern.exec(content);
-  if (match && match[1]) {
-    const arrayStart = match.index + match[1].length;
-    const arrayEnd = findArrayEnd(content, arrayStart);
+function updateDepsInConfig(content, depType, depsArray, depsObject) {
+  const arrayPattern = new RegExp(`(${depType}:\\s*)\\[`);
+  const arrayMatch = arrayPattern.exec(content);
+  if (arrayMatch && arrayMatch[1]) {
+    const formattedDeps = formatDepsArray(depsArray);
+    const arrayStart = arrayMatch.index + arrayMatch[1].length;
+    const arrayEnd = findBracketEnd(content, arrayStart, "[", "]");
     if (arrayEnd !== -1) {
       return content.slice(0, arrayStart) + formattedDeps + content.slice(arrayEnd + 1);
     }
   }
-  if (deps.length > 0) {
+  const objectPattern = new RegExp(`(${depType}:\\s*)\\{`);
+  const objectMatch = objectPattern.exec(content);
+  if (objectMatch && objectMatch[1]) {
+    const formattedDeps = formatDepsObject(depsObject || {});
+    const objStart = objectMatch.index + objectMatch[1].length;
+    const objEnd = findBracketEnd(content, objStart, "{", "}");
+    if (objEnd !== -1) {
+      return content.slice(0, objStart) + formattedDeps + content.slice(objEnd + 1);
+    }
+  }
+  if (depsArray.length > 0) {
+    const formattedDeps = formatDepsArray(depsArray);
     const insertPatterns = [
-      { pattern: /peerDependencies:\s*\[/, after: true },
-      { pattern: /devDependencies:\s*\[/, after: true },
-      { pattern: /dependencies:\s*\[/, after: true },
+      { pattern: /peerDependencies:\s*[\[{]/, after: true },
+      { pattern: /devDependencies:\s*[\[{]/, after: true },
+      { pattern: /dependencies:\s*[\[{]/, after: true },
       { pattern: /(\n\s*)(conditions:\s*\[)/, before: true },
       { pattern: /(\n\s*)(engines:\s*\{)/, before: true }
     ];
@@ -368,10 +388,12 @@ function updateDepsInConfig(content, depType, deps) {
       const m = pattern.exec(content);
       if (m) {
         if (after) {
-          const arrStart = m.index + m[0].length - 1;
-          const arrEnd = findArrayEnd(content, arrStart);
-          if (arrEnd !== -1) {
-            let insertPos = arrEnd + 1;
+          const startChar = content[m.index + m[0].length - 1];
+          const isArray = startChar === "[";
+          const bracketStart = m.index + m[0].length - 1;
+          const bracketEnd = findBracketEnd(content, bracketStart, isArray ? "[" : "{", isArray ? "]" : "}");
+          if (bracketEnd !== -1) {
+            let insertPos = bracketEnd + 1;
             let char = content[insertPos];
             while (insertPos < content.length && char && /[,\s]/.test(char) && char !== `
 `) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a35hie/ts-pkg",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "TypeScript-based package.json with magical features",
   "license": "Apache-2.0",
   "repository": "https://github.com/a35hie/TsPkg",