@takeshape/schema 11.122.2 → 11.123.2

package/dist/index.d.ts

@@ -52,6 +52,7 @@ export * from './util/is-asset-property.ts';
 export * from './util/mcp.ts';
 export * from './util/merge.ts';
 export * from './util/patch-schema.ts';
+export * from './util/query-field-path.ts';
 export * from './util/shapes.ts';
 export * from './validate/errors.ts';
 export * from './validate/validate.ts';

package/dist/index.js

@@ -49,6 +49,7 @@ export * from "./util/is-asset-property.js";
 export * from "./util/mcp.js";
 export * from "./util/merge.js";
 export * from "./util/patch-schema.js";
+export * from "./util/query-field-path.js";
 export * from "./util/shapes.js";
 export * from "./validate/errors.js";
 export * from "./validate/validate.js";

package/dist/util/find-shape-at-path.d.ts

@@ -8,7 +8,7 @@ import type { ProjectSchemaJSON, PropertySchema, ShapeJSON } from '../project-sc
  * @example
  * findShapeAtPath(projectSchema, projectSchema.shapes.Shopify_ProductConnection.shape, ['edges', 'node']) // finds {'@ref': Shopify_Product}
  */
-export declare function findSchemaAtPath(projectSchema: ProjectSchemaJSON, schema: PropertySchema, queryPath: string[]): PropertySchema | undefined;
+export declare function findSchemaAtPath(projectSchema: Pick<ProjectSchemaJSON, 'services' | 'shapes'>, schema: PropertySchema, queryPath: string[]): PropertySchema | undefined;
 /**
  *
  * @param projectSchema
@@ -18,4 +18,4 @@ export declare function findSchemaAtPath(projectSchema: ProjectSchemaJSON, schem
  * @example
  * findShapeAtPath(projectSchema, projectSchema.shapes.Shopify_ProductConnection.shape, ['edges', 'node']) // finds Shopify_Product
  */
-export declare function findShapeAtPath(projectSchema: ProjectSchemaJSON, propSchema: PropertySchema, queryPath: string[]): ShapeJSON | undefined;
+export declare function findShapeAtPath(projectSchema: Pick<ProjectSchemaJSON, 'services' | 'shapes'>, propSchema: PropertySchema, queryPath: string[]): ShapeJSON | undefined;

package/dist/util/get-return-shape.d.ts

@@ -1,4 +1,4 @@
 import type { ProjectSchemaJSON, PropertySchema, QueryJSON, ShapeJSON } from '../project-schema/index.ts';
 import { type ServicesShapesContext } from '../refs.ts';
 export declare function getReturnShapeRef(context: ServicesShapesContext, propOrQuery: PropertySchema | QueryJSON): import("@takeshape/util").Maybe<import("../refs.ts").RefItem>;
-export declare function getReturnShape(projectSchema: ProjectSchemaJSON, propOrQuery: PropertySchema | QueryJSON): ShapeJSON | undefined;
+export declare function getReturnShape(projectSchema: Pick<ProjectSchemaJSON, 'services' | 'shapes'>, propOrQuery: PropertySchema | QueryJSON): ShapeJSON | undefined;

package/dist/util/has-arg.d.ts

@@ -1,5 +1,6 @@
 import type { Args, ObjectSchema, ProjectSchemaJSON } from '../project-schema/index.ts';
+import { type ServicesShapesContext } from '../refs.ts';
 import { type SchemaWithArgs } from '../types/index.ts';
 export declare function getArgs(prop: SchemaWithArgs): Args | undefined;
-export declare function getArgsSchema(projectSchema: ProjectSchemaJSON, args: Args): ObjectSchema | undefined;
+export declare function getArgsSchema(projectSchema: ServicesShapesContext, args: Args): ObjectSchema | undefined;
 export declare function hasArg(projectSchema: ProjectSchemaJSON, prop: SchemaWithArgs, argPath: string | string[]): boolean;

package/dist/util/query-field-path.d.ts

@@ -0,0 +1,9 @@
+import type { ProjectSchemaJSON } from '../project-schema/index.ts';
+export declare function getQueryFieldPath(operation: 'query' | 'mutation', fieldName: string): ['queries' | 'mutations', ...string[]];
+/**
+ * Get a query or property schema
+ * @param schema
+ * @param queryFieldPath
+ * @returns
+ */
+export declare function findSchemaAtQueryFieldPath(schema: Pick<ProjectSchemaJSON, 'queries' | 'mutations' | 'services' | 'shapes'>, queryFieldPath: ReturnType<typeof getQueryFieldPath>): import("../project-schema/latest.ts").PropertySchema | undefined;

package/dist/util/query-field-path.js

@@ -0,0 +1,23 @@
+import { findSchemaAtPath } from "./find-shape-at-path.js";
+import { getReturnShape } from "./get-return-shape.js";
+function parseFieldName(fieldName) {
+    return fieldName.split('.');
+}
+export function getQueryFieldPath(operation, fieldName) {
+    return [operation === 'query' ? 'queries' : 'mutations', ...parseFieldName(fieldName)];
+}
+/**
+ * Get a query or property schema
+ * @param schema
+ * @param queryFieldPath
+ * @returns
+ */
+export function findSchemaAtQueryFieldPath(schema, queryFieldPath) {
+    const [operationName, queryName, ...fieldPath] = queryFieldPath;
+    const queryOrMutation = schema[operationName]?.[queryName];
+    if (!queryOrMutation) {
+        return undefined;
+    }
+    const shape = getReturnShape(schema, queryOrMutation);
+    return shape ? findSchemaAtPath(schema, shape.schema, fieldPath) : undefined;
+}

