@eik/core 1.2.29 → 1.3.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [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)
 
 

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({
@@ -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;

package/lib/handlers/pkg.log.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 { createFilePathToPackage } = require('../utils/path-builders-fs');
-const HttpOutgoing = require('../classes/http-outgoing');
-const config = require('../utils/defaults');
-const utils = require('../utils/utils');
+import { createFilePathToPackage } 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 PkgLog = class PkgLog {
     constructor({
@@ -54,8 +52,8 @@ const PkgLog = class PkgLog {
     async handler(req, type, 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);
@@ -114,4 +112,4 @@ const PkgLog = class PkgLog {
         }
     }
 };
-module.exports = PkgLog;
+export default PkgLog;

package/lib/handlers/pkg.put.js

@@ -1,25 +1,22 @@
-'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 {
+import {
     createFilePathToPackage,
     createFilePathToVersion,
-} = require('../utils/path-builders-fs');
-const { createURIPathToPkgLog } = require('../utils/path-builders-uri');
-const HttpIncoming = require('../classes/http-incoming');
-const HttpOutgoing = require('../classes/http-outgoing');
-const Versions = require('../classes/versions');
-const Package = require('../classes/package');
-const Author = require('../classes/author');
-const utils = require('../utils/utils');
-const config = require('../utils/defaults');
-
-const MultipartParser = require('../multipart/parser');
+} from '../utils/path-builders-fs.js';
+import { decodeUriComponent, writeJSON, readJSON } from '../utils/utils.js';
+import { createURIPathToPkgLog } 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 Versions from '../classes/versions.js';
+import Package from '../classes/package.js';
+import Author from '../classes/author.js';
+import config from '../utils/defaults.js';
 
 const PkgPut = class PkgPut {
     constructor({
@@ -84,7 +81,7 @@ const PkgPut = class PkgPut {
                 return pkg;
             }).then(async (pkg) => {
                 const path = createFilePathToPackage(pkg);
-                await utils.writeJSON(
+                await writeJSON(
                     this._sink,
                     path,
                     pkg,
@@ -106,7 +103,7 @@ const PkgPut = class PkgPut {
         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(
                 `pkg:put - Successfully read version meta file from sink - Pathname: ${path}`,
@@ -123,7 +120,7 @@ const PkgPut = class PkgPut {
 
     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(
             `pkg:put - Successfully wrote version meta file to sink - Pathname: ${path}`,
         );
@@ -132,8 +129,8 @@ const PkgPut = class PkgPut {
     async handler(req, user, type, 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);
@@ -198,4 +195,4 @@ const PkgPut = class PkgPut {
         return outgoing;
     }
 };
-module.exports = PkgPut;
+export default PkgPut;

package/lib/handlers/versions.get.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 { createFilePathToVersion } = require('../utils/path-builders-fs');
-const HttpOutgoing = require('../classes/http-outgoing');
-const config = require('../utils/defaults');
-const utils = require('../utils/utils');
+import { createFilePathToVersion } 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 VersionsGet = class VersionsGet {
     constructor({
@@ -55,7 +53,7 @@ const VersionsGet = class VersionsGet {
     async handler(req, type, name) {
         const end = this._histogram.timer();
 
-        const pName = utils.decodeUriComponent(name);
+        const pName = decodeUriComponent(name);
 
         try {
             validators.name(pName);
@@ -118,4 +116,4 @@ const VersionsGet = class VersionsGet {
         }
     }
 };
-module.exports = VersionsGet;
+export default VersionsGet;

package/lib/main.js

@@ -1,26 +1,22 @@
-'use strict';
+import VersionsGet from './handlers/versions.get.js';
+import AliasPost from './handlers/alias.post.js';
+import AliasPut from './handlers/alias.put.js';
+import AliasGet from './handlers/alias.get.js';
+import AliasDel from './handlers/alias.delete.js';
+import AuthPost from './handlers/auth.post.js';
+import PkgLog from './handlers/pkg.log.js';
+import PkgGet from './handlers/pkg.get.js';
+import PkgPut from './handlers/pkg.put.js';
+import MapGet from './handlers/map.get.js';
+import MapPut from './handlers/map.put.js';
 
-const VersionsGet = require('./handlers/versions.get');
-const AliasPost = require('./handlers/alias.post');
-const AliasPut = require('./handlers/alias.put');
-const AliasGet = require('./handlers/alias.get');
-const AliasDel = require('./handlers/alias.delete');
-const AuthPost = require('./handlers/auth.post');
-const PkgLog = require('./handlers/pkg.log');
-const PkgGet = require('./handlers/pkg.get');
-const PkgPut = require('./handlers/pkg.put');
-const MapGet = require('./handlers/map.get');
-const MapPut = require('./handlers/map.put');
+import MEM from './sinks/mem.js';
+import FS from './sinks/fs.js';
 
-const MEM = require('./sinks/mem');
-const FS = require('./sinks/fs');
+import HealthCheck from './utils/healthcheck.js';
+import globals from './utils/globals.js';
 
-const HealthCheck = require('./utils/healthcheck');
-const globals = require('./utils/globals');
-
-module.exports.HealthCheck = HealthCheck;
-
-module.exports.http = {
+const http = {
     VersionsGet,
     AliasPost,
     AliasPut,
@@ -34,14 +30,21 @@ module.exports.http = {
     MapPut,
 };
 
-module.exports.sink = {
+const sink = {
     MEM,
     FS,
 };
 
-module.exports.prop = {
+const prop = {
     base_auth: globals.BASE_AUTHENTICATION,
     base_map: globals.BASE_IMPORT_MAPS,
     base_pkg: globals.BASE_PACKAGES,
     base_npm: globals.BASE_NPM,
 };
+
+export default {
+    HealthCheck,
+    http,
+    sink,
+    prop,
+}

package/lib/multipart/form-field.js

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

package/lib/multipart/form-file.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const FormFile = class FormFile {
     constructor({
         value = [],
@@ -29,4 +27,4 @@ const FormFile = class FormFile {
         return 'FormFile';
     }
 }
-module.exports = FormFile;
+export default FormFile;

package/lib/multipart/parser.js

@@ -1,16 +1,14 @@
-'use strict';
-
-const { pipeline } = require('stream');
-const HttpError = require('http-errors');
-const Busboy = require('busboy');
-const abslog = require('abslog');
-const ssri = require('ssri');
-const tar = require('tar');
-
-const { createFilePathToAsset } = require('../utils/path-builders-fs');
-const FormField = require('./form-field');
-const FormFile = require('./form-file');
-const Asset = require('../classes/asset');
+import { pipeline } from 'node:stream';
+import HttpError from 'http-errors';
+import Busboy from 'busboy';
+import abslog from 'abslog';
+import ssri from 'ssri';
+import tar from 'tar';
+
+import { createFilePathToAsset } from '../utils/path-builders-fs.js';
+import FormField from './form-field.js';
+import FormFile from './form-file.js';
+import Asset from '../classes/asset.js';
 
 const MultipartParser = class MultipartParser {
     constructor({
@@ -216,4 +214,4 @@ const MultipartParser = class MultipartParser {
         });
     }
 }
-module.exports = MultipartParser;
+export default MultipartParser;

package/lib/sinks/fs.js

@@ -1,15 +1,13 @@
-'use strict';
+import { ReadFile } from '@eik/common';
+import Metrics from '@metrics/client';
+import rimraf from 'rimraf';
+import Sink from '@eik/sink';
+import mime from 'mime';
+import path from 'node:path';
+import fs from 'node:fs';
 
-const { ReadFile } = require('@eik/common');
-const Metrics = require('@metrics/client');
-const rimraf = require('rimraf');
-const Sink = require('@eik/sink');
-const mime = require('mime/lite');
-const path = require('path');
-const fs = require('fs');
-
-const { etagFromFsStat } = require('../utils/utils');
-const conf = require('../utils/defaults');
+import { etagFromFsStat } from '../utils/utils.js';
+import conf from '../utils/defaults.js';
 
 /**
  * A sink for persisting files to local file system
@@ -263,4 +261,4 @@ const SinkFS = class SinkFS extends Sink {
         return 'SinkFS';
     }
 }
-module.exports = SinkFS;
+export default SinkFS;

package/lib/sinks/mem-entry.js

@@ -1,6 +1,4 @@
-'use strict';
-
-const crypto = require('crypto');
+import crypto from 'node:crypto';
 
 const Entry = class Entry {
     constructor({
@@ -38,4 +36,5 @@ const Entry = class Entry {
         return 'Entry';
     }
 }
-module.exports = Entry;
+
+export default Entry;

package/lib/sinks/mem.js

@@ -1,12 +1,10 @@
-'use strict';
+import { Writable, Readable } from 'node:stream';
+import { ReadFile } from '@eik/common';
+import { join } from 'node:path';
+import Metrics from '@metrics/client';
+import Sink from '@eik/sink';
 
-const { Writable, Readable } = require('stream');
-const { ReadFile } = require('@eik/common');
-const { join } = require('path');
-const Metrics = require('@metrics/client');
-const Sink = require('@eik/sink');
-
-const Entry = require('./mem-entry');
+import Entry from './mem-entry.js';
 
 const DEFAULT_ROOT_PATH = '/eik';
 
@@ -209,4 +207,4 @@ const SinkMem = class SinkMem extends Sink {
         return 'SinkMEM';
     }
 }
-module.exports = SinkMem;
+export default SinkMem;

package/lib/sinks/test.js

@@ -1,13 +1,11 @@
-'use strict';
+import { Writable, Readable } from 'node:stream';
+import { ReadFile } from '@eik/common';
+import Metrics from '@metrics/client';
+import Sink from '@eik/sink';
+import mime from 'mime';
+import path from 'node:path';
 
-const { Writable, Readable } = require('stream');
-const { ReadFile } = require('@eik/common');
-const Metrics = require('@metrics/client');
-const Sink = require('@eik/sink');
-const mime = require('mime/lite');
-const path = require('path');
-
-const Entry = require('./mem-entry');
+import Entry from './mem-entry.js';
 
 const DEFAULT_ROOT_PATH = '/eik';
 
@@ -278,4 +276,5 @@ const SinkTest = class SinkTest extends Sink {
         return 'SinkTest';
     }
 }
-module.exports = SinkTest;
+
+export default SinkTest;

package/lib/utils/defaults.js

@@ -1,7 +1,5 @@
-'use strict';
-
-const path = require('path');
-const os = require('os');
+import path from 'node:path';
+import os from 'node:os';
 
 const config = {
     authKey: 'change_me',
@@ -14,4 +12,5 @@ const config = {
         ['127.0.0.1', 'local'],
     ],
 };
-module.exports = config;
+
+export default config;

package/lib/utils/globals.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const globals = {
     BASE_AUTHENTICATION: 'auth',
     BASE_IMPORT_MAPS: 'map',
@@ -7,4 +5,4 @@ const globals = {
     BASE_NPM: 'npm',
     ROOT: '/',
 };
-module.exports = globals;
+export default globals;

package/lib/utils/healthcheck.js

@@ -1,15 +1,10 @@
-'use strict';
+import { Writable, pipeline } from 'node:stream';
+import { URL } from 'node:url';
+import abslog from 'abslog';
+import slug from 'unique-slug';
+import fs from 'node:fs';
 
-const { Writable, pipeline } = require('stream');
-const abslog = require('abslog');
-const slug = require('unique-slug');
-const path = require('path');
-const fs = require('fs');
-
-const fileReader = (file = '../../README.md') => {
-    const pathname = path.join(__dirname, file);
-    return fs.createReadStream(pathname);
-};
+const fileReader = (file = '../../README.md') => fs.createReadStream(new URL(file, import.meta.url));
 
 const HealthCheck = class HealthCheck {
     constructor({ sink, logger } = {}) {
@@ -112,4 +107,5 @@ const HealthCheck = class HealthCheck {
         return 'HealthCheck';
     }
 }
-module.exports = HealthCheck;
+
+export default HealthCheck;

package/lib/utils/path-builders-fs.js

@@ -1,37 +1,30 @@
-'use strict';
-
-const path = require('path');
-const { BASE_IMPORT_MAPS, ROOT } = require("./globals");
+import path from 'node:path';
+import globals from './globals.js';
 
 
 // Build file system path to a package file
 
-const createFilePathToPackage = ({ org = '', type = '', name = '', version = '' } = {}) => path.join(ROOT, org, type, name, `${version}.package.json`)
-module.exports.createFilePathToPackage = createFilePathToPackage;
+const createFilePathToPackage = ({ org = '', type = '', name = '', version = '' } = {}) => path.join(globals.ROOT, org, type, name, `${version}.package.json`)
 
 
 // Build file system path to an asset in a package
 // pkgAsset
-const createFilePathToAsset = ({ org = '', type = '', name = '', version = '', asset = '' } = {}) => path.join(ROOT, org, type, name, version, asset)
-module.exports.createFilePathToAsset = createFilePathToAsset;
+const createFilePathToAsset = ({ org = '', type = '', name = '', version = '', asset = '' } = {}) => path.join(globals.ROOT, org, type, name, version, asset)
 
 
 // Build file system path to an import map
 
-const createFilePathToImportMap = ({ org = '', name = '', version = '' } = {}) => path.join(ROOT, org, BASE_IMPORT_MAPS, name, `${version}.import-map.json`)
-module.exports.createFilePathToImportMap = createFilePathToImportMap;
+const createFilePathToImportMap = ({ org = '', name = '', version = '' } = {}) => path.join(globals.ROOT, org, globals.BASE_IMPORT_MAPS, name, `${version}.import-map.json`)
 
 
 // Build file system path to an alias file
 
-const createFilePathToAlias = ({ org = '', type = '', name = '', alias = '' } = {}) => path.join(ROOT, org, type, name, `${alias}.alias.json`)
-module.exports.createFilePathToAlias = createFilePathToAlias;
+const createFilePathToAlias = ({ org = '', type = '', name = '', alias = '' } = {}) => path.join(globals.ROOT, org, type, name, `${alias}.alias.json`)
 
 
 // Build file system path to an version file
 
-const createFilePathToVersion = ({ org = '', type = '', name = '' } = {}) => path.join(ROOT, org, type, name, 'versions.json')
-module.exports.createFilePathToVersion = createFilePathToVersion;
+const createFilePathToVersion = ({ org = '', type = '', name = '' } = {}) => path.join(globals.ROOT, org, type, name, 'versions.json')
 
 const createFilePathToAliasOrigin = ({org = '', type = '', name = '', version = '',} = {}) => {
     if(type === 'map') {
@@ -39,4 +32,13 @@ const createFilePathToAliasOrigin = ({org = '', type = '', name = '', version =
     }
     return createFilePathToPackage({org, type, name, version})
 };
-module.exports.createFilePathToAliasOrigin = createFilePathToAliasOrigin
+
+
+export {
+    createFilePathToPackage,
+    createFilePathToAsset,
+    createFilePathToImportMap,
+    createFilePathToAlias,
+    createFilePathToVersion,
+    createFilePathToAliasOrigin,
+}

package/lib/utils/path-builders-uri.js

@@ -1,35 +1,35 @@
-'use strict';
-
-const path = require('path');
-const { BASE_IMPORT_MAPS, ROOT } = require("./globals");
+import path from 'node:path';
+import globals from './globals.js';
 
 
 // Build URL pathname to a package log file
 
-const createURIPathToPkgLog = ({ type = '', name = '', version = '' } = {}) => path.join(ROOT, type, name, version)
-module.exports.createURIPathToPkgLog = createURIPathToPkgLog;
+const createURIPathToPkgLog = ({ type = '', name = '', version = '' } = {}) => path.join(globals.ROOT, type, name, version)
 
 
 // Build URL pathname to an asset in a package
 
-const createURIPathToAsset = ({ type = '', name = '', version = '', asset = '' } = {}) => path.join(ROOT, type, name, version, asset)
-module.exports.createURIPathToAsset = createURIPathToAsset;
+const createURIPathToAsset = ({ type = '', name = '', version = '', asset = '' } = {}) => path.join(globals.ROOT, type, name, version, asset)
 
 
 // Build URL pathname to an import map
 
-const createURIPathToImportMap = ({ name = '', version = '' } = {}) => path.join(ROOT, BASE_IMPORT_MAPS, name, version)
-module.exports.createURIPathToImportMap = createURIPathToImportMap;
+const createURIPathToImportMap = ({ name = '', version = '' } = {}) => path.join(globals.ROOT, globals.BASE_IMPORT_MAPS, name, version)
 
 
 // Build URL pathname to an alias source
 
-const createURIToAlias = ({ type = '', name = '', alias = '' } = {}) => path.join(ROOT, type, name, `v${alias}`)
-module.exports.createURIToAlias = createURIToAlias;
+const createURIToAlias = ({ type = '', name = '', alias = '' } = {}) => path.join(globals.ROOT, type, name, `v${alias}`)
 
 
 // Build URL pathname to an alias target destination
 
-const createURIToTargetOfAlias = ({ type = '', name = '', version = '', extra = '' } = {}) => path.join(ROOT, type, name, version, extra)
-module.exports.createURIToTargetOfAlias = createURIToTargetOfAlias;
+const createURIToTargetOfAlias = ({ type = '', name = '', version = '', extra = '' } = {}) => path.join(globals.ROOT, type, name, version, extra)
 
+export {
+    createURIPathToPkgLog,
+    createURIPathToAsset,
+    createURIPathToImportMap,
+    createURIToAlias,
+    createURIToTargetOfAlias,
+}

package/lib/utils/utils.js

@@ -1,6 +1,4 @@
-'use strict';
-
-const { Writable, Readable, pipeline } = require('stream');
+import { Writable, Readable, pipeline } from 'node:stream';
 
 const readJSON = (sink, path) => 
     // eslint-disable-next-line no-async-promise-executor
@@ -32,7 +30,6 @@ const readJSON = (sink, path) =>
         }
     })
 ;
-module.exports.readJSON = readJSON;
 
 const writeJSON = (sink, path, obj, contentType) => 
     // eslint-disable-next-line no-async-promise-executor
@@ -59,7 +56,6 @@ const writeJSON = (sink, path, obj, contentType) =>
         }
     })
 ;
-module.exports.writeJSON = writeJSON;
 
 const streamCollector = (from) => new Promise((resolve, reject) => {
         const buffer = [];
@@ -75,18 +71,22 @@ const streamCollector = (from) => new Promise((resolve, reject) => {
             return resolve(buffer.join('').toString());
         });
     });
-module.exports.streamCollector = streamCollector;
 
 const etagFromFsStat = (stat) => {
     const mtime = stat.mtime.getTime().toString(16)
     const size = stat.size.toString(16)
     return `W/"${size}-${mtime}"`;
 };
-module.exports.etagFromFsStat = etagFromFsStat;
-
 
 const decodeUriComponent = (value) => {
     if (value === null || value === undefined) return value;
     return decodeURIComponent(value);
 }
-module.exports.decodeUriComponent = decodeUriComponent;
+
+export {
+    readJSON,
+    writeJSON,
+    streamCollector,
+    etagFromFsStat,
+    decodeUriComponent,
+}

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@eik/core",
-  "version": "1.2.29",
+  "version": "1.3.0",
   "description": "Core server package",
   "main": "lib/main.js",
+  "type": "module",
   "files": [
     "CHANGELOG.md",
     "package.json",
@@ -33,6 +34,7 @@
     "unique-slug": "2.0.2"
   },
   "devDependencies": {
+    "@babel/eslint-parser": "7.16.5",
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/git": "10.0.1",
     "eslint": "8.6.0",
@@ -42,7 +44,7 @@
     "eslint-plugin-prettier": "4.0.0",
     "form-data": "4.0.0",
     "mkdirp": "1.0.4",
-    "node-fetch": "2.6.6",
+    "node-fetch": "3.1.0",
     "prettier": "2.5.1",
     "semantic-release": "18.0.1",
     "tap": "15.1.6"