Skip to content
This repository was archived by the owner on Oct 16, 2024. It is now read-only.

Commit d1282f5

Browse files
bennobuilderbennobuilder
authored
Merge pull request #210 from agile-ts/refactor-logger
Refactor logger
2 parents 434c1f0 + 6c152d8 commit d1282f5

File tree

6 files changed

+428
-342
lines changed

6 files changed

+428
-342
lines changed

‎examples/react/develop/functional-component-ts/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
"@agile-ts/multieditor": "file:.yalc/@agile-ts/multieditor",
1111
"@agile-ts/proxytree": "file:.yalc/@agile-ts/proxytree",
1212
"@agile-ts/react": "file:.yalc/@agile-ts/react",
13-
"react": "^16.13.1",
14-
"react-dom": "^16.13.1",
15-
"react-router-dom": "^5.2.0",
13+
"react": "^17.0.2",
14+
"react-dom": "^17.0.2",
15+
"react-router-dom": "^5.3.0",
1616
"react-scripts": "3.4.3",
1717
"styled-components": "^5.2.0",
18-
"typescript": "^3.9.7"
18+
"typescript": "^4.4.3"
1919
},
2020
"devDependencies": {
2121
"@testing-library/react": "^9.3.2",
2222
"@testing-library/user-event": "^7.1.2",
2323
"@types/node": "^12.0.0",
24-
"@types/react": "^16.9.0",
25-
"@types/react-dom": "^16.9.0",
24+
"@types/react": "^17.0.26",
25+
"@types/react-dom": "^17.0.9",
2626
"@types/react-router-dom": "^5.1.5",
2727
"@types/styled-components": "^5.1.3"
2828
},