package/dist/validate/validate.d.ts

@@ -37,7 +37,9 @@ export type ValidateContext = {
     generatedApi?: Pick<ProjectSchemaJSON, 'queries' | 'mutations'>;
     structureOnly?: boolean;
 } & EntitlementsOptions & ValidateSyntaxOptions;
-export type ValidateReferencesContext = SetRequired<ValidateContext, 'resolveLayer'>;
+export type ValidateReferencesContext = SetRequired<ValidateContext, 'resolveLayer'> & {
+    projectSchema: ProjectSchemaJSON;
+};
 export declare function validateSchemaSyntax(obj: unknown, options?: ValidateSyntaxOptions): SchemaValidationResult;
 /**
  * Validates a schema using a matching validation based on the `schemaVersion` property.

package/dist/validate/validate.js

@@ -31,6 +31,7 @@ import { legacyProjectSchemaImportOptionalProps, projectSchemaImportOptionalProp
 import { isAIResolver, isBasicResolver, isComposeResolver, isExtendsSchema, isObjectSchema } from "../types/utils.js";
 import { isUnionSchema } from "../unions.js";
 import { getMcpToolMap, TOOL_SCHEMA_PATH } from '../util/mcp.js';
+import { findSchemaAtQueryFieldPath, getQueryFieldPath } from "../util/query-field-path.js";
 import { getShape } from "../util/shapes.js";
 import { CURRENT_SCHEMA_VERSION, LEGACY_API_VERSION, LEGACY_SCHEMA_VERSION } from "../versions.js";
 import { defaultWorkflow } from "../workflows.js";
@@ -331,17 +332,18 @@ async function validateResolverReferences(context, basePath, baseResolver) {
     await pMap(enumerateBasicResolvers(baseResolver, basePath), async ([resolver, path]) => {
         if (resolver.name === 'graphql:query' || resolver.name === 'graphql:mutation') {
             const { service, fieldName } = resolver;
-            const prop = resolver.name === 'graphql:query' ? 'queries' : 'mutations';
+            const operationProp = resolver.name === 'graphql:query' ? 'query' : 'mutation';
+            const { projectSchema: { services } } = context;
             const layerState = await context.resolveLayer(service);
-            const valid = layerState.status === 'ok'
-                ? Boolean(layerState.schema[prop][fieldName])
+            const { schema: layerSchema, status: layerStatus } = layerState;
+            const valid = layerStatus === 'ok'
+                ? Boolean(findSchemaAtQueryFieldPath({ ...layerSchema, services }, getQueryFieldPath(operationProp, fieldName)))
                 : allowDisconnected(context, layerState.status);
             if (!valid) {
-                const operation = resolver.name === 'graphql:query' ? 'query' : 'mutation';
                 errors.push({
                     type: 'notFound',
                     path: path.concat('fieldName'),
-                    message: `Missing ${operation} "${resolver.fieldName}" in service layer "${service}"`
+                    message: `Missing ${operationProp} "${resolver.fieldName}" in service layer "${service}"`
                 });
             }
         }
@@ -956,10 +958,14 @@ export async function validateSchema(context, obj) {
         return invalidVersionResult;
     }
     const syntaxValidation = validateSyntax(contextWithDefaults, schema);
-    if (!syntaxValidation.valid || !isValidateReferencesContext(contextWithDefaults)) {
+    const validateReferencesContext = {
+        ...contextWithDefaults,
+        projectSchema: schema
+    };
+    if (!syntaxValidation.valid || !isValidateReferencesContext(validateReferencesContext)) {
         return syntaxValidation;
     }
-    return validateReferences(contextWithDefaults, schema);
+    return validateReferences(validateReferencesContext, schema);
 }
 export function ensureValidLatestSchemaSyntax(obj) {
     const { valid, schema, errors } = validateSchemaSyntax(obj);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "11.122.2",
+  "version": "11.123.2",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -56,9 +56,9 @@
     "p-reduce": "2.1.0",
     "semver": "7.7.2",
     "tiny-invariant": "1.3.3",
-    "@takeshape/errors": "11.122.2",
-    "@takeshape/util": "11.122.2",
-    "@takeshape/json-schema": "11.122.2"
+    "@takeshape/errors": "11.123.2",
+    "@takeshape/json-schema": "11.123.2",
+    "@takeshape/util": "11.123.2"
   },
   "devDependencies": {
     "@takeshape/json-schema-to-typescript": "11.0.0",
@@ -75,8 +75,8 @@
     "glob": "7.2.3",
     "json-schema-to-ts": "3.1.1",
     "shortid": "2.2.16",
-    "@takeshape/infra": "11.122.2",
-    "@takeshape/logger": "11.122.2"
+    "@takeshape/infra": "11.123.2",
+    "@takeshape/logger": "11.123.2"
   },
   "engines": {
     "node": ">=22"