@takeshape/schema 11.2.0 → 11.3.1

package/es/schemas/project-schema/v4.0.0.json

@@ -294,10 +294,11 @@
       "title": "Query Map",
       "type": "object",
       "patternProperties": {
-        "[0-9A-Za-z_-]+": {
+        "^[0-9A-Za-z_]+$": {
           "$ref": "#/definitions/query"
         }
-      }
+      },
+      "additionalProperties": false
     },
     "args": {
       "title": "Args",
@@ -1522,10 +1523,11 @@
       "title": "Shape Map",
       "type": "object",
       "patternProperties": {
-        "[0-9A-Za-z_-]+": {
+        "^[0-9A-Za-z_]+$": {
           "$ref": "#/definitions/shape"
         }
-      }
+      },
+      "additionalProperties": false
     },
     "formMap": {
       "title": "Form Map",

package/es/types/utils.js

@@ -53,7 +53,7 @@ export const aiResolverNames = ['ai:generateText', 'ai:chat'];
 export function isAIResolverName(name) {
   return name ? aiResolverNames.includes(name) : false;
 }
-export function isAIGenerateTextResolver(resolver) {
+export function isAIResolver(resolver) {
   return isBasicResolver(resolver) && isAIResolverName(resolver.name);
 }
 export function isProjectSchemaWithServices(schema) {

package/es/validate.js

@@ -22,7 +22,7 @@ import authSchemas from './schemas/auth-schemas.json';
 import { getAllRefs, getShape } from './schema-util';
 import { builtInShapes } from './builtin-schema';
 import { isValidTemplate } from './template-shapes';
-import { isAIGenerateTextResolver, isBasicResolver, isComposeResolver, isExtendsSchema, isObjectSchema } from './types/utils';
+import { isAIResolver, isBasicResolver, isComposeResolver, isExtendsSchema, isObjectSchema } from './types/utils';
 import { refItemToNamespacedShapeName, getRefShapeName, parsePropertyRef, propertyRefItemToResolverPath, createGetNamespace, propertyRefItemToPath, atRefToRefItem, refItemToShape, refItemToAtRef } from './refs';
 import { scalars } from './scalars';
 import { isUnionSchema } from './unions';
@@ -145,7 +145,9 @@ function validateResolver(projectSchema, basePath, baseResolver) {
     if (!shapeName) {
       return false;
     }
-    const shape = getShape(projectSchema, shapeName);
+    const shape = getShape(projectSchema, shapeName) ?? getShape({
+      shapes: builtInShapes
+    }, shapeName);
     if (shape?.model) {
       return true;
     }
@@ -280,7 +282,7 @@ function validateResolver(projectSchema, basePath, baseResolver) {
       }
       if (resolver.name === 'delegate') {
         pushErrors(errors, validateDeletgateResolver(resolver, path));
-      } else if (isAIGenerateTextResolver(resolver)) {
+      } else if (isAIResolver(resolver)) {
         validateAIGenerateTextResolver(resolver, path);
       }
     } else {
@@ -352,7 +354,7 @@ async function validateResolverReferences(context, projectSchema, basePath, base
           message: `Missing resolver config at property ref "${resolver.to}"`
         });
       }
-    } else if (isAIGenerateTextResolver(resolver)) {
+    } else if (isAIResolver(resolver)) {
       if (resolver.tools) {
         await pMap(resolver.tools, async (tool, i) => {
           const toolRef = getToolRef(tool);

package/examples/latest/layers/rick-and-morty-layer.json

@@ -0,0 +1,576 @@
+{
+  "shapes": {
+    "Rick_Character": {
+      "name": "Rick_Character",
+      "title": "Rick_Character",
+      "id": "Rick_Character",
+      "description": "",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "@tag": "id",
+            "@mapping": "rick:Character.id",
+            "description": "The id of the character."
+          },
+          "name": {
+            "type": "string",
+            "@mapping": "rick:Character.name",
+            "description": "The name of the character."
+          },
+          "status": {
+            "type": "string",
+            "@mapping": "rick:Character.status",
+            "description": "The status of the character ('Alive', 'Dead' or 'unknown')."
+          },
+          "species": {
+            "type": "string",
+            "@mapping": "rick:Character.species",
+            "description": "The species of the character."
+          },
+          "type": {
+            "type": "string",
+            "@mapping": "rick:Character.type",
+            "description": "The type or subspecies of the character."
+          },
+          "gender": {
+            "type": "string",
+            "@mapping": "rick:Character.gender",
+            "description": "The gender of the character ('Female', 'Male', 'Genderless' or 'unknown')."
+          },
+          "origin": {
+            "@ref": "rick:Location",
+            "@mapping": "rick:Character.origin",
+            "description": "The character's origin location"
+          },
+          "location": {
+            "@ref": "rick:Location",
+            "@mapping": "rick:Character.location",
+            "description": "The character's last known location"
+          },
+          "image": {
+            "type": "string",
+            "@mapping": "rick:Character.image",
+            "description": "Link to the character's image.\nAll images are 300x300px and most are medium shots or portraits since they are intended to be used as avatars."
+          },
+          "episode": {
+            "type": "array",
+            "items": {
+              "@ref": "rick:Episode"
+            },
+            "@mapping": "rick:Character.episode",
+            "description": "Episodes in which this character appeared."
+          },
+          "created": {
+            "type": "string",
+            "@mapping": "rick:Character.created",
+            "description": "Time at which the character was created in the database."
+          }
+        },
+        "required": [
+          "episode"
+        ]
+      }
+    },
+    "Rick_Location": {
+      "name": "Rick_Location",
+      "title": "Rick_Location",
+      "id": "Rick_Location",
+      "description": "",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "@tag": "id",
+            "@mapping": "rick:Location.id",
+            "description": "The id of the location."
+          },
+          "name": {
+            "type": "string",
+            "@mapping": "rick:Location.name",
+            "description": "The name of the location."
+          },
+          "type": {
+            "type": "string",
+            "@mapping": "rick:Location.type",
+            "description": "The type of the location."
+          },
+          "dimension": {
+            "type": "string",
+            "@mapping": "rick:Location.dimension",
+            "description": "The dimension in which the location is located."
+          },
+          "residents": {
+            "type": "array",
+            "items": {
+              "@ref": "rick:Character"
+            },
+            "@mapping": "rick:Location.residents",
+            "description": "List of characters who have been last seen in the location."
+          },
+          "created": {
+            "type": "string",
+            "@mapping": "rick:Location.created",
+            "description": "Time at which the location was created in the database."
+          }
+        },
+        "required": [
+          "residents"
+        ]
+      }
+    },
+    "Rick_Episode": {
+      "name": "Rick_Episode",
+      "title": "Rick_Episode",
+      "id": "Rick_Episode",
+      "description": "",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "@tag": "id",
+            "@mapping": "rick:Episode.id",
+            "description": "The id of the episode."
+          },
+          "name": {
+            "type": "string",
+            "@mapping": "rick:Episode.name",
+            "description": "The name of the episode."
+          },
+          "air_date": {
+            "type": "string",
+            "@mapping": "rick:Episode.air_date",
+            "description": "The air date of the episode."
+          },
+          "episode": {
+            "type": "string",
+            "@mapping": "rick:Episode.episode",
+            "description": "The code of the episode."
+          },
+          "characters": {
+            "type": "array",
+            "items": {
+              "@ref": "rick:Character"
+            },
+            "@mapping": "rick:Episode.characters",
+            "description": "List of characters who have been seen in the episode."
+          },
+          "created": {
+            "type": "string",
+            "@mapping": "rick:Episode.created",
+            "description": "Time at which the episode was created in the database."
+          }
+        },
+        "required": [
+          "characters"
+        ]
+      }
+    },
+    "Rick_FilterCharacter": {
+      "name": "Rick_FilterCharacter",
+      "title": "Rick_FilterCharacter",
+      "id": "Rick_FilterCharacter",
+      "description": "",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "@mapping": "rick:FilterCharacter.name",
+            "description": ""
+          },
+          "status": {
+            "type": "string",
+            "@mapping": "rick:FilterCharacter.status",
+            "description": ""
+          },
+          "species": {
+            "type": "string",
+            "@mapping": "rick:FilterCharacter.species",
+            "description": ""
+          },
+          "type": {
+            "type": "string",
+            "@mapping": "rick:FilterCharacter.type",
+            "description": ""
+          },
+          "gender": {
+            "type": "string",
+            "@mapping": "rick:FilterCharacter.gender",
+            "description": ""
+          }
+        }
+      }
+    },
+    "Rick_Characters": {
+      "name": "Rick_Characters",
+      "title": "Rick_Characters",
+      "id": "Rick_Characters",
+      "description": "",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "info": {
+            "@ref": "rick:Info",
+            "@mapping": "rick:Characters.info",
+            "description": ""
+          },
+          "results": {
+            "type": "array",
+            "items": {
+              "@ref": "rick:Character"
+            },
+            "@mapping": "rick:Characters.results",
+            "description": ""
+          }
+        }
+      }
+    },
+    "Rick_Info": {
+      "name": "Rick_Info",
+      "title": "Rick_Info",
+      "id": "Rick_Info",
+      "description": "",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "count": {
+            "type": "integer",
+            "@mapping": "rick:Info.count",
+            "description": "The length of the response."
+          },
+          "pages": {
+            "type": "integer",
+            "@mapping": "rick:Info.pages",
+            "description": "The amount of pages."
+          },
+          "next": {
+            "type": "integer",
+            "@mapping": "rick:Info.next",
+            "description": "Number of the next page (if it exists)"
+          },
+          "prev": {
+            "type": "integer",
+            "@mapping": "rick:Info.prev",
+            "description": "Number of the previous page (if it exists)"
+          }
+        }
+      }
+    },
+    "Rick_FilterLocation": {
+      "name": "Rick_FilterLocation",
+      "title": "Rick_FilterLocation",
+      "id": "Rick_FilterLocation",
+      "description": "",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "@mapping": "rick:FilterLocation.name",
+            "description": ""
+          },
+          "type": {
+            "type": "string",
+            "@mapping": "rick:FilterLocation.type",
+            "description": ""
+          },
+          "dimension": {
+            "type": "string",
+            "@mapping": "rick:FilterLocation.dimension",
+            "description": ""
+          }
+        }
+      }
+    },
+    "Rick_Locations": {
+      "name": "Rick_Locations",
+      "title": "Rick_Locations",
+      "id": "Rick_Locations",
+      "description": "",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "info": {
+            "@ref": "rick:Info",
+            "@mapping": "rick:Locations.info",
+            "description": ""
+          },
+          "results": {
+            "type": "array",
+            "items": {
+              "@ref": "rick:Location"
+            },
+            "@mapping": "rick:Locations.results",
+            "description": ""
+          }
+        }
+      }
+    },
+    "Rick_FilterEpisode": {
+      "name": "Rick_FilterEpisode",
+      "title": "Rick_FilterEpisode",
+      "id": "Rick_FilterEpisode",
+      "description": "",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "@mapping": "rick:FilterEpisode.name",
+            "description": ""
+          },
+          "episode": {
+            "type": "string",
+            "@mapping": "rick:FilterEpisode.episode",
+            "description": ""
+          }
+        }
+      }
+    },
+    "Rick_Episodes": {
+      "name": "Rick_Episodes",
+      "title": "Rick_Episodes",
+      "id": "Rick_Episodes",
+      "description": "",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "info": {
+            "@ref": "rick:Info",
+            "@mapping": "rick:Episodes.info",
+            "description": ""
+          },
+          "results": {
+            "type": "array",
+            "items": {
+              "@ref": "rick:Episode"
+            },
+            "@mapping": "rick:Episodes.results",
+            "description": ""
+          }
+        }
+      }
+    },
+    "Rick_CacheControlScope": {
+      "name": "Rick_CacheControlScope",
+      "title": "Rick_CacheControlScope",
+      "id": "Rick_CacheControlScope",
+      "description": "",
+      "schema": {
+        "enum": [
+          "PUBLIC",
+          "PRIVATE"
+        ]
+      }
+    }
+  },
+  "queries": {
+    "character": {
+      "resolver": {
+        "name": "graphql:query",
+        "service": "rick",
+        "fieldName": "character"
+      },
+      "args": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "@tag": "id"
+          }
+        },
+        "required": [
+          "id"
+        ]
+      },
+      "shape": "Rick_Character"
+    },
+    "characters": {
+      "resolver": {
+        "name": "graphql:query",
+        "service": "rick",
+        "fieldName": "characters"
+      },
+      "args": {
+        "type": "object",
+        "properties": {
+          "page": {
+            "type": "integer"
+          },
+          "filter": {
+            "@ref": "rick:FilterCharacter"
+          }
+        }
+      },
+      "shape": "Rick_Characters"
+    },
+    "charactersByIds": {
+      "resolver": {
+        "name": "graphql:query",
+        "service": "rick",
+        "fieldName": "charactersByIds"
+      },
+      "args": {
+        "type": "object",
+        "properties": {
+          "ids": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "@tag": "id"
+            }
+          }
+        },
+        "required": [
+          "ids"
+        ]
+      },
+      "shape": {
+        "type": "array",
+        "items": {
+          "@ref": "rick:Character"
+        }
+      }
+    },
+    "location": {
+      "resolver": {
+        "name": "graphql:query",
+        "service": "rick",
+        "fieldName": "location"
+      },
+      "args": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "@tag": "id"
+          }
+        },
+        "required": [
+          "id"
+        ]
+      },
+      "shape": "Rick_Location"
+    },
+    "locations": {
+      "resolver": {
+        "name": "graphql:query",
+        "service": "rick",
+        "fieldName": "locations"
+      },
+      "args": {
+        "type": "object",
+        "properties": {
+          "page": {
+            "type": "integer"
+          },
+          "filter": {
+            "@ref": "rick:FilterLocation"
+          }
+        }
+      },
+      "shape": "Rick_Locations"
+    },
+    "locationsByIds": {
+      "resolver": {
+        "name": "graphql:query",
+        "service": "rick",
+        "fieldName": "locationsByIds"
+      },
+      "args": {
+        "type": "object",
+        "properties": {
+          "ids": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "@tag": "id"
+            }
+          }
+        },
+        "required": [
+          "ids"
+        ]
+      },
+      "shape": {
+        "type": "array",
+        "items": {
+          "@ref": "rick:Location"
+        }
+      }
+    },
+    "episode": {
+      "resolver": {
+        "name": "graphql:query",
+        "service": "rick",
+        "fieldName": "episode"
+      },
+      "args": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "@tag": "id"
+          }
+        },
+        "required": [
+          "id"
+        ]
+      },
+      "shape": "Rick_Episode"
+    },
+    "episodes": {
+      "resolver": {
+        "name": "graphql:query",
+        "service": "rick",
+        "fieldName": "episodes"
+      },
+      "args": {
+        "type": "object",
+        "properties": {
+          "page": {
+            "type": "integer"
+          },
+          "filter": {
+            "@ref": "rick:FilterEpisode"
+          }
+        }
+      },
+      "shape": "Rick_Episodes"
+    },
+    "episodesByIds": {
+      "resolver": {
+        "name": "graphql:query",
+        "service": "rick",
+        "fieldName": "episodesByIds"
+      },
+      "args": {
+        "type": "object",
+        "properties": {
+          "ids": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "@tag": "id"
+            }
+          }
+        },
+        "required": [
+          "ids"
+        ]
+      },
+      "shape": {
+        "type": "array",
+        "items": {
+          "@ref": "rick:Episode"
+        }
+      }
+    }
+  },
+  "mutations": {},
+  "schemaVersion": "3.46.0"
+}

package/examples/{dependencies → latest/layers}/shopify-layer-2023-01.json

@@ -86167,5 +86167,6 @@
       },
       "shape": "Shopify_WebhookSubscriptionUpdatePayload"
     }
-  }
-}
+  },
+  "schemaVersion": "3.46.0"
+}