@threekit-tools/treble 0.0.82 → 0.0.85-next-1

package/dist/store/treble.js

@@ -63,17 +63,7 @@ var wishlist_1 = require("./wishlist");
 var translations_1 = require("./translations");
 var product_1 = require("./product");
 var message_1 = __importDefault(require("../components/message"));
-/*****************************************************
- * Helper Functions
- ****************************************************/
 var createPlayerLoaderEl = function (elementId) {
-    /**
-     * By default the player is loaded into a player-loader div that
-     * is placed outside the user's view. This is done because in
-     * React the Threekit Initialization may happen before the
-     * component with the player HTML element has loaded which would
-     * otherwise throw an error.
-     */
     var playerElement = document.getElementById(elementId);
     if (playerElement)
         return playerElement;
@@ -90,13 +80,7 @@ var createPlayerLoaderEl = function (elementId) {
     document.body.appendChild(playerLoader);
     return playerElement;
 };
-/*****************************************************
- * Constants and Event Handlers
- ****************************************************/
 var EVENTS = {};
-/*****************************************************
- * State
- ****************************************************/
 var initialState = {
     threekitEnv: 'preview',
     isThreekitInitialized: false,
@@ -105,18 +89,12 @@ var initialState = {
     notifications: true,
     loadingProgress: 0,
 };
-/*****************************************************
- * Actions
- ****************************************************/
 exports.setThreekitEnv = (0, toolkit_1.createAction)('treble/set-threekit-env');
 exports.setThreekitInitialized = (0, toolkit_1.createAction)('treble/set-threekit-initialized');
 exports.setPlayerLoading = (0, toolkit_1.createAction)('treble/set-player-loading');
 exports.setPlayerElement = (0, toolkit_1.createAction)('treble/set-player-element');
 exports.reloadTreble = (0, toolkit_1.createAction)('treble/reload');
 exports.updateLoadingProgress = (0, toolkit_1.createAction)('treble/update-loading-progress');
-/*****************************************************
- * Slice
- ****************************************************/
 var reducer = (0, toolkit_1.createSlice)({
     name: 'treble',
     initialState: initialState,
@@ -147,15 +125,10 @@ var reducer = (0, toolkit_1.createSlice)({
         });
     },
 }).reducer;
-/*****************************************************
- * Standard Selectors
- ****************************************************/
-//  Loading Trackers
 var getThreekitEnv = function (state) {
     return state.treble.threekitEnv;
 };
 exports.getThreekitEnv = getThreekitEnv;
-//  Loading Trackers
 var isThreekitInitialized = function (state) {
     return state.treble.isThreekitInitialized;
 };
@@ -164,36 +137,29 @@ var isPlayerLoading = function (state) {
     return state.treble.isPlayerLoading;
 };
 exports.isPlayerLoading = isPlayerLoading;
-//  Player's HTML element
 var getPlayerElementId = function (state) {
     return state.treble.playerElId;
 };
 exports.getPlayerElementId = getPlayerElementId;
-//  Player's HTML element
 var getLoadingProgress = function (state) {
     return state.treble.loadingProgress;
 };
 exports.getLoadingProgress = getLoadingProgress;
-/*****************************************************
- * Complex Actions
- ****************************************************/
 var initPlayer = function (config) {
     return function (dispatch, getState) { return __awaiter(void 0, void 0, void 0, function () {
-        var el, authToken, assetId, stageId, orgId, playerConfig, initialConfiguration, player, configurator;
+        var el, authToken, assetId, stageId, configurationId, orgId, playerConfig, initialConfiguration, player, configurator;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    el = config.el, authToken = config.authToken, assetId = config.assetId, stageId = config.stageId, orgId = config.orgId, playerConfig = config.playerConfig, initialConfiguration = config.initialConfiguration;
-                    return [4 /*yield*/, window.threekitPlayer(__assign(__assign({ el: el, 
-                            // Variables to sort out
-                            authToken: authToken, stageId: stageId, assetId: assetId }, playerConfig), { initialConfiguration: initialConfiguration, onLoadingProgress: function (progress) {
+                    el = config.el, authToken = config.authToken, assetId = config.assetId, stageId = config.stageId, configurationId = config.configurationId, orgId = config.orgId, playerConfig = config.playerConfig, initialConfiguration = config.initialConfiguration;
+                    return [4, window.threekitPlayer(__assign(__assign({ el: el, authToken: authToken, stageId: stageId, assetId: assetId, configurationId: configurationId }, playerConfig), { initialConfiguration: initialConfiguration, onLoadingProgress: function (progress) {
                                 var _a;
                                 dispatch((0, exports.updateLoadingProgress)(progress));
                                 (_a = playerConfig === null || playerConfig === void 0 ? void 0 : playerConfig.onLoadingProgress) === null || _a === void 0 ? void 0 : _a.call(playerConfig, progress);
                             } }))];
                 case 1:
                     player = _a.sent();
-                    return [4 /*yield*/, player.getConfigurator()];
+                    return [4, player.getConfigurator()];
                 case 2:
                     configurator = _a.sent();
                     if (window.threekit) {
@@ -228,14 +194,14 @@ var initPlayer = function (config) {
                                     previousAttributes = Object.values(attributes);
                                     updatedAttributes = window.threekit.configurator.getDisplayAttributes();
                                     dispatch((0, attributes_1.setAttributes)(updatedAttributes));
-                                    return [4 /*yield*/, ((_a = EVENTS.postConfigurationChange) === null || _a === void 0 ? void 0 : _a.call(EVENTS, updatedAttributes, {}, previousAttributes))];
+                                    return [4, ((_a = EVENTS.postConfigurationChange) === null || _a === void 0 ? void 0 : _a.call(EVENTS, updatedAttributes, {}, previousAttributes))];
                                 case 1:
                                     _b.sent();
-                                    return [2 /*return*/];
+                                    return [2];
                             }
                         });
                     }); });
-                    return [2 /*return*/];
+                    return [2];
             }
         });
     }); };
