feat: refactor shared structure (#196)

Author: Alexander Vakrilov

.vscode/launch.json

@@ -17,7 +17,8 @@
  ],
  "outFiles": [
  "${workspaceFolder}/**/*.js"
- ]
+ ],
+ "preLaunchTask": "npm-build"
  }
  ]
 }

.vscode/tasks.json

@@ -0,0 +1,13 @@
+{
+ // See https://go.microsoft.com/fwlink/?LinkId=733558 
+ // for the documentation about the tasks.json format
+ "version": "2.0.0",
+ "tasks": [
+ {
+ "type": "npm",
+ "script": "build",
+ "problemMatcher": [],
+ "label": "npm-build"
+ }
+ ]
+}

package.json

@@ -15,17 +15,20 @@
  },
  "schematics": "./src/collection.json",
  "dependencies": {
- "@angular-devkit/core": "~7.1.3",
- "@angular-devkit/schematics": "~7.1.3",
- "@schematics/angular": "~7.1.3"
+ "@angular-devkit/core": "~7.3.9",
+ "@angular-devkit/schematics": "~7.3.9",
+ "@nativescript/tslint-rules": "~0.0.1",
+ "@phenomnomnominal/tsquery": "^3.0.0",
+ "@schematics/angular": "~7.3.9",
+ "tslint": "^5.16.0"
  },
  "devDependencies": {
  "@types/jasmine": "^2.6.0",
  "@types/node": "^8.0.31",
  "conventional-changelog-cli": "^2.0.1",
  "jasmine": "^2.8.0",
  "jasmine-spec-reporter": "^4.2.1",
- "typescript": "~3.1.1"
+ "typescript": "3.2.4"
  },
  "repository": {
  "type": "git",

src/add-ns/_ns-files/__sourceDir__/package.json

@@ -2,7 +2,7 @@
  "android": {
  "v8Flags": "--expose_gc"
  },
- "main": "<%= main %>.js",
+ "main": "<%= main %><%= nsext %>.js",
  "name": "migration-ng",
  "version": "4.1.0"
 }

src/add-ns/_ns-files/tsconfig__nsext__.json

@@ -3,21 +3,16 @@
  "compilerOptions": {
  "module": "es2015",
  "moduleResolution": "node",
- "baseUrl": "./",
  "paths": {
- "~/*": [
- "src/*"
- ],
- "*": [
- "./node_modules/tns-core-modules/*",
- "./node_modules/*"
+ "@src/*": [
+ "<%= sourceDir %>/*.android.ts",
+ "<%= sourceDir %>/*.ios.ts",
+ "<%= sourceDir %>/*.tns.ts",
+ "<%= sourceDir %>/*.ts"
  ]
  }
  },
- "exclude": [
- "**/*.tns.ts",
- "**/*.android.ts",
- "**/*.ios.ts",
- "**/*.spec.ts"
+ "files": [
+ "<%= sourceDir %>/main<%= nsext %>.ts"
  ]
-}
+}

