@iobroker/json-config 7.5.2 → 7.6.0

package/build/JsonConfigComponent/wrapper/Components/Editor.d.ts

@@ -1,5 +1,6 @@
 import { type JSX } from 'react';
 import 'ace-builds/src-min-noconflict/mode-json';
+import 'ace-builds/src-min-noconflict/mode-json5';
 import 'ace-builds/src-min-noconflict/worker-json';
 import 'ace-builds/src-min-noconflict/theme-clouds_midnight';
 import 'ace-builds/src-min-noconflict/theme-chrome';
@@ -8,7 +9,7 @@ interface EditorProps {
     fontSize?: number;
     value?: string;
     defaultValue?: string;
-    mode?: 'json' | 'css' | 'html';
+    mode?: 'json' | 'css' | 'html' | 'json5';
     name: string;
     onChange: (newValue: string) => void;
     themeType: string;

package/build/JsonConfigComponent/wrapper/Components/Editor.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import AceEditor from 'react-ace';
 import 'ace-builds/src-min-noconflict/mode-json';
+import 'ace-builds/src-min-noconflict/mode-json5';
 import 'ace-builds/src-min-noconflict/worker-json';
 import 'ace-builds/src-min-noconflict/theme-clouds_midnight';
 import 'ace-builds/src-min-noconflict/theme-chrome';

package/build/JsonConfigComponent/wrapper/Components/Editor.js.map

@@ -1 +1 @@
-{"version":3,"file":"Editor.js","sourceRoot":"./src/","sources":["JsonConfigComponent/wrapper/Components/Editor.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAExC,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,yCAAyC,CAAC;AACjD,OAAO,2CAA2C,CAAC;AACnD,OAAO,qDAAqD,CAAC;AAC7D,OAAO,4CAA4C,CAAC;AACpD,OAAO,kDAAkD,CAAC;AAE1D,MAAM,MAAM,GAAwC;IAChD,SAAS,EAAE;QACP,MAAM,EAAE,eAAe;QACvB,SAAS,EAAE,GAAG;KACjB;IACD,WAAW,EAAE;QACT,MAAM,EAAE,qBAAqB;QAC7B,SAAS,EAAE,GAAG;KACjB;CACJ,CAAC;AAcF,SAAS,MAAM,CAAC,KAAkB;IAC9B,OAAO,CACH,oBAAC,SAAS,IACN,KAAK,EAAE,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,EACvG,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,MAAM,EAC1B,KAAK,EAAC,MAAM,EACZ,MAAM,EAAC,MAAM,EACb,eAAe,EAAE,KAAK,CAAC,aAAa,EACpC,UAAU,EAAE,KAAK,CAAC,aAAa,EAC/B,mBAAmB,EAAE,KAAK,CAAC,aAAa,EACxC,YAAY,EAAE,KAAK,CAAC,YAAY,EAChC,KAAK,EAAE,KAAK,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,QAAQ,EAChE,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,QAAQ,EAAE,CAAC,KAAK,CAAC,QAAQ,EACzB,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAC9C,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,mBAAmB,EACvC,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,EAAE,EAC9B,UAAU,EAAE;YACR,yBAAyB,EAAE,IAAI;YAC/B,wBAAwB,EAAE,IAAI;YAC9B,cAAc,EAAE,IAAI;YAEpB,eAAe,EAAE,KAAK,CAAC,aAAa;YACpC,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;SAC/C,EACD,WAAW,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,GACxC,CACL,CAAC;AACN,CAAC;AAED,eAAe,MAAM,CAAC","sourcesContent":["import React, { type JSX } from 'react';\n\nimport AceEditor from 'react-ace';\nimport 'ace-builds/src-min-noconflict/mode-json';\nimport 'ace-builds/src-min-noconflict/worker-json';\nimport 'ace-builds/src-min-noconflict/theme-clouds_midnight';\nimport 'ace-builds/src-min-noconflict/theme-chrome';\nimport 'ace-builds/src-min-noconflict/ext-language_tools';\n\nconst styles: Record<string, React.CSSProperties> = {\n    jsonError: {\n        border: '1px solid red',\n        minHeight: 200,\n    },\n    jsonNoError: {\n        border: '1px solid #00000000',\n        minHeight: 200,\n    },\n};\n\ninterface EditorProps {\n    fontSize?: number;\n    value?: string;\n    defaultValue?: string;\n    mode?: 'json' | 'css' | 'html';\n    name: string;\n    onChange: (newValue: string) => void;\n    themeType: string;\n    editValueMode?: boolean; // flag that indicates the \"value edit mode\"\n    error?: boolean;\n}\n\nfunction Editor(props: EditorProps): JSX.Element {\n    return (\n        <AceEditor\n            style={props.error === true ? styles.jsonError : props.error === false ? styles.jsonNoError : undefined}\n            mode={props.mode || 'json'}\n            width=\"100%\"\n            height=\"100%\"\n            showPrintMargin={props.editValueMode}\n            showGutter={props.editValueMode}\n            highlightActiveLine={props.editValueMode}\n            defaultValue={props.defaultValue}\n            theme={props.themeType === 'dark' ? 'clouds_midnight' : 'chrome'}\n            value={props.value}\n            readOnly={!props.onChange}\n            onChange={newValue => props.onChange(newValue)}\n            name={props.name || 'UNIQUE_ID_OF_DIV1'}\n            fontSize={props.fontSize || 14}\n            setOptions={{\n                enableBasicAutocompletion: true,\n                enableLiveAutocompletion: true,\n                enableSnippets: true,\n\n                showLineNumbers: props.editValueMode,\n                tabSize: props.editValueMode ? 2 : undefined,\n            }}\n            editorProps={{ $blockScrolling: true }}\n        />\n    );\n}\n\nexport default Editor;\n"]}
+{"version":3,"file":"Editor.js","sourceRoot":"./src/","sources":["JsonConfigComponent/wrapper/Components/Editor.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAExC,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,yCAAyC,CAAC;AACjD,OAAO,0CAA0C,CAAC;AAClD,OAAO,2CAA2C,CAAC;AACnD,OAAO,qDAAqD,CAAC;AAC7D,OAAO,4CAA4C,CAAC;AACpD,OAAO,kDAAkD,CAAC;AAE1D,MAAM,MAAM,GAAwC;IAChD,SAAS,EAAE;QACP,MAAM,EAAE,eAAe;QACvB,SAAS,EAAE,GAAG;KACjB;IACD,WAAW,EAAE;QACT,MAAM,EAAE,qBAAqB;QAC7B,SAAS,EAAE,GAAG;KACjB;CACJ,CAAC;AAcF,SAAS,MAAM,CAAC,KAAkB;IAC9B,OAAO,CACH,oBAAC,SAAS,IACN,KAAK,EAAE,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,EACvG,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,MAAM,EAC1B,KAAK,EAAC,MAAM,EACZ,MAAM,EAAC,MAAM,EACb,eAAe,EAAE,KAAK,CAAC,aAAa,EACpC,UAAU,EAAE,KAAK,CAAC,aAAa,EAC/B,mBAAmB,EAAE,KAAK,CAAC,aAAa,EACxC,YAAY,EAAE,KAAK,CAAC,YAAY,EAChC,KAAK,EAAE,KAAK,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,QAAQ,EAChE,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,QAAQ,EAAE,CAAC,KAAK,CAAC,QAAQ,EACzB,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAC9C,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,mBAAmB,EACvC,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,EAAE,EAC9B,UAAU,EAAE;YACR,yBAAyB,EAAE,IAAI;YAC/B,wBAAwB,EAAE,IAAI;YAC9B,cAAc,EAAE,IAAI;YAEpB,eAAe,EAAE,KAAK,CAAC,aAAa;YACpC,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;SAC/C,EACD,WAAW,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,GACxC,CACL,CAAC;AACN,CAAC;AAED,eAAe,MAAM,CAAC","sourcesContent":["import React, { type JSX } from 'react';\n\nimport AceEditor from 'react-ace';\nimport 'ace-builds/src-min-noconflict/mode-json';\nimport 'ace-builds/src-min-noconflict/mode-json5';\nimport 'ace-builds/src-min-noconflict/worker-json';\nimport 'ace-builds/src-min-noconflict/theme-clouds_midnight';\nimport 'ace-builds/src-min-noconflict/theme-chrome';\nimport 'ace-builds/src-min-noconflict/ext-language_tools';\n\nconst styles: Record<string, React.CSSProperties> = {\n    jsonError: {\n        border: '1px solid red',\n        minHeight: 200,\n    },\n    jsonNoError: {\n        border: '1px solid #00000000',\n        minHeight: 200,\n    },\n};\n\ninterface EditorProps {\n    fontSize?: number;\n    value?: string;\n    defaultValue?: string;\n    mode?: 'json' | 'css' | 'html' | 'json5';\n    name: string;\n    onChange: (newValue: string) => void;\n    themeType: string;\n    editValueMode?: boolean; // flag that indicates the \"value edit mode\"\n    error?: boolean;\n}\n\nfunction Editor(props: EditorProps): JSX.Element {\n    return (\n        <AceEditor\n            style={props.error === true ? styles.jsonError : props.error === false ? styles.jsonNoError : undefined}\n            mode={props.mode || 'json'}\n            width=\"100%\"\n            height=\"100%\"\n            showPrintMargin={props.editValueMode}\n            showGutter={props.editValueMode}\n            highlightActiveLine={props.editValueMode}\n            defaultValue={props.defaultValue}\n            theme={props.themeType === 'dark' ? 'clouds_midnight' : 'chrome'}\n            value={props.value}\n            readOnly={!props.onChange}\n            onChange={newValue => props.onChange(newValue)}\n            name={props.name || 'UNIQUE_ID_OF_DIV1'}\n            fontSize={props.fontSize || 14}\n            setOptions={{\n                enableBasicAutocompletion: true,\n                enableLiveAutocompletion: true,\n                enableSnippets: true,\n\n                showLineNumbers: props.editValueMode,\n                tabSize: props.editValueMode ? 2 : undefined,\n            }}\n            editorProps={{ $blockScrolling: true }}\n        />\n    );\n}\n\nexport default Editor;\n"]}

package/build/types.d.ts

@@ -7,7 +7,7 @@ import type {
     ThemeType,
     ThemeName,
 } from '@iobroker/adapter-react-v5';
-import type { ConfigGeneric, DeviceManagerPropsProps } from '#JC/JsonConfigComponent/ConfigGeneric';
+import type { ConfigGeneric, DeviceManagerPropsProps } from './JsonConfigComponent/ConfigGeneric';
 
 declare module '@mui/material/Button' {
     interface ButtonPropsColorOverrides {
@@ -601,6 +601,8 @@ export interface ConfigItemCustom extends ConfigItem {
     type: 'custom';
     /** location of Widget, like "custom/customComponents.js" */
     url: string;
+    /* module federation settings */
+    bundlerType?: 'module';
     /** Component name, like "ConfigCustomBackItUpSet/Components/AdapterExist" */
     name: string;
     /** i18n */
@@ -860,6 +862,10 @@ export interface ConfigItemJsonEditor extends ConfigItem {
     validateJson?: boolean;
     /** if true, the JSON will be validated only if the value is not empty */
     allowEmpty?: boolean;
+    /** Allow JSON5 format. Default is disabled */
+    json5?: boolean;
+    /** Do not allow to save the value if error in JSON or JSON5 */
+    doNotApplyWithError?: boolean;
 }
 
 export interface ConfigItemInterface extends ConfigItem {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@iobroker/json-config",
     "description": "This package contains the ioBroker JSON config UI components",
-    "version": "7.5.2",
+    "version": "7.6.0",
     "main": "./build/index.js",
     "types": "./build/index.d.ts",
     "scripts": {
@@ -18,20 +18,22 @@
         "access": "public"
     },
     "dependencies": {
-        "@iobroker/adapter-react-v5": "file:../adapter-react-v5",
-        "@mui/x-date-pickers": "^7.27.0",
+        "@iobroker/adapter-react-v5": "7.6.0",
+        "@mui/x-date-pickers": "^7.27.1",
         "crypto-js": "^4.2.0",
+        "json5": "^2.2.3",
         "react-ace": "^14.0.1",
         "react-qr-code": "^2.0.15"
     },
     "devDependencies": {
-        "@craco/craco": "^7.1.0",
         "@types/crypto-js": "^4.2.2",
+        "@types/json5": "^2.2.0",
         "ajv": "^8.17.1",
-        "tsc-alias": "^1.8.10"
+        "tsc-alias": "^1.8.11"
     },
     "files": [
         "build/",
         "LICENSE"
-    ]
+    ],
+    "gitHead": "a0a7fc4fc182fbfd4f7aae1345de3198d9ae49aa"
 }