@basemaps/cli 6.29.0 → 6.32.0

package/build/cli/config/action.bundle.js

@@ -22,6 +22,11 @@ export class CommandBundle extends CommandLineAction {
             parameterLongName: '--output',
             description: 'Output of the bundle file',
         });
+        this.assets = this.defineStringParameter({
+            argumentName: 'ASSETS',
+            parameterLongName: '--assets',
+            description: 'Add assets location into the config bundle file',
+        });
     }
     async onExecute() {
         var _a, _b;
@@ -29,8 +34,13 @@ export class CommandBundle extends CommandLineAction {
         const config = (_a = this.config.value) !== null && _a !== void 0 ? _a : DefaultConfig;
         const bundle = (_b = this.output.value) !== null && _b !== void 0 ? _b : DefaultOutput;
         const mem = await ConfigJson.fromPath(config, logger);
-        await fsa.writeJson(bundle, mem.toJson());
+        const configJson = mem.toJson();
+        const assets = this.assets.value;
+        if (assets)
+            configJson.assets = assets;
+        await fsa.writeJson(bundle, configJson);
         logger.info({ path: bundle }, 'ConfigBundled');
         return;
     }
 }
+//# sourceMappingURL=action.bundle.js.map

package/build/cli/config/action.bundle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"action.bundle.js","sourceRoot":"","sources":["../../../src/cli/config/action.bundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAA8B,MAAM,4BAA4B,CAAC;AAE3F,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC;AACvC,MAAM,CAAC,MAAM,aAAa,GAAG,oBAAoB,CAAC;AAElD,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IAKlD;QACE,KAAK,CAAC;YACJ,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,wCAAwC;YACjD,aAAa,EAAE,mEAAmE;SACnF,CAAC,CAAC;IACL,CAAC;IAES,kBAAkB;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,sBAAsB;SACpC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,2BAA2B;SACzC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,iDAAiD;SAC/D,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS;;QACb,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,mCAAI,aAAa,CAAC;QAClD,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,mCAAI,aAAa,CAAC;QAClD,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QACjC,IAAI,MAAM;YAAE,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC;QACvC,MAAM,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACxC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,eAAe,CAAC,CAAC;QAC/C,OAAO;IACT,CAAC;CACF"}

package/build/cli/config/action.import.d.ts

