From 43aaa63f021bb68b901587423c89ccb5531196a3 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 May 2022 16:48:42 -0600
Subject: [PATCH] format, update imports
---
example/e2e/src/app.e2e-spec.ts | 3 ++-
example/src/app/app.component.spec.ts | 3 ++-
example/src/app/app.component.ts | 6 +++---
example/src/app/app.module.ts | 2 +-
example/src/app/app.service.ts | 6 +++---
example/src/test.ts | 1 +
types/d3/index.d.ts | 6 ++----
types/d3/view/D3Options.d.ts | 3 ++-
types/disagg/DisaggResponse.d.ts | 3 ++-
types/disagg/Disaggregation.d.ts | 3 ++-
types/disagg/index.d.ts | 2 +-
types/mvc/index.d.ts | 2 +-
12 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/example/e2e/src/app.e2e-spec.ts b/example/e2e/src/app.e2e-spec.ts
index f6309f9..f9d4b19 100644
--- a/example/e2e/src/app.e2e-spec.ts
+++ b/example/e2e/src/app.e2e-spec.ts
@@ -1,6 +1,7 @@
-import { AppPage } from './app.po';
import { browser, logging } from 'protractor';
+import { AppPage } from './app.po';
+
describe('workspace-project App', () => {
let page: AppPage;
diff --git a/example/src/app/app.component.spec.ts b/example/src/app/app.component.spec.ts
index 5e1a4b8..1443a50 100644
--- a/example/src/app/app.component.spec.ts
+++ b/example/src/app/app.component.spec.ts
@@ -1,4 +1,5 @@
import { TestBed, waitForAsync } from '@angular/core/testing';
+
import { AppComponent } from './app.component';
describe('AppComponent', () => {
@@ -16,7 +17,7 @@ describe('AppComponent', () => {
expect(app).toBeTruthy();
});
- it(`should have as title 'example'`, () => {
+ it("should have as title 'example'", () => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.componentInstance;
expect(app.title).toEqual('example');
diff --git a/example/src/app/app.component.ts b/example/src/app/app.component.ts
index baf75eb..99bbfd8 100644
--- a/example/src/app/app.component.ts
+++ b/example/src/app/app.component.ts
@@ -1,7 +1,7 @@
-import { Component, ViewChild, ElementRef, OnInit, AfterViewInit } from '@angular/core';
-import { DisaggResponse, Disaggregation, DisaggGraphView } from '@nshmp/disagg-d3/src/disagg';
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { nshmpHaz } from '@ghsc/nshmp-web-utils';
+import { DisaggGraphView, Disaggregation, DisaggResponse } from '@nshmp/disagg-d3/src/disagg';
import { Collection } from '@nshmp/disagg-d3/src/mvc';
-import { nshmpHaz } from '@ghsc/nshmp-utils';
import deagg from '../assets/deagg.json';
diff --git a/example/src/app/app.module.ts b/example/src/app/app.module.ts
index 5ce7811..7bcb9e9 100644
--- a/example/src/app/app.module.ts
+++ b/example/src/app/app.module.ts
@@ -1,5 +1,5 @@
-import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
import { AppComponent } from './app.component';
diff --git a/example/src/app/app.service.ts b/example/src/app/app.service.ts
index 39ee8b4..167535a 100644
--- a/example/src/app/app.service.ts
+++ b/example/src/app/app.service.ts
@@ -1,8 +1,8 @@
-import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { nshmpHaz } from '@ghsc/nshmp-web-utils';
+import { Observable, throwError } from 'rxjs';
import { map } from 'rxjs/operators';
-import { nshmpHaz } from '@ghsc/nshmp-utils';
-import { throwError, Observable } from 'rxjs';
@Injectable({
providedIn: 'root',
diff --git a/example/src/test.ts b/example/src/test.ts
index 3d6a9ec..cbf2f64 100644
--- a/example/src/test.ts
+++ b/example/src/test.ts
@@ -1,6 +1,7 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'zone.js/testing';
+
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
diff --git a/types/d3/index.d.ts b/types/d3/index.d.ts
index 0bb4e56..16e34b1 100644
--- a/types/d3/index.d.ts
+++ b/types/d3/index.d.ts
@@ -4,14 +4,12 @@ export * from './3d/D33dGroup';
export * from './3d/D33dOptions';
export * from './3d/D33dPath';
export * from './3d/D33dText';
-
export * from './util/ClassList';
export * from './util/D3Util';
-
-export * from './view/D33dSubView';
-export * from './view/D33dView';
export * from './view/D3BaseView';
export * from './view/D3Options';
export * from './view/D3SubView';
export * from './view/D3View';
+export * from './view/D33dSubView';
+export * from './view/D33dView';
export * from './view/Info';
diff --git a/types/d3/view/D3Options.d.ts b/types/d3/view/D3Options.d.ts
index 8c40417..7e8f07c 100644
--- a/types/d3/view/D3Options.d.ts
+++ b/types/d3/view/D3Options.d.ts
@@ -1,7 +1,8 @@
import * as d3 from 'd3';
-import { D33dView } from './D33dView';
+
import { D3BaseView } from './D3BaseView';
import { D3View } from './D3View';
+import { D33dView } from './D33dView';
export interface D3Options {
el?: SVGElement | HTMLElement;
diff --git a/types/disagg/DisaggResponse.d.ts b/types/disagg/DisaggResponse.d.ts
index 8c498bc..4e5a868 100644
--- a/types/disagg/DisaggResponse.d.ts
+++ b/types/disagg/DisaggResponse.d.ts
@@ -1,4 +1,5 @@
-import { nshmpHaz } from '@ghsc/nshmp-utils';
+import { nshmpHaz } from '@ghsc/nshmp-web-utils';
+
import { Model } from '../mvc/Model';
/**
diff --git a/types/disagg/Disaggregation.d.ts b/types/disagg/Disaggregation.d.ts
index 517e435..56b617e 100644
--- a/types/disagg/Disaggregation.d.ts
+++ b/types/disagg/Disaggregation.d.ts
@@ -1,4 +1,5 @@
-import { nshmpHaz } from '@ghsc/nshmp-utils';
+import { nshmpHaz } from '@ghsc/nshmp-web-utils';
+
import { Model } from '../mvc/Model';
import { DisaggParameters } from './DisaggParameters';
diff --git a/types/disagg/index.d.ts b/types/disagg/index.d.ts
index babb33d..7ae7837 100644
--- a/types/disagg/index.d.ts
+++ b/types/disagg/index.d.ts
@@ -3,5 +3,5 @@ export * from './DisaggBinOptions';
export * from './DisaggGraphView';
export * from './DisaggGraphViewOptions';
export * from './DisaggParameters';
-export * from './DisaggResponse';
export * from './Disaggregation';
+export * from './DisaggResponse';
diff --git a/types/mvc/index.d.ts b/types/mvc/index.d.ts
index 2a5ecc6..1105ee6 100644
--- a/types/mvc/index.d.ts
+++ b/types/mvc/index.d.ts
@@ -1,6 +1,6 @@
export * from './Collection';
export * from './Column';
export * from './Model';
+export * from './MvcOptions';
export * from './SelectedCollectionView';
export * from './View';
-export * from './MvcOptions';
--
GitLab