1.2.4 (#167)

.eslintignore

@@ -1,2 +1,3 @@
 node_modules
 lib
+/dist/

.gitignore

@@ -3,3 +3,4 @@
 /lib/
 /coverage/
 docs/
+/dist/

package.json

@@ -1,22 +1,30 @@
 {
   "name": "shortcut-api",
-  "version": "1.2.3",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "version": "1.2.4",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
   "files": [
-    "lib"
+    "dist"
   ],
   "exports": {
     ".": {
-      "import": "./lib/index.js",
-      "require": "./lib/index.js"
-    }
+      "import": "./dist/esm/index.mjs",
+      "require": "./dist/cjs/index.cjs"
+    },
+    "./package.json": "./package.json"
   },
   "type": "module",
   "description": "An API Wrapper for Shortcut, using an object oriented approach to interact with the Shortcut API",
   "scripts": {
-    "build": "rm -rf lib && tsc && tscpaths -p tsconfig.json -s ./src -o ./lib && npm run reformatImports",
-    "reformatImports": "node ./scripts/reformat-imports.js",
+    "build": "rm -rf dist && npm run compile:esm && npm run compile:cjs && npm run replace-paths && npm run rename:esm && npm run rename:cjs && npm run reformat-imports:esm && npm run reformat-imports:cjs",
+    "compile:esm": "tsc -p tsconfig.esm.json",
+    "compile:cjs": "tsc -p tsconfig.cjs.json",
+    "rename:esm": "renamer --path-element ext --find js --replace mjs './dist/esm/**/*.js'",
+    "rename:cjs": "renamer --path-element ext --find js --replace cjs './dist/cjs/**/*.js'",
+    "replace-paths": "tscpaths -p tsconfig.esm.json -s ./src -o ./dist/esm && tscpaths -p tsconfig.cjs.json -s ./src -o ./dist/cjs",
+    "reformat-imports:esm": "node scripts/reformat-esm-imports.js",
+    "reformat-imports:cjs": "node scripts/reformat-cjs-imports.js",
     "prepublishOnly": "npm run build",
     "test": "jest",
     "docs": "npx typedoc",
@@ -41,6 +49,7 @@
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-perfectionist": "^2.7.0",
     "jest": "^29.7.0",
+    "renamer": "^5.0.0",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",

scripts/reformat-cjs-imports.js

@@ -0,0 +1,40 @@
+import fs from 'fs'
+import path from 'path'
+import {fileURLToPath} from 'url'
+
+
+const __filename = fileURLToPath(import.meta.url)
+const dirname = path.dirname(__filename)
+
+
+function appendJsExtension(file) {
+  const content = fs.readFileSync(file, 'utf8')
+  const updatedContent = content.replace(/require\(['"]([^'"]+)['"]\)/g, (match, p1) => {
+    // Append .js to relative paths if missing and not already ending with .js or .json
+    if (p1.startsWith('.') && !p1.endsWith('.js') && !p1.endsWith('.json')) {
+      return `require('${p1}.cjs')`
+    }
+    return match
+  })
+
+  fs.writeFileSync(file, updatedContent, 'utf8')
+}
+
+function processDirectory(directory) {
+  fs.readdirSync(directory, {withFileTypes: true}).forEach(dirent => {
+    const fullPath = path.join(directory, dirent.name)
+    if (dirent.isDirectory()) {
+      processDirectory(fullPath)
+    }
+    else if (dirent.isFile() && dirent.name.endsWith('.cjs')) {
+      appendJsExtension(fullPath)
+    }
+  })
+}
+
+// The directory containing your compiled JavaScript files.
+// Adjust this path as necessary.
+const compiledDir = path.join(dirname, '../dist/cjs')
+processDirectory(compiledDir)
+
+console.log('Import paths have been fixed for CJS modules.')

scripts/reformat-esm-imports.js

@@ -0,0 +1,41 @@
+import fs from 'fs'
+import path from 'path'
+import {fileURLToPath} from 'url'
+
+
+const __filename = fileURLToPath(import.meta.url)
+const dirname = path.dirname(__filename)
+
+
+function addJsExtension(file) {
+  const content = fs.readFileSync(file, 'utf8')
+  const updatedContent = content.replace(/from\s+['"]([^'"]+)['"]/g, (match, p1) => {
+    // Don't modify node_modules imports or absolute paths or URLs
+    if (p1.startsWith('.') && !p1.endsWith('.js') && !p1.endsWith('.json')) {
+      return `from '${p1}.mjs'`
+    }
+    return match
+  })
+
+  fs.writeFileSync(file, updatedContent, 'utf8')
+}
+
+function processDirectory(directory) {
+  fs.readdirSync(directory, {withFileTypes: true}).forEach(dirent => {
+    const fullPath = path.join(directory, dirent.name)
+    if (dirent.isDirectory()) {
+      processDirectory(fullPath)
+    }
+    else if (dirent.isFile() && dirent.name.endsWith('.mjs')) {
+      addJsExtension(fullPath)
+    }
+  })
+}
+
+// The directory containing your compiled JavaScript files.
+// Adjust this path as necessary.
+const compiledDir = path.join(dirname, '../dist/esm')
+
+processDirectory(compiledDir)
+
+console.log('Import paths have been fixed.')

tsconfig.base.json

@@ -0,0 +1,41 @@
+{
+  "compilerOptions": {
+    "target": "es2022",
+    "lib": [
+      "ES2022"
+    ],
+    "strictNullChecks": true,
+    "alwaysStrict": true,
+    "moduleResolution": "node",
+    "baseUrl": "./",
+    "declaration": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "paths": {
+      "@sx/*": [
+        "./src/*"
+      ]
+    },
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "allowSyntheticDefaultImports": true,
+    "resolveJsonModule": true,
+    "strictPropertyInitialization": false
+  },
+  "ts-node": {
+    "esm": true
+  },
+  "include": [
+    "./src/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist"
+  ],
+  "plugins": [
+    "@typescript-eslint",
+    "import"
+  ]
+}

tsconfig.cjs.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "module": "CommonJS",
+    "outDir": "./dist/cjs"
+  },
+  "include": ["src/**/*"]
+}

tsconfig.esm.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "module": "ESNext",
+    "outDir": "./dist/esm"
+  },
+  "include": ["src/**/*"]
+}

tsconfig.json

@@ -1,43 +1,8 @@
 {
+  "extends": "./tsconfig.esm.json",
   "compilerOptions": {
-    "target": "es2022",
-    "lib": [
-      "ES2022"
-    ],
-    "strictNullChecks": true,
-    "alwaysStrict": true,
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "baseUrl": "./",
-    "declaration": true,
-    "outDir": "./lib",
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "skipLibCheck": true,
-    "paths": {
-      "@sx/*": [
-        "./src/*"
-      ]
-    },
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "allowSyntheticDefaultImports": true,
-    "resolveJsonModule": true,
-    "strictPropertyInitialization": false
+    "module": "ESNext",
+    "outDir": "./dist/esm"
   },
-  "ts-node": {
-    "esm": true
-  },
-  "include": [
-    "./src/**/*.ts"
-  ],
-  "exclude": [
-    "node_modules",
-    "lib"
-  ],
-  "plugins": [
-    "@typescript-eslint",
-    "import"
-  ]
+  "include": ["src/**/*"]
 }