From 6f28561303b65c2f4922bb04bbeb1c544c6b1db1 Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Wed, 17 Jul 2019 11:51:14 +0200 Subject: [PATCH] Export more types, add stub for common-map library --- angular.json | 35 +++++++++++++++++++ package-lock.json | 2 +- projects/common-map/README.md | 24 +++++++++++++ projects/common-map/karma.conf.js | 32 +++++++++++++++++ projects/common-map/ng-package.json | 7 ++++ projects/common-map/package.json | 8 +++++ .../src/lib/common-map.component.spec.ts | 25 +++++++++++++ .../src/lib/common-map.component.ts | 19 ++++++++++ .../common-map/src/lib/common-map.module.ts | 10 ++++++ .../src/lib/common-map.service.spec.ts | 12 +++++++ .../common-map/src/lib/common-map.service.ts | 9 +++++ projects/common-map/src/public-api.ts | 7 ++++ projects/common-map/src/test.ts | 22 ++++++++++++ projects/common-map/tsconfig.lib.json | 32 +++++++++++++++++ projects/common-map/tsconfig.spec.json | 17 +++++++++ projects/common-map/tslint.json | 17 +++++++++ projects/common/src/lib/common.module.ts | 32 ++++++++++++++--- tsconfig.json | 10 +++++- 18 files changed, 313 insertions(+), 7 deletions(-) create mode 100644 projects/common-map/README.md create mode 100644 projects/common-map/karma.conf.js create mode 100644 projects/common-map/ng-package.json create mode 100644 projects/common-map/package.json create mode 100644 projects/common-map/src/lib/common-map.component.spec.ts create mode 100644 projects/common-map/src/lib/common-map.component.ts create mode 100644 projects/common-map/src/lib/common-map.module.ts create mode 100644 projects/common-map/src/lib/common-map.service.spec.ts create mode 100644 projects/common-map/src/lib/common-map.service.ts create mode 100644 projects/common-map/src/public-api.ts create mode 100644 projects/common-map/src/test.ts create mode 100644 projects/common-map/tsconfig.lib.json create mode 100644 projects/common-map/tsconfig.spec.json create mode 100644 projects/common-map/tslint.json diff --git a/angular.json b/angular.json index fbeae8e..0964473 100644 --- a/angular.json +++ b/angular.json @@ -166,6 +166,41 @@ } } } + }, + "common-map": { + "root": "projects/common-map", + "sourceRoot": "projects/common-map/src", + "projectType": "library", + "prefix": "lib", + "architect": { + "build": { + "builder": "@angular-devkit/build-ng-packagr:build", + "options": { + "tsConfig": "projects/common-map/tsconfig.lib.json", + "project": "projects/common-map/ng-package.json" + } + }, + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "projects/common-map/src/test.ts", + "tsConfig": "projects/common-map/tsconfig.spec.json", + "karmaConfig": "projects/common-map/karma.conf.js" + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": [ + "projects/common-map/tsconfig.lib.json", + "projects/common-map/tsconfig.spec.json" + ], + "exclude": [ + "**/node_modules/**" + ] + } + } + } } }, "defaultProject": "farmmaps-lib-app" diff --git a/package-lock.json b/package-lock.json index f7a53de..721bcf1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "farmmaps-lib-app", - "version": "0.0.0", + "version": "0.0.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/projects/common-map/README.md b/projects/common-map/README.md new file mode 100644 index 0000000..f03f493 --- /dev/null +++ b/projects/common-map/README.md @@ -0,0 +1,24 @@ +# CommonMap + +This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.2.0. + +## Code scaffolding + +Run `ng generate component component-name --project common-map` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project common-map`. +> Note: Don't forget to add `--project common-map` or else it will be added to the default project in your `angular.json` file. + +## Build + +Run `ng build common-map` to build the project. The build artifacts will be stored in the `dist/` directory. + +## Publishing + +After building your library with `ng build common-map`, go to the dist folder `cd dist/common-map` and run `npm publish`. + +## Running unit tests + +Run `ng test common-map` to execute the unit tests via [Karma](https://karma-runner.github.io). + +## Further help + +To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md). diff --git a/projects/common-map/karma.conf.js b/projects/common-map/karma.conf.js new file mode 100644 index 0000000..370c5f5 --- /dev/null +++ b/projects/common-map/karma.conf.js @@ -0,0 +1,32 @@ +// Karma configuration file, see link for more information +// https://karma-runner.github.io/1.0/config/configuration-file.html + +module.exports = function (config) { + config.set({ + basePath: '', + frameworks: ['jasmine', '@angular-devkit/build-angular'], + plugins: [ + require('karma-jasmine'), + require('karma-chrome-launcher'), + require('karma-jasmine-html-reporter'), + require('karma-coverage-istanbul-reporter'), + require('@angular-devkit/build-angular/plugins/karma') + ], + client: { + clearContext: false // leave Jasmine Spec Runner output visible in browser + }, + coverageIstanbulReporter: { + dir: require('path').join(__dirname, '../../coverage/common-map'), + reports: ['html', 'lcovonly'], + fixWebpackSourcePaths: true + }, + reporters: ['progress', 'kjhtml'], + port: 9876, + colors: true, + logLevel: config.LOG_INFO, + autoWatch: true, + browsers: ['Chrome'], + singleRun: false, + restartOnFileChange: true + }); +}; diff --git a/projects/common-map/ng-package.json b/projects/common-map/ng-package.json new file mode 100644 index 0000000..5509b1c --- /dev/null +++ b/projects/common-map/ng-package.json @@ -0,0 +1,7 @@ +{ + "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../dist/common-map", + "lib": { + "entryFile": "src/public-api.ts" + } +} \ No newline at end of file diff --git a/projects/common-map/package.json b/projects/common-map/package.json new file mode 100644 index 0000000..2426c54 --- /dev/null +++ b/projects/common-map/package.json @@ -0,0 +1,8 @@ +{ + "name": "@farmmaps/common/map", + "version": "0.0.1", + "peerDependencies": { + "@angular/common": "^7.2.0", + "@angular/core": "^7.2.0" + } +} \ No newline at end of file diff --git a/projects/common-map/src/lib/common-map.component.spec.ts b/projects/common-map/src/lib/common-map.component.spec.ts new file mode 100644 index 0000000..f160c7a --- /dev/null +++ b/projects/common-map/src/lib/common-map.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CommonMapComponent } from './common-map.component'; + +describe('CommonMapComponent', () => { + let component: CommonMapComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CommonMapComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CommonMapComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/projects/common-map/src/lib/common-map.component.ts b/projects/common-map/src/lib/common-map.component.ts new file mode 100644 index 0000000..aab1bfd --- /dev/null +++ b/projects/common-map/src/lib/common-map.component.ts @@ -0,0 +1,19 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'lib-common-map', + template: ` +

+ common-map works! +

+ `, + styles: [] +}) +export class CommonMapComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/projects/common-map/src/lib/common-map.module.ts b/projects/common-map/src/lib/common-map.module.ts new file mode 100644 index 0000000..483318b --- /dev/null +++ b/projects/common-map/src/lib/common-map.module.ts @@ -0,0 +1,10 @@ +import { NgModule } from '@angular/core'; +import { CommonMapComponent } from './common-map.component'; + +@NgModule({ + declarations: [CommonMapComponent], + imports: [ + ], + exports: [CommonMapComponent] +}) +export class CommonMapModule { } diff --git a/projects/common-map/src/lib/common-map.service.spec.ts b/projects/common-map/src/lib/common-map.service.spec.ts new file mode 100644 index 0000000..5c0fa7c --- /dev/null +++ b/projects/common-map/src/lib/common-map.service.spec.ts @@ -0,0 +1,12 @@ +import { TestBed } from '@angular/core/testing'; + +import { CommonMapService } from './common-map.service'; + +describe('CommonMapService', () => { + beforeEach(() => TestBed.configureTestingModule({})); + + it('should be created', () => { + const service: CommonMapService = TestBed.get(CommonMapService); + expect(service).toBeTruthy(); + }); +}); diff --git a/projects/common-map/src/lib/common-map.service.ts b/projects/common-map/src/lib/common-map.service.ts new file mode 100644 index 0000000..2316538 --- /dev/null +++ b/projects/common-map/src/lib/common-map.service.ts @@ -0,0 +1,9 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class CommonMapService { + + constructor() { } +} diff --git a/projects/common-map/src/public-api.ts b/projects/common-map/src/public-api.ts new file mode 100644 index 0000000..cc3004b --- /dev/null +++ b/projects/common-map/src/public-api.ts @@ -0,0 +1,7 @@ +/* + * Public API Surface of common-map + */ + +export * from './lib/common-map.service'; +export * from './lib/common-map.component'; +export * from './lib/common-map.module'; diff --git a/projects/common-map/src/test.ts b/projects/common-map/src/test.ts new file mode 100644 index 0000000..e11ff1c --- /dev/null +++ b/projects/common-map/src/test.ts @@ -0,0 +1,22 @@ +// This file is required by karma.conf.js and loads recursively all the .spec and framework files + +import 'core-js/es7/reflect'; +import 'zone.js/dist/zone'; +import 'zone.js/dist/zone-testing'; +import { getTestBed } from '@angular/core/testing'; +import { + BrowserDynamicTestingModule, + platformBrowserDynamicTesting +} from '@angular/platform-browser-dynamic/testing'; + +declare const require: any; + +// First, initialize the Angular testing environment. +getTestBed().initTestEnvironment( + BrowserDynamicTestingModule, + platformBrowserDynamicTesting() +); +// Then we find all the tests. +const context = require.context('./', true, /\.spec\.ts$/); +// And load the modules. +context.keys().map(context); diff --git a/projects/common-map/tsconfig.lib.json b/projects/common-map/tsconfig.lib.json new file mode 100644 index 0000000..3fe337f --- /dev/null +++ b/projects/common-map/tsconfig.lib.json @@ -0,0 +1,32 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "../../out-tsc/lib", + "target": "es2015", + "module": "es2015", + "moduleResolution": "node", + "declaration": true, + "sourceMap": true, + "inlineSources": true, + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "importHelpers": true, + "types": [], + "lib": [ + "dom", + "es2018" + ] + }, + "angularCompilerOptions": { + "annotateForClosureCompiler": true, + "skipTemplateCodegen": true, + "strictMetadataEmit": true, + "fullTemplateTypeCheck": true, + "strictInjectionParameters": true, + "enableResourceInlining": true + }, + "exclude": [ + "src/test.ts", + "**/*.spec.ts" + ] +} diff --git a/projects/common-map/tsconfig.spec.json b/projects/common-map/tsconfig.spec.json new file mode 100644 index 0000000..16da33d --- /dev/null +++ b/projects/common-map/tsconfig.spec.json @@ -0,0 +1,17 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "../../out-tsc/spec", + "types": [ + "jasmine", + "node" + ] + }, + "files": [ + "src/test.ts" + ], + "include": [ + "**/*.spec.ts", + "**/*.d.ts" + ] +} diff --git a/projects/common-map/tslint.json b/projects/common-map/tslint.json new file mode 100644 index 0000000..124133f --- /dev/null +++ b/projects/common-map/tslint.json @@ -0,0 +1,17 @@ +{ + "extends": "../../tslint.json", + "rules": { + "directive-selector": [ + true, + "attribute", + "lib", + "camelCase" + ], + "component-selector": [ + true, + "element", + "lib", + "kebab-case" + ] + } +} diff --git a/projects/common/src/lib/common.module.ts b/projects/common/src/lib/common.module.ts index 9e30423..4ec871f 100644 --- a/projects/common/src/lib/common.module.ts +++ b/projects/common/src/lib/common.module.ts @@ -15,8 +15,6 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { AppCommonRoutingModule } from './common-routing.module'; import { MODULE_NAME } from './module-name'; -import * as appCommonReducers from './reducers/app-common.reducer'; -import * as appCommonEffects from './effects/app-common.effects'; //components import { FolderService } from './services/folder.service'; @@ -41,6 +39,18 @@ import { NotFoundComponent } from './components/not-found/not-found.component'; import { SidePanelComponent } from './components/side-panel/side-panel.component'; import { TimespanComponent } from './components/timespan/timespan.component'; import { TagInputComponent } from './components/tag-input/tag-input.component'; +import {IEventMessage } from './models/event.message'; +import { IItem, Item } from './models/item'; +import {IItemType} from './models/item.type'; +import {IItemTypes} from './models/item.types'; +import {IItemTask,ItemTask} from './models/itemTask'; +import {IListItem} from './models/list.item'; +import {ITypeaheadItem} from './models/typeahead.item'; +import {IUser} from './models/user'; +import * as commonActions from './actions/app-common.actions'; +import * as commonReducers from './reducers/app-common.reducer'; +import * as commonEffects from './effects/app-common.effects'; +import { from } from 'rxjs'; export {FolderService, TimespanService, @@ -62,7 +72,19 @@ export {FolderService, NotFoundComponent, SidePanelComponent, TimespanComponent, - TagInputComponent + TagInputComponent, + IEventMessage, + IItem, + Item, + IItemType, + IItemTypes, + IItemTask, + ItemTask, + IListItem, + ITypeaheadItem, + IUser, + commonActions, + commonReducers, }; @NgModule({ @@ -70,8 +92,8 @@ export {FolderService, CommonModule, HttpClientModule, AppCommonRoutingModule, - StoreModule.forFeature(MODULE_NAME, appCommonReducers.reducer ), - EffectsModule.forFeature([appCommonEffects.AppCommonEffects]), + StoreModule.forFeature(MODULE_NAME, commonReducers.reducer ), + EffectsModule.forFeature([commonEffects.AppCommonEffects]), OAuthModule.forRoot(), NgbModule, FormsModule diff --git a/tsconfig.json b/tsconfig.json index 1f5e7c6..90da221 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,6 +17,14 @@ "lib": [ "es2018", "dom" - ] + ], + "paths": { + "common-map": [ + "dist/common-map" + ], + "common-map/*": [ + "dist/common-map/*" + ] + } } } \ No newline at end of file