Modern codebase

.eslintignore

@@ -1,2 +1,3 @@
-/lib
-/module.mjs
+/dts
+/esm
+/cjs

.eslintrc.yaml

@@ -246,6 +246,10 @@ rules:
         MethodDefinition: true
       checkGetters: true
       checkSetters: true
+  jsdoc/tag-lines:
+    - warn
+    - never
+    - startLines: 1
 
   # TypeScript Simple:
   '@typescript-eslint/array-type': error
@@ -445,26 +449,42 @@ overrides:
     rules:
       '@typescript-eslint/no-unsafe-assignment': off
       '@typescript-eslint/no-unsafe-member-access': off
+      '@typescript-eslint/no-unsafe-call': off
+      '@typescript-eslint/no-unsafe-return': off
   - files:
       - '*.ts'
       - '*.tsx'
     rules:
       jsdoc/no-types: warn
   - files:
+      - '*.test.js'
+      - '*.test.jsx'
+      - '*.test.mjs'
+      - '*.test.mjsx'
+      - '*.test.ts'
+      - '*.test.tsx'
       - '*.spec.js'
       - '*.spec.jsx'
       - '*.spec.mjs'
       - '*.spec.mjsx'
       - '*.spec.ts'
       - '*.spec.tsx'
     rules:
+      no-void: off
       jsdoc/require-jsdoc: off
+      '@typescript-eslint/no-floating-promises':
+        - error
+        - ignoreVoid: true
   - files:
-      - 'gulpfile.babel.ts'
+      - 'babel.config.js'
     rules:
       import/no-extraneous-dependencies:
         - error
         - devDependencies: true
           optionalDependencies: false
           peerDependencies: false
       jsdoc/require-jsdoc: off
+      '@typescript-eslint/no-require-imports': off
+      '@typescript-eslint/no-var-requires': off
+    parserOptions:
+      sourceType: script

.github/workflows/main.yaml

@@ -7,19 +7,17 @@ jobs:
     strategy:
       matrix:
         config:
-          - node-version: '14.15.0' # LTS
-            NO_FORMATTED: 1
-            NO_LINT: 1
+          - runs-on: ubuntu-latest
+            node-version: '18.12.0' # LTS
 
-          - node-version: '16.13.0' # LTS
-            NO_FORMATTED: 1
-            NO_LINT: 1
+          - runs-on: ubuntu-latest
+            node-version: '18.18.0' # LTS (current)
+            CODE_CHECK: 1
 
-          - node-version: '18.12.0' # LTS (current)
+          - runs-on: ubuntu-latest
+            node-version: '20.7.0'
 
-          - node-version: '19.0.0' # Latest
-
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.config.runs-on }}
 
     steps:
       - name: Checkout
@@ -44,17 +42,17 @@ jobs:
 
       - name: Lint
         run: npm run lint
-        if: matrix.config.NO_LINT != 1
+        if: matrix.config.CODE_CHECK == 1
 
       - name: Formatted
         run: npm run formatted
-        if: matrix.config.NO_FORMATTED != 1
+        if: matrix.config.CODE_CHECK == 1
 
   publish:
     if: startsWith(github.ref, 'refs/tags/')
     needs: build
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
@@ -63,7 +61,7 @@ jobs:
       - name: Node
         uses: actions/setup-node@v3
         with:
-          node-version: '16.16.0'
+          node-version: '18.18.0'
           registry-url: https://registry.npmjs.org/
 
       - name: Dependencies

.gitignore

@@ -21,4 +21,6 @@ yarn.lock
 .vscode
 
 # Build files
-/lib
+/dts
+/esm
+/cjs

.npmignore

@@ -25,20 +25,25 @@ yarn.lock
 /.gitattributes
 /.gitignore
 /.github
-/.babelrc
 /.editorconfig
 /.eslintignore
 /.eslintrc.yaml
 /.prettierrc.yaml
 /.prettierignore
+/babel.config.js
 /tsconfig.json
 /tsconfig.eslint.json
-/gulpfile.babel.ts
 /spec
 /src
 
-/lib/**/*.spec.d.ts
-/lib/**/*.spec.js
-/lib/**/*.spec.js.map
-/lib/**/*.spec.mjs
-/lib/**/*.spec.mjs.map
+/dts/**/*.test.d.ts
+/esm/**/*.test.mjs
+/esm/**/*.test.mjs.map
+/cjs/**/*.test.js
+/cjs/**/*.test.js.map
+
+/dts/**/*.spec.d.ts
+/esm/**/*.spec.mjs
+/esm/**/*.spec.mjs.map
+/cjs/**/*.spec.js
+/cjs/**/*.spec.js.map

.nvmrc

@@ -1 +1 @@
-18.12.0
+18.18.0

.prettierignore

@@ -1,2 +1,4 @@
 /package-lock.json
-/lib
+/dts
+/esm
+/cjs

README.md

@@ -33,7 +33,7 @@ If you find a bug or have compatibility issues, please open a ticket under issue
 
 # License
 
-Copyright (c) 2019-2022 JrMasterModelBuilder
+Copyright (c) 2019-2023 JrMasterModelBuilder
 
 Licensed under the Mozilla Public License, v. 2.0.
 

babel.config.js

@@ -0,0 +1,69 @@
+'use strict';
+
+const {name, version, engines} = require('./package.json');
+
+const node = engines.node
+	.split(/[^\d.]+/)
+	.filter(s => s.length)
+	.map(s => [...s.split('.').map(s => +s || 0), 0, 0].slice(0, 3))
+	.sort((a, b) => a[2] - b[2])
+	.sort((a, b) => a[1] - b[1])
+	.sort((a, b) => a[0] - b[0])[0]
+	.join('.');
+
+module.exports = api => {
+	const env = api.env();
+	api.cache(() => env);
+	const modules = env === 'esm' ? false : 'commonjs';
+	const ext = modules ? '.js' : '.mjs';
+	const presets = [];
+	const plugins = [];
+	presets.push([
+		'@babel/preset-env',
+		{
+			modules,
+			exclude: ['proposal-dynamic-import'],
+			targets: {
+				node
+			}
+		}
+	]);
+	presets.push(['@babel/preset-typescript']);
+	if (modules === 'commonjs') {
+		plugins.push([
+			'@babel/plugin-transform-modules-commonjs',
+			{
+				importInterop: 'node'
+			}
+		]);
+	}
+	plugins.push([
+		'esm-resolver',
+		{
+			source: {
+				extensions: [
+					[['.js', '.mjs', '.jsx', '.mjsx', '.ts', '.tsx'], ext]
+				]
+			}
+		}
+	]);
+	plugins.push([
+		'search-and-replace',
+		{
+			rules: [
+				{
+					search: '#{NAME}',
+					replace: name
+				},
+				{
+					search: '#{VERSION}',
+					replace: version
+				}
+			]
+		}
+	]);
+	return {
+		presets,
+		plugins
+	};
+};