Remove generated source files (#34)

* Remove exponent utils * Remove generated files * Change build path
jscheiny · Jun 22, 2018 · d6c32fc · d6c32fc
1 parent bd5d1e6
commit d6c32fc
Show file tree

Hide file tree

Showing 24 changed files with 92 additions and 1,523 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,6 @@ yarn-error.log
 
 ### Editors
 .vscode/
+
+### Generated code
+generated/
diff --git a/codegen/common.ts b/codegen/common.ts
@@ -38,20 +38,31 @@ export function genFileHeader(disableTslint: boolean = true): string[] {
     return header;
 }
 
-export function genImport(symbols: string[], source: string): string {
-    symbols.sort((first, second) => {
-        if (first < second) {
-            return -1;
-        }
-        if (first > second) {
-            return 1;
-        }
-        return 0;
-    });
+interface ImportSpec {
+    symbols: string[];
+    source: string;
+}
+
+export function genImports(...imports: ImportSpec[]): string[] {
+    imports.sort((first, second) => order(first.source, second.source));
+    return imports.map(genImport);
+}
 
+function genImport({ symbols, source }: ImportSpec): string {
+    symbols.sort(order);
     return `import { ${symbols.join(", ")} } from "${source}";`;
 }
 
+function order(first: string, second: string) {
+    if (first < second) {
+        return -1;
+    }
+    if (first > second) {
+        return 1;
+    }
+    return 0;
+}
+
 export function genUncurriedTypeName(spec: OperatorSpec, left?: string | number, right?: string | number) {
     const args = left !== undefined && right !== undefined ? `<${left}, ${right}>` : "";
     return `${spec.uncurriedTypeNamePrefix}Exponents${args}`;

diff --git a/codegen/emit.ts b/codegen/emit.ts
@@ -1,10 +1,11 @@
-import { writeFile } from "fs";
+import { exists, mkdir, writeFile } from "fs";
 import { genCommonTypes } from "./genCommon";
 import { genOperatorTests } from "./genTests";
 import { genOperatorTypes } from "./genTypes";
 import { codeGenSpec } from "./spec";
 
-const PATH_PREFIX = "src/exponent";
+const PATH_PREFIX = "src/exponent/generated";
+const TEST_PREFIX = `${PATH_PREFIX}/__test__`;
 
 export interface EmitPlan {
     path: string;
@@ -13,14 +14,15 @@ export interface EmitPlan {
 
 export function emit(callback?: () => void) {
     const emits: EmitPlan[] = getEmitPlans();
-
-    let index = -1;
-    const nextEmit = () => {
-        index++;
-        const isLastEmit = index === emits.length - 1;
-        emitFile(emits[index], isLastEmit ? callback : nextEmit);
-    };
-    nextEmit();
+    prepForEmit(() => {
+        let index = -1;
+        const nextEmit = () => {
+            index++;
+            const isLastEmit = index === emits.length - 1;
+            emitFile(emits[index], isLastEmit ? callback : nextEmit);
+        };
+        nextEmit();
+    });
 }
 
 export function getEmitPlans(): EmitPlan[] {
@@ -31,12 +33,31 @@ export function getEmitPlans(): EmitPlan[] {
         const { fileNamePrefix } = operator;
         emits.push(
             { path: `${PATH_PREFIX}/${fileNamePrefix}.ts`, source: genOperatorTypes(operatorSpec) },
-            { path: `${PATH_PREFIX}/__test__/${fileNamePrefix}Spec.ts`, source: genOperatorTests(operatorSpec) },
+            { path: `${TEST_PREFIX}/${fileNamePrefix}Spec.ts`, source: genOperatorTests(operatorSpec) },
         );
     });
     return emits;
 }
 
+function prepForEmit(callback: () => void) {
+    makeDirectory(PATH_PREFIX, () => makeDirectory(TEST_PREFIX, callback));
+}
+
+function makeDirectory(path: string, callback: () => void) {
+    exists(path, doesExist => {
+        if (doesExist) {
+            return callback();
+        }
+        mkdir(path, err => {
+            if (err) {
+                console.error(`There was an error creating directory ${path}`);
+            } else {
+                callback();
+            }
+        });
+    });
+}
+
 function emitFile({ path, source }: EmitPlan, callback?: () => void) {
     writeFile(path, source, error => {
         if (error) {
@@ -49,3 +70,5 @@ function emitFile({ path, source }: EmitPlan, callback?: () => void) {
         }
     });
 }
+
+emit();
diff --git a/codegen/genCommon.ts b/codegen/genCommon.ts
@@ -26,6 +26,7 @@ function genErrorType(): string[] {
     return [
         `export type ArithmeticError = "UnitError" & "Arithmetic out of bounds";`,
         `export const ArithmeticError = "Arithmetic out of bounds";`,
+        `export type IsArithmeticError<T> = T extends ArithmeticError ? true : false;`,
         "",
     ];
 }
diff --git a/codegen/genTests.ts b/codegen/genTests.ts
@@ -1,6 +1,6 @@
 import {
     genFileHeader,
-    genImport,
+    genImports,
     genUncurriedTypeName,
     genValueName,
     getExponents,
@@ -9,7 +9,7 @@ import {
 } from "./common";
 
 export function genOperatorTests(spec: OperatorSpec): string {
-    const lines: string[] = [...genFileHeader(), ...genImports(spec)];
+    const lines: string[] = [...genFileHeader(false), ...genTestsImports(spec)];
     const exponents = getExponents(spec);
     for (const left of exponents) {
         for (const right of exponents) {
@@ -20,10 +20,12 @@ export function genOperatorTests(spec: OperatorSpec): string {
     return lines.join("\n");
 }
 
-function genImports(spec: OperatorSpec): string[] {
+function genTestsImports(spec: OperatorSpec): string[] {
     return [
-        genImport([genUncurriedTypeName(spec)], `../${spec.fileNamePrefix}`),
-        genImport(["IsArithmeticError"], "../utils"),
+        ...genImports(
+            { symbols: ["IsArithmeticError"], source: "../common" },
+            { symbols: [genUncurriedTypeName(spec)], source: `../${spec.fileNamePrefix}` },
+        ),
         "",
     ];
 }

diff --git a/codegen/genTypes.ts b/codegen/genTypes.ts
@@ -1,6 +1,6 @@
 import {
     genFileHeader,
-    genImport,
+    genImports,
     genUncurriedTypeName,
     genValueName,
     getExponents,
@@ -11,7 +11,7 @@ import {
 
 export function genOperatorTypes(spec: OperatorSpec): string {
     const exponents = getExponents(spec);
-    let lines: string[] = [...genFileHeader(), ...genImports(), ...genUncurriedType(spec, exponents)];
+    let lines: string[] = [...genFileHeader(), ...genTypesImports(), ...genUncurriedType(spec, exponents)];
     for (const left of exponents) {
         if (!(left in spec.specialCases)) {
             lines.push(...genCurriedType(spec, exponents, left));
@@ -20,8 +20,8 @@ export function genOperatorTypes(spec: OperatorSpec): string {
     return lines.join("\n");
 }
 
-function genImports(): string[] {
-    return [genImport(["ArithmeticError", "Exponent"], "./common"), ""];
+function genTypesImports(): string[] {
+    return [...genImports({ symbols: ["ArithmeticError", "Exponent"], source: "./common" }), ""];
 }
 
 function genUncurriedType(spec: OperatorSpec, exponents: number[]): string[] {

diff --git a/codegen/produce.ts b/codegen/produce.ts
diff --git a/codegen/verify.ts b/codegen/verify.ts
diff --git a/package.json b/package.json
@@ -13,16 +13,14 @@
     "main": "dist/index.js",
     "typings": "dist/index.d.ts",
     "scripts": {
-        "codegen:produce": "npm-run-all -s compile:codegen node:codegen:produce",
-        "codegen:verify": "npm-run-all -s compile:codegen node:codegen:verify",
+        "codegen": "npm-run-all -s compile:codegen node:codegen",
         "compile:src": "tsc -p src",
         "compile:codegen": "tsc -p codegen",
         "lint": "tslint -p src/tsconfig.json -c tslint.json '{src,codegen}/**/*.ts'",
         "lint:fix": "yarn lint --fix",
-        "node:codegen:produce": "node codegen/dist/produce",
-        "node:codegen:verify": "node codegen/dist/verify",
+        "node:codegen": "node codegen/dist/emit",
         "test": "jest --config jest.config.js",
-        "verify": "npm-run-all -s codegen:verify compile:src lint test"
+        "verify": "npm-run-all -s codegen compile:src lint test"
     },
     "devDependencies": {
         "@types/jest": "^22.2.3",