Skip to content

Commit 39d6675

Browse files
authored
Merge pull request #383 from formidablejs/feature/improvements-and-changes
Feature/improvements and changes
2 parents 686da7a + 5872315 commit 39d6675

File tree

8 files changed

+352
-563
lines changed

8 files changed

+352
-563
lines changed

bin/imba/server.imba

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ application.then do(instance)
1414
let host = process.env.HOST || 'localhost'
1515
let addr = process.env.ADDR || false
1616

17+
imba.serve instance.fastify().server
18+
1719
instance.fastify().listen({
1820
port: Number(port),
1921
host: host
@@ -26,8 +28,6 @@ application.then do(instance)
2628
if addr then storeAddress address
2729
)
2830

29-
imba.serve instance.fastify().server
30-
3131
start!
3232

3333
def storeAddress address\string

src/Http/Request/FormRequest.imba

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -332,24 +332,18 @@ export default class FormRequest
332332
this.all![key] ? true : false
333333

334334
/**
335-
* Get key from body/query.
336-
*/
337-
def get key\string, default = null
338-
this.all![key] ?? default
339-
340-
/**
341-
* Get specified keys from request.
335+
* Get specified keys from body.
342336
*/
343337
def only keys\string[]
344338
if (!isArray(keys))
345339
return []
346340

347341
let response = {}
348342

349-
const all\object = this.all!
343+
const body\object = this.body!
350344

351345
keys.forEach do(key)
352-
const value = all[key]
346+
const value = body[key]
353347

354348
if value
355349
Object.assign response, {

src/Support/Helpers/index.imba

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ const { default: multitap } = require './multitap'
2424
const { default: now } = require './now'
2525
const { default: response } = require './response'
2626
const { default: route } = require './route'
27+
const { default: runtime } = require './runtime'
2728
const { default: signedRoute } = require './signedRoute'
2829
const { default: singularize } = require './singularize'
2930
const { default: slug } = require './slug'
@@ -69,6 +70,7 @@ export {
6970
pluralize
7071
response
7172
route
73+
runtime
7274
signedRoute
7375
singularize
7476
slug

src/Support/Helpers/runtime.imba

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
export default def runtime
2+
const args = process.argv
3+
let runtime = 'node'
4+
5+
if args && args.length > 0
6+
const executor = args[0].split('/').pop!
7+
8+
runtime = executor if executor != undefined
9+
10+
runtime

src/index.imba

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ import Response from './Http/Response/Response'
6666
import response from './Support/Helpers/response'
6767
import Route from './Http/Router/Route'
6868
import route from './Support/Helpers/route'
69+
import runtime from './Support/Helpers/runtime'
6970
import Server from './Foundation/Server'
7071
import ServiceResolver from './Support/ServiceResolver'
7172
import SessionDriverManager from './Http/Session/DriverManager'
@@ -165,6 +166,7 @@ export {
165166
Response
166167
Route
167168
route
169+
runtime
168170
Server
169171
ServiceResolver
170172
SessionDriverManager

0 commit comments

Comments
 (0)