@skmtc/core 0.0.231 → 0.0.233

package/esm/mod.d.ts

@@ -52,6 +52,7 @@ export * from './typescript/EntityType.js';
 export * from './typescript/FunctionParameter.js';
 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';

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,4BAA4B,CAAA;AAC1C,cAAc,mCAAmC,CAAA;AACjD,cAAc,6BAA6B,CAAA;AAC3C,cAAc,2BAA2B,CAAA;AACzC,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,4BAA4B,CAAA;AAC1C,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"}

package/esm/mod.js

@@ -52,6 +52,7 @@ export * from './typescript/EntityType.js';
 export * from './typescript/FunctionParameter.js';
 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';

package/esm/typescript/FunctionParameter.d.ts

@@ -2,7 +2,7 @@ import type { TypeSystemObject, TypeSystemValue } from '../types/TypeSystem.js';
 import type { Definition } from '../dsl/Definition.js';
 type CreateArgs = {
     name?: string;
-    typeDefiniton: Definition<TypeSystemValue>;
+    typeDefinition: Definition<TypeSystemValue>;
     destructure: boolean;
     required?: boolean;
 };
@@ -12,12 +12,12 @@ type VoidParameter = {
 };
 type DestructuredParameter = {
     type: 'destructured';
-    typeDefiniton: Definition<TypeSystemObject>;
+    typeDefinition: Definition<TypeSystemObject>;
 };
 type RegularParameter = {
     type: 'regular';
     name: string;
-    typeDefiniton: Definition<TypeSystemValue>;
+    typeDefinition: Definition<TypeSystemValue>;
     required: boolean;
 };
 export declare class FunctionParameter {

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,aAAa,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC1C,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,aAAa,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAA;CAC5C,CAAA;AACD,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC1C,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,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"}

package/esm/typescript/FunctionParameter.js

@@ -10,21 +10,21 @@ export class FunctionParameter {
         });
         // @TODO It might be possible to simplify this by adding entityType
         // to Definition as one its generic parameter types
