@webda/core 1.6.0-beta.3 → 2.0.0-beta.2

package/lib/models/coremodel.d.ts

@@ -1,7 +1,32 @@
+import { Core } from "..";
+import { Service } from "../services/service";
 import { Store } from "../stores/store";
-import { Context, HttpMethodType } from "../utils/context";
-import { Service } from "..";
-import { JSONSchema6 } from "json-schema";
+import { Context } from "../utils/context";
+import { HttpMethodType } from "../utils/httpcontext";
+declare type ModelLoader<T> = {
+    refresh: () => Promise<T>;
+    getUuid(): string;
+};
+declare type ModelLinker<T> = string & ModelLoader<T>;
+/**
+ * Load related objects
+ */
+export declare type ModelLinked<T> = (query?: string) => Promise<T[]>;
+/**
+ * Define a ModelMap attribute
+ */
+export declare type ModelMap<T, _FK extends keyof T, K extends keyof T> = (Pick<T, K> & ModelLoader<T>)[];
+/**
+ * Define a link to 1:n or 1:1 relation
+ */
+export declare type ModelLink<T, _FK extends keyof T> = ModelLinker<T>;
+/**
+ * Define several links for n:m relation
+ */
+export declare type ModelLinks<T, _FK extends keyof T> = ModelLinker<T>[] | {
+    [key: string]: ModelLinker<T>;
+};
+export declare type ModelParent<T, FK extends keyof T> = ModelLink<T, FK>;
 /**
  * Define an export of actions from Model
  */
@@ -27,14 +52,28 @@ export interface ModelAction {
      */
     openapi?: any;
 }
