@eik/core 1.2.27 → 1.3.1

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [1.3.1](https://github.com/eik-lib/core/compare/v1.3.0...v1.3.1) (2022-01-07)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @eik/sink to v1.2.0 ([#298](https://github.com/eik-lib/core/issues/298)) ([d60a704](https://github.com/eik-lib/core/commit/d60a7047e2451cb4985329e728e2e42acc26bf6d))
+
+# [1.3.0](https://github.com/eik-lib/core/compare/v1.2.29...v1.3.0) (2022-01-07)
+
+
+### Features
+
+* Convert to ESM ([#297](https://github.com/eik-lib/core/issues/297)) ([86c5cb3](https://github.com/eik-lib/core/commit/86c5cb3be753b777dafb6a79753e4dd5412cd352))
+
+## [1.2.29](https://github.com/eik-lib/core/compare/v1.2.28...v1.2.29) (2022-01-05)
+
+
+### Bug Fixes
+
+* Upgrade to major version 1.3.0 of Busboy ([#296](https://github.com/eik-lib/core/issues/296)) ([295eec0](https://github.com/eik-lib/core/commit/295eec01d9c97d421f68cd3ecfd05e083716c462))
+
+## [1.2.28](https://github.com/eik-lib/core/compare/v1.2.27...v1.2.28) (2021-11-15)
+
+
+### Bug Fixes
+
+* **deps:** update dependency http-errors to v1.8.1 ([665552b](https://github.com/eik-lib/core/commit/665552b16c27bf3dd6ba5b6214c223d4ce023f99))
+
 ## [1.2.27](https://github.com/eik-lib/core/compare/v1.2.26...v1.2.27) (2021-11-03)
 
 

package/lib/classes/alias.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const Alias = class Alias {
     constructor({ name = '', type = '', alias = '', org = '' } = {}) {
         this._version = '';
@@ -47,4 +45,5 @@ const Alias = class Alias {
         return 'Alias';
     }
 }
-module.exports = Alias;
+
+export default Alias;

package/lib/classes/asset.js

@@ -1,7 +1,5 @@
-'use strict';
-
-const mime = require('mime/lite');
-const path = require('path');
+import mime from 'mime';
+import path from 'node:path';
 
 /**
  * Meta information about an Asset.
@@ -95,4 +93,5 @@ const Asset = class Asset {
         return 'Asset';
     }
 }
-module.exports = Asset;
+
+export default Asset;

package/lib/classes/author.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const Author = class Author {
     constructor({ name = '', user = '' } = {}) {
         this._name = name;
@@ -25,4 +23,5 @@ const Author = class Author {
         return 'Author';
     }
 }
-module.exports = Author;
+
+export default Author;

package/lib/classes/http-incoming.js

@@ -1,5 +1,3 @@
-'use strict';
-
 /**
  * A bearer object to hold misc data through a http
  * request / response cyclus.
@@ -70,4 +68,5 @@ const HttpIncoming = class HttpIncoming {
         return 'HttpIncoming';
     }
 };
-module.exports = HttpIncoming;
+
+export default HttpIncoming;

package/lib/classes/http-outgoing.js

@@ -1,6 +1,4 @@
-'use strict';
-
-const { stream } = require('@eik/common');
+import { stream } from '@eik/common';
 
 const STATUS_CODES = [
     100, 101, 102, 103,
@@ -88,4 +86,4 @@ const HttpOutgoing = class HttpOutgoing {
         return 'HttpOutgoing';
     }
 }
-module.exports = HttpOutgoing;
+export default HttpOutgoing;

package/lib/classes/meta.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const Meta = class Meta {
     constructor({
         value = '',
@@ -28,4 +26,5 @@ const Meta = class Meta {
         return 'Meta';
     }
 }
-module.exports = Meta;
+
+export default Meta;

package/lib/classes/package.js

@@ -1,8 +1,6 @@
-'use strict';
-
-const crypto = require('crypto');
-const Asset = require('./asset');
-const Meta = require('./meta');
+import crypto from 'node:crypto';
+import Asset from './asset.js';
+import Meta from './meta.js';
 
 const Package = class Package {
     constructor({ version = '', type = '', name = '', org = '', author = {} } = {}) {
@@ -85,4 +83,4 @@ const Package = class Package {
         return 'Package';
     }
 }
-module.exports = Package;
+export default Package;

package/lib/classes/versions.js

@@ -1,6 +1,4 @@
-'use strict';
-
-const semver = require('semver');
+import semver from 'semver';
 
 const Versions = class Versions {
     constructor({ versions = [], type = '', name = '', org = '' } = {}) {
@@ -65,4 +63,4 @@ const Versions = class Versions {
         return 'Versions';
     }
 }
-module.exports = Versions;
+export default Versions;

package/lib/handlers/alias.delete.js

@@ -1,15 +1,13 @@
-'use strict';
+import { validators } from '@eik/common';
+import originalUrl from 'original-url';
+import HttpError from 'http-errors';
+import Metrics from '@metrics/client';
+import abslog from 'abslog';
 
-const { validators } = require('@eik/common');
-const originalUrl = require('original-url');
-const HttpError = require('http-errors');
-const Metrics = require('@metrics/client');
-const abslog = require('abslog');
-
-const { createFilePathToAlias } = require('../utils/path-builders-fs');
-const HttpOutgoing = require('../classes/http-outgoing');
-const config = require('../utils/defaults');
-const utils = require('../utils/utils');
+import { createFilePathToAlias } from '../utils/path-builders-fs.js';
+import { decodeUriComponent } from '../utils/utils.js';
+import HttpOutgoing from '../classes/http-outgoing.js';
+import config from '../utils/defaults.js';
 
 const AliasDel = class AliasDel {
     constructor({
@@ -61,8 +59,8 @@ const AliasDel = class AliasDel {
     async handler(req, user, type, name, alias) {
         const end = this._histogram.timer();
 
-        const pAlias = utils.decodeUriComponent(alias);
-        const pName = utils.decodeUriComponent(name);
+        const pAlias = decodeUriComponent(alias);
+        const pName = decodeUriComponent(name);
 
         try {
             validators.alias(pAlias);
@@ -124,4 +122,4 @@ const AliasDel = class AliasDel {
         return outgoing;
     }
 };
-module.exports = AliasDel;
+export default AliasDel;

package/lib/handlers/alias.get.js

@@ -1,16 +1,14 @@
-'use strict';
+import { validators } from '@eik/common';
+import originalUrl from 'original-url';
+import HttpError from 'http-errors';
+import abslog from 'abslog';
+import Metrics from '@metrics/client';
 
-const { validators } = require('@eik/common');
-const originalUrl = require('original-url');
-const HttpError = require('http-errors');
-const abslog = require('abslog');
-const Metrics = require('@metrics/client');
-
-const { createURIToTargetOfAlias } = require('../utils/path-builders-uri');
-const { createFilePathToAlias } = require('../utils/path-builders-fs');
-const HttpOutgoing = require('../classes/http-outgoing');
-const utils = require('../utils/utils');
-const config = require('../utils/defaults');
+import { decodeUriComponent, readJSON } from '../utils/utils.js';
+import { createURIToTargetOfAlias } from '../utils/path-builders-uri.js';
+import { createFilePathToAlias } from '../utils/path-builders-fs.js';
+import HttpOutgoing from '../classes/http-outgoing.js';
+import config from '../utils/defaults.js';
 
 const AliasGet = class AliasGet {
     constructor({
@@ -53,9 +51,9 @@ const AliasGet = class AliasGet {
     async handler(req, type, name, alias, extra) {
         const end = this._histogram.timer();
 
-        const pAlias = utils.decodeUriComponent(alias);
-        const pExtra = utils.decodeUriComponent(extra);
-        const pName = utils.decodeUriComponent(name);
+        const pAlias = decodeUriComponent(alias);
+        const pExtra = decodeUriComponent(extra);
+        const pName = decodeUriComponent(name);
 
         try {
             validators.alias(pAlias);
@@ -82,7 +80,7 @@ const AliasGet = class AliasGet {
         const path = createFilePathToAlias({ org, type, name: pName, alias: pAlias });
 
         try {
-            const obj = await utils.readJSON(this._sink, path);
+            const obj = await readJSON(this._sink, path);
             const location = createURIToTargetOfAlias({ extra: pExtra, ...obj });
 
             const outgoing = new HttpOutgoing();
@@ -103,4 +101,4 @@ const AliasGet = class AliasGet {
         }
     }
 };
-module.exports = AliasGet;
+export default AliasGet;

package/lib/handlers/alias.post.js

@@ -1,23 +1,21 @@
-'use strict';
+import { validators } from '@eik/common';
+import originalUrl from 'original-url';
+import HttpError from 'http-errors';
+import abslog from 'abslog';
+import Metrics from '@metrics/client';
 
-const { validators } = require('@eik/common');
-const originalUrl = require('original-url');
-const HttpError = require('http-errors');
-const abslog = require('abslog');
-const Metrics = require('@metrics/client');
-
-const {
+import {
     createFilePathToAlias,
     createFilePathToAliasOrigin,
-} = require('../utils/path-builders-fs');
-const { createURIToAlias } = require('../utils/path-builders-uri');
-const MultipartParser = require('../multipart/parser');
-const HttpIncoming = require('../classes/http-incoming');
-const HttpOutgoing = require('../classes/http-outgoing');
-const Author = require('../classes/author');
-const Alias = require('../classes/alias');
-const config = require('../utils/defaults');
-const utils = require('../utils/utils');
+} from '../utils/path-builders-fs.js';
+import { createURIToAlias } from '../utils/path-builders-uri.js';
+import MultipartParser from '../multipart/parser.js';
+import HttpIncoming from '../classes/http-incoming.js';
+import HttpOutgoing from '../classes/http-outgoing.js';
+import Author from '../classes/author.js';
+import Alias from '../classes/alias.js';
+import config from '../utils/defaults.js';
+import { decodeUriComponent, writeJSON } from '../utils/utils.js';
 
 const AliasPost = class AliasPost {
     constructor({
@@ -112,7 +110,7 @@ const AliasPost = class AliasPost {
                     );
 
                     try {
-                        await utils.writeJSON(
+                        await writeJSON(
                             this._sink,
                             path,
                             alias,
@@ -152,8 +150,8 @@ const AliasPost = class AliasPost {
     async handler(req, user, type, name, alias) {
         const end = this._histogram.timer();
 
-        const pAlias = utils.decodeUriComponent(alias);
-        const pName = utils.decodeUriComponent(name);
+        const pAlias = decodeUriComponent(alias);
+        const pName = decodeUriComponent(name);
 
         try {
             validators.alias(pAlias);
@@ -208,4 +206,4 @@ const AliasPost = class AliasPost {
         return outgoing;
     }
 };
-module.exports = AliasPost;
+export default AliasPost;

package/lib/handlers/alias.put.js

@@ -1,23 +1,21 @@
-'use strict';
+import { validators } from '@eik/common';
+import originalUrl from 'original-url';
+import HttpError from 'http-errors';
+import abslog from 'abslog';
+import Metrics from '@metrics/client';
 
-const { validators } = require('@eik/common');
-const originalUrl = require('original-url');
-const HttpError = require('http-errors');
-const abslog = require('abslog');
-const Metrics = require('@metrics/client');
-
-const {
+import {
     createFilePathToAlias,
     createFilePathToAliasOrigin
-} = require('../utils/path-builders-fs');
-const { createURIToAlias } = require('../utils/path-builders-uri');
-const MultipartParser = require('../multipart/parser');
-const HttpIncoming = require('../classes/http-incoming');
-const HttpOutgoing = require('../classes/http-outgoing');
-const Author = require('../classes/author');
-const Alias = require('../classes/alias');
-const utils = require('../utils/utils');
-const config = require('../utils/defaults');
+} from '../utils/path-builders-fs.js';
+import { decodeUriComponent, writeJSON } from '../utils/utils.js';
+import { createURIToAlias } from '../utils/path-builders-uri.js';
+import MultipartParser from '../multipart/parser.js';
+import HttpIncoming from '../classes/http-incoming.js';
+import HttpOutgoing from '../classes/http-outgoing.js';
+import Author from '../classes/author.js';
+import Alias from '../classes/alias.js';
+import config from '../utils/defaults.js';
 
 const AliasPut = class AliasPut {
     constructor({
@@ -112,7 +110,7 @@ const AliasPut = class AliasPut {
                     );
 
                     try {
-                        await utils.writeJSON(
+                        await writeJSON(
                             this._sink,
                             path,
                             alias,
@@ -151,8 +149,8 @@ const AliasPut = class AliasPut {
     async handler(req, user, type, name, alias) {
         const end = this._histogram.timer();
 
-        const pAlias = utils.decodeUriComponent(alias);
-        const pName = utils.decodeUriComponent(name);
+        const pAlias = decodeUriComponent(alias);
+        const pName = decodeUriComponent(name);
 
         try {
             validators.alias(pAlias);
@@ -207,4 +205,4 @@ const AliasPut = class AliasPut {
         return outgoing;
     }
 };
-module.exports = AliasPut;
+export default AliasPut;

package/lib/handlers/auth.post.js

@@ -1,15 +1,13 @@
-'use strict';
+import originalUrl from 'original-url';
+import HttpError from 'http-errors';
+import Metrics from '@metrics/client';
+import abslog from 'abslog';
 
-const originalUrl = require('original-url');
-const HttpError = require('http-errors');
-const Metrics = require('@metrics/client');
-const abslog = require('abslog');
-
-const MultipartParser = require('../multipart/parser');
-const HttpIncoming = require('../classes/http-incoming');
-const HttpOutgoing = require('../classes/http-outgoing');
-const Author = require('../classes/author');
-const config = require('../utils/defaults');
+import MultipartParser from '../multipart/parser.js';
+import HttpIncoming from '../classes/http-incoming.js';
+import HttpOutgoing from '../classes/http-outgoing.js';
+import Author from '../classes/author.js';
+import config from '../utils/defaults.js';
 
 const AuthPost = class AuthPost {
     constructor({
@@ -108,4 +106,4 @@ const AuthPost = class AuthPost {
         return outgoing;
     }
 };
-module.exports = AuthPost;
+export default AuthPost;

package/lib/handlers/map.get.js

@@ -1,15 +1,13 @@
-'use strict';
+import { validators } from '@eik/common';
+import originalUrl from 'original-url';
+import HttpError from 'http-errors';
+import abslog from 'abslog';
+import Metrics from '@metrics/client';
 
-const { validators } = require('@eik/common');
-const originalUrl = require('original-url');
-const HttpError = require('http-errors');
-const abslog = require('abslog');
-const Metrics = require('@metrics/client');
-
-const { createFilePathToImportMap } = require('../utils/path-builders-fs');
-const HttpOutgoing = require('../classes/http-outgoing');
-const config = require('../utils/defaults');
-const utils = require('../utils/utils');
+import { createFilePathToImportMap } from '../utils/path-builders-fs.js';
+import HttpOutgoing from '../classes/http-outgoing.js';
+import config from '../utils/defaults.js';
+import { decodeUriComponent } from '../utils/utils.js';
 
 const MapGet = class MapGet {
     constructor({
@@ -55,8 +53,8 @@ const MapGet = class MapGet {
     async handler(req, name, version) {
         const end = this._histogram.timer();
 
-        const pVersion = utils.decodeUriComponent(version);
-        const pName = utils.decodeUriComponent(name);
+        const pVersion = decodeUriComponent(version);
+        const pName = decodeUriComponent(name);
 
         try {
             validators.version(pVersion);
@@ -116,4 +114,4 @@ const MapGet = class MapGet {
         }
     }
 };
-module.exports = MapGet;
+export default MapGet;

package/lib/handlers/map.put.js

@@ -1,24 +1,22 @@
-'use strict';
-
-const { validators } = require('@eik/common');
-const originalUrl = require('original-url');
-const HttpError = require('http-errors');
-const Busboy = require('busboy');
-const crypto = require('crypto');
-const abslog = require('abslog');
-const Metrics = require('@metrics/client');
-
-const {
+import { validators } from '@eik/common';
+import originalUrl from 'original-url';
+import HttpError from 'http-errors';
+import Busboy from 'busboy';
+import crypto from 'node:crypto';
+import abslog from 'abslog';
+import Metrics from '@metrics/client';
+
+import {
     createFilePathToImportMap,
     createFilePathToVersion,
-} = require('../utils/path-builders-fs');
-const { createURIPathToImportMap } = require('../utils/path-builders-uri');
-const HttpIncoming = require('../classes/http-incoming');
-const HttpOutgoing = require('../classes/http-outgoing');
-const Versions = require('../classes/versions');
-const Author = require('../classes/author');
-const config = require('../utils/defaults');
-const utils = require('../utils/utils');
+} from '../utils/path-builders-fs.js';
+import { createURIPathToImportMap } from '../utils/path-builders-uri.js';
+import HttpIncoming from '../classes/http-incoming.js';
+import HttpOutgoing from '../classes/http-outgoing.js';
+import Versions from '../classes/versions.js';
+import Author from '../classes/author.js';
+import config from '../utils/defaults.js';
+import { decodeUriComponent, streamCollector, writeJSON, readJSON, } from '../utils/utils.js';
 
 const MapPut = class MapPut {
     constructor({
@@ -66,7 +64,7 @@ const MapPut = class MapPut {
             const path = createFilePathToImportMap(incoming);
             const queue = [];
 
-            const busboy = new Busboy({
+            const busboy = Busboy({
                 headers: incoming.headers,
                 limits: {
                     fields: 0,
@@ -83,7 +81,7 @@ const MapPut = class MapPut {
                 }));
             });
 
-            busboy.on('finish', () => {
+            busboy.on('close', () => {
                 Promise.all(queue).then((items) => {
                     // Resolve with only the first item in the array since
                     // only one uploaded file is accepted
@@ -118,7 +116,7 @@ const MapPut = class MapPut {
         // parse it as JSON or not.
         let obj = {};
         try {
-            const str = await utils.streamCollector(file);
+            const str = await streamCollector(file);
             hasher.update(str);
             obj = JSON.parse(str);
         } catch (error) {
@@ -130,7 +128,7 @@ const MapPut = class MapPut {
         // Write file to storage.
         try {
             this._log.info(`map:put - Start writing import map to sink - Pathname: ${path}`);
-            await utils.writeJSON(this._sink, path, obj, 'application/json');
+            await writeJSON(this._sink, path, obj, 'application/json');
         } catch (error) {
             this._log.error(`map:put - Failed writing import map to sink - Pathname: ${path}`);
             this._log.trace(error);
@@ -146,7 +144,7 @@ const MapPut = class MapPut {
         const path = createFilePathToVersion(incoming);
         let versions;
         try {
-            const obj = await utils.readJSON(this._sink, path);
+            const obj = await readJSON(this._sink, path);
             versions = new Versions(obj);
             this._log.info(
                 `map:put - Successfully read version meta file from sink - Pathname: ${path}`,
@@ -163,7 +161,7 @@ const MapPut = class MapPut {
 
     async _writeVersions(incoming, versions) {
         const path = createFilePathToVersion(incoming);
-        await utils.writeJSON(this._sink, path, versions, 'application/json');
+        await writeJSON(this._sink, path, versions, 'application/json');
         this._log.info(
             `map:put - Successfully wrote version meta file to sink - Pathname: ${path}`,
         );
@@ -172,8 +170,8 @@ const MapPut = class MapPut {
     async handler(req, user, name, version) {
         const end = this._histogram.timer();
 
-        const pVersion = utils.decodeUriComponent(version);
-        const pName = utils.decodeUriComponent(name);
+        const pVersion = decodeUriComponent(version);
+        const pName = decodeUriComponent(name);
 
         try {
             validators.version(pVersion);
@@ -237,4 +235,4 @@ const MapPut = class MapPut {
         return outgoing;
     }
 };
-module.exports = MapPut;
+export default MapPut;

package/lib/handlers/pkg.get.js

@@ -1,16 +1,14 @@
-'use strict';
-
-const { validators } = require('@eik/common');
-const originalUrl = require('original-url');
-const HttpError = require('http-errors');
-const abslog = require('abslog');
-const Metrics = require('@metrics/client');
-
-const { createFilePathToAsset } = require('../utils/path-builders-fs');
-const HttpOutgoing = require('../classes/http-outgoing');
-const Asset = require('../classes/asset');
-const config = require('../utils/defaults');
-const utils = require('../utils/utils');
+import { validators } from '@eik/common';
+import originalUrl from 'original-url';
+import HttpError from 'http-errors';
+import abslog from 'abslog';
+import Metrics from '@metrics/client';
+
+import { createFilePathToAsset } from '../utils/path-builders-fs.js';
+import { decodeUriComponent } from '../utils/utils.js';
+import HttpOutgoing from '../classes/http-outgoing.js';
+import Asset from '../classes/asset.js';
+import config from '../utils/defaults.js';
 
 const PkgGet = class PkgGet {
     constructor({
@@ -56,9 +54,9 @@ const PkgGet = class PkgGet {
     async handler(req, type, name, version, extra) {
         const end = this._histogram.timer();
 
-        const pVersion = utils.decodeUriComponent(version);
-        const pExtra = utils.decodeUriComponent(extra);
-        const pName = utils.decodeUriComponent(name);
+        const pVersion = decodeUriComponent(version);
+        const pExtra = decodeUriComponent(extra);
+        const pName = decodeUriComponent(name);
 
         try {
             validators.version(pVersion);
@@ -126,4 +124,4 @@ const PkgGet = class PkgGet {
         }
     }
 };
-module.exports = PkgGet;
+export default PkgGet;