grunt-generate-database - npm Package Compare versions

Comparing version 0.0.32 to 0.0.33

dist/src/tasks/createDbScripts.js

@@ -16,2 +16,5 @@ "use strict";
 };
+const replaceLinuxSlashToCommonFromPath = (path) => {
+    return path.split("\\").join("/");
+};
 function createFile(rendererTemplate, pathToWrapper, declarationName, namespace, filename) {
@@ -52,2 +55,3 @@ if (rendererTemplate && rendererTemplate.trim()) {
         default:
+            console.warn(`${db} has no supported functions to create triggers(available 'mssql', 'postgres')`);
             break;
@@ -86,7 +90,10 @@ }
                         }
-                        if (dec.name === shared_1.DecoratorsName.GenerateHistory && _class.name.toLowerCase() === table.modelName.toLowerCase()) {
-                            const historyPath = dec.arguments[0].valueOf()["historyPath"];
-                            const classFirstChar = _class.name.charAt(0).toLowerCase();
-                            table.historyPath = `${historyPath}/${classFirstChar}${_class.name.slice(1)}`;
+                        const isClassNameIsEqualTableModelName = _class.name.toLowerCase() === table.modelName.toLowerCase();
+                        const needToAddHistoryPathToTable = dec.name === shared_1.DecoratorsName.GenerateHistory && isClassNameIsEqualTableModelName;
+                        if (!needToAddHistoryPathToTable) {
+                            return;
                         }
+                        const historyPath = dec.arguments[0].valueOf()["historyPath"];
+                        const classFirstChar = _class.name.charAt(0).toLowerCase();
+                        table.historyPath = `${historyPath}/${classFirstChar}${_class.name.slice(1)}`;
                     });
@@ -107,7 +114,11 @@ });
             schms[innerIndex].tables.forEach(table => {
-                let tmpPathtoDBWrappers = declarations[index].pathToDBWrappers + "/" + declarations[index].name + "/" + schms[innerIndex].namespace;
+                const { pathToDBWrappers, name } = declarations[index];
+                const baseNamespace = schms[innerIndex].namespace;
+                let tmpPathtoDBWrappers = `${pathToDBWrappers}/${name}/${baseNamespace}`;
                 if (table.historyPath) {
-                    table.historyPath = path.relative(tmpPathtoDBWrappers, table.historyPath).split("\\").join("/");
+                    const historyPath = path.relative(tmpPathtoDBWrappers, table.historyPath);
+                    table.historyPath = replaceLinuxSlashToCommonFromPath(historyPath);
                 }
-                table.pathToModel = path.relative(tmpPathtoDBWrappers, table.pathToModel).split("\\").join("/");
+                const pathToModel = path.relative(tmpPathtoDBWrappers, table.pathToModel);
+                table.pathToModel = replaceLinuxSlashToCommonFromPath(pathToModel);
             });
@@ -114,0 +125,0 @@ const json = ts_file_parser_1.parseStruct(stringFile, {}, shared_1.emptyString);

package.json

 {
   "name": "grunt-generate-database",
-  "version": "0.0.32",
+  "version": "0.0.33",
   "description": "Grunt task for create database generation scripts by models description",
@@ -5,0 +5,0 @@ "private": false,

src/index.ts

 import {CreateDbSCriptsInternal} from "./tasks/createDbScripts";
-import {Options} from "./tasks/model/options";
 
 export function CreateDbSCripts(): void {
     CreateDbSCriptsInternal();
-
 }
-
-
-

src/tasks/createDbScripts.ts

@@ -31,2 +31,6 @@ import "reflect-metadata";
 
+const replaceLinuxSlashToCommonFromPath = (path: string) => {
+    return path.split("\\").join("/");
+};
+
 function createFile(rendererTemplate: string, pathToWrapper: string, declarationName: string, namespace: string, filename: string) {
@@ -113,2 +117,3 @@ if (rendererTemplate && rendererTemplate.trim()) {
         default:
+            console.warn(`${db} has no supported functions to create triggers(available 'mssql', 'postgres')`);
             break;
@@ -156,7 +161,10 @@ }
                         }
-                        if (dec.name === DecoratorsName.GenerateHistory && _class.name.toLowerCase() === table.modelName.toLowerCase()) {
-                            const historyPath = dec.arguments[0].valueOf()["historyPath"];
-                            const classFirstChar = _class.name.charAt(0).toLowerCase();
-                            table.historyPath = `${historyPath}/${classFirstChar}${_class.name.slice(1)}`;
+                        const isClassNameIsEqualTableModelName = _class.name.toLowerCase() === table.modelName.toLowerCase();
+                        const needToAddHistoryPathToTable = dec.name === DecoratorsName.GenerateHistory && isClassNameIsEqualTableModelName;
+                        if (!needToAddHistoryPathToTable) {
+                            return;
                         }
+                        const historyPath = dec.arguments[0].valueOf()["historyPath"];
+                        const classFirstChar = _class.name.charAt(0).toLowerCase();
+                        table.historyPath = `${historyPath}/${classFirstChar}${_class.name.slice(1)}`;
                     });
