feat: enable support for typescript references

- add script to build typescript project references
- reorg project layout for better typescript refs
- switch to tsconfig.json
- add copy-resources script

Author: raymondfeng

.nycrc

@@ -5,9 +5,9 @@
       "examples/*/dist"
     ],
     "exclude": [
-      "packages/*/dist/test/",
+      "packages/*/dist/__tests__/",
       "packages/cli/test/",
-      "examples/*/dist/test/",
+      "examples/*/dist/__tests__/",
       "**/.sandbox/"
     ],
     "extension": [

benchmark/.npmignore

@@ -0,0 +1 @@
+/*/__tests__/

benchmark/index.ts

@@ -8,15 +8,16 @@
     "performance",
     "benchmark"
   ],
-  "main": "index.js",
+  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=8.9"
   },
   "scripts": {
     "build": "lb-tsc es2017 --outDir dist",
+    "build:resources": "lb-copy-resources",
     "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",
     "benchmark:routing": "node ./dist/src/rest-routing/routing-table",
     "start": "node ."
@@ -26,14 +27,6 @@
   },
   "author": "",
   "license": "MIT",
-  "files": [
-    "README.md",
-    "index.js",
-    "index.d.ts",
-    "dist/src",
-    "dist/index*",
-    "src"
-  ],
   "dependencies": {
     "@loopback/example-todo": "^1.2.2",
     "@loopback/openapi-spec-builder": "^1.0.1",

benchmark/package.json

@@ -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');
 

benchmark/test/benchmark.integration.ts renamed to benchmark/src/__tests__/benchmark.integration.ts

@@ -0,0 +1,28 @@
+{
+  "$schema": "http://json.schemastore.org/tsconfig",
+  "extends": "../packages/build/config/tsconfig.common.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "composite": true,
+    "target": "es2017",
+    "outDir": "dist"
+  },
+  "references": [
+    {
+      "path": "../packages/testlab/tsconfig.json"
+    },
+    {
+      "path": "../examples/todo/tsconfig.json"
+    },
+    {
+      "path": "../packages/openapi-spec-builder/tsconfig.json"
+    },
+    {
+      "path": "../packages/rest/tsconfig.json"
+    }
+  ],
+  "include": [
+    "src/**/*",
+    "src/**/*.json"
+  ]
+}

benchmark/test/mocha.opts renamed to benchmark/src/__tests__/mocha.opts

@@ -0,0 +1,122 @@
+#!/usr/bin/env node
+// Copyright IBM Corp. 2017,2018. All Rights Reserved.
+// Node module: loopback-next
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
+/**
+ * This is an internal script to update TypeScript project references based on
+ * lerna's local package dependencies.
+ *
+ * See https://www.typescriptlang.org/docs/handbook/project-references.html
+ */
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const util = require('util');
+const debug = require('debug')('loopback:build');
+const buildUtils = require('../packages/build/bin/utils');
+
+const Project = require('@lerna/project');
+const PackageGraph = require('@lerna/package-graph');
+
+const TSCONFIG = 'tsconfig.json';
+
+async function updateReferences(options) {
+  options = options || {};
+  const dryRun = options.dryRun;
+  const project = new Project(process.cwd());
+  const packages = await project.getPackages();
+
+  const rootRefs = [];
+  const graph = new PackageGraph(packages);
+
+  for (const p of graph.values()) {
+    debug('Package %s', p.pkg.name);
+    const pkgLocation = p.pkg.location;
+    const tsconfigFile = path.join(pkgLocation, TSCONFIG);
+    // Skip non-typescript packages
+    if (!fs.existsSync(tsconfigFile)) {
+      debug('Skipping non-TS package: %s', p.pkg.name);
+      continue;
+    }
+    rootRefs.push({
+      path: path.join(path.relative(project.rootPath, pkgLocation), TSCONFIG),
+    });
+    const tsconfig = require(tsconfigFile);
+    const refs = [];
+    for (const d of p.localDependencies.keys()) {
+      const depPkg = graph.get(d);
+      // Skip non-typescript packages
+      if (!fs.existsSync(path.join(depPkg.pkg.location, TSCONFIG))) {
+        debug('Skipping non-TS dependency: %s', depPkg.pkg.name);
+        continue;
+      }
+      const relativePath = path.relative(pkgLocation, depPkg.pkg.location);
+      refs.push({path: path.join(relativePath, TSCONFIG)});
+    }
+    tsconfig.compilerOptions = tsconfig.compilerOptions || {};
+    // composite must be true for project refs
+    tsconfig.compilerOptions.composite = true;
+    // outDir & target have to be set in tsconfig instead of CLI for tsc -b
+    tsconfig.compilerOptions.target =
+      tsconfig.compilerOptions.target || buildUtils.getCompilationTarget();
+    tsconfig.compilerOptions.outDir =
+      tsconfig.compilerOptions.outDir ||
+      buildUtils.getDistribution(tsconfig.compilerOptions.target);
+    if (!tsconfig.include) {
+      // To include ts/json files
+      tsconfig.include = ['src/**/*', 'src/**/*.json'];
+    }
+    tsconfig.references = refs;
+
+    // Convert to JSON
+    const tsconfigJson = JSON.stringify(tsconfig, null, 2);
+
+    if (!dryRun) {
+      // Using `-f` to overwrite tsconfig.json
+      fs.writeFileSync(tsconfigFile, tsconfigJson + '\n', {encoding: 'utf-8'});
+      debug('%s has been updated.', tsconfigFile);
+    } else {
+      // Otherwise write to console
+      debug(tsconfigJson);
+      console.log('%s', p.pkg.name);
+      refs.forEach(r => console.log('  %s', r.path));
+    }
+  }
+
+  const rootTsconfigFile = path.join(project.rootPath, 'tsconfig.json');
+  const rootTsconfig = require(rootTsconfigFile);
+  rootTsconfig.compilerOptions = rootTsconfig.compilerOptions || {};
+  rootTsconfig.compilerOptions.composite = true;
+  rootTsconfig.references = rootRefs;
+
+  // Reset files/include/exclude. The root should use project references now.
+  rootTsconfig.files = [];
+  delete rootTsconfig.include;
+  delete rootTsconfig.exclude;
+
+  // Convert to JSON
+  const rootTsconfigJson = JSON.stringify(rootTsconfig, null, 2);
+  if (!dryRun) {
+    // Using `-f` to overwrite tsconfig.json
+    fs.writeFileSync(rootTsconfigFile, rootTsconfigJson + '\n', {
+      encoding: 'utf-8',
+    });
+    debug('%s has been updated.', rootTsconfigFile);
+    console.log('TypeScript project references have been updated.');
+  } else {
+    debug(rootTsconfigJson);
+    console.log('\n%s', path.relative(project.rootPath, rootTsconfigFile));
+    rootRefs.forEach(r => console.log('  %s', r.path));
+    console.log(
+      '\nThis is a dry-run. Please use -f option to update tsconfig files.',
+    );
+  }
+}
+
+if (require.main === module) {
+  const dryRun = process.argv[2] !== '-f';
+  updateReferences({dryRun});
+}

