@webda/models 4.0.0-beta.8 → 4.0.0-beta.9

package/lib/types-resolver.js

@@ -0,0 +1,365 @@
+/**
+ * Own Metadata of a class: a subclass without its own Metadata does not inherit its parent's identifier
+ * @param clazz - the class
+ * @returns its own Metadata
+ */
+function ownMetadata(clazz) {
+    return clazz && Object.prototype.hasOwnProperty.call(clazz, "Metadata") ? clazz.Metadata : undefined;
+}
+/**
+ * Add a class to a multi-valued index
+ * @param index - the index
+ * @param key - the key
+ * @param clazz - the class
+ */
+function addTo(index, key, clazz) {
+    let set = index.get(key);
+    if (!set) {
+        set = new Set();
+        index.set(key, set);
+    }
+    set.add(clazz);
+}
+/**
+ * Resolve the `__type` stored in a row (Webda 3 short, lower-case or renamed forms included) to a model
+ *
+ * Resolution order, first match wins:
+ * 1. the exact identifier (or a map key that is not the identifier);
+ * 2. a `@WebdaAlias`, exact, then case-insensitive;
+ * 3. an identifier, case-insensitive;
+ * 4. for a value without `/`: `<namespace>/<value>` then `Webda/<value>`, case-insensitive, identifiers then aliases;
+ * 5. otherwise unknown.
+ *
+ * Two different models matching at the same step make the value ambiguous: it resolves to nothing.
+ */
+export class ModelTypeResolver {
+    /**
+     * @param models - models by identifier (an application model map), or a list of classes carrying Metadata
+     * @param options - namespace and exact mode
+     */
+    constructor(models, options = {}) {
+        /** Exact names (identifiers and extra map keys) to class */
+        this.byName = new Map();
+        /** Current identifier of each class */
+        this.identifiers = new Map();
+        /** Map keys of a class that are not its identifier */
+        this.extraNames = new Map();
+        /** Lower-case identifiers and extra names */
+        this.lowerNames = new Map();
+        /** Aliases */
+        this.aliases = new Map();
+        /** Lower-case aliases */
+        this.lowerAliases = new Map();
+        /** Cache of resolutions */
+        this.resolutions = new Map();
+        /** Cache of families */
+        this.families = new Map();
+        /** Cache of accepted types */
+        this.accepted = new Map();
+        this.namespace = options.namespace ?? "Webda";
+        this.exactOnly = options.exactOnly ?? false;
+        const entries = Array.isArray(models)
+            ? models.filter(Boolean).map(model => [undefined, model])
+            : Object.entries(models).filter(([, model]) => !!model);
+        for (const [key, clazz] of entries) {
+            const identifier = ownMetadata(clazz)?.Identifier ?? key;
+            if (!identifier)
+                continue;
+            this.addName(identifier, clazz, false);
+            if (key && key !== identifier) {
+                this.addName(key, clazz, true);
+            }
+        }
+    }
+    /**
+     * Index a name of a class
+     * @param name - identifier or extra name
+     * @param clazz - the class
+     * @param extra - true for a map key that is not the identifier
+     */
+    addName(name, clazz, extra) {
+        if (!this.byName.has(name)) {
+            this.byName.set(name, clazz);
+        }
+        addTo(this.lowerNames, name.toLowerCase(), clazz);
+        if (extra) {
+            this.extraNames.set(clazz, [...(this.extraNames.get(clazz) ?? []), name]);
+            return;
+        }
+        if (!this.identifiers.has(clazz)) {
+            this.identifiers.set(clazz, name);
+        }
+        for (const alias of ownMetadata(clazz)?.Aliases ?? []) {
+            addTo(this.aliases, alias, clazz);
+            addTo(this.lowerAliases, alias.toLowerCase(), clazz);
+        }
+    }
+    /**
+     * Resolver of the hierarchy of a model only, exact identifiers only
+     *
+     * Used for repositories whose model is not part of the installed application: today's exact matching.
+     * @param model - the model
+     * @returns the resolver
+     */
+    static forHierarchy(model) {
+        if (!model) {
+            return new ModelTypeResolver({}, { exactOnly: true });
+        }
+        const classes = [];
+        const queue = [model];
+        while (queue.length) {
+            const clazz = queue.shift();
+            if (!clazz || classes.includes(clazz))
+                continue;
+            classes.push(clazz);
+            queue.push(...(clazz.Metadata?.Subclasses ?? []).filter((sub) => typeof sub === "function"));
+        }
+        for (let parent = Object.getPrototypeOf(model); parent && parent !== Function.prototype; parent = Object.getPrototypeOf(parent)) {
+            if (ownMetadata(parent)?.Identifier)
+                classes.push(parent);
+        }
+        const record = {};
+        for (const clazz of classes) {
+            // The repository model may inherit its Metadata (a bare subclass used directly)
+            const identifier = (clazz === model ? clazz.Metadata : ownMetadata(clazz))?.Identifier;
+            if (identifier && !record[identifier])
+                record[identifier] = clazz;
+        }
+        return new ModelTypeResolver(record, { exactOnly: true });
+    }
+    /**
+     * @param model - a class
+     * @returns true when the class is one of the models of this resolver
+     */
+    knows(model) {
+        return this.identifiers.has(model);
+    }
+    /**
+     * @param model - a class
+     * @returns its current identifier, undefined when the class is not known
+     */
+    getIdentifier(model) {
+        return this.identifiers.get(model);
+    }
+    /**
+     * Resolve a stored `__type`
+     * @param stored - the stored value
+     * @returns the resolution
+     */
+    resolve(stored) {
+        let resolution = this.resolutions.get(stored);
+        if (!resolution) {
+            resolution = this.computeResolution(stored);
+            this.resolutions.set(stored, resolution);
+        }
+        return resolution;
+    }
+    /**
+     * @param stored - the stored value
+     * @returns the model, undefined when unknown or ambiguous
+     */
+    resolveStoredType(stored) {
+        return this.resolve(stored).model;
+    }
+    /**
+     * Run the resolution steps
+     * @param stored - the stored value
+     * @returns the resolution
+     */
+    computeResolution(stored) {
+        if (typeof stored !== "string" || stored === "") {
+            return { status: "unknown" };
+        }
+        const exact = this.byName.get(stored);
+        if (exact) {
+            return this.found(stored, exact);
+        }
+        if (this.exactOnly) {
+            return { status: "unknown" };
+        }
+        const lower = stored.toLowerCase();
+        const steps = [
+            this.aliases.get(stored),
+            this.lowerAliases.get(lower),
+            this.lowerNames.get(lower)
+        ];
+        if (!stored.includes("/")) {
+            // Webda 3 completeNamespace order: the application namespace first, then Webda
+            for (const namespace of new Set([this.namespace, "Webda"])) {
+                const name = `${namespace}/${stored}`.toLowerCase();
+                steps.push(this.lowerNames.get(name), this.lowerAliases.get(name));
+            }
+        }
+        for (const step of steps) {
+            if (!step || step.size === 0)
+                continue;
+            if (step.size > 1) {
+                return {
+                    status: "ambiguous",
+                    candidates: [...step].map(clazz => this.identifiers.get(clazz)).sort()
+                };
+            }
+            return this.found(stored, [...step][0]);
+        }
+        return { status: "unknown" };
+    }
+    /**
+     * @param stored - the stored value
+     * @param model - the matched model
+     * @returns the resolution of a match
+     */
+    found(stored, model) {
+        const identifier = this.identifiers.get(model);
+        return { status: stored === identifier ? "current" : "legacy", model, identifier };
+    }
+    /**
+     * The model and all its transitive subclasses: from `Metadata.Subclasses` (direct only), then any known class
+     * extending the model that the metadata does not list
+     * @param model - the model
+     * @returns the model first, then its subclasses
+     */
+    family(model) {
+        let family = this.families.get(model);
+        if (family)
+            return family;
+        family = [];
+        const queue = [model];
+        while (queue.length) {
+            const clazz = queue.shift();
+            if (!clazz || family.includes(clazz))
+                continue;
+            family.push(clazz);
+            for (const sub of clazz.Metadata?.Subclasses ?? []) {
+                queue.push(typeof sub === "string" ? this.byName.get(sub) : sub);
+            }
+        }
+        for (const clazz of this.identifiers.keys()) {
+            if (!family.includes(clazz) && clazz.prototype instanceof model) {
+                family.push(clazz);
+            }
+        }
+        this.families.set(model, family);
+        return family;
+    }
+    /**
+     * @param model - the model
+     * @returns the current identifiers of the model and its transitive subclasses
+     */
+    identifiersOf(model) {
+        const identifiers = [];
+        for (const clazz of this.family(model)) {
+            const identifier = this.identifiers.get(clazz) ?? clazz.Metadata?.Identifier;
+            if (identifier && !identifiers.includes(identifier))
+                identifiers.push(identifier);
+        }
+        return identifiers;
+    }
+    /**
+     * Every stored string that resolves to the model or one of its transitive subclasses: identifiers, short names,
+     * lower-case forms, aliases and their short and lower-case forms
+     * @param model - the model
+     * @returns the strings, deduplicated
+     */
+    acceptedTypes(model) {
+        let accepted = this.accepted.get(model);
+        if (accepted)
+            return accepted;
+        accepted = [];
+        for (const clazz of this.family(model)) {
+            const identifier = this.identifiers.get(clazz);
+            if (!identifier)
+                continue;
+            const names = [identifier, ...(this.extraNames.get(clazz) ?? []), ...(ownMetadata(clazz)?.Aliases ?? [])];
+            for (const name of names) {
+                const short = name.split("/").pop();
+                for (const candidate of [name, short, name.toLowerCase(), short.toLowerCase()]) {
+                    if (!accepted.includes(candidate) && this.resolve(candidate).model === clazz) {
+                        accepted.push(candidate);
+                    }
+                }
+            }
+        }
+        this.accepted.set(model, accepted);
+        return accepted;
+    }
+    /**
+     * Whether a stored row belongs to a model
+     * @param model - the model queried
+     * @param stored - the stored `__type`, undefined for an untyped row
+     * @param tableRoot - the model owning the untyped rows of the table, when known
+     * @returns true when the row resolves to the model or one of its transitive subclasses; an untyped row belongs to
+     *   the table root and its ancestors (to every model when the root is not known), and so does a row typed as a
+     *   strict ancestor of the table root
+     */
+    belongsToModel(model, stored, tableRoot) {
+        const ownedByRoot = () => !tableRoot || tableRoot === model || tableRoot.prototype instanceof model;
+        if (stored === undefined || stored === null || stored === "") {
+            return ownedByRoot();
+        }
+        const resolved = this.resolveStoredType(stored);
+        if (resolved === undefined)
+            return false;
+        if (tableRoot && tableRoot.prototype instanceof resolved) {
+            // Typed as an ancestor of the table root (e.g. written before the application subclassed the model)
+            return ownedByRoot();
+        }
+        return this.family(model).includes(resolved);
+    }
+}
+/** Global slot: shared by every copy of this module loaded in the process */
+const SLOT = Symbol.for("webda.models.typeResolver");
+/** Resolver used when nothing is installed and no model is given */
+let empty;
+/**
+ * Install the resolver of the application (done by `@webda/core` when models load)
+ * @param resolver - the resolver, undefined to uninstall
+ */
+export function setTypeResolver(resolver) {
+    globalThis[SLOT] = resolver;
+}
+/**
+ * @returns the installed resolver, if any
+ */
+export function useTypeResolver() {
+    return globalThis[SLOT];
+}
+/**
+ * Resolver to use for a model: the installed one when it knows the model, else the model's own hierarchy (exact
+ * identifiers only)
+ * @param model - the model, if any
+ * @returns the resolver
+ */
+export function getTypeResolver(model) {
+    const installed = useTypeResolver();
+    if (installed && (model === undefined || installed.knows(model))) {
+        return installed;
+    }
+    if (model !== undefined) {
+        return ModelTypeResolver.forHierarchy(model);
+    }
+    return (empty ??= new ModelTypeResolver({}, { exactOnly: true }));
+}
+/**
+ * @param stored - a stored `__type`
+ * @returns the model it resolves to with the installed resolver
+ */
+export function resolveStoredType(stored) {
+    return getTypeResolver().resolveStoredType(stored);
+}
+/**
+ * @param model - the model
+ * @returns every stored string resolving to the model or a transitive subclass
+ */
+export function acceptedTypes(model) {
+    return getTypeResolver(model).acceptedTypes(model);
+}
+/**
+ * @param model - the model
+ * @param stored - the stored `__type`
+ * @param tableRoot - the model owning the untyped rows
+ * @returns true when the row belongs to the model
+ */
+export function belongsToModel(model, stored, tableRoot) {
+    return getTypeResolver(model).belongsToModel(model, stored, tableRoot);
+}
+//# sourceMappingURL=types-resolver.js.map

package/lib/types-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types-resolver.js","sourceRoot":"","sources":["../src/types-resolver.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webda/models",
-  "version": "4.0.0-beta.8",
+  "version": "4.0.0-beta.9",
   "description": "Webda Models implementation",
   "main": "lib/index.js",
   "repository": {
@@ -28,8 +28,8 @@
     "@webda/serialize": "^4.0.0-beta.7"
   },
   "peerDependencies": {
-    "@webda/ql": "4.0.0-beta.7",
-    "@webda/utils": "4.0.0-beta.8"
+    "@webda/ql": "4.0.0-beta.8",
+    "@webda/utils": "4.0.0-beta.9"
   },
   "publishConfig": {
     "access": "public"
@@ -41,9 +41,9 @@
     "type-fest": "^5.5.0",
     "vitest": "^4.1.2",
     "vite": "^6.0.0",
-    "@webda/compiler": "^4.0.0-beta.8",
-    "@webda/tsc-esm": "4.0.0-beta.8",
-    "@webda/test": "^4.0.0-beta.7"
+    "@webda/test": "^4.0.0-beta.7",
+    "@webda/compiler": "^4.0.0-beta.9",
+    "@webda/tsc-esm": "4.0.0-beta.8"
   },
   "type": "module",
   "engines": {