update examples to use objection 3

koskimas · koskimas · commit 2dda08390a6e · 2021-11-09T15:24:07.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@ node_modules
 scratchpad.js
 testCoverage
 examples/*/*.db
-examples/express-es7/build
+examples/*/dist
 examples/**/package-lock.json
 *.iml
 *.DS_Store
diff --git a/examples/koa-ts/api.ts b/examples/koa-ts/api.ts
@@ -73,7 +73,7 @@ export default (router: KoaRouter) => {
     }
 
     if (ctx.query.orderBy) {
-      query.orderBy(ctx.query.orderBy)
+      query.orderBy(takeFirst(ctx.query.orderBy))
     }
 
     if (ctx.query.withPetCount) {
@@ -239,3 +239,7 @@ export default (router: KoaRouter) => {
     ctx.body = actors
   })
 }
+
+function takeFirst<T>(item: T | ReadonlyArray<T>): T {
+  return Array.isArray(item) ? item[0] : item
+}
diff --git a/examples/koa-ts/app.ts b/examples/koa-ts/app.ts
@@ -37,7 +37,7 @@ app.listen(port, () => {
 async function errorHandler(ctx: Context, next: () => Promise<any>) {
   try {
     await next()
-  } catch (err) {
+  } catch (err: any) {
     if (err instanceof ValidationError) {
       ctx.status = 400
       ctx.body = {
diff --git a/examples/koa-ts/client.js b/examples/koa-ts/client.js
@@ -40,7 +40,11 @@ const req = axios.create({
   await addPersonToMovieAsActor(departed, matt)
   await removePersonFromMovie(departed, matt)
 })().catch((err) => {
-  console.error('error:', err.response.status, err.response.data)
+  if (err.response) {
+    console.error('error:', err.response.status, err.response.data)
+  } else {
+    console.error('error:', err)
+  }
 })
 
 async function inserPersonWithRelations() {
diff --git a/examples/koa-ts/package.json b/examples/koa-ts/package.json
@@ -1,11 +1,11 @@
 {
-  "name": "objection-example-koa",
-  "version": "2.0.0",
-  "description": "Objection.js koa example",
+  "name": "objection-example-koa-ts",
+  "version": "3.0.0",
+  "description": "Objection.js koa typescript example",
   "main": "app.js",
   "scripts": {
     "migrate": "knex migrate:latest",
-    "start": "npm run migrate && ts-node app"
+    "start": "npm run migrate && rm -rf dist && tsc && node dist/app.js"
   },
   "engines": {
     "node": ">=8.0.0"
@@ -14,18 +14,17 @@
   "license": "MIT",
   "dependencies": {
     "axios": "^0.19.0",
-    "knex": "^0.20.3",
+    "knex": "^0.95.13",
     "koa": "^2.11.0",
     "koa-bodyparser": "^4.2.1",
     "koa-router": "^7.4.0",
-    "objection": "^2.1.0",
-    "sqlite3": "^4.1.0"
+    "objection": "^3.0.0-rc.4",
+    "sqlite3": "^5.0.2"
   },
   "devDependencies": {
     "@types/koa": "^2.11.0",
     "@types/koa-bodyparser": "^4.3.0",
     "@types/koa-router": "^7.0.42",
-    "ts-node": "^8.5.4",
-    "typescript": "3.7.2"
+    "typescript": "4.4.4"
   }
 }
diff --git a/examples/koa-ts/tsconfig.json b/examples/koa-ts/tsconfig.json
@@ -14,6 +14,6 @@
     "allowJs": true,
     "target": "esnext",
     "rootDir": "./",
-    "outDir": "lib"
+    "outDir": "dist"
   }
 }
diff --git a/examples/koa/package.json b/examples/koa/package.json
@@ -1,6 +1,6 @@
 {
   "name": "objection-example-koa",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Objection.js koa example",
   "main": "app.js",
   "scripts": {
@@ -14,11 +14,11 @@
   "license": "MIT",
   "dependencies": {
     "axios": "^0.19.0",
-    "knex": "^0.20.3",
+    "knex": "^0.95.13",
     "koa": "^2.11.0",
     "koa-bodyparser": "^4.2.1",
     "koa-router": "^7.4.0",
-    "objection": "^2.1.0",
-    "sqlite3": "^4.1.0"
+    "objection": "3.0.0-rc.4",
+    "sqlite3": "^5.0.2"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ export default (router: KoaRouter) => {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`if (ctx.query.orderBy) {`
`76`		`- query.orderBy(ctx.query.orderBy)`
	`76`	`+ query.orderBy(takeFirst(ctx.query.orderBy))`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`if (ctx.query.withPetCount) {`
`@@ -239,3 +239,7 @@ export default (router: KoaRouter) => {`
`239`	`239`	`ctx.body = actors`
`240`	`240`	`})`
`241`	`241`	`}`
	`242`	`+`
	`243`	`+function takeFirst<T>(item: T \| ReadonlyArray<T>): T {`
	`244`	`+ return Array.isArray(item) ? item[0] : item`
	`245`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@`
`14`	`14`	`"allowJs": true,`
`15`	`15`	`"target": "esnext",`
`16`	`16`	`"rootDir": "./",`
`17`		`- "outDir": "lib"`
	`17`	`+ "outDir": "dist"`
`18`	`18`	`}`
`19`	`19`	`}`