@@ -249,7 +215,7 @@ var launch = function (launchConfig) {
             switch (_j.label) {
                 case 0:
                     if (window.threekit)
-                        return [2 /*return*/];
+                        return [2];
                     config = (0, utils_1.loadTrebleConfig)();
                     credentials = ((_b = launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.project) === null || _b === void 0 ? void 0 : _b.credentials) || ((_c = config.project) === null || _c === void 0 ? void 0 : _c.credentials) || {};
                     productsRaw = ((_d = launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.project) === null || _d === void 0 ? void 0 : _d.products) || ((_e = config.project) === null || _e === void 0 ? void 0 : _e.products) || {};
@@ -296,12 +262,14 @@ var launch = function (launchConfig) {
                         return Object.assign(output, (_b = {}, _b[prodId] = updatedEnvs, _b));
                     }, {});
                     if (!Object.keys(credentials).length || !Object.keys(products).length)
-                        return [2 /*return*/, console.error('Missing credentials')];
+                        return [2, console.error('Missing credentials')];
+                    dispatch((0, product_1.initProduct)(products));
+                    dispatch((0, product_1.setProductId)(productId));
                     threekitEnv = (launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.threekitEnv) || process.env.THREEKIT_ENV || 'preview';
                     serverUrl = (launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.serverUrl) || ((_g = config === null || config === void 0 ? void 0 : config.project) === null || _g === void 0 ? void 0 : _g.serverUrl);
                     playerConfig = Object.assign({}, constants_1.DEFAULT_PLAYER_CONFIG, config.player, launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.playerConfig);
                     envCredentials = credentials[threekitEnv];
-                    _a = products[productId][threekitEnv], assetIdRaw = _a.assetId, stageId = _a.stageId, configurationId = _a.configurationId, initialConfigurationRaw = _a.initialConfiguration;
+                    _a = products[productId][threekitEnv] || {}, assetIdRaw = _a.assetId, stageId = _a.stageId, configurationId = _a.configurationId, initialConfigurationRaw = _a.initialConfiguration;
                     assetId = (launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.assetId) || assetIdRaw;
                     threekitDomainRaw = envCredentials.threekitDomain || "".concat(threekitEnv, ".threekit.com");
                     orgId = envCredentials.orgId, authToken = envCredentials.publicToken;
@@ -314,7 +282,6 @@ var launch = function (launchConfig) {
                         el = createPlayerLoaderEl(constants_1.TK_PLAYER_ROOT_DIV);
                         dispatch((0, exports.setPlayerElement)(constants_1.TK_PLAYER_ROOT_DIV));
                     }
-                    //  Connection
                     connection_1.default.connect({
                         authToken: authToken,
                         orgId: orgId,
@@ -329,8 +296,8 @@ var launch = function (launchConfig) {
                     configId = ((_h = params[constants_1.TK_SAVED_CONFIG_PARAM_KEY]) === null || _h === void 0 ? void 0 : _h.length)
                         ? params[constants_1.TK_SAVED_CONFIG_PARAM_KEY]
                         : configurationId;
-                    if (!configId) return [3 /*break*/, 2];
-                    return [4 /*yield*/, api_1.default.configurations.fetch(configId)];
+                    if (!configId) return [3, 2];
+                    return [4, api_1.default.configurations.fetch(configId)];
                 case 1:
                     configuration = _j.sent();
                     if (configuration) {
@@ -341,9 +308,8 @@ var launch = function (launchConfig) {
                     _j.label = 2;
                 case 2:
                     if (!updatedAssetId)
-                        return [2 /*return*/, console.error('missing assetId')];
-                    //  We create the threekit script
-                    return [4 /*yield*/, new Promise(function (resolve) {
+                        return [2, console.error('missing assetId')];
+                    return [4, new Promise(function (resolve) {
                             var script = document.createElement('script');
                             script.src = "".concat(threekitDomain, "/app/js/threekit-player-bundle.js");
                             script.id = 'threekit-player-bundle';
@@ -351,14 +317,14 @@ var launch = function (launchConfig) {
                             document.head.appendChild(script);
                         })];
                 case 3:
-                    //  We create the threekit script
                     _j.sent();
-                    return [4 /*yield*/, dispatch((0, exports.initPlayer)({
+                    return [4, dispatch((0, exports.initPlayer)({
                             el: el,
                             orgId: orgId,
                             authToken: authToken,
                             stageId: stageId,
                             assetId: updatedAssetId,
+                            configurationId: configId,
                             playerConfig: playerConfig,
                             initialConfiguration: initialConfiguration,
                         }))];
@@ -368,14 +334,15 @@ var launch = function (launchConfig) {
                         message_1.default.info(e.detail.message);
                     });
                     EVENTS = Object.assign(EVENTS, launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.eventHandlers);
+                    dispatch((0, product_1.setName)());
+                    dispatch((0, product_1.setMetadata)());
+                    dispatch((0, product_1.initProduct)());
                     dispatch((0, exports.setThreekitEnv)(threekitEnv));
                     dispatch((0, translations_1.initTranslations)(launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.locale));
                     dispatch((0, price_1.initPrice)());
                     dispatch((0, price_1.updatePrice)());
-                    dispatch((0, product_1.initProduct)(products));
-                    dispatch((0, product_1.setProductId)(productId));
                     dispatch((0, wishlist_1.refreshWishlist)());
-                    return [2 /*return*/];
+                    return [2];
             }
         });
     }); };
@@ -390,10 +357,10 @@ var unloadPlayer = function () { return function (dispatch) { return __awaiter(v
                 dispatch((0, attributes_1.setAttributes)([]));
                 dispatch((0, product_1.setName)(''));
                 dispatch((0, product_1.setMetadata)({}));
-                return [4 /*yield*/, window.threekit.player.unload()];
+                return [4, window.threekit.player.unload()];
             case 1:
                 _a.sent();
-                return [2 /*return*/];
+                return [2];
         }
     });
 }); }; };
@@ -405,19 +372,19 @@ var reloadPlayer = function (config) {
             switch (_a.label) {
                 case 0:
                     connectionObj = connection_1.default.getConnection();
-                    if (!(config === undefined)) return [3 /*break*/, 1];
+                    if (!(config === undefined)) return [3, 1];
                     assetId = connectionObj.assetId;
-                    return [3 /*break*/, 4];
+                    return [3, 4];
                 case 1:
-                    if (!(typeof config === 'string')) return [3 /*break*/, 2];
+                    if (!(typeof config === 'string')) return [3, 2];
                     assetId = config;
-                    return [3 /*break*/, 4];
+                    return [3, 4];
                 case 2:
                     assetId = (config === null || config === void 0 ? void 0 : config.assetId) || connectionObj.assetId;
                     stageId = config === null || config === void 0 ? void 0 : config.stageId;
                     initialConfiguration = (config === null || config === void 0 ? void 0 : config.configuration) || {};
-                    if (!(config === null || config === void 0 ? void 0 : config.configurationId)) return [3 /*break*/, 4];
-                    return [4 /*yield*/, api_1.default.configurations.fetch(config === null || config === void 0 ? void 0 : config.configurationId)];
+                    if (!(config === null || config === void 0 ? void 0 : config.configurationId)) return [3, 4];
+                    return [4, api_1.default.configurations.fetch(config === null || config === void 0 ? void 0 : config.configurationId)];
                 case 3:
                     configuration = _a.sent();
                     if (configuration) {
@@ -426,19 +393,18 @@ var reloadPlayer = function (config) {
                     }
                     _a.label = 4;
                 case 4:
-                    //  Update connection
                     if (assetId !== connectionObj.assetId)
                         connection_1.default.connect({ assetId: assetId });
                     state = getState();
                     trebleConfig = (0, utils_1.loadTrebleConfig)();
                     playerConfig = Object.assign({}, constants_1.DEFAULT_PLAYER_CONFIG, trebleConfig.player);
                     el = document.getElementById(state.treble.playerElId);
-                    if (!state.treble.isThreekitInitialized) return [3 /*break*/, 6];
-                    return [4 /*yield*/, dispatch((0, exports.unloadPlayer)())];
+                    if (!state.treble.isThreekitInitialized) return [3, 6];
+                    return [4, dispatch((0, exports.unloadPlayer)())];
                 case 5:
                     _a.sent();
                     _a.label = 6;
-                case 6: return [4 /*yield*/, dispatch((0, exports.initPlayer)({
+                case 6: return [4, dispatch((0, exports.initPlayer)({
                         el: el,
                         orgId: connectionObj.orgId,
                         authToken: connectionObj.authToken,
@@ -451,7 +417,7 @@ var reloadPlayer = function (config) {
                     _a.sent();
                     dispatch((0, price_1.updatePrice)());
                     dispatch((0, product_1.initProduct)());
-                    return [2 /*return*/];
+                    return [2];
             }
         });
     }); };

package/dist/store/wishlist.d.ts

@@ -1,24 +1,12 @@
 import { RootState, ThreekitDispatch } from './index';
 import { WishlistArray } from '../Treble';
 import { ISaveConfiguration } from '../api/configurations';
-/*****************************************************
- * Types and Interfaces
- ****************************************************/
 export declare type WishlistState = WishlistArray;
-/*****************************************************
- * Standard Selectors
- ****************************************************/
 export declare const refreshWishlist: import("@reduxjs/toolkit").AsyncThunk<import("../http/configurations").IConfigurationResponse[], void, {}>;
 export declare const addToWishlist: import("@reduxjs/toolkit").AsyncThunk<import("../http/configurations").IConfigurationResponse[], Omit<ISaveConfiguration, "configuration">, {}>;
 export declare const clearWishlist: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[], import("../http/configurations").IConfigurationResponse[], "treble/wishlist/clear", never, never>;
 export declare const removeFromWishlist: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[idx: number], import("../http/configurations").IConfigurationResponse[], "treble/wishlist/remove-item", never, never>;
-/*****************************************************
- * Slice
- ****************************************************/
 declare const reducer: import("redux").Reducer<WishlistArray, import("redux").AnyAction>;
-/*****************************************************
- * Standard Selectors
- ****************************************************/
 export declare const getWishlist: (state: RootState) => WishlistArray;
 export declare const resumeFromWishlist: (idx: number) => (_: ThreekitDispatch, getState: () => RootState) => void;
 export default reducer;

package/dist/store/wishlist.js

@@ -38,21 +38,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resumeFromWishlist = exports.getWishlist = exports.removeFromWishlist = exports.clearWishlist = exports.addToWishlist = exports.refreshWishlist = void 0;
 var toolkit_1 = require("@reduxjs/toolkit");
-/*****************************************************
- * State
- ****************************************************/
 var initialState = [];
-/*****************************************************
- * Standard Selectors
- ****************************************************/
 exports.refreshWishlist = (0, toolkit_1.createAsyncThunk)('treble/wishlist/refresh-data', function () { return __awaiter(void 0, void 0, void 0, function () {
     var wishlistData;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, window.threekit.treble.wishlist.getWishlist()];
+            case 0: return [4, window.threekit.treble.wishlist.getWishlist()];
             case 1:
                 wishlistData = _a.sent();
-                return [2 /*return*/, wishlistData];
+                return [2, wishlistData];
         }
     });
 }); });
@@ -60,10 +54,10 @@ exports.addToWishlist = (0, toolkit_1.createAsyncThunk)('treble/wishlist/add-ite
     var wishlistData;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, window.threekit.treble.wishlist.addItem(config)];
+            case 0: return [4, window.threekit.treble.wishlist.addItem(config)];
             case 1:
                 wishlistData = _a.sent();
-                return [2 /*return*/, wishlistData];
+                return [2, wishlistData];
         }
     });
 }); });