-        if (args.typeDefiniton.identifier.entityType.type === 'value') {
+        if (args.typeDefinition.identifier.entityType.type === 'value') {
             throw new Error('Value identifiers cannot be used in type definitions');
         }
         this.properties = match(args)
-            .with({ typeDefiniton: { value: { type: 'void' } } }, () => ({
+            .with({ typeDefinition: { value: { type: 'void' } } }, () => ({
             type: 'void'
         }))
-            .with({ typeDefiniton: { value: { type: 'object' }, destructure: true } }, ({ typeDefiniton }) => ({
+            .with({ typeDefinition: { value: { type: 'object' } }, destructure: true }, ({ typeDefinition }) => ({
             type: 'destructured',
-            typeDefiniton
+            typeDefinition
         }))
-            .with({ name: P.string }, ({ typeDefiniton, name, required }) => ({
+            .with({ name: P.string }, ({ typeDefinition, name, required }) => ({
             type: 'regular',
             name,
-            typeDefiniton,
+            typeDefinition,
             required: required ?? false
         }))
             .otherwise(() => {
@@ -35,9 +35,9 @@ export class FunctionParameter {
         if (this.properties.type === 'void') {
             return this;
         }
-        invariant(this.properties.typeDefiniton.value.type === 'object', 'Only object types can be destructured');
+        invariant(this.properties.typeDefinition.value.type === 'object', 'Only object types can be destructured');
         return new FunctionParameter({
-            typeDefiniton: this.properties.typeDefiniton,
+            typeDefinition: this.properties.typeDefinition,
             destructure: true
         });
     }
@@ -45,8 +45,8 @@ export class FunctionParameter {
         return match(this.properties)
             .with({ type: 'void' }, () => [])
             .with({ type: 'regular' }, ({ name }) => [`${name}`])
-            .with({ type: 'destructured' }, ({ typeDefiniton }) => {
-            return toPropertyNames(typeDefiniton.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
+            .with({ type: 'destructured' }, ({ typeDefinition }) => {
+            return toPropertyNames(typeDefinition.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
         })
             .otherwise(() => {
             throw new Error('Invalid parameter');
@@ -58,8 +58,8 @@ export class FunctionParameter {
             .with({ type: 'regular' }, ({ name }) => {
             return `${name}`;
         })
-            .with({ type: 'destructured' }, ({ typeDefiniton }) => {
-            const propertyNames = toPropertyNames(typeDefiniton.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
+            .with({ type: 'destructured' }, ({ typeDefinition }) => {
+            const propertyNames = toPropertyNames(typeDefinition.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
             return `{${propertyNames.join(', ')}}`;
         })
             .otherwise(() => {
@@ -69,12 +69,12 @@ export class FunctionParameter {
     toString() {
         return match(this.properties)
             .with({ type: 'void' }, () => '')
-            .with({ type: 'regular' }, ({ name, typeDefiniton, required }) => {
-            return `${name}${required ? '' : '?'}: ${typeDefiniton.identifier}`;
+            .with({ type: 'regular' }, ({ name, typeDefinition, required }) => {
+            return `${name}${required ? '' : '?'}: ${typeDefinition.identifier}`;
         })
-            .with({ type: 'destructured' }, ({ typeDefiniton }) => {
-            const propertyNames = toPropertyNames(typeDefiniton.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
-            return `{${propertyNames.join(', ')}}: ${typeDefiniton.identifier}`;
+            .with({ type: 'destructured' }, ({ typeDefinition }) => {
+            const propertyNames = toPropertyNames(typeDefinition.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
+            return `{${propertyNames.join(', ')}}: ${typeDefinition.identifier}`;
         })
             .otherwise(() => {
             throw new Error('Invalid parameter');

package/esm/typescript/PathParams.d.ts

@@ -0,0 +1,23 @@
+import type { CoreContext } from '../context/CoreContext.js';
+import type { ContentSettings } from '../dsl/ContentSettings.js';
+import { Definition } from '../dsl/Definition.js';
+import type { OasObject } from '../oas/object/Object.js';
+import type { TypeSystemArgs, TypeSystemValue } from '../types/TypeSystem.js';
+import { FunctionParameter } from './FunctionParameter.js';
+type ConstructorArgs = {
+    context: CoreContext;
+    name: string;
+    objectSchema: OasObject;
+    settings: ContentSettings;
+    pathTemplate: string;
+    toValue: (args: TypeSystemArgs) => TypeSystemValue;
+};
+export declare class PathParams {
+    context: CoreContext;
+    typeDefinition: Definition<TypeSystemValue>;
+    parameter: FunctionParameter;
+    path: string;
+    constructor({ context, name, objectSchema, settings, pathTemplate, toValue }: ConstructorArgs);
+}
+export {};
+//# sourceMappingURL=PathParams.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"PathParams.d.ts","sourceRoot":"","sources":["../../src/typescript/PathParams.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAG1D,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,WAAW,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,SAAS,CAAA;IACvB,QAAQ,EAAE,eAAe,CAAA;IACzB,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,eAAe,CAAA;CACnD,CAAA;AAED,qBAAa,UAAU;IACrB,OAAO,EAAE,WAAW,CAAA;IACpB,cAAc,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC3C,SAAS,EAAE,iBAAiB,CAAA;IAC5B,IAAI,EAAE,MAAM,CAAA;gBAEA,EACV,OAAO,EACP,IAAI,EACJ,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,OAAO,EACR,EAAE,eAAe;CA6BnB"}

package/esm/typescript/PathParams.js

@@ -0,0 +1,55 @@
+import { Definition } from '../dsl/Definition.js';
+import { Identifier } from '../dsl/Identifier.js';
+import { capitalize } from '../helpers/strings.js';
+import { FunctionParameter } from './FunctionParameter.js';
+import { toPathTemplate } from './toPathTemplate.js';
+export class PathParams {
+    constructor({ context, name, objectSchema, settings, pathTemplate, toValue }) {
+        Object.defineProperty(this, "context", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "typeDefinition", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "parameter", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "path", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.context = context;
+        this.typeDefinition = new Definition({
+            context,
+            identifier: Identifier.createType(capitalize(`${settings.name}Params`)),
+            value: toValue({
+                context,
+                schema: objectSchema,
+                destinationPath: settings.exportPath,
+                required: true
+            })
+        });
+        this.parameter = new FunctionParameter({
+            name,
+            typeDefinition: this.typeDefinition,
+            destructure: !name,
+            required: true
+        });
+        const queryArg = this.parameter.properties.type === 'regular'
+            ? this.parameter.properties.name
+            : undefined;
+        // @TODO Reconcile pathTemplate with params
+        this.path = toPathTemplate(pathTemplate, queryArg);
+    }
+}

package/package.json

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

package/script/mod.d.ts

@@ -52,6 +52,7 @@ export * from './typescript/EntityType.js';
 export * from './typescript/FunctionParameter.js';
 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';

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,4BAA4B,CAAA;AAC1C,cAAc,mCAAmC,CAAA;AACjD,cAAc,6BAA6B,CAAA;AAC3C,cAAc,2BAA2B,CAAA;AACzC,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,4BAA4B,CAAA;AAC1C,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"}

package/script/mod.js

@@ -68,6 +68,7 @@ __exportStar(require("./typescript/EntityType.js"), exports);
 __exportStar(require("./typescript/FunctionParameter.js"), exports);
 __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);

package/script/typescript/FunctionParameter.d.ts

@@ -2,7 +2,7 @@ import type { TypeSystemObject, TypeSystemValue } from '../types/TypeSystem.js';
 import type { Definition } from '../dsl/Definition.js';
 type CreateArgs = {
     name?: string;
-    typeDefiniton: Definition<TypeSystemValue>;
+    typeDefinition: Definition<TypeSystemValue>;
     destructure: boolean;
     required?: boolean;
 };
@@ -12,12 +12,12 @@ type VoidParameter = {
 };
 type DestructuredParameter = {
     type: 'destructured';
-    typeDefiniton: Definition<TypeSystemObject>;
+    typeDefinition: Definition<TypeSystemObject>;
 };
 type RegularParameter = {
     type: 'regular';
     name: string;
-    typeDefiniton: Definition<TypeSystemValue>;
+    typeDefinition: Definition<TypeSystemValue>;
     required: boolean;
 };
 export declare class FunctionParameter {

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,aAAa,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC1C,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,aAAa,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAA;CAC5C,CAAA;AACD,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC1C,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,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"}

package/script/typescript/FunctionParameter.js

@@ -16,21 +16,21 @@ class FunctionParameter {
         });
         // @TODO It might be possible to simplify this by adding entityType
         // to Definition as one its generic parameter types
-        if (args.typeDefiniton.identifier.entityType.type === 'value') {
+        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({ typeDefiniton: { value: { type: 'void' } } }, () => ({
+            .with({ typeDefinition: { value: { type: 'void' } } }, () => ({
             type: 'void'
         }))
-            .with({ typeDefiniton: { value: { type: 'object' }, destructure: true } }, ({ typeDefiniton }) => ({
+            .with({ typeDefinition: { value: { type: 'object' } }, destructure: true }, ({ typeDefinition }) => ({
             type: 'destructured',
-            typeDefiniton
+            typeDefinition
         }))
-            .with({ name: ts_pattern_1.P.string }, ({ typeDefiniton, name, required }) => ({
+            .with({ name: ts_pattern_1.P.string }, ({ typeDefinition, name, required }) => ({
             type: 'regular',
             name,
-            typeDefiniton,
+            typeDefinition,
             required: required ?? false
         }))
             .otherwise(() => {
@@ -41,9 +41,9 @@ class FunctionParameter {
         if (this.properties.type === 'void') {
             return this;
         }
-        (0, tiny_invariant_1.default)(this.properties.typeDefiniton.value.type === 'object', 'Only object types can be destructured');
+        (0, tiny_invariant_1.default)(this.properties.typeDefinition.value.type === 'object', 'Only object types can be destructured');
         return new FunctionParameter({
-            typeDefiniton: this.properties.typeDefiniton,
+            typeDefinition: this.properties.typeDefinition,
             destructure: true
         });
     }
@@ -51,8 +51,8 @@ class FunctionParameter {
         return (0, ts_pattern_1.match)(this.properties)
             .with({ type: 'void' }, () => [])
             .with({ type: 'regular' }, ({ name }) => [`${name}`])
-            .with({ type: 'destructured' }, ({ typeDefiniton }) => {
-            return toPropertyNames(typeDefiniton.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
+            .with({ type: 'destructured' }, ({ typeDefinition }) => {
+            return toPropertyNames(typeDefinition.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
         })
             .otherwise(() => {
             throw new Error('Invalid parameter');
@@ -64,8 +64,8 @@ class FunctionParameter {
             .with({ type: 'regular' }, ({ name }) => {
             return `${name}`;
         })
-            .with({ type: 'destructured' }, ({ typeDefiniton }) => {
-            const propertyNames = toPropertyNames(typeDefiniton.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
+            .with({ type: 'destructured' }, ({ typeDefinition }) => {
+            const propertyNames = toPropertyNames(typeDefinition.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
             return `{${propertyNames.join(', ')}}`;
         })
             .otherwise(() => {
@@ -75,12 +75,12 @@ class FunctionParameter {
     toString() {
         return (0, ts_pattern_1.match)(this.properties)
             .with({ type: 'void' }, () => '')
-            .with({ type: 'regular' }, ({ name, typeDefiniton, required }) => {
-            return `${name}${required ? '' : '?'}: ${typeDefiniton.identifier}`;
+            .with({ type: 'regular' }, ({ name, typeDefinition, required }) => {
+            return `${name}${required ? '' : '?'}: ${typeDefinition.identifier}`;
         })
-            .with({ type: 'destructured' }, ({ typeDefiniton }) => {
-            const propertyNames = toPropertyNames(typeDefiniton.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
-            return `{${propertyNames.join(', ')}}: ${typeDefiniton.identifier}`;
+            .with({ type: 'destructured' }, ({ typeDefinition }) => {
+            const propertyNames = toPropertyNames(typeDefinition.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
+            return `{${propertyNames.join(', ')}}: ${typeDefinition.identifier}`;
         })
             .otherwise(() => {
             throw new Error('Invalid parameter');

package/script/typescript/PathParams.d.ts

@@ -0,0 +1,23 @@
+import type { CoreContext } from '../context/CoreContext.js';
+import type { ContentSettings } from '../dsl/ContentSettings.js';
+import { Definition } from '../dsl/Definition.js';
+import type { OasObject } from '../oas/object/Object.js';
+import type { TypeSystemArgs, TypeSystemValue } from '../types/TypeSystem.js';
+import { FunctionParameter } from './FunctionParameter.js';
+type ConstructorArgs = {
+    context: CoreContext;
+    name: string;
+    objectSchema: OasObject;
+    settings: ContentSettings;
+    pathTemplate: string;
+    toValue: (args: TypeSystemArgs) => TypeSystemValue;
+};
+export declare class PathParams {
+    context: CoreContext;
+    typeDefinition: Definition<TypeSystemValue>;
+    parameter: FunctionParameter;
+    path: string;
+    constructor({ context, name, objectSchema, settings, pathTemplate, toValue }: ConstructorArgs);
+}
+export {};
+//# sourceMappingURL=PathParams.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"PathParams.d.ts","sourceRoot":"","sources":["../../src/typescript/PathParams.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAG1D,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,WAAW,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,SAAS,CAAA;IACvB,QAAQ,EAAE,eAAe,CAAA;IACzB,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,eAAe,CAAA;CACnD,CAAA;AAED,qBAAa,UAAU;IACrB,OAAO,EAAE,WAAW,CAAA;IACpB,cAAc,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC3C,SAAS,EAAE,iBAAiB,CAAA;IAC5B,IAAI,EAAE,MAAM,CAAA;gBAEA,EACV,OAAO,EACP,IAAI,EACJ,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,OAAO,EACR,EAAE,eAAe;CA6BnB"}

package/script/typescript/PathParams.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PathParams = void 0;
+const Definition_js_1 = require("../dsl/Definition.js");
+const Identifier_js_1 = require("../dsl/Identifier.js");
+const strings_js_1 = require("../helpers/strings.js");
+const FunctionParameter_js_1 = require("./FunctionParameter.js");
+const toPathTemplate_js_1 = require("./toPathTemplate.js");
+class PathParams {
+    constructor({ context, name, objectSchema, settings, pathTemplate, toValue }) {
+        Object.defineProperty(this, "context", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "typeDefinition", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "parameter", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "path", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.context = context;
+        this.typeDefinition = new Definition_js_1.Definition({
+            context,
+            identifier: Identifier_js_1.Identifier.createType((0, strings_js_1.capitalize)(`${settings.name}Params`)),
+            value: toValue({
+                context,
+                schema: objectSchema,
+                destinationPath: settings.exportPath,
+                required: true
+            })
+        });
+        this.parameter = new FunctionParameter_js_1.FunctionParameter({
+            name,
+            typeDefinition: this.typeDefinition,
+            destructure: !name,
+            required: true
+        });
+        const queryArg = this.parameter.properties.type === 'regular'
+            ? this.parameter.properties.name
+            : undefined;
+        // @TODO Reconcile pathTemplate with params
+        this.path = (0, toPathTemplate_js_1.toPathTemplate)(pathTemplate, queryArg);
+    }
+}
+exports.PathParams = PathParams;