Merge pull request #20 from Awoogamuffin/learningLibrary

Cleaned up elements of importing dungeoneerCommon

dungeoneer.code-workspace

@@ -21,6 +21,6 @@
 			"dgraphData": true
 		},
 		"jest.autoRun": null,
-    	"jest.disabledWorkspaceFolders": ["dungeoneer", "dungeoneerCommon", "dungeoneerClient"]
+    	"jest.disabledWorkspaceFolders": ["dungeoneer", "dungeoneerClient"]
 	}
 }

dungeoneerClient/src/app/connection/dm-web-socket.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { WebSocketSubject } from 'rxjs/webSocket';
-import { DmRequest, DmResponse } from 'dungeoneer-common/dist/types/src/connection/connectionTypes';
+import { DmRequest, DmResponse } from 'dungeoneer-common';
 import { environment } from 'src/environments/environment';
 import { nanoid } from 'nanoid';
 import { BehaviorSubject } from 'rxjs';

dungeoneerClient/src/app/data/dm-data-provider.ts

@@ -1,4 +1,4 @@
-import { DmFetchParams } from "dungeoneer-common/dist/types/src/connection/connectionTypes";
+import { DmFetchParams } from "dungeoneer-common";
 import { BehaviorSubject, Subject } from "rxjs";
 
 

dungeoneerClient/src/app/data/dm-data-store.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { DmFetchParams, DmResponse } from 'dungeoneer-common/dist/types/src/connection/connectionTypes';
+import { DmFetchParams, DmResponse } from 'dungeoneer-common';
 import { BehaviorSubject } from 'rxjs';
 import { DmWebSocketService } from '../connection/dm-web-socket.service';
 import { DmDataObject } from './dm-data-provider';

dungeoneerClient/src/app/data/providers/dm-data-store-provider.ts

@@ -1,4 +1,4 @@
-import { DmFetchParams } from "dungeoneer-common/dist/types/src/connection/connectionTypes";
+import { DmFetchParams } from "dungeoneer-common";
 import { BehaviorSubject } from "rxjs";
 import { DmDataObject, DmDataProvider } from "../dm-data-provider";
 import { DmDataStoreService } from "../dm-data-store.service";

dungeoneerClient/src/app/display/dm-search-card/dm-search-card.component.spec.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormGroup } from '@angular/forms';
-import { Schema } from 'dungeoneer-common/dist/types/src/schema/schemaTypes';
+import { Schema } from 'dungeoneer-common';
 import { Subject } from 'rxjs';
 import { DmFormInputData } from 'src/app/form/DmFormInputData';
 import { DmFormUtils } from 'src/app/form/DmFormUtils';

dungeoneerClient/src/app/display/dm-search-card/dm-search-card.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { Schema } from 'dungeoneer-common/dist/types/src/schema/schemaTypes';
+import { Schema } from 'dungeoneer-common';
 import { getDungeoneerSchema } from 'dungeoneer-common'
 import { Subject, takeUntil } from 'rxjs';
 import { DmUnsubscriberComponent } from 'src/app/core/dm-unsubscriber/dm-unsubscriber.component';

dungeoneerClient/src/app/display/dm-single-node-display/dm-single-node-display.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { getDungeoneerSchema } from 'dungeoneer-common';
-import { NodeType, NodeVar, Schema } from 'dungeoneer-common/dist/types/src/schema/schemaTypes';
+import { NodeType, NodeVar, Schema } from 'dungeoneer-common';
 import { takeUntil } from 'rxjs';
 import { DmWebSocketService } from 'src/app/connection/dm-web-socket.service';
 import { DmUnsubscriberComponent } from 'src/app/core/dm-unsubscriber/dm-unsubscriber.component';

dungeoneerClient/src/app/display/dm-table-and-single-node/dm-table-and-single-node.component.spec.ts

@@ -1,8 +1,8 @@
 import { Component, Injectable, Input } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { DmFetchParams } from 'dungeoneer-common/dist/types/src/connection/connectionTypes';
-import { Schema } from 'dungeoneer-common/dist/types/src/schema/schemaTypes';
+import { DmFetchParams } from 'dungeoneer-common';
+import { Schema } from 'dungeoneer-common';
 import { BehaviorSubject } from 'rxjs';
 import { DmDataObject } from 'src/app/data/dm-data-provider';
 import { DmDataStoreService } from 'src/app/data/dm-data-store.service';

dungeoneerClient/src/app/display/dm-table-and-single-node/dm-table-and-single-node.component.ts

@@ -1,8 +1,8 @@
 import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { getDungeoneerSchema } from "dungeoneer-common";
-import { DmFetchParams } from 'dungeoneer-common/dist/types/src/connection/connectionTypes';
-import { NodeType } from 'dungeoneer-common/dist/types/src/schema/schemaTypes';
+import { DmFetchParams } from 'dungeoneer-common';
+import { NodeType } from 'dungeoneer-common';
 import { nanoid } from 'nanoid';
 import { Subject, takeUntil } from 'rxjs';
 import { DmUnsubscriberComponent } from 'src/app/core/dm-unsubscriber/dm-unsubscriber.component';

