@skmtc/core 0.0.253 → 0.0.254

package/esm/mod.d.ts

@@ -54,7 +54,6 @@ export * from './typescript/identifiers.js';
 export * from './typescript/keyValues.js';
 export * from './typescript/PathParams.js';
 export * from './typescript/ReactRouterPathParams.js';
-export * from './typescript/toDestructuredObject.js';
 export * from './typescript/toOperationArg.js';
 export * from './typescript/toOperationResponse.js';
 export * from './typescript/toPathTemplate.js';

package/esm/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,CAAC;AAC7B,cAAc,0BAA0B,CAAA;AACxC,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA;AAClC,cAAc,eAAe,CAAA;AAC7B,cAAc,oBAAoB,CAAA;AAClC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,yBAAyB,CAAA;AACvC,cAAc,sCAAsC,CAAA;AACpD,cAAc,4BAA4B,CAAA;AAC1C,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,kBAAkB,CAAA;AAChC,cAAc,kCAAkC,CAAA;AAChD,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,kBAAkB,CAAA;AAChC,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA;AAChC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,2BAA2B,CAAA;AACzC,cAAc,0BAA0B,CAAA;AACxC,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,mCAAmC,CAAA;AACjD,cAAc,6BAA6B,CAAA;AAC3C,cAAc,2BAA2B,CAAA;AACzC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,uCAAuC,CAAA;AACrD,cAAc,sCAAsC,CAAA;AACpD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,qCAAqC,CAAA;AACnD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,iCAAiC,CAAA"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,CAAC;AAC7B,cAAc,0BAA0B,CAAA;AACxC,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA;AAClC,cAAc,eAAe,CAAA;AAC7B,cAAc,oBAAoB,CAAA;AAClC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,yBAAyB,CAAA;AACvC,cAAc,sCAAsC,CAAA;AACpD,cAAc,4BAA4B,CAAA;AAC1C,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,kBAAkB,CAAA;AAChC,cAAc,kCAAkC,CAAA;AAChD,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,kBAAkB,CAAA;AAChC,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA;AAChC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,2BAA2B,CAAA;AACzC,cAAc,0BAA0B,CAAA;AACxC,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,mCAAmC,CAAA;AACjD,cAAc,6BAA6B,CAAA;AAC3C,cAAc,2BAA2B,CAAA;AACzC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,uCAAuC,CAAA;AACrD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,qCAAqC,CAAA;AACnD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,iCAAiC,CAAA"}

package/esm/mod.js

@@ -54,7 +54,6 @@ export * from './typescript/identifiers.js';
 export * from './typescript/keyValues.js';
 export * from './typescript/PathParams.js';
 export * from './typescript/ReactRouterPathParams.js';
-export * from './typescript/toDestructuredObject.js';
 export * from './typescript/toOperationArg.js';
 export * from './typescript/toOperationResponse.js';
 export * from './typescript/toPathTemplate.js';

package/esm/typescript/DestructuredObject.d.ts

@@ -0,0 +1,15 @@
+import type { TypeSystemObject } from '../types/TypeSystem.js';
+export declare class DestructuredObject {
+    typeSystemObject: TypeSystemObject;
+    properties: ObjectProperty[];
+    constructor(typeSystemObject: TypeSystemObject);
+    toString(): string;
+}
+export declare class ObjectProperty {
+    name: string;
+    isValid: boolean;
+    canonicalName: string;
+    constructor(name: string);
+    toString(): string;
+}
+//# sourceMappingURL=DestructuredObject.d.ts.map

package/esm/typescript/DestructuredObject.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DestructuredObject.d.ts","sourceRoot":"","sources":["../../src/typescript/DestructuredObject.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAG9D,qBAAa,kBAAkB;IAC7B,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,UAAU,EAAE,cAAc,EAAE,CAAA;gBAChB,gBAAgB,EAAE,gBAAgB;IAQ9C,QAAQ,IAAI,MAAM;CAGnB;AAED,qBAAa,cAAc;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;gBACT,IAAI,EAAE,MAAM;IAYxB,QAAQ,IAAI,MAAM;CAGnB"}