‎examples/react/develop/functional-component-ts/src/core/index.ts‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -126,35 +126,36 @@ MY_EVENT.on('Test', () => {
126126

127127
// LOGGER tests
128128

129-
// const logger = new Logger((l) => ({
130-
// prefix: 'Tests',
131-
// allowedTags: ['coreWarning', 'randomDebug'],
132-
// level: Logger.level.DEBUG,
133-
// timestamp: true,
134-
// }));
135-
// logger.watch({
136-
// callback: (loggerCategory, data) => {
137-
// console.log('--- CALLED WATCHER ', loggerCategory, data);
138-
// },
139-
// level: Logger.level.WARN,
140-
// });
141-
// logger.createLoggerCategory({
142-
// key: 'coreLog',
143-
// level: 100,
144-
// customStyle: 'color: purple; font-weight: bold;',
145-
// prefix: 'Core Log',
146-
// });
147-
// logger.custom('coreLog', 'This is a cool Log', { object: 'yeet' });
148-
// logger.log('This is a Log');
149-
// logger.debug('This is a Debug');
150-
// logger.info('This is an Info');
151-
// logger.info('This is an Info with Object', { empty: 'object' });
152-
// logger.error('This is an Error');
153-
// logger.warn('This is a Warning');
154-
// logger.trace('This is a Trace');
155-
// logger.if.tag(['coreWarning']).warn('My core Warning');
156-
// logger.if.tag(['randomDebug']).debug('My random Debug');
157-
// logger.table('Test Table', { test: 'test', test1: 'test1' });
129+
const logger = new Logger((l) => ({
130+
prefix: 'Tests',
131+
allowedTags: ['coreWarning', 'randomDebug'],
132+
level: Logger.level.DEBUG,
133+
timestamp: true,
134+
}));
135+
logger.watch(
136+
(loggerCategory, data) => {
137+
console.log('--- CALLED WATCHER ', loggerCategory, data);
138+
},
139+
{
140+
level: Logger.level.WARN,
141+
}
142+
);
143+
logger.createLoggerCategory({
144+
key: 'coreLog',
145+
level: 100,
146+
customStyle: 'color: purple; font-weight: bold;',
147+
prefix: 'Core Log',
148+
});
149+
logger.custom('coreLog', 'This is a cool Log', { object: 'yeet' });
150+
logger.log('This is a Log');
151+
logger.debug('This is a Debug');
152+
logger.info('This is an Info', 'second info');
153+
logger.info('This is an Info with Object', { empty: 'object' });
154+
logger.error('This is an Error');
155+
logger.warn('This is a Warning');
156+
logger.if.tag(['coreWarning']).warn('My core Warning');
157+
logger.if.tag(['randomDebug']).debug('My random Debug');
158+
logger.table('Test Table', { test: 'test', test1: 'test1' });
158159
//
159160
// const api = new API({
160161
// timeout: 10000,

‎examples/react/develop/functional-component-ts/yarn.lock‎

Lines changed: 64 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,36 @@
33

44

55
"@agile-ts/api@file:.yalc/@agile-ts/api":
6-
version "0.0.23"
6+
version "0.0.24"
77
dependencies:
8-
"@agile-ts/utils" "^0.0.9"
8+
"@agile-ts/utils" "^0.0.10"
99

1010
"@agile-ts/core@file:.yalc/@agile-ts/core":
11-
version "0.2.5"
11+
version "0.2.6"
1212
dependencies:
13-
"@agile-ts/utils" "^0.0.9"
13+
"@agile-ts/utils" "^0.0.10"
1414

1515
"@agile-ts/event@file:.yalc/@agile-ts/event":
16-
version "0.0.12"
16+
version "0.0.13"
1717

1818
"@agile-ts/logger@file:.yalc/@agile-ts/logger":
19-
version "0.0.9"
19+
version "0.0.10"
2020
dependencies:
21-
"@agile-ts/utils" "^0.0.9"
21+
"@agile-ts/utils" "^0.0.10"
2222

2323
"@agile-ts/multieditor@file:.yalc/@agile-ts/multieditor":
24-
version "0.0.22"
24+
version "0.0.23"
2525

2626
"@agile-ts/proxytree@file:.yalc/@agile-ts/proxytree":
27-
version "0.0.7"
27+
version "0.0.8"
2828

2929
"@agile-ts/react@file:.yalc/@agile-ts/react":
30-
version "0.2.1"
30+
version "0.2.2"
3131

32-
"@agile-ts/utils@^0.0.9":
33-
version "0.0.9"
34-
resolved "https://registry.yarnpkg.com/@agile-ts/utils/-/utils-0.0.9.tgz#b20d03cc450d1a916bb7d8836c3451cb06cc882c"
35-
integrity sha512-M9/QQjX+I5r11MwztfK371/kfInmJS7kLlAKmG8ZkgqG/x8LdCxD7tOTwqMa9Dc1p1ZJqSvNzL/Y8l7boi/3IQ==
32+
"@agile-ts/utils@^0.0.10":
33+
version "0.0.10"
34+
resolved "https://registry.yarnpkg.com/@agile-ts/utils/-/utils-0.0.10.tgz#5eb2d7b7faefc00c416165ad93c79237e8448bbd"
35+
integrity sha512-eVJZS60H8HaD8atTfswObihdDxjcxNlaoHk8Crmz85KOrdIMBMdrGx41p+Zf15s+dSfal1gbgM2In3bw4zjSww==
3636

3737
"@babel/code-frame@7.8.3":
3838
version "7.8.3"
@@ -1111,6 +1111,13 @@
11111111
dependencies:
11121112
regenerator-runtime "^0.13.4"
11131113

1114+
"@babel/runtime@^7.12.13":
1115+
version "7.15.4"
1116+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
1117+
integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
1118+
dependencies:
1119+
regenerator-runtime "^0.13.4"
1120+
11141121
"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.4.0", "@babel/template@^7.8.6":
11151122
version "7.12.7"
11161123
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
@@ -1216,11 +1223,6 @@
12161223
dependencies:
12171224
"@hapi/hoek" "^8.3.0"
12181225

1219-
"@hookform/resolvers@^2.8.1":
1220-
version "2.8.1"
1221-
resolved "https://registry.yarnpkg.com/@hookform/resolvers/-/resolvers-2.8.1.tgz#0d4fdd25bdeb4b98bf4e177c63fc4efa173454dd"
1222-
integrity sha512-U5lgaCkvD+0e5X8iQmCHiF+jOqjTX6OHUA7zPdeIHI6xdAOoi3rH9MKNuwMwv5Hly2LL6XtDgDkS/k+YG9hOew==
1223-
12241226
"@jest/console@^24.7.1", "@jest/console@^24.9.0":
12251227
version "24.9.0"
12261228
resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0"
@@ -1685,12 +1687,12 @@
16851687
dependencies:
16861688
"@types/react" "*"
16871689

1688-
"@types/react-dom@^16.9.0":
1689-
version "16.9.10"
1690-
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.10.tgz#4485b0bec3d41f856181b717f45fd7831101156f"
1691-
integrity sha512-ItatOrnXDMAYpv6G8UCk2VhbYVTjZT9aorLtA/OzDN9XJ2GKcfam68jutoAcILdRjsRUO8qb7AmyObF77Q8QFw==
1690+
"@types/react-dom@^17.0.9":
1691+
version "17.0.9"
1692+
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.9.tgz#441a981da9d7be117042e1a6fd3dac4b30f55add"
1693+
integrity sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg==
16921694
dependencies:
1693-
"@types/react" "^16"
1695+
"@types/react" "*"
16941696

16951697
"@types/react-router-dom@^5.1.5":
16961698
version "5.1.7"
@@ -1717,14 +1719,20 @@
17171719
"@types/prop-types" "*"
17181720
csstype "^3.0.2"
17191721

1720-
"@types/react@^16", "@types/react@^16.9.0":
1721-
version "16.14.2"
1722-
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.2.tgz#85dcc0947d0645349923c04ccef6018a1ab7538c"
1723-
integrity sha512-BzzcAlyDxXl2nANlabtT4thtvbbnhee8hMmH/CcJrISDBVcJS1iOsP1f0OAgSdGE0MsY9tqcrb9YoZcOFv9dbQ==
1722+
"@types/react@^17.0.26":
1723+
version "17.0.26"
1724+
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.26.tgz#960ea4b3518cc154ed7df3b35656c508df653331"
1725+
integrity sha512-MXxuXrH2xOcv5cp/su4oz69dNQnSA90JjFw5HBd5wifw6Ihi94j7dRJm7qNsB30tnruXSCPc9qmlhGop4nh9Hw==
17241726
dependencies:
17251727
"@types/prop-types" "*"
1728+
"@types/scheduler" "*"
17261729
csstype "^3.0.2"
17271730

1731+
"@types/scheduler@*":
1732+
version "0.16.2"
1733+
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
1734+
integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
1735+
17281736
"@types/stack-utils@^1.0.1":
17291737
version "1.0.1"
17301738
resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
@@ -8835,15 +8843,14 @@ react-dev-utils@^10.2.1:
88358843
strip-ansi "6.0.0"
88368844
text-table "0.2.0"
88378845

8838-
react-dom@^16.13.1:
8839-
version "16.14.0"
8840-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"
8841-
integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==
8846+
react-dom@^17.0.2:
8847+
version "17.0.2"
8848+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
8849+
integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
88428850
dependencies:
88438851
loose-envify "^1.1.0"
88448852
object-assign "^4.1.1"
8845-
prop-types "^15.6.2"
8846-
scheduler "^0.19.1"
8853+
scheduler "^0.20.2"
88478854

88488855
react-error-overlay@^6.0.7:
88498856
version "6.0.8"
@@ -8860,25 +8867,25 @@ react-is@^17.0.1:
88608867
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
88618868
integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
88628869

8863-
react-router-dom@^5.2.0:
8864-
version "5.2.0"
8865-
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662"
8866-
integrity sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==
8870+
react-router-dom@^5.3.0:
8871+
version "5.3.0"
8872+
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363"
8873+
integrity sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ==
88678874
dependencies:
8868-
"@babel/runtime" "^7.1.2"
8875+
"@babel/runtime" "^7.12.13"
88698876
history "^4.9.0"
88708877
loose-envify "^1.3.1"
88718878
prop-types "^15.6.2"
8872-
react-router "5.2.0"
8879+
react-router "5.2.1"
88738880
tiny-invariant "^1.0.2"
88748881
tiny-warning "^1.0.0"
88758882

8876-
react-router@5.2.0:
8877-
version "5.2.0"
8878-
resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz#424e75641ca8747fbf76e5ecca69781aa37ea293"
8879-
integrity sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==
8883+
react-router@5.2.1:
8884+
version "5.2.1"
8885+
resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d"
8886+
integrity sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ==
88808887
dependencies:
8881-
"@babel/runtime" "^7.1.2"
8888+
"@babel/runtime" "^7.12.13"
88828889
history "^4.9.0"
88838890
hoist-non-react-statics "^3.1.0"
88848891
loose-envify "^1.3.1"
@@ -8949,14 +8956,13 @@ react-scripts@3.4.3:
89498956
optionalDependencies:
89508957
fsevents "2.1.2"
89518958

8952-
react@^16.13.1:
8953-
version "16.14.0"
8954-
resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
8955-
integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
8959+
react@^17.0.2:
8960+
version "17.0.2"
8961+
resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
8962+
integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
89568963
dependencies:
89578964
loose-envify "^1.1.0"
89588965
object-assign "^4.1.1"
8959-
prop-types "^15.6.2"
89608966

89618967
read-pkg-up@^2.0.0:
89628968
version "2.0.0"
@@ -9431,10 +9437,10 @@ saxes@^3.1.9:
94319437
dependencies:
94329438
xmlchars "^2.1.1"
94339439

9434-
scheduler@^0.19.1:
9435-
version "0.19.1"
9436-
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
9437-
integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==
9440+
scheduler@^0.20.2:
9441+
version "0.20.2"
9442+
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
9443+
integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
94389444
dependencies:
94399445
loose-envify "^1.1.0"
94409446
object-assign "^4.1.1"
@@ -10436,10 +10442,10 @@ typedarray@^0.0.6:
1043610442
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
1043710443
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
1043810444

10439-
typescript@^3.9.7:
10440-
version "3.9.7"
10441-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
10442-
integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
10445+
typescript@^4.4.3:
10446+
version "4.4.3"
10447+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324"
10448+
integrity sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==
1044310449

1044410450
unicode-canonical-property-names-ecmascript@^1.0.4:
1044510451
version "1.0.4"

‎examples/react/develop/multieditor-ts/src/core/signUpEditor.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export const signUpEditor = createMultieditor<InitialDataInterface>({
117117
},
118118
},
119119
fixedProperties: ['id'],
120-
reValidateMode: 'onChange',
120+
reValidateMode: 'onBlur',
121121
});
122122

123123
// For better debugging

0 commit comments

Comments
 (0)