merge v0.20.0

Author: etsuo

.idea/runConfigurations/Debug_Server_Tests.xml

@@ -1,6 +1,6 @@
 {
   "name": "@sakuraapi/core",
-  "version": "0.19.5",
+  "version": "0.20.0",
   "description": "MongoDB and TypeScript MEAN Stack Framework for NodeJS",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -15,7 +15,6 @@
     "docs:generate": "./scripts/docs:generate.sh",
     "docs:publish": "./scripts/docs:publish.sh",
     "docs:serve": "./scripts/docs:serve.sh",
-    "docker:compose-test": "./scripts/docker:compose-test.sh",
     "install": "chmod +x scripts/*.* || true",
     "lint": "./scripts/lint.sh",
     "prepublish": "npm test && npx nsp check",
@@ -70,7 +69,7 @@
     "supertest": "^3.1.0",
     "tslint": "^5.11.0",
     "typedoc": "^0.11.1",
-    "typescript": "^2.9.2"
+    "typescript": "^3.0.3"
   },
   "dependencies": {
     "bcrypt": "^3.0.0",

package-lock.json

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+PROJECT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+PROJECT_NAME="$(basename ${PROJECT_DIR})"
+
+function compose {
+  docker-compose --project-name ${PROJECT_NAME} --file ${COMPOSE_FILE} $@
+}
+
+function down {
+  compose down --remove-orphans
+  docker volume prune -f || echo "skipped docker volume prune"
+}
+
+function pull {
+  local services
+  local remoteServices
+  services=$(compose config --services)
+  remoteServices=""
+  for service in ${services[@]}; do
+    if [[ ${service} != local-* ]]; then
+      remoteServices+=" $service"
+    fi
+  done
+
+  compose pull --parallel ${remoteServices}
+}
+
+
+function saveVersion {
+  cat package.json \
+    | grep version \
+    | head -1 \
+    | awk -F: '{ print $2 }' \
+    | sed 's/[",]//g' \
+    | tr -d '[[:space:]]' > ./lib/version
+}
+
+function updateStart {
+  echo
+  echo "🚀  starting $0"
+}
+
+function update {
+  echo "✔  $1"
+}
+
+function updateDone {
+  echo "☘  $0 done"
+  echo
+}

package.json

@@ -1,7 +1,20 @@
 #!/usr/bin/env bash
 
-set -ex
+set -e
 
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+. ${DIR}/_functions.sh
+
+updateStart
+
+update "removing lib"
 rm -rf lib/
+
+update "compiling typescript"
 npx tsc
+
+update "syncing assets"
 rsync -r --exclude=*.ts spec/ lib/spec
+
+update "saving version"
+saveVersion

scripts/_functions.sh

@@ -1,8 +1,23 @@
 #!/usr/bin/env bash
 
-set -ex
-npm run docker:compose-test
-npm run build
+set -e
+
+COMPOSE_FILE="./docker-compose.yml"
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+. ${DIR}/_functions.sh
+
+updateStart
+
+update "starting mongodb"
+trap down EXIT
+compose up -d
+
+npm run build test
+
+update "starting istanbul"
 npx istanbul cover --include-all-sources node_modules/jasmine/bin/jasmine.js
-docker-compose down
+
+update "opening report"
 (open coverage/lcov-report/index.html || echo '')
+
+updateDone

scripts/build.sh

@@ -1,3 +1,13 @@
 #!/usr/bin/env bash
 
+set -e
+
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+. ${DIR}/_functions.sh
+
+updateStart
+
+update "starting tslint"
 npx tslint -t stylish -c tslint.json -p tsconfig.json
+
+updateDone

scripts/coverage.sh

@@ -1,13 +1,34 @@
 #!/usr/bin/env bash
 
-set -ex
+set -e
 
-TEST_TYPE=${1:-clearDb}
+TEST_TYPE=${1:-"clearDb"}
 
-npm run docker:compose-test
-npm run build
-npx jasmine || ((say 'fail' || echo 'fail') ; exit 1)
+COMPOSE_FILE="./docker-compose.yml"
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+. ${DIR}/_functions.sh
+
+updateStart
+
+npm run build test
+
+if [ "$1" == "webstorm-debug" ]; then
+
+  update "starting MongoDB"
+  down
+  compose up -d
+
+else
+
+  update "starting MongoDB"
+  if [ "$1" != "saveDb" ]; then
+    trap down EXIT
+  fi
+  compose up -d
+
+  update "starting jasmine"
+  npx jasmine
 
-if [ $TEST_TYPE != "saveDb" ]; then
-  docker-compose down
 fi
+
+updateDone

scripts/docker:compose-test.sh

@@ -40,6 +40,19 @@ describe('@Id', () => {
     });
   });
 
+  it('allows default ID on instantiation', () => {
+
+    @Model()
+    class DefaultValue extends SapiModelMixin() {
+      @Id()
+      id: ObjectID = new ObjectID();
+    }
+
+    const result = new DefaultValue();
+    expect(result.id).toBeDefined();
+
+  });
+
   describe('@Db', () => {
     it('maps fromDb', () => {
       const id = new ObjectID();