imng-kendo-schematics 7.209.3 → 7.222.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imng-kendo-schematics",
-  "version": "7.209.3",
+  "version": "7.222.4",
   "description": "Angular Schematics facilitating Angular, Kendo, NGRX and imng package integration",
   "scripts": {
     "build": "tsc -p tsconfig.json",
@@ -20,14 +20,14 @@
   "schematics": "./schematics/collection.json",
   "peerDependencies": {
     "pluralize": "^8.x",
-    "@nrwl/angular": ">=11.x",
-    "@angular/core": ">=11.x",
-    "jest": ">=26.x"
+    "@nx/angular": ">=19.x",
+    "@angular/core": ">=18.x",
+    "jest": ">=29.x"
   },
   "dependencies": {
-    "@angular-devkit/core": ">=11.x",
-    "@angular-devkit/schematics": ">=11.x",
-    "@angular/compiler": ">=11.x",
-    "typescript": ">=4.x"
+    "@angular-devkit/core": ">=18.x",
+    "@angular-devkit/schematics": ">=18.x",
+    "@angular/compiler": ">=18.x",
+    "typescript": ">=5.x"
   }
 }

package/schematics/imng-crud/files/add.component.spec.ts.template

@@ -11,7 +11,6 @@ import { of } from 'rxjs';<% } %>
 import { <%= classify(name) %>AddComponent } from './add.component';
 import { <%= classify(name) %>CrudFacade } from './crud.facade';
 
