sedentary 0.0.19 → 0.0.20

package/index.d.ts

@@ -1,4 +1,4 @@
-import { DB, EntryBase, ForeignKeyOptions, Meta, Natural, Type } from "./lib/db";
+import { Attribute, DB, EntryBase, ForeignKeyOptions, Natural, Type } from "./lib/db";
 export { EntryBase, ForeignKeyActions, ForeignKeyOptions, Natural, Type } from "./lib/db";
 export declare type TypeDefinition<N extends Natural, E> = (() => Type<N, E>) | Type<N, E>;
 export interface AttributeOptions<N extends Natural, E> {
@@ -16,13 +16,9 @@ declare type ForeignKeysAttributes<T, k> = T extends AttributeDefinition<Natural
 declare type ForeignKeys<A extends AttributesDefinition> = {
     [a in keyof A]?: ForeignKeysAttributes<A[a], a>;
 }[keyof A];
-declare type Methods<E> = {
-    [key: string]: (this: E) => unknown;
-};
 declare type Native__<T> = T extends Type<infer N, unknown> ? N : never;
 declare type Native_<T> = T extends () => Type<infer N, infer E> ? Native__<Type<N, E>> : Native__<T>;
 declare type Native<T> = T extends AttributeOptions<infer N, infer E> ? Native__<Type<N, E>> : Native_<T>;
-declare type Parent<T> = T extends Meta<Natural, infer E> ? E : never;
 export declare type IndexAttributes = string[] | string;
 export interface IndexOptions {
     attributes: IndexAttributes;
@@ -33,51 +29,59 @@ export declare type IndexDefinition = IndexAttributes | IndexOptions;
 export declare type IndexesDefinition = {
     [key: string]: IndexDefinition;
 };
-declare type BaseModelOptions<B extends boolean, T> = {
+interface BaseModelOptions {
     indexes?: IndexesDefinition;
-    init?: (this: T) => void;
-    int8id?: B;
     sync?: boolean;
     tableName?: string;
-};
-export declare type ModelOptions<B extends boolean, K extends string, M extends Methods<T>, P extends Meta<Natural, EntryBase>, T extends EntryBase> = BaseModelOptions<B, T> & {
-    methods?: M;
-    parent?: P;
-    primaryKey?: K;
-};
-declare type ModelBaseOptions = {
-    indexes?: IndexesDefinition;
-    sync?: boolean;
-    tableName?: string;
-};
-export declare type ModelOptions2 = ModelBaseOptions & {
+}
+export interface ModelOptions extends BaseModelOptions {
     int8id?: boolean;
     parent?: Type<Natural, EntryBase>;
     primaryKey?: string;
+}
+declare type ConditionAttribute<N extends Natural> = N | [">" | "<" | ">=" | "<=" | "<>", N] | ["LIKE", string] | ["IN", ...N[]];
+declare type ConditionBase<A extends AttributesDefinition> = string | {
+    [a in keyof A]?: ConditionAttribute<Native<A[a]>>;
 };
+declare type Condition<A extends AttributesDefinition> = ConditionBase<A> | ["NOT", Condition<A>] | ["AND", ...Condition<A>[]] | ["OR", ...Condition<A>[]];
 declare type UnionToIntersection<U> = (U extends unknown ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
 declare type IsUnion<T> = [T] extends [UnionToIntersection<T>] ? false : true;
-declare type EntryIdNatural<B extends boolean> = IsUnion<B> extends true ? number : B extends true ? string : number;
-export declare type EntryId<B extends boolean> = {
-    id?: EntryIdNatural<B>;
-};
+declare type BaseKeyType<B extends boolean> = IsUnion<B> extends true ? number : B extends true ? string : number;
+declare type KeyType<B extends boolean, P extends ModelStd> = P extends new () => EntryBase ? (P extends Attribute<infer T, EntryBase> ? T : never) : BaseKeyType<B>;
 declare type ForeignKey<A> = A extends AttributeDefinition<Natural, infer E> ? () => Promise<E> : never;
-declare type ModelFKAttributes<A extends AttributesDefinition> = {
-    [a in ForeignKeys<A> & string as `${a}Load`]?: ForeignKey<A[a]>;
-};
-declare type ModelBaseAttributes<A extends AttributesDefinition> = {
+declare type EntryBaseAttributes<A extends AttributesDefinition> = {
     [a in keyof A]?: Native<A[a]>;
 };
-declare type ModelAttributes<A extends AttributesDefinition> = keyof ModelFKAttributes<A> extends never ? ModelBaseAttributes<A> : ModelBaseAttributes<A> & ModelFKAttributes<A>;
-declare type Ancestor<A, N extends Natural, T extends EntryBase> = (new () => T) & {
-    [a in keyof A]?: Meta<Native<A[a]>, T>;
+declare type EntryMethodsBase<P extends ModelStd> = P extends new () => EntryBase ? P["methods"] : EntryBase;
+declare type EntryMethodsFK<A extends AttributesDefinition> = {
+    [a in ForeignKeys<A> & string as `${a}Load`]: ForeignKey<A[a]>;
+};
+declare type EntryMethods<A extends AttributesDefinition, P extends ModelStd> = keyof EntryMethodsFK<A> extends never ? EntryMethodsBase<P> : EntryMethodsBase<P> & EntryMethodsFK<A>;
+declare type ModelAttributesIf<A extends AttributesDefinition, T> = keyof A extends never ? T : T & A;
+declare type ModelAttributes<A extends AttributesDefinition, B extends boolean, K extends string, P extends ModelStd> = K extends keyof A ? A : ModelAttributesIf<A, P extends new () => EntryBase ? P["attributes"] : {
+    id: Type<BaseKeyType<B>, unknown>;
+}>;
+declare type ModelBase<N extends Natural, A extends AttributesDefinition, EA extends Record<string, Natural | undefined>, EM extends EntryBase, E extends EntryBase> = (new (from?: EA) => E) & Attribute<N, E> & {
+    attributes: A;
+    foreignKeys: Record<string, boolean>;
+    methods: EM;
+    parent?: ModelStd;
+    tableName: string;
+    load: (where?: Condition<A>) => Promise<E[]>;
 } & {
-    load: (boh: boolean) => Promise<T[]>;
-} & Meta<N, T> & {
-    tmp: number;
+    [a in keyof A]: Attribute<Native<A[a]>, E>;
+};
+declare type Model<N extends Natural, A extends AttributesDefinition, EM extends EntryBase> = ModelBase<N, A, EntryBaseAttributes<A>, EM, EntryBaseAttributes<A> & EM>;
+declare type ModelStd = Attribute<Natural, EntryBase> & {
+    attributes: AttributesDefinition;
+    foreignKeys: Record<string, boolean>;
+    methods: EntryBase;
+    parent?: ModelStd;
 };
-declare type ModelBase<E extends EntryBase> = new () => E;
 export declare type Entry<M> = M extends new () => infer E ? E : never;
+export declare type Where<M> = M extends {
+    load: (where: infer T) => void;
+} ? Exclude<T, undefined> : never;
 export interface SedentaryOptions {
     log?: ((message: string) => void) | null;
     serverless?: boolean;
@@ -90,36 +94,22 @@ export declare class Sedentary {
     private models;
     constructor(filename: string, options?: SedentaryOptions);
     DATETIME(): Type<Date, unknown>;
-    FKEY<N extends Natural, E extends EntryBase>(attribute: Type<N, E>, options?: ForeignKeyOptions): Type<N, E>;
+    FKEY<N extends Natural, E extends EntryBase>(attribute: Attribute<N, E>, options?: ForeignKeyOptions): Type<N, E>;
     INT(size?: number): Type<number, unknown>;
     INT8(): Type<string, unknown>;
     VARCHAR(size?: number): Type<string, unknown>;
     checkSize(size: number, message: string): number;
     connect(): Promise<void>;
     end(): Promise<void>;
-    model2<E extends EntryBase>(modelName: string): ModelBase<E>;
-    model2<E extends EntryBase, M extends Record<string, <S extends M>(this: E & S) => unknown>>(modelName: string, methods: M & Record<string, (this: E & M) => void>): ModelBase<E & M>;
-    model<A extends AttributesDefinition, B extends boolean, E extends EntryBase & EntryId<B> & ModelAttributes<A>>(modelName: string, attributes: A, options?: BaseModelOptions<B, E>): Ancestor<A, string, E>;
-    model<A extends AttributesDefinition, B extends boolean, K extends keyof A, P extends Meta<Natural, EntryBase>, N extends P extends {
-        tmp: number;
-    } ? (P extends Meta<infer N, EntryBase> ? N : never) : Native<A[K]>, E extends (P extends {
-        tmp: number;
-    } ? Parent<P> : EntryBase) & ModelAttributes<A>>(modelName: string, attributes: A, options?: BaseModelOptions<B, E> & {
+    model<A extends AttributesDefinition, B extends boolean, K extends string, P extends ModelStd, EM extends EntryMethods<A, P>>(modelName: string, attributes: A, options?: BaseModelOptions & {
+        int8id?: B;
         parent?: P;
-        primaryKey?: K;
-    }): Ancestor<A, N, E>;
-    model<A extends AttributesDefinition, B extends boolean, E extends EntryBase & EntryId<B> & ModelAttributes<A>, M extends Record<string, <S extends M>(this: E & S) => unknown>>(modelName: string, attributes: A, options: BaseModelOptions<B, E>, methods: M & Record<string, (this: E & M) => unknown>): Ancestor<A, string, E & M>;
-    model<A extends AttributesDefinition, B extends boolean, K extends keyof A, P extends Meta<Natural, EntryBase>, N extends P extends {
-        tmp: number;
-    } ? (P extends Meta<infer N, EntryBase> ? N : never) : Native<A[K]>, E extends (P extends {
-        tmp: number;
-    } ? Parent<P> : EntryBase) & ModelAttributes<A>, M extends Record<string, <S extends M>(this: E & S) => unknown>>(modelName: string, attributes: A, options: BaseModelOptions<B, E> & {
+        primaryKey?: K | keyof A;
+    }): Model<K extends keyof A ? Native<A[K]> : KeyType<B, P>, ModelAttributes<A, B, K, P>, EM>;
+    model<A extends AttributesDefinition, B extends boolean, K extends string, P extends ModelStd, EA extends EntryBaseAttributes<ModelAttributes<A, B, K, P>>, EM extends EntryMethods<A, P>, M extends Record<string, <S extends M>(this: EA & EM & S, ...args: any[]) => void>>(modelName: string, attributes: A, options: BaseModelOptions & {
+        int8id?: B;
         parent?: P;
-        primaryKey?: K;
-    }, methods: M & Record<string, (this: E & M) => unknown>): Ancestor<A, N, E & M>;
+        primaryKey?: K | keyof A;
+    }, methods: M & Record<keyof M, (this: EA & EM & M, ...args: any[]) => void>): Model<K extends keyof A ? Native<A[K]> : KeyType<B, P>, ModelAttributes<A, B, K, P>, EM & M>;
 }
 export declare const Package: typeof Sedentary;
-export declare class Sedentary2 {
-    model<E extends EntryBase>(modelName: string): ModelBase<E>;
-    model<E extends EntryBase, M extends Record<string, <S extends M>(this: E & S) => unknown>>(modelName: string, methods: M & Record<string, (this: E & M) => void>): ModelBase<E & M>;
-}

package/index.js

@@ -1,16 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Sedentary2 = exports.Package = exports.Sedentary = exports.Type = exports.EntryBase = void 0;
+exports.Package = exports.Sedentary = exports.Type = exports.EntryBase = void 0;
 const db_1 = require("./lib/db");
-const log_1 = require("./lib/log");
 const minidb_1 = require("./lib/minidb");
 var db_2 = require("./lib/db");
 Object.defineProperty(exports, "EntryBase", { enumerable: true, get: function () { return db_2.EntryBase; } });
 Object.defineProperty(exports, "Type", { enumerable: true, get: function () { return db_2.Type; } });
-const allowedOption = ["indexes", "init", "int8id", "methods", "parent", "primaryKey", "sync", "tableName", "type"];
+const allowedOption = ["indexes", "int8id", "parent", "primaryKey", "sync", "tableName"];
 const reservedNames = [
-    ...["attributeName", "base", "class", "constructor", "defaultValue", "entry", "fieldName", "init", "isModel"],
-    ...["load", "meta", "methods", "name", "primaryKey", "prototype", "save", "size", "tableName", "type"]
+    ...["attributeName", "attributes", "base", "class", "construct", "constructor", "defaultValue", "entry", "fieldName", "foreignKeys", "load"],
+    ...["methods", "name", "postLoad", "postSave", "preLoad", "preSave", "primaryKey", "prototype", "save", "size", "tableName", "type"]
 ];
 class Sedentary {
     constructor(filename, options) {
@@ -30,7 +29,8 @@ class Sedentary {
             throw new Error("new Sedentary: 'log' option: Wrong type, expected 'null' or 'Function'");
         if (typeof sync !== "boolean")
             throw new Error("new Sedentary: 'sync' option: Wrong type, expected 'boolean'");
-        this.log = (0, log_1.createLogger)(log);
+        // eslint-disable-next-line no-console
+        this.log = log ? log : log === null ? () => { } : console.log;
         this.db = new minidb_1.MiniDB(filename, this.log);
         this.sync = sync;
     }
@@ -72,7 +72,7 @@ class Sedentary {
             this.log("Synced");
         }
         catch (e) {
-            this.log("Connecting:", e.message);
+            this.log("Connecting: " + (e instanceof Error ? e.message : JSON.stringify(e)));
             throw e;
         }
     }
@@ -81,15 +81,7 @@ class Sedentary {
         await this.db.end();
         this.log("Connection closed");
     }
-    model2(modelName, methods) {
-        const ret = function () {
-            this.save();
-        };
-        Object.defineProperty(ret, "name", { value: name });
-        if (methods)
-            Object.assign(ret.prototype, methods);
-        return ret;
-    }
+    /* eslint-enable @typescript-eslint/no-explicit-any */
     model(modelName, attributes, options, methods) {
         if (typeof modelName !== "string")
             throw new Error("Sedentary.model: 'name' argument: Wrong type, expected 'string'");
@@ -123,16 +115,10 @@ class Sedentary {
         if (methods && !(methods instanceof Object))
             throw new Error(`Sedentary.model: '${modelName}' model: 'methods' option: Wrong type, expected 'Object'`);
         const originalMethods = methods;
-        if (parent) {
-            try {
-                if (!parent.isModel())
-                    throw new Error();
-            }
-            catch (e) {
+        if (parent)
+            if (!parent.attributes)
                 throw new Error(`Sedentary.model: '${modelName}' model: 'parent' option: Wrong type, expected 'Model'`);
-            }
-            methods = (methods ? Object.assign(Object.assign({}, (parent.methods || {})), methods) : parent.methods);
-        }
+        //methods = (methods ? { ...(parent.methods || {}), ...methods } : parent.methods) as never;
         if (primaryKey && typeof primaryKey !== "string")
             throw new Error(`Sedentary.model: '${modelName}' model: 'primaryKey' option: Wrong type, expected 'string'`);
         if (primaryKey && !Object.keys(attributes).includes(primaryKey))
@@ -191,21 +177,21 @@ class Sedentary {
                 return ret;
             })();
             if (foreignKey) {
-                if (!foreignKey.options)
-                    foreignKey.options = {};
-                if (!(foreignKey.options instanceof Object))
+                const options = foreignKey.options || {};
+                if (foreignKey.options !== undefined && !(foreignKey.options instanceof Object))
                     throw new Error(`Sedentary.FKEY: '${modelName}' model: '${attributeName}' attribute: Wrong options type, expected 'Object'`);
-                for (const k in foreignKey.options)
+                for (const k in options)
                     if (!["onDelete", "onUpdate"].includes(k))
                         throw new Error(`Sedentary.FKEY: '${modelName}' model: '${attributeName}' attribute: Unknown option '${k}'`);
                 for (const onChange of ["onDelete", "onUpdate"]) {
                     const actions = ["cascade", "no action", "restrict", "set default", "set null"];
-                    let action = foreignKey.options[onChange];
+                    let action = options[onChange];
                     if (!action)
-                        action = foreignKey.options[onChange] = "no action";
+                        action = options[onChange] = "no action";
                     if (action && !actions.includes(action))
                         throw new Error(`Sedentary.FKEY: '${modelName}' model: '${attributeName}' attribute: '${onChange}' option: Wrong value, expected ${actions.map(_ => `'${_}'`).join(" | ")}`);
                 }
+                foreignKey.options = options;
             }
             if (primaryKey === attributeName) {
                 notNull = true;
@@ -274,70 +260,38 @@ class Sedentary {
         }
         this.db.tables.push(new db_1.Table({ autoIncrement, constraints, attributes: aarray, indexes: iarray, parent, sync, tableName }));
         this.models[modelName] = true;
-        const init = parent
-            ? options.init
-                ? function () {
-                    parent.init.call(this);
-                    options.init.call(this);
-                }
-                : parent.init
-            : options.init;
-        class Class {
-            constructor() {
-                if (init)
-                    init.call(this);
-            }
-            save() {
-                return new Promise((resolve, reject) => {
-                    const save = () => reject(new Error("eh no"));
-                    Object.defineProperty(save, "name", { value: modelName + ".save" });
-                    setTimeout(save, 10);
-                });
-            }
-        }
-        const load = (boh) => new Promise((resolve, reject) => setTimeout(() => {
-            if (boh)
-                return resolve([new Class()]);
-            reject(new Error("boh"));
-        }, 10));
-        Object.defineProperty(load, "name", { value: modelName + ".load" });
-        const metaAttributes = aarray.reduce((ret, curr) => {
-            ret[curr.attributeName] = curr;
-            return ret;
-        }, {});
-        const metaForeignKeys = aarray
+        const foreignKeys = aarray
             .filter(_ => _.foreignKey)
             .reduce((ret, curr) => {
-            ret[curr.attributeName] = curr;
+            ret[curr.attributeName] = true;
             return ret;
         }, {});
-        const meta = new db_1.Meta({ base: Number, attributes: metaAttributes, foreignKeys: metaForeignKeys, modelName, parent: parent, type: "meta", tableName, primaryKey, init, methods });
-        for (const foreignKey in metaForeignKeys) {
-            if (foreignKey + "Load" in metaAttributes)
+        for (const foreignKey in foreignKeys) {
+            if (foreignKey + "Load" in attributes)
                 throw new Error(`Sedentary.model: '${modelName}' model: '${foreignKey}' attribute: '${foreignKey}Load' inferred methods conflicts with an attribute`);
             if (originalMethods && foreignKey + "Load" in originalMethods)
                 throw new Error(`Sedentary.model: '${modelName}' model: '${foreignKey}' attribute: '${foreignKey}Load' inferred methods conflicts with a method`);
         }
         if (originalMethods)
             for (const method in originalMethods)
-                if (method in metaAttributes)
+                if (method in attributes)
                     throw new Error(`Sedentary.model: '${modelName}' model: '${method}' method: conflicts with an attribute`);
         const checkParent = (parent) => {
             if (!parent)
                 return;
-            for (const attribute in metaAttributes) {
+            for (const attribute in attributes) {
                 if (attribute in parent.attributes)
                     throw new Error(`Sedentary.model: '${modelName}' model: '${attribute}' attribute: conflicts with an attribute of '${parent.modelName}' model`);
-                if (parent.methods && attribute in parent.methods)
+                if (attribute in parent.methods)
                     throw new Error(`Sedentary.model: '${modelName}' model: '${attribute}' attribute: conflicts with a method of '${parent.modelName}' model`);
                 for (const foreignKey in parent.foreignKeys)
                     if (attribute === foreignKey + "Load")
                         throw new Error(`Sedentary.model: '${modelName}' model: '${attribute}' attribute: conflicts with an inferred methods of '${parent.modelName}' model`);
             }
-            for (const foreignKey in metaForeignKeys) {
+            for (const foreignKey in foreignKeys) {
                 if (foreignKey + "Load" in parent.attributes)
                     throw new Error(`Sedentary.model: '${modelName}' model: '${foreignKey}' attribute: '${foreignKey}Load' inferred methods conflicts with an attribute of '${parent.modelName}' model`);
-                if (parent.methods && foreignKey + "Load" in parent.methods)
+                if (foreignKey + "Load" in parent.methods)
                     throw new Error(`Sedentary.model: '${modelName}' model: '${foreignKey}' attribute: '${foreignKey}Load' inferred methods conflicts with a method of '${parent.modelName}' model`);
             }
             if (originalMethods) {
@@ -347,135 +301,36 @@ class Sedentary {
                     for (const foreignKey in parent.foreignKeys)
                         if (foreignKey + "Load" === method)
                             throw new Error(`Sedentary.model: '${modelName}' model: '${method}' method: conflicts with an inferred methods of '${parent.modelName}' model`);
-                    if (parent.methods && method in parent.methods)
+                    if (method in parent.methods)
                         throw new Error(`Sedentary.model: '${modelName}' model: '${method}' method: conflicts with a method of '${parent.modelName}' model`);
                 }
             }
             checkParent(parent.parent);
         };
         checkParent(parent);
-        Object.defineProperty(Class, "isModel", { value: () => true });
-        Object.defineProperty(Class, "load", { value: load });
-        Object.defineProperty(Class, "meta", { value: meta });
-        Object.defineProperty(Class, "name", { value: modelName });
-        Object.defineProperty(Class.prototype.save, "name", { value: modelName + ".save" });
-        Object.assign(Class, meta);
-        Object.assign(Class.prototype, methods);
-        for (const attribute of aarray)
-            Object.defineProperty(Class, attribute.attributeName, { value: attribute });
-        for (const key of ["attributeName", "base", "fieldName", "modelName", "size", "type", "unique"])
-            Object.defineProperty(Class, key, { value: pk[key] });
-        return Class;
-    }
-}
-exports.Sedentary = Sedentary;
-exports.Package = Sedentary;
-const db = new Sedentary("gino");
-const Users = db.model("User", { foo: db.INT(), bar: { type: db.VARCHAR(), unique: true } }, {});
-class Item extends db.model("Item", {
-    num: db.FKEY(Users),
-    str: db.VARCHAR()
-}, {
-    init: function () {
-        this.num = "0";
-        this.str = "0";
-    },
-    int8id: true
-    /*
-    methods: {
-      prova: (): string => "ok"
-    }
-    */
-}) {
-}
-class Super extends db.model("Super", {
-    a: db.INT,
-    n: db.FKEY(Item),
-    s: db.FKEY(Users.bar)
-}, {
-    parent: Item
-    /*
-    init:   async function() {
-      this.n = "23";
-      this.id = 0;
-      this.num = 0;
-      const a = this.nLoad ? await this.nLoad() : { prova: (): null => null };
-      a.prova();
-      this.prova();
-    }
-    */
-}) {
-}
-class Next extends db.model("Next", { a: db.INT, b: db.INT }, {
-    init: function () {
-        this.a = 23;
-    },
-    primaryKey: "a"
-}) {
-}
-class Current extends db.model("Current", { b: { type: db.FKEY(Next), unique: true } }, {
-    init: function () {
-        this.b = 24;
-    }
-}) {
-}
-class Last extends db.model("Last", { c: db.FKEY(Current.b) }, {
-    init: function () {
-        this.c = 24;
-    },
-    parent: Next
-}) {
-}
-(async function () {
-    const item = new Super();
-    try {
-        await item.save();
-    }
-    catch (e) {
-        console.log(Item.load, item.save, await Item.load(true), item, e.message);
-        //console.log(new Next(), Next.load, await Next.load(true), new Last(), item.prova());
-    }
-    return true;
-})();
-function model(modelName, attributes, options, methods) {
-    const model = function () { };
-    Object.defineProperty(model, "name", { value: modelName });
-    if (methods)
-        Object.assign(model.prototype, methods);
-    return model;
-}
-const T1 = model("T1", {});
-const t1 = new T1();
-t1.id = 0;
-console.log(t1);
-const T2 = model("T2", { a: db.INT, b: db.VARCHAR }, { int8id: true }, {
-    test: function (repeat = true) {
-        if (repeat)
-            this.b = this.test(false);
-        this.c = this.a = 0;
-        return "test";
-    }
-});
-const t2 = new T2();
-//t2.id = "0";
-const tt2 = (t) => console.log(t, t.test(), t.a, t.b);
-tt2(t2);
-class Sedentary2 {
-    model(modelName, methods) {
         const ret = function () { };
+        const load = (boh) => new Promise((resolve, reject) => setTimeout(() => {
+            if (boh)
+                return resolve([new ret()]);
+            reject(new Error("boh"));
+        }, 10));
+        Object.defineProperty(load, "name", { value: modelName + ".load" });
         Object.defineProperty(ret, "name", { value: modelName });
+        Object.defineProperty(ret, "load", { value: load });
+        Object.defineProperty(ret, "attributes", { value: attributes });
+        Object.defineProperty(ret, "foreignKeys", { value: foreignKeys });
+        Object.defineProperty(ret, "methods", { value: methods || {} });
         if (methods)
             Object.assign(ret.prototype, methods);
-        ret.prototype.save = () => new Promise(resolve => resolve(false));
+        ret.prototype.save = function () {
+            return Promise.resolve(false);
+        };
+        for (const attribute of aarray)
+            Object.defineProperty(ret, attribute.attributeName, { value: attribute });
+        for (const key of ["attributeName", "base", "fieldName", "modelName", "size", "tableName", "type", "unique"])
+            Object.defineProperty(ret, key, { value: pk[key] });
         return ret;
     }
 }
-exports.Sedentary2 = Sedentary2;
-const db2 = new Sedentary2();
-const T22 = db2.model("T2", {
-    c: function () {
-        this.id = "0";
-        this.c();
-        return 0;
-    }
-});
+exports.Sedentary = Sedentary;
+exports.Package = Sedentary;

package/lib/db.d.ts

@@ -1,5 +1,9 @@
 export declare type Natural = Date | Record<string, unknown> | boolean | number | string;
 export declare class EntryBase {
+    construct(): void;
+    postLoad(): void;
+    preLoad(): void;
+    preSave(): void;
     save(): Promise<boolean>;
 }
 export declare type ForeignKeyActions = "cascade" | "no action" | "restrict" | "set default" | "set null";
@@ -7,7 +11,7 @@ export interface ForeignKeyOptions {
     onDelete?: ForeignKeyActions;
     onUpdate?: ForeignKeyActions;
 }
-export declare class Type<N extends Natural, E> {
+export interface Type<N extends Natural, E> {
     base: unknown;
     entry?: E;
     native?: N;
@@ -19,27 +23,11 @@ export declare class Type<N extends Natural, E> {
         options?: ForeignKeyOptions;
         tableName: string;
     };
-    constructor(from: Type<N, E>);
 }
-export declare class Meta<N extends Natural, E> extends Type<N, E> {
-    attributes: {
-        [key: string]: unknown;
-    };
-    foreignKeys: {
-        [key: string]: unknown;
-    };
-    init: () => void;
-    isModel?: () => boolean;
-    methods: {
-        [key: string]: () => unknown;
-    };
-    modelName: string;
-    parent?: Meta<Natural, E>;
-    primaryKey: string;
-    tableName: string;
-    constructor(from: Meta<N, E>);
+export declare class Type<N extends Natural, E> {
+    constructor(from: Type<N, E>);
 }
-export declare class Attribute<N extends Natural, E> extends Type<N, E> {
+export interface Attribute<N extends Natural, E> extends Type<N, E> {
     attributeName: string;
     defaultValue?: unknown;
     fieldName: string;
@@ -47,6 +35,8 @@ export declare class Attribute<N extends Natural, E> extends Type<N, E> {
     notNull: boolean;
     tableName: string;
     unique?: boolean;
+}
+export declare class Attribute<N extends Natural, E> extends Type<N, E> {
     constructor(from: Attribute<N, E>);
 }
 export interface Constraint {
@@ -65,11 +55,11 @@ interface ITable {
     autoIncrement: boolean;
     constraints: Constraint[];
     indexes: Index[];
-    parent: Meta<Natural, unknown>;
+    parent: any;
     sync: boolean;
     tableName: string;
 }
-declare const Table_base: new (defaults?: ITable) => ITable;
+declare const Table_base: new (defaults?: ITable | undefined) => ITable;
 export declare class Table extends Table_base {
     autoIncrementOwn?: boolean;
     oid?: number;
@@ -77,7 +67,7 @@ export declare class Table extends Table_base {
 }
 export declare abstract class DB {
     tables: Table[];
-    protected log: (...data: unknown[]) => void;
+    protected log: (message: string) => void;
     protected sync: boolean;
     abstract connect(): Promise<void>;
     abstract end(): Promise<void>;
@@ -85,7 +75,7 @@ export declare abstract class DB {
     findTable(name: string): Table;
     protected indexesEq(a: Index, b: Index): boolean;
     syncDataBase(): Promise<void>;
-    protected syncLog(...data: unknown[]): void;
+    protected syncLog(message: string): void;
     abstract dropConstraints(table: Table): Promise<number[]>;
     abstract dropFields(table: Table): Promise<void>;
     abstract dropIndexes(table: Table, constraintIndexes: number[]): Promise<void>;

package/lib/db.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DB = exports.Table = exports.Attribute = exports.Meta = exports.Type = exports.EntryBase = void 0;
-/**/
+exports.DB = exports.Table = exports.Attribute = exports.Type = exports.EntryBase = void 0;
 class EntryBase {
+    construct() { }
+    postLoad() { }
+    preLoad() { }
+    preSave() { }
     async save() {
         return false;
     }
@@ -14,12 +17,6 @@ class Type {
     }
 }
 exports.Type = Type;
-class Meta extends Type {
-    constructor(from) {
-        super(from);
-    }
-}
-exports.Meta = Meta;
 class Attribute extends Type {
     constructor(from) {
         super(from);
@@ -42,6 +39,7 @@ exports.Table = Table;
 class DB {
     constructor(log) {
         this.tables = [];
+        this.sync = true;
         this.log = log;
     }
     findTable(name) {
@@ -72,9 +70,8 @@ class DB {
             await this.syncIndexes(table);
         }
     }
-    syncLog(...data) {
-        const args = this.sync ? data : ["NOT SYNCING:", ...data];
-        this.log(...args);
+    syncLog(message) {
+        this.log(this.sync ? message : "NOT SYNCING: " + message);
     }
 }
 exports.DB = DB;

package/lib/minidb.js

@@ -16,7 +16,8 @@ class MiniDB extends db_1.DB {
             this.body = JSON.parse((await readFile(this.file)).toString());
         }
         catch (e) {
-            if (e.code !== "ENOENT")
+            const err = e;
+            if (err.code !== "ENOENT")
                 throw e;
         }
     }

package/lib/transaction.d.ts

@@ -0,0 +1,2 @@
+export declare class Transaction {
+}

package/lib/transaction.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Transaction = void 0;
+class Transaction {
+}
+exports.Transaction = Transaction;

package/package.json

@@ -5,10 +5,10 @@
   "description": "The ORM which never needs to migrate",
   "devDependencies": {
     "@types/mocha": "9.0.0",
-    "@types/node": "17.0.0",
+    "@types/node": "17.0.5",
     "@types/yamljs": "0.2.31",
-    "@typescript-eslint/eslint-plugin": "5.7.0",
-    "@typescript-eslint/parser": "5.7.0",
+    "@typescript-eslint/eslint-plugin": "5.8.1",
+    "@typescript-eslint/parser": "5.8.1",
     "eslint": "8.5.0",
     "mocha": "9.1.3",
     "nyc": "15.1.0",
@@ -58,9 +58,21 @@
   },
   "tsd": {
     "compilerOptions": {
-      "strict": false
+      "alwaysStrict": true,
+      "declaration": true,
+      "esModuleInterop": true,
+      "module": "commonjs",
+      "noImplicitAny": true,
+      "noImplicitReturns": true,
+      "noImplicitThis": true,
+      "strict": true,
+      "strictBindCallApply": true,
+      "strictFunctionTypes": true,
+      "strictNullChecks": true,
+      "strictPropertyInitialization": true,
+      "target": "es2017"
     }
   },
   "types": "index.d.ts",
-  "version": "0.0.19"
+  "version": "0.0.20"
 }

package/utils.d.ts

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

package/utils.js

@@ -0,0 +1,130 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const yamljs_1 = __importDefault(require("yamljs"));
+const fs_1 = require("fs");
+const { readFile, writeFile } = fs_1.promises;
+const { VERSION, npm_package_name } = process.env;
+const common = ["*.tgz", "coverage", "node_modules", "test.json", ""];
+const git = [".gitignore", ".npmignore", ".nyc_output", "docs/build", "docs/__pycache__", "index.d.ts", "index.js", "lib/*.d.ts", "lib/*.js"];
+const npm = [".*", "Makefile", "docs", "index.ts", "lib/db.ts", "lib/minidb.ts", "lib/transaction.ts", "sedentary-*", "test", "tsconfig.json", "utils.ts"];
+const descriptions = { sedentary: "", "sedentary-mysql": " - MySQL", "sedentary-pg": " - PostgreSQL", "sedentary-sqlite": " - SQLite" };
+const urls = { sedentary: "", "sedentary-mysql": "-mysql", "sedentary-pg": "-pg", "sedentary-sqlite": "-sqlite" };
+const deps = { sedentary: {}, "sedentary-mysql": {}, "sedentary-pg": { pg: "8.7.1", "pg-format": "1.0.4" }, "sedentary-sqlite": {} };
+const devd = { sedentary: {}, "sedentary-mysql": {}, "sedentary-pg": { "@types/pg": "8.6.3", "@types/pg-format": "1.0.2" }, "sedentary-sqlite": {} };
+const packagejson = {
+    author: "Daniele Ricci <daniele.icc@gmail.com> (https://github.com/iccicci)",
+    dependencies: {},
+    devDependencies: {
+        "@types/mocha": "9.0.0",
+        "@types/node": "17.0.5",
+        "@types/yamljs": "0.2.31",
+        "@typescript-eslint/eslint-plugin": "5.8.1",
+        "@typescript-eslint/parser": "5.8.1",
+        eslint: "8.5.0",
+        mocha: "9.1.3",
+        prettier: "2.5.1",
+        nyc: "15.1.0",
+        "ts-node": "10.4.0",
+        tsd: "0.19.0",
+        typescript: "4.5.4",
+        yamljs: "0.3.0"
+    },
+    engines: { node: ">=12.0" },
+    funding: { url: "https://blockchain.info/address/1Md9WFAHrXTb3yPBwQWmUfv2RmzrtbHioB" },
+    keywords: ["DB", "ORM", "database", "migration", "mysql", "postgresql", "sqlite"],
+    license: "MIT",
+    prettier: {
+        arrowParens: "avoid",
+        endOfLine: "lf",
+        jsxBracketSameLine: true,
+        printWidth: 200,
+        trailingComma: "none",
+        useTabs: false
+    },
+    readmeFilename: "README.md",
+    scripts: {
+        coverage: "nyc -r lcov -r text -r text-summary -r html mocha -r ts-node/register test/*ts",
+        gitignore: "node -r ts-node/register utils.ts gitignore",
+        npmignore: "node -r ts-node/register utils.ts npmignore",
+        packagejson: "node -r ts-node/register utils.ts packagejson",
+        test: "mocha -r ts-node/register test/*ts",
+        travis: "node -r ts-node/register utils.ts travis",
+        tsc: "tsc --declaration",
+        version: "node -r ts-node/register utils.ts version"
+    },
+    tsd: { compilerOptions: {} },
+    types: "index.d.ts"
+};
+const before_script_common = [
+    "curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter",
+    "chmod +x ./cc-test-reporter",
+    "./cc-test-reporter before-build"
+];
+const conditions = { sedentary: "", "sedentary-pg": "&& $PG_VERSION == 14 " };
+const travis = {
+    common: {
+        after_script: [`if [[ \`node --version\` =~ ^v16 ${conditions[npm_package_name]}]] ; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT ; fi`],
+        before_script: before_script_common,
+        language: "node_js",
+        node_js: ["16", "14", "12"],
+        script: "npm run coverage",
+        sudo: "required"
+    },
+    sedentary: { env: { global: ["CC_TEST_REPORTER_ID=1aa1f737e7bf7d2859a2c7d9a0d9634a0d9aa89e3a19476d576faa7d02a1d46f"] } },
+    "sedentary-pg": {
+        before_install: ["sudo service postgresql stop", "sudo service postgresql restart $PG_VERSION"],
+        before_script: [
+            ...before_script_common,
+            'psql -c "CREATE DATABASE sedentary;" -U postgres',
+            "psql -c \"ALTER DATABASE sedentary SET timezone TO 'GMT';\" -U postgres",
+            'export SPG=\'{"database":"sedentary","password":"postgres","user":"postgres"}\''
+        ],
+        env: {
+            global: ["CC_TEST_REPORTER_ID=c7519657dfea145349c1b7a98f7134f033c25f598b40ad5b077744eb4beb7c66"],
+            matrix: ["PG_VERSION=14", "PG_VERSION=13", "PG_VERSION=12", "PG_VERSION=11", "PG_VERSION=10"]
+        }
+    }
+};
+function sort(obj) {
+    const ret = {};
+    if (obj instanceof Array || !(obj instanceof Object))
+        return obj;
+    Object.entries(obj)
+        .sort(([a], [b]) => (a < b ? -1 : 1))
+        .forEach(([k, v]) => (ret[k] = sort(v)));
+    return ret;
+}
+(async function () {
+    if (process.argv[2] === "gitignore")
+        writeFile(".gitignore", [...git, ...common].join("\n"), "utf-8");
+    if (process.argv[2] === "npmignore")
+        writeFile(".npmignore", [...npm, ...common].join("\n"), "utf-8");
+    if (process.argv[2] === "travis")
+        writeFile(".travis.yml", yamljs_1.default.stringify(sort(Object.assign(Object.assign({}, travis.common), travis[npm_package_name])), 4, 2), "utf-8");
+    if (process.argv[2] === "packagejson") {
+        const bugs = `https://github.com/iccicci/sedentary${urls[npm_package_name]}/issues`;
+        const description = "The ORM which never needs to migrate" + descriptions[npm_package_name];
+        const homepage = `https://github.com/iccicci/sedentary${urls[npm_package_name]}#readme`;
+        const repository = `https://github.com/iccicci/sedentary${urls[npm_package_name]}`;
+        const pkg = JSON.parse(await readFile("package.json", "utf-8"));
+        const { compilerOptions } = JSON.parse(await readFile("tsconfig.json", "utf-8"));
+        const { name, version } = pkg;
+        const tsd = { compilerOptions };
+        let { dependencies, devDependencies } = pkg;
+        try {
+            const { version } = JSON.parse(await readFile("../package.json", "utf-8"));
+            dependencies = Object.assign(Object.assign({}, deps[npm_package_name]), { sedentary: version });
+            devDependencies = Object.assign(Object.assign({}, devDependencies), devd[npm_package_name]);
+        }
+        catch (e) { }
+        await writeFile("package.json", JSON.stringify(sort(Object.assign(Object.assign({}, packagejson), { bugs, dependencies, devDependencies, description, homepage, name, repository, tsd, version })), null, 2), "utf-8");
+    }
+    if (process.argv[2] === "version") {
+        const pkg = JSON.parse(await readFile("package.json", "utf-8"));
+        pkg.version = VERSION;
+        await writeFile("package.json", JSON.stringify(pkg, null, 2), "utf-8");
+    }
+})();

package/lib/log.d.ts

@@ -1,4 +0,0 @@
-export declare function createLogger(log: ((message: string) => void) | null | undefined): {
-    (...data: any[]): void;
-    (message?: any, ...optionalParams: any[]): void;
-};

package/lib/log.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLogger = void 0;
-const console_1 = require("console");
-const stream_1 = require("stream");
-class Logger extends stream_1.Writable {
-    constructor(log) {
-        super();
-        this.log = log;
-    }
-    _write(chunk, encoding, callback) {
-        this.log(chunk.toString());
-        callback();
-    }
-}
-function createLogger(log) {
-    // eslint-disable-next-line no-console
-    return log ? new console_1.Console(new Logger(log)).log : log === null ? () => { } : console.log;
-}
-exports.createLogger = createLogger;

package/lib/log.ts

@@ -1,22 +0,0 @@
-import { Console } from "console";
-import { Writable } from "stream";
-
-class Logger extends Writable {
-  private log: (message: string) => void;
-
-  constructor(log: (message: string) => void) {
-    super();
-
-    this.log = log;
-  }
-
-  _write(chunk: Buffer, encoding: string, callback: () => void) {
-    this.log(chunk.toString());
-    callback();
-  }
-}
-
-export function createLogger(log: ((message: string) => void) | null | undefined) {
-  // eslint-disable-next-line no-console
-  return log ? new Console(new Logger(log)).log : log === null ? () => {} : console.log;
-}