@ditojs/server 0.273.0 → 0.274.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/app/Application.js +10 -4
- package/lib/cli/console.js +4 -4
- package/lib/cli/db/createMigration.js +4 -4
- package/lib/cli/db/migrate.js +3 -3
- package/lib/cli/db/reset.js +3 -3
- package/lib/cli/db/rollback.js +3 -3
- package/lib/cli/db/seed.js +5 -5
- package/lib/cli/db/unlock.js +3 -3
- package/lib/cli/index.js +4 -4
- package/lib/controllers/Controller.js +4 -4
- package/lib/controllers/RelationController.js +3 -3
- package/lib/middleware/logRequests.js +4 -4
- package/package.json +9 -9
- package/src/app/Application.js +12 -6
- package/src/cli/console.js +3 -3
- package/src/cli/db/createMigration.js +3 -3
- package/src/cli/db/migrate.js +4 -4
- package/src/cli/db/reset.js +4 -4
- package/src/cli/db/rollback.js +4 -4
- package/src/cli/db/seed.js +6 -6
- package/src/cli/db/unlock.js +2 -2
- package/src/cli/index.js +3 -3
- package/src/controllers/Controller.js +8 -8
- package/src/controllers/RelationController.js +2 -2
- package/src/middleware/logRequests.js +9 -9
|
@@ -9,7 +9,7 @@ require("core-js/modules/esnext.iterator.constructor.js");
|
|
|
9
9
|
|
|
10
10
|
require("core-js/modules/esnext.iterator.filter.js");
|
|
11
11
|
|
|
12
|
-
var
|
|
12
|
+
var _picocolors = _interopRequireDefault(require("picocolors"));
|
|
13
13
|
|
|
14
14
|
var _errors = require("../errors");
|
|
15
15
|
|
|
@@ -50,7 +50,7 @@ class RelationController extends _CollectionController.CollectionController {
|
|
|
50
50
|
|
|
51
51
|
this.path = this.app.normalizePath(this.name);
|
|
52
52
|
this.url = `${this.parent.url}/${this.parent.getPath('member', this.path)}`;
|
|
53
|
-
this.log(`${
|
|
53
|
+
this.log(`${_picocolors.default.blue(this.path)}${_picocolors.default.white(':')}`, this.level);
|
|
54
54
|
|
|
55
55
|
for (const key in this.object) {
|
|
56
56
|
if (!['relation', 'member', 'allow'].includes(key)) {
|
|
@@ -79,4 +79,4 @@ class RelationController extends _CollectionController.CollectionController {
|
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
exports.RelationController = RelationController;
|
|
82
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/controllers/RelationController.js"],"names":["RelationController","CollectionController","constructor","parent","object","relationInstance","relationDefinition","app","collection","toCoreActions","member","modelClass","ownerModelClass","ControllerError","name","relatedModelClass","isOneToOne","relate","owner","unrelate","graph","transacted","level","scope","filter","path","normalizePath","url","getPath","log","pico","blue","white","key","includes","setup","inheritValues","type","values","execute","ctx","id","getMemberId","parentQuery","trx","model","ignoreScope","findById","throwIfNotFound","select","ownerProp","props","query","$relatedQuery","setupQuery"],"mappings":"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","sourcesContent":["import pico from 'picocolors'\nimport { ControllerError } from '@/errors'\nimport { CollectionController } from './CollectionController'\nimport { setupPropertyInheritance, getScope } from '@/utils'\nimport { asArray } from '@ditojs/utils'\n\nexport class RelationController extends CollectionController {\n  constructor(parent, object, relationInstance, relationDefinition) {\n    super(parent.app, null)\n    if (parent.modelClass !== relationInstance.ownerModelClass) {\n      throw new ControllerError(parent,\n        `Invalid parent controller for relation '${relationInstance.name}'.`)\n    }\n    this.parent = parent\n    this.object = object\n    this.relationInstance = relationInstance\n    this.relationDefinition = relationDefinition\n    this.name = relationInstance.name\n    this.modelClass = relationInstance.relatedModelClass\n    this.isOneToOne = relationInstance.isOneToOne()\n    this.relate = !relationDefinition.owner\n    this.unrelate = !relationDefinition.owner\n    // Inherit parent values:\n    this.graph = parent.graph\n    this.transacted = parent.transacted\n    this.level = parent.level + 1\n    if (parent.scope) {\n      // Inherit only the graph scopes since it's in its nature to propagate to\n      // relations:\n      this.scope = asArray(parent.scope).filter(scope => getScope(scope).graph)\n    }\n    // Initialize:\n    this.path = this.app.normalizePath(this.name)\n    this.url = `${this.parent.url}/${this.parent.getPath('member', this.path)}`\n    this.log(`${pico.blue(this.path)}${pico.white(':')}`, this.level)\n    // Copy over all fields in the relation object except the ones that are\n    // going to be inherited in `setup()` (relation, member, allow), for\n    // settings like scope, etc.\n    for (const key in this.object) {\n      if (!['relation', 'member', 'allow'].includes(key)) {\n        this[key] = this.object[key]\n      }\n    }\n    this.setup(false)\n  }\n\n  // @override\n  inheritValues(type) {\n    // Since RelationController are mapped to nested `relations` objects in\n    // ModelController parents and are never extended directly in the user land\n    // code, inheritance works differently here than on the other controllers:\n    // ModelController already sets up inheritance for its `relations` object\n    // and its entries for each relation from which `object` is retrieved.\n    // But the actions per relation still need to have inheritance set up,\n    // using the values in its parent controller and potential super-classes,\n    // falling back on the definitions in RelationController and its inherited\n    // values from ModelController.\n    const values = setupPropertyInheritance(\n      this.object,\n      // On the relation objects, the `collection` actions are stored in a\n      // `relation` object, to make sense both for one- and many-relations:\n      type === 'collection' ? 'relation' : type,\n      // Set up inheritance for RelationController's override of `collection`\n      // and `member` objects, and use it as the base for further inheritance.\n      // NOTE: Currently they're empty, but they could allow local overrides.\n      super.inheritValues(type)\n    )\n    return values\n  }\n\n  // @override\n  async execute(ctx, execute) {\n    const id = this.parent.getMemberId(ctx)\n    return this.parent.execute(ctx,\n      async (parentQuery, trx) => {\n        const model = await parentQuery\n          .ignoreScope()\n          .findById(id)\n          .throwIfNotFound()\n          // Explicitly only select the foreign key ids for more efficiency.\n          .select(...this.relationInstance.ownerProp.props)\n        // This is the same as `ModelController.execute()`, except for the use\n        // of `model.$relatedQuery()` instead of `modelClass.query()`:\n        const query = model.$relatedQuery(this.relationInstance.name, trx)\n        this.setupQuery(query)\n        return execute(query, trx)\n      }\n    )\n  }\n\n  collection = this.toCoreActions({\n  })\n\n  member = this.toCoreActions({\n  })\n}\n"]}
|
|
@@ -5,7 +5,7 @@ exports.logRequests = logRequests;
|
|
|
5
5
|
|
|
6
6
|
var _bytes = _interopRequireDefault(require("bytes"));
|
|
7
7
|
|
|
8
|
-
var
|
|
8
|
+
var _picocolors = _interopRequireDefault(require("picocolors"));
|
|
9
9
|
|
|
10
10
|
var _passthroughCounter = _interopRequireDefault(require("passthrough-counter"));
|
|
11
11
|
|
|
@@ -75,7 +75,7 @@ function logRequest(ctx) {
|
|
|
75
75
|
if (logger != null && logger.isLevelEnabled('trace')) {
|
|
76
76
|
logger.trace({
|
|
77
77
|
req: ctx.req
|
|
78
|
-
}, `${
|
|
78
|
+
}, `${_picocolors.default.gray('<--')} ${_picocolors.default.bold(ctx.method)} ${_picocolors.default.gray(ctx.originalUrl)}`);
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
81
|
|
|
@@ -101,7 +101,7 @@ function logResponse({
|
|
|
101
101
|
logger[level]({
|
|
102
102
|
req: ctx.req,
|
|
103
103
|
res: ctx.res
|
|
104
|
-
}, `${
|
|
104
|
+
}, `${_picocolors.default.bold(ctx.method)} ${_picocolors.default.gray(ctx.originalUrl)} ${_picocolors.default[statusColor](status)} ${_picocolors.default.gray(formattedTime)} ${_picocolors.default.gray(formattedLength)}`);
|
|
105
105
|
}
|
|
106
106
|
}
|
|
107
107
|
|
|
@@ -119,4 +119,4 @@ const colorCodes = {
|
|
|
119
119
|
1: 'green',
|
|
120
120
|
0: 'yellow'
|
|
121
121
|
};
|
|
122
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
122
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/middleware/logRequests.js"],"names":["logRequests","ignoreUrls","ctx","next","req","url","match","start","Date","now","logRequest","err","logResponse","body","response","length","counter","readable","pipe","Counter","on","onerror","res","onfinish","done","bind","onclose","once","removeListener","logger","child","name","isLevelEnabled","trace","pico","gray","bold","method","originalUrl","level","status","statusRange","statusColor","colorCodes","formattedLength","includes","toLowerCase","formattedTime","formatTime","delta","Math","round"],"mappings":"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","sourcesContent":["/*\n * Middleware inspired by 'koa-logger'. Adapted and extended to our needs.\n */\nimport bytes from 'bytes'\nimport pico from 'picocolors'\nimport Counter from 'passthrough-counter'\n\nexport function logRequests({ ignoreUrls } = {}) {\n  return async (ctx, next) => {\n    if (ignoreUrls && ctx.req.url.match(ignoreUrls)) {\n      return next()\n    }\n    // request\n    const start = Date.now()\n\n    logRequest(ctx)\n\n    try {\n      await next()\n    } catch (err) {\n      logResponse({ ctx, start, err })\n      throw err\n    }\n\n    // Calculate the length of a streaming response by intercepting the stream\n    // with a counter. Only necessary if a content-length header is currently\n    // not set.\n    const {\n      body,\n      response: { length }\n    } = ctx\n\n    let counter\n    if (length === null && body?.readable) {\n      ctx.body = body.pipe((counter = new Counter())).on('error', ctx.onerror)\n    }\n\n    // Log when the response is finished or closed, whichever happens first.\n    const { res } = ctx\n\n    const onfinish = done.bind(null, 'finish')\n    const onclose = done.bind(null, 'close')\n\n    res.once('finish', onfinish)\n    res.once('close', onclose)\n\n    function done() {\n      res.removeListener('finish', onfinish)\n      res.removeListener('close', onclose)\n      logResponse({ ctx, start, length: counter ? counter.length : length })\n    }\n  }\n}\n\nfunction logRequest(ctx) {\n  const logger = ctx.logger?.child({ name: 'http' })\n  if (logger?.isLevelEnabled('trace')) {\n    logger.trace(\n      { req: ctx.req },\n      `${\n        pico.gray('<--')\n      } ${\n        pico.bold(ctx.method)\n      } ${\n        pico.gray(ctx.originalUrl)\n      }`\n    )\n  }\n}\n\nfunction logResponse({ ctx, start, length, err }) {\n  const logger = ctx.logger?.child({ name: 'http' })\n  const level = err ? 'warn' : 'info'\n  if (logger?.isLevelEnabled(level)) {\n  // Get the status code of the response\n    const status = err\n      ? err.status || 500\n      : ctx.status || 404\n\n    // Set the color of the status code;\n    const statusRange = (status / 100) | 0\n    const statusColor = colorCodes[statusRange] || colorCodes[0]\n\n    // Get the human readable response length\n    const formattedLength = [204, 205, 304].includes(status)\n      ? ''\n      : length == null\n        ? '-'\n        : bytes(length).toLowerCase()\n\n    const formattedTime = formatTime(start)\n\n    logger[level](\n      { req: ctx.req, res: ctx.res },\n      `${\n        pico.bold(ctx.method)\n      } ${\n        pico.gray(ctx.originalUrl)\n      } ${\n        pico[statusColor](status)\n      } ${\n        pico.gray(formattedTime)\n      } ${\n        pico.gray(formattedLength)\n      }`\n    )\n  }\n}\n\nfunction formatTime(start) {\n  const delta = Date.now() - start\n  return delta < 10000 ? delta + 'ms' : Math.round(delta / 1000) + 's'\n}\n\nconst colorCodes = {\n  7: 'magenta',\n  5: 'red',\n  4: 'yellow',\n  3: 'cyan',\n  2: 'green',\n  1: 'green',\n  0: 'yellow'\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ditojs/server",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.274.0",
|
|
4
4
|
"description": "Dito.js Server – Dito.js is a declarative and modern web framework, based on Objection.js, Koa.js and Vue.js",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"repository": "https://github.com/ditojs/dito/tree/master/packages/server",
|
|
@@ -30,20 +30,19 @@
|
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"@babel/core": "^7.17.5",
|
|
32
32
|
"@babel/runtime": "^7.17.2",
|
|
33
|
-
"@ditojs/admin": "^0.
|
|
34
|
-
"@ditojs/router": "^0.
|
|
35
|
-
"@ditojs/utils": "^0.
|
|
33
|
+
"@ditojs/admin": "^0.274.0",
|
|
34
|
+
"@ditojs/router": "^0.274.0",
|
|
35
|
+
"@ditojs/utils": "^0.274.0",
|
|
36
36
|
"@koa/cors": "^3.1.0",
|
|
37
37
|
"@koa/multer": "^3.0.0",
|
|
38
38
|
"@vue/cli-service": "^4.5.15",
|
|
39
39
|
"ajv": "^7.2.4",
|
|
40
40
|
"ajv-formats": "^1.6.1",
|
|
41
|
-
"aws-sdk": "^2.
|
|
41
|
+
"aws-sdk": "^2.1087.0",
|
|
42
42
|
"axios": "^0.26.0",
|
|
43
|
-
"babel-loader": "^8.2.
|
|
43
|
+
"babel-loader": "^8.2.3",
|
|
44
44
|
"bcryptjs": "^2.4.3",
|
|
45
45
|
"bytes": "^3.1.2",
|
|
46
|
-
"chalk": "^4.1.2",
|
|
47
46
|
"core-js": "^3.21.1",
|
|
48
47
|
"data-uri-to-buffer": "^3.0.1",
|
|
49
48
|
"eventemitter2": "^6.4.5",
|
|
@@ -73,6 +72,7 @@
|
|
|
73
72
|
"parse-duration": "^1.0.2",
|
|
74
73
|
"passport-local": "^1.0.0",
|
|
75
74
|
"passthrough-counter": "^1.0.0",
|
|
75
|
+
"picocolors": "^1.0.0",
|
|
76
76
|
"pino": "^6.14.0",
|
|
77
77
|
"pino-pretty": "^6.0.0",
|
|
78
78
|
"pluralize": "^8.0.0",
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
"devDependencies": {
|
|
92
92
|
"@babel/cli": "^7.17.6",
|
|
93
93
|
"@babel/preset-env": "^7.16.11",
|
|
94
|
-
"@ditojs/babel-preset": "^0.
|
|
94
|
+
"@ditojs/babel-preset": "^0.274.0",
|
|
95
95
|
"babel-plugin-dynamic-import-node": "^2.3.3",
|
|
96
96
|
"babel-plugin-module-resolver": "^4.1.0",
|
|
97
97
|
"knex": "^0.21.21",
|
|
@@ -100,5 +100,5 @@
|
|
|
100
100
|
"rimraf": "^3.0.2",
|
|
101
101
|
"sqlite3": "^5.0.2"
|
|
102
102
|
},
|
|
103
|
-
"gitHead": "
|
|
103
|
+
"gitHead": "0ebfe0bb8913f9d338bb91a0a507e7a4c6e49ecb"
|
|
104
104
|
}
|
package/src/app/Application.js
CHANGED
|
@@ -2,7 +2,7 @@ import Koa from 'koa'
|
|
|
2
2
|
import Knex from 'knex'
|
|
3
3
|
import util from 'util'
|
|
4
4
|
import axios from 'axios'
|
|
5
|
-
import
|
|
5
|
+
import pico from 'picocolors'
|
|
6
6
|
import zlib from 'zlib'
|
|
7
7
|
import pino from 'pino'
|
|
8
8
|
import os from 'os'
|
|
@@ -163,7 +163,7 @@ export class Application extends Koa {
|
|
|
163
163
|
}
|
|
164
164
|
if (Object.keys(data).length > 0) {
|
|
165
165
|
console.info(
|
|
166
|
-
|
|
166
|
+
pico.yellow.bold(`\n${modelClass.name}:\n`),
|
|
167
167
|
util.inspect(data, {
|
|
168
168
|
colors: true,
|
|
169
169
|
depth: null,
|
|
@@ -628,6 +628,12 @@ export class Application extends Koa {
|
|
|
628
628
|
}
|
|
629
629
|
}
|
|
630
630
|
this.knex = Knex(knex)
|
|
631
|
+
// Support PostgreSQL type parser mappings in the config.
|
|
632
|
+
if (knex.client === 'postgresql' && knex.typeParsers) {
|
|
633
|
+
for (const [type, parser] of Object.entries(knex.typeParsers)) {
|
|
634
|
+
this.knex.client.driver.types.setTypeParser(type, parser)
|
|
635
|
+
}
|
|
636
|
+
}
|
|
631
637
|
if (log.sql) {
|
|
632
638
|
this.setupKnexLogging()
|
|
633
639
|
}
|
|
@@ -846,13 +852,13 @@ export class Application extends Koa {
|
|
|
846
852
|
if (!data) {
|
|
847
853
|
console.info(
|
|
848
854
|
`${
|
|
849
|
-
|
|
855
|
+
pico.red('INFO:')
|
|
850
856
|
} Asset ${
|
|
851
|
-
|
|
857
|
+
pico.green(`'${file.name}'`)
|
|
852
858
|
} is from a foreign source, fetching from ${
|
|
853
|
-
|
|
859
|
+
pico.green(`'${file.url}'`)
|
|
854
860
|
} and adding to storage ${
|
|
855
|
-
|
|
861
|
+
pico.green(`'${storage.name}'`)
|
|
856
862
|
}...`
|
|
857
863
|
)
|
|
858
864
|
const response = await axios.request({
|
package/src/cli/console.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import repl from 'repl'
|
|
2
2
|
import path from 'path'
|
|
3
3
|
import fs from 'fs-extra'
|
|
4
|
-
import
|
|
4
|
+
import pico from 'picocolors'
|
|
5
5
|
import objection from 'objection'
|
|
6
6
|
import { isFunction, deindent } from '@ditojs/utils'
|
|
7
7
|
|
|
@@ -100,11 +100,11 @@ function displayUsage(app, config, details) {
|
|
|
100
100
|
Dito Console
|
|
101
101
|
|
|
102
102
|
Available references:
|
|
103
|
-
- Dito app: ${
|
|
103
|
+
- Dito app: ${pico.cyan('app')}
|
|
104
104
|
${
|
|
105
105
|
modelHandleNames.length > 0
|
|
106
106
|
? ` - Dito models: ${
|
|
107
|
-
modelHandleNames.map(m =>
|
|
107
|
+
modelHandleNames.map(m => pico.cyan(m)).join(', ')
|
|
108
108
|
}`
|
|
109
109
|
: ''
|
|
110
110
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import path from 'path'
|
|
2
2
|
import fs from 'fs-extra'
|
|
3
|
-
import
|
|
3
|
+
import pico from 'picocolors'
|
|
4
4
|
import { getRelationClass, isThroughRelationClass } from '@/schema'
|
|
5
5
|
import {
|
|
6
6
|
isObject, isArray, isString, deindent, capitalize
|
|
@@ -52,7 +52,7 @@ export async function createMigration(app, name, ...modelNames) {
|
|
|
52
52
|
const file = path.join(migrationDir, filename)
|
|
53
53
|
if (await fs.exists(file)) {
|
|
54
54
|
// This should never happen, but let's be on the safe side here:
|
|
55
|
-
console.info(
|
|
55
|
+
console.info(pico.red(`Migration '${filename}' already exists.`))
|
|
56
56
|
return false
|
|
57
57
|
} else {
|
|
58
58
|
await fs.writeFile(file, deindent`
|
|
@@ -64,7 +64,7 @@ export async function createMigration(app, name, ...modelNames) {
|
|
|
64
64
|
${getCode(dropTables)}
|
|
65
65
|
}
|
|
66
66
|
`)
|
|
67
|
-
console.info(
|
|
67
|
+
console.info(pico.cyan(`Migration '${filename}' successfully created.`))
|
|
68
68
|
return true
|
|
69
69
|
}
|
|
70
70
|
}
|
package/src/cli/db/migrate.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import
|
|
1
|
+
import pico from 'picocolors'
|
|
2
2
|
|
|
3
3
|
export async function migrate(knex) {
|
|
4
4
|
const [batch, log] = await knex.migrate.latest()
|
|
5
5
|
console.info(log.length === 0
|
|
6
|
-
?
|
|
7
|
-
:
|
|
8
|
-
|
|
6
|
+
? pico.cyan('Already up to date')
|
|
7
|
+
: pico.green(`Batch ${batch} run: ${log.length} migrations\n`) +
|
|
8
|
+
pico.cyan(log.join('\n')))
|
|
9
9
|
return true
|
|
10
10
|
}
|
package/src/cli/db/reset.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import pico from 'picocolors'
|
|
2
2
|
import { migrate } from './migrate'
|
|
3
3
|
|
|
4
4
|
export async function reset(knex) {
|
|
@@ -11,10 +11,10 @@ export async function reset(knex) {
|
|
|
11
11
|
migrations.push(...log)
|
|
12
12
|
}
|
|
13
13
|
console.info(migrations.length === 0
|
|
14
|
-
?
|
|
15
|
-
:
|
|
14
|
+
? pico.cyan('Already at the base migration')
|
|
15
|
+
: pico.green(`${batches.length > 1 ? 'Batches' : 'Batch'} ${batches} ` +
|
|
16
16
|
`rolled back: ${migrations.length} migrations\n`) +
|
|
17
|
-
|
|
17
|
+
pico.cyan(migrations.join('\n')))
|
|
18
18
|
await migrate(knex)
|
|
19
19
|
return true
|
|
20
20
|
}
|
package/src/cli/db/rollback.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import
|
|
1
|
+
import pico from 'picocolors'
|
|
2
2
|
|
|
3
3
|
export async function rollback(knex) {
|
|
4
4
|
const [batch, log] = await knex.migrate.rollback()
|
|
5
5
|
console.info(log.length === 0
|
|
6
|
-
?
|
|
7
|
-
:
|
|
8
|
-
|
|
6
|
+
? pico.cyan('Already at the base migration')
|
|
7
|
+
: pico.green(`Batch ${batch} rolled back: ${log.length} migrations\n`) +
|
|
8
|
+
pico.cyan(log.join('\n')))
|
|
9
9
|
return true
|
|
10
10
|
}
|
package/src/cli/db/seed.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import path from 'path'
|
|
2
2
|
import fs from 'fs-extra'
|
|
3
|
-
import
|
|
3
|
+
import pico from 'picocolors'
|
|
4
4
|
import util from 'util'
|
|
5
5
|
import pluralize from 'pluralize'
|
|
6
6
|
import { isFunction, isArray, camelize } from '@ditojs/utils'
|
|
@@ -57,18 +57,18 @@ async function handleSeed(app, base, seed, modelClass) {
|
|
|
57
57
|
}
|
|
58
58
|
if (isArray(res)) {
|
|
59
59
|
console.info(
|
|
60
|
-
|
|
61
|
-
|
|
60
|
+
pico.green(`${base}:`),
|
|
61
|
+
pico.cyan(`${res.length} seed records created.`)
|
|
62
62
|
)
|
|
63
63
|
} else {
|
|
64
64
|
console.info(
|
|
65
|
-
|
|
66
|
-
|
|
65
|
+
pico.red(`${base}:`),
|
|
66
|
+
pico.cyan('No seed records created.')
|
|
67
67
|
)
|
|
68
68
|
}
|
|
69
69
|
} catch (err) {
|
|
70
70
|
console.error(
|
|
71
|
-
|
|
71
|
+
pico.red(`${base}:`),
|
|
72
72
|
util.inspect(err, {
|
|
73
73
|
colors: true,
|
|
74
74
|
depth: null,
|
package/src/cli/db/unlock.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import
|
|
1
|
+
import pico from 'picocolors'
|
|
2
2
|
|
|
3
3
|
export async function unlock(knex) {
|
|
4
4
|
await knex.migrate.forceFreeMigrationsLock()
|
|
5
5
|
console.info(
|
|
6
|
-
|
|
6
|
+
pico.green(`Successfully unlocked the migrations lock table`)
|
|
7
7
|
)
|
|
8
8
|
return true
|
|
9
9
|
}
|
package/src/cli/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env babel-node
|
|
2
2
|
|
|
3
3
|
import path from 'path'
|
|
4
|
-
import
|
|
4
|
+
import pico from 'picocolors'
|
|
5
5
|
import Knex from 'knex'
|
|
6
6
|
import { isPlainObject, isFunction, camelize } from '@ditojs/utils'
|
|
7
7
|
import * as db from './db'
|
|
@@ -47,10 +47,10 @@ async function execute() {
|
|
|
47
47
|
} catch (err) {
|
|
48
48
|
if (err instanceof Error) {
|
|
49
49
|
console.error(
|
|
50
|
-
|
|
50
|
+
pico.red(`${err.detail ? `${err.detail}\n` : ''}${err.stack}`)
|
|
51
51
|
)
|
|
52
52
|
} else {
|
|
53
|
-
console.error(
|
|
53
|
+
console.error(pico.red(err))
|
|
54
54
|
}
|
|
55
55
|
process.exit(1)
|
|
56
56
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import pico from 'picocolors'
|
|
2
2
|
import { getOwnProperty, getAllKeys, describeFunction } from '@/utils'
|
|
3
3
|
import { EventEmitter } from '@/lib'
|
|
4
4
|
import ControllerAction from './ControllerAction'
|
|
@@ -44,11 +44,11 @@ export class Controller {
|
|
|
44
44
|
this.url = namespace ? `/${namespace}${url}` : url
|
|
45
45
|
this.log(
|
|
46
46
|
`${
|
|
47
|
-
namespace ?
|
|
47
|
+
namespace ? pico.green(`/${namespace}/`) : ''
|
|
48
48
|
}${
|
|
49
|
-
|
|
49
|
+
pico.cyan(path)
|
|
50
50
|
}${
|
|
51
|
-
|
|
51
|
+
pico.white(':')
|
|
52
52
|
}`,
|
|
53
53
|
this.level
|
|
54
54
|
)
|
|
@@ -92,13 +92,13 @@ export class Controller {
|
|
|
92
92
|
setupRoute(verb, url, transacted, authorize, action, handlers) {
|
|
93
93
|
this.log(
|
|
94
94
|
`${
|
|
95
|
-
|
|
95
|
+
pico.magenta(verb.toUpperCase())
|
|
96
96
|
} ${
|
|
97
|
-
|
|
97
|
+
pico.green(this.url)
|
|
98
98
|
}${
|
|
99
|
-
|
|
99
|
+
pico.cyan(url.slice(this.url.length))
|
|
100
100
|
} ${
|
|
101
|
-
|
|
101
|
+
pico.white(this.describeAuthorize(authorize))
|
|
102
102
|
}`,
|
|
103
103
|
this.level + 1
|
|
104
104
|
)
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import pico from 'picocolors'
|
|
2
2
|
import { ControllerError } from '@/errors'
|
|
3
3
|
import { CollectionController } from './CollectionController'
|
|
4
4
|
import { setupPropertyInheritance, getScope } from '@/utils'
|
|
@@ -32,7 +32,7 @@ export class RelationController extends CollectionController {
|
|
|
32
32
|
// Initialize:
|
|
33
33
|
this.path = this.app.normalizePath(this.name)
|
|
34
34
|
this.url = `${this.parent.url}/${this.parent.getPath('member', this.path)}`
|
|
35
|
-
this.log(`${
|
|
35
|
+
this.log(`${pico.blue(this.path)}${pico.white(':')}`, this.level)
|
|
36
36
|
// Copy over all fields in the relation object except the ones that are
|
|
37
37
|
// going to be inherited in `setup()` (relation, member, allow), for
|
|
38
38
|
// settings like scope, etc.
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Middleware inspired by 'koa-logger'. Adapted and extended to our needs.
|
|
3
3
|
*/
|
|
4
4
|
import bytes from 'bytes'
|
|
5
|
-
import
|
|
5
|
+
import pico from 'picocolors'
|
|
6
6
|
import Counter from 'passthrough-counter'
|
|
7
7
|
|
|
8
8
|
export function logRequests({ ignoreUrls } = {}) {
|
|
@@ -58,11 +58,11 @@ function logRequest(ctx) {
|
|
|
58
58
|
logger.trace(
|
|
59
59
|
{ req: ctx.req },
|
|
60
60
|
`${
|
|
61
|
-
|
|
61
|
+
pico.gray('<--')
|
|
62
62
|
} ${
|
|
63
|
-
|
|
63
|
+
pico.bold(ctx.method)
|
|
64
64
|
} ${
|
|
65
|
-
|
|
65
|
+
pico.gray(ctx.originalUrl)
|
|
66
66
|
}`
|
|
67
67
|
)
|
|
68
68
|
}
|
|
@@ -93,15 +93,15 @@ function logResponse({ ctx, start, length, err }) {
|
|
|
93
93
|
logger[level](
|
|
94
94
|
{ req: ctx.req, res: ctx.res },
|
|
95
95
|
`${
|
|
96
|
-
|
|
96
|
+
pico.bold(ctx.method)
|
|
97
97
|
} ${
|
|
98
|
-
|
|
98
|
+
pico.gray(ctx.originalUrl)
|
|
99
99
|
} ${
|
|
100
|
-
|
|
100
|
+
pico[statusColor](status)
|
|
101
101
|
} ${
|
|
102
|
-
|
|
102
|
+
pico.gray(formattedTime)
|
|
103
103
|
} ${
|
|
104
|
-
|
|
104
|
+
pico.gray(formattedLength)
|
|
105
105
|
}`
|
|
106
106
|
)
|
|
107
107
|
}
|