feat: fix build

.gitignore

@@ -3,4 +3,5 @@
 /.vscode
 /workbench
 /lib
-/es
+/es
+/generated

generate.ts

@@ -1,15 +1,17 @@
 import * as fs from 'fs';
+import { map } from 'lodash/fp';
 import * as path from 'path';
 import prettier from 'prettier';
 import * as util from 'util';
 
 import { generateAllTypes } from './src/generateAllTypes';
+import { generateIndex } from './src/generateIndex';
 
 const readdir = util.promisify(fs.readdir);
 const readFile = util.promisify(fs.readFile);
 const writeFile = util.promisify(fs.writeFile);
 
-const LIB_PATH = path.join(__dirname, './lib');
+const LIB_PATH = path.join(__dirname, './generated');
 
 async function format(filepath: string) {
   const contents = await readFile(filepath);
@@ -33,6 +35,10 @@ async function generate() {
   await Promise.all(
     formatted.map(({ contents, filepath }) => writeFile(filepath, contents)),
   );
+
+  await generateIndex(
+    map(filename => `./${filename.replace('.ts', '')}`, filenames),
+  );
 }
 
 generate();

jest.config.js

@@ -14,7 +14,7 @@ module.exports = {
   collectCoverage: true,
   globals: {
     'ts-jest': {
-      tsConfigFile: 'tsconfig.cjs.json',
+      tsConfigFile: 'tsconfig.cjs.test.json',
     },
   },
 };

package.json

@@ -2,20 +2,21 @@
   "name": "@johanneslumpe/css-types",
   "version": "0.1.0",
   "description": "TypeScript CSS types and value helpers generated from MDN data",
-  "main": "lib/index.ts",
+  "main": "lib/index.js",
+  "module": "es/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "test": "tsc -p ./tsconfig.cjs.json --noEmit && jest",
+    "test": "tsc -p ./tsconfig.cjs.test.json --noEmit && jest",
     "lint": "tslint --project tsconfig.json",
     "format": "prettier --write \"src/**/*.ts\"",
     "test:watch": "jest --watch",
-    "build": "rimraf ./lib && npx ts-node generate",
+    "build": "rimraf ./generated && npx ts-node generate && tsc -p ./tsconfig.cjs.generated.json && tsc -p ./tsconfig.esm.generated.json",
     "prepare": "npm run build && npm run docs",
     "prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",
     "version": "npm run format && git add -A src",
     "postversion": "git push && git push --tags",
-    "docs": "typedoc ./lib --tsconfig ./tsconfig.cjs.json --hideGenerator --readme none --theme markdown --out docs"
+    "docs": "typedoc ./generated --tsconfig ./tsconfig.cjs.json --hideGenerator --readme none --theme markdown --out docs"
   },
   "files": [
     "/lib",

src/constants.ts

@@ -1,5 +1,6 @@
-export const TYPES_BUILD_DIR = '../lib/';
+export const TYPES_BUILD_DIR = '../generated/';
 export const LENGTH_GENERIC_ARGUMENT = 'TLength';
 export const LENGTH_TYPE_NAME = 'Length';
+export const CSS_TYPES_FILE = 'types.ts';
 export const UNIT_TYPES_FILE = 'unitTypes.ts';
 export const UNIT_UTILS_FILE = 'unitUtils.ts';

src/generateAllTypes.ts

@@ -7,7 +7,7 @@ import rimraf from 'rimraf';
 import ts from 'typescript';
 import * as util from 'util';
 
-import { LENGTH_TYPE_NAME, TYPES_BUILD_DIR } from './constants';
+import { CSS_TYPES_FILE, LENGTH_TYPE_NAME, TYPES_BUILD_DIR } from './constants';
 import { customSyntaxes } from './customSyntaxes';
 import {
   generateBaseDataTypes,
@@ -94,7 +94,7 @@ export async function generateAllTypes() {
 
   const typesOutputSource = ts.updateSourceFileNode(
     ts.createSourceFile(
-      'types.ts',
+      CSS_TYPES_FILE,
       '',
       ts.ScriptTarget.ESNext,
       false,

src/generateIndex.ts

@@ -0,0 +1,42 @@
+import * as fs from 'fs';
+import { map } from 'lodash/fp';
+import * as path from 'path';
+import ts from 'typescript';
+import * as util from 'util';
+import { TYPES_BUILD_DIR } from './constants';
+
+export function generateIndex(filenames: string[]) {
+  const printer = ts.createPrinter({
+    newLine: ts.NewLineKind.LineFeed,
+  });
+
+  const indexSource = ts.createSourceFile(
+    'index.ts',
+    '',
+    ts.ScriptTarget.ESNext,
+    false,
+    ts.ScriptKind.TS,
+  );
+  const exportDeclarations = map(
+    filename =>
+      ts.createExportDeclaration(
+        [],
+        [],
+        undefined,
+        ts.createStringLiteral(filename),
+      ),
+    filenames,
+  );
+
+  // const export
+  const updatedSource = ts.updateSourceFileNode(
+    indexSource,
+    exportDeclarations,
+  );
+
+  const writeFile = util.promisify(fs.writeFile);
+  return writeFile(
+    path.join(__dirname, TYPES_BUILD_DIR, indexSource.fileName),
+    printer.printFile(updatedSource),
+  );
+}

src/generateUnitTypeSourceFiles.ts

@@ -1,4 +1,4 @@
-import { flatten, map } from 'lodash/fp';
+import { flatten, map, sortBy } from 'lodash/fp';
 import { CSSUnitGroups } from 'mdn-data';
 import ts from 'typescript';
 
@@ -12,14 +12,15 @@ import { createUnitFunctionDeclaration } from './utils/createUnitFunctionDeclara
 import { generateTypeName } from './utils/generateTypeName';
 import { getUnits, lengthValueTags } from './utils/getUnits';
 
-const getUnitsWithAdditionalTypes = (tagFilterArray?: CSSUnitGroups[]) => [
-  ...getUnits(tagFilterArray),
-  {
-    brandKey: 'percentage',
-    name: 'Percentage',
-    unit: '%',
-  },
-];
+const getUnitsWithAdditionalTypes = (tagFilterArray?: CSSUnitGroups[]) =>
+  sortBy(x => x.name.toLowerCase(), [
+    ...getUnits(tagFilterArray),
+    {
+      brandKey: 'percentage',
+      name: 'Percentage',
+      unit: '%',
+    },
+  ]);
 
 export function generateUnitInterfaces(
   withAdditionalTypes: boolean,

tsconfig.cjs.generated.json

@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.compile.generated.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "lib"
+  }
+}

tsconfig.compile.base.json

@@ -4,7 +4,7 @@
   },
   "extends": "./tsconfig.json",
   "include": [
-    "src/**/*",
+    "generated/**/*",
   ],
   "exclude": [
     "**/*/__tests__/**/*"

tsconfig.compile.generated.json

@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+  },
+  "extends": "./tsconfig.json",
+  "include": [
+    "generated/**/*",
+  ],
+  "exclude": [
+    "**/*/__tests__/**/*"
+  ]  
+}

tsconfig.esm.json → tsconfig.esm.generated.json

@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.compile.base.json",
+  "extends": "./tsconfig.compile.generated.json",
   "compilerOptions": {
     "module": "esnext",
     "outDir": "es"