@typespec/openapi3 0.60.0-dev.5 → 0.60.0-dev.6

package/dist/src/cli/actions/convert/generators/generate-types.js

@@ -2,12 +2,141 @@ import { printIdentifier } from "@typespec/compiler";
 import { getDecoratorsForSchema } from "../utils/decorators.js";
 import { getScopeAndName } from "../utils/get-scope-and-name.js";
 import { generateDecorators } from "./generate-decorators.js";
-export function generateTypeFromSchema(schema) {
-    return getTypeFromRefableSchema(schema);
-}
-function getTypeFromRefableSchema(schema) {
-    const hasRef = "$ref" in schema;
-    return hasRef ? getRefName(schema.$ref) : getTypeFromSchema(schema);
+export class SchemaToExpressionGenerator {
+    rootNamespace;
+    constructor(rootNamespace) {
+        this.rootNamespace = rootNamespace;
+    }
+    generateTypeFromRefableSchema(schema, callingScope) {
+        const hasRef = "$ref" in schema;
+        return hasRef
+            ? this.getRefName(schema.$ref, callingScope)
+            : this.getTypeFromSchema(schema, callingScope);
+    }
+    generateArrayType(schema, callingScope) {
+        const items = schema.items;
+        if (!items) {
+            return "unknown[]";
+        }
+        if ("$ref" in items) {
+            return `${this.getRefName(items.$ref, callingScope)}[]`;
+        }
+        // Prettier will get rid of the extra parenthesis for us
+        return `(${this.getTypeFromSchema(items, callingScope)})[]`;
+    }
+    getRefName(ref, callingScope) {
+        const { scope, name } = this.getRefScopeAndName(ref, callingScope);
+        return [...scope, name].join(".");
+    }
+    getRefScopeAndName(ref, callingScope) {
+        const parts = ref.split("/");
+        const name = parts.pop() ?? "";
+        const componentType = parts.pop()?.toLowerCase() ?? "";
+        const scopeAndName = getScopeAndName(name);
+        switch (componentType) {
+            case "schemas":
+                if (callingScope.length) {
+                    /*
+                      Since schemas are generated in the file namespace,
+                      need to reference them against the file namespace
+                      to prevent name collisions.
+                      Example:
+                        namespace Service;
+                        scalar Foo extends string;
+                        namespace Parameters {
+                          model Foo {
+                            @query foo: Service.Foo
+                          }
+                        }
+                    */
+                    scopeAndName.scope.unshift(this.rootNamespace);
+                }
+                break;
+            case "parameters":
+                scopeAndName.scope.unshift("Parameters");
+                break;
+        }
+        return scopeAndName;
+    }
+    getTypeFromSchema(schema, callingScope) {
+        let type = "unknown";
+        if (schema.enum) {
+            type = getEnum(schema.enum);
+        }
+        else if (schema.anyOf) {
+            type = this.getAnyOfType(schema, callingScope);
+        }
+        else if (schema.type === "array") {
+            type = this.generateArrayType(schema, callingScope);
+        }
+        else if (schema.type === "boolean") {
+            type = "boolean";
+        }
+        else if (schema.type === "integer") {
+            type = getIntegerType(schema);
+        }
+        else if (schema.type === "number") {
+            type = getNumberType(schema);
+        }
+        else if (schema.type === "object") {
+            type = this.getObjectType(schema, callingScope);
+        }
+        else if (schema.oneOf) {
+            type = this.getOneOfType(schema, callingScope);
+        }
+        else if (schema.type === "string") {
+            type = getStringType(schema);
+        }
+        if (schema.nullable) {
+            type += ` | null`;
+        }
+        if (schema.default) {
+            type += ` = ${JSON.stringify(schema.default)}`;
+        }
+        return type;
+    }
+    getAnyOfType(schema, callingScope) {
+        const definitions = [];
+        for (const item of schema.anyOf ?? []) {
+            definitions.push(this.generateTypeFromRefableSchema(item, callingScope));
+        }
+        return definitions.join(" | ");
+    }
+    getOneOfType(schema, callingScope) {
+        const definitions = [];
+        for (const item of schema.oneOf ?? []) {
+            definitions.push(this.generateTypeFromRefableSchema(item, callingScope));
+        }
+        return definitions.join(" | ");
+    }
+    getObjectType(schema, callingScope) {
+        // If we have `additionalProperties`, treat that as an 'indexer' and convert to a record.
+        const recordType = typeof schema.additionalProperties === "object"
+            ? `Record<${this.generateTypeFromRefableSchema(schema.additionalProperties, callingScope)}>`
+            : "";
+        if (!schema.properties && recordType) {
+            return recordType;
+        }
+        const requiredProps = schema.required ?? [];
+        const props = [];
+        if (schema.properties) {
+            for (const name of Object.keys(schema.properties)) {
+                const decorators = generateDecorators(getDecoratorsForSchema(schema.properties[name]))
+                    .map((d) => `${d}\n`)
+                    .join("");
+                const isOptional = !requiredProps.includes(name) ? "?" : "";
+                props.push(`${decorators}${printIdentifier(name)}${isOptional}: ${this.generateTypeFromRefableSchema(schema.properties[name], callingScope)}`);
+            }
+        }
+        const propertyCount = Object.keys(props).length;
+        if (recordType && !propertyCount) {
+            return recordType;
+        }
+        else if (recordType && propertyCount) {
+            props.push(`...${recordType}`);
+        }
+        return `{${props.join("; ")}}`;
+    }
 }
 export function getTypeSpecPrimitiveFromSchema(schema) {
     if (schema.type === "boolean") {
@@ -24,107 +153,7 @@ export function getTypeSpecPrimitiveFromSchema(schema) {
     }
     return;
 }
-function getTypeFromSchema(schema) {
-    let type = "unknown";
-    if (schema.enum) {
-        type = getEnum(schema.enum);
-    }
-    else if (schema.anyOf) {
-        type = getAnyOfType(schema);
-    }
-    else if (schema.type === "array") {
-        type = getArrayType(schema);
-    }
-    else if (schema.type === "boolean") {
-        type = "boolean";
-    }
-    else if (schema.type === "integer") {
-        type = getIntegerType(schema);
-    }
-    else if (schema.type === "number") {
-        type = getNumberType(schema);
-    }
-    else if (schema.type === "object") {
-        type = getObjectType(schema);
-    }
-    else if (schema.oneOf) {
-        type = getOneOfType(schema);
-    }
-    else if (schema.type === "string") {
-        type = getStringType(schema);
-    }
-    if (schema.nullable) {
-        type += ` | null`;
-    }
-    if (schema.default) {
-        type += ` = ${JSON.stringify(schema.default)}`;
-    }
-    return type;
-}
-export function getRefName(ref) {
-    const { scope, name } = getRefScopeAndName(ref);
-    return [...scope, name].join(".");
-}
-export function getRefScopeAndName(ref) {
-    const parts = ref.split("/");
-    const name = parts.pop() ?? "";
-    const scopeAndName = getScopeAndName(name);
-    return scopeAndName;
-}
-function getAnyOfType(schema) {
-    const definitions = [];
-    for (const item of schema.anyOf ?? []) {
-        definitions.push(generateTypeFromSchema(item));
-    }
-    return definitions.join(" | ");
-}
-function getOneOfType(schema) {
-    const definitions = [];
-    for (const item of schema.oneOf ?? []) {
-        definitions.push(generateTypeFromSchema(item));
-    }
-    return definitions.join(" | ");
-}
-function getObjectType(schema) {
-    // If we have `additionalProperties`, treat that as an 'indexer' and convert to a record.
-    const recordType = typeof schema.additionalProperties === "object"
-        ? `Record<${getTypeFromRefableSchema(schema.additionalProperties)}>`
-        : "";
-    if (!schema.properties && recordType) {
-        return recordType;
-    }
-    const requiredProps = schema.required ?? [];
-    const props = [];
-    if (schema.properties) {
-        for (const name of Object.keys(schema.properties)) {
-            const decorators = generateDecorators(getDecoratorsForSchema(schema.properties[name]))
-                .map((d) => `${d}\n`)
-                .join("");
-            const isOptional = !requiredProps.includes(name) ? "?" : "";
-            props.push(`${decorators}${printIdentifier(name)}${isOptional}: ${getTypeFromRefableSchema(schema.properties[name])}`);
-        }
-    }
-    const propertyCount = Object.keys(props).length;
-    if (recordType && !propertyCount) {
-        return recordType;
-    }
-    else if (recordType && propertyCount) {
-        props.push(`...${recordType}`);
-    }
-    return `{${props.join("; ")}}`;
-}
-export function getArrayType(schema) {
-    const items = schema.items;
-    if (!items) {
-        return "unknown[]";
-    }
-    if ("$ref" in items) {
-        return `${getRefName(items.$ref)}[]`;
-    }
-    // Prettier will get rid of the extra parenthesis for us
-    return `(${getTypeFromSchema(items)})[]`;
-}
-export function getIntegerType(schema) {
+function getIntegerType(schema) {
     const format = schema.format ?? "";
     switch (format) {
         case "int8":
@@ -142,7 +171,7 @@ export function getIntegerType(schema) {
             return "integer";
     }
 }
-export function getNumberType(schema) {
+function getNumberType(schema) {
     const format = schema.format ?? "";
     switch (format) {
         case "decimal":
@@ -157,7 +186,7 @@ export function getNumberType(schema) {
             return "numeric";
     }
 }
-export function getStringType(schema) {
+function getStringType(schema) {
     const format = schema.format ?? "";
     let type = "string";
     switch (format) {

package/dist/src/cli/actions/convert/generators/generate-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-types.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,UAAU,sBAAsB,CAAC,MAA+B;IACpE,OAAO,wBAAwB,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,wBAAwB,CAAC,MAA+B;IAC/D,MAAM,MAAM,GAAG,MAAM,IAAI,MAAM,CAAC;IAChC,OAAO,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,MAAsB;IACnE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC;IACnB,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACrC,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO;AACT,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAsB;IAC/C,IAAI,IAAI,GAAG,SAAS,CAAC;IAErB,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAChB,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;SAAM,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACxB,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QACnC,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACrC,IAAI,GAAG,SAAS,CAAC;IACnB,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACrC,IAAI,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpC,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpC,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;SAAM,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACxB,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpC,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpB,IAAI,IAAI,SAAS,CAAC;IACpB,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,IAAI,IAAI,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;IACjD,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAW;IACpC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAChD,OAAO,CAAC,GAAG,KAAK,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAW;IAC5C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;IAC/B,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IAE3C,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,YAAY,CAAC,MAAsB;IAC1C,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC;QACtC,WAAW,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,YAAY,CAAC,MAAsB;IAC1C,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC;QACtC,WAAW,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,aAAa,CAAC,MAAsB;IAC3C,yFAAyF;IACzF,MAAM,UAAU,GACd,OAAO,MAAM,CAAC,oBAAoB,KAAK,QAAQ;QAC7C,CAAC,CAAC,UAAU,wBAAwB,CAAC,MAAM,CAAC,oBAAoB,CAAC,GAAG;QACpE,CAAC,CAAC,EAAE,CAAC;IAET,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,UAAU,EAAE,CAAC;QACrC,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;IAE5C,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QACtB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YAClD,MAAM,UAAU,GAAG,kBAAkB,CAAC,sBAAsB,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;iBACnF,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;iBACpB,IAAI,CAAC,EAAE,CAAC,CAAC;YACZ,MAAM,UAAU,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,KAAK,CAAC,IAAI,CACR,GAAG,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,UAAU,KAAK,wBAAwB,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,CAC3G,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;IAChD,IAAI,UAAU,IAAI,CAAC,aAAa,EAAE,CAAC;QACjC,OAAO,UAAU,CAAC;IACpB,CAAC;SAAM,IAAI,UAAU,IAAI,aAAa,EAAE,CAAC;QACvC,KAAK,CAAC,IAAI,CAAC,MAAM,UAAU,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,MAAsB;IACjD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC3B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;QACpB,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;IACvC,CAAC;IAED,wDAAwD;IACxD,OAAO,IAAI,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAsB;IACnD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;IACnC,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO,CAAC;QACb,KAAK,OAAO,CAAC;QACb,KAAK,OAAO,CAAC;QACb,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC;QAChB,KAAK,YAAY;YACf,OAAO,SAAS,CAAC;QACnB;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAAsB;IAClD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;IACnC,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,SAAS,CAAC;QACf,KAAK,YAAY;YACf,OAAO,MAAM,CAAC;QAChB,KAAK,QAAQ;YACX,OAAO,SAAS,CAAC;QACnB,KAAK,OAAO;YACV,OAAO,SAAS,CAAC;QACnB;YACE,oDAAoD;YACpD,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAAsB;IAClD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;IACnC,IAAI,IAAI,GAAG,QAAQ,CAAC;IACpB,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,QAAQ,CAAC;QACd,KAAK,MAAM;YACT,IAAI,GAAG,OAAO,CAAC;YACf,MAAM;QACR,KAAK,MAAM;YACT,IAAI,GAAG,WAAW,CAAC;YACnB,MAAM;QACR,KAAK,WAAW;YACd,mEAAmE;YACnE,IAAI,GAAG,aAAa,CAAC;YACrB,MAAM;QACR,KAAK,MAAM;YACT,IAAI,GAAG,WAAW,CAAC;YACnB,MAAM;QACR,KAAK,UAAU;YACb,IAAI,GAAG,UAAU,CAAC;YAClB,MAAM;QACR,KAAK,KAAK;YACR,IAAI,GAAG,KAAK,CAAC;YACb,MAAM;IACV,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,OAAO,CAAC,UAAyC;IACxD,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC9D,CAAC"}
+{"version":3,"file":"generate-types.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-types.ts"],"names":[],"mappings":"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"}

package/dist/src/cli/actions/convert/transforms/transform-component-parameters.d.ts

@@ -1,5 +1,5 @@
-import { OpenAPI3Components } from "../../../../types.js";
-import { TypeSpecModel } from "../interfaces.js";
+import { TypeSpecDataTypes } from "../interfaces.js";
+import { Context } from "../utils/context.js";
 /**
  * Transforms #/components/parameters into TypeSpec models.
  * Overwrites properties of existing models if an existing model already exists.
@@ -8,5 +8,5 @@ import { TypeSpecModel } from "../interfaces.js";
  * @param parameters
  * @returns
  */
-export declare function transformComponentParameters(models: TypeSpecModel[], parameters?: OpenAPI3Components["parameters"]): void;
+export declare function transformComponentParameters(context: Context, dataTypes: TypeSpecDataTypes[]): void;
 //# sourceMappingURL=transform-component-parameters.d.ts.map

package/dist/src/cli/actions/convert/transforms/transform-component-parameters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform-component-parameters.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-parameters.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAqB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAyB,MAAM,kBAAkB,CAAC;AAIxE;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,aAAa,EAAE,EACvB,UAAU,CAAC,EAAE,kBAAkB,CAAC,YAAY,CAAC,GAC5C,IAAI,CAON"}
+{"version":3,"file":"transform-component-parameters.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-parameters.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAyB,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,iBAAiB,EAAE,GAC7B,IAAI,CAQN"}

package/dist/src/cli/actions/convert/transforms/transform-component-parameters.js

@@ -1,6 +1,6 @@
 import { printIdentifier } from "@typespec/compiler";
 import { getParameterDecorators } from "../utils/decorators.js";
-import { getScopeAndName, scopesMatch } from "../utils/get-scope-and-name.js";
+import { getScopeAndName } from "../utils/get-scope-and-name.js";
 /**
  * Transforms #/components/parameters into TypeSpec models.
  * Overwrites properties of existing models if an existing model already exists.
@@ -9,39 +9,26 @@ import { getScopeAndName, scopesMatch } from "../utils/get-scope-and-name.js";
  * @param parameters
  * @returns
  */
-export function transformComponentParameters(models, parameters) {
+export function transformComponentParameters(context, dataTypes) {
+    const parameters = context.openApi3Doc.components?.parameters;
     if (!parameters)
         return;
     for (const name of Object.keys(parameters)) {
         const parameter = parameters[name];
-        transformComponentParameter(models, name, parameter);
+        transformComponentParameter(dataTypes, name, parameter);
     }
 }
-function transformComponentParameter(models, key, parameter) {
+function transformComponentParameter(dataTypes, key, parameter) {
     const { name, scope } = getScopeAndName(key);
-    // Get the model name this parameter belongs to
-    const modelName = scope.length > 0 ? scope.pop() : name;
-    // find a matching model, or create one if it doesn't exist
-    let model = models.find((m) => m.name === modelName && scopesMatch(m.scope, scope));
-    if (!model) {
-        model = {
-            kind: "model",
-            scope,
-            name: modelName,
-            decorators: [],
-            properties: [],
-        };
-        models.push(model);
-    }
-    const modelProperty = getModelPropertyFromParameter(parameter);
-    // Check if the model already has a property of the matching name
-    const propIndex = model.properties.findIndex((p) => p.name === modelProperty.name);
-    if (propIndex >= 0) {
-        model.properties[propIndex] = modelProperty;
-    }
-    else {
-        model.properties.push(modelProperty);
-    }
+    // Parameters should live in the root Parameters namespace
+    scope.unshift("Parameters");
+    dataTypes.push({
+        kind: "model",
+        scope,
+        name,
+        decorators: [],
+        properties: [getModelPropertyFromParameter(parameter)],
+    });
 }
 function getModelPropertyFromParameter(parameter) {
     return {

package/dist/src/cli/actions/convert/transforms/transform-component-parameters.js.map

@@ -1 +1 @@
-{"version":3,"file":"transform-component-parameters.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-parameters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE9E;;;;;;;GAOG;AACH,MAAM,UAAU,4BAA4B,CAC1C,MAAuB,EACvB,UAA6C;IAE7C,IAAI,CAAC,UAAU;QAAE,OAAO;IAExB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3C,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QACnC,2BAA2B,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IACvD,CAAC;AACH,CAAC;AAED,SAAS,2BAA2B,CAClC,MAAuB,EACvB,GAAW,EACX,SAA4B;IAE5B,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IAC7C,+CAA+C;IAC/C,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAG,CAAC,CAAC,CAAC,IAAI,CAAC;IAEzD,2DAA2D;IAC3D,IAAI,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IACpF,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,KAAK,GAAG;YACN,IAAI,EAAE,OAAO;YACb,KAAK;YACL,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,EAAE;YACd,UAAU,EAAE,EAAE;SACf,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC;IAED,MAAM,aAAa,GAAG,6BAA6B,CAAC,SAAS,CAAC,CAAC;IAE/D,iEAAiE;IACjE,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,CAAC,IAAI,CAAC,CAAC;IACnF,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;QACnB,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC;IAC9C,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACvC,CAAC;AACH,CAAC;AAED,SAAS,6BAA6B,CAAC,SAA4B;IACjE,OAAO;QACL,IAAI,EAAE,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC;QACrC,UAAU,EAAE,CAAC,SAAS,CAAC,QAAQ;QAC/B,GAAG,EAAE,SAAS,CAAC,WAAW,IAAI,SAAS,CAAC,MAAM,CAAC,WAAW;QAC1D,UAAU,EAAE,sBAAsB,CAAC,SAAS,CAAC;QAC7C,MAAM,EAAE,SAAS,CAAC,MAAM;KACzB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"transform-component-parameters.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-parameters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAIrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE;;;;;;;GAOG;AACH,MAAM,UAAU,4BAA4B,CAC1C,OAAgB,EAChB,SAA8B;IAE9B,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,UAAU,CAAC;IAC9D,IAAI,CAAC,UAAU;QAAE,OAAO;IAExB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3C,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QACnC,2BAA2B,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IAC1D,CAAC;AACH,CAAC;AAED,SAAS,2BAA2B,CAClC,SAA8B,EAC9B,GAAW,EACX,SAA4B;IAE5B,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IAC7C,0DAA0D;IAC1D,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAE5B,SAAS,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,OAAO;QACb,KAAK;QACL,IAAI;QACJ,UAAU,EAAE,EAAE;QACd,UAAU,EAAE,CAAC,6BAA6B,CAAC,SAAS,CAAC,CAAC;KACvD,CAAC,CAAC;AACL,CAAC;AAED,SAAS,6BAA6B,CAAC,SAA4B;IACjE,OAAO;QACL,IAAI,EAAE,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC;QACrC,UAAU,EAAE,CAAC,SAAS,CAAC,QAAQ;QAC/B,GAAG,EAAE,SAAS,CAAC,WAAW,IAAI,SAAS,CAAC,MAAM,CAAC,WAAW;QAC1D,UAAU,EAAE,sBAAsB,CAAC,SAAS,CAAC;QAC7C,MAAM,EAAE,SAAS,CAAC,MAAM;KACzB,CAAC;AACJ,CAAC"}

package/dist/src/cli/actions/convert/transforms/transform-component-schemas.d.ts

@@ -1,5 +1,5 @@
-import { OpenAPI3Components } from "../../../../types.js";
 import { TypeSpecModel } from "../interfaces.js";
+import { Context } from "../utils/context.js";
 /**
  * Transforms #/components/schemas into TypeSpec models.
  * Populates the provided `models` array in-place.
@@ -7,5 +7,5 @@ import { TypeSpecModel } from "../interfaces.js";
  * @param schemas
  * @returns
  */
-export declare function transformComponentSchemas(models: TypeSpecModel[], schemas?: OpenAPI3Components["schemas"]): void;
+export declare function transformComponentSchemas(context: Context, models: TypeSpecModel[]): void;
 //# sourceMappingURL=transform-component-schemas.d.ts.map

package/dist/src/cli/actions/convert/transforms/transform-component-schemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform-component-schemas.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-schemas.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAA2B,MAAM,sBAAsB,CAAC;AAQnF,OAAO,EAGL,aAAa,EAGd,MAAM,kBAAkB,CAAC;AAI1B;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,aAAa,EAAE,EACvB,OAAO,CAAC,EAAE,kBAAkB,CAAC,SAAS,CAAC,GACtC,IAAI,CAON"}
+{"version":3,"file":"transform-component-schemas.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-schemas.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,aAAa,EAGd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAoIzF"}

package/dist/src/cli/actions/convert/transforms/transform-component-schemas.js

@@ -1,5 +1,4 @@
 import { printIdentifier } from "@typespec/compiler";
-import { getArrayType, getIntegerType, getNumberType, getRefName, getStringType, } from "../generators/generate-types.js";
 import { getDecoratorsForSchema } from "../utils/decorators.js";
 import { getScopeAndName } from "../utils/get-scope-and-name.js";
 /**
@@ -9,114 +8,110 @@ import { getScopeAndName } from "../utils/get-scope-and-name.js";
  * @param schemas
  * @returns
  */
-export function transformComponentSchemas(models, schemas) {
+export function transformComponentSchemas(context, models) {
+    const schemas = context.openApi3Doc.components?.schemas;
     if (!schemas)
         return;
     for (const name of Object.keys(schemas)) {
         const schema = schemas[name];
         transformComponentSchema(models, name, schema);
     }
-}
-function transformComponentSchema(types, name, schema) {
-    const kind = getTypeSpecKind(schema);
-    switch (kind) {
-        case "alias":
-            return populateAlias(types, name, schema);
-        case "enum":
-            return populateEnum(types, name, schema);
-        case "model":
-            return populateModel(types, name, schema);
-        case "union":
-            return populateUnion(types, name, schema);
-        case "scalar":
-            return populateScalar(types, name, schema);
+    return;
+    function transformComponentSchema(types, name, schema) {
+        const kind = getTypeSpecKind(schema);
+        switch (kind) {
+            case "alias":
+                return populateAlias(types, name, schema);
+            case "enum":
+                return populateEnum(types, name, schema);
+            case "model":
+                return populateModel(types, name, schema);
+            case "union":
+                return populateUnion(types, name, schema);
+            case "scalar":
+                return populateScalar(types, name, schema);
+        }
     }
-}
-function populateAlias(types, name, schema) {
-    if (!("$ref" in schema)) {
-        return;
+    function populateAlias(types, rawName, schema) {
+        if (!("$ref" in schema)) {
+            return;
+        }
+        const { name, scope } = getScopeAndName(rawName);
+        types.push({
+            kind: "alias",
+            name,
+            scope,
+            doc: schema.description,
+            ref: context.getRefName(schema.$ref, scope),
+        });
     }
-    types.push({
-        kind: "alias",
-        ...getScopeAndName(name),
-        doc: schema.description,
-        ref: getRefName(schema.$ref),
-    });
-}
-function populateEnum(types, name, schema) {
-    const tsEnum = {
-        kind: "enum",
-        ...getScopeAndName(name),
-        decorators: getDecoratorsForSchema(schema),
-        doc: schema.description,
-        schema,
-    };
-    types.push(tsEnum);
-}
-function populateScalar(types, name, schema) {
-    types.push({
-        kind: "scalar",
-        ...getScopeAndName(name),
-        decorators: getDecoratorsForSchema(schema),
-        doc: schema.description,
-        schema,
-    });
-}
-function populateUnion(types, name, schema) {
-    const union = {
-        kind: "union",
-        ...getScopeAndName(name),
-        decorators: getDecoratorsForSchema(schema),
-        doc: schema.description,
-        schema,
-    };
-    types.push(union);
-}
-function populateModel(types, name, schema) {
-    const extendsParent = getModelExtends(schema);
-    const isParent = getModelIs(schema);
-    types.push({
-        kind: "model",
-        ...getScopeAndName(name),
-        decorators: [...getDecoratorsForSchema(schema)],
-        doc: schema.description,
-        properties: getModelPropertiesFromObjectSchema(schema),
-        additionalProperties: typeof schema.additionalProperties === "object" ? schema.additionalProperties : undefined,
-        extends: extendsParent,
-        is: isParent,
-        type: schema.type,
-    });
-}
-function getModelExtends(schema) {
-    switch (schema.type) {
-        case "boolean":
-            return "boolean";
-        case "integer":
-            return getIntegerType(schema);
-        case "number":
-            return getNumberType(schema);
-        case "string":
-            return getStringType(schema);
+    function populateEnum(types, name, schema) {
+        const tsEnum = {
+            kind: "enum",
+            ...getScopeAndName(name),
+            decorators: getDecoratorsForSchema(schema),
+            doc: schema.description,
+            schema,
+        };
+        types.push(tsEnum);
     }
-    if (schema.type !== "object" || !schema.allOf) {
-        return;
+    function populateModel(types, rawName, schema) {
+        const { name, scope } = getScopeAndName(rawName);
+        const extendsParent = getModelExtends(schema, scope);
+        const isParent = getModelIs(schema, scope);
+        types.push({
+            kind: "model",
+            name,
+            scope,
+            decorators: [...getDecoratorsForSchema(schema)],
+            doc: schema.description,
+            properties: getModelPropertiesFromObjectSchema(schema),
+            additionalProperties: typeof schema.additionalProperties === "object" ? schema.additionalProperties : undefined,
+            extends: extendsParent,
+            is: isParent,
+            type: schema.type,
+        });
     }
-    if (schema.allOf.length !== 1) {
-        // TODO: Emit warning - can't extend more than 1 model
-        return;
+    function populateUnion(types, name, schema) {
+        const union = {
+            kind: "union",
+            ...getScopeAndName(name),
+            decorators: getDecoratorsForSchema(schema),
+            doc: schema.description,
+            schema,
+        };
+        types.push(union);
     }
-    const parent = schema.allOf[0];
-    if (!parent || !("$ref" in parent)) {
-        // TODO: Error getting parent - must be a reference, not expression
-        return;
+    function populateScalar(types, name, schema) {
+        types.push({
+            kind: "scalar",
+            ...getScopeAndName(name),
+            decorators: getDecoratorsForSchema(schema),
+            doc: schema.description,
+            schema,
+        });
     }
-    return getRefName(parent.$ref);
-}
-function getModelIs(schema) {
-    if (schema.type !== "array") {
-        return;
+    function getModelExtends(schema, callingScope) {
+        if (schema.type !== "object" || !schema.allOf) {
+            return;
+        }
+        if (schema.allOf.length !== 1) {
+            // TODO: Emit warning - can't extend more than 1 model
+            return;
+        }
+        const parent = schema.allOf[0];
+        if (!parent || !("$ref" in parent)) {
+            // TODO: Error getting parent - must be a reference, not expression
+            return;
+        }
+        return context.getRefName(parent.$ref, callingScope);
+    }
+    function getModelIs(schema, callingScope) {
+        if (schema.type !== "array") {
+            return;
+        }
+        return context.generateTypeFromRefableSchema(schema, callingScope);
     }
-    return getArrayType(schema);
 }
 function getModelPropertiesFromObjectSchema({ properties, required = [], }) {
     if (!properties)