fix: remove tsup, replace with Vite + dts-bundle-generator

ghiscoding · ghiscoding · commit 2f8431f27d18 · 2024-10-11T01:12:05.000-04:00
diff --git a/packages/excel-builder-vanilla-types/dist/index.d.cts b/packages/excel-builder-vanilla-types/dist/index.d.cts
diff --git a/packages/excel-builder-vanilla-types/dist/index.d.ts b/packages/excel-builder-vanilla-types/dist/index.d.ts
diff --git a/packages/excel-builder-vanilla/clone-dts.mjs b/packages/excel-builder-vanilla/clone-dts.mjs
@@ -0,0 +1,3 @@
+import { readFileSync, writeFileSync } from 'node:fs';
+
+writeFileSync('dist/index.d.cts', readFileSync('dist/index.d.ts'));
diff --git a/packages/excel-builder-vanilla/package.json b/packages/excel-builder-vanilla/package.json
@@ -29,7 +29,6 @@
   },
   "type": "module",
   "main": "./dist/index.cjs",
-  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
@@ -51,11 +50,11 @@
   },
   "scripts": {
     "clean": "rimraf dist ../excel-builder-vanilla-types/dist",
-    "dev:init": "tsup && pnpm copy:types",
-    "dev": "tsup --watch --onSuccess \"pnpm build:types:map\"",
-    "build": "pnpm clean && tsup && pnpm copy:types",
-    "build:types:map": "tsc --emitDeclarationOnly --incremental --declarationMap --outDir dist",
-    "build:vite": "pnpm clean && vite build && pnpm copy:types",
+    "dev:init": "vite build",
+    "dev": "vite build --watch",
+    "build": "pnpm clean && vite build && pnpm build:dts && pnpm clone:dts && pnpm copy:types",
+    "build:dts": "dts-bundle-generator -o dist/index.d.ts src/index.ts",
+    "clone:dts": "node clone-dts.mjs",
     "copy:types": "node copy-types.mjs",
     "are-type-wrong": "attw --pack ."
   },
@@ -65,7 +64,8 @@
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.16.4",
     "copyfiles": "^2.4.1",
-    "tsup": "^8.3.0",
-    "typescript": "^5.6.2"
+    "dts-bundle-generator": "^9.5.1",
+    "typescript": "^5.6.2",
+    "vite": "^5.4.8"
   }
 }
