@mxpicture/build-api 0.2.5 → 0.2.6

package/dist/vscode/vscode.settings.js

@@ -1,6 +1,6 @@
 import { activeProfile, defaultSettingsPath } from "./vscode.profiles.js";
 import { readFile } from "fs/promises";
-import pkg from "json5";
+import json5 from "json5";
 let __settings = null;
 export const vscodeSettings = async (dir) => {
     if (!__settings) {
@@ -12,7 +12,7 @@ export const vscodeSettings = async (dir) => {
             settingsPath = defaultSettingsPath();
         }
         const raw = await readFile(settingsPath, "utf-8");
-        __settings = pkg.parse(raw);
+        __settings = json5.parse(raw);
         if (!__settings)
             throw new Error("No settings found");
     }

package/dist/vscode/vscode.storage.js

@@ -1,6 +1,6 @@
 import * as fs from "fs";
 import { join } from "path";
-import pkg from "json5";
+import json5 from "json5";
 import { configUserPath } from "./vscode.config.js";
 export const storagePath = () => join(configUserPath(), "globalStorage", "storage.json");
 let __storage;
@@ -8,7 +8,7 @@ export const storage = () => {
     if (__storage)
         return __storage;
     const content = fs.readFileSync(storagePath()).toString();
-    __storage = pkg.parse(content);
+    __storage = json5.parse(content);
     if (!__storage)
         throw new Error("VS Code storage.json could not be loaded");
     return __storage;

package/dist/vscode/vscode.workspace.js

@@ -1,12 +1,12 @@
 import { readFile } from "fs/promises";
-import pkg from "json5";
+import json5 from "json5";
 import { dirname } from "path";
 const __workspaces = {};
 export const vscodeWorkspace = async (workspaceFile) => {
     let found = __workspaces[workspaceFile];
     if (!found) {
         const raw = await readFile(workspaceFile, "utf-8");
-        found = pkg.parse(raw);
+        found = json5.parse(raw);
         __workspaces[workspaceFile] = found;
     }
     return { ...found };

package/dist/workspace/workspace.common.js

@@ -1,8 +1,9 @@
 import { readdir, readFile, writeFile } from "fs/promises";
 import { WorkspaceFileType, } from "../types/types.workspace.js";
-import { join, parse, relative, resolve } from "path";
+import { join, relative, resolve } from "path";
 import { splitVersion, compareVersions, concatVersion, } from "../pkg/pkg.common.js";
-import pkg from "json5";
+import json5 from "json5";
+import { parse } from "yaml";
 export const DEFAULT_WORKSPACE_FILE_ENDING = ".code-workspace";
 export const getFileType = (filename) => filename.endsWith(DEFAULT_WORKSPACE_FILE_ENDING)
     ? WorkspaceFileType.workspace
@@ -18,8 +19,9 @@ export const findWorkspaceRoot = async (startPath) => {
     const promises = [];
     while (path.length > 0) {
         promises.push((async () => {
+            const workingPath = path.substring(0);
             const l = level;
-            const entries = await readdir(path, { withFileTypes: true });
+            const entries = await readdir(workingPath, { withFileTypes: true });
             let pkg = null;
             for (const entry of entries) {
                 if (!entry.isFile())
@@ -27,16 +29,16 @@ export const findWorkspaceRoot = async (startPath) => {
                 const type = getFileType(entry.name);
                 if (type === WorkspaceFileType.workspace)
                     return {
-                        filePath: join(path, entry.name),
-                        dirPath: path,
+                        filePath: join(workingPath, entry.name),
+                        dirPath: workingPath,
                         filename: entry.name,
                         level: l,
                         type,
                     };
                 if (!pkg && type === WorkspaceFileType.package)
                     pkg = {
-                        filePath: join(path, entry.name),
-                        dirPath: path,
+                        filePath: join(workingPath, entry.name),
+                        dirPath: workingPath,
                         filename: entry.name,
                         level: l,
                         type,
@@ -51,7 +53,7 @@ export const findWorkspaceRoot = async (startPath) => {
     }
     const results = (await Promise.allSettled(promises)).filter((r) => r.status === "fulfilled");
     results.sort((a, b) => a.value.level - b.value.level);
-    const result = results.find((r) => r.value.type === WorkspaceFileType.workspace)?.value &&
+    const result = results.find((r) => r.value.type === WorkspaceFileType.workspace)?.value ??
         results.find((r) => r.value.type === WorkspaceFileType.package)?.value;
     if (!result)
         throw new Error("findWorkspaceRoot: no file found");
@@ -90,7 +92,7 @@ export const readPackageJsonThrow = async (dirOrFilepath) => {
     const pkgPath = dirOrFilepath.endsWith("/package.json")
         ? dirOrFilepath
         : join(dirOrFilepath, "package.json");
-    return pkg.parse(await readFile(pkgPath, "utf8"));
+    return json5.parse(await readFile(pkgPath, "utf8"));
 };
 export const readPackageJsons = async (repoRoot) => {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mxpicture/build-api",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Build utilities API",
   "type": "module",
   "author": "MXPicture",