typespec-typescript-emitter 1.2.0 → 2.0.1

package/dist/src/resolve/types/Model.Shaped.js

@@ -0,0 +1,210 @@
+import { getDoc } from "@typespec/compiler";
+import { isVisible, Visibility } from "@typespec/http";
+import { AppendableString } from "../../helpers/appendableString.js";
+import { compareArrays } from "../../helpers/arrays.js";
+import { namespaceListFromNamespace } from "../../helpers/namespaces.js";
+import { Resolvable } from "../Resolvable.js";
+import { Resolver, } from "../Resolvable_helpers.js";
+export class ShapedModel extends Resolvable {
+    expectedTypeKind = "Model";
+    getProps() {
+        return Array.from(this._t.properties).map((p) => p[1]);
+    }
+    getPropVisibilityType(program, prop) {
+        if (!prop.decorators.some((decorator) => decorator.definition?.name === "@visibility"))
+            return null;
+        const ret = [];
+        if (isVisible(program, prop, Visibility.Read))
+            ret.push("Read");
+        if (isVisible(program, prop, Visibility.Create))
+            ret.push("Create");
+        if (isVisible(program, prop, Visibility.Update))
+            ret.push("Update");
+        if (isVisible(program, prop, Visibility.Delete))
+            ret.push("Delete");
+        if (isVisible(program, prop, Visibility.Query))
+            ret.push("Query");
+        return ret;
+    }
+    /**
+     * Checks whether or not any of the model's properties has @visibility modifier.
+     * Also returns true if any base model (in the entire chain) has a visibility OR if
+     * any nested type (in the model's properties) has a visibility.
+     */
+    async hasVisibility(opts, out) {
+        if (await super.hasVisibility(opts, out))
+            return true;
+        // resolve base
+        if (this._t.baseModel &&
+            (await Resolvable.hasVisibility(this._t.baseModel, opts, out, this._t)))
+            return true;
+        // resolve props: check for decorators
+        const props = this.getProps();
+        if (props.some((prop) => prop.decorators.some((decorator) => decorator.definition?.name === "@visibility")))
+            return true;
+        // resolve props: check if any resolves to visibility
+        for (const prop of props) {
+            // check if this prop is somewhere up the resolution chain -> recursion -> skip (defaults to false)
+            const propNamespaces = namespaceListFromNamespace(prop.type.namespace);
+            if (opts.parents &&
+                opts.parents.some((parent) => {
+                    const parentNamespaces = namespaceListFromNamespace(parent.namespace);
+                    return (parent.kind === prop.type.kind &&
+                        prop.type.name &&
+                        parent.name === prop.type.name &&
+                        propNamespaces &&
+                        parentNamespaces &&
+                        compareArrays(propNamespaces, parentNamespaces));
+                }))
+                continue;
+            // not recursion, resolve
+            if (await Resolvable.hasVisibility(prop.type, opts, out, this._t))
+                return true;
+        }
+        // nothing true
+        return false;
+    }
+    async type(opts, out) {
+        if (opts.emitDocs) {
+            out.doc = getDoc(opts.program, this._t);
+        }
+        const resolution = new AppendableString();
+        // check for base model (extended)
+        if (this._t.baseModel) {
+            const resolvedBase = await this.resolveNested(this._t.baseModel, opts, out);
+            out.imports.push(...resolvedBase.imports);
+            resolution.append(`${resolvedBase.resolved} & `);
+        }
+        const props = this.getProps();
+        const propVisibilityTypes = {};
+        if (props.length === 0) {
+            out.resolved.append("{}");
+        }
+        else {
+            resolution.append("{\n");
+            for (let i = 0; i < props.length; i++) {
+                const prop = props[i];
+                // add doc strings
+                if (opts.emitDocs) {
+                    const doc = getDoc(opts.program, prop);
+                    if (doc)
+                        resolution.addLine(`/** ${doc} */`, opts.nestlevel + 1);
+                }
+                // resolve prop
+                const resolved = await this.resolveNested(prop.type, opts, out);
+                resolution.addLine(`${prop.name}${prop.optional ? "?" : ""}: ${resolved.resolved}${i + 1 < this._t.properties.size ? "," : ""}`, opts.nestlevel + 1);
+                out.imports.push(...resolved.imports);
+                // if prop has visibility, save to vismap
+                const propVis = this.getPropVisibilityType(opts.program, prop);
+                if (propVis !== null || resolved.hasVisibility) {
+                    propVisibilityTypes[prop.name] = { type: null, nested: "" };
+                    propVisibilityTypes[prop.name].type = propVis;
+                    propVisibilityTypes[prop.name].nested = resolved.visibilityMap;
+                }
+            }
+            // build prop visibility map
+            const visMap = new AppendableString();
+            const propVisibilityTypesArr = Object.entries(propVisibilityTypes).filter((p) => p[1].type !== null || p[1].nested);
+            if (propVisibilityTypesArr.length > 0) {
+                visMap.addLine("{");
+                let i = 1;
+                for (const [prop, propvis] of propVisibilityTypesArr) {
+                    const visLine = `vis: [${(propvis.type ?? []).map((t) => `Lifecycle.${t}`).join(", ")}]`;
+                    if (propvis.type !== null && !propvis.nested) {
+                        visMap.addLine(`'${prop}': {${visLine}}`, opts.nestlevel + 1, "continued");
+                    }
+                    if (propvis.nested) {
+                        visMap.addLine(`'${prop}': {`, opts.nestlevel + 1);
+                        if (propvis.type)
+                            visMap.addLine(`${visLine},`, opts.nestlevel + 2);
+                        visMap.addLine(`nested: ${propvis.nested
+                            .split("\n")
+                            .map((l) => `  ${l}`)
+                            .join("\n")
+                            .trim()}`, opts.nestlevel + 2);
+                        visMap.addLine("}", opts.nestlevel + 1, "continued");
+                    }
+                    visMap.addLine(i < propVisibilityTypesArr.length ? "," : "");
+                    i++;
+                }
+                visMap.addLine("}", opts.nestlevel, "continued");
+            }
+            resolution.addLine("}", opts.nestlevel, "continued");
+            out.visibilityMap = visMap.value;
+            if (opts.parents &&
+                opts.parents.every((p) => p.kind !== "Model" || p.name === "Array" || p.name === "Record") &&
+                visMap.value) {
+                // this model is nested in something that's not a model and has visibility; inline filters
+                out.resolved.append(`FilterLifecycle<${resolution}, ${visMap}, V>`);
+                // this model is the root type or nested in a model; do not inline visibility filter
+            }
+            else {
+                out.resolved.append(resolution);
+            }
+        }
+    }
+    async typeguard(opts, out) {
+        out.resolved.append("\n");
+        if (this._t.baseModel) {
+            const resolvedBase = await this.resolveNested(this._t.baseModel, opts, out);
+            out.resolved.append(`${"  ".repeat(opts.nestlevel)}${resolvedBase.resolved} &&`);
+            out.imports.push(...resolvedBase.imports);
+            // derived type does not have extended properties; fix by casting
+            opts.accessor = `(${opts.accessor} as any)`;
+        }
+        const props = this.getProps();
+        const propGuards = [];
+        for (const prop of props) {
+            const oldAccessor = opts.accessor;
+            opts.accessor = `${opts.accessor}['${prop.name}']`;
+            const resolved = await this.resolveNested(prop.type, opts, out);
+            opts.accessor = oldAccessor;
+            out.imports.push(...resolved.imports);
+            const visibility = this.getPropVisibilityType(opts.program, prop);
+            let guard = " ".repeat(out.resolved.value.endsWith("&") ? 1 : opts.nestlevel * 2);
+            if (visibility !== null) {
+                guard += `((vis as any) !== Lifecycle.All && ![${(visibility ?? []).map((t) => `Lifecycle.${t}`).join(", ")}].includes(vis) ? !('${prop.name}' in ${opts.accessor}) : (`;
+            }
+            if (prop.type.kind === "Intrinsic" &&
+                ["never", "void"].includes(prop.type.name)) {
+                // some special intrinsic types need special treatment
+                switch (prop.type.name) {
+                    case "never":
+                        guard += `!('${prop.name}' in ${opts.accessor})`;
+                        break;
+                    case "void":
+                        guard += `${opts.accessor}['${prop.name}'] === undefined`;
+                        break;
+                }
+            }
+            else {
+                guard += prop.optional
+                    ? `${opts.accessor}['${prop.name}'] === undefined || `
+                    : `${opts.accessor}['${prop.name}'] !== undefined && `;
+                guard += `(${resolved.resolved}`;
+                guard += resolved.resolved.value.endsWith("\n")
+                    ? "  ".repeat(opts.nestlevel)
+                    : "";
+                guard += ")";
+            }
+            if (visibility !== null)
+                guard += "))";
+            propGuards.push(guard);
+        }
+        out.resolved.append(propGuards.join(" &&\n"));
+        out.resolved.addLine("", opts.nestlevel);
+    }
+    transformKnownType(opts, out) {
+        // If this is a known type, it can't be the root of this resolution tree,
+        // because of the "originalTypeReady" flag.
+        // If it also has visibility, it must have its own visibility map,
+        // which is baked into the type definition, so it shouldn't be returned now.
+        if (this._r === Resolver.Type && out.hasVisibility) {
+            out.visibilityMap = "";
+            const newResolved = `${out.resolved}<V>`;
+            out.resolved.clear().append(newResolved);
+            // ret.visibilityMap = `${(t as any).name}_VisMap`;
+        }
+    }
+}
+//# sourceMappingURL=Model.Shaped.js.map

