@stacksjs/path 0.75.71 → 0.75.73

package/dist/index.js

@@ -1,7 +1,7 @@
 // @bun
 // src/index.ts
 import {
-  existsSync,
+  existsSync as existsSync2,
   lstatSync,
   mkdirSync,
   readFileSync,
@@ -19,34 +19,40 @@ import {
   dirname,
   extname,
   isAbsolute,
-  join,
+  join as join2,
   normalize,
   parse,
   relative as relative2,
   resolve as resolve2,
-  sep,
+  sep as sep2,
   toNamespacedPath
 } from "path";
 import process2 from "process";
 
 // src/project.ts
-import { relative, resolve } from "path";
+import { existsSync } from "fs";
+import { join, relative, resolve, sep } from "path";
 import process from "process";
 var cachedCwd;
 var cachedProjectRoot = "";
+function projectRootFor(cwd) {
+  if (existsSync(join(cwd, "storage", "framework")))
+    return cwd;
+  const segments = cwd.split(sep);
+  const candidates = [];
+  for (let i = segments.length - 1;i > 0; i--) {
+    if (segments[i] === "storage")
+      candidates.push(segments.slice(0, i).join(sep) || sep);
+  }
+  return candidates.find((candidate) => existsSync(join(candidate, "storage", "framework"))) ?? candidates.find((candidate) => existsSync(join(candidate, "package.json"))) ?? cwd;
+}
 function projectPath(filePath = "", options) {
   const cwd = process.cwd();
   let path;
   if (cwd === cachedCwd) {
     path = cachedProjectRoot;
   } else {
-    path = cwd;
-    while (path.includes("storage")) {
-      const parent = resolve(path, "..");
-      if (parent === path)
-        break;
-      path = parent;
-    }
+    path = projectRootFor(cwd);
     cachedCwd = cwd;
     cachedProjectRoot = path;
   }
@@ -108,7 +114,7 @@ function userViewsPath(path) {
 function userFunctionsPath(path) {
   return `${resolveUserLibBase(projectPath("functions"), resourcesPath("functions"))}/${path || ""}`;
 }
-function resolveUserLibBase(rootDir, resourcesDir, exists = existsSync) {
+function resolveUserLibBase(rootDir, resourcesDir, exists = existsSync2) {
   return exists(rootDir) ? rootDir : resourcesDir;
 }
 function userJobsPath(path) {
@@ -226,8 +232,8 @@ function configPath(path) {
   return corePath(`config/${path || ""}`);
 }
 function siteConfigPath(root = projectPath()) {
-  const configured = join(root, "config/site.ts");
-  return existsSync(configured) ? configured : join(root, "site.config.ts");
+  const configured = join2(root, "config/site.ts");
+  return existsSync2(configured) ? configured : join2(root, "site.config.ts");
 }
 function corePath(path) {
   return frameworkPath(`core/${path || ""}`);
@@ -375,11 +381,11 @@ function notApplicable() {
   return { status: "not-applicable", installed: null, vendored: null, syncedAt: null };
 }
 function defaultsPackagePath(projectRoot = projectPath()) {
-  return join(projectRoot, "node_modules/@stacksjs/defaults");
+  return join2(projectRoot, "node_modules/@stacksjs/defaults");
 }
 function manifestVersion(packageRoot) {
   try {
-    const version = JSON.parse(readFileSync(join(packageRoot, "package.json"), "utf8"))?.version;
+    const version = JSON.parse(readFileSync(join2(packageRoot, "package.json"), "utf8"))?.version;
     return typeof version === "string" ? version : null;
   } catch {
     return null;
@@ -390,17 +396,17 @@ function installedDefaultsVersion(projectRoot = projectPath()) {
 }
 function isInside(child, parent) {
   const resolved = realpathSync(child);
-  return resolved === parent || resolved.startsWith(`${parent}${sep}`);
+  return resolved === parent || resolved.startsWith(`${parent}${sep2}`);
 }
 function inspectDefaultsProvenance(projectRoot = projectPath()) {
-  const targetDefaults = join(projectRoot, "storage/framework/defaults");
+  const targetDefaults = join2(projectRoot, "storage/framework/defaults");
   const packageRoot = defaultsPackagePath(projectRoot);
-  if (!existsSync(targetDefaults) || !existsSync(join(packageRoot, "package.json")))
+  if (!existsSync2(targetDefaults) || !existsSync2(join2(packageRoot, "package.json")))
     return notApplicable();
-  if (existsSync(join(projectRoot, "storage/framework/core/buddy/package.json")))
+  if (existsSync2(join2(projectRoot, "storage/framework/core/buddy/package.json")))
     return notApplicable();
   try {
-    if (!isInside(packageRoot, join(realpathSync(projectRoot), "node_modules")))
+    if (!isInside(packageRoot, join2(realpathSync(projectRoot), "node_modules")))
       return notApplicable();
   } catch {
     return notApplicable();
@@ -410,7 +416,7 @@ function inspectDefaultsProvenance(projectRoot = projectPath()) {
     return notApplicable();
   let marker = null;
   try {
-    const raw = JSON.parse(readFileSync(join(targetDefaults, DEFAULTS_SYNC_MARKER), "utf8"));
+    const raw = JSON.parse(readFileSync(join2(targetDefaults, DEFAULTS_SYNC_MARKER), "utf8"));
     if (typeof raw?.version === "string")
       marker = { version: raw.version, syncedAt: typeof raw.syncedAt === "string" ? raw.syncedAt : "" };
   } catch {}
@@ -573,9 +579,9 @@ function applyRuntimeDirectoryEnv() {
 function mergeDirectoryInto(from, to) {
   mkdirSync(to, { recursive: true });
   for (const entry of readdirSync(from)) {
-    const source = join(from, entry);
-    const destination = join(to, entry);
-    if (!existsSync(destination)) {
+    const source = join2(from, entry);
+    const destination = join2(to, entry);
+    if (!existsSync2(destination)) {
       renameSync(source, destination);
       continue;
     }
@@ -769,12 +775,12 @@ var path = {
   dirname,
   extname,
   isAbsolute,
-  join,
+  join: join2,
   normalize,
   relative: relative2,
   resolve: resolve2,
   parse,
-  sep: () => sep,
+  sep: () => sep2,
   toNamespacedPath
 };
 export {
@@ -844,7 +850,7 @@ export {
   installedDefaultsVersion,
   isAbsolute,
   jobsPath,
-  join,
+  join2 as join,
   langPath,
   layoutsPath,
   libraryPackagePath,
@@ -889,7 +895,7 @@ export {
   scriptsPath,
   searchEnginePath,
   securityPath,
-  sep,
+  sep2 as sep,
   serverPath,
   serverlessPath,
   settingsPath,

package/dist/project.js

@@ -1,22 +1,28 @@
 // @bun
 // src/project.ts
-import { relative, resolve } from "path";
+import { existsSync } from "fs";
+import { join, relative, resolve, sep } from "path";
 import process from "process";
 var cachedCwd;
 var cachedProjectRoot = "";
+function projectRootFor(cwd) {
+  if (existsSync(join(cwd, "storage", "framework")))
+    return cwd;
+  const segments = cwd.split(sep);
+  const candidates = [];
+  for (let i = segments.length - 1;i > 0; i--) {
+    if (segments[i] === "storage")
+      candidates.push(segments.slice(0, i).join(sep) || sep);
+  }
+  return candidates.find((candidate) => existsSync(join(candidate, "storage", "framework"))) ?? candidates.find((candidate) => existsSync(join(candidate, "package.json"))) ?? cwd;
+}
 function projectPath(filePath = "", options) {
   const cwd = process.cwd();
   let path;
   if (cwd === cachedCwd) {
     path = cachedProjectRoot;
   } else {
-    path = cwd;
-    while (path.includes("storage")) {
-      const parent = resolve(path, "..");
-      if (parent === path)
-        break;
-      path = parent;
-    }
+    path = projectRootFor(cwd);
     cachedCwd = cwd;
     cachedProjectRoot = path;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/path",
   "type": "module",
-  "version": "0.75.71",
+  "version": "0.75.73",
   "description": "The Stacks path.",
   "author": "Chris Breuer",
   "contributors": [