package/esm/typescript/DestructuredObject.js

@@ -0,0 +1,54 @@
+import { isIdentifierName } from '@babel/helper-validator-identifier';
+import { camelCase } from 'lodash-es';
+export class DestructuredObject {
+    constructor(typeSystemObject) {
+        Object.defineProperty(this, "typeSystemObject", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "properties", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.typeSystemObject = typeSystemObject;
+        this.properties = Object.keys(typeSystemObject.objectProperties?.properties ?? {}).map(name => new ObjectProperty(name));
+    }
+    toString() {
+        return `{${this.properties.map(property => `${property}`).join(',\n')}}`;
+    }
+}
+export class ObjectProperty {
+    constructor(name) {
+        Object.defineProperty(this, "name", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "isValid", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "canonicalName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.name = name;
+        this.isValid = isIdentifierName(name);
+        this.canonicalName = this.isValid ? name : camelCase(name);
+        if (!isIdentifierName(this.canonicalName)) {
+            throw new Error(`Property name '${name}' is not a valid identifier and cannot be converted to a canonical name`);
+        }
+    }
+    toString() {
+        return this.isValid ? this.name : `'${this.name}': ${this.canonicalName}`;
+    }
+}

package/esm/typescript/FunctionParameter.d.ts

@@ -1,5 +1,6 @@
 import type { TypeSystemObject, TypeSystemValue } from '../types/TypeSystem.js';
 import type { Definition } from '../dsl/Definition.js';
+import type { Stringable } from '../dsl/Stringable.js';
 type CreateArgs = {
     name?: string;
     typeDefinition: Definition<TypeSystemValue>;
@@ -24,8 +25,7 @@ export declare class FunctionParameter {
     properties: ParameterProperties;
     constructor(args: CreateArgs);
     toDestructured(): FunctionParameter;
-    toPropertyList(): string[];
-    toInbound(): string;
+    toInbound(): Stringable;
     toString(): string;
 }
 export {};

package/esm/typescript/FunctionParameter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FunctionParameter.d.ts","sourceRoot":"","sources":["../../src/typescript/FunctionParameter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAE/E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEtD,KAAK,UAAU,GAAG;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,cAAc,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC3C,WAAW,EAAE,OAAO,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,mBAAmB,GACpB,aAAa,GACb,qBAAqB,GACrB,gBAAgB,CAAA;AAEpB,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,cAAc,CAAA;IACpB,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAA;CAC7C,CAAA;AACD,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC3C,QAAQ,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,qBAAa,iBAAiB;IAC5B,UAAU,EAAE,mBAAmB,CAAA;gBAEnB,IAAI,EAAE,UAAU;IA6B5B,cAAc,IAAI,iBAAiB;IAgBnC,cAAc,IAAI,MAAM,EAAE;IAc1B,SAAS,IAAI,MAAM;IAkBnB,QAAQ,IAAI,MAAM;CAiBnB"}
+{"version":3,"file":"FunctionParameter.d.ts","sourceRoot":"","sources":["../../src/typescript/FunctionParameter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAE/E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEtD,KAAK,UAAU,GAAG;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,cAAc,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC3C,WAAW,EAAE,OAAO,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,mBAAmB,GACpB,aAAa,GACb,qBAAqB,GACrB,gBAAgB,CAAA;AAEpB,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,cAAc,CAAA;IACpB,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAA;CAC7C,CAAA;AACD,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC3C,QAAQ,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,qBAAa,iBAAiB;IAC5B,UAAU,EAAE,mBAAmB,CAAA;gBAEnB,IAAI,EAAE,UAAU;IAuB5B,cAAc,IAAI,iBAAiB;IAgBnC,SAAS,IAAI,UAAU;IAUvB,QAAQ,IAAI,MAAM;CAWnB"}

package/esm/typescript/FunctionParameter.js

@@ -1,5 +1,6 @@
 import { P, match } from 'ts-pattern';
 import invariant from 'tiny-invariant';
+import { DestructuredObject } from './DestructuredObject.js';
 export class FunctionParameter {
     constructor(args) {
         Object.defineProperty(this, "properties", {
@@ -8,11 +9,6 @@ export class FunctionParameter {
             writable: true,
             value: void 0
         });
-        // @TODO It might be possible to simplify this by adding entityType
-        // to Definition as one its generic parameter types
-        if (args.typeDefinition.identifier.entityType.type === 'value') {
-            throw new Error('Value identifiers cannot be used in type definitions');
-        }
         this.properties = match(args)
             .with({ typeDefinition: { value: { type: 'void' } } }, () => ({
             type: 'void'
@@ -41,30 +37,14 @@ export class FunctionParameter {
             destructure: true
         });
     }
-    toPropertyList() {
-        return match(this.properties)
-            .with({ type: 'void' }, () => [])
-            .with({ type: 'regular' }, ({ name }) => [`${name}`])
-            .with({ type: 'destructured' }, ({ typeDefinition }) => {
-            return toPropertyNames(typeDefinition.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
-        })
-            .otherwise(() => {
-            throw new Error('Invalid parameter');
-        });
-    }
     toInbound() {
         return match(this.properties)
             .with({ type: 'void' }, () => '')
-            .with({ type: 'regular' }, ({ name }) => {
-            return `${name}`;
-        })
+            .with({ type: 'regular' }, ({ name }) => `${name}`)
             .with({ type: 'destructured' }, ({ typeDefinition }) => {
-            const propertyNames = toPropertyNames(typeDefinition.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
-            return `{${propertyNames.join(', ')}}`;
+            return new DestructuredObject(typeDefinition.value);
         })
-            .otherwise(() => {
-            throw new Error('Invalid parameter');
-        });
+            .exhaustive();
     }
     toString() {
         return match(this.properties)
@@ -73,15 +53,8 @@ export class FunctionParameter {
             return `${name}${required ? '' : '?'}: ${typeDefinition.identifier}`;
         })
             .with({ type: 'destructured' }, ({ typeDefinition }) => {
-            const propertyNames = toPropertyNames(typeDefinition.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
-            return `{${propertyNames.join(', ')}}: ${typeDefinition.identifier}`;
+            return new DestructuredObject(typeDefinition.value).toString();
         })
-            .otherwise(() => {
-            throw new Error('Invalid parameter');
-        });
+            .exhaustive();
     }
 }
-const toPropertyNames = (value) => {
-    invariant(value.objectProperties, 'Only object types can be destructured');
-    return Object.keys(value.objectProperties.properties);
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skmtc/core",
-  "version": "0.0.253",
+  "version": "0.0.254",
   "main": "./script/mod.js",
   "module": "./esm/mod.js",
   "exports": {

package/script/mod.d.ts

@@ -54,7 +54,6 @@ export * from './typescript/identifiers.js';
 export * from './typescript/keyValues.js';
 export * from './typescript/PathParams.js';
 export * from './typescript/ReactRouterPathParams.js';
-export * from './typescript/toDestructuredObject.js';
 export * from './typescript/toOperationArg.js';
 export * from './typescript/toOperationResponse.js';
 export * from './typescript/toPathTemplate.js';

package/script/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,CAAC;AAC7B,cAAc,0BAA0B,CAAA;AACxC,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA;AAClC,cAAc,eAAe,CAAA;AAC7B,cAAc,oBAAoB,CAAA;AAClC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,yBAAyB,CAAA;AACvC,cAAc,sCAAsC,CAAA;AACpD,cAAc,4BAA4B,CAAA;AAC1C,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,kBAAkB,CAAA;AAChC,cAAc,kCAAkC,CAAA;AAChD,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,kBAAkB,CAAA;AAChC,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA;AAChC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,2BAA2B,CAAA;AACzC,cAAc,0BAA0B,CAAA;AACxC,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,mCAAmC,CAAA;AACjD,cAAc,6BAA6B,CAAA;AAC3C,cAAc,2BAA2B,CAAA;AACzC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,uCAAuC,CAAA;AACrD,cAAc,sCAAsC,CAAA;AACpD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,qCAAqC,CAAA;AACnD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,iCAAiC,CAAA"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,CAAC;AAC7B,cAAc,0BAA0B,CAAA;AACxC,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA;AAClC,cAAc,eAAe,CAAA;AAC7B,cAAc,oBAAoB,CAAA;AAClC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,yBAAyB,CAAA;AACvC,cAAc,sCAAsC,CAAA;AACpD,cAAc,4BAA4B,CAAA;AAC1C,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,kBAAkB,CAAA;AAChC,cAAc,kCAAkC,CAAA;AAChD,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,kBAAkB,CAAA;AAChC,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA;AAChC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,2BAA2B,CAAA;AACzC,cAAc,0BAA0B,CAAA;AACxC,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,mCAAmC,CAAA;AACjD,cAAc,6BAA6B,CAAA;AAC3C,cAAc,2BAA2B,CAAA;AACzC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,uCAAuC,CAAA;AACrD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,qCAAqC,CAAA;AACnD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,iCAAiC,CAAA"}

package/script/mod.js

@@ -70,7 +70,6 @@ __exportStar(require("./typescript/identifiers.js"), exports);
 __exportStar(require("./typescript/keyValues.js"), exports);
 __exportStar(require("./typescript/PathParams.js"), exports);
 __exportStar(require("./typescript/ReactRouterPathParams.js"), exports);
-__exportStar(require("./typescript/toDestructuredObject.js"), exports);
 __exportStar(require("./typescript/toOperationArg.js"), exports);
 __exportStar(require("./typescript/toOperationResponse.js"), exports);
 __exportStar(require("./typescript/toPathTemplate.js"), exports);

package/script/typescript/DestructuredObject.d.ts

@@ -0,0 +1,15 @@
+import type { TypeSystemObject } from '../types/TypeSystem.js';
+export declare class DestructuredObject {
+    typeSystemObject: TypeSystemObject;
+    properties: ObjectProperty[];
+    constructor(typeSystemObject: TypeSystemObject);
+    toString(): string;
+}
+export declare class ObjectProperty {
+    name: string;
+    isValid: boolean;
+    canonicalName: string;
+    constructor(name: string);
+    toString(): string;
+}
+//# sourceMappingURL=DestructuredObject.d.ts.map

package/script/typescript/DestructuredObject.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DestructuredObject.d.ts","sourceRoot":"","sources":["../../src/typescript/DestructuredObject.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAG9D,qBAAa,kBAAkB;IAC7B,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,UAAU,EAAE,cAAc,EAAE,CAAA;gBAChB,gBAAgB,EAAE,gBAAgB;IAQ9C,QAAQ,IAAI,MAAM;CAGnB;AAED,qBAAa,cAAc;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;gBACT,IAAI,EAAE,MAAM;IAYxB,QAAQ,IAAI,MAAM;CAGnB"}

package/script/typescript/DestructuredObject.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ObjectProperty = exports.DestructuredObject = void 0;
+const helper_validator_identifier_1 = require("@babel/helper-validator-identifier");
+const lodash_es_1 = require("lodash-es");
+class DestructuredObject {
+    constructor(typeSystemObject) {
+        Object.defineProperty(this, "typeSystemObject", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "properties", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.typeSystemObject = typeSystemObject;
+        this.properties = Object.keys(typeSystemObject.objectProperties?.properties ?? {}).map(name => new ObjectProperty(name));
+    }
+    toString() {
+        return `{${this.properties.map(property => `${property}`).join(',\n')}}`;
+    }
+}
+exports.DestructuredObject = DestructuredObject;
+class ObjectProperty {
+    constructor(name) {
+        Object.defineProperty(this, "name", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "isValid", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "canonicalName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.name = name;
+        this.isValid = (0, helper_validator_identifier_1.isIdentifierName)(name);
+        this.canonicalName = this.isValid ? name : (0, lodash_es_1.camelCase)(name);
+        if (!(0, helper_validator_identifier_1.isIdentifierName)(this.canonicalName)) {
+            throw new Error(`Property name '${name}' is not a valid identifier and cannot be converted to a canonical name`);
+        }
+    }
+    toString() {
+        return this.isValid ? this.name : `'${this.name}': ${this.canonicalName}`;
+    }
+}
+exports.ObjectProperty = ObjectProperty;

package/script/typescript/FunctionParameter.d.ts

@@ -1,5 +1,6 @@
 import type { TypeSystemObject, TypeSystemValue } from '../types/TypeSystem.js';
 import type { Definition } from '../dsl/Definition.js';
+import type { Stringable } from '../dsl/Stringable.js';
 type CreateArgs = {
     name?: string;
     typeDefinition: Definition<TypeSystemValue>;
@@ -24,8 +25,7 @@ export declare class FunctionParameter {
     properties: ParameterProperties;
     constructor(args: CreateArgs);
     toDestructured(): FunctionParameter;
-    toPropertyList(): string[];
-    toInbound(): string;
+    toInbound(): Stringable;
     toString(): string;
 }
 export {};

package/script/typescript/FunctionParameter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FunctionParameter.d.ts","sourceRoot":"","sources":["../../src/typescript/FunctionParameter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAE/E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEtD,KAAK,UAAU,GAAG;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,cAAc,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC3C,WAAW,EAAE,OAAO,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,mBAAmB,GACpB,aAAa,GACb,qBAAqB,GACrB,gBAAgB,CAAA;AAEpB,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,cAAc,CAAA;IACpB,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAA;CAC7C,CAAA;AACD,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC3C,QAAQ,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,qBAAa,iBAAiB;IAC5B,UAAU,EAAE,mBAAmB,CAAA;gBAEnB,IAAI,EAAE,UAAU;IA6B5B,cAAc,IAAI,iBAAiB;IAgBnC,cAAc,IAAI,MAAM,EAAE;IAc1B,SAAS,IAAI,MAAM;IAkBnB,QAAQ,IAAI,MAAM;CAiBnB"}
+{"version":3,"file":"FunctionParameter.d.ts","sourceRoot":"","sources":["../../src/typescript/FunctionParameter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAE/E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEtD,KAAK,UAAU,GAAG;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,cAAc,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC3C,WAAW,EAAE,OAAO,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,mBAAmB,GACpB,aAAa,GACb,qBAAqB,GACrB,gBAAgB,CAAA;AAEpB,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,cAAc,CAAA;IACpB,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAA;CAC7C,CAAA;AACD,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC3C,QAAQ,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,qBAAa,iBAAiB;IAC5B,UAAU,EAAE,mBAAmB,CAAA;gBAEnB,IAAI,EAAE,UAAU;IAuB5B,cAAc,IAAI,iBAAiB;IAgBnC,SAAS,IAAI,UAAU;IAUvB,QAAQ,IAAI,MAAM;CAWnB"}

package/script/typescript/FunctionParameter.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionParameter = void 0;
 const ts_pattern_1 = require("ts-pattern");
 const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
+const DestructuredObject_js_1 = require("./DestructuredObject.js");
 class FunctionParameter {
     constructor(args) {
         Object.defineProperty(this, "properties", {
@@ -14,11 +15,6 @@ class FunctionParameter {
             writable: true,
             value: void 0
         });
-        // @TODO It might be possible to simplify this by adding entityType
-        // to Definition as one its generic parameter types
-        if (args.typeDefinition.identifier.entityType.type === 'value') {
-            throw new Error('Value identifiers cannot be used in type definitions');
-        }
         this.properties = (0, ts_pattern_1.match)(args)
             .with({ typeDefinition: { value: { type: 'void' } } }, () => ({
             type: 'void'
@@ -47,30 +43,14 @@ class FunctionParameter {
             destructure: true
         });
     }
-    toPropertyList() {
-        return (0, ts_pattern_1.match)(this.properties)
-            .with({ type: 'void' }, () => [])
-            .with({ type: 'regular' }, ({ name }) => [`${name}`])
-            .with({ type: 'destructured' }, ({ typeDefinition }) => {
-            return toPropertyNames(typeDefinition.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
-        })
-            .otherwise(() => {
-            throw new Error('Invalid parameter');
-        });
-    }
     toInbound() {
         return (0, ts_pattern_1.match)(this.properties)
             .with({ type: 'void' }, () => '')
-            .with({ type: 'regular' }, ({ name }) => {
-            return `${name}`;
-        })
+            .with({ type: 'regular' }, ({ name }) => `${name}`)
             .with({ type: 'destructured' }, ({ typeDefinition }) => {
-            const propertyNames = toPropertyNames(typeDefinition.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
-            return `{${propertyNames.join(', ')}}`;
+            return new DestructuredObject_js_1.DestructuredObject(typeDefinition.value);
         })
-            .otherwise(() => {
-            throw new Error('Invalid parameter');
-        });
+            .exhaustive();
     }
     toString() {
         return (0, ts_pattern_1.match)(this.properties)
@@ -79,16 +59,9 @@ class FunctionParameter {
             return `${name}${required ? '' : '?'}: ${typeDefinition.identifier}`;
         })
             .with({ type: 'destructured' }, ({ typeDefinition }) => {
-            const propertyNames = toPropertyNames(typeDefinition.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
-            return `{${propertyNames.join(', ')}}: ${typeDefinition.identifier}`;
+            return new DestructuredObject_js_1.DestructuredObject(typeDefinition.value).toString();
         })
-            .otherwise(() => {
-            throw new Error('Invalid parameter');
-        });
+            .exhaustive();
     }
 }
 exports.FunctionParameter = FunctionParameter;
-const toPropertyNames = (value) => {
-    (0, tiny_invariant_1.default)(value.objectProperties, 'Only object types can be destructured');
-    return Object.keys(value.objectProperties.properties);
-};

package/esm/typescript/toDestructuredObject.d.ts

@@ -1,3 +0,0 @@
-import type { TypeSystemValue } from '../types/TypeSystem.js';
-export declare const toDestructuredObject: (value: TypeSystemValue) => string;
-//# sourceMappingURL=toDestructuredObject.d.ts.map

package/esm/typescript/toDestructuredObject.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"toDestructuredObject.d.ts","sourceRoot":"","sources":["../../src/typescript/toDestructuredObject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAE7D,eAAO,MAAM,oBAAoB,UAAW,eAAe,KAAG,MAsB7D,CAAA"}

package/esm/typescript/toDestructuredObject.js

@@ -1,16 +0,0 @@
-export const toDestructuredObject = (value) => {
-    if (value.type === 'void') {
-        return '';
-    }
-    if (value.type !== 'object' || !value.objectProperties) {
-        throw new Error('Only object types can be destructured');
-    }
-    if (value.recordProperties) {
-        throw new Error('Objects with record properties cannot be destructured, yet');
-    }
-    if (!value.objectProperties.properties) {
-        throw new Error('Cannot destructure an object without properties');
-    }
-    const propertyNames = Object.keys(value.objectProperties.properties);
-    return `{${propertyNames.join(', ')}}`;
-};

package/script/typescript/toDestructuredObject.d.ts

@@ -1,3 +0,0 @@
-import type { TypeSystemValue } from '../types/TypeSystem.js';
-export declare const toDestructuredObject: (value: TypeSystemValue) => string;
-//# sourceMappingURL=toDestructuredObject.d.ts.map

package/script/typescript/toDestructuredObject.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"toDestructuredObject.d.ts","sourceRoot":"","sources":["../../src/typescript/toDestructuredObject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAE7D,eAAO,MAAM,oBAAoB,UAAW,eAAe,KAAG,MAsB7D,CAAA"}

package/script/typescript/toDestructuredObject.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.toDestructuredObject = void 0;
-const toDestructuredObject = (value) => {
-    if (value.type === 'void') {
-        return '';
-    }
-    if (value.type !== 'object' || !value.objectProperties) {
-        throw new Error('Only object types can be destructured');
-    }
-    if (value.recordProperties) {
-        throw new Error('Objects with record properties cannot be destructured, yet');
-    }
-    if (!value.objectProperties.properties) {
-        throw new Error('Cannot destructure an object without properties');
-    }
-    const propertyNames = Object.keys(value.objectProperties.properties);
-    return `{${propertyNames.join(', ')}}`;
-};
-exports.toDestructuredObject = toDestructuredObject;