package/dist/src/resolve/types/Model.Shaped.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Model.Shaped.js","sourceRoot":"","sources":["../../../../src/resolve/types/Model.Shaped.ts"],"names":[],"mappings":"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"}

package/dist/src/resolve/types/Scalar.d.ts

@@ -0,0 +1,9 @@
+import { Scalar } from "@typespec/compiler";
+import { Resolvable } from "../Resolvable.js";
+import { Resolver, ResolverOptions, ResolverResult } from "../Resolvable_helpers.js";
+export declare class ResolvableScalar extends Resolvable<Scalar> {
+    protected expectedTypeKind: string;
+    private dateTypes;
+    protected type(opts: ResolverOptions<Resolver.Type>, out: ResolverResult<Resolver.Type>): Promise<void>;
+    protected typeguard(opts: ResolverOptions<Resolver.Typeguard>, out: ResolverResult<Resolver.Typeguard>): Promise<void>;
+}

package/dist/src/resolve/types/Scalar.js

@@ -0,0 +1,109 @@
+import { Resolvable } from "../Resolvable.js";
+export class ResolvableScalar extends Resolvable {
+    expectedTypeKind = "Scalar";
+    dateTypes = [
+        "offsetDateTime",
+        "plainDate",
+        "utcDateTime",
+        "unixTimestamp32",
+    ];
+    async type(opts, out) {
+        if (this.dateTypes.includes(this._t.name)) {
+            switch (this._t.name) {
+                case "offsetDateTime":
+                case "plainDate":
+                case "utcDateTime":
+                    out.resolved.append(opts.options["serializable-date-types"] ? "string" : "Date");
+                    break;
+                case "unixTimestamp32":
+                    out.resolved.append(opts.options["serializable-date-types"] ? "number" : "Date");
+                    break;
+            }
+        }
+        else if (this._t.baseScalar) {
+            out.resolved.append((await this.resolveNested(this._t.baseScalar, opts, out)).resolved);
+        }
+        else {
+            switch (this._t.name) {
+                case "boolean":
+                    out.resolved.append("boolean");
+                    break;
+                case "bytes":
+                    out.resolved.append("Uint8Array");
+                    break;
+                case "duration":
+                    out.resolved.append("number");
+                    break;
+                case "numeric":
+                    out.resolved.append("number");
+                    break;
+                case "plainTime":
+                    out.resolved.append("string");
+                    break;
+                case "string":
+                    out.resolved.append("string");
+                    break;
+                case "url":
+                    out.resolved.append("string");
+                    break;
+                default:
+                    this.diagnostic("resolve-unresolved-scalar", `Could not resolve scalar ${this._t.name}`, "error");
+                    out.resolved.append("unknown");
+                    break;
+            }
+        }
+    }
+    async typeguard(opts, out) {
+        if (this.dateTypes.includes(this._t.name)) {
+            switch (this._t.name) {
+                case "offsetDateTime":
+                case "plainDate":
+                case "utcDateTime":
+                    out.resolved.append(opts.options["serializable-date-types"]
+                        ? `typeof ${opts.accessor} === 'string'`
+                        : `${opts.accessor} instanceof Date`);
+                    break;
+                case "unixTimestamp32":
+                    out.resolved.append(opts.options["serializable-date-types"]
+                        ? `typeof ${opts.accessor} === 'number'`
+                        : `${opts.accessor} instanceof Date`);
+                    break;
+            }
+        }
+        else if (this._t.baseScalar) {
+            out.resolved.append((await this.resolveNested(this._t.baseScalar, opts, out)).resolved);
+        }
+        else if (this._t.name === "bytes") {
+            out.resolved.append(`${opts.accessor} instanceof Uint8Array`);
+        }
+        else {
+            out.resolved.append(`typeof ${opts.accessor} === '`);
+            switch (this._t.name) {
+                case "boolean":
+                    out.resolved.append("boolean");
+                    break;
+                case "duration":
+                    out.resolved.append("number");
+                    break;
+                case "numeric":
+                    out.resolved.append("number");
+                    break;
+                case "plainTime":
+                    out.resolved.append("string");
+                    break;
+                case "string":
+                    out.resolved.append("string");
+                    break;
+                case "url":
+                    out.resolved.append("string");
+                    break;
+                default:
+                    this.diagnostic("resolve-unresolved-scalar", `Could not create typeguard for scalar ${this._t.name}`, "error");
+                    out.resolved.append("unknown");
+                    break;
+            }
+            out.resolved.append("'");
+        }
+    }
+}
+//# sourceMappingURL=Scalar.js.map

