Merge branch 'dev'

Author: JaroslavBereza

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 1.4.0
+- feature: adds indentation option into generated code
+- feature: adds single quotes option into generated code
+- feature: adds options to hide useless properties
+- change: property names in generated code are now without quotes where possible
+- adds types to the components
+- fix: UI crash in DOM (live) when object is proxy (e.g. array of layers in document)
+- improvement: adds history states and snapshots into DOM (live)
+- improvement: left column adjustable width is now expressed in pixels instead of percentage and it is remembered after panel reload
+
+
 ## 1.3.0
 - adds raw data type support (needs to be enabled in Code > Options)
 - adds grouping of items with same content
@@ -32,7 +43,7 @@
 - change: button menus in footer are now using dropdown so those can be shown out of panel boundary
 
 ## 0.27.0
-- improvement: shows error dialog when something failes outside of react error component
+- improvement: shows error dialog when something fails outside of react error component
 - workaround: allows to make production version of plugin. See: https://forums.adobeprerelease.com/photoshop/discussion/2138/severe-issue-with-listener-in-production-use#latest
 - improvement: adds info in footer whether this is production or development version of plugin. Also adds copyright.
 - improvement: generates "await" keyword for async batchplay
@@ -46,7 +57,7 @@
 
 ## 0.26.0
 - feature: adds partial support for raw data type (fake structure in views and attempt to generate code in code tab)
-- feature: adds posibility to enable/disable raw data type support
+- feature: adds possibility to enable/disable raw data type support
 - feature: add expand slider into tree views
 - improvement: breadcrumb in tree view is now at fixed position when scrolling
 
