Merge pull request #54 from tylerbutler/cjs-esm-fix

fix: Generate and export types, use .cjs file extension

package.json

@@ -3,8 +3,19 @@
   "version": "5.101.0",
   "type": "module",
   "description": "Visualization of JSSM machines using viz.js",
-  "main": "dist/jssm-viz.cjs.js",
+  "main": "dist/jssm-viz.cjs.cjs",
   "module": "dist/jssm-viz.es6.js",
+  "exports": {
+    "require": {
+      "types": "./dist/jssm-viz.d.cts",
+      "default": "./dist/jssm-viz.cjs.cjs"
+    },
+    "import": {
+      "types": "./dist/jssm-viz.es6.d.ts",
+      "default": "./dist/jssm-viz.es6.js"
+    },
+    "browser": "./dist/jssm-viz.iife.js"
+  },
   "scripts": {
     "test": "jest --verbose",
     "clean": "rimraf build -f && rimraf dist -f && rimraf docs -f && mkdir build && cd build && mkdir terser && cd .. && mkdir dist && mkdir docs && cd docs && mkdir docs && cd ../src/ts && rimraf -f generated_code && mkdir generated_code && cd ../..",
@@ -74,6 +85,7 @@
     "pegjs": "^0.10.0",
     "rimraf": "^2.7.1",
     "rollup": "^4.22.4",
+    "rollup-plugin-dts": "^6.1.1",
     "typescript": "^5.5.3",
     "uglify-js": "^3.6.2",
     "viz.js": "^2.1.2"

rollup.config.js

@@ -1,12 +1,12 @@
 
 import nodeResolve from '@rollup/plugin-node-resolve';
 import commonjs    from '@rollup/plugin-commonjs';
+import dts         from "rollup-plugin-dts";
 
 
 
 
-
-const es6config = {
+const es6config = [{
 
   input     : 'build/typescript/jssm-viz.js',
 
@@ -35,18 +35,31 @@ const es6config = {
 
   ]
 
-};
+}, {
+
+  input: 'build/typescript/jssm-viz.d.ts',
+
+  output: { 
+    file   : './build/rollup/jssm-viz.es6.d.ts',
+    format : 'es'
+  },
+
+  plugins : [
+
+    dts()
+  ]}
+];
 
 
 
 
 
-const cjsconfig = {
+const cjsconfig = [{
 
   input     : 'build/typescript/jssm-viz.js',
 
   output    : {
-    file      : 'build/rollup/jssm-viz.cjs.js',
+    file      : 'build/rollup/jssm-viz.cjs.cjs',
     format    : 'cjs',
     name      : 'jssm_viz',
     sourcemap : true,
@@ -70,13 +83,26 @@ const cjsconfig = {
 
   ]
 
-};
+}, {
+
+  input: 'build/typescript/jssm-viz.d.ts',
+
+  output: { 
+    file   : './build/rollup/jssm-viz.cjs.d.cts',
+    format : 'cjs'
+  },
+
+  plugins : [
+
+    dts()
+  ]}
+];
 
 
 
 
 
-const iifeconfig = {
+const iifeconfig = [{
 
   input     : 'build/typescript/jssm-viz.js',
 
@@ -105,10 +131,10 @@ const iifeconfig = {
 
   ]
 
-};
+}];
 
 
 
 
 
-export default [ es6config, cjsconfig, iifeconfig ];
+export default [ ...es6config, ...cjsconfig, ...iifeconfig ];

tsconfig.json

@@ -49,7 +49,7 @@
     // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
 
     /* Emit */
-    // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
+    "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
     // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
     // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
     "sourceMap": true,                                   /* Create source map files for emitted JavaScript files. */