diff --git a/packages/excel-builder-vanilla/src/Excel/Drawing/AbsoluteAnchor.ts b/packages/excel-builder-vanilla/src/Excel/Drawing/AbsoluteAnchor.ts
@@ -1,5 +1,5 @@
-import { Util } from '../Util';
-import type { XMLDOM } from '../XMLDOM';
+import { Util } from '../Util.js';
+import type { XMLDOM } from '../XMLDOM.js';
 
 /**
  *
diff --git a/packages/excel-builder-vanilla/src/Excel/Drawing/Drawing.ts b/packages/excel-builder-vanilla/src/Excel/Drawing/Drawing.ts
@@ -1,9 +1,9 @@
-import { uniqueId } from '../../utilities/uniqueId';
-import { AbsoluteAnchor } from './AbsoluteAnchor';
-import { Chart } from './Chart';
-import { OneCellAnchor } from './OneCellAnchor';
-import { TwoCellAnchor } from './TwoCellAnchor';
-// import { Picture } from './Picture';
+import { uniqueId } from '../../utilities/uniqueId.js';
+import { AbsoluteAnchor } from './AbsoluteAnchor.js';
+import { Chart } from './Chart.js';
+import { OneCellAnchor } from './OneCellAnchor.js';
+import { TwoCellAnchor } from './TwoCellAnchor.js';
+// import { Picture } from './Picture.js';
 
 /**
  * This is mostly a global spot where all of the relationship managers can get and set
diff --git a/packages/excel-builder-vanilla/src/Excel/Drawing/OneCellAnchor.ts b/packages/excel-builder-vanilla/src/Excel/Drawing/OneCellAnchor.ts
@@ -1,5 +1,5 @@
-import { Util } from '../Util';
-import type { XMLDOM } from '../XMLDOM';
+import { Util } from '../Util.js';
+import type { XMLDOM } from '../XMLDOM.js';
 
 /**
  *
diff --git a/packages/excel-builder-vanilla/src/Excel/Drawing/Picture.ts b/packages/excel-builder-vanilla/src/Excel/Drawing/Picture.ts
@@ -1,7 +1,7 @@
-import { uniqueId } from '../../utilities/uniqueId';
-import { Util } from '../Util';
-import type { XMLDOM } from '../XMLDOM';
-import { Drawing } from './Drawing';
+import { uniqueId } from '../../utilities/uniqueId.js';
+import { Util } from '../Util.js';
+import type { XMLDOM } from '../XMLDOM.js';
+import { Drawing } from './Drawing.js';
 
 export class Picture extends Drawing {
   media: any = null;
diff --git a/packages/excel-builder-vanilla/src/Excel/Drawing/TwoCellAnchor.ts b/packages/excel-builder-vanilla/src/Excel/Drawing/TwoCellAnchor.ts
@@ -1,5 +1,5 @@
-import { Util } from '../Util';
-import type { XMLDOM } from '../XMLDOM';
+import { Util } from '../Util.js';
+import type { XMLDOM } from '../XMLDOM.js';
 
 export class TwoCellAnchor {
   from: any = { xOff: 0, yOff: 0 };
diff --git a/packages/excel-builder-vanilla/src/Excel/Drawings.ts b/packages/excel-builder-vanilla/src/Excel/Drawings.ts
@@ -1,8 +1,8 @@
-import { uniqueId } from '../utilities/uniqueId';
-import type { Drawing } from './Drawing/Drawing';
-import type { Picture } from './Drawing/Picture';
-import { RelationshipManager } from './RelationshipManager';
-import { Util } from './Util';
+import { uniqueId } from '../utilities/uniqueId.js';
+import type { Drawing } from './Drawing/Drawing.js';
+import type { Picture } from './Drawing/Picture.js';
+import { RelationshipManager } from './RelationshipManager.js';
+import { Util } from './Util.js';
 
 /**
  * @module Excel/Drawings
diff --git a/packages/excel-builder-vanilla/src/Excel/Pane.ts b/packages/excel-builder-vanilla/src/Excel/Pane.ts
@@ -4,7 +4,7 @@
  * https://msdn.microsoft.com/en-us/library/documentformat.openxml.spreadsheet.pane%28v=office.14%29.aspx
  */
 
