@emuanalytics/flow-cli 1.3.123 → 1.3.125
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.
|
@@ -48,7 +48,7 @@ const builder = (args) => {
|
|
|
48
48
|
.option('description', { alias: 'd', describe: 'Description for new dataset', type: 'string' })
|
|
49
49
|
.option('databaseId', {
|
|
50
50
|
describe: 'ID of associated database (for multi-database apps only)',
|
|
51
|
-
type: 'string'
|
|
51
|
+
type: 'string',
|
|
52
52
|
})
|
|
53
53
|
.option('type', { alias: 't', describe: 'Type of dataset', type: 'string', choices: ['table', 'sql'] })
|
|
54
54
|
.option('source', { alias: 's', description: 'Dataset source', type: 'string' })
|
|
@@ -56,20 +56,30 @@ const builder = (args) => {
|
|
|
56
56
|
alias: 'i',
|
|
57
57
|
describe: 'Show interactive prompts',
|
|
58
58
|
type: 'boolean',
|
|
59
|
-
default: 'true'
|
|
59
|
+
default: 'true',
|
|
60
60
|
})
|
|
61
61
|
.option('autodetect', { describe: 'Autodetect geometry', type: 'boolean' })
|
|
62
|
+
.option('geometryType', { describe: 'Geometry type (ignored when autodetect=true)', type: 'string' })
|
|
62
63
|
.option('srid', { describe: 'Geometry SRID (ignored when autodetect=true)', type: 'number' })
|
|
63
64
|
.option('extent', {
|
|
64
65
|
description: 'Geometry extent x1,y1,x2,y2 (lng/lat) (ignored when autodetect=true)',
|
|
65
|
-
type: 'array'
|
|
66
|
+
type: 'array',
|
|
66
67
|
});
|
|
67
68
|
};
|
|
68
69
|
exports.builder = builder;
|
|
69
70
|
const handler = (params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
70
71
|
try {
|
|
71
72
|
const databases = yield getDatabases(params.host, params.apiKey);
|
|
72
|
-
const databaseChoices = databases.map(db => ({ name: db.name, value: db.id, short: db.name }));
|
|
73
|
+
const databaseChoices = databases.map((db) => ({ name: db.name, value: db.id, short: db.name }));
|
|
74
|
+
const geometryTypeChoices = [
|
|
75
|
+
'Point',
|
|
76
|
+
'LineString',
|
|
77
|
+
'Polygon',
|
|
78
|
+
'MultiPoint',
|
|
79
|
+
'MultiLineString',
|
|
80
|
+
'MultiPolygon',
|
|
81
|
+
'Geometry',
|
|
82
|
+
];
|
|
73
83
|
if (params.interactive) {
|
|
74
84
|
const answers = yield inquirer.prompt([
|
|
75
85
|
{ type: 'input', name: 'name', message: 'Name for new dataset', default: params.name },
|
|
@@ -77,64 +87,73 @@ const handler = (params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
77
87
|
type: 'input',
|
|
78
88
|
name: 'description',
|
|
79
89
|
message: 'Description for new dataset',
|
|
80
|
-
default: params.description
|
|
90
|
+
default: params.description,
|
|
81
91
|
},
|
|
82
92
|
{
|
|
83
93
|
type: 'list',
|
|
84
94
|
name: 'databaseId',
|
|
85
95
|
message: 'Select the associated database',
|
|
86
96
|
choices: databaseChoices,
|
|
87
|
-
default: params.databaseId || databases.find(db => db.default).id,
|
|
88
|
-
when: () => databaseChoices.length > 1
|
|
97
|
+
default: params.databaseId || databases.find((db) => db.default).id,
|
|
98
|
+
when: () => databaseChoices.length > 1,
|
|
89
99
|
},
|
|
90
100
|
{
|
|
91
101
|
type: 'confirm',
|
|
92
102
|
name: 'autodetect',
|
|
93
103
|
message: 'Autodetect geometry?',
|
|
94
|
-
default: params.autodetect
|
|
104
|
+
default: params.autodetect,
|
|
105
|
+
},
|
|
106
|
+
{
|
|
107
|
+
type: 'list',
|
|
108
|
+
name: 'geometryType',
|
|
109
|
+
message: 'Geometry Type',
|
|
110
|
+
choices: geometryTypeChoices,
|
|
111
|
+
default: params.geometryType,
|
|
112
|
+
when: ({ autodetect }) => autodetect === false,
|
|
95
113
|
},
|
|
96
114
|
{
|
|
97
115
|
type: 'input',
|
|
98
116
|
name: 'srid',
|
|
99
117
|
message: 'Geometry SRID',
|
|
100
118
|
default: params.srid,
|
|
101
|
-
validate: val => (0, utils_1.isNumeric)(val) || 'Enter a number',
|
|
102
|
-
when: ({ autodetect }) => autodetect === false
|
|
119
|
+
validate: (val) => (0, utils_1.isNumeric)(val) || 'Enter a number',
|
|
120
|
+
when: ({ autodetect }) => autodetect === false,
|
|
103
121
|
},
|
|
104
122
|
{
|
|
105
123
|
type: 'input',
|
|
106
124
|
name: 'extent',
|
|
107
125
|
message: 'Map extent (x1 y1 x2 y2) (in SRID units)',
|
|
108
126
|
default: (0, utils_1.extentToString)(params.extent || [-180, -90, 180, 90]),
|
|
109
|
-
validate: val => (0, utils_1.isValidExtent)(val) || 'Enter lng/lat bounding box as x1 y1 x2 y2',
|
|
110
|
-
when: ({ autodetect }) => autodetect === false
|
|
127
|
+
validate: (val) => (0, utils_1.isValidExtent)(val) || 'Enter lng/lat bounding box as x1 y1 x2 y2',
|
|
128
|
+
when: ({ autodetect }) => autodetect === false,
|
|
111
129
|
},
|
|
112
130
|
{
|
|
113
131
|
type: 'list',
|
|
114
132
|
name: 'type',
|
|
115
133
|
message: 'Type of dataset to create',
|
|
116
134
|
choices: ['table', 'sql'],
|
|
117
|
-
default: params.type
|
|
135
|
+
default: params.type,
|
|
118
136
|
},
|
|
119
137
|
{
|
|
120
138
|
type: 'input',
|
|
121
139
|
name: 'source',
|
|
122
140
|
message: 'Table name',
|
|
123
141
|
default: params.source,
|
|
124
|
-
when: ({ type }) => type === 'table'
|
|
142
|
+
when: ({ type }) => type === 'table',
|
|
125
143
|
},
|
|
126
144
|
{
|
|
127
145
|
type: 'editor',
|
|
128
146
|
name: 'source',
|
|
129
147
|
message: 'SQL query',
|
|
130
148
|
default: params.source,
|
|
131
|
-
when: ({ type }) => type === 'sql'
|
|
132
|
-
}
|
|
149
|
+
when: ({ type }) => type === 'sql',
|
|
150
|
+
},
|
|
133
151
|
]);
|
|
134
152
|
params.name = answers.name;
|
|
135
153
|
params.description = answers.description;
|
|
136
154
|
params.databaseId = answers.databaseId;
|
|
137
155
|
params.autodetect = answers.autodetect;
|
|
156
|
+
params.geometryType = answers.autodetect ? undefined : answers.geometryType;
|
|
138
157
|
params.srid = answers.autodetect ? undefined : answers.srid;
|
|
139
158
|
params.extent = answers.autodetect ? undefined : (0, utils_1.extentFromString)(answers.extent);
|
|
140
159
|
params.type = answers.type;
|
|
@@ -149,9 +168,10 @@ const handler = (params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
149
168
|
source: params.source,
|
|
150
169
|
options: {
|
|
151
170
|
autodetect: params.autodetect,
|
|
171
|
+
geometryType: params.geometryType,
|
|
152
172
|
srid: params.srid,
|
|
153
|
-
extent: params.extent
|
|
154
|
-
}
|
|
173
|
+
extent: params.extent,
|
|
174
|
+
},
|
|
155
175
|
};
|
|
156
176
|
newDataset = yield params.client.datasets.create(newDataset);
|
|
157
177
|
if (params.format === 'table') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/datasets/create.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAQqB;AACrB,yEAA4E;AAC5E,mDAAqC;AAGxB,QAAA,OAAO,GAAG,aAAa,CAAC;AAExB,QAAA,IAAI,GAAG,sBAAsB,CAAC;AAEpC,MAAM,OAAO,GAAG,CAAC,IAAgB,EAAE,EAAE;IAC1C,OAAO,IAAI;SACR,UAAU,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SAC5D,MAAM,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,sBAAsB,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SAChF,MAAM,CAAC,aAAa,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,6BAA6B,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SAC9F,MAAM,CAAC,YAAY,EAAE;QACpB,QAAQ,EAAE,0DAA0D;QACpE,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,iBAAiB,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;SACtG,MAAM,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,gBAAgB,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SAC/E,MAAM,CAAC,aAAa,EAAE;QACrB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,0BAA0B;QACpC,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,MAAM;KAChB,CAAC;SACD,MAAM,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,qBAAqB,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;SAC1E,MAAM,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,8CAA8C,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SAC5F,MAAM,CAAC,QAAQ,EAAE;QAChB,WAAW,EAAE,sEAAsE;QACnF,IAAI,EAAE,OAAO;KACd,CAAC,CAAC;AACP,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/datasets/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,23 +50,34 @@ const builder = (args) => {
|
|
|
50
50
|
alias: 'i',
|
|
51
51
|
describe: 'Show interactive prompts',
|
|
52
52
|
type: 'boolean',
|
|
53
|
-
default: 'true'
|
|
53
|
+
default: 'true',
|
|
54
54
|
})
|
|
55
55
|
.option('autodetect', { describe: 'Autodetect geometry', type: 'boolean' })
|
|
56
|
+
.option('geometryType', { describe: 'Geometry type (ignored when autodetect=true)', type: 'string' })
|
|
56
57
|
.option('srid', { describe: 'Geometry SRID (ignored when autodetect=true)', type: 'number' })
|
|
57
58
|
.option('extent', {
|
|
58
59
|
description: 'Geometry extent x1,y1,x2,y2 (lng/lat) (ignored when autodetect=true)',
|
|
59
|
-
type: 'array'
|
|
60
|
+
type: 'array',
|
|
60
61
|
})
|
|
61
62
|
.positional('id', { describe: 'Dataset id (or unique prefix)', type: 'string' });
|
|
62
63
|
};
|
|
63
64
|
exports.builder = builder;
|
|
64
65
|
function handler(params) {
|
|
66
|
+
var _a, _b, _c, _d;
|
|
65
67
|
return __awaiter(this, void 0, void 0, function* () {
|
|
66
68
|
const client = params.client;
|
|
67
69
|
const id = params.id;
|
|
68
70
|
try {
|
|
69
71
|
const ds = yield (0, utils_1.resolveResource)(id, client.datasets);
|
|
72
|
+
const geometryTypeChoices = [
|
|
73
|
+
'Point',
|
|
74
|
+
'LineString',
|
|
75
|
+
'Polygon',
|
|
76
|
+
'MultiPoint',
|
|
77
|
+
'MultiLineString',
|
|
78
|
+
'MultiPolygon',
|
|
79
|
+
'Geometry',
|
|
80
|
+
];
|
|
70
81
|
if (params.interactive) {
|
|
71
82
|
const answers = yield inquirer.prompt([
|
|
72
83
|
{ type: 'input', name: 'name', message: 'Name', default: params.name || ds.name },
|
|
@@ -74,7 +85,7 @@ function handler(params) {
|
|
|
74
85
|
type: 'input',
|
|
75
86
|
name: 'description',
|
|
76
87
|
message: 'Description',
|
|
77
|
-
default: params.description || ds.description
|
|
88
|
+
default: params.description || ds.description,
|
|
78
89
|
},
|
|
79
90
|
{
|
|
80
91
|
type: 'confirm',
|
|
@@ -84,49 +95,58 @@ function handler(params) {
|
|
|
84
95
|
? params.autodetect
|
|
85
96
|
: ds.options && ds.options.hasOwnProperty('autodetect')
|
|
86
97
|
? ds.options.autodetect
|
|
87
|
-
: true
|
|
98
|
+
: true,
|
|
99
|
+
},
|
|
100
|
+
{
|
|
101
|
+
type: 'list',
|
|
102
|
+
name: 'geometryType',
|
|
103
|
+
message: 'Geometry Type',
|
|
104
|
+
choices: geometryTypeChoices,
|
|
105
|
+
default: params.geometryType || ((_a = ds.options) === null || _a === void 0 ? void 0 : _a.geometryType) || 'Geometry',
|
|
106
|
+
when: ({ autodetect }) => autodetect === false,
|
|
88
107
|
},
|
|
89
108
|
{
|
|
90
109
|
type: 'input',
|
|
91
110
|
name: 'srid',
|
|
92
111
|
message: 'Geometry SRID',
|
|
93
|
-
default: params.srid
|
|
94
|
-
validate: val => (0, utils_1.isNumeric)(val) || 'Enter a number',
|
|
95
|
-
when: ({ autodetect }) => autodetect === false
|
|
112
|
+
default: (_d = (_b = params.srid) !== null && _b !== void 0 ? _b : (_c = ds.options) === null || _c === void 0 ? void 0 : _c.srid) !== null && _d !== void 0 ? _d : 4326,
|
|
113
|
+
validate: (val) => (0, utils_1.isNumeric)(val) || 'Enter a number',
|
|
114
|
+
when: ({ autodetect }) => autodetect === false,
|
|
96
115
|
},
|
|
97
116
|
{
|
|
98
117
|
type: 'input',
|
|
99
118
|
name: 'extent',
|
|
100
119
|
message: 'Map extent (x1 y1 x2 y2) (in SRID units)',
|
|
101
120
|
default: (0, utils_1.extentToString)(params.extent || (ds.options && ds.options.extent) || [-180, -90, 180, 90]),
|
|
102
|
-
validate: val => (0, utils_1.isValidExtent)(val) || 'Enter lng/lat bounding box as x1 y1 x2 y2',
|
|
103
|
-
when: ({ autodetect }) => autodetect === false
|
|
121
|
+
validate: (val) => (0, utils_1.isValidExtent)(val) || 'Enter lng/lat bounding box as x1 y1 x2 y2',
|
|
122
|
+
when: ({ autodetect }) => autodetect === false,
|
|
104
123
|
},
|
|
105
124
|
{
|
|
106
125
|
type: 'list',
|
|
107
126
|
name: 'type',
|
|
108
127
|
message: 'Source type',
|
|
109
128
|
choices: ['table', 'sql'],
|
|
110
|
-
default: params.type || ds.type
|
|
129
|
+
default: params.type || ds.type,
|
|
111
130
|
},
|
|
112
131
|
{
|
|
113
132
|
type: 'input',
|
|
114
133
|
name: 'source',
|
|
115
134
|
message: 'Table name',
|
|
116
135
|
default: params.source || ds.source,
|
|
117
|
-
when: ({ type }) => type === 'table'
|
|
136
|
+
when: ({ type }) => type === 'table',
|
|
118
137
|
},
|
|
119
138
|
{
|
|
120
139
|
type: 'editor',
|
|
121
140
|
name: 'source',
|
|
122
141
|
message: 'SQL query',
|
|
123
142
|
default: params.source || ds.source,
|
|
124
|
-
when: ({ type }) => type === 'sql'
|
|
125
|
-
}
|
|
143
|
+
when: ({ type }) => type === 'sql',
|
|
144
|
+
},
|
|
126
145
|
]);
|
|
127
146
|
params.name = answers.name;
|
|
128
147
|
params.description = answers.description;
|
|
129
148
|
params.autodetect = answers.autodetect;
|
|
149
|
+
params.geometryType = answers.geometryType;
|
|
130
150
|
params.srid = answers.autodetect ? undefined : answers.srid;
|
|
131
151
|
params.extent = answers.autodetect ? undefined : (0, utils_1.extentFromString)(answers.extent);
|
|
132
152
|
params.type = answers.type;
|
|
@@ -140,11 +160,12 @@ function handler(params) {
|
|
|
140
160
|
source: params.source,
|
|
141
161
|
options: {
|
|
142
162
|
autodetect: params.autodetect,
|
|
163
|
+
geometryType: params.geometryType,
|
|
143
164
|
srid: params.srid,
|
|
144
|
-
extent: params.extent
|
|
145
|
-
}
|
|
165
|
+
extent: params.extent,
|
|
166
|
+
},
|
|
146
167
|
});
|
|
147
|
-
const geomAttr = updatedDs.attributes.find(attr => attr.isGeometry);
|
|
168
|
+
const geomAttr = updatedDs.attributes.find((attr) => attr.isGeometry);
|
|
148
169
|
if (params.format === 'table') {
|
|
149
170
|
(0, utils_1.logObject)(updatedDs, 'table');
|
|
150
171
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/commands/datasets/update.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAUqB;AAErB,mDAAqC;AAGxB,QAAA,OAAO,GAAG,CAAC,aAAa,CAAC,CAAC;AAE1B,QAAA,IAAI,GAAG,kBAAkB,CAAC;AAEhC,MAAM,OAAO,GAAG,CAAC,IAAgB,EAAE,EAAE;IAC1C,OAAO,IAAI;SACR,MAAM,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;SACtG,MAAM,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,gBAAgB,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SAC/E,MAAM,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SAC3E,MAAM,CAAC,aAAa,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,qBAAqB,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SACzF,MAAM,CAAC,aAAa,EAAE;QACrB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,0BAA0B;QACpC,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,MAAM;KAChB,CAAC;SACD,MAAM,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,qBAAqB,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;SAC1E,MAAM,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,8CAA8C,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SAC5F,MAAM,CAAC,QAAQ,EAAE;QAChB,WAAW,EAAE,sEAAsE;QACnF,IAAI,EAAE,OAAO;KACd,CAAC;SACD,UAAU,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,+BAA+B,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;AACrF,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/commands/datasets/update.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@emuanalytics/flow-cli",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.125",
|
|
4
4
|
"main": "index.js",
|
|
5
5
|
"author": "Robin Summerhill <robin.summerhill@emu-analytics.net",
|
|
6
6
|
"license": "Copyright 2018 Emu Analytics Limited",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"typescript": "^4.7.4"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
|
-
"@emuanalytics/flow-engine-client": "^1.3.
|
|
45
|
+
"@emuanalytics/flow-engine-client": "^1.3.125",
|
|
46
46
|
"@types/uuid": "^8.3.4",
|
|
47
47
|
"JSONStream": "^1.3.5",
|
|
48
48
|
"chalk": "^2.0.1",
|
|
@@ -80,5 +80,5 @@
|
|
|
80
80
|
"git add"
|
|
81
81
|
]
|
|
82
82
|
},
|
|
83
|
-
"gitHead": "
|
|
83
|
+
"gitHead": "e64c9503d859b87b6215fbe2ad3bd33d2f728127"
|
|
84
84
|
}
|