17 Commits
0.5.1 ... 0.5.8

Author SHA1 Message Date
589cb7d579 Bump version
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2021-10-19 22:29:34 -05:00
3680ad1914 Fix back-fill on insert for Model.save 2021-10-19 22:29:15 -05:00
96e13d85fc Bump version
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2021-10-19 13:59:14 -05:00
5a9283ad85 orm(PostgreSQLDialect): double-quote column names in INSERT field lists 2021-10-19 13:59:00 -05:00
b1ea489ccb Bump version
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2021-10-19 13:00:27 -05:00
c3f2779650 Add generic to APIResponse 2021-10-19 13:00:14 -05:00
248b24e612 Bump version
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2021-10-19 10:26:47 -05:00
b4a9057e2b CLI invocation output better debugging infor 2021-10-19 10:26:32 -05:00
c078d695a8 Bump version
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2021-10-18 17:23:30 -05:00
55ffadc742 Export CLI decorators
All checks were successful
continuous-integration/drone/push Build is passing
2021-10-18 17:23:16 -05:00
56574d43ce Bump version
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
continuous-integration/drone Build is passing
2021-10-18 14:57:44 -05:00
e16f02ce12 Readd migrations
All checks were successful
continuous-integration/drone/push Build is passing
2021-10-18 14:49:19 -05:00
c34fad3502 Fix path in drone docs deploy
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
2021-10-18 14:02:00 -05:00
156006053b Fix path in drone static deploy
Some checks failed
continuous-integration/drone/push Build was killed
continuous-integration/drone Build is failing
2021-10-18 13:53:37 -05:00
22cf6aa953 bump version
Some checks failed
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
continuous-integration/drone Build is failing
2021-10-18 13:41:22 -05:00
b35eb8d6a1 Fix error throw
All checks were successful
continuous-integration/drone/push Build is passing
2021-10-18 13:36:59 -05:00
9ee4c42e43 Error type fixes
Some checks failed
continuous-integration/drone/push Build is failing
2021-10-18 13:03:28 -05:00
15 changed files with 149 additions and 31 deletions

View File

@@ -22,7 +22,7 @@ steps:
from_secret: docs_deploy_key from_secret: docs_deploy_key
port: 22 port: 22
source: extollo_api_documentation.tar.gz source: extollo_api_documentation.tar.gz
target: /var/nfs/general/static/sites/extollo target: /var/nfs/storage/static/sites/extollo
when: when:
event: promote event: promote
target: docs target: docs
@@ -38,7 +38,7 @@ steps:
from_secret: docs_deploy_key from_secret: docs_deploy_key
port: 22 port: 22
script: script:
- cd /var/nfs/general/static/sites/extollo - cd /var/nfs/storage/static/sites/extollo
- rm -rf docs - rm -rf docs
- tar xzf extollo_api_documentation.tar.gz - tar xzf extollo_api_documentation.tar.gz
- rm -rf extollo_api_documentation.tar.gz - rm -rf extollo_api_documentation.tar.gz

View File

@@ -1,6 +1,6 @@
{ {
"name": "@extollo/lib", "name": "@extollo/lib",
"version": "0.5.1", "version": "0.5.8",
"description": "The framework library that lifts up your code.", "description": "The framework library that lifts up your code.",
"main": "lib/index.js", "main": "lib/index.js",
"types": "lib/index.d.ts", "types": "lib/index.d.ts",

View File

@@ -169,8 +169,12 @@ export abstract class Directive extends AppClass {
const optionValues = this.parseOptions(options, argv) const optionValues = this.parseOptions(options, argv)
this.setOptionValues(optionValues) this.setOptionValues(optionValues)
await this.handle(argv) await this.handle(argv)
} catch (e) { } catch (e: unknown) {
this.nativeOutput(e.message) if ( e instanceof Error ) {
this.nativeOutput(e.message)
this.error(e)
}
if ( e instanceof OptionValidationError ) { if ( e instanceof OptionValidationError ) {
// expecting, value, requirements // expecting, value, requirements
if ( e.context.expecting ) { if ( e.context.expecting ) {
@@ -187,6 +191,7 @@ export abstract class Directive extends AppClass {
this.nativeOutput(` - ${e.context.value}`) this.nativeOutput(` - ${e.context.value}`)
} }
} }
this.nativeOutput('\nUse --help for more info.') this.nativeOutput('\nUse --help for more info.')
} }
} }

View File

@@ -11,3 +11,5 @@ export * from './directive/options/PositionalOption'
export * from './directive/ShellDirective' export * from './directive/ShellDirective'
export * from './directive/TemplateDirective' export * from './directive/TemplateDirective'
export * from './directive/UsageDirective' export * from './directive/UsageDirective'
export * from './decorators'

View File

