Resolve build issues with json imports

Author: ollwells

projects/ionic-typeorm/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rareloop/ionic-typeorm",
-    "version": "0.0.8",
+    "version": "0.0.15",
     "description": "",
     "license": "MIT",
     "author": "Rareloop",
@@ -13,12 +13,10 @@
         "url": "https://github.com/Rareloop/ionic-typeorm/issues"
     },
     "peerDependencies": {
-        "@angular/common": "^11",
-        "@angular/core": "^11",
-        "typeorm": "^0.2",
-        "sql.js": "^1.5"
-    },
-    "devDependencies": {
+        "@angular/common": "^11.0.9",
+        "@angular/core": "^11.0.9",
+        "typeorm": "^0.2.31",
+        "sql.js": "^1.5.0",
         "@angular-builders/custom-webpack": "^11"
     },
     "bin": {

projects/ionic-typeorm/src/lib/entities/index.ts

@@ -0,0 +1 @@
+export * from './common-entity';

projects/ionic-typeorm/src/lib/index.ts

@@ -1,6 +1,5 @@
 export * from './connection';
-export * from './entities/common-entity';
-export * from './seeds/orm-seeder.seeder';
-export * from './services/db-service';
-export * from './services/orm-service.service';
-export * from './test/type-orm-test-utils';
+export * from './entities';
+export * from './seeds';
+export * from './services';
+export * from './test';

projects/ionic-typeorm/src/lib/seeds/index.ts

@@ -0,0 +1 @@
+export * from './orm-seeder.seeder';

projects/ionic-typeorm/src/lib/services/index.ts

@@ -0,0 +1,3 @@
+export * from './db-service';
+export * from './orm-service.service';
+export * from './orm-database.service';

projects/ionic-typeorm/src/lib/services/orm-service.service.spec.ts

@@ -8,6 +8,7 @@ import { expectedAllTestItems } from '../test/orm/test-expected-data';
 import { ITypeOrmConnection } from 'dist/ionic-typeorm/lib';
 import { castTestItem } from '../test/orm/test-interfaces';
 import { IsNull, MoreThan, Not } from 'typeorm';
+import { SEED_DATA } from '../test/orm/test-seed-data';
 
 describe('OrmService', () => {
     let service: TestItemService;
@@ -17,7 +18,7 @@ describe('OrmService', () => {
 
     beforeAll(async () => {
         conn = getTypeOrmConnection('test-app-db', TYPE_ORM_TEST_ENTITIES, TYPE_ORM_TEST_MIGRATIONS);
-        utils = new TypeOrmTestUtils(conn, 'orm/fixtures/');
+        utils = new TypeOrmTestUtils(conn, SEED_DATA);
         await utils.openDbConnection(['warn', 'error']); // , 'query', 'schema', 'all']);
     });
 

projects/ionic-typeorm/src/lib/test/index.ts

@@ -0,0 +1 @@
+export * from './type-orm-test-utils';

projects/ionic-typeorm/src/lib/test/orm/fixtures/testitem.json

@@ -0,0 +1,21 @@
+export const SEED_DATA = {
+    testitem: {
+        items: [
+            {
+                name: 'Jack Smith',
+                age: 34,
+                phoneNumber: null,
+            },
+            {
+                name: 'Jack MacDonald',
+                age: 51,
+                phoneNumber: '012345678910',
+            },
+            {
+                name: 'James Bond',
+                age: 25,
+                phoneNumber: '007',
+            },
+        ],
+    },
+};

projects/ionic-typeorm/src/lib/test/orm/test-seed-data.ts

@@ -1,5 +1,5 @@
-import { IOrmDatabaseEntity, OrmDatabaseService } from '../services/orm-database.service';
 import { ITypeOrmConnection } from '../connection';
+import { IOrmDatabaseEntity, OrmDatabaseService } from '../services';
 
 /**
  * This class is used to support TypeORM database testing
@@ -13,7 +13,7 @@ export class TypeOrmTestUtils {
     /**
      * Creates an instance of TestUtils
      */
-    constructor(conn: ITypeOrmConnection, private fixtureDir = 'fixtures/') {
+    constructor(conn: ITypeOrmConnection, private fixtureData: { [key: string]: { items: any[] } }) {
         this.databaseService = new OrmDatabaseService(conn);
     }
 
@@ -87,19 +87,13 @@ export class TypeOrmTestUtils {
     }
 
     private async getEntityMockData(name: string): Promise<{ items: any[] }> {
-        let data: { default: { items: any[] } } = { default: { items: [] } };
-        const fixtureFile = this.fixtureDir + `${name.toLowerCase()}.json`;
+        let data: { items: any[] } = { items: [] };
         try {
-            data = await this.loadMockData(fixtureFile);
+            data = this.fixtureData[name.toLowerCase()];
         } catch (e) {
-            console.warn('Fixture not loaded: ' + fixtureFile);
+            console.warn('Fixture not loaded: ' + name.toLowerCase());
             // If no data, do nothing
         }
-        return data.default;
-    }
-
-    private async loadMockData(filename: string): Promise<any> {
-        const json = await import('./' + filename);
-        return json;
+        return data;
     }
 }