benchmark/tsconfig.build.json

@@ -9,9 +9,6 @@
   "engines": {
     "node": ">=8.9"
   },
-  "files": [
-    "**/*"
-  ],
   "keywords": [
     "LoopBack",
     "docs"

benchmark/tsconfig.json

@@ -242,8 +242,9 @@ with a test to verify that the error is thrown properly.
 {% include code-caption.html content="test/integration/controllers/hello.controller.integration.ts" %}
 
 ```ts
-import {HelloController} from '../../../src/controllers';
-import {HelloRepository} from '../../../src/repositories';
+// test/integration/controllers/hello.controller.integration.ts
+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';

bin/update-project-refs.js

@@ -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;
@@ -652,7 +649,7 @@ instance:
 
 ```ts
 import {merge} from 'lodash';
-import * as GEO_CODER_CONFIG from '../src/datasources/geo.datasource.json';
+import * as GEO_CODER_CONFIG from '../datasources/geo.datasource.json';
 
 function givenGeoService() {
   const config = merge({}, GEO_CODER_CONFIG, {

docs/package.json

@@ -0,0 +1 @@
+/*/__tests__/

docs/site/Controllers.md

@@ -6,11 +6,13 @@
   "engines": {
     "node": ">=8.9"
   },
+  "types": "./dist/index.d.ts",
   "scripts": {
-    "acceptance": "lb-mocha \"dist/test/acceptance/**/*.js\"",
+    "acceptance": "lb-mocha \"dist/__tests__/acceptance/**/*.js\"",
     "build:apidocs": "lb-apidocs",
     "build": "lb-tsc es2017 --outDir dist",
-    "build:watch": "lb-tsc es2017 --outDir dist --watch",
+    "build:resources": "lb-copy-resources",
+    "build:watch": "lb-tsc --watch",
     "clean": "lb-clean *example-hello-world*.tgz dist package api-docs",
     "verify": "npm pack && tar xf *example-hello-world*.tgz && tree package && npm run clean",
     "lint": "npm run prettier:check && npm run tslint",
@@ -21,9 +23,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 ."
   },

docs/site/Testing-your-application.md

@@ -9,7 +9,7 @@ import {
   expect,
   givenHttpServerConfig,
 } from '@loopback/testlab';
-import {HelloWorldApplication} from '../../src/application';
+import {HelloWorldApplication} from '../../application';
 
 describe('Application', () => {
   let app: HelloWorldApplication;