@nstudio/focus 15.0.2 → 15.0.4-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstudio/focus",
-  "version": "15.0.2",
+  "version": "15.0.4-rc.0",
   "description": "Focus helpers for monorepos in various IDEs",
   "homepage": "https://nstudio.io/xplat",
   "repository": {
@@ -30,9 +30,9 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@angular-devkit/core": "^14.0.0",
-    "@angular-devkit/schematics": "^14.0.0",
-    "@nstudio/xplat-utils": "15.0.2",
+    "@angular-devkit/core": "^15.0.0",
+    "@angular-devkit/schematics": "^15.0.0",
+    "@nstudio/xplat-utils": "15.0.4-rc.0",
     "xml2js": "~0.4.23"
   }
 }

package/src/utils/index.js

@@ -4,8 +4,8 @@ exports.FocusHelpers = void 0;
 const xplat_utils_1 = require("@nstudio/xplat-utils");
 const path_1 = require("path");
 const fs_1 = require("fs");
-const devkit_1 = require("@nrwl/devkit");
 const xml2js = require("xml2js");
+const devkit_1 = require("@nrwl/devkit");
 var FocusHelpers;
 (function (FocusHelpers) {
     function updateIDESettings(options) {
@@ -113,7 +113,7 @@ var FocusHelpers;
                 }
                 // VS Code
                 const isVsCode = updateVSCode({
-                    userUpdates,
+                    workspaceUpdates: userUpdates,
                     allApps: options.allApps,
                     focusOnApps: options.focusOnApps,
                     appWildcards,
@@ -187,6 +187,63 @@ var FocusHelpers;
         };
     }
     FocusHelpers.updateIDESettings = updateIDESettings;
+    function generateVSCodeUpdatedSettings(currentSettings, updates, options) {
+        const newSettings = {
+            'files.exclude': {},
+            'search.exclude': {},
+        };
+        let exclude = currentSettings['files.exclude'] || {};
+        let searchExclude = currentSettings['search.exclude'] || {};
+        newSettings['files.exclude'] = Object.assign(Object.assign({}, exclude), updates);
+        newSettings['search.exclude'] = Object.assign(Object.assign({}, searchExclude), updates);
+        if ((0, xplat_utils_1.isXplatWorkspace)()) {
+            if (options.allApps.length) {
+                // always reset specific app filters
+                for (const app of options.allApps) {
+                    delete newSettings['files.exclude'][app];
+                    delete newSettings['search.exclude'][app];
+                }
+            }
+            if (!options.isFullstack &&
+                options.focusOnApps.length &&
+                options.allApps.length) {
+                // when focusing on projects, clear all specific app wildcards first if they exist
+                for (const wildcard of options.appWildcards) {
+                    delete newSettings['files.exclude'][wildcard];
+                    delete newSettings['search.exclude'][wildcard];
+                }
+                for (const focusApp of options.focusOnApps) {
+                    newSettings['files.exclude'][focusApp] = false;
+                    newSettings['search.exclude'][focusApp] = false;
+                }
+                // ensure all other apps are excluded (except for the one that's being focused on)
+                // also support focusing on apps/{subfolder}/*
+                // if focusing on specific apps but there's no direct match of the focus target in allApps listing, it's a subfolder
+                const isFocusingOnAppSubFolder = options.focusOnApps.filter((a) => options.allApps.includes(a))
+                    .length === 0;
+                for (const app of options.allApps) {
+                    if (!options.focusOnApps.includes(app)) {
+                        let skipExcluding = false;
+                        if (isFocusingOnAppSubFolder) {
+                            // see if beginning path of app is in the focused subfolder
+                            for (const focus of options.focusOnApps) {
+                                if (app.indexOf(focus) === 0) {
+                                    // console.log('found app in focused folder:', app)
+                                    skipExcluding = true;
+                                }
+                            }
+                        }
+                        if (!skipExcluding) {
+                            // console.log('hiding app:', app)
+                            newSettings['files.exclude'][app] = true;
+                            newSettings['search.exclude'][app] = true;
+                        }
+                    }
+                }
+            }
+        }
+        return Object.assign(Object.assign({}, currentSettings), newSettings);
+    }
     function updateVSCode(options) {
         // VS Code support
         let isVsCode;
@@ -215,63 +272,8 @@ var FocusHelpers;
                 });
                 if (userSettings) {
                     const userSettingsJson = (0, xplat_utils_1.jsonParse)(userSettings);
-                    let exclude = userSettingsJson['files.exclude'];
-                    if (!exclude) {
-                        exclude = {};
-                    }
-                    let searchExclude = userSettingsJson['search.exclude'];
-                    if (!searchExclude) {
-                        searchExclude = {};
-                    }
-                    userSettingsJson['files.exclude'] = Object.assign(exclude, options.userUpdates);
-                    userSettingsJson['search.exclude'] = Object.assign(searchExclude, options.userUpdates);
-                    if ((0, xplat_utils_1.isXplatWorkspace)()) {
-                        if (options.allApps.length) {
-                            // always reset specific app filters
-                            for (const app of options.allApps) {
-                                delete userSettingsJson['files.exclude'][app];
-                                delete userSettingsJson['search.exclude'][app];
-                            }
-                        }
-                        if (!options.isFullstack &&
-                            options.focusOnApps.length &&
-                            options.allApps.length) {
-                            // when focusing on projects, clear all specific app wildcards first if they exist
-                            for (const wildcard of options.appWildcards) {
-                                delete userSettingsJson['files.exclude'][wildcard];
-                                delete userSettingsJson['search.exclude'][wildcard];
-                            }
-                            for (const focusApp of options.focusOnApps) {
-                                userSettingsJson['files.exclude'][focusApp] = false;
-                                userSettingsJson['search.exclude'][focusApp] = false;
-                            }
-                            // ensure all other apps are excluded (except for the one that's being focused on)
-                            // also support focusing on apps/{subfolder}/*
-                            // if focusing on specific apps but there's no direct match of the focus target in allApps listing, it's a subfolder
-                            const isFocusingOnAppSubFolder = options.focusOnApps.filter((a) => options.allApps.includes(a))
-                                .length === 0;
-                            for (const app of options.allApps) {
-                                if (!options.focusOnApps.includes(app)) {
-                                    let skipExcluding = false;
-                                    if (isFocusingOnAppSubFolder) {
-                                        // see if beginning path of app is in the focused subfolder
-                                        for (const focus of options.focusOnApps) {
-                                            if (app.indexOf(focus) === 0) {
-                                                // console.log('found app in focused folder:', app)
-                                                skipExcluding = true;
-                                            }
-                                        }
-                                    }
-                                    if (!skipExcluding) {
-                                        // console.log('hiding app:', app)
-                                        userSettingsJson['files.exclude'][app] = true;
-                                        userSettingsJson['search.exclude'][app] = true;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    (0, fs_1.writeFileSync)(userSettingsVSCodePath, (0, devkit_1.serializeJson)(userSettingsJson));
+                    const newSettings = generateVSCodeUpdatedSettings(userSettingsJson, options.userUpdates, options);
+                    (0, fs_1.writeFileSync)(userSettingsVSCodePath, (0, devkit_1.serializeJson)(newSettings));
                     // TODO: print out the updates made
                     // Example of how the updates are represented
                     // true === hidden
@@ -311,15 +313,15 @@ var FocusHelpers;
                     encoding: 'utf-8',
                 });
                 workspaceSettingsJson = (0, xplat_utils_1.jsonParse)(workspaceSettings);
-                const exclude = workspaceSettingsJson['files.exclude'];
-                workspaceSettingsJson['files.exclude'] = Object.assign(exclude, options.workspaceUpdates);
             }
             else {
                 // console.log('creating workspace settings...');
-                (0, fs_1.mkdirSync)('.vscode');
-                workspaceSettingsJson['files.exclude'] = options.workspaceUpdates;
+                (0, fs_1.mkdirSync)('.vscode', {
+                    recursive: true // ignore error if exists
+                });
             }
-            (0, fs_1.writeFileSync)(workspaceSettingsPath, (0, devkit_1.serializeJson)(workspaceSettingsJson));
+            const newSettings = generateVSCodeUpdatedSettings(workspaceSettingsJson, options.workspaceUpdates, options);
+            (0, fs_1.writeFileSync)(workspaceSettingsPath, (0, devkit_1.serializeJson)(newSettings));
         }
         return isVsCode;
     }