dungeoneerClient/src/app/display/dm-table/dm-table.component.ts

@@ -1,8 +1,8 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { MatPaginator } from '@angular/material/paginator';
 import { getDungeoneerSchema } from 'dungeoneer-common';
-import { DmFetchParams } from 'dungeoneer-common/dist/types/src/connection/connectionTypes';
-import { NodeType, Schema } from 'dungeoneer-common/dist/types/src/schema/schemaTypes';
+import { DmFetchParams } from 'dungeoneer-common';
+import { NodeType, Schema } from 'dungeoneer-common';
 import { nanoid } from 'nanoid';
 import { BehaviorSubject, Subject, takeUntil } from 'rxjs';
 import { DmUnsubscriberComponent } from 'src/app/core/dm-unsubscriber/dm-unsubscriber.component';

dungeoneerClient/src/app/dm-character-sheet/components/dm-nodevar-card/dm-nodevar-card.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
 import { getDungeoneerSchema } from 'dungeoneer-common';
-import { Schema } from 'dungeoneer-common/dist/types/src/schema/schemaTypes';
+import { Schema } from 'dungeoneer-common';
 
 @Component({
   selector: 'dm-nodevar-card',

dungeoneerClient/src/app/dm-character-sheet/dm-abstract-character.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input } from "@angular/core";
 import { getDungeoneerSchema } from "dungeoneer-common";
-import { Schema } from "dungeoneer-common/dist/types/src/schema/schemaTypes";
+import { Schema } from "dungeoneer-common";
 import { DmUnsubscriberComponent } from "../core/dm-unsubscriber/dm-unsubscriber.component";
 import { DmFormEditService } from "../form/dm-form-edit/dm-form-edit.service";
 import { CreatureStats } from "./model/creature-stats.model";

dungeoneerClient/src/app/dm-character-sheet/dm-character-inventory/dm-character-inventory.component.spec.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { Schema } from 'dungeoneer-common/dist/types/src/schema/schemaTypes';
+import { Schema } from 'dungeoneer-common';
 import { EditEventObject } from 'src/app/form/dm-form-edit/dm-edit-event.model';
 import { DmFormEditService } from 'src/app/form/dm-form-edit/dm-form-edit.service';
 

dungeoneerClient/src/app/dm-character-sheet/dm-character-magic/dm-character-magic.component.spec.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { Schema } from 'dungeoneer-common/dist/types/src/schema/schemaTypes';
+import { Schema } from 'dungeoneer-common';
 import { EditEventObject } from 'src/app/form/dm-form-edit/dm-edit-event.model';
 import { DmFormEditService } from 'src/app/form/dm-form-edit/dm-form-edit.service';
 

dungeoneerClient/src/app/dm-character-sheet/dm-character-notes/dm-character-notes.component.spec.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { Schema } from 'dungeoneer-common/dist/types/src/schema/schemaTypes';
+import { Schema } from 'dungeoneer-common';
 import { EditEventObject } from 'src/app/form/dm-form-edit/dm-edit-event.model';
 import { DmFormEditService } from 'src/app/form/dm-form-edit/dm-form-edit.service';
 

dungeoneerClient/src/app/dm-character-sheet/dm-character-statistics/dm-character-statistics.component.spec.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { Schema } from 'dungeoneer-common/dist/types/src/schema/schemaTypes';
+import { Schema } from 'dungeoneer-common';
 import { EditEventObject } from 'src/app/form/dm-form-edit/dm-edit-event.model';
 import { DmFormEditService } from 'src/app/form/dm-form-edit/dm-form-edit.service';
 

dungeoneerClient/src/app/form/DmFormInputData.ts

@@ -1,5 +1,5 @@
 import { AbstractControl } from "@angular/forms";
-import { Facet, Schema } from "dungeoneer-common/dist/types/src/schema/schemaTypes";
+import { Facet, Schema } from "dungeoneer-common";
 
 export interface DmFormInputData {
     // the control that handles this input. Abstract control becasue it could be a FormArray, FormGroup or FormControl.

dungeoneerClient/src/app/form/DmFormUtils.ts

@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 import { AbstractControl, FormControl, FormGroup, ValidatorFn, Validators } from "@angular/forms";
-import { DmLinkSetParams } from "dungeoneer-common/dist/types/src/connection/connectionTypes";
-import { NodeType, NodeVar, Schema } from "dungeoneer-common/dist/types/src/schema/schemaTypes";
+import { DmLinkSetParams } from "dungeoneer-common";
+import { NodeType, NodeVar, Schema } from "dungeoneer-common";
 import { DmWebSocketService } from "../connection/dm-web-socket.service";
 import { DmUniqueValidator } from "../validation/DmUniqueValidator";
 import { DmFormInputData, DmTableInputConfig } from "./DmFormInputData";

dungeoneerClient/src/app/form/dm-form-dialog/dm-form-dialog.component.spec.ts

@@ -1,7 +1,7 @@
 import { Component, Injectable } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormGroup } from '@angular/forms';
-import { Schema } from 'dungeoneer-common/dist/types/src/schema/schemaTypes';
+import { Schema } from 'dungeoneer-common';
 import { DmFormInputData } from '../DmFormInputData';
 import { DmFormUtils } from '../DmFormUtils';
 

dungeoneerClient/src/app/form/dm-form-edit/dm-form-edit.service.spec.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { FormGroup } from '@angular/forms';
-import { Schema } from 'dungeoneer-common/dist/types/src/schema/schemaTypes';
+import { Schema } from 'dungeoneer-common';
 import { DmWebSocketService } from 'src/app/connection/dm-web-socket.service';
 import { DmDialogService } from 'src/app/display/dialog/dm-dialog.service';
 import { DmFormInputData } from '../DmFormInputData';

dungeoneerClient/src/app/form/dm-form-edit/dm-form-edit.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
-import { DmSetParams } from 'dungeoneer-common/dist/types/src/connection/connectionTypes';
-import { Schema } from 'dungeoneer-common/dist/types/src/schema/schemaTypes';
+import { DmSetParams } from 'dungeoneer-common';
+import { Schema } from 'dungeoneer-common';
 import { takeUntil } from 'rxjs';
 import { DmWebSocketService } from 'src/app/connection/dm-web-socket.service';
 import { DmUnsubscriberComponent } from 'src/app/core/dm-unsubscriber/dm-unsubscriber.component';

dungeoneerClient/src/app/form/dm-form/dm-form.component.spec.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormGroup } from '@angular/forms';
-import { Schema } from 'dungeoneer-common/dist/types/src/schema/schemaTypes';
+import { Schema } from 'dungeoneer-common';
 import { DmFormInputData } from '../DmFormInputData';
 import { DmFormUtils } from '../DmFormUtils';
 

