@sprucelabs/spruce-skill-utils 32.1.0 → 32.1.2

package/build/esm/services/SettingsService.js

@@ -62,9 +62,9 @@ export default class SettingsService {
         this.settings = undefined;
     }
     loadSettings() {
-        const path = this.getSettingsPath();
         if (!this.settings) {
             try {
+                const path = this.getSettingsPath();
                 const contents = diskUtil.readFile(path);
                 this.settings = JSON.parse(contents);
             }
@@ -75,7 +75,7 @@ export default class SettingsService {
         return this.settings;
     }
     getSettingsPath() {
-        const isInGoProject = diskUtil.doesFileExist(diskUtil.resolvePath(this.cwd, 'go.mod'));
+        const isInGoProject = diskUtil.detectProjectLanguage(this.cwd) === 'go';
         if (isInGoProject) {
             return diskUtil.resolvePath(this.cwd, HASH_SPRUCE_DIR_NAME, this.fileName);
         }

package/build/esm/types/skill.types.d.ts

@@ -73,3 +73,4 @@ export interface PersonWithToken {
     token: string;
     isLoggedIn?: boolean | undefined | null;
 }
+export type ProjectLanguage = 'ts' | 'go' | 'unknown' | 'js';

package/build/esm/utilities/disk.utility.d.ts

@@ -1,3 +1,4 @@
+import { ProjectLanguage } from '../types/skill.types';
 export interface CreateFile {
     /** The relative path from the cwd, without a leading forward slash */
     relativePath: string;
@@ -20,6 +21,7 @@ declare const diskUtil: {
     isFile(target: string): boolean;
     doesDirExist(target: string): boolean;
     resolveHashSprucePath(cwd: string, ...filePath: string[]): string;
+    detectProjectLanguage(cwd: string): ProjectLanguage;
     doesHashSprucePathExist(cwd: string, ...filePath: string[]): boolean;
     resolveBuiltHashSprucePath(cwd: string, ...filePath: string[]): string;
     doesBuiltHashSprucePathExist(cwd: string, ...filePath: string[]): boolean;

package/build/esm/utilities/disk.utility.js

@@ -103,6 +103,17 @@ const diskUtil = {
         } while (parts.length > 0);
         throw new Error(`.spruce directory not found at ${cwd}`);
     },
+    detectProjectLanguage(cwd) {
+        const isInGoProject = this.doesDirExist(this.resolvePath(cwd, 'go.mod'));
+        if (isInGoProject) {
+            return 'go';
+        }
+        const isInTypescript = this.doesFileExist(this.resolvePath(cwd, 'tsconfig.json'));
+        if (isInTypescript) {
+            return 'ts';
+        }
+        return 'js';
+    },
     doesHashSprucePathExist(cwd, ...filePath) {
         try {
             this.resolveHashSprucePath(cwd, ...filePath);

package/build/esm/utilities/version.utility.js

@@ -56,7 +56,6 @@ const versionUtil = {
         const version = this.getAllVersions(resolved);
         const latest = version.pop();
         if (!latest) {
-            debugger;
             throw new SpruceError({
                 //@ts-ignore
                 code: 'NO_VERSIONING_FOUND',
@@ -85,7 +84,6 @@ const versionUtil = {
         const allDateIsh = this.getAllVersions(dirToRead);
         const latest = allDateIsh.pop();
         if (!latest) {
-            debugger;
             throw new Error('no versioning found!');
         }
         return resolved.replace(LATEST_HANDLEBARS, latest.dirValue);

package/build/services/SettingsService.js

@@ -65,9 +65,9 @@ class SettingsService {
         this.settings = undefined;
     }
     loadSettings() {
-        const path = this.getSettingsPath();
         if (!this.settings) {
             try {
+                const path = this.getSettingsPath();
                 const contents = disk_utility_1.default.readFile(path);
                 this.settings = JSON.parse(contents);
             }
@@ -78,7 +78,7 @@ class SettingsService {
         return this.settings;
     }
     getSettingsPath() {
-        const isInGoProject = disk_utility_1.default.doesFileExist(disk_utility_1.default.resolvePath(this.cwd, 'go.mod'));
+        const isInGoProject = disk_utility_1.default.detectProjectLanguage(this.cwd) === 'go';
         if (isInGoProject) {
             return disk_utility_1.default.resolvePath(this.cwd, constants_1.HASH_SPRUCE_DIR_NAME, this.fileName);
         }

package/build/types/skill.types.d.ts

@@ -73,3 +73,4 @@ export interface PersonWithToken {
     token: string;
     isLoggedIn?: boolean | undefined | null;
 }
+export type ProjectLanguage = 'ts' | 'go' | 'unknown' | 'js';

package/build/utilities/disk.utility.d.ts

@@ -1,3 +1,4 @@
+import { ProjectLanguage } from '../types/skill.types';
 export interface CreateFile {
     /** The relative path from the cwd, without a leading forward slash */
     relativePath: string;
@@ -20,6 +21,7 @@ declare const diskUtil: {
     isFile(target: string): boolean;
     doesDirExist(target: string): boolean;
     resolveHashSprucePath(cwd: string, ...filePath: string[]): string;
+    detectProjectLanguage(cwd: string): ProjectLanguage;
     doesHashSprucePathExist(cwd: string, ...filePath: string[]): boolean;
     resolveBuiltHashSprucePath(cwd: string, ...filePath: string[]): string;
     doesBuiltHashSprucePathExist(cwd: string, ...filePath: string[]): boolean;

package/build/utilities/disk.utility.js

@@ -97,6 +97,17 @@ const diskUtil = {
         } while (parts.length > 0);
         throw new Error(`.spruce directory not found at ${cwd}`);
     },
+    detectProjectLanguage(cwd) {
+        const isInGoProject = this.doesDirExist(this.resolvePath(cwd, 'go.mod'));
+        if (isInGoProject) {
+            return 'go';
+        }
+        const isInTypescript = this.doesFileExist(this.resolvePath(cwd, 'tsconfig.json'));
+        if (isInTypescript) {
+            return 'ts';
+        }
+        return 'js';
+    },
     doesHashSprucePathExist(cwd, ...filePath) {
         try {
             this.resolveHashSprucePath(cwd, ...filePath);

package/build/utilities/version.utility.js

@@ -62,7 +62,6 @@ const versionUtil = {
         const version = this.getAllVersions(resolved);
         const latest = version.pop();
         if (!latest) {
-            debugger;
             throw new SpruceError_1.default({
                 //@ts-ignore
                 code: 'NO_VERSIONING_FOUND',
@@ -91,7 +90,6 @@ const versionUtil = {
         const allDateIsh = this.getAllVersions(dirToRead);
         const latest = allDateIsh.pop();
         if (!latest) {
-            debugger;
             throw new Error('no versioning found!');
         }
         return resolved.replace(constants_1.LATEST_HANDLEBARS, latest.dirValue);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "32.1.0",
+  "version": "32.1.2",
   "skill": {
     "namespace": "skill-utils",
     "upgradeIgnoreList": [
@@ -72,11 +72,11 @@
     "@sprucelabs/resolve-path-aliases": "^3.0.28",
     "@sprucelabs/semantic-release": "^5.0.2",
     "@sprucelabs/test": "^10.0.24",
-    "@sprucelabs/test-utils": "^6.0.106",
+    "@sprucelabs/test-utils": "^6.0.107",
     "@types/fs-extra": "^11.0.4",
     "@types/inflection": "^2.0.0",
     "@types/lodash": "^4.17.20",
-    "@types/node": "^24.8.0",
+    "@types/node": "^24.8.1",
     "chokidar-cli": "^3.0.0",
     "eslint": "^9.37.0",
     "eslint-config-spruce": "^11.2.26",