package/dist/src/resolve/types/Scalar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Scalar.js","sourceRoot":"","sources":["../../../../src/resolve/types/Scalar.ts"],"names":[],"mappings":"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"}

package/dist/src/resolve/types/Simple.d.ts

@@ -0,0 +1,11 @@
+import { Type } from "@typespec/compiler";
+import { Resolvable } from "../Resolvable.js";
+import { Resolver, ResolverOptions, ResolverResult } from "../Resolvable_helpers.js";
+export declare class ResolvableSimple extends Resolvable<Type> {
+    protected expectedTypeKind: string;
+    static AllowedTypeKinds: readonly ["Boolean", "Intrinsic", "Number", "String", "TemplateParameter"];
+    private static typeMap;
+    protected type(opts: ResolverOptions<Resolver.Type>, out: ResolverResult<Resolver.Type>): Promise<void>;
+    protected typeguard(opts: ResolverOptions<Resolver.Typeguard>, out: ResolverResult<Resolver.Typeguard>): Promise<void>;
+    protected validate(): void;
+}

package/dist/src/resolve/types/Simple.js

@@ -0,0 +1,49 @@
+import { Resolvable } from "../Resolvable.js";
+const allowedTypeKinds = [
+    "Boolean",
+    "Intrinsic",
+    "Number",
+    "String",
+    "TemplateParameter",
+];
+export class ResolvableSimple extends Resolvable {
+    expectedTypeKind = ""; // placeholder as required; validate is overridden
+    static AllowedTypeKinds = allowedTypeKinds;
+    static typeMap = {
+        Boolean: (t) => (t.value ? "true" : "false"),
+        Intrinsic: (t) => t.name,
+        Number: (t) => t.valueAsString,
+        String: (t) => `'${t.value}'`,
+        TemplateParameter: () => "unknown",
+    };
+    async type(opts, out) {
+        const mapped = ResolvableSimple.typeMap[this._t.kind]; // check is in validate()
+        out.resolved.append(mapped(this._t));
+    }
+    async typeguard(opts, out) {
+        const mapped = ResolvableSimple.typeMap[this._t.kind]; // check is in validate()
+        const v = mapped(this._t);
+        // some special intrinsic types are handled directly in the model property
+        switch (v) {
+            case "unknown":
+                out.resolved.append("true");
+                break;
+            case "never":
+                out.resolved.append("false");
+                break; // instantly fails all type checks
+            case "void":
+                out.resolved.append(`${opts.accessor} === undefined`);
+                break;
+            default:
+                out.resolved.append(`${opts.accessor} === ${v}`);
+                break;
+        }
+    }
+    validate() {
+        if (!ResolvableSimple.AllowedTypeKinds.includes(this._t.kind)) {
+            this.diagnostic("typeclass-mismatch", `Tried resolving type ${this._t.kind} as primitive`, "error");
+            throw new TypeError(`Type-kind/class mismatch: tried resolving type ${this._t.kind} as primitive`);
+        }
+    }
+}
+//# sourceMappingURL=Simple.js.map

