@takeshape/schema 8.263.4 → 8.264.2

package/es/schemas/project-schema.json

@@ -102,6 +102,9 @@
     {
       "$ref": "https://schema.takeshape.io/project-schema/v3.24.0#"
     },
+    {
+      "$ref": "https://schema.takeshape.io/project-schema/v3.25.0#"
+    },
     {
       "$ref": "https://schema.takeshape.io/project-schema/v4.0.0#"
     }

package/es/types/types.js

@@ -3,8 +3,8 @@
  * only type used in most runtime code. Updating this to a new version should
  * trigger type errors that clue you in to code that needs review.
  */
-export const projectSchemaImportOptionalProps = ['projectId', 'dataKey', 'locales', 'defaultLocale', 'author'];
-export const legacyProjectSchemaImportOptionalProps = ['created', 'updated', 'version'];
+export const projectSchemaImportOptionalProps = ['projectId', 'locales', 'defaultLocale', 'author'];
+export const legacyProjectSchemaImportOptionalProps = ['created', 'updated', 'version', 'dataKey'];
 
 /**
  * Types of refs

package/es/types/utils.js

@@ -7,6 +7,7 @@ import isArray from 'lodash/isArray';
 import has from 'lodash/has';
 import { latestSchemaJson } from '../schemas';
 import satisfies from 'semver/functions/satisfies';
+import isUndefined from 'lodash/isUndefined';
 /** Resolver Type Utils **/
 
 /**
@@ -55,7 +56,7 @@ export function isV3XSchema(maybeSchema) {
   return version ? satisfies(version, '^3.0.0') : false;
 }
 export function isProjectSchemaWithServices(schema) {
-  return typeof schema.dataKey !== 'undefined' && typeof schema.services !== 'undefined';
+  return !isUndefined(schema.services);
 }
 /** Directive Mapping Utils **/
 

package/es/util/merge.js

@@ -255,7 +255,7 @@ export function mergeProjectSchemas(to, base, from) {
 
       if (potentialConflict.op === 'add' && change.op === 'add' || potentialConflict.op === 'update' && change.op === 'update') {
         if (change.section === 'shapes') {
-          const mergedValue = attemptToMerge(to, base, from, change);
+          const mergedValue = attemptToMerge(to, base, from, change); // eslint-disable-next-line max-depth
 
           if (!mergedValue) {
             return {

package/examples/latest/betzino.json

@@ -7656,7 +7656,6 @@
       }
     }
   },
-  "dataKey": "AQIDAHi9nATJb1LYgj5u7ShOGp43y2H6TuckRKGDlwTU4b6ryQFysYUZOpJcN6AnANucX2maAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMBdpIggrzI4+4aejRAgEQgDsXWrhpoQO9bOWJzxEyrTJ2xEMzsjgGqos1oAqve5QfoTtAHH100AKiueEBwPHODz6egpxm1Nv+SEPYfQ==",
   "queries": {
     "getProfileForm": {
       "args": "TSGetArgs<ProfileForm>",
@@ -52526,6 +52525,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/blog-schema.json

@@ -37,7 +37,6 @@
       }
     }
   },
-  "dataKey": "supersecret",
   "queries": {
     "getHomepage": {
       "args": "TSGetSingletonArgs<Homepage>",
@@ -400,6 +399,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/brewery-schema.json

@@ -57,7 +57,6 @@
       }
     }
   },
-  "dataKey": "supersecret",
   "queries": {
     "getBrewery": {
       "args": "TSGetArgs<Brewery>",
@@ -383,6 +382,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/complex-project-schema.json

@@ -927,7 +927,6 @@
       }
     }
   },
-  "dataKey": "supersecret",
   "queries": {
     "getPurpose": {
       "args": "TSGetArgs<Purpose>",
@@ -4186,6 +4185,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/complex-schema.json

@@ -1,5 +1,4 @@
 {
-  "dataKey": "supersecret",
   "workflows": {},
   "projectId": "f1679577-e89a-449b-9313-e2edac0a5bf0",
   "defaultLocale": "en",
@@ -16,7 +15,7 @@
   "apiVersion": "1",
   "queries": {},
   "mutations": {},
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "shapes": {
     "DocumentUploadForm": {
       "id": "HJPFlRKkr",

package/examples/latest/fabric-ecommerce.json

@@ -1,6 +1,5 @@
 {
   "projectId": "4c54da75-a240-4e50-8343-bd1e8eafcdbb",
-  "dataKey": "secret",
   "defaultLocale": "en-us",
   "locales": [
     "en-us"
@@ -10506,5 +10505,5 @@
       }
     }
   },
-  "schemaVersion": "3.24.0"
+  "schemaVersion": "3.25.0"
 }

package/examples/latest/frank-and-fred-schema.json

@@ -3859,7 +3859,6 @@
       }
     }
   },
