@osaas/cli 0.15.2 → 0.15.3
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/dist/user/util.d.ts.map +1 -1
- package/dist/user/util.js +2 -1
- package/dist/user/util.js.map +1 -1
- package/package.json +2 -2
- package/src/user/util.test.ts +6 -0
- package/src/user/util.ts +2 -1
package/dist/user/util.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/user/util.ts"],"names":[],"mappings":"AAEA,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,SAAS;;
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/user/util.ts"],"names":[],"mappings":"AAEA,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,SAAS;;EA0B/D;AAED,wBAAsB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBxE"}
|
package/dist/user/util.js
CHANGED
|
@@ -10,7 +10,8 @@ function instanceOptsToPayload(opts) {
|
|
|
10
10
|
if (opts) {
|
|
11
11
|
opts.map((kv) => {
|
|
12
12
|
const regex = /=(?=(?:[^"]*"[^"]*")*[^"]*$)/;
|
|
13
|
-
const [key,
|
|
13
|
+
const [key, ...rest] = kv.split(regex);
|
|
14
|
+
const value = rest.join('=');
|
|
14
15
|
const subkeys = key.split('.');
|
|
15
16
|
if (subkeys.length > 1) {
|
|
16
17
|
let current = payload;
|
package/dist/user/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/user/util.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAqC;AAErC,SAAgB,qBAAqB,CAAC,IAA0B;IAC9D,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,IAAI,IAAI,EAAE;QACR,IAAI,CAAC,GAAG,CAAC,CAAC,EAAU,EAAE,EAAE;YACtB,MAAM,KAAK,GAAG,8BAA8B,CAAC;YAC7C,MAAM,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/user/util.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAqC;AAErC,SAAgB,qBAAqB,CAAC,IAA0B;IAC9D,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,IAAI,IAAI,EAAE;QACR,IAAI,CAAC,GAAG,CAAC,CAAC,EAAU,EAAE,EAAE;YACtB,MAAM,KAAK,GAAG,8BAA8B,CAAC;YAC7C,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACvC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7B,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtB,IAAI,OAAO,GAAG,OAAO,CAAC;gBACtB,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;oBAChC,IAAI,KAAK,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;wBAChC,OAAO,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;qBACzB;yBAAM;wBACL,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;4BACpB,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;yBACtB;wBACD,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;qBAC3B;gBACH,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;aACtB;QACH,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AA1BD,sDA0BC;AAEM,KAAK,UAAU,OAAO,CAAC,OAA2B;IACvD,MAAM,EAAE,GAAG,uBAAQ,CAAC,eAAe,CAAC;QAClC,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;IAEH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,EAAE,CAAC,QAAQ,CAAC,OAAO,IAAI,yBAAyB,EAAE,CAAC,MAAM,EAAE,EAAE;YAC3D,EAAE,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YAC5C,IAAI,OAAO,KAAK,KAAK,EAAE;gBACrB,OAAO,EAAE,CAAC;aACX;iBAAM;gBACL,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;aACtC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAjBD,0BAiBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@osaas/cli",
|
|
3
|
-
"version": "0.15.
|
|
3
|
+
"version": "0.15.3",
|
|
4
4
|
"description": "Open Source Cloud CLI",
|
|
5
5
|
"author": "Eyevinn Technology <work@eyevinn.se>",
|
|
6
6
|
"homepage": "https://www.osaas.io",
|
|
@@ -37,5 +37,5 @@
|
|
|
37
37
|
"publishConfig": {
|
|
38
38
|
"access": "public"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "78c608dc564776400925290760c0c24dc9103087"
|
|
41
41
|
}
|
package/src/user/util.test.ts
CHANGED
|
@@ -6,4 +6,10 @@ describe('util functions', () => {
|
|
|
6
6
|
const payload = instanceOptsToPayload(opts);
|
|
7
7
|
expect(payload).toEqual({ cmdLineArgs: '-i "hejhopp=tjohopp"' });
|
|
8
8
|
});
|
|
9
|
+
|
|
10
|
+
test('can parse instance options containing = not in quotes', () => {
|
|
11
|
+
const opts = [`cmdLineArgs=-i hejhopp=tjohopp`];
|
|
12
|
+
const payload = instanceOptsToPayload(opts);
|
|
13
|
+
expect(payload).toEqual({ cmdLineArgs: '-i hejhopp=tjohopp' });
|
|
14
|
+
});
|
|
9
15
|
});
|
package/src/user/util.ts
CHANGED
|
@@ -5,7 +5,8 @@ export function instanceOptsToPayload(opts: string[] | undefined) {
|
|
|
5
5
|
if (opts) {
|
|
6
6
|
opts.map((kv: string) => {
|
|
7
7
|
const regex = /=(?=(?:[^"]*"[^"]*")*[^"]*$)/;
|
|
8
|
-
const [key,
|
|
8
|
+
const [key, ...rest] = kv.split(regex);
|
|
9
|
+
const value = rest.join('=');
|
|
9
10
|
const subkeys = key.split('.');
|
|
10
11
|
if (subkeys.length > 1) {
|
|
11
12
|
let current = payload;
|