package/dist/src/resolve/types/Simple.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Simple.js","sourceRoot":"","sources":["../../../../src/resolve/types/Simple.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAO9C,MAAM,gBAAgB,GAAG;IACvB,SAAS;IACT,WAAW;IACX,QAAQ;IACR,QAAQ;IACR,mBAAmB;CACX,CAAC;AAEX,MAAM,OAAO,gBAAiB,SAAQ,UAAgB;IAC1C,gBAAgB,GAAG,EAAE,CAAC,CAAC,kDAAkD;IAC5E,MAAM,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAE1C,MAAM,CAAC,OAAO,GAGlB;QACF,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,CAAS,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;QACrD,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAE,CAAmB,CAAC,IAAI;QAC3C,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAE,CAAoB,CAAC,aAAa;QAClD,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAK,CAAmB,CAAC,KAAK,GAAG;QAChD,iBAAiB,EAAE,GAAG,EAAE,CAAC,SAAS;KACnC,CAAC;IAEQ,KAAK,CAAC,IAAI,CAClB,IAAoC,EACpC,GAAkC;QAElC,MAAM,MAAM,GACV,gBAAgB,CAAC,OAAO,CACtB,IAAI,CAAC,EAAE,CAAC,IAAyC,CAClD,CAAC,CAAC,yBAAyB;QAC9B,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;IAES,KAAK,CAAC,SAAS,CACvB,IAAyC,EACzC,GAAuC;QAEvC,MAAM,MAAM,GACV,gBAAgB,CAAC,OAAO,CACtB,IAAI,CAAC,EAAE,CAAC,IAAyC,CAClD,CAAC,CAAC,yBAAyB;QAC9B,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE1B,0EAA0E;QAC1E,QAAQ,CAAC,EAAE,CAAC;YACV,KAAK,SAAS;gBACZ,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC5B,MAAM;YACR,KAAK,OAAO;gBACV,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC7B,MAAM,CAAC,kCAAkC;YAC3C,KAAK,MAAM;gBACT,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,gBAAgB,CAAC,CAAC;gBACtD,MAAM;YAER;gBACE,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACjD,MAAM;QACV,CAAC;IACH,CAAC;IAES,QAAQ;QAChB,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,IAAW,CAAC,EAAE,CAAC;YACrE,IAAI,CAAC,UAAU,CACb,oBAAoB,EACpB,wBAAwB,IAAI,CAAC,EAAE,CAAC,IAAI,eAAe,EACnD,OAAO,CACR,CAAC;YACF,MAAM,IAAI,SAAS,CACjB,kDAAkD,IAAI,CAAC,EAAE,CAAC,IAAI,eAAe,CAC9E,CAAC;QACJ,CAAC;IACH,CAAC"}

