@snowtop/ent 0.1.5 → 0.1.7-test8

package/core/clause.d.ts

@@ -115,6 +115,7 @@ export declare function JSONObjectFieldKeyASJSON<T extends Data, K = keyof T>(co
 export declare function JSONObjectFieldKeyAsText<T extends Data, K = keyof T>(col: K, field: string): keyof T;
 type predicate = "==" | ">" | "<" | "!=" | ">=" | "<=";
 export declare function JSONPathValuePredicate<T extends Data, K = keyof T>(dbCol: K, path: string, val: any, pred: predicate): Clause<T, K>;
+export declare function JSONKeyExists<T extends Data, K = keyof T>(dbCol: K, val: any): Clause<T, K>;
 export declare function PaginationMultipleColsSubQuery<T extends Data, K = keyof T>(col: K, op: string, tableName: string, uniqueCol: K, val: any): Clause<T, K>;
 export declare function Add<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;
 export declare function Subtract<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;

package/core/clause.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCombinedClause = exports.Modulo = exports.Divide = exports.Multiply = exports.Subtract = exports.Add = exports.PaginationMultipleColsSubQuery = exports.JSONPathValuePredicate = exports.JSONObjectFieldKeyAsText = exports.JSONObjectFieldKeyASJSON = exports.sensitiveValue = exports.TsVectorWebsearchToTsQuery = exports.TsVectorPhraseToTsQuery = exports.TsVectorPlainToTsQuery = exports.TsVectorColTsQuery = exports.WebsearchToTsQuery = exports.PhraseToTsQuery = exports.PlainToTsQuery = exports.TsQuery = exports.DBTypeNotIn = exports.TextNotIn = exports.IntegerNotIn = exports.UuidNotIn = exports.DBTypeIn = exports.TextIn = exports.IntegerIn = exports.UuidIn = exports.In = exports.OrOptional = exports.Or = exports.AndOptional = exports.And = exports.LessEq = exports.GreaterEq = exports.Less = exports.Greater = exports.NotEq = exports.Eq = exports.ArrayNotEq = exports.ArrayEq = exports.PostgresArrayNotOverlaps = exports.PostgresArrayOverlaps = exports.PostgresArrayNotContains = exports.PostgresArrayNotContainsValue = exports.PostgresArrayContains = exports.PostgresArrayContainsValue = exports.notInClause = exports.inClause = void 0;
+exports.getCombinedClause = exports.Modulo = exports.Divide = exports.Multiply = exports.Subtract = exports.Add = exports.PaginationMultipleColsSubQuery = exports.JSONKeyExists = exports.JSONPathValuePredicate = exports.JSONObjectFieldKeyAsText = exports.JSONObjectFieldKeyASJSON = exports.sensitiveValue = exports.TsVectorWebsearchToTsQuery = exports.TsVectorPhraseToTsQuery = exports.TsVectorPlainToTsQuery = exports.TsVectorColTsQuery = exports.WebsearchToTsQuery = exports.PhraseToTsQuery = exports.PlainToTsQuery = exports.TsQuery = exports.DBTypeNotIn = exports.TextNotIn = exports.IntegerNotIn = exports.UuidNotIn = exports.DBTypeIn = exports.TextIn = exports.IntegerIn = exports.UuidIn = exports.In = exports.OrOptional = exports.Or = exports.AndOptional = exports.And = exports.LessEq = exports.GreaterEq = exports.Less = exports.Greater = exports.NotEq = exports.Eq = exports.ArrayNotEq = exports.ArrayEq = exports.PostgresArrayNotOverlaps = exports.PostgresArrayOverlaps = exports.PostgresArrayNotContains = exports.PostgresArrayNotContainsValue = exports.PostgresArrayContains = exports.PostgresArrayContainsValue = exports.notInClause = exports.inClause = void 0;
 const db_1 = __importStar(require("./db"));
 function isSensitive(val) {
     return (val !== null &&
@@ -725,6 +725,10 @@ function JSONPathValuePredicate(dbCol, path, val, pred) {
     return new jSONPathValuePredicateClause(dbCol, path, val, pred);
 }
 exports.JSONPathValuePredicate = JSONPathValuePredicate;
+function JSONKeyExists(dbCol, val) {
+    return new simpleClause(dbCol, val, "?", new isNullClause(dbCol));
+}
+exports.JSONKeyExists = JSONKeyExists;
 // TODO need a better name for this lol
 // this assumes we're doing the same direction twice which isn't necessarily accurate in the future...
 class paginationMultipleColumnsSubQueryClause {

package/graphql/graphql.d.ts

@@ -1,4 +1,4 @@
-import { GraphQLScalarType } from "graphql";
+import { GraphQLEnumType, GraphQLScalarType } from "graphql";
 import type { FieldMap } from "../schema";
 import { ProcessedField as ParsedProcessedField } from "../parse_schema/parse";
 import { ImportPath } from "../schema/schema";
@@ -66,7 +66,7 @@ export interface CustomTypeInput {
 export type CustomType = Omit<CustomTypeInput, "structFields"> & {
     structFields?: ParsedProcessedField[];
 };
-type Type = GraphQLScalarType | ClassType | string | CustomTypeInput;
+type Type = GraphQLScalarType | GraphQLEnumType | ClassType | string | CustomTypeInput;
 export type GraphQLConnection<T> = {
     node: T;
 };

package/graphql/graphql.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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;
+const graphql_1 = require("graphql");
 const parse_1 = require("../parse_schema/parse");
 var CustomFieldType;
 (function (CustomFieldType) {
@@ -61,7 +62,10 @@ const isCustomType = (type) => {
 };
 exports.isCustomType = isCustomType;
 const isGraphQLScalarType = (type) => {
-    return type.serialize !== undefined;
+    return (0, graphql_1.isScalarType)(type);
+};
+const isGraphQLEnumType = (type) => {
+    return (0, graphql_1.isEnumType)(type);
 };
 const addCustomType = async (type, gqlCapture) => {
     // TODO these should return ReadOnly objects...
@@ -81,28 +85,30 @@ const addCustomType = async (type, gqlCapture) => {
     if (type.enumMap || type.structFields) {
         await addType(type);
     }
-    try {
-        const r = require(type.importPath);
-        const ct = r[type.type];
-        // this gets us the information needed for scalars
-        if (ct && isGraphQLScalarType(ct)) {
-            type.scalarInfo = {
-                description: ct.description,
-                name: ct.name,
-            };
-            if (ct.specifiedByURL) {
-                type.scalarInfo.specifiedByUrl = ct.specifiedByURL;
+    if (type.importPath) {
+        try {
+            const r = require(type.importPath);
+            const ct = r[type.type];
+            // this gets us the information needed for scalars
+            if (ct && isGraphQLScalarType(ct)) {
+                type.scalarInfo = {
+                    description: ct.description,
+                    name: ct.name,
+                };
+                if (ct.specifiedByURL) {
+                    type.scalarInfo.specifiedByUrl = ct.specifiedByURL;
+                }
             }
         }
-    }
-    catch (e) {
-        if (type.secondaryImportPath) {
-            (0, exports.addCustomType)({
-                ...type,
-                importPath: type.secondaryImportPath,
-            }, gqlCapture);
+        catch (e) {
+            if (type.secondaryImportPath) {
+                await (0, exports.addCustomType)({
+                    ...type,
+                    importPath: type.secondaryImportPath,
+                }, gqlCapture);
+            }
+            return;
         }
-        return;
     }
     if (customType) {
         if (JSON.stringify(customType) !== JSON.stringify(type)) {
@@ -138,8 +144,9 @@ const getType = (typ, result) => {
         (0, exports.addCustomType)(typ, GQLCapture);
         return;
     }
-    // GraphQLScalarType or ClassType
+    // GraphQLScalarType or GraphQLEnumType or ClassType
     result.scalarType = isGraphQLScalarType(typ);
+    result.enumType = isGraphQLEnumType(typ);
     result.type = typ.name;
     return;
 };
@@ -193,6 +200,10 @@ class GQLCapture {
         if (fd.nullable === undefined) {
             return res;
         }
+        if (fd.nullable === false) {
+            delete res.nullable;
+            return res;
+        }
         if (fd.nullable === "contents") {
             res.nullable = NullableResult.CONTENTS;
         }
@@ -234,11 +245,13 @@ class GQLCapture {
         let scalarType = false;
         let connection;
         let type = "";
+        let enumType = false;
         if (field?.type) {
             let r = { type: "" };
             getType(field.type, r);
             list = r.list;
             scalarType = r.scalarType || false;
+            enumType = r.enumType || false;
             connection = r.connection;
             type = r.type;
         }
@@ -260,9 +273,14 @@ class GQLCapture {
         };
         // unknown type. we need to flag that this field needs to eventually be resolved
         if (!exports.knownAllowedNames.has(type)) {
+            // we do this so that we know how to import them later
+            // would be nice not to need that. seems like we should be able to do it by checking the imports for the page
             if (scalarType) {
                 throw new Error(`custom scalar type ${type} is not supported this way. use CustomType syntax. see \`gqlFileUpload\` as an example`);
             }
+            if (enumType) {
+                throw new Error(`custom enum type ${type} is not supported this way. use CustomType syntax. see \`gqlFileUpload\` as an example`);
+            }
             result.needsResolving = true;
         }
         return result;
@@ -478,13 +496,12 @@ class GQLCapture {
                 }
             });
         });
-        // TODO this should be aware of knownCustomTypes
         const resolveFields = (fields) => {
             fields.forEach((field) => {
                 // we have a check earlier that *should* make this path impossible
                 field.args.forEach((arg) => {
                     if (arg.needsResolving) {
-                        if (baseArgs.has(arg.type)) {
+                        if (baseArgs.has(arg.type) || this.customTypes.has(arg.type)) {
                             arg.needsResolving = false;
                         }
                         else {
@@ -501,7 +518,8 @@ class GQLCapture {
                     if (result.needsResolving) {
                         if (baseObjects.has(result.type) ||
                             this.customUnions.has(result.type) ||
-                            this.customInterfaces.has(result.type)) {
+                            this.customInterfaces.has(result.type) ||
+                            this.customTypes.has(result.type)) {
                             result.needsResolving = false;
                         }
                         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.5",
+  "version": "0.1.7-test8",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",