@takeshape/schema 9.40.2 → 9.41.2

package/dist/builtin-schema.js

@@ -247,9 +247,9 @@ const builtInShapes = {
       required: ['filename', 'path']
     }
   },
-  TsStaticSite: {
+  TSStaticSite: {
     id: 'SITE',
-    name: 'TsStaticSite',
+    name: 'TSStaticSite',
     title: 'Static Site',
     model: {
       type: 'multiple'
@@ -330,7 +330,7 @@ const builtInShapes = {
           title: 'Environment Variables',
           '@l10n': false,
           items: {
-            $ref: '#/shapes/TsStaticSiteEnvironmentVariables/schema'
+            $ref: '#/shapes/TSStaticSiteEnvironmentVariables/schema'
           },
           '@mapping': 'shapedb:TsStaticSite.9fj4UiNxY'
         },
@@ -339,7 +339,7 @@ const builtInShapes = {
           title: 'Publish Triggers',
           '@l10n': false,
           items: {
-            $ref: '#/shapes/TsStaticSiteTriggers/schema'
+            $ref: '#/shapes/TSStaticSiteTriggers/schema'
           }
         },
         templateHash: {
@@ -352,9 +352,9 @@ const builtInShapes = {
       required: ['title', 'provider', 'destination']
     }
   },
-  TsStaticSiteEnvironmentVariables: {
+  TSStaticSiteEnvironmentVariables: {
     id: '9fj4UiNxY',
-    name: 'TsStaticSiteEnvironmentVariables',
+    name: 'TSStaticSiteEnvironmentVariables',
     title: 'Static Site EnvironmentVariables',
     schema: {
       type: 'object',
@@ -372,9 +372,9 @@ const builtInShapes = {
       }
     }
   },
-  TsStaticSiteTriggers: {
-    id: 'TsStaticSiteTriggers',
-    name: 'TsStaticSiteTriggers',
+  TSStaticSiteTriggers: {
+    id: 'TSStaticSiteTriggers',
+    name: 'TSStaticSiteTriggers',
     title: 'Static Site Triggers',
     schema: {
       type: 'object',
@@ -436,7 +436,7 @@ const builtInForms = {
       }
     }
   },
-  TsStaticSite: {
+  TSStaticSite: {
     default: {
       order: ['title', 'provider', 'destination', 'idKey', 'secretKey', 'environmentVariables'],
       properties: {

package/dist/schema-util.js

@@ -480,7 +480,7 @@ function applyBuiltinPropertiesToShape(projectSchema, shape) {
 } // Dependencies of these built-in shapes are automatically added by getBuiltinsUsed
 
 
-const requiredBuiltinShapes = ['Asset', 'TSRelationship', 'TsStaticSite', 'TSUser'];
+const requiredBuiltinShapes = ['Asset', 'TSRelationship', 'TSStaticSite', 'TSUser'];
 /**
  * Get all built-in shapes that are depended on by the given project schema.
  * Required built-in shapes are always included.

package/dist/template-shapes/templates.d.ts

@@ -19,7 +19,7 @@ export declare const TSSearchSortInput: Shape;
 export declare const commonSearchProps: Record<string, PropertySchema>;
 export declare const localeProps: ObjectSchema;
 export declare const termsProps: ObjectSchema;
-export declare const ContentStructureInput: Shape;
+export declare const TSContentStructureInput: Shape;
 export declare function getPaginatedListShape(context: unknown, shape: Shape): ResolvedTemplate;
 export declare function getSearchResultsShape(context: unknown, shape: Shape): ResolvedTemplate;
 export declare function getIDQueryArgs(templateName: string): (context: unknown, shape: Shape) => ResolvedTemplate;

package/dist/template-shapes/templates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../../src/template-shapes/templates.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAiB,cAAc,EAAE,KAAK,EAAc,MAAM,mBAAmB,CAAC;AACvG,OAAO,KAAK,EAAC,gBAAgB,EAAE,eAAe,EAAC,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAWtC,eAAO,MAAM,SAAS,YAoJH,OAAO,SAAS,KAAK,KAAG,gBAAgB,AApJP,CAAC;AACrD,eAAO,MAAM,kBAAkB,YAmJZ,OAAO,SAAS,KAAK,KAAG,gBAAgB,AAnJW,CAAC;AACvE,eAAO,MAAM,UAAU,YAsWJ,eAAe,SAAS,KAAK,KAAG,gBAAgB,AAtWA,CAAC;AACpE,eAAO,MAAM,YAAY,YAqWN,eAAe,SAAS,KAAK,KAAG,gBAAgB,AArWK,CAAC;AACzE,eAAO,MAAM,UAAU,sBAkNI,eAAe,SAAS,KAAK,KAAG,gBAAgB,AAlNE,CAAC;AAC9E,eAAO,MAAM,UAAU,sBAiNI,eAAe,SAAS,KAAK,KAAG,gBAAgB,AAjNE,CAAC;AAC9E,eAAO,MAAM,aAAa,sBAgNC,eAAe,SAAS,KAAK,KAAG,gBAAgB,AAhNW,CAAC;AACvF,eAAO,MAAM,UAAU,sBA+MI,eAAe,SAAS,KAAK,KAAG,gBAAgB,AA/ME,CAAC;AAC9E,eAAO,MAAM,aAAa,8BAAwB,CAAC;AACnD,eAAO,MAAM,aAAa,8BAAwB,CAAC;AACnD,eAAO,MAAM,YAAY,YA2RN,OAAO,SAAS,KAAK,KAAG,gBAAgB,AA3RY,CAAC;AACxE,eAAO,MAAM,YAAY,YA0RN,OAAO,SAAS,KAAK,KAAG,gBAAgB,AA1RY,CAAC;AACxE,eAAO,MAAM,eAAe,YAyRT,OAAO,SAAS,KAAK,KAAG,gBAAgB,AAzRkB,CAAC;AAC9E,eAAO,MAAM,YAAY,YAwRN,OAAO,SAAS,KAAK,KAAG,gBAAgB,AAxRY,CAAC;AAExE,eAAO,MAAM,iBAAiB,OAU5B,CAAC;AAEH,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAqB5D,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,YAMzB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,YAKxB,CAAC;AAEF,eAAO,MAAM,qBAAqB,OAsBjC,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,gBAAgB,CAetF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,gBAAgB,CAmBtF;AAsBD,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,aAChC,OAAO,SAAS,KAAK,KAAG,gBAAgB,CAU1D;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,aAAa,eACxC,MAAM,YAG1B;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AA2BD;;GAEG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,uBAM9C,eAAe,SAAS,KAAK,KAAG,gBAAgB,CA4E1E;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,aAAa,aACtC,OAAO,SAAS,KAAK,KAAG,gBAAgB,CAiB1D;AAED,eAAO,MAAM,gBAAgB,EAAE,YAwB9B,CAAC;AAuBF,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,aAC5D,eAAe,SAAS,KAAK,KAAG,gBAAgB,CA0BlE"}
+{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../../src/template-shapes/templates.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAiB,cAAc,EAAE,KAAK,EAAc,MAAM,mBAAmB,CAAC;AACvG,OAAO,KAAK,EAAC,gBAAgB,EAAE,eAAe,EAAC,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAWtC,eAAO,MAAM,SAAS,YAoJH,OAAO,SAAS,KAAK,KAAG,gBAAgB,AApJP,CAAC;AACrD,eAAO,MAAM,kBAAkB,YAmJZ,OAAO,SAAS,KAAK,KAAG,gBAAgB,AAnJW,CAAC;AACvE,eAAO,MAAM,UAAU,YA0WJ,eAAe,SAAS,KAAK,KAAG,gBAAgB,AA1WA,CAAC;AACpE,eAAO,MAAM,YAAY,YAyWN,eAAe,SAAS,KAAK,KAAG,gBAAgB,AAzWK,CAAC;AACzE,eAAO,MAAM,UAAU,sBAsNI,eAAe,SAAS,KAAK,KAAG,gBAAgB,AAtNE,CAAC;AAC9E,eAAO,MAAM,UAAU,sBAqNI,eAAe,SAAS,KAAK,KAAG,gBAAgB,AArNE,CAAC;AAC9E,eAAO,MAAM,aAAa,sBAoNC,eAAe,SAAS,KAAK,KAAG,gBAAgB,AApNW,CAAC;AACvF,eAAO,MAAM,UAAU,sBAmNI,eAAe,SAAS,KAAK,KAAG,gBAAgB,AAnNE,CAAC;AAC9E,eAAO,MAAM,aAAa,8BAAwB,CAAC;AACnD,eAAO,MAAM,aAAa,8BAAwB,CAAC;AACnD,eAAO,MAAM,YAAY,YA+RN,OAAO,SAAS,KAAK,KAAG,gBAAgB,AA/RY,CAAC;AACxE,eAAO,MAAM,YAAY,YA8RN,OAAO,SAAS,KAAK,KAAG,gBAAgB,AA9RY,CAAC;AACxE,eAAO,MAAM,eAAe,YA6RT,OAAO,SAAS,KAAK,KAAG,gBAAgB,AA7RkB,CAAC;AAC9E,eAAO,MAAM,YAAY,YA4RN,OAAO,SAAS,KAAK,KAAG,gBAAgB,AA5RY,CAAC;AAExE,eAAO,MAAM,iBAAiB,OAU5B,CAAC;AAEH,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAqB5D,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,YAMzB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,YAKxB,CAAC;AAEF,eAAO,MAAM,uBAAuB,OAsBnC,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,gBAAgB,CAetF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,gBAAgB,CAmBtF;AAsBD,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,aAChC,OAAO,SAAS,KAAK,KAAG,gBAAgB,CAU1D;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,aAAa,eACxC,MAAM,YAG1B;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAM3D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AA2BD;;GAEG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,uBAM9C,eAAe,SAAS,KAAK,KAAG,gBAAgB,CA4E1E;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,aAAa,aACtC,OAAO,SAAS,KAAK,KAAG,gBAAgB,CAiB1D;AAED,eAAO,MAAM,gBAAgB,EAAE,YAwB9B,CAAC;AAuBF,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,aAC5D,eAAe,SAAS,KAAK,KAAG,gBAAgB,CA0BlE"}

package/dist/template-shapes/templates.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.commonSearchProps = exports.commonSearchArgs = exports.UpdateResult = exports.UpdateArgs = exports.TSSearchSortInput = exports.TSSearchArgs = exports.TSListArgs = exports.TSGetSingletonArgs = exports.TSGetArgs = exports.SearchResults = exports.PaginatedList = exports.DuplicateResult = exports.DuplicateArgs = exports.DeleteResult = exports.DeleteArgs = exports.CreateResult = exports.CreateArgs = exports.ContentStructureInput = void 0;
+exports.commonSearchProps = exports.commonSearchArgs = exports.UpdateResult = exports.UpdateArgs = exports.TSSearchSortInput = exports.TSSearchArgs = exports.TSListArgs = exports.TSGetSingletonArgs = exports.TSGetArgs = exports.TSContentStructureInput = exports.SearchResults = exports.PaginatedList = exports.DuplicateResult = exports.DuplicateArgs = exports.DeleteResult = exports.DeleteArgs = exports.CreateResult = exports.CreateArgs = void 0;
 exports.getIDQueryArgs = getIDQueryArgs;
 exports.getInputShapeName = getInputShapeName;
 exports.getMutationArgs = getMutationArgs;
@@ -126,7 +126,7 @@ const termsProps = {
   }
 };
 exports.termsProps = termsProps;
-const ContentStructureInput = (0, _schemaUtil.createShape)('ContentStructureInput', {
+const TSContentStructureInput = (0, _schemaUtil.createShape)('TSContentStructureInput', {
   type: 'object',
   properties: {
     path: {
@@ -145,7 +145,7 @@ const ContentStructureInput = (0, _schemaUtil.createShape)('ContentStructureInpu
 }, {
   description: 'Describes a structural update to an array of data.'
 });
-exports.ContentStructureInput = ContentStructureInput;
+exports.TSContentStructureInput = TSContentStructureInput;
 
 function getPaginatedListShape(context, shape) {
   const shapeName = `${shape.name}${_migration.listTypePrefix}`;
@@ -203,7 +203,7 @@ const contentStructureFields = {
     structure: {
       type: 'array',
       items: {
-        '@ref': 'local:ContentStructureInput'
+        '@ref': 'local:TSContentStructureInput'
       }
     }
   }
@@ -239,7 +239,9 @@ function getIDQueryArgs(templateName) {
 
 function getMutationInputShapeName(verb) {
   return shapeName => {
-    return (0, _util.pascalCase)([verb, shapeName, 'input']);
+    return (0, _util.formatShapeName)([verb, shapeName, 'input'], {
+      shapeNameIndex: 1
+    });
   };
 }
 /**
@@ -248,7 +250,11 @@ function getMutationInputShapeName(verb) {
 
 
 function getInputShapeName(shapeName) {
-  return shapeName === 'TSRelationship' ? shapeName : `${shapeName}Input`;
+  if (shapeName === 'TSRelationship') {
+    return shapeName;
+  }
+
+  return `${shapeName}Input`;
 }
 
 function getOutputShapeName(name) {
@@ -341,7 +347,7 @@ function getMutationArgs(templateName, verb) {
           return (0, _schemaUtil.createShape)(getInputShapeName(shapeName), rewriteRefs(projectSchema, (0, _createInputSchema.createInputSchema)(shape.schema), getInputShapeName));
         }), 'name')),
         ...(addStructure ? {
-          ContentStructureInput
+          TSContentStructureInput
         } : {})
       }
     };
@@ -350,7 +356,9 @@ function getMutationArgs(templateName, verb) {
 
 function getMutationResultType(verb) {
   return (context, shape) => {
-    const shapeName = (0, _util.pascalCase)([verb, shape.name, 'result']);
+    const shapeName = (0, _util.formatShapeName)([verb, shape.name, 'result'], {
+      shapeNameIndex: 1
+    });
     const result = verb === _types.TemplateVerbs.Delete ? {
       type: 'boolean'
     } : {

package/dist/template-shapes/where.js

@@ -242,7 +242,7 @@ function truncateNames(names) {
 function getRelationshipShapeName(refs) {
   return refs.map(ref => {
     const shapeName = ref.split(':')[1];
-    return (0, _util.pascalCase)(shapeName);
+    return (0, _util.formatShapeName)(shapeName);
   }).sort().join('');
 }
 
@@ -287,7 +287,7 @@ function getTypeName(name, prop, shapeName, context) {
 
   if (type === 'object' || type === 'array') {
     const prefix = `TS${relationshipDepth >= MAX_RELATIONSHIP_DEPTH ? 'Shallow' : ''}Where`;
-    const fieldName = `${conflictingProperties !== null && conflictingProperties !== void 0 && conflictingProperties.has(name) ? '_' : ''}${(0, _util.pascalCase)(name)}`;
+    const fieldName = `${conflictingProperties !== null && conflictingProperties !== void 0 && conflictingProperties.has(name) ? '_' : ''}${(0, _util.formatShapeName)(name)}`;
     const refItem = (0, _refs.getRefOrItemsRef)(projectSchema, prop);
     const suffix = refItem ? (0, _refs.refItemToShapeName)(refItem) : `${shapeName}${fieldName}`;
     return `${prefix}${suffix}`;

package/es/builtin-schema.js

@@ -233,9 +233,9 @@ export const builtInShapes = {
       required: ['filename', 'path']
     }
   },
-  TsStaticSite: {
+  TSStaticSite: {
     id: 'SITE',
-    name: 'TsStaticSite',
+    name: 'TSStaticSite',
     title: 'Static Site',
     model: {
       type: 'multiple'
@@ -316,7 +316,7 @@ export const builtInShapes = {
           title: 'Environment Variables',
           '@l10n': false,
           items: {
-            $ref: '#/shapes/TsStaticSiteEnvironmentVariables/schema'
+            $ref: '#/shapes/TSStaticSiteEnvironmentVariables/schema'
           },
           '@mapping': 'shapedb:TsStaticSite.9fj4UiNxY'
         },
@@ -325,7 +325,7 @@ export const builtInShapes = {
           title: 'Publish Triggers',
           '@l10n': false,
           items: {
-            $ref: '#/shapes/TsStaticSiteTriggers/schema'
+            $ref: '#/shapes/TSStaticSiteTriggers/schema'
           }
         },
         templateHash: {
@@ -338,9 +338,9 @@ export const builtInShapes = {
       required: ['title', 'provider', 'destination']
     }
   },
-  TsStaticSiteEnvironmentVariables: {
+  TSStaticSiteEnvironmentVariables: {
     id: '9fj4UiNxY',
-    name: 'TsStaticSiteEnvironmentVariables',
+    name: 'TSStaticSiteEnvironmentVariables',
     title: 'Static Site EnvironmentVariables',
     schema: {
       type: 'object',
@@ -358,9 +358,9 @@ export const builtInShapes = {
       }
     }
   },
-  TsStaticSiteTriggers: {
-    id: 'TsStaticSiteTriggers',
-    name: 'TsStaticSiteTriggers',
+  TSStaticSiteTriggers: {
+    id: 'TSStaticSiteTriggers',
+    name: 'TSStaticSiteTriggers',
     title: 'Static Site Triggers',
     schema: {
       type: 'object',
@@ -421,7 +421,7 @@ export const builtInForms = {
       }
     }
   },
-  TsStaticSite: {
+  TSStaticSite: {
     default: {
       order: ['title', 'provider', 'destination', 'idKey', 'secretKey', 'environmentVariables'],
       properties: {

package/es/schema-util.js

@@ -363,7 +363,7 @@ export function applyBuiltinPropertiesToShape(projectSchema, shape) {
   };
 } // Dependencies of these built-in shapes are automatically added by getBuiltinsUsed
 
-const requiredBuiltinShapes = ['Asset', 'TSRelationship', 'TsStaticSite', 'TSUser'];
+const requiredBuiltinShapes = ['Asset', 'TSRelationship', 'TSStaticSite', 'TSUser'];
 /**
  * Get all built-in shapes that are depended on by the given project schema.
  * Required built-in shapes are always included.

package/es/template-shapes/templates.js

@@ -1,6 +1,6 @@
 import { TemplateVerbs } from './types';
 import { listTypePrefix } from '../migration';
-import { deepClone, pascalCase, visit } from '@takeshape/util';
+import { deepClone, formatShapeName, visit } from '@takeshape/util';
 import keyBy from 'lodash/keyBy';
 import { createShape, getShapeDependencies, isCachedShape } from '../schema-util';
 import { getFlattenedTemplateShapeName, getRef, getRefShapeName, refItemToAtRef, refItemToShapeName } from '../refs';
@@ -79,7 +79,7 @@ export const termsProps = {
     }
   }
 };
-export const ContentStructureInput = createShape('ContentStructureInput', {
+export const TSContentStructureInput = createShape('TSContentStructureInput', {
   type: 'object',
   properties: {
     path: {
@@ -152,7 +152,7 @@ const contentStructureFields = {
     structure: {
       type: 'array',
       items: {
-        '@ref': 'local:ContentStructureInput'
+        '@ref': 'local:TSContentStructureInput'
       }
     }
   }
@@ -186,7 +186,9 @@ export function getIDQueryArgs(templateName) {
 
 export function getMutationInputShapeName(verb) {
   return shapeName => {
-    return pascalCase([verb, shapeName, 'input']);
+    return formatShapeName([verb, shapeName, 'input'], {
+      shapeNameIndex: 1
+    });
   };
 }
 /**
@@ -194,7 +196,11 @@ export function getMutationInputShapeName(verb) {
  */
 
 export function getInputShapeName(shapeName) {
-  return shapeName === 'TSRelationship' ? shapeName : `${shapeName}Input`;
+  if (shapeName === 'TSRelationship') {
+    return shapeName;
+  }
+
+  return `${shapeName}Input`;
 }
 export function getOutputShapeName(name) {
   return name.replace(/(?:Input|PartialInput)$/, '');
@@ -286,7 +292,7 @@ export function getMutationArgs(templateName, verb) {
           return createShape(getInputShapeName(shapeName), rewriteRefs(projectSchema, createInputSchema(shape.schema), getInputShapeName));
         }), 'name')),
         ...(addStructure ? {
-          ContentStructureInput
+          TSContentStructureInput
         } : {})
       }
     };
@@ -294,7 +300,9 @@ export function getMutationArgs(templateName, verb) {
 }
 export function getMutationResultType(verb) {
   return (context, shape) => {
-    const shapeName = pascalCase([verb, shape.name, 'result']);
+    const shapeName = formatShapeName([verb, shape.name, 'result'], {
+      shapeNameIndex: 1
+    });
     const result = verb === TemplateVerbs.Delete ? {
       type: 'boolean'
     } : {

package/es/template-shapes/where.js

@@ -3,7 +3,7 @@ import isFunction from 'lodash/isFunction';
 import { createSchemaPropertyList, createShape, getAllRefsInShapes, isCachedShape } from '../schema-util';
 import uniqBy from 'lodash/uniqBy';
 import md5 from 'blueimp-md5';
-import { pascalCase, isDefined } from '@takeshape/util';
+import { pascalCase, isDefined, formatShapeName } from '@takeshape/util';
 import { workflowsEnabled } from '../api-version';
 import { followRef, getRef, getRefOrItemsRef, hasRefProperty, hasResolvableRef, refItemToShape, refItemToShapeName } from '../refs';
 import { enumerateOneOfKeys, isUnionSchema } from '../unions';
@@ -209,7 +209,7 @@ function truncateNames(names) {
 function getRelationshipShapeName(refs) {
   return refs.map(ref => {
     const shapeName = ref.split(':')[1];
-    return pascalCase(shapeName);
+    return formatShapeName(shapeName);
   }).sort().join('');
 }
 
@@ -254,7 +254,7 @@ function getTypeName(name, prop, shapeName, context) {
 
   if (type === 'object' || type === 'array') {
     const prefix = `TS${relationshipDepth >= MAX_RELATIONSHIP_DEPTH ? 'Shallow' : ''}Where`;
-    const fieldName = `${conflictingProperties !== null && conflictingProperties !== void 0 && conflictingProperties.has(name) ? '_' : ''}${pascalCase(name)}`;
+    const fieldName = `${conflictingProperties !== null && conflictingProperties !== void 0 && conflictingProperties.has(name) ? '_' : ''}${formatShapeName(name)}`;
     const refItem = getRefOrItemsRef(projectSchema, prop);
     const suffix = refItem ? refItemToShapeName(refItem) : `${shapeName}${fieldName}`;
     return `${prefix}${suffix}`;

package/examples/latest/betzino.json

@@ -7241,7 +7241,7 @@
         ]
       }
     },
-    "TsStaticSite": {
+    "TSStaticSite": {
       "default": {
         "order": [
           "title",
@@ -10317,27 +10317,27 @@
       "shape": "PaginatedList<DismissibleNotification>",
       "description": "Returns a list DismissibleNotification in natural order."
     },
-    "getTsStaticSite": {
-      "args": "TSGetArgs<TsStaticSite>",
+    "getTSStaticSite": {
+      "args": "TSGetArgs<TSStaticSite>",
       "resolver": {
         "name": "shapedb:get",
         "service": "shapedb",
         "options": {},
-        "shapeName": "TsStaticSite"
+        "shapeName": "TSStaticSite"
       },
-      "shape": "TsStaticSite",
-      "description": "Get a TsStaticSite by ID"
+      "shape": "TSStaticSite",
+      "description": "Get a TSStaticSite by ID"
     },
-    "getTsStaticSiteList": {
-      "args": "TSListArgs<TsStaticSite>",
+    "getTSStaticSiteList": {
+      "args": "TSListArgs<TSStaticSite>",
       "resolver": {
         "name": "shapedb:list",
         "service": "shapedb",
         "options": {},
-        "shapeName": "TsStaticSite"
+        "shapeName": "TSStaticSite"
       },
-      "shape": "PaginatedList<TsStaticSite>",
-      "description": "Returns a list TsStaticSite in natural order."
+      "shape": "PaginatedList<TSStaticSite>",
+      "description": "Returns a list TSStaticSite in natural order."
     },
     "getQuickDeposit": {
       "args": "TSGetArgs<QuickDeposit>",
@@ -15699,49 +15699,49 @@
       "shape": "DeleteResult<DismissibleNotification>",
       "description": "Delete DismissibleNotification"
     },
-    "updateTsStaticSite": {
-      "args": "UpdateArgs<TsStaticSite>",
+    "updateTSStaticSite": {
+      "args": "UpdateArgs<TSStaticSite>",
       "resolver": {
         "name": "shapedb:update",
         "service": "shapedb",
         "options": {},
-        "shapeName": "TsStaticSite"
+        "shapeName": "TSStaticSite"
       },
-      "shape": "UpdateResult<TsStaticSite>",
-      "description": "Update TsStaticSite"
+      "shape": "UpdateResult<TSStaticSite>",
+      "description": "Update TSStaticSite"
     },
-    "createTsStaticSite": {
-      "args": "CreateArgs<TsStaticSite>",
+    "createTSStaticSite": {
+      "args": "CreateArgs<TSStaticSite>",
       "resolver": {
         "name": "shapedb:create",
         "service": "shapedb",
         "options": {},
-        "shapeName": "TsStaticSite"
+        "shapeName": "TSStaticSite"
       },
-      "shape": "CreateResult<TsStaticSite>",
-      "description": "Create TsStaticSite"
+      "shape": "CreateResult<TSStaticSite>",
+      "description": "Create TSStaticSite"
     },
-    "duplicateTsStaticSite": {
-      "args": "DuplicateArgs<TsStaticSite>",
+    "duplicateTSStaticSite": {
+      "args": "DuplicateArgs<TSStaticSite>",
       "resolver": {
         "name": "shapedb:duplicate",
         "service": "shapedb",
         "options": {},
-        "shapeName": "TsStaticSite"
+        "shapeName": "TSStaticSite"
       },
-      "shape": "DuplicateResult<TsStaticSite>",
-      "description": "Duplicate TsStaticSite"
+      "shape": "DuplicateResult<TSStaticSite>",
+      "description": "Duplicate TSStaticSite"
     },
-    "deleteTsStaticSite": {
-      "args": "DeleteArgs<TsStaticSite>",
+    "deleteTSStaticSite": {
+      "args": "DeleteArgs<TSStaticSite>",
       "resolver": {
         "name": "shapedb:delete",
         "service": "shapedb",
         "options": {},
-        "shapeName": "TsStaticSite"
+        "shapeName": "TSStaticSite"
       },
-      "shape": "DeleteResult<TsStaticSite>",
-      "description": "Delete TsStaticSite"
+      "shape": "DeleteResult<TSStaticSite>",
+      "description": "Delete TSStaticSite"
     },
     "updateQuickDeposit": {
       "args": "UpdateArgs<QuickDeposit>",
@@ -51496,9 +51496,9 @@
         }
       }
     },
-    "TsStaticSite": {
+    "TSStaticSite": {
       "id": "SITE",
-      "name": "TsStaticSite",
+      "name": "TSStaticSite",
       "title": "Static Site",
       "model": {
         "type": "multiple"
@@ -51511,14 +51511,14 @@
             "title": "Title",
             "@l10n": false,
             "minLength": 1,
-            "@mapping": "shapedb:TsStaticSite.Ski9jLuXg"
+            "@mapping": "shapedb:TSStaticSite.Ski9jLuXg"
           },
           "baseUrl": {
             "type": "string",
             "title": "Base URL",
             "@l10n": false,
             "minLength": 1,
-            "@mapping": "shapedb:TsStaticSite.Bk3tNmrfE"
+            "@mapping": "shapedb:TSStaticSite.Bk3tNmrfE"
           },
           "provider": {
             "type": "string",
@@ -51563,14 +51563,14 @@
                 "title": "Vercel"
               }
             ],
-            "@mapping": "shapedb:TsStaticSite.SkwbT2hqe"
+            "@mapping": "shapedb:TSStaticSite.SkwbT2hqe"
           },
           "idKey": {
             "type": "string",
             "title": "Id Key",
             "@l10n": false,
             "minLength": 1,
-            "@mapping": "shapedb:TsStaticSite.SyRhi8_me"
+            "@mapping": "shapedb:TSStaticSite.SyRhi8_me"
           },
           "secretKey": {
             "type": "string",
@@ -51578,43 +51578,43 @@
             "@l10n": false,
             "@sensitive": true,
             "minLength": 1,
-            "@mapping": "shapedb:TsStaticSite.BkIajLdXl"
+            "@mapping": "shapedb:TSStaticSite.BkIajLdXl"
           },
           "destination": {
             "type": "string",
             "title": "Destination",
             "@l10n": false,
             "minLength": 1,
-            "@mapping": "shapedb:TsStaticSite.Hk6TsIdXl"
+            "@mapping": "shapedb:TSStaticSite.Hk6TsIdXl"
           },
           "privateAcl": {
             "type": "boolean",
             "title": "Private ACL",
             "@l10n": false,
-            "@mapping": "shapedb:TsStaticSite.ByFe48wWU"
+            "@mapping": "shapedb:TSStaticSite.ByFe48wWU"
           },
           "environmentVariables": {
             "type": "array",
             "title": "Environment Variables",
             "@l10n": false,
             "items": {
-              "$ref": "#/shapes/TsStaticSiteEnvironmentVariables/schema"
+              "$ref": "#/shapes/TSStaticSiteEnvironmentVariables/schema"
             },
-            "@mapping": "shapedb:TsStaticSite.9fj4UiNxY"
+            "@mapping": "shapedb:TSStaticSite.9fj4UiNxY"
           },
           "triggers": {
             "type": "array",
             "title": "Publish Triggers",
             "@l10n": false,
             "items": {
-              "$ref": "#/shapes/TsStaticSiteTriggers/schema"
+              "$ref": "#/shapes/TSStaticSiteTriggers/schema"
             }
           },
           "templateHash": {
             "type": "string",
             "title": "Template Hash",
             "@l10n": false,
-            "@mapping": "shapedb:TsStaticSite.S1QA3GYI8"
+            "@mapping": "shapedb:TSStaticSite.S1QA3GYI8"
           },
           "_id": {
             "title": "Id",
@@ -51692,9 +51692,9 @@
         ]
       }
     },
-    "TsStaticSiteEnvironmentVariables": {
+    "TSStaticSiteEnvironmentVariables": {
       "id": "9fj4UiNxY",
-      "name": "TsStaticSiteEnvironmentVariables",
+      "name": "TSStaticSiteEnvironmentVariables",
       "title": "Static Site EnvironmentVariables",
       "schema": {
         "type": "object",
@@ -51702,19 +51702,19 @@
           "name": {
             "type": "string",
             "title": "Name",
-            "@mapping": "shapedb:TsStaticSite.J8sbHgfdI"
+            "@mapping": "shapedb:TSStaticSite.J8sbHgfdI"
           },
           "value": {
             "type": "string",
             "title": "Value",
-            "@mapping": "shapedb:TsStaticSite.ndhh88DvG"
+            "@mapping": "shapedb:TSStaticSite.ndhh88DvG"
           }
         }
       }
     },
-    "TsStaticSiteTriggers": {
-      "id": "TsStaticSiteTriggers",
-      "name": "TsStaticSiteTriggers",
+    "TSStaticSiteTriggers": {
+      "id": "TSStaticSiteTriggers",
+      "name": "TSStaticSiteTriggers",
       "title": "Static Site Triggers",
       "schema": {
         "type": "object",