dungeoneerClient/src/app/form/inputs/dm-table-input/dm-table-input.component.spec.ts

@@ -2,7 +2,7 @@ import { OverlayModule } from '@angular/cdk/overlay';
 import { Component, Injectable } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AbstractControl } from '@angular/forms';
-import { DmFetchParams } from 'dungeoneer-common/dist/types/src/connection/connectionTypes';
+import { DmFetchParams } from 'dungeoneer-common';
 import { BehaviorSubject, of } from 'rxjs';
 import { DmWebSocketService } from 'src/app/connection/dm-web-socket.service';
 import { DmDataObject } from 'src/app/data/dm-data-provider';

dungeoneerClient/src/app/form/inputs/dm-table-input/dm-table-input.component.ts

@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Input, OnInit } from '@angular/core';
 import { FormControl, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { getDungeoneerSchema } from 'dungeoneer-common';
-import { Facet, Schema } from 'dungeoneer-common/dist/types/src/schema/schemaTypes';
+import { Facet, Schema } from 'dungeoneer-common';
 import { distinctUntilChanged, Subject, takeUntil } from 'rxjs';
 import { DmWebSocketService } from 'src/app/connection/dm-web-socket.service';
 import { DmDataProvider } from 'src/app/data/dm-data-provider';

dungeoneerClient/src/app/pipes/dm-value.pipe.ts

@@ -1,6 +1,6 @@
 import { formatDate } from '@angular/common';
 import { Inject, LOCALE_ID, Pipe, PipeTransform } from '@angular/core';
-import { NodeType, NodeVar } from 'dungeoneer-common/dist/types/src/schema/schemaTypes';
+import { NodeType, NodeVar } from 'dungeoneer-common';
 
 @Pipe({
   name: 'dmValue'

dungeoneerClient/src/app/routes/dm-character-sheet/dm-character-sheet.component.spec.ts

@@ -2,7 +2,7 @@ import { Component, Injectable } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, convertToParamMap } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { DmFetchParams } from 'dungeoneer-common/dist/types/src/connection/connectionTypes';
+import { DmFetchParams } from 'dungeoneer-common';
 import { BehaviorSubject } from 'rxjs';
 import { DmDataObject } from 'src/app/data/dm-data-provider';
 import { DmDataStoreService } from 'src/app/data/dm-data-store.service';

dungeoneerClient/src/app/validation/DmUniqueValidator.ts

@@ -1,5 +1,5 @@
 import { AbstractControl, AsyncValidator, ValidationErrors } from "@angular/forms";
-import { DmFetchParams, DmResponse } from "dungeoneer-common/dist/types/src/connection/connectionTypes";
+import { DmFetchParams, DmResponse } from "dungeoneer-common";
 import { Observable } from "rxjs";
 import { DmWebSocketService } from "../connection/dm-web-socket.service";