@live-change/cli 0.1.8 → 0.1.9

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.
Files changed (2) hide show
  1. package/bin/lcli.js +26 -26
  2. package/package.json +3 -3
package/bin/lcli.js CHANGED
@@ -16,7 +16,9 @@ const {
16
16
  setupApiServer,
17
17
  setupApiSockJs,
18
18
  setupApiWs,
19
- setupDbServer
19
+ setupDbServer,
20
+ setupDbClient,
21
+ setupApp
20
22
 
21
23
  } = require("@live-change/server")
22
24
 
@@ -120,14 +122,16 @@ const argv = require('yargs') // eslint-disable-line
120
122
  .command('apiServer', 'start server', (yargs) => {
121
123
  apiServerOptions(yargs)
122
124
  startOptions(yargs)
123
- }, (argv) => {
124
- apiServer(argv)
125
+ }, async (argv) => {
126
+ await setupApp(argv)
127
+ await apiServer(argv)
125
128
  })
126
129
  .command('devApiServer', 'shortcut for apiServer --withServices --updateServices', (yargs) => {
127
130
  apiServerOptions(yargs)
128
131
  startOptions(yargs)
129
- }, (argv) => {
130
- apiServer({
132
+ }, async (argv) => {
133
+ await setupApp(argv)
134
+ await apiServer({
131
135
  ...argv,
132
136
  withServices: true, updateServices: true
133
137
  })
@@ -135,8 +139,9 @@ const argv = require('yargs') // eslint-disable-line
135
139
  .command('memApiServer', 'shortcut for devApiServer --withDb --dbBackend mem --createDb', (yargs) => {
136
140
  apiServerOptions(yargs)
137
141
  startOptions(yargs)
138
- }, (argv) => {
139
- apiServer({
142
+ }, async (argv) => {
143
+ await setupApp(argv)
144
+ await apiServer({
140
145
  ...argv,
141
146
  withServices: true, updateServices: true,
142
147
  withDb: true, dbBackend: 'mem', createDb: true
@@ -146,22 +151,25 @@ const argv = require('yargs') // eslint-disable-line
146
151
  ssrServerOptions(yargs)
147
152
  apiServerOptions(yargs)
148
153
  startOptions(yargs)
149
- }, (argv) => {
150
- ssrServer(argv, false)
154
+ }, async (argv) => {
155
+ await setupApp(argv)
156
+ await ssrServer(argv, false)
151
157
  })
152
158
  .command('ssrDev', 'start ssr server in development mode', (yargs) => {
153
159
  ssrServerOptions(yargs)
154
160
  apiServerOptions(yargs)
155
161
  startOptions(yargs)
156
- }, (argv) => {
157
- ssrServer(argv, true)
162
+ }, async (argv) => {
163
+ await setupApp(argv)
164
+ await ssrServer(argv, true)
158
165
  })
159
166
  .command('dev', 'shortcut for ssrDev --withApi --withServices --updateServices', (yargs) => {
160
167
  ssrServerOptions(yargs)
161
168
  apiServerOptions(yargs)
162
169
  startOptions(yargs)
163
- }, (argv) => {
164
- ssrServer({
170
+ }, async (argv) => {
171
+ await setupApp(argv)
172
+ await ssrServer({
165
173
  ...argv,
166
174
  withApi: true, withServices: true, updateServices: true
167
175
  }, true)
@@ -170,8 +178,9 @@ const argv = require('yargs') // eslint-disable-line
170
178
  ssrServerOptions(yargs)
171
179
  apiServerOptions(yargs)
172
180
  startOptions(yargs)
173
- }, (argv) => {
174
- ssrServer({
181
+ }, async (argv) => {
182
+ await setupApp(argv)
183
+ await ssrServer({
175
184
  ...argv,
176
185
  withApi: true, withServices: true, updateServices: true,
177
186
  withDb: true, dbBackend: 'mem', createDb: true
@@ -187,7 +196,7 @@ const argv = require('yargs') // eslint-disable-line
187
196
  async function apiServer(argv) {
188
197
  const { apiPort, apiHost } = argv
189
198
 
190
- const apiServer = await setupApiServer(argv)
199
+ const apiServer = await setupApiServer(argv, dbServer)
191
200
 
192
201
  const expressApp = express()
193
202
 
@@ -220,15 +229,6 @@ async function ssrServer(argv, dev) {
220
229
  console.log("PROXY /api to", target)
221
230
  }
222
231
 
223
- let dbServer
224
- if(argv.withDb) {
225
- dbServer = await setupDbServer(argv)
226
- //app.dao.dispose()
227
- const loopbackDao = await createLoopbackDao('local', () => dbServer.createDao('local'))
228
- loopbackDao.prepareSource(app.dao.definition.database)
229
- loopbackDao.prepareSource(app.dao.definition.store)
230
- }
231
-
232
232
  if(argv.createDb) {
233
233
  const list = await app.dao.get(['database', 'databasesList'])
234
234
  console.log("EXISTING DATABASES", list)
@@ -240,7 +240,7 @@ async function ssrServer(argv, dev) {
240
240
 
241
241
  let apiServer
242
242
  if(argv.withApi) {
243
- apiServer = await setupApiServer(argv, dbServer)
243
+ apiServer = await setupApiServer(argv)
244
244
  }
245
245
 
246
246
  const ssrServer = new SsrServer(expressApp, manifest, {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@live-change/cli",
3
- "version": "0.1.8",
3
+ "version": "0.1.9",
4
4
  "description": "Live Change Framework - command line interface",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -28,8 +28,8 @@
28
28
  "@live-change/dao-sockjs": "^0.2.0",
29
29
  "@live-change/dao-websocket": "^0.3.1",
30
30
  "@live-change/db-server": "^0.4.80",
31
- "@live-change/framework": "^0.4.36",
32
- "@live-change/server": "^0.1.3",
31
+ "@live-change/framework": "^0.5.0",
32
+ "@live-change/server": "^0.1.7",
33
33
  "@live-change/vue3-ssr": "^0.1.1",
34
34
  "dotenv": "^10.0.0",
35
35
  "express": "^4.17.1",