convert to ESM

index.js

@@ -1,3 +1,19 @@
-for (const l of ['group', 'nameserver', 'permission', 'session', 'user', 'zone', 'zone_record']) {
-  module.exports[l] = require(`./lib/${l}`)
+import * as group from './lib/group.js'
+import * as nameserver from './lib/nameserver.js'
+import * as permission from './lib/permission.js'
+import * as session from './lib/session.js'
+import * as user from './lib/user.js'
+import * as zone from './lib/zone.js'
+import * as zone_record from './lib/zone_record.js'
+
+export { group, nameserver, permission, session, user, zone, zone_record }
+
+export default {
+  group,
+  nameserver,
+  permission,
+  session,
+  user,
+  zone,
+  zone_record,
 }

index.test.js

@@ -1,7 +1,10 @@
-const assert = require('node:assert/strict')
-const { describe, it } = require('node:test')
+import assert from 'node:assert/strict'
+import { describe, it } from 'node:test'
+import { createRequire } from 'node:module'
 
-const schema = require('./index')
+const require = createRequire(import.meta.url)
+
+import * as schema from './index.js'
 
 describe('index', function () {
   const testGroup = require('./lib/test/group.json')

lib/group.js

@@ -1,61 +1,61 @@
-const Joi = require('joi')
+import Joi from 'joi'
 
-const shared = require('./shared')
-const permission = require('./permission')
+import * as shared from './shared.js'
+import * as permission from './permission.js'
 
-exports.id = Joi.number().integer().min(1).max(4294967295)
+export const id = Joi.number().integer().min(1).max(4294967295)
 
-exports.pid = shared.uint32
+export const pid = shared.uint32
 
-exports.name = Joi.string()
+export const name = Joi.string()
   .min(3)
   .max(255)
   .pattern(new RegExp("^[a-zA-Z0-9 _.@'-]+$"))
   .pattern(new RegExp('^[a-zA-Z0-9]'))
 
-exports.v3 = Joi.object({
-  id: exports.id,
-  parent_gid: exports.pid,
-  name: exports.name.required(),
+export const v3 = Joi.object({
+  id: id,
+  parent_gid: pid,
+  name: name.required(),
   deleted: Joi.boolean(),
   has_children: Joi.boolean(),
   permission: permission.v3,
 })
 
 // legacy group format
-exports.v2 = Joi.object({
-  nt_group_id: exports.id,
-  parent_group_id: exports.pid,
-  name: exports.name.required(),
+export const v2 = Joi.object({
+  nt_group_id: id,
+  parent_group_id: pid,
+  name: name.required(),
   deleted: Joi.boolean(),
   has_children: Joi.boolean(),
   permission: permission.v3,
 })
 
-exports.GET_req = Joi.object({
-  id: exports.pid,
-  name: exports.name,
+export const GET_req = Joi.object({
+  id: pid,
+  name: name,
   deleted: Joi.boolean(),
 })
 
-exports.GET_res = Joi.object({
+export const GET_res = Joi.object({
   group: Joi.object({
-    id: exports.pid,
-    name: exports.name,
-    parent_gid: exports.pid,
+    id: pid,
+    name: name,
+    parent_gid: pid,
     deleted: Joi.boolean(),
   }),
   meta: shared.meta,
 })
 
-exports.POST = Joi.object({
-  id: exports.id,
-  name: exports.name,
-  parent_gid: exports.pid,
+export const POST = Joi.object({
+  id: id,
+  name: name,
+  parent_gid: pid,
   deleted: Joi.boolean(),
 })
 
-exports.DELETE = Joi.object({
-  id: exports.id,
+export const DELETE = Joi.object({
+  id: id,
   deleted: Joi.boolean(),
 })

lib/group.test.js

@@ -1,7 +1,11 @@
-const assert = require('node:assert/strict')
-const { describe, it } = require('node:test')
+import assert from 'node:assert/strict'
+import { describe, it } from 'node:test'
+import { createRequire } from 'node:module'
 
-const schema = require('./group').v3
+const require = createRequire(import.meta.url)
+
+import * as group from './group.js'
+const schema = group.v3
 const testGroup = require('./test/group.json')
 
 describe('group', function () {

lib/nameserver.js

@@ -1,53 +1,53 @@
-const Joi = require('joi')
+import Joi from 'joi'
 
-const shared = require('./shared')
+import * as shared from './shared.js'
 
-exports.id = shared.uint16.min(0)
+export const id = shared.uint16.min(0)
 
-exports.name = Joi.string()
+export const name = Joi.string()
   .min(2)
   .max(127)
   .domain({ allowFullyQualified: true, tlds: false })
   .pattern(/\.$/)
 
-exports.type = Joi.string().valid('bind', 'djbdns', 'knot', 'nsd', 'maradns', 'powerdns', 'dynect')
+export const type = Joi.string().valid('bind', 'djbdns', 'knot', 'nsd', 'maradns', 'powerdns', 'dynect')
 
-exports.remote_login = Joi.string().empty('').max(127)
+export const remote_login = Joi.string().empty('').max(127)
 
-exports.v3 = Joi.object({
-  id: exports.id,
+export const v3 = Joi.object({
+  id: id,
   gid: shared.uint32.required(),
-  name: exports.name.required(),
+  name: name.required(),
   ttl: shared.ttl.required(),
   description: Joi.string().empty('').max(255),
   address: shared.ipv4.required(),
   address6: shared.ipv6.empty(''),
-  remote_login: exports.remote_login,
+  remote_login: remote_login,
   logdir: Joi.string().empty('').max(255),
   datadir: Joi.string().empty('').min(2).max(255),
   export: Joi.object({
     interval: shared.uint16,
     serials: Joi.boolean(),
     status: Joi.string().empty('').max(255),
-    type: exports.type.required(),
+    type: type.required(),
   }),
   deleted: Joi.boolean(),
 })
 
-exports.GET_req = Joi.object({
-  id: exports.id,
-  name: exports.name,
+export const GET_req = Joi.object({
+  id: id,
+  name: name,
   deleted: Joi.boolean(),
 })
 
-exports.GET_res = Joi.object({
-  nameserver: Joi.array().items(exports.v3),
+export const GET_res = Joi.object({
+  nameserver: Joi.array().items(v3),
   meta: shared.meta,
 })
 
-exports.POST = exports.v3
+export const POST = v3
 
-exports.DELETE = Joi.object({
-  id: exports.id,
+export const DELETE = Joi.object({
+  id: id,
   deleted: Joi.boolean(),
 })

lib/nameserver.test.js

@@ -1,7 +1,11 @@
-const assert = require('node:assert/strict')
-const { describe, it } = require('node:test')
+import assert from 'node:assert/strict'
+import { describe, it } from 'node:test'
+import { createRequire } from 'node:module'
 
-const schema = require('./nameserver').v3
+const require = createRequire(import.meta.url)
+
+import * as nameserver from './nameserver.js'
+const schema = nameserver.v3
 const testNS = require('./test/nameserver.json')
 
 describe('nameserver', function () {

lib/permission.js

@@ -1,23 +1,23 @@
-const Joi = require('joi')
+import Joi from 'joi'
 
-const shared = require('./shared')
+import * as shared from './shared.js'
 
-exports.id = Joi.number().integer().min(1).max(4294967295)
+export const id = Joi.number().integer().min(1).max(4294967295)
 
-exports.v3 = Joi.object({
-  id: exports.id,
+export const v3 = Joi.object({
+  id: id,
   name: Joi.string().empty(''),
   inherit: Joi.boolean(),
   self_write: Joi.boolean(),
   deleted: Joi.boolean(),
   group: Joi.object({
-    id: exports.id,
+    id: id,
     write: Joi.boolean(),
     create: Joi.boolean(),
     delete: Joi.boolean(),
   }),
   user: Joi.object({
-    id: exports.id,
+    id: id,
     write: Joi.boolean(),
     create: Joi.boolean(),
     delete: Joi.boolean(),
@@ -42,19 +42,19 @@ exports.v3 = Joi.object({
   }),
 })
 
-exports.POST = exports.v3
+export const POST = v3
 
-exports.GET_req = Joi.object({
-  id: exports.id,
+export const GET_req = Joi.object({
+  id: id,
   deleted: Joi.boolean(),
 })
 
-exports.GET_res = Joi.object({
-  permission: exports.v3,
+export const GET_res = Joi.object({
+  permission: v3,
   meta: shared.meta,
 })
 
-exports.DELETE = Joi.object({
-  id: exports.id,
+export const DELETE = Joi.object({
+  id: id,
   deleted: Joi.boolean(),
 })

lib/session.js

@@ -1,17 +1,17 @@
-const Joi = require('joi')
+import Joi from 'joi'
 
-const shared = require('./shared')
-const group = require('./group')
-const user = require('./user')
+import * as shared from './shared.js'
+import * as group from './group.js'
+import * as user from './user.js'
 
-exports.id = shared.uint32
+export const id = shared.uint32
 
-exports.POST = Joi.object({
+export const POST = Joi.object({
   username: user.username.required(),
   password: user.password.required(),
 })
 
-exports.GET_res = Joi.object({
+export const GET_res = Joi.object({
   user: user.v3,
   group: group.v3,
   session: Joi.object({
@@ -22,4 +22,4 @@ exports.GET_res = Joi.object({
   meta: shared.meta,
 })
 
-exports.DELETE = Joi.object({})
+export const DELETE = Joi.object({})

lib/session.test.js

@@ -1,7 +1,7 @@
-const assert = require('node:assert/strict')
-const { describe, it } = require('node:test')
+import assert from 'node:assert/strict'
+import { describe, it } from 'node:test'
 
-const schema = require('./session')
+import * as schema from './session.js'
 
 describe('session', () => {
   describe('POST', function () {

lib/shared.js

@@ -1,35 +1,35 @@
-const Joi = require('joi')
+import Joi from 'joi'
 
-exports.meta = Joi.object({
+export const meta = Joi.object({
   msg: Joi.string(),
   err: Joi.string(),
   api: Joi.object({
     version: Joi.string(),
   }).unknown(),
 }).unknown()
 
-exports.int8 = Joi.number().integer().min(-128).max(127)
+export const int8 = Joi.number().integer().min(-128).max(127)
 
-exports.uint8 = Joi.number().integer().min(0).max(255)
+export const uint8 = Joi.number().integer().min(0).max(255)
 
-exports.int16 = Joi.number().integer().min(-32768).max(32767)
+export const int16 = Joi.number().integer().min(-32768).max(32767)
 
-exports.uint16 = Joi.number().integer().min(0).max(65535)
+export const uint16 = Joi.number().integer().min(0).max(65535)
 
-exports.int32 = Joi.number().integer().min(-2147483648).max(2147483647)
+export const int32 = Joi.number().integer().min(-2147483648).max(2147483647)
 
-exports.uint32 = Joi.number().integer().min(0).max(4294967295)
+export const uint32 = Joi.number().integer().min(0).max(4294967295)
 
-exports.ipv4 = Joi.string()
+export const ipv4 = Joi.string()
   .ip({ version: ['ipv4'], cidr: 'forbidden' })
   .min(7)
   .max(15)
 
-exports.ipv6 = Joi.string()
+export const ipv6 = Joi.string()
   .ip({ version: ['ipv6'], cidr: 'forbidden' })
   .min(2)
   .max(39)
 
 // Clarifications to the DNS specification: http://tools.ietf.org/html/rfc2181
 // valid TTL is unsigned number from 0 to 2147483647
-exports.ttl = exports.int32.min(0)
+export const ttl = int32.min(0)