@basemaps/cli 6.7.0 → 6.11.0

package/CHANGELOG.md

@@ -3,6 +3,67 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.11.0](https://github.com/linz/basemaps/compare/v6.10.1...v6.11.0) (2021-10-03)
+
+
+### Bug Fixes
+
+* **cli:** correct path issues with ESM modules being bundled into docker containers ([#1888](https://github.com/linz/basemaps/issues/1888)) ([7c1b2f4](https://github.com/linz/basemaps/commit/7c1b2f4979956a09f63b461463bb43788ce0122c))
+* **cli:** work around certificate issues ([#1890](https://github.com/linz/basemaps/issues/1890)) ([5e90775](https://github.com/linz/basemaps/commit/5e907752f0a195d6b6b976bb1bbf56895e6e18f7))
+
+
+### Features
+
+* **server:** use the lambda handler directly ([#1870](https://github.com/linz/basemaps/issues/1870)) ([408ff56](https://github.com/linz/basemaps/commit/408ff5654cc04aae35d05eb5bbc47a51f99ec5b2))
+
+
+
+
+
+# [6.10.0](https://github.com/linz/basemaps/compare/v6.9.1...v6.10.0) (2021-09-22)
+
+
+### Bug Fixes
+
+* correctly bundle with esm modules ([#1858](https://github.com/linz/basemaps/issues/1858)) ([708a22e](https://github.com/linz/basemaps/commit/708a22ec1006c25cf2c057b75f61cc813e943aac))
+
+
+### Features
+
+* replace s3fs with chunkd/fs ([#1859](https://github.com/linz/basemaps/issues/1859)) ([9b6f2d3](https://github.com/linz/basemaps/commit/9b6f2d3609c336f96c2ae32246f241cb396e71c8))
+* switch to esm modules ([#1857](https://github.com/linz/basemaps/issues/1857)) ([75bdff8](https://github.com/linz/basemaps/commit/75bdff8da35104f10f6b6ecf58a2c6006245af6e))
+
+
+
+
+
+## [6.9.1](https://github.com/linz/basemaps/compare/v6.9.0...v6.9.1) (2021-09-09)
+
+**Note:** Version bump only for package @basemaps/cli
+
+
+
+
+
+# [6.9.0](https://github.com/linz/basemaps/compare/v6.8.0...v6.9.0) (2021-09-09)
+
+**Note:** Version bump only for package @basemaps/cli
+
+
+
+
+
+# [6.8.0](https://github.com/linz/basemaps/compare/v6.7.0...v6.8.0) (2021-09-01)
+
+
+### Features
+
+* **server:** create a standalone express server ([#1819](https://github.com/linz/basemaps/issues/1819)) ([83488af](https://github.com/linz/basemaps/commit/83488af658a3ed8f3080dd2ea9f120ac3abd2444))
+
+
+
+
+
 # [6.7.0](https://github.com/linz/basemaps/compare/v6.6.1...v6.7.0) (2021-08-15)
 
 **Note:** Version bump only for package @basemaps/cli

package/basemaps.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import './build/cli/basemaps/index.js';

package/build/cli/base.cli.d.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { CommandLineParser } from '@rushstack/ts-command-line';
-import 'source-map-support/register';
+import 'source-map-support/register.js';
 /** Useful traceability information  */
 export declare const CliInfo: {
     package: string;

package/build/cli/base.cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.cli.d.ts","sourceRoot":"","sources":["../../src/cli/base.cli.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,6BAA6B,CAAC;AAMrC,uCAAuC;AACvC,eAAO,MAAM,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAIrE,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,KAAK,QAAc,CAAC;AAEjC,8BAAsB,eAAgB,SAAQ,iBAAiB;IAC3D,OAAO,gEAIJ;IACH,YAAY,gEAIT;IAEH,SAAS,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBpC,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAI7B,GAAG,IAAI,IAAI;CAUrB"}
+{"version":3,"file":"base.cli.d.ts","sourceRoot":"","sources":["../../src/cli/base.cli.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,gCAAgC,CAAC;AAGxC,uCAAuC;AACvC,eAAO,MAAM,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAKrE,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,KAAK,QAAc,CAAC;AAEjC,8BAAsB,eAAgB,SAAQ,iBAAiB;IAC7D,OAAO,gEAIJ;IACH,YAAY,gEAIT;IAEH,SAAS,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAepC,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAI7B,GAAG,IAAI,IAAI;CAUnB"}

package/build/cli/base.cli.js

@@ -1,26 +1,20 @@
 #!/usr/bin/env node
-"use strict";
-var _a, _b, _c;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseCommandLine = exports.CliId = exports.CliInfo = void 0;
-const tslib_1 = require("tslib");
-const shared_1 = require("@basemaps/shared");
-const git_tag_1 = require("@basemaps/shared/build/cli/git.tag");
-const ts_command_line_1 = require("@rushstack/ts-command-line");
-const pretty_json_log_1 = require("pretty-json-log");
-require("source-map-support/register");
-const ulid = tslib_1.__importStar(require("ulid"));
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const packageJson = require('../../package.json');
+var _a, _b;
+import { LogConfig, LoggerFatalError } from '@basemaps/shared';
+import { GitTag } from '@basemaps/shared/build/cli/git.tag.js';
+import { CommandLineParser } from '@rushstack/ts-command-line';
+import 'source-map-support/register.js';
+import * as ulid from 'ulid';
 /** Useful traceability information  */
-exports.CliInfo = {
-    package: packageJson.name,
-    version: (_a = process.env.GIT_VERSION) !== null && _a !== void 0 ? _a : packageJson.version,
-    hash: (_c = (_b = process.env.GIT_HASH) !== null && _b !== void 0 ? _b : packageJson.gitHead) !== null && _c !== void 0 ? _c : git_tag_1.GitTag().hash,
+export const CliInfo = {
+    // Detect unlinked packages looks for this string since its a package name, slightly work around it
+    package: '@' + 'basemaps/cli',
+    version: (_a = process.env.GIT_VERSION) !== null && _a !== void 0 ? _a : GitTag().version,
+    hash: (_b = process.env.GIT_HASH) !== null && _b !== void 0 ? _b : GitTag().hash,
 };
 /** Unique Id for this instance of the cli being run */
-exports.CliId = ulid.ulid();
-class BaseCommandLine extends ts_command_line_1.CommandLineParser {
+export const CliId = ulid.ulid();
+export class BaseCommandLine extends CommandLineParser {
     constructor() {
         super(...arguments);
         this.verbose = this.defineFlagParameter({
@@ -35,22 +29,18 @@ class BaseCommandLine extends ts_command_line_1.CommandLineParser {
         });
     }
     onExecute() {
-        // If the console is a tty pretty print the output
-        if (process.stdout.isTTY) {
-            shared_1.LogConfig.setOutputStream(pretty_json_log_1.PrettyTransform.stream());
-        }
         if (this.verbose.value) {
-            shared_1.LogConfig.get().level = 'debug';
+            LogConfig.get().level = 'debug';
         }
         else if (this.extraVerbose.value) {
-            shared_1.LogConfig.get().level = 'trace';
+            LogConfig.get().level = 'trace';
         }
         else {
-            shared_1.LogConfig.get().level = 'info';
+            LogConfig.get().level = 'info';
         }
-        const logger = shared_1.LogConfig.get().child({ id: exports.CliId });
-        logger.info(exports.CliInfo, 'CliStart');
-        shared_1.LogConfig.set(logger);
+        const logger = LogConfig.get().child({ id: CliId });
+        logger.info(CliInfo, 'CliStart');
+        LogConfig.set(logger);
         return super.onExecute();
     }
     onDefineParameters() {
@@ -58,14 +48,13 @@ class BaseCommandLine extends ts_command_line_1.CommandLineParser {
     }
     run() {
         this.executeWithoutErrorHandling().catch((err) => {
-            if (err instanceof shared_1.LoggerFatalError) {
-                shared_1.LogConfig.get().fatal(err.obj, err.message);
+            if (err instanceof LoggerFatalError) {
+                LogConfig.get().fatal(err.obj, err.message);
             }
             else {
-                shared_1.LogConfig.get().fatal({ err }, 'Failed to run command');
+                LogConfig.get().fatal({ err }, 'Failed to run command');
             }
             process.exit(1);
         });
     }
 }
-exports.BaseCommandLine = BaseCommandLine;

package/build/cli/basemaps/action.invalidate.d.ts

@@ -1,4 +1,4 @@
-import { TileSetBaseAction } from './tileset.action';
+import { TileSetBaseAction } from './tileset.action.js';
 export declare class TileSetInvalidateAction extends TileSetBaseAction {
     private commit;
     private projection;

package/build/cli/basemaps/action.invalidate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action.invalidate.d.ts","sourceRoot":"","sources":["../../../src/cli/basemaps/action.invalidate.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,qBAAa,uBAAwB,SAAQ,iBAAiB;IAC1D,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,UAAU,CAA8B;IAChD,OAAO,CAAC,OAAO,CAA6B;;IAU5C,SAAS,CAAC,kBAAkB,IAAI,IAAI;cAMpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAgB7C"}
+{"version":3,"file":"action.invalidate.d.ts","sourceRoot":"","sources":["../../../src/cli/basemaps/action.invalidate.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGxD,qBAAa,uBAAwB,SAAQ,iBAAiB;IAC5D,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,UAAU,CAA8B;IAChD,OAAO,CAAC,OAAO,CAA6B;;IAU5C,SAAS,CAAC,kBAAkB,IAAI,IAAI;cAMpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAgB3C"}

package/build/cli/basemaps/action.invalidate.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TileSetInvalidateAction = void 0;
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-const geo_1 = require("@basemaps/geo");
-const shared_1 = require("@basemaps/shared");
-const tag_action_1 = require("../tag.action");
-const tileset_action_1 = require("./tileset.action");
-const tileset_util_1 = require("./tileset.util");
-class TileSetInvalidateAction extends tileset_action_1.TileSetBaseAction {
+import { Epsg } from '@basemaps/geo';
+import { Config, LogConfig } from '@basemaps/shared';
+import { TagActions } from '../tag.action.js';
+import { TileSetBaseAction } from './tileset.action.js';
+import { invalidateXYZCache } from './tileset.util.js';
+export class TileSetInvalidateAction extends TileSetBaseAction {
     constructor() {
         super({
             actionName: 'invalidate',
@@ -16,25 +13,24 @@ class TileSetInvalidateAction extends tileset_action_1.TileSetBaseAction {
         });
     }
     onDefineParameters() {
-        this.commit = this.defineFlagParameter(tag_action_1.TagActions.Commit);
-        this.projection = this.defineIntegerParameter(tag_action_1.TagActions.Projection);
-        this.tileSet = this.defineStringParameter(tag_action_1.TagActions.TileSet);
+        this.commit = this.defineFlagParameter(TagActions.Commit);
+        this.projection = this.defineIntegerParameter(TagActions.Projection);
+        this.tileSet = this.defineStringParameter(TagActions.TileSet);
     }
     async onExecute() {
         const tileSet = this.tileSet.value;
-        const projection = geo_1.Epsg.tryGet(this.projection.value);
+        const projection = Epsg.tryGet(this.projection.value);
         if (projection == null)
             return this.fatal({ projection: this.projection.value }, 'Invalid projection');
-        const tsData = await shared_1.Config.TileSet.get(shared_1.Config.TileSet.id(tileSet));
+        const tsData = await Config.TileSet.get(Config.TileSet.id(tileSet));
         if (tsData == null)
             return this.fatal({ tileSet }, 'Could not find tileset');
-        shared_1.LogConfig.get().info({ tileSet, projection }, 'Invalidating');
+        LogConfig.get().info({ tileSet, projection }, 'Invalidating');
         if (this.commit.value) {
-            await tileset_util_1.invalidateXYZCache(tileSet, projection, this.commit.value);
+            await invalidateXYZCache(tileSet, projection, this.commit.value);
         }
         else {
-            shared_1.LogConfig.get().warn('DryRun:Done');
+            LogConfig.get().warn('DryRun:Done');
         }
     }
 }
-exports.TileSetInvalidateAction = TileSetInvalidateAction;

package/build/cli/basemaps/action.tileset.info.d.ts

@@ -1,4 +1,4 @@
-import { TileSetBaseAction } from './tileset.action';
+import { TileSetBaseAction } from './tileset.action.js';
 export declare class TileSetInfoAction extends TileSetBaseAction {
     private imagery;
     private projection;

package/build/cli/basemaps/action.tileset.info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action.tileset.info.d.ts","sourceRoot":"","sources":["../../../src/cli/basemaps/action.tileset.info.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,qBAAa,iBAAkB,SAAQ,iBAAiB;IACpD,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,UAAU,CAA8B;IAChD,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,OAAO,CAA8B;;IAU7C,SAAS,CAAC,kBAAkB,IAAI,IAAI;YAOtB,SAAS;cAcP,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAuB7C"}
+{"version":3,"file":"action.tileset.info.d.ts","sourceRoot":"","sources":["../../../src/cli/basemaps/action.tileset.info.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGxD,qBAAa,iBAAkB,SAAQ,iBAAiB;IACtD,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,UAAU,CAA8B;IAChD,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,OAAO,CAA8B;;IAU7C,SAAS,CAAC,kBAAkB,IAAI,IAAI;YAOtB,SAAS;cAcP,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAuB3C"}

package/build/cli/basemaps/action.tileset.info.js

@@ -1,15 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TileSetInfoAction = void 0;
-const tslib_1 = require("tslib");
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-const geo_1 = require("@basemaps/geo");
-const shared_1 = require("@basemaps/shared");
-const c = tslib_1.__importStar(require("ansi-colors"));
-const tag_action_1 = require("../tag.action");
-const tileset_action_1 = require("./tileset.action");
-const tileset_util_1 = require("./tileset.util");
-class TileSetInfoAction extends tileset_action_1.TileSetBaseAction {
+import { Epsg } from '@basemaps/geo';
+import { Config, LogConfig } from '@basemaps/shared';
+import * as c from 'ansi-colors';
+import { TagActions } from '../tag.action.js';
+import { TileSetBaseAction } from './tileset.action.js';
+import { printTileSet } from './tileset.util.js';
+export class TileSetInfoAction extends TileSetBaseAction {
     constructor() {
         super({
             actionName: 'info',
@@ -18,13 +14,13 @@ class TileSetInfoAction extends tileset_action_1.TileSetBaseAction {
         });
     }
     onDefineParameters() {
-        this.imagery = this.defineStringParameter(tag_action_1.TagActions.Imagery);
-        this.projection = this.defineIntegerParameter(tag_action_1.TagActions.Projection);
-        this.tileSet = this.defineStringParameter(tag_action_1.TagActions.TileSet);
-        this.version = this.defineIntegerParameter(tag_action_1.TagActions.Version);
+        this.imagery = this.defineStringParameter(TagActions.Imagery);
+        this.projection = this.defineIntegerParameter(TagActions.Projection);
+        this.tileSet = this.defineStringParameter(TagActions.TileSet);
+        this.version = this.defineIntegerParameter(TagActions.Version);
     }
     async imageInfo(imageryId) {
-        const img = await shared_1.Config.Imagery.get(imageryId);
+        const img = await Config.Imagery.get(imageryId);
         if (img == null)
             throw new Error('Cannot find imagery with id ' + imageryId);
         console.log(c.bold('Imagery:'), img.name);
@@ -38,24 +34,23 @@ class TileSetInfoAction extends tileset_action_1.TileSetBaseAction {
     }
     async onExecute() {
         const tileSet = this.tileSet.value;
-        const projection = geo_1.Epsg.tryGet(this.projection.value);
+        const projection = Epsg.tryGet(this.projection.value);
         if (projection == null)
             return this.fatal({ projection: this.projection.value }, 'Invalid projection');
         const imgId = this.imagery.value;
         if (imgId != null)
             return this.imageInfo(imgId);
         if (tileSet == null) {
-            shared_1.LogConfig.get().fatal('Missing --tileset and --projection or --imagery');
+            LogConfig.get().fatal('Missing --tileset and --projection or --imagery');
             console.log(this.renderHelpText());
             return;
         }
-        const tileSetId = shared_1.Config.TileSet.id(tileSet);
-        const tsData = await shared_1.Config.TileSet.get(tileSetId);
+        const tileSetId = Config.TileSet.id(tileSet);
+        const tsData = await Config.TileSet.get(tileSetId);
         if (tsData == null) {
-            shared_1.LogConfig.get().fatal({ tileSet }, 'Unable to find tile set');
+            LogConfig.get().fatal({ tileSet }, 'Unable to find tile set');
             return;
         }
-        await tileset_util_1.printTileSet(tsData, projection);
+        await printTileSet(tsData, projection);
     }
 }
-exports.TileSetInfoAction = TileSetInfoAction;

package/build/cli/basemaps/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 BasemapsCommandLine extends BaseCommandLine {
     constructor();
 }

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/basemaps/index.ts"],"names":[],"mappings":";AAGA,OAAO,6BAA6B,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAI9C,qBAAa,mBAAoB,SAAQ,eAAe;;CAavD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/basemaps/index.ts"],"names":[],"mappings":";AACA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAIjD,qBAAa,mBAAoB,SAAQ,eAAe;;CASvD"}

package/build/cli/basemaps/index.js

@@ -1,25 +1,16 @@
 #!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BasemapsCommandLine = void 0;
-const shared_1 = require("@basemaps/shared");
-const pretty_json_log_1 = require("pretty-json-log");
-require("source-map-support/register");
-const base_cli_1 = require("../base.cli");
-const action_invalidate_1 = require("./action.invalidate");
-const action_tileset_info_1 = require("./action.tileset.info");
-class BasemapsCommandLine extends base_cli_1.BaseCommandLine {
+import 'source-map-support/register.js';
+import { BaseCommandLine } from '../base.cli.js';
+import { TileSetInvalidateAction } from './action.invalidate.js';
+import { TileSetInfoAction } from './action.tileset.info.js';
+export class BasemapsCommandLine extends BaseCommandLine {
     constructor() {
         super({
             toolFilename: 'basemaps',
             toolDescription: 'Basemaps configuration utilities',
         });
-        this.addAction(new action_tileset_info_1.TileSetInfoAction());
-        this.addAction(new action_invalidate_1.TileSetInvalidateAction());
-        if (process.stdout.isTTY) {
-            shared_1.LogConfig.setOutputStream(pretty_json_log_1.PrettyTransform.stream());
-        }
+        this.addAction(new TileSetInfoAction());
+        this.addAction(new TileSetInvalidateAction());
     }
 }
-exports.BasemapsCommandLine = BasemapsCommandLine;
 new BasemapsCommandLine().run();

package/build/cli/basemaps/tileset.action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tileset.action.d.ts","sourceRoot":"","sources":["../../../src/cli/basemaps/tileset.action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,OAAO,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,8BAAsB,iBAAkB,SAAQ,iBAAiB;IAC7D,iDAAiD;IACjD,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,OAAyB,GAAG,IAAI;CAK5F"}
+{"version":3,"file":"tileset.action.d.ts","sourceRoot":"","sources":["../../../src/cli/basemaps/tileset.action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,OAAO,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,8BAAsB,iBAAkB,SAAQ,iBAAiB;IAC/D,iDAAiD;IACjD,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,OAAyB,GAAG,IAAI;CAK1F"}

package/build/cli/basemaps/tileset.action.js

@@ -1,14 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TileSetBaseAction = void 0;
-const shared_1 = require("@basemaps/shared");
-const ts_command_line_1 = require("@rushstack/ts-command-line");
-class TileSetBaseAction extends ts_command_line_1.CommandLineAction {
+import { LogConfig } from '@basemaps/shared';
+import { CommandLineAction } from '@rushstack/ts-command-line';
+export class TileSetBaseAction extends CommandLineAction {
     /** Log a fatal error and render the help text */
-    fatal(obj, msg, logger = shared_1.LogConfig.get()) {
+    fatal(obj, msg, logger = LogConfig.get()) {
         logger.fatal(obj, msg);
         console.log('\n');
         console.log(this.renderHelpText());
     }
 }
-exports.TileSetBaseAction = TileSetBaseAction;

package/build/cli/basemaps/tileset.util.d.ts

@@ -1,18 +1,6 @@
 import { ConfigImagery, ConfigLayer, ConfigTileSet, ConfigTileSetRaster } from '@basemaps/config';
 import { Epsg } from '@basemaps/geo';
-import { CliTable } from '../cli.table';
-/**
- * Parse a hexstring into RGBA
- *
- * Defaults to 0 if missing values
- * @param str string to parse
- */
-export declare function parseRgba(str: string): {
-    r: number;
-    g: number;
-    b: number;
-    alpha: number;
-};
+import { CliTable } from '../cli.table.js';
 export declare function rgbaToHex(c: {
     r: number;
     g: number;

package/build/cli/basemaps/tileset.util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tileset.util.d.ts","sourceRoot":"","sources":["../../../src/cli/basemaps/tileset.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,mBAAmB,EAAe,MAAM,kBAAkB,CAAC;AAC/G,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAGrC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAgBxC;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAYzF;AASD,wBAAgB,SAAS,CAAC,CAAC,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAEvF;AAED,UAAU,mBAAmB;IACzB,KAAK,EAAE,WAAW,CAAC;IACnB,OAAO,EAAE,aAAa,CAAC;CAC1B;AAED,eAAO,MAAM,YAAY,+BAAsC,CAAC;AAMhE,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,EAAE,UAAU,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CActG;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,UAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAoB9G;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAItG"}
+{"version":3,"file":"tileset.util.d.ts","sourceRoot":"","sources":["../../../src/cli/basemaps/tileset.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,mBAAmB,EAAe,MAAM,kBAAkB,CAAC;AAC/G,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAGrC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAU3C,wBAAgB,SAAS,CAAC,CAAC,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAEvF;AAED,UAAU,mBAAmB;IAC3B,KAAK,EAAE,WAAW,CAAC;IACnB,OAAO,EAAE,aAAa,CAAC;CACxB;AAED,eAAO,MAAM,YAAY,+BAAsC,CAAC;AAMhE,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,EAAE,UAAU,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CActG;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,UAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAc9G;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAItG"}

package/build/cli/basemaps/tileset.util.js

@@ -1,47 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.invalidateXYZCache = exports.printTileSet = exports.printTileSetImagery = exports.TileSetTable = exports.rgbaToHex = exports.parseRgba = void 0;
-const tslib_1 = require("tslib");
-const config_1 = require("@basemaps/config");
-const shared_1 = require("@basemaps/shared");
-const c = tslib_1.__importStar(require("ansi-colors"));
-const cli_table_1 = require("../cli.table");
-const util_1 = require("../util");
-/**
- * Parse a string as hex, return 0 on failure
- * @param str string to parse
- */
-function parseHex(str) {
-    if (str === '')
-        return 0;
-    const val = parseInt(str, 16);
-    if (isNaN(val)) {
-        throw new Error('Invalid hex byte: ' + str);
-    }
-    return val;
-}
-/**
- * Parse a hexstring into RGBA
- *
- * Defaults to 0 if missing values
- * @param str string to parse
- */
-function parseRgba(str) {
-    if (str.startsWith('0x'))
-        str = str.slice(2);
-    else if (str.startsWith('#'))
-        str = str.slice(1);
-    if (str.length !== 6 && str.length !== 8) {
-        throw new Error('Invalid hex color: ' + str);
-    }
-    return {
-        r: parseHex(str.substr(0, 2)),
-        g: parseHex(str.substr(2, 2)),
-        b: parseHex(str.substr(4, 2)),
-        alpha: parseHex(str.substr(6, 2)),
-    };
-}
-exports.parseRgba = parseRgba;
+import { TileSetType } from '@basemaps/config';
+import { Config } from '@basemaps/shared';
+import * as c from 'ansi-colors';
+import { CliTable } from '../cli.table.js';
+import { invalidateCache } from '../util.js';
 /**
  * Convert a number to a two digit hex string. numbers < 16 are padded with '0'
  */
@@ -49,20 +10,19 @@ function numberToHexString(n) {
     const ans = n.toString(16);
     return ans.length === 1 ? '0' + ans : ans;
 }
-function rgbaToHex(c) {
+export function rgbaToHex(c) {
     return numberToHexString(c.r) + numberToHexString(c.g) + numberToHexString(c.b) + numberToHexString(c.alpha);
 }
-exports.rgbaToHex = rgbaToHex;
-exports.TileSetTable = new cli_table_1.CliTable();
-exports.TileSetTable.field('Imagery Id', 30, (obj) => c.dim(obj.imagery.id));
-exports.TileSetTable.field('Name', 40, (obj) => obj.imagery.name);
-exports.TileSetTable.field('Zoom', 10, (obj) => obj.layer.minZoom + ' -> ' + obj.layer.maxZoom);
-exports.TileSetTable.field('CreatedAt', 10, (obj) => new Date(obj.imagery.createdAt).toISOString());
-async function printTileSetImagery(tsData, projection) {
-    const allImagery = await shared_1.Config.TileSet.getImagery(tsData);
+export const TileSetTable = new CliTable();
+TileSetTable.field('Imagery Id', 30, (obj) => c.dim(obj.imagery.id));
+TileSetTable.field('Name', 40, (obj) => obj.imagery.name);
+TileSetTable.field('Zoom', 10, (obj) => obj.layer.minZoom + ' -> ' + obj.layer.maxZoom);
+TileSetTable.field('CreatedAt', 10, (obj) => new Date(obj.imagery.createdAt).toISOString());
+export async function printTileSetImagery(tsData, projection) {
+    const allImagery = await Config.getTileSetImagery(tsData);
     const ruleImagery = [];
     for (const layer of tsData.layers) {
-        const imgId = shared_1.Config.TileSet.getImageId(layer, projection);
+        const imgId = Config.getImageId(layer, projection);
         if (imgId != null) {
             const imagery = allImagery.get(imgId);
             if (imagery == null)
@@ -71,15 +31,14 @@ async function printTileSetImagery(tsData, projection) {
         }
     }
     console.log('');
-    exports.TileSetTable.header();
-    exports.TileSetTable.print(ruleImagery);
+    TileSetTable.header();
+    TileSetTable.print(ruleImagery);
 }
-exports.printTileSetImagery = printTileSetImagery;
-async function printTileSet(tsData, projection, printImagery = true) {
+export async function printTileSet(tsData, projection, printImagery = true) {
     console.log(c.bold('TileSet:'), `${tsData.name} `);
     console.log(c.bold('CreatedAt:'), new Date(tsData.createdAt).toISOString());
     console.log(c.bold('UpdatedAt:'), new Date(tsData.updatedAt).toISOString());
-    if (tsData.type === config_1.TileSetType.Vector)
+    if (tsData.type === TileSetType.Vector)
         return;
     if (tsData.background) {
         console.log(c.bold('Background'), tsData.background);
@@ -90,12 +49,10 @@ async function printTileSet(tsData, projection, printImagery = true) {
     if (printImagery)
         await printTileSetImagery(tsData, projection);
 }
-exports.printTileSet = printTileSet;
 /**
  * Invalidate the cloudfront distribution cache when updating imagery sets
  */
-async function invalidateXYZCache(name, projection, commit = false) {
+export async function invalidateXYZCache(name, projection, commit = false) {
     const path = `/v1/tiles/${name}/${projection.toEpsgString()}/*`;
-    return util_1.invalidateCache(path, commit);
+    return invalidateCache(path, commit);
 }
-exports.invalidateXYZCache = invalidateXYZCache;

package/build/cli/cli.table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.table.d.ts","sourceRoot":"","sources":["../../src/cli/cli.table.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,qBAAa,QAAQ,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAC/C,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,MAAM,CAAA;KAAE,EAAE,CAAM;IAE1E,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,MAAM,GAAG,IAAI;IAInE,MAAM,IAAI,IAAI;IAId,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,MAAM;IAIpB,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,IAAI;CAGxB"}
+{"version":3,"file":"cli.table.d.ts","sourceRoot":"","sources":["../../src/cli/cli.table.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,qBAAa,QAAQ,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACjD,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,MAAM,CAAA;KAAE,EAAE,CAAM;IAE1E,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,MAAM,GAAG,IAAI;IAInE,MAAM,IAAI,IAAI;IAId,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,MAAM;IAIpB,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,IAAI;CAGtB"}

package/build/cli/cli.table.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CliTable = void 0;
-const tslib_1 = require("tslib");
-const c = tslib_1.__importStar(require("ansi-colors"));
+import * as c from 'ansi-colors';
 /**
  * Simple fixed width table formatter
  */
-class CliTable {
+export class CliTable {
     constructor() {
         this.fields = [];
     }
@@ -23,4 +19,3 @@ class CliTable {
         obj.forEach((o) => console.log(this.line(o)));
     }
 }
-exports.CliTable = CliTable;

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

@@ -1,16 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const ospec_1 = tslib_1.__importDefault(require("ospec"));
-const action_batch_1 = require("../action.batch");
-ospec_1.default.spec('action.batch', () => {
-    ospec_1.default('extractResolutionFromName', () => {
-        ospec_1.default(action_batch_1.extractResolutionFromName('2013')).equals(-1);
-        ospec_1.default(action_batch_1.extractResolutionFromName('new_zealand_sentinel_2018-19_10m')).equals(10000);
-        ospec_1.default(action_batch_1.extractResolutionFromName('abc2017def_1.00m')).equals(1000);
-        ospec_1.default(action_batch_1.extractResolutionFromName('wellington_urban_2017_0.10m')).equals(100);
-        ospec_1.default(action_batch_1.extractResolutionFromName('wellington_urban_2017_0-10m')).equals(100);
-        ospec_1.default(action_batch_1.extractResolutionFromName('wellington_urban_2017_1.00m')).equals(1000);
-        ospec_1.default(action_batch_1.extractResolutionFromName('wellington_urban_2017_0.025m')).equals(25);
+import o from 'ospec';
+import { extractResolutionFromName } from '../action.batch.js';
+o.spec('action.batch', () => {
+    o('extractResolutionFromName', () => {
+        o(extractResolutionFromName('2013')).equals(-1);
+        o(extractResolutionFromName('new_zealand_sentinel_2018-19_10m')).equals(10000);
+        o(extractResolutionFromName('abc2017def_1.00m')).equals(1000);
+        o(extractResolutionFromName('wellington_urban_2017_0.10m')).equals(100);
+        o(extractResolutionFromName('wellington_urban_2017_0-10m')).equals(100);
+        o(extractResolutionFromName('wellington_urban_2017_1.00m')).equals(1000);
+        o(extractResolutionFromName('wellington_urban_2017_0.025m')).equals(25);
     });
 });