package/dist/src/resolve/types/Tuple.d.ts

@@ -0,0 +1,9 @@
+import { Tuple } from "@typespec/compiler";
+import { Resolvable } from "../Resolvable.js";
+import { Resolver, ResolverOptions, ResolverResult } from "../Resolvable_helpers.js";
+export declare class ResolvableTuple extends Resolvable<Tuple> {
+    protected expectedTypeKind: string;
+    hasVisibility(opts: ResolverOptions<Resolver>, out: ResolverResult<Resolver>): Promise<boolean>;
+    protected type(opts: ResolverOptions<Resolver.Type>, out: ResolverResult<Resolver.Type>): Promise<void>;
+    protected typeguard(opts: ResolverOptions<Resolver.Typeguard>, out: ResolverResult<Resolver.Typeguard>): Promise<void>;
+}

package/dist/src/resolve/types/Tuple.js

@@ -0,0 +1,38 @@
+import { Resolvable } from "../Resolvable.js";
+export class ResolvableTuple extends Resolvable {
+    expectedTypeKind = "Tuple";
+    async hasVisibility(opts, out) {
+        if (await super.hasVisibility(opts, out))
+            return true;
+        for (const v of this._t.values) {
+            if (await Resolvable.hasVisibility(v, opts, out, this._t))
+                return true;
+        }
+        return false;
+    }
+    async type(opts, out) {
+        const results = [];
+        for (const v of this._t.values) {
+            const resolved = await this.resolveNested(v, opts, out);
+            out.imports.push(...resolved.imports);
+            results.push(resolved.resolved.value);
+        }
+        out.resolved.append(`[${results.join(", ")}]`);
+    }
+    async typeguard(opts, out) {
+        const results = [];
+        const oldAccessor = opts.accessor;
+        let i = 0;
+        for (const v of this._t.values) {
+            opts.accessor = `${opts.accessor}[${i}]`;
+            const resolved = await this.resolveNested(v, opts, out);
+            opts.accessor = oldAccessor;
+            out.imports.push(...resolved.imports);
+            results.push(resolved.resolved.value);
+            i++;
+        }
+        opts.accessor = oldAccessor;
+        out.resolved.append(`Array.isArray(${opts.accessor}) && ${results.map((g) => `(${g})`).join(" && ")}`);
+    }
+}
+//# sourceMappingURL=Tuple.js.map

