Skip to content

Commit

Permalink
fix: expose shared utils/types through ngx-sub-form/new path so that …
Browse files Browse the repository at this point in the history
…we can import only from that one when migrating
  • Loading branch information
maxime1992 committed Nov 21, 2021
1 parent 2e16f30 commit a348cd4
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 22 deletions.
2 changes: 2 additions & 0 deletions projects/ngx-sub-form/public_api.new.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ export * from './new/src/helpers';
export * from './new/src/helpers.types';
export * from './new/src/ngx-sub-form';
export { FormType } from './new/src/ngx-sub-form.types';
export * from './src/lib/shared/ngx-sub-form-utils';
export * from './src/lib/shared/ngx-sub-form.types';
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Component, forwardRef } from '@angular/core';
import { FormControl, Validators } from '@angular/forms';
import { subformComponentProviders } from 'ngx-sub-form';
import { createForm, FormType, NgxSubForm } from 'ngx-sub-form/new';
import { createForm, FormType, NgxSubForm, subformComponentProviders } from 'ngx-sub-form/new';
import { AssassinDroid, AssassinDroidWeapon, DroidType } from 'src/app/interfaces/droid.interface';

export const ASSASSIN_DROID_WEAPON_TEXT: { [K in AssassinDroidWeapon]: string } = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Component, forwardRef } from '@angular/core';
import { FormControl, Validators } from '@angular/forms';
import { subformComponentProviders } from 'ngx-sub-form';
import { createForm, FormType, NgxSubForm } from 'ngx-sub-form/new';
import { createForm, FormType, NgxSubForm, subformComponentProviders } from 'ngx-sub-form/new';
import { AstromechDroid, AstromechDroidShape, DroidType } from '../../../../../interfaces/droid.interface';

@NgxSubForm()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Component, forwardRef } from '@angular/core';
import { FormControl, Validators } from '@angular/forms';
import { subformComponentProviders } from 'ngx-sub-form';
import { createForm, FormType, NgxSubForm } from 'ngx-sub-form/new';
import { createForm, FormType, NgxSubForm, subformComponentProviders } from 'ngx-sub-form/new';
import {
AssassinDroid,
AstromechDroid,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Component, forwardRef } from '@angular/core';
import { FormControl, Validators } from '@angular/forms';
import { subformComponentProviders } from 'ngx-sub-form';
import { createForm, FormType, NgxSubForm } from 'ngx-sub-form/new';
import { createForm, FormType, NgxSubForm, subformComponentProviders } from 'ngx-sub-form/new';
import { DroidType, MedicalDroid } from 'src/app/interfaces/droid.interface';

@NgxSubForm()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Component, forwardRef } from '@angular/core';
import { FormControl, Validators } from '@angular/forms';
import { getObservableLifecycle } from 'ngx-observable-lifecycle';
import { subformComponentProviders } from 'ngx-sub-form';
import { createForm, FormType, NgxSubForm } from 'ngx-sub-form/new';
import { createForm, FormType, NgxSubForm, subformComponentProviders } from 'ngx-sub-form/new';
import { DroidType, Languages, ProtocolDroid } from '../../../../../interfaces/droid.interface';

@NgxSubForm()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Component, forwardRef } from '@angular/core';
import { FormControl, Validators } from '@angular/forms';
import { subformComponentProviders } from 'ngx-sub-form';
import { createForm, FormType, NgxSubForm } from 'ngx-sub-form/new';
import { createForm, FormType, NgxSubForm, subformComponentProviders } from 'ngx-sub-form/new';
import { CrewMember } from '../../../../../../interfaces/crew-member.interface';

@NgxSubForm()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
import { Component, forwardRef } from '@angular/core';
import { FormArray, FormControl, Validators } from '@angular/forms';
import { ArrayPropertyKey, ArrayPropertyValue, subformComponentProviders } from 'ngx-sub-form';
import { createForm, FormType, NgxSubForm } from 'ngx-sub-form/new';
import {
ArrayPropertyKey,
ArrayPropertyValue,
createForm,
FormType,
NgxSubForm,
subformComponentProviders,
} from 'ngx-sub-form/new';
import { CrewMember } from '../../../../../interfaces/crew-member.interface';

interface CrewMembersForm {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Component, forwardRef } from '@angular/core';
import { FormControl, Validators } from '@angular/forms';
import { subformComponentProviders } from 'ngx-sub-form';
import { createForm, FormType, NgxSubForm } from 'ngx-sub-form/new';
import { createForm, FormType, NgxSubForm, subformComponentProviders } from 'ngx-sub-form/new';
import { Spaceship, VehicleType } from 'src/app/interfaces/vehicle.interface';

@NgxSubForm()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Component, forwardRef } from '@angular/core';
import { FormControl, Validators } from '@angular/forms';
import { subformComponentProviders } from 'ngx-sub-form';
import { createForm, FormType, NgxSubForm } from 'ngx-sub-form/new';
import { createForm, FormType, NgxSubForm, subformComponentProviders } from 'ngx-sub-form/new';
import { Speeder, VehicleType } from 'src/app/interfaces/vehicle.interface';

@NgxSubForm()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Component, forwardRef } from '@angular/core';
import { FormControl, Validators } from '@angular/forms';
import { subformComponentProviders } from 'ngx-sub-form';
import { createForm, FormType, NgxSubForm } from 'ngx-sub-form/new';
import { createForm, FormType, NgxSubForm, subformComponentProviders } from 'ngx-sub-form/new';
import { OneVehicle, Spaceship, Speeder, VehicleType } from 'src/app/interfaces/vehicle.interface';
import { UnreachableCase } from 'src/app/shared/utils';

Expand Down
4 changes: 2 additions & 2 deletions src/app/main-rewrite/listing/listing.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { FormControl } from '@angular/forms';
import { NullableObject } from 'ngx-sub-form';
import { ActivatedRoute } from '@angular/router';
import { NullableObject } from 'ngx-sub-form/new';
import { Observable, of } from 'rxjs';
import { map, switchMap } from 'rxjs/operators';
import { OneListing } from 'src/app/interfaces/listing.interface';
Expand Down

0 comments on commit a348cd4

Please sign in to comment.