react-obsidian 2.20.1 → 2.21.0

package/src/decorators/inject/Inject.ts

@@ -1,12 +1,11 @@
-import InjectionMetadata from '../../injectors/class/InjectionMetadata';
+import { shouldUseModernDecorator } from '../../utils/decorators';
+import { legacyDecorator } from './inject.legacy';
+import { modernDecorator } from './inject.modern';
 
 export function inject(name?: string) {
-  return (
-    target: Object | any,
-    _propertyKey?: string,
-    _indexOrPropertyDescriptor?: number | PropertyDescriptor,
-  ) => {
-    const metadata = new InjectionMetadata();
-      metadata.savePropertyMetadata(target.constructor, name!);
+  return (...args: any[]) => {
+    return shouldUseModernDecorator(args) ?
+      modernDecorator(name, args[0], args[1]) :
+      legacyDecorator(name, args[0], args[1], args[2]);
   };
 }

package/src/decorators/inject/inject.legacy.ts

@@ -0,0 +1,11 @@
+import InjectionMetadata from '../../injectors/class/InjectionMetadata';
+
+export function legacyDecorator(
+  name: string | undefined,
+  target: Object | any,
+  propertyKey: string,
+  _indexOrPropertyDescriptor?: number | PropertyDescriptor,
+) {
+  const metadata = new InjectionMetadata();
+  metadata.savePropertyMetadata(target.constructor, name ?? propertyKey);
+}

package/src/decorators/inject/inject.modern.ts

@@ -0,0 +1,12 @@
+import InjectionMetadata from '../../injectors/class/InjectionMetadata';
+
+export function modernDecorator<This, Args extends any[], Return>(
+  name: string | undefined,
+  _target: (this: This, ...args: Args) => Return,
+  context: { name: string | symbol; addInitializer: (callback: () => void) => void },
+) {
+  context.addInitializer(function initializer(this: any) {
+    const metadata = new InjectionMetadata();
+    metadata.savePropertyMetadata(this.constructor, name!);
+  });
+}

package/src/decorators/lateInject/LateInject.ts

@@ -0,0 +1,11 @@
+import { shouldUseModernDecorator } from '../../utils/decorators';
+import { legacyDecorator } from './lateInject.legacy';
+import { modernDecorator } from './lateInject.modern';
+
+export function lateInject(name?: string): any {
+  return (...args: any[]) => {
+    return shouldUseModernDecorator(args) ?
+      modernDecorator(name, args[0], args[1]) :
+      legacyDecorator(name, args[0], args[1], args[2]);
+  };
+}

package/src/decorators/lateInject/lateInject.legacy.ts

@@ -0,0 +1,11 @@
+import InjectionMetadata from '../../injectors/class/InjectionMetadata';
+
+export function legacyDecorator(
+  name: string | undefined,
+  target: Object | any,
+  propertyKey: string,
+  _indexOrPropertyDescriptor?: number | PropertyDescriptor,
+) {
+  const metadata = new InjectionMetadata();
+  metadata.saveLatePropertyMetadata(target.constructor, name ?? propertyKey);
+}

package/src/decorators/lateInject/lateInject.modern.ts

@@ -0,0 +1,12 @@
+import InjectionMetadata from '../../injectors/class/InjectionMetadata';
+
+export function modernDecorator<This, Args extends any[], Return>(
+  name: string | undefined,
+  _target: (this: This, ...args: Args) => Return,
+  context: { name: string | symbol; addInitializer: (callback: () => void) => void },
+) {
+  context.addInitializer(function initializer(this: any) {
+    const metadata = new InjectionMetadata();
+    metadata.saveLatePropertyMetadata(this.constructor, name ?? String(context.name));
+  });
+}

package/src/decorators/provides/Provides.ts

@@ -1,14 +1,15 @@
-import { Graph } from '../../graph/Graph';
-import providedPropertiesStore from '../../ProvidedPropertiesStore';
-import { memoizeDescriptor } from './MemoizeDescriptor';
+import { shouldUseModernDecorator } from '../../utils/decorators';
+import { legacyDecorator } from './provides.legacy';
+import { modernDecorator } from './provides.modern';
 
 interface ProvidesParams {
   name: string;
 }
 
-export function provides({ name }: Partial<ProvidesParams> = {}) {
-  return (graph: Graph, propertyKey: string, descriptor: PropertyDescriptor) => {
-    providedPropertiesStore.set(graph, propertyKey, name!);
-    return memoizeDescriptor(propertyKey, descriptor);
+export function provides({ name }: Partial<ProvidesParams> = {}): any {
+  return (...args: any[]) => {
+    return shouldUseModernDecorator(args)
+      ? modernDecorator(name, args[0], args[1])
+      : legacyDecorator(name, args[0], args[1], args[2]);
   };
 }

package/src/decorators/provides/provides.legacy.ts

@@ -0,0 +1,13 @@
+import { Graph } from '../../graph/Graph';
+import providedPropertiesStore from '../../ProvidedPropertiesStore';
+import { memoizeDescriptor } from './MemoizeDescriptor';
+
+export function legacyDecorator(
+  name: string | undefined,
+  graph: Graph,
+  propertyKey: string,
+  descriptor: PropertyDescriptor,
+) {
+  providedPropertiesStore.set(graph, propertyKey, name!);
+  return memoizeDescriptor(propertyKey, descriptor);
+}

package/src/decorators/provides/provides.modern.ts

@@ -0,0 +1,36 @@
+import { Graph } from '../../graph/Graph';
+import providedPropertiesStore from '../../ProvidedPropertiesStore';
+import { Reflect } from '../../utils/reflect';
+
+export function modernDecorator<This, Args extends any[], Return>(
+  name: string | undefined,
+  target: (this: This, ...args: Args) => Return,
+  context: ClassMethodDecoratorContext<This, (this: This, ...args: Args) => Return>,
+) {
+  context.addInitializer(function initializer(this: This) {
+    const mangledProperty = String(context.name);
+    // @ts-ignore
+    this[mangledProperty] = this[mangledProperty].bind(this);
+    providedPropertiesStore.set(this as Graph, mangledProperty, name!);
+  });
+
+  function getMemoizationTarget(zis: This) {
+    if (Reflect.getMetadata('isSingleton', target)) {
+      return (zis as any).constructor;
+    }
+    return zis;
+  }
+
+  function replacementMethod(this: This, ...args: Args): Return {
+    const memoizationTarget = getMemoizationTarget(this);
+    const memoizedResult = Reflect.getMetadata(`memoized${name!}`, memoizationTarget);
+    if (memoizedResult === undefined) {
+      const result = target.call(this, ...args);
+      Reflect.defineMetadata(`memoized${name!}`, result, memoizationTarget);
+      return result;
+    }
+    return memoizedResult;
+  }
+
+  return replacementMethod;
+}

package/src/decorators/singleton/Singleton.ts

@@ -0,0 +1,11 @@
+import { modernDecorator } from './singleton.modern';
+import { legacyDecorator } from './singleton.legacy';
+import { shouldUseModernDecorator } from '../../utils/decorators';
+
+export function singleton() {
+  return (...args: any[]) => {
+    return shouldUseModernDecorator(args) ?
+      modernDecorator(args[0]) :
+      legacyDecorator(args[0], args[1], args[2]);
+  };
+}

package/src/decorators/singleton/singleton.legacy.ts

@@ -0,0 +1,13 @@
+import { Constructable } from '../../types';
+import { ObjectGraph } from '../../graph/ObjectGraph';
+import {Reflect} from '../../utils/reflect';
+
+export function legacyDecorator(
+  constructorOrGraph: Constructable<ObjectGraph> | ObjectGraph,
+  _property?: string,
+  descriptor?: PropertyDescriptor,
+): any {
+  const target = descriptor || constructorOrGraph;
+  Reflect.defineMetadata('isSingleton', true, target);
+  return target;
+}

package/src/decorators/singleton/singleton.modern.ts

@@ -0,0 +1,8 @@
+import {Reflect} from '../../utils/reflect';
+
+export function modernDecorator<This, Args extends any[], Return>(
+  target: (this: This, ...args: Args) => Return,
+): any {
+  Reflect.defineMetadata('isSingleton', true, target);
+  return target;
+}

package/src/index.ts

@@ -1,22 +1,22 @@
 import { graph } from './decorators/Graph';
 import { inject } from './decorators/inject/Inject';
-import { injectable } from './decorators/inject/Injectable';
-import { lateInject } from './decorators/inject/LateInject';
+import { injectable } from './decorators/injectable/Injectable';
+import { lateInject } from './decorators/lateInject/LateInject';
 import { lifecycleBound } from './decorators/LifecycleBound';
 import { provides } from './decorators/provides/Provides';
-import { singleton } from './decorators/Singleton';
+import { singleton } from './decorators/singleton/Singleton';
 import _Obsidian from './Obsidian';
 
 export * from './types';
 
 export { graph } from './decorators/Graph';
-export { singleton } from './decorators/Singleton';
+export { singleton } from './decorators/singleton/Singleton';
 export { ObjectGraph } from './graph/ObjectGraph';
 export { Graph as IGraph } from './graph/Graph';
 export { provides } from './decorators/provides/Provides';
-export { injectable } from './decorators/inject/Injectable';
+export { injectable } from './decorators/injectable/Injectable';
 export { inject } from './decorators/inject/Inject';
-export { lateInject } from './decorators/inject/LateInject';
+export { lateInject } from './decorators/lateInject/LateInject';
 export { lifecycleBound } from './decorators/LifecycleBound';
 export { GraphMiddleware } from './graph/registry/GraphMiddleware';
 export { GraphResolveChain as ResolveChain } from './graph/registry/GraphResolveChain';

package/src/utils/decorators.ts

@@ -0,0 +1,3 @@
+export function shouldUseModernDecorator(args: any[]) {
+  return args.length === 2 && typeof args[1] === 'object' && 'addInitializer' in args[1];
+}

package/wallaby.legacy.js

@@ -0,0 +1,9 @@
+module.exports = () => {
+  return {
+    autoDetect: true,
+    testFramework: {
+      configFile: 'jest.config.legacy.js',
+    },
+    env: {params: {env: 'NODE_OPTIONS="--max_old_space_size=4096"'}},
+  };
+};

package/dist/src/decorators/Singleton.d.ts

@@ -1,4 +0,0 @@
-import { Constructable } from '../types';
-import { ObjectGraph } from '../graph/ObjectGraph';
-export declare function singleton(): (constructorOrGraph: Constructable<ObjectGraph> | ObjectGraph, _property?: string, descriptor?: PropertyDescriptor) => any;
-//# sourceMappingURL=Singleton.d.ts.map

package/dist/src/decorators/Singleton.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Singleton.d.ts","sourceRoot":"","sources":["../../../src/decorators/Singleton.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,wBAAgB,SAAS,yBAED,aAAa,CAAC,WAAW,CAAC,GAAG,WAAW,cAChD,MAAM,eACL,kBAAkB,KAC9B,GAAG,CAKP"}

package/dist/src/decorators/Singleton.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.singleton = singleton;
-const reflect_1 = require("../utils/reflect");
-function singleton() {
-    return (constructorOrGraph, _property, descriptor) => {
-        const target = descriptor || constructorOrGraph;
-        reflect_1.Reflect.defineMetadata('isSingleton', true, target);
-        return target;
-    };
-}
-//# sourceMappingURL=Singleton.js.map

package/dist/src/decorators/Singleton.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Singleton.js","sourceRoot":"","sources":["../../../src/decorators/Singleton.ts"],"names":[],"mappings":";;AAIA,8BAUC;AAZD,8CAAyC;AAEzC,SAAgB,SAAS;IACvB,OAAO,CACL,kBAA4D,EAC5D,SAAkB,EAClB,UAA+B,EAC1B,EAAE;QACP,MAAM,MAAM,GAAG,UAAU,IAAI,kBAAkB,CAAC;QAChD,iBAAO,CAAC,cAAc,CAAC,aAAa,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACpD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC"}

package/dist/src/decorators/inject/Injectable.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Injectable.d.ts","sourceRoot":"","sources":["../../../../src/decorators/inject/Injectable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAI1C,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,GAAG,CAEzE"}

package/dist/src/decorators/inject/Injectable.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Injectable.js","sourceRoot":"","sources":["../../../../src/decorators/inject/Injectable.ts"],"names":[],"mappings":";;;;;AAKA,gCAEC;AALD,uFAA+D;AAC/D,wFAAgE;AAEhE,SAAgB,UAAU,CAAC,UAAyC;IAClE,OAAO,IAAI,uBAAa,CAAC,uBAAa,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;AAC7D,CAAC"}

package/dist/src/decorators/inject/LateInject.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"LateInject.d.ts","sourceRoot":"","sources":["../../../../src/decorators/inject/LateInject.ts"],"names":[],"mappings":"AAEA,wBAAgB,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,GAAG,CAK7C"}

package/dist/src/decorators/inject/LateInject.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LateInject.js","sourceRoot":"","sources":["../../../../src/decorators/inject/LateInject.ts"],"names":[],"mappings":";;;;;AAEA,gCAKC;AAPD,gGAAwE;AAExE,SAAgB,UAAU,CAAC,IAAa;IACtC,OAAO,CAAC,MAAc,EAAE,EAAE;QACxB,MAAM,QAAQ,GAAG,IAAI,2BAAiB,EAAE,CAAC;QACzC,QAAQ,CAAC,wBAAwB,CAAC,MAAM,CAAC,WAAW,EAAE,IAAK,CAAC,CAAC;IAC/D,CAAC,CAAC;AACJ,CAAC"}

package/src/decorators/Singleton.ts

@@ -1,15 +0,0 @@
-import { Constructable } from '../types';
-import { ObjectGraph } from '../graph/ObjectGraph';
-import {Reflect} from '../utils/reflect';
-
-export function singleton() {
-  return (
-    constructorOrGraph: Constructable<ObjectGraph> | ObjectGraph,
-    _property?: string,
-    descriptor?: PropertyDescriptor,
-  ): any => {
-    const target = descriptor || constructorOrGraph;
-    Reflect.defineMetadata('isSingleton', true, target);
-    return target;
-  };
-}

package/src/decorators/inject/LateInject.ts

@@ -1,8 +0,0 @@
-import InjectionMetadata from '../../injectors/class/InjectionMetadata';
-
-export function lateInject(name?: string): any {
-  return (target: object) => {
-    const metadata = new InjectionMetadata();
-    metadata.saveLatePropertyMetadata(target.constructor, name!);
-  };
-}