-  "dataKey": "supersecret",
   "queries": {
     "getDocumentUploadForm": {
       "args": "TSGetArgs<DocumentUploadForm>",
@@ -23252,6 +23251,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/klirr-schema.json

@@ -1,5 +1,4 @@
 {
-  "dataKey": "supersecret",
   "workflows": {},
   "projectId": "190a2592-08ff-466f-bb4a-78eb9bcb69c6",
   "defaultLocale": "en",
@@ -34787,6 +34786,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/massive-schema.json

@@ -1822,7 +1822,6 @@
       }
     }
   },
-  "dataKey": "supersecret",
   "queries": {
     "getResourceNavigation": {
       "args": "TSGetSingletonArgs<ResourceNavigation>",
@@ -7838,6 +7837,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/mill-components-schema.json

@@ -345,7 +345,6 @@
       }
     }
   },
-  "dataKey": "secret",
   "queries": {
     "getNotification": {
       "args": "TSGetArgs<Notification>",
@@ -1885,6 +1884,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/one-earth.json

@@ -1,5 +1,4 @@
 {
-  "dataKey": "supersecret",
   "workflows": {},
   "projectId": "86ce9525-f5f2-4e97-81ba-54e8ce933da7",
   "defaultLocale": "en",
@@ -14217,6 +14216,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/pet-oneof-array.json

@@ -80,7 +80,6 @@
       }
     }
   },
-  "dataKey": "supersecret",
   "queries": {
     "getMall": {
       "args": "TSGetArgs<Mall>",
@@ -389,6 +388,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/post-schema.json

@@ -27,7 +27,6 @@
       }
     }
   },
-  "dataKey": "supersecret",
   "queries": {
     "getPost": {
       "args": "TSGetArgs<Post>",
@@ -227,6 +226,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/pruned-shopify-product-schema.json

@@ -23,7 +23,6 @@
       "authentication": "abc"
     }
   },
-  "dataKey": "secret",
   "queries": {
     "Shopify_products": {
       "args": {
@@ -9757,5 +9756,5 @@
       }
     }
   },
-  "schemaVersion": "3.24.0"
+  "schemaVersion": "3.25.0"
 }

package/examples/latest/real-world-schema.json

@@ -170,7 +170,6 @@
       }
     }
   },
-  "dataKey": "supersecret",
   "queries": {
     "getBeer": {
       "args": "TSGetArgs<Beer>",
@@ -1042,6 +1041,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/recursive-repeater-schema.json

@@ -18,7 +18,6 @@
       }
     }
   },
-  "dataKey": "supersecret",
   "queries": {
     "getPost": {
       "args": "TSGetArgs<Post>",
@@ -143,6 +142,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/recursive-schema.json

@@ -18,7 +18,6 @@
       }
     }
   },
-  "dataKey": "supersecret",
   "queries": {
     "getPost": {
       "args": "TSGetArgs<Post>",
@@ -150,6 +149,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/rick-and-morty-ast.json

@@ -517,7 +517,6 @@
       }
     }
   },
-  "dataKey": "secret",
   "queries": {
     "getAsset": {
       "args": "TSGetArgs<Asset>",
@@ -2821,5 +2820,5 @@
       }
     }
   },
-  "schemaVersion": "3.24.0"
+  "schemaVersion": "3.25.0"
 }

package/examples/latest/rick-and-morty-graphql.json

@@ -455,7 +455,6 @@
       }
     }
   },
-  "dataKey": "AQIDAHi9nATJb1LYgj5u7ShOGp43y2H6TuckRKGDlwTU4b6ryQGI0q/SRpsDawxZIqwDcVlDAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM854moczqo/0NmMLbAgEQgDvf6d048wXTUyv/KlbkBLU/v/D1itvLB9wgP3M9vX4bKU6WgalSGCL/QtC18KiQ+mBk5BPQTiY6+rPsWQ==",
   "services": {
     "rick-n-morty": {
       "id": "rick-n-morty",
@@ -2293,5 +2292,5 @@
       }
     }
   },
-  "schemaVersion": "3.24.0"
+  "schemaVersion": "3.25.0"
 }

package/examples/latest/rick-and-morty-rest.json

@@ -23,7 +23,6 @@
       }
     }
   },
-  "dataKey": "AQIDAHhcZWXOdlBglkxBhI23ElO/clC/kuw5ynjXDSqJgfTz8gGs0V9U9qOKlqicZ9d2p+45AAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMzl46lhOMi4RGP3AkAgEQgDu0SsBk84UIM55pydDDKcz5L8EL02u/rhULFBliykTWhkSIv+EuqiaLVaqA7qVGJP84HpuPd+ZFORY/lw==",
   "queries": {
     "getCharacter": {
       "args": "Rnm_GetCharacterArgs",
@@ -92,5 +91,5 @@
       }
     }
   },
-  "schemaVersion": "3.24.0"
+  "schemaVersion": "3.25.0"
 }

package/examples/latest/schema-with-repeater-draftjs.json

