rman 0.33.2 → 0.35.0

package/cjs/commands/publish-command.js

@@ -63,9 +63,14 @@ class PublishCommand extends run_command_js_1.RunCommand {
         if (command === '#') {
             if (pkg === this.repository.rootPackage)
                 return { code: 0 };
-            const cwd = this.options.contents
-                ? path_1.default.resolve(this.repository.dirname, path_1.default.join(this.options.contents, path_1.default.basename(pkg.dirname)))
-                : pkg.dirname;
+            let cwd = pkg.dirname;
+            if (this.options.contents) {
+                const contents = this.options.contents.replaceAll('${package.basename}', pkg.basename);
+                if (contents.startsWith('/'))
+                    cwd = path_1.default.join(this.repository.dirname, contents);
+                else
+                    cwd = path_1.default.join(pkg.dirname, contents);
+            }
             return super._exec(pkg, 'npm publish' +
                 (this.options.access ? ' --access=' + this.options.access : '') +
                 (this.options.userconfig ? ` --userconfig="${this.options.userconfig}"` : ''), {

package/cjs/core/package.js

@@ -10,6 +10,9 @@ class Package {
         this.dependencies = [];
         this.reloadJson();
     }
+    get basename() {
+        return path_1.default.basename(this.dirname);
+    }
     get name() {
         return this._json.name;
     }

package/esm/commands/publish-command.js

@@ -59,9 +59,14 @@ export class PublishCommand extends RunCommand {
         if (command === '#') {
             if (pkg === this.repository.rootPackage)
                 return { code: 0 };
-            const cwd = this.options.contents
-                ? path.resolve(this.repository.dirname, path.join(this.options.contents, path.basename(pkg.dirname)))
-                : pkg.dirname;
+            let cwd = pkg.dirname;
+            if (this.options.contents) {
+                const contents = this.options.contents.replaceAll('${package.basename}', pkg.basename);
+                if (contents.startsWith('/'))
+                    cwd = path.join(this.repository.dirname, contents);
+                else
+                    cwd = path.join(pkg.dirname, contents);
+            }
             return super._exec(pkg, 'npm publish' +
                 (this.options.access ? ' --access=' + this.options.access : '') +
                 (this.options.userconfig ? ` --userconfig="${this.options.userconfig}"` : ''), {

package/esm/core/package.js

@@ -6,6 +6,9 @@ export class Package {
         this.dependencies = [];
         this.reloadJson();
     }
+    get basename() {
+        return path.basename(this.dirname);
+    }
     get name() {
         return this._json.name;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rman",
   "description": "Monorepo repository manager",
-  "version": "0.33.2",
+  "version": "0.35.0",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {

package/types/core/package.d.ts

@@ -3,6 +3,7 @@ export declare class Package {
     private _json;
     dependencies: string[];
     constructor(dirname: string);
+    get basename(): string;
     get name(): string;
     get version(): string;
     get json(): any;