@tremho/mist-lift 2.0.0 → 2.0.1
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/README.md +8 -1
- package/build/commands/create.js +9 -1
- package/build/commands/create.js.map +1 -1
- package/build/commands/start.js +22 -20
- package/build/commands/start.js.map +1 -1
- package/package.json +3 -3
- package/src/commands/create.ts +8 -1
- package/src/commands/start.ts +19 -16
package/README.md
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
|
|
4
4
|
_CLI tools and structured project support for easy-access cloud development_
|
|
5
5
|
|
|
6
|
-
[![NPM version][npm-image]][npm-url]
|
|
6
|
+
[![NPM version][npm-image]][npm-url]
|
|
7
7
|
[![Downloads][downloads-image]][npm-url]
|
|
8
8
|
[![TotalDownloads][total-downloads-image]][npm-url]
|
|
9
9
|
|
|
@@ -56,6 +56,9 @@ To get started using MistLift, please see the [QuickStart Guide](https://github.
|
|
|
56
56
|
|
|
57
57
|
## Changelog
|
|
58
58
|
|
|
59
|
+
### 2.0.1
|
|
60
|
+
- Fixes sourcemap issues, via @tremho/gen-logger 2.0.1
|
|
61
|
+
|
|
59
62
|
### 2.0.0
|
|
60
63
|
- Revised logging implementation using [@tremho/gen-logger](https://www.npmjs.com/package/@tremho/gen-logger)
|
|
61
64
|
- Numerous bug fixes
|
|
@@ -106,3 +109,7 @@ This is breaking because any previous service definition files need to change th
|
|
|
106
109
|
|
|
107
110
|
|
|
108
111
|
|
|
112
|
+
|
|
113
|
+
|
|
114
|
+
|
|
115
|
+
|
package/build/commands/create.js
CHANGED
|
@@ -57,7 +57,15 @@ function doCreate(funcName // name of function to create
|
|
|
57
57
|
if (!fs.existsSync(path.join(funcPath, 'src', 'commonLib'))) {
|
|
58
58
|
const funcSrc = path.join(funcPath, 'src');
|
|
59
59
|
const relPath = path.relative(funcSrc, projectPaths.basePath);
|
|
60
|
-
|
|
60
|
+
let from = path.join(relPath, 'commonLib');
|
|
61
|
+
let to = path.join(funcSrc, 'lib');
|
|
62
|
+
if (path.sep !== '/') {
|
|
63
|
+
while (from.indexOf('/') !== -1)
|
|
64
|
+
from = from.replace('/', path.sep);
|
|
65
|
+
while (to.indexOf('/') !== -1)
|
|
66
|
+
to = to.replace('/', path.sep);
|
|
67
|
+
}
|
|
68
|
+
fs.symlinkSync(from, to, 'dir');
|
|
61
69
|
}
|
|
62
70
|
let localsrc = fs.readFileSync(path.join(dataDir, 'function-local-ts')).toString();
|
|
63
71
|
while (localsrc.includes('$$FUNCTION_NAME$$')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":";AAAA,uDAAuD;;;;;;;;;;;;;;;;;;;;;;;;;;AAEvD,uCAAwB;AACxB,2CAA4B;AAC5B,gDAAiC;AACjC,oDAAiD;AACjD,gDAA4C;AAC5C,iCAAmC;AAEnC,kBAAkB;AAClB,SAAgB,QAAQ,CACtB,QAAiB,CAAC,6BAA6B;;IAE/C,IAAI,QAAQ,KAAK,EAAE,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC9C,IAAA,iBAAU,GAAE,CAAA;IACd,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,8BAA8B,CAAC,GAAG,QAAQ,CAAC,CAAA;QAErE,MAAM,YAAY,GAAG,IAAA,0BAAY,GAAE,CAAA;QACnC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,0CAA0C,CAAC,CAAC,CAAA;YACxE,OAAM;QACR,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;QAC/D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;YAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QACpD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAA;QAEhE,MAAM,WAAW,GAAG,IAAA,qBAAS,EAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;QAClD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAA;QACpG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAA;QAExF,4BAA4B;QAC5B,IAAG,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC;YAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;YAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;YAC7D,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"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"}
|
package/build/commands/start.js
CHANGED
|
@@ -79,21 +79,17 @@ function startLocalServer() {
|
|
|
79
79
|
app.use('*', all_1.default);
|
|
80
80
|
startServers();
|
|
81
81
|
funcWatcher(path_1.default.join(projectPaths.basePath, 'functions'), path_1.default.join(projectPaths.basePath, 'webroot'));
|
|
82
|
+
// sleep(5000).then(() => esbuilder())
|
|
82
83
|
esbuilder();
|
|
83
84
|
});
|
|
84
85
|
}
|
|
85
86
|
exports.startLocalServer = startLocalServer;
|
|
86
87
|
function startServers() {
|
|
87
88
|
startWebSocketConnection(app);
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
});
|
|
93
|
-
}
|
|
94
|
-
catch (e) {
|
|
95
|
-
// console.error(e)
|
|
96
|
-
}
|
|
89
|
+
server = app.listen(serverConfig.port, function () {
|
|
90
|
+
var _a;
|
|
91
|
+
console.log(`http listening on port ${(_a = serverConfig.port) !== null && _a !== void 0 ? _a : defaultPort}`);
|
|
92
|
+
});
|
|
97
93
|
}
|
|
98
94
|
function readServerConfig() {
|
|
99
95
|
// console.log('readServerConfig...')
|
|
@@ -169,19 +165,25 @@ function triggerRebuild() {
|
|
|
169
165
|
}
|
|
170
166
|
});
|
|
171
167
|
}
|
|
168
|
+
let closing = false;
|
|
172
169
|
function triggerBrowserRestart() {
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
170
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
171
|
+
if (closing) {
|
|
172
|
+
console.warn('restarting...');
|
|
173
|
+
return;
|
|
174
|
+
}
|
|
175
|
+
if (server) {
|
|
176
|
+
closing = true;
|
|
177
|
+
yield socketClose();
|
|
178
|
+
yield server.close();
|
|
179
|
+
yield sleep(1000);
|
|
180
|
+
closing = false;
|
|
177
181
|
startServers();
|
|
178
|
-
}
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
startServers();
|
|
184
|
-
}
|
|
182
|
+
}
|
|
183
|
+
else {
|
|
184
|
+
closing = false;
|
|
185
|
+
}
|
|
186
|
+
});
|
|
185
187
|
}
|
|
186
188
|
class WSConnection {
|
|
187
189
|
constructor() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yBAAyB;AACzB,sDAA6B;AAE7B,iDAAkC;AAClC,4DAA+B;AAC/B,4DAAkC;AAElC,kFAAgF;AAEhF,+DAA4C;AAC5C,4DAA2D;AAC3D,oDAAiD;AACjD,mCAAsC;AAEtC,gDAAiC;AAEjC,gDAAuB;AACvB,4CAAmB;AAInB,MAAM,WAAW,GAAG,IAAI,CAAA;AACxB,MAAM,YAAY,GAAG,gBAAgB,EAAE,CAAC;AACxC,IAAI,MAAM,GAAO,IAAI,CAAA;AACrB,MAAM,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAA;AAErB,SAAsB,gBAAgB;;QACpC,mCAAmC;QACnC,MAAM,YAAY,GAAG,IAAA,0BAAY,GAAE,CAAA;QACnC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC,CAAA;YACrD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,2CAA2C,CAAC,CAAC,CAAA;YACxE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YACf,OAAM;QACR,CAAC;QAED,yDAAyD;QACzD,MAAM,IAAA,oBAAY,EAAC,EAAE,CAAC,CAAA;QACtB,MAAM,IAAA,eAAS,GAAE,CAAA;QACjB,sCAAsC;QACtC,MAAM,IAAA,+BAAc,GAAE,CAAA;QACtB,2CAA2C;QAC3C,iBAAiB;QACjB,4CAA4C;QAC5C,GAAG,CAAC,GAAG,CAAC,iBAAO,CAAC,IAAI,EAAE,CAAC,CAAA;QACvB,iBAAiB;QACjB,GAAG,CAAC,GAAG,CAAC,iBAAO,CAAC,UAAU,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC,CAAA;QAE7C,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,wBAAc,CAAC,CAAA;QAC5B,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,aAAS,CAAC,CAAA;QAC1B,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,aAAS,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tremho/mist-lift",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.1",
|
|
4
4
|
"description": "lift command line utility for MistLift development",
|
|
5
5
|
"main": "build/lift.js",
|
|
6
6
|
"bin": {
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"@aws-sdk/client-api-gateway": "^3.598.0",
|
|
52
52
|
"@aws-sdk/client-lambda": "^3.598.0",
|
|
53
53
|
"@aws-sdk/credential-providers": "^3.598.0",
|
|
54
|
-
"@tremho/inverse-y": "^2.0.
|
|
54
|
+
"@tremho/inverse-y": "^2.0.1",
|
|
55
55
|
"@tremho/session-tbd": "^2.0.0-pre-release.13",
|
|
56
56
|
"ansi-colors": "^4.1.3",
|
|
57
57
|
"body-parser": "^1.20.2",
|
|
@@ -80,4 +80,4 @@
|
|
|
80
80
|
"ts-standard": "^12.0.2",
|
|
81
81
|
"typescript": "^5.4.5"
|
|
82
82
|
}
|
|
83
|
-
}
|
|
83
|
+
}
|
package/src/commands/create.ts
CHANGED
|
@@ -33,7 +33,14 @@ export function doCreate (
|
|
|
33
33
|
if(!fs.existsSync(path.join(funcPath, 'src', 'commonLib'))) {
|
|
34
34
|
const funcSrc = path.join(funcPath, 'src')
|
|
35
35
|
const relPath = path.relative(funcSrc, projectPaths.basePath)
|
|
36
|
-
|
|
36
|
+
let from = path.join(relPath, 'commonLib');
|
|
37
|
+
let to = path.join(funcSrc, 'lib')
|
|
38
|
+
if(path.sep !== '/') {
|
|
39
|
+
while(from.indexOf('/') !== -1) from = from.replace('/', path.sep)
|
|
40
|
+
while(to.indexOf('/') !== -1) to = to.replace('/', path.sep)
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
fs.symlinkSync(from, to, 'dir')
|
|
37
44
|
}
|
|
38
45
|
|
|
39
46
|
let localsrc = fs.readFileSync(path.join(dataDir, 'function-local-ts')).toString()
|
package/src/commands/start.ts
CHANGED
|
@@ -50,21 +50,19 @@ export async function startLocalServer (): Promise<void> {
|
|
|
50
50
|
app.use('/api', apiRouter)
|
|
51
51
|
app.use('*', allRouter)
|
|
52
52
|
|
|
53
|
+
|
|
53
54
|
startServers()
|
|
54
55
|
|
|
55
56
|
funcWatcher(path.join(projectPaths.basePath, 'functions'), path.join(projectPaths.basePath, 'webroot'));
|
|
57
|
+
// sleep(5000).then(() => esbuilder())
|
|
56
58
|
esbuilder()
|
|
57
59
|
|
|
58
60
|
}
|
|
59
61
|
function startServers() {
|
|
60
62
|
startWebSocketConnection(app)
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
})
|
|
65
|
-
} catch(e:any) {
|
|
66
|
-
// console.error(e)
|
|
67
|
-
}
|
|
63
|
+
server = app.listen(serverConfig.port, function () {
|
|
64
|
+
console.log(`http listening on port ${serverConfig.port ?? defaultPort}`)
|
|
65
|
+
})
|
|
68
66
|
}
|
|
69
67
|
|
|
70
68
|
function readServerConfig() {
|
|
@@ -144,17 +142,22 @@ async function triggerRebuild() {
|
|
|
144
142
|
}
|
|
145
143
|
}
|
|
146
144
|
|
|
147
|
-
|
|
148
|
-
|
|
145
|
+
let closing = false
|
|
146
|
+
|
|
147
|
+
async function triggerBrowserRestart() {
|
|
148
|
+
if(closing) {
|
|
149
|
+
console.warn('restarting...')
|
|
150
|
+
return
|
|
151
|
+
}
|
|
149
152
|
if(server) {
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
} else {
|
|
156
|
-
// console.log("first start of servers")
|
|
153
|
+
closing = true;
|
|
154
|
+
await socketClose();
|
|
155
|
+
await server.close();
|
|
156
|
+
await sleep(1000)
|
|
157
|
+
closing = false
|
|
157
158
|
startServers()
|
|
159
|
+
} else {
|
|
160
|
+
closing = false
|
|
158
161
|
}
|
|
159
162
|
}
|
|
160
163
|
|