@@ -13,7 +13,6 @@
       "default": {}
     }
   },
-  "dataKey": "supersecret",
   "queries": {
     "getPost": {
       "args": "TSGetArgs<Post>",
@@ -398,6 +397,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/shape-books-v3_2_0.json

@@ -220,7 +220,6 @@
       }
     }
   },
-  "dataKey": "supersecret",
   "queries": {
     "getGenre": {
       "args": "TSGetArgs<Genre>",
@@ -1125,6 +1124,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/shape-books.json

@@ -220,7 +220,6 @@
       }
     }
   },
-  "dataKey": "supersecret",
   "queries": {
     "getGenre": {
       "args": "TSGetArgs<Genre>",
@@ -1125,6 +1124,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/shopify-lookbook.json

@@ -151,7 +151,6 @@
       }
     }
   },
-  "dataKey": "AQIDAHhcZWXOdlBglkxBhI23ElO/clC/kuw5ynjXDSqJgfTz8gF9PtUhhmj99Nwuy3NTUSw0AAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMyc4d40JF8HULr2wWAgEQgDs9q/z7QObGJa+nOpS1GDYB9HYK9EcHEiZjhiGhQyAhxZLvqEwQj7+1Zn1LHykh3NJE1BQLQqF8AlQkkQ==",
   "queries": {
     "getProduct": {
       "args": "TSGetArgs<Product>",
@@ -1178,5 +1177,5 @@
       }
     }
   },
-  "schemaVersion": "3.24.0"
+  "schemaVersion": "3.25.0"
 }

package/examples/latest/shopify-product-2022-07.json

@@ -1,12 +1,11 @@
 {
   "projectId": "88af4177-f5f0-4311-8496-eb7f66ba53ac",
-  "dataKey": "secret",
   "defaultLocale": "en-us",
   "locales": [
     "en-us"
   ],
   "apiVersion": "2",
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "queries": {
     "getAsset": {
       "shape": "Asset",

package/examples/latest/shopify-store-with-widget.json

@@ -716,7 +716,6 @@
       }
     }
   },
-  "dataKey": "AQIDAHhcZWXOdlBglkxBhI23ElO/clC/kuw5ynjXDSqJgfTz8gF9PtUhhmj99Nwuy3NTUSw0AAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMyc4d40JF8HULr2wWAgEQgDs9q/z7QObGJa+nOpS1GDYB9HYK9EcHEiZjhiGhQyAhxZLvqEwQj7+1Zn1LHykh3NJE1BQLQqF8AlQkkQ==",
   "queries": {
     "getAsset": {
       "args": "TSGetArgs<Asset>",
@@ -12561,5 +12560,5 @@
       }
     }
   },
-  "schemaVersion": "3.24.0"
+  "schemaVersion": "3.25.0"
 }

package/examples/latest/stripe-product-runtime-schema.json

@@ -1,12 +1,11 @@
 {
   "projectId": "9f513e93-01d6-4fa9-b158-5af4008cb575",
-  "dataKey": "secret",
   "defaultLocale": "en-us",
   "locales": [
     "en-us"
   ],
   "apiVersion": "2",
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "queries": {
     "getAsset": {
       "shape": "Asset",

package/examples/latest/stripe-starter-resolved.json

@@ -1,6 +1,5 @@
 {
   "projectId": "520be3e2-877f-465b-8698-983500713948",
-  "dataKey": "data-key",
   "apiVersion": "2",
   "defaultLocale": "en-us",
   "locales": [
@@ -29317,5 +29316,5 @@
       }
     }
   },
-  "schemaVersion": "3.24.0"
+  "schemaVersion": "3.25.0"
 }

package/examples/latest/user-schema-no-required.json

@@ -23,7 +23,6 @@
       }
     }
   },
-  "dataKey": "supersecret",
   "queries": {
     "getUser": {
       "args": "TSGetArgs<User>",
@@ -166,6 +165,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/examples/latest/user-schema-with-defaults.json

@@ -24,7 +24,6 @@
       }
     }
   },
-  "dataKey": "supersecret",
   "queries": {
     "getUser": {
       "args": "TSGetArgs<User>",
@@ -191,6 +190,6 @@
       }
     }
   },
-  "schemaVersion": "3.24.0",
+  "schemaVersion": "3.25.0",
   "services": {}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "8.263.4",
+  "version": "8.264.2",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -30,9 +30,9 @@
     "p-reduce": "^2.1.0",
     "semver": "^7.3.2",
     "tiny-invariant": "^1.2.0",
-    "@takeshape/errors": "8.263.4",
-    "@takeshape/json-schema": "8.263.4",
-    "@takeshape/util": "8.263.4"
+    "@takeshape/json-schema": "8.264.2",
+    "@takeshape/util": "8.264.2",
+    "@takeshape/errors": "8.264.2"
   },
   "devDependencies": {
     "@takeshape/json-schema-to-typescript": "^11.0.0",