@@ -1,10 +1,10 @@
/** /**
* Base type for an API response format. * Base type for an API response format.
*/ */
export interface APIResponse { export interface APIResponse<T> {
success: boolean, success: boolean,
message?: string, message?: string,
data?: any, data?: T,
error?: { error?: {
name: string, name: string,
message: string, message: string,
@@ -17,7 +17,7 @@ export interface APIResponse {
* @param {string} displayMessage * @param {string} displayMessage
* @return APIResponse * @return APIResponse
*/ */
export function message(displayMessage: string): APIResponse { export function message(displayMessage: string): APIResponse<void> {
return { return {
success: true, success: true,
message: displayMessage, message: displayMessage,
@@ -29,7 +29,7 @@ export function message(displayMessage: string): APIResponse {
* @param record * @param record
* @return APIResponse * @return APIResponse
*/ */
export function one(record: unknown): APIResponse { export function one<T>(record: T): APIResponse<T> {
return { return {
success: true, success: true,
data: record, data: record,
@@ -41,7 +41,7 @@ export function one(record: unknown): APIResponse {
* @param {array} records * @param {array} records
* @return APIResponse * @return APIResponse
*/ */
export function many(records: any[]): APIResponse { export function many<T>(records: T[]): APIResponse<{records: T[], total: number}> {
return { return {
success: true, success: true,
data: { data: {
@@ -56,7 +56,7 @@ export function many(records: any[]): APIResponse {
* @return APIResponse * @return APIResponse
* @param thrownError * @param thrownError
*/ */
export function error(thrownError: string | Error): APIResponse { export function error(thrownError: string | Error): APIResponse<void> {
if ( typeof thrownError === 'string' ) { if ( typeof thrownError === 'string' ) {
return { return {
success: false, success: false,

View File

@@ -259,8 +259,12 @@ export class Application extends Container {
try { try {
await this.up() await this.up()
await this.down() await this.down()
} catch (e) { } catch (e: unknown) {
this.errorHandler(e) if ( e instanceof Error ) {
this.errorHandler(e)
}
throw e
} }
} }
@@ -306,9 +310,14 @@ export class Application extends Container {
await unit.up() await unit.up()
unit.status = UnitStatus.Started unit.status = UnitStatus.Started
logging.info(`Started ${unit.constructor.name}.`) logging.info(`Started ${unit.constructor.name}.`)
} catch (e) { } catch (e: unknown) {
unit.status = UnitStatus.Error unit.status = UnitStatus.Error
throw this.errorWrapContext(e, {unitName: unit.constructor.name})
if ( e instanceof Error ) {
throw this.errorWrapContext(e, {unitName: unit.constructor.name})
}
throw e
} }
} }
@@ -327,7 +336,12 @@ export class Application extends Container {
logging.info(`Stopped ${unit.constructor.name}.`) logging.info(`Stopped ${unit.constructor.name}.`)
} catch (e) { } catch (e) {
unit.status = UnitStatus.Error unit.status = UnitStatus.Error
throw this.errorWrapContext(e, {unitName: unit.constructor.name})
if ( e instanceof Error ) {
throw this.errorWrapContext(e, {unitName: unit.constructor.name})
}
throw e
} }
} }
} }

View File

@@ -79,10 +79,13 @@ ${contextDisplay}
} }
this.logging.error(errorString, true) this.logging.error(errorString, true)
} catch (displayError) { } catch (displayError: unknown) {
// The error display encountered an error... if ( displayError instanceof Error ) {
// just throw the original so it makes it out // The error display encountered an error...
console.error('RunLevelErrorHandler encountered an error:', displayError.message) // eslint-disable-line no-console // just throw the original so it makes it out
console.error('RunLevelErrorHandler encountered an error:', displayError.message) // eslint-disable-line no-console
}
throw operativeError throw operativeError
} }
} }

View File

@@ -0,0 +1,39 @@
import {Inject, Injectable} from '../di'
import {ConstraintType, DatabaseService, FieldType, Migration, Schema} from '../orm'
/**
* Migration that creates the sessions table used by the ORMSession backend.
*/
@Injectable()
export default class CreateSessionsTableMigration extends Migration {
@Inject()
protected readonly db!: DatabaseService
async up(): Promise<void> {
const schema: Schema = this.db.get().schema()
const table = await schema.table('sessions')
table.primaryKey('session_uuid', FieldType.varchar)
.required()
table.column('session_data')
.type(FieldType.json)
.required()
.default('{}')
table.constraint('session_uuid_ck')
.type(ConstraintType.Check)
.expression('LENGTH(session_uuid) > 0')
await schema.commit(table)
}
async down(): Promise<void> {
const schema: Schema = this.db.get().schema()
const table = await schema.table('sessions')
table.dropIfExists()
await schema.commit(table)
}
}

View File

@@ -0,0 +1,47 @@
import {Inject, Injectable} from '../di'
import {DatabaseService, FieldType, Migration, Schema} from '../orm'
/**
* Migration that creates the users table used by @extollo/lib.auth.
*/
@Injectable()
export default class CreateUsersTableMigration extends Migration {
@Inject()
protected readonly db!: DatabaseService
async up(): Promise<void> {
const schema: Schema = this.db.get().schema()
const table = await schema.table('users')
table.primaryKey('user_id')
.required()
table.column('first_name')
.type(FieldType.varchar)
.nullable()
table.column('last_name')
.type(FieldType.varchar)
.nullable()
table.column('password_hash')
.type(FieldType.text)
.nullable()
table.column('username')
.type(FieldType.varchar)
.required()
.unique()
await schema.commit(table)
}
async down(): Promise<void> {
const schema: Schema = this.db.get().schema()
const table = await schema.table('users')
table.dropIfExists()
await schema.commit(table)
}
}

View File

@@ -63,10 +63,14 @@ export class PostgresConnection extends Connection {
rowCount: result.rowCount, rowCount: result.rowCount,
} }
} catch (e) { } catch (e) {
throw this.app().errorWrapContext(e, { if ( e instanceof Error ) {
query, throw this.app().errorWrapContext(e, {
connection: this.name, query,
}) connection: this.name,
})
}
throw e
} }
} }

View File

@@ -230,7 +230,7 @@ export class PostgreSQLDialect extends SQLDialect {
const table: string = tableString.split('.').map(x => `"${x}"`) const table: string = tableString.split('.').map(x => `"${x}"`)
.join('.') .join('.')
queryLines.push('INSERT INTO ' + (typeof source === 'string' ? table : `${table} AS "${source.alias}"`) queryLines.push('INSERT INTO ' + (typeof source === 'string' ? table : `${table} AS "${source.alias}"`)
+ (columns.length ? ` (${columns.join(', ')})` : '')) + (columns.length ? ` (${columns.map(x => `"${x}"`).join(', ')})` : ''))
} }
if ( Array.isArray(data) && !data.length ) { if ( Array.isArray(data) && !data.length ) {

View File

@@ -627,7 +627,7 @@ export abstract class Model<T extends Model<T>> extends AppClass implements Bus
const data = result.rows.first() const data = result.rows.first()
if ( data ) { if ( data ) {
await this.assumeFromSource(result) await this.assumeFromSource(data)
} }
await this.dispatch(new ModelCreatedEvent<T>(this as any)) await this.dispatch(new ModelCreatedEvent<T>(this as any))

View File

@@ -1,5 +1,5 @@
import {Inject, Singleton} from '../di' import {Inject, Singleton} from '../di'
import {HTTPStatus, withTimeout} from '../util' import {ErrorWithContext, HTTPStatus, withTimeout} from '../util'
import {Unit} from '../lifecycle/Unit' import {Unit} from '../lifecycle/Unit'
import {createServer, IncomingMessage, RequestListener, Server, ServerResponse} from 'http' import {createServer, IncomingMessage, RequestListener, Server, ServerResponse} from 'http'
import {Logging} from './Logging' import {Logging} from './Logging'
@@ -114,7 +114,11 @@ export class HTTPServer extends Unit {
try { try {
await this.kernel.handle(extolloReq) await this.kernel.handle(extolloReq)
} catch (e) { } catch (e) {
await error(e).write(extolloReq) if ( e instanceof Error ) {
await error(e).write(extolloReq)
}
await error(new ErrorWithContext('Unknown error occurred.', { e }))
} }
await extolloReq.response.send() await extolloReq.response.send()

View File

@@ -137,7 +137,7 @@ export class BehaviorSubject<T> {
} catch (e) { } catch (e) {
if ( e instanceof UnsubscribeError ) { if ( e instanceof UnsubscribeError ) {
this.subscribers = this.subscribers.filter(x => x !== subscriber) this.subscribers = this.subscribers.filter(x => x !== subscriber)
} else if (subscriber.error) { } else if (subscriber.error && e instanceof Error) {
await subscriber.error(e) await subscriber.error(e)
} else { } else {
throw e throw e
@@ -181,7 +181,7 @@ export class BehaviorSubject<T> {
try { try {
await subscriber.complete(finalValue) await subscriber.complete(finalValue)
} catch (e) { } catch (e) {
if ( subscriber.error ) { if ( subscriber.error && e instanceof Error ) {
await subscriber.error(e) await subscriber.error(e)
} else { } else {
throw e throw e

View File

@@ -92,7 +92,7 @@ export class LocalFilesystem extends Filesystem {
isFile: stat.isFile(), isFile: stat.isFile(),
} }
} catch (e) { } catch (e) {
if ( e?.code === 'ENOENT' ) { if ( (e as any)?.code === 'ENOENT' ) {
return { return {
path: new UniversalPath(args.storePath, this), path: new UniversalPath(args.storePath, this),
exists: false, exists: false,