src/add-ns/_sample-files/barcelona/player-detail/player-detail.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
-import { Player } from '../player';
+import { Player } from '../player.model';
 import { PlayerService } from '../player.service';
 
 @Component({

src/add-ns/_sample-files/barcelona/player.ts renamed to src/add-ns/_sample-files/barcelona/player.model.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Player } from './player';
+import { Player } from './player.model';
 
 @Injectable()
 export class PlayerService {

src/add-ns/_sample-files/barcelona/player.service.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { Player } from '../player';
+import { Player } from '../player.model';
 import { PlayerService } from '../player.service';
 
 @Component({

src/add-ns/_sample-files/barcelona/players/players.component.ts

@@ -1,4 +1,4 @@
-import { join } from 'path';
+import { join, dirname } from 'path';
 import {
  Rule,
  SchematicContext,
@@ -22,6 +22,8 @@ import { getJsonFile, getFileContents, getPackageJson, overwritePackageJson } fr
 import { getAngularProjectSettings, AngularProjectSettings } from '../angular-project-parser';
 import { Extensions } from '../generate/utils';
 
+import { Schema as ConvertRelativeImportsSchema } from '../convert-relative-imports/schema';
+
 let extensions: Extensions;
 let projectSettings: AngularProjectSettings;
 
@@ -46,14 +48,17 @@ export default function (options: MigrationOptions): Rule {
  mergeGitIgnore,
  addRunScriptsToPackageJson,
  addNativeScriptProjectId,
- excludeNsFilesFromTsconfig,
+
+ modifyWebTsconfig,
 
  options.skipAutoGeneratedComponent ?
  noop() :
  addSampleComponent(options.nsExtension, options.webExtension, options.project),
 
  addDependencies(),
 
+ schematic<ConvertRelativeImportsSchema>('convert-relative-imports', options),
+
  options.skipInstall ?
  noop() :
  (_tree: Tree, context: SchematicContext) => {
@@ -211,6 +216,7 @@ const mergeGitIgnore = (tree: Tree, context: SchematicContext) => {
  */
 const addRunScriptsToPackageJson = (tree: Tree, context: SchematicContext) => {
  context.logger.info('Adding NativeScript run scripts to package.json');
+
  const packageJson = getPackageJson(tree);
 
  const scriptsToAdd = {
@@ -237,26 +243,57 @@ const addNativeScriptProjectId = (tree: Tree, context: SchematicContext) => {
 }
 
 /**
- * Adds {N}-specific extensions
- * to the list with excluded files
- * in the web TypeScript configuration
+ * Add web-specific path mappings and files
  */
-const excludeNsFilesFromTsconfig = (tree: Tree, context: SchematicContext) => {
- context.logger.info('Excluding NativeScript files from web tsconfig');
-
- const nsExtensions = [
- `**/*${extensions.ns}.ts`,
- '**/*.android.ts',
- '**/*.ios.ts',
- ];
+const modifyWebTsconfig = (tree: Tree, context: SchematicContext) => {
+ context.logger.info('Modifying web tsconfig');
 
  const tsConfigPath = projectSettings.tsConfig;
  const tsConfig: any = getJsonFile(tree, tsConfigPath);
 
- tsConfig.exclude = tsConfig.exclude || [];
- tsConfig.exclude = [...tsConfig.exclude, ...nsExtensions];
+ // files
+ const defaultFiles = ["main.ts", "polyfills.ts"];
+ tsConfig.files = tsConfig.files || [];
+ tsConfig.files.push(...defaultFiles);
+
+ // paths
+ const srcDir = projectSettings.sourceRoot;
+ const webPaths = {
+ "@src/*": [
+ `${srcDir}/*.web`,
+ `${srcDir}/*`]
+ };
+ tsConfig.compilerOptions = tsConfig.compilerOptions || {};
+ tsConfig.compilerOptions.paths = {
+ ...tsConfig.compilerOptions.paths,
+ ...webPaths
+ }
 
  tree.overwrite(tsConfigPath, JSON.stringify(tsConfig, null, 2));
+
+ if (!tsConfig.extends) {
+ return
+ }
+
+ const baseTsConfigPath = join(dirname(tsConfigPath), tsConfig.extends);
+ const baseTsConfig: any = getJsonFile(tree, baseTsConfigPath);
+
+ const basePaths = {
+ "@src/*": [
+ `${srcDir}/*.android.ts`,
+ `${srcDir}/*.ios.ts`,
+ `${srcDir}/*.tns.ts`,
+ `${srcDir}/*.web.ts`,
+ `${srcDir}/*`]
+ };
+
+ baseTsConfig.compilerOptions = baseTsConfig.compilerOptions || {};
+ baseTsConfig.compilerOptions.paths = {
+ ...baseTsConfig.compilerOptions.paths,
+ ...basePaths
+ }
+
+ tree.overwrite(baseTsConfigPath, JSON.stringify(baseTsConfig, null, 2));
 }
 
 const addDependencies = () => (tree: Tree, context: SchematicContext) => {