@cogeotiff/cli 6.0.0 → 6.1.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/CHANGELOG.md +38 -0
- package/bin/cogeotiff.js +3 -0
- package/build/action.util.d.ts.map +1 -1
- package/build/action.util.js +5 -19
- package/package.json +6 -7
- package/src/action.util.ts +3 -16
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,44 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [6.1.1](https://github.com/blacha/cogeotiff/compare/v6.1.0...v6.1.1) (2022-01-26)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @cogeotiff/cli
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
# [6.1.0](https://github.com/blacha/cogeotiff/compare/v6.0.2...v6.1.0) (2021-09-30)
|
|
15
|
+
|
|
16
|
+
**Note:** Version bump only for package @cogeotiff/cli
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
## [6.0.2](https://github.com/blacha/cogeotiff/compare/v6.0.1...v6.0.2) (2021-09-16)
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
### Bug Fixes
|
|
26
|
+
|
|
27
|
+
* upgrade to latest chunkd fixes issue with missing fetchBytes function ([9b33cbf](https://github.com/blacha/cogeotiff/commit/9b33cbfe02acaa1248895203c1a55002b82d1a49))
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
## [6.0.1](https://github.com/blacha/cogeotiff/compare/v6.0.0...v6.0.1) (2021-09-15)
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
### Bug Fixes
|
|
37
|
+
|
|
38
|
+
* missing bin file ([3e5beb0](https://github.com/blacha/cogeotiff/commit/3e5beb03664cbea3b7bfb64c8a3a4e2dac7d623d))
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
|
|
6
44
|
# [6.0.0](https://github.com/blacha/cogeotiff/compare/v5.0.0...v6.0.0) (2021-09-11)
|
|
7
45
|
|
|
8
46
|
|
package/bin/cogeotiff.js
ADDED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.util.d.ts","sourceRoot":"","sources":["../src/action.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"action.util.d.ts","sourceRoot":"","sources":["../src/action.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAIxE,MAAM,WAAW,gBAAgB;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,GAAG,IAAI,CAAC;CACtD;AACD,MAAM,WAAW,YAAY;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,CAAC,gBAAgB,GAAG,IAAI,CAAC,EAAE,CAAC;CACrC;AAED,eAAO,MAAM,UAAU;;gBAC6D,WAAW;aAAO,OAAO;;wBAWrF,MAAM,UAAU,YAAY,EAAE,GAAG,MAAM,EAAE;CAmBhE,CAAC"}
|
package/build/action.util.js
CHANGED
|
@@ -1,29 +1,15 @@
|
|
|
1
1
|
import { CogTiff } from '@cogeotiff/core';
|
|
2
|
-
import {
|
|
3
|
-
import { SourceFile } from '@chunkd/source-file';
|
|
4
|
-
import { SourceUrl } from '@chunkd/source-url';
|
|
2
|
+
import { fsa } from '@chunkd/fs';
|
|
5
3
|
import c from 'ansi-colors';
|
|
6
|
-
import S3 from 'aws-sdk/clients/s3.js';
|
|
7
4
|
import { logger as CliLogger } from './cli.log.js';
|
|
8
|
-
const DefaultS3 = new S3();
|
|
9
5
|
export const ActionUtil = {
|
|
10
6
|
async getCogSource(file) {
|
|
11
7
|
if (file == null || file.value == null) {
|
|
12
8
|
throw new Error(`File "${file} is not valid`);
|
|
13
9
|
}
|
|
14
|
-
|
|
15
|
-
if (
|
|
16
|
-
|
|
17
|
-
}
|
|
18
|
-
else if (file.value.startsWith('s3://')) {
|
|
19
|
-
const src = SourceAwsS3.fromUri(file.value, DefaultS3);
|
|
20
|
-
if (src == null)
|
|
21
|
-
throw new Error(`Unable to parse s3 uri: ${file.value}`);
|
|
22
|
-
source = src;
|
|
23
|
-
}
|
|
24
|
-
else {
|
|
25
|
-
source = new SourceFile(file.value);
|
|
26
|
-
}
|
|
10
|
+
const source = fsa.source(file.value);
|
|
11
|
+
if (source == null)
|
|
12
|
+
throw new Error(`File "${file} is not valid`);
|
|
27
13
|
const tif = new CogTiff(source);
|
|
28
14
|
await tif.init(false, CliLogger);
|
|
29
15
|
return { source, tif };
|
|
@@ -48,4 +34,4 @@ export const ActionUtil = {
|
|
|
48
34
|
return msg;
|
|
49
35
|
},
|
|
50
36
|
};
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWN0aW9uLnV0aWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvYWN0aW9uLnV0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzFDLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFakMsT0FBTyxDQUFDLE1BQU0sYUFBYSxDQUFDO0FBQzVCLE9BQU8sRUFBRSxNQUFNLElBQUksU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBV25ELE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN0QixLQUFLLENBQUMsWUFBWSxDQUFDLElBQXdDO1FBQ3ZELElBQUksSUFBSSxJQUFJLElBQUksSUFBSSxJQUFJLENBQUMsS0FBSyxJQUFJLElBQUksRUFBRTtZQUNwQyxNQUFNLElBQUksS0FBSyxDQUFDLFNBQVMsSUFBSSxlQUFlLENBQUMsQ0FBQztTQUNqRDtRQUNELE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ3RDLElBQUksTUFBTSxJQUFJLElBQUk7WUFBRSxNQUFNLElBQUksS0FBSyxDQUFDLFNBQVMsSUFBSSxlQUFlLENBQUMsQ0FBQztRQUVsRSxNQUFNLEdBQUcsR0FBRyxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNoQyxNQUFNLEdBQUcsQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQ2pDLE9BQU8sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUNELFlBQVksQ0FBQyxLQUFhLEVBQUUsTUFBc0I7UUFDOUMsTUFBTSxHQUFHLEdBQWEsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUM5QixLQUFLLE1BQU0sS0FBSyxJQUFJLE1BQU0sRUFBRTtZQUN4QixHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQ2IsSUFBSSxLQUFLLENBQUMsS0FBSyxFQUFFO2dCQUNiLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQzthQUNqQztZQUNELEtBQUssTUFBTSxFQUFFLElBQUksS0FBSyxDQUFDLElBQUksRUFBRTtnQkFDekIsSUFBSSxFQUFFLElBQUksSUFBSSxFQUFFO29CQUNaLFNBQVM7aUJBQ1o7Z0JBQ0QsSUFBSSxFQUFFLENBQUMsS0FBSyxJQUFJLElBQUksSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDLEtBQUssS0FBSyxRQUFRLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRTtvQkFDOUUsU0FBUztpQkFDWjtnQkFDRCxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLEdBQUcsQ0FBQyxLQUFLLE1BQU0sQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFDO2FBQ2xFO1NBQ0o7UUFDRCxPQUFPLEdBQUcsQ0FBQztJQUNmLENBQUM7Q0FDSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ2h1bmtTb3VyY2UgfSBmcm9tICdAY2h1bmtkL2NvcmUnO1xuaW1wb3J0IHsgQ29nVGlmZiB9IGZyb20gJ0Bjb2dlb3RpZmYvY29yZSc7XG5pbXBvcnQgeyBmc2EgfSBmcm9tICdAY2h1bmtkL2ZzJztcbmltcG9ydCB7IENvbW1hbmRMaW5lU3RyaW5nUGFyYW1ldGVyIH0gZnJvbSAnQHJ1c2hzdGFjay90cy1jb21tYW5kLWxpbmUnO1xuaW1wb3J0IGMgZnJvbSAnYW5zaS1jb2xvcnMnO1xuaW1wb3J0IHsgbG9nZ2VyIGFzIENsaUxvZ2dlciB9IGZyb20gJy4vY2xpLmxvZy5qcyc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgQ0xpUmVzdWx0TWFwTGluZSB7XG4gICAga2V5OiBzdHJpbmc7XG4gICAgdmFsdWU6IHN0cmluZyB8IG51bWJlciB8IGJvb2xlYW4gfCBudW1iZXJbXSB8IG51bGw7XG59XG5leHBvcnQgaW50ZXJmYWNlIENsaVJlc3VsdE1hcCB7XG4gICAgdGl0bGU/OiBzdHJpbmc7XG4gICAga2V5czogKENMaVJlc3VsdE1hcExpbmUgfCBudWxsKVtdO1xufVxuXG5leHBvcnQgY29uc3QgQWN0aW9uVXRpbCA9IHtcbiAgICBhc3luYyBnZXRDb2dTb3VyY2UoZmlsZT86IENvbW1hbmRMaW5lU3RyaW5nUGFyYW1ldGVyIHwgbnVsbCk6IFByb21pc2U8eyBzb3VyY2U6IENodW5rU291cmNlOyB0aWY6IENvZ1RpZmYgfT4ge1xuICAgICAgICBpZiAoZmlsZSA9PSBudWxsIHx8IGZpbGUudmFsdWUgPT0gbnVsbCkge1xuICAgICAgICAgICAgdGhyb3cgbmV3IEVycm9yKGBGaWxlIFwiJHtmaWxlfSBpcyBub3QgdmFsaWRgKTtcbiAgICAgICAgfVxuICAgICAgICBjb25zdCBzb3VyY2UgPSBmc2Euc291cmNlKGZpbGUudmFsdWUpO1xuICAgICAgICBpZiAoc291cmNlID09IG51bGwpIHRocm93IG5ldyBFcnJvcihgRmlsZSBcIiR7ZmlsZX0gaXMgbm90IHZhbGlkYCk7XG5cbiAgICAgICAgY29uc3QgdGlmID0gbmV3IENvZ1RpZmYoc291cmNlKTtcbiAgICAgICAgYXdhaXQgdGlmLmluaXQoZmFsc2UsIENsaUxvZ2dlcik7XG4gICAgICAgIHJldHVybiB7IHNvdXJjZSwgdGlmIH07XG4gICAgfSxcbiAgICBmb3JtYXRSZXN1bHQodGl0bGU6IHN0cmluZywgcmVzdWx0OiBDbGlSZXN1bHRNYXBbXSk6IHN0cmluZ1tdIHtcbiAgICAgICAgY29uc3QgbXNnOiBzdHJpbmdbXSA9IFt0aXRsZV07XG4gICAgICAgIGZvciAoY29uc3QgZ3JvdXAgb2YgcmVzdWx0KSB7XG4gICAgICAgICAgICBtc2cucHVzaCgnJyk7XG4gICAgICAgICAgICBpZiAoZ3JvdXAudGl0bGUpIHtcbiAgICAgICAgICAgICAgICBtc2cucHVzaChjLmJvbGQoZ3JvdXAudGl0bGUpKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICAgIGZvciAoY29uc3Qga3Ygb2YgZ3JvdXAua2V5cykge1xuICAgICAgICAgICAgICAgIGlmIChrdiA9PSBudWxsKSB7XG4gICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlO1xuICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgICAgICBpZiAoa3YudmFsdWUgPT0gbnVsbCB8fCAodHlwZW9mIGt2LnZhbHVlID09PSAnc3RyaW5nJyAmJiBrdi52YWx1ZS50cmltKCkgPT09ICcnKSkge1xuICAgICAgICAgICAgICAgICAgICBjb250aW51ZTtcbiAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICAgICAgbXNnLnB1c2goYCAgICAke2t2LmtleS5wYWRFbmQoMTQsICcgJyl9ICAke1N0cmluZyhrdi52YWx1ZSl9YCk7XG4gICAgICAgICAgICB9XG4gICAgICAgIH1cbiAgICAgICAgcmV0dXJuIG1zZztcbiAgICB9LFxufTtcbiJdfQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cogeotiff/cli",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.1.1",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/blacha/cogeotiff.git",
|
|
@@ -17,15 +17,14 @@
|
|
|
17
17
|
},
|
|
18
18
|
"scripts": {},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@chunkd/
|
|
21
|
-
"@chunkd/
|
|
22
|
-
"@
|
|
23
|
-
"@cogeotiff/core": "^6.0.0",
|
|
20
|
+
"@chunkd/core": "^8.0.3",
|
|
21
|
+
"@chunkd/fs": "^8.0.3",
|
|
22
|
+
"@cogeotiff/core": "^6.1.1",
|
|
24
23
|
"@rushstack/ts-command-line": "^4.3.14",
|
|
25
24
|
"@types/pino": "^6.3.11",
|
|
26
25
|
"ansi-colors": "^4.1.1",
|
|
27
26
|
"aws-sdk": "^2.781.0",
|
|
28
|
-
"p-limit": "^
|
|
27
|
+
"p-limit": "^4.0.0",
|
|
29
28
|
"pino": "^6.13.2",
|
|
30
29
|
"pretty-json-log": "^1.0.0",
|
|
31
30
|
"source-map-support": "^0.5.12"
|
|
@@ -36,5 +35,5 @@
|
|
|
36
35
|
"publishConfig": {
|
|
37
36
|
"access": "public"
|
|
38
37
|
},
|
|
39
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "377f418fb624d01a1a4ed598ec8fce9c52f1372c"
|
|
40
39
|
}
|
package/src/action.util.ts
CHANGED
|
@@ -1,15 +1,10 @@
|
|
|
1
1
|
import { ChunkSource } from '@chunkd/core';
|
|
2
2
|
import { CogTiff } from '@cogeotiff/core';
|
|
3
|
-
import {
|
|
4
|
-
import { SourceFile } from '@chunkd/source-file';
|
|
5
|
-
import { SourceUrl } from '@chunkd/source-url';
|
|
3
|
+
import { fsa } from '@chunkd/fs';
|
|
6
4
|
import { CommandLineStringParameter } from '@rushstack/ts-command-line';
|
|
7
5
|
import c from 'ansi-colors';
|
|
8
|
-
import S3 from 'aws-sdk/clients/s3.js';
|
|
9
6
|
import { logger as CliLogger } from './cli.log.js';
|
|
10
7
|
|
|
11
|
-
const DefaultS3 = new S3();
|
|
12
|
-
|
|
13
8
|
export interface CLiResultMapLine {
|
|
14
9
|
key: string;
|
|
15
10
|
value: string | number | boolean | number[] | null;
|
|
@@ -24,16 +19,8 @@ export const ActionUtil = {
|
|
|
24
19
|
if (file == null || file.value == null) {
|
|
25
20
|
throw new Error(`File "${file} is not valid`);
|
|
26
21
|
}
|
|
27
|
-
|
|
28
|
-
if (
|
|
29
|
-
source = new SourceUrl(file.value);
|
|
30
|
-
} else if (file.value.startsWith('s3://')) {
|
|
31
|
-
const src = SourceAwsS3.fromUri(file.value, DefaultS3);
|
|
32
|
-
if (src == null) throw new Error(`Unable to parse s3 uri: ${file.value}`);
|
|
33
|
-
source = src;
|
|
34
|
-
} else {
|
|
35
|
-
source = new SourceFile(file.value);
|
|
36
|
-
}
|
|
22
|
+
const source = fsa.source(file.value);
|
|
23
|
+
if (source == null) throw new Error(`File "${file} is not valid`);
|
|
37
24
|
|
|
38
25
|
const tif = new CogTiff(source);
|
|
39
26
|
await tif.init(false, CliLogger);
|