@mittwald/react-ghostmaker 1.2.1 → 1.3.1

package/dist/esm/index.js

@@ -3,5 +3,5 @@ export { registerModelIdentifier } from "./modelIdentifier";
 export { getQueryContext, forwardQueryContext } from "./context";
 export { invalidateGhosts } from "./invalidate";
 export * from "./maybeGhost";
-export { GhostMakerModel } from "./metaData";
+export { GhostMakerModel, ghostMakerModel } from "./metaData";
 export { getModelId, getModelName } from "./queries";

package/dist/esm/metaData.js

@@ -1,9 +1,47 @@
+import is from "@sindresorhus/is";
 const store = new Map();
-export const getMetaData = (something) => {
-    return store.get(something);
-};
 export function GhostMakerModel(options) {
     return function (target) {
         store.set(target, options);
     };
 }
+const modelIdentifiers = [];
+export function ghostMakerModel(modelIdentifier) {
+    modelIdentifiers.push(modelIdentifier);
+}
+const getMetaDataFromIdentifiers = (something) => {
+    for (const identifyModel of modelIdentifiers) {
+        const meta = identifyModel(something);
+        if (meta) {
+            return meta;
+        }
+    }
+};
+function isClass(value) {
+    return typeof value === "function" && /class[\s{]/.test(value.toString());
+}
+const getClass = (something) => {
+    return isClass(something)
+        ? something
+        : is.object(something)
+            ? something.constructor
+            : undefined;
+};
+export const getMetaData = (something) => {
+    return (getMetaDataRecursive(something, undefined, getClass(something)) ??
+        getMetaDataFromIdentifiers(something));
+};
+const getMetaDataRecursive = (something, collectedMeta, 
+// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
+klass) => {
+    const currentClass = getClass(something);
+    const meta = store.get(klass ?? currentClass);
+    const mergedMeta = meta || collectedMeta ? { ...meta, ...collectedMeta } : undefined;
+    if (mergedMeta && "getId" in mergedMeta && "name" in mergedMeta) {
+        return mergedMeta;
+    }
+    if (!klass) {
+        return mergedMeta;
+    }
+    return getMetaDataRecursive(something, mergedMeta, Object.getPrototypeOf(klass));
+};

package/dist/esm/queries.js

@@ -3,35 +3,15 @@ import { hashObject } from "./hash";
 import { getMetaData } from "./metaData";
 import { modelIdentifiers } from "./modelIdentifier";
 export const getModelName = (something) => {
-    const isObject = is.object(something);
-    const getModelNameRecursive = (
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
-    klass) => {
-        if (!klass) {
-            return;
-        }
-        return (getMetaData(klass)?.name ??
-            getModelNameRecursive(Object.getPrototypeOf(klass)));
-    };
-    const klass = isObject ? something.constructor : undefined;
-    return getModelNameRecursive(klass);
+    return getMetaData(something)?.name;
 };
 export const getModelId = (something) => {
-    const isObject = is.object(something);
-    const getIdRecursive = (
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
-    klass) => {
-        if (!klass) {
-            return;
-        }
-        const getId = getMetaData(klass)?.getId;
+    if (is.object(something)) {
+        const getId = getMetaData(something)?.getId;
         if (getId) {
             return getId(something);
         }
-        return getIdRecursive(Object.getPrototypeOf(klass));
-    };
-    const klass = isObject ? something.constructor : undefined;
-    return getIdRecursive(klass);
+    }
 };
 const getObjectName = (something) => {
     const modelName = getModelName(something);

package/dist/esm/queries.test.js

@@ -0,0 +1,106 @@
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+import { getMetaData, GhostMakerModel } from "./metaData";
+import { expect, test } from "vitest";
+let GrandParent = (() => {
+    let _classDecorators = [GhostMakerModel({
+            name: "TheGrandParent",
+            getId: (grandParent) => grandParent.id,
+        })];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    var GrandParent = class {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            GrandParent = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        id;
+        constructor(id) {
+            this.id = id;
+        }
+    };
+    return GrandParent = _classThis;
+})();
+let Parent = (() => {
+    let _classDecorators = [GhostMakerModel({
+            name: "TheParent",
+        })];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = GrandParent;
+    var Parent = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            Parent = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+    };
+    return Parent = _classThis;
+})();
+let Child = (() => {
+    let _classDecorators = [GhostMakerModel({
+            name: "TheChild",
+        })];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = Parent;
+    var Child = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            Child = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+    };
+    return Child = _classThis;
+})();
+test("getMetaData returns correct names", () => {
+    expect(getMetaData(new Child("id"))?.name).toBe("TheChild");
+    expect(getMetaData(new Parent("id"))?.name).toBe("TheParent");
+    expect(getMetaData(Parent)?.name).toBe("TheParent");
+    expect(getMetaData(Child)?.name).toBe("TheChild");
+});

package/dist/types/index.d.ts

@@ -4,5 +4,5 @@ export { type ReactGhost, UseGhostReturn } from "./types";
 export { getQueryContext, forwardQueryContext } from "./context";
 export { invalidateGhosts } from "./invalidate";
 export * from "./maybeGhost";
-export { GhostMakerModel } from "./metaData";
+export { GhostMakerModel, ghostMakerModel } from "./metaData";
 export { getModelId, getModelName } from "./queries";

package/dist/types/metaData.d.ts

@@ -1,8 +1,11 @@
-import type { Class } from "type-fest";
-interface GhostMakerModelOptions<T extends Class<unknown>> {
+import type { AbstractClass, Class } from "type-fest";
+type DecoratorTarget = Class<unknown> | AbstractClass<unknown>;
+interface GhostMakerModelMeta<T extends DecoratorTarget> {
     getId?: (instance: InstanceType<T>) => string;
     name?: string;
 }
-export declare const getMetaData: (something: unknown) => GhostMakerModelOptions<Class<unknown>> | undefined;
-export declare function GhostMakerModel<T extends Class<unknown>>(options: GhostMakerModelOptions<T>): (target: T) => void;
+export declare function GhostMakerModel<T extends DecoratorTarget>(options: GhostMakerModelMeta<T>): (target: T) => void;
+type IdentifyModel = (something: unknown) => GhostMakerModelMeta<DecoratorTarget> | undefined;
+export declare function ghostMakerModel(modelIdentifier: IdentifyModel): void;
+export declare const getMetaData: (something: unknown) => GhostMakerModelMeta<DecoratorTarget> | undefined;
 export {};

package/dist/types/queries.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mittwald/react-ghostmaker",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "author": "Mittwald CM Service GmbH & Co. KG <opensource@mittwald.de>",
   "contributors": [
     "Marco Falkenberg <m.falkenberg@mittwald.de>"