@@ -178,7 +186,11 @@ });
             schms[innerIndex].tables.forEach(table => {
-                let tmpPathtoDBWrappers = declarations[index].pathToDBWrappers + "/" + declarations[index].name + "/" + schms[innerIndex].namespace;
+                const {pathToDBWrappers, name} = declarations[index];
+                const baseNamespace = schms[innerIndex].namespace;
+                let tmpPathtoDBWrappers = `${pathToDBWrappers}/${name}/${baseNamespace}`;
                 if (table.historyPath) {
-                    table.historyPath = path.relative(tmpPathtoDBWrappers, table.historyPath).split("\\").join("/");
+                    const historyPath = path.relative(tmpPathtoDBWrappers, table.historyPath);
+                    table.historyPath = replaceLinuxSlashToCommonFromPath(historyPath);
                 }
-                table.pathToModel = path.relative(tmpPathtoDBWrappers, table.pathToModel).split("\\").join("/");
+                const pathToModel = path.relative(tmpPathtoDBWrappers, table.pathToModel);
+                table.pathToModel = replaceLinuxSlashToCommonFromPath(pathToModel);
             });
@@ -185,0 +197,0 @@ const json = parseStruct(stringFile, {}, emptyString);

tasks/createDbScripts.js

@@ -16,2 +16,5 @@ "use strict";
 };
+const replaceLinuxSlashToCommonFromPath = (path) => {
+    return path.split("\\").join("/");
+};
 function createFile(rendererTemplate, pathToWrapper, declarationName, namespace, filename) {
@@ -52,2 +55,3 @@ if (rendererTemplate && rendererTemplate.trim()) {
         default:
+            console.warn(`${db} has no supported functions to create triggers(available 'mssql', 'postgres')`);
             break;
@@ -86,7 +90,10 @@ }
                         }
-                        if (dec.name === shared_1.DecoratorsName.GenerateHistory && _class.name.toLowerCase() === table.modelName.toLowerCase()) {
-                            const historyPath = dec.arguments[0].valueOf()["historyPath"];
-                            const classFirstChar = _class.name.charAt(0).toLowerCase();
-                            table.historyPath = `${historyPath}/${classFirstChar}${_class.name.slice(1)}`;
+                        const isClassNameIsEqualTableModelName = _class.name.toLowerCase() === table.modelName.toLowerCase();
+                        const needToAddHistoryPathToTable = dec.name === shared_1.DecoratorsName.GenerateHistory && isClassNameIsEqualTableModelName;
+                        if (!needToAddHistoryPathToTable) {
+                            return;
                         }
+                        const historyPath = dec.arguments[0].valueOf()["historyPath"];
+                        const classFirstChar = _class.name.charAt(0).toLowerCase();
+                        table.historyPath = `${historyPath}/${classFirstChar}${_class.name.slice(1)}`;
                     });
@@ -107,7 +114,11 @@ });
             schms[innerIndex].tables.forEach(table => {
-                let tmpPathtoDBWrappers = declarations[index].pathToDBWrappers + "/" + declarations[index].name + "/" + schms[innerIndex].namespace;
+                const { pathToDBWrappers, name } = declarations[index];
+                const baseNamespace = schms[innerIndex].namespace;
+                let tmpPathtoDBWrappers = `${pathToDBWrappers}/${name}/${baseNamespace}`;
                 if (table.historyPath) {
-                    table.historyPath = path.relative(tmpPathtoDBWrappers, table.historyPath).split("\\").join("/");
+                    const historyPath = path.relative(tmpPathtoDBWrappers, table.historyPath);
+                    table.historyPath = replaceLinuxSlashToCommonFromPath(historyPath);
                 }
-                table.pathToModel = path.relative(tmpPathtoDBWrappers, table.pathToModel).split("\\").join("/");
+                const pathToModel = path.relative(tmpPathtoDBWrappers, table.pathToModel);
+                table.pathToModel = replaceLinuxSlashToCommonFromPath(pathToModel);
             });
@@ -114,0 +125,0 @@ const json = ts_file_parser_1.parseStruct(stringFile, {}, shared_1.emptyString);

No alert changes

Improved metrics

Total package byte prevSize

204205

1.77%

Lines of code

4712

0.68%

No dependency changes