-import type { XMLDOM } from './XMLDOM';
+import type { XMLDOM } from './XMLDOM.js';
 
 export class Pane {
   /*
diff --git a/packages/excel-builder-vanilla/src/Excel/RelationshipManager.ts b/packages/excel-builder-vanilla/src/Excel/RelationshipManager.ts
@@ -1,6 +1,6 @@
-import { uniqueId } from '../utilities/uniqueId';
-import { Paths } from './Paths';
-import { Util } from './Util';
+import { uniqueId } from '../utilities/uniqueId.js';
+import { Paths } from './Paths.js';
+import { Util } from './Util.js';
 
 /**
  * @module Excel/RelationshipManager
diff --git a/packages/excel-builder-vanilla/src/Excel/SharedStrings.ts b/packages/excel-builder-vanilla/src/Excel/SharedStrings.ts
@@ -1,5 +1,5 @@
-import { uniqueId } from '../utilities/uniqueId';
-import { Util } from './Util';
+import { uniqueId } from '../utilities/uniqueId.js';
+import { Util } from './Util.js';
 
 /**
  * @module Excel/SharedStrings
diff --git a/packages/excel-builder-vanilla/src/Excel/SheetView.ts b/packages/excel-builder-vanilla/src/Excel/SheetView.ts
@@ -1,6 +1,6 @@
-import { Pane } from './Pane';
-import { Util } from './Util';
-import type { XMLDOM } from './XMLDOM';
+import { Pane } from './Pane.js';
+import { Util } from './Util.js';
+import type { XMLDOM } from './XMLDOM.js';
 
 interface SheetViewOption {
   pane?: Pane;
diff --git a/packages/excel-builder-vanilla/src/Excel/StyleSheet.ts b/packages/excel-builder-vanilla/src/Excel/StyleSheet.ts
@@ -1,9 +1,9 @@
-import type { ExcelFontStyle, ExcelStyleInstruction } from '../interfaces';
-import { isObject, isString } from '../utilities/isTypeOf';
-import { pick } from '../utilities/pick';
-import { uniqueId } from '../utilities/uniqueId';
-import { Util } from './Util';
-import type { XMLDOM } from './XMLDOM';
+import type { ExcelFontStyle, ExcelStyleInstruction } from '../interfaces.js';
+import { isObject, isString } from '../utilities/isTypeOf.js';
+import { pick } from '../utilities/pick.js';
+import { uniqueId } from '../utilities/uniqueId.js';
+import { Util } from './Util.js';
+import type { XMLDOM } from './XMLDOM.js';
 
 /**
  * @module Excel/StyleSheet
diff --git a/packages/excel-builder-vanilla/src/Excel/Table.ts b/packages/excel-builder-vanilla/src/Excel/Table.ts
@@ -1,8 +1,8 @@
-import type { ExcelSortState, ExcelTableColumn } from '../interfaces';
-import { isString } from '../utilities/isTypeOf';
-import { uniqueId } from '../utilities/uniqueId';
-import { Util } from './Util';
-import type { XMLDOM } from './XMLDOM';
+import type { ExcelSortState, ExcelTableColumn } from '../interfaces.js';
+import { isString } from '../utilities/isTypeOf.js';
+import { uniqueId } from '../utilities/uniqueId.js';
+import { Util } from './Util.js';
+import type { XMLDOM } from './XMLDOM.js';
 
 /**
  * @module Excel/Table
diff --git a/packages/excel-builder-vanilla/src/Excel/Util.ts b/packages/excel-builder-vanilla/src/Excel/Util.ts
@@ -1,5 +1,5 @@
-import { isPlainObject } from '../utilities/isTypeOf';
-import { XMLDOM, type XMLNode } from './XMLDOM';
+import { isPlainObject } from '../utilities/isTypeOf.js';
+import { XMLDOM, type XMLNode } from './XMLDOM.js';
 
 /**
  * @module Excel/Util
diff --git a/packages/excel-builder-vanilla/src/Excel/Workbook.ts b/packages/excel-builder-vanilla/src/Excel/Workbook.ts
@@ -1,13 +1,13 @@
-import { uniqueId } from '../utilities/uniqueId';
-import type { Drawings } from './Drawings';
-import { Paths } from './Paths';
-import { RelationshipManager } from './RelationshipManager';
-import { SharedStrings } from './SharedStrings';
-import { StyleSheet } from './StyleSheet';
-import type { Table } from './Table';
-import { Util } from './Util';
-import { Worksheet } from './Worksheet';
-import { XMLDOM } from './XMLDOM';
+import { uniqueId } from '../utilities/uniqueId.js';
+import type { Drawings } from './Drawings.js';
+import { Paths } from './Paths.js';
+import { RelationshipManager } from './RelationshipManager.js';
+import { SharedStrings } from './SharedStrings.js';
+import { StyleSheet } from './StyleSheet.js';
+import type { Table } from './Table.js';
+import { Util } from './Util.js';
+import { Worksheet } from './Worksheet.js';
+import { XMLDOM } from './XMLDOM.js';
 
 /**
  * @module Excel/Workbook
diff --git a/packages/excel-builder-vanilla/src/Excel/Worksheet.ts b/packages/excel-builder-vanilla/src/Excel/Worksheet.ts
@@ -1,13 +1,13 @@
-import type { ExcelColumn, ExcelColumnFormat, ExcelColumnMetadata, ExcelMargin, ExcelStyleInstruction } from '../interfaces';
-import { isObject, isString } from '../utilities/isTypeOf';
-import { uniqueId } from '../utilities/uniqueId';
-import type { Drawings } from './Drawings';
-import { RelationshipManager } from './RelationshipManager';
-import type { SharedStrings } from './SharedStrings';
-import { SheetView } from './SheetView';
-import type { Table } from './Table';
-import { Util } from './Util';
-import type { XMLDOM, XMLNode } from './XMLDOM';
+import type { ExcelColumn, ExcelColumnFormat, ExcelColumnMetadata, ExcelMargin, ExcelStyleInstruction } from '../interfaces.js';
+import { isObject, isString } from '../utilities/isTypeOf.js';
+import { uniqueId } from '../utilities/uniqueId.js';
+import type { Drawings } from './Drawings.js';
+import { RelationshipManager } from './RelationshipManager.js';
+import type { SharedStrings } from './SharedStrings.js';
+import { SheetView } from './SheetView.js';
+import type { Table } from './Table.js';
+import { Util } from './Util.js';
+import type { XMLDOM, XMLNode } from './XMLDOM.js';
 
 interface CharType {
   font?: string;
diff --git a/packages/excel-builder-vanilla/src/Excel/XMLDOM.ts b/packages/excel-builder-vanilla/src/Excel/XMLDOM.ts
@@ -1,4 +1,4 @@
-import { htmlEscape } from '../utilities/escape';
+import { htmlEscape } from '../utilities/escape.js';
 
 type XMLNodeOption = {
   attributes?: {
diff --git a/packages/excel-builder-vanilla/src/Excel/__tests__/Util.spec.ts b/packages/excel-builder-vanilla/src/Excel/__tests__/Util.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 
-import { Util } from '../Util';
+import { Util } from '../Util.js';
 
 describe('utility functions', () => {
   describe('positionToLetterRef', () => {
diff --git a/packages/excel-builder-vanilla/src/Excel/__tests__/Worksheet.spec.ts b/packages/excel-builder-vanilla/src/Excel/__tests__/Worksheet.spec.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest';
 
-import { Worksheet } from '../Worksheet';
-import { XMLDOM, XMLNode } from '../XMLDOM';
+import { Worksheet } from '../Worksheet.js';
+import { XMLDOM, XMLNode } from '../XMLDOM.js';
 
 describe('Excel/Worksheet', () => {
   describe('compilePageDetailPiece', () => {
diff --git a/packages/excel-builder-vanilla/src/Excel/__tests__/XMLDOM.spec.ts b/packages/excel-builder-vanilla/src/Excel/__tests__/XMLDOM.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 
-import { XMLDOM } from '../XMLDOM';
+import { XMLDOM } from '../XMLDOM.js';
 
 describe('basic DOM simulator for web workers', () => {
   describe('XMLDOM', () => {
diff --git a/packages/excel-builder-vanilla/src/factory.ts b/packages/excel-builder-vanilla/src/factory.ts
@@ -1,6 +1,6 @@
 import { type ZipOptions, strToU8, zip } from 'fflate';
 
-import { Workbook } from './Excel/Workbook';
+import { Workbook } from './Excel/Workbook.js';
 
 type InferOutputByType<T extends 'Blob' | 'Uint8Array'> = T extends 'Blob' ? Blob : T extends 'Uint8Array' ? Uint8Array : any;
 
diff --git a/packages/excel-builder-vanilla/src/index.ts b/packages/excel-builder-vanilla/src/index.ts
@@ -1,25 +1,25 @@
-export { AbsoluteAnchor } from './Excel/Drawing/AbsoluteAnchor';
-export { Chart } from './Excel/Drawing/Chart';
-export { Drawing } from './Excel/Drawing/Drawing';
-export { OneCellAnchor } from './Excel/Drawing/OneCellAnchor';
-export { Picture } from './Excel/Drawing/Picture';
-export { TwoCellAnchor } from './Excel/Drawing/TwoCellAnchor';
-export { Drawings } from './Excel/Drawings';
-export { Pane } from './Excel/Pane';
-export { Paths } from './Excel/Paths';
-export { Positioning } from './Excel/Positioning';
-export { RelationshipManager } from './Excel/RelationshipManager';
-export { SharedStrings } from './Excel/SharedStrings';
-export { SheetView } from './Excel/SheetView';
-export { StyleSheet } from './Excel/StyleSheet';
-export { Table } from './Excel/Table';
-export { Util } from './Excel/Util';
-export { Workbook } from './Excel/Workbook';
-export { Worksheet } from './Excel/Worksheet';
-export { XMLDOM, XMLNode } from './Excel/XMLDOM';
-export { createExcelFile, createWorkbook, downloadExcelFile } from './factory';
-export * from './interfaces';
-export { htmlEscape } from './utilities/escape';
-export { isObject, isPlainObject, isString } from './utilities/isTypeOf';
-export { pick } from './utilities/pick';
-export { uniqueId } from './utilities/uniqueId';
+export { AbsoluteAnchor } from './Excel/Drawing/AbsoluteAnchor.js';
+export { Chart } from './Excel/Drawing/Chart.js';
+export { Drawing } from './Excel/Drawing/Drawing.js';
+export { OneCellAnchor } from './Excel/Drawing/OneCellAnchor.js';
+export { Picture } from './Excel/Drawing/Picture.js';
+export { TwoCellAnchor } from './Excel/Drawing/TwoCellAnchor.js';
+export { Drawings } from './Excel/Drawings.js';
+export { Pane } from './Excel/Pane.js';
+export { Paths } from './Excel/Paths.js';
+export { Positioning } from './Excel/Positioning.js';
+export { RelationshipManager } from './Excel/RelationshipManager.js';
+export { SharedStrings } from './Excel/SharedStrings.js';
+export { SheetView } from './Excel/SheetView.js';
+export { StyleSheet } from './Excel/StyleSheet.js';
+export { Table } from './Excel/Table.js';
+export { Util } from './Excel/Util.js';
+export { Workbook } from './Excel/Workbook.js';
+export { Worksheet } from './Excel/Worksheet.js';
+export { XMLDOM, XMLNode } from './Excel/XMLDOM.js';
+export { createExcelFile, createWorkbook, downloadExcelFile } from './factory.js';
+export * from './interfaces.js';
+export { htmlEscape } from './utilities/escape.js';
+export { isObject, isPlainObject, isString } from './utilities/isTypeOf.js';
+export { pick } from './utilities/pick.js';
+export { uniqueId } from './utilities/uniqueId.js';
diff --git a/packages/excel-builder-vanilla/src/utilities/__tests__/isTypeOf.spec.ts b/packages/excel-builder-vanilla/src/utilities/__tests__/isTypeOf.spec.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from 'vitest';
-import { isObject, isPlainObject, isString } from '../isTypeOf';
+
+import { isObject, isPlainObject, isString } from '../isTypeOf.js';
 
 describe('isObject() method', () => {
   it('should return truthy when input is a valid object', () => {
diff --git a/packages/excel-builder-vanilla/src/utilities/__tests__/uniqueId.spec.ts b/packages/excel-builder-vanilla/src/utilities/__tests__/uniqueId.spec.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from 'vitest';
-import { uniqueId } from '../uniqueId';
+
+import { uniqueId } from '../uniqueId.js';
 
 describe('uniqueId() method', () => {
   it('should return number starting at 1 when no prefix provided', () => {
diff --git a/packages/excel-builder-vanilla/tsconfig.json b/packages/excel-builder-vanilla/tsconfig.json
@@ -19,7 +19,6 @@
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noImplicitReturns": true,
-    "skipLibCheck": true,
     "sourceMap": true
   },
   "exclude": ["node_modules", "**/*.spec.ts"],
diff --git a/packages/excel-builder-vanilla/tsup.config.ts b/packages/excel-builder-vanilla/tsup.config.ts
diff --git a/packages/excel-builder-vanilla/vite.config.mts b/packages/excel-builder-vanilla/vite.config.mts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { readFileSync, writeFileSync } from 'node:fs';`
	`2`	`+`
	`3`	`+writeFileSync('dist/index.d.cts', readFileSync('dist/index.d.ts'));`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-import { Util } from '../Util';`
`2`		`-import type { XMLDOM } from '../XMLDOM';`
	`1`	`+import { Util } from '../Util.js';`
	`2`	`+import type { XMLDOM } from '../XMLDOM.js';`
`3`	`3`
`4`	`4`	`/**`
`5`	`5`	`*`