@eik/cli 3.1.2 → 3.1.3

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [3.1.3](https://github.com/eik-lib/cli/compare/v3.1.2...v3.1.3) (2024-08-19)
+
+
+### Bug Fixes
+
+* add support for Windows ([#584](https://github.com/eik-lib/cli/issues/584)) ([3d2dc7e](https://github.com/eik-lib/cli/commit/3d2dc7ef87abc48a3b4b796e5d717b280837974b))
+
 ## [3.1.2](https://github.com/eik-lib/cli/compare/v3.1.1...v3.1.2) (2024-08-19)
 
 

package/classes/alias.js

@@ -1,9 +1,9 @@
 import assert from 'assert';
 import abslog from 'abslog';
-import { join } from 'path';
 import { schemas, validators } from '@eik/common';
 import { request } from '../utils/http/index.js';
 import { typeSlug } from '../utils/index.js';
+import { joinUrlPathname } from '../utils/url.js';
 
 /**
  * @typedef {object} AliasOptions
@@ -74,7 +74,11 @@ export default class Alias {
             `Requesting creation of ${this.type} alias "v${this.alias}" for ${this.name} v${this.version} on ${this.server}`,
         );
 
-        const pathname = join(this.type, this.name, `v${this.alias}`);
+        const pathname = joinUrlPathname(
+            this.type,
+            this.name,
+            `v${this.alias}`,
+        );
         try {
             const { message } = await request({
                 host: this.server,

package/classes/integrity.js

@@ -1,7 +1,7 @@
 import abslog from 'abslog';
-import { join } from 'path';
 import eik from '@eik/common';
 import { typeSlug } from '../utils/index.js';
+import { joinUrlPathname } from '../utils/url.js';
 
 const { schemas } = eik;
 
@@ -79,7 +79,7 @@ export default class Integrity {
         this.log.debug('Requesting meta information from asset server');
         try {
             const url = new URL(
-                join(typeSlug(this.type), this.name, this.version),
+                joinUrlPathname(typeSlug(this.type), this.name, this.version),
                 this.server,
             );
             this.log.debug(`  ==> url: ${url}`);

package/classes/meta.js

@@ -1,6 +1,6 @@
 import abslog from 'abslog';
-import { join } from 'path';
 import { schemas } from '@eik/common';
+import { joinUrlPathname } from '../utils/url.js';
 
 const types = ['pkg', 'map', 'npm'];
 
@@ -40,7 +40,10 @@ export default class Meta {
         try {
             const typeFetches = [];
             for (const type of types) {
-                const url = new URL(join(type, this.name), this.server);
+                const url = new URL(
+                    joinUrlPathname(type, this.name),
+                    this.server,
+                );
                 url.search = `?t=${Date.now()}`;
                 typeFetches.push(fetch(url));
             }
@@ -64,7 +67,7 @@ export default class Meta {
                     for (let i = 0; i < data[type].versions.length; i++) {
                         const { version } = data[type].versions[i];
                         const url = new URL(
-                            join(type, name, version),
+                            joinUrlPathname(type, name, version),
                             this.server,
                         );
 

package/classes/publish/map.js

@@ -4,6 +4,7 @@ import { join, parse, isAbsolute } from 'path';
 import { existsSync } from 'fs';
 import { schemas } from '@eik/common';
 import { request } from '../../utils/http/index.js';
+import { joinUrlPathname } from '../../utils/url.js';
 
 /**
  * @typedef {object} PublishMapOptions
@@ -79,7 +80,7 @@ export default class PublishMap {
             await request({
                 method: 'PUT',
                 host: this.server,
-                pathname: join('map', this.name, this.version),
+                pathname: joinUrlPathname('map', this.name, this.version),
                 map: this.absoluteFile,
                 token: this.token,
             });

package/classes/publish/package/tasks/check-if-already-published.js

@@ -46,7 +46,7 @@ export default class CheckIfAlreadyPublished extends Task {
 
         let localHash;
         try {
-            const localFiles = [join(path, './eik.json')];
+            const localFiles = [join(path, 'eik.json')];
             if (files) {
                 const mappings = await this.config.mappings();
 

package/classes/publish/package/tasks/cleanup.js

@@ -1,6 +1,7 @@
-import { join } from 'path';
-import fs from 'fs';
-import { rimrafSync } from 'rimraf';
+import { join } from 'node:path';
+import { existsSync } from 'node:fs';
+import { readdir } from 'node:fs/promises';
+import { rimraf } from 'rimraf';
 import Task from './task.js';
 
 export default class Cleanup extends Task {
@@ -8,10 +9,13 @@ export default class Cleanup extends Task {
         const { log, path } = this;
         log.debug('Cleaning up');
 
-        if (fs.existsSync(path)) {
-            fs.readdirSync(path)
-                .filter((file) => file !== 'integrity.json')
-                .forEach((file) => rimrafSync(join(path, file)));
+        if (existsSync(path)) {
+            const dir = await readdir(path);
+            await Promise.all(
+                dir
+                    .filter((file) => file !== 'integrity.json')
+                    .map((file) => rimraf(join(path, file))),
+            );
         }
     }
 }

package/classes/publish/package/tasks/create-zip-file.js

@@ -10,13 +10,13 @@ export default class CreateZipFile extends Task {
         const { log, path } = this;
         const { name, map, server, out, files } = this.config;
 
-        log.debug(`Creating zip file`);
-        log.debug(`  ==> ${join(path, `eik.tgz`)}`);
+        log.debug('Creating zip file');
+        log.debug(`  ==> ${join(path, 'eik.tgz')}`);
 
         const filesToZip = [];
 
         try {
-            const eikPathDest = join(path, './eik.json');
+            const eikPathDest = join(path, 'eik.json');
             writeFileSync(
                 eikPathDest,
                 JSON.stringify(
@@ -59,7 +59,7 @@ export default class CreateZipFile extends Task {
         }
 
         try {
-            const zipFile = resolve(`${path}/eik.tgz`);
+            const zipFile = resolve(path, 'eik.tgz');
 
             await tar.c(
                 {

package/classes/publish/package/tasks/upload-files.js

@@ -1,6 +1,7 @@
-import { join } from 'path';
 import { request } from '../../../../utils/http/index.js';
 import { typeSlug } from '../../../../utils/index.js';
+import { joinUrlPathname } from '../../../../utils/url.js';
+
 import Task from './task.js';
 
 export default class UploadFiles extends Task {
@@ -9,7 +10,7 @@ export default class UploadFiles extends Task {
         const { server, name, version, type, token } = this.config;
         log.debug('Uploading zip file to server');
         try {
-            const pathname = join(
+            const pathname = joinUrlPathname(
                 typeSlug(type),
                 encodeURIComponent(name),
                 version,

package/classes/version.js

@@ -124,7 +124,7 @@ export default class Version {
         let localHash;
         try {
             makeDirectorySync(path);
-            const eikPathDest = join(path, './eik.json');
+            const eikPathDest = join(path, 'eik.json');
             const eikJSON = {
                 name,
                 server,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eik/cli",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "CLI tool for publishing assets to an Eik server",
   "main": "./classes/index.js",
   "types": "./types/classes/index.d.ts",
@@ -25,10 +25,6 @@
     "test:integration": "cross-env HTTP_PORT=0 LOG_LEVEL=fatal tap --timeout 0 --disable-coverage test/integration/**/*.test.mjs",
     "test:unit": "cross-env HTTP_PORT=0 LOG_LEVEL=fatal tap --timeout 0 --disable-coverage test/*.test.mjs",
     "test:tasks": "cross-env HTTP_PORT=0 LOG_LEVEL=fatal tap --timeout 0 --disable-coverage test/tasks/*.test.mjs",
-    "test:ci:integration": "npm run test:integration -- --jobs=1",
-    "test:ci:unit": "npm run test:unit -- --jobs=1",
-    "test:ci:tasks": "npm run test:tasks -- --jobs=1",
-    "test:ci": "run-s test:ci:*",
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
     "format:check": "prettier -c .",
@@ -62,7 +58,7 @@
   "devDependencies": {
     "@eik/eslint-config": "1.0.2",
     "@eik/semantic-release-config": "1.0.0",
-    "@eik/service": "2.3.0",
+    "@eik/service": "2.3.1",
     "@eik/sink-memory": "1.1.2",
     "@eik/typescript-config": "1.0.0",
     "cross-env": "7.0.3",

package/types/utils/url.d.ts

@@ -0,0 +1,6 @@
+/**
+ * A version of path.join that replaces \ (win32) with /
+ * @param  {...string} parts
+ * @returns {string}
+ */
+export function joinUrlPathname(...parts: string[]): string;

package/utils/url.js

@@ -0,0 +1,10 @@
+import { join } from 'node:path';
+
+/**
+ * A version of path.join that replaces \ (win32) with /
+ * @param  {...string} parts
+ * @returns {string}
+ */
+export function joinUrlPathname(...parts) {
+    return join(...parts).replace(/\\/g, '/');
+}