@basemaps/shared 6.28.1 → 6.29.0

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.29.0](https://github.com/linz/basemaps/compare/v6.28.1...v6.29.0) (2022-06-27)
+
+
+### Bug Fixes
+
+* **cli:** ensure errors are thrown ([#2248](https://github.com/linz/basemaps/issues/2248)) ([c0923fe](https://github.com/linz/basemaps/commit/c0923fe137ce36c610c6e13332292d5c7f573c16))
+
+
+### Features
+
+* **config:** create a hash of config bundles and use bundle created timestamp for records ([#2274](https://github.com/linz/basemaps/issues/2274)) ([bd9c7bb](https://github.com/linz/basemaps/commit/bd9c7bbf3f651417b60ba6ad2ca655f89f1f5cd9))
+* **lambda-tiler:** serve assets via /v1/sprites and /v1/fonts ([#2246](https://github.com/linz/basemaps/issues/2246)) ([0e04c63](https://github.com/linz/basemaps/commit/0e04c631363d5b540ae16bfc8c4c7910e1308412))
+
+
+
+
+
 ## [6.28.1](https://github.com/linz/basemaps/compare/v6.28.0...v6.28.1) (2022-06-07)
 
 **Note:** Version bump only for package @basemaps/shared

package/build/cli/base.d.ts

@@ -11,6 +11,12 @@ export declare const CliId: string;
 export declare abstract class BaseCommandLine extends CommandLineParser {
     verbose: import("@rushstack/ts-command-line").CommandLineFlagParameter;
     extraVerbose: import("@rushstack/ts-command-line").CommandLineFlagParameter;
+    toolName: string;
+    toolDescription: string;
+    constructor(opt: {
+        toolFilename: string;
+        toolDescription: string;
+    });
     protected onExecute(): Promise<void>;
     protected onDefineParameters(): void;
     run(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/cli/base.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"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/cli/base.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,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;gBAEZ,GAAG,EAAE;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE;IAMlE,SAAS,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAepC,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAI7B,GAAG,IAAI,IAAI;CAUnB"}

package/build/cli/base.js

@@ -15,8 +15,8 @@ export const CliInfo = {
 /** Unique Id for this instance of the cli being run */
 export const CliId = ulid.ulid();
 export class BaseCommandLine extends CommandLineParser {
-    constructor() {
-        super(...arguments);
+    constructor(opt) {
+        super(opt);
         this.verbose = this.defineFlagParameter({
             parameterLongName: '--verbose',
             parameterShortName: '-v',
@@ -27,6 +27,8 @@ export class BaseCommandLine extends CommandLineParser {
             parameterShortName: '-V',
             description: 'Show extra extra logging detail',
         });
+        this.toolName = opt.toolFilename;
+        this.toolDescription = opt.toolDescription;
     }
     onExecute() {
         if (this.verbose.value) {
@@ -39,7 +41,7 @@ export class BaseCommandLine extends CommandLineParser {
             LogConfig.get().level = 'info';
         }
         const logger = LogConfig.get().child({ id: CliId });
-        logger.info(CliInfo, 'CliStart');
+        logger.info({ package: CliInfo, cli: this.toolName }, 'Cli:Start');
         LogConfig.set(logger);
         return super.onExecute();
     }
@@ -52,7 +54,7 @@ export class BaseCommandLine extends CommandLineParser {
                 LogConfig.get().fatal(err.obj, err.message);
             }
             else {
-                LogConfig.get().fatal({ err }, 'Failed to run command');
+                LogConfig.get().fatal({ err, cli: this.toolName }, 'Cli:Failed');
             }
             process.exit(1);
         });

package/build/const.d.ts

@@ -15,6 +15,8 @@ export declare const Const: {
 export declare const Env: {
     /** Public URL base that tiles are served from */
     PublicUrlBase: string;
+    /** Location of sprites and glyphs */
+    AssetLocation: string;
     /** How many tiffs to load at one time */
     TiffConcurrency: string;
     /** Temporary folder used for processing, @default /tmp */

package/build/const.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"const.d.ts","sourceRoot":"","sources":["../src/const.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,KAAK;;;;;;;;;;;;;CAajB,CAAC;AAEF,eAAO,MAAM,GAAG;IACd,iDAAiD;;IAGjD,yCAAyC;;IAGzC,0DAA0D;;IAG1D,6DAA6D;;IAG7D,uDAAuD;;IAGvD,6BAA6B;;IAG7B,4BAA4B;;IAG5B,wCAAwC;;IAGxC,kDAAkD;;;QAIhD,gDAAgD;;QAEhD,2DAA2D;;;;;;;;;IAW7D,+EAA+E;iBAClE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIxC,gGAAgG;uBAC7E,MAAM,iBAAiB,MAAM,GAAG,MAAM;oBAazC,OAAO;CAGxB,CAAC"}
+{"version":3,"file":"const.d.ts","sourceRoot":"","sources":["../src/const.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,KAAK;;;;;;;;;;;;;CAajB,CAAC;AAEF,eAAO,MAAM,GAAG;IACd,iDAAiD;;IAGjD,qCAAqC;;IAGrC,yCAAyC;;IAGzC,0DAA0D;;IAG1D,6DAA6D;;IAG7D,uDAAuD;;IAGvD,6BAA6B;;IAG7B,4BAA4B;;IAG5B,wCAAwC;;IAGxC,kDAAkD;;;QAIhD,gDAAgD;;QAEhD,2DAA2D;;;;;;;;;IAW7D,+EAA+E;iBAClE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIxC,gGAAgG;uBAC7E,MAAM,iBAAiB,MAAM,GAAG,MAAM;oBAazC,OAAO;CAGxB,CAAC"}

package/build/const.js

@@ -16,6 +16,8 @@ export const Const = {
 export const Env = {
     /** Public URL base that tiles are served from */
     PublicUrlBase: 'BASEMAPS_PUBLIC_URL',
+    /** Location of sprites and glyphs */
+    AssetLocation: 'BASEMAPS_ASSEST_LOCATION',
     /** How many tiffs to load at one time */
     TiffConcurrency: 'TIFF_CONCURRENCY',
     /** Temporary folder used for processing, @default /tmp */

package/build/file/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/file/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,GAAG,IAAI,SAAS,EAAW,MAAM,YAAY,CAAC;AAGvD,OAAO,EAAE,UAAU,EAAkB,MAAM,kBAAkB,CAAC;AAK9D,oBAAY,OAAO,GAAG,OAAO,SAAS,GAAG;IACvC,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1C,SAAS,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,sCAAsC;IACtC,SAAS,CAAC,EAAE,EAAE,UAAU,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,GAAG,SAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/file/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AAEjC,OAAO,EAAE,GAAG,IAAI,SAAS,EAAE,MAAM,YAAY,CAAC;AAM9C,OAAO,EAAE,UAAU,EAAkB,MAAM,kBAAkB,CAAC;AAI9D,oBAAY,OAAO,GAAG,OAAO,SAAS,GAAG;IACvC,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1C,SAAS,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,sCAAsC;IACtC,SAAS,CAAC,EAAE,EAAE,UAAU,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,GAAG,SAA8B,CAAC"}

package/build/file/index.js

@@ -1,9 +1,12 @@
 export * from './file.config.js';
-import { fsa as fsaSource, FsAwsS3 } from '@chunkd/fs';
+import { parseUri } from '@chunkd/core';
+import { fsa as fsaSource } from '@chunkd/fs';
+import { FsAwsS3 } from '@chunkd/source-aws';
+import { AwsCredentials } from '@chunkd/source-aws-v2';
+import S3 from 'aws-sdk/clients/s3.js';
 import { promisify } from 'util';
 import { createGzip, gunzip } from 'zlib';
 import { isConfigS3Role } from './file.config.js';
-import { AwsCredentials } from '@chunkd/source-aws-v2';
 const pGunzip = promisify(gunzip);
 export const fsa = fsaSource;
 fsa.readJson = async function readJson(filePath) {
@@ -31,12 +34,10 @@ fsa.configure = function configure(cfg) {
         return; // ignore local configs
     if (!isConfigS3Role(cfg))
         return; // ignore configs which don't need role assumptions
-    const { bucket } = FsAwsS3.parse(cfg.path);
-    const bucketUri = `s3://${bucket}/`;
+    const res = parseUri(cfg.path);
+    if (res == null)
+        throw new Error('Failed to parse URI: ' + cfg.path);
+    const bucketUri = `s3://${res.bucket}/`;
     this.register(bucketUri, AwsCredentials.fsFromRole(cfg.roleArn, cfg.externalId));
 };
-/**
- *  Default to using the file handler useful for folders like
- * "C:\" or "directory_name/sub_directory"
- */
-fsa.register('', fsa.get('file://'));
+fsa.register('s3://', new FsAwsS3(new S3()));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/shared",
-  "version": "6.28.1",
+  "version": "6.29.0",
   "private": false,
   "repository": {
     "type": "git",
@@ -23,10 +23,10 @@
     "test": "ospec --globs 'build/**/*.test.js'"
   },
   "dependencies": {
-    "@basemaps/config": "^6.28.1",
+    "@basemaps/config": "^6.29.0",
     "@basemaps/geo": "^6.28.1",
-    "@basemaps/tiler": "^6.28.1",
-    "@chunkd/source-aws-v2": "^8.1.0",
+    "@basemaps/tiler": "^6.29.0",
+    "@chunkd/source-aws-v2": "^8.4.0",
     "@linzjs/geojson": "^6.28.1",
     "@linzjs/metrics": "^6.28.1",
     "aws-sdk": "^2.890.0",
@@ -48,5 +48,5 @@
   "files": [
     "build/"
   ],
-  "gitHead": "f387e0365bcfc7391fd8d0665195b246c93532cf"
+  "gitHead": "9097d2f045d734d0d5acd968f026fe29ab6afcda"
 }

package/build/aws/aws.dynamo.table.d.ts

@@ -1,20 +0,0 @@
-/**
- * Base interface for all dynamo records
- *
- * all records should have these values.
- */
-export interface BaseDynamoTable {
-    /**
-     * Primary key of the table
-     */
-    id: string;
-    /**
-     * Date that the key was created
-     */
-    createdAt: number;
-    /**
-     * Date the record was last modified
-     */
-    updatedAt: number;
-}
-//# sourceMappingURL=aws.dynamo.table.d.ts.map

package/build/aws/aws.dynamo.table.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"aws.dynamo.table.d.ts","sourceRoot":"","sources":["../../src/aws/aws.dynamo.table.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB"}

package/build/aws/aws.dynamo.table.js

@@ -1 +0,0 @@
-export {};