From 8db92d4d7edbaf9065c751c7cdf8a581bf64e99a Mon Sep 17 00:00:00 2001 From: Robert Almalak Date: Thu, 21 Mar 2019 12:29:45 -0700 Subject: [PATCH] removed lodash --- main.js | 3 --- package-lock.json | 15 +++------------ package.json | 20 ++++++++++++++------ typeScriptCodeGenerator.js | 34 +++++++++++++++------------------- 4 files changed, 32 insertions(+), 40 deletions(-) diff --git a/main.js b/main.js index 77175f7..8f8a23d 100644 --- a/main.js +++ b/main.js @@ -1,9 +1,6 @@ const typeScriptCodeGenerator = require("./typeScriptCodeGenerator") function _handleGen(base, path, options) { - console.log('this is a test'); - - // window.alert('Hello World!'); // If options is not passed, get from preference options = options || getGenOptions() diff --git a/package-lock.json b/package-lock.json index 3b82f74..91a2eb9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,5 @@ { - "name": "robertalmalak.typescript", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", - "dev": true - } - } + "name": "robertalmalak.staruml-typescript", + "version": "0.2.0", + "lockfileVersion": 1 } diff --git a/package.json b/package.json index 1203b54..03f2f90 100644 --- a/package.json +++ b/package.json @@ -4,18 +4,26 @@ "description": "TypeScript code generation", "homepage": "https://github.com/qwin/staruml-typescript", "issues": "https://github.com/qwin/staruml-typescript/issues", + "repository": { + "type": "git", + "url": "https://github.com/qwin/staruml-typescript.git" + }, "version": "0.2.0", - "keywords": ["TypeScript", "ts", "UML", "staruml"], + "keywords": [ + "TypeScript", + "ts", + "UML", + "staruml" + ], "author": { "name": "Robert Al Malak", "email": "robertalmalak7@gmail.com", "url": "https://github.com/qwin" }, - "license": "GPLv3", + "license": "GPL-3.0", "engines": { "staruml": ">=3.0.0" }, - "devDependencies": { - "lodash": "^4.17.11" - } -} + "devDependencies": {}, + "dependencies": {} +} \ No newline at end of file diff --git a/typeScriptCodeGenerator.js b/typeScriptCodeGenerator.js index a36128e..49e7603 100755 --- a/typeScriptCodeGenerator.js +++ b/typeScriptCodeGenerator.js @@ -5,8 +5,6 @@ const CodeWriter = require("./CodeGenUtils") var path = require('path'); var fs = require('fs'); -var _ = require('lodash'); - class TypeScriptCodeGenerator { /** @@ -147,7 +145,7 @@ class TypeScriptCodeGenerator { writeNamespace(writeFunction, codeWriter, elem, options) { var path = null; if (elem._parent) { - path = _.map(elem._parent.getPath(this.baseModel), function (e) { + path = elem._parent.getPath(this.baseModel).map(function (e) { return e.name; }).join("."); } @@ -228,9 +226,7 @@ class TypeScriptCodeGenerator { // Extends var _extends = this.getSuperClasses(elem); if (_extends.length > 0) { - terms.push("extends " + _.map(_extends, function (e) { - return e.name; - }).join(", ")); + terms.push("extends " + _extends.map(function (e) { return e.name }).join(', ')) } codeWriter.writeLine(terms.join(" ") + " {"); codeWriter.writeLine(); @@ -306,7 +302,7 @@ class TypeScriptCodeGenerator { // Modifiers var _modifiers = this.getModifiers(elem); - if (_.some(elem.operations, function (op) { + if (elem.operations.some(function (op) { return op.isAbstract === true; })) { _modifiers.push("abstract"); @@ -333,11 +329,11 @@ class TypeScriptCodeGenerator { var _implements = this.getSuperInterfaces(elem); if (_implements.length > 0) { if (_extends.length > 0) { - terms.push(", " + _.map(_implements, function (e) { + terms.push(", " + _implements.map(function (e) { return e.name; }).join(", ")); } else { - terms.push("implements " + _.map(_implements, function (e) { + terms.push("implements " + _implements.map(function (e) { return e.name; }).join(", ")); } @@ -428,7 +424,7 @@ class TypeScriptCodeGenerator { // Modifiers // var _modifiers = this.getModifiers(elem); - // if (_.some(elem.operations, function(op) { + // if (elem.operations.some(function(op) { // return op.isAbstract === true; // })) { // _modifiers.push("abstract"); @@ -451,11 +447,11 @@ class TypeScriptCodeGenerator { var _implements = this.getSuperInterfaces(elem); if (_implements.length > 0) { if (_extends.length > 0) { - terms.push(", " + _.map(_implements, function (e) { + terms.push(", " + _implements.map(function (e) { return e.name; }).join(", ")); } else { - terms.push("implements " + _.map(_implements, function (e) { + terms.push("implements " + _implements.map(function (e) { return e.name; }).join(", ")); } @@ -541,7 +537,7 @@ class TypeScriptCodeGenerator { // doc var doc = elem.documentation.trim(); - _.each(params, function (param) { + params.forEach(function (param) { doc += "\n@param " + param.name + " " + param.documentation; }); if (returnParam) { @@ -581,7 +577,7 @@ class TypeScriptCodeGenerator { } // body - if (skipBody === true || _.contains(_modifiers, "abstract")) { + if (skipBody === true || _modifiers.includes("abstract")) { codeWriter.writeLine(terms.join(" ") + ";"); } else { codeWriter.writeLine(terms.join(" ") + " {"); @@ -640,7 +636,7 @@ class TypeScriptCodeGenerator { } else { if (elem.type instanceof type.UMLModelElement && elem.type.name.length > 0) { _type = elem.type.name; - } else if (_.isString(elem.type) && elem.type.length > 0) { + } else if ((typeof elem.type === 'string') && elem.type.length > 0) { _type = elem.type; } } @@ -648,7 +644,7 @@ class TypeScriptCodeGenerator { // multiplicity if (elem.multiplicity) { - if (_.contains(["0..*", "1..*", "*"], elem.multiplicity.trim())) { + if (["0..*", "1..*", "*"].includes(elem.multiplicity.trim())) { if (elem.isOrdered === true) { _type = "List<" + _type + ">"; } else { @@ -731,7 +727,7 @@ class TypeScriptCodeGenerator { */ writeDoc(codeWriter, text, options) { var i, len, lines; - if (options.tsDoc && _.isString(text)) { + if (options.tsDoc && (typeof text === 'string')) { console.log("write Doc"); lines = text.trim().split("\n"); codeWriter.writeLine("/**"); @@ -800,7 +796,7 @@ class TypeScriptCodeGenerator { var generalizations = app.repository.getRelationshipsOf(elem, function (rel) { return (rel instanceof type.UMLGeneralization && rel.source === elem); }); - return _.map(generalizations, function (gen) { + return generalizations.map(function (gen) { return gen.target; }); }; @@ -814,7 +810,7 @@ class TypeScriptCodeGenerator { var realizations = app.repository.getRelationshipsOf(elem, function (rel) { return (rel instanceof type.UMLInterfaceRealization && rel.source === elem); }); - return _.map(realizations, function (gen) { + return realizations.map(function (gen) { return gen.target; }); };