@@ -75,9 +69,6 @@ exports.removeFromWishlist = (0, toolkit_1.createAction)('treble/wishlist/remove
     var wishlistData = window.threekit.treble.wishlist.removeItemByIdx(idx);
     return { payload: wishlistData };
 });
-/*****************************************************
- * Slice
- ****************************************************/
 var reducer = (0, toolkit_1.createSlice)({
     name: 'wishlist',
     initialState: initialState,
@@ -97,10 +88,6 @@ var reducer = (0, toolkit_1.createSlice)({
         });
     },
 }).reducer;
-/*****************************************************
- * Standard Selectors
- ****************************************************/
-//  Wishlist
 var getWishlist = function (state) { return state.wishlist; };
 exports.getWishlist = getWishlist;
 var resumeFromWishlist = function (idx) { return function (_, getState) {

package/dist/types.d.ts

@@ -1,33 +1,67 @@
 /// <reference types="webpack-env" />
 import threekitAPI from './api';
 import Treble from './Treble';
-declare type SCENE_PHASES = 'LOADED' | 'PRELOADED' | 'RENDERED';
-declare type PRIVATE_APIS = 'scene' | 'player';
-export declare type DISPLAY_OPTIONS = 'webgl' | 'image';
-export declare type IAttributeTypes = 'String' | 'Asset' | 'Color' | 'Number' | 'Boolean';
-export declare type AssetType = 'upload' | 'item';
+declare enum SCENE_PHASES {
+    LOADED = 0,
+    PRELOADED = 1,
+    RENDERED = 2
+}
+export declare enum PRIVATE_APIS {
+    SCENE = "scene",
+    PLAYER = "player"
+}
+export declare enum DISPLAY_OPTIONS {
+    WEBGL = "webgl",
+    IMAGE = "image"
+}
+export declare enum ATTRIBUTE_TYPES {
+    STRING = "String",
+    ASSET = "Asset",
+    COLOR = "Color",
+    NUMBER = "Number",
+    BOOLEAN = "Boolean"
+}
+export declare enum ASSET_TYPES {
+    UPLOAD = "upload",
+    ITEM = "item"
+}
+export declare enum PLUG_TYPES {
+    PROXY = "Proxy",
+    TRANSFORM = "Transform"
+}
+export declare enum TRANSFORM_PROPERTY_TYPES {
+    ROTATION = "rotation",
+    TRANSLATION = "translation",
+    SCALE = "scale"
+}
+export declare enum SNAPSHOT_FORMATS {
+    JPG = "jpg",
+    PNG = "png"
+}
+export declare enum SNAPSHOT_OUTPUTS {
+    URL = "url",
+    DOWNLOAD = "download",
+    DATA_URL = "dataUrl",
+    BLOB = "blob",
+    FILE = "file"
+}
 export declare type IMetadata = Record<string, string | number | null>;
-/***************************************************
- *  Scene
- **************************************************/
-export interface ISceneQuery {
+export interface ISceneQueryShared {
     all?: boolean;
     id?: string;
     name?: string | RegExp;
     type?: string | Array<string>;
     names?: Array<RegExp>;
     properties?: any;
-    property?: string;
     child?: string;
     parent?: boolean;
     includeParent?: boolean;
-    from?: string | ISceneQuery;
+    from?: string | ISceneQueryShared | ISceneQueryNode;
     hasPlug?: string;
     operator?: any;
     operatorIndex?: number;
     evalNode?: boolean;
     evalPlug?: string;
-    plug?: string;
     shallow?: boolean;
     skipModels?: boolean;
     configurator?: boolean;
@@ -36,14 +70,20 @@ export interface ISceneQuery {
     tags?: Array<RegExp>;
     hierarchial?: boolean;
 }
+export interface ISceneQueryNode extends ISceneQueryShared {
+    plug?: PLUG_TYPES.PROXY;
+    property?: 'asset';
+}
+export interface ISceneQueryTransform extends ISceneQueryShared {
+    plug: PLUG_TYPES.TRANSFORM;
+    property: TRANSFORM_PROPERTY_TYPES;
+}
+export declare type ISceneQuery = ISceneQueryNode | ISceneQueryTransform | string;
 export interface ISceneResult {
     id: string;
     name: string;
     configurator: IThreekitPrivateConfigurator;
 }
-/***************************************************
- *  Configuration
- **************************************************/
 export interface IConfigurationAsset {
     assetId: string;
     configuration?: string;
@@ -57,22 +97,16 @@ export interface IConfigurationColor {
 export declare type IConfigurationAttribute = IConfigurationAsset | IConfigurationColor | string | number | boolean | undefined;
 export declare type IConfiguration = Record<string, IConfigurationAttribute>;
 export declare type ISetConfiguration = Record<string, IConfigurationAttribute>;
-/***************************************************
- *  ATTRIBUTES
- *
- *  This section covers both getAttributes() and getDisplayAttributes()
- **************************************************/
 interface IDisplayAttributeConfig {
     includeHidden?: boolean;
 }
-interface IAttributeBase<T extends IAttributeTypes, V extends IConfigurationAttribute> {
+interface IAttributeBase<T extends ATTRIBUTE_TYPES, V extends IConfigurationAttribute> {
     type: T;
     id: string;
     name: string;
     value: V;
     label: string;
 }
-/****** ASSET TYPE ATTRIBUTE *******/
 export interface IConfigurationAssetValue {
     assetId: string;
     name: string;
@@ -90,8 +124,8 @@ export interface IHydratedAttributeAssetValue extends IDisplayAttributeAssetValu
     handleSelect: () => Promise<void>;
     selected: boolean;
 }
-export interface IAttributeAssetBase<V> extends IAttributeBase<'Asset', IConfigurationAsset> {
-    assetType: AssetType;
+export interface IAttributeAssetBase<V> extends IAttributeBase<ATTRIBUTE_TYPES.ASSET, IConfigurationAsset> {
+    assetType: ASSET_TYPES;
     blacklist: [];
     defaultValue: IConfigurationAsset;
     hiddenValues?: Array<string>;
@@ -101,7 +135,6 @@ export interface IAttributeAssetBase<V> extends IAttributeBase<'Asset', IConfigu
 export declare type IDisplayAttributeAsset = IAttributeAssetBase<IDisplayAttributeAssetValue>;
 export declare type IHydratedAttributeAsset = IAttributeAssetBase<IHydratedAttributeAssetValue>;
 export declare type IAttributeAsset = IAttributeAssetBase<IConfigurationAssetValue>;
-/****** String TYPE ATTRIBUTE *******/
 export interface IDisplayAttributeStringValue {
     label: string;
     value: string;
@@ -110,7 +143,7 @@ export interface IHydratedAttributeStringValue extends IDisplayAttributeStringVa
     handleSelect: () => Promise<void>;
     selected: boolean;
 }
-export interface IAttributeStringBase<V> extends IAttributeBase<'String', string> {
+export interface IAttributeStringBase<V> extends IAttributeBase<ATTRIBUTE_TYPES.STRING, string> {
     blacklist: [];
     defaultValue: string;
     hiddenValues?: Array<string>;
@@ -120,31 +153,22 @@ export interface IAttributeStringBase<V> extends IAttributeBase<'String', string
 export declare type IDisplayAttributeString = IAttributeStringBase<IDisplayAttributeStringValue>;
 export declare type IHydratedAttributeString = IAttributeStringBase<IHydratedAttributeStringValue>;
 export declare type IAttributeString = IAttributeStringBase<string>;
-/****** STRING TYPE ATTRIBUTE *******/
-export interface IAttributeColor extends IAttributeBase<'Color', IConfigurationColor> {
+export interface IAttributeColor extends IAttributeBase<ATTRIBUTE_TYPES.COLOR, IConfigurationColor> {
     defaultValue: IConfigurationColor;
 }
-/****** NUMBER TYPE ATTRIBUTE *******/
-export interface IAttributeNumber extends IAttributeBase<'Number', number> {
+export interface IAttributeNumber extends IAttributeBase<ATTRIBUTE_TYPES.NUMBER, number> {
     defaultValue: number;
     lockToStep: boolean;
     max?: number;
     min?: number;
     step: number;
 }
-/****** NUMBER TYPE ATTRIBUTE *******/
-export interface IAttributeBoolean extends IAttributeBase<'Boolean', boolean> {
+export interface IAttributeBoolean extends IAttributeBase<ATTRIBUTE_TYPES.BOOLEAN, boolean> {
     defaultValue: boolean;
 }
-/****** getAttributes() *******/
 export declare type IThreekitAttribute = IAttributeAsset | IAttributeColor | IAttributeString | IAttributeNumber | IAttributeBoolean;
-/****** getDisplayAttributes() *******/
 export declare type IThreekitDisplayAttribute = IDisplayAttributeAsset | IDisplayAttributeString | IAttributeColor | IAttributeNumber | IAttributeBoolean;
-/****** Treble Hydrated Values *******/
 export declare type IHydratedAttribute = IHydratedAttributeAsset | IHydratedAttributeString | IAttributeColor | IAttributeNumber | IAttributeBoolean;
-/***************************************************
- *  Camera
- **************************************************/
 export interface ICoordinates {
     x: number;
     y: number;
@@ -160,10 +184,6 @@ export interface ISnapshotConfig {
         height: number;
     };
 }
-export declare type SNAPSHOT_FORMAT_TYPES = 'jpg' | 'png';
-/***************************************************
- * Tools
- **************************************************/
 export interface Node {
     name: string;
     nodeId: string;
@@ -211,9 +231,6 @@ export interface IThreekitTools {
     setTool: () => void;
     setTools: () => void;
 }
-/***************************************************
- *  Threekit Api
- **************************************************/
 export interface IConfigurationChangeEvent {
     name: string;
     appliedConfiguration: Record<string, string>;
@@ -231,13 +248,13 @@ export interface IThreekitConfigurator {
 }
 export interface IThreekitScene {
     PHASES: {
-        LOADED: 'loaded';
-        PRELOADED: 'preloaded';
-        RENDERED: 'rendered';
+        LOADED: SCENE_PHASES.LOADED;
+        PRELOADED: SCENE_PHASES.PRELOADED;
+        RENDERED: SCENE_PHASES.RENDERED;
     };
-    get: (query: ISceneQuery | string) => ISceneResult;
-    find: (query: ISceneQuery | string) => ISceneResult;
-    set: (query: ISceneQuery | string, transform: ICoordinates) => void;
+    get: <T extends ISceneQuery>(query: T) => T extends ISceneQueryTransform ? ICoordinates : ISceneResult;
+    find: (query: ISceneQuery) => string;
+    set: (query: ISceneQueryTransform, transform: ICoordinates) => void;
 }
 export interface IThreekitCamera {
     frameBoundingSphere: () => void;
@@ -259,12 +276,13 @@ export interface IThreekitPlayer {
     on: (phase: SCENE_PHASES | string, callback: (args: any) => void) => void;
     getConfigurator: () => Promise<IThreekitConfigurator>;
     getStageConfigurator: () => Promise<IThreekitConfigurator>;
-    enableApi: (api: PRIVATE_APIS) => any;
+    enableApi: <T extends PRIVATE_APIS>(api: T) => T extends PRIVATE_APIS.PLAYER ? IThreekitPrivatePlayer : any;
     snapshotAsync: (snapshotConfig: ISnapshotConfig) => Promise<string>;
     unload: () => Promise<string>;
 }
 export interface IThreekitPrivateConfigurator extends IThreekitConfigurator {
     getAppliedConfiguration: (attributeName: string) => string;
+    getFullConfiguration: () => IConfiguration;
 }
 export interface IThreekitPrivatePlayer {
     getConfigurator: () => IThreekitPrivateConfigurator;
@@ -272,12 +290,15 @@ export interface IThreekitPrivatePlayer {
         getFullConfiguration: () => IConfiguration;
     };
     calculateLogs: () => Promise<Record<string, any>>;
+    getAssetInstance: (query: ISceneQueryNode | string) => Promise<string>;
+    saveSceneGraphState: () => string;
 }
 export interface ThreekitInitConfig {
     authToken: string;
     el: HTMLElement;
     assetId: string;
     stageId?: string;
+    configurationId?: string;
     orgId?: string;
     showConfigurator?: boolean;
     initialConfiguration?: Record<string, any>;
@@ -305,9 +326,6 @@ export interface ThreekitInitConfig {
         help?: string;
     };
 }
-/***************************************************
- *  Treble Declarations
- **************************************************/
 export interface IFrameworkConfig {
     productsCtx: __WebpackModuleApi.RequireContext;
 }
@@ -337,9 +355,6 @@ export interface ITrebleConfig {
     treble: IFrameworkConfig;
     player: IPlayerConfig;
 }
-/***************************************************
- *  Global Declaration
- **************************************************/
 declare global {
     interface Window {
         threekitPlayer: (arg0: ThreekitInitConfig) => Promise<IThreekitPlayer>;