@gesslar/toolkit 3.30.0 → 3.31.0

package/package.json

@@ -5,7 +5,7 @@
     "name": "gesslar",
     "url": "https://gesslar.dev"
   },
-  "version": "3.30.0",
+  "version": "3.31.0",
   "license": "Unlicense",
   "homepage": "https://github.com/gesslar/toolkit#readme",
   "repository": {

package/src/node/lib/FileObject.js

@@ -462,7 +462,7 @@ export default class FileObject extends FS {
    * @returns {Promise<object>} The file contents as a module.
    */
   async import() {
-    const filePath = this.path
+    const filePath = this.url
 
     if(!(await this.exists))
       throw Sass.new(`No such file '${filePath}'`)

package/src/node/lib/FileSystem.js

@@ -11,13 +11,15 @@
 import path from "node:path"
 import url from "node:url"
 
-import Collection from "../../browser/lib/Collection.js"
 import Data from "../../browser/lib/Data.js"
 import Valid from "./Valid.js"
-import Sass from "./Sass.js"
+import Collection from "../../browser/lib/Collection.js"
 
-/** @typedef {import("./FileObject.js").default} FileObject */
-/** @typedef {import("./DirectoryObject.js").default} DirectoryObject */
+/**
+ * @import {FileObject} from "./FileObject.js"
+ * @import {DirectoryObject} from "./DirectoryObject.js"
+ * @import {Sass} from "./Sass.js"
+ */
 
 const fdTypes = Object.freeze(["file", "directory"])
 const upperFdTypes = Object.freeze(fdTypes.map(type => type.toUpperCase()))
@@ -115,7 +117,7 @@ export default class FileSystem {
     const relative = path.relative(fromBasePath, to.path)
 
     return relative.startsWith("..")
-      ? to.path
+      ? path.resolve(to.path)
       : relative
   }
 
@@ -134,7 +136,7 @@ export default class FileSystem {
     const relative = path.relative(from, to)
 
     return relative.startsWith("..")
-      ? to
+      ? path.resolve(to)
       : relative
   }
 
@@ -165,9 +167,13 @@ export default class FileSystem {
       const result = path.join(...prefix, ...to)
 
       // If original path1 was absolute, ensure result is also absolute
-      return isAbsolutePath1 && !path.isAbsolute(result)
-        ? path.sep + result
-        : result
+      if(isAbsolutePath1 && !path.isAbsolute(result)) {
+        const root = path.parse(path1).root || path.sep
+
+        return path.join(root, result)
+      }
+
+      return result
     }
 
     // If no overlap, just join the paths
@@ -235,7 +241,7 @@ export default class FileSystem {
     Valid.type(container, "String", {allowEmpty: false})
     Valid.type(candidate, "String", {allowEmpty: false})
 
-    const realPath = Data.append(container, "/")  // bookend this mofo
+    const realPath = Data.append(container, path.sep)  // bookend this mofo
 
     return candidate.startsWith(realPath)
   }

package/types/node/lib/FileSystem.d.ts

@@ -42,7 +42,7 @@ export default class FileSystem {
      * @param {FileObject|DirectoryObject} to - The target file or directory object
      * @returns {string} The relative path from `from` to `to`, or the absolute path if not reachable
      */
-    static relativeOrAbsolute(from: FileObject | DirectoryObject, to: FileObject | DirectoryObject): string;
+    static relativeOrAbsolute(from: path | path, to: path | path): string;
     /**
      * Computes the relative path from one file or directory to another.
      *
@@ -196,8 +196,6 @@ export default class FileSystem {
      * @returns {string} The relative path from the source to this instance, or the absolute path if not reachable
      * @throws {Sass} If the parameter is not a FileObject or DirectoryObject
      */
-    relativeTo(fileOrDirectoryObject: FileObject | DirectoryObject): string;
+    relativeTo(fileOrDirectoryObject: path | path): string;
 }
-export type FileObject = import("./FileObject.js").default;
-export type DirectoryObject = import("./DirectoryObject.js").default;
 //# sourceMappingURL=FileSystem.d.ts.map

package/types/node/lib/FileSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileSystem.d.ts","sourceRoot":"","sources":["../../../src/node/lib/FileSystem.js"],"names":[],"mappings":"AA2BA;;GAEG;AACH;IACE,kCAAwB;IACxB,uCAAkC;IAClC,mBAAsB;IAsBtB;;;;;;OAMG;IACH,4BAHW,MAAM,GACJ,MAAM,CAIlB;IAED;;;;;;OAMG;IACH,2BAHW,MAAM,GACJ,MAAM,CAQlB;IAED;;;;;;;;OAQG;IACH,0BALW,MAAM,GACJ,MAAM,CAUlB;IAED;;;;;;;;;;OAUG;IACH,gCAJW,UAAU,GAAC,eAAe,MAC1B,UAAU,GAAC,eAAe,GACxB,MAAM,CAYlB;IAED;;;;;;;;;;OAUG;IACH,oCAJW,MAAM,MACN,MAAM,GACJ,MAAM,CAQlB;IAED;;;;;;;;;OASG;IACH,oCALW,MAAM,SACN,MAAM,QACN,MAAM,GACJ,MAAM,CA0BlB;IAED;;;;;;;;OAQG;IACH,6BAJW,MAAM,UACN,MAAM,GACJ,MAAM,CAmClB;IAED;;;;;;;;;;;;OAYG;IACH,+BATW,MAAM,aACN,MAAM,GACJ,OAAO,CAcnB;IAED;;;;;;;;;;;;;;OAcG;IACH,iCATW,MAAM,MACN,MAAM,QACN,MAAM,GACJ,MAAM,GAAC,IAAI,CAwBvB;IAED;;;;;;;;;;;;;;OAcG;IACH,4BARW,MAAM,MACN,MAAM,GACJ,MAAM,CAYlB;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,+BAXW,MAAM,MACN,MAAM,QACN,MAAM,GACJ,MAAM,GAAC,IAAI,CA+BvB;IAED;;;;;;;OAOG;IAEH;;;;;;;OAOG;IACH,2BAJW,MAAM;;;;cAXH,MAAM;;;;aACN,MAAM;;;;aACN,MAAM;;;;cACN,MAAM;;;;cACN,MAAM;MAenB;IAED;;;;OAIG;IACH,kBAFa,MAAM,CAIlB;IAnVD;;;;;;;;;OASG;IACH,kCAJW,UAAU,GAAC,eAAe,GACxB,MAAM,CAWlB;CAkUF;yBArWa,OAAO,iBAAiB,EAAE,OAAO;8BACjC,OAAO,sBAAsB,EAAE,OAAO"}
+{"version":3,"file":"FileSystem.d.ts","sourceRoot":"","sources":["../../../src/node/lib/FileSystem.js"],"names":[],"mappings":"AA6BA;;GAEG;AACH;IACE,kCAAwB;IACxB,uCAAkC;IAClC,mBAAsB;IAsBtB;;;;;;OAMG;IACH,4BAHW,MAAM,GACJ,MAAM,CAIlB;IAED;;;;;;OAMG;IACH,2BAHW,MAAM,GACJ,MAAM,CAQlB;IAED;;;;;;;;OAQG;IACH,0BALW,MAAM,GACJ,MAAM,CAUlB;IAED;;;;;;;;;;OAUG;IACH,gCAJW,IAAU,GAAC,IAAe,MAC1B,IAAU,GAAC,IAAe,GACxB,MAAM,CAYlB;IAED;;;;;;;;;;OAUG;IACH,oCAJW,MAAM,MACN,MAAM,GACJ,MAAM,CAQlB;IAED;;;;;;;;;OASG;IACH,oCALW,MAAM,SACN,MAAM,QACN,MAAM,GACJ,MAAM,CA8BlB;IAED;;;;;;;;OAQG;IACH,6BAJW,MAAM,UACN,MAAM,GACJ,MAAM,CAmClB;IAED;;;;;;;;;;;;OAYG;IACH,+BATW,MAAM,aACN,MAAM,GACJ,OAAO,CAcnB;IAED;;;;;;;;;;;;;;OAcG;IACH,iCATW,MAAM,MACN,MAAM,QACN,MAAM,GACJ,MAAM,GAAC,IAAI,CAwBvB;IAED;;;;;;;;;;;;;;OAcG;IACH,4BARW,MAAM,MACN,MAAM,GACJ,MAAM,CAYlB;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,+BAXW,MAAM,MACN,MAAM,QACN,MAAM,GACJ,MAAM,GAAC,IAAI,CA+BvB;IAED;;;;;;;OAOG;IAEH;;;;;;;OAOG;IACH,2BAJW,MAAM;;;;cAXH,MAAM;;;;aACN,MAAM;;;;aACN,MAAM;;;;cACN,MAAM;;;;cACN,MAAM;MAenB;IAED;;;;OAIG;IACH,kBAFa,MAAM,CAIlB;IAvVD;;;;;;;;;OASG;IACH,kCAJW,IAAU,GAAC,IAAe,GACxB,MAAM,CAWlB;CAsUF"}