@@ -55,7 +66,7 @@
 - improvement: adds new icon (made by Petr Štefek https://www.behance.net/phob )
 - improvement: removes right bottom artifact
 - improvement: cleaner path to the pinned property in generated source code
-- improvement: now it shows autoselected descriptor underline for only autocative items. 2 for difference 1 for others
+- improvement: now it shows autoselected descriptor underline for only autoactive items. 2 for difference 1 for others
 - fix: initial text flash from black to theme color
 
 

TODO.md

@@ -2,11 +2,18 @@
 	"name": "Alchemist",
 	"id": "2bcdb900",
 	"main": "index.html",
-	"version": "1.3.0",
-	"manifestVersion": 4,
-	"host": {
+	"version": "1.4.0",
+	"manifestVersion": 5,
+	"host": [{
 		"app": "PS",
-		"minVersion": "22.2.0"
+		"minVersion": "22.5.0",
+		"data": {
+			"apiVersion": 2
+		}
+	}],
+	"requiredPermissions": {
+		"clipboard": "readAndWrite",
+		"allowCodeGenerationFromStrings": true
 	},
 	"entrypoints": [{
 			"type": "panel",
@@ -58,13 +65,13 @@
 		"path": "icons/lightPlugin.png",
 		"scale": [1, 2],
 		"theme": ["darkest", "dark", "medium"],
-		"species": [ "pluginList" ]
+		"species": ["pluginList"]
 	}, {
 		"width": 48,
 		"height": 48,
 		"path": "icons/darkPlugin.png",
 		"scale": [1, 2],
 		"theme": ["lightest", "light"],
-		"species": [ "pluginList" ]
+		"species": ["pluginList"]
 	}]
 }

dist/index.js

@@ -12,6 +12,7 @@
         "@types/react": "^16.9.38",
         "@types/react-dom": "^16.9.8",
         "@types/semver": "^7.3.6",
+        "@types/stringify-object": "^3.3.1",
         "@typescript-eslint/eslint-plugin": "^3.3.0",
         "@typescript-eslint/parser": "^3.3.0",
         "babel-loader": "^8.1.0",
@@ -50,17 +51,19 @@
         "jss-vendor-prefixer": "^8.0.1",
         "lodash": "^4.17.15",
         "prismjs": "^1.20.0",
-        "react": "^16.13.1",
+        "react": "^17.0.2",
         "react-dom": "^16.13.1",
         "react-json-tree": "^0.11.2",
         "react-notifications": "^1.7.2",
         "react-redux": "^7.2.0",
-        "react-split": "^2.0.9",
+        "react-split-pane": "^0.1.92",
+        "react-uxp-spectrum": "github:jardicc/react-uxp-spectrum",
         "redux": "^4.0.5",
         "redux-devtools-extension": "^2.13.8",
         "redux-devtools-themes": "^1.0.0",
         "reselect": "^4.0.0",
         "semver": "^7.3.5",
+        "stringify-object": "^3.3.0",
         "styled-components": "^5.1.1",
         "sval": "^0.4.8",
         "terser-webpack-plugin": "^5.1.4",

dist/index.js.LICENSE.txt

@@ -1,7 +1,6 @@
-import { TActiveSection, TActiveInspectorTab, IDescriptor, TTargetReference, TSelectDescriptorOperation, ITargetReference, TSubTypes, ITreeDataTabs, TPath, TFilterEvents, TImportItems, IInspectorState, TGenericViewType, TCodeViewType, IAMCoverter, TFontSizeSettings, IDescriptorSettings } from "../model/types";
+import { TActiveSection, TActiveInspectorTab, IDescriptor, TTargetReference, TSelectDescriptorOperation, ITargetReference, TSubTypes, ITreeDataTabs, TPath, TFilterEvents, TImportItems, IInspectorState, TGenericViewType, TCodeViewType, IAMCoverter, TFontSizeSettings, IDescriptorSettings, ISettings } from "../model/types";
 import { TState } from "../components/FilterButton/FilterButton";
 import { IRootState } from "../../shared/store";
-import { CommandOptions } from "photoshop/dist/types/UXP";
 
 export interface ISetMainTab {
 	type: "SET_MAIN_TAB"
@@ -270,6 +269,18 @@ export interface IToggleDescriptorsGroupingAction{
 	payload:null
 }
 
+export interface ISetSettingsAction{
+	type: "SET_SETTINGS",
+	payload: Partial<ISettings>
+}
+
+export function setSettingsAction(settings:Partial<ISettings>): ISetSettingsAction{
+	return {
+		type: "SET_SETTINGS",
+		payload: settings,
+	};
+}
+
 export function toggleDescriptorsGroupingAction():IToggleDescriptorsGroupingAction {
 	return {
 		type: "TOGGLE_DESCRIPTORS_GROUPING",
@@ -653,4 +664,5 @@ export type TActions = ISetMainTab |
 	ISetConverterInfoAction |
 	ISetFontSizeAction |
 	ISetNeverRecordActionNamesAction |
-	IToggleDescriptorsGroupingAction
+	IToggleDescriptorsGroupingAction |
+	ISetSettingsAction

dist/manifest.json

@@ -14,6 +14,10 @@ export class GetDOM{
 			return null;
 		}
 
+		if (res[0]._ref === "historyState" || res[0]._ref === "snapshot") {
+			return GetDOM.getHistoryDom(res[0]._id, res[1]?._id);
+		}
+
 		if (res[0]._ref === "application") {
 			return GetDOM.getAppDom();
 		}
@@ -39,30 +43,48 @@ export class GetDOM{
 		return null;
 	}
 
+	private static sanitizeDocId(docId?: number) {
+		if (typeof docId !== "number") {
+			if (!photoshop.app.activeDocument) {
+				return null;
+			}
+			docId = photoshop.app.activeDocument._id;
+		}
+		return docId;
+	}
+
 	private static getAppDom():Photoshop {
 		const appDom = new photoshop.app.Photoshop();
 		return appDom;
 	}
 
-	private static getLayerDom(layer: number, doc?: number): Layer|null {
-		if (doc === undefined) {
-			doc = photoshop.app.activeDocument._id;
+	private static getDocumentDom(doc: number):Document|null {
+		const docDom = new photoshop.app.Document(doc);
+		if (!docDom) { return null;}
+		const extraDom = new DocumentExtra(docDom);
+		if (!extraDom.exists) {
+			return null;
 		}
-		const layerDom = new photoshop.app.Layer(layer, doc);
+		return docDom;
+	}
+
+	private static getLayerDom(layer: number, docId?: number): Layer|null {
+		docId = GetDOM.sanitizeDocId(docId);
+		if (!docId) { return null;}
+		const layerDom = new photoshop.app.Layer(layer, docId);
 		const layerExtra = new LayerExtra(layerDom);
 		if (!layerExtra.exists) {
 			return null;
 		}
 		return layerDom;
 	}
 
-	private static getDocumentDom(doc: number):Document|null {
-		const docDom = new photoshop.app.Document(doc);
-		const extraDom = new DocumentExtra(docDom);
-		if (!extraDom.exists) {
-			return null;
-		}
-		return docDom;
+	private static getHistoryDom(historyId: number, docId?: number) {
+		docId = GetDOM.sanitizeDocId(docId);
+		if (!docId) { return null;}
+		const doc = GetDOM.getDocumentDom(docId);
+		const found = (doc as any).historyStates.find((h: any) => historyId === h.id) || null;
+		return found;
 	}
 
 	private static actionSetDom(actionSetID: number):ActionSet {

package.json

@@ -26,16 +26,18 @@ export class ListenerClass{
 		this.listenerCb = cb;
 		ListenerClass.addAMConverterHack();
 		if (Main.devMode) {
-			app.eventNotifier = this.listenerCb;
+			//app.eventNotifier = this.listenerCb;
+			action.addNotificationListener(["$All "] as any, this.listenerCb);
 		} else {
-			action.addNotificationListener(this.allEventsArray, this.listenerCb);			
+			action.addNotificationListener(this.allEventsArray, this.listenerCb);
 		}
 	}
 
 	public static stopListener(): void{
 		this.removeAMConverterHack();
 		if (Main.devMode) {
-			app.eventNotifier = () => { };
+			//app.eventNotifier = () => { };
+			action.removeNotificationListener(["$All "] as any, this.listenerCb);
 		} else {
 			action.removeNotificationListener(this.allEventsArray, this.listenerCb);			
 		}