package/dist/src/resolve/types/Tuple.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Tuple.js","sourceRoot":"","sources":["../../../../src/resolve/types/Tuple.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAO9C,MAAM,OAAO,eAAgB,SAAQ,UAAiB;IAC1C,gBAAgB,GAAG,OAAO,CAAC;IAErB,KAAK,CAAC,aAAa,CACjC,IAA+B,EAC/B,GAA6B;QAE7B,IAAI,MAAM,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC;QACtD,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC;YAC/B,IAAI,MAAM,UAAU,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;gBAAE,OAAO,IAAI,CAAC;QACzE,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAES,KAAK,CAAC,IAAI,CAClB,IAAoC,EACpC,GAAkC;QAElC,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;YACxD,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YACtC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACxC,CAAC;QACD,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjD,CAAC;IAES,KAAK,CAAC,SAAS,CACvB,IAAyC,EACzC,GAAuC;QAEvC,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC;YAC/B,IAAI,CAAC,QAAQ,GAAG,GAAG,IAAI,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC;YACzC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;YACxD,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC;YAC5B,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YACtC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACtC,CAAC,EAAE,CAAC;QACN,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC;QAC5B,GAAG,CAAC,QAAQ,CAAC,MAAM,CACjB,iBAAiB,IAAI,CAAC,QAAQ,QAAQ,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAClF,CAAC;IACJ,CAAC;CACF"}

package/dist/src/resolve/types/Union.d.ts

@@ -0,0 +1,9 @@
+import { Union } from "@typespec/compiler";
+import { Resolvable } from "../Resolvable.js";
+import { Resolver, ResolverOptions, ResolverResult } from "../Resolvable_helpers.js";
+export declare class ResolvableUnion extends Resolvable<Union> {
+    protected expectedTypeKind: string;
+    hasVisibility(opts: ResolverOptions<Resolver>, out: ResolverResult<Resolver>): Promise<boolean>;
+    protected type(opts: ResolverOptions<Resolver.Type>, out: ResolverResult<Resolver.Type>): Promise<void>;
+    protected typeguard(opts: ResolverOptions<Resolver.Typeguard>, out: ResolverResult<Resolver.Typeguard>): Promise<void>;
+}

