diff --git a/package.json b/package.json index 49893b1..2133daa 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,6 @@ }, "homepage": "https://github.com/lucaspalomodevelop/JSSTE#readme", "dependencies": { - "typechecker": "^7.18.0" }, "engines": { "node": ">= 0.10.0" diff --git a/src/engine.js b/src/engine.js index 0d0f97a..804d4e3 100644 --- a/src/engine.js +++ b/src/engine.js @@ -1,5 +1,4 @@ const fs = require("fs"); -const checker = require("typechecker"); const path = require("path"); const jsonmerger = require("./jsonMerger"); //let appdir = path.join(__dirname, ".."); @@ -32,7 +31,7 @@ app.render = function (pagecode, templatecode) { app.setState({ status: 0, statusMSG: "Render Page" }); if ( (pagecode != null || pagecode != undefined) && - checker.isString(pagecode) + (typeof pagecode === 'string') ) { pagecode = JSON.parse(pagecode); app.setState({ status: 0, statusMSG: "Parse Pagecode" }); diff --git a/src/jsonMerger.js b/src/jsonMerger.js index e73d9f3..6159233 100644 --- a/src/jsonMerger.js +++ b/src/jsonMerger.js @@ -1,12 +1,10 @@ -const checker = require("typechecker"); - function mergeJson(org, ext) { // let placeholder = undefined; - if (!checker.isObject(org)) { + if (!(typeof org === 'object' && org !== null)) { org = JSON.parse(org); } - if (!checker.isObject(ext)) { + if (!(typeof ext === 'object' && ext !== null)) { ext = JSON.parse(ext); }