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

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,133 @@ 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 allOfDetails = getAllOfDetails(schema, scope);
+        const isParent = getModelIs(schema, scope);
+        types.push({
+            kind: "model",
+            name,
+            scope,
+            decorators: [...getDecoratorsForSchema(schema)],
+            doc: schema.description,
+            properties: [...getModelPropertiesFromObjectSchema(schema), ...allOfDetails.properties],
+            additionalProperties: typeof schema.additionalProperties === "object" ? schema.additionalProperties : undefined,
+            extends: allOfDetails.extends,
+            is: isParent,
+            type: schema.type,
+            spread: allOfDetails.spread,
+        });
     }
-    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 getAllOfDetails(schema, callingScope) {
+        const details = {
+            spread: [],
+            properties: [],
+        };
+        if (!schema.allOf) {
+            return details;
+        }
+        let foundParentWithDiscriminator = false;
+        for (const member of schema.allOf) {
+            // inline-schemas treated as normal objects with properties
+            if (!("$ref" in member)) {
+                details.properties.push(...getModelPropertiesFromObjectSchema(member));
+                continue;
+            }
+            const refSchema = context.getSchemaByRef(member.$ref);
+            // Inheritance only supported if parent has a discriminator defined, otherwise prefer
+            // composition via spreading.
+            if (!refSchema?.discriminator) {
+                details.spread.push(context.getRefName(member.$ref, callingScope));
+                continue;
+            }
+            if (!foundParentWithDiscriminator) {
+                details.extends = context.getRefName(member.$ref, callingScope);
+                foundParentWithDiscriminator = true;
+                continue;
+            }
+            // can only extend once, so if we have multiple potential parents, spread them all
+            // user will need to resolve TypeSpec errors (e.g. duplicate fields) manually
+            if (details.extends) {
+                details.spread.push(details.extends);
+                details.extends = undefined;
+            }
+            details.spread.push(context.getRefName(member.$ref, callingScope));
+        }
+        return details;
+    }
+    function getModelIs(schema, callingScope) {
+        if (schema.type !== "array") {
+            return;
+        }
+        return context.generateTypeFromRefableSchema(schema, callingScope);
     }
-    return getArrayType(schema);
 }
 function getModelPropertiesFromObjectSchema({ properties, required = [], }) {
     if (!properties)

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

@@ -1 +1 @@
-{"version":3,"file":"transform-component-schemas.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-schemas.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transform-component-schemas.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-schemas.ts"],"names":[],"mappings":"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"}

package/dist/src/cli/actions/convert/transforms/transforms.d.ts

@@ -1,4 +1,4 @@
-import { OpenAPI3Document } from "../../../../types.js";
 import { TypeSpecProgram } from "../interfaces.js";
-export declare function transform(openapi: OpenAPI3Document): TypeSpecProgram;
+import { Context } from "../utils/context.js";
+export declare function transform(context: Context): TypeSpecProgram;
 //# sourceMappingURL=transforms.d.ts.map

package/dist/src/cli/actions/convert/transforms/transforms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transforms.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transforms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAiB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOlE,wBAAgB,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,eAAe,CASpE"}
+{"version":3,"file":"transforms.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transforms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAO9C,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,eAAe,CAU3D"}

package/dist/src/cli/actions/convert/transforms/transforms.js

@@ -3,8 +3,9 @@ import { transformComponentSchemas } from "./transform-component-schemas.js";
 import { transformNamespaces } from "./transform-namespaces.js";
 import { transformPaths } from "./transform-paths.js";
 import { transformServiceInfo } from "./transform-service-info.js";
