taon 19.0.26 → 19.0.29

package/websql/fesm2022/taon.mjs

@@ -11,7 +11,6 @@ import * as JSON5 from 'json5';
 import * as i0 from '@angular/core';
 import { InjectionToken, inject as inject$1, Injectable } from '@angular/core';
 import axios from 'axios';
-import { ipcRenderer } from 'electron';
 import { JSON10 } from 'json10/websql';
 import { Observable, Subject, from } from 'rxjs';
 import { io } from 'socket.io-client';
@@ -877,6 +876,95 @@ let CURRENT_HOST_BACKEND_PORT;
 //#region @browser
 CURRENT_HOST_BACKEND_PORT = new InjectionToken('CURRENT_HOST_BACKEND_PORT');
 
+const inject = (entity) => {
+    return new Proxy({}, {
+        get: (_, propName) => {
+            if (propName === 'hasOwnProperty') {
+                return () => false;
+            }
+            const ctor = entity();
+            const contextFromClass = ctor[Symbols.ctxInClassOrClassObj];
+            const resultContext = contextFromClass;
+            if (resultContext) {
+                let instance = resultContext.inject(ctor, {
+                    parentInstanceThatWillGetInjectedStuff: this,
+                });
+                // console.log('instance', instance);
+                if (propName === 'getOriginalPrototype') {
+                    return () => Object.getPrototypeOf(instance);
+                }
+                if (propName === 'getOriginalConstructor') {
+                    return () => instance.constructor;
+                }
+                const methods = ctor[Symbols.classMethodsNames] || [];
+                const isMethods = methods.includes(propName);
+                const methodOrProperty = isMethods
+                    ? instance[propName].bind(instance)
+                    : instance[propName];
+                // console.log(
+                //   `methodOrProperty from proxy ${propName?.toString()} = isMethods:${isMethods}`,
+                //   methods,
+                // );
+                return methodOrProperty;
+            }
+        },
+    });
+};
+// export const injectController = inject;
+// export type SubscriptionEvent<T> = {
+//   name: keyof T;
+//   data: any;
+// };
+/**
+ * TODO
+ */
+// export const injectEntityEvents = <T>(
+//   subscriberClassResolveFn: () => new (...args: any[]) => T,
+//   eventName?: keyof Omit<EntitySubscriberInterface,'listenTo'> ,
+// ): Observable<SubscriptionEvent<T>> => {
+//   const eventsSrc = new Subject<SubscriptionEvent<T>>();
+//   const obs = eventsSrc.asObservable();
+//   let isFirstSubscription = true;
+//   const proxyObservable = new Proxy(obs, {
+//     get(target, prop, receiver) {
+//       if (prop === 'subscribe') {
+//         return (...args: any[]) => {
+//           if (isFirstSubscription) {
+//             isFirstSubscription = false;
+//             const subscriberClassFN: typeof BaseClass =
+//               subscriberClassResolveFn() as any;
+//             const ctx = subscriberClassFN[
+//               Symbols.ctxInClassOrClassObj
+//             ] as EndpointContext;
+//             if (!ctx) {
+//               throw new Error(
+//                 `You are trying to inject class without context. Use context like this:
+//               class MyClassSubscriber extends BaseSubscriber {
+//                   ${eventName as any}() {
+//                     \/\/ your code here
+//                   }
+//               }
+//               Taon.injectSubscriberEvents( MyContext.getInstance(()=> MyClassSubscriber), '${eventName as any}' )
+//               `,
+//               );
+//             }
+//             const subscriberInstance = ctx.getInstanceBy(subscriberClassFN);
+//             // subscriberInstance TODO @LAST subscriber event from instance
+//             // const entity = subscriberClassFN.prototype.listenTo();
+//             console.log('First subscription, you can access arguments here:', {
+//               subscriberClassFN,
+//               eventName,
+//             });
+//           }
+//           return target.subscribe(...args);
+//         };
+//       }
+//       return Reflect.get(target, prop, receiver);
+//     },
+//   });
+//   return proxyObservable as Observable<SubscriptionEvent<T>>;
+// };
+
 /**
  * TODO prevent calling methods when not initialized
  * with init(ctx)
@@ -888,7 +976,9 @@ class BaseAngularsService {
         //#region @browser
         this.currentContext = inject$1(TAON_CONTEXT);
         //#region @browser
-        this.CURRENT_HOST_BACKEND_PORT = inject$1(CURRENT_HOST_BACKEND_PORT);
+        this.CURRENT_HOST_BACKEND_PORT = inject$1(CURRENT_HOST_BACKEND_PORT, {
+            optional: true,
+        });
         // #endregion
     }
     /**
@@ -899,10 +989,17 @@ class BaseAngularsService {
     get host() {
         return `http://localhost:${this.CURRENT_HOST_BACKEND_PORT}`;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: BaseAngularsService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: BaseAngularsService }); }
+    injectController(ctor) {
+        let currentContext;
+        //#region @browser
+        currentContext = this.currentContext;
+        //#endregion
+        return inject(() => currentContext.getClass(ctor));
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.7", ngImport: i0, type: BaseAngularsService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.7", ngImport: i0, type: BaseAngularsService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: BaseAngularsService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.7", ngImport: i0, type: BaseAngularsService, decorators: [{
             type: Injectable
         }], ctorParameters: () => [] });
 
@@ -3561,7 +3658,7 @@ class EndpointContext {
     }
     //#endregion
     //#region methods & getters / initialize metadata
-    initControllers() {
+    async initControllers() {
         if (this.isRunOrRevertOnlyMigrationAppStart) {
             return;
         }
@@ -3612,7 +3709,8 @@ class EndpointContext {
             /* */
             /* */
             // console.log('methods', classConfig.methods);
