@plugjs/plug 0.0.9 → 0.0.10

package/dist/run.cjs

@@ -24,7 +24,6 @@ __export(run_exports, {
 });
 module.exports = __toCommonJS(run_exports);
 var import_node_path = require("node:path");
-var import_assert = require("./assert.cjs");
 var import_files = require("./files.cjs");
 var import_log = require("./log.cjs");
 var import_paths = require("./paths.cjs");
@@ -48,19 +47,14 @@ var RunImpl = class {
   report(title) {
     return (0, import_log.createReport)(title, this.taskName);
   }
-  resolve(...paths) {
-    const path = (0, import_node_path.join)(...paths);
-    if (!path)
-      return this.buildDir;
-    if (path.startsWith("@")) {
-      const components = (0, import_node_path.normalize)(path.substring(1)).split(import_node_path.sep);
-      const relative = (0, import_node_path.join)(...components);
-      (0, import_assert.assert)(!(0, import_paths.isAbsolutePath)(relative), `Path "${path.substring(1)}" is absolute`);
-      return (0, import_paths.resolveAbsolutePath)(this.buildDir, relative);
+  resolve(path, ...paths) {
+    if (path && path.startsWith("@")) {
+      const components = path.substring(1).split(import_node_path.sep).filter((s) => !!s);
+      return (0, import_paths.resolveAbsolutePath)(this.buildDir, ...components, ...paths);
     }
-    if ((0, import_paths.isAbsolutePath)(path))
-      return path;
-    return (0, import_paths.resolveAbsolutePath)((0, import_paths.getCurrentWorkingDirectory)(), path);
+    if (!path)
+      return (0, import_paths.getCurrentWorkingDirectory)();
+    return (0, import_paths.resolveAbsolutePath)((0, import_paths.getCurrentWorkingDirectory)(), path, ...paths);
   }
   files(first, ...paths) {
     if (typeof first === "string") {

package/dist/run.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/run.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAqC;AACrC,oBAAuB;AACvB,mBAAoC;AACpC,iBAAwF;AACxF,mBAA8F;AAC9F,kBAA+B;AAC/B,qBAA2C;AAC3C,kBAAkC;AAgF3B,IAAM,UAAN,MAA6B;AAAA,EACzB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAIT,YAAY,EAAE,UAAU,UAAU,WAAW,IAAI,GAA2B;AAC1E,SAAK,WAAW;AAChB,SAAK,WAAW;AAChB,SAAK,YAAY;AACjB,SAAK,MAAM,WAAO,sBAAU,QAAQ;AAAA,EACtC;AAAA,EAGA,YAAY,OAA6B;AACvC,SAAK,IAAI,YAAQ,2BAAe,KAAK;AAAA,EACvC;AAAA,EAEA,OAAO,OAAuB;AAC5B,eAAO,yBAAa,OAAO,KAAK,QAAQ;AAAA,EAC1C;AAAA,EAEA,WAAW,OAA+B;AACxC,UAAM,WAAO,uBAAK,GAAG,KAAK;AAC1B,QAAI,CAAE;AAAM,aAAO,KAAK;AAExB,QAAI,KAAK,WAAW,GAAG,GAAG;AACxB,YAAM,iBAAa,4BAAU,KAAK,UAAU,CAAC,CAAC,EAAE,MAAM,oBAAG;AACzD,YAAM,eAAW,uBAAK,GAAG,UAAU;AACnC,gCAAO,KAAE,6BAAe,QAAQ,GAAG,SAAS,KAAK,UAAU,CAAC,gBAAgB;AAC5E,iBAAO,kCAAoB,KAAK,UAAU,QAAQ;AAAA,IACpD;AAEA,YAAI,6BAAe,IAAI;AAAG,aAAO;AAEjC,eAAO,sCAAoB,yCAA2B,GAAG,IAAI;AAAA,EAC/D;AAAA,EAIA,MAAM,UAAsC,OAA+B;AACzE,QAAI,OAAO,UAAU,UAAU;AAC7B,aAAO,mBAAM,QAAQ,KAAK,QAAQ,OAAO,GAAG,KAAK,CAAC;AAAA,IACpD,WAAW,OAAO;AAChB,aAAO,mBAAM,QAAQ,KAAK;AAAA,IAC5B,OAAO;AACL,aAAO,mBAAM,QAAQ,KAAK,QAAQ,CAAC;AAAA,IACrC;AAAA,EACF;AAAA,EAEA,KAAK,SAAiB,MAAwD;AAC5E,UAAM,EAAE,QAAQ,SAAS,EAAE,cAAc,QAAQ,EAAE,QAAI,6BAAa,MAAM,CAAC,CAAC;AAE5E,UAAM,UAAU,QAAQ,QAAQ,EAAE,KAAK,YAAY;AACjD,YAAM,UAAU,KAAK,MAAM,aAAa,GAAG;AAC3C,uBAAiB,YAAQ,kBAAK,QAAQ,WAAW,CAAE,MAAM,GAAG,MAAO,GAAG,OAAO,GAAG;AAC9E,gBAAQ,UAAU,IAAI;AAAA,MACxB;AACA,aAAO,QAAQ,MAAM;AAAA,IACvB,CAAC;AAED,WAAO,KAAK,KAAK,OAAO;AAAA,EAC1B;AAAA,EAEA,KAAK,OAAsD;AACzD,WAAO,IAAI,qBAAS,OAAO,IAAI;AAAA,EACjC;AAAA,EAEA,KAAK,MAA0C;AAC7C,UAAM,IAAI,MAAM,wBAAwB,OAAO;AAAA,EACjD;AACF;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAoB;AACpB,mBAAoC;AACpC,iBAAwF;AACxF,mBAA8E;AAC9E,kBAA+B;AAC/B,qBAA2C;AAC3C,kBAAkC;AAgF3B,IAAM,UAAN,MAA6B;AAAA,EACzB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAIT,YAAY,EAAE,UAAU,UAAU,WAAW,IAAI,GAA2B;AAC1E,SAAK,WAAW;AAChB,SAAK,WAAW;AAChB,SAAK,YAAY;AACjB,SAAK,MAAM,WAAO,sBAAU,QAAQ;AAAA,EACtC;AAAA,EAGA,YAAY,OAA6B;AACvC,SAAK,IAAI,YAAQ,2BAAe,KAAK;AAAA,EACvC;AAAA,EAEA,OAAO,OAAuB;AAC5B,eAAO,yBAAa,OAAO,KAAK,QAAQ;AAAA,EAC1C;AAAA,EAEA,QAAQ,SAAkB,OAA+B;AAEvD,QAAI,QAAQ,KAAK,WAAW,GAAG,GAAG;AAEhC,YAAM,aAAa,KAAK,UAAU,CAAC,EAAE,MAAM,oBAAG,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;AACjE,iBAAO,kCAAoB,KAAK,UAAU,GAAG,YAAY,GAAG,KAAK;AAAA,IACnE;AAGA,QAAI,CAAE;AAAM,iBAAO,yCAA2B;AAG9C,eAAO,sCAAoB,yCAA2B,GAAG,MAAM,GAAG,KAAK;AAAA,EACzE;AAAA,EAIA,MAAM,UAAsC,OAA+B;AACzE,QAAI,OAAO,UAAU,UAAU;AAC7B,aAAO,mBAAM,QAAQ,KAAK,QAAQ,OAAO,GAAG,KAAK,CAAC;AAAA,IACpD,WAAW,OAAO;AAChB,aAAO,mBAAM,QAAQ,KAAK;AAAA,IAC5B,OAAO;AACL,aAAO,mBAAM,QAAQ,KAAK,QAAQ,CAAC;AAAA,IACrC;AAAA,EACF;AAAA,EAEA,KAAK,SAAiB,MAAwD;AAC5E,UAAM,EAAE,QAAQ,SAAS,EAAE,cAAc,QAAQ,EAAE,QAAI,6BAAa,MAAM,CAAC,CAAC;AAE5E,UAAM,UAAU,QAAQ,QAAQ,EAAE,KAAK,YAAY;AACjD,YAAM,UAAU,KAAK,MAAM,aAAa,GAAG;AAC3C,uBAAiB,YAAQ,kBAAK,QAAQ,WAAW,CAAE,MAAM,GAAG,MAAO,GAAG,OAAO,GAAG;AAC9E,gBAAQ,UAAU,IAAI;AAAA,MACxB;AACA,aAAO,QAAQ,MAAM;AAAA,IACvB,CAAC;AAED,WAAO,KAAK,KAAK,OAAO;AAAA,EAC1B;AAAA,EAEA,KAAK,OAAsD;AACzD,WAAO,IAAI,qBAAS,OAAO,IAAI;AAAA,EACjC;AAAA,EAEA,KAAK,MAA0C;AAC7C,UAAM,IAAI,MAAM,wBAAwB,OAAO;AAAA,EACjD;AACF;",
   "names": []
 }

package/dist/run.mjs

@@ -1,9 +1,8 @@
 // run.ts
-import { join, normalize, sep } from "node:path";
-import { assert } from "./assert.mjs";
+import { sep } from "node:path";
 import { Files } from "./files.mjs";
 import { createReport, getLevelNumber, getLogger } from "./log.mjs";
-import { getCurrentWorkingDirectory, isAbsolutePath, resolveAbsolutePath } from "./paths.mjs";
+import { getCurrentWorkingDirectory, resolveAbsolutePath } from "./paths.mjs";
 import { PipeImpl } from "./pipe.mjs";
 import { parseOptions } from "./utils/options.mjs";
 import { walk } from "./utils/walk.mjs";
@@ -24,19 +23,14 @@ var RunImpl = class {
   report(title) {
     return createReport(title, this.taskName);
   }
-  resolve(...paths) {
-    const path = join(...paths);
-    if (!path)
-      return this.buildDir;
-    if (path.startsWith("@")) {
-      const components = normalize(path.substring(1)).split(sep);
-      const relative = join(...components);
-      assert(!isAbsolutePath(relative), `Path "${path.substring(1)}" is absolute`);
-      return resolveAbsolutePath(this.buildDir, relative);
+  resolve(path, ...paths) {
+    if (path && path.startsWith("@")) {
+      const components = path.substring(1).split(sep).filter((s) => !!s);
+      return resolveAbsolutePath(this.buildDir, ...components, ...paths);
     }
-    if (isAbsolutePath(path))
-      return path;
-    return resolveAbsolutePath(getCurrentWorkingDirectory(), path);
+    if (!path)
+      return getCurrentWorkingDirectory();
+    return resolveAbsolutePath(getCurrentWorkingDirectory(), path, ...paths);
   }
   files(first, ...paths) {
     if (typeof first === "string") {

package/dist/run.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/run.ts"],
-  "mappings": ";AAAA,SAAS,MAAM,WAAW,WAAW;AACrC,SAAS,cAAc;AACvB,SAAS,aAA2B;AACpC,SAAS,cAAc,gBAAgB,iBAAiD;AACxF,SAAuB,4BAA4B,gBAAgB,2BAA2B;AAC9F,SAAe,gBAAgB;AAC/B,SAAuB,oBAAoB;AAC3C,SAAS,YAAyB;AAgF3B,IAAM,UAAN,MAA6B;AAAA,EACzB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAIT,YAAY,EAAE,UAAU,UAAU,WAAW,IAAI,GAA2B;AAC1E,SAAK,WAAW;AAChB,SAAK,WAAW;AAChB,SAAK,YAAY;AACjB,SAAK,MAAM,OAAO,UAAU,QAAQ;AAAA,EACtC;AAAA,EAGA,YAAY,OAA6B;AACvC,SAAK,IAAI,QAAQ,eAAe,KAAK;AAAA,EACvC;AAAA,EAEA,OAAO,OAAuB;AAC5B,WAAO,aAAa,OAAO,KAAK,QAAQ;AAAA,EAC1C;AAAA,EAEA,WAAW,OAA+B;AACxC,UAAM,OAAO,KAAK,GAAG,KAAK;AAC1B,QAAI,CAAE;AAAM,aAAO,KAAK;AAExB,QAAI,KAAK,WAAW,GAAG,GAAG;AACxB,YAAM,aAAa,UAAU,KAAK,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG;AACzD,YAAM,WAAW,KAAK,GAAG,UAAU;AACnC,aAAO,CAAE,eAAe,QAAQ,GAAG,SAAS,KAAK,UAAU,CAAC,gBAAgB;AAC5E,aAAO,oBAAoB,KAAK,UAAU,QAAQ;AAAA,IACpD;AAEA,QAAI,eAAe,IAAI;AAAG,aAAO;AAEjC,WAAO,oBAAoB,2BAA2B,GAAG,IAAI;AAAA,EAC/D;AAAA,EAIA,MAAM,UAAsC,OAA+B;AACzE,QAAI,OAAO,UAAU,UAAU;AAC7B,aAAO,MAAM,QAAQ,KAAK,QAAQ,OAAO,GAAG,KAAK,CAAC;AAAA,IACpD,WAAW,OAAO;AAChB,aAAO,MAAM,QAAQ,KAAK;AAAA,IAC5B,OAAO;AACL,aAAO,MAAM,QAAQ,KAAK,QAAQ,CAAC;AAAA,IACrC;AAAA,EACF;AAAA,EAEA,KAAK,SAAiB,MAAwD;AAC5E,UAAM,EAAE,QAAQ,SAAS,EAAE,cAAc,QAAQ,EAAE,IAAI,aAAa,MAAM,CAAC,CAAC;AAE5E,UAAM,UAAU,QAAQ,QAAQ,EAAE,KAAK,YAAY;AACjD,YAAM,UAAU,KAAK,MAAM,aAAa,GAAG;AAC3C,uBAAiB,QAAQ,KAAK,QAAQ,WAAW,CAAE,MAAM,GAAG,MAAO,GAAG,OAAO,GAAG;AAC9E,gBAAQ,UAAU,IAAI;AAAA,MACxB;AACA,aAAO,QAAQ,MAAM;AAAA,IACvB,CAAC;AAED,WAAO,KAAK,KAAK,OAAO;AAAA,EAC1B;AAAA,EAEA,KAAK,OAAsD;AACzD,WAAO,IAAI,SAAS,OAAO,IAAI;AAAA,EACjC;AAAA,EAEA,KAAK,MAA0C;AAC7C,UAAM,IAAI,MAAM,wBAAwB,OAAO;AAAA,EACjD;AACF;",
+  "mappings": ";AAAA,SAAS,WAAW;AACpB,SAAS,aAA2B;AACpC,SAAS,cAAc,gBAAgB,iBAAiD;AACxF,SAAuB,4BAA4B,2BAA2B;AAC9E,SAAe,gBAAgB;AAC/B,SAAuB,oBAAoB;AAC3C,SAAS,YAAyB;AAgF3B,IAAM,UAAN,MAA6B;AAAA,EACzB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAIT,YAAY,EAAE,UAAU,UAAU,WAAW,IAAI,GAA2B;AAC1E,SAAK,WAAW;AAChB,SAAK,WAAW;AAChB,SAAK,YAAY;AACjB,SAAK,MAAM,OAAO,UAAU,QAAQ;AAAA,EACtC;AAAA,EAGA,YAAY,OAA6B;AACvC,SAAK,IAAI,QAAQ,eAAe,KAAK;AAAA,EACvC;AAAA,EAEA,OAAO,OAAuB;AAC5B,WAAO,aAAa,OAAO,KAAK,QAAQ;AAAA,EAC1C;AAAA,EAEA,QAAQ,SAAkB,OAA+B;AAEvD,QAAI,QAAQ,KAAK,WAAW,GAAG,GAAG;AAEhC,YAAM,aAAa,KAAK,UAAU,CAAC,EAAE,MAAM,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;AACjE,aAAO,oBAAoB,KAAK,UAAU,GAAG,YAAY,GAAG,KAAK;AAAA,IACnE;AAGA,QAAI,CAAE;AAAM,aAAO,2BAA2B;AAG9C,WAAO,oBAAoB,2BAA2B,GAAG,MAAM,GAAG,KAAK;AAAA,EACzE;AAAA,EAIA,MAAM,UAAsC,OAA+B;AACzE,QAAI,OAAO,UAAU,UAAU;AAC7B,aAAO,MAAM,QAAQ,KAAK,QAAQ,OAAO,GAAG,KAAK,CAAC;AAAA,IACpD,WAAW,OAAO;AAChB,aAAO,MAAM,QAAQ,KAAK;AAAA,IAC5B,OAAO;AACL,aAAO,MAAM,QAAQ,KAAK,QAAQ,CAAC;AAAA,IACrC;AAAA,EACF;AAAA,EAEA,KAAK,SAAiB,MAAwD;AAC5E,UAAM,EAAE,QAAQ,SAAS,EAAE,cAAc,QAAQ,EAAE,IAAI,aAAa,MAAM,CAAC,CAAC;AAE5E,UAAM,UAAU,QAAQ,QAAQ,EAAE,KAAK,YAAY;AACjD,YAAM,UAAU,KAAK,MAAM,aAAa,GAAG;AAC3C,uBAAiB,QAAQ,KAAK,QAAQ,WAAW,CAAE,MAAM,GAAG,MAAO,GAAG,OAAO,GAAG;AAC9E,gBAAQ,UAAU,IAAI;AAAA,MACxB;AACA,aAAO,QAAQ,MAAM;AAAA,IACvB,CAAC;AAED,WAAO,KAAK,KAAK,OAAO;AAAA,EAC1B;AAAA,EAEA,KAAK,OAAsD;AACzD,WAAO,IAAI,SAAS,OAAO,IAAI;AAAA,EACjC;AAAA,EAEA,KAAK,MAA0C;AAC7C,UAAM,IAAI,MAAM,wBAAwB,OAAO;AAAA,EACjD;AACF;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plugjs/plug",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "type": "commonjs",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",

package/src/run.ts

@@ -1,8 +1,7 @@
-import { join, normalize, sep } from 'node:path'
-import { assert } from './assert.js'
+import { sep } from 'node:path'
 import { Files, FilesBuilder } from './files.js'
 import { createReport, getLevelNumber, getLogger, Logger, LogLevelString, Report } from './log.js'
-import { AbsolutePath, getCurrentWorkingDirectory, isAbsolutePath, resolveAbsolutePath } from './paths.js'
+import { AbsolutePath, getCurrentWorkingDirectory, resolveAbsolutePath } from './paths.js'
 import { Pipe, PipeImpl } from './pipe.js'
 import { ParseOptions, parseOptions } from './utils/options.js'
 import { walk, WalkOptions } from './utils/walk.js'
@@ -109,20 +108,19 @@ export class RunImpl implements Run {
     return createReport(title, this.taskName)
   }
 
-  resolve(...paths: string[]): AbsolutePath {
-    const path = join(...paths)
-    if (! path) return this.buildDir
-
-    if (path.startsWith('@')) {
-      const components = normalize(path.substring(1)).split(sep)
-      const relative = join(...components) // this will remove any leading slash
-      assert(! isAbsolutePath(relative), `Path "${path.substring(1)}" is absolute`)
-      return resolveAbsolutePath(this.buildDir, relative)
+  resolve(path?: string, ...paths: string[]): AbsolutePath {
+    // Paths starting with "@" are relative to the build file directory
+    if (path && path.startsWith('@')) {
+      // We can have paths like "@/../foo/bar" or "@../foo/bar"... both are ok
+      const components = path.substring(1).split(sep).filter((s) => !!s)
+      return resolveAbsolutePath(this.buildDir, ...components, ...paths)
     }
 
-    if (isAbsolutePath(path)) return path
+    // No path? Resolve to the CWD!
+    if (! path) return getCurrentWorkingDirectory()
 
-    return resolveAbsolutePath(getCurrentWorkingDirectory(), path)
+    // For all the rest, normal resolution!
+    return resolveAbsolutePath(getCurrentWorkingDirectory(), path, ...paths)
   }
 
   files(files: Files): FilesBuilder

package/types/run.d.ts

@@ -80,7 +80,7 @@ export declare class RunImpl implements Run {
     /** Set the logging level within this {@link Run} */
     setLogLevel(level: LogLevelString): void;
     report(title: string): Report;
-    resolve(...paths: string[]): AbsolutePath;
+    resolve(path?: string, ...paths: string[]): AbsolutePath;
     files(files: Files): FilesBuilder;
     files(...paths: string[]): FilesBuilder;
     find(glob: string, ...args: ParseOptions<FindOptions>): Pipe & Promise<Files>;