+ ${available ? "" : `
${T.demo.settingNotAvailable} `}
${T.settings.labels[this.id].title}
diff --git a/src/js/savegame/savegame.js b/src/js/savegame/savegame.js
index 2a7102a9..0ad630f6 100644
--- a/src/js/savegame/savegame.js
+++ b/src/js/savegame/savegame.js
@@ -1,273 +1,279 @@
-import { ReadWriteProxy } from "../core/read_write_proxy";
-import { ExplainedResult } from "../core/explained_result";
-import { SavegameSerializer } from "./savegame_serializer";
-import { BaseSavegameInterface } from "./savegame_interface";
-import { createLogger } from "../core/logging";
-import { globalConfig } from "../core/config";
-import { getSavegameInterface, savegameInterfaces } from "./savegame_interface_registry";
-import { SavegameInterface_V1001 } from "./schemas/1001";
-import { SavegameInterface_V1002 } from "./schemas/1002";
-import { SavegameInterface_V1003 } from "./schemas/1003";
-import { SavegameInterface_V1004 } from "./schemas/1004";
-import { SavegameInterface_V1005 } from "./schemas/1005";
-
-const logger = createLogger("savegame");
-
-/**
- * @typedef {import("../application").Application} Application
- * @typedef {import("../game/root").GameRoot} GameRoot
- * @typedef {import("./savegame_typedefs").SavegameData} SavegameData
- * @typedef {import("./savegame_typedefs").SavegameMetadata} SavegameMetadata
- * @typedef {import("./savegame_typedefs").SavegameStats} SavegameStats
- * @typedef {import("./savegame_typedefs").SerializedGame} SerializedGame
- */
-
-export class Savegame extends ReadWriteProxy {
- /**
- *
- * @param {Application} app
- * @param {object} param0
- * @param {string} param0.internalId
- * @param {SavegameMetadata} param0.metaDataRef Handle to the meta data
- */
- constructor(app, { internalId, metaDataRef }) {
- super(app, "savegame-" + internalId + ".bin");
- this.internalId = internalId;
- this.metaDataRef = metaDataRef;
-
- /** @type {SavegameData} */
- this.currentData = this.getDefaultData();
-
- assert(
- savegameInterfaces[Savegame.getCurrentVersion()],
- "Savegame interface not defined: " + Savegame.getCurrentVersion()
- );
- }
-
- //////// RW Proxy Impl //////////
-
- /**
- * @returns {number}
- */
- static getCurrentVersion() {
- return 1005;
- }
-
- /**
- * @returns {typeof BaseSavegameInterface}
- */
- static getReaderClass() {
- return savegameInterfaces[Savegame.getCurrentVersion()];
- }
-
- /**
- * @returns {number}
- */
- getCurrentVersion() {
- return /** @type {typeof Savegame} */ (this.constructor).getCurrentVersion();
- }
-
- /**
- * Returns the savegames default data
- * @returns {SavegameData}
- */
- getDefaultData() {
- return {
- version: this.getCurrentVersion(),
- dump: null,
- stats: {},
- lastUpdate: Date.now(),
- };
- }
-
- /**
- * Migrates the savegames data
- * @param {SavegameData} data
- */
- migrate(data) {
- if (data.version < 1000) {
- return ExplainedResult.bad("Can not migrate savegame, too old");
- }
-
- if (data.version === 1000) {
- SavegameInterface_V1001.migrate1000to1001(data);
- data.version = 1001;
- }
-
- if (data.version === 1001) {
- SavegameInterface_V1002.migrate1001to1002(data);
- data.version = 1002;
- }
-
- if (data.version === 1002) {
- SavegameInterface_V1003.migrate1002to1003(data);
- data.version = 1003;
- }
-
- if (data.version === 1003) {
- SavegameInterface_V1004.migrate1003to1004(data);
- data.version = 1004;
- }
-
- if (data.version === 1004) {
- SavegameInterface_V1005.migrate1004to1005(data);
- data.version = 1005;
- }
-
- return ExplainedResult.good();
- }
-
- /**
- * Verifies the savegames data
- * @param {SavegameData} data
- */
- verify(data) {
- if (!data.dump) {
- // Well, guess that works
- return ExplainedResult.good();
- }
-
- if (!this.getDumpReaderForExternalData(data).validate()) {
- return ExplainedResult.bad("dump-reader-failed-validation");
- }
- return ExplainedResult.good();
- }
-
- //////// Subclasses interface ////////
-
- /**
- * Returns if this game can be saved on disc
- * @returns {boolean}
- */
- isSaveable() {
- return true;
- }
- /**
- * Returns the statistics of the savegame
- * @returns {SavegameStats}
- */
- getStatistics() {
- return this.currentData.stats;
- }
-
- /**
- * Returns the *real* last update of the savegame, not the one of the metadata
- * which could also be the servers one
- */
- getRealLastUpdate() {
- return this.currentData.lastUpdate;
- }
-
- /**
- * Returns if this game has a serialized game dump
- */
- hasGameDump() {
- return !!this.currentData.dump && this.currentData.dump.entities.length > 0;
- }
-
- /**
- * Returns the current game dump
- * @returns {SerializedGame}
- */
- getCurrentDump() {
- return this.currentData.dump;
- }
-
- /**
- * Returns a reader to access the data
- * @returns {BaseSavegameInterface}
- */
- getDumpReader() {
- if (!this.currentData.dump) {
- logger.warn("Getting reader on null-savegame dump");
- }
-
- const cls = /** @type {typeof Savegame} */ (this.constructor).getReaderClass();
- return new cls(this.currentData);
- }
-
- /**
- * Returns a reader to access external data
- * @returns {BaseSavegameInterface}
- */
- getDumpReaderForExternalData(data) {
- assert(data.version, "External data contains no version");
- return getSavegameInterface(data);
- }
-
- ///////// Public Interface ///////////
-
- /**
- * Updates the last update field so we can send the savegame to the server,
- * WITHOUT Saving!
- */
- setLastUpdate(time) {
- this.currentData.lastUpdate = time;
- }
-
- /**
- *
- * @param {GameRoot} root
- */
- updateData(root) {
- // Construct a new serializer
- const serializer = new SavegameSerializer();
-
- // let timer = performance.now();
- const dump = serializer.generateDumpFromGameRoot(root);
- if (!dump) {
- return false;
- }
-
- const shadowData = Object.assign({}, this.currentData);
- shadowData.dump = dump;
- shadowData.lastUpdate = new Date().getTime();
- shadowData.version = this.getCurrentVersion();
-
- const reader = this.getDumpReaderForExternalData(shadowData);
-
- // Validate (not in prod though)
- if (!G_IS_RELEASE) {
- const validationResult = reader.validate();
- if (!validationResult) {
- return false;
- }
- }
-
- // Save data
- this.currentData = shadowData;
- }
-
- /**
- * Writes the savegame as well as its metadata
- */
- writeSavegameAndMetadata() {
- return this.writeAsync().then(() => this.saveMetadata());
- }
-
- /**
- * Updates the savegames metadata
- */
- saveMetadata() {
- this.metaDataRef.lastUpdate = new Date().getTime();
- this.metaDataRef.version = this.getCurrentVersion();
- if (!this.hasGameDump()) {
- this.metaDataRef.level = 0;
- } else {
- this.metaDataRef.level = this.currentData.dump.hubGoals.level;
- }
-
- return this.app.savegameMgr.writeAsync();
- }
-
- /**
- * @see ReadWriteProxy.writeAsync
- * @returns {Promise
}
- */
- writeAsync() {
- if (G_IS_DEV && globalConfig.debug.disableSavegameWrite) {
- return Promise.resolve();
- }
- return super.writeAsync();
- }
-}
+import { ReadWriteProxy } from "../core/read_write_proxy";
+import { ExplainedResult } from "../core/explained_result";
+import { SavegameSerializer } from "./savegame_serializer";
+import { BaseSavegameInterface } from "./savegame_interface";
+import { createLogger } from "../core/logging";
+import { globalConfig } from "../core/config";
+import { getSavegameInterface, savegameInterfaces } from "./savegame_interface_registry";
+import { SavegameInterface_V1001 } from "./schemas/1001";
+import { SavegameInterface_V1002 } from "./schemas/1002";
+import { SavegameInterface_V1003 } from "./schemas/1003";
+import { SavegameInterface_V1004 } from "./schemas/1004";
+import { SavegameInterface_V1005 } from "./schemas/1005";
+import { SavegameInterface_V1006 } from "./schemas/1006";
+
+const logger = createLogger("savegame");
+
+/**
+ * @typedef {import("../application").Application} Application
+ * @typedef {import("../game/root").GameRoot} GameRoot
+ * @typedef {import("./savegame_typedefs").SavegameData} SavegameData
+ * @typedef {import("./savegame_typedefs").SavegameMetadata} SavegameMetadata
+ * @typedef {import("./savegame_typedefs").SavegameStats} SavegameStats
+ * @typedef {import("./savegame_typedefs").SerializedGame} SerializedGame
+ */
+
+export class Savegame extends ReadWriteProxy {
+ /**
+ *
+ * @param {Application} app
+ * @param {object} param0
+ * @param {string} param0.internalId
+ * @param {SavegameMetadata} param0.metaDataRef Handle to the meta data
+ */
+ constructor(app, { internalId, metaDataRef }) {
+ super(app, "savegame-" + internalId + ".bin");
+ this.internalId = internalId;
+ this.metaDataRef = metaDataRef;
+
+ /** @type {SavegameData} */
+ this.currentData = this.getDefaultData();
+
+ assert(
+ savegameInterfaces[Savegame.getCurrentVersion()],
+ "Savegame interface not defined: " + Savegame.getCurrentVersion()
+ );
+ }
+
+ //////// RW Proxy Impl //////////
+
+ /**
+ * @returns {number}
+ */
+ static getCurrentVersion() {
+ return 1006;
+ }
+
+ /**
+ * @returns {typeof BaseSavegameInterface}
+ */
+ static getReaderClass() {
+ return savegameInterfaces[Savegame.getCurrentVersion()];
+ }
+
+ /**
+ * @returns {number}
+ */
+ getCurrentVersion() {
+ return /** @type {typeof Savegame} */ (this.constructor).getCurrentVersion();
+ }
+
+ /**
+ * Returns the savegames default data
+ * @returns {SavegameData}
+ */
+ getDefaultData() {
+ return {
+ version: this.getCurrentVersion(),
+ dump: null,
+ stats: {},
+ lastUpdate: Date.now(),
+ };
+ }
+
+ /**
+ * Migrates the savegames data
+ * @param {SavegameData} data
+ */
+ migrate(data) {
+ if (data.version < 1000) {
+ return ExplainedResult.bad("Can not migrate savegame, too old");
+ }
+
+ if (data.version === 1000) {
+ SavegameInterface_V1001.migrate1000to1001(data);
+ data.version = 1001;
+ }
+
+ if (data.version === 1001) {
+ SavegameInterface_V1002.migrate1001to1002(data);
+ data.version = 1002;
+ }
+
+ if (data.version === 1002) {
+ SavegameInterface_V1003.migrate1002to1003(data);
+ data.version = 1003;
+ }
+
+ if (data.version === 1003) {
+ SavegameInterface_V1004.migrate1003to1004(data);
+ data.version = 1004;
+ }
+
+ if (data.version === 1004) {
+ SavegameInterface_V1005.migrate1004to1005(data);
+ data.version = 1005;
+ }
+
+ if (data.version === 1005) {
+ SavegameInterface_V1006.migrate1005to1006(data);
+ data.version = 1006;
+ }
+
+ return ExplainedResult.good();
+ }
+
+ /**
+ * Verifies the savegames data
+ * @param {SavegameData} data
+ */
+ verify(data) {
+ if (!data.dump) {
+ // Well, guess that works
+ return ExplainedResult.good();
+ }
+
+ if (!this.getDumpReaderForExternalData(data).validate()) {
+ return ExplainedResult.bad("dump-reader-failed-validation");
+ }
+ return ExplainedResult.good();
+ }
+
+ //////// Subclasses interface ////////
+
+ /**
+ * Returns if this game can be saved on disc
+ * @returns {boolean}
+ */
+ isSaveable() {
+ return true;
+ }
+ /**
+ * Returns the statistics of the savegame
+ * @returns {SavegameStats}
+ */
+ getStatistics() {
+ return this.currentData.stats;
+ }
+
+ /**
+ * Returns the *real* last update of the savegame, not the one of the metadata
+ * which could also be the servers one
+ */
+ getRealLastUpdate() {
+ return this.currentData.lastUpdate;
+ }
+
+ /**
+ * Returns if this game has a serialized game dump
+ */
+ hasGameDump() {
+ return !!this.currentData.dump && this.currentData.dump.entities.length > 0;
+ }
+
+ /**
+ * Returns the current game dump
+ * @returns {SerializedGame}
+ */
+ getCurrentDump() {
+ return this.currentData.dump;
+ }
+
+ /**
+ * Returns a reader to access the data
+ * @returns {BaseSavegameInterface}
+ */
+ getDumpReader() {
+ if (!this.currentData.dump) {
+ logger.warn("Getting reader on null-savegame dump");
+ }
+
+ const cls = /** @type {typeof Savegame} */ (this.constructor).getReaderClass();
+ return new cls(this.currentData);
+ }
+
+ /**
+ * Returns a reader to access external data
+ * @returns {BaseSavegameInterface}
+ */
+ getDumpReaderForExternalData(data) {
+ assert(data.version, "External data contains no version");
+ return getSavegameInterface(data);
+ }
+
+ ///////// Public Interface ///////////
+
+ /**
+ * Updates the last update field so we can send the savegame to the server,
+ * WITHOUT Saving!
+ */
+ setLastUpdate(time) {
+ this.currentData.lastUpdate = time;
+ }
+
+ /**
+ *
+ * @param {GameRoot} root
+ */
+ updateData(root) {
+ // Construct a new serializer
+ const serializer = new SavegameSerializer();
+
+ // let timer = performance.now();
+ const dump = serializer.generateDumpFromGameRoot(root);
+ if (!dump) {
+ return false;
+ }
+
+ const shadowData = Object.assign({}, this.currentData);
+ shadowData.dump = dump;
+ shadowData.lastUpdate = new Date().getTime();
+ shadowData.version = this.getCurrentVersion();
+
+ const reader = this.getDumpReaderForExternalData(shadowData);
+
+ // Validate (not in prod though)
+ if (!G_IS_RELEASE) {
+ const validationResult = reader.validate();
+ if (!validationResult) {
+ return false;
+ }
+ }
+
+ // Save data
+ this.currentData = shadowData;
+ }
+
+ /**
+ * Writes the savegame as well as its metadata
+ */
+ writeSavegameAndMetadata() {
+ return this.writeAsync().then(() => this.saveMetadata());
+ }
+
+ /**
+ * Updates the savegames metadata
+ */
+ saveMetadata() {
+ this.metaDataRef.lastUpdate = new Date().getTime();
+ this.metaDataRef.version = this.getCurrentVersion();
+ if (!this.hasGameDump()) {
+ this.metaDataRef.level = 0;
+ } else {
+ this.metaDataRef.level = this.currentData.dump.hubGoals.level;
+ }
+
+ return this.app.savegameMgr.writeAsync();
+ }
+
+ /**
+ * @see ReadWriteProxy.writeAsync
+ * @returns {Promise}
+ */
+ writeAsync() {
+ if (G_IS_DEV && globalConfig.debug.disableSavegameWrite) {
+ return Promise.resolve();
+ }
+ return super.writeAsync();
+ }
+}
diff --git a/src/js/savegame/savegame_compressor.js b/src/js/savegame/savegame_compressor.js
index bc14baf7..b0b92aa8 100644
--- a/src/js/savegame/savegame_compressor.js
+++ b/src/js/savegame/savegame_compressor.js
@@ -59,7 +59,13 @@ if (G_IS_DEV) {
}
}
-function compressObjectInternal(obj, keys = [], values = []) {
+/**
+ * @param {any} obj
+ * @param {Map} keys
+ * @param {Map} values
+ * @returns {any[]|object|number|string}
+ */
+function compressObjectInternal(obj, keys, values) {
if (Array.isArray(obj)) {
let result = [];
for (let i = 0; i < obj.length; ++i) {
@@ -69,37 +75,58 @@ function compressObjectInternal(obj, keys = [], values = []) {
} else if (typeof obj === "object" && obj !== null) {
let result = {};
for (const key in obj) {
- let index = keys.indexOf(key);
- if (index < 0) {
- keys.push(key);
- index = keys.length - 1;
+ let index = keys.get(key);
+ if (index === undefined) {
+ index = keys.size;
+ keys.set(key, index);
}
const value = obj[key];
result[compressInt(index)] = compressObjectInternal(value, keys, values);
}
return result;
} else if (typeof obj === "string") {
- let index = values.indexOf(obj);
- if (index < 0) {
- values.push(obj);
- index = values.length - 1;
+ let index = values.get(obj);
+ if (index === undefined) {
+ index = values.size;
+ values.set(obj, index);
}
return compressInt(index);
}
return obj;
}
+/**
+ * @param {Map} hashMap
+ * @returns {Array}
+ */
+function indexMapToArray(hashMap) {
+ const result = new Array(hashMap.size);
+ hashMap.forEach((index, key) => {
+ result[index] = key;
+ });
+ return result;
+}
+
+/**
+ * @param {object} obj
+ */
export function compressObject(obj) {
- const keys = [];
- const values = [];
+ const keys = new Map();
+ const values = new Map();
const data = compressObjectInternal(obj, keys, values);
return {
- keys,
- values,
+ keys: indexMapToArray(keys),
+ values: indexMapToArray(values),
data,
};
}
+/**
+ * @param {object} obj
+ * @param {string[]} keys
+ * @param {any[]} values
+ * @returns {object}
+ */
function decompressObjectInternal(obj, keys = [], values = []) {
if (Array.isArray(obj)) {
let result = [];
@@ -122,6 +149,9 @@ function decompressObjectInternal(obj, keys = [], values = []) {
return obj;
}
+/**
+ * @param {object} obj
+ */
export function decompressObject(obj) {
if (obj.keys && obj.values && obj.data) {
const keys = obj.keys;
diff --git a/src/js/savegame/savegame_interface_registry.js b/src/js/savegame/savegame_interface_registry.js
index fb1df52f..07b5353c 100644
--- a/src/js/savegame/savegame_interface_registry.js
+++ b/src/js/savegame/savegame_interface_registry.js
@@ -1,45 +1,47 @@
-import { BaseSavegameInterface } from "./savegame_interface";
-import { SavegameInterface_V1000 } from "./schemas/1000";
-import { createLogger } from "../core/logging";
-import { SavegameInterface_V1001 } from "./schemas/1001";
-import { SavegameInterface_V1002 } from "./schemas/1002";
-import { SavegameInterface_V1003 } from "./schemas/1003";
-import { SavegameInterface_V1004 } from "./schemas/1004";
-import { SavegameInterface_V1005 } from "./schemas/1005";
-
-/** @type {Object.} */
-export const savegameInterfaces = {
- 1000: SavegameInterface_V1000,
- 1001: SavegameInterface_V1001,
- 1002: SavegameInterface_V1002,
- 1003: SavegameInterface_V1003,
- 1004: SavegameInterface_V1004,
- 1005: SavegameInterface_V1005,
-};
-
-const logger = createLogger("savegame_interface_registry");
-
-/**
- * Returns if the given savegame has any supported interface
- * @param {any} savegame
- * @returns {BaseSavegameInterface|null}
- */
-export function getSavegameInterface(savegame) {
- if (!savegame || !savegame.version) {
- logger.warn("Savegame does not contain a valid version (undefined)");
- return null;
- }
- const version = savegame.version;
- if (!Number.isInteger(version)) {
- logger.warn("Savegame does not contain a valid version (non-integer):", version);
- return null;
- }
-
- const interfaceClass = savegameInterfaces[version];
- if (!interfaceClass) {
- logger.warn("Version", version, "has no implemented interface!");
- return null;
- }
-
- return new interfaceClass(savegame);
-}
+import { BaseSavegameInterface } from "./savegame_interface";
+import { SavegameInterface_V1000 } from "./schemas/1000";
+import { createLogger } from "../core/logging";
+import { SavegameInterface_V1001 } from "./schemas/1001";
+import { SavegameInterface_V1002 } from "./schemas/1002";
+import { SavegameInterface_V1003 } from "./schemas/1003";
+import { SavegameInterface_V1004 } from "./schemas/1004";
+import { SavegameInterface_V1005 } from "./schemas/1005";
+import { SavegameInterface_V1006 } from "./schemas/1006";
+
+/** @type {Object.} */
+export const savegameInterfaces = {
+ 1000: SavegameInterface_V1000,
+ 1001: SavegameInterface_V1001,
+ 1002: SavegameInterface_V1002,
+ 1003: SavegameInterface_V1003,
+ 1004: SavegameInterface_V1004,
+ 1005: SavegameInterface_V1005,
+ 1006: SavegameInterface_V1006,
+};
+
+const logger = createLogger("savegame_interface_registry");
+
+/**
+ * Returns if the given savegame has any supported interface
+ * @param {any} savegame
+ * @returns {BaseSavegameInterface|null}
+ */
+export function getSavegameInterface(savegame) {
+ if (!savegame || !savegame.version) {
+ logger.warn("Savegame does not contain a valid version (undefined)");
+ return null;
+ }
+ const version = savegame.version;
+ if (!Number.isInteger(version)) {
+ logger.warn("Savegame does not contain a valid version (non-integer):", version);
+ return null;
+ }
+
+ const interfaceClass = savegameInterfaces[version];
+ if (!interfaceClass) {
+ logger.warn("Version", version, "has no implemented interface!");
+ return null;
+ }
+
+ return new interfaceClass(savegame);
+}
diff --git a/src/js/savegame/savegame_manager.js b/src/js/savegame/savegame_manager.js
index 52f9dc14..eb0d53d0 100644
--- a/src/js/savegame/savegame_manager.js
+++ b/src/js/savegame/savegame_manager.js
@@ -40,15 +40,8 @@ export class SavegameManager extends ReadWriteProxy {
return 1002;
}
- /**
- * @returns {SavegamesData}
- */
- getCurrentData() {
- return super.getCurrentData();
- }
-
verify(data) {
- // TODO / FIXME!!!!
+ // @TODO
return ExplainedResult.good();
}
@@ -96,6 +89,14 @@ export class SavegameManager extends ReadWriteProxy {
return new Savegame(this.app, { internalId, metaDataRef: metadata });
}
+ /**
+ * Returns if this manager has any savegame of a 1.1.19 version, which
+ * enables all levels
+ */
+ getHasAnyLegacySavegames() {
+ return this.currentData.savegames.some(savegame => savegame.version === 1005 || savegame.level > 14);
+ }
+
/**
* Deletes a savegame
* @param {SavegameMetadata} game
@@ -149,7 +150,9 @@ export class SavegameManager extends ReadWriteProxy {
});
this.currentData.savegames.push(metaData);
- this.sortSavegames();
+
+ // Notice: This is async and happening in the background
+ this.updateAfterSavegamesChanged();
return new Savegame(this.app, {
internalId: id,
@@ -157,8 +160,16 @@ export class SavegameManager extends ReadWriteProxy {
});
}
+ /**
+ * Attempts to import a savegame
+ * @param {object} data
+ */
importSavegame(data) {
const savegame = this.createNewSavegame();
+
+ // Track legacy savegames
+ const isOldSavegame = data.version < 1006;
+
const migrationResult = savegame.migrate(data);
if (migrationResult.isBad()) {
return Promise.reject("Failed to migrate: " + migrationResult.reason);
@@ -170,7 +181,19 @@ export class SavegameManager extends ReadWriteProxy {
return Promise.reject("Verification failed: " + verification.result);
}
- return savegame.writeSavegameAndMetadata().then(() => this.sortSavegames());
+ return savegame
+ .writeSavegameAndMetadata()
+ .then(() => this.updateAfterSavegamesChanged())
+ .then(() => this.app.restrictionMgr.onHasLegacySavegamesChanged(isOldSavegame));
+ }
+
+ /**
+ * Hook after the savegames got changed
+ */
+ updateAfterSavegamesChanged() {
+ return this.sortSavegames()
+ .then(() => this.writeAsync())
+ .then(() => this.app.restrictionMgr.onHasLegacySavegamesChanged(this.getHasAnyLegacySavegames()));
}
/**
@@ -219,7 +242,7 @@ export class SavegameManager extends ReadWriteProxy {
if (G_IS_DEV && globalConfig.debug.disableSavegameWrite) {
return Promise.resolve();
}
- return this.sortSavegames().then(() => this.writeAsync());
+ return this.updateAfterSavegamesChanged();
});
}
}
diff --git a/src/js/savegame/savegame_serializer.js b/src/js/savegame/savegame_serializer.js
index 92db738b..c1247225 100644
--- a/src/js/savegame/savegame_serializer.js
+++ b/src/js/savegame/savegame_serializer.js
@@ -1,146 +1,146 @@
-import { ExplainedResult } from "../core/explained_result";
-import { createLogger } from "../core/logging";
-import { gComponentRegistry } from "../core/global_registries";
-import { SerializerInternal } from "./serializer_internal";
-
-/**
- * @typedef {import("../game/component").Component} Component
- * @typedef {import("../game/component").StaticComponent} StaticComponent
- * @typedef {import("../game/entity").Entity} Entity
- * @typedef {import("../game/root").GameRoot} GameRoot
- * @typedef {import("../savegame/savegame_typedefs").SerializedGame} SerializedGame
- */
-
-const logger = createLogger("savegame_serializer");
-
-/**
- * Serializes a savegame
- */
-export class SavegameSerializer {
- constructor() {
- this.internal = new SerializerInternal();
- }
-
- /**
- * Serializes the game root into a dump
- * @param {GameRoot} root
- * @param {boolean=} sanityChecks Whether to check for validity
- * @returns {object}
- */
- generateDumpFromGameRoot(root, sanityChecks = true) {
- /** @type {SerializedGame} */
- const data = {
- camera: root.camera.serialize(),
- time: root.time.serialize(),
- map: root.map.serialize(),
- entityMgr: root.entityMgr.serialize(),
- hubGoals: root.hubGoals.serialize(),
- pinnedShapes: root.hud.parts.pinnedShapes.serialize(),
- waypoints: root.hud.parts.waypoints.serialize(),
- entities: this.internal.serializeEntityArray(root.entityMgr.entities),
- beltPaths: root.systemMgr.systems.belt.serializePaths(),
- };
-
- if (!G_IS_RELEASE) {
- if (sanityChecks) {
- // Sanity check
- const sanity = this.verifyLogicalErrors(data);
- if (!sanity.result) {
- logger.error("Created invalid savegame:", sanity.reason, "savegame:", data);
- return null;
- }
- }
- }
- return data;
- }
-
- /**
- * Verifies if there are logical errors in the savegame
- * @param {SerializedGame} savegame
- * @returns {ExplainedResult}
- */
- verifyLogicalErrors(savegame) {
- if (!savegame.entities) {
- return ExplainedResult.bad("Savegame has no entities");
- }
-
- const seenUids = [];
-
- // Check for duplicate UIDS
- for (let i = 0; i < savegame.entities.length; ++i) {
- /** @type {Entity} */
- const entity = savegame.entities[i];
-
- const uid = entity.uid;
- if (!Number.isInteger(uid)) {
- return ExplainedResult.bad("Entity has invalid uid: " + uid);
- }
- if (seenUids.indexOf(uid) >= 0) {
- return ExplainedResult.bad("Duplicate uid " + uid);
- }
- seenUids.push(uid);
-
- // Verify components
- if (!entity.components) {
- return ExplainedResult.bad("Entity is missing key 'components': " + JSON.stringify(entity));
- }
-
- const components = entity.components;
- for (const componentId in components) {
- const componentClass = gComponentRegistry.findById(componentId);
-
- // Check component id is known
- if (!componentClass) {
- return ExplainedResult.bad("Unknown component id: " + componentId);
- }
-
- // Verify component data
- const componentData = components[componentId];
- const componentVerifyError = /** @type {StaticComponent} */ (componentClass).verify(
- componentData
- );
-
- // Check component data is ok
- if (componentVerifyError) {
- return ExplainedResult.bad(
- "Component " + componentId + " has invalid data: " + componentVerifyError
- );
- }
- }
- }
-
- return ExplainedResult.good();
- }
-
- /**
- * Tries to load the savegame from a given dump
- * @param {SerializedGame} savegame
- * @param {GameRoot} root
- * @returns {ExplainedResult}
- */
- deserialize(savegame, root) {
- // Sanity
- const verifyResult = this.verifyLogicalErrors(savegame);
- if (!verifyResult.result) {
- return ExplainedResult.bad(verifyResult.reason);
- }
- let errorReason = null;
-
- errorReason = errorReason || root.entityMgr.deserialize(savegame.entityMgr);
- errorReason = errorReason || root.time.deserialize(savegame.time);
- errorReason = errorReason || root.camera.deserialize(savegame.camera);
- errorReason = errorReason || root.map.deserialize(savegame.map);
- errorReason = errorReason || root.hubGoals.deserialize(savegame.hubGoals);
- errorReason = errorReason || root.hud.parts.pinnedShapes.deserialize(savegame.pinnedShapes);
- errorReason = errorReason || root.hud.parts.waypoints.deserialize(savegame.waypoints);
- errorReason = errorReason || this.internal.deserializeEntityArray(root, savegame.entities);
- errorReason = errorReason || root.systemMgr.systems.belt.deserializePaths(savegame.beltPaths);
-
- // Check for errors
- if (errorReason) {
- return ExplainedResult.bad(errorReason);
- }
-
- return ExplainedResult.good();
- }
-}
+import { ExplainedResult } from "../core/explained_result";
+import { createLogger } from "../core/logging";
+import { gComponentRegistry } from "../core/global_registries";
+import { SerializerInternal } from "./serializer_internal";
+
+/**
+ * @typedef {import("../game/component").Component} Component
+ * @typedef {import("../game/component").StaticComponent} StaticComponent
+ * @typedef {import("../game/entity").Entity} Entity
+ * @typedef {import("../game/root").GameRoot} GameRoot
+ * @typedef {import("../savegame/savegame_typedefs").SerializedGame} SerializedGame
+ */
+
+const logger = createLogger("savegame_serializer");
+
+/**
+ * Serializes a savegame
+ */
+export class SavegameSerializer {
+ constructor() {
+ this.internal = new SerializerInternal();
+ }
+
+ /**
+ * Serializes the game root into a dump
+ * @param {GameRoot} root
+ * @param {boolean=} sanityChecks Whether to check for validity
+ * @returns {object}
+ */
+ generateDumpFromGameRoot(root, sanityChecks = true) {
+ /** @type {SerializedGame} */
+ const data = {
+ camera: root.camera.serialize(),
+ time: root.time.serialize(),
+ map: root.map.serialize(),
+ entityMgr: root.entityMgr.serialize(),
+ hubGoals: root.hubGoals.serialize(),
+ pinnedShapes: root.hud.parts.pinnedShapes.serialize(),
+ waypoints: root.hud.parts.waypoints.serialize(),
+ entities: this.internal.serializeEntityArray(root.entityMgr.entities),
+ beltPaths: root.systemMgr.systems.belt.serializePaths(),
+ };
+
+ if (G_IS_DEV) {
+ if (sanityChecks) {
+ // Sanity check
+ const sanity = this.verifyLogicalErrors(data);
+ if (!sanity.result) {
+ logger.error("Created invalid savegame:", sanity.reason, "savegame:", data);
+ return null;
+ }
+ }
+ }
+ return data;
+ }
+
+ /**
+ * Verifies if there are logical errors in the savegame
+ * @param {SerializedGame} savegame
+ * @returns {ExplainedResult}
+ */
+ verifyLogicalErrors(savegame) {
+ if (!savegame.entities) {
+ return ExplainedResult.bad("Savegame has no entities");
+ }
+
+ const seenUids = new Set();
+
+ // Check for duplicate UIDS
+ for (let i = 0; i < savegame.entities.length; ++i) {
+ /** @type {Entity} */
+ const entity = savegame.entities[i];
+
+ const uid = entity.uid;
+ if (!Number.isInteger(uid)) {
+ return ExplainedResult.bad("Entity has invalid uid: " + uid);
+ }
+ if (seenUids.has(uid)) {
+ return ExplainedResult.bad("Duplicate uid " + uid);
+ }
+ seenUids.add(uid);
+
+ // Verify components
+ if (!entity.components) {
+ return ExplainedResult.bad("Entity is missing key 'components': " + JSON.stringify(entity));
+ }
+
+ const components = entity.components;
+ for (const componentId in components) {
+ const componentClass = gComponentRegistry.findById(componentId);
+
+ // Check component id is known
+ if (!componentClass) {
+ return ExplainedResult.bad("Unknown component id: " + componentId);
+ }
+
+ // Verify component data
+ const componentData = components[componentId];
+ const componentVerifyError = /** @type {StaticComponent} */ (componentClass).verify(
+ componentData
+ );
+
+ // Check component data is ok
+ if (componentVerifyError) {
+ return ExplainedResult.bad(
+ "Component " + componentId + " has invalid data: " + componentVerifyError
+ );
+ }
+ }
+ }
+
+ return ExplainedResult.good();
+ }
+
+ /**
+ * Tries to load the savegame from a given dump
+ * @param {SerializedGame} savegame
+ * @param {GameRoot} root
+ * @returns {ExplainedResult}
+ */
+ deserialize(savegame, root) {
+ // Sanity
+ const verifyResult = this.verifyLogicalErrors(savegame);
+ if (!verifyResult.result) {
+ return ExplainedResult.bad(verifyResult.reason);
+ }
+ let errorReason = null;
+
+ errorReason = errorReason || root.entityMgr.deserialize(savegame.entityMgr);
+ errorReason = errorReason || root.time.deserialize(savegame.time);
+ errorReason = errorReason || root.camera.deserialize(savegame.camera);
+ errorReason = errorReason || root.map.deserialize(savegame.map);
+ errorReason = errorReason || root.hubGoals.deserialize(savegame.hubGoals, root);
+ errorReason = errorReason || root.hud.parts.pinnedShapes.deserialize(savegame.pinnedShapes);
+ errorReason = errorReason || root.hud.parts.waypoints.deserialize(savegame.waypoints);
+ errorReason = errorReason || this.internal.deserializeEntityArray(root, savegame.entities);
+ errorReason = errorReason || root.systemMgr.systems.belt.deserializePaths(savegame.beltPaths);
+
+ // Check for errors
+ if (errorReason) {
+ return ExplainedResult.bad(errorReason);
+ }
+
+ return ExplainedResult.good();
+ }
+}
diff --git a/src/js/savegame/schemas/1006.js b/src/js/savegame/schemas/1006.js
new file mode 100644
index 00000000..79226772
--- /dev/null
+++ b/src/js/savegame/schemas/1006.js
@@ -0,0 +1,304 @@
+import { gMetaBuildingRegistry } from "../../core/global_registries.js";
+import { createLogger } from "../../core/logging.js";
+import { enumBalancerVariants, MetaBalancerBuilding } from "../../game/buildings/balancer.js";
+import { MetaBeltBuilding } from "../../game/buildings/belt.js";
+import { enumCutterVariants, MetaCutterBuilding } from "../../game/buildings/cutter.js";
+import { MetaHubBuilding } from "../../game/buildings/hub.js";
+import { enumMinerVariants, MetaMinerBuilding } from "../../game/buildings/miner.js";
+import { MetaMixerBuilding } from "../../game/buildings/mixer.js";
+import { enumPainterVariants, MetaPainterBuilding } from "../../game/buildings/painter.js";
+import { enumRotaterVariants, MetaRotaterBuilding } from "../../game/buildings/rotater.js";
+import { MetaStackerBuilding } from "../../game/buildings/stacker.js";
+import { MetaStorageBuilding } from "../../game/buildings/storage.js";
+import { MetaTrashBuilding } from "../../game/buildings/trash.js";
+import {
+ enumUndergroundBeltVariants,
+ MetaUndergroundBeltBuilding,
+} from "../../game/buildings/underground_belt.js";
+import { getCodeFromBuildingData } from "../../game/building_codes.js";
+import { StaticMapEntityComponent } from "../../game/components/static_map_entity.js";
+import { Entity } from "../../game/entity.js";
+import { defaultBuildingVariant, MetaBuilding } from "../../game/meta_building.js";
+import { SavegameInterface_V1005 } from "./1005.js";
+
+const schema = require("./1006.json");
+const logger = createLogger("savegame_interface/1006");
+
+/**
+ *
+ * @param {typeof MetaBuilding} metaBuilding
+ * @param {string=} variant
+ * @param {number=} rotationVariant
+ */
+function findCode(metaBuilding, variant = defaultBuildingVariant, rotationVariant = 0) {
+ return getCodeFromBuildingData(gMetaBuildingRegistry.findByClass(metaBuilding), variant, rotationVariant);
+}
+
+/**
+ * Rebalances a value from the old balancing to the new one
+ * @param {number} value
+ * @returns {number}
+ */
+function rebalance(value) {
+ return Math.round(Math.pow(value, 0.75));
+}
+
+export class SavegameInterface_V1006 extends SavegameInterface_V1005 {
+ getVersion() {
+ return 1006;
+ }
+
+ getSchemaUncached() {
+ return schema;
+ }
+
+ static computeSpriteMapping() {
+ return {
+ // Belt
+ "sprites/blueprints/belt_top.png": findCode(MetaBeltBuilding, defaultBuildingVariant, 0),
+ "sprites/blueprints/belt_left.png": findCode(MetaBeltBuilding, defaultBuildingVariant, 1),
+ "sprites/blueprints/belt_right.png": findCode(MetaBeltBuilding, defaultBuildingVariant, 2),
+
+ // Splitter (=Balancer)
+ "sprites/blueprints/splitter.png": findCode(MetaBalancerBuilding),
+ "sprites/blueprints/splitter-compact.png": findCode(
+ MetaBalancerBuilding,
+ enumBalancerVariants.merger
+ ),
+ "sprites/blueprints/splitter-compact-inverse.png": findCode(
+ MetaBalancerBuilding,
+ enumBalancerVariants.mergerInverse
+ ),
+
+ // Underground belt
+ "sprites/blueprints/underground_belt_entry.png": findCode(
+ MetaUndergroundBeltBuilding,
+ defaultBuildingVariant,
+ 0
+ ),
+ "sprites/blueprints/underground_belt_exit.png": findCode(
+ MetaUndergroundBeltBuilding,
+ defaultBuildingVariant,
+ 1
+ ),
+
+ "sprites/blueprints/underground_belt_entry-tier2.png": findCode(
+ MetaUndergroundBeltBuilding,
+ enumUndergroundBeltVariants.tier2,
+ 0
+ ),
+ "sprites/blueprints/underground_belt_exit-tier2.png": findCode(
+ MetaUndergroundBeltBuilding,
+ enumUndergroundBeltVariants.tier2,
+ 1
+ ),
+
+ // Miner
+ "sprites/blueprints/miner.png": findCode(MetaMinerBuilding),
+ "sprites/blueprints/miner-chainable.png": findCode(
+ MetaMinerBuilding,
+ enumMinerVariants.chainable,
+ 0
+ ),
+
+ // Cutter
+ "sprites/blueprints/cutter.png": findCode(MetaCutterBuilding),
+ "sprites/blueprints/cutter-quad.png": findCode(MetaCutterBuilding, enumCutterVariants.quad),
+
+ // Rotater
+ "sprites/blueprints/rotater.png": findCode(MetaRotaterBuilding),
+ "sprites/blueprints/rotater-ccw.png": findCode(MetaRotaterBuilding, enumRotaterVariants.ccw),
+
+ // Stacker
+ "sprites/blueprints/stacker.png": findCode(MetaStackerBuilding),
+
+ // Mixer
+ "sprites/blueprints/mixer.png": findCode(MetaMixerBuilding),
+
+ // Painter
+ "sprites/blueprints/painter.png": findCode(MetaPainterBuilding),
+ "sprites/blueprints/painter-mirrored.png": findCode(
+ MetaPainterBuilding,
+ enumPainterVariants.mirrored
+ ),
+ "sprites/blueprints/painter-double.png": findCode(
+ MetaPainterBuilding,
+ enumPainterVariants.double
+ ),
+ "sprites/blueprints/painter-quad.png": findCode(MetaPainterBuilding, enumPainterVariants.quad),
+
+ // Trash
+ "sprites/blueprints/trash.png": findCode(MetaTrashBuilding),
+
+ // Storage
+ "sprites/blueprints/trash-storage.png": findCode(MetaStorageBuilding),
+ };
+ }
+
+ /**
+ * @param {import("../savegame_typedefs.js").SavegameData} data
+ */
+ static migrate1005to1006(data) {
+ logger.log("Migrating 1005 to 1006");
+ const dump = data.dump;
+ if (!dump) {
+ return true;
+ }
+
+ // Reduce stored shapes
+ const stored = dump.hubGoals.storedShapes;
+ for (const shapeKey in stored) {
+ stored[shapeKey] = rebalance(stored[shapeKey]);
+ }
+
+ // Reset final game shape
+ stored["RuCw--Cw:----Ru--"] = 0;
+
+ // Reduce goals
+ if (dump.hubGoals.currentGoal) {
+ dump.hubGoals.currentGoal.required = rebalance(dump.hubGoals.currentGoal.required);
+ }
+
+ let level = Math.min(19, dump.hubGoals.level);
+
+ const levelMapping = {
+ 14: 15,
+ 15: 16,
+ 16: 17,
+ 17: 18,
+ 18: 19,
+ 19: 20,
+ };
+
+ dump.hubGoals.level = levelMapping[level] || level;
+
+ // Update entities
+ const entities = dump.entities;
+ for (let i = 0; i < entities.length; ++i) {
+ const entity = entities[i];
+ const components = entity.components;
+ this.migrateStaticComp1005to1006(entity);
+
+ // HUB
+ if (components.Hub) {
+ // @ts-ignore
+ components.Hub = {};
+ }
+
+ // Item Processor
+ if (components.ItemProcessor) {
+ // @ts-ignore
+ components.ItemProcessor = {
+ nextOutputSlot: 0,
+ };
+ }
+
+ // OLD: Unremovable component
+ // @ts-ignore
+ if (components.Unremovable) {
+ // @ts-ignore
+ delete components.Unremovable;
+ }
+
+ // OLD: ReplaceableMapEntity
+ // @ts-ignore
+ if (components.ReplaceableMapEntity) {
+ // @ts-ignore
+ delete components.ReplaceableMapEntity;
+ }
+
+ // ItemAcceptor
+ if (components.ItemAcceptor) {
+ // @ts-ignore
+ components.ItemAcceptor = {};
+ }
+
+ // Belt
+ if (components.Belt) {
+ // @ts-ignore
+ components.Belt = {};
+ }
+
+ // Item Ejector
+ if (components.ItemEjector) {
+ // @ts-ignore
+ components.ItemEjector = {
+ slots: [],
+ };
+ }
+
+ // UndergroundBelt
+ if (components.UndergroundBelt) {
+ // @ts-ignore
+ components.UndergroundBelt = {
+ pendingItems: [],
+ };
+ }
+
+ // Miner
+ if (components.Miner) {
+ // @ts-ignore
+ delete components.Miner.chainable;
+
+ components.Miner.lastMiningTime = 0;
+ components.Miner.itemChainBuffer = [];
+ }
+
+ // Storage
+ if (components.Storage) {
+ // @ts-ignore
+ components.Storage = {
+ storedCount: rebalance(components.Storage.storedCount),
+ storedItem: null,
+ };
+ }
+ }
+ }
+
+ /**
+ *
+ * @param {Entity} entity
+ */
+ static migrateStaticComp1005to1006(entity) {
+ const spriteMapping = this.computeSpriteMapping();
+ const staticComp = entity.components.StaticMapEntity;
+
+ /** @type {StaticMapEntityComponent} */
+ const newStaticComp = {};
+ newStaticComp.origin = staticComp.origin;
+ newStaticComp.originalRotation = staticComp.originalRotation;
+ newStaticComp.rotation = staticComp.rotation;
+
+ // @ts-ignore
+ newStaticComp.code = spriteMapping[staticComp.blueprintSpriteKey];
+
+ // Hub special case
+ if (entity.components.Hub) {
+ newStaticComp.code = findCode(MetaHubBuilding);
+ }
+
+ // Belt special case
+ if (entity.components.Belt) {
+ const actualCode = {
+ top: findCode(MetaBeltBuilding, defaultBuildingVariant, 0),
+ left: findCode(MetaBeltBuilding, defaultBuildingVariant, 1),
+ right: findCode(MetaBeltBuilding, defaultBuildingVariant, 2),
+ }[entity.components.Belt.direction];
+ if (actualCode !== newStaticComp.code) {
+ if (G_IS_DEV) {
+ console.warn("Belt mismatch");
+ }
+ newStaticComp.code = actualCode;
+ }
+ }
+
+ if (!newStaticComp.code) {
+ throw new Error(
+ // @ts-ignore
+ "1006 Migration: Could not reconstruct code for " + staticComp.blueprintSpriteKey
+ );
+ }
+
+ entity.components.StaticMapEntity = newStaticComp;
+ }
+}
diff --git a/src/js/savegame/schemas/1006.json b/src/js/savegame/schemas/1006.json
new file mode 100644
index 00000000..b0916986
--- /dev/null
+++ b/src/js/savegame/schemas/1006.json
@@ -0,0 +1,5 @@
+{
+ "type": "object",
+ "required": [],
+ "additionalProperties": true
+}
diff --git a/src/js/savegame/serialization.js b/src/js/savegame/serialization.js
index 9f998a0f..801b26ab 100644
--- a/src/js/savegame/serialization.js
+++ b/src/js/savegame/serialization.js
@@ -1,344 +1,351 @@
-import { createLogger } from "../core/logging";
-import {
- BaseDataType,
- TypeArray,
- TypeBoolean,
- TypeClass,
- TypeClassData,
- TypeClassFromMetaclass,
- TypeClassId,
- TypeEntity,
- TypeEntityWeakref,
- TypeEnum,
- TypeFixedClass,
- TypeInteger,
- TypeKeyValueMap,
- TypeMetaClass,
- TypeNullable,
- TypeNumber,
- TypePair,
- TypePositiveInteger,
- TypePositiveNumber,
- TypeString,
- TypeStructuredObject,
- TypeVector,
-} from "./serialization_data_types";
-
-const logger = createLogger("serialization");
-
-// Schema declarations
-export const types = {
- int: new TypeInteger(),
- uint: new TypePositiveInteger(),
- float: new TypeNumber(),
- ufloat: new TypePositiveNumber(),
- string: new TypeString(),
- entity: new TypeEntity(),
- weakEntityRef: new TypeEntityWeakref(),
- vector: new TypeVector(),
- tileVector: new TypeVector(),
- bool: new TypeBoolean(),
-
- /**
- * @param {BaseDataType} wrapped
- */
- nullable(wrapped) {
- return new TypeNullable(wrapped);
- },
-
- /**
- * @param {FactoryTemplate<*>|SingletonFactoryTemplate<*>} registry
- */
- classId(registry) {
- return new TypeClassId(registry);
- },
- /**
- * @param {BaseDataType} valueType
- * @param {boolean=} includeEmptyValues
- */
- keyValueMap(valueType, includeEmptyValues = true) {
- return new TypeKeyValueMap(valueType, includeEmptyValues);
- },
-
- /**
- * @param {Object} values
- */
- enum(values) {
- return new TypeEnum(values);
- },
-
- /**
- * @param {FactoryTemplate<*>} registry
- * @param {(GameRoot, any) => object=} resolver
- */
- obj(registry, resolver = null) {
- return new TypeClass(registry, resolver);
- },
-
- /**
- * @param {FactoryTemplate<*>} registry
- */
- objData(registry) {
- return new TypeClassData(registry);
- },
-
- /**
- * @param {typeof BasicSerializableObject} cls
- */
- knownType(cls) {
- return new TypeFixedClass(cls);
- },
-
- /**
- * @param {BaseDataType} innerType
- */
- array(innerType) {
- return new TypeArray(innerType);
- },
-
- /**
- * @param {SingletonFactoryTemplate<*>} innerType
- */
- classRef(registry) {
- return new TypeMetaClass(registry);
- },
-
- /**
- * @param {Object.} descriptor
- */
- structured(descriptor) {
- return new TypeStructuredObject(descriptor);
- },
-
- /**
- * @param {BaseDataType} a
- * @param {BaseDataType} b
- */
- pair(a, b) {
- return new TypePair(a, b);
- },
-
- /**
- * @param {typeof BasicSerializableObject} classHandle
- * @param {SingletonFactoryTemplate<*>} registry
- */
- classWithMetaclass(classHandle, registry) {
- return new TypeClassFromMetaclass(classHandle, registry);
- },
-};
-
-/**
- * A full schema declaration
- * @typedef {Object.} Schema
- */
-
-const globalSchemaCache = {};
-
-/* dev:start */
-const classnamesCache = {};
-/* dev:end*/
-
-export class BasicSerializableObject {
- /* dev:start */
- /**
- * Fixes typeof DerivedComponent is not assignable to typeof Component, compiled out
- * in non-dev builds
- */
- constructor(...args) {}
-
- /* dev:end */
-
- static getId() {
- abstract;
- }
-
- /**
- * Should return the serialization schema
- * @returns {Schema}
- */
- static getSchema() {
- return {};
- }
-
- // Implementation
- /** @returns {Schema} */
- static getCachedSchema() {
- const id = this.getId();
-
- /* dev:start */
- assert(
- classnamesCache[id] === this || classnamesCache[id] === undefined,
- "Class name taken twice: " + id + " (from " + this.name + ")"
- );
- classnamesCache[id] = this;
- /* dev:end */
-
- const entry = globalSchemaCache[id];
- if (entry) {
- return entry;
- }
-
- const schema = this.getSchema();
- globalSchemaCache[id] = schema;
- return schema;
- }
-
- /** @returns {object} */
- serialize() {
- return serializeSchema(
- this,
- /** @type {typeof BasicSerializableObject} */ (this.constructor).getCachedSchema()
- );
- }
-
- /**
- * @param {any} data
- * @param {import("./savegame_serializer").GameRoot} root
- * @returns {string|void}
- */
- deserialize(data, root = null) {
- return deserializeSchema(
- this,
- /** @type {typeof BasicSerializableObject} */ (this.constructor).getCachedSchema(),
- data,
- null,
- root
- );
- }
-
- /** @returns {string|void} */
- static verify(data) {
- return verifySchema(this.getCachedSchema(), data);
- }
-}
-
-/**
- * Serializes an object using the given schema, mergin with the given properties
- * @param {object} obj The object to serialize
- * @param {Schema} schema The schema to use
- * @param {object=} mergeWith Any additional properties to merge with the schema, useful for super calls
- * @returns {object} Serialized data object
- */
-export function serializeSchema(obj, schema, mergeWith = {}) {
- for (const key in schema) {
- if (!obj.hasOwnProperty(key)) {
- logger.error("Invalid schema, property", key, "does not exist on", obj, "(schema=", schema, ")");
- assert(
- obj.hasOwnProperty(key),
- "serialization: invalid schema, property does not exist on object: " + key
- );
- }
- if (!schema[key]) {
- assert(false, "Invalid schema (bad key '" + key + "'): " + JSON.stringify(schema));
- }
-
- if (G_IS_DEV) {
- try {
- mergeWith[key] = schema[key].serialize(obj[key]);
- } catch (ex) {
- logger.error(
- "Serialization of",
- obj,
- "failed on key '" + key + "' ->",
- ex,
- "(schema was",
- schema,
- ")"
- );
- throw ex;
- }
- } else {
- mergeWith[key] = schema[key].serialize(obj[key]);
- }
- }
- return mergeWith;
-}
-
-/**
- * Deserializes data into an object
- * @param {object} obj The object to store the deserialized data into
- * @param {Schema} schema The schema to use
- * @param {object} data The serialized data
- * @param {string|void|null=} baseclassErrorResult Convenience, if this is a string error code, do nothing and return it
- * @param {import("../game/root").GameRoot=} root Optional game root reference
- * @returns {string|void} String error code or nothing on success
- */
-export function deserializeSchema(obj, schema, data, baseclassErrorResult = null, root) {
- if (baseclassErrorResult) {
- return baseclassErrorResult;
- }
-
- if (!data) {
- logger.error("Got 'NULL' data for", obj, "and schema", schema, "!");
- return "Got null data";
- }
-
- for (const key in schema) {
- if (!data.hasOwnProperty(key)) {
- logger.error("Data", data, "does not contain", key, "(schema:", schema, ")");
- return "Missing key in schema: " + key + " of class " + obj.constructor.name;
- }
- if (!schema[key].allowNull() && (data[key] === null || data[key] === undefined)) {
- logger.error("Data", data, "has null value for", key, "(schema:", schema, ")");
- return "Non-nullable entry is null: " + key + " of class " + obj.constructor.name;
- }
-
- const errorStatus = schema[key].deserializeWithVerify(data[key], obj, key, obj.root || root);
- if (errorStatus) {
- logger.error(
- "Deserialization failed with error '" + errorStatus + "' on object",
- obj,
- "and key",
- key,
- "(root? =",
- obj.root ? "y" : "n",
- ")"
- );
- return errorStatus;
- }
- }
-}
-
-/**
- * Verifies stored data using the given schema
- * @param {Schema} schema The schema to use
- * @param {object} data The data to verify
- * @returns {string|void} String error code or nothing on success
- */
-export function verifySchema(schema, data) {
- for (const key in schema) {
- if (!data.hasOwnProperty(key)) {
- logger.error("Data", data, "does not contain", key, "(schema:", schema, ")");
- return "verify: missing key required by schema in stored data: " + key;
- }
- if (!schema[key].allowNull() && (data[key] === null || data[key] === undefined)) {
- logger.error("Data", data, "has null value for", key, "(schema:", schema, ")");
- return "verify: non-nullable entry is null: " + key;
- }
-
- const errorStatus = schema[key].verifySerializedValue(data[key]);
- if (errorStatus) {
- logger.error(errorStatus);
- return "verify: " + errorStatus;
- }
- }
-}
-
-/**
- * Extends a schema by adding the properties from the new schema to the existing base schema
- * @param {Schema} base
- * @param {Schema} newOne
- * @returns {Schema}
- */
-export function extendSchema(base, newOne) {
- /** @type {Schema} */
- const result = Object.assign({}, base);
- for (const key in newOne) {
- if (result.hasOwnProperty(key)) {
- logger.error("Extend schema got duplicate key:", key);
- continue;
- }
- result[key] = newOne[key];
- }
- return result;
-}
+import { createLogger } from "../core/logging";
+import {
+ BaseDataType,
+ TypeArray,
+ TypeBoolean,
+ TypeClass,
+ TypeClassData,
+ TypeClassFromMetaclass,
+ TypeClassId,
+ TypeEntity,
+ TypeEntityWeakref,
+ TypeEnum,
+ TypeFixedClass,
+ TypeInteger,
+ TypeKeyValueMap,
+ TypeMetaClass,
+ TypeNullable,
+ TypeNumber,
+ TypePair,
+ TypePositiveInteger,
+ TypePositiveNumber,
+ TypeString,
+ TypeStructuredObject,
+ TypeVector,
+} from "./serialization_data_types";
+
+const logger = createLogger("serialization");
+
+// Schema declarations
+export const types = {
+ int: new TypeInteger(),
+ uint: new TypePositiveInteger(),
+ float: new TypeNumber(),
+ ufloat: new TypePositiveNumber(),
+ string: new TypeString(),
+ entity: new TypeEntity(),
+ weakEntityRef: new TypeEntityWeakref(),
+ vector: new TypeVector(),
+ tileVector: new TypeVector(),
+ bool: new TypeBoolean(),
+
+ /**
+ * @param {BaseDataType} wrapped
+ */
+ nullable(wrapped) {
+ return new TypeNullable(wrapped);
+ },
+
+ /**
+ * @param {FactoryTemplate<*>|SingletonFactoryTemplate<*>} registry
+ */
+ classId(registry) {
+ return new TypeClassId(registry);
+ },
+ /**
+ * @param {BaseDataType} valueType
+ * @param {boolean=} includeEmptyValues
+ */
+ keyValueMap(valueType, includeEmptyValues = true) {
+ return new TypeKeyValueMap(valueType, includeEmptyValues);
+ },
+
+ /**
+ * @param {Object} values
+ */
+ enum(values) {
+ return new TypeEnum(values);
+ },
+
+ /**
+ * @param {FactoryTemplate<*>} registry
+ * @param {(GameRoot, any) => object=} resolver
+ */
+ obj(registry, resolver = null) {
+ return new TypeClass(registry, resolver);
+ },
+
+ /**
+ * @param {FactoryTemplate<*>} registry
+ */
+ objData(registry) {
+ return new TypeClassData(registry);
+ },
+
+ /**
+ * @param {typeof BasicSerializableObject} cls
+ */
+ knownType(cls) {
+ return new TypeFixedClass(cls);
+ },
+
+ /**
+ * @param {BaseDataType} innerType
+ */
+ array(innerType) {
+ return new TypeArray(innerType);
+ },
+
+ /**
+ * @param {BaseDataType} innerType
+ */
+ fixedSizeArray(innerType) {
+ return new TypeArray(innerType, true);
+ },
+
+ /**
+ * @param {SingletonFactoryTemplate<*>} innerType
+ */
+ classRef(registry) {
+ return new TypeMetaClass(registry);
+ },
+
+ /**
+ * @param {Object.} descriptor
+ */
+ structured(descriptor) {
+ return new TypeStructuredObject(descriptor);
+ },
+
+ /**
+ * @param {BaseDataType} a
+ * @param {BaseDataType} b
+ */
+ pair(a, b) {
+ return new TypePair(a, b);
+ },
+
+ /**
+ * @param {typeof BasicSerializableObject} classHandle
+ * @param {SingletonFactoryTemplate<*>} registry
+ */
+ classWithMetaclass(classHandle, registry) {
+ return new TypeClassFromMetaclass(classHandle, registry);
+ },
+};
+
+/**
+ * A full schema declaration
+ * @typedef {Object.} Schema
+ */
+
+const globalSchemaCache = {};
+
+/* dev:start */
+const classnamesCache = {};
+/* dev:end*/
+
+export class BasicSerializableObject {
+ /* dev:start */
+ /**
+ * Fixes typeof DerivedComponent is not assignable to typeof Component, compiled out
+ * in non-dev builds
+ */
+ constructor(...args) {}
+
+ /* dev:end */
+
+ static getId() {
+ abstract;
+ }
+
+ /**
+ * Should return the serialization schema
+ * @returns {Schema}
+ */
+ static getSchema() {
+ return {};
+ }
+
+ // Implementation
+ /** @returns {Schema} */
+ static getCachedSchema() {
+ const id = this.getId();
+
+ /* dev:start */
+ assert(
+ classnamesCache[id] === this || classnamesCache[id] === undefined,
+ "Class name taken twice: " + id + " (from " + this.name + ")"
+ );
+ classnamesCache[id] = this;
+ /* dev:end */
+
+ const entry = globalSchemaCache[id];
+ if (entry) {
+ return entry;
+ }
+
+ const schema = this.getSchema();
+ globalSchemaCache[id] = schema;
+ return schema;
+ }
+
+ /** @returns {object} */
+ serialize() {
+ return serializeSchema(
+ this,
+ /** @type {typeof BasicSerializableObject} */ (this.constructor).getCachedSchema()
+ );
+ }
+
+ /**
+ * @param {any} data
+ * @param {import("./savegame_serializer").GameRoot} root
+ * @returns {string|void}
+ */
+ deserialize(data, root = null) {
+ return deserializeSchema(
+ this,
+ /** @type {typeof BasicSerializableObject} */ (this.constructor).getCachedSchema(),
+ data,
+ null,
+ root
+ );
+ }
+
+ /** @returns {string|void} */
+ static verify(data) {
+ return verifySchema(this.getCachedSchema(), data);
+ }
+}
+
+/**
+ * Serializes an object using the given schema, mergin with the given properties
+ * @param {object} obj The object to serialize
+ * @param {Schema} schema The schema to use
+ * @param {object=} mergeWith Any additional properties to merge with the schema, useful for super calls
+ * @returns {object} Serialized data object
+ */
+export function serializeSchema(obj, schema, mergeWith = {}) {
+ for (const key in schema) {
+ if (!obj.hasOwnProperty(key)) {
+ logger.error("Invalid schema, property", key, "does not exist on", obj, "(schema=", schema, ")");
+ assert(
+ obj.hasOwnProperty(key),
+ "serialization: invalid schema, property does not exist on object: " + key
+ );
+ }
+ if (!schema[key]) {
+ assert(false, "Invalid schema (bad key '" + key + "'): " + JSON.stringify(schema));
+ }
+
+ if (G_IS_DEV) {
+ try {
+ mergeWith[key] = schema[key].serialize(obj[key]);
+ } catch (ex) {
+ logger.error(
+ "Serialization of",
+ obj,
+ "failed on key '" + key + "' ->",
+ ex,
+ "(schema was",
+ schema,
+ ")"
+ );
+ throw ex;
+ }
+ } else {
+ mergeWith[key] = schema[key].serialize(obj[key]);
+ }
+ }
+ return mergeWith;
+}
+
+/**
+ * Deserializes data into an object
+ * @param {object} obj The object to store the deserialized data into
+ * @param {Schema} schema The schema to use
+ * @param {object} data The serialized data
+ * @param {string|void|null=} baseclassErrorResult Convenience, if this is a string error code, do nothing and return it
+ * @param {import("../game/root").GameRoot=} root Optional game root reference
+ * @returns {string|void} String error code or nothing on success
+ */
+export function deserializeSchema(obj, schema, data, baseclassErrorResult = null, root) {
+ if (baseclassErrorResult) {
+ return baseclassErrorResult;
+ }
+
+ if (!data) {
+ logger.error("Got 'NULL' data for", obj, "and schema", schema, "!");
+ return "Got null data";
+ }
+
+ for (const key in schema) {
+ if (!data.hasOwnProperty(key)) {
+ logger.error("Data", data, "does not contain", key, "(schema:", schema, ")");
+ return "Missing key in schema: " + key + " of class " + obj.constructor.name;
+ }
+ if (!schema[key].allowNull() && (data[key] === null || data[key] === undefined)) {
+ logger.error("Data", data, "has null value for", key, "(schema:", schema, ")");
+ return "Non-nullable entry is null: " + key + " of class " + obj.constructor.name;
+ }
+
+ const errorStatus = schema[key].deserializeWithVerify(data[key], obj, key, obj.root || root);
+ if (errorStatus) {
+ logger.error(
+ "Deserialization failed with error '" + errorStatus + "' on object",
+ obj,
+ "and key",
+ key,
+ "(root? =",
+ obj.root ? "y" : "n",
+ ")"
+ );
+ return errorStatus;
+ }
+ }
+}
+
+/**
+ * Verifies stored data using the given schema
+ * @param {Schema} schema The schema to use
+ * @param {object} data The data to verify
+ * @returns {string|void} String error code or nothing on success
+ */
+export function verifySchema(schema, data) {
+ for (const key in schema) {
+ if (!data.hasOwnProperty(key)) {
+ logger.error("Data", data, "does not contain", key, "(schema:", schema, ")");
+ return "verify: missing key required by schema in stored data: " + key;
+ }
+ if (!schema[key].allowNull() && (data[key] === null || data[key] === undefined)) {
+ logger.error("Data", data, "has null value for", key, "(schema:", schema, ")");
+ return "verify: non-nullable entry is null: " + key;
+ }
+
+ const errorStatus = schema[key].verifySerializedValue(data[key]);
+ if (errorStatus) {
+ logger.error(errorStatus);
+ return "verify: " + errorStatus;
+ }
+ }
+}
+
+/**
+ * Extends a schema by adding the properties from the new schema to the existing base schema
+ * @param {Schema} base
+ * @param {Schema} newOne
+ * @returns {Schema}
+ */
+export function extendSchema(base, newOne) {
+ /** @type {Schema} */
+ const result = Object.assign({}, base);
+ for (const key in newOne) {
+ if (result.hasOwnProperty(key)) {
+ logger.error("Extend schema got duplicate key:", key);
+ continue;
+ }
+ result[key] = newOne[key];
+ }
+ return result;
+}
diff --git a/src/js/savegame/serialization_data_types.js b/src/js/savegame/serialization_data_types.js
index 9fb53bb8..9d3b689f 100644
--- a/src/js/savegame/serialization_data_types.js
+++ b/src/js/savegame/serialization_data_types.js
@@ -1,1292 +1,1295 @@
-/* typehints:start */
-import { GameRoot } from "../game/root";
-import { BasicSerializableObject } from "./serialization";
-/* typehints:end */
-
-import { Vector } from "../core/vector";
-import { round4Digits } from "../core/utils";
-export const globalJsonSchemaDefs = {};
-
-/**
- *
- * @param {import("./serialization").Schema} schema
- */
-export function schemaToJsonSchema(schema) {
- const jsonSchema = {
- type: "object",
- additionalProperties: false,
- required: [],
- properties: {},
- };
-
- for (const key in schema) {
- const subSchema = schema[key].getAsJsonSchema();
- jsonSchema.required.push(key);
- jsonSchema.properties[key] = subSchema;
- }
-
- return jsonSchema;
-}
-
-/**
- * Helper function to create a json schema object
- * @param {any} properties
- */
-function schemaObject(properties) {
- return {
- type: "object",
- required: Object.keys(properties).slice(),
- additionalProperties: false,
- properties,
- };
-}
-
-/**
- * Base serialization data type
- */
-export class BaseDataType {
- /**
- * Serializes a given raw value
- * @param {any} value
- */
- serialize(value) {
- abstract;
- return {};
- }
-
- /**
- * Verifies a given serialized value
- * @param {any} value
- * @returns {string|void} String error code or null on success
- */
- verifySerializedValue(value) {}
-
- /**
- * Deserializes a serialized value into the target object under the given key
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- abstract;
- }
-
- /**
- * Returns the json schema
- */
- getAsJsonSchema() {
- const key = this.getCacheKey();
- const schema = this.getAsJsonSchemaUncached();
-
- if (!globalJsonSchemaDefs[key]) {
- // schema.$id = key;
- globalJsonSchemaDefs[key] = schema;
- }
-
- return {
- $ref: "#/definitions/" + key,
- };
- }
-
- /**
- * INTERNAL Should return the json schema representation
- */
- getAsJsonSchemaUncached() {
- abstract;
- }
-
- /**
- * Returns whether null values are okay
- * @returns {boolean}
- */
- allowNull() {
- return false;
- }
-
- // Helper methods
-
- /**
- * Deserializes a serialized value, but performs integrity checks before
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserializeWithVerify(value, targetObject, targetKey, root) {
- const errorCode = this.verifySerializedValue(value);
- if (errorCode) {
- return (
- "serialization verify failed: " +
- errorCode +
- " [value " +
- JSON.stringify(value).substr(0, 100) +
- "]"
- );
- }
- return this.deserialize(value, targetObject, targetKey, root);
- }
-
- /**
- * Should return a cacheable key
- */
- getCacheKey() {
- abstract;
- return "";
- }
-}
-
-export class TypeInteger extends BaseDataType {
- serialize(value) {
- assert(Number.isInteger(value), "Type integer got non integer for serialize: " + value);
- return value;
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- targetObject[targetKey] = value;
- }
-
- getAsJsonSchemaUncached() {
- return {
- type: "integer",
- };
- }
-
- verifySerializedValue(value) {
- if (!Number.isInteger(value)) {
- return "Not a valid number";
- }
- }
-
- getCacheKey() {
- return "int";
- }
-}
-
-export class TypePositiveInteger extends BaseDataType {
- serialize(value) {
- assert(Number.isInteger(value), "Type integer got non integer for serialize: " + value);
- assert(value >= 0, "value < 0: " + value);
- return value;
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- targetObject[targetKey] = value;
- }
-
- getAsJsonSchemaUncached() {
- return {
- type: "integer",
- minimum: 0,
- };
- }
-
- verifySerializedValue(value) {
- if (!Number.isInteger(value)) {
- return "Not a valid number";
- }
- if (value < 0) {
- return "Negative value for positive integer";
- }
- }
-
- getCacheKey() {
- return "uint";
- }
-}
-
-export class TypeBoolean extends BaseDataType {
- serialize(value) {
- assert(value === true || value === false, "Type bool got non bool for serialize: " + value);
- return value;
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- targetObject[targetKey] = value;
- }
-
- getAsJsonSchemaUncached() {
- return {
- type: "boolean",
- };
- }
-
- verifySerializedValue(value) {
- if (value !== true && value !== false) {
- return "Not a boolean";
- }
- }
-
- getCacheKey() {
- return "bool";
- }
-}
-
-export class TypeString extends BaseDataType {
- serialize(value) {
- assert(typeof value === "string", "Type string got non string for serialize: " + value);
- return value;
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- targetObject[targetKey] = value;
- }
- getAsJsonSchemaUncached() {
- return {
- type: "string",
- };
- }
-
- verifySerializedValue(value) {
- if (typeof value !== "string") {
- return "Not a valid string";
- }
- }
-
- getCacheKey() {
- return "string";
- }
-}
-
-export class TypeVector extends BaseDataType {
- serialize(value) {
- assert(value instanceof Vector, "Type vector got non vector for serialize: " + value);
- return {
- x: round4Digits(value.x),
- y: round4Digits(value.y),
- };
- }
-
- getAsJsonSchemaUncached() {
- return schemaObject({
- x: {
- type: "number",
- },
- y: {
- type: "number",
- },
- });
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- targetObject[targetKey] = new Vector(value.x, value.y);
- }
-
- verifySerializedValue(value) {
- if (!Number.isFinite(value.x) || !Number.isFinite(value.y)) {
- return "Not a valid vector, missing x/y or bad data type";
- }
- }
-
- getCacheKey() {
- return "vector";
- }
-}
-
-export class TypeTileVector extends BaseDataType {
- serialize(value) {
- assert(value instanceof Vector, "Type vector got non vector for serialize: " + value);
- assert(Number.isInteger(value.x) && value.x > 0, "Invalid tile x:" + value.x);
- assert(Number.isInteger(value.y) && value.y > 0, "Invalid tile x:" + value.y);
- return { x: value.x, y: value.y };
- }
-
- getAsJsonSchemaUncached() {
- return schemaObject({
- x: {
- type: "integer",
- minimum: 0,
- maximum: 256,
- },
- y: {
- type: "integer",
- minimum: 0,
- maximum: 256,
- },
- });
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- targetObject[targetKey] = new Vector(value.x, value.y);
- }
-
- verifySerializedValue(value) {
- if (!Number.isInteger(value.x) || !Number.isInteger(value.y)) {
- return "Not a valid tile vector, missing x/y or bad data type";
- }
- if (value.x < 0 || value.y < 0) {
- return "Invalid tile vector, x or y < 0";
- }
- }
-
- getCacheKey() {
- return "tilevector";
- }
-}
-
-export class TypeNumber extends BaseDataType {
- serialize(value) {
- assert(Number.isFinite(value), "Type number got non number for serialize: " + value);
- assert(!Number.isNaN(value), "Value is nan: " + value);
- return round4Digits(value);
- }
-
- getAsJsonSchemaUncached() {
- return {
- type: "number",
- };
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- targetObject[targetKey] = value;
- }
-
- verifySerializedValue(value) {
- if (!Number.isFinite(value)) {
- return "Not a valid number: " + value;
- }
- }
-
- getCacheKey() {
- return "float";
- }
-}
-
-export class TypePositiveNumber extends BaseDataType {
- serialize(value) {
- assert(Number.isFinite(value), "Type number got non number for serialize: " + value);
- assert(value >= 0, "Postitive number got negative value: " + value);
- return round4Digits(value);
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- targetObject[targetKey] = value;
- }
-
- getAsJsonSchemaUncached() {
- return {
- type: "number",
- minimum: 0,
- };
- }
-
- verifySerializedValue(value) {
- if (!Number.isFinite(value)) {
- return "Not a valid number: " + value;
- }
- if (value < 0) {
- return "Positive number got negative value: " + value;
- }
- }
-
- getCacheKey() {
- return "ufloat";
- }
-}
-
-export class TypeEnum extends BaseDataType {
- /**
- * @param {Object.} enumeration
- */
- constructor(enumeration = {}) {
- super();
- this.availableValues = Object.values(enumeration);
- }
-
- serialize(value) {
- assert(this.availableValues.indexOf(value) >= 0, "Unknown value: " + value);
- return value;
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- targetObject[targetKey] = value;
- }
-
- getAsJsonSchemaUncached() {
- return {
- type: "string",
- enum: this.availableValues,
- };
- }
-
- verifySerializedValue(value) {
- if (this.availableValues.indexOf(value) < 0) {
- return "Unknown enum value: " + value;
- }
- }
-
- getCacheKey() {
- return "enum." + this.availableValues.join(",");
- }
-}
-
-export class TypeEntity extends BaseDataType {
- serialize(value) {
- // assert(value instanceof Entity, "Not a valid entity ref: " + value);
- assert(value.uid, "Entity has no uid yet");
- assert(!value.destroyed, "Entity already destroyed");
- assert(!value.queuedForDestroy, "Entity queued for destroy");
-
- return value.uid;
- }
-
- getAsJsonSchemaUncached() {
- return {
- type: "integer",
- minimum: 0,
- };
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- const entity = root.entityMgr.findByUid(value);
- if (!entity) {
- return "Entity not found by uid: " + value;
- }
- targetObject[targetKey] = entity;
- }
-
- verifySerializedValue(value) {
- if (!Number.isFinite(value)) {
- return "Not a valid uuid: " + value;
- }
- }
-
- getCacheKey() {
- return "entity";
- }
-}
-
-export class TypeEntityWeakref extends BaseDataType {
- serialize(value) {
- if (value === null) {
- return null;
- }
-
- // assert(value instanceof Entity, "Not a valid entity ref (weak): " + value);
- assert(value.uid, "Entity has no uid yet");
- if (value.destroyed || value.queuedForDestroy) {
- return null;
- }
- return value.uid;
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- if (value === null) {
- targetObject[targetKey] = null;
- return;
- }
- const entity = root.entityMgr.findByUid(value, false);
- targetObject[targetKey] = entity;
- }
-
- getAsJsonSchemaUncached() {
- return {
- type: ["null", "integer"],
- minimum: 0,
- };
- }
-
- allowNull() {
- return true;
- }
-
- verifySerializedValue(value) {
- if (value !== null && !Number.isFinite(value)) {
- return "Not a valid uuid: " + value;
- }
- }
-
- getCacheKey() {
- return "entity-weakref";
- }
-}
-
-export class TypeClass extends BaseDataType {
- /**
- *
- * @param {FactoryTemplate<*>} registry
- * @param {(GameRoot, object) => object} customResolver
- */
- constructor(registry, customResolver = null) {
- super();
- this.registry = registry;
- this.customResolver = customResolver;
- }
-
- serialize(value) {
- assert(typeof value === "object", "Not a class instance: " + value);
- return {
- $: value.constructor.getId(),
- data: value.serialize(),
- };
- }
-
- getAsJsonSchemaUncached() {
- const options = [];
- const entries = this.registry.getEntries();
- for (let i = 0; i < entries.length; ++i) {
- const entry = entries[i];
-
- options.push(
- schemaObject({
- $: {
- type: "string",
- // @ts-ignore
- enum: [entry.getId()],
- },
- // @ts-ignore
- data: schemaToJsonSchema(entry.getCachedSchema()),
- })
- );
- }
-
- return { oneOf: options };
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- let instance;
-
- if (this.customResolver) {
- instance = this.customResolver(root, value);
- if (!instance) {
- return "Failed to call custom resolver";
- }
- } else {
- const instanceClass = this.registry.findById(value.$);
- if (!instanceClass || !instanceClass.prototype) {
- return "Invalid class id (runtime-err): " + value.$ + "->" + instanceClass;
- }
- instance = Object.create(instanceClass.prototype);
- const errorState = instance.deserialize(value.data);
- if (errorState) {
- return errorState;
- }
- }
- targetObject[targetKey] = instance;
- }
-
- verifySerializedValue(value) {
- if (!value) {
- return "Got null data";
- }
-
- if (!this.registry.hasId(value.$)) {
- return "Invalid class id: " + value.$ + " (factory is " + this.registry.getId() + ")";
- }
- }
-
- getCacheKey() {
- return "class." + this.registry.getId();
- }
-}
-
-export class TypeClassData extends BaseDataType {
- /**
- *
- * @param {FactoryTemplate<*>} registry
- */
- constructor(registry) {
- super();
- this.registry = registry;
- }
-
- serialize(value) {
- assert(typeof value === "object", "Not a class instance: " + value);
- return value.serialize();
- }
-
- getAsJsonSchemaUncached() {
- const options = [];
- const entries = this.registry.getEntries();
- for (let i = 0; i < entries.length; ++i) {
- const entry = entries[i];
- options.push(
- schemaToJsonSchema(/** @type {typeof BasicSerializableObject} */ (entry).getCachedSchema())
- );
- }
- return { oneOf: options };
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- assert(false, "can not deserialize class data of type " + this.registry.getId());
- }
-
- verifySerializedValue(value) {
- if (!value) {
- return "Got null data";
- }
- }
-
- getCacheKey() {
- return "class." + this.registry.getId();
- }
-}
-
-export class TypeClassFromMetaclass extends BaseDataType {
- /**
- *
- * @param {typeof BasicSerializableObject} classHandle
- * @param {SingletonFactoryTemplate<*>} registry
- */
- constructor(classHandle, registry) {
- super();
- this.registry = registry;
- this.classHandle = classHandle;
- }
-
- serialize(value) {
- assert(typeof value === "object", "Not a class instance: " + value);
- return {
- $: value.getMetaclass().getId(),
- data: value.serialize(),
- };
- }
-
- getAsJsonSchemaUncached() {
- // const options = [];
- const ids = this.registry.getAllIds();
-
- return {
- $: {
- type: "string",
- enum: ids,
- },
- data: schemaToJsonSchema(this.classHandle.getCachedSchema()),
- };
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- const metaClassInstance = this.registry.findById(value.$);
- if (!metaClassInstance || !metaClassInstance.prototype) {
- return "Invalid meta class id (runtime-err): " + value.$ + "->" + metaClassInstance;
- }
-
- const instanceClass = metaClassInstance.getInstanceClass();
- const instance = Object.create(instanceClass.prototype);
- const errorState = instance.deserialize(value.data);
- if (errorState) {
- return errorState;
- }
- targetObject[targetKey] = instance;
- }
-
- verifySerializedValue(value) {
- if (!value) {
- return "Got null data";
- }
-
- if (!this.registry.hasId(value.$)) {
- return "Invalid class id: " + value.$ + " (factory is " + this.registry.getId() + ")";
- }
- }
-
- getCacheKey() {
- return "classofmetaclass." + this.registry.getId();
- }
-}
-
-export class TypeMetaClass extends BaseDataType {
- /**
- *
- * @param {SingletonFactoryTemplate<*>} registry
- */
- constructor(registry) {
- super();
- this.registry = registry;
- }
-
- serialize(value) {
- return value.getId();
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- const instanceClass = this.registry.findById(value);
- if (!instanceClass) {
- return "Invalid class id (runtime-err): " + value;
- }
- targetObject[targetKey] = instanceClass;
- }
-
- getAsJsonSchemaUncached() {
- return {
- type: "string",
- enum: this.registry.getAllIds(),
- };
- }
-
- verifySerializedValue(value) {
- if (!value) {
- return "Got null data";
- }
-
- if (typeof value !== "string") {
- return "Got non string data";
- }
-
- if (!this.registry.hasId(value)) {
- return "Invalid class id: " + value + " (factory is " + this.registry.getId() + ")";
- }
- }
-
- getCacheKey() {
- return "metaclass." + this.registry.getId();
- }
-}
-
-export class TypeArray extends BaseDataType {
- /**
- * @param {BaseDataType} innerType
- */
- constructor(innerType) {
- super();
- this.innerType = innerType;
- }
-
- serialize(value) {
- assert(Array.isArray(value), "Not an array");
- const result = new Array(value.length);
- for (let i = 0; i < value.length; ++i) {
- result[i] = this.innerType.serialize(value[i]);
- }
- return result;
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- let destination = targetObject[targetKey];
- if (!destination) {
- targetObject[targetKey] = destination = new Array(value.length);
- }
-
- for (let i = 0; i < value.length; ++i) {
- const errorStatus = this.innerType.deserializeWithVerify(value[i], destination, i, root);
- if (errorStatus) {
- return errorStatus;
- }
- }
- }
-
- getAsJsonSchemaUncached() {
- return {
- type: "array",
- items: this.innerType.getAsJsonSchema(),
- };
- }
-
- verifySerializedValue(value) {
- if (!Array.isArray(value)) {
- return "Not an array: " + value;
- }
- }
-
- getCacheKey() {
- return "array." + this.innerType.getCacheKey();
- }
-}
-
-export class TypeFixedClass extends BaseDataType {
- /**
- *
- * @param {typeof BasicSerializableObject} baseclass
- */
- constructor(baseclass) {
- super();
- this.baseclass = baseclass;
- }
-
- serialize(value) {
- assert(value instanceof this.baseclass, "Not a valid class instance");
- return value.serialize();
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- const instance = Object.create(this.baseclass.prototype);
- const errorState = instance.deserialize(value);
- if (errorState) {
- return "Failed to deserialize class: " + errorState;
- }
- targetObject[targetKey] = instance;
- }
-
- getAsJsonSchemaUncached() {
- this.baseclass.getSchema();
- this.baseclass.getCachedSchema();
- return schemaToJsonSchema(this.baseclass.getCachedSchema());
- }
-
- verifySerializedValue(value) {
- if (!value) {
- return "Got null data";
- }
- }
-
- getCacheKey() {
- return "fixedclass." + this.baseclass.getId();
- }
-}
-
-export class TypeKeyValueMap extends BaseDataType {
- /**
- * @param {BaseDataType} valueType
- * @param {boolean=} includeEmptyValues
- */
- constructor(valueType, includeEmptyValues = true) {
- super();
- this.valueType = valueType;
- this.includeEmptyValues = includeEmptyValues;
- }
-
- serialize(value) {
- assert(typeof value === "object", "not an object");
- let result = {};
- for (const key in value) {
- const serialized = this.valueType.serialize(value[key]);
- if (!this.includeEmptyValues && typeof serialized === "object") {
- if (
- serialized.$ &&
- typeof serialized.data === "object" &&
- Object.keys(serialized.data).length === 0
- ) {
- continue;
- } else if (Object.keys(serialized).length === 0) {
- continue;
- }
- }
-
- result[key] = serialized;
- }
- return result;
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- let result = {};
- for (const key in value) {
- const errorCode = this.valueType.deserializeWithVerify(value[key], result, key, root);
- if (errorCode) {
- return errorCode;
- }
- }
- targetObject[targetKey] = result;
- }
-
- getAsJsonSchemaUncached() {
- return {
- type: "object",
- additionalProperties: this.valueType.getAsJsonSchema(),
- };
- }
-
- verifySerializedValue(value) {
- if (typeof value !== "object") {
- return "KV map is not an object";
- }
- }
-
- getCacheKey() {
- return "kvmap." + this.valueType.getCacheKey();
- }
-}
-
-export class TypeClassId extends BaseDataType {
- /**
- * @param {FactoryTemplate<*>|SingletonFactoryTemplate<*>} registry
- */
- constructor(registry) {
- super();
- this.registry = registry;
- }
-
- serialize(value) {
- assert(typeof value === "string", "Not a valid string");
- assert(this.registry.hasId(value), "Id " + value + " not found in registry");
- return value;
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- targetObject[targetKey] = value;
- }
-
- getAsJsonSchemaUncached() {
- return {
- type: "string",
- enum: this.registry.getAllIds(),
- };
- }
-
- verifySerializedValue(value) {
- if (typeof value !== "string") {
- return "Not a valid registry id key: " + value;
- }
- if (!this.registry.hasId(value)) {
- return "Id " + value + " not known to registry";
- }
- }
-
- getCacheKey() {
- return "classid." + this.registry.getId();
- }
-}
-
-export class TypePair extends BaseDataType {
- /**
- * @param {BaseDataType} type1
- * @param {BaseDataType} type2
- */
- constructor(type1, type2) {
- super();
- assert(type1 && type1 instanceof BaseDataType, "bad first type given for pair");
- assert(type2 && type2 instanceof BaseDataType, "bad second type given for pair");
- this.type1 = type1;
- this.type2 = type2;
- }
-
- serialize(value) {
- assert(Array.isArray(value), "pair: not an array");
- assert(value.length === 2, "pair: length != 2");
- return [this.type1.serialize(value[0]), this.type2.serialize(value[1])];
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- const result = [undefined, undefined];
-
- let errorCode = this.type1.deserialize(value[0], result, 0, root);
- if (errorCode) {
- return errorCode;
- }
- errorCode = this.type2.deserialize(value[1], result, 1, root);
- if (errorCode) {
- return errorCode;
- }
-
- targetObject[targetKey] = result;
- }
-
- getAsJsonSchemaUncached() {
- return {
- type: "array",
- minLength: 2,
- maxLength: 2,
- items: [this.type1.getAsJsonSchema(), this.type2.getAsJsonSchema()],
- };
- }
-
- verifySerializedValue(value) {
- if (!Array.isArray(value)) {
- return "Pair is not an array";
- }
- if (value.length !== 2) {
- return "Pair length != 2";
- }
- let errorCode = this.type1.verifySerializedValue(value[0]);
- if (errorCode) {
- return errorCode;
- }
- errorCode = this.type2.verifySerializedValue(value[1]);
- if (errorCode) {
- return errorCode;
- }
- }
-
- getCacheKey() {
- return "pair.(" + this.type1.getCacheKey() + "," + this.type2.getCacheKey + ")";
- }
-}
-
-export class TypeNullable extends BaseDataType {
- /**
- * @param {BaseDataType} wrapped
- */
- constructor(wrapped) {
- super();
- this.wrapped = wrapped;
- }
-
- serialize(value) {
- if (value === null || value === undefined) {
- return null;
- }
- return this.wrapped.serialize(value);
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- if (value === null || value === undefined) {
- targetObject[targetKey] = null;
- return;
- }
- return this.wrapped.deserialize(value, targetObject, targetKey, root);
- }
-
- verifySerializedValue(value) {
- if (value === null) {
- return;
- }
- return this.wrapped.verifySerializedValue(value);
- }
-
- getAsJsonSchemaUncached() {
- return {
- oneOf: [
- {
- type: "null",
- },
- this.wrapped.getAsJsonSchema(),
- ],
- };
- }
-
- allowNull() {
- return true;
- }
-
- getCacheKey() {
- return "nullable." + this.wrapped.getCacheKey();
- }
-}
-
-export class TypeStructuredObject extends BaseDataType {
- /**
- * @param {Object.} descriptor
- */
- constructor(descriptor) {
- super();
- this.descriptor = descriptor;
- }
-
- serialize(value) {
- assert(typeof value === "object", "not an object");
- let result = {};
- for (const key in this.descriptor) {
- // assert(value.hasOwnProperty(key), "Serialization: Object does not have", key, "property!");
- result[key] = this.descriptor[key].serialize(value[key]);
- }
- return result;
- }
-
- /**
- * @see BaseDataType.deserialize
- * @param {any} value
- * @param {GameRoot} root
- * @param {object} targetObject
- * @param {string|number} targetKey
- * @returns {string|void} String error code or null on success
- */
- deserialize(value, targetObject, targetKey, root) {
- let target = targetObject[targetKey];
- if (!target) {
- targetObject[targetKey] = target = {};
- }
-
- for (const key in value) {
- const valueType = this.descriptor[key];
- const errorCode = valueType.deserializeWithVerify(value[key], target, key, root);
- if (errorCode) {
- return errorCode;
- }
- }
- }
-
- getAsJsonSchemaUncached() {
- let properties = {};
- for (const key in this.descriptor) {
- properties[key] = this.descriptor[key].getAsJsonSchema();
- }
-
- return {
- type: "object",
- required: Object.keys(this.descriptor),
- properties,
- };
- }
-
- verifySerializedValue(value) {
- if (typeof value !== "object") {
- return "structured object is not an object";
- }
- for (const key in this.descriptor) {
- if (!value.hasOwnProperty(key)) {
- return "structured object is missing key " + key;
- }
- const subError = this.descriptor[key].verifySerializedValue(value[key]);
- if (subError) {
- return "structured object::" + subError;
- }
- }
- }
-
- getCacheKey() {
- let props = [];
- for (const key in this.descriptor) {
- props.push(key + "=" + this.descriptor[key].getCacheKey());
- }
- return "structured[" + props.join(",") + "]";
- }
-}
+/* typehints:start */
+import { GameRoot } from "../game/root";
+import { BasicSerializableObject } from "./serialization";
+/* typehints:end */
+
+import { Vector } from "../core/vector";
+import { round4Digits } from "../core/utils";
+export const globalJsonSchemaDefs = {};
+
+/**
+ *
+ * @param {import("./serialization").Schema} schema
+ */
+export function schemaToJsonSchema(schema) {
+ const jsonSchema = {
+ type: "object",
+ additionalProperties: false,
+ required: [],
+ properties: {},
+ };
+
+ for (const key in schema) {
+ const subSchema = schema[key].getAsJsonSchema();
+ jsonSchema.required.push(key);
+ jsonSchema.properties[key] = subSchema;
+ }
+
+ return jsonSchema;
+}
+
+/**
+ * Helper function to create a json schema object
+ * @param {any} properties
+ */
+function schemaObject(properties) {
+ return {
+ type: "object",
+ required: Object.keys(properties).slice(),
+ additionalProperties: false,
+ properties,
+ };
+}
+
+/**
+ * Base serialization data type
+ */
+export class BaseDataType {
+ /**
+ * Serializes a given raw value
+ * @param {any} value
+ */
+ serialize(value) {
+ abstract;
+ return {};
+ }
+
+ /**
+ * Verifies a given serialized value
+ * @param {any} value
+ * @returns {string|void} String error code or null on success
+ */
+ verifySerializedValue(value) {}
+
+ /**
+ * Deserializes a serialized value into the target object under the given key
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ abstract;
+ }
+
+ /**
+ * Returns the json schema
+ */
+ getAsJsonSchema() {
+ const key = this.getCacheKey();
+ const schema = this.getAsJsonSchemaUncached();
+
+ if (!globalJsonSchemaDefs[key]) {
+ // schema.$id = key;
+ globalJsonSchemaDefs[key] = schema;
+ }
+
+ return {
+ $ref: "#/definitions/" + key,
+ };
+ }
+
+ /**
+ * INTERNAL Should return the json schema representation
+ */
+ getAsJsonSchemaUncached() {
+ abstract;
+ }
+
+ /**
+ * Returns whether null values are okay
+ * @returns {boolean}
+ */
+ allowNull() {
+ return false;
+ }
+
+ // Helper methods
+
+ /**
+ * Deserializes a serialized value, but performs integrity checks before
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserializeWithVerify(value, targetObject, targetKey, root) {
+ const errorCode = this.verifySerializedValue(value);
+ if (errorCode) {
+ return (
+ "serialization verify failed: " +
+ errorCode +
+ " [value " +
+ (JSON.stringify(value) || "").substr(0, 100) +
+ "]"
+ );
+ }
+ return this.deserialize(value, targetObject, targetKey, root);
+ }
+
+ /**
+ * Should return a cacheable key
+ */
+ getCacheKey() {
+ abstract;
+ return "";
+ }
+}
+
+export class TypeInteger extends BaseDataType {
+ serialize(value) {
+ assert(Number.isInteger(value), "Type integer got non integer for serialize: " + value);
+ return value;
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ targetObject[targetKey] = value;
+ }
+
+ getAsJsonSchemaUncached() {
+ return {
+ type: "integer",
+ };
+ }
+
+ verifySerializedValue(value) {
+ if (!Number.isInteger(value)) {
+ return "Not a valid number";
+ }
+ }
+
+ getCacheKey() {
+ return "int";
+ }
+}
+
+export class TypePositiveInteger extends BaseDataType {
+ serialize(value) {
+ assert(Number.isInteger(value), "Type integer got non integer for serialize: " + value);
+ assert(value >= 0, "value < 0: " + value);
+ return value;
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ targetObject[targetKey] = value;
+ }
+
+ getAsJsonSchemaUncached() {
+ return {
+ type: "integer",
+ minimum: 0,
+ };
+ }
+
+ verifySerializedValue(value) {
+ if (!Number.isInteger(value)) {
+ return "Not a valid number";
+ }
+ if (value < 0) {
+ return "Negative value for positive integer";
+ }
+ }
+
+ getCacheKey() {
+ return "uint";
+ }
+}
+
+export class TypeBoolean extends BaseDataType {
+ serialize(value) {
+ assert(value === true || value === false, "Type bool got non bool for serialize: " + value);
+ return value;
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ targetObject[targetKey] = value;
+ }
+
+ getAsJsonSchemaUncached() {
+ return {
+ type: "boolean",
+ };
+ }
+
+ verifySerializedValue(value) {
+ if (value !== true && value !== false) {
+ return "Not a boolean";
+ }
+ }
+
+ getCacheKey() {
+ return "bool";
+ }
+}
+
+export class TypeString extends BaseDataType {
+ serialize(value) {
+ assert(typeof value === "string", "Type string got non string for serialize: " + value);
+ return value;
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ targetObject[targetKey] = value;
+ }
+ getAsJsonSchemaUncached() {
+ return {
+ type: "string",
+ };
+ }
+
+ verifySerializedValue(value) {
+ if (typeof value !== "string") {
+ return "Not a valid string";
+ }
+ }
+
+ getCacheKey() {
+ return "string";
+ }
+}
+
+export class TypeVector extends BaseDataType {
+ serialize(value) {
+ assert(value instanceof Vector, "Type vector got non vector for serialize: " + value);
+ return {
+ x: round4Digits(value.x),
+ y: round4Digits(value.y),
+ };
+ }
+
+ getAsJsonSchemaUncached() {
+ return schemaObject({
+ x: {
+ type: "number",
+ },
+ y: {
+ type: "number",
+ },
+ });
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ targetObject[targetKey] = new Vector(value.x, value.y);
+ }
+
+ verifySerializedValue(value) {
+ if (!Number.isFinite(value.x) || !Number.isFinite(value.y)) {
+ return "Not a valid vector, missing x/y or bad data type";
+ }
+ }
+
+ getCacheKey() {
+ return "vector";
+ }
+}
+
+export class TypeTileVector extends BaseDataType {
+ serialize(value) {
+ assert(value instanceof Vector, "Type vector got non vector for serialize: " + value);
+ assert(Number.isInteger(value.x) && value.x > 0, "Invalid tile x:" + value.x);
+ assert(Number.isInteger(value.y) && value.y > 0, "Invalid tile x:" + value.y);
+ return { x: value.x, y: value.y };
+ }
+
+ getAsJsonSchemaUncached() {
+ return schemaObject({
+ x: {
+ type: "integer",
+ minimum: 0,
+ maximum: 256,
+ },
+ y: {
+ type: "integer",
+ minimum: 0,
+ maximum: 256,
+ },
+ });
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ targetObject[targetKey] = new Vector(value.x, value.y);
+ }
+
+ verifySerializedValue(value) {
+ if (!Number.isInteger(value.x) || !Number.isInteger(value.y)) {
+ return "Not a valid tile vector, missing x/y or bad data type";
+ }
+ if (value.x < 0 || value.y < 0) {
+ return "Invalid tile vector, x or y < 0";
+ }
+ }
+
+ getCacheKey() {
+ return "tilevector";
+ }
+}
+
+export class TypeNumber extends BaseDataType {
+ serialize(value) {
+ assert(Number.isFinite(value), "Type number got non number for serialize: " + value);
+ assert(!Number.isNaN(value), "Value is nan: " + value);
+ return round4Digits(value);
+ }
+
+ getAsJsonSchemaUncached() {
+ return {
+ type: "number",
+ };
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ targetObject[targetKey] = value;
+ }
+
+ verifySerializedValue(value) {
+ if (!Number.isFinite(value)) {
+ return "Not a valid number: " + value;
+ }
+ }
+
+ getCacheKey() {
+ return "float";
+ }
+}
+
+export class TypePositiveNumber extends BaseDataType {
+ serialize(value) {
+ assert(Number.isFinite(value), "Type number got non number for serialize: " + value);
+ assert(value >= 0, "Postitive number got negative value: " + value);
+ return round4Digits(value);
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ targetObject[targetKey] = value;
+ }
+
+ getAsJsonSchemaUncached() {
+ return {
+ type: "number",
+ minimum: 0,
+ };
+ }
+
+ verifySerializedValue(value) {
+ if (!Number.isFinite(value)) {
+ return "Not a valid number: " + value;
+ }
+ if (value < 0) {
+ return "Positive number got negative value: " + value;
+ }
+ }
+
+ getCacheKey() {
+ return "ufloat";
+ }
+}
+
+export class TypeEnum extends BaseDataType {
+ /**
+ * @param {Object.} enumeration
+ */
+ constructor(enumeration = {}) {
+ super();
+ this.availableValues = Object.values(enumeration);
+ }
+
+ serialize(value) {
+ assert(this.availableValues.indexOf(value) >= 0, "Unknown value: " + value);
+ return value;
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ targetObject[targetKey] = value;
+ }
+
+ getAsJsonSchemaUncached() {
+ return {
+ type: "string",
+ enum: this.availableValues,
+ };
+ }
+
+ verifySerializedValue(value) {
+ if (this.availableValues.indexOf(value) < 0) {
+ return "Unknown enum value: " + value;
+ }
+ }
+
+ getCacheKey() {
+ return "enum." + this.availableValues.join(",");
+ }
+}
+
+export class TypeEntity extends BaseDataType {
+ serialize(value) {
+ // assert(value instanceof Entity, "Not a valid entity ref: " + value);
+ assert(value.uid, "Entity has no uid yet");
+ assert(!value.destroyed, "Entity already destroyed");
+ assert(!value.queuedForDestroy, "Entity queued for destroy");
+
+ return value.uid;
+ }
+
+ getAsJsonSchemaUncached() {
+ return {
+ type: "integer",
+ minimum: 0,
+ };
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ const entity = root.entityMgr.findByUid(value);
+ if (!entity) {
+ return "Entity not found by uid: " + value;
+ }
+ targetObject[targetKey] = entity;
+ }
+
+ verifySerializedValue(value) {
+ if (!Number.isFinite(value)) {
+ return "Not a valid uuid: " + value;
+ }
+ }
+
+ getCacheKey() {
+ return "entity";
+ }
+}
+
+export class TypeEntityWeakref extends BaseDataType {
+ serialize(value) {
+ if (value === null) {
+ return null;
+ }
+
+ // assert(value instanceof Entity, "Not a valid entity ref (weak): " + value);
+ assert(value.uid, "Entity has no uid yet");
+ if (value.destroyed || value.queuedForDestroy) {
+ return null;
+ }
+ return value.uid;
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ if (value === null) {
+ targetObject[targetKey] = null;
+ return;
+ }
+ const entity = root.entityMgr.findByUid(value, false);
+ targetObject[targetKey] = entity;
+ }
+
+ getAsJsonSchemaUncached() {
+ return {
+ type: ["null", "integer"],
+ minimum: 0,
+ };
+ }
+
+ allowNull() {
+ return true;
+ }
+
+ verifySerializedValue(value) {
+ if (value !== null && !Number.isFinite(value)) {
+ return "Not a valid uuid: " + value;
+ }
+ }
+
+ getCacheKey() {
+ return "entity-weakref";
+ }
+}
+
+export class TypeClass extends BaseDataType {
+ /**
+ *
+ * @param {FactoryTemplate<*>} registry
+ * @param {(GameRoot, object) => object} customResolver
+ */
+ constructor(registry, customResolver = null) {
+ super();
+ this.registry = registry;
+ this.customResolver = customResolver;
+ }
+
+ serialize(value) {
+ assert(typeof value === "object", "Not a class instance: " + value);
+ return {
+ $: value.constructor.getId(),
+ data: value.serialize(),
+ };
+ }
+
+ getAsJsonSchemaUncached() {
+ const options = [];
+ const entries = this.registry.getEntries();
+ for (let i = 0; i < entries.length; ++i) {
+ const entry = entries[i];
+
+ options.push(
+ schemaObject({
+ $: {
+ type: "string",
+ // @ts-ignore
+ enum: [entry.getId()],
+ },
+ // @ts-ignore
+ data: schemaToJsonSchema(entry.getCachedSchema()),
+ })
+ );
+ }
+
+ return { oneOf: options };
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ let instance;
+
+ if (this.customResolver) {
+ instance = this.customResolver(root, value);
+ if (!instance) {
+ return "Failed to call custom resolver";
+ }
+ } else {
+ const instanceClass = this.registry.findById(value.$);
+ if (!instanceClass || !instanceClass.prototype) {
+ return "Invalid class id (runtime-err): " + value.$ + "->" + instanceClass;
+ }
+ instance = Object.create(instanceClass.prototype);
+ const errorState = instance.deserialize(value.data);
+ if (errorState) {
+ return errorState;
+ }
+ }
+ targetObject[targetKey] = instance;
+ }
+
+ verifySerializedValue(value) {
+ if (!value) {
+ return "Got null data";
+ }
+
+ if (!this.registry.hasId(value.$)) {
+ return "Invalid class id: " + value.$ + " (factory is " + this.registry.getId() + ")";
+ }
+ }
+
+ getCacheKey() {
+ return "class." + this.registry.getId();
+ }
+}
+
+export class TypeClassData extends BaseDataType {
+ /**
+ *
+ * @param {FactoryTemplate<*>} registry
+ */
+ constructor(registry) {
+ super();
+ this.registry = registry;
+ }
+
+ serialize(value) {
+ assert(typeof value === "object", "Not a class instance: " + value);
+ return value.serialize();
+ }
+
+ getAsJsonSchemaUncached() {
+ const options = [];
+ const entries = this.registry.getEntries();
+ for (let i = 0; i < entries.length; ++i) {
+ const entry = entries[i];
+ options.push(
+ schemaToJsonSchema(/** @type {typeof BasicSerializableObject} */ (entry).getCachedSchema())
+ );
+ }
+ return { oneOf: options };
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ assert(false, "can not deserialize class data of type " + this.registry.getId());
+ }
+
+ verifySerializedValue(value) {
+ if (!value) {
+ return "Got null data";
+ }
+ }
+
+ getCacheKey() {
+ return "class." + this.registry.getId();
+ }
+}
+
+export class TypeClassFromMetaclass extends BaseDataType {
+ /**
+ *
+ * @param {typeof BasicSerializableObject} classHandle
+ * @param {SingletonFactoryTemplate<*>} registry
+ */
+ constructor(classHandle, registry) {
+ super();
+ this.registry = registry;
+ this.classHandle = classHandle;
+ }
+
+ serialize(value) {
+ assert(typeof value === "object", "Not a class instance: " + value);
+ return {
+ $: value.getMetaclass().getId(),
+ data: value.serialize(),
+ };
+ }
+
+ getAsJsonSchemaUncached() {
+ // const options = [];
+ const ids = this.registry.getAllIds();
+
+ return {
+ $: {
+ type: "string",
+ enum: ids,
+ },
+ data: schemaToJsonSchema(this.classHandle.getCachedSchema()),
+ };
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ const metaClassInstance = this.registry.findById(value.$);
+ if (!metaClassInstance || !metaClassInstance.prototype) {
+ return "Invalid meta class id (runtime-err): " + value.$ + "->" + metaClassInstance;
+ }
+
+ const instanceClass = metaClassInstance.getInstanceClass();
+ const instance = Object.create(instanceClass.prototype);
+ const errorState = instance.deserialize(value.data);
+ if (errorState) {
+ return errorState;
+ }
+ targetObject[targetKey] = instance;
+ }
+
+ verifySerializedValue(value) {
+ if (!value) {
+ return "Got null data";
+ }
+
+ if (!this.registry.hasId(value.$)) {
+ return "Invalid class id: " + value.$ + " (factory is " + this.registry.getId() + ")";
+ }
+ }
+
+ getCacheKey() {
+ return "classofmetaclass." + this.registry.getId();
+ }
+}
+
+export class TypeMetaClass extends BaseDataType {
+ /**
+ *
+ * @param {SingletonFactoryTemplate<*>} registry
+ */
+ constructor(registry) {
+ super();
+ this.registry = registry;
+ }
+
+ serialize(value) {
+ return value.getId();
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ const instanceClass = this.registry.findById(value);
+ if (!instanceClass) {
+ return "Invalid class id (runtime-err): " + value;
+ }
+ targetObject[targetKey] = instanceClass;
+ }
+
+ getAsJsonSchemaUncached() {
+ return {
+ type: "string",
+ enum: this.registry.getAllIds(),
+ };
+ }
+
+ verifySerializedValue(value) {
+ if (!value) {
+ return "Got null data";
+ }
+
+ if (typeof value !== "string") {
+ return "Got non string data";
+ }
+
+ if (!this.registry.hasId(value)) {
+ return "Invalid class id: " + value + " (factory is " + this.registry.getId() + ")";
+ }
+ }
+
+ getCacheKey() {
+ return "metaclass." + this.registry.getId();
+ }
+}
+
+export class TypeArray extends BaseDataType {
+ /**
+ * @param {BaseDataType} innerType
+ */
+ constructor(innerType, fixedSize = false) {
+ super();
+ this.fixedSize = fixedSize;
+ this.innerType = innerType;
+ }
+
+ serialize(value) {
+ assert(Array.isArray(value), "Not an array");
+ const result = new Array(value.length);
+ for (let i = 0; i < value.length; ++i) {
+ result[i] = this.innerType.serialize(value[i]);
+ }
+ return result;
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ let destination = targetObject[targetKey];
+ if (!destination) {
+ targetObject[targetKey] = destination = new Array(value.length);
+ }
+
+ const size = this.fixedSize ? Math.min(value.length, destination.length) : value.length;
+
+ for (let i = 0; i < size; ++i) {
+ const errorStatus = this.innerType.deserializeWithVerify(value[i], destination, i, root);
+ if (errorStatus) {
+ return errorStatus;
+ }
+ }
+ }
+
+ getAsJsonSchemaUncached() {
+ return {
+ type: "array",
+ items: this.innerType.getAsJsonSchema(),
+ };
+ }
+
+ verifySerializedValue(value) {
+ if (!Array.isArray(value)) {
+ return "Not an array: " + value;
+ }
+ }
+
+ getCacheKey() {
+ return "array." + this.innerType.getCacheKey();
+ }
+}
+
+export class TypeFixedClass extends BaseDataType {
+ /**
+ *
+ * @param {typeof BasicSerializableObject} baseclass
+ */
+ constructor(baseclass) {
+ super();
+ this.baseclass = baseclass;
+ }
+
+ serialize(value) {
+ assert(value instanceof this.baseclass, "Not a valid class instance");
+ return value.serialize();
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ const instance = Object.create(this.baseclass.prototype);
+ const errorState = instance.deserialize(value);
+ if (errorState) {
+ return "Failed to deserialize class: " + errorState;
+ }
+ targetObject[targetKey] = instance;
+ }
+
+ getAsJsonSchemaUncached() {
+ this.baseclass.getSchema();
+ this.baseclass.getCachedSchema();
+ return schemaToJsonSchema(this.baseclass.getCachedSchema());
+ }
+
+ verifySerializedValue(value) {
+ if (!value) {
+ return "Got null data";
+ }
+ }
+
+ getCacheKey() {
+ return "fixedclass." + this.baseclass.getId();
+ }
+}
+
+export class TypeKeyValueMap extends BaseDataType {
+ /**
+ * @param {BaseDataType} valueType
+ * @param {boolean=} includeEmptyValues
+ */
+ constructor(valueType, includeEmptyValues = true) {
+ super();
+ this.valueType = valueType;
+ this.includeEmptyValues = includeEmptyValues;
+ }
+
+ serialize(value) {
+ assert(typeof value === "object", "not an object");
+ let result = {};
+ for (const key in value) {
+ const serialized = this.valueType.serialize(value[key]);
+ if (!this.includeEmptyValues && typeof serialized === "object") {
+ if (
+ serialized.$ &&
+ typeof serialized.data === "object" &&
+ Object.keys(serialized.data).length === 0
+ ) {
+ continue;
+ } else if (Object.keys(serialized).length === 0) {
+ continue;
+ }
+ }
+
+ result[key] = serialized;
+ }
+ return result;
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ let result = {};
+ for (const key in value) {
+ const errorCode = this.valueType.deserializeWithVerify(value[key], result, key, root);
+ if (errorCode) {
+ return errorCode;
+ }
+ }
+ targetObject[targetKey] = result;
+ }
+
+ getAsJsonSchemaUncached() {
+ return {
+ type: "object",
+ additionalProperties: this.valueType.getAsJsonSchema(),
+ };
+ }
+
+ verifySerializedValue(value) {
+ if (typeof value !== "object") {
+ return "KV map is not an object";
+ }
+ }
+
+ getCacheKey() {
+ return "kvmap." + this.valueType.getCacheKey();
+ }
+}
+
+export class TypeClassId extends BaseDataType {
+ /**
+ * @param {FactoryTemplate<*>|SingletonFactoryTemplate<*>} registry
+ */
+ constructor(registry) {
+ super();
+ this.registry = registry;
+ }
+
+ serialize(value) {
+ assert(typeof value === "string", "Not a valid string");
+ assert(this.registry.hasId(value), "Id " + value + " not found in registry");
+ return value;
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ targetObject[targetKey] = value;
+ }
+
+ getAsJsonSchemaUncached() {
+ return {
+ type: "string",
+ enum: this.registry.getAllIds(),
+ };
+ }
+
+ verifySerializedValue(value) {
+ if (typeof value !== "string") {
+ return "Not a valid registry id key: " + value;
+ }
+ if (!this.registry.hasId(value)) {
+ return "Id " + value + " not known to registry";
+ }
+ }
+
+ getCacheKey() {
+ return "classid." + this.registry.getId();
+ }
+}
+
+export class TypePair extends BaseDataType {
+ /**
+ * @param {BaseDataType} type1
+ * @param {BaseDataType} type2
+ */
+ constructor(type1, type2) {
+ super();
+ assert(type1 && type1 instanceof BaseDataType, "bad first type given for pair");
+ assert(type2 && type2 instanceof BaseDataType, "bad second type given for pair");
+ this.type1 = type1;
+ this.type2 = type2;
+ }
+
+ serialize(value) {
+ assert(Array.isArray(value), "pair: not an array");
+ assert(value.length === 2, "pair: length != 2");
+ return [this.type1.serialize(value[0]), this.type2.serialize(value[1])];
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ const result = [undefined, undefined];
+
+ let errorCode = this.type1.deserialize(value[0], result, 0, root);
+ if (errorCode) {
+ return errorCode;
+ }
+ errorCode = this.type2.deserialize(value[1], result, 1, root);
+ if (errorCode) {
+ return errorCode;
+ }
+
+ targetObject[targetKey] = result;
+ }
+
+ getAsJsonSchemaUncached() {
+ return {
+ type: "array",
+ minLength: 2,
+ maxLength: 2,
+ items: [this.type1.getAsJsonSchema(), this.type2.getAsJsonSchema()],
+ };
+ }
+
+ verifySerializedValue(value) {
+ if (!Array.isArray(value)) {
+ return "Pair is not an array";
+ }
+ if (value.length !== 2) {
+ return "Pair length != 2";
+ }
+ let errorCode = this.type1.verifySerializedValue(value[0]);
+ if (errorCode) {
+ return errorCode;
+ }
+ errorCode = this.type2.verifySerializedValue(value[1]);
+ if (errorCode) {
+ return errorCode;
+ }
+ }
+
+ getCacheKey() {
+ return "pair.(" + this.type1.getCacheKey() + "," + this.type2.getCacheKey + ")";
+ }
+}
+
+export class TypeNullable extends BaseDataType {
+ /**
+ * @param {BaseDataType} wrapped
+ */
+ constructor(wrapped) {
+ super();
+ this.wrapped = wrapped;
+ }
+
+ serialize(value) {
+ if (value === null || value === undefined) {
+ return null;
+ }
+ return this.wrapped.serialize(value);
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ if (value === null || value === undefined) {
+ targetObject[targetKey] = null;
+ return;
+ }
+ return this.wrapped.deserialize(value, targetObject, targetKey, root);
+ }
+
+ verifySerializedValue(value) {
+ if (value === null) {
+ return;
+ }
+ return this.wrapped.verifySerializedValue(value);
+ }
+
+ getAsJsonSchemaUncached() {
+ return {
+ oneOf: [
+ {
+ type: "null",
+ },
+ this.wrapped.getAsJsonSchema(),
+ ],
+ };
+ }
+
+ allowNull() {
+ return true;
+ }
+
+ getCacheKey() {
+ return "nullable." + this.wrapped.getCacheKey();
+ }
+}
+
+export class TypeStructuredObject extends BaseDataType {
+ /**
+ * @param {Object.} descriptor
+ */
+ constructor(descriptor) {
+ super();
+ this.descriptor = descriptor;
+ }
+
+ serialize(value) {
+ assert(typeof value === "object", "not an object");
+ let result = {};
+ for (const key in this.descriptor) {
+ // assert(value.hasOwnProperty(key), "Serialization: Object does not have", key, "property!");
+ result[key] = this.descriptor[key].serialize(value[key]);
+ }
+ return result;
+ }
+
+ /**
+ * @see BaseDataType.deserialize
+ * @param {any} value
+ * @param {GameRoot} root
+ * @param {object} targetObject
+ * @param {string|number} targetKey
+ * @returns {string|void} String error code or null on success
+ */
+ deserialize(value, targetObject, targetKey, root) {
+ let target = targetObject[targetKey];
+ if (!target) {
+ targetObject[targetKey] = target = {};
+ }
+
+ for (const key in value) {
+ const valueType = this.descriptor[key];
+ const errorCode = valueType.deserializeWithVerify(value[key], target, key, root);
+ if (errorCode) {
+ return errorCode;
+ }
+ }
+ }
+
+ getAsJsonSchemaUncached() {
+ let properties = {};
+ for (const key in this.descriptor) {
+ properties[key] = this.descriptor[key].getAsJsonSchema();
+ }
+
+ return {
+ type: "object",
+ required: Object.keys(this.descriptor),
+ properties,
+ };
+ }
+
+ verifySerializedValue(value) {
+ if (typeof value !== "object") {
+ return "structured object is not an object";
+ }
+ for (const key in this.descriptor) {
+ if (!value.hasOwnProperty(key)) {
+ return "structured object is missing key " + key;
+ }
+ const subError = this.descriptor[key].verifySerializedValue(value[key]);
+ if (subError) {
+ return "structured object::" + subError;
+ }
+ }
+ }
+
+ getCacheKey() {
+ let props = [];
+ for (const key in this.descriptor) {
+ props.push(key + "=" + this.descriptor[key].getCacheKey());
+ }
+ return "structured[" + props.join(",") + "]";
+ }
+}
diff --git a/src/js/savegame/serializer_internal.js b/src/js/savegame/serializer_internal.js
index 6e5dfbc2..c75cebad 100644
--- a/src/js/savegame/serializer_internal.js
+++ b/src/js/savegame/serializer_internal.js
@@ -1,3 +1,4 @@
+import { globalConfig } from "../core/config";
import { createLogger } from "../core/logging";
import { Vector } from "../core/vector";
import { getBuildingDataFromCode } from "../game/building_codes";
@@ -78,7 +79,12 @@ export class SerializerInternal {
deserializeComponents(root, entity, data) {
for (const componentId in data) {
if (!entity.components[componentId]) {
- logger.warn("Entity no longer has component:", componentId);
+ if (G_IS_DEV && !globalConfig.debug.disableSlowAsserts) {
+ // @ts-ignore
+ if (++window.componentWarningsShown < 100) {
+ logger.warn("Entity no longer has component:", componentId);
+ }
+ }
continue;
}
diff --git a/src/js/states/ingame.js b/src/js/states/ingame.js
index 3eea38b7..316c536c 100644
--- a/src/js/states/ingame.js
+++ b/src/js/states/ingame.js
@@ -1,438 +1,454 @@
-import { APPLICATION_ERROR_OCCURED } from "../core/error_handler";
-import { GameState } from "../core/game_state";
-import { logSection, createLogger } from "../core/logging";
-import { waitNextFrame } from "../core/utils";
-import { globalConfig } from "../core/config";
-import { GameLoadingOverlay } from "../game/game_loading_overlay";
-import { KeyActionMapper } from "../game/key_action_mapper";
-import { Savegame } from "../savegame/savegame";
-import { GameCore } from "../game/core";
-import { MUSIC } from "../platform/sound";
-
-const logger = createLogger("state/ingame");
-
-// Different sub-states
-const stages = {
- s3_createCore: "🌈 3: Create core",
- s4_A_initEmptyGame: "🌈 4/A: Init empty game",
- s4_B_resumeGame: "🌈 4/B: Resume game",
-
- s5_firstUpdate: "🌈 5: First game update",
- s6_postLoadHook: "🌈 6: Post load hook",
- s7_warmup: "🌈 7: Warmup",
-
- s10_gameRunning: "🌈 10: Game finally running",
-
- leaving: "🌈 Saving, then leaving the game",
- destroyed: "🌈 DESTROYED: Core is empty and waits for state leave",
- initFailed: "🌈 ERROR: Initialization failed!",
-};
-
-export const gameCreationAction = {
- new: "new-game",
- resume: "resume-game",
-};
-
-// Typehints
-export class GameCreationPayload {
- constructor() {
- /** @type {boolean|undefined} */
- this.fastEnter;
-
- /** @type {Savegame} */
- this.savegame;
- }
-}
-
-export class InGameState extends GameState {
- constructor() {
- super("InGameState");
-
- /** @type {GameCreationPayload} */
- this.creationPayload = null;
-
- // Stores current stage
- this.stage = "";
-
- /** @type {GameCore} */
- this.core = null;
-
- /** @type {KeyActionMapper} */
- this.keyActionMapper = null;
-
- /** @type {GameLoadingOverlay} */
- this.loadingOverlay = null;
-
- /** @type {Savegame} */
- this.savegame;
-
- this.boundInputFilter = this.filterInput.bind(this);
- }
-
- /**
- * Switches the game into another sub-state
- * @param {string} stage
- */
- switchStage(stage) {
- assert(stage, "Got empty stage");
- if (stage !== this.stage) {
- this.stage = stage;
- logger.log(this.stage);
- return true;
- } else {
- // log(this, "Re entering", stage);
- return false;
- }
- }
-
- // GameState implementation
- getInnerHTML() {
- return "";
- }
-
- getThemeMusic() {
- return MUSIC.theme;
- }
-
- onBeforeExit() {
- // logger.log("Saving before quitting");
- // return this.doSave().then(() => {
- // logger.log(this, "Successfully saved");
- // // this.stageDestroyed();
- // });
- }
-
- onAppPause() {
- // if (this.stage === stages.s10_gameRunning) {
- // logger.log("Saving because app got paused");
- // this.doSave();
- // }
- }
-
- getHasFadeIn() {
- return false;
- }
-
- getPauseOnFocusLost() {
- return false;
- }
-
- getHasUnloadConfirmation() {
- return true;
- }
-
- onLeave() {
- if (this.core) {
- this.stageDestroyed();
- }
- this.app.inputMgr.dismountFilter(this.boundInputFilter);
- }
-
- onResized(w, h) {
- super.onResized(w, h);
- if (this.stage === stages.s10_gameRunning) {
- this.core.resize(w, h);
- }
- }
-
- // ---- End of GameState implementation
-
- /**
- * Goes back to the menu state
- */
- goBackToMenu() {
- this.saveThenGoToState("MainMenuState");
- }
-
- /**
- * Goes back to the settings state
- */
- goToSettings() {
- this.saveThenGoToState("SettingsState", {
- backToStateId: this.key,
- backToStatePayload: this.creationPayload,
- });
- }
-
- /**
- * Goes back to the settings state
- */
- goToKeybindings() {
- this.saveThenGoToState("KeybindingsState", {
- backToStateId: this.key,
- backToStatePayload: this.creationPayload,
- });
- }
-
- /**
- * Moves to a state outside of the game
- * @param {string} stateId
- * @param {any=} payload
- */
- saveThenGoToState(stateId, payload) {
- if (this.stage === stages.leaving || this.stage === stages.destroyed) {
- logger.warn(
- "Tried to leave game twice or during destroy:",
- this.stage,
- "(attempted to move to",
- stateId,
- ")"
- );
- return;
- }
- this.stageLeavingGame();
- this.doSave().then(() => {
- this.stageDestroyed();
- this.moveToState(stateId, payload);
- });
- }
-
- onBackButton() {
- // do nothing
- }
-
- /**
- * Called when the game somehow failed to initialize. Resets everything to basic state and
- * then goes to the main menu, showing the error
- * @param {string} err
- */
- onInitializationFailure(err) {
- if (this.switchStage(stages.initFailed)) {
- logger.error("Init failure:", err);
- this.stageDestroyed();
- this.moveToState("MainMenuState", { loadError: err });
- }
- }
-
- // STAGES
-
- /**
- * Creates the game core instance, and thus the root
- */
- stage3CreateCore() {
- if (this.switchStage(stages.s3_createCore)) {
- logger.log("Creating new game core");
- this.core = new GameCore(this.app);
-
- this.core.initializeRoot(this, this.savegame);
-
- if (this.savegame.hasGameDump()) {
- this.stage4bResumeGame();
- } else {
- this.app.gameAnalytics.handleGameStarted();
- this.stage4aInitEmptyGame();
- }
- }
- }
-
- /**
- * Initializes a new empty game
- */
- stage4aInitEmptyGame() {
- if (this.switchStage(stages.s4_A_initEmptyGame)) {
- this.core.initNewGame();
- this.stage5FirstUpdate();
- }
- }
-
- /**
- * Resumes an existing game
- */
- stage4bResumeGame() {
- if (this.switchStage(stages.s4_B_resumeGame)) {
- if (!this.core.initExistingGame()) {
- this.onInitializationFailure("Savegame is corrupt and can not be restored.");
- return;
- }
- this.app.gameAnalytics.handleGameResumed();
- this.stage5FirstUpdate();
- }
- }
-
- /**
- * Performs the first game update on the game which initializes most caches
- */
- stage5FirstUpdate() {
- if (this.switchStage(stages.s5_firstUpdate)) {
- this.core.root.logicInitialized = true;
- this.core.updateLogic();
- this.stage6PostLoadHook();
- }
- }
-
- /**
- * Call the post load hook, this means that we have loaded the game, and all systems
- * can operate and start to work now.
- */
- stage6PostLoadHook() {
- if (this.switchStage(stages.s6_postLoadHook)) {
- logger.log("Post load hook");
- this.core.postLoadHook();
- this.stage7Warmup();
- }
- }
-
- /**
- * This makes the game idle and draw for a while, because we run most code this way
- * the V8 engine can already start to optimize it. Also this makes sure the resources
- * are in the VRAM and we have a smooth experience once we start.
- */
- stage7Warmup() {
- if (this.switchStage(stages.s7_warmup)) {
- if (G_IS_DEV && globalConfig.debug.noArtificialDelays) {
- this.warmupTimeSeconds = 0.05;
- } else {
- if (this.creationPayload.fastEnter) {
- this.warmupTimeSeconds = globalConfig.warmupTimeSecondsFast;
- } else {
- this.warmupTimeSeconds = globalConfig.warmupTimeSecondsRegular;
- }
- }
- }
- }
-
- /**
- * The final stage where this game is running and updating regulary.
- */
- stage10GameRunning() {
- if (this.switchStage(stages.s10_gameRunning)) {
- this.core.root.signals.readyToRender.dispatch();
-
- logSection("GAME STARTED", "#26a69a");
-
- // Initial resize, might have changed during loading (this is possible)
- this.core.resize(this.app.screenWidth, this.app.screenHeight);
- }
- }
-
- /**
- * This stage destroys the whole game, used to cleanup
- */
- stageDestroyed() {
- if (this.switchStage(stages.destroyed)) {
- // Cleanup all api calls
- this.cancelAllAsyncOperations();
-
- if (this.syncer) {
- this.syncer.cancelSync();
- this.syncer = null;
- }
-
- // Cleanup core
- if (this.core) {
- this.core.destruct();
- this.core = null;
- }
- }
- }
-
- /**
- * When leaving the game
- */
- stageLeavingGame() {
- if (this.switchStage(stages.leaving)) {
- // ...
- }
- }
-
- // END STAGES
-
- /**
- * Filters the input (keybindings)
- */
- filterInput() {
- return this.stage === stages.s10_gameRunning;
- }
-
- /**
- * @param {GameCreationPayload} payload
- */
- onEnter(payload) {
- this.app.inputMgr.installFilter(this.boundInputFilter);
-
- this.creationPayload = payload;
- this.savegame = payload.savegame;
-
- this.loadingOverlay = new GameLoadingOverlay(this.app, this.getDivElement());
- this.loadingOverlay.showBasic();
-
- // Remove unneded default element
- document.body.querySelector(".modalDialogParent").remove();
-
- this.asyncChannel.watch(waitNextFrame()).then(() => this.stage3CreateCore());
- }
-
- /**
- * Render callback
- * @param {number} dt
- */
- onRender(dt) {
- if (APPLICATION_ERROR_OCCURED) {
- // Application somehow crashed, do not do anything
- return;
- }
-
- if (this.stage === stages.s7_warmup) {
- this.core.draw();
- this.warmupTimeSeconds -= dt / 1000.0;
- if (this.warmupTimeSeconds < 0) {
- logger.log("Warmup completed");
- this.stage10GameRunning();
- }
- }
-
- if (this.stage === stages.s10_gameRunning) {
- this.core.tick(dt);
- }
-
- // If the stage is still active (This might not be the case if tick() moved us to game over)
- if (this.stage === stages.s10_gameRunning) {
- // Only draw if page visible
- if (this.app.pageVisible) {
- this.core.draw();
- }
-
- this.loadingOverlay.removeIfAttached();
- } else {
- if (!this.loadingOverlay.isAttached()) {
- this.loadingOverlay.showBasic();
- }
- }
- }
-
- onBackgroundTick(dt) {
- this.onRender(dt);
- }
-
- /**
- * Saves the game
- */
-
- doSave() {
- if (!this.savegame || !this.savegame.isSaveable()) {
- return Promise.resolve();
- }
-
- if (APPLICATION_ERROR_OCCURED) {
- logger.warn("skipping save because application crashed");
- return Promise.resolve();
- }
-
- if (
- this.stage !== stages.s10_gameRunning &&
- this.stage !== stages.s7_warmup &&
- this.stage !== stages.leaving
- ) {
- logger.warn("Skipping save because game is not ready");
- return Promise.resolve();
- }
-
- // First update the game data
- logger.log("Starting to save game ...");
- this.core.root.signals.gameSaved.dispatch();
- this.savegame.updateData(this.core.root);
- return this.savegame.writeSavegameAndMetadata().catch(err => {
- logger.warn("Failed to save:", err);
- });
- }
-}
+import { APPLICATION_ERROR_OCCURED } from "../core/error_handler";
+import { GameState } from "../core/game_state";
+import { logSection, createLogger } from "../core/logging";
+import { waitNextFrame } from "../core/utils";
+import { globalConfig } from "../core/config";
+import { GameLoadingOverlay } from "../game/game_loading_overlay";
+import { KeyActionMapper } from "../game/key_action_mapper";
+import { Savegame } from "../savegame/savegame";
+import { GameCore } from "../game/core";
+import { MUSIC } from "../platform/sound";
+
+const logger = createLogger("state/ingame");
+
+// Different sub-states
+const stages = {
+ s3_createCore: "🌈 3: Create core",
+ s4_A_initEmptyGame: "🌈 4/A: Init empty game",
+ s4_B_resumeGame: "🌈 4/B: Resume game",
+
+ s5_firstUpdate: "🌈 5: First game update",
+ s6_postLoadHook: "🌈 6: Post load hook",
+ s7_warmup: "🌈 7: Warmup",
+
+ s10_gameRunning: "🌈 10: Game finally running",
+
+ leaving: "🌈 Saving, then leaving the game",
+ destroyed: "🌈 DESTROYED: Core is empty and waits for state leave",
+ initFailed: "🌈 ERROR: Initialization failed!",
+};
+
+export const gameCreationAction = {
+ new: "new-game",
+ resume: "resume-game",
+};
+
+// Typehints
+export class GameCreationPayload {
+ constructor() {
+ /** @type {boolean|undefined} */
+ this.fastEnter;
+
+ /** @type {Savegame} */
+ this.savegame;
+ }
+}
+
+export class InGameState extends GameState {
+ constructor() {
+ super("InGameState");
+
+ /** @type {GameCreationPayload} */
+ this.creationPayload = null;
+
+ // Stores current stage
+ this.stage = "";
+
+ /** @type {GameCore} */
+ this.core = null;
+
+ /** @type {KeyActionMapper} */
+ this.keyActionMapper = null;
+
+ /** @type {GameLoadingOverlay} */
+ this.loadingOverlay = null;
+
+ /** @type {Savegame} */
+ this.savegame = null;
+
+ this.boundInputFilter = this.filterInput.bind(this);
+
+ /**
+ * Whether we are currently saving the game
+ * @TODO: This doesn't realy fit here
+ */
+ this.currentSavePromise = null;
+ }
+
+ /**
+ * Switches the game into another sub-state
+ * @param {string} stage
+ */
+ switchStage(stage) {
+ assert(stage, "Got empty stage");
+ if (stage !== this.stage) {
+ this.stage = stage;
+ logger.log(this.stage);
+ return true;
+ } else {
+ // log(this, "Re entering", stage);
+ return false;
+ }
+ }
+
+ // GameState implementation
+ getInnerHTML() {
+ return "";
+ }
+
+ getThemeMusic() {
+ return MUSIC.theme;
+ }
+
+ onBeforeExit() {
+ // logger.log("Saving before quitting");
+ // return this.doSave().then(() => {
+ // logger.log(this, "Successfully saved");
+ // // this.stageDestroyed();
+ // });
+ }
+
+ onAppPause() {
+ // if (this.stage === stages.s10_gameRunning) {
+ // logger.log("Saving because app got paused");
+ // this.doSave();
+ // }
+ }
+
+ getHasFadeIn() {
+ return false;
+ }
+
+ getPauseOnFocusLost() {
+ return false;
+ }
+
+ getHasUnloadConfirmation() {
+ return true;
+ }
+
+ onLeave() {
+ if (this.core) {
+ this.stageDestroyed();
+ }
+ this.app.inputMgr.dismountFilter(this.boundInputFilter);
+ }
+
+ onResized(w, h) {
+ super.onResized(w, h);
+ if (this.stage === stages.s10_gameRunning) {
+ this.core.resize(w, h);
+ }
+ }
+
+ // ---- End of GameState implementation
+
+ /**
+ * Goes back to the menu state
+ */
+ goBackToMenu() {
+ this.saveThenGoToState("MainMenuState");
+ }
+
+ /**
+ * Goes back to the settings state
+ */
+ goToSettings() {
+ this.saveThenGoToState("SettingsState", {
+ backToStateId: this.key,
+ backToStatePayload: this.creationPayload,
+ });
+ }
+
+ /**
+ * Goes back to the settings state
+ */
+ goToKeybindings() {
+ this.saveThenGoToState("KeybindingsState", {
+ backToStateId: this.key,
+ backToStatePayload: this.creationPayload,
+ });
+ }
+
+ /**
+ * Moves to a state outside of the game
+ * @param {string} stateId
+ * @param {any=} payload
+ */
+ saveThenGoToState(stateId, payload) {
+ if (this.stage === stages.leaving || this.stage === stages.destroyed) {
+ logger.warn(
+ "Tried to leave game twice or during destroy:",
+ this.stage,
+ "(attempted to move to",
+ stateId,
+ ")"
+ );
+ return;
+ }
+ this.stageLeavingGame();
+ this.doSave().then(() => {
+ this.stageDestroyed();
+ this.moveToState(stateId, payload);
+ });
+ }
+
+ onBackButton() {
+ // do nothing
+ }
+
+ /**
+ * Called when the game somehow failed to initialize. Resets everything to basic state and
+ * then goes to the main menu, showing the error
+ * @param {string} err
+ */
+ onInitializationFailure(err) {
+ if (this.switchStage(stages.initFailed)) {
+ logger.error("Init failure:", err);
+ this.stageDestroyed();
+ this.moveToState("MainMenuState", { loadError: err });
+ }
+ }
+
+ // STAGES
+
+ /**
+ * Creates the game core instance, and thus the root
+ */
+ stage3CreateCore() {
+ if (this.switchStage(stages.s3_createCore)) {
+ logger.log("Creating new game core");
+ this.core = new GameCore(this.app);
+
+ this.core.initializeRoot(this, this.savegame);
+
+ if (this.savegame.hasGameDump()) {
+ this.stage4bResumeGame();
+ } else {
+ this.app.gameAnalytics.handleGameStarted();
+ this.stage4aInitEmptyGame();
+ }
+ }
+ }
+
+ /**
+ * Initializes a new empty game
+ */
+ stage4aInitEmptyGame() {
+ if (this.switchStage(stages.s4_A_initEmptyGame)) {
+ this.core.initNewGame();
+ this.stage5FirstUpdate();
+ }
+ }
+
+ /**
+ * Resumes an existing game
+ */
+ stage4bResumeGame() {
+ if (this.switchStage(stages.s4_B_resumeGame)) {
+ if (!this.core.initExistingGame()) {
+ this.onInitializationFailure("Savegame is corrupt and can not be restored.");
+ return;
+ }
+ this.app.gameAnalytics.handleGameResumed();
+ this.stage5FirstUpdate();
+ }
+ }
+
+ /**
+ * Performs the first game update on the game which initializes most caches
+ */
+ stage5FirstUpdate() {
+ if (this.switchStage(stages.s5_firstUpdate)) {
+ this.core.root.logicInitialized = true;
+ this.core.updateLogic();
+ this.stage6PostLoadHook();
+ }
+ }
+
+ /**
+ * Call the post load hook, this means that we have loaded the game, and all systems
+ * can operate and start to work now.
+ */
+ stage6PostLoadHook() {
+ if (this.switchStage(stages.s6_postLoadHook)) {
+ logger.log("Post load hook");
+ this.core.postLoadHook();
+ this.stage7Warmup();
+ }
+ }
+
+ /**
+ * This makes the game idle and draw for a while, because we run most code this way
+ * the V8 engine can already start to optimize it. Also this makes sure the resources
+ * are in the VRAM and we have a smooth experience once we start.
+ */
+ stage7Warmup() {
+ if (this.switchStage(stages.s7_warmup)) {
+ if (this.creationPayload.fastEnter) {
+ this.warmupTimeSeconds = globalConfig.warmupTimeSecondsFast;
+ } else {
+ this.warmupTimeSeconds = globalConfig.warmupTimeSecondsRegular;
+ }
+ }
+ }
+
+ /**
+ * The final stage where this game is running and updating regulary.
+ */
+ stage10GameRunning() {
+ if (this.switchStage(stages.s10_gameRunning)) {
+ this.core.root.signals.readyToRender.dispatch();
+
+ logSection("GAME STARTED", "#26a69a");
+
+ // Initial resize, might have changed during loading (this is possible)
+ this.core.resize(this.app.screenWidth, this.app.screenHeight);
+ }
+ }
+
+ /**
+ * This stage destroys the whole game, used to cleanup
+ */
+ stageDestroyed() {
+ if (this.switchStage(stages.destroyed)) {
+ // Cleanup all api calls
+ this.cancelAllAsyncOperations();
+
+ if (this.syncer) {
+ this.syncer.cancelSync();
+ this.syncer = null;
+ }
+
+ // Cleanup core
+ if (this.core) {
+ this.core.destruct();
+ this.core = null;
+ }
+ }
+ }
+
+ /**
+ * When leaving the game
+ */
+ stageLeavingGame() {
+ if (this.switchStage(stages.leaving)) {
+ // ...
+ }
+ }
+
+ // END STAGES
+
+ /**
+ * Filters the input (keybindings)
+ */
+ filterInput() {
+ return this.stage === stages.s10_gameRunning;
+ }
+
+ /**
+ * @param {GameCreationPayload} payload
+ */
+ onEnter(payload) {
+ this.app.inputMgr.installFilter(this.boundInputFilter);
+
+ this.creationPayload = payload;
+ this.savegame = payload.savegame;
+
+ this.loadingOverlay = new GameLoadingOverlay(this.app, this.getDivElement());
+ this.loadingOverlay.showBasic();
+
+ // Remove unneded default element
+ document.body.querySelector(".modalDialogParent").remove();
+
+ this.asyncChannel.watch(waitNextFrame()).then(() => this.stage3CreateCore());
+ }
+
+ /**
+ * Render callback
+ * @param {number} dt
+ */
+ onRender(dt) {
+ if (APPLICATION_ERROR_OCCURED) {
+ // Application somehow crashed, do not do anything
+ return;
+ }
+
+ if (this.stage === stages.s7_warmup) {
+ this.core.draw();
+ this.warmupTimeSeconds -= dt / 1000.0;
+ if (this.warmupTimeSeconds < 0) {
+ logger.log("Warmup completed");
+ this.stage10GameRunning();
+ }
+ }
+
+ if (this.stage === stages.s10_gameRunning) {
+ this.core.tick(dt);
+ }
+
+ // If the stage is still active (This might not be the case if tick() moved us to game over)
+ if (this.stage === stages.s10_gameRunning) {
+ // Only draw if page visible
+ if (this.app.pageVisible) {
+ this.core.draw();
+ }
+
+ this.loadingOverlay.removeIfAttached();
+ } else {
+ if (!this.loadingOverlay.isAttached()) {
+ this.loadingOverlay.showBasic();
+ }
+ }
+ }
+
+ onBackgroundTick(dt) {
+ this.onRender(dt);
+ }
+
+ /**
+ * Saves the game
+ */
+
+ doSave() {
+ if (!this.savegame || !this.savegame.isSaveable()) {
+ return Promise.resolve();
+ }
+
+ if (APPLICATION_ERROR_OCCURED) {
+ logger.warn("skipping save because application crashed");
+ return Promise.resolve();
+ }
+
+ if (
+ this.stage !== stages.s10_gameRunning &&
+ this.stage !== stages.s7_warmup &&
+ this.stage !== stages.leaving
+ ) {
+ logger.warn("Skipping save because game is not ready");
+ return Promise.resolve();
+ }
+
+ if (this.currentSavePromise) {
+ logger.warn("Skipping double save and returning same promise");
+ return this.currentSavePromise;
+ }
+ logger.log("Starting to save game ...");
+ this.savegame.updateData(this.core.root);
+
+ this.currentSavePromise = this.savegame
+ .writeSavegameAndMetadata()
+ .catch(err => {
+ // Catch errors
+ logger.warn("Failed to save:", err);
+ })
+ .then(() => {
+ // Clear promise
+ logger.log("Saved!");
+ this.core.root.signals.gameSaved.dispatch();
+ this.currentSavePromise = null;
+ });
+
+ return this.currentSavePromise;
+ }
+}
diff --git a/src/js/states/keybindings.js b/src/js/states/keybindings.js
index b68626c7..a01629f1 100644
--- a/src/js/states/keybindings.js
+++ b/src/js/states/keybindings.js
@@ -1,179 +1,173 @@
-import { TextualGameState } from "../core/textual_game_state";
-import { SOUNDS } from "../platform/sound";
-import { T } from "../translations";
-import { KEYMAPPINGS, getStringForKeyCode } from "../game/key_action_mapper";
-import { Dialog } from "../core/modal_dialog_elements";
-import { IS_DEMO } from "../core/config";
-
-export class KeybindingsState extends TextualGameState {
- constructor() {
- super("KeybindingsState");
- }
-
- getStateHeaderTitle() {
- return T.keybindings.title;
- }
-
- getMainContentHTML() {
- return `
-
-
- ${T.keybindings.hint}
- ${T.keybindings.resetKeybindings}
-
-
-
-
-
-
- `;
- }
-
- onEnter() {
- const keybindingsElem = this.htmlElement.querySelector(".keybindings");
-
- this.trackClicks(this.htmlElement.querySelector(".resetBindings"), this.resetBindings);
-
- for (const category in KEYMAPPINGS) {
- const categoryDiv = document.createElement("div");
- categoryDiv.classList.add("category");
- keybindingsElem.appendChild(categoryDiv);
-
- const labelDiv = document.createElement("strong");
- labelDiv.innerText = T.keybindings.categoryLabels[category];
- labelDiv.classList.add("categoryLabel");
- categoryDiv.appendChild(labelDiv);
-
- for (const keybindingId in KEYMAPPINGS[category]) {
- const mapped = KEYMAPPINGS[category][keybindingId];
-
- const elem = document.createElement("div");
- elem.classList.add("entry");
- elem.setAttribute("data-keybinding", keybindingId);
- categoryDiv.appendChild(elem);
-
- const title = document.createElement("span");
- title.classList.add("title");
- title.innerText = T.keybindings.mappings[keybindingId];
- elem.appendChild(title);
-
- const mappingDiv = document.createElement("span");
- mappingDiv.classList.add("mapping");
- elem.appendChild(mappingDiv);
-
- const editBtn = document.createElement("button");
- editBtn.classList.add("styledButton", "editKeybinding");
-
- const resetBtn = document.createElement("button");
- resetBtn.classList.add("styledButton", "resetKeybinding");
-
- if (mapped.builtin) {
- editBtn.classList.add("disabled");
- resetBtn.classList.add("disabled");
- } else {
- this.trackClicks(editBtn, () => this.editKeybinding(keybindingId));
- this.trackClicks(resetBtn, () => this.resetKeybinding(keybindingId));
- }
- elem.appendChild(editBtn);
- elem.appendChild(resetBtn);
- }
- }
- this.updateKeybindings();
- }
-
- editKeybinding(id) {
- // if (IS_DEMO) {
- // this.dialogs.showFeatureRestrictionInfo(T.demo.features.customizeKeybindings);
- // return;
- // }
-
- const dialog = new Dialog({
- app: this.app,
- title: T.dialogs.editKeybinding.title,
- contentHTML: T.dialogs.editKeybinding.desc,
- buttons: ["cancel:good"],
- type: "info",
- });
-
- dialog.inputReciever.keydown.add(({ keyCode, shift, alt, event }) => {
- if (keyCode === 27) {
- this.dialogs.closeDialog(dialog);
- return;
- }
-
- if (event) {
- event.preventDefault();
- }
-
- if (event.target && event.target.tagName === "BUTTON" && keyCode === 1) {
- return;
- }
-
- if (
- // Enter
- keyCode === 13
- ) {
- // Ignore builtins
- return;
- }
-
- this.app.settings.updateKeybindingOverride(id, keyCode);
-
- this.dialogs.closeDialog(dialog);
- this.updateKeybindings();
- });
-
- dialog.inputReciever.backButton.add(() => {});
- this.dialogs.internalShowDialog(dialog);
-
- this.app.sound.playUiSound(SOUNDS.dialogOk);
- }
-
- updateKeybindings() {
- const overrides = this.app.settings.getKeybindingOverrides();
- for (const category in KEYMAPPINGS) {
- for (const keybindingId in KEYMAPPINGS[category]) {
- const mapped = KEYMAPPINGS[category][keybindingId];
-
- const container = this.htmlElement.querySelector("[data-keybinding='" + keybindingId + "']");
- assert(container, "Container for keybinding not found: " + keybindingId);
-
- let keyCode = mapped.keyCode;
- if (overrides[keybindingId]) {
- keyCode = overrides[keybindingId];
- }
-
- const mappingDiv = container.querySelector(".mapping");
- mappingDiv.innerHTML = getStringForKeyCode(keyCode);
- mappingDiv.classList.toggle("changed", !!overrides[keybindingId]);
-
- const resetBtn = container.querySelector("button.resetKeybinding");
- resetBtn.classList.toggle("disabled", mapped.builtin || !overrides[keybindingId]);
- }
- }
- }
-
- resetKeybinding(id) {
- this.app.settings.resetKeybindingOverride(id);
- this.updateKeybindings();
- }
-
- resetBindings() {
- const { reset } = this.dialogs.showWarning(
- T.dialogs.resetKeybindingsConfirmation.title,
- T.dialogs.resetKeybindingsConfirmation.desc,
- ["cancel:good", "reset:bad"]
- );
-
- reset.add(() => {
- this.app.settings.resetKeybindingOverrides();
- this.updateKeybindings();
-
- this.dialogs.showInfo(T.dialogs.keybindingsResetOk.title, T.dialogs.keybindingsResetOk.desc);
- });
- }
-
- getDefaultPreviousState() {
- return "SettingsState";
- }
-}
+import { Dialog } from "../core/modal_dialog_elements";
+import { TextualGameState } from "../core/textual_game_state";
+import { getStringForKeyCode, KEYMAPPINGS } from "../game/key_action_mapper";
+import { SOUNDS } from "../platform/sound";
+import { T } from "../translations";
+
+export class KeybindingsState extends TextualGameState {
+ constructor() {
+ super("KeybindingsState");
+ }
+
+ getStateHeaderTitle() {
+ return T.keybindings.title;
+ }
+
+ getMainContentHTML() {
+ return `
+
+
+ ${T.keybindings.hint}
+ ${T.keybindings.resetKeybindings}
+
+
+
+
+
+
+ `;
+ }
+
+ onEnter() {
+ const keybindingsElem = this.htmlElement.querySelector(".keybindings");
+
+ this.trackClicks(this.htmlElement.querySelector(".resetBindings"), this.resetBindings);
+
+ for (const category in KEYMAPPINGS) {
+ const categoryDiv = document.createElement("div");
+ categoryDiv.classList.add("category");
+ keybindingsElem.appendChild(categoryDiv);
+
+ const labelDiv = document.createElement("strong");
+ labelDiv.innerText = T.keybindings.categoryLabels[category];
+ labelDiv.classList.add("categoryLabel");
+ categoryDiv.appendChild(labelDiv);
+
+ for (const keybindingId in KEYMAPPINGS[category]) {
+ const mapped = KEYMAPPINGS[category][keybindingId];
+
+ const elem = document.createElement("div");
+ elem.classList.add("entry");
+ elem.setAttribute("data-keybinding", keybindingId);
+ categoryDiv.appendChild(elem);
+
+ const title = document.createElement("span");
+ title.classList.add("title");
+ title.innerText = T.keybindings.mappings[keybindingId];
+ elem.appendChild(title);
+
+ const mappingDiv = document.createElement("span");
+ mappingDiv.classList.add("mapping");
+ elem.appendChild(mappingDiv);
+
+ const editBtn = document.createElement("button");
+ editBtn.classList.add("styledButton", "editKeybinding");
+
+ const resetBtn = document.createElement("button");
+ resetBtn.classList.add("styledButton", "resetKeybinding");
+
+ if (mapped.builtin) {
+ editBtn.classList.add("disabled");
+ resetBtn.classList.add("disabled");
+ } else {
+ this.trackClicks(editBtn, () => this.editKeybinding(keybindingId));
+ this.trackClicks(resetBtn, () => this.resetKeybinding(keybindingId));
+ }
+ elem.appendChild(editBtn);
+ elem.appendChild(resetBtn);
+ }
+ }
+ this.updateKeybindings();
+ }
+
+ editKeybinding(id) {
+ const dialog = new Dialog({
+ app: this.app,
+ title: T.dialogs.editKeybinding.title,
+ contentHTML: T.dialogs.editKeybinding.desc,
+ buttons: ["cancel:good"],
+ type: "info",
+ });
+
+ dialog.inputReciever.keydown.add(({ keyCode, shift, alt, event }) => {
+ if (keyCode === 27) {
+ this.dialogs.closeDialog(dialog);
+ return;
+ }
+
+ if (event) {
+ event.preventDefault();
+ }
+
+ if (event.target && event.target.tagName === "BUTTON" && keyCode === 1) {
+ return;
+ }
+
+ if (
+ // Enter
+ keyCode === 13
+ ) {
+ // Ignore builtins
+ return;
+ }
+
+ this.app.settings.updateKeybindingOverride(id, keyCode);
+
+ this.dialogs.closeDialog(dialog);
+ this.updateKeybindings();
+ });
+
+ dialog.inputReciever.backButton.add(() => {});
+ this.dialogs.internalShowDialog(dialog);
+
+ this.app.sound.playUiSound(SOUNDS.dialogOk);
+ }
+
+ updateKeybindings() {
+ const overrides = this.app.settings.getKeybindingOverrides();
+ for (const category in KEYMAPPINGS) {
+ for (const keybindingId in KEYMAPPINGS[category]) {
+ const mapped = KEYMAPPINGS[category][keybindingId];
+
+ const container = this.htmlElement.querySelector("[data-keybinding='" + keybindingId + "']");
+ assert(container, "Container for keybinding not found: " + keybindingId);
+
+ let keyCode = mapped.keyCode;
+ if (overrides[keybindingId]) {
+ keyCode = overrides[keybindingId];
+ }
+
+ const mappingDiv = container.querySelector(".mapping");
+ mappingDiv.innerHTML = getStringForKeyCode(keyCode);
+ mappingDiv.classList.toggle("changed", !!overrides[keybindingId]);
+
+ const resetBtn = container.querySelector("button.resetKeybinding");
+ resetBtn.classList.toggle("disabled", mapped.builtin || !overrides[keybindingId]);
+ }
+ }
+ }
+
+ resetKeybinding(id) {
+ this.app.settings.resetKeybindingOverride(id);
+ this.updateKeybindings();
+ }
+
+ resetBindings() {
+ const { reset } = this.dialogs.showWarning(
+ T.dialogs.resetKeybindingsConfirmation.title,
+ T.dialogs.resetKeybindingsConfirmation.desc,
+ ["cancel:good", "reset:bad"]
+ );
+
+ reset.add(() => {
+ this.app.settings.resetKeybindingOverrides();
+ this.updateKeybindings();
+
+ this.dialogs.showInfo(T.dialogs.keybindingsResetOk.title, T.dialogs.keybindingsResetOk.desc);
+ });
+ }
+
+ getDefaultPreviousState() {
+ return "SettingsState";
+ }
+}
diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js
index bea209a8..fa177874 100644
--- a/src/js/states/main_menu.js
+++ b/src/js/states/main_menu.js
@@ -1,44 +1,31 @@
-import { GameState } from "../core/game_state";
import { cachebust } from "../core/cachebust";
-import { globalConfig, IS_DEMO, THIRDPARTY_URLS } from "../core/config";
+import { A_B_TESTING_LINK_TYPE, globalConfig, THIRDPARTY_URLS } from "../core/config";
+import { GameState } from "../core/game_state";
+import { DialogWithForm } from "../core/modal_dialog_elements";
+import { FormElementInput } from "../core/modal_dialog_forms";
+import { ReadWriteProxy } from "../core/read_write_proxy";
import {
- makeDiv,
- makeButtonElement,
formatSecondsToTimeAgo,
- waitNextFrame,
+ generateFileDownload,
isSupportedBrowser,
makeButton,
+ makeButtonElement,
+ makeDiv,
removeAllChildren,
+ startFileChoose,
+ waitNextFrame,
} from "../core/utils";
-import { ReadWriteProxy } from "../core/read_write_proxy";
import { HUDModalDialogs } from "../game/hud/parts/modal_dialogs";
-import { T } from "../translations";
import { getApplicationSettingById } from "../profile/application_settings";
-import { FormElementInput } from "../core/modal_dialog_forms";
-import { DialogWithForm } from "../core/modal_dialog_elements";
+import { T } from "../translations";
+
+const trim = require("trim");
/**
* @typedef {import("../savegame/savegame_typedefs").SavegameMetadata} SavegameMetadata
* @typedef {import("../profile/setting_types").EnumSetting} EnumSetting
*/
-/**
- * Generates a file download
- * @param {string} filename
- * @param {string} text
- */
-function generateFileDownload(filename, text) {
- var element = document.createElement("a");
- element.setAttribute("href", "data:text/plain;charset=utf-8," + encodeURIComponent(text));
- element.setAttribute("download", filename);
-
- element.style.display = "none";
- document.body.appendChild(element);
-
- element.click();
- document.body.removeChild(element);
-}
-
export class MainMenuState extends GameState {
constructor() {
super("MainMenuState");
@@ -47,18 +34,16 @@ export class MainMenuState extends GameState {
getInnerHTML() {
const bannerHtml = `
${T.demoBanners.title}
-
${T.demoBanners.intro}
-
- Get the shapez.io standalone!
+ Get the shapez.io standalone!
`;
- return `
+ const showDemoBadges = this.app.restrictionMgr.getIsStandaloneMarketingActive();
+ return `
- `;
- }
-
- getThemeMusic() {
- return null;
- }
-
- getHasFadeIn() {
- return false;
- }
-
- onEnter() {
- this.htmlElement.classList.add("prefab_LoadingState");
-
- const elementsToRemove = ["#loadingPreload", "#fontPreload"];
- for (let i = 0; i < elementsToRemove.length; ++i) {
- const elem = document.querySelector(elementsToRemove[i]);
- if (elem) {
- elem.remove();
- }
- }
-
- this.dialogs = new HUDModalDialogs(null, this.app);
- const dialogsElement = document.body.querySelector(".modalDialogParent");
- this.dialogs.initializeToElement(dialogsElement);
-
- /** @type {HTMLElement} */
- this.statusText = this.htmlElement.querySelector(".loadingStatus > .desc");
- /** @type {HTMLElement} */
- this.statusBar = this.htmlElement.querySelector(".loadingStatus > .bar > .inner");
- /** @type {HTMLElement} */
- this.statusBarText = this.htmlElement.querySelector(".loadingStatus > .bar > .status");
-
- this.currentStatus = "booting";
- this.currentIndex = 0;
-
- this.startLoading();
- }
-
- onLeave() {
- // this.dialogs.cleanup();
- }
-
- startLoading() {
- this.setStatus("Booting")
-
- .then(() => this.setStatus("Creating platform wrapper"))
- .then(() => this.app.platformWrapper.initialize())
-
- .then(() => this.setStatus("Initializing local storage"))
- .then(() => {
- const wrapper = this.app.platformWrapper;
- if (wrapper instanceof PlatformWrapperImplBrowser) {
- try {
- window.localStorage.setItem("local_storage_test", "1");
- window.localStorage.removeItem("local_storage_test");
- } catch (ex) {
- logger.error("Failed to read/write local storage:", ex);
- return new Promise(() => {
- alert(`Your brower does not support thirdparty cookies or you have disabled it in your security settings.\n\n
- In Chrome this setting is called "Block third-party cookies and site data".\n\n
- Please allow third party cookies and then reload the page.`);
- // Never return
- });
- }
- }
- })
-
- .then(() => this.setStatus("Creating storage"))
- .then(() => {
- return this.app.storage.initialize();
- })
-
- .then(() => this.setStatus("Initializing libraries"))
- .then(() => this.app.analytics.initialize())
- .then(() => this.app.gameAnalytics.initialize())
-
- .then(() => this.setStatus("Initializing settings"))
- .then(() => {
- return this.app.settings.initialize();
- })
-
- .then(() => {
- // Initialize fullscreen
- if (this.app.platformWrapper.getSupportsFullscreen()) {
- this.app.platformWrapper.setFullscreen(this.app.settings.getIsFullScreen());
- }
- })
-
- .then(() => this.setStatus("Initializing language"))
- .then(() => {
- if (this.app.settings.getLanguage() === "auto-detect") {
- const language = autoDetectLanguageId();
- logger.log("Setting language to", language);
- return this.app.settings.updateLanguage(language);
- }
- })
- .then(() => {
- const language = this.app.settings.getLanguage();
- updateApplicationLanguage(language);
- })
-
- .then(() => this.setStatus("Initializing sounds"))
- .then(() => {
- // Notice: We don't await the sounds loading itself
- return this.app.sound.initialize();
- })
-
- .then(() => {
- this.app.backgroundResourceLoader.startLoading();
- })
-
- .then(() => this.setStatus("Initializing savegame"))
- .then(() => {
- return this.app.savegameMgr.initialize().catch(err => {
- logger.error("Failed to initialize savegames:", err);
- alert(
- "Your savegames failed to load, it seems your data files got corrupted. I'm so sorry!\n\n(This can happen if your pc crashed while a game was saved).\n\nYou can try re-importing your savegames."
- );
- return this.app.savegameMgr.writeAsync();
- });
- })
-
- .then(() => this.setStatus("Downloading resources"))
- .then(() => {
- return this.app.backgroundResourceLoader.getPromiseForBareGame();
- })
-
- .then(() => this.setStatus("Checking changelog"))
- .then(() => {
- if (G_IS_DEV && globalConfig.debug.disableUpgradeNotification) {
- return;
- }
-
- return this.app.storage
- .readFileAsync("lastversion.bin")
- .catch(err => {
- logger.warn("Failed to read lastversion:", err);
- return G_BUILD_VERSION;
- })
- .then(version => {
- logger.log("Last version:", version, "App version:", G_BUILD_VERSION);
- this.app.storage.writeFileAsync("lastversion.bin", G_BUILD_VERSION);
- return version;
- })
- .then(version => {
- let changelogEntries = [];
- logger.log("Last seen version:", version);
-
- for (let i = 0; i < CHANGELOG.length; ++i) {
- if (CHANGELOG[i].version === version) {
- break;
- }
- changelogEntries.push(CHANGELOG[i]);
- }
- if (changelogEntries.length === 0) {
- return;
- }
-
- let dialogHtml = T.dialogs.updateSummary.desc;
- for (let i = 0; i < changelogEntries.length; ++i) {
- const entry = changelogEntries[i];
- dialogHtml += `
-
-
${entry.version}
-
${entry.date}
-
- ${entry.entries.map(text => `${text} `).join("")}
-
-
-
-
-
-
- ${this.currentStatus} failed:
-
-
- Please send me an email with steps to reproduce and what you did before this happened:
-
${email}
-
-
-
- Reset App
- Build ${G_BUILD_VERSION} @ ${G_BUILD_COMMIT_HASH}
-
-
+
+ Booting
+
+
+
+ `;
+ }
+
+ getThemeMusic() {
+ return null;
+ }
+
+ getHasFadeIn() {
+ return false;
+ }
+
+ onEnter() {
+ this.htmlElement.classList.add("prefab_LoadingState");
+
+ const elementsToRemove = ["#loadingPreload", "#fontPreload"];
+ for (let i = 0; i < elementsToRemove.length; ++i) {
+ const elem = document.querySelector(elementsToRemove[i]);
+ if (elem) {
+ elem.remove();
+ }
+ }
+
+ this.dialogs = new HUDModalDialogs(null, this.app);
+ const dialogsElement = document.body.querySelector(".modalDialogParent");
+ this.dialogs.initializeToElement(dialogsElement);
+
+ /** @type {HTMLElement} */
+ this.statusText = this.htmlElement.querySelector(".loadingStatus > .desc");
+
+ /** @type {HTMLElement} */
+ this.hintsText = this.htmlElement.querySelector(".prefab_GameHint");
+ this.lastHintShown = -1000;
+ this.nextHintDuration = 0;
+
+ this.currentStatus = "booting";
+
+ this.startLoading();
+ }
+
+ onLeave() {
+ // this.dialogs.cleanup();
+ }
+
+ startLoading() {
+ this.setStatus("Booting")
+
+ .then(() => this.setStatus("Creating platform wrapper"))
+ .then(() => this.app.platformWrapper.initialize())
+
+ .then(() => this.setStatus("Initializing local storage"))
+ .then(() => {
+ const wrapper = this.app.platformWrapper;
+ if (wrapper instanceof PlatformWrapperImplBrowser) {
+ try {
+ window.localStorage.setItem("local_storage_test", "1");
+ window.localStorage.removeItem("local_storage_test");
+ } catch (ex) {
+ logger.error("Failed to read/write local storage:", ex);
+ return new Promise(() => {
+ alert(`Your brower does not support thirdparty cookies or you have disabled it in your security settings.\n\n
+ In Chrome this setting is called "Block third-party cookies and site data".\n\n
+ Please allow third party cookies and then reload the page.`);
+ // Never return
+ });
+ }
+ }
+ })
+
+ .then(() => this.setStatus("Creating storage"))
+ .then(() => {
+ return this.app.storage.initialize();
+ })
+
+ .then(() => this.setStatus("Initializing libraries"))
+ .then(() => this.app.analytics.initialize())
+ .then(() => this.app.gameAnalytics.initialize())
+
+ .then(() => this.setStatus("Initializing settings"))
+ .then(() => {
+ return this.app.settings.initialize();
+ })
+
+ .then(() => {
+ // Initialize fullscreen
+ if (this.app.platformWrapper.getSupportsFullscreen()) {
+ this.app.platformWrapper.setFullscreen(this.app.settings.getIsFullScreen());
+ }
+ })
+
+ .then(() => this.setStatus("Initializing language"))
+ .then(() => {
+ if (this.app.settings.getLanguage() === "auto-detect") {
+ const language = autoDetectLanguageId();
+ logger.log("Setting language to", language);
+ return this.app.settings.updateLanguage(language);
+ }
+ })
+ .then(() => {
+ const language = this.app.settings.getLanguage();
+ updateApplicationLanguage(language);
+ })
+
+ .then(() => this.setStatus("Initializing sounds"))
+ .then(() => {
+ // Notice: We don't await the sounds loading itself
+ return this.app.sound.initialize();
+ })
+
+ .then(() => {
+ this.app.backgroundResourceLoader.startLoading();
+ })
+
+ .then(() => this.setStatus("Initializing restrictions"))
+ .then(() => {
+ return this.app.restrictionMgr.initialize();
+ })
+
+ .then(() => this.setStatus("Initializing savegame"))
+ .then(() => {
+ return this.app.savegameMgr.initialize().catch(err => {
+ logger.error("Failed to initialize savegames:", err);
+ alert(
+ "Your savegames failed to load, it seems your data files got corrupted. I'm so sorry!\n\n(This can happen if your pc crashed while a game was saved).\n\nYou can try re-importing your savegames."
+ );
+ return this.app.savegameMgr.writeAsync();
+ });
+ })
+
+ .then(() => this.setStatus("Downloading resources"))
+ .then(() => {
+ return this.app.backgroundResourceLoader.getPromiseForBareGame();
+ })
+
+ .then(() => this.setStatus("Checking changelog"))
+ .then(() => {
+ if (G_IS_DEV && globalConfig.debug.disableUpgradeNotification) {
+ return;
+ }
+
+ return this.app.storage
+ .readFileAsync("lastversion.bin")
+ .catch(err => {
+ logger.warn("Failed to read lastversion:", err);
+ return G_BUILD_VERSION;
+ })
+ .then(version => {
+ logger.log("Last version:", version, "App version:", G_BUILD_VERSION);
+ this.app.storage.writeFileAsync("lastversion.bin", G_BUILD_VERSION);
+ return version;
+ })
+ .then(version => {
+ let changelogEntries = [];
+ logger.log("Last seen version:", version);
+
+ for (let i = 0; i < CHANGELOG.length; ++i) {
+ if (CHANGELOG[i].version === version) {
+ break;
+ }
+ changelogEntries.push(CHANGELOG[i]);
+ }
+ if (changelogEntries.length === 0) {
+ return;
+ }
+
+ let dialogHtml = T.dialogs.updateSummary.desc;
+ for (let i = 0; i < changelogEntries.length; ++i) {
+ const entry = changelogEntries[i];
+ dialogHtml += `
+
+
${entry.version}
+
${entry.date}
+
+ ${entry.entries.map(text => `${text} `).join("")}
+
+
+ `;
+ }
+
+ return new Promise(resolve => {
+ this.dialogs.showInfo(T.dialogs.updateSummary.title, dialogHtml).ok.add(resolve);
+ });
+ });
+ })
+
+ .then(() => this.setStatus("Launching"))
+ .then(
+ () => {
+ this.moveToState("MainMenuState");
+ },
+ err => {
+ this.showFailMessage(err);
+ }
+ );
+ }
+
+ update() {
+ const now = performance.now();
+ if (now - this.lastHintShown > this.nextHintDuration) {
+ this.lastHintShown = now;
+ const hintText = getRandomHint();
+
+ this.hintsText.innerHTML = hintText;
+
+ /**
+ * Compute how long the user will need to read the hint.
+ * We calculate with 130 words per minute, with an average of 5 chars
+ * that is 650 characters / minute
+ */
+ this.nextHintDuration = Math.max(2500, (hintText.length / 650) * 60 * 1000);
+ }
+ }
+
+ onRender() {
+ this.update();
+ }
+
+ onBackgroundTick() {
+ this.update();
+ }
+
+ /**
+ *
+ * @param {string} text
+ */
+ setStatus(text) {
+ logger.log("✅ " + text);
+ this.currentStatus = text;
+ this.statusText.innerText = text;
+ return Promise.resolve();
+ }
+
+ showFailMessage(text) {
+ logger.error("App init failed:", text);
+
+ const email = "bugs@shapez.io";
+
+ const subElement = document.createElement("div");
+ subElement.classList.add("failureBox");
+
+ subElement.innerHTML = `
+
+
+
+
+
+
+ ${this.currentStatus} failed:
+
+
+ Please send me an email with steps to reproduce and what you did before this happened:
+
${email}
+
+
+
+ Reset App
+ Build ${G_BUILD_VERSION} @ ${G_BUILD_COMMIT_HASH}
+
+
+ `;
+
+ this.htmlElement.classList.add("failure");
+ this.htmlElement.appendChild(subElement);
+
+ const resetBtn = subElement.querySelector("button.resetApp");
+ this.trackClicks(resetBtn, this.showResetConfirm);
+
+ this.hintsText.remove();
+ }
+
+ showResetConfirm() {
+ if (confirm("Are you sure you want to reset the app? This will delete all your savegames!")) {
+ this.resetApp();
+ }
+ }
+
+ resetApp() {
+ this.app.settings
+ .resetEverythingAsync()
+ .then(() => {
+ this.app.savegameMgr.resetEverythingAsync();
+ })
+ .then(() => {
+ this.app.settings.resetEverythingAsync();
+ })
+ .then(() => {
+ window.location.reload();
+ });
+ }
+}
diff --git a/src/js/states/settings.js b/src/js/states/settings.js
index 5e22492a..36dee5d8 100644
--- a/src/js/states/settings.js
+++ b/src/js/states/settings.js
@@ -1,169 +1,169 @@
-import { TextualGameState } from "../core/textual_game_state";
-import { formatSecondsToTimeAgo } from "../core/utils";
-import { allApplicationSettings, enumCategories } from "../profile/application_settings";
-import { T } from "../translations";
-
-export class SettingsState extends TextualGameState {
- constructor() {
- super("SettingsState");
- }
-
- getStateHeaderTitle() {
- return T.settings.title;
- }
-
- getMainContentHTML() {
- return `
-
-
-
-
- ${this.getSettingsHtml()}
-
-
- `;
- }
-
- getCategoryButtonsHtml() {
- return Object.keys(enumCategories)
- .map(key => enumCategories[key])
- .map(
- category =>
- `
-
- ${T.settings.categories[category]}
-
- `
- )
- .join("");
- }
-
- getSettingsHtml() {
- const categoriesHTML = {};
-
- Object.keys(enumCategories).forEach(key => {
- const catName = enumCategories[key];
- categoriesHTML[catName] = `
`;
- });
-
- for (let i = 0; i < allApplicationSettings.length; ++i) {
- const setting = allApplicationSettings[i];
-
- categoriesHTML[setting.categoryId] += setting.getHtml();
- }
-
- return Object.keys(categoriesHTML)
- .map(k => categoriesHTML[k] + "
")
- .join("");
- }
-
- renderBuildText() {
- const labelVersion = this.htmlElement.querySelector(".buildVersion");
- const lastBuildMs = new Date().getTime() - G_BUILD_TIME;
- const lastBuildText = formatSecondsToTimeAgo(lastBuildMs / 1000.0);
-
- const version = T.settings.versionBadges[G_APP_ENVIRONMENT];
-
- labelVersion.innerHTML = `
-
- ${G_BUILD_VERSION} @ ${version} @ ${G_BUILD_COMMIT_HASH}
-
-
- ${T.settings.buildDate.replace("", lastBuildText)} `;
- }
-
- onEnter(payload) {
- this.renderBuildText();
- this.trackClicks(this.htmlElement.querySelector(".about"), this.onAboutClicked, {
- preventDefault: false,
- });
-
- const keybindingsButton = this.htmlElement.querySelector(".editKeybindings");
-
- if (keybindingsButton) {
- this.trackClicks(keybindingsButton, this.onKeybindingsClicked, { preventDefault: false });
- }
-
- this.initSettings();
- this.initCategoryButtons();
-
- this.htmlElement.querySelector(".category").classList.add("active");
- this.htmlElement.querySelector(".categoryButton").classList.add("active");
- }
-
- setActiveCategory(category) {
- const previousCategory = this.htmlElement.querySelector(".category.active");
- const previousCategoryButton = this.htmlElement.querySelector(".categoryButton.active");
-
- if (previousCategory.getAttribute("data-category") == category) {
- return;
- }
-
- previousCategory.classList.remove("active");
- previousCategoryButton.classList.remove("active");
-
- const newCategory = this.htmlElement.querySelector("[data-category='" + category + "']");
- const newCategoryButton = this.htmlElement.querySelector("[data-category-btn='" + category + "']");
-
- newCategory.classList.add("active");
- newCategoryButton.classList.add("active");
- }
-
- initSettings() {
- allApplicationSettings.forEach(setting => {
- /** @type {HTMLElement} */
- const element = this.htmlElement.querySelector("[data-setting='" + setting.id + "']");
- setting.bind(this.app, element, this.dialogs);
- setting.syncValueToElement();
- this.trackClicks(
- element,
- () => {
- setting.modify();
- },
- { preventDefault: false }
- );
- });
- }
-
- initCategoryButtons() {
- Object.keys(enumCategories).forEach(key => {
- const category = enumCategories[key];
- const button = this.htmlElement.querySelector("[data-category-btn='" + category + "']");
- this.trackClicks(
- button,
- () => {
- this.setActiveCategory(category);
- },
- { preventDefault: false }
- );
- });
- }
-
- onAboutClicked() {
- this.moveToStateAddGoBack("AboutState");
- }
-
- onKeybindingsClicked() {
- this.moveToStateAddGoBack("KeybindingsState");
- }
-}
+import { TextualGameState } from "../core/textual_game_state";
+import { formatSecondsToTimeAgo } from "../core/utils";
+import { allApplicationSettings, enumCategories } from "../profile/application_settings";
+import { T } from "../translations";
+
+export class SettingsState extends TextualGameState {
+ constructor() {
+ super("SettingsState");
+ }
+
+ getStateHeaderTitle() {
+ return T.settings.title;
+ }
+
+ getMainContentHTML() {
+ return `
+
+
+
+
+ ${this.getSettingsHtml()}
+
+
+ `;
+ }
+
+ getCategoryButtonsHtml() {
+ return Object.keys(enumCategories)
+ .map(key => enumCategories[key])
+ .map(
+ category =>
+ `
+
+ ${T.settings.categories[category]}
+
+ `
+ )
+ .join("");
+ }
+
+ getSettingsHtml() {
+ const categoriesHTML = {};
+
+ Object.keys(enumCategories).forEach(key => {
+ const catName = enumCategories[key];
+ categoriesHTML[catName] = `
`;
+ });
+
+ for (let i = 0; i < allApplicationSettings.length; ++i) {
+ const setting = allApplicationSettings[i];
+
+ categoriesHTML[setting.categoryId] += setting.getHtml(this.app);
+ }
+
+ return Object.keys(categoriesHTML)
+ .map(k => categoriesHTML[k] + "
")
+ .join("");
+ }
+
+ renderBuildText() {
+ const labelVersion = this.htmlElement.querySelector(".buildVersion");
+ const lastBuildMs = new Date().getTime() - G_BUILD_TIME;
+ const lastBuildText = formatSecondsToTimeAgo(lastBuildMs / 1000.0);
+
+ const version = T.settings.versionBadges[G_APP_ENVIRONMENT];
+
+ labelVersion.innerHTML = `
+
+ ${G_BUILD_VERSION} @ ${version} @ ${G_BUILD_COMMIT_HASH}
+
+
+ ${T.settings.buildDate.replace("", lastBuildText)} `;
+ }
+
+ onEnter(payload) {
+ this.renderBuildText();
+ this.trackClicks(this.htmlElement.querySelector(".about"), this.onAboutClicked, {
+ preventDefault: false,
+ });
+
+ const keybindingsButton = this.htmlElement.querySelector(".editKeybindings");
+
+ if (keybindingsButton) {
+ this.trackClicks(keybindingsButton, this.onKeybindingsClicked, { preventDefault: false });
+ }
+
+ this.initSettings();
+ this.initCategoryButtons();
+
+ this.htmlElement.querySelector(".category").classList.add("active");
+ this.htmlElement.querySelector(".categoryButton").classList.add("active");
+ }
+
+ setActiveCategory(category) {
+ const previousCategory = this.htmlElement.querySelector(".category.active");
+ const previousCategoryButton = this.htmlElement.querySelector(".categoryButton.active");
+
+ if (previousCategory.getAttribute("data-category") == category) {
+ return;
+ }
+
+ previousCategory.classList.remove("active");
+ previousCategoryButton.classList.remove("active");
+
+ const newCategory = this.htmlElement.querySelector("[data-category='" + category + "']");
+ const newCategoryButton = this.htmlElement.querySelector("[data-category-btn='" + category + "']");
+
+ newCategory.classList.add("active");
+ newCategoryButton.classList.add("active");
+ }
+
+ initSettings() {
+ allApplicationSettings.forEach(setting => {
+ /** @type {HTMLElement} */
+ const element = this.htmlElement.querySelector("[data-setting='" + setting.id + "']");
+ setting.bind(this.app, element, this.dialogs);
+ setting.syncValueToElement();
+ this.trackClicks(
+ element,
+ () => {
+ setting.modify();
+ },
+ { preventDefault: false }
+ );
+ });
+ }
+
+ initCategoryButtons() {
+ Object.keys(enumCategories).forEach(key => {
+ const category = enumCategories[key];
+ const button = this.htmlElement.querySelector("[data-category-btn='" + category + "']");
+ this.trackClicks(
+ button,
+ () => {
+ this.setActiveCategory(category);
+ },
+ { preventDefault: false }
+ );
+ });
+ }
+
+ onAboutClicked() {
+ this.moveToStateAddGoBack("AboutState");
+ }
+
+ onKeybindingsClicked() {
+ this.moveToStateAddGoBack("KeybindingsState");
+ }
+}
diff --git a/src/js/tsconfig.json b/src/js/tsconfig.json
index 8a151000..7ecc605a 100644
--- a/src/js/tsconfig.json
+++ b/src/js/tsconfig.json
@@ -3,7 +3,7 @@
/* Basic Options */
"target": "es6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */,
"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
- "lib": ["DOM","ES2018"], /* Specify library files to be included in the compilation. */
+ "lib": ["DOM", "ES2018"] /* Specify library files to be included in the compilation. */,
"allowJs": true /* Allow javascript files to be compiled. */,
"checkJs": true /* Report errors in .js files. */,
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
diff --git a/sync-translations.js b/sync-translations.js
index d6b87278..356a4aba 100644
--- a/sync-translations.js
+++ b/sync-translations.js
@@ -1,82 +1,81 @@
-// Synchronizes all translations
-
-const fs = require("fs");
-const matchAll = require("match-all");
-const path = require("path");
-const YAWN = require("yawn-yaml/cjs");
-const YAML = require("yaml");
-
-const files = fs
- .readdirSync(path.join(__dirname, "translations"))
- .filter(x => x.endsWith(".yaml"))
- .filter(x => x.indexOf("base-en") < 0);
-
-const originalContents = fs
- .readFileSync(path.join(__dirname, "translations", "base-en.yaml"))
- .toString("utf-8");
-
-const original = YAML.parse(originalContents);
-
-const placeholderRegexp = /[[<]([a-zA-Z_0-9]+)[\]<]/gi;
-
-function match(originalObj, translatedObj, path = "/") {
- for (const key in originalObj) {
- if (!translatedObj.hasOwnProperty(key)) {
- console.warn(" | Missing key", path + key);
- translatedObj[key] = originalObj[key];
- continue;
- }
- const valueOriginal = originalObj[key];
- const valueMatching = translatedObj[key];
- if (typeof valueOriginal !== typeof valueMatching) {
- console.warn(" | MISMATCHING type (obj|non-obj) in", path + key);
- continue;
- }
-
- if (typeof valueOriginal === "object") {
- match(valueOriginal, valueMatching, path + key + "/");
- } else if (typeof valueOriginal === "string") {
- // todo
- const originalPlaceholders = matchAll(valueOriginal, placeholderRegexp).toArray();
- const translatedPlaceholders = matchAll(valueMatching, placeholderRegexp).toArray();
-
- if (originalPlaceholders.length !== translatedPlaceholders.length) {
- console.warn(
- " | Mismatching placeholders in",
- path + key,
- "->",
- originalPlaceholders,
- "vs",
- translatedPlaceholders
- );
- translatedObj[key] = originalObj[key];
- continue;
- }
- } else {
- console.warn(" | Unknown type: ", typeof valueOriginal);
- }
-
- // const matching = translatedObj[key];
- }
-
- for (const key in translatedObj) {
- if (!originalObj.hasOwnProperty(key)) {
- console.warn(" | Obsolete key", path + key);
- delete translatedObj[key];
- }
- }
-}
-
-for (let i = 0; i < files.length; ++i) {
- const filePath = path.join(__dirname, "translations", files[i]);
- console.log("Processing", files[i]);
- const translatedContents = fs.readFileSync(filePath).toString("utf-8");
- const translated = YAML.parse(translatedContents);
- const handle = new YAWN(translatedContents);
-
- const json = handle.json;
- match(original, json, "/");
- handle.json = json;
-
- fs.writeFileSync(filePath, handle.yaml, "utf-8");
-}
+// Synchronizes all translations
+
+const fs = require("fs");
+const matchAll = require("match-all");
+const path = require("path");
+const YAML = require("yaml");
+
+const files = fs
+ .readdirSync(path.join(__dirname, "translations"))
+ .filter(x => x.endsWith(".yaml"))
+ .filter(x => x.indexOf("base-en") < 0);
+
+const originalContents = fs
+ .readFileSync(path.join(__dirname, "translations", "base-en.yaml"))
+ .toString("utf-8");
+
+const original = YAML.parse(originalContents);
+
+const placeholderRegexp = /[[<]([a-zA-Z_0-9/-_]+?)[\]>]/gi;
+
+function match(originalObj, translatedObj, path = "/") {
+ for (const key in originalObj) {
+ if (!translatedObj.hasOwnProperty(key)) {
+ console.warn(" | Missing key", path + key);
+ translatedObj[key] = originalObj[key];
+ continue;
+ }
+ const valueOriginal = originalObj[key];
+ const valueMatching = translatedObj[key];
+ if (typeof valueOriginal !== typeof valueMatching) {
+ console.warn(" | MISMATCHING type (obj|non-obj) in", path + key);
+ translatedObj[key] = originalObj[key];
+ continue;
+ }
+
+ if (typeof valueOriginal === "object") {
+ match(valueOriginal, valueMatching, path + key + "/");
+ } else if (typeof valueOriginal === "string") {
+ // @todo
+ const originalPlaceholders = matchAll(valueOriginal, placeholderRegexp).toArray();
+ const translatedPlaceholders = matchAll(valueMatching, placeholderRegexp).toArray();
+
+ if (originalPlaceholders.length !== translatedPlaceholders.length) {
+ console.warn(
+ " | Mismatching placeholders in",
+ path + key,
+ "->",
+ originalPlaceholders,
+ "vs",
+ translatedPlaceholders
+ );
+ translatedObj[key] = originalObj[key];
+ continue;
+ }
+ } else {
+ console.warn(" | Unknown type: ", typeof valueOriginal);
+ }
+ }
+
+ for (const key in translatedObj) {
+ if (!originalObj.hasOwnProperty(key)) {
+ console.warn(" | Obsolete key", path + key);
+ delete translatedObj[key];
+ }
+ }
+}
+
+for (let i = 0; i < files.length; ++i) {
+ const filePath = path.join(__dirname, "translations", files[i]);
+ console.log("Processing", files[i]);
+ const translatedContents = fs.readFileSync(filePath).toString("utf-8");
+
+ const json = YAML.parse(translatedContents);
+ match(original, json, "/");
+
+ const stringified = YAML.stringify(json, {
+ indent: 4,
+ simpleKeys: true,
+ });
+ fs.writeFileSync(filePath, stringified, "utf-8");
+}
diff --git a/translations/.gitignore b/translations/.gitignore
new file mode 100644
index 00000000..6f7f420d
--- /dev/null
+++ b/translations/.gitignore
@@ -0,0 +1 @@
+tmp
diff --git a/translations/README.md b/translations/README.md
index 7695f022..020c7ca6 100644
--- a/translations/README.md
+++ b/translations/README.md
@@ -1,80 +1,83 @@
-# Translations
-
-The base language is English and can be found [here](base-en.yaml).
-
-## Languages
-
-- [German](base-de.yaml)
-- [French](base-fr.yaml)
-- [Korean](base-kor.yaml)
-- [Dutch](base-nl.yaml)
-- [Polish](base-pl.yaml)
-- [Portuguese (Brazil)](base-pt-BR.yaml)
-- [Portuguese (Portugal)](base-pt-PT.yaml)
-- [Russian](base-ru.yaml)
-- [Greek](base-el.yaml)
-- [Italian](base-it.yaml)
-- [Romanian](base-ro.yaml)
-- [Swedish](base-sv.yaml)
-- [Chinese (Simplified)](base-zh-CN.yaml)
-- [Chinese (Traditional)](base-zh-TW.yaml)
-- [Spanish](base-es.yaml)
-- [Hungarian](base-hu.yaml)
-- [Turkish](base-tr.yaml)
-- [Japanese](base-ja.yaml)
-- [Lithuanian](base-lt.yaml)
-- [Arabic](base-ar.yaml)
-- [Norwegian](base-no.yaml)
-- [Kroatian](base-hr.yaml)
-- [Danish](base-da.yaml)
-- [Finnish](base-fi.yaml)
-- [Catalan](base-cat.yaml)
-- [Slovenian](base-sl.yaml)
-- [Ukrainian](base-uk.yaml)
-- [Indonesian](base-ind.yaml)
-- [Serbian](base-sr.yaml)
-
-(If you want to translate into a new language, see below!)
-
-## Editing existing translations
-
-If you want to edit an existing translation (Fixing typos, Updating it to a newer version, etc), you can just use the github file editor to edit the file.
-
-- Click the language you want to edit from the list above
-- Click the small "edit" symbol on the top right
-
-
-
-- Do the changes you wish to do (Be sure **not** to translate placeholders! For example, `
minutes` should get ` Minuten` and **not** ` Minuten`!)
-
-- Click "Propose Changes"
-
-
-Short code:
-Local Name:
-```
-
-You can find the short code [here](https://www.science.co.il/language/Codes.php) (In column `Code 2`).
-
-PS: I'm super busy, but I'll give my best to do it quickly!
-
-## Updating a language to the latest version
-
-Run `yarn syncTranslations` in the root directory to synchronize all translations to the latest version! This will remove obsolete keys and add newly added keys. (Run `yarn` before to install packes).
+# Translations
+
+The base language is English and can be found [here](base-en.yaml).
+
+## Languages
+
+- [German](base-de.yaml)
+- [French](base-fr.yaml)
+- [Korean](base-kor.yaml)
+- [Dutch](base-nl.yaml)
+- [Polish](base-pl.yaml)
+- [Portuguese (Brazil)](base-pt-BR.yaml)
+- [Portuguese (Portugal)](base-pt-PT.yaml)
+- [Russian](base-ru.yaml)
+- [Greek](base-el.yaml)
+- [Italian](base-it.yaml)
+- [Romanian](base-ro.yaml)
+- [Swedish](base-sv.yaml)
+- [Chinese (Simplified)](base-zh-CN.yaml)
+- [Chinese (Traditional)](base-zh-TW.yaml)
+- [Spanish](base-es.yaml)
+- [Hungarian](base-hu.yaml)
+- [Turkish](base-tr.yaml)
+- [Japanese](base-ja.yaml)
+- [Lithuanian](base-lt.yaml)
+- [Arabic](base-ar.yaml)
+- [Norwegian](base-no.yaml)
+- [Kroatian](base-hr.yaml)
+- [Danish](base-da.yaml)
+- [Finnish](base-fi.yaml)
+- [Catalan](base-cat.yaml)
+- [Slovenian](base-sl.yaml)
+- [Ukrainian](base-uk.yaml)
+- [Indonesian](base-ind.yaml)
+- [Serbian](base-sr.yaml)
+- [Czech](base-cz.yaml)
+
+(If you want to translate into a new language, see below!)
+
+## Editing existing translations
+
+If you want to edit an existing translation (Fixing typos, updating it to a newer version, etc), you can just use the github file editor to edit the file.
+
+- Click the language you want to edit from the list above
+- Click the small "edit" symbol on the top right
+
+ minutes` should get ` Minuten` and **not** ` Minuten`!)
+
+- Click "Propose Changes"
+
+
+Short code:
+Local Name:
+```
+
+You can find the short code [here](https://www.science.co.il/language/Codes.php) (In column `Code 2`).
+
+PS: I'm super busy, but I'll give my best to do it quickly!
+
+## Updating a language to the latest version
+
+Run `yarn syncTranslations` in the root directory to synchronize all translations to the latest version! This will remove obsolete keys and add newly added keys. (Run `yarn` before to install packages).
diff --git a/translations/base-ar.yaml b/translations/base-ar.yaml
index 17d822d9..305c9b88 100644
--- a/translations/base-ar.yaml
+++ b/translations/base-ar.yaml
@@ -1,114 +1,62 @@
-#
-# GAME TRANSLATIONS
-#
-# Contributing:
-#
-# If you want to contribute, please make a pull request on this respository
-# and I will have a look.
-#
-# Placeholders:
-#
-# Do *not* replace placeholders! Placeholders have a special syntax like
-# `Hotkey: `. They are encapsulated within angle brackets. The correct
-# translation for this one in German for example would be: `Taste: ` (notice
-# how the placeholder stayed '' and was not replaced!)
-#
-# Adding a new language:
-#
-# If you want to add a new language, ask me in the Discord and I will setup
-# the basic structure so the game also detects it.
-#
-
----
steamPage:
- # This is the short text appearing on the steam page
- shortText: shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+ shortText: لعبة شيبز (أشكال) هي لعبة تدور حول بناء مصانع وتوصيلها حتى تقوم بشكل
+ .آلي بصناعة أشكال مختلفة تزداد تعقيدا في خريطة لانهائية.
+ discordLinkShort: Official Discord
+ intro: >-
+ لعبة شيبز (أشكال) هي لعبة مريحة تقوم فيها ببناء مصانع ووتشغيلها آليا
+ لصناعة أشكال هندسية.
- # This is the text shown above the Discord link
- discordLink: Official Discord - Chat with me!
+ مع التقدم في المستوى، تزداد الأشكال تعقيداً، فيتوجب عليك التوسع في الخريطة اللانهائية، وذلك ليس كافياً للتقدم في مستوى اللعبة حيث عليك صناعة المزيد بأضعاف مضاعفة لتلبية الطلب، الشيء
+ الوحيد الذي يمكنه مساعدتك هو التوسع.
- # This is the long description for the steam page - It is contained here so you can help to translate it, and I will regulary update the store page.
- # NOTICE:
- # - Do not translate the first line (This is the gif image at the start of the store)
- # - Please keep the markup (Stuff like [b], [list] etc) in the same format
- longText: >-
- [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
+ بينما في البداية تقوم بصناعة أشكال مختلفة، تتطلب منك المراحل المتقدمة تلوين هذه الأشكال، حيث يتوجب عليك استخراج وخلط الألوان.
- shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+ عند شراءك اللعبة على ستيم (Steam) تحصل على الإصدار الكامل للعبة، ولكن يمكن أيضاً لعبة نسخة تجريبية على موقع shapez.io ثم يمكنك القرار لاحقا
+ title_advantages: ميزات نسخة الحاسوب
+ advantages:
+ - 12 New Level for a total of 26 levels
+ - 18 New Buildings for a fully automated factory!
+ - Unlimited Upgrade Tiers for many hours of fun!
+ - Wires Update for an entirely new dimension!
+ - Dark Mode !
+ - Unlimited Savegames
+ - Unlimited Markers
+ - Support me! ❤️
+ title_future: Planned Content
+ planned:
+ - Blueprint Library (Standalone Exclusive)
+ - Steam Achievements
+ - Puzzle Mode
+ - Minimap
+ - Mods
+ - Sandbox mode
+ - ... and a lot more!
+ title_open_source: This game is open source!
+ title_links: Links
+ links:
+ discord: Official Discord
+ roadmap: Roadmap
+ subreddit: Subreddit
+ source_code: Source code (GitHub)
+ translate: Help translate
+ text_open_source: >-
+ Anybody can contribute, I'm actively involved in the community and
+ attempt to review all suggestions and take feedback into consideration
+ where possible.
- Upon delivering the requested shapes you'll progress within the game and unlock upgrades to speed up your factory.
-
- As the demand for shapes increases, you'll have to scale up your factory to meet the demand - Don't forget about resources though, you'll have to expand across the [b]infinite map[/b]!
-
- Soon you'll have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with them to satisfy the demand.
-
- This game features 18 progressive levels (Which should already keep you busy for hours!) but I'm constantly adding new content - There's a lot planned!
-
- Purchasing the game gives you access to the standalone version which has additional features, and you'll also receive access to newly developed features.
-
- [b]Standalone Advantages[/b]
-
- [list]
- [*] Dark Mode
- [*] Unlimited Waypoints
- [*] Unlimited Savegames
- [*] Additional settings
- [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
- [*] Coming soon: More Levels
- [*] Allows me to further develop shapez.io ❤️
- [/list]
-
- [b]Future Updates[/b]
-
- I am updating the game often and trying to push an update at least once every week!
-
- [list]
- [*] Different maps and challenges (e.g. maps with obstacles)
- [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
- [*] A story mode where buildings have a cost
- [*] Configurable map generator (Configure resource/shape size/density, seed and more)
- [*] Additional types of shapes
- [*] Performance improvements (The game already runs pretty well!)
- [*] And much more!
- [/list]
-
- [b]This game is open source![/b]
-
- Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
Be sure to check out my trello board for the full roadmap!
-
- [b]Links[/b]
-
- [list]
- [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
- [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
- [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
- [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
- [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
- [/list]
-
global:
loading: Loading
error: Error
-
- # How big numbers are rendered, e.g. "10,000"
thousandsDivider: ","
-
- # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
- decimalSeparator: "."
-
- # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
+ decimalSeparator: .
suffix:
thousands: k
millions: M
billions: B
trillions: T
-
- # Shown for infinitely big numbers
infinite: inf
-
time:
- # Used for formatting past time dates
oneSecondAgo: one second ago
xSecondsAgo: seconds ago
oneMinuteAgo: one minute ago
@@ -117,14 +65,10 @@ global:
xHoursAgo: hours ago
oneDayAgo: one day ago
xDaysAgo: days ago
-
- # Short formats for times, e.g. '5h 23m'
secondsShort: s
minutesAndSecondsShort: m s
hoursAndMinutesShort: h m
-
xMinutes: minutes
-
keys:
tab: TAB
control: CTRL
@@ -132,13 +76,9 @@ global:
escape: ESC
shift: SHIFT
space: SPACE
-
demoBanners:
- # This is the "advertisement" shown in the main menu and other various places
title: Demo Version
- intro: >-
- Get the standalone to unlock all features!
-
+ intro: Get the standalone to unlock all features!
mainMenu:
play: Play
continue: Continue
@@ -150,14 +90,11 @@ mainMenu:
discordLink: Official Discord Server
helpTranslate: Help translate!
madeBy: Made by
-
- # This is shown when using firefox and other browsers which are not supported.
- browserWarning: >-
- Sorry, but the game is known to run slow on your browser! Get the standalone version or download chrome for the full experience.
-
+ browserWarning: Sorry, but the game is known to run slow on your browser! Get
+ the standalone version or download chrome for the full experience.
savegameLevel: Level
savegameLevelUnknown: Unknown Level
-
+ savegameUnnamed: Unnamed
dialogs:
buttons:
ok: OK
@@ -171,112 +108,104 @@ dialogs:
viewUpdate: View Update
showUpgrades: Show Upgrades
showKeybindings: Show Keybindings
-
importSavegameError:
title: Import Error
- text: >-
- Failed to import your savegame:
-
+ text: "Failed to import your savegame:"
importSavegameSuccess:
title: Savegame Imported
- text: >-
- Your savegame has been successfully imported.
-
+ text: Your savegame has been successfully imported.
gameLoadFailure:
title: Game is broken
- text: >-
- Failed to load your savegame:
-
+ text: "Failed to load your savegame:"
confirmSavegameDelete:
title: Confirm deletion
- text: >-
- Are you sure you want to delete the game?
-
+ text: Are you sure you want to delete the following game?' at level ) which is not available in the demo. Consider getting the standalone version for the full experience!
-
+ desc: You tried to access a feature () which is not available in the
+ demo. Consider getting the standalone version for the full
+ experience!
oneSavegameLimit:
title: Limited savegames
- desc: You can only have one savegame at a time in the demo version. Please remove the existing one or get the standalone version!
-
+ desc: You can only have one savegame at a time in the demo version. Please
+ remove the existing one or get the standalone version!
updateSummary:
title: New update!
- desc: >-
- Here are the changes since you last played:
-
+ desc: "Here are the changes since you last played:"
upgradesIntroduction:
title: Unlock Upgrades
- desc: >-
- All shapes you produce can be used to unlock upgrades - Don't destroy your old factories!
- The upgrades tab can be found on the top right corner of the screen.
-
+ desc: All shapes you produce can be used to unlock upgrades - Don't
+ destroy your old factories! The upgrades tab can be found
+ on the top right corner of the screen.
massDeleteConfirm:
title: Confirm delete
- desc: >-
- You are deleting a lot of buildings ( to be exact)! Are you sure you want to do this?
-
+ desc: You are deleting a lot of buildings ( to be exact)! Are you sure
+ you want to do this?
massCutConfirm:
title: Confirm cut
- desc: >-
- You are cutting a lot of buildings ( to be exact)! Are you sure you want to do this?
-
+ desc: You are cutting a lot of buildings ( to be exact)! Are you sure you
+ want to do this?
massCutInsufficientConfirm:
title: Confirm cut
- desc: >-
- You can not afford to paste this area! Are you sure you want to cut it?
-
+ desc: You can not afford to paste this area! Are you sure you want to cut it?
blueprintsNotUnlocked:
title: Not unlocked yet
- desc: >-
- Complete level 12 to unlock Blueprints!
-
+ desc: Complete level 12 to unlock Blueprints!
keybindingsIntroduction:
title: Useful keybindings
- desc: >-
- This game has a lot of keybindings which make it easier to build big factories.
- Here are a few, but be sure to check out the keybindings !CTRL + Drag: Select an area.SHIFT: Hold to place multiple of one building.ALT: Invert orientation of placed belts.check out the
+ keybindings !CTRL +
+ Drag: Select an area.SHIFT:
+ Hold to place multiple of one building.ALT: Invert orientation of placed
+ belts.short key of a shape (Which you can generate here )
-
+ desc: Give it a meaningful name, you can also include a short
+ key of a shape (Which you can generate short key of a shape (Which you
+ can generate to cycle variants.
-
- # Shows the hotkey in the ui, e.g. "Hotkey: Q"
- hotkeyLabel: >-
- Hotkey:
-
+ hotkeyLabel: "Hotkey: "
infoTexts:
speed: Speed
range: Range
@@ -328,36 +246,21 @@ ingame:
oneItemPerSecond: 1 item / second
itemsPerSecond: items / s
itemsPerSecondDouble: (x2)
-
tiles: tiles
-
- # The notification when completing a level
levelCompleteNotification:
- # is replaced by the actual level, so this gets 'Level 03' for example.
levelTitle: Level
completed: Completed
unlockText: Unlocked !
buttonNextLevel: Next Level
-
- # Notifications on the lower right
notifications:
newUpgrade: A new upgrade is available!
gameSaved: Your game has been saved.
-
- # The "Upgrades" window
+ freeplayLevelComplete: Level has been completed!
shop:
title: Upgrades
buttonUnlock: Upgrade
-
- # Gets replaced to e.g. "Tier IX"
tier: Tier
-
- # The roman number for each tier
- tierLabels: [I, II, III, IV, V, VI, VII, VIII, IX, X]
-
maximumLevel: MAXIMUM LEVEL (Speed x)
-
- # The "Statistics" window
statistics:
title: Statistics
dataSources:
@@ -366,62 +269,110 @@ ingame:
description: Displaying amount of stored shapes in your central building.
produced:
title: Produced
- description: Displaying all shapes your whole factory produces, including intermediate products.
+ description: Displaying all shapes your whole factory produces, including
+ intermediate products.
delivered:
title: Delivered
description: Displaying shapes which are delivered to your central building.
noShapesProduced: No shapes have been produced so far.
-
- # Displays the shapes per minute, e.g. '523 / m'
- shapesPerMinute: / m
-
- # Settings menu, when you press "ESC"
+ shapesDisplayUnits:
+ second: / s
+ minute: / m
+ hour: / h
settingsMenu:
playtime: Playtime
-
buildingsPlaced: Buildings
beltsPlaced: Belts
-
- buttons:
- continue: Continue
- settings: Settings
- menu: Return to menu
-
- # Bottom left tutorial hints
tutorialHints:
title: Need help?
showHint: Show hint
hideHint: Close
-
- # When placing a blueprint
blueprintPlacer:
cost: Cost
-
- # Map markers
waypoints:
waypoints: Markers
hub: HUB
- description: Left-click a marker to jump to it, right-click to delete it. to create a marker from the current view, or right-click to create a marker at the selected location.
+ description: Left-click a marker to jump to it, right-click to delete
+ it. to create a marker from the current
+ view, or right-click to create a marker at the
+ selected location.
creationSuccessNotification: Marker has been created.
-
- # Shape viewer
shapeViewer:
title: Layers
empty: Empty
copyKey: Copy Key
-
- # Interactive tutorial
interactiveTutorial:
title: Tutorial
hints:
- 1_1_extractor: Place an extractor on top of a circle shape to extract it!
- 1_2_conveyor: >-
- Connect the extractor with a conveyor belt to your hub!Click and drag the belt with your mouse!
-
- 1_3_expand: >-
- This is NOT an idle game! Build more extractors and belts to finish the goal quicker.SHIFT to place multiple extractors, and use R to rotate them.
-
-# All shop upgrades
+ 1_1_extractor: Place an extractor on top of a circle
+ shape to extract it!
+ 1_2_conveyor: "Connect the extractor with a conveyor belt to
+ your hub!Click and drag the belt
+ with your mouse!"
+ 1_3_expand: "This is NOT an idle game! Build more extractors
+ and belts to finish the goal quicker.SHIFT to place multiple extractors, and use
+ R to rotate them."
+ 2_1_place_cutter: "Now place a Cutter to cut the circles in two
+ halves!top to
+ bottom regardless of its orientation."
+ 2_2_place_trash: The cutter can clog and stall !trash to get rid of the currently (!) not
+ needed waste.
+ 2_3_more_cutters: "Good job! Now place 2 more cutters to speed
+ up this slow process!0-9
+ hotkeys to access buildings faster!"
+ 3_1_rectangles: "Now let's extract some rectangles! Build 4
+ extractors and connect them to the hub.SHIFT while dragging a belt to activate
+ the belt planner!"
+ 21_1_place_quad_painter: Place the quad painter and get some
+ circles , white and
+ red color!
+ 21_2_switch_to_wires: Switch to the wires layer by pressing
+ E !connect all four
+ inputs of the painter with cables!
+ 21_3_place_button: Awesome! Now place a Switch and connect it
+ with wires!
+ 21_4_press_button: "Press the switch to make it emit a truthy
+ signal and thus activate the painter. Miners
+ limited_items: Limited to
+ watermark:
+ title: Demo version
+ desc: Click here to see the Steam version advantages!
+ get_on_steam: Get on steam
+ standaloneAdvantages:
+ title: Get the full version!
+ no_thanks: No, thanks!
+ points:
+ levels:
+ title: 12 New Levels
+ desc: For a total of 26 levels!
+ buildings:
+ title: 18 New Buildings
+ desc: Fully automate your factory!
+ savegames:
+ title: ∞ Savegames
+ desc: As many as your heart desires!
+ upgrades:
+ title: ∞ Upgrade Tiers
+ desc: This demo version has only 5!
+ markers:
+ title: ∞ Markers
+ desc: Never get lost in your factory!
+ wires:
+ title: Wires
+ desc: An entirely new dimension!
+ darkmode:
+ title: Dark Mode
+ desc: Stop hurting your eyes!
+ support:
+ title: Support me
+ desc: I develop it in my spare time!
shopUpgrades:
belt:
name: Belts, Distributor & Tunnels
@@ -435,249 +386,386 @@ shopUpgrades:
painting:
name: Mixing & Painting
description: Speed x → x 
diff --git a/artwork/README.md b/artwork/README.md
deleted file mode 100644
index dab59a98..00000000
--- a/artwork/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The artwork can be found here:
-
-https://github.com/tobspr/shapez.io-artwork
diff --git a/electron/index.js b/electron/index.js
index 7b9377df..91ab8e9e 100644
--- a/electron/index.js
+++ b/electron/index.js
@@ -4,7 +4,7 @@ const { app, BrowserWindow, Menu, MenuItem, session } = require("electron");
const path = require("path");
const url = require("url");
const childProcess = require("child_process");
-const { ipcMain } = require("electron");
+const { ipcMain, shell } = require("electron");
const fs = require("fs");
const isDev = process.argv.indexOf("--dev") >= 0;
const isLocal = process.argv.indexOf("--local") >= 0;
@@ -67,11 +67,7 @@ function createWindow() {
win.webContents.on("new-window", (event, pth) => {
event.preventDefault();
- if (process.platform == "win32") {
- childProcess.execSync("start " + pth);
- } else if (process.platform == "linux") {
- childProcess.execSync("xdg-open " + pth);
- }
+ shell.openExternal(pth);
});
win.on("closed", () => {
diff --git a/electron/package.json b/electron/package.json
index a67249a0..c8d3a124 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -1,16 +1,16 @@
-{
- "name": "electron",
- "version": "1.0.0",
- "main": "index.js",
- "license": "MIT",
- "private": true,
- "scripts": {
- "startDev": "electron --disable-direct-composition --in-process-gpu . --dev --local",
- "startDevGpu": "electron --enable-gpu-rasterization --enable-accelerated-2d-canvas --num-raster-threads=8 --enable-zero-copy . --dev --local",
- "start": "electron --disable-direct-composition --in-process-gpu ."
- },
- "devDependencies": {
- "electron": "^6.1.12"
- },
- "dependencies": {}
-}
+{
+ "name": "electron",
+ "version": "1.0.0",
+ "main": "index.js",
+ "license": "MIT",
+ "private": true,
+ "scripts": {
+ "startDev": "electron --disable-direct-composition --in-process-gpu . --dev --local",
+ "startDevGpu": "electron --enable-gpu-rasterization --enable-accelerated-2d-canvas --num-raster-threads=8 --enable-zero-copy . --dev --local",
+ "start": "electron --disable-direct-composition --in-process-gpu ."
+ },
+ "devDependencies": {
+ "electron": "10.1.3"
+ },
+ "dependencies": {}
+}
diff --git a/electron/yarn.lock b/electron/yarn.lock
index 01214c92..fa92ec46 100644
--- a/electron/yarn.lock
+++ b/electron/yarn.lock
@@ -1,961 +1,572 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/node@^10.12.18":
- version "10.17.24"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.24.tgz#c57511e3a19c4b5e9692bb2995c40a3a52167944"
- integrity sha512-5SCfvCxV74kzR3uWgTYiGxrd69TbT1I6+cMx1A5kEly/IVveJBimtAMlXiEyVFn5DvUFewQWxOOiJhlxeQwxgA==
-
-ajv@^6.5.5:
- version "6.12.2"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
- integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
- dependencies:
- fast-deep-equal "^3.1.1"
- fast-json-stable-stringify "^2.0.0"
- json-schema-traverse "^0.4.1"
- uri-js "^4.2.2"
-
-ansi-regex@^2.0.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
- integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-array-find-index@^1.0.1:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
- integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
-
-asn1@~0.2.3:
- version "0.2.4"
- resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
- integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
- dependencies:
- safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
- integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-asynckit@^0.4.0:
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
- integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-aws-sign2@~0.7.0:
- version "0.7.0"
- resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
- integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.8.0:
- version "1.9.1"
- resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
- integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
-
-bcrypt-pbkdf@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
- integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
- dependencies:
- tweetnacl "^0.14.3"
-
-buffer-from@^1.0.0:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
- integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
-camelcase-keys@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
- integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
- dependencies:
- camelcase "^2.0.0"
- map-obj "^1.0.0"
-
-camelcase@^2.0.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
- integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
-
-caseless@~0.12.0:
- version "0.12.0"
- resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
- integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
-code-point-at@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
- integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
-combined-stream@^1.0.6, combined-stream@~1.0.6:
- version "1.0.8"
- resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
- integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
- dependencies:
- delayed-stream "~1.0.0"
-
-concat-stream@1.6.2:
- version "1.6.2"
- resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
- integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
- dependencies:
- buffer-from "^1.0.0"
- inherits "^2.0.3"
- readable-stream "^2.2.2"
- typedarray "^0.0.6"
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
- integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-currently-unhandled@^0.4.1:
- version "0.4.1"
- resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
- integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
- dependencies:
- array-find-index "^1.0.1"
-
-dashdash@^1.12.0:
- version "1.14.1"
- resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
- integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
- dependencies:
- assert-plus "^1.0.0"
-
-debug@2.6.9, debug@^2.1.3, debug@^2.2.0:
- version "2.6.9"
- resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
- integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
- dependencies:
- ms "2.0.0"
-
-debug@^3.0.0:
- version "3.2.6"
- resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
- integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
- dependencies:
- ms "^2.1.1"
-
-decamelize@^1.1.2:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
- integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-deep-extend@^0.6.0:
- version "0.6.0"
- resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
- integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
-delayed-stream@~1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
- integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-ecc-jsbn@~0.1.1:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
- integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
- dependencies:
- jsbn "~0.1.0"
- safer-buffer "^2.1.0"
-
-electron-download@^4.1.0:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-4.1.1.tgz#02e69556705cc456e520f9e035556ed5a015ebe8"
- integrity sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg==
- dependencies:
- debug "^3.0.0"
- env-paths "^1.0.0"
- fs-extra "^4.0.1"
- minimist "^1.2.0"
- nugget "^2.0.1"
- path-exists "^3.0.0"
- rc "^1.2.1"
- semver "^5.4.1"
- sumchecker "^2.0.2"
-
-electron@^6.1.12:
- version "6.1.12"
- resolved "https://registry.yarnpkg.com/electron/-/electron-6.1.12.tgz#a7aee6dfa75b57f32b3645ef8e14dcef6d5f31a9"
- integrity sha512-RUPM8xJfTcm53V9EKMBhvpLu1+CQkmuvWDmVCypR5XbUG1OOrOLiKl0CqUZ9+tEDuOmC+DmzmJP2MZXScBU5IA==
- dependencies:
- "@types/node" "^10.12.18"
- electron-download "^4.1.0"
- extract-zip "^1.0.3"
-
-env-paths@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0"
- integrity sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=
-
-error-ex@^1.2.0:
- version "1.3.2"
- resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
- integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
- dependencies:
- is-arrayish "^0.2.1"
-
-extend@~3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
- integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-extract-zip@^1.0.3:
- version "1.6.7"
- resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9"
- integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=
- dependencies:
- concat-stream "1.6.2"
- debug "2.6.9"
- mkdirp "0.5.1"
- yauzl "2.4.1"
-
-extsprintf@1.3.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
- integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
- integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-
-fast-deep-equal@^3.1.1:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
- integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
-
-fast-json-stable-stringify@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
- integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fd-slicer@~1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
- integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=
- dependencies:
- pend "~1.2.0"
-
-find-up@^1.0.0:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
- integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
- dependencies:
- path-exists "^2.0.0"
- pinkie-promise "^2.0.0"
-
-forever-agent@~0.6.1:
- version "0.6.1"
- resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
- integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.3.2:
- version "2.3.3"
- resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
- integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
- dependencies:
- asynckit "^0.4.0"
- combined-stream "^1.0.6"
- mime-types "^2.1.12"
-
-fs-extra@^4.0.1:
- version "4.0.3"
- resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
- integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
- dependencies:
- graceful-fs "^4.1.2"
- jsonfile "^4.0.0"
- universalify "^0.1.0"
-
-get-stdin@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
- integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
-
-getpass@^0.1.1:
- version "0.1.7"
- resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
- integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
- dependencies:
- assert-plus "^1.0.0"
-
-graceful-fs@^4.1.2:
- version "4.2.4"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
- integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
-
-graceful-fs@^4.1.6:
- version "4.2.2"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
- integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
-
-har-schema@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
- integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.3:
- version "5.1.3"
- resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
- integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
- dependencies:
- ajv "^6.5.5"
- har-schema "^2.0.0"
-
-hosted-git-info@^2.1.4:
- version "2.8.8"
- resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
- integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
-
-http-signature@~1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
- integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
- dependencies:
- assert-plus "^1.0.0"
- jsprim "^1.2.2"
- sshpk "^1.7.0"
-
-indent-string@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
- integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
- dependencies:
- repeating "^2.0.0"
-
-inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
- integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-ini@~1.3.0:
- version "1.3.5"
- resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
- integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-
-is-arrayish@^0.2.1:
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
- integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
-
-is-finite@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
- integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
-
-is-fullwidth-code-point@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
- integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
- dependencies:
- number-is-nan "^1.0.0"
-
-is-typedarray@~1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
- integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
-is-utf8@^0.2.0:
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
- integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
-isarray@0.0.1:
- version "0.0.1"
- resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
- integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
-isarray@~1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
- integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isstream@~0.1.2:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
- integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-jsbn@~0.1.0:
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
- integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-json-schema-traverse@^0.4.1:
- version "0.4.1"
- resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
- integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema@0.2.3:
- version "0.2.3"
- resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
- integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
-json-stringify-safe@~5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
- integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-jsonfile@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
- integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
- optionalDependencies:
- graceful-fs "^4.1.6"
-
-jsprim@^1.2.2:
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
- integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
- dependencies:
- assert-plus "1.0.0"
- extsprintf "1.3.0"
- json-schema "0.2.3"
- verror "1.10.0"
-
-load-json-file@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
- integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
- dependencies:
- graceful-fs "^4.1.2"
- parse-json "^2.2.0"
- pify "^2.0.0"
- pinkie-promise "^2.0.0"
- strip-bom "^2.0.0"
-
-loud-rejection@^1.0.0:
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
- integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
- dependencies:
- currently-unhandled "^0.4.1"
- signal-exit "^3.0.0"
-
-map-obj@^1.0.0, map-obj@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
- integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
-
-meow@^3.1.0:
- version "3.7.0"
- resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
- integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
- dependencies:
- camelcase-keys "^2.0.0"
- decamelize "^1.1.2"
- loud-rejection "^1.0.0"
- map-obj "^1.0.1"
- minimist "^1.1.3"
- normalize-package-data "^2.3.4"
- object-assign "^4.0.1"
- read-pkg-up "^1.0.1"
- redent "^1.0.0"
- trim-newlines "^1.0.0"
-
-mime-db@1.44.0:
- version "1.44.0"
- resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
- integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
-
-mime-types@^2.1.12, mime-types@~2.1.19:
- version "2.1.27"
- resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
- integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
- dependencies:
- mime-db "1.44.0"
-
-minimist@0.0.8:
- version "0.0.8"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
- integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
- version "1.2.5"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
- integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-mkdirp@0.5.1:
- version "0.5.1"
- resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
- integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
- dependencies:
- minimist "0.0.8"
-
-ms@2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
- integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@^2.1.1:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
- integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
- integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
- dependencies:
- hosted-git-info "^2.1.4"
- resolve "^1.10.0"
- semver "2 || 3 || 4 || 5"
- validate-npm-package-license "^3.0.1"
-
-nugget@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/nugget/-/nugget-2.0.1.tgz#201095a487e1ad36081b3432fa3cada4f8d071b0"
- integrity sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=
- dependencies:
- debug "^2.1.3"
- minimist "^1.1.0"
- pretty-bytes "^1.0.2"
- progress-stream "^1.1.0"
- request "^2.45.0"
- single-line-log "^1.1.2"
- throttleit "0.0.2"
-
-number-is-nan@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
- integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
-oauth-sign@~0.9.0:
- version "0.9.0"
- resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
- integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-object-assign@^4.0.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
- integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object-keys@~0.4.0:
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
- integrity sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=
-
-parse-json@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
- integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
- dependencies:
- error-ex "^1.2.0"
-
-path-exists@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
- integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
- dependencies:
- pinkie-promise "^2.0.0"
-
-path-exists@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
- integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
-path-parse@^1.0.6:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
- integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
-
-path-type@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
- integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
- dependencies:
- graceful-fs "^4.1.2"
- pify "^2.0.0"
- pinkie-promise "^2.0.0"
-
-pend@~1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
- integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
-
-performance-now@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
- integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
-pify@^2.0.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
- integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
-
-pinkie-promise@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
- integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
- dependencies:
- pinkie "^2.0.0"
-
-pinkie@^2.0.0:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
- integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
-pretty-bytes@^1.0.2:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-1.0.4.tgz#0a22e8210609ad35542f8c8d5d2159aff0751c84"
- integrity sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=
- dependencies:
- get-stdin "^4.0.1"
- meow "^3.1.0"
-
-process-nextick-args@~2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
- integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-progress-stream@^1.1.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/progress-stream/-/progress-stream-1.2.0.tgz#2cd3cfea33ba3a89c9c121ec3347abe9ab125f77"
- integrity sha1-LNPP6jO6OonJwSHsM0er6asSX3c=
- dependencies:
- speedometer "~0.1.2"
- through2 "~0.2.3"
-
-psl@^1.1.28:
- version "1.8.0"
- resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
- integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
-
-punycode@^2.1.0, punycode@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
- integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-qs@~6.5.2:
- version "6.5.2"
- resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
- integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-
-rc@^1.2.1:
- version "1.2.8"
- resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
- integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
- dependencies:
- deep-extend "^0.6.0"
- ini "~1.3.0"
- minimist "^1.2.0"
- strip-json-comments "~2.0.1"
-
-read-pkg-up@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
- integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
- dependencies:
- find-up "^1.0.0"
- read-pkg "^1.0.0"
-
-read-pkg@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
- integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
- dependencies:
- load-json-file "^1.0.0"
- normalize-package-data "^2.3.2"
- path-type "^1.0.0"
-
-readable-stream@^2.2.2:
- version "2.3.6"
- resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
- integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
- dependencies:
- core-util-is "~1.0.0"
- inherits "~2.0.3"
- isarray "~1.0.0"
- process-nextick-args "~2.0.0"
- safe-buffer "~5.1.1"
- string_decoder "~1.1.1"
- util-deprecate "~1.0.1"
-
-readable-stream@~1.1.9:
- version "1.1.14"
- resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
- integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
- dependencies:
- core-util-is "~1.0.0"
- inherits "~2.0.1"
- isarray "0.0.1"
- string_decoder "~0.10.x"
-
-redent@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
- integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
- dependencies:
- indent-string "^2.1.0"
- strip-indent "^1.0.1"
-
-repeating@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
- integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
- dependencies:
- is-finite "^1.0.0"
-
-request@^2.45.0:
- version "2.88.2"
- resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
- integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
- dependencies:
- aws-sign2 "~0.7.0"
- aws4 "^1.8.0"
- caseless "~0.12.0"
- combined-stream "~1.0.6"
- extend "~3.0.2"
- forever-agent "~0.6.1"
- form-data "~2.3.2"
- har-validator "~5.1.3"
- http-signature "~1.2.0"
- is-typedarray "~1.0.0"
- isstream "~0.1.2"
- json-stringify-safe "~5.0.1"
- mime-types "~2.1.19"
- oauth-sign "~0.9.0"
- performance-now "^2.1.0"
- qs "~6.5.2"
- safe-buffer "^5.1.2"
- tough-cookie "~2.5.0"
- tunnel-agent "^0.6.0"
- uuid "^3.3.2"
-
-resolve@^1.10.0:
- version "1.17.0"
- resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
- integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
- dependencies:
- path-parse "^1.0.6"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.2:
- version "5.2.1"
- resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
- integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
- version "5.1.2"
- resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
- integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
- integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-"semver@2 || 3 || 4 || 5", semver@^5.4.1:
- version "5.7.1"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
- integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-signal-exit@^3.0.0:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
- integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
-
-single-line-log@^1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/single-line-log/-/single-line-log-1.1.2.tgz#c2f83f273a3e1a16edb0995661da0ed5ef033364"
- integrity sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=
- dependencies:
- string-width "^1.0.1"
-
-spdx-correct@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
- integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
- dependencies:
- spdx-expression-parse "^3.0.0"
- spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
- integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
-
-spdx-expression-parse@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
- integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
- dependencies:
- spdx-exceptions "^2.1.0"
- spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
- version "3.0.5"
- resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
- integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
-
-speedometer@~0.1.2:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/speedometer/-/speedometer-0.1.4.tgz#9876dbd2a169d3115402d48e6ea6329c8816a50d"
- integrity sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0=
-
-sshpk@^1.7.0:
- version "1.16.1"
- resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
- integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
- dependencies:
- asn1 "~0.2.3"
- assert-plus "^1.0.0"
- bcrypt-pbkdf "^1.0.0"
- dashdash "^1.12.0"
- ecc-jsbn "~0.1.1"
- getpass "^0.1.1"
- jsbn "~0.1.0"
- safer-buffer "^2.0.2"
- tweetnacl "~0.14.0"
-
-string-width@^1.0.1:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
- integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
- dependencies:
- code-point-at "^1.0.0"
- is-fullwidth-code-point "^1.0.0"
- strip-ansi "^3.0.0"
-
-string_decoder@~0.10.x:
- version "0.10.31"
- resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
- integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
-string_decoder@~1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
- integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
- dependencies:
- safe-buffer "~5.1.0"
-
-strip-ansi@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
- integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
- dependencies:
- ansi-regex "^2.0.0"
-
-strip-bom@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
- integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
- dependencies:
- is-utf8 "^0.2.0"
-
-strip-indent@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
- integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
- dependencies:
- get-stdin "^4.0.1"
-
-strip-json-comments@~2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
- integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-sumchecker@^2.0.2:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-2.0.2.tgz#0f42c10e5d05da5d42eea3e56c3399a37d6c5b3e"
- integrity sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=
- dependencies:
- debug "^2.2.0"
-
-throttleit@0.0.2:
- version "0.0.2"
- resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-0.0.2.tgz#cfedf88e60c00dd9697b61fdd2a8343a9b680eaf"
- integrity sha1-z+34jmDADdlpe2H90qg0OptoDq8=
-
-through2@~0.2.3:
- version "0.2.3"
- resolved "https://registry.yarnpkg.com/through2/-/through2-0.2.3.tgz#eb3284da4ea311b6cc8ace3653748a52abf25a3f"
- integrity sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=
- dependencies:
- readable-stream "~1.1.9"
- xtend "~2.1.1"
-
-tough-cookie@~2.5.0:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
- integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
- dependencies:
- psl "^1.1.28"
- punycode "^2.1.1"
-
-trim-newlines@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
- integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
-
-tunnel-agent@^0.6.0:
- version "0.6.0"
- resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
- integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
- dependencies:
- safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
- version "0.14.5"
- resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
- integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
-typedarray@^0.0.6:
- version "0.0.6"
- resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
- integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-
-universalify@^0.1.0:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
- integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
-uri-js@^4.2.2:
- version "4.2.2"
- resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
- integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
- dependencies:
- punycode "^2.1.0"
-
-util-deprecate@~1.0.1:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
- integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-uuid@^3.3.2:
- version "3.4.0"
- resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
- integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
-validate-npm-package-license@^3.0.1:
- version "3.0.4"
- resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
- integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
- dependencies:
- spdx-correct "^3.0.0"
- spdx-expression-parse "^3.0.0"
-
-verror@1.10.0:
- version "1.10.0"
- resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
- integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
- dependencies:
- assert-plus "^1.0.0"
- core-util-is "1.0.2"
- extsprintf "^1.2.0"
-
-xtend@~2.1.1:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"
- integrity sha1-bv7MKk2tjmlixJAbM3znuoe10os=
- dependencies:
- object-keys "~0.4.0"
-
-yauzl@2.4.1:
- version "2.4.1"
- resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"
- integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=
- dependencies:
- fd-slicer "~1.0.1"
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@electron/get@^1.0.1":
+ version "1.12.2"
+ resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.2.tgz#6442066afb99be08cefb9a281e4b4692b33764f3"
+ integrity sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==
+ dependencies:
+ debug "^4.1.1"
+ env-paths "^2.2.0"
+ fs-extra "^8.1.0"
+ got "^9.6.0"
+ progress "^2.0.3"
+ sanitize-filename "^1.6.2"
+ sumchecker "^3.0.1"
+ optionalDependencies:
+ global-agent "^2.0.2"
+ global-tunnel-ng "^2.7.1"
+
+"@sindresorhus/is@^0.14.0":
+ version "0.14.0"
+ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
+ integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+
+"@szmarczak/http-timer@^1.1.2":
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
+ integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
+ dependencies:
+ defer-to-connect "^1.0.1"
+
+"@types/node@^12.0.12":
+ version "12.12.62"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.62.tgz#733923d73669188d35950253dd18a21570085d2b"
+ integrity sha512-qAfo81CsD7yQIM9mVyh6B/U47li5g7cfpVQEDMfQeF8pSZVwzbhwU3crc0qG4DmpsebpJPR49AKOExQyJ05Cpg==
+
+boolean@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.1.tgz#35ecf2b4a2ee191b0b44986f14eb5f052a5cbb4f"
+ integrity sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==
+
+buffer-from@^1.0.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+ integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
+cacheable-request@^6.0.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
+ integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
+ dependencies:
+ clone-response "^1.0.2"
+ get-stream "^5.1.0"
+ http-cache-semantics "^4.0.0"
+ keyv "^3.0.0"
+ lowercase-keys "^2.0.0"
+ normalize-url "^4.1.0"
+ responselike "^1.0.2"
+
+clone-response@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+ integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+ dependencies:
+ mimic-response "^1.0.0"
+
+concat-stream@1.6.2:
+ version "1.6.2"
+ resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+ integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+ dependencies:
+ buffer-from "^1.0.0"
+ inherits "^2.0.3"
+ readable-stream "^2.2.2"
+ typedarray "^0.0.6"
+
+config-chain@^1.1.11:
+ version "1.1.12"
+ resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
+ integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
+ dependencies:
+ ini "^1.3.4"
+ proto-list "~1.2.1"
+
+core-js@^3.6.5:
+ version "3.6.5"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
+ integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
+
+core-util-is@~1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+ integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+debug@2.6.9:
+ version "2.6.9"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+ integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+ dependencies:
+ ms "2.0.0"
+
+debug@^4.1.0, debug@^4.1.1:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
+ integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
+ dependencies:
+ ms "2.1.2"
+
+decompress-response@^3.3.0:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+ integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
+ dependencies:
+ mimic-response "^1.0.0"
+
+defer-to-connect@^1.0.1:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
+ integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
+
+define-properties@^1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+ integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+ dependencies:
+ object-keys "^1.0.12"
+
+detect-node@^2.0.4:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
+ integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
+
+duplexer3@^0.1.4:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+ integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
+
+electron@10.1.3:
+ version "10.1.3"
+ resolved "https://registry.yarnpkg.com/electron/-/electron-10.1.3.tgz#7e276e373bf30078bd4cb1184850a91268dc0e6c"
+ integrity sha512-CR8LrlG47MdAp317SQ3vGYa2o2cIMdMSMPYH46OVitFLk35dwE9fn3VqvhUIXhCHYcNWIAPzMhkVHpkoFdKWuw==
+ dependencies:
+ "@electron/get" "^1.0.1"
+ "@types/node" "^12.0.12"
+ extract-zip "^1.0.3"
+
+encodeurl@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+ integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+
+end-of-stream@^1.1.0:
+ version "1.4.4"
+ resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+ integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+ dependencies:
+ once "^1.4.0"
+
+env-paths@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
+ integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==
+
+es6-error@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
+ integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
+
+escape-string-regexp@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+ integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
+extract-zip@^1.0.3:
+ version "1.6.7"
+ resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9"
+ integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=
+ dependencies:
+ concat-stream "1.6.2"
+ debug "2.6.9"
+ mkdirp "0.5.1"
+ yauzl "2.4.1"
+
+fd-slicer@~1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
+ integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=
+ dependencies:
+ pend "~1.2.0"
+
+fs-extra@^8.1.0:
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+ integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+ dependencies:
+ graceful-fs "^4.2.0"
+ jsonfile "^4.0.0"
+ universalify "^0.1.0"
+
+get-stream@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+ integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+ dependencies:
+ pump "^3.0.0"
+
+get-stream@^5.1.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+ integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+ dependencies:
+ pump "^3.0.0"
+
+global-agent@^2.0.2:
+ version "2.1.12"
+ resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz#e4ae3812b731a9e81cbf825f9377ef450a8e4195"
+ integrity sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg==
+ dependencies:
+ boolean "^3.0.1"
+ core-js "^3.6.5"
+ es6-error "^4.1.1"
+ matcher "^3.0.0"
+ roarr "^2.15.3"
+ semver "^7.3.2"
+ serialize-error "^7.0.1"
+
+global-tunnel-ng@^2.7.1:
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f"
+ integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==
+ dependencies:
+ encodeurl "^1.0.2"
+ lodash "^4.17.10"
+ npm-conf "^1.1.3"
+ tunnel "^0.0.6"
+
+globalthis@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz#40116f5d9c071f9e8fb0037654df1ab3a83b7ef9"
+ integrity sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==
+ dependencies:
+ define-properties "^1.1.3"
+
+got@^9.6.0:
+ version "9.6.0"
+ resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
+ integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
+ dependencies:
+ "@sindresorhus/is" "^0.14.0"
+ "@szmarczak/http-timer" "^1.1.2"
+ cacheable-request "^6.0.0"
+ decompress-response "^3.3.0"
+ duplexer3 "^0.1.4"
+ get-stream "^4.1.0"
+ lowercase-keys "^1.0.1"
+ mimic-response "^1.0.1"
+ p-cancelable "^1.0.0"
+ to-readable-stream "^1.0.0"
+ url-parse-lax "^3.0.0"
+
+graceful-fs@^4.1.6:
+ version "4.2.2"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
+ integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
+
+graceful-fs@^4.2.0:
+ version "4.2.4"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+ integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+
+http-cache-semantics@^4.0.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
+ integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+
+inherits@^2.0.3, inherits@~2.0.3:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+ integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+ini@^1.3.4:
+ version "1.3.5"
+ resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+ integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+
+isarray@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+ integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+json-buffer@3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+ integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
+
+json-stringify-safe@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+ integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
+jsonfile@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+ integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+ optionalDependencies:
+ graceful-fs "^4.1.6"
+
+keyv@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
+ integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
+ dependencies:
+ json-buffer "3.0.0"
+
+lodash@^4.17.10:
+ version "4.17.20"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+ integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+
+lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+ integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
+
+lowercase-keys@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
+ integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
+
+matcher@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca"
+ integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==
+ dependencies:
+ escape-string-regexp "^4.0.0"
+
+mimic-response@^1.0.0, mimic-response@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+ integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+
+minimist@0.0.8:
+ version "0.0.8"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+ integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
+
+mkdirp@0.5.1:
+ version "0.5.1"
+ resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+ integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+ dependencies:
+ minimist "0.0.8"
+
+ms@2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+ integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@2.1.2:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+ integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+normalize-url@^4.1.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
+ integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
+
+npm-conf@^1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
+ integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==
+ dependencies:
+ config-chain "^1.1.11"
+ pify "^3.0.0"
+
+object-keys@^1.0.12:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+ integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
+once@^1.3.1, once@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+ integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+ dependencies:
+ wrappy "1"
+
+p-cancelable@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
+ integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
+
+pend@~1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
+ integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
+
+pify@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+ integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+prepend-http@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+ integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
+
+process-nextick-args@~2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+ integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+progress@^2.0.3:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+ integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+
+proto-list@~1.2.1:
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+ integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
+
+pump@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+ integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+ dependencies:
+ end-of-stream "^1.1.0"
+ once "^1.3.1"
+
+readable-stream@^2.2.2:
+ version "2.3.6"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+ integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+ dependencies:
+ core-util-is "~1.0.0"
+ inherits "~2.0.3"
+ isarray "~1.0.0"
+ process-nextick-args "~2.0.0"
+ safe-buffer "~5.1.1"
+ string_decoder "~1.1.1"
+ util-deprecate "~1.0.1"
+
+responselike@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+ integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
+ dependencies:
+ lowercase-keys "^1.0.0"
+
+roarr@^2.15.3:
+ version "2.15.4"
+ resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"
+ integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==
+ dependencies:
+ boolean "^3.0.1"
+ detect-node "^2.0.4"
+ globalthis "^1.0.1"
+ json-stringify-safe "^5.0.1"
+ semver-compare "^1.0.0"
+ sprintf-js "^1.1.2"
+
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+ version "5.1.2"
+ resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+ integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+sanitize-filename@^1.6.2:
+ version "1.6.3"
+ resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378"
+ integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==
+ dependencies:
+ truncate-utf8-bytes "^1.0.0"
+
+semver-compare@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+ integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
+
+semver@^7.3.2:
+ version "7.3.2"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+ integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+
+serialize-error@^7.0.1:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18"
+ integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==
+ dependencies:
+ type-fest "^0.13.1"
+
+sprintf-js@^1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
+ integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
+
+string_decoder@~1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+ integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+ dependencies:
+ safe-buffer "~5.1.0"
+
+sumchecker@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42"
+ integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==
+ dependencies:
+ debug "^4.1.0"
+
+to-readable-stream@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
+ integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
+
+truncate-utf8-bytes@^1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
+ integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys=
+ dependencies:
+ utf8-byte-length "^1.0.1"
+
+tunnel@^0.0.6:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
+ integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
+
+type-fest@^0.13.1:
+ version "0.13.1"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
+ integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
+
+typedarray@^0.0.6:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+ integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+
+universalify@^0.1.0:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+ integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
+url-parse-lax@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+ integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
+ dependencies:
+ prepend-http "^2.0.0"
+
+utf8-byte-length@^1.0.1:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
+ integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=
+
+util-deprecate@~1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+ integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+wrappy@1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+ integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+yauzl@2.4.1:
+ version "2.4.1"
+ resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"
+ integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=
+ dependencies:
+ fd-slicer "~1.0.1"
diff --git a/gulp/.gitattributes b/gulp/.gitattributes
deleted file mode 100644
index d899f655..00000000
--- a/gulp/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.wav filter=lfs diff=lfs merge=lfs -text
diff --git a/gulp/.gitignore b/gulp/.gitignore
index aa92ef40..80dc3c89 100644
--- a/gulp/.gitignore
+++ b/gulp/.gitignore
@@ -1,2 +1 @@
-additional_build_files
-steampipe
+additional_build_files
diff --git a/gulp/atlas2json.js b/gulp/atlas2json.js
new file mode 100644
index 00000000..b77a47f3
--- /dev/null
+++ b/gulp/atlas2json.js
@@ -0,0 +1,127 @@
+const { join, resolve } = require("path");
+const { readFileSync, readdirSync, writeFileSync } = require("fs");
+
+const suffixToScale = {
+ lq: "0.25",
+ mq: "0.5",
+ hq: "0.75"
+};
+
+function convert(srcDir) {
+ const full = resolve(srcDir);
+ const srcFiles = readdirSync(full)
+ .filter(n => n.endsWith(".atlas"))
+ .map(n => join(full, n));
+
+ for (const atlas of srcFiles) {
+ console.log(`Processing: ${atlas}`);
+
+ // Read all text, split it into line array
+ // and filter all empty lines
+ const lines = readFileSync(atlas, "utf-8")
+ .split("\n")
+ .filter(n => n.trim());
+
+ // Get source image name
+ const image = lines.shift();
+ const srcMeta = {};
+
+ // Read all metadata (supports only one page)
+ while (true) {
+ const kv = lines.shift().split(":");
+ if (kv.length != 2) {
+ lines.unshift(kv[0]);
+ break;
+ }
+
+ srcMeta[kv[0]] = kv[1].trim();
+ }
+
+ const frames = {};
+ let current = null;
+
+ lines.push("Dummy line to make it convert last frame");
+
+ for (const line of lines) {
+ if (!line.startsWith(" ")) {
+ // New frame, convert previous if it exists
+ if (current != null) {
+ let { name, rotate, xy, size, orig, offset, index } = current;
+
+ // Convert to arrays because Node.js doesn't
+ // support latest JS features
+ xy = xy.split(",").map(v => Number(v));
+ size = size.split(",").map(v => Number(v));
+ orig = orig.split(",").map(v => Number(v));
+ offset = offset.split(",").map(v => Number(v));
+
+ // GDX TexturePacker removes index suffixes
+ const indexSuff = index != -1 ? `_${index}` : "";
+ const isTrimmed = size != orig;
+
+ frames[`${name}${indexSuff}.png`] = {
+ // Bounds on atlas
+ frame: {
+ x: xy[0],
+ y: xy[1],
+ w: size[0],
+ h: size[1]
+ },
+
+ // Whether image was rotated
+ rotated: rotate == "true",
+ trimmed: isTrimmed,
+
+ // How is the image trimmed
+ spriteSourceSize: {
+ x: offset[0],
+ y: (orig[1] - size[1]) - offset[1],
+ w: size[0],
+ h: size[1]
+ },
+
+ sourceSize: {
+ w: orig[0],
+ h: orig[1]
+ }
+ }
+ }
+
+ // Simple object that will hold other metadata
+ current = {
+ name: line
+ };
+ } else {
+ // Read and set current image metadata
+ const kv = line.split(":").map(v => v.trim());
+ current[kv[0]] = isNaN(Number(kv[1])) ? kv[1] : Number(kv[1]);
+ }
+ }
+
+ const atlasSize = srcMeta.size.split(",").map(v => Number(v));
+ const atlasScale = suffixToScale[atlas.match(/_(\w+)\.atlas$/)[1]];
+
+ const result = JSON.stringify({
+ frames,
+ meta: {
+ image,
+ format: srcMeta.format,
+ size: {
+ w: atlasSize[0],
+ h: atlasSize[1]
+ },
+ scale: atlasScale.toString()
+ }
+ });
+
+ writeFileSync(atlas.replace(".atlas", ".json"), result, {
+ encoding: "utf-8"
+ });
+ }
+}
+
+if (require.main == module) {
+ convert(process.argv[2]);
+}
+
+module.exports = { convert };
diff --git a/gulp/buildutils.js b/gulp/buildutils.js
index 041c8b1d..ea253773 100644
--- a/gulp/buildutils.js
+++ b/gulp/buildutils.js
@@ -25,6 +25,14 @@ module.exports = {
});
},
+ getTag() {
+ try {
+ return execSync("git describe --tag --exact-match").toString("ascii");
+ } catch (e) {
+ throw new Error('Current git HEAD is not a version tag');
+ }
+ },
+
getVersion() {
return trim(fs.readFileSync(path.join(__dirname, "..", "version")).toString());
},
diff --git a/gulp/convert_atlas.js b/gulp/convert_atlas.js
deleted file mode 100644
index 8e0ba990..00000000
--- a/gulp/convert_atlas.js
+++ /dev/null
@@ -1,96 +0,0 @@
-// Converts the atlas description to a JSON file
-
-String.prototype.replaceAll = function (search, replacement) {
- var target = this;
- return target.split(search).join(replacement);
-};
-
-const fs = require("fs");
-const path = require("path");
-
-const folder = path.join(__dirname, "res_built", "atlas");
-const files = fs.readdirSync(folder);
-
-const metadata = [];
-
-files.forEach(filename => {
- if (filename.endsWith(".atlas")) {
- // Read content
-
- const content = fs.readFileSync(path.join(folder, filename), "ascii");
-
- const lines = content.replaceAll("\r", "").replaceAll("\t", "").split("\n");
-
- const readLine = () => lines.splice(0, 1)[0];
- const readValue = () => readLine().replaceAll(" ", "").split(":")[1];
- const readVector = () =>
- readValue()
- .split(",")
- .map(d => parseInt(d, 10));
-
- let maxAtlas = 100;
-
- atlasLoop: while (maxAtlas-- > 0 && lines.length >= 7) {
- const result = {
- entries: [],
- };
-
- // Extract header
- const header_fileStart = readLine();
- const header_fileName = readLine();
- const header_size = readVector();
- const header_format = readLine();
- const header_filter = readLine();
- const header_repeat = readLine();
- const baseAtlasName = header_fileName.replace(".png", "");
-
- // Store size
- result.size = header_size;
-
- lineLoop: while (lines.length >= 7) {
- const entryResult = {};
-
- const nextLine = lines[0];
- if (nextLine.length === 0) {
- break;
- }
-
- const entry_fileName = readLine() + ".png";
-
- const entry_rotate = readValue();
- const entry_xy = readVector();
- const entry_size = readVector();
- const entry_orig = readVector();
- const entry_offset = readVector();
- const entry_index = readValue();
-
- entryResult.filename = entry_fileName;
- entryResult.xy = entry_xy;
- entryResult.size = entry_size;
- // entryResult.offset = entry_offset;
-
- entryResult.origSize = entry_orig;
-
- let offset = [0, 0];
-
- // GDX Atlas packer uses 1 - y coordinates. This sucks, and we have to convert it
- offset[0] = entry_offset[0];
- offset[1] = entry_orig[1] - entry_offset[1] - entry_size[1];
-
- entryResult.offset = offset;
-
- result.entries.push(entryResult);
- }
-
- console.log("[Atlas]", "'" + baseAtlasName + "'", "has", result.entries.length, "entries");
- // fs.writeFileSync(path.join(folder, baseAtlasName + ".gen.json"), JSON.stringify(result));
-
- metadata.push({
- filename: baseAtlasName + ".png",
- entries: result,
- });
- }
- }
-});
-
-fs.writeFileSync(path.join(folder, "meta.gen.json"), JSON.stringify(metadata, null, 4));
diff --git a/gulp/css.js b/gulp/css.js
index 6734f1ae..73a0a7cf 100644
--- a/gulp/css.js
+++ b/gulp/css.js
@@ -1,99 +1,137 @@
-const path = require("path");
-const buildUtils = require("./buildutils");
-
-function gulptasksCSS($, gulp, buildFolder, browserSync) {
- // The assets plugin copies the files
- const commitHash = buildUtils.getRevision();
- const postcssAssetsPlugin = cachebust =>
- $.postcssAssets({
- loadPaths: [path.join(buildFolder, "res", "ui")],
- basePath: buildFolder,
- baseUrl: ".",
- cachebuster: cachebust
- ? (filePath, urlPathname) => ({
- pathname: buildUtils.cachebust(urlPathname, commitHash),
- })
- : "",
- });
-
- // Postcss configuration
- const postcssPlugins = (prod, { cachebust = false }) => {
- const plugins = [postcssAssetsPlugin(cachebust)];
- if (prod) {
- plugins.unshift(
- $.postcssUnprefix(),
- $.postcssPresetEnv({
- browsers: ["> 0.1%"],
- })
- );
-
- plugins.push(
- $.cssMqpacker({
- sort: true,
- }),
- $.cssnano({
- preset: [
- "advanced",
- {
- cssDeclarationSorter: false,
- discardUnused: true,
- mergeIdents: false,
- reduceIdents: true,
- zindex: true,
- },
- ],
- }),
- $.postcssRoundSubpixels()
- );
- }
- return plugins;
- };
-
- // Performs linting on css
- gulp.task("css.lint", () => {
- return gulp
- .src(["../src/css/**/*.scss"])
- .pipe($.sassLint({ configFile: ".sasslint.yml" }))
- .pipe($.sassLint.format())
- .pipe($.sassLint.failOnError());
- });
-
- // Builds the css in dev mode
- gulp.task("css.dev", () => {
- return gulp
- .src(["../src/css/main.scss"])
- .pipe($.plumber())
- .pipe($.sass.sync().on("error", $.sass.logError))
- .pipe($.postcss(postcssPlugins(false, {})))
- .pipe(gulp.dest(buildFolder))
- .pipe(browserSync.stream());
- });
-
- // Builds the css in production mode (=minified)
- gulp.task("css.prod", () => {
- return (
- gulp
- .src("../src/css/main.scss", { cwd: __dirname })
- .pipe($.plumber())
- .pipe($.sass.sync({ outputStyle: "compressed" }).on("error", $.sass.logError))
- .pipe($.postcss(postcssPlugins(true, { cachebust: true })))
- .pipe(gulp.dest(buildFolder))
- );
- });
-
- // Builds the css in production mode (=minified), without cachebusting
- gulp.task("css.prod-standalone", () => {
- return (
- gulp
- .src("../src/css/main.scss", { cwd: __dirname })
- .pipe($.plumber())
- .pipe($.sass.sync({ outputStyle: "compressed" }).on("error", $.sass.logError))
- .pipe($.postcss(postcssPlugins(true, { cachebust: false })))
- .pipe(gulp.dest(buildFolder))
- );
- });
-}
-
-module.exports = {
- gulptasksCSS,
-};
+const path = require("path");
+const buildUtils = require("./buildutils");
+
+function gulptasksCSS($, gulp, buildFolder, browserSync) {
+ // The assets plugin copies the files
+ const commitHash = buildUtils.getRevision();
+ const postcssAssetsPlugin = cachebust =>
+ $.postcssAssets({
+ loadPaths: [path.join(buildFolder, "res", "ui")],
+ basePath: buildFolder,
+ baseUrl: ".",
+ cachebuster: cachebust
+ ? (filePath, urlPathname) => ({
+ pathname: buildUtils.cachebust(urlPathname, commitHash),
+ })
+ : "",
+ });
+
+ // Postcss configuration
+ const postcssPlugins = (prod, { cachebust = false }) => {
+ const plugins = [postcssAssetsPlugin(cachebust)];
+ if (prod) {
+ plugins.unshift(
+ $.postcssUnprefix(),
+ $.postcssPresetEnv({
+ browsers: ["> 0.1%"],
+ })
+ );
+
+ plugins.push(
+ $.cssMqpacker({
+ sort: true,
+ }),
+ $.cssnano({
+ preset: [
+ "advanced",
+ {
+ cssDeclarationSorter: false,
+ discardUnused: true,
+ mergeIdents: false,
+ reduceIdents: true,
+ zindex: true,
+ },
+ ],
+ }),
+ $.postcssRoundSubpixels()
+ );
+ }
+ return plugins;
+ };
+
+ // Performs linting on css
+ gulp.task("css.lint", () => {
+ return gulp
+ .src(["../src/css/**/*.scss"])
+ .pipe($.sassLint({ configFile: ".sasslint.yml" }))
+ .pipe($.sassLint.format())
+ .pipe($.sassLint.failOnError());
+ });
+
+ function resourcesTask({ cachebust, isProd }) {
+ return gulp
+ .src("../src/css/main.scss", { cwd: __dirname })
+ .pipe($.plumber())
+ .pipe($.sass.sync().on("error", $.sass.logError))
+ .pipe(
+ $.postcss([
+ $.postcssCriticalSplit({
+ blockTag: "@load-async",
+ }),
+ ])
+ )
+ .pipe($.rename("async-resources.css"))
+ .pipe($.postcss(postcssPlugins(isProd, { cachebust })))
+ .pipe(gulp.dest(buildFolder))
+ .pipe(browserSync.stream());
+ }
+
+ // Builds the css resources
+ gulp.task("css.resources.dev", () => {
+ return resourcesTask({ cachebust: false, isProd: false });
+ });
+
+ // Builds the css resources in prod (=minified)
+ gulp.task("css.resources.prod", () => {
+ return resourcesTask({ cachebust: true, isProd: true });
+ });
+
+ // Builds the css resources in prod (=minified), without cachebusting
+ gulp.task("css.resources.prod-standalone", () => {
+ return resourcesTask({ cachebust: false, isProd: true });
+ });
+
+ function mainTask({ cachebust, isProd }) {
+ return gulp
+ .src("../src/css/main.scss", { cwd: __dirname })
+ .pipe($.plumber())
+ .pipe($.sass.sync().on("error", $.sass.logError))
+ .pipe(
+ $.postcss([
+ $.postcssCriticalSplit({
+ blockTag: "@load-async",
+ output: "rest",
+ }),
+ ])
+ )
+ .pipe($.postcss(postcssPlugins(isProd, { cachebust })))
+ .pipe(gulp.dest(buildFolder))
+ .pipe(browserSync.stream());
+ }
+
+ // Builds the css main
+ gulp.task("css.main.dev", () => {
+ return mainTask({ cachebust: false, isProd: false });
+ });
+
+ // Builds the css main in prod (=minified)
+ gulp.task("css.main.prod", () => {
+ return mainTask({ cachebust: true, isProd: true });
+ });
+
+ // Builds the css main in prod (=minified), without cachebusting
+ gulp.task("css.main.prod-standalone", () => {
+ return mainTask({ cachebust: false, isProd: true });
+ });
+
+ gulp.task("css.dev", gulp.parallel("css.main.dev", "css.resources.dev"));
+ gulp.task("css.prod", gulp.parallel("css.main.prod", "css.resources.prod"));
+ gulp.task(
+ "css.prod-standalone",
+ gulp.parallel("css.main.prod-standalone", "css.resources.prod-standalone")
+ );
+}
+
+module.exports = {
+ gulptasksCSS,
+};
diff --git a/gulp/entitlements.plist b/gulp/entitlements.plist
new file mode 100644
index 00000000..8f574f5f
--- /dev/null
+++ b/gulp/entitlements.plist
@@ -0,0 +1,12 @@
+
+
+