chore: reorg project layout for better typescript refs

loopbackio · Sep 28, 2018 · 729be0a · 729be0a
1 parent d16e94b
commit 729be0a
Show file tree

Hide file tree

Showing 289 changed files with 203 additions and 573 deletions.
diff --git a/benchmark/index.ts b/benchmark/index.ts
diff --git a/benchmark/package.json b/benchmark/package.json
@@ -8,7 +8,7 @@
     "performance",
     "benchmark"
   ],
-  "main": "index.js",
+  "types": "./dist10/index.d.ts",
   "engines": {
     "node": ">=8.9"
   },
@@ -19,7 +19,7 @@
     "build:dist10": "lb-tsc es2018",
     "clean": "lb-clean dist*",
     "pretest": "npm run clean && npm run build",
-    "test": "lb-mocha \"DIST/test\"",
+    "test": "lb-mocha \"DIST/__tests__\"",
     "prestart": "npm run build",
     "start": "node ."
   },

diff --git a/benchmark/test/benchmark.integration.ts → ...rk/src/__tests__/benchmark.integration.ts b/benchmark/test/benchmark.integration.ts → ...rk/src/__tests__/benchmark.integration.ts
@@ -6,7 +6,7 @@
 import {expect} from '@loopback/testlab';
 import * as request from 'request-promise-native';
 import {Benchmark} from '..';
-import {Autocannon, EndpointStats} from '../src/autocannon';
+import {Autocannon, EndpointStats} from '../autocannon';
 
 const debug = require('debug')('test');
 

diff --git a/benchmark/test/mocha.opts → benchmark/src/__tests__/mocha.opts b/benchmark/test/mocha.opts → benchmark/src/__tests__/mocha.opts
diff --git a/benchmark/tsconfig.build.json b/benchmark/tsconfig.build.json
@@ -2,16 +2,11 @@
   "$schema": "http://json.schemastore.org/tsconfig",
   "extends": "../packages/build/config/tsconfig.common.json",
   "compilerOptions": {
-    "rootDir": ".",
+    "rootDir": "src",
     "composite": true,
     "target": "es2018",
     "outDir": "dist10"
   },