-export interface CoreModelDefinition {
-    new (): CoreModel;
+export interface CoreModelDefinition<T extends CoreModel = CoreModel> {
+    new (): T;
+    /**
+     * Create a CoreModel object loaded with the content of object
+     *
+     * It allows polymorphism from Store
+     *
+     * @param model to create by default
+     * @param object to load data from
+     * @param context if the data is unsafe from http
+     */
+    factory(model: new () => T, object: any, context?: Context): T;
     getActions(): {
         [key: string]: ModelAction;
     };
     getUuidField(): string;
     getLastUpdateField(): string;
     getCreationField(): string;
+    getPermissionQuery(context?: Context): null | {
+        partial: boolean;
+        query: string;
+    };
 }
 /**
  * Sent if action required attached CoreModel is trigger
@@ -42,6 +81,7 @@ export interface CoreModelDefinition {
 export declare class CoreModelUnattachedError extends Error {
     constructor();
 }
+export declare function NotEnumerable(target: any, propertyKey: string): void;
 /**
  * Basic Object in Webda
  *
@@ -50,9 +90,9 @@ export declare class CoreModelUnattachedError extends Error {
  * Any variable starting with __ won't be exported outside of the server
  *
  * @class
+ * @WebdaModel
  */
 declare class CoreModel {
-    static jsonExcludes: string[];
     /**
      * Class reference to the object
      */
@@ -98,18 +138,28 @@ declare class CoreModel {
      * @param uuid
      * @param target
      */
-    setUuid(uuid: string, target?: any): void;
+    setUuid(uuid: string, target?: this): this;
     /**
      * Get actions callable on an object
      *
      * This will expose them by the Store with /storeUrl/{uuid}/{action}
      */
     static getActions(): ModelActions;
+    /**
+     * Return the expressable query for permission
+     *
+     * @param context of the query
+     * @returns
+     */
+    static getPermissionQuery(_ctx: Context): null | {
+        partial: boolean;
+        query: string;
+    };
     /**
      * By default nothing is permitted on a CoreModel
      * @returns
      */
-    canAct(ctx: Context, action: "create" | "update" | "get" | "delete" | "get_binary" | "detach_binary" | "attach_binary" | string): Promise<this>;
+    canAct(_ctx: Context, _action: "create" | "update" | "get" | "delete" | "get_binary" | "detach_binary" | "attach_binary" | "update_binary_metadata" | string): Promise<this>;
     /**
      * Get the UUID property
      */
@@ -122,6 +172,11 @@ declare class CoreModel {
      * Get the UUID property
      */
     static getCreationField(): string;
+    /**
+     * Create an object
+     * @returns
+     */
+    static factory(model: new () => CoreModel, object: any, context?: Context): CoreModel;
     /**
      * Return if an object is attached to its store
      */
@@ -129,28 +184,43 @@ declare class CoreModel {
     /**
      * Attach an object to a store instance
      */
-    attach(store: Store<CoreModel>): void;
+    attach(store: Store<CoreModel>): this;
+    /**
+     * Return a unique reference within the application to the object
+     *
+     * It contains the Store containing it
+     * @returns
+     */
+    getFullUuid(): string;
+    /**
+     * Get an object from the full uuid
+     * @param core
+     * @param fullUuid
+     * @param partials
+     * @returns
+     */
+    static fromFullUuid<T extends CoreModel = CoreModel>(core: Core, fullUuid: string, partials?: any): Promise<T>;
     /**
      * Load an object from RAW
      *
      * @param raw data
      * @param secure if false will ignore any _ variable
      */
-    load(raw: any, secure?: boolean): void;
+    load(raw: any, secure?: boolean): this;
     /**
      * Context of the request
      */
-    setContext(ctx: Context): void;
+    setContext(ctx: Context): this;
     /**
      * Get object context
      *
      * Global object does not belong to a request
      */
-    getContext(): Context;
+    getContext(): Context<any, any>;
     /**
      * Return the object registered store
      */
-    getStore(): Store<CoreModel, import("..").StoreParameters>;
+    getStore(): Store<CoreModel, import("..").StoreParameters, import("..").StoreEvents>;
     /**
      * Get the object again
      *
@@ -174,15 +244,7 @@ declare class CoreModel {
      *
      * @throws Error if the object is not coming from a store
      */
-    update(changes: any): Promise<void>;
-    /**
-     * Allow to specify the JSONSchema to configure this service
-     *
-     * Return undefined by default to fallback on typescript-json-schema guess
-     *
-     * Using this method should only be exception
-     */
-    static getSchema(): JSONSchema6;
+    update(changes: any): Promise<this>;
     /**
      * Validate objet modification
      *
@@ -196,7 +258,7 @@ declare class CoreModel {
      * @param object
      * @returns
      */
-    generateUid(object?: any): string;
+    generateUid(_object?: any): string;
     /**
      * Remove all the attribute starting with __
      * @param key
@@ -258,7 +320,7 @@ declare class CoreModel {
      *
      * @param updates to be send
      */
-    _onUpdate(updates: any): Promise<void>;
+    _onUpdate(_updates: any): Promise<void>;
     /**
      * Called when object is updated
      */

package/lib/models/coremodel.js

@@ -1,4 +1,10 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -9,7 +15,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CoreModel = exports.CoreModelUnattachedError = void 0;
+exports.CoreModel = exports.NotEnumerable = exports.CoreModelUnattachedError = void 0;
 const uuid_1 = require("uuid");
 const context_1 = require("../utils/context");
 /**
@@ -21,6 +27,19 @@ class CoreModelUnattachedError extends Error {
     }
 }
 exports.CoreModelUnattachedError = CoreModelUnattachedError;
+function NotEnumerable(target, propertyKey) {
+    Object.defineProperty(target, propertyKey, {
+        set(value) {
+            Object.defineProperty(this, propertyKey, {
+                value,
+                writable: true,
+                configurable: true
+            });
+        },
+        configurable: true
+    });
+}
+exports.NotEnumerable = NotEnumerable;
 /**
  * Basic Object in Webda
  *
@@ -29,6 +48,7 @@ exports.CoreModelUnattachedError = CoreModelUnattachedError;
  * Any variable starting with __ won't be exported outside of the server
  *
  * @class
+ * @WebdaModel
  */
 class CoreModel {
     constructor() {
@@ -49,6 +69,7 @@ class CoreModel {
      */
     setUuid(uuid, target = this) {
         target[this.__class.getUuidField()] = uuid;
+        return target;
     }
     /**
      * Get actions callable on an object
@@ -58,11 +79,20 @@ class CoreModel {
     static getActions() {
         return {};
     }
+    /**
+     * Return the expressable query for permission
+     *
+     * @param context of the query
+     * @returns
+     */
+    static getPermissionQuery(_ctx) {
+        return null;
+    }
     /**
      * By default nothing is permitted on a CoreModel
      * @returns
      */
-    canAct(ctx, action) {
+    canAct(_ctx, _action) {
         return __awaiter(this, void 0, void 0, function* () {
             throw 403;
         });
@@ -85,6 +115,13 @@ class CoreModel {
     static getCreationField() {
         return "_creationDate";
     }
+    /**
+     * Create an object
+     * @returns
+     */
+    static factory(model, object, context) {
+        return new model().setContext(context).load(object, context === undefined);
+    }
     /**
      * Return if an object is attached to its store
      */
@@ -96,6 +133,36 @@ class CoreModel {
      */
     attach(store) {
         this.__store = store;
+        return this;
+    }
+    /**
+     * Return a unique reference within the application to the object
+     *
+     * It contains the Store containing it
+     * @returns
+     */
+    getFullUuid() {
+        if (!this.isAttached()) {
+            throw new Error("Cannot return full uuid of unattached object");
+        }
+        return `${this.__store.getName()}$${this.getUuid()}`;
+    }
+    /**
+     * Get an object from the full uuid
+     * @param core
+     * @param fullUuid
+     * @param partials
+     * @returns
+     */
+    static fromFullUuid(core, fullUuid, partials) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [store, uuid] = fullUuid.split("$");
+            let service = core.getService(store);
+            if (partials) {
+                return service.initModel(partials).setUuid(uuid);
+            }
+            return service.get(uuid);
+        });
     }
     /**
      * Load an object from RAW
@@ -115,12 +182,14 @@ class CoreModel {
         if (!this.getUuid()) {
             this.setUuid(this.generateUid(raw));
         }
+        return this;
     }
     /**
      * Context of the request
      */
     setContext(ctx) {
         this.__ctx = ctx;
+        return this;
     }
     /**
      * Get object context
@@ -206,18 +275,9 @@ class CoreModel {
             for (var i in obj) {
                 this[i] = obj[i];
             }
+            return this;
         });
     }
-    /**
-     * Allow to specify the JSONSchema to configure this service
-     *
-     * Return undefined by default to fallback on typescript-json-schema guess
-     *
-     * Using this method should only be exception
-     */
-    static getSchema() {
-        return undefined;
-    }
     /**
      * Validate objet modification
      *
@@ -226,17 +286,7 @@ class CoreModel {
      */
     validate(ctx, updates = undefined) {
         return __awaiter(this, void 0, void 0, function* () {
-            // Load updates before validating itself
-            if (updates) {
-                this.load(updates);
-            }
-            if (!ctx.getWebda().validateSchema(this, this)) {
-                throw new Error(ctx
-                    .getWebda()
-                    .validationLastErrors()
-                    .map(e => e.message)
-                    .join(","));
-            }
+            ctx.getWebda().validateSchema(this, updates);
             return true;
         });
     }
@@ -246,7 +296,7 @@ class CoreModel {
      * @param object
      * @returns
      */
-    generateUid(object = undefined) {
+    generateUid(_object = undefined) {
         return (0, uuid_1.v4)().toString();
     }
     /**
@@ -269,15 +319,9 @@ class CoreModel {
      */
     toStoredJSON(stringify = false) {
         let obj = this._toJSON(true);
-        obj.__store = undefined;
         obj.__type = this.__class.name;
         if (stringify) {
-            return JSON.stringify(obj, (key, value) => {
-                if (CoreModel.jsonExcludes.indexOf(key) >= 0) {
-                    return undefined;
-                }
-                return value;
-            });
+            return JSON.stringify(obj);
         }
         return obj;
     }
@@ -305,9 +349,6 @@ class CoreModel {
         let obj = {};
         for (let i in this) {
             let value = this[i];
-            if (CoreModel.jsonExcludes.indexOf(i) >= 0) {
-                continue;
-            }
             if (!secure) {
                 value = this._jsonFilter(i, this[i]);
             }
@@ -370,7 +411,7 @@ class CoreModel {
      *
      * @param updates to be send
      */
-    _onUpdate(updates) {
+    _onUpdate(_updates) {
         return __awaiter(this, void 0, void 0, function* () {
             // Empty to be overriden
         });
@@ -384,6 +425,14 @@ class CoreModel {
         });
     }
 }
+__decorate([
+    NotEnumerable
+], CoreModel.prototype, "__class", void 0);
+__decorate([
+    NotEnumerable
+], CoreModel.prototype, "__ctx", void 0);
+__decorate([
+    NotEnumerable
+], CoreModel.prototype, "__store", void 0);
 exports.CoreModel = CoreModel;
-CoreModel.jsonExcludes = ["__store", "__ctx"];
 //# sourceMappingURL=coremodel.js.map

package/lib/models/coremodel.js.map

@@ -1 +1 @@
-{"version":3,"file":"coremodel.js","sourceRoot":"","sources":["../../src/models/coremodel.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;AACb,+BAAoC;AAEpC,8CAA2D;AAqC3D;;GAEG;AACH,MAAa,wBAAyB,SAAQ,KAAK;IACjD;QACE,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAC1C,CAAC;CACF;AAJD,4DAIC;AAED;;;;;;;;GAQG;AACH,MAAM,SAAS;IAuCb;QACE,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC;IAC5B,CAAC;IACD;;;OAGG;IACH,OAAO;QACL,aAAa;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,IAAY,EAAE,SAAc,IAAI;QACtC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,GAAG,IAAI,CAAC;IAC7C,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU;QACf,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;OAGG;IACG,MAAM,CACV,GAAY,EACZ,MAA0G;;YAE1G,MAAM,GAAG,CAAC;QACZ,CAAC;KAAA;IAED;;OAEG;IACH,MAAM,CAAC,YAAY;QACjB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,kBAAkB;QACvB,OAAO,aAAa,CAAC;IACvB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,gBAAgB;QACrB,OAAO,eAAe,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC;IACpC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAuB;QAC5B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC;IAED;;;;;OAKG;IACH,IAAI,CAAC,GAAQ,EAAE,SAAkB,KAAK;QACpC,4BAA4B;QAC5B,KAAK,IAAI,IAAI,IAAI,GAAG,EAAE;YACpB,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;gBAC9B,SAAS;aACV;YACD,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;SACxB;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QAEhC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE;YACnB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;SACrC;IACH,CAAC;IAED;;OAEG;IACH,UAAU,CAAC,GAAY;QACrB,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACH,UAAU;QACR,OAAO,IAAI,CAAC,KAAK,IAAI,iBAAO,CAAC,gBAAgB,EAAE,CAAC;IAClD,CAAC;IAED;;OAEG;IACH,QAAQ;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED;;;;OAIG;IACG,OAAO;;YACX,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,MAAM,IAAI,wBAAwB,EAAE,CAAC;aACtC;YACD,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACjD,IAAI,GAAG,EAAE;gBACP,KAAK,IAAI,CAAC,IAAI,GAAG,EAAE;oBACjB,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;iBAClB;gBACD,KAAK,IAAI,CAAC,IAAI,IAAI,EAAE;oBAClB,aAAa;oBACb,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE;wBACtB,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;qBACrB;iBACF;aACF;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;;OAIG;IACG,MAAM;;YACV,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,MAAM,IAAI,wBAAwB,EAAE,CAAC;aACtC;YACD,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7C,CAAC;KAAA;IAED;;;;OAIG;IACG,IAAI;;YACR,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,MAAM,IAAI,wBAAwB,EAAE,CAAC;aACtC;YACD,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxC,KAAK,IAAI,CAAC,IAAI,GAAG,EAAE;gBACjB,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;aAClB;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;;OAIG;IACG,MAAM,CAAC,OAAO;;YAClB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,MAAM,IAAI,wBAAwB,EAAE,CAAC;aACtC;YACD,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;YACzE,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5C,KAAK,IAAI,CAAC,IAAI,GAAG,EAAE;gBACjB,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;aAClB;QACH,CAAC;KAAA;IAED;;;;;;OAMG;IACH,MAAM,CAAC,SAAS;QACd,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;OAKG;IACG,QAAQ,CAAC,GAAY,EAAE,UAAe,SAAS;;YACnD,wCAAwC;YACxC,IAAI,OAAO,EAAE;gBACX,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACpB;YACD,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;gBAC9C,MAAM,IAAI,KAAK,CACb,GAAG;qBACA,QAAQ,EAAE;qBACV,oBAAoB,EAAE;qBACtB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;qBACnB,IAAI,CAAC,GAAG,CAAC,CACb,CAAC;aACH;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;;;OAKG;IACH,WAAW,CAAC,SAAc,SAAS;QACjC,OAAO,IAAA,SAAM,GAAE,CAAC,QAAQ,EAAE,CAAC;IAC7B,CAAC;IAED;;;;;OAKG;IACH,WAAW,CAAC,GAAG,EAAE,KAAK;QACpB,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YACtD,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;OAKG;IACH,YAAY,CAAC,SAAS,GAAG,KAAK;QAC5B,IAAI,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7B,GAAG,CAAC,OAAO,GAAG,SAAS,CAAC;QACxB,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QAC/B,IAAI,SAAS,EAAE;YACb,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACxC,IAAI,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAC5C,OAAO,SAAS,CAAC;iBAClB;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;;;OAKG;IACH,UAAU,CAAoB,OAAO;QACnC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,MAAM,IAAI,wBAAwB,EAAE,CAAC;SACtC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAI,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM;QACZ,IAAI,GAAG,GAAQ,EAAE,CAAC;QAClB,KAAK,IAAI,CAAC,IAAI,IAAI,EAAE;YAClB,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;gBAC1C,SAAS;aACV;YACD,IAAI,CAAC,MAAM,EAAE;gBACX,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;aACtC;YACD,IAAI,KAAK,KAAK,SAAS;gBAAE,SAAS;YAClC,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;SAChB;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;;OAIG;IACH,MAAM;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED;;OAEG;IACG,SAAS;;YACb,wBAAwB;QAC1B,CAAC;KAAA;IAED;;OAEG;IACG,UAAU;;YACd,wBAAwB;QAC1B,CAAC;KAAA;IAED;;OAEG;IACG,MAAM;;YACV,wBAAwB;QAC1B,CAAC;KAAA;IAED;;OAEG;IACG,OAAO;;YACX,wBAAwB;QAC1B,CAAC;KAAA;IAED;;OAEG;IACG,QAAQ;;YACZ,wBAAwB;QAC1B,CAAC;KAAA;IAED;;;;OAIG;IACG,SAAS,CAAC,OAAY;;YAC1B,wBAAwB;QAC1B,CAAC;KAAA;IAED;;OAEG;IACG,UAAU;;YACd,wBAAwB;QAC1B,CAAC;KAAA;;AAGM,8BAAS;AAlZT,sBAAY,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC"}
+{"version":3,"file":"coremodel.js","sourceRoot":"","sources":["../../src/models/coremodel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,+BAAoC;AAIpC,8CAA2C;AAsE3C;;GAEG;AACH,MAAa,wBAAyB,SAAQ,KAAK;IACjD;QACE,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAC1C,CAAC;CACF;AAJD,4DAIC;AAED,SAAgB,aAAa,CAAC,MAAW,EAAE,WAAmB;IAC5D,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE;QACzC,GAAG,CAAC,KAAK;YACP,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,EAAE;gBACvC,KAAK;gBACL,QAAQ,EAAE,IAAI;gBACd,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;QACL,CAAC;QACD,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;AACL,CAAC;AAXD,sCAWC;AAED;;;;;;;;;GASG;AACH,MAAM,SAAS;IAyCb;QACE,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC;IAC5B,CAAC;IACD;;;OAGG;IACH,OAAO;QACL,aAAa;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,IAAY,EAAE,MAAM,GAAG,IAAI;QACjC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,GAAG,IAAI,CAAC;QAC3C,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU;QACf,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,kBAAkB,CAAC,IAAa;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACG,MAAM,CACV,IAAa,EACb,OASU;;YAEV,MAAM,GAAG,CAAC;QACZ,CAAC;KAAA;IAED;;OAEG;IACH,MAAM,CAAC,YAAY;QACjB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,kBAAkB;QACvB,OAAO,aAAa,CAAC;IACvB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,gBAAgB;QACrB,OAAO,eAAe,CAAC;IACzB,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,OAAO,CAAC,KAA0B,EAAE,MAAW,EAAE,OAAiB;QACvE,OAAO,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,KAAK,SAAS,CAAC,CAAC;IAC7E,CAAC;IAED;;OAEG;IACH,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC;IACpC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAuB;QAC5B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACH,WAAW;QACT,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;SACjE;QACD,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;IACvD,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAO,YAAY,CAAkC,IAAU,EAAE,QAAgB,EAAE,QAAc;;YACrG,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAW,KAAK,CAAC,CAAC;YAC/C,IAAI,QAAQ,EAAE;gBACZ,OAAO,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAClD;YACD,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;KAAA;IACD;;;;;OAKG;IACH,IAAI,CAAC,GAAQ,EAAE,SAAkB,KAAK;QACpC,4BAA4B;QAC5B,KAAK,IAAI,IAAI,IAAI,GAAG,EAAE;YACpB,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;gBAC9B,SAAS;aACV;YACD,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;SACxB;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QAEhC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE;YACnB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;SACrC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,UAAU,CAAC,GAAY;QACrB,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACH,UAAU;QACR,OAAO,IAAI,CAAC,KAAK,IAAI,iBAAO,CAAC,gBAAgB,EAAE,CAAC;IAClD,CAAC;IAED;;OAEG;IACH,QAAQ;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED;;;;OAIG;IACG,OAAO;;YACX,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,MAAM,IAAI,wBAAwB,EAAE,CAAC;aACtC;YACD,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACjD,IAAI,GAAG,EAAE;gBACP,KAAK,IAAI,CAAC,IAAI,GAAG,EAAE;oBACjB,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;iBAClB;gBACD,KAAK,IAAI,CAAC,IAAI,IAAI,EAAE;oBAClB,aAAa;oBACb,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE;wBACtB,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;qBACrB;iBACF;aACF;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;;OAIG;IACG,MAAM;;YACV,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,MAAM,IAAI,wBAAwB,EAAE,CAAC;aACtC;YACD,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7C,CAAC;KAAA;IAED;;;;OAIG;IACG,IAAI;;YACR,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,MAAM,IAAI,wBAAwB,EAAE,CAAC;aACtC;YACD,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxC,KAAK,IAAI,CAAC,IAAI,GAAG,EAAE;gBACjB,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;aAClB;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;;OAIG;IACG,MAAM,CAAC,OAAO;;YAClB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,MAAM,IAAI,wBAAwB,EAAE,CAAC;aACtC;YACD,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;YACzE,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5C,KAAK,IAAI,CAAC,IAAI,GAAG,EAAE;gBACjB,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;aAClB;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;;;OAKG;IACG,QAAQ,CAAC,GAAY,EAAE,UAAe,SAAS;;YACnD,GAAG,CAAC,QAAQ,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC7C,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;;;OAKG;IACH,WAAW,CAAC,UAAe,SAAS;QAClC,OAAO,IAAA,SAAM,GAAE,CAAC,QAAQ,EAAE,CAAC;IAC7B,CAAC;IAED;;;;;OAKG;IACH,WAAW,CAAC,GAAG,EAAE,KAAK;QACpB,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YACtD,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;OAKG;IACH,YAAY,CAAC,SAAS,GAAG,KAAK;QAC5B,IAAI,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7B,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QAC/B,IAAI,SAAS,EAAE;YACb,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;SAC5B;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;;;OAKG;IACH,UAAU,CAAoB,OAAO;QACnC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,MAAM,IAAI,wBAAwB,EAAE,CAAC;SACtC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAI,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM;QACZ,IAAI,GAAG,GAAQ,EAAE,CAAC;QAClB,KAAK,IAAI,CAAC,IAAI,IAAI,EAAE;YAClB,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,CAAC,MAAM,EAAE;gBACX,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;aACtC;YACD,IAAI,KAAK,KAAK,SAAS;gBAAE,SAAS;YAClC,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;SAChB;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;;OAIG;IACH,MAAM;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED;;OAEG;IACG,SAAS;;YACb,wBAAwB;QAC1B,CAAC;KAAA;IAED;;OAEG;IACG,UAAU;;YACd,wBAAwB;QAC1B,CAAC;KAAA;IAED;;OAEG;IACG,MAAM;;YACV,wBAAwB;QAC1B,CAAC;KAAA;IAED;;OAEG;IACG,OAAO;;YACX,wBAAwB;QAC1B,CAAC;KAAA;IAED;;OAEG;IACG,QAAQ;;YACZ,wBAAwB;QAC1B,CAAC;KAAA;IAED;;;;OAIG;IACG,SAAS,CAAC,QAAa;;YAC3B,wBAAwB;QAC1B,CAAC;KAAA;IAED;;OAEG;IACG,UAAU;;YACd,wBAAwB;QAC1B,CAAC;KAAA;CACF;AA1aC;IADC,aAAa;0CACD;AAWb;IADC,aAAa;wCACC;AAOf;IADC,aAAa;0CACY;AA0ZnB,8BAAS"}

package/lib/models/coremodel.spec.js

@@ -17,9 +17,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const mocha_1 = require("@testdeck/mocha");
 const assert = require("assert");
-const test_1 = require("../test");
-const __1 = require("..");
 const sinon = require("sinon");
+const __1 = require("..");
+const test_1 = require("../test");
 const Task = require("../../test/models/task");
 let CoreModelTest = class CoreModelTest extends test_1.WebdaTest {
     unsecureLoad() {
@@ -116,6 +116,22 @@ let CoreModelTest = class CoreModelTest extends test_1.WebdaTest {
             assert.strictEqual(this.getService("ResourceService"), task.getService("ResourceService"));
         });
     }
+    fullUuid() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let task = new Task();
+            task.setUuid("task#1");
+            assert.throws(() => task.getFullUuid(), /Cannot return full uuid of unattached object/);
+            let memoryStore = this.getService("MemoryUsers");
+            task = yield memoryStore.save(Object.assign(Object.assign({}, task), { test: false }));
+            assert.strictEqual(task.getFullUuid(), "MemoryUsers$task#1");
+            let taskB = yield this.webda.getModelObject("MemoryUsers$task#1");
+            // @ts-ignore
+            assert.strictEqual(taskB.test, false);
+            taskB = yield this.webda.getModelObject(task.getFullUuid(), { test: true });
+            // @ts-ignore
+            assert.strictEqual(taskB.test, true);
+        });
+    }
     refresh() {
         return __awaiter(this, void 0, void 0, function* () {
             let task = new Task();
@@ -152,6 +168,9 @@ __decorate([
 __decorate([
     mocha_1.test
 ], CoreModelTest.prototype, "cov", null);
+__decorate([
+    mocha_1.test
+], CoreModelTest.prototype, "fullUuid", null);
 __decorate([
     mocha_1.test
 ], CoreModelTest.prototype, "refresh", null);

package/lib/models/coremodel.spec.js.map

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

package/lib/models/ident.d.ts

@@ -1,19 +1,22 @@
+import { ModelLink } from "./coremodel";
 import { OwnerModel } from "./ownermodel";
-declare class IdentTokens {
+import { User } from "./user";
+export declare class IdentTokens {
     refresh: string;
     access: string;
 }
 /**
  * First basic model for Ident
  * @class
+ * @WebdaModel
  */
-declare class Ident extends OwnerModel {
+export declare class Ident extends OwnerModel {
     _type: string;
     uid: string;
     __profile: any;
     __tokens: IdentTokens;
     _lastUsed: Date;
-    _user: string;
+    _user: ModelLink<User, "_idents">;
     __new: boolean;
     _failedLogin: number;
     /**
@@ -29,10 +32,9 @@ declare class Ident extends OwnerModel {
      */
     email?: string;
     static init(type: string, uid: string, accessToken?: string, refreshToken?: string, profile?: object): Ident;
-    getUser(): string;
+    getUser(): ModelLink<User, "_idents">;
     getEmail(): string;
     setUser(user: any): void;
     getType(): string;
     setType(type: any): void;
 }
-export { Ident, IdentTokens };

package/lib/models/ident.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IdentTokens = exports.Ident = void 0;
+exports.Ident = exports.IdentTokens = void 0;
 const ownermodel_1 = require("./ownermodel");
 class IdentTokens {
 }
@@ -8,6 +8,7 @@ exports.IdentTokens = IdentTokens;
 /**
  * First basic model for Ident
  * @class
+ * @WebdaModel
  */
 class Ident extends ownermodel_1.OwnerModel {
     static init(type, uid, accessToken = "", refreshToken = "", profile = {}) {

package/lib/models/ident.js.map

@@ -1 +1 @@
-{"version":3,"file":"ident.js","sourceRoot":"","sources":["../../src/models/ident.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;AACb,6CAA0C;AAE1C,MAAM,WAAW;CAGhB;AAqEe,kCAAW;AApE3B;;;GAGG;AACH,MAAM,KAAM,SAAQ,uBAAU;IAsB5B,MAAM,CAAC,IAAI,CACT,IAAY,EACZ,GAAW,EACX,cAAsB,EAAE,EACxB,eAAuB,EAAE,EACzB,UAAkB,EAAE;QAEpB,IAAI,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;QACtB,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC/B,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC5B,IAAI,GAAG,CAAC,KAAK,KAAK,OAAO,EAAE;YACzB,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC;SACrB;QACD,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC;QACrC,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;QACxB,GAAG,CAAC,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;QACjC,GAAG,CAAC,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC;QACpC,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,WAAW,CAAC;QAClC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,IAAI;QACV,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,IAAI;QACV,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;CACF;AAEQ,sBAAK"}
+{"version":3,"file":"ident.js","sourceRoot":"","sources":["../../src/models/ident.ts"],"names":[],"mappings":";;;AACA,6CAA0C;AAG1C,MAAa,WAAW;CAGvB;AAHD,kCAGC;AACD;;;;GAIG;AACH,MAAa,KAAM,SAAQ,uBAAU;IAsBnC,MAAM,CAAC,IAAI,CACT,IAAY,EACZ,GAAW,EACX,cAAsB,EAAE,EACxB,eAAuB,EAAE,EACzB,UAAkB,EAAE;QAEpB,IAAI,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;QACtB,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC/B,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC5B,IAAI,GAAG,CAAC,KAAK,KAAK,OAAO,EAAE;YACzB,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC;SACrB;QACD,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC;QACrC,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;QACxB,GAAG,CAAC,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;QACjC,GAAG,CAAC,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC;QACpC,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,WAAW,CAAC;QAClC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,IAAI;QACV,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,IAAI;QACV,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;CACF;AA9DD,sBA8DC"}

package/lib/models/ident.spec.js

@@ -6,8 +6,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const assert = require("assert");
 const mocha_1 = require("@testdeck/mocha");
+const assert = require("assert");
 const ident_1 = require("./ident");
 let IdentTest = class IdentTest {
     getType() {

package/lib/models/ident.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"ident.spec.js","sourceRoot":"","sources":["../../src/models/ident.spec.ts"],"names":[],"mappings":";;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAC9C,mCAAgC;AAGhC,IAAM,SAAS,GAAf,MAAM,SAAS;IACP,OAAO;QACX,eAAe;QACf,IAAI,IAAI,GAAU,IAAI,aAAK,EAAE,CAAC;QAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAEK,IAAI;QACR,IAAI,KAAK,GAAG,aAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACjE,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACxC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAChD,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACjD,KAAK,GAAG,aAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC5C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC9C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC/C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;QAChD,KAAK,CAAC,KAAK,GAAG,eAAe,CAAC;QAC9B,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,eAAe,CAAC,CAAC;IACxD,CAAC;CACF,CAAA;AAvBO;IAAL,YAAI;wCAKJ;AAEK;IAAL,YAAI;qCAeJ;AAvBG,SAAS;IADd,aAAK;GACA,SAAS,CAwBd"}
+{"version":3,"file":"ident.spec.js","sourceRoot":"","sources":["../../src/models/ident.spec.ts"],"names":[],"mappings":";;;;;;;;AAAA,2CAA8C;AAC9C,iCAAiC;AACjC,mCAAgC;AAGhC,IAAM,SAAS,GAAf,MAAM,SAAS;IACP,OAAO;QACX,eAAe;QACf,IAAI,IAAI,GAAU,IAAI,aAAK,EAAE,CAAC;QAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAEK,IAAI;QACR,IAAI,KAAK,GAAG,aAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACjE,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACxC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAChD,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACjD,KAAK,GAAG,aAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC5C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC9C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC/C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;QAChD,KAAK,CAAC,KAAK,GAAG,eAAe,CAAC;QAC9B,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,eAAe,CAAC,CAAC;IACxD,CAAC;CACF,CAAA;AAvBO;IAAL,YAAI;wCAKJ;AAEK;IAAL,YAAI;qCAeJ;AAvBG,SAAS;IADd,aAAK;GACA,SAAS,CAwBd"}