@basemaps/shared 6.34.0 → 6.35.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.35.0](https://github.com/linz/basemaps/compare/v6.34.0...v6.35.0) (2022-09-14)
+
+
+### Bug Fixes
+
+* **lambda-tiler:** ensure wmts and style propagate config location ([#2445](https://github.com/linz/basemaps/issues/2445)) ([d93a34b](https://github.com/linz/basemaps/commit/d93a34b50bce9b49a30baa1fbfd7142332738d23))
+* **shared:** actually catch read errors ([#2451](https://github.com/linz/basemaps/issues/2451)) ([e349f3e](https://github.com/linz/basemaps/commit/e349f3e81a1eb75d27bf69a1a6474f70a5b02ef8))
+* **shared:** do not attempt to lookup roles for the role config data ([#2461](https://github.com/linz/basemaps/issues/2461)) ([bdd5c72](https://github.com/linz/basemaps/commit/bdd5c72f084d988f36c01204ebdae6641c9011aa))
+* **shared:** ensure & is escaped in xml ([#2456](https://github.com/linz/basemaps/issues/2456)) ([665e433](https://github.com/linz/basemaps/commit/665e4335cbf52aeb2292295aba40fa40abf4c1b0))
+
+
+### Features
+
+* switch to aws role provider from chunkd ([#2473](https://github.com/linz/basemaps/issues/2473)) ([87be0e0](https://github.com/linz/basemaps/commit/87be0e08610f02003cb4ec3f6ced9b2051ee1617))
+* use $AWS_ROLE_CONFIG_PATH to be more consistent ([#2476](https://github.com/linz/basemaps/issues/2476)) ([e5d0f1f](https://github.com/linz/basemaps/commit/e5d0f1f6cdefd383366c2b7c53994568a5f67a21))
+* **cli:** New cli to create cog map sheet from a give fgb file and config. ([#2472](https://github.com/linz/basemaps/issues/2472)) ([6cf2563](https://github.com/linz/basemaps/commit/6cf25638e2ae4fe365aa78ab77cd0d319c02d7a0))
+* allow loading config from ?config ([#2442](https://github.com/linz/basemaps/issues/2442)) ([8f946d8](https://github.com/linz/basemaps/commit/8f946d8ffb155304b80c26aca0faf4c64136390f))
+
+
+
+
+
 # [6.34.0](https://github.com/linz/basemaps/compare/v6.33.0...v6.34.0) (2022-08-17)
 
 **Note:** Version bump only for package @basemaps/shared

package/build/__tests__/url.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=url.test.d.ts.map

package/build/__tests__/url.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"url.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/url.test.ts"],"names":[],"mappings":""}

package/build/__tests__/url.test.js

@@ -0,0 +1,16 @@
+import o from 'ospec';
+import { toQueryString } from '../url.js';
+o.spec('toQueryString', () => {
+    o('should create a  query string', () => {
+        o(toQueryString({ api: 'foo' })).equals('?api=foo');
+    });
+    o('should not create empty query strings', () => {
+        o(toQueryString({})).equals('');
+        o(toQueryString({ api: undefined })).equals('');
+        o(toQueryString({ api: null })).equals('');
+    });
+    o('should sort keys', () => {
+        o(toQueryString({ z: 'z', a: 'a' })).equals('?a=a&z=z');
+    });
+});
+//# sourceMappingURL=url.test.js.map

package/build/__tests__/url.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"url.test.js","sourceRoot":"","sources":["../../src/__tests__/url.test.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,CAAC,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;IAC3B,CAAC,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACtC,CAAC,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC9C,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAChC,CAAC,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,SAAS,EAAS,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,IAAI,EAAS,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,kBAAkB,EAAE,GAAG,EAAE;QACzB,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/build/config.d.ts

@@ -0,0 +1,4 @@
+import { BasemapsConfigProvider } from '@basemaps/config';
+export declare function setDefaultConfig(cfg: BasemapsConfigProvider): BasemapsConfigProvider;
+export declare function getDefaultConfig(): BasemapsConfigProvider;
+//# sourceMappingURL=config.d.ts.map

package/build/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAKhF,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,sBAAsB,GAAG,sBAAsB,CAGpF;AAED,wBAAgB,gBAAgB,IAAI,sBAAsB,CAGzD"}

package/build/config.js

@@ -0,0 +1,13 @@
+import { ConfigProviderDynamo } from '@basemaps/config';
+import { Const, Env } from './const.js';
+let ConfigDefault = new ConfigProviderDynamo(Const.TileMetadata.TableName);
+export function setDefaultConfig(cfg) {
+    ConfigDefault = cfg;
+    return ConfigDefault;
+}
+export function getDefaultConfig() {
+    if (ConfigDefault.assets == null)
+        ConfigDefault.assets = Env.get(Env.AssetLocation);
+    return ConfigDefault;
+}
+//# sourceMappingURL=config.js.map

package/build/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAA0B,MAAM,kBAAkB,CAAC;AAChF,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAExC,IAAI,aAAa,GAA2B,IAAI,oBAAoB,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;AAEnG,MAAM,UAAU,gBAAgB,CAAC,GAA2B;IAC1D,aAAa,GAAG,GAAG,CAAC;IACpB,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,IAAI,aAAa,CAAC,MAAM,IAAI,IAAI;QAAE,aAAa,CAAC,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IACpF,OAAO,aAAa,CAAC;AACvB,CAAC"}

package/build/const.d.ts

@@ -27,12 +27,6 @@ export declare const Env: {
     AwsRoleDurationHours: string;
     /** AWS role config bucket */
     AwsRoleConfigPath: string;
-    /** Import Imagery bucket */
-    ImportImageryBucket: string;
-    /** Import Imagery files number limit */
-    ImportFilesNumberLimit: string;
-    /** Import Imagery files total size limit in GB */
-    ImportFilesSizeLimitGb: string;
     Gdal: {
         /** Should the gdal docker container be used? */
         UseDocker: string;

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,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"}
+{"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;;;QAI3B,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

@@ -27,13 +27,7 @@ export const Env = {
     /** Number of hours to assume a role for, @default 8 */
     AwsRoleDurationHours: 'AWS_ROLE_DURATION_HOURS',
     /** AWS role config bucket */
-    AwsRoleConfigPath: 'ROLE_CONFIG_PATH',
-    /** Import Imagery bucket */
-    ImportImageryBucket: 'IMPORT_IMAGERY_BUCKET',
-    /** Import Imagery files number limit */
-    ImportFilesNumberLimit: 'FILES_NUMBER_LIMIT',
-    /** Import Imagery files total size limit in GB */
-    ImportFilesSizeLimitGb: 'FILES_SIZE_LIMIT_GB',
+    AwsRoleConfigPath: 'AWS_ROLE_CONFIG_PATH',
     Gdal: {
         /** Should the gdal docker container be used? */
         UseDocker: 'GDAL_DOCKER',

package/build/const.js.map

@@ -1 +1 @@
-{"version":3,"file":"const.js","sourceRoot":"","sources":["../src/const.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,MAAM,CAAC,MAAM,KAAK,GAAG;IACnB,GAAG,EAAE;QACH,MAAM,EAAE,gBAAgB;KACzB;IACD,MAAM,EAAE;QACN,WAAW,EAAE,KAAK;QAClB,SAAS,EAAE,QAAQ;QACnB,kBAAkB,EAAE,IAAI;KACzB;IACD,YAAY,EAAE;QACZ,SAAS,EAAE,cAAc;QACzB,kBAAkB,EAAE,IAAI;KACzB;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,GAAG,GAAG;IACjB,iDAAiD;IACjD,aAAa,EAAE,qBAAqB;IAEpC,qCAAqC;IACrC,aAAa,EAAE,0BAA0B;IAEzC,yCAAyC;IACzC,eAAe,EAAE,kBAAkB;IAEnC,0DAA0D;IAC1D,UAAU,EAAE,aAAa;IAEzB,6DAA6D;IAC7D,UAAU,EAAE,2BAA2B;IAEvC,uDAAuD;IACvD,oBAAoB,EAAE,yBAAyB;IAE/C,6BAA6B;IAC7B,iBAAiB,EAAE,kBAAkB;IAErC,4BAA4B;IAC5B,mBAAmB,EAAE,uBAAuB;IAE5C,wCAAwC;IACxC,sBAAsB,EAAE,oBAAoB;IAE5C,kDAAkD;IAClD,sBAAsB,EAAE,qBAAqB;IAE7C,IAAI,EAAE;QACJ,gDAAgD;QAChD,SAAS,EAAE,aAAa;QACxB,2DAA2D;QAC3D,eAAe,EAAE,uBAAuB;QACxC,kBAAkB,EAAE,2BAA2B;KAChD;IAED,SAAS,EAAE;QACT,YAAY,EAAE,0BAA0B;QACxC,sBAAsB,EAAE,qCAAqC;QAC7D,WAAW,EAAE,wBAAwB;KACtC;IAED,+EAA+E;IAC/E,GAAG,CAAC,OAAe;QACjB,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAED,gGAAgG;IAChG,SAAS,CAAC,OAAe,EAAE,aAAqB;QAC9C,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,OAAO,KAAK,EAAE,IAAI,OAAO,IAAI,IAAI,EAAE;YACrC,OAAO,aAAa,CAAC;SACtB;QAED,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE;YACjB,OAAO,aAAa,CAAC;SACtB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,YAAY;QACV,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;IAC/C,CAAC;CACF,CAAC"}
+{"version":3,"file":"const.js","sourceRoot":"","sources":["../src/const.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,MAAM,CAAC,MAAM,KAAK,GAAG;IACnB,GAAG,EAAE;QACH,MAAM,EAAE,gBAAgB;KACzB;IACD,MAAM,EAAE;QACN,WAAW,EAAE,KAAK;QAClB,SAAS,EAAE,QAAQ;QACnB,kBAAkB,EAAE,IAAI;KACzB;IACD,YAAY,EAAE;QACZ,SAAS,EAAE,cAAc;QACzB,kBAAkB,EAAE,IAAI;KACzB;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,GAAG,GAAG;IACjB,iDAAiD;IACjD,aAAa,EAAE,qBAAqB;IAEpC,qCAAqC;IACrC,aAAa,EAAE,0BAA0B;IAEzC,yCAAyC;IACzC,eAAe,EAAE,kBAAkB;IAEnC,0DAA0D;IAC1D,UAAU,EAAE,aAAa;IAEzB,6DAA6D;IAC7D,UAAU,EAAE,2BAA2B;IAEvC,uDAAuD;IACvD,oBAAoB,EAAE,yBAAyB;IAE/C,6BAA6B;IAC7B,iBAAiB,EAAE,sBAAsB;IAEzC,IAAI,EAAE;QACJ,gDAAgD;QAChD,SAAS,EAAE,aAAa;QACxB,2DAA2D;QAC3D,eAAe,EAAE,uBAAuB;QACxC,kBAAkB,EAAE,2BAA2B;KAChD;IAED,SAAS,EAAE;QACT,YAAY,EAAE,0BAA0B;QACxC,sBAAsB,EAAE,qCAAqC;QAC7D,WAAW,EAAE,wBAAwB;KACtC;IAED,+EAA+E;IAC/E,GAAG,CAAC,OAAe;QACjB,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAED,gGAAgG;IAChG,SAAS,CAAC,OAAe,EAAE,aAAqB;QAC9C,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,OAAO,KAAK,EAAE,IAAI,OAAO,IAAI,IAAI,EAAE;YACrC,OAAO,aAAa,CAAC;SACtB;QAED,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE;YACjB,OAAO,aAAa,CAAC;SACtB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,YAAY;QACV,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;IAC/C,CAAC;CACF,CAAC"}

package/build/file/index.d.ts

@@ -1,5 +1,4 @@
 export * from './file.config.js';
-export { RoleRegister, RoleConfig, BucketConfig } from './role.registry.js';
 import { fsa as fsaSource } from '@chunkd/fs';
 import { FileConfig } from './file.config.js';
 export declare type FsaJson = typeof fsaSource & {

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,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAG5E,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/file/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AAGjC,OAAO,EAAE,GAAG,IAAI,SAAS,EAAE,MAAM,YAAY,CAAC;AAQ9C,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,12 +1,13 @@
 export * from './file.config.js';
-export { RoleRegister } from './role.registry.js';
 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 { AwsCredentials, FsAwsS3ProviderV2 } from '@chunkd/source-aws-v2';
 import S3 from 'aws-sdk/clients/s3.js';
 import { promisify } from 'util';
 import { createGzip, gunzip } from 'zlib';
+import { Env } from '../const.js';
+import { LogConfig } from '../log.js';
 import { isConfigS3Role } from './file.config.js';
 const pGunzip = promisify(gunzip);
 export const fsa = fsaSource;
@@ -41,5 +42,15 @@ fsa.configure = function configure(cfg) {
     const bucketUri = `s3://${res.bucket}/`;
     this.register(bucketUri, AwsCredentials.fsFromRole(cfg.roleArn, cfg.externalId));
 };
-fsa.register('s3://', new FsAwsS3(new S3()));
+const s3Fs = new FsAwsS3(new S3());
+fsa.register('s3://', s3Fs);
+const bucketProviderConfig = Env.get(Env.AwsRoleConfigPath);
+if (bucketProviderConfig != null) {
+    const provider = new FsAwsS3ProviderV2(bucketProviderConfig, fsa);
+    provider.onFileSystemCreated = (ro, fs) => {
+        LogConfig.get().debug({ roleArn: ro.roleArn, prefix: ro.prefix }, 'FileSystem:Registered');
+        fsa.register(ro.prefix, fs);
+    };
+    s3Fs.credentials = provider;
+}
 //# sourceMappingURL=index.js.map

package/build/file/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/file/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,YAAY,EAA4B,MAAM,oBAAoB,CAAC;AAE5E,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,GAAG,IAAI,SAAS,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC1C,OAAO,EAAc,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE9D,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAsC,CAAC;AASvE,MAAM,CAAC,MAAM,GAAG,GAAG,SAA2B,CAAC;AAE/C,GAAG,CAAC,QAAQ,GAAG,KAAK,UAAU,QAAQ,CAAI,QAAgB;IACxD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAC5B,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAM,CAAC;KAC1D;SAAM;QACL,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAM,CAAC;KACzC;AACH,CAAC,CAAC;AAEF,GAAG,CAAC,SAAS,GAAG,KAAK,UAAU,SAAS,CAAI,QAAgB,EAAE,GAAM;IAClE,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5D,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAC5B,MAAM,IAAI,GAAG,UAAU,EAAE,CAAC;QAC1B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;KACnC;SAAM;QACL,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;KACnC;AACH,CAAC,CAAC;AAEF,GAAG,CAAC,SAAS,GAAG,SAAS,SAAS,CAAC,GAAe;IAChD,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI;QAAE,OAAO,CAAC,uBAAuB;IACtD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;QAAE,OAAO,CAAC,mDAAmD;IAErF,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,GAAG,IAAI,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,QAAQ,GAAG,CAAC,MAAM,GAAG,CAAC;IACxC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;AACnF,CAAC,CAAC;AAEF,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/file/index.ts"],"names":[],"mappings":"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"}

package/build/index.d.ts

@@ -1,4 +1,3 @@
-export { Config } from '@basemaps/config';
 export { Const, Env } from './const.js';
 export { LogConfig, LogType } from './log.js';
 export * from './api.js';
@@ -6,6 +5,8 @@ export { V, VNode, VNodeElement, VNodeText } from './vdom.js';
 export { CompositeError } from './composite.error.js';
 export { LoggerFatalError } from './logger.fatal.error.js';
 export { TileSetName, TileSetNameValues } from './proj/tile.set.name.js';
+export { setDefaultConfig, getDefaultConfig } from './config.js';
+export { toQueryString } from './url.js';
 export * from './proj/projection.js';
 export * from './file/index.js';
 export * from './util.js';

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAC9C,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEzE,cAAc,sBAAsB,CAAC;AAErC,cAAc,iBAAiB,CAAC;AAEhC,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAC9C,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC"}

package/build/index.js

@@ -1,9 +1,5 @@
 // Force aws-sdk connection reuse
 process.env['AWS_NODEJS_CONNECTION_REUSE_ENABLED'] = '1';
-import { Config, ConfigProviderDynamo } from '@basemaps/config';
-import { Const } from './const.js';
-Config.setConfigProvider(new ConfigProviderDynamo(Const.TileMetadata.TableName));
-export { Config } from '@basemaps/config';
 export { Const, Env } from './const.js';
 export { LogConfig } from './log.js';
 export * from './api.js';
@@ -11,6 +7,8 @@ export { V, VNode, VNodeElement, VNodeText } from './vdom.js';
 export { CompositeError } from './composite.error.js';
 export { LoggerFatalError } from './logger.fatal.error.js';
 export { TileSetName, TileSetNameValues } from './proj/tile.set.name.js';
+export { setDefaultConfig, getDefaultConfig } from './config.js';
+export { toQueryString } from './url.js';
 export * from './proj/projection.js';
 export * from './file/index.js';
 export * from './util.js';

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,GAAG,GAAG,CAAC;AAEzD,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,MAAM,CAAC,iBAAiB,CAAC,IAAI,oBAAoB,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;AAEjF,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,SAAS,EAAW,MAAM,UAAU,CAAC;AAC9C,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEzE,cAAc,sBAAsB,CAAC;AAErC,cAAc,iBAAiB,CAAC;AAEhC,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,GAAG,GAAG,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,SAAS,EAAW,MAAM,UAAU,CAAC;AAC9C,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC"}

package/build/url.d.ts

@@ -0,0 +1,3 @@
+/** Convert to a a sorted query string or empty string if no query parameters are provided */
+export declare function toQueryString(r: Record<string, string | null | undefined>): string;
+//# sourceMappingURL=url.d.ts.map

package/build/url.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../src/url.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAC7F,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,GAAG,MAAM,CAelF"}

package/build/url.js

@@ -0,0 +1,18 @@
+/** Convert to a a sorted query string or empty string if no query parameters are provided */
+export function toQueryString(r) {
+    const entries = Object.entries(r);
+    if (entries.length === 0)
+        return '';
+    const search = new URLSearchParams();
+    for (const e of entries) {
+        if (e[1] == null)
+            continue;
+        search.set(e[0], e[1]);
+    }
+    search.sort();
+    const query = search.toString();
+    if (query === '')
+        return '';
+    return `?${query}`;
+}
+//# sourceMappingURL=url.js.map

package/build/url.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"url.js","sourceRoot":"","sources":["../src/url.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAC7F,MAAM,UAAU,aAAa,CAAC,CAA4C;IACxE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAClC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEpC,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;IACrC,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;QACvB,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI;YAAE,SAAS;QAC3B,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACxB;IAED,MAAM,CAAC,IAAI,EAAE,CAAC;IAEd,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IAChC,IAAI,KAAK,KAAK,EAAE;QAAE,OAAO,EAAE,CAAC;IAC5B,OAAO,IAAI,KAAK,EAAE,CAAC;AACrB,CAAC"}

package/build/vdom.js

@@ -99,7 +99,7 @@ export class VNodeElement extends VNode {
             const val = this.attrs[key];
             if (val == null)
                 continue;
-            out += ` ${key}="${val}"`;
+            out += ` ${key}="${escapeUTF8(val)}"`;
         }
         return out;
     }

package/build/vdom.js.map

@@ -1 +1 @@
-{"version":3,"file":"vdom.js","sourceRoot":"","sources":["../src/vdom.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vdom.js","sourceRoot":"","sources":["../src/vdom.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/shared",
-  "version": "6.34.0",
+  "version": "6.35.0",
   "private": false,
   "repository": {
     "type": "git",
@@ -23,10 +23,11 @@
     "test": "ospec --globs 'build/**/*.test.js'"
   },
   "dependencies": {
-    "@basemaps/config": "^6.34.0",
+    "@basemaps/config": "^6.35.0",
     "@basemaps/geo": "^6.32.1",
-    "@basemaps/tiler": "^6.32.1",
-    "@chunkd/source-aws-v2": "^8.4.0",
+    "@basemaps/tiler": "^6.35.0",
+    "@chunkd/fs": "^8.5.1",
+    "@chunkd/source-aws-v2": "^8.5.1",
     "@linzjs/geojson": "^6.32.1",
     "@linzjs/metrics": "^6.32.1",
     "aws-sdk": "^2.890.0",
@@ -39,7 +40,6 @@
   },
   "devDependencies": {
     "@types/aws-lambda": "^8.10.75",
-    "@types/geojson": "^7946.0.7",
     "@types/proj4": "^2.5.2",
     "@types/sax": "^1.2.1"
   },
@@ -49,5 +49,5 @@
   "files": [
     "build/"
   ],
-  "gitHead": "1685fa12be66df74bc64d7f76b7355390980a43f"
+  "gitHead": "dcebd7149ab318ea979b5d1ba34a9f82fc41b935"
 }

package/build/file/role.registry.d.ts

@@ -1,25 +0,0 @@
-export interface RoleConfig {
-    bucket: string;
-    accountId: string;
-    roleArn: string;
-    externalId?: string;
-    roleSessionDuration?: number;
-}
-export interface BucketConfig {
-    v: number;
-    buckets: RoleConfig[];
-    version: string;
-    package: string;
-    hash: string;
-    updatedAt: string;
-}
-/** Attempt to list the target path, if it fails with a 403 Forbidden assume we do not have permission to do read it */
-export declare function canRead(path: string): Promise<boolean>;
-export declare class RoleRegister {
-    /** Get all imagery source aws roles */
-    static _loadRoles(): Promise<RoleConfig[]>;
-    static _loadRolesPromise: Promise<RoleConfig[]> | undefined;
-    static loadRoles(): Promise<RoleConfig[]>;
-    static findRole(path: string): Promise<RoleConfig | undefined>;
-}
-//# sourceMappingURL=role.registry.d.ts.map

package/build/file/role.registry.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"role.registry.d.ts","sourceRoot":"","sources":["../../src/file/role.registry.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAOD,uHAAuH;AACvH,wBAAsB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAU5D;AAED,qBAAa,YAAY;IACvB,uCAAuC;WAC1B,UAAU,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAOhD,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,GAAG,SAAS,CAAC;IAC5D,MAAM,CAAC,SAAS,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;WAK5B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;CAerE"}

package/build/file/role.registry.js

@@ -1,52 +0,0 @@
-import { Env } from '../const.js';
-import { fsa } from '@chunkd/fs';
-import { AwsCredentials } from '@chunkd/source-aws-v2';
-function isForbidden(e) {
-    if (typeof e !== 'object')
-        return false;
-    if (e == null)
-        return false;
-    return e.code === 403;
-}
-/** Attempt to list the target path, if it fails with a 403 Forbidden assume we do not have permission to do read it */
-export async function canRead(path) {
-    try {
-        await fsa.list(path).next();
-        return true;
-    }
-    catch (e) {
-        // Permission denied
-        if (isForbidden(e))
-            return false;
-        // Un related error
-        throw e;
-    }
-}
-export class RoleRegister {
-    /** Get all imagery source aws roles */
-    static async _loadRoles() {
-        const configPath = Env.get(Env.AwsRoleConfigPath);
-        if (configPath == null)
-            return [];
-        const config = await fsa.readJson(configPath);
-        return config.buckets;
-    }
-    static loadRoles() {
-        if (RoleRegister._loadRolesPromise == null)
-            RoleRegister._loadRolesPromise = this._loadRoles();
-        return RoleRegister._loadRolesPromise;
-    }
-    static async findRole(path) {
-        const isAbleToRead = await canRead(path);
-        // If we can directly read/write this path we don't need to register a role for it
-        if (isAbleToRead)
-            return;
-        const roles = await this.loadRoles();
-        const targetRole = roles.find((f) => path.startsWith(`s3://${f.bucket}`));
-        if (targetRole == null)
-            throw new Error(`Failed to read ${path}`);
-        fsa.register(`s3://${targetRole.bucket}`, AwsCredentials.fsFromRole(targetRole.roleArn, targetRole.externalId, targetRole.roleSessionDuration));
-        return targetRole;
-    }
-}
-//# sourceMappingURL=role.registry.js.map

package/build/file/role.registry.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"role.registry.js","sourceRoot":"","sources":["../../src/file/role.registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAkBvD,SAAS,WAAW,CAAC,CAAU;IAC7B,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACxC,IAAI,CAAC,IAAI,IAAI;QAAE,OAAO,KAAK,CAAC;IAC5B,OAAQ,CAAuB,CAAC,IAAI,KAAK,GAAG,CAAC;AAC/C,CAAC;AAED,uHAAuH;AACvH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAY;IACxC,IAAI;QACF,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAU,EAAE;QACnB,oBAAoB;QACpB,IAAI,WAAW,CAAC,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;QACjC,mBAAmB;QACnB,MAAM,CAAC,CAAC;KACT;AACH,CAAC;AAED,MAAM,OAAO,YAAY;IACvB,uCAAuC;IACvC,MAAM,CAAC,KAAK,CAAC,UAAU;QACrB,MAAM,UAAU,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAClD,IAAI,UAAU,IAAI,IAAI;YAAE,OAAO,EAAE,CAAC;QAClC,MAAM,MAAM,GAAiB,MAAM,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC5D,OAAO,MAAM,CAAC,OAAO,CAAC;IACxB,CAAC;IAGD,MAAM,CAAC,SAAS;QACd,IAAI,YAAY,CAAC,iBAAiB,IAAI,IAAI;YAAE,YAAY,CAAC,iBAAiB,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAC/F,OAAO,YAAY,CAAC,iBAAiB,CAAC;IACxC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAY;QAChC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QACzC,kFAAkF;QAClF,IAAI,YAAY;YAAE,OAAO;QAEzB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACrC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC1E,IAAI,UAAU,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC;QAElE,GAAG,CAAC,QAAQ,CACV,QAAQ,UAAU,CAAC,MAAM,EAAE,EAC3B,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,mBAAmB,CAAC,CACrG,CAAC;QACF,OAAO,UAAU,CAAC;IACpB,CAAC;CACF"}