Simplify exports

.gitignore

@@ -1,5 +1,3 @@
 node_modules
 coverage
-
-*.d.ts
-*.js
+dist

pg.ts → lib/pg.ts

@@ -1,10 +1,10 @@
+import _sql = require('./sql')
 import {
   IPGQueryable,
   IPGQueryConfig,
   IPGQueryResult,
   TemplateLiteralFunc
-} from './lib/utils'
-import _sql = require('./sql')
+} from './utils'
 
 type PGSql = TemplateLiteralFunc<IPGQueryConfig> & {
   query: <T extends IPGQueryResult>(

sql.ts → lib/sql.ts

@@ -1,4 +1,4 @@
-import { IPGQueryConfig, SqlContainer, TemplateLiteralFunc } from './lib/utils'
+import { IPGQueryConfig, SqlContainer, TemplateLiteralFunc } from './utils'
 
 function sqlText(
   count: number,

package.json

@@ -1,8 +1,8 @@
 {
   "name": "@sequencework/sql",
   "version": "2.1.1",
-  "main": "sql.js",
-  "types": "sql.d.ts",
+  "main": "dist/sql.js",
+  "types": "dist/sql.d.ts",
   "license": "MIT",
   "description": "Javascript tag to format SQL template literals",
   "keywords": [
@@ -12,16 +12,11 @@
     "pg"
   ],
   "files": [
-    "sql.js",
-    "sql.d.ts",
-    "pg.js",
-    "pg.d.ts",
-    "lib/**/*.js",
-    "lib/**/*.d.ts"
+    "dist"
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf pg.js pg.d.ts sql.js sql.d.ts lib/**/*.js lib/**/*.d.ts coverage",
+    "clean": "rimraf dist coverage",
     "test": "jest",
     "prettier": "prettier --write '**/*.{ts,js,json,css,md}' --ignore-path .gitignore",
     "lint": "tslint -c tslint.json -p tsconfig.json -t stylish"

pg/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "@sequencework/sql/pg",
+  "private": true,
+  "main": "../dist/pg.js",
+  "types": "../dist/pg.d.ts"
+}

test/pg.test.ts

@@ -1,4 +1,4 @@
-import sql = require('../pg')
+import sql = require('../lib/pg')
 
 const sampleBooks = ['book1', 'book2']
 const db = {

test/sql.test.ts

@@ -1,4 +1,4 @@
-import sql = require('../sql')
+import sql = require('../lib/sql')
 
 const trimSpaces = str => str.trim().replace(/\s+/g, ' ')
 

tsconfig.json

@@ -2,7 +2,8 @@
   "compilerOptions": {
     "target": "es5",
     "module": "commonjs",
-    "declaration": true
+    "declaration": true,
+    "outDir": "dist"
   },
-  "files": ["sql.ts", "pg.ts", "lib/utils.ts"]
+  "include": ["lib"]
 }