introspectron 2.13.15 → 2.13.17

package/esm/gql.js

@@ -156,7 +156,8 @@ export const parseGraphQuery = (introQuery) => {
         return m;
     }, {});
     const queries = queriesRoot.fields.reduce((m, query) => {
-        if (query.type.kind === 'OBJECT') {
+        const model = getObjectType(query.type);
+        if (model) {
             if (isConnectionQuery(query)) {
                 m[query.name] = parseConnectionQuery(context, query, 1);
             }
@@ -174,24 +175,59 @@ export const parseGraphQuery = (introQuery) => {
 function parseSelectionObject(context, model, nesting) {
     const { HASH } = context;
     throwIfInvalidContext(context);
-    const selectionFields = HASH[model].fields.filter((f) => !isPureObjectType(f.type));
-    return selectionFields.map((f) => {
-        if (f.type.ofType?.kind === 'OBJECT') {
+    const selectionFields = HASH[model].fields
+        .filter((f) => !isPureObjectType(f.type))
+        .filter((f) => {
+        const objectType = getObjectType(f.type);
+        if (objectType && fieldHasRequiredArgs(f))
+            return false;
+        return true;
+    });
+    const mapped = selectionFields.map((f) => {
+        const objectType = getObjectType(f.type);
+        if (objectType) {
             if (isConnectionQuery(f)) {
                 return { name: f.name, ...parseConnectionQuery(context, f, nesting - 1) };
             }
-            else {
-                return { name: f.name, ...parseSingleQuery(context, f, nesting - 1) };
+            if (isListType(f.type)) {
+                return { name: f.name, selection: parseSelectionScalar(context, objectType) };
             }
+            return { name: f.name, ...parseSingleQuery(context, f, nesting - 1) };
+        }
+        const baseKind = getBaseKind(f.type);
+        if (isListType(f.type)) {
+            if (baseKind === 'SCALAR' || baseKind === 'ENUM')
+                return f.name;
+            return null;
         }
+        if (baseKind === 'UNION' || baseKind === 'INTERFACE')
+            return null;
         return f.name;
     });
+    return mapped.filter((x) => x != null);
 }
 function parseSelectionScalar(context, model) {
     const { HASH } = context;
     throwIfInvalidContext(context);
-    const selectionFields = HASH[model].fields.filter((f) => !isPureObjectType(f.type) && !isConnectionQuery(f));
-    return selectionFields.map((f) => f.name);
+    const selectionFields = HASH[model].fields.filter((f) => {
+        if (isPureObjectType(f.type))
+            return false;
+        if (isConnectionQuery(f))
+            return false;
+        const objectType = getObjectType(f.type);
+        if (objectType)
+            return false;
+        const baseKind = getBaseKind(f.type);
+        if (isListType(f.type) && !(baseKind === 'SCALAR' || baseKind === 'ENUM'))
+            return false;
+        if (baseKind === 'UNION' || baseKind === 'INTERFACE')
+            return false;
+        return true;
+    });
+    const names = selectionFields.map((f) => f.name);
+    if (names.length === 0)
+        return ['__typename'];
+    return names;
 }
 function isConnectionQuery(query) {
     const objectType = getObjectType(query.type);
@@ -210,6 +246,27 @@ function getObjectType(type) {
         return getObjectType(type.ofType);
     return undefined;
 }
+function isListType(type) {
+    if (type.kind === 'LIST')
+        return true;
+    if (type.ofType)
+        return isListType(type.ofType);
+    return false;
+}
+function fieldHasRequiredArgs(field) {
+    for (const a of field.args) {
+        if (a.type && a.type.kind === 'NON_NULL' && (a.defaultValue === undefined || a.defaultValue === null)) {
+            return true;
+        }
+    }
+    return false;
+}
+function getBaseKind(type) {
+    let t = type;
+    while (t && t.ofType)
+        t = t.ofType;
+    return (t?.kind || type.kind);
+}
 function throwIfInvalidContext(context) {
     const { HASH, getInputForQueries } = context;
     if (!HASH || !getInputForQueries) {

package/gql.js

@@ -161,7 +161,8 @@ const parseGraphQuery = (introQuery) => {
         return m;
     }, {});
     const queries = queriesRoot.fields.reduce((m, query) => {
-        if (query.type.kind === 'OBJECT') {
+        const model = getObjectType(query.type);
+        if (model) {
             if (isConnectionQuery(query)) {
                 m[query.name] = (0, exports.parseConnectionQuery)(context, query, 1);
             }
@@ -180,24 +181,59 @@ exports.parseGraphQuery = parseGraphQuery;
 function parseSelectionObject(context, model, nesting) {
     const { HASH } = context;
     throwIfInvalidContext(context);
-    const selectionFields = HASH[model].fields.filter((f) => !isPureObjectType(f.type));
-    return selectionFields.map((f) => {
-        if (f.type.ofType?.kind === 'OBJECT') {
+    const selectionFields = HASH[model].fields
+        .filter((f) => !isPureObjectType(f.type))
+        .filter((f) => {
+        const objectType = getObjectType(f.type);
+        if (objectType && fieldHasRequiredArgs(f))
+            return false;
+        return true;
+    });
+    const mapped = selectionFields.map((f) => {
+        const objectType = getObjectType(f.type);
+        if (objectType) {
             if (isConnectionQuery(f)) {
                 return { name: f.name, ...(0, exports.parseConnectionQuery)(context, f, nesting - 1) };
             }
-            else {
-                return { name: f.name, ...(0, exports.parseSingleQuery)(context, f, nesting - 1) };
+            if (isListType(f.type)) {
+                return { name: f.name, selection: parseSelectionScalar(context, objectType) };
             }
+            return { name: f.name, ...(0, exports.parseSingleQuery)(context, f, nesting - 1) };
+        }
+        const baseKind = getBaseKind(f.type);
+        if (isListType(f.type)) {
+            if (baseKind === 'SCALAR' || baseKind === 'ENUM')
+                return f.name;
+            return null;
         }
+        if (baseKind === 'UNION' || baseKind === 'INTERFACE')
+            return null;
         return f.name;
     });
+    return mapped.filter((x) => x != null);
 }
 function parseSelectionScalar(context, model) {
     const { HASH } = context;
     throwIfInvalidContext(context);
-    const selectionFields = HASH[model].fields.filter((f) => !isPureObjectType(f.type) && !isConnectionQuery(f));
-    return selectionFields.map((f) => f.name);
+    const selectionFields = HASH[model].fields.filter((f) => {
+        if (isPureObjectType(f.type))
+            return false;
+        if (isConnectionQuery(f))
+            return false;
+        const objectType = getObjectType(f.type);
+        if (objectType)
+            return false;
+        const baseKind = getBaseKind(f.type);
+        if (isListType(f.type) && !(baseKind === 'SCALAR' || baseKind === 'ENUM'))
+            return false;
+        if (baseKind === 'UNION' || baseKind === 'INTERFACE')
+            return false;
+        return true;
+    });
+    const names = selectionFields.map((f) => f.name);
+    if (names.length === 0)
+        return ['__typename'];
+    return names;
 }
 function isConnectionQuery(query) {
     const objectType = getObjectType(query.type);
@@ -216,6 +252,27 @@ function getObjectType(type) {
         return getObjectType(type.ofType);
     return undefined;
 }
+function isListType(type) {
+    if (type.kind === 'LIST')
+        return true;
+    if (type.ofType)
+        return isListType(type.ofType);
+    return false;
+}
+function fieldHasRequiredArgs(field) {
+    for (const a of field.args) {
+        if (a.type && a.type.kind === 'NON_NULL' && (a.defaultValue === undefined || a.defaultValue === null)) {
+            return true;
+        }
+    }
+    return false;
+}
+function getBaseKind(type) {
+    let t = type;
+    while (t && t.ofType)
+        t = t.ofType;
+    return (t?.kind || type.kind);
+}
 function throwIfInvalidContext(context) {
     const { HASH, getInputForQueries } = context;
     if (!HASH || !getInputForQueries) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "introspectron",
-  "version": "2.13.15",
+  "version": "2.13.17",
   "description": "introspect your Postgres database and generate an SDK",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "main": "index.js",
@@ -31,9 +31,9 @@
   "devDependencies": {
     "@jest/test-sequencer": "^30.2.0",
     "@types/pg": "^8.15.2",
-    "launchql-test": "^2.8.12",
+    "launchql-test": "^2.8.14",
     "makage": "^0.1.8",
-    "pgsql-test": "^2.14.13"
+    "pgsql-test": "^2.14.14"
   },
   "dependencies": {
     "graphql": "15.10.1",
@@ -48,5 +48,5 @@
     "graphile",
     "launchql"
   ],
-  "gitHead": "658faf222c9ceebf76a78d764a283a5a38ccba4f"
+  "gitHead": "ea3f6b8d86ba521ee629411efb4cf4133cc6e302"
 }