update: Merge *.types.d.ts files into matching *.d.ts files during release

packages/data/src/css/data-types.ts

@@ -1,12 +1,10 @@
-export interface DataType {
+export type DataType = {
   groups: string[];
   status: 'standard' | 'nonstandard' | 'experimental';
   mdn_url?: string;
-}
+};
 
-export interface DataTypes {
-  [name: string]: DataType;
-}
+export type DataTypes = Record<string, DataType>;
 
 // Populated via @email-types/scripts during the build pipeline.
 // This cannot be a named export or it will not work.

packages/data/src/css/index.ts

@@ -1,3 +1 @@
-import { dataTypes, DataType, DataTypes } from './data-types';
-
-export { dataTypes, DataType, DataTypes };
+export * from './data-types';

packages/data/src/html/index.ts

@@ -1,2 +1 @@
 export * from './doctypes';
-export * from './doctypes.types';

packages/data/src/mso/index.ts

@@ -3,8 +3,3 @@ export * from './operators';
 export * from './properties';
 export * from './syntaxes';
 export * from './versions';
-
-export * from './operators.types';
-export * from './properties.types';
-export * from './syntaxes.types';
-export * from './versions.types';

packages/scripts/README.md

@@ -34,5 +34,7 @@ yarn prerelease
 
 **Tasks**
 
-- Automatically removes empty `*.js` files from the `@email-types/data` dist,
-  reducing overall package size.
+- Automatically merges `*.types.d.ts` files with matched `.d.ts` files in
+  `@email-types/data` dist, reducing overall package size.
+- Automatically removes empty `*.js` and unused `*.types.d.ts` files from the
+  `@email-types/data` dist, reducing overall package size.

packages/scripts/transfer/index.ts → packages/scripts/build/transfer.ts

@@ -21,7 +21,7 @@ const createTemplate = <T extends object = {}>(
     `exports.${name} = ${name};`,
   ];
 
-  return content.join(`${EOL}${EOL}`);
+  return content.join(`${EOL}`);
 };
 
 const createTransport = (pkg: Package) => async (

packages/scripts/prerelease/optimize.ts

@@ -0,0 +1,43 @@
+import fs from 'fs-extra';
+import glob from 'tiny-glob';
+import { log, getPackagePath, Package } from '../utils';
+
+const extensions = 'types';
+
+const importPattern = RegExp(
+  `import(?:["'\\s]*[\\w*\\$\\{\\}\n\r\t, ]+from\\s*)?["'\\s]["'\\s](.*[@\\w_-]+\\.${extensions})["'\\s].*;$`,
+  'gmi',
+);
+
+const clean = async (target: string): Promise<boolean> => {
+  const source = target.replace('.d.ts', `.${extensions}.d.ts`);
+
+  if (fs.existsSync(source)) {
+    const content = await fs.readFile(target, 'utf-8');
+    const [match] = content.match(importPattern) || [];
+
+    if (match) {
+      const types = await fs.readFile(source, 'utf-8');
+      const next = content.replace(match, types.replace('export {};\n', ''));
+
+      await fs.outputFile(target, next);
+      await fs.remove(source);
+      await fs.remove(source.replace('.d.ts', '.js'));
+      return true;
+    }
+  }
+
+  return false;
+};
+
+export const optimize = async (pkg: Package): Promise<void> => {
+  const filepaths = await glob(`**/*.d.ts`, {
+    cwd: getPackagePath(pkg, 'dist'),
+    absolute: true,
+  });
+
+  log.wait(`Merging '*.types.d.ts' files with '*.d.ts'...`);
+  const results = await Promise.all(filepaths.map(clean));
+
+  log.done(`Optimized ${results.filter(Boolean).length} declaration files`);
+};

packages/scripts/tasks/build.ts

@@ -1,4 +1,4 @@
-import { transfer } from '../transfer';
+import { transfer } from '../build/transfer';
 import { log } from '../utils';
 
 const pkgs = [

packages/scripts/tasks/prerelease.ts

@@ -1,10 +1,11 @@
-import { removeEmpty } from '../prerelease/removeEmpty';
+import { optimize } from '../prerelease/optimize';
 import { log } from '../utils';
 
 (async (): Promise<void> => {
   try {
     log.info('Running prerelease task...');
-    await removeEmpty('data');
+
+    await optimize('data');
     log.done('Successfully ran prerelease task');
   } catch (error) {
     log.error(error);