Separate source and generated code

WebThingsIO · Oct 10, 2021 · 07d65a3 · 07d65a3
1 parent ea95091
commit 07d65a3
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
           npm ci
       - name: Check formatting
         run: |
-          npx prettier -c '*.ts' 'lib/*.ts' 'example/**/*.{js,ts}'
+          npx prettier -c 'src/*.ts' 'example/**/*.{js,ts}'
       - name: Lint with eslint
         run: |
           npm run lint

diff --git a/package.json b/package.json
@@ -2,14 +2,14 @@
   "name": "webthing",
   "version": "0.15.0",
   "description": "HTTP Web Thing implementation",
-  "main": "webthing.js",
+  "main": "lib/webthing.js",
   "scripts": {
     "lint": "tsc --noEmit && eslint . --ext .ts",
     "node": "NODE_PATH=. node",
     "start": "NODE_PATH=. node example/multiple-things",
     "test": "make test",
     "simplest": "NODE_PATH=. node example/simplest-thing",
-    "prettier": "npx prettier -w '*.ts' 'lib/*.ts' 'example/**/*.{js,ts}'",
+    "prettier": "npx prettier -w 'src/*.ts' 'example/**/*.{js,ts}'",
     "build": "tsc -p ."
   },
   "repository": {
@@ -28,7 +28,7 @@
     "url": "https://github.com/WebThingsIO/webthing-node/issues"
   },
   "homepage": "https://github.com/WebThingsIO/webthing-node#readme",
-  "types": "index.d.ts",
+  "types": "lib/index.d.ts",
   "dependencies": {
     "ajv": "^7.0.4",
     "body-parser": "^1.19.0",

diff --git a/lib/action.ts → src/action.ts b/lib/action.ts → src/action.ts
diff --git a/lib/event.ts → src/event.ts b/lib/event.ts → src/event.ts
diff --git a/index.ts → src/index.ts b/index.ts → src/index.ts
diff --git a/lib/property.ts → src/property.ts b/lib/property.ts → src/property.ts
diff --git a/lib/server.ts → src/server.ts b/lib/server.ts → src/server.ts
diff --git a/lib/thing.ts → src/thing.ts b/lib/thing.ts → src/thing.ts
diff --git a/lib/types.ts → src/types.ts b/lib/types.ts → src/types.ts
diff --git a/lib/utils.ts → src/utils.ts b/lib/utils.ts → src/utils.ts
diff --git a/lib/value.ts → src/value.ts b/lib/value.ts → src/value.ts
diff --git a/src/webthing.ts b/src/webthing.ts
@@ -0,0 +1,9 @@
+import Action from './action';
+import Event from './event';
+import Property from './property';
+import Thing from './thing';
+import Value from './value';
+
+export { Action, Event, Property, Thing, Value };
+
+export * from './server';
diff --git a/tsconfig.json b/tsconfig.json
@@ -10,6 +10,8 @@
     "declaration": true,
     "declarationMap": true,
     "sourceMap": true,
+    "rootDir": "src",
+    "outDir": "lib",
     "strict": true,
     "noImplicitAny": true,
     "strictNullChecks": true,

diff --git a/webthing.ts b/webthing.ts