package/dist/src/resolve/types/Union.js

@@ -0,0 +1,36 @@
+import { getDoc } from "@typespec/compiler";
+import { Resolvable } from "../Resolvable.js";
+export class ResolvableUnion extends Resolvable {
+    expectedTypeKind = "Union";
+    async hasVisibility(opts, out) {
+        if (await super.hasVisibility(opts, out))
+            return true;
+        for (const v of Array.from(this._t.variants)) {
+            if (await Resolvable.hasVisibility(v[1].type, opts, out, this._t))
+                return true;
+        }
+        return false;
+    }
+    async type(opts, out) {
+        if (opts.emitDocs) {
+            out.doc = getDoc(opts.program, this._t);
+        }
+        const results = [];
+        for (const v of Array.from(this._t.variants)) {
+            const resolved = await this.resolveNested(v[1].type, opts, out, false);
+            out.imports.push(...resolved.imports);
+            results.push(resolved.resolved.value);
+        }
+        out.resolved.append(results.join(" | "));
+    }
+    async typeguard(opts, out) {
+        const results = [];
+        for (const v of Array.from(this._t.variants)) {
+            const resolved = await this.resolveNested(v[1].type, opts, out);
+            out.imports.push(...resolved.imports);
+            results.push(`(${resolved.resolved.value})`);
+        }
+        out.resolved.append(results.join(" || "));
+    }
+}
+//# sourceMappingURL=Union.js.map

package/dist/src/resolve/types/Union.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Union.js","sourceRoot":"","sources":["../../../../src/resolve/types/Union.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAS,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAO9C,MAAM,OAAO,eAAgB,SAAQ,UAAiB;IAC1C,gBAAgB,GAAG,OAAO,CAAC;IAErB,KAAK,CAAC,aAAa,CACjC,IAA+B,EAC/B,GAA6B;QAE7B,IAAI,MAAM,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC;QACtD,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7C,IAAI,MAAM,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC/D,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAES,KAAK,CAAC,IAAI,CAClB,IAAoC,EACpC,GAAkC;QAElC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,GAAG,CAAC,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1C,CAAC;QACD,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;YACvE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YACtC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACxC,CAAC;QACD,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3C,CAAC;IAES,KAAK,CAAC,SAAS,CACvB,IAAyC,EACzC,GAAuC;QAEvC,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;YAChE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YACtC,OAAO,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC;QAC/C,CAAC;QACD,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5C,CAAC;CACF"}

package/eslint.config.js

@@ -3,16 +3,24 @@ import eslint from "@eslint/js";
 import tsEslint from "typescript-eslint";
 
 export default tsEslint.config(
+  eslint.configs.recommended,
+  ...tsEslint.configs.recommended,
   {
     ignores: [
       "**/dist/**/*",
       "**/.temp/**/*",
       "**/*.md",
       "**/node_modules/**/*",
-      "**/test/out/**/*",
-      "**/test/targets/**/*",
+      "**/*.target.*",
     ],
+    rules: {
+      "@typescript-eslint/no-explicit-any": "off",
+    },
+  },
+  {
+    files: ["**/*.target.*"],
+    rules: {
+      "@typescript-eslint/no-unused-vars": "off",
+    },
   },
-  eslint.configs.recommended,
-  ...tsEslint.configs.recommended,
 );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typespec-typescript-emitter",
-  "version": "1.2.0",
+  "version": "2.0.1",
   "description": "A TypeSpec library providing an emitter that generates TypeScript types and a structured routes object for robust importing",
   "homepage": "https://github.com/crowbait/typespec-typescript-emitter#readme",
   "bugs": "https://github.com/crowbait/typespec-typescript-emitter/issues",
@@ -47,6 +47,6 @@
     "format:check": "prettier --check .",
     "prepare": "husky",
     "prepublishOnly": "npm run build",
-    "test": "vitest run"
+    "test": "npm run build && vitest run"
   }
 }