@snowtop/ent 0.1.0-alpha127 → 0.1.0-alpha129

package/graphql/graphql.d.ts

@@ -37,6 +37,12 @@ export interface gqlObjectOptions {
     name?: string;
     description?: string;
 }
+export interface gqlObjectWithInterfaceOptions extends gqlObjectOptions {
+    interfaces?: string[];
+}
+export interface gqlObjectWithUnionOptions extends gqlObjectOptions {
+    unionTypes: string[];
+}
 type gqlMutationOptions = Omit<gqlFieldOptions, "nullable" | "type"> & {
     type?: gqlFieldOptionsBase["type"];
 };
@@ -77,6 +83,8 @@ export interface CustomObject {
     nodeName: string;
     className: string;
     description?: string;
+    interfaces?: string[];
+    unionTypes?: string[];
 }
 type NullableListOptions = "contents" | "contentsAndList";
 interface FieldImpl {
@@ -103,6 +111,7 @@ declare enum NullableResult {
 }
 export declare const knownAllowedNames: Map<string, string>;
 export declare const knownDisAllowedNames: Map<string, boolean>;
+export declare const knownInterfaces: Map<string, boolean>;
 export declare const isCustomType: (type: Type) => type is CustomType;
 export declare const addCustomType: (type: CustomType, gqlCapture: typeof GQLCapture) => void;
 export declare class GQLCapture {
@@ -115,6 +124,8 @@ export declare class GQLCapture {
     private static customArgs;
     private static customInputObjects;
     private static customObjects;
+    private static customInterfaces;
+    private static customUnions;
     private static customTypes;
     static clear(): void;
     static getCustomFields(): Map<string, CustomField[]>;
@@ -123,6 +134,8 @@ export declare class GQLCapture {
     static getCustomArgs(): Map<string, CustomObject>;
     static getCustomInputObjects(): Map<string, CustomObject>;
     static getCustomObjects(): Map<string, CustomObject>;
+    static getCustomInterfaces(): Map<string, CustomObject>;
+    static getCustomUnions(): Map<string, CustomObject>;
     static getCustomTypes(): Map<string, CustomType>;
     private static getNullableArg;
     static getProcessedCustomFields(): ProcessCustomFieldMap;
@@ -135,7 +148,9 @@ export declare class GQLCapture {
     static gqlContextType(): gqlFieldArg;
     static gqlArgType(options?: gqlObjectOptions): any;
     static gqlInputObjectType(options?: gqlObjectOptions): any;
-    static gqlObjectType(options?: gqlObjectOptions): any;
+    static gqlObjectType(options?: gqlObjectWithInterfaceOptions): any;
+    static gqlUnionType(options: gqlObjectWithUnionOptions): any;
+    static gqlInterfaceType(options?: gqlObjectOptions): any;
     private static customGQLObject;
     static gqlQuery(options: gqlQueryOptions): any;
     static gqlMutation(options: gqlMutationOptions): any;
@@ -146,6 +161,8 @@ export declare const gqlField: typeof GQLCapture.gqlField;
 export declare const gqlArgType: typeof GQLCapture.gqlArgType;
 export declare const gqlInputObjectType: typeof GQLCapture.gqlInputObjectType;
 export declare const gqlObjectType: typeof GQLCapture.gqlObjectType;
+export declare const gqlInterfaceType: typeof GQLCapture.gqlInterfaceType;
+export declare const gqlUnionType: typeof GQLCapture.gqlUnionType;
 export declare const gqlQuery: typeof GQLCapture.gqlQuery;
 export declare const gqlMutation: typeof GQLCapture.gqlMutation;
 export declare const gqlContextType: typeof GQLCapture.gqlContextType;

package/graphql/graphql.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gqlFileUpload = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlField = exports.GQLCapture = exports.addCustomType = exports.isCustomType = exports.knownDisAllowedNames = exports.knownAllowedNames = exports.CustomFieldType = void 0;
+exports.gqlFileUpload = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlUnionType = exports.gqlInterfaceType = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlField = exports.GQLCapture = exports.addCustomType = exports.isCustomType = exports.knownInterfaces = exports.knownDisAllowedNames = exports.knownAllowedNames = exports.CustomFieldType = void 0;
 var CustomFieldType;
 (function (CustomFieldType) {
     CustomFieldType["Accessor"] = "ACCESSOR";
@@ -24,6 +24,7 @@ exports.knownAllowedNames = new Map([
     ["Float", "number"],
     ["ID", "ID"],
     ["JSON", "any"],
+    ["Node", "Ent"],
 ]);
 exports.knownDisAllowedNames = new Map([
     ["Function", true],
@@ -31,6 +32,11 @@ exports.knownDisAllowedNames = new Map([
     ["Array", true],
     ["Promise", true],
 ]);
+exports.knownInterfaces = new Map([
+    ["Node", true],
+    ["Edge", true],
+    ["Connection", true],
+]);
 const isArray = (type) => {
     if (typeof type === "function") {
         return false;
@@ -143,6 +149,8 @@ class GQLCapture {
         this.customArgs.clear();
         this.customInputObjects.clear();
         this.customObjects.clear();
+        this.customInterfaces.clear();
+        this.customUnions.clear();
         this.customTypes.clear();
     }
     static getCustomFields() {
@@ -163,6 +171,12 @@ class GQLCapture {
     static getCustomObjects() {
         return this.customObjects;
     }
+    static getCustomInterfaces() {
+        return this.customInterfaces;
+    }
+    static getCustomUnions() {
+        return this.customUnions;
+    }
     static getCustomTypes() {
         return this.customTypes;
     }
@@ -348,6 +362,16 @@ class GQLCapture {
             return GQLCapture.customGQLObject(ctx, GQLCapture.customObjects, options);
         };
     }
+    static gqlUnionType(options) {
+        return function (target, ctx) {
+            return GQLCapture.customGQLObject(ctx, GQLCapture.customUnions, options);
+        };
+    }
+    static gqlInterfaceType(options) {
+        return function (target, ctx) {
+            return GQLCapture.customGQLObject(ctx, GQLCapture.customInterfaces, options);
+        };
+    }
     static customGQLObject(ctx, map, options) {
         if (!GQLCapture.isEnabled() || ctx.kind !== "class" || !ctx.name) {
             return;
@@ -358,6 +382,10 @@ class GQLCapture {
             className,
             nodeName,
             description: options?.description,
+            // @ts-ignore
+            interfaces: options?.interfaces,
+            // @ts-ignore
+            unionTypes: options?.unionTypes,
         });
     }
     // we want to specify args if any, name, response if any
@@ -384,13 +412,47 @@ class GQLCapture {
     }
     static resolve(objects) {
         let baseObjects = new Map();
-        objects.map((object) => baseObjects.set(object, true));
-        this.customObjects.forEach((_val, key) => baseObjects.set(key, true));
+        objects.forEach((object) => baseObjects.set(object, true));
+        this.customObjects.forEach((obj, key) => {
+            baseObjects.set(key, true);
+            obj.interfaces?.forEach((interfaceName) => {
+                const inter = this.customInterfaces.get(interfaceName);
+                if (inter) {
+                    const fields = this.customFields.get(inter.nodeName);
+                    if (fields) {
+                        let objFields = this.customFields.get(obj.nodeName);
+                        if (!objFields) {
+                            objFields = [];
+                        }
+                        for (const field of fields) {
+                            objFields.push({
+                                ...field,
+                                nodeName: obj.nodeName,
+                            });
+                        }
+                        this.customFields.set(obj.nodeName, objFields);
+                    }
+                }
+                else if (!exports.knownInterfaces.has(interfaceName)) {
+                    throw new Error(`object ${key} references unknown interface ${interfaceName}`);
+                }
+            });
+        });
         let baseArgs = new Map();
         this.customArgs.forEach((_val, key) => baseArgs.set(key, true));
         this.customInputObjects.forEach((_val, key) => baseArgs.set(key, true));
         baseArgs.set("Context", true);
         this.customTypes.forEach((_val, key) => baseArgs.set(key, true));
+        this.customUnions.forEach((val, key) => {
+            if (this.customFields.has(key)) {
+                throw new Error(`union ${key} has custom fields which is not allowed`);
+            }
+            val.unionTypes?.forEach((typ) => {
+                if (!baseObjects.has(typ)) {
+                    throw new Error(`union ${key} references ${typ} which isn't a graphql object`);
+                }
+            });
+        });
         // TODO this should be aware of knownCustomTypes
         const resolveFields = (fields) => {
             fields.forEach((field) => {
@@ -412,7 +474,9 @@ class GQLCapture {
                 // but i don't think it applies
                 field.results.forEach((result) => {
                     if (result.needsResolving) {
-                        if (baseObjects.has(result.type)) {
+                        if (baseObjects.has(result.type) ||
+                            this.customUnions.has(result.type) ||
+                            this.customInterfaces.has(result.type)) {
                             result.needsResolving = false;
                         }
                         else {
@@ -435,6 +499,8 @@ GQLCapture.customMutations = [];
 GQLCapture.customArgs = new Map();
 GQLCapture.customInputObjects = new Map();
 GQLCapture.customObjects = new Map();
+GQLCapture.customInterfaces = new Map();
+GQLCapture.customUnions = new Map();
 GQLCapture.customTypes = new Map();
 exports.GQLCapture = GQLCapture;
 // why is this a static class lol?
@@ -443,6 +509,8 @@ exports.gqlField = GQLCapture.gqlField;
 exports.gqlArgType = GQLCapture.gqlArgType;
 exports.gqlInputObjectType = GQLCapture.gqlInputObjectType;
 exports.gqlObjectType = GQLCapture.gqlObjectType;
+exports.gqlInterfaceType = GQLCapture.gqlInterfaceType;
+exports.gqlUnionType = GQLCapture.gqlUnionType;
 exports.gqlQuery = GQLCapture.gqlQuery;
 exports.gqlMutation = GQLCapture.gqlMutation;
 exports.gqlContextType = GQLCapture.gqlContextType;

package/graphql/graphql_field_helpers.d.ts

@@ -8,12 +8,16 @@ export declare function validateNoCustomFields(): void;
 export declare function validateCustomArgs(expected: CustomObject[]): void;
 export declare function validateCustomInputObjects(expected: CustomObject[]): void;
 export declare function validateCustomObjects(expected: CustomObject[]): void;
+export declare function validateCustomInterfaces(expected: CustomObject[]): void;
+export declare function validateCustomUnions(expected: CustomObject[]): void;
 export declare function validateNoCustomArgs(): void;
 export declare function validateNoCustomQueries(): void;
 export declare function validateNoCustomMutations(): void;
 export declare function validateNoCustomInputObjects(): void;
 export declare function validateNoCustomObjects(): void;
 export declare function validateNoCustomTypes(): void;
+export declare function validateNoCustomInterfaces(): void;
+export declare function validateNoCustomUnions(): void;
 export declare enum CustomObjectTypes {
     Field = 1,
     Arg = 2,
@@ -21,7 +25,9 @@ export declare enum CustomObjectTypes {
     InputObject = 8,
     Query = 16,
     Mutation = 32,
-    CustomTypes = 64
+    CustomTypes = 64,
+    Interface = 128,
+    Union = 256
 }
 export declare function validateNoCustom(...exceptions: number[]): void;
 export declare function validateCustomTypes(expected: CustomType[]): void;

package/graphql/graphql_field_helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateCustomTypes = exports.validateNoCustom = exports.CustomObjectTypes = exports.validateNoCustomTypes = exports.validateNoCustomObjects = exports.validateNoCustomInputObjects = exports.validateNoCustomMutations = exports.validateNoCustomQueries = exports.validateNoCustomArgs = exports.validateCustomObjects = exports.validateCustomInputObjects = exports.validateCustomArgs = exports.validateNoCustomFields = exports.validateFields = exports.validateCustomQueries = exports.validateCustomMutations = exports.validateCustomFields = exports.validateOneCustomField = void 0;
+exports.validateCustomTypes = exports.validateNoCustom = exports.CustomObjectTypes = exports.validateNoCustomUnions = exports.validateNoCustomInterfaces = exports.validateNoCustomTypes = exports.validateNoCustomObjects = exports.validateNoCustomInputObjects = exports.validateNoCustomMutations = exports.validateNoCustomQueries = exports.validateNoCustomArgs = exports.validateCustomUnions = exports.validateCustomInterfaces = exports.validateCustomObjects = exports.validateCustomInputObjects = exports.validateCustomArgs = exports.validateNoCustomFields = exports.validateFields = exports.validateCustomQueries = exports.validateCustomMutations = exports.validateCustomFields = exports.validateOneCustomField = void 0;
 const graphql_1 = require("./graphql");
 function validateOneCustomField(expected) {
     let customFields = graphql_1.GQLCapture.getCustomFields();
@@ -101,6 +101,14 @@ function validateCustomObjects(expected) {
     validateCustom(expected, graphql_1.GQLCapture.getCustomObjects());
 }
 exports.validateCustomObjects = validateCustomObjects;
+function validateCustomInterfaces(expected) {
+    validateCustom(expected, graphql_1.GQLCapture.getCustomInterfaces());
+}
+exports.validateCustomInterfaces = validateCustomInterfaces;
+function validateCustomUnions(expected) {
+    validateCustom(expected, graphql_1.GQLCapture.getCustomUnions());
+}
+exports.validateCustomUnions = validateCustomUnions;
 function validateNoCustomArgs() {
     expect(graphql_1.GQLCapture.getCustomArgs().size).toBe(0);
 }
@@ -125,6 +133,14 @@ function validateNoCustomTypes() {
     expect(graphql_1.GQLCapture.getCustomTypes().size).toBe(0);
 }
 exports.validateNoCustomTypes = validateNoCustomTypes;
+function validateNoCustomInterfaces() {
+    expect(graphql_1.GQLCapture.getCustomInterfaces().size).toBe(0);
+}
+exports.validateNoCustomInterfaces = validateNoCustomInterfaces;
+function validateNoCustomUnions() {
+    expect(graphql_1.GQLCapture.getCustomUnions().size).toBe(0);
+}
+exports.validateNoCustomUnions = validateNoCustomUnions;
 var CustomObjectTypes;
 (function (CustomObjectTypes) {
     CustomObjectTypes[CustomObjectTypes["Field"] = 1] = "Field";
@@ -134,6 +150,8 @@ var CustomObjectTypes;
     CustomObjectTypes[CustomObjectTypes["Query"] = 16] = "Query";
     CustomObjectTypes[CustomObjectTypes["Mutation"] = 32] = "Mutation";
     CustomObjectTypes[CustomObjectTypes["CustomTypes"] = 64] = "CustomTypes";
+    CustomObjectTypes[CustomObjectTypes["Interface"] = 128] = "Interface";
+    CustomObjectTypes[CustomObjectTypes["Union"] = 256] = "Union";
 })(CustomObjectTypes = exports.CustomObjectTypes || (exports.CustomObjectTypes = {}));
 // TODO what's a good name for this instead
 function validateNoCustom(...exceptions) {
@@ -151,6 +169,8 @@ function validateNoCustom(...exceptions) {
     validate(CustomObjectTypes.Mutation, validateNoCustomMutations);
     validate(CustomObjectTypes.InputObject, validateNoCustomInputObjects);
     validate(CustomObjectTypes.CustomTypes, validateNoCustomTypes);
+    validate(CustomObjectTypes.Interface, validateNoCustomInterfaces);
+    validate(CustomObjectTypes.Union, validateNoCustomUnions);
 }
 exports.validateNoCustom = validateNoCustom;
 function validateCustomTypes(expected) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha127",
+  "version": "0.1.0-alpha129",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",

package/parse_schema/parse.js

@@ -22,7 +22,7 @@ async function processFields(src, patternName) {
     for (const name in m) {
         const field = m[name];
         //@ts-ignore type and other changed fields with different type in ProcessedField vs Field
-        let f = { name, ...field };
+        let f = { ...field, name };
         f.hasDefaultValueOnCreate = field.defaultValueOnCreate != undefined;
         f.hasDefaultValueOnEdit = field.defaultValueOnEdit != undefined;
         f.hasFieldPrivacy = field.privacyPolicy !== undefined;

package/scripts/custom_graphql.js

@@ -375,6 +375,8 @@ async function main() {
     let queries = gqlCapture.getProcessedCustomQueries();
     let mutations = gqlCapture.getProcessedCustomMutations();
     let objects = fromMap(gqlCapture.getCustomObjects());
+    let interfaces = fromMap(gqlCapture.getCustomInterfaces());
+    let unions = fromMap(gqlCapture.getCustomUnions());
     let customTypes = fromMap(gqlCapture.getCustomTypes());
     let classes = {};
     let allFiles = {};
@@ -437,6 +439,8 @@ async function main() {
         mutations,
         classes,
         objects,
+        interfaces,
+        unions,
         files: allFiles,
         customTypes,
     }));