-
 <% if (hasObjects) { %>export function createMock<%= classify(name) %>Facade() {
   return {
     currentEntity$: of({}),<% swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>

package/schematics/imng-crud/files/api.service.ts.template

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { NrsrxBaseApiClientService } from 'imng-nrsrx-client-utils';
 import { HttpClient } from '@angular/common/http';
-import { environment } from '../../../../environments/environment';
+import { environment } from '@env';
 
 @Injectable({
   providedIn: 'root',
@@ -9,7 +9,7 @@ import { environment } from '../../../../environments/environment';
 export class <%= classify(name) %>ApiService extends NrsrxBaseApiClientService<I<%= classify(name) %>> {
   public override url = environment.webApiEndpoints.<%= camelize(pluralizedName) %>;
 <% if (swaggerProperties.filter(t => t.format === 'date')) { %>
-  public dateOnlyPropertyNames = [<% swaggerProperties.filter(t => t.format === 'date').forEach(function (swaggerProperty, index, dateProperties) {  %>
+  public override dateOnlyPropertyNames = [<% swaggerProperties.filter(t => t.format === 'date').forEach(function (swaggerProperty, index, dateProperties) {  %>
     <%= classify(singularizedName) %>Properties.<%= swaggerProperty.snakeCaseName.toUpperCase() %><% if (index + 1 < dateProperties.length) { %>,<% }}) %>];
 <% } %>
   constructor(http: HttpClient) {

package/schematics/imng-crud/files/base-entry.component.ts.template

@@ -26,7 +26,7 @@ export abstract class <%= classify(name) %>BaseEntryComponent extends BaseDataEn
     ))));<% }) %>
   }
 
-  public ngOnInit(): void {
+  public override ngOnInit(): void {
     this.initForm();<% swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
     this.facade.load<%= classify(swaggerProperty.pluralizedName) %>({ selectors: [<% swaggerProperty.properties.forEach(function(swaggerSubProperty){ %>
       <%= classify(swaggerProperty.propertyTypeName) %>Properties.<%= swaggerSubProperty.snakeCaseName.toUpperCase() %>,<% }) %>] });<% }) %>

package/schematics/imng-crud/files/crud.facade.spec.ts.template

@@ -13,11 +13,10 @@ import {
 import { createODataPayload } from 'imng-kendo-odata';
 import { of } from 'rxjs';
 
-import { <%= classify(singularizedStoreName) %>Effects } from '../+state/<%= dasherize(singularizedStoreName) %>.effects';
-import { <%= camelize(pluralizedStoreName) %>Feature } from '../+state/<%= dasherize(singularizedStoreName) %>.reducer';
+import { <%= camelize(pluralizedStoreName) %>Feature, <%= classify(singularizedStoreName) %>ListEffects, <%= classify(singularizedStoreName) %>CrudEffects } from '../+state';
 import { <%= classify(name) %>CrudFacade } from './crud.facade';
 import { <%= classify(name) %>ApiService } from './api.service';
-import { environment } from '../../../../environments/environment';
+import { environment } from '@env';
 
 describe('<%= classify(name) %>CrudFacade', () => {
   let facade: <%= classify(name) %>CrudFacade;
@@ -32,7 +31,7 @@ describe('<%= classify(name) %>CrudFacade', () => {
       @NgModule({
         imports: [
           StoreModule.forFeature(<%= camelize(pluralizedStoreName) %>Feature),
-          EffectsModule.forFeature([<%= classify(singularizedStoreName) %>Effects]),
+          EffectsModule.forFeature([<%= classify(singularizedStoreName) %>ListEffects, <%= classify(singularizedStoreName) %>CrudEffects]),
         ],
         providers: [
           <%= classify(name) %>CrudFacade,

package/schematics/imng-crud/files/crud.facade.ts.template

@@ -2,16 +2,14 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { IDataEntryFacade } from 'imng-kendo-data-entry';<% if (hasObjects) { %>
 import { ODataState } from 'imng-kendo-odata';<% } %>
-import { <%= camelize(pluralizedStoreName) %>Feature } from '../+state/<%= dasherize(singularizedStoreName) %>.reducer';
-import { <%= camelize(singularizedStoreName) %>Queries } from '../+state/<%= dasherize(singularizedStoreName) %>.selectors';
-import * as <%= camelize(singularizedStoreName) %>ActionTypes from '../+state/<%= dasherize(singularizedStoreName) %>.actions';
+import { <%= camelize(pluralizedStoreName) %>Feature, <%= camelize(singularizedStoreName) %>Selectors, <%= camelize(singularizedStoreName) %>ActionTypes } from '../+state';
 
 @Injectable()
 export class <%= classify(name) %>CrudFacade implements IDataEntryFacade<I<%= classify(name) %>> {
   loading$ = this.store.select(<%= camelize(pluralizedStoreName) %>Feature.selectLoading);
-  currentEntity$ = this.store.select(<%= camelize(singularizedStoreName) %>Queries.selectCurrent<%= classify(name) %>);
-  isEditActive$ = this.store.select(<%= camelize(singularizedStoreName) %>Queries.selectIsEdit<%= classify(name) %>Active);
-  isNewActive$ = this.store.select(<%= camelize(singularizedStoreName) %>Queries.selectIsNew<%= classify(name) %>Active);<% swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
+  currentEntity$ = this.store.select(<%= camelize(pluralizedStoreName) %>Feature.selectCurrent<%= classify(name) %>);
+  isEditActive$ = this.store.select(<%= camelize(singularizedStoreName) %>Selectors.selectIsEdit<%= classify(name) %>Active);
+  isNewActive$ = this.store.select(<%= camelize(singularizedStoreName) %>Selectors.selectIsNew<%= classify(name) %>Active);<% swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
   <%= camelize(swaggerProperty.pluralizedName) %>$ = this.store.select(<%= camelize(pluralizedStoreName) %>Feature.select<%= classify(swaggerProperty.pluralizedName) %>);<% }); %>
 
   constructor(private readonly store: Store) {}

package/schematics/imng-crud/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.imngCrud = void 0;
+exports.imngCrud = imngCrud;
 const schematics_1 = require("@angular-devkit/schematics");
 const shared_1 = require("../shared");
 function imngCrud(_options) {
@@ -8,5 +8,4 @@ function imngCrud(_options) {
         return (0, schematics_1.chain)([(0, shared_1.getSwaggerDoc)(_options), (0, shared_1.generateFiles)(_options, 'crud')])(tree, _context);
     };
 }
-exports.imngCrud = imngCrud;
 //# sourceMappingURL=index.js.map

package/schematics/imng-crud/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/imng-crud/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiF;AACjF,sCAAmE;AAEnE,SAAgB,QAAQ,CAAC,QAAkB;IACzC,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,OAAO,IAAA,kBAAK,EAAC,CAAC,IAAA,sBAAa,EAAC,QAAQ,CAAC,EAAE,IAAA,sBAAa,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC3F,CAAC,CAAC;AACJ,CAAC;AAJD,4BAIC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/imng-crud/index.ts"],"names":[],"mappings":";;AAGA,4BAIC;AAPD,2DAAiF;AACjF,sCAAmE;AAEnE,SAAgB,QAAQ,CAAC,QAAkB;IACzC,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,OAAO,IAAA,kBAAK,EAAC,CAAC,IAAA,sBAAa,EAAC,QAAQ,CAAC,EAAE,IAAA,sBAAa,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC3F,CAAC,CAAC;AACJ,CAAC"}

package/schematics/imng-list/files/index.ts.template

@@ -1,3 +1,3 @@
 export { <%= classify(singularizedName) %>ListComponent } from './list.component';
 export { <%= classify(singularizedName) %>ListFacade } from './list.facade';
-export { <%= classify(singularizedName) %>GridState } from './list.grid-state';
+export { <%= camelize(singularizedName) %>GridState } from './list.grid-state';

package/schematics/imng-list/files/list.facade.spec.ts.template

@@ -8,11 +8,9 @@ import { ODataState, createODataPayload, createODataResult, ODataService } from
 import { testDeleteCurrentEntity } from 'imng-kendo-data-entry/testing';
 import { Observable, of } from 'rxjs';
 
-import { <%= classify(singularizedStoreName) %>Effects } from '../+state/<%= dasherize(singularizedStoreName) %>.effects';
-import * as <%= camelize(singularizedStoreName) %>ActionTypes from '../+state/<%= dasherize(singularizedStoreName) %>.actions';
-import { <%= camelize(pluralizedStoreName) %>Feature } from '../+state/<%= dasherize(singularizedStoreName) %>.reducer';
+import { <%= camelize(pluralizedStoreName) %>Feature, <%= classify(singularizedStoreName) %>ListEffects, <%= classify(singularizedStoreName) %>CrudEffects } from '../+state';
 import { <%= classify(singularizedName) %>ListFacade } from './list.facade';
-import { environment } from '../../../../environments/environment';
+import { environment } from '@env';
 
 describe('<%= classify(singularizedName) %>ListFacade', () => {
   let facade: <%= classify(singularizedName) %>ListFacade;
@@ -27,7 +25,7 @@ describe('<%= classify(singularizedName) %>ListFacade', () => {
       @NgModule({
         imports: [
           StoreModule.forFeature(<%= camelize(pluralizedStoreName) %>Feature),
-          EffectsModule.forFeature([<%= classify(singularizedStoreName) %>Effects]),
+          EffectsModule.forFeature([<%= classify(singularizedStoreName) %>ListEffects, <%= classify(singularizedStoreName) %>CrudEffects]),
         ],
         providers: [
           <%= classify(singularizedName) %>ListFacade,

package/schematics/imng-list/files/list.facade.ts.template

@@ -4,8 +4,7 @@ import { IDataDeleteFacade } from 'imng-kendo-data-entry';
 import { IKendoODataGridFacade } from 'imng-kendo-grid-odata';
 import { ODataState } from 'imng-kendo-odata';
 
-import { <%= camelize(pluralizedStoreName) %>Feature } from '../+state/<%= dasherize(singularizedStoreName) %>.reducer';
-import * as <%= camelize(storeName) %>ActionTypes from '../+state/<%= dasherize(singularizedStoreName) %>.actions';
+import { <%= camelize(pluralizedStoreName) %>Feature, <%= camelize(storeName) %>ActionTypes } from '../+state';
 
 @Injectable()
 export class <%= classify(singularizedName) %>ListFacade implements IKendoODataGridFacade<I<%= classify(name) %>>, IDataDeleteFacade<I<%= classify(name) %>> {

package/schematics/imng-list/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.imngList = void 0;
+exports.imngList = imngList;
 const schematics_1 = require("@angular-devkit/schematics");
 const shared_1 = require("../shared");
 function imngList(_options) {
@@ -8,5 +8,4 @@ function imngList(_options) {
         return (0, schematics_1.chain)([(0, shared_1.getSwaggerDoc)(_options), (0, shared_1.generateFiles)(_options, 'list')])(tree, _context);
     };
 }
-exports.imngList = imngList;
 //# sourceMappingURL=index.js.map

package/schematics/imng-list/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/imng-list/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiF;AACjF,sCAAmE;AAEnE,SAAgB,QAAQ,CAAC,QAAkB;IACzC,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,OAAO,IAAA,kBAAK,EAAC,CAAC,IAAA,sBAAa,EAAC,QAAQ,CAAC,EAAE,IAAA,sBAAa,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC3F,CAAC,CAAC;AACJ,CAAC;AAJD,4BAIC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/imng-list/index.ts"],"names":[],"mappings":";;AAGA,4BAIC;AAPD,2DAAiF;AACjF,sCAAmE;AAEnE,SAAgB,QAAQ,CAAC,QAAkB;IACzC,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,OAAO,IAAA,kBAAK,EAAC,CAAC,IAAA,sBAAa,EAAC,QAAQ,CAAC,EAAE,IAAA,sBAAa,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC3F,CAAC,CAAC;AACJ,CAAC"}

package/schematics/imng-module/files/+state/{__singularizedName@dasherize__.effects.ts.template → __singularizedName@dasherize__-crud.effects.ts.template}

@@ -1,52 +1,21 @@
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { createEffect, Actions, ofType } from '@ngrx/effects';
-import { concatLatestFrom } from '@ngrx/operators';
 import { ODataService } from 'imng-kendo-odata';
 import { handleEffectError } from 'imng-ngrx-utils';
 import { map, switchMap } from 'rxjs/operators';
 
-import { <%= camelize(pluralizedStoreName) %>Feature } from './<%= dasherize(singularizedName) %>.reducer';
 import * as <%= camelize(singularizedName) %>ActionTypes from './<%= dasherize(singularizedName) %>.actions';
-import { environment } from '../../../../environments/environment';
 <% if (openApiJsonUrl || openApiJsonFileName) { %>
-import { <%= classify(singularizedName) %>ApiService } from '../<%= dasherize(pluralizedName) %>-crud';
+import { <%= classify(singularizedName) %>ApiService } from '../<%= dasherize(pluralizedName) %>-crud/api.service';
 <% } %>
 @Injectable()
-export class <%= classify(singularizedName) %>Effects {
+export class <%= classify(singularizedName) %>CrudEffects {
   constructor(
     private readonly actions$: Actions,
     private readonly odataService: ODataService,
-    private readonly store: Store,
     private readonly <%= camelize(singularizedName) %>ApiService : <%= classify(singularizedName) %>ApiService,
   ) {}
 <% if (openApiJsonUrl || openApiJsonFileName) { %>
-  load<%= classify(pluralizedName) %>Effect$ = createEffect(() => {
-    return this.actions$.pipe(
-      ofType(<%= camelize(singularizedName) %>ActionTypes.load<%= classify(pluralizedName) %>Request),
-      switchMap((action: ReturnType<typeof <%= camelize(singularizedName) %>ActionTypes.load<%= classify(pluralizedName) %>Request>) => this.odataService
-        .fetch<I<%= classify(name) %>>(environment.odataEndpoints.<%= camelize(pluralizedName) %>, action.payload<% if(hasNullableDates){ %>, {
-          dateNullableProps: [<% swaggerProperties.filter(t=> (t.format==='date-time' || t.format === 'date') && !t.required).forEach((swaggerProperty,i,arr) => { %><%= classify(singularizedName) %>Properties.<%= swaggerProperty.snakeCaseName.toUpperCase() %><% if (i !== arr.length-1){%>, <% } }) %>],
-        }<% } %>)
-        .pipe(
-          map(t => <%= camelize(singularizedName) %>ActionTypes.load<%= classify(pluralizedName) %>Success(t)),
-          handleEffectError(action))));
-  });
-
-  reload<%= classify(pluralizedName) %>Effect$ = createEffect(() => {
-    return this.actions$.pipe(
-      ofType(<%= camelize(singularizedName) %>ActionTypes.reload<%= classify(pluralizedName) %>Request),
-      concatLatestFrom(() => this.store.select(<%= camelize(pluralizedStoreName) %>Feature.selectGridODataState)),
-      switchMap(([action, odataState]) => this.odataService
-        .fetch<I<%= classify(singularizedName) %>>(environment.odataEndpoints.<%= camelize(pluralizedName) %>, odataState, {
-          bustCache: true,<% if(hasNullableDates){ %>
-          dateNullableProps: [<% swaggerProperties.filter(t=> (t.format==='date-time' || t.format === 'date') && !t.required).forEach((swaggerProperty,i,arr)=> { %><%= classify(singularizedName) %>Properties.<%= swaggerProperty.snakeCaseName.toUpperCase() %><% if (i !== arr.length-1){%>, <% } }) %>],<% } %>
-        })
-        .pipe(
-          map(t => <%= camelize(singularizedName) %>ActionTypes.reload<%= classify(pluralizedName) %>Success(t)),
-          handleEffectError(action))));
-  });
-
   save<%= classify(singularizedName) %>Effect$ = createEffect(() => {
     return this.actions$.pipe(
       ofType(<%= camelize(singularizedName) %>ActionTypes.save<%= classify(singularizedName) %>Request),

package/schematics/imng-module/files/+state/__singularizedName@dasherize__-list.effects.ts.template

@@ -0,0 +1,46 @@
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { createEffect, Actions, ofType } from '@ngrx/effects';
+import { concatLatestFrom } from '@ngrx/operators';
+import { ODataService } from 'imng-kendo-odata';
+import { handleEffectError } from 'imng-ngrx-utils';
+import { map, switchMap } from 'rxjs/operators';
+
+import { <%= camelize(pluralizedStoreName) %>Feature } from './<%= dasherize(singularizedName) %>.feature';
+import * as <%= camelize(singularizedName) %>ActionTypes from './<%= dasherize(singularizedName) %>.actions';
+import { environment } from '@env';
+
+@Injectable()
+export class <%= classify(singularizedName) %>ListEffects {
+  constructor(
+    private readonly actions$: Actions,
+    private readonly odataService: ODataService,
+    private readonly store: Store,
+  ) {}
+<% if (openApiJsonUrl || openApiJsonFileName) { %>
+  load<%= classify(pluralizedName) %>Effect$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(<%= camelize(singularizedName) %>ActionTypes.load<%= classify(pluralizedName) %>Request),
+      switchMap((action: ReturnType<typeof <%= camelize(singularizedName) %>ActionTypes.load<%= classify(pluralizedName) %>Request>) => this.odataService
+        .fetch<I<%= classify(name) %>>(environment.odataEndpoints.<%= camelize(pluralizedName) %>, action.payload<% if(hasNullableDates){ %>, {
+          dateNullableProps: [<% swaggerProperties.filter(t=> (t.format==='date-time' || t.format === 'date') && !t.required).forEach((swaggerProperty,i,arr) => { %><%= classify(singularizedName) %>Properties.<%= swaggerProperty.snakeCaseName.toUpperCase() %><% if (i !== arr.length-1){%>, <% } }) %>],
+        }<% } %>)
+        .pipe(
+          map(t => <%= camelize(singularizedName) %>ActionTypes.load<%= classify(pluralizedName) %>Success(t)),
+          handleEffectError(action))));
+  });
+
+  reload<%= classify(pluralizedName) %>Effect$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(<%= camelize(singularizedName) %>ActionTypes.reload<%= classify(pluralizedName) %>Request),
+      concatLatestFrom(() => this.store.select(<%= camelize(pluralizedStoreName) %>Feature.selectGridODataState)),
+      switchMap(([action, odataState]) => this.odataService
+        .fetch<I<%= classify(singularizedName) %>>(environment.odataEndpoints.<%= camelize(pluralizedName) %>, odataState, {
+          bustCache: true,<% if(hasNullableDates){ %>
+          dateNullableProps: [<% swaggerProperties.filter(t=> (t.format==='date-time' || t.format === 'date') && !t.required).forEach((swaggerProperty,i,arr)=> { %><%= classify(singularizedName) %>Properties.<%= swaggerProperty.snakeCaseName.toUpperCase() %><% if (i !== arr.length-1){%>, <% } }) %>],<% } %>
+        })
+        .pipe(
+          map(t => <%= camelize(singularizedName) %>ActionTypes.reload<%= classify(pluralizedName) %>Success(t)),
+          handleEffectError(action))));
+  });
+<% } %>}

package/schematics/imng-module/files/+state/__singularizedName@dasherize__.selectors.ts.template

@@ -1,5 +1,5 @@
 import { createSelector } from '@ngrx/store';
-import { <%= camelize(pluralizedStoreName) %>Feature } from './<%= dasherize(singularizedName) %>.reducer';
+import { <%= camelize(pluralizedStoreName) %>Feature } from './<%= dasherize(singularizedName) %>.feature';
 import { isTruthy } from 'imng-ngrx-utils';
 <% if (openApiJsonUrl || openApiJsonFileName) { %>
 const selectIsEdit<%= classify(name) %>Active = createSelector(
@@ -8,10 +8,10 @@ const selectIsEdit<%= classify(name) %>Active = createSelector(
 const selectIsNew<%= classify(name) %>Active = createSelector(
   <%= camelize(pluralizedStoreName) %>Feature.selectCurrent<%= classify(name) %>,
   (entity) => isTruthy(entity) && !isTruthy(entity?.id));
-export const <%= camelize(singularizedName) %>Queries = {
+export const <%= camelize(singularizedName) %>Selectors = {
   selectIsEdit<%= classify(name) %>Active,
   selectIsNew<%= classify(name) %>Active,
 };
 
 <% } else { %>
-export const <%= camelize(singularizedName) %>Queries = {};<% } %>
+export const <%= camelize(singularizedName) %>Selectors = {};<% } %>

package/schematics/imng-module/files/+state/index.ts.template

@@ -0,0 +1,5 @@
+export * as <%= camelize(singularizedName) %>ActionTypes from './<%= dasherize(singularizedName) %>.actions';
+export { <%= camelize(pluralizedStoreName) %>Feature } from './<%= dasherize(singularizedName) %>.feature';
+export { <%= classify(singularizedName) %>ListEffects } from './<%= dasherize(singularizedName) %>-list.effects';
+export { <%= classify(singularizedName) %>CrudEffects } from './<%= dasherize(singularizedName) %>-crud.effects';
+export { <%= camelize(singularizedName) %>Selectors } from './<%= dasherize(singularizedName) %>.selectors'

package/schematics/imng-module/files/__pluralizedName@dasherize__.module.ts.template

@@ -14,8 +14,7 @@ import { ImngDataEntryDialogModule } from 'imng-kendo-data-entry';
 import { ImngKendoGridFilteringModule } from 'imng-kendo-grid-filtering';
 
 import { <%= classify(pluralizedName) %>RoutingModule } from './<%= dasherize(pluralizedName) %>.routing';
-import { <%= camelize(pluralizedStoreName) %>Feature } from './+state/<%= dasherize(singularizedName) %>.reducer';
-import { <%= classify(singularizedName) %>Effects } from './+state/<%= dasherize(singularizedName) %>.effects';
+import { <%= camelize(pluralizedStoreName) %>Feature, <%= classify(singularizedName) %>ListEffects, <%= classify(singularizedName) %>CrudEffects } from './+state';
 <% if (openApiJsonUrl || openApiJsonFileName) { %>
 import { <%= classify(singularizedName) %>ListComponent, <%= classify(singularizedName) %>ListFacade } from './<%= dasherize(pluralizedName) %>-list';
 import { <%= classify(singularizedName) %>AddComponent, <%= classify(singularizedName) %>EditComponent, <%= classify(singularizedName) %>ApiService, <%= classify(singularizedName) %>CrudFacade  } from './<%= dasherize(pluralizedName) %>-crud';
@@ -39,7 +38,7 @@ import { <%= classify(singularizedName) %>AddComponent, <%= classify(singularize
     ReactiveFormsModule,
     <%= classify(pluralizedName) %>RoutingModule,
     StoreModule.forFeature(<%= camelize(pluralizedStoreName) %>Feature),
-    EffectsModule.forFeature([<%= classify(singularizedName) %>Effects]),
+    EffectsModule.forFeature([<%= classify(singularizedName) %>ListEffects, <%= classify(singularizedName) %>CrudEffects]),
   ],
   providers: [
     <% if (openApiJsonUrl || openApiJsonFileName) { %><%= classify(singularizedName) %>ListFacade,

package/schematics/imng-module/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.imngModule = void 0;
+exports.imngModule = imngModule;
 const schematics_1 = require("@angular-devkit/schematics");
 const shared_1 = require("../shared");
 const pluralize = require("pluralize");
@@ -8,8 +8,9 @@ const path_1 = require("path");
 const strings_1 = require("@angular-devkit/core/src/utils/strings");
 function imngModule(_options) {
     return (tree, _context) => {
-        const listOptions = Object.assign(Object.assign({}, _options), { storeName: _options.storeName || _options.name, path: (0, path_1.normalize)(`${_options.path}/${(0, strings_1.dasherize)(pluralize(_options.name))}-module`) });
-        const crudOptions = Object.assign(Object.assign({}, _options), { storeName: _options.storeName || _options.name, path: (0, path_1.normalize)(`${_options.path}/${(0, strings_1.dasherize)(pluralize(_options.name))}-module`) });
+        var _a, _b;
+        const listOptions = Object.assign(Object.assign({}, _options), { storeName: (_a = _options.storeName) !== null && _a !== void 0 ? _a : _options.name, path: (0, path_1.normalize)(`${_options.path}/${(0, strings_1.dasherize)(pluralize.plural(_options.name))}-module`) });
+        const crudOptions = Object.assign(Object.assign({}, _options), { storeName: (_b = _options.storeName) !== null && _b !== void 0 ? _b : _options.name, path: (0, path_1.normalize)(`${_options.path}/${(0, strings_1.dasherize)(pluralize.plural(_options.name))}-module`) });
         return (0, schematics_1.chain)([
             (0, shared_1.getSwaggerDoc)(_options),
             (0, shared_1.generateFiles)(_options, 'module'),
@@ -18,5 +19,4 @@ function imngModule(_options) {
         ])(tree, _context);
     };
 }
-exports.imngModule = imngModule;
 //# sourceMappingURL=index.js.map

package/schematics/imng-module/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/imng-module/index.ts"],"names":[],"mappings":";;;AAAA,2DAAkG;AAClG,sCAAmE;AACnE,uCAAwC;AACxC,+BAAiC;AACjC,oEAAmE;AAGnE,SAAgB,UAAU,CAAC,QAAkB;IAC3C,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,MAAM,WAAW,mCACZ,QAAQ,KACX,SAAS,EAAE,QAAQ,CAAC,SAAS,IAAI,QAAQ,CAAC,IAAI,EAC9C,IAAI,EAAE,IAAA,gBAAS,EAAC,GAAG,QAAQ,CAAC,IAAI,IAAI,IAAA,mBAAS,EAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,GAClF,CAAC;QACF,MAAM,WAAW,mCACZ,QAAQ,KACX,SAAS,EAAE,QAAQ,CAAC,SAAS,IAAI,QAAQ,CAAC,IAAI,EAC9C,IAAI,EAAE,IAAA,gBAAS,EAAC,GAAG,QAAQ,CAAC,IAAI,IAAI,IAAA,mBAAS,EAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,GAClF,CAAC;QAEF,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,sBAAa,EAAC,QAAQ,CAAC;YACvB,IAAA,sBAAa,EAAC,QAAQ,EAAE,QAAQ,CAAC;YACjC,QAAQ,CAAC,cAAc,IAAI,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAA,sBAAS,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;YACtG,QAAQ,CAAC,cAAc,IAAI,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAA,sBAAS,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;SACvG,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC;AApBD,gCAoBC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/imng-module/index.ts"],"names":[],"mappings":";;AAOA,gCAoBC;AA3BD,2DAAkG;AAClG,sCAAmE;AACnE,uCAAuC;AACvC,+BAAiC;AACjC,oEAAmE;AAGnE,SAAgB,UAAU,CAAC,QAAkB;IAC3C,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;;QAChD,MAAM,WAAW,mCACZ,QAAQ,KACX,SAAS,EAAE,MAAA,QAAQ,CAAC,SAAS,mCAAI,QAAQ,CAAC,IAAI,EAC9C,IAAI,EAAE,IAAA,gBAAS,EAAC,GAAG,QAAQ,CAAC,IAAI,IAAI,IAAA,mBAAS,EAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,GACzF,CAAC;QACF,MAAM,WAAW,mCACZ,QAAQ,KACX,SAAS,EAAE,MAAA,QAAQ,CAAC,SAAS,mCAAI,QAAQ,CAAC,IAAI,EAC9C,IAAI,EAAE,IAAA,gBAAS,EAAC,GAAG,QAAQ,CAAC,IAAI,IAAI,IAAA,mBAAS,EAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,GACzF,CAAC;QAEF,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,sBAAa,EAAC,QAAQ,CAAC;YACvB,IAAA,sBAAa,EAAC,QAAQ,EAAE,QAAQ,CAAC;YACjC,QAAQ,CAAC,cAAc,IAAI,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAA,sBAAS,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;YACtG,QAAQ,CAAC,cAAc,IAAI,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAA,sBAAS,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;SACvG,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC"}

package/schematics/imng-sub-list/files/+state/__singularizedName@dasherize__.effects.ts.template

@@ -6,10 +6,10 @@ import { handleEffectError } from 'imng-ngrx-utils';
 import { map, switchMap } from 'rxjs/operators';
 
 import * as <%= camelize(singularizedName) %>ActionTypes from './<%= dasherize(singularizedName) %>.actions';
-import { <%= camelize(singularizedName) %>Queries } from './<%= dasherize(singularizedName) %>.selectors';<% if (openApiJsonUrl || openApiJsonFileName) { %>
+import { <%= camelize(singularizedName) %>Selectors } from './<%= dasherize(singularizedName) %>.selectors';<% if (openApiJsonUrl || openApiJsonFileName) { %>
 import { <%= classify(singularizedName) %>ApiService } from '../<%= dasherize(pluralizedName) %>-list';
 <% } %>
-import { environment } from '../../../../environments/environment';
+import { environment } from '@env';
 
 @Injectable()
 export class <%= classify(singularizedName) %>Effects {
@@ -34,7 +34,7 @@ export class <%= classify(singularizedName) %>Effects {
     return this.actions$.pipe(
       ofType(<%= camelize(singularizedName) %>ActionTypes.reload<%= classify(pluralizedName) %>Request),
       concatLatestFrom((action: ReturnType<typeof <%= camelize(singularizedName) %>ActionTypes.reload<%= classify(pluralizedName) %>Request>) =>
-        this.store.select(<%= camelize(singularizedName) %>Queries.selectODataState$(action.payload))),
+        this.store.select(<%= camelize(singularizedName) %>Selectors.selectODataState$(action.payload))),
       switchMap(([action, odataState]) => this.odataService
         .fetch<I<%= classify(singularizedName) %>>(environment.odataEndpoints.<%= camelize(pluralizedName) %>, odataState, { bustCache: true })
         .pipe(

package/schematics/imng-sub-list/files/+state/__singularizedName@dasherize__.selectors.ts.template

@@ -26,11 +26,11 @@ const selectGridPagerSettings$ = (<%= camelize(parentName) %>Id: string) => crea
   entity => entity.<%= camelize(singularizedName) %>PagerSettings || false,
 );
 
-export const <%= camelize(singularizedName) %>Queries = {
+export const <%= camelize(singularizedName) %>Selectors = {
   select<%= classify(pluralizedName) %>,
   selectGridData$,
   selectODataState$,
   selectGridPagerSettings$,
 };
 <% } else { %>
-export const <%= camelize(singularizedName) %>Queries = {};<% } %>
+export const <%= camelize(singularizedName) %>Selectors = {};<% } %>

package/schematics/imng-sub-list/files/__pluralizedName@dasherize__-list/api.service.ts.template

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { NrsrxBaseApiClientService } from 'imng-nrsrx-client-utils';
 import { HttpClient } from '@angular/common/http';
-import { environment } from '../../../../environments/environment';
+import { environment } from '@env';
 
 @Injectable({
   providedIn: 'root',

package/schematics/imng-sub-list/files/__pluralizedName@dasherize__-list/list.facade.spec.ts.template

@@ -14,7 +14,7 @@ import { <%= classify(singularizedName) %>Effects } from '../+state/<%= dasheriz
 import { <%= camelize(pluralizedStoreName) %>Feature } from '../+state/<%= dasherize(singularizedStoreName) %>.reducer';
 import { <%= classify(singularizedName) %>ListFacade } from './list.facade';
 import { <%= classify(parentName) %>Effects } from '../+state/<%= dasherize(parentName) %>.effects';
-import { environment } from '../../../../environments/environment';
+import { environment } from '@env';
 
 describe('<%= classify(singularizedName) %>ListFacade', () => {
   let facade: <%= classify(singularizedName) %>ListFacade;

package/schematics/imng-sub-list/files/__pluralizedName@dasherize__-list/list.facade.ts.template

@@ -8,7 +8,7 @@ import { BehaviorSubject, Observable, switchMap } from 'rxjs';
 
 import * as <%= camelize(singularizedName) %>ActionTypes from '../+state/<%= dasherize(singularizedName) %>.actions';
 import { <%= camelize(pluralizedStoreName) %>Feature } from '../+state/<%= dasherize(singularizedStoreName) %>.reducer';
-import { <%= camelize(singularizedName) %>Queries } from '../+state/<%= dasherize(singularizedName) %>.selectors';
+import { <%= camelize(singularizedName) %>Selectors } from '../+state/<%= dasherize(singularizedName) %>.selectors';
 
 @Injectable()
 export class <%= classify(singularizedName) %>ListFacade implements IKendoODataGridFacade<I<%= classify(name) %>>, IDataDeleteFacade<I<%= classify(name) %>> {
@@ -25,13 +25,13 @@ export class <%= classify(singularizedName) %>ListFacade implements IKendoODataG
   loading$ = this.store.select(<%= camelize(pluralizedStoreName) %>Feature.selectLoading);
   gridData$: Observable<ODataResult<I<%= classify(singularizedName) %>>> = this.parentGrid$.pipe(
     switchMap(x =>
-      this.store.select(<%= camelize(singularizedName) %>Queries.selectGridData$(x))));
+      this.store.select(<%= camelize(singularizedName) %>Selectors.selectGridData$(x))));
   gridPagerSettings$: Observable<false | PagerSettings> = this.parentGrid$.pipe(
     switchMap(x =>
-      this.store.select(<%= camelize(singularizedName) %>Queries.selectGridPagerSettings$(x))));
+      this.store.select(<%= camelize(singularizedName) %>Selectors.selectGridPagerSettings$(x))));
   gridODataState$: Observable<ODataState> = this.parentGrid$.pipe(
     switchMap(x =>
-      this.store.select(<%= camelize(singularizedName) %>Queries.selectODataState$(x))));
+      this.store.select(<%= camelize(singularizedName) %>Selectors.selectODataState$(x))));
 
   constructor(private readonly store: Store) {}
 

package/schematics/imng-sub-list/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.imngSubList = void 0;
+exports.imngSubList = imngSubList;
 const schematics_1 = require("@angular-devkit/schematics");
 const shared_1 = require("../shared");
 function imngSubList(_options) {
@@ -8,5 +8,4 @@ function imngSubList(_options) {
         return (0, schematics_1.chain)([(0, shared_1.getSwaggerDoc)(_options), (0, shared_1.generateFiles)(_options, 'sub-list')])(tree, _context);
     };
 }
-exports.imngSubList = imngSubList;
 //# sourceMappingURL=index.js.map

package/schematics/imng-sub-list/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/imng-sub-list/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiF;AACjF,sCAAmE;AAEnE,SAAgB,WAAW,CAAC,QAAkB;IAC5C,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,OAAO,IAAA,kBAAK,EAAC,CAAC,IAAA,sBAAa,EAAC,QAAQ,CAAC,EAAE,IAAA,sBAAa,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC/F,CAAC,CAAC;AACJ,CAAC;AAJD,kCAIC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/imng-sub-list/index.ts"],"names":[],"mappings":";;AAGA,kCAIC;AAPD,2DAAiF;AACjF,sCAAmE;AAEnE,SAAgB,WAAW,CAAC,QAAkB;IAC5C,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,OAAO,IAAA,kBAAK,EAAC,CAAC,IAAA,sBAAa,EAAC,QAAQ,CAAC,EAAE,IAAA,sBAAa,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC/F,CAAC,CAAC;AACJ,CAAC"}

package/schematics/ng-add/index.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ngAdd = void 0;
+exports.ngAdd = ngAdd;
 const tasks_1 = require("@angular-devkit/schematics/tasks");
 // Just return the tree
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
 function ngAdd(_options) {
     return (tree, _context) => {
         _context.addTask(new tasks_1.NodePackageInstallTask());
         return tree;
     };
 }
-exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.map

package/schematics/ng-add/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ng-add/index.ts"],"names":[],"mappings":";;;AACA,4DAA0E;AAE1E,uBAAuB;AACvB,oJAAoJ;AACpJ,SAAgB,KAAK,CAAC,QAAa;IACjC,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,QAAQ,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AALD,sBAKC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ng-add/index.ts"],"names":[],"mappings":";;AAKA,sBAKC;AATD,4DAA0E;AAE1E,uBAAuB;AACvB,iGAAiG;AACjG,SAAgB,KAAK,CAAC,QAAa;IACjC,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,QAAQ,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}

package/schematics/shared/map-properties.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapProperties = void 0;
+exports.mapProperties = mapProperties;
 const pluralize = require("pluralize");
 const rules_1 = require("./rules");
 const excludedFields = ['createdBy', 'createdOnUtc', 'tenantId', 'updatedBy', 'updatedOnUtc'];
@@ -21,7 +21,6 @@ function mapProperties(properties, options, openApiComponent, openApiDoc) {
     }
     return { firstProperty, filteredProperties };
 }
-exports.mapProperties = mapProperties;
 function mapReferencedProperties(property, propertyKey, openApiComponent, openApiDoc) {
     var _a;
     const prop = openApiComponent.properties[propertyKey];
@@ -29,7 +28,7 @@ function mapReferencedProperties(property, propertyKey, openApiComponent, openAp
     if (propTypeNames) {
         const typeName = propTypeNames.pop() || '';
         property.propertyTypeName = typeName;
-        property.pluralizedPropertyTypeName = pluralize(typeName);
+        property.pluralizedPropertyTypeName = pluralize.plural(typeName);
         property.singularizedPropertyTypeName = pluralize.singular(typeName);
         const refComponent = openApiDoc.components.schemas[typeName];
         property.enum = refComponent.enum;

package/schematics/shared/map-properties.js.map

@@ -1 +1 @@
-{"version":3,"file":"map-properties.js","sourceRoot":"","sources":["../../../src/shared/map-properties.ts"],"names":[],"mappings":";;;AAAA,uCAAwC;AAGxC,mCAAgD;AAEhD,MAAM,cAAc,GAAG,CAAC,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;AAE9F,SAAgB,aAAa,CAAC,UAA4C,EAAE,OAAiB,EAAE,gBAAkC,EAAE,UAA2B;;IAC5J,IAAI,aAAuC,CAAC;IAC5C,MAAM,kBAAkB,GAAmB,EAAE,CAAC;IAC9C,KAAK,MAAM,WAAW,IAAI,UAAU,EAAE;QACpC,MAAM,gBAAgB,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;QACjD,IAAI,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,gBAAgB,CAAC,IAAI,KAAK,OAAO,EAAE;YAChF,MAAM,QAAQ,GAAG,IAAA,6BAAqB,EAAC,OAAO,EAAE,gBAAgB,kCAC3D,UAAU,CAAC,WAAW,CAAC,KAC1B,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,CAAC,MAAA,gBAAgB,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IACrE,CAAC;YAEH,uBAAuB,CAAC,QAAQ,EAAE,WAAW,EAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;YAC5E,IAAI,CAAC,aAAa,IAAI,WAAW,KAAK,IAAI,EAAE;gBAC1C,aAAa,GAAG,QAAQ,CAAC;aAC1B;YACD,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACnC;KACF;IACD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,CAAC;AAC/C,CAAC;AApBD,sCAoBC;AACD,SAAS,uBAAuB,CAAC,QAAsB,EAAE,WAAmB,EAAE,gBAAkC,EAAE,UAA2B;;IAC3I,MAAM,IAAI,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IACtD,MAAM,aAAa,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,0CAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/C,IAAI,aAAa,EAAE;QACjB,MAAM,QAAQ,GAAW,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;QACnD,QAAQ,CAAC,gBAAgB,GAAG,QAAQ,CAAC;QACrC,QAAQ,CAAC,0BAA0B,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC1D,QAAQ,CAAC,4BAA4B,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrE,MAAM,YAAY,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC7D,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC;QAClC,IAAI,QAAQ,CAAC,IAAI,EAAC;YAChB,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;YAC3D,QAAQ,CAAC,gBAAgB,GAAG,GAAG,QAAQ,CAAC,0BAA0B,IAAI,KAAK,EAAE,CAAA;SAC9E;KACF;AACH,CAAC"}
+{"version":3,"file":"map-properties.js","sourceRoot":"","sources":["../../../src/shared/map-properties.ts"],"names":[],"mappings":";;AAOA,sCAoBC;AA3BD,uCAAuC;AAGvC,mCAAgD;AAEhD,MAAM,cAAc,GAAG,CAAC,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;AAE9F,SAAgB,aAAa,CAAC,UAA4C,EAAE,OAAiB,EAAE,gBAAkC,EAAE,UAA2B;;IAC5J,IAAI,aAAuC,CAAC;IAC5C,MAAM,kBAAkB,GAAmB,EAAE,CAAC;IAC9C,KAAK,MAAM,WAAW,IAAI,UAAU,EAAE,CAAC;QACrC,MAAM,gBAAgB,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;QACjD,IAAI,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,gBAAgB,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACjF,MAAM,QAAQ,GAAG,IAAA,6BAAqB,EAAC,OAAO,EAAE,gBAAgB,kCAC3D,UAAU,CAAC,WAAW,CAAC,KAC1B,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,CAAC,MAAA,gBAAgB,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IACrE,CAAC;YAEH,uBAAuB,CAAC,QAAQ,EAAE,WAAW,EAAE,gBAAgB,EAAE,UAAU,CAAC,CAAC;YAC7E,IAAI,CAAC,aAAa,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;gBAC3C,aAAa,GAAG,QAAQ,CAAC;YAC3B,CAAC;YACD,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IACD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,CAAC;AAC/C,CAAC;AACD,SAAS,uBAAuB,CAAC,QAAsB,EAAE,WAAmB,EAAE,gBAAkC,EAAE,UAA2B;;IAC3I,MAAM,IAAI,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IACtD,MAAM,aAAa,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,0CAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/C,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,QAAQ,GAAW,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;QACnD,QAAQ,CAAC,gBAAgB,GAAG,QAAQ,CAAC;QACrC,QAAQ,CAAC,0BAA0B,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACjE,QAAQ,CAAC,4BAA4B,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrE,MAAM,YAAY,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC7D,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC;QAClC,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAClB,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;YAC3D,QAAQ,CAAC,gBAAgB,GAAG,GAAG,QAAQ,CAAC,0BAA0B,IAAI,KAAK,EAAE,CAAA;QAC/E,CAAC;IACH,CAAC;AACH,CAAC"}

package/schematics/shared/rules.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateFiles = exports.mapPropertyAttributes = exports.processOpenApiDoc = exports.getSwaggerDoc = void 0;
+exports.getSwaggerDoc = getSwaggerDoc;
+exports.processOpenApiDoc = processOpenApiDoc;
+exports.mapPropertyAttributes = mapPropertyAttributes;
+exports.generateFiles = generateFiles;
 const schematics_1 = require("@angular-devkit/schematics");
 const core_1 = require("@angular-devkit/core");
 const axios_1 = require("axios");
@@ -42,7 +45,6 @@ function getSwaggerDoc(options) {
         return (0, rxjs_1.of)(host);
     };
 }
-exports.getSwaggerDoc = getSwaggerDoc;
 function getFileNames(openApiJsonFileName) {
     const fileName = `${__dirname}/${openApiJsonFileName}`;
     if (fs.existsSync(fileName)) {
@@ -62,7 +64,7 @@ function processOpenApiDoc(data, options, host) {
     mappedProperties.filteredProperties.filter(f => f.$ref).forEach(property => {
         var _a;
         const componentName = (_a = property.$ref) === null || _a === void 0 ? void 0 : _a.split('/').pop();
-        const component = data.components.schemas[componentName || ''];
+        const component = data.components.schemas[componentName !== null && componentName !== void 0 ? componentName : ''];
         if (component) {
             property.properties = (0, map_properties_1.mapProperties)(component.properties, options, component, data).filteredProperties;
             property.firstProperty = property.properties.find(prop => { var _a; return ((_a = prop.name) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== 'id'; });
@@ -75,8 +77,8 @@ function processOpenApiDoc(data, options, host) {
     options.hasNullableDates = options.swaggerProperties.some(t => (t.format === 'date-time' || t.format === 'date') && !t.required);
     return host;
 }
-exports.processOpenApiDoc = processOpenApiDoc;
 function mapPropertyAttributes(options, source, dest) {
+    var _a;
     if (source.type === 'number' || source.type === 'integer') {
         dest.htmlInputType = 'number';
         dest.filterExpression = 'numeric';
@@ -97,7 +99,7 @@ function mapPropertyAttributes(options, source, dest) {
         dest.htmlInputType = 'object';
         dest.filterExpression = 'text';
         dest.$ref = source.$ref;
-        dest.pluralizedName = pluralize(dest.name || '', plural);
+        dest.pluralizedName = pluralize((_a = dest.name) !== null && _a !== void 0 ? _a : '', plural);
         dest.testFactoryValue = '{}';
     }
     else {
@@ -110,7 +112,6 @@ function mapPropertyAttributes(options, source, dest) {
     dest.startCaseName = _.startCase(dest.name);
     return dest;
 }
-exports.mapPropertyAttributes = mapPropertyAttributes;
 const singular = 1;
 const plural = 2;
 function generateFiles(options, templateType) {
@@ -142,5 +143,4 @@ function generateFiles(options, templateType) {
         return (0, schematics_1.chain)([(0, schematics_1.mergeWith)(templateSource)])(tree, context);
     };
 }
-exports.generateFiles = generateFiles;
 //# sourceMappingURL=rules.js.map

package/schematics/shared/rules.js.map

@@ -1 +1 @@
-{"version":3,"file":"rules.js","sourceRoot":"","sources":["../../../src/shared/rules.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rules.js","sourceRoot":"","sources":["../../../src/shared/rules.ts"],"names":[],"mappings":"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"}