Skip to content

Commit

Permalink
v2.0.2 few optimizations for globalizeModels implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
izelnakri committed Feb 10, 2020
1 parent 46bb2ce commit ab60db8
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 6 deletions.
8 changes: 8 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
.circleci
.git
.prettierrc
.babelrc
.dockerignore
rollup.config.js
README.md
TODO
scripts
vendor
examples
node_modules
@ember
ember-inflector
src
Dockerfile

Empty file modified cli.sh
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion memserver-boilerplate/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Memserver from "memserver";
import Memserver from "memserver/server";
import initializer from "./initializer";
import routes from "./routes";

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "memserver",
"version": "2.0.0-alpha12",
"version": "2.0.2",
"description": "in-memory database/ORM and http mock server you can run in-browser and node environments. Built for large frontend teams, fast tests and rapid prototyping",
"author": "Izel Nakri",
"repository": {
Expand Down
11 changes: 8 additions & 3 deletions src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ declare global {
import chalk from "ansi-colors";
import { primaryKeyTypeSafetyCheck } from "./utils";
import FakeXMLHttpRequest from "fake-xml-http-request";
import Model from "./model";
import TargetModel from "./model";
import RouteRecognizer from "route-recognizer";
import "pretender"; // NOTE: check this
import "./pretender-hacks"; // NOTE: check this
Expand All @@ -27,25 +27,30 @@ interface MemserverOptions {
}

export default class Memserver {
Models = {};

constructor(options: MemserverOptions = { logging: true }) {
const initializer = options.initializer || async function() {};
const routes = options.routes || function() {};
const logging = options.hasOwnProperty("logging") ? options.logging : true;
const initializerReturn = initializer();
const Model = window.MemserverModel || TargetModel;

window.MemserverModel = Model;
window.MemServer = this;

if (initializerReturn instanceof Promise) {
initializerReturn.then(() => {
if (options.globalizeModels) {
Object.keys(Model._modelDefinitions).forEach((modelName) => {
window[modelName] = Model._modelDefinitions[modelName];
this.Models[modelName] = Model._modelDefinitions[modelName];
});
}
});
} else {
if (options.globalizeModels) {
Object.keys(Model._modelDefinitions).forEach((modelName) => {
window[modelName] = Model._modelDefinitions[modelName];
this.Models[modelName] = Model._modelDefinitions[modelName];
});
}
}
Expand Down

0 comments on commit ab60db8

Please sign in to comment.