Merge pull request #511 from eik-lib/refactor

Refactor to use new common packages + remove eik map command
eik-lib · Aug 17, 2022 · b2b62f2 · b2b62f2
2 parents 2e9dc71 + f7f9801
commit b2b62f2
Show file tree

Hide file tree

Showing 26 changed files with 204 additions and 249 deletions.
diff --git a/classes/alias.js b/classes/alias.js
@@ -3,9 +3,12 @@
 const assert = require('assert');
 const abslog = require('abslog');
 const { join } = require('path');
-const { schemas, validators } = require('@eik/common');
+
+const validators = require('@eik/common-validators');
+const schemas = require('@eik/common-schemas');
+
+const { typeSlug } = require('@eik/common-utils');
 const { request } = require('../utils/http');
-const { typeSlug } = require('../utils');
 
 module.exports = class Alias {
     constructor({ logger, server, token, type, name, version, alias } = {}) {

diff --git a/classes/integrity.js b/classes/integrity.js
@@ -5,9 +5,11 @@
 
 const abslog = require('abslog');
 const { join } = require('path');
-const { schemas, ValidationError } = require('@eik/common');
+
+const schemas = require('@eik/common-schemas');
+
+const { typeSlug } = require('@eik/common-utils');
 const fetch = require('node-fetch');
-const { typeSlug } = require('../utils');
 
 module.exports = class Integrity {
     constructor({
@@ -46,12 +48,16 @@ module.exports = class Integrity {
 
             this.log.debug(`  ==> debug: ${this.debug}`);
             if (typeof this.debug !== 'boolean') {
-                throw new ValidationError(`Parameter "debug" is not valid`);
+                throw new schemas.ValidationError(
+                    `Parameter "debug" is not valid`,
+                );
             }
 
             this.log.debug(`  ==> cwd: ${this.cwd}`);
             if (typeof this.cwd !== 'string') {
-                throw new ValidationError(`Parameter "cwd" is not valid`);
+                throw new schemas.ValidationError(
+                    `Parameter "cwd" is not valid`,
+                );
             }
         } catch (err) {
             throw new Error(

diff --git a/classes/login.js b/classes/login.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const abslog = require('abslog');
-const { schemas, ValidationError } = require('@eik/common');
+const schemas = require('@eik/common-schemas');
 const { request } = require('../utils/http');
 
 module.exports = class Login {
@@ -17,7 +17,7 @@ module.exports = class Login {
         try {
             schemas.assert.server(this.server);
             if (!this.key || typeof !this.key === 'string') {
-                throw new ValidationError('"key" must be a string');
+                throw new schemas.ValidationError('"key" must be a string');
             }
         } catch (err) {
             this.log.error(err.message);

diff --git a/classes/meta.js b/classes/meta.js
@@ -5,7 +5,7 @@
 
 const abslog = require('abslog');
 const { join } = require('path');
-const { schemas } = require('@eik/common');
+const schemas = require('@eik/common-schemas');
 const fetch = require('node-fetch');
 
 const types = ['pkg', 'map', 'npm'];

diff --git a/classes/ping.js b/classes/ping.js
@@ -2,7 +2,7 @@
 
 const fetch = require('node-fetch');
 const abslog = require('abslog');
-const { schemas } = require('@eik/common');
+const schemas = require('@eik/common-schemas');
 
 module.exports = class Ping {
     constructor({ logger, server } = {}) {

diff --git a/classes/publish/map.js b/classes/publish/map.js
@@ -4,7 +4,7 @@ const assert = require('assert');
 const abslog = require('abslog');
 const { join, parse, isAbsolute } = require('path');
 const { existsSync } = require('fs');
-const { schemas } = require('@eik/common');
+const schemas = require('@eik/common-schemas');
 const { request } = require('../../utils/http');
 
 module.exports = class PublishMap {

diff --git a/classes/publish/package/index.js b/classes/publish/package/index.js
@@ -2,8 +2,8 @@
 
 const abslog = require('abslog');
 const { join, isAbsolute } = require('path');
-const { EikConfig } = require('@eik/common');
-const { typeSlug } = require('../../../utils');
+const { EikConfig } = require('@eik/common-config-loader');
+const { typeSlug } = require('@eik/common-utils');
 const ValidateInput = require('./tasks/validate-input');
 const CreateTempDirectory = require('./tasks/create-temp-directory');
 const CreateZipFile = require('./tasks/create-zip-file');

diff --git a/classes/publish/package/tasks/check-if-already-published.js b/classes/publish/package/tasks/check-if-already-published.js
@@ -3,9 +3,9 @@
 'use strict';
 
 const { join } = require('path');
+const { typeSlug } = require('@eik/common-utils');
 const { integrity, versions } = require('../../../../utils/http');
 const hash = require('../../../../utils/hash');
-const { typeSlug } = require('../../../../utils');
 const Task = require('./task');
 
 module.exports = class CheckIfAlreadyPublished extends Task {

diff --git a/classes/publish/package/tasks/upload-files.js b/classes/publish/package/tasks/upload-files.js
@@ -3,8 +3,8 @@
 'use strict';
 
 const { join } = require('path');
+const { typeSlug } = require('@eik/common-utils');
 const { request } = require('../../../../utils/http');
-const { typeSlug } = require('../../../../utils');
 const Task = require('./task');
 
 module.exports = class UploadFiles extends Task {
@@ -30,6 +30,7 @@ module.exports = class UploadFiles extends Task {
             return message;
         } catch (err) {
             log.error('Unable to upload zip file to server');
+
             switch (err.statusCode) {
                 case 400:
                     throw new Error(
@@ -52,7 +53,9 @@ module.exports = class UploadFiles extends Task {
                         'Server was unable to write file to storage',
                     );
                 default:
-                    throw new Error('Server failed');
+                    throw new Error(
+                        `Upload to server failed, server responded with: ${err.message}`,
+                    );
             }
         }
     }

diff --git a/classes/version.js b/classes/version.js
@@ -7,10 +7,13 @@ const { join, isAbsolute, parse } = require('path');
 const abslog = require('abslog');
 const semver = require('semver');
 const mkdir = require('make-dir');
-const { schemas, EikConfig } = require('@eik/common');
+
+const { EikConfig } = require('@eik/common-config-loader');
+const schemas = require('@eik/common-schemas');
+
+const { typeSlug } = require('@eik/common-utils');
 const { integrity } = require('../utils/http');
 const hash = require('../utils/hash');
-const { typeSlug } = require('../utils');
 
 module.exports = class Version {
     constructor({

diff --git a/commands/integrity.js b/commands/integrity.js
@@ -6,11 +6,9 @@
 
 const { join } = require('path');
 const ora = require('ora');
-const {
-    helpers: { configStore },
-} = require('@eik/common');
+const { configStore, getDefaults } = require('@eik/common-config-loader');
 const Integrity = require('../classes/integrity');
-const { logger, getDefaults, getCWD } = require('../utils');
+const { logger, getCWD } = require('../utils');
 const json = require('../utils/json');
 
 exports.command = 'integrity [name] [version]';

diff --git a/commands/login.js b/commands/login.js
@@ -1,10 +1,11 @@
 'use strict';
 
 const homedir = require('os').homedir();
+const { getDefaults } = require('@eik/common-config-loader');
 const readline = require('readline');
 const ora = require('ora');
 const Login = require('../classes/login');
-const { logger, getDefaults, getCWD } = require('../utils');
+const { logger, getCWD } = require('../utils');
 const json = require('../utils/json');
 
 exports.command = 'login';

diff --git a/commands/map-alias.js b/commands/map-alias.js
@@ -1,8 +1,9 @@
 'use strict';
 
 const ora = require('ora');
+const { getDefaults } = require('@eik/common-config-loader');
 const Alias = require('../classes/alias');
-const { logger, getDefaults, getCWD } = require('../utils');
+const { logger, getCWD } = require('../utils');
 const { Alias: AliasFormatter } = require('../formatters');
 
 exports.command = 'map-alias <name> <version> <alias>';

diff --git a/commands/map.js b/commands/map.js
diff --git a/commands/meta.js b/commands/meta.js
@@ -5,9 +5,10 @@
 'use strict';
 
 const ora = require('ora');
+const { getDefaults } = require('@eik/common-config-loader');
 const Meta = require('../classes/meta');
 const { Artifact } = require('../formatters');
-const { logger, getDefaults, getCWD } = require('../utils');
+const { logger, getCWD } = require('../utils');
 
 exports.command = 'meta <name>';
 

diff --git a/commands/npm-alias.js b/commands/npm-alias.js
@@ -1,8 +1,9 @@
 'use strict';
 
 const ora = require('ora');
+const { getDefaults } = require('@eik/common-config-loader');
 const Alias = require('../classes/alias');
-const { logger, getDefaults, getCWD } = require('../utils');
+const { logger, getCWD } = require('../utils');
 const { Alias: AliasFormatter } = require('../formatters');
 
 exports.command = 'npm-alias <name> <version> <alias>';

diff --git a/commands/package-alias.js b/commands/package-alias.js
@@ -2,8 +2,9 @@
 
 const ora = require('ora');
 const semver = require('semver');
+const { getDefaults } = require('@eik/common-config-loader');
 const Alias = require('../classes/alias');
-const { logger, getDefaults, getCWD } = require('../utils');
+const { logger, getCWD } = require('../utils');
 const { Alias: AliasFormatter } = require('../formatters');
 
 exports.command = 'package-alias [name] [version] [alias]';

diff --git a/commands/ping.js b/commands/ping.js
@@ -1,8 +1,9 @@
 'use strict';
 
 const ora = require('ora');
+const { getDefaults } = require('@eik/common-config-loader');
 const Ping = require('../classes/ping');
-const { logger, getDefaults, getCWD } = require('../utils');
+const { logger, getCWD } = require('../utils');
 
 exports.command = 'ping [server]';