@snowtop/ent 0.1.0-alpha123 → 0.1.0-alpha125

package/schema/struct_field.js

@@ -4,24 +4,20 @@ exports.StructTypeAsList = exports.StructListType = exports.StructType = exports
 const camel_case_1 = require("camel-case");
 const field_1 = require("./field");
 const schema_1 = require("./schema");
-const global_schema_1 = require("../core/global_schema");
-const logger_1 = require("../core/logger");
 class StructField extends field_1.BaseField {
-    constructor(options, jsonAsList) {
+    constructor(options) {
         super();
         this.options = options;
-        this.jsonAsList = jsonAsList;
         this.type = {
             dbType: schema_1.DBType.JSONB,
         };
         this.type.subFields = options.fields;
         this.type.type = options.tsType;
         this.type.graphQLType = options.graphQLType || options.tsType;
-        this.type.globalType = this.options.globalType;
         if (options.jsonNotJSONB) {
             this.type.dbType = schema_1.DBType.JSON;
         }
-        if (jsonAsList) {
+        if (options?.jsonAsList) {
             this.type.listElemType = {
                 dbType: schema_1.DBType.JSONB,
             };
@@ -61,37 +57,7 @@ class StructField extends field_1.BaseField {
         return JSON.stringify(ret);
     }
     format(obj, nested) {
-        if (this.type.globalType) {
-            const f = (0, global_schema_1.__getGlobalSchemaField)(this.type.globalType);
-            if (f && f.format) {
-                if (JSON.stringify(this.type.listElemType) !==
-                    JSON.stringify(f?.type.listElemType)) {
-                    if (this.jsonAsList) {
-                        // handle as nested
-                        // @ts-ignore
-                        const formatted = obj.map((v) => f.format(v, true));
-                        if (nested) {
-                            return formatted;
-                        }
-                        else {
-                            return JSON.stringify(formatted);
-                        }
-                    }
-                    else {
-                        const formatted = f.format([obj], true);
-                        if (nested) {
-                            return formatted[0];
-                        }
-                        else {
-                            return JSON.stringify(formatted[0]);
-                        }
-                    }
-                }
-                // TODO handle format code
-                return f.format(obj);
-            }
-        }
-        if (Array.isArray(obj) && this.jsonAsList) {
+        if (Array.isArray(obj) && this.options.jsonAsList) {
             const ret = obj.map((v) => this.formatImpl(v, true));
             if (nested) {
                 return ret;
@@ -136,35 +102,7 @@ class StructField extends field_1.BaseField {
         return ret.every((v) => v);
     }
     async valid(obj) {
-        if (this.type.globalType) {
-            const f = (0, global_schema_1.__getGlobalSchemaField)(this.type.globalType);
-            // list and global type is not valid.
-            if (f) {
-                if (f.valid) {
-                    if (JSON.stringify(this.type.listElemType) !==
-                        JSON.stringify(f?.type.listElemType)) {
-                        if (this.jsonAsList) {
-                            if (!Array.isArray(obj)) {
-                                return false;
-                            }
-                            // @ts-ignore
-                            const valid = await Promise.all(obj.map((v) => f.valid(v)));
-                            return valid.every((b) => b);
-                        }
-                        else {
-                            return f.valid([obj]);
-                        }
-                    }
-                    return f.valid(obj);
-                }
-                return true;
-            }
-            else {
-                (0, logger_1.log)("error", `globalType ${this.type.globalType} not found in global schema`);
-                return false;
-            }
-        }
-        if (this.jsonAsList) {
+        if (this.options.jsonAsList) {
             if (!Array.isArray(obj)) {
                 return false;
             }
@@ -191,7 +129,10 @@ function StructListType(options) {
 }
 exports.StructListType = StructListType;
 function StructTypeAsList(options) {
-    let result = new StructField(options, true);
+    let result = new StructField({
+        ...options,
+        jsonAsList: true,
+    });
     return Object.assign(result, options);
 }
 exports.StructTypeAsList = StructTypeAsList;

package/schema/union_field.d.ts

@@ -15,7 +15,7 @@ export declare class UnionField extends BaseField implements FieldOptions {
     type: Type;
     m: Map<Object, string>;
     constructor(options: UnionOptions);
-    format(obj: any): any;
+    format(obj: any): string | Object;
     private validField;
     valid(obj: any): Promise<boolean>;
 }

package/scripts/custom_compiler.js

@@ -229,7 +229,7 @@ class Compiler {
                     let relPath = checkPath(paths, text);
                     if (relPath) {
                         // update the node...
-                        return typescript_1.default.factory.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, typescript_1.default.factory.createStringLiteral(relPath), importNode.assertClause);
+                        return typescript_1.default.factory.updateImportDeclaration(importNode, importNode.modifiers, importNode.importClause, typescript_1.default.factory.createStringLiteral(relPath), importNode.assertClause);
                     }
                 }
                 if (node.kind === typescript_1.default.SyntaxKind.ExportDeclaration) {
@@ -239,7 +239,7 @@ class Compiler {
                         let relPath = checkPath(paths, text);
                         if (relPath) {
                             // update the node...
-                            return typescript_1.default.updateExportDeclaration(exportNode, exportNode.decorators, exportNode.modifiers, exportNode.exportClause, typescript_1.default.factory.createStringLiteral(relPath), exportNode.isTypeOnly);
+                            return typescript_1.default.factory.updateExportDeclaration(exportNode, exportNode.modifiers, exportNode.isTypeOnly, exportNode.exportClause, typescript_1.default.factory.createStringLiteral(relPath), exportNode.assertClause);
                         }
                     }
                 }

package/scripts/move_types.js

@@ -36,7 +36,10 @@ class GatherExportsInGeneratedTypes {
         this.names = [];
     }
     traverseChild(sourceFile, contents, file, node) {
-        const exported = node.modifiers?.filter((mod) => mod.getText(sourceFile) === "export");
+        const modifiers = typescript_1.default.canHaveModifiers(node)
+            ? typescript_1.default.getModifiers(node)
+            : undefined;
+        const exported = modifiers?.filter((mod) => mod.getText(sourceFile) === "export");
         if (exported?.length) {
             if (typescript_1.default.isEnumDeclaration(node) ||
                 typescript_1.default.isInterfaceDeclaration(node) ||

package/testutils/db_mock.js

@@ -263,10 +263,10 @@ class QueryRecorder {
         });
     }
 }
-exports.QueryRecorder = QueryRecorder;
 QueryRecorder.queries = [];
 QueryRecorder.ids = [];
 // we need pkeys when storing...
 QueryRecorder.data = new Map();
+exports.QueryRecorder = QueryRecorder;
 // TODO
 process.env.DB_CONNECTION_STRING = "INVALID DATABASE";

package/testutils/fake_comms.js

@@ -32,5 +32,5 @@ class FakeComms {
         this.sent = [];
     }
 }
-exports.FakeComms = FakeComms;
 FakeComms.sent = [];
+exports.FakeComms = FakeComms;

package/testutils/fake_log.js

@@ -21,12 +21,12 @@ class FakeLogger {
         this.logs = [];
     }
 }
-exports.FakeLogger = FakeLogger;
 // todo this is quick and ideal.
 // more ideal is capturing all console.logs
 // we do it in golang for example
 // and will need this for production launch anyways
 FakeLogger.logs = [];
+exports.FakeLogger = FakeLogger;
 // TODO instead of needing to add this manually
 // we need to build a way to add global observers (and maybe triggers)
 // to be run on every action/mutation

package/core/global_schema.d.ts

@@ -1,7 +0,0 @@
-import { Field, GlobalSchema } from "../schema/schema";
-export declare function setGlobalSchema(val: GlobalSchema): void;
-export declare function clearGlobalSchema(): void;
-export declare function __hasGlobalSchema(): boolean;
-export declare function __getGlobalSchema(): GlobalSchema | undefined;
-export declare function __getGlobalSchemaFields(): Map<string, Field>;
-export declare function __getGlobalSchemaField(type: string): Field | undefined;

package/core/global_schema.js

@@ -1,51 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.__getGlobalSchemaField = exports.__getGlobalSchemaFields = exports.__getGlobalSchema = exports.__hasGlobalSchema = exports.clearGlobalSchema = exports.setGlobalSchema = void 0;
-const schema_1 = require("../schema/schema");
-let globalSchema;
-let globalSchemaFields = new Map();
-function isGlobalSchemaField(f) {
-    switch (f.type.dbType) {
-        case schema_1.DBType.Enum:
-        case schema_1.DBType.StringEnum:
-        case schema_1.DBType.IntEnum:
-        case schema_1.DBType.JSON:
-        case schema_1.DBType.JSONB:
-            return true;
-    }
-    return false;
-}
-function setGlobalSchema(val) {
-    globalSchema = val;
-    if (val.fields) {
-        for (const [k, v] of Object.entries(val.fields)) {
-            if (isGlobalSchemaField(v) && v.type.type) {
-                globalSchemaFields.set(v.type.type, v);
-            }
-        }
-    }
-}
-exports.setGlobalSchema = setGlobalSchema;
-function clearGlobalSchema() {
-    globalSchema = undefined;
-    globalSchemaFields.clear();
-}
-exports.clearGlobalSchema = clearGlobalSchema;
-// used by tests. no guarantee will always exist
-function __hasGlobalSchema() {
-    return globalSchema !== undefined;
-}
-exports.__hasGlobalSchema = __hasGlobalSchema;
-// used by tests. no guarantee will always exist
-function __getGlobalSchema() {
-    return globalSchema;
-}
-exports.__getGlobalSchema = __getGlobalSchema;
-function __getGlobalSchemaFields() {
-    return globalSchemaFields;
-}
-exports.__getGlobalSchemaFields = __getGlobalSchemaFields;
-function __getGlobalSchemaField(type) {
-    return globalSchemaFields.get(type);
-}
-exports.__getGlobalSchemaField = __getGlobalSchemaField;