-            Object.keys(classConfig.methods).forEach(methodName => {
+            const methodNames = Object.keys(classConfig.methods);
+            for (const methodName of methodNames) {
                 const methodConfig = classConfig.methods[methodName];
                 // debugger
                 const type = methodConfig.type;
@@ -3639,9 +3737,9 @@ class EndpointContext {
                     //   methodConfig,
                     //   expressPath,
                     // );
-                    this.initClient(controllerClassFn, type, methodConfig, expressPath);
+                    await this.initClient(controllerClassFn, type, methodConfig, expressPath);
                 }
-            });
+            }
             /* */
             /* */
             this.logHttp && console.groupEnd();
@@ -4093,7 +4191,7 @@ class EndpointContext {
     /**
      * client can be browser or nodejs (when remote host)
      */
-    initClient(
+    async initClient(
     //#region parameters
     target, type, methodConfig, expressPath) {
         const ctx = this;
@@ -4113,6 +4211,7 @@ class EndpointContext {
         const orgMethods = target.prototype[methodConfig.methodName];
         //#region handle electron ipc request
         if (Helpers.isElectron) {
+            const ipcRenderer = window.require('electron').ipcRenderer;
             target.prototype[methodConfig.methodName] = function (...args) {
                 const received = new Promise(async (resolve, reject) => {
                     const headers = {};
@@ -4541,7 +4640,7 @@ const createContext = (configFn) => {
                     //   endpointContextRef?.connection?.subscribers,
                     // );
                     // debugger;
-                    endpointContextRef.initControllers();
+                    await endpointContextRef.initControllers();
                     await endpointContextRef.startServer();
                     //#region @websql
                     endpointContextRef.writeActiveRoutes();
@@ -6098,95 +6197,6 @@ var Http;
     })(Param = Http.Param || (Http.Param = {}));
 })(Http || (Http = {}));
 
-const inject = (entity) => {
-    return new Proxy({}, {
-        get: (_, propName) => {
-            if (propName === 'hasOwnProperty') {
-                return () => false;
-            }
-            const ctor = entity();
-            const contextFromClass = ctor[Symbols.ctxInClassOrClassObj];
-            const resultContext = contextFromClass;
-            if (resultContext) {
-                let instance = resultContext.inject(ctor, {
-                    parentInstanceThatWillGetInjectedStuff: this,
-                });
-                // console.log('instance', instance);
-                if (propName === 'getOriginalPrototype') {
-                    return () => Object.getPrototypeOf(instance);
-                }
-                if (propName === 'getOriginalConstructor') {
-                    return () => instance.constructor;
-                }
-                const methods = ctor[Symbols.classMethodsNames] || [];
-                const isMethods = methods.includes(propName);
-                const methodOrProperty = isMethods
-                    ? instance[propName].bind(instance)
-                    : instance[propName];
-                // console.log(
-                //   `methodOrProperty from proxy ${propName?.toString()} = isMethods:${isMethods}`,
-                //   methods,
-                // );
-                return methodOrProperty;
-            }
-        },
-    });
-};
-// export const injectController = inject;
-// export type SubscriptionEvent<T> = {
-//   name: keyof T;
-//   data: any;
-// };
-/**
- * TODO
- */
-// export const injectEntityEvents = <T>(
-//   subscriberClassResolveFn: () => new (...args: any[]) => T,
-//   eventName?: keyof Omit<EntitySubscriberInterface,'listenTo'> ,
-// ): Observable<SubscriptionEvent<T>> => {
-//   const eventsSrc = new Subject<SubscriptionEvent<T>>();
-//   const obs = eventsSrc.asObservable();
-//   let isFirstSubscription = true;
-//   const proxyObservable = new Proxy(obs, {
-//     get(target, prop, receiver) {
-//       if (prop === 'subscribe') {
-//         return (...args: any[]) => {
-//           if (isFirstSubscription) {
-//             isFirstSubscription = false;
-//             const subscriberClassFN: typeof BaseClass =
-//               subscriberClassResolveFn() as any;
-//             const ctx = subscriberClassFN[
-//               Symbols.ctxInClassOrClassObj
-//             ] as EndpointContext;
-//             if (!ctx) {
-//               throw new Error(
-//                 `You are trying to inject class without context. Use context like this:
-//               class MyClassSubscriber extends BaseSubscriber {
-//                   ${eventName as any}() {
-//                     \/\/ your code here
-//                   }
-//               }
-//               Taon.injectSubscriberEvents( MyContext.getInstance(()=> MyClassSubscriber), '${eventName as any}' )
-//               `,
-//               );
-//             }
-//             const subscriberInstance = ctx.getInstanceBy(subscriberClassFN);
-//             // subscriberInstance TODO @LAST subscriber event from instance
-//             // const entity = subscriberClassFN.prototype.listenTo();
-//             console.log('First subscription, you can access arguments here:', {
-//               subscriberClassFN,
-//               eventName,
-//             });
-//           }
-//           return target.subscribe(...args);
-//         };
-//       }
-//       return Reflect.get(target, prop, receiver);
-//     },
-//   });
-//   return proxyObservable as Observable<SubscriptionEvent<T>>;
-// };
-
 // TODO export all things
 var Taon;
 (function (Taon) {