-export function transform(openapi) {
-    const models = collectModels(openapi);
+export function transform(context) {
+    const openapi = context.openApi3Doc;
+    const models = collectDataTypes(context);
     const operations = transformPaths(models, openapi.paths);
     return {
         serviceInfo: transformServiceInfo(openapi.info),
@@ -12,13 +13,12 @@ export function transform(openapi) {
         augmentations: [],
     };
 }
-function collectModels(document) {
+function collectDataTypes(context) {
     const models = [];
-    const components = document.components;
     // get models from `#/components/schema
-    transformComponentSchemas(models, components?.schemas);
+    transformComponentSchemas(context, models);
     // get models from `#/components/parameters
-    transformComponentParameters(models, components?.parameters);
+    transformComponentParameters(context, models);
     return models;
 }
 //# sourceMappingURL=transforms.js.map

package/dist/src/cli/actions/convert/transforms/transforms.js.map

@@ -1 +1 @@
-{"version":3,"file":"transforms.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transforms.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,4BAA4B,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,MAAM,UAAU,SAAS,CAAC,OAAyB;IACjD,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEzD,OAAO;QACL,WAAW,EAAE,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC;QAC/C,GAAG,mBAAmB,CAAC,MAAM,EAAE,UAAU,CAAC;QAC1C,aAAa,EAAE,EAAE;KAClB,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,QAA0B;IAC/C,MAAM,MAAM,GAAoB,EAAE,CAAC;IACnC,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;IACvC,uCAAuC;IACvC,yBAAyB,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACvD,2CAA2C;IAC3C,4BAA4B,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAE7D,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"transforms.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transforms.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,4BAA4B,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,MAAM,UAAU,SAAS,CAAC,OAAgB;IACxC,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;IACpC,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEzD,OAAO;QACL,WAAW,EAAE,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC;QAC/C,GAAG,mBAAmB,CAAC,MAAM,EAAE,UAAU,CAAC;QAC1C,aAAa,EAAE,EAAE;KAClB,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAgB;IACxC,MAAM,MAAM,GAAoB,EAAE,CAAC;IACnC,uCAAuC;IACvC,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC3C,2CAA2C;IAC3C,4BAA4B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAE9C,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/src/cli/actions/convert/utils/context.d.ts

@@ -0,0 +1,10 @@
+import { OpenAPI3Document, OpenAPI3Schema, Refable } from "../../../../types.js";
+export interface Context {
+    readonly openApi3Doc: OpenAPI3Document;
+    readonly rootNamespace: string;
+    generateTypeFromRefableSchema(schema: Refable<OpenAPI3Schema>, callingScope: string[]): string;
+    getRefName(ref: string, callingScope: string[]): string;
+    getSchemaByRef(ref: string): OpenAPI3Schema | undefined;
+}
+export declare function createContext(openApi3Doc: OpenAPI3Document): Context;
+//# sourceMappingURL=context.d.ts.map

package/dist/src/cli/actions/convert/utils/context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAIjF,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC;IACvC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAE/B,6BAA6B,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC/F,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IACxD,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAAC;CACzD;AAED,wBAAgB,aAAa,CAAC,WAAW,EAAE,gBAAgB,GAAG,OAAO,CAqBpE"}

package/dist/src/cli/actions/convert/utils/context.js

@@ -0,0 +1,23 @@
+import { SchemaToExpressionGenerator } from "../generators/generate-types.js";
+import { generateNamespaceName } from "./generate-namespace-name.js";
+export function createContext(openApi3Doc) {
+    const rootNamespace = generateNamespaceName(openApi3Doc.info.title);
+    const schemaExpressionGenerator = new SchemaToExpressionGenerator(rootNamespace);
+    const context = {
+        openApi3Doc,
+        rootNamespace,
+        getRefName(ref, callingScope) {
+            return schemaExpressionGenerator.getRefName(ref, callingScope);
+        },
+        generateTypeFromRefableSchema(schema, callingScope) {
+            return schemaExpressionGenerator.generateTypeFromRefableSchema(schema, callingScope);
+        },
+        getSchemaByRef(ref) {
+            const schemaName = ref.replace("#/components/schemas/", "");
+            const schema = openApi3Doc.components?.schemas?.[schemaName];
+            return schema;
+        },
+    };
+    return context;
+}
+//# sourceMappingURL=context.js.map

package/dist/src/cli/actions/convert/utils/context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAWrE,MAAM,UAAU,aAAa,CAAC,WAA6B;IACzD,MAAM,aAAa,GAAG,qBAAqB,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpE,MAAM,yBAAyB,GAAG,IAAI,2BAA2B,CAAC,aAAa,CAAC,CAAC;IAEjF,MAAM,OAAO,GAAY;QACvB,WAAW;QACX,aAAa;QACb,UAAU,CAAC,GAAW,EAAE,YAAsB;YAC5C,OAAO,yBAAyB,CAAC,UAAU,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QACjE,CAAC;QACD,6BAA6B,CAAC,MAA+B,EAAE,YAAsB;YACnF,OAAO,yBAAyB,CAAC,6BAA6B,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACvF,CAAC;QACD,cAAc,CAAC,GAAG;YAChB,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;YAC5D,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC;YAC7D,OAAO,MAAM,CAAC;QAChB,CAAC;KACF,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/src/cli/actions/convert/utils/generate-namespace-name.d.ts

@@ -0,0 +1,2 @@
+export declare function generateNamespaceName(name: string): string;
+//# sourceMappingURL=generate-namespace-name.d.ts.map

package/dist/src/cli/actions/convert/utils/generate-namespace-name.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-namespace-name.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/generate-namespace-name.ts"],"names":[],"mappings":"AAAA,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE1D"}

package/dist/src/cli/actions/convert/utils/generate-namespace-name.js

@@ -0,0 +1,4 @@
+export function generateNamespaceName(name) {
+    return name.replaceAll(/[^\w^\d_]+/g, "");
+}
+//# sourceMappingURL=generate-namespace-name.js.map

package/dist/src/cli/actions/convert/utils/generate-namespace-name.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-namespace-name.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/generate-namespace-name.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,qBAAqB,CAAC,IAAY;IAChD,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;AAC5C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/openapi3",
-  "version": "0.60.0-dev.5",
+  "version": "0.60.0-dev.7",
   "author": "Microsoft Corporation",
   "description": "TypeSpec library for emitting OpenAPI 3.0 from the TypeSpec REST protocol binding and converting OpenAPI3 to TypeSpec",
   "homepage": "https://typespec.io",