Merge pull request #13 from artpani4/artpani/ward

Artpani/ward

deno.json

@@ -5,7 +5,7 @@
     }
   },
   "tasks": {
-    "start": "deno run --allow-all src/index.ts"
+    "start": "config=develop deno run --allow-all example/config/main.ts"
   },
   "lint": {
     "files": {

example/config/a.tuner.ts

@@ -5,14 +5,17 @@ export default Tuner.tune({
   //     'http://localhost:8000/example/config/b.tuner.ts',
   //   ),
   env: {
-    someField: Tuner.Env.getString.orDefault("effe"),
+    someField: Tuner.Env.getString.orDefault('effe'),
   },
-  child: Tuner.Load.remote.providers.notion(
-    Tuner.getEnv('NOTION_KEY'),
-    'https://www.notion.so/artpani/Tuner-15d96fa233e64e8da65c30bfa2ade5e2?pvs=4#8b52d24ee4e1494392ff3f1b58a73753',
-  ),
+  // child: Tuner.Load.remote.providers.notion(
+  //   Tuner.getEnv('NOTION_KEY'),
+  //   'https://www.notion.so/artpani/d1ecc246b8304e08a780b9a312548064?pvs=4#ef81f9e0a6b9482db00b2045bc1a76c4',
+  // ),
   config: {
-    b: 200,
-    e: 201,
+    b: 209,
+    e: 20,
+    f: 780,
+    CONFIG_A: false,
   },
+  watch: 5000,
 });

example/config/b.tuner.ts

@@ -1,5 +1,5 @@
 import Tuner from '../../mod.ts';
 
 export default Tuner.tune({
-  config: { a: 100, d: 101 },
+  config: { a: 100, d: 101, CONFIG_B: true },
 });

example/config/base.tuner.ts

@@ -1,5 +1,5 @@
 import Tuner from '../../mod.ts';
 
 export default Tuner.tune({
-  config: { a: 400, b: 401, c: 402 },
+  config: { a: 50, b: 40, c: 402, base: false },
 });

example/config/configSchema.ts

@@ -3,24 +3,20 @@ import { z } from 'https://deno.land/x/zod/mod.ts';
 export const configSchema = z.object({
   config: z.object({
     a: z.number(),
+    d: z.number(),
+    CONFIG_B: z.boolean(),
+    test: z.number(),
+    develop: z.boolean(),
     b: z.number(),
-    c: z.number(),
     e: z.number(),
-    d: z.number(),
+    f: z.number(),
+    CONFIG_A: z.boolean(),
+    CONFIG_NOTION: z.boolean(),
   }),
+  watch: z.number(),
   env: z.object({
-    someField: z.number(),
+    someField: z.string(),
   }),
 });
 
 export type Config = z.infer<typeof configSchema>;
-
-//├─ config
-//│  ├─ a
-//│  ├─ b
-//│  ├─ c
-//│  ├─ e
-//│  └─ d
-//└─ env
-//   └─ someField
-//

example/config/develop.tuner.ts

@@ -2,9 +2,10 @@
 import Tuner from '../../mod.ts';
 export default Tuner.tune({
   child: Tuner.Load.local.cwd('example/config/a.tuner.ts'),
-  parent: Tuner.Load.local.configDir('base.tuner.ts'),
+  parent: Tuner.Load.local.cwd('example/config/b.tuner.ts'),
   config: {
-    a: 300,
-    b: 301,
+    test: 1000,
+    develop: true,
   },
+  watch: 2000,
 });

example/config/main.ts

@@ -1,9 +1,25 @@
 import Tuner from '../../mod.ts';
-import { Config } from './configSchema.ts';
-const cfg = (await Tuner.use.loadConfig()) as Config;
-// Tuner.use.generateSchema(
+import { Ward } from '../../src/ward/ward.ts';
+
+let cfg = await Tuner.use.loadConfig();
+// await Tuner.use.generateSchema(
 //   cfg,
 //   'config',
 //   'example/config/configSchema.ts',
 // );
-console.log(cfg);
+await Tuner.onChanged(async (_data) => {
+  //   cfg = (await Tuner.use.loadConfig()) as Config;
+  cfg = await Tuner.use.loadConfig();
+  console.log(cfg);
+});
+
+setInterval(() => {
+  // console.log(Ward.wards.map((ward) => ward.period).join(' '));
+  console.log(Deno.memoryUsage().heapUsed);
+  //   gc();
+}, 600);
+
+// const a = async (x: number) => x + 2;
+// const b = async (x: number) => x + 2;
+
+// console.log(a.toString() === b.toString());

example/main.ts

@@ -1,14 +1,6 @@
-// import Tuner from '../mod.ts';
-// import { Config } from './config/schema.ts';
-// const config = (await Tuner.use.loadConfig()) as Config;
-// console.log(config);
-
-// config/develop.tuner.ts
 import Tuner from '../mod.ts';
-export default Tuner.tune({
-  child: Tuner.Load.local.configDir('a.tuner.ts'),
-  config: {
-    a: 300,
-    b: 301,
-  },
-});
+import { Config } from './config/configSchema.ts';
+
+const config = (await Tuner.use.loadConfig()) as Config;
+
+setInterval(() => console.log(Deno.memoryUsage()), 500);

mod.ts

@@ -1,9 +1,10 @@
 import tune from './src/tunerFun.ts';
 import Env from './src/envFuns.ts';
-import { getEnv } from './src/tuner.ts';
+import { getEnv, onChangeTrigger } from './src/tuner.ts';
 import Load from './src/loaders.ts';
 import { loadConfig } from './src/tuner.ts';
 import { generateSchema } from './src/scheme.ts';
+import { IFilledTunerConfig } from './src/type.ts';
 
 export default {
   tune,
@@ -14,4 +15,5 @@ export default {
     loadConfig,
     generateSchema,
   },
+  onChanged: onChangeTrigger<IFilledTunerConfig>,
 };

src/event.ts

@@ -13,7 +13,6 @@ const myEventTarget = new MyEventTarget();
 
 myEventTarget.addEventListener('myEvent', (event: Event) => {
   const customEvent = event as CustomEvent;
-  console.log('Событие myEvent с данными:', customEvent.detail);
 });
 
 myEventTarget.triggerCustomEvent('myEvent', {
@@ -36,7 +35,6 @@ myEventTarget.triggerCustomEvent('myEvent', {
 
 // myEventTarget.addEventListener('myEvent', (event: Event) => {
 //   const customEvent = event as CustomEvent;
-//   console.log('Событие myEvent с данными:', customEvent.detail);
 // });
 
 // myEventTarget.triggerCustomEvent('myEvent', {