@@ -1,11 +1,14 @@
-import { BaseConfig } from '@basemaps/config';
+import { BaseConfig, ConfigProviderMemory } from '@basemaps/config';
 import { CommandLineAction } from '@rushstack/ts-command-line';
 export declare class CommandImport extends CommandLineAction {
     private config;
+    private backup;
     private commit;
     promises: Promise<boolean>[];
     /** List of paths to invalidate at the end of the request */
     invalidations: string[];
+    /** List of paths to invalidate at the end of the request */
+    backupConfig: ConfigProviderMemory;
     constructor();
     protected onDefineParameters(): void;
     onExecute(): Promise<void>;

package/build/cli/config/action.import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action.import.d.ts","sourceRoot":"","sources":["../../../src/cli/config/action.import.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAuC,MAAM,kBAAkB,CAAC;AACnF,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AAIrH,qBAAa,aAAc,SAAQ,iBAAiB;IAClD,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA2B;IAEzC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAM;IAClC,4DAA4D;IAC5D,aAAa,EAAE,MAAM,EAAE,CAAM;;IAU7B,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAc9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA0ChC,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;CASlD"}
+{"version":3,"file":"action.import.d.ts","sourceRoot":"","sources":["../../../src/cli/config/action.import.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAuC,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACzG,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AAKrH,qBAAa,aAAc,SAAQ,iBAAiB;IAClD,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA2B;IAEzC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAM;IAClC,4DAA4D;IAC5D,aAAa,EAAE,MAAM,EAAE,CAAM;IAC7B,4DAA4D;IAC5D,YAAY,EAAE,oBAAoB,CAA8B;;IAUhE,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAmB9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAoEhC,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;CAiBlD"}

package/build/cli/config/action.import.js

@@ -1,8 +1,9 @@
 import { Env, fsa, LogConfig } from '@basemaps/shared';
-import { ConfigProviderMemory } from '@basemaps/config';
+import { Config, ConfigProviderMemory } from '@basemaps/config';
 import { CommandLineAction } from '@rushstack/ts-command-line';
 import { Q, Updater } from './config.update.js';
 import { invalidateCache } from '../util.js';
+import fetch from 'node-fetch';
 export class CommandImport extends CommandLineAction {
     constructor() {
         super({
@@ -13,14 +14,21 @@ export class CommandImport extends CommandLineAction {
         this.promises = [];
         /** List of paths to invalidate at the end of the request */
         this.invalidations = [];
+        /** List of paths to invalidate at the end of the request */
+        this.backupConfig = new ConfigProviderMemory();
     }
     onDefineParameters() {
         this.config = this.defineStringParameter({
             argumentName: 'CONFIG',
             parameterLongName: '--config',
-            description: 'Path of config json',
+            description: 'Path of config json, this can be both a local path or s3 location',
             required: true,
         });
+        this.backup = this.defineStringParameter({
+            argumentName: 'BACKUP',
+            parameterLongName: '--backup',
+            description: 'Backup the old config into a config bundle json',
+        });
         this.commit = this.defineFlagParameter({
             parameterLongName: '--commit',
             description: 'Actually start the import',
@@ -33,8 +41,12 @@ export class CommandImport extends CommandLineAction {
         logger.level = 'trace';
         const commit = (_a = this.commit.value) !== null && _a !== void 0 ? _a : false;
         const config = this.config.value;
+        const backup = this.backup.value;
         if (config == null)
             throw new Error('Please provide a config json');
+        if (commit && !config.startsWith('s3://')) {
+            throw new Error('To actually import into dynamo has to use the config file from s3.');
+        }
         const HostPrefix = Env.isProduction() ? '' : 'dev.';
         const healthEndpoint = `https://${HostPrefix}basemaps.linz.govt.nz/v1/health`;
         logger.info({ url: healthEndpoint }, 'Import:ValidateHealth');
@@ -51,6 +63,22 @@ export class CommandImport extends CommandLineAction {
         for (const config of mem.objects.values())
             this.update(config, commit);
         await Promise.all(this.promises);
+        if (commit) {
+            const configBundle = {
+                id: Config.ConfigBundle.id(configJson.hash),
+                name: Config.ConfigBundle.id(`config-${configJson.hash}.json`),
+                path: config,
+                hash: configJson.hash,
+            };
+            logger.info({ config }, 'Import:ConfigBundle');
+            if (Config.ConfigBundle.isWriteable()) {
+                // Insert a cb_hash record for reference
+                await Config.ConfigBundle.put(configBundle);
+                // Update the cb_latest record
+                configBundle.id = Config.ConfigBundle.id('latest');
+                await Config.ConfigBundle.put(configBundle);
+            }
+        }
         if (commit && this.invalidations.length > 0) {
             // Lots of invalidations just invalidate everything
             if (this.invalidations.length > 10) {
@@ -64,6 +92,9 @@ export class CommandImport extends CommandLineAction {
             if (!res.ok)
                 throw new Error('Basemaps is unhealthy');
         }
+        if (backup) {
+            await fsa.writeJson(backup, this.backupConfig.toJson());
+        }
         if (commit !== true)
             logger.info('DryRun:Done');
     }
@@ -71,10 +102,18 @@ export class CommandImport extends CommandLineAction {
         const promise = Q(async () => {
             const updater = new Updater(config, commit);
             const hasChanges = await updater.reconcile();
-            if (hasChanges)
+            if (hasChanges) {
                 this.invalidations.push(updater.invalidatePath());
+                const oldData = await updater.getOldData();
+                if (oldData != null)
+                    this.backupConfig.put(oldData); // No need to backup anything if there is new insert
+            }
+            else {
+                this.backupConfig.put(config);
+            }
             return true;
         });
         this.promises.push(promise);
     }
 }
+//# sourceMappingURL=action.import.js.map

package/build/cli/config/action.import.js.map

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

package/build/cli/config/config.diff.d.ts

@@ -2,7 +2,7 @@ import { LogType } from '@basemaps/shared';
 import diff from 'deep-diff';
 export declare const IgnoredProperties: string[];
 export declare class ConfigDiff {
-    static printDiff<T>(changes: diff.Diff<T, T>[]): string;
+    static getDiff<T>(changes: diff.Diff<T, T>[]): string;
     static showDiff<T extends {
         id: string;
     }>(type: string, oldData: T, newData: T, logger: LogType): boolean;

package/build/cli/config/config.diff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.diff.d.ts","sourceRoot":"","sources":["../../../src/cli/config/config.diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,eAAO,MAAM,iBAAiB,UAAyD,CAAC;AAExF,qBAAa,UAAU;IACrB,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM;IA0BvD,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO;CAS1G"}
+{"version":3,"file":"config.diff.d.ts","sourceRoot":"","sources":["../../../src/cli/config/config.diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,eAAO,MAAM,iBAAiB,UAAyD,CAAC;AAExF,qBAAa,UAAU;IACrB,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM;IA0BrD,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO;CAW1G"}

package/build/cli/config/config.diff.js

@@ -2,14 +2,14 @@ import c from 'ansi-colors';
 import diff from 'deep-diff';
 export const IgnoredProperties = ['id', 'createdAt', 'updatedAt', 'year', 'resolution'];
 export class ConfigDiff {
-    static printDiff(changes) {
+    static getDiff(changes) {
         let output = '';
         let isArray = false;
         for (const change of changes) {
             if (change.kind === 'A') {
                 if (change.path)
                     output += change.path.join();
-                output += this.printDiff([change.item]);
+                output += this.getDiff([change.item]);
                 isArray = true; // Stop displaying the array changes for each line.
             }
             else {
@@ -33,15 +33,18 @@ export class ConfigDiff {
                 }
             }
         }
-        return output;
+        return output.trim();
     }
     static showDiff(type, oldData, newData, logger) {
         const changes = diff.diff(oldData, newData, (_path, key) => IgnoredProperties.indexOf(key) >= 0);
         if (changes) {
+            const changeDif = ConfigDiff.getDiff(changes);
             logger.info({ type, record: newData.id }, 'Changes');
-            ConfigDiff.printDiff(changes);
+            // eslint-disable-next-line no-console
+            console.log(changeDif);
             return true;
         }
         return false;
     }
 }
+//# sourceMappingURL=config.diff.js.map

package/build/cli/config/config.diff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.diff.js","sourceRoot":"","sources":["../../../src/cli/config/config.diff.ts"],"names":[],"mappings":"AACA,OAAO,CAAC,MAAM,aAAa,CAAC;AAC5B,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;AAExF,MAAM,OAAO,UAAU;IACrB,MAAM,CAAC,OAAO,CAAI,OAA0B;QAC1C,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,MAAM,CAAC,IAAI,KAAK,GAAG,EAAE;gBACvB,IAAI,MAAM,CAAC,IAAI;oBAAE,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBAC9C,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;gBACtC,OAAO,GAAG,IAAI,CAAC,CAAC,mDAAmD;aACpE;iBAAM;gBACL,IAAI,OAAO;oBAAE,SAAS;gBACtB,IAAI,MAAM,CAAC,IAAI,KAAK,GAAG,EAAE;oBACvB,IAAI,MAAM,CAAC,IAAI;wBAAE,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC9C,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;oBACtD,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;iBAC5D;qBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,GAAG,EAAE;oBAC9B,IAAI,MAAM,CAAC,IAAI;wBAAE,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC9C,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;iBAC9D;qBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,GAAG,EAAE;oBAC9B,IAAI,MAAM,CAAC,IAAI;wBAAE,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC9C,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;iBAC5D;aACF;SACF;QACD,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,QAAQ,CAA2B,IAAY,EAAE,OAAU,EAAE,OAAU,EAAE,MAAe;QAC7F,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,KAAe,EAAE,GAAW,EAAE,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QACnH,IAAI,OAAO,EAAE;YACX,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC9C,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;YACrD,sCAAsC;YACtC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACvB,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}

package/build/cli/config/config.update.d.ts

@@ -4,6 +4,7 @@ import { LogType } from '@basemaps/shared';
 export declare const Q: import("p-limit").LimitFunction;
 export declare class Updater<S extends BaseConfig = BaseConfig> {
     config: S;
+    _oldData: Promise<ConfigImagery | ConfigTileSet | ConfigProvider | ConfigVectorStyle | null>;
     prefix: string;
     isCommit: boolean;
     logger: LogType;
@@ -15,6 +16,7 @@ export declare class Updater<S extends BaseConfig = BaseConfig> {
     getDB(): BasemapsConfigObject<ConfigTileSet | ConfigImagery | ConfigProvider | ConfigVectorStyle>;
     getConfig(): ConfigTileSet | ConfigImagery | ConfigProvider | ConfigVectorStyle;
     invalidatePath(): string;
+    getOldData(): Promise<ConfigImagery | ConfigTileSet | ConfigProvider | ConfigVectorStyle | null>;
     /**
      * Reconcile the differences between the config and the tile metadata DB and update if changed.
      */

package/build/cli/config/config.update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.update.d.ts","sourceRoot":"","sources":["../../../src/cli/config/config.update.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAGV,aAAa,EACb,aAAa,EACb,cAAc,EACd,iBAAiB,EAElB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAa,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAItD,eAAO,MAAM,CAAC,iCAAa,CAAC;AAE5B,qBAAa,OAAO,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IACpD,MAAM,EAAE,CAAC,CAAC;IACV,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAEhB;;;OAGG;gBACS,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,OAAO;IASxC,KAAK,IAAI,oBAAoB,CAAC,aAAa,GAAG,aAAa,GAAG,cAAc,GAAG,iBAAiB,CAAC;IAQjG,SAAS,IAAI,aAAa,GAAG,aAAa,GAAG,cAAc,GAAG,iBAAiB;IAQ/E,cAAc,IAAI,MAAM;IAMxB;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;CAkBpC"}
+{"version":3,"file":"config.update.d.ts","sourceRoot":"","sources":["../../../src/cli/config/config.update.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAGV,aAAa,EACb,aAAa,EACb,cAAc,EACd,iBAAiB,EAElB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAa,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAItD,eAAO,MAAM,CAAC,iCAAa,CAAC;AAE5B,qBAAa,OAAO,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IACpD,MAAM,EAAE,CAAC,CAAC;IACV,QAAQ,EAAE,OAAO,CAAC,aAAa,GAAG,aAAa,GAAG,cAAc,GAAG,iBAAiB,GAAG,IAAI,CAAC,CAAC;IAC7F,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAEhB;;;OAGG;gBACS,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,OAAO;IASxC,KAAK,IAAI,oBAAoB,CAAC,aAAa,GAAG,aAAa,GAAG,cAAc,GAAG,iBAAiB,CAAC;IAQjG,SAAS,IAAI,aAAa,GAAG,aAAa,GAAG,cAAc,GAAG,iBAAiB;IAQ/E,cAAc,IAAI,MAAM;IAMxB,UAAU,IAAI,OAAO,CAAC,aAAa,GAAG,aAAa,GAAG,cAAc,GAAG,iBAAiB,GAAG,IAAI,CAAC;IAMhG;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;CAgBpC"}

package/build/cli/config/config.update.js

@@ -47,13 +47,19 @@ export class Updater {
         else
             return `/v1/tiles/${this.config.id.slice(3)}/*`;
     }
+    getOldData() {
+        if (this._oldData)
+            return this._oldData;
+        this._oldData = this.getDB().get(this.config.id);
+        return this._oldData;
+    }
     /**
      * Reconcile the differences between the config and the tile metadata DB and update if changed.
      */
     async reconcile() {
-        const db = this.getDB();
-        const oldData = await db.get(this.config.id);
         const newData = this.getConfig();
+        const db = this.getDB();
+        const oldData = await this.getOldData();
         if (oldData == null || ConfigDiff.showDiff(db.prefix, oldData, newData, this.logger)) {
             const operation = oldData == null ? 'Insert' : 'Update';
             this.logger.info({ type: db.prefix, record: newData.id, commit: this.isCommit }, `Change:${operation}`);
@@ -69,3 +75,4 @@ export class Updater {
         return false;
     }
 }
+//# sourceMappingURL=config.update.js.map

package/build/cli/config/config.update.js.map

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

package/build/cli/folder.js

@@ -15,3 +15,4 @@ export async function makeTiffFolder(tmpFolder, name) {
     await fs.mkdir(folderPath, { recursive: true });
     return folderPath;
 }
+//# sourceMappingURL=folder.js.map

package/build/cli/folder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"folder.js","sourceRoot":"","sources":["../../src/cli/folder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,mDAAmD;AACnD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,MAAc;;IACjD,MAAM,QAAQ,GAAG,MAAA,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,mCAAI,MAAM,CAAC;IACnD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE/C,MAAM,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAChD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,mDAAmD;AACnD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,SAAiB,EAAE,IAAY;IAClE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAE9C,MAAM,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAChD,OAAO,UAAU,CAAC;AACpB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,gCAAgC,CAAC;AAOxC,qBAAa,yBAA0B,SAAQ,eAAe;;CAe7D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,gCAAgC,CAAC;AAWxC,qBAAa,yBAA0B,SAAQ,eAAe;;CAqB7D"}

package/build/cli/index.js

@@ -1,11 +1,15 @@
 #!/usr/bin/env node
 import { BaseCommandLine } from '@basemaps/shared/build/cli/base.js';
 import 'source-map-support/register.js';
+import { CommandList } from './aws/action.aws.list.js';
 import { CommandCogCreate } from './cogify/action.cog.js';
 import { CommandJobCreate } from './cogify/action.job.js';
+import { CommandBundleAssets } from './config/action.bundle.assets.js';
 import { CommandBundle } from './config/action.bundle.js';
 import { CommandImport } from './config/action.import.js';
 import { CommandScreenShot } from './screenshot/action.screenshot.js';
+import { CommandServe } from './server/action.serve.js';
+import { CommandSprites } from './sprites/action.sprites.js';
 export class BasemapsConfigCommandLine extends BaseCommandLine {
     constructor() {
         super({
@@ -15,7 +19,12 @@ export class BasemapsConfigCommandLine extends BaseCommandLine {
         this.addAction(new CommandCogCreate());
         this.addAction(new CommandJobCreate());
         this.addAction(new CommandBundle());
+        this.addAction(new CommandBundleAssets());
         this.addAction(new CommandImport());
         this.addAction(new CommandScreenShot());
+        this.addAction(new CommandSprites());
+        this.addAction(new CommandServe());
+        this.addAction(new CommandList());
     }
 }
+//# sourceMappingURL=index.js.map

package/build/cli/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,MAAM,OAAO,yBAA0B,SAAQ,eAAe;IAC5D;QACE,KAAK,CAAC;YACJ,YAAY,EAAE,KAAK;YACnB,eAAe,EAAE,+BAA+B;SACjD,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,CAAC,IAAI,gBAAgB,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,SAAS,CAAC,IAAI,gBAAgB,EAAE,CAAC,CAAC;QAEvC,IAAI,CAAC,SAAS,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,SAAS,CAAC,IAAI,mBAAmB,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,SAAS,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;QAEpC,IAAI,CAAC,SAAS,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC;QAExC,IAAI,CAAC,SAAS,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC;QACrC,IAAI,CAAC,SAAS,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;QAEnC,IAAI,CAAC,SAAS,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC;IACpC,CAAC;CACF"}

package/build/cli/screenshot/action.screenshot.d.ts

@@ -1,61 +1,19 @@
 import { LogType } from '@basemaps/shared';
-import { Browser } from 'playwright';
 import { CommandLineAction } from '@rushstack/ts-command-line';
-import { z } from 'zod';
-export declare const DefaultTestTiles = "./test-tiles/default.test.tiles.json";
+import { FastifyInstance } from 'fastify/types/instance';
+import { Browser } from 'playwright';
 export declare const DefaultHost = "basemaps.linz.govt.nz";
-declare enum TileMatrixIdentifier {
-    Nztm2000Quad = "NZTM2000Quad",
-    Google = "WebMercatorQuad"
-}
-declare const zTileTest: z.ZodObject<{
-    name: z.ZodString;
-    tileMatrix: z.ZodNativeEnum<typeof TileMatrixIdentifier>;
-    location: z.ZodObject<{
-        lat: z.ZodNumber;
-        lng: z.ZodNumber;
-        z: z.ZodNumber;
-    }, "strip", z.ZodTypeAny, {
-        z: number;
-        lat: number;
-        lng: number;
-    }, {
-        z: number;
-        lat: number;
-        lng: number;
-    }>;
-    tileSet: z.ZodString;
-    style: z.ZodOptional<z.ZodString>;
-}, "strip", z.ZodTypeAny, {
-    style?: string | undefined;
-    name: string;
-    location: {
-        z: number;
-        lat: number;
-        lng: number;
-    };
-    tileMatrix: TileMatrixIdentifier;
-    tileSet: string;
-}, {
-    style?: string | undefined;
-    name: string;
-    location: {
-        z: number;
-        lat: number;
-        lng: number;
-    };
-    tileMatrix: TileMatrixIdentifier;
-    tileSet: string;
-}>;
-export declare type TileTestSchema = z.infer<typeof zTileTest>;
+export declare const DefaultOutput = ".artifacts/visual-snapshots/";
 export declare class CommandScreenShot extends CommandLineAction {
     private config;
     private host;
     private tiles;
+    private assets;
+    private output;
     constructor();
     protected onDefineParameters(): void;
     onExecute(): Promise<void>;
+    startServer(port: number, config: string, logger: LogType): Promise<FastifyInstance>;
+    takeScreenshots(host: string, chrome: Browser, logger: LogType): Promise<void>;
 }
-export declare function takeScreenshots(host: string, tiles: string, chrome: Browser, logger: LogType): Promise<void>;
-export {};
 //# sourceMappingURL=action.screenshot.d.ts.map

package/build/cli/screenshot/action.screenshot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action.screenshot.d.ts","sourceRoot":"","sources":["../../../src/cli/screenshot/action.screenshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAExE,OAAO,EAAE,OAAO,EAAY,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAA8B,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,gBAAgB,yCAAyC,CAAC;AACvE,eAAO,MAAM,WAAW,0BAA0B,CAAC;AAEnD,aAAK,oBAAoB;IACvB,YAAY,iBAAiB;IAC7B,MAAM,oBAAoB;CAC3B;AAQD,QAAA,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMb,CAAC;AAEH,oBAAY,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,SAAS,CAAC,CAAC;AAEvD,qBAAa,iBAAkB,SAAQ,iBAAiB;IACtD,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,IAAI,CAA6B;IACzC,OAAO,CAAC,KAAK,CAA6B;;IAU1C,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAsB9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAyBjC;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAkClH"}
+{"version":3,"file":"action.screenshot.d.ts","sourceRoot":"","sources":["../../../src/cli/screenshot/action.screenshot.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAA8B,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD,OAAO,EAAE,OAAO,EAAY,MAAM,YAAY,CAAC;AAG/C,eAAO,MAAM,WAAW,0BAA0B,CAAC;AACnD,eAAO,MAAM,aAAa,iCAAiC,CAAC;AAE5D,qBAAa,iBAAkB,SAAQ,iBAAiB;IACtD,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,IAAI,CAA6B;IACzC,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA6B;;IAU3C,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAiC9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1B,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC;IAMpF,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CA0CrF"}

package/build/cli/screenshot/action.screenshot.js

@@ -1,30 +1,12 @@
-import { Config, Env, fsa, LogConfig } from '@basemaps/shared';
-import { mkdir } from 'fs/promises';
-import { chromium } from 'playwright';
+import { createServer } from '@basemaps/server';
+import { Env, fsa, LogConfig } from '@basemaps/shared';
 import { CommandLineAction } from '@rushstack/ts-command-line';
-import { z } from 'zod';
+import { mkdir } from 'fs/promises';
 import getPort from 'get-port';
-import { createServer } from '@basemaps/server';
-import { ConfigProviderMemory } from '@basemaps/config';
-export const DefaultTestTiles = './test-tiles/default.test.tiles.json';
+import { chromium } from 'playwright';
+import { DefaultTestTiles } from './test.tiles.js';
 export const DefaultHost = 'basemaps.linz.govt.nz';
-var TileMatrixIdentifier;
-(function (TileMatrixIdentifier) {
-    TileMatrixIdentifier["Nztm2000Quad"] = "NZTM2000Quad";
-    TileMatrixIdentifier["Google"] = "WebMercatorQuad";
-})(TileMatrixIdentifier || (TileMatrixIdentifier = {}));
-const zLocation = z.object({
-    lat: z.number().gte(-90).lte(90),
-    lng: z.number().gte(-180).lte(180),
-    z: z.number().gte(0).lte(32),
-});
-const zTileTest = z.object({
-    name: z.string(),
-    tileMatrix: z.nativeEnum(TileMatrixIdentifier),
-    location: zLocation,
-    tileSet: z.string(),
-    style: z.string().optional(),
-});
+export const DefaultOutput = '.artifacts/visual-snapshots/';
 export class CommandScreenShot extends CommandLineAction {
     constructor() {
         super({
@@ -49,28 +31,36 @@ export class CommandScreenShot extends CommandLineAction {
             argumentName: 'TILES',
             parameterLongName: '--tiles',
             description: 'JSON file path for the test tiles',
-            defaultValue: DefaultTestTiles,
+        });
+        this.assets = this.defineStringParameter({
+            argumentName: 'ASSETS',
+            parameterLongName: '--assets',
+            description: 'Where the assets (sprites, fonts) are located',
+        });
+        this.output = this.defineStringParameter({
+            argumentName: 'OUTPUT',
+            parameterLongName: '--output',
+            description: 'Output of the bundle file',
         });
     }
     async onExecute() {
-        var _a, _b, _c;
+        var _a, _b;
         const logger = LogConfig.get();
         const config = this.config.value;
         let host = (_a = this.host.value) !== null && _a !== void 0 ? _a : DefaultHost;
-        const tiles = (_b = this.tiles.value) !== null && _b !== void 0 ? _b : DefaultTestTiles;
         let BasemapsServer = undefined;
         if (config != null) {
             const port = await getPort();
-            host = (_c = Env.get(Env.PublicUrlBase)) !== null && _c !== void 0 ? _c : `http://localhost:${port}`;
+            host = (_b = Env.get(Env.PublicUrlBase)) !== null && _b !== void 0 ? _b : `http://localhost:${port}`;
             // Force a default url base so WMTS requests know their relative url
             process.env[Env.PublicUrlBase] = host;
-            BasemapsServer = await startServer(port, config, logger);
+            BasemapsServer = await this.startServer(port, config, logger);
             logger.info({ url: host }, 'Server:Started');
         }
         logger.info('Page:Launch');
         const chrome = await chromium.launch();
         try {
-            await takeScreenshots(host, tiles, chrome, logger);
+            await this.takeScreenshots(host, chrome, logger);
         }
         finally {
             await chrome.close();
@@ -78,44 +68,48 @@ export class CommandScreenShot extends CommandLineAction {
                 await BasemapsServer.close();
         }
     }
-}
-export async function takeScreenshots(host, tiles, chrome, logger) {
-    const TestTiles = await fsa.readJson(tiles);
-    for (const test of TestTiles) {
-        const page = await chrome.newPage();
-        const searchParam = new URLSearchParams();
-        searchParam.set('p', test.tileMatrix);
-        searchParam.set('i', test.tileSet);
-        if (test.style)
-            searchParam.set('s', test.style);
-        const loc = `@${test.location.lat},${test.location.lng},z${test.location.z}`;
-        const fileName = '.artifacts/visual-snapshots/' + test.name + '.png';
-        await mkdir(`.artifacts/visual-snapshots/`, { recursive: true });
-        let url = `${host}/?${searchParam.toString()}&debug=true&debug.screenshot=true#${loc}`;
-        if (!url.startsWith('http'))
-            url = `https://${url}`;
-        logger.info({ url, expected: fileName }, 'Page:Load');
-        await page.goto(url);
-        try {
-            await page.waitForSelector('div#map-loaded', { state: 'attached' });
-            await page.waitForTimeout(1000);
-            await page.waitForLoadState('networkidle');
-            await page.screenshot({ path: fileName });
+    async startServer(port, config, logger) {
+        // Start server
+        const server = await createServer({ config, assets: this.assets.value }, logger);
+        return await new Promise((resolve) => server.listen(port, '0.0.0.0', () => resolve(server)));
+    }
+    async takeScreenshots(host, chrome, logger) {
+        var _a;
+        const tiles = this.tiles.value;
+        const outputPath = (_a = this.output.value) !== null && _a !== void 0 ? _a : DefaultOutput;
+        let testTiles = DefaultTestTiles;
+        if (tiles) {
+            testTiles = await fsa.readJson(tiles);
         }
-        catch (e) {
-            await page.screenshot({ path: fileName });
-            throw e;
+        for (const test of testTiles) {
+            const page = await chrome.newPage();
+            const searchParam = new URLSearchParams();
+            searchParam.set('p', test.tileMatrix);
+            searchParam.set('i', test.tileSet);
+            if (test.style)
+                searchParam.set('s', test.style);
+            const loc = `@${test.location.lat},${test.location.lng},z${test.location.z}`;
+            const fileName = test.name + '.png';
+            const output = fsa.join(outputPath, fileName);
+            await mkdir(`.artifacts/visual-snapshots/`, { recursive: true });
+            let url = `${host}/?${searchParam.toString()}&debug=true&debug.screenshot=true#${loc}`;
+            if (!url.startsWith('http'))
+                url = `https://${url}`;
+            logger.info({ url, expected: output }, 'Page:Load');
+            await page.goto(url);
+            try {
+                await page.waitForSelector('div#map-loaded', { state: 'attached' });
+                await page.waitForTimeout(1000);
+                await page.waitForLoadState('networkidle');
+                await page.screenshot({ path: output });
+            }
+            catch (e) {
+                await page.screenshot({ path: output });
+                throw e;
+            }
+            logger.info({ url, expected: output }, 'Page:Load:Done');
+            await page.close();
         }
-        logger.info({ url, expected: fileName }, 'Page:Load:Done');
-        await page.close();
     }
 }
-async function startServer(port, config, logger) {
-    // Bundle Config
-    const configJson = await fsa.readJson(config);
-    const mem = ConfigProviderMemory.fromJson(configJson);
-    Config.setConfigProvider(mem);
-    // Start server
-    const server = createServer(logger);
-    return await new Promise((resolve) => server.listen(port, '0.0.0.0', () => resolve(server)));
-}
+//# sourceMappingURL=action.screenshot.js.map

package/build/cli/screenshot/action.screenshot.js.map

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