@basemaps/cli 6.8.0 → 6.12.0

package/build/cli/cogify/__test__/semver.test.js

@@ -1,64 +1,61 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const ospec_1 = tslib_1.__importDefault(require("ospec"));
-const semver_util_1 = require("../semver.util");
-ospec_1.default.spec('VersionCompare', () => {
-    ospec_1.default.spec('toNumber', () => {
-        ospec_1.default('should make correct numbers', () => {
-            ospec_1.default(semver_util_1.SemVer.toNumber('0.0.1')).equals(1);
-            ospec_1.default(semver_util_1.SemVer.toNumber('0.1.0')).equals(1024);
-            ospec_1.default(semver_util_1.SemVer.toNumber('0.1.1')).equals(1025);
-            ospec_1.default(semver_util_1.SemVer.toNumber('0.1.1023')).equals(2047);
-            ospec_1.default(semver_util_1.SemVer.toNumber('1.0.0')).equals(1048576);
-        });
-        ospec_1.default('should not overflow', () => {
-            ospec_1.default(semver_util_1.SemVer.toNumber('1023.1023.1023') > 0).equals(true);
-        });
-        ospec_1.default('should support up to three dots', () => {
-            ospec_1.default(semver_util_1.SemVer.toNumber('')).equals(0);
-            ospec_1.default(semver_util_1.SemVer.toNumber('1')).equals(1048576);
-            ospec_1.default(semver_util_1.SemVer.toNumber('1.0')).equals(1048576);
-            ospec_1.default(semver_util_1.SemVer.toNumber('1.0.0')).equals(1048576);
-            ospec_1.default(semver_util_1.SemVer.toNumber('2')).equals(2097152);
-            ospec_1.default(semver_util_1.SemVer.toNumber('')).equals(0);
-        });
-        ospec_1.default('should be getting bigger', () => {
-            ospec_1.default(semver_util_1.SemVer.toNumber('1.0.0') > semver_util_1.SemVer.toNumber('0.0.0')).equals(true);
-            ospec_1.default(semver_util_1.SemVer.toNumber('1.0.1') > semver_util_1.SemVer.toNumber('1.0.0')).equals(true);
-            ospec_1.default(semver_util_1.SemVer.toNumber('1.1.1') > semver_util_1.SemVer.toNumber('1.1.0')).equals(true);
-            ospec_1.default(semver_util_1.SemVer.toNumber('2.1.1') > semver_util_1.SemVer.toNumber('1.1.0')).equals(true);
-        });
-        ospec_1.default('should support release candidates', () => {
-            ospec_1.default(semver_util_1.SemVer.toNumber('0.0.1-rc1')).equals(1);
-            ospec_1.default(semver_util_1.SemVer.toNumber('1.0.0-rc2')).equals(semver_util_1.SemVer.toNumber('1.0.0'));
+import o from 'ospec';
+import { SemVer } from '../semver.util.js';
+o.spec('VersionCompare', () => {
+    o.spec('toNumber', () => {
+        o('should make correct numbers', () => {
+            o(SemVer.toNumber('0.0.1')).equals(1);
+            o(SemVer.toNumber('0.1.0')).equals(1024);
+            o(SemVer.toNumber('0.1.1')).equals(1025);
+            o(SemVer.toNumber('0.1.1023')).equals(2047);
+            o(SemVer.toNumber('1.0.0')).equals(1048576);
+        });
+        o('should not overflow', () => {
+            o(SemVer.toNumber('1023.1023.1023') > 0).equals(true);
+        });
+        o('should support up to three dots', () => {
+            o(SemVer.toNumber('')).equals(0);
+            o(SemVer.toNumber('1')).equals(1048576);
+            o(SemVer.toNumber('1.0')).equals(1048576);
+            o(SemVer.toNumber('1.0.0')).equals(1048576);
+            o(SemVer.toNumber('2')).equals(2097152);
+            o(SemVer.toNumber('')).equals(0);
+        });
+        o('should be getting bigger', () => {
+            o(SemVer.toNumber('1.0.0') > SemVer.toNumber('0.0.0')).equals(true);
+            o(SemVer.toNumber('1.0.1') > SemVer.toNumber('1.0.0')).equals(true);
+            o(SemVer.toNumber('1.1.1') > SemVer.toNumber('1.1.0')).equals(true);
+            o(SemVer.toNumber('2.1.1') > SemVer.toNumber('1.1.0')).equals(true);
+        });
+        o('should support release candidates', () => {
+            o(SemVer.toNumber('0.0.1-rc1')).equals(1);
+            o(SemVer.toNumber('1.0.0-rc2')).equals(SemVer.toNumber('1.0.0'));
         });
     });
-    ospec_1.default.spec('fromNumber', () => {
-        ospec_1.default('should create versions', () => {
-            ospec_1.default(semver_util_1.SemVer.fromNumber(1)).equals('0.0.1');
-            ospec_1.default(semver_util_1.SemVer.fromNumber(1023)).equals('0.0.1023');
-            ospec_1.default(semver_util_1.SemVer.fromNumber(1024)).equals('0.1.0');
-            ospec_1.default(semver_util_1.SemVer.fromNumber(1025)).equals('0.1.1');
-            ospec_1.default(semver_util_1.SemVer.fromNumber(1048576)).equals('1.0.0');
-            ospec_1.default(semver_util_1.SemVer.fromNumber(2097152)).equals('2.0.0');
-        });
-        ospec_1.default('should round trip', () => {
+    o.spec('fromNumber', () => {
+        o('should create versions', () => {
+            o(SemVer.fromNumber(1)).equals('0.0.1');
+            o(SemVer.fromNumber(1023)).equals('0.0.1023');
+            o(SemVer.fromNumber(1024)).equals('0.1.0');
+            o(SemVer.fromNumber(1025)).equals('0.1.1');
+            o(SemVer.fromNumber(1048576)).equals('1.0.0');
+            o(SemVer.fromNumber(2097152)).equals('2.0.0');
+        });
+        o('should round trip', () => {
             for (const num of ['0.1.0', '1.2.3', '3.2.1']) {
-                ospec_1.default(semver_util_1.SemVer.fromNumber(semver_util_1.SemVer.toNumber(num))).equals(num)(`Should roundtrip ${num}`);
+                o(SemVer.fromNumber(SemVer.toNumber(num))).equals(num)(`Should roundtrip ${num}`);
             }
         });
     });
-    ospec_1.default.spec('compare', () => {
-        ospec_1.default('should compare versions', () => {
-            ospec_1.default(semver_util_1.SemVer.compare('0.0.0', '0.0.1')).equals(-1);
-            ospec_1.default(semver_util_1.SemVer.compare('0.0.1', '0.0.0')).equals(1);
-            ospec_1.default(semver_util_1.SemVer.compare('0.0.0', '0.0.0')).equals(0);
+    o.spec('compare', () => {
+        o('should compare versions', () => {
+            o(SemVer.compare('0.0.0', '0.0.1')).equals(-1);
+            o(SemVer.compare('0.0.1', '0.0.0')).equals(1);
+            o(SemVer.compare('0.0.0', '0.0.0')).equals(0);
         });
-        ospec_1.default('should sort versions', () => {
+        o('should sort versions', () => {
             const versions = ['1.0.0', '2.0.0', '0.0.1', '1.2.3'];
-            versions.sort(semver_util_1.SemVer.compare);
-            ospec_1.default(versions).deepEquals(['0.0.1', '1.0.0', '1.2.3', '2.0.0']);
+            versions.sort(SemVer.compare);
+            o(versions).deepEquals(['0.0.1', '1.0.0', '1.2.3', '2.0.0']);
         });
     });
 });

package/build/cli/cogify/action.batch.d.ts

@@ -1,7 +1,7 @@
 import { LogType } from '@basemaps/shared';
 import { CommandLineAction } from '@rushstack/ts-command-line';
-import Batch from 'aws-sdk/clients/batch';
-import { CogJob } from '../../cog/types';
+import Batch from 'aws-sdk/clients/batch.js';
+import { CogJob } from '../../cog/types.js';
 /**
  * Attempt to parse a resolution from a imagery name
  * @example `wellington_urban_2017_0.10m` -> 100

package/build/cli/cogify/action.batch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action.batch.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.batch.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,OAAO,EAAc,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AACrH,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AASzC;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI9D;AAED,qBAAa,cAAe,SAAQ,iBAAiB;IACjD,OAAO,CAAC,GAAG,CAAC,CAA6B;IACzC,OAAO,CAAC,MAAM,CAAC,CAA2B;IAC1C,OAAO,CAAC,MAAM,CAAC,CAA6B;;IAU5C,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM;WAI/B,QAAQ,CACjB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,GAClB,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IA6B9D;;;OAGG;WACU,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAqBrE,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;WAanB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,qBAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyD9G,SAAS,CAAC,kBAAkB,IAAI,IAAI;CAqBvC"}
+{"version":3,"file":"action.batch.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.batch.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,OAAO,EAAc,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AACrH,OAAO,KAAK,MAAM,0BAA0B,CAAC;AAE7C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAS5C;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI9D;AAED,qBAAa,cAAe,SAAQ,iBAAiB;IACnD,OAAO,CAAC,GAAG,CAAC,CAA6B;IACzC,OAAO,CAAC,MAAM,CAAC,CAA2B;IAC1C,OAAO,CAAC,MAAM,CAAC,CAA6B;;IAU5C,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM;WAI/B,QAAQ,CACnB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IA6B9D;;;OAGG;WACU,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAqBrE,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;WAanB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,qBAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyD9G,SAAS,CAAC,kBAAkB,IAAI,IAAI;CAqBrC"}

package/build/cli/cogify/action.batch.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActionBatchJob = exports.extractResolutionFromName = void 0;
-const tslib_1 = require("tslib");
-const geo_1 = require("@basemaps/geo");
-const shared_1 = require("@basemaps/shared");
-const ts_command_line_1 = require("@rushstack/ts-command-line");
-const batch_1 = tslib_1.__importDefault(require("aws-sdk/clients/batch"));
-const cog_stac_job_1 = require("../../cog/cog.stac.job");
+import { TileMatrixSet } from '@basemaps/geo';
+import { Env, fsa, LogConfig, Projection } from '@basemaps/shared';
+import { CommandLineAction } from '@rushstack/ts-command-line';
+import Batch from 'aws-sdk/clients/batch.js';
+import { CogStacJob } from '../../cog/cog.stac.job.js';
 const JobQueue = 'CogBatchJobQueue';
 const JobDefinition = 'CogBatchJob';
 /** The base alignment level used by GDAL, Tiffs that are bigger or smaller than this should scale the compute resources */
@@ -18,14 +14,13 @@ const ResolutionRegex = /((?:\d[\.\-])?\d+)m/;
  * @param name Imagery name to parse
  * @returns resolution (millimeters), -1 for failure to parse
  */
-function extractResolutionFromName(name) {
+export function extractResolutionFromName(name) {
     const matches = name.match(ResolutionRegex);
     if (matches == null)
         return -1;
     return parseFloat(matches[1].replace('-', '.')) * 1000;
 }
-exports.extractResolutionFromName = extractResolutionFromName;
-class ActionBatchJob extends ts_command_line_1.CommandLineAction {
+export class ActionBatchJob extends CommandLineAction {
     constructor() {
         super({
             actionName: 'batch',
@@ -38,8 +33,8 @@ class ActionBatchJob extends ts_command_line_1.CommandLineAction {
     }
     static async batchOne(jobPath, job, batch, name, isCommit) {
         const jobName = ActionBatchJob.id(job, name);
-        const tile = geo_1.TileMatrixSet.nameToTile(name);
-        const alignmentLevels = shared_1.Projection.findAlignmentLevels(job.tileMatrix, tile, job.source.gsd);
+        const tile = TileMatrixSet.nameToTile(name);
+        const alignmentLevels = Projection.findAlignmentLevels(job.tileMatrix, tile, job.source.gsd);
         // Give 25% more memory to larger jobs
         const resDiff = 1 + Math.max(alignmentLevels - MagicAlignmentLevel, 0) * 0.25;
         const memory = 3900 * resDiff;
@@ -87,18 +82,18 @@ class ActionBatchJob extends ts_command_line_1.CommandLineAction {
         if (((_a = this.job) === null || _a === void 0 ? void 0 : _a.value) == null) {
             throw new Error('Failed to read parameters');
         }
-        await ActionBatchJob.batchJob(await cog_stac_job_1.CogStacJob.load(this.job.value), (_b = this.commit) === null || _b === void 0 ? void 0 : _b.value, (_c = this.oneCog) === null || _c === void 0 ? void 0 : _c.value, shared_1.LogConfig.get());
+        await ActionBatchJob.batchJob(await CogStacJob.load(this.job.value), (_b = this.commit) === null || _b === void 0 ? void 0 : _b.value, (_c = this.oneCog) === null || _c === void 0 ? void 0 : _c.value, LogConfig.get());
     }
     static async batchJob(job, commit = false, oneCog, logger) {
         var _a;
         const jobPath = job.getJobPath('job.json');
-        if (!shared_1.fsa.isS3(jobPath)) {
+        if (!jobPath.startsWith('s3://')) {
             throw new Error(`AWS Batch collection.json have to be in S3, jobPath:${jobPath}`);
         }
-        shared_1.LogConfig.set(logger.child({ correlationId: job.id, imageryName: job.name }));
-        const region = (_a = shared_1.Env.get('AWS_DEFAULT_REGION')) !== null && _a !== void 0 ? _a : 'ap-southeast-2';
-        const batch = new batch_1.default({ region });
-        shared_1.fsa.configure(job.output.location);
+        LogConfig.set(logger.child({ correlationId: job.id, imageryName: job.name }));
+        const region = (_a = Env.get('AWS_DEFAULT_REGION')) !== null && _a !== void 0 ? _a : 'ap-southeast-2';
+        const batch = new Batch({ region });
+        fsa.configure(job.output.location);
         const runningJobs = await ActionBatchJob.getCurrentJobList(batch);
         const stats = await Promise.all(job.output.files.map(async ({ name }) => {
             if (oneCog != null && oneCog !== name)
@@ -110,7 +105,7 @@ class ActionBatchJob extends ts_command_line_1.CommandLineAction {
                 return { name, ok: true };
             }
             const targetPath = job.getJobPath(`${name}.tiff`);
-            const exists = await shared_1.fsa.exists(targetPath);
+            const exists = await fsa.exists(targetPath);
             if (exists)
                 logger.info({ targetPath }, 'FileExists');
             return { name, ok: exists };
@@ -155,4 +150,3 @@ class ActionBatchJob extends ts_command_line_1.CommandLineAction {
         });
     }
 }
-exports.ActionBatchJob = ActionBatchJob;

package/build/cli/cogify/action.cog.d.ts

@@ -1,5 +1,5 @@
 import { CommandLineAction } from '@rushstack/ts-command-line';
-import { CogJob } from '../../cog/types';
+import { CogJob } from '../../cog/types.js';
 export declare class ActionCogCreate extends CommandLineAction {
     private job?;
     private name?;

package/build/cli/cogify/action.cog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action.cog.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.cog.ts"],"names":[],"mappings":"AACA,OAAO,EACH,iBAAiB,EAIpB,MAAM,4BAA4B,CAAC;AAOpC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAKzC,qBAAa,eAAgB,SAAQ,iBAAiB;IAClD,OAAO,CAAC,GAAG,CAAC,CAA6B;IACzC,OAAO,CAAC,IAAI,CAAC,CAA6B;IAC1C,OAAO,CAAC,MAAM,CAAC,CAA2B;IAC1C,OAAO,CAAC,QAAQ,CAAC,CAA8B;;IAU/C,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAmC7B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAmEhC,SAAS,CAAC,kBAAkB,IAAI,IAAI;CA4BvC"}
+{"version":3,"file":"action.cog.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.cog.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAIlB,MAAM,4BAA4B,CAAC;AAOpC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAK5C,qBAAa,eAAgB,SAAQ,iBAAiB;IACpD,OAAO,CAAC,GAAG,CAAC,CAA6B;IACzC,OAAO,CAAC,IAAI,CAAC,CAA6B;IAC1C,OAAO,CAAC,MAAM,CAAC,CAA2B;IAC1C,OAAO,CAAC,QAAQ,CAAC,CAA8B;;IAU/C,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAgC7B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8DhC,SAAS,CAAC,kBAAkB,IAAI,IAAI;CA4BrC"}

package/build/cli/cogify/action.cog.js

@@ -1,17 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActionCogCreate = void 0;
-const shared_1 = require("@basemaps/shared");
-const ts_command_line_1 = require("@rushstack/ts-command-line");
-const fs_1 = require("fs");
-const cog_1 = require("../../cog/cog");
-const cog_stac_job_1 = require("../../cog/cog.stac.job");
-const cog_vrt_1 = require("../../cog/cog.vrt");
-const cutline_1 = require("../../cog/cutline");
-const gdal_1 = require("../../gdal/gdal");
-const base_cli_1 = require("../base.cli");
-const folder_1 = require("../folder");
-class ActionCogCreate extends ts_command_line_1.CommandLineAction {
+import { Env, fsa, LogConfig, LoggerFatalError } from '@basemaps/shared';
+import { CommandLineAction, } from '@rushstack/ts-command-line';
+import { createReadStream, promises as fs } from 'fs';
+import { buildCogForName } from '../../cog/cog.js';
+import { CogStacJob } from '../../cog/cog.stac.job.js';
+import { CogVrt } from '../../cog/cog.vrt.js';
+import { Cutline } from '../../cog/cutline.js';
+import { Gdal } from '../../gdal/gdal.js';
+import { CliId } from '../base.cli.js';
+import { makeTempFolder } from '../folder.js';
+export class ActionCogCreate extends CommandLineAction {
     constructor() {
         super({
             actionName: 'cog',
@@ -22,11 +19,11 @@ class ActionCogCreate extends ts_command_line_1.CommandLineAction {
     getName(job) {
         var _a, _b;
         const { files } = job.output;
-        const batchIndex = shared_1.Env.getNumber(shared_1.Env.BatchIndex, -1);
+        const batchIndex = Env.getNumber(Env.BatchIndex, -1);
         if (batchIndex > -1) {
             const { name } = files[batchIndex];
             if (name == null) {
-                throw new shared_1.LoggerFatalError({ cogIndex: batchIndex, tileMax: files.length - 1 }, 'Failed to find cog name from batch index');
+                throw new LoggerFatalError({ cogIndex: batchIndex, tileMax: files.length - 1 }, 'Failed to find cog name from batch index');
             }
             return name;
         }
@@ -34,13 +31,13 @@ class ActionCogCreate extends ts_command_line_1.CommandLineAction {
         if (cogIndex != null) {
             const { name } = files[cogIndex];
             if (name == null) {
-                throw new shared_1.LoggerFatalError({ cogIndex, tileMax: files.length - 1 }, 'Failed to find cog name from index');
+                throw new LoggerFatalError({ cogIndex, tileMax: files.length - 1 }, 'Failed to find cog name from index');
             }
             return name;
         }
         const name = (_b = this.name) === null || _b === void 0 ? void 0 : _b.value;
         if (name == null || !files.find((r) => r.name === name)) {
-            throw new shared_1.LoggerFatalError({ name, names: files.map((r) => r.name).join(', ') }, 'Name does not exist inside job');
+            throw new LoggerFatalError({ name, names: files.map((r) => r.name).join(', ') }, 'Name does not exist inside job');
         }
         return name;
     }
@@ -49,46 +46,46 @@ class ActionCogCreate extends ts_command_line_1.CommandLineAction {
         const jobFn = (_a = this.job) === null || _a === void 0 ? void 0 : _a.value;
         if (jobFn == null)
             throw new Error('Missing job name');
-        const job = await cog_stac_job_1.CogStacJob.load(jobFn);
+        const job = await CogStacJob.load(jobFn);
         const isCommit = (_c = (_b = this.commit) === null || _b === void 0 ? void 0 : _b.value) !== null && _c !== void 0 ? _c : false;
-        const logger = shared_1.LogConfig.get().child({ correlationId: job.id, imageryName: job.name });
-        shared_1.LogConfig.set(logger);
-        const gdalVersion = await gdal_1.Gdal.version(logger);
+        const logger = LogConfig.get().child({ correlationId: job.id, imageryName: job.name });
+        LogConfig.set(logger);
+        const gdalVersion = await Gdal.version(logger);
         logger.info({ version: gdalVersion }, 'GdalVersion');
         const name = this.getName(job);
         if (name == null)
             return;
         const targetPath = job.getJobPath(`${name}.tiff`);
-        shared_1.fsa.configure(job.output.location);
-        const outputExists = await shared_1.fsa.exists(targetPath);
+        fsa.configure(job.output.location);
+        const outputExists = await fsa.exists(targetPath);
         logger.info({ targetPath, outputExists }, 'CheckExists');
         // Output file exists don't try and overwrite it
         if (outputExists) {
             logger.warn({ targetPath }, 'OutputExists');
             return;
         }
-        const tmpFolder = await folder_1.makeTempFolder(`basemaps-${job.id}-${base_cli_1.CliId}`);
+        const tmpFolder = await makeTempFolder(`basemaps-${job.id}-${CliId}`);
         try {
             let cutlineJson;
             if (job.output.cutline != null) {
                 const cutlinePath = job.getJobPath('cutline.geojson.gz');
                 logger.info({ path: cutlinePath }, 'UsingCutLine');
-                cutlineJson = await cutline_1.Cutline.loadCutline(cutlinePath);
+                cutlineJson = await Cutline.loadCutline(cutlinePath);
             }
             else {
                 logger.warn('NoCutLine');
             }
-            const cutline = new cutline_1.Cutline(job.tileMatrix, cutlineJson, (_d = job.output.cutline) === null || _d === void 0 ? void 0 : _d.blend, job.output.oneCogCovering);
-            const tmpVrtPath = await cog_vrt_1.CogVrt.buildVrt(tmpFolder, job, cutline, name, logger);
+            const cutline = new Cutline(job.tileMatrix, cutlineJson, (_d = job.output.cutline) === null || _d === void 0 ? void 0 : _d.blend, job.output.oneCogCovering);
+            const tmpVrtPath = await CogVrt.buildVrt(tmpFolder, job, cutline, name, logger);
             if (tmpVrtPath == null) {
                 logger.warn({ name, tileMatrix: job.tileMatrix.identifier }, 'NoMatchingSourceImagery');
                 return;
             }
-            const tmpTiff = shared_1.fsa.join(tmpFolder, `${name}.tiff`);
-            await cog_1.buildCogForName(job, name, tmpVrtPath, tmpTiff, logger, isCommit);
+            const tmpTiff = fsa.join(tmpFolder, `${name}.tiff`);
+            await buildCogForName(job, name, tmpVrtPath, tmpTiff, logger, isCommit);
             logger.info({ target: targetPath }, 'StoreTiff');
             if (isCommit) {
-                await shared_1.fsa.write(targetPath, fs_1.createReadStream(tmpTiff));
+                await fsa.write(targetPath, createReadStream(tmpTiff));
             }
             else {
                 logger.warn('DryRun:Done');
@@ -96,7 +93,7 @@ class ActionCogCreate extends ts_command_line_1.CommandLineAction {
         }
         finally {
             // Cleanup!
-            await fs_1.promises.rmdir(tmpFolder, { recursive: true });
+            await fs.rmdir(tmpFolder, { recursive: true });
         }
     }
     onDefineParameters() {
@@ -125,4 +122,3 @@ class ActionCogCreate extends ts_command_line_1.CommandLineAction {
         });
     }
 }
-exports.ActionCogCreate = ActionCogCreate;

package/build/cli/cogify/action.job.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action.job.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.job.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAuB,MAAM,kBAAkB,CAAC;AACnE,OAAO,EACH,iBAAiB,EAGjB,0BAA0B,EAC7B,MAAM,4BAA4B,CAAC;AAMpC,qBAAa,YAAY;IACrB,IAAI,EAAE,0BAA0B,CAAC;IACjC,OAAO,EAAE,0BAA0B,CAAC;IACpC,UAAU,EAAE,0BAA0B,CAAC;gBAE3B,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM;CAsBxD;AAED,qBAAa,eAAgB,SAAQ,iBAAiB;IAClD,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,cAAc,CAA8B;IACpD,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,mBAAmB,CAA6B;IACxD,OAAO,CAAC,WAAW,CAA2B;IAC9C,OAAO,CAAC,OAAO,CAA8B;IAC7C,OAAO,CAAC,gBAAgB,CAA8B;IACtD,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,QAAQ,CAA6B;;IAU7C,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,UAAU;IAkBpC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyDhC,SAAS,CAAC,kBAAkB,IAAI,IAAI;CAkFvC"}
+{"version":3,"file":"action.job.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.job.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAuB,MAAM,kBAAkB,CAAC;AACnE,OAAO,EACL,iBAAiB,EAGjB,0BAA0B,EAC3B,MAAM,4BAA4B,CAAC;AAMpC,qBAAa,YAAY;IACvB,IAAI,EAAE,0BAA0B,CAAC;IACjC,OAAO,EAAE,0BAA0B,CAAC;IACpC,UAAU,EAAE,0BAA0B,CAAC;gBAE3B,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM;CAsBtD;AAED,qBAAa,eAAgB,SAAQ,iBAAiB;IACpD,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,cAAc,CAA8B;IACpD,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,mBAAmB,CAA6B;IACxD,OAAO,CAAC,WAAW,CAA2B;IAC9C,OAAO,CAAC,OAAO,CAA8B;IAC7C,OAAO,CAAC,gBAAgB,CAA8B;IACtD,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,QAAQ,CAA6B;;IAU7C,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,UAAU;IAkBpC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyDhC,SAAS,CAAC,kBAAkB,IAAI,IAAI;CAkFrC"}

package/build/cli/cogify/action.job.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActionJobCreate = exports.CLiInputData = void 0;
-const geo_1 = require("@basemaps/geo");
-const shared_1 = require("@basemaps/shared");
-const ts_command_line_1 = require("@rushstack/ts-command-line");
-const job_factory_1 = require("../../cog/job.factory");
-const gdal_config_1 = require("../../gdal/gdal.config");
-const base_cli_1 = require("../base.cli");
-class CLiInputData {
+import { Epsg, GoogleTms, TileMatrixSets } from '@basemaps/geo';
+import { fsa } from '@basemaps/shared';
+import { CommandLineAction, } from '@rushstack/ts-command-line';
+import { CogJobFactory, MaxConcurrencyDefault } from '../../cog/job.factory.js';
+import { GdalCogBuilderDefaults, GdalResamplingOptions } from '../../gdal/gdal.config.js';
+import { CliId } from '../base.cli.js';
+export class CLiInputData {
     constructor(parent, prefix) {
         this.path = parent.defineStringParameter({
             argumentName: prefix.toUpperCase(),
@@ -29,8 +26,7 @@ class CLiInputData {
         });
     }
 }
-exports.CLiInputData = CLiInputData;
-class ActionJobCreate extends ts_command_line_1.CommandLineAction {
+export class ActionJobCreate extends CommandLineAction {
     constructor() {
         super({
             actionName: 'job',
@@ -42,7 +38,7 @@ class ActionJobCreate extends ts_command_line_1.CommandLineAction {
         if (source.path.value == null) {
             throw new Error('Invalid path');
         }
-        if (!shared_1.fsa.isS3(source.path.value)) {
+        if (!source.path.value.startsWith('s3://')) {
             return { type: 'local', path: source.path.value };
         }
         if (source.roleArn.value == null) {
@@ -59,18 +55,18 @@ class ActionJobCreate extends ts_command_line_1.CommandLineAction {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         const sourceLocation = this.fsConfig(this.source);
         const outputLocation = this.fsConfig(this.output);
-        shared_1.fsa.configure(this.fsConfig(this.source));
-        shared_1.fsa.configure(this.fsConfig(this.output));
+        fsa.configure(this.fsConfig(this.source));
+        fsa.configure(this.fsConfig(this.output));
         let cutline = undefined;
         if ((_a = this.cutline) === null || _a === void 0 ? void 0 : _a.value) {
             cutline = { href: this.cutline.value, blend: (_b = this.cutlineBlend.value) !== null && _b !== void 0 ? _b : 20 };
         }
-        const tileMatrix = geo_1.TileMatrixSets.find((_c = this.tileMatrix.value) !== null && _c !== void 0 ? _c : geo_1.GoogleTms.identifier);
+        const tileMatrix = TileMatrixSets.find((_c = this.tileMatrix.value) !== null && _c !== void 0 ? _c : GoogleTms.identifier);
         if (tileMatrix == null)
             throw new Error('Invalid target-projection');
         let resampling;
         if (((_d = this.overrideWarpReample) === null || _d === void 0 ? void 0 : _d.value) != null) {
-            const warp = gdal_config_1.GdalResamplingOptions[(_e = this.overrideWarpReample) === null || _e === void 0 ? void 0 : _e.value];
+            const warp = GdalResamplingOptions[(_e = this.overrideWarpReample) === null || _e === void 0 ? void 0 : _e.value];
             if (warp == null) {
                 throw new Error('Invalid override-warp-resampling');
             }
@@ -81,7 +77,7 @@ class ActionJobCreate extends ts_command_line_1.CommandLineAction {
         }
         const fileListPath = (_f = this.fileList) === null || _f === void 0 ? void 0 : _f.value;
         if (fileListPath != null) {
-            const fileData = await shared_1.fsa.read(fileListPath);
+            const fileData = await fsa.read(fileListPath);
             sourceLocation.files = fileData
                 .toString()
                 .trim()
@@ -94,16 +90,16 @@ class ActionJobCreate extends ts_command_line_1.CommandLineAction {
             cutline,
             tileMatrix,
             override: {
-                concurrency: (_h = (_g = this.maxConcurrency) === null || _g === void 0 ? void 0 : _g.value) !== null && _h !== void 0 ? _h : job_factory_1.MaxConcurrencyDefault,
-                quality: (_k = (_j = this.quality) === null || _j === void 0 ? void 0 : _j.value) !== null && _k !== void 0 ? _k : gdal_config_1.GdalCogBuilderDefaults.quality,
-                id: (_m = (_l = this.overrideId) === null || _l === void 0 ? void 0 : _l.value) !== null && _m !== void 0 ? _m : base_cli_1.CliId,
-                projection: geo_1.Epsg.tryGet((_o = this.sourceProjection) === null || _o === void 0 ? void 0 : _o.value),
+                concurrency: (_h = (_g = this.maxConcurrency) === null || _g === void 0 ? void 0 : _g.value) !== null && _h !== void 0 ? _h : MaxConcurrencyDefault,
+                quality: (_k = (_j = this.quality) === null || _j === void 0 ? void 0 : _j.value) !== null && _k !== void 0 ? _k : GdalCogBuilderDefaults.quality,
+                id: (_m = (_l = this.overrideId) === null || _l === void 0 ? void 0 : _l.value) !== null && _m !== void 0 ? _m : CliId,
+                projection: Epsg.tryGet((_o = this.sourceProjection) === null || _o === void 0 ? void 0 : _o.value),
                 resampling,
             },
             batch: (_q = (_p = this.submitBatch) === null || _p === void 0 ? void 0 : _p.value) !== null && _q !== void 0 ? _q : false,
             oneCogCovering: (_s = (_r = this.oneCog) === null || _r === void 0 ? void 0 : _r.value) !== null && _s !== void 0 ? _s : false,
         };
-        await job_factory_1.CogJobFactory.create(ctx);
+        await CogJobFactory.create(ctx);
     }
     onDefineParameters() {
         this.source = new CLiInputData(this, 'source');
@@ -113,7 +109,7 @@ class ActionJobCreate extends ts_command_line_1.CommandLineAction {
             parameterLongName: '--concurrency',
             parameterShortName: '-c',
             description: 'Maximum number of requests to use at one time',
-            defaultValue: job_factory_1.MaxConcurrencyDefault,
+            defaultValue: MaxConcurrencyDefault,
             required: false,
         });
         this.cutline = this.defineStringParameter({
@@ -161,7 +157,7 @@ class ActionJobCreate extends ts_command_line_1.CommandLineAction {
             argumentName: 'TILE_MATRIX',
             parameterLongName: '--target-tile-matrix-set',
             description: 'The TileMatrixSet to generate the COGS for',
-            defaultValue: geo_1.GoogleTms.identifier,
+            defaultValue: GoogleTms.identifier,
             required: false,
         });
         this.oneCog = this.defineFlagParameter({
@@ -177,4 +173,3 @@ class ActionJobCreate extends ts_command_line_1.CommandLineAction {
         });
     }
 }
-exports.ActionJobCreate = ActionJobCreate;

package/build/cli/cogify/index.d.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import 'source-map-support/register';
-import { BaseCommandLine } from '../base.cli';
+import 'source-map-support/register.js';
+import { BaseCommandLine } from '../base.cli.js';
 export declare class CogifyCommandLine extends BaseCommandLine {
     constructor();
 }

package/build/cli/cogify/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/index.ts"],"names":[],"mappings":";AACA,OAAO,6BAA6B,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAK9C,qBAAa,iBAAkB,SAAQ,eAAe;;CAUrD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/index.ts"],"names":[],"mappings":";AACA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAKjD,qBAAa,iBAAkB,SAAQ,eAAe;;CAUrD"}

package/build/cli/cogify/index.js

@@ -1,22 +1,18 @@
 #!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CogifyCommandLine = void 0;
-require("source-map-support/register");
-const base_cli_1 = require("../base.cli");
-const action_batch_1 = require("./action.batch");
-const action_cog_1 = require("./action.cog");
-const action_job_1 = require("./action.job");
-class CogifyCommandLine extends base_cli_1.BaseCommandLine {
+import 'source-map-support/register.js';
+import { BaseCommandLine } from '../base.cli.js';
+import { ActionBatchJob } from './action.batch.js';
+import { ActionCogCreate } from './action.cog.js';
+import { ActionJobCreate } from './action.job.js';
+export class CogifyCommandLine extends BaseCommandLine {
     constructor() {
         super({
             toolFilename: 'cogify',
             toolDescription: 'Cloud optimized geotiff utilities',
         });
-        this.addAction(new action_cog_1.ActionCogCreate());
-        this.addAction(new action_job_1.ActionJobCreate());
-        this.addAction(new action_batch_1.ActionBatchJob());
+        this.addAction(new ActionCogCreate());
+        this.addAction(new ActionJobCreate());
+        this.addAction(new ActionBatchJob());
     }
 }
-exports.CogifyCommandLine = CogifyCommandLine;
 new CogifyCommandLine().run();

package/build/cli/cogify/semver.util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"semver.util.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/semver.util.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,MAAM;IACf;;;;;;OAMG;gBACS,MAAM,GAAG,MAAM;IAmB3B;;;;OAIG;kBACW,MAAM,GAAG,MAAM;IAO7B;;;;;OAKG;gBACS,MAAM,MAAM,MAAM,GAAG,MAAM;CAG1C,CAAC"}
+{"version":3,"file":"semver.util.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/semver.util.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,MAAM;IACjB;;;;;;OAMG;gBACS,MAAM,GAAG,MAAM;IAmB3B;;;;OAIG;kBACW,MAAM,GAAG,MAAM;IAO7B;;;;;OAKG;gBACS,MAAM,MAAM,MAAM,GAAG,MAAM;CAGxC,CAAC"}

package/build/cli/cogify/semver.util.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SemVer = void 0;
 /** major.minor.patch */
 const MaxLength = 3;
 /** fits into a int32 with out forcing a uint conversion */
 const EncodeBits = 10;
 /** Max size for a single semver number (1024) */
 const MaxEncode = 2 ** EncodeBits - 1;
-exports.SemVer = {
+export const SemVer = {
     /**
      * Encode a semver string into a number
      * @example
@@ -53,6 +50,6 @@ exports.SemVer = {
      * @returns 0 if equal, >0 if vA > vB, <0 otherwise
      */
     compare(vA, vB) {
-        return exports.SemVer.toNumber(vA) - exports.SemVer.toNumber(vB);
+        return SemVer.toNumber(vA) - SemVer.toNumber(vB);
     },
 };

package/build/cli/folder.js

@@ -1,16 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeTempFolder = void 0;
-const tslib_1 = require("tslib");
-const shared_1 = require("@basemaps/shared");
-const fs_1 = require("fs");
-const path = tslib_1.__importStar(require("path"));
+import { Env } from '@basemaps/shared';
+import { promises as fs } from 'fs';
+import * as path from 'path';
 /** Make a temp folder inside TEMP_FOLDER's path */
-async function makeTempFolder(folder) {
+export async function makeTempFolder(folder) {
     var _a;
-    const tempPath = (_a = shared_1.Env.get(shared_1.Env.TempFolder)) !== null && _a !== void 0 ? _a : '/tmp';
+    const tempPath = (_a = Env.get(Env.TempFolder)) !== null && _a !== void 0 ? _a : '/tmp';
     const folderPath = path.join(tempPath, folder);
-    await fs_1.promises.mkdir(folderPath, { recursive: true });
+    await fs.mkdir(folderPath, { recursive: true });
     return folderPath;
 }
-exports.makeTempFolder = makeTempFolder;

package/build/cli/tag.action.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TagActions = void 0;
 /** Commonly used definitions for cli args */
-exports.TagActions = {
+export const TagActions = {
     Version: {
         argumentName: 'VERSION',
         parameterLongName: '--version',