@reldens/storage 0.50.0 → 0.51.0

package/lib/prisma/prisma-data-server.js

@@ -50,7 +50,7 @@ class PrismaDataServer extends BaseDataServer
         this.entities = {};
         for(let i of Object.keys(this.rawEntities)){
             let rawEntity = this.rawEntities[i];
-            let tableName = rawEntity.tableName.toString();
+            let tableName = rawEntity.tableName;
             let prismaModel = this.prisma[tableName];
             if(!prismaModel){
                 Logger.critical('Invalid raw entity "'+i+'". No matching Prisma model found for "'+tableName+'".');

package/lib/prisma/prisma-schema-generator.js

@@ -18,14 +18,17 @@ class PrismaSchemaGenerator
         this.debug = sc.get(props, 'debug', false);
         this.dataProxy = sc.get(props, 'dataProxy', false);
         this.checkInterval = sc.get(props, 'checkInterval', 1000);
+        this.maxWaitTime = sc.get(props, 'maxWaitTime', 30000);
         this.prismaSchemaPath = sc.get(props, 'prismaSchemaPath', FileHandler.joinPaths(process.cwd(), 'prisma'));
         this.schemaFilePath = FileHandler.joinPaths(this.prismaSchemaPath, 'schema.prisma');
+        this.clientOutputPath = sc.get(props, 'clientOutputPath', './prisma/client');
+        this.generateBinaryTargets = sc.get(props, 'generateBinaryTargets', ['native']);
     }
 
     async generate()
     {
         try {
-            FileHandler.createFolder(this.prismaSchemaPath, { recursive: true });
+            FileHandler.createFolder(this.prismaSchemaPath);
             this.generateSchemaFile();
             Logger.info('Running prisma introspect "npx prisma db pull"...');
             execSync('npx prisma db pull', { stdio: 'inherit' });
@@ -45,13 +48,20 @@ class PrismaSchemaGenerator
 
     async waitForSchemaGeneration()
     {
-        let generatedClientPath = FileHandler.joinPaths(this.prismaSchemaPath, '..', 'node_modules', '.prisma', 'client');
+        let generatedClientPath = FileHandler.joinPaths(this.prismaSchemaPath, this.clientOutputPath);
         let clientIndexPath = FileHandler.joinPaths(generatedClientPath, 'index.js');
+        let startTime = Date.now();
         return new Promise((resolve) => {
             let interval = setInterval(() => {
                 if(FileHandler.exists(clientIndexPath)){
                     clearInterval(interval);
                     resolve();
+                    return;
+                }
+                if(Date.now() - startTime > this.maxWaitTime){
+                    clearInterval(interval);
+                    Logger.warning('Schema generation wait timeout reached.');
+                    resolve();
                 }
             }, this.checkInterval);
         });
@@ -59,30 +69,80 @@ class PrismaSchemaGenerator
 
     generateSchemaFile()
     {
-        let datasourceProvider = 'mysql';
+        let datasourceProvider = this.getDatasourceProvider();
+        let schemaContent = this.buildSchemaContent(
+            datasourceProvider,
+            this.buildConnectionString(datasourceProvider),
+            this.buildDirectConnectionString(datasourceProvider)
+        );
+        FileHandler.writeFile(this.schemaFilePath, schemaContent);
+        Logger.info('Generated Prisma schema file at: '+this.schemaFilePath);
+    }
+
+    getDatasourceProvider()
+    {
         if('postgresql' === this.client || 'postgres' === this.client){
-            datasourceProvider = 'postgresql';
+            return 'postgresql';
         }
         if('mongodb' === this.client){
-            datasourceProvider = 'mongodb';
+            return 'mongodb';
         }
-        let connectionString = datasourceProvider + '://'
-            + this.config.user + ':' + this.config.password
-            + '@' + this.config.host + ':' + this.config.port + '/'
-            + this.config.database;
-        let schemaContent = `
-generator client {
-  provider = "prisma-client-js"
-  output   = "../node_modules/.prisma/client"
-}
+        return 'mysql';
+    }
 
-datasource db {
-  provider = "${datasourceProvider}"
-  url      = "${connectionString}"
-}
-`;
-        FileHandler.writeFile(this.schemaFilePath, schemaContent);
-        Logger.info('Generated Prisma schema file at: '+this.schemaFilePath);
+    buildConnectionString(datasourceProvider)
+    {
+        if(this.dataProxy){
+            datasourceProvider = 'prisma';
+        }
+        return datasourceProvider + this.buildConnectionDataString();
+    }
+
+    buildDirectConnectionString(datasourceProvider)
+    {
+        if(!this.dataProxy){
+            return '';
+        }
+        return datasourceProvider + this.buildConnectionDataString();
+    }
+
+    buildConnectionDataString()
+    {
+        return '://' + this.config.user + ':' + this.config.password
+            + '@' + this.config.host+':' + this.config.port
+            + '/' + this.config.database;
+    }
+
+    buildSchemaContent(datasourceProvider, connectionString, directConnectionString)
+    {
+        return this.buildGeneratorBlock() + '\n\n'
+            + this.buildDatasourceBlock(datasourceProvider, connectionString, directConnectionString) + '\n';
+    }
+
+    buildGeneratorBlock()
+    {
+        let generatorContent = 'generator client {\n';
+        generatorContent += '  provider = "prisma-client-js"\n';
+        generatorContent += '  output   = "' + this.clientOutputPath + '"\n';
+        if(0 < this.generateBinaryTargets.length){
+            generatorContent += '  binaryTargets = [' +
+                this.generateBinaryTargets.map(target => '"' + target + '"').join(', ')
+                + ']\n';
+        }
+        generatorContent += '}';
+        return generatorContent;
+    }
+
+    buildDatasourceBlock(datasourceProvider, connectionString, directConnectionString)
+    {
+        let datasourceContent = 'datasource db {\n';
+        datasourceContent += '  provider = "' + datasourceProvider + '"\n';
+        datasourceContent += '  url      = "' + connectionString + '"\n';
+        if('' !== directConnectionString){
+            datasourceContent += '  directUrl = "' + directConnectionString + '"\n';
+        }
+        datasourceContent += '}';
+        return datasourceContent;
     }
 
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/storage",
     "scope": "@reldens",
-    "version": "0.50.0",
+    "version": "0.51.0",
     "description": "Reldens - Storage",
     "author": "Damian A. Pastorini",
     "license": "MIT",