-  "include": [
-    "index.ts",
-    "src",
-    "test"
-  ],
   "references": [
     {
       "path": "../packages/testlab/tsconfig.build.json"

diff --git a/docs/site/Controllers.md b/docs/site/Controllers.md
@@ -241,8 +241,8 @@ with a test to verify that the error is thrown properly.
 
 ```ts
 // test/integration/controllers/hello.controller.integration.ts
-import {HelloController} from '../../../src/controllers';
-import {HelloRepository} from '../../../src/repositories';
+import {HelloController} from '../../..//controllers';
+import {HelloRepository} from '../../..//repositories';
 import {testdb} from '../../fixtures/datasources/testdb.datasource';
 import {expect} from '@loopback/testlab';
 import {HttpErrors} from '@loopback/rest';

diff --git a/docs/site/Testing-your-application.md b/docs/site/Testing-your-application.md
@@ -129,7 +129,7 @@ helper method; for example:
 {% include code-caption.html content="test/helpers/database.helpers.ts" %}
 
 ```ts
-import {ProductRepository, CategoryRepository} from '../../src/repositories';
+import {ProductRepository, CategoryRepository} from '../../repositories';
 import {testdb} from '../fixtures/datasources/testdb.datasource';
 
 export async function givenEmptyDatabase() {
@@ -413,8 +413,8 @@ detailed explanation.
 
 ```ts
 import {expect, sinon} from '@loopback/testlab';
-import {ProductRepository} from '../../../src/repositories';
-import {ProductController} from '../../../src/controllers';
+import {ProductRepository} from '../../..//repositories';
+import {ProductController} from '../../..//controllers';
 
 describe('ProductController (unit)', () => {
   let repository: ProductRepository;
@@ -456,7 +456,7 @@ valid data to create a new model instance.
 {% include code-caption.html content="test/unit/models/person.model.unit.ts" %}
 
 ```ts
-import {Person} from '../../../src/models';
+import {Person} from '../../..//models';
 import {givenPersonData} from '../../helpers/database.helpers';
 import {expect} from '@loopback/testlab';
 
@@ -547,7 +547,7 @@ import {
   givenEmptyDatabase,
   givenCategory,
 } from '../../helpers/database.helpers';
-import {CategoryRepository} from '../../../src/repositories';
+import {CategoryRepository} from '../../..//repositories';
 import {expect} from '@loopback/testlab';
 import {testdb} from '../../fixtures/datasources/testdb.datasource';
 
@@ -580,8 +580,8 @@ ingredient.
 ```ts
 import {expect} from '@loopback/testlab';
 import {givenEmptyDatabase, givenProduct} from '../../helpers/database.helpers';
-import {ProductController} from '../../../src/controllers';
-import {ProductRepository} from '../../../src/repositories';
+import {ProductController} from '../../..//controllers';
+import {ProductRepository} from '../../..//repositories';
 import {testdb} from '../../fixtures/datasources/testdb.datasource';
 
 describe('ProductController (integration)', () => {
@@ -628,11 +628,8 @@ of the service proxy by invoking the provider. This helper should be typically
 invoked once before the integration test suite begins.
 
 ```ts
-import {
-  GeoService,
-  GeoServiceProvider,
-} from '../../src/services/geo.service.ts';
-import {GeoDataSource} from '../../src/datasources/geo.datasource.ts';
+import {GeoService, GeoServiceProvider} from '../../services/geo.service.ts';
+import {GeoDataSource} from '../../datasources/geo.datasource.ts';
 
 describe('GeoService', () => {
   let service: GeoService;
@@ -653,7 +650,7 @@ instance:
 ```ts
 import {merge} from 'lodash';
 
-const GEO_CODER_CONFIG = require('../src/datasources/geo.datasource.json');
+const GEO_CODER_CONFIG = require('../datasources/geo.datasource.json');
 
 function givenGeoService() {
   const config = merge({}, GEO_CODER_CONFIG, {

diff --git a/examples/hello-world/index.d.ts b/examples/hello-world/index.d.ts
diff --git a/examples/hello-world/index.ts b/examples/hello-world/index.ts
diff --git a/examples/hello-world/package.json b/examples/hello-world/package.json
@@ -6,8 +6,9 @@
   "engines": {
     "node": ">=8.9"
   },
+  "types": "./dist10/index.d.ts",
   "scripts": {
-    "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"",
+    "acceptance": "lb-mocha \"DIST/__tests__/acceptance/**/*.js\"",
     "build:all-dist": "npm run build:dist8 && npm run build:dist10",
     "build:apidocs": "lb-apidocs",
     "build": "lb-tsc",
@@ -24,9 +25,9 @@
     "tslint": "lb-tslint",
     "tslint:fix": "npm run tslint -- --fix",
     "pretest": "npm run clean && npm run build",
-    "test": "lb-mocha --allow-console-logs \"DIST/test\"",
+    "test": "lb-mocha --allow-console-logs \"DIST/__tests__\"",
     "posttest": "npm run lint",
-    "test:dev": "lb-mocha --allow-console-logs DIST/test/**/*.js && npm run posttest",
+    "test:dev": "lb-mocha --allow-console-logs DIST/__tests__/**/*.js && npm run posttest",
     "prestart": "npm run build",
     "start": "node ."
   },

diff --git a/...test/acceptance/application.acceptance.ts → ...ts__/acceptance/application.acceptance.ts b/...test/acceptance/application.acceptance.ts → ...ts__/acceptance/application.acceptance.ts
@@ -9,7 +9,7 @@ import {
   expect,
   givenHttpServerConfig,
 } from '@loopback/testlab';
-import {HelloWorldApplication} from '../../src/application';
+import {HelloWorldApplication} from '../../application';
 
 describe('Application', () => {
   let app: HelloWorldApplication;

diff --git a/examples/hello-world/tsconfig.build.json b/examples/hello-world/tsconfig.build.json
@@ -2,16 +2,11 @@
   "$schema": "http://json.schemastore.org/tsconfig",
   "extends": "./node_modules/@loopback/build/config/tsconfig.common.json",
   "compilerOptions": {
-    "rootDir": ".",
+    "rootDir": "src",
     "composite": true,
     "target": "es2018",
     "outDir": "dist10"
   },
-  "include": [
-    "index.ts",
-    "src",
-    "test"
-  ],
   "references": [
     {
       "path": "../../packages/testlab/tsconfig.build.json"

diff --git a/examples/log-extension/index.d.ts b/examples/log-extension/index.d.ts
diff --git a/examples/log-extension/index.ts b/examples/log-extension/index.ts
diff --git a/examples/log-extension/package.json b/examples/log-extension/package.json
@@ -6,6 +6,7 @@
   "engines": {
     "node": ">=8.9"
   },
+  "types": "./dist10/index.d.ts",
   "scripts": {
     "build:all-dist": "npm run build:dist8 && npm run build:dist10",
     "build:apidocs": "lb-apidocs",
@@ -22,9 +23,9 @@
     "tslint": "lb-tslint",
     "tslint:fix": "npm run tslint -- --fix",
     "pretest": "npm run clean && npm run build",
-    "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"",
+    "test": "lb-mocha \"DIST/__tests__/unit/**/*.js\" \"DIST/__tests__/acceptance/**/*.js\"",
     "posttest": "npm run lint",
-    "test:dev": "lb-mocha --allow-console-logs DIST/test/**/*.js && npm run posttest",
+    "test:dev": "lb-mocha --allow-console-logs DIST/__tests__/**/*.js && npm run posttest",
     "verify": "npm pack && tar xf *example-log-extension*.tgz && tree package && npm run clean"
   },
   "repository": {

diff --git a/...st/acceptance/log.extension.acceptance.ts → ...__/acceptance/log.extension.acceptance.ts b/...st/acceptance/log.extension.acceptance.ts → ...__/acceptance/log.extension.acceptance.ts
diff --git a/...es/log-extension/test/in-memory-logger.ts → ...tension/src/__tests__/in-memory-logger.ts b/...es/log-extension/test/in-memory-logger.ts → ...tension/src/__tests__/in-memory-logger.ts
diff --git a/examples/log-extension/test/log-spy.ts → ...es/log-extension/src/__tests__/log-spy.ts b/examples/log-extension/test/log-spy.ts → ...es/log-extension/src/__tests__/log-spy.ts
diff --git a/...est/unit/decorators/log.decorator.unit.ts → ...s__/unit/decorators/log.decorator.unit.ts b/...est/unit/decorators/log.decorator.unit.ts → ...s__/unit/decorators/log.decorator.unit.ts
diff --git a/...ension/test/unit/mixins/log.mixin.unit.ts → ...c/__tests__/unit/mixins/log.mixin.unit.ts b/...ension/test/unit/mixins/log.mixin.unit.ts → ...c/__tests__/unit/mixins/log.mixin.unit.ts
diff --git a/...nit/providers/log-action.provider.unit.ts → ...nit/providers/log-action.provider.unit.ts b/...nit/providers/log-action.provider.unit.ts → ...nit/providers/log-action.provider.unit.ts
diff --git a/...est/unit/providers/timer.provider.unit.ts → ...s__/unit/providers/timer.provider.unit.ts b/...est/unit/providers/timer.provider.unit.ts → ...s__/unit/providers/timer.provider.unit.ts
diff --git a/examples/log-extension/tsconfig.build.json b/examples/log-extension/tsconfig.build.json
@@ -2,16 +2,11 @@
   "$schema": "http://json.schemastore.org/tsconfig",
   "extends": "./node_modules/@loopback/build/config/tsconfig.common.json",
   "compilerOptions": {
-    "rootDir": ".",
+    "rootDir": "src",
     "composite": true,
     "target": "es2018",
     "outDir": "dist10"
   },
-  "include": [
-    "index.ts",
-    "src",
-    "test"
-  ],
   "references": [
     {
       "path": "../../packages/testlab/tsconfig.build.json"

diff --git a/examples/rpc-server/index.d.ts b/examples/rpc-server/index.d.ts
diff --git a/examples/rpc-server/index.ts b/examples/rpc-server/index.ts
diff --git a/examples/rpc-server/package.json b/examples/rpc-server/package.json
@@ -9,6 +9,7 @@
   "engines": {
     "node": ">=8.9"
   },
+  "types": "./dist10/index.d.ts",
   "scripts": {
     "build:all-dist": "npm run build:dist8 && npm run build:dist10",
     "build:apidocs": "lb-apidocs",
@@ -25,9 +26,9 @@
     "tslint": "lb-tslint",
     "tslint:fix": "npm run tslint -- --fix",
     "pretest": "npm run clean && npm run build",
-    "test": "lb-mocha DIST/test",
+    "test": "lb-mocha DIST/__tests__",
     "posttest": "npm run lint",
-    "test:dev": "lb-mocha --allow-console-logs DIST/test/**/*.js && npm run posttest",
+    "test:dev": "lb-mocha --allow-console-logs DIST/__tests__/**/*.js && npm run posttest",
     "prestart": "npm run build",
     "start": "node ."
   },

diff --git a/examples/rpc-server/test/README.md → examples/rpc-server/src/__tests__/README.md b/examples/rpc-server/test/README.md → examples/rpc-server/src/__tests__/README.md
diff --git a/...unit/controllers/greet.controller.unit.ts → ...unit/controllers/greet.controller.unit.ts b/...unit/controllers/greet.controller.unit.ts → ...unit/controllers/greet.controller.unit.ts
@@ -3,7 +3,7 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-import {GreetController} from '../../../src/controllers';
+import {GreetController} from '../../..//controllers';
 import {expect} from '@loopback/testlab';
 
 describe('greet.controller', () => {

diff --git a/...s/rpc-server/test/unit/rpc.router.unit.ts → ...ver/src/__tests__/unit/rpc.router.unit.ts b/...s/rpc-server/test/unit/rpc.router.unit.ts → ...ver/src/__tests__/unit/rpc.router.unit.ts
@@ -4,8 +4,8 @@
 // License text available at https://opensource.org/licenses/MIT
 
 import * as express from 'express';
-import {RPCServer} from '../../src/rpc.server';
-import {routeHandler} from '../../src/rpc.router';
+import {RPCServer} from '../../rpc.server';
+import {routeHandler} from '../../rpc.router';
 import {expect, sinon} from '@loopback/testlab';
 
 describe('rpcRouter', () => {

diff --git a/examples/soap-calculator/index.d.ts b/examples/soap-calculator/index.d.ts
diff --git a/examples/soap-calculator/index.ts b/examples/soap-calculator/index.ts
diff --git a/examples/soap-calculator/package.json b/examples/soap-calculator/package.json
@@ -11,8 +11,9 @@
   ],
   "main": "index.js",
   "engines": {
-    "node": ">=8"
+    "node": ">=8.9"
   },
+  "types": "./dist10/index.d.ts",
   "scripts": {
     "build:all-dist": "npm run build:dist8 && npm run build:dist10",
     "build:apidocs": "lb-apidocs",
@@ -29,9 +30,9 @@
     "tslint": "lb-tslint",
     "tslint:fix": "npm run tslint -- --fix",
     "pretest": "npm run clean && npm run build",
-    "test": "lb-mocha \"DIST/test\"",
+    "test": "lb-mocha \"DIST/__tests__\"",
     "posttest": "npm run lint",
-    "test:dev": "lb-mocha --allow-console-logs DIST/test/**/*.js && npm run posttest",
+    "test:dev": "lb-mocha --allow-console-logs DIST/__tests__/**/*.js && npm run posttest",
     "prestart": "npm run build",
     "start": "node ."
   },

diff --git a/...test/acceptance/application.acceptance.ts → ...ts__/acceptance/application.acceptance.ts b/...test/acceptance/application.acceptance.ts → ...ts__/acceptance/application.acceptance.ts
@@ -1,5 +1,5 @@
 import {Client, createRestAppClient, expect} from '@loopback/testlab';
-import {SoapCalculatorApplication} from '../../src/application';
+import {SoapCalculatorApplication} from '../../application';
 
 describe('Application', function() {
   let app: SoapCalculatorApplication;

diff --git a/examples/soap-calculator/test/helpers.ts → .../soap-calculator/src/__tests__/helpers.ts b/examples/soap-calculator/test/helpers.ts → .../soap-calculator/src/__tests__/helpers.ts
@@ -1,4 +1,4 @@
-import {CalculatorDataSource} from '../src/datasources/calculator.datasource';
+import {CalculatorDataSource} from '../datasources/calculator.datasource';
 
 export async function givenAConnectedDataSource(): Promise<
   CalculatorDataSource

diff --git a/...ervices/calculator.service.integration.ts → ...ervices/calculator.service.integration.ts b/...ervices/calculator.service.integration.ts → ...ervices/calculator.service.integration.ts
@@ -1,8 +1,8 @@
 import {
   CalculatorService,
   CalculatorParameters,
-} from '../../../src/services/calculator.service';
-import {CalculatorServiceProvider} from '../../../src/services/calculator.service';
+} from '../../..//services/calculator.service';
+import {CalculatorServiceProvider} from '../../..//services/calculator.service';
 import {givenAConnectedDataSource} from '../../helpers';
 
 import {expect} from '@loopback/testlab';

diff --git a/examples/soap-calculator/tsconfig.build.json b/examples/soap-calculator/tsconfig.build.json
@@ -2,16 +2,11 @@
   "$schema": "http://json.schemastore.org/tsconfig",
   "extends": "./node_modules/@loopback/build/config/tsconfig.common.json",
   "compilerOptions": {
-    "rootDir": ".",
+    "rootDir": "src",
     "composite": true,
     "target": "es2018",
     "outDir": "dist10"
   },
-  "include": [
-    "index.ts",
-    "src",
-    "test"
-  ],
   "references": [
     {
       "path": "../../packages/testlab/tsconfig.build.json"

diff --git a/examples/todo-list/index.d.ts b/examples/todo-list/index.d.ts