File tree 2 files changed +26
-2
lines changed
packages/cli/generators/repository
templates/src/repositories
2 files changed +26
-2
lines changed Original file line number Diff line number Diff line change @@ -376,6 +376,13 @@ module.exports = class RepositoryGenerator extends ArtifactGenerator {
376
376
subdirectory ,
377
377
'model' ,
378
378
) ;
379
+ const subdir = subdirectory . split ( 'models' ) [ 1 ] ;
380
+ if ( ! this . artifactInfo . modelSubDirs ) {
381
+ this . artifactInfo . modelSubDirs = { } ;
382
+ }
383
+ subdirectoryModelList . forEach ( model => {
384
+ this . artifactInfo . modelSubDirs [ model ] = subdir ;
385
+ } ) ;
379
386
modelList = modelList . concat ( subdirectoryModelList ) ;
380
387
} catch ( err ) {
381
388
console . error (
@@ -584,6 +591,15 @@ module.exports = class RepositoryGenerator extends ArtifactGenerator {
584
591
this . artifactInfo . modelName ,
585
592
) ;
586
593
594
+ const outFile = `${
595
+ this . artifactInfo . modelSubDirs [
596
+ this . artifactInfo . modelName || this . artifactInfo . name
597
+ ]
598
+ } /${ this . artifactInfo . outFile } `;
599
+ if ( ! outFile . includes ( 'undefined' ) ) {
600
+ this . artifactInfo . outFile = outFile . slice ( 1 , outFile . length ) ;
601
+ }
602
+
587
603
this . artifactInfo . indexesToBeUpdated . push ( {
588
604
dir : this . artifactInfo . outDir ,
589
605
file : this . artifactInfo . outFile ,
Original file line number Diff line number Diff line change @@ -2,8 +2,16 @@ import {inject} from '@loopback/core';
2
2
<% if (isRepositoryBaseBuiltin) { -% >
3
3
import {<%= repositoryTypeClass %>} from ' @loopback/repository' ;
4
4
< % } - %>
5
- import {<%= dataSourceClassName %> } from '../datasources';
6
- import {<%= modelName %> , <%= modelName %> Relations} from '../models';
5
+ <% if (modelSubDirs[modelName]) { -% >
6
+ import {<%= dataSourceClassName %>} from ' ../../datasources' ;
7
+ import {<%= modelName %>, <%= modelName %>Relations } from ' ../../models' ;
8
+ < % } - %>
9
+
10
+ <% if (! modelSubDirs[modelName]) { -% >
11
+ import {<%= dataSourceClassName %>} from ' ../datasources' ;
12
+ import {<%= modelName %>, <%= modelName %>Relations } from ' ../models' ;
13
+ < % } - %>
14
+
7
15
<% if ( ! isRepositoryBaseBuiltin ) { -% >
8
16
import {<%=repositoryBaseClass %>} from ' ./<%=repositoryBaseFile %>' ;
9
17
< % } - %>
You can’t perform that action at this time.
0 commit comments