typespec-typescript-emitter 0.2.0 → 0.3.0

package/.husky/pre-commit

@@ -1 +1,4 @@
+npm run lint
+npm run format
 npm run build
+git add .

package/.prettierignore

@@ -0,0 +1 @@
+**/*.md

package/CHANGELOG.md

@@ -1,11 +1,34 @@
-# 0.2.0 (2024-11-12)
+# [0.3.0](https://github.com/crowbait/typespec-typescript-emitter/compare/v0.2.0...v0.3.0) (2024-12-08)
+
+
+### Bug Fixes
+
+* content-type+body response models in typeguards ([61f37e3](https://github.com/crowbait/typespec-typescript-emitter/commit/61f37e31a330585f4b97ffd7aa2e4a6aa73cc689))
+* remove useless routes interface ([b828ee9](https://github.com/crowbait/typespec-typescript-emitter/commit/b828ee994743c7fbbb313adb042088057f59466f))
+* typo in typeguards (double space) ([253aacf](https://github.com/crowbait/typespec-typescript-emitter/commit/253aacff2859e58c659a1357a0d7e16088520f6f))
+
+
+### Features
+
+* support for unions and nested models in typeguards ([9292107](https://github.com/crowbait/typespec-typescript-emitter/commit/92921073ad83a1cec74d7b7595cb178120cdc32b))
+* typeguards ([8dc3eef](https://github.com/crowbait/typespec-typescript-emitter/commit/8dc3eef62c4d9bc0df71d7878ada52254ed1475a))
+* typeguards in routes ([010388a](https://github.com/crowbait/typespec-typescript-emitter/commit/010388a2ff1c0c53ce34828e4197e31ada745e83))
+
+
+
+# [0.2.0](https://github.com/crowbait/typespec-typescript-emitter/compare/fdafc1c081058e9d683946b010d10ff3bd962cdc...v0.2.0) (2024-11-12)
+
 
 ### Bug Fixes
 
-- warning log level ([8b74b01](https://github.com/crowbait/typespec-typescript-emitter/commit/8b74b0197ed4b8fa3aad57d0f50cb884af879243))
+* warning log level ([8b74b01](https://github.com/crowbait/typespec-typescript-emitter/commit/8b74b0197ed4b8fa3aad57d0f50cb884af879243))
+
 
 ### Features
 
-- routes emitter ([fdafc1c](https://github.com/crowbait/typespec-typescript-emitter/commit/fdafc1c081058e9d683946b010d10ff3bd962cdc))
-- support optional model properties ([729d9f1](https://github.com/crowbait/typespec-typescript-emitter/commit/729d9f125434ead7a33326014082cd172c79f2ff))
-- types emitter ([e31d459](https://github.com/crowbait/typespec-typescript-emitter/commit/e31d459edce08d010e590681e3a2e17d636de64e))
+* routes emitter ([fdafc1c](https://github.com/crowbait/typespec-typescript-emitter/commit/fdafc1c081058e9d683946b010d10ff3bd962cdc))
+* support optional model properties ([729d9f1](https://github.com/crowbait/typespec-typescript-emitter/commit/729d9f125434ead7a33326014082cd172c79f2ff))
+* types emitter ([e31d459](https://github.com/crowbait/typespec-typescript-emitter/commit/e31d459edce08d010e590681e3a2e17d636de64e))
+
+
+

package/README.md

@@ -6,22 +6,24 @@ TypeScript output to a TypeSpec project.
 Currently, this library is tailored to my specific use case, which is defining
 an HTTP API. The 'routes'-emitter will only work on HTTP operations. **However**, exporting all models as types is independent of HTTP, and so may also benefit projects with a different usage scenario.
 
-It can export two things:
+It can the following things:
 
 - ts files exporting every model present in the spec
   - 1 file for each (nested) namespace
   - exports models, enums and unions
   - does NOT export aliases (see below)
+- optional typeguards, *if* type export is enabled
+  - referenced or generated in the routes object as well, if enabled (experimental)
 - for `TypeSpec.Http`: ts file containing a nested object containing information about every route
   - this can be imported at runtime to provide a robust way of eg. accessing URLs
 
-## Content
+## Content <!-- omit from toc -->
 
 - [Installation](#installation)
 - [Configuration](#configuration)
-- [Types Emitter](#types-emitter)
+- [Types emitter](#types-emitter)
   - [Alias's](#aliass)
-- [Routes Emitter](#routes-emitter)
+- [Routes emitter](#routes-emitter)
 
 ## Installation
 
@@ -41,7 +43,9 @@ options:
     root-namespace: "string"
     out-dir: "{cwd}/path"
     enable-types: true
-    enable-routes: true
+    enable-typeguards: false
+    enable-routes: false
+    typeguards-in-routes: true
 ```
 
 The following options are available:
@@ -49,7 +53,9 @@ The following options are available:
 - `root-namespace` **(required)**: name of the most outer namespace. As the TypeSpec docs recommend, your project is expected to consist of one or more nested namespaces. Here, you need to specify the most outer / general namespace you want emitted.
 - `out-dir`: output directory. Must be an absolute path; replacers like `{cwd}` are permitted.
 - `enable-types` (default: true): enables output of TypeScript types.
+- `enable-typeguards` (default: false): enables output of typeguards, *IF* type-output is enabled.
 - `enable-routes` (default: false): enables output of the HTTP-routes object.
+- `typeguards-in-routes` (default: false) **Experimental**: generates or references typeguards in the routes object, *IF* types, typeguards *and* routes are enabled.
 
 ## Types emitter
 
@@ -94,20 +100,34 @@ namespace myProject { // remember to set in config!
 export enum ReadStatus {
   Never,
   Once,
-  Often,
+  Often
 }
 export type Author = "unknown" | string;
 export interface Book {
-  author: Author;
-  title: string;
-  subtitile: null | string;
-  read: ReadStatus;
-  chapterTitles?: string[];
+  author: Author,
+  title: string,
+  subtitile: null | string,
+  read: ReadStatus,
+  chapterTitles?: string[]
 }
 
+// if `enable-typeguards` is set to true
+export function isBook(arg: any): arg is Book {
+  return (
+    (arg['author'] !== undefined) &&
+    (arg['title'] !== undefined && typeof arg['title'] === 'string') &&
+    (arg['subtitle'] !== undefined) &&
+    (arg['read'] !== undefined) &&
+    (arg['chapterTitles'] === undefined ||  Array.isArray(arg['chapterTitles']))
+  );
+};
+
 // the other namespace will be emitted to `/path/to/outdir/SubNameSpace.ts`
 ```
 
+Typeguards *should* create comprehensive checks that adhere as strictly to the source model as possible.
+If you find a case where the typeguard is looser than it needs to be, please report that as a bug.
+
 ### Alias's
 
 There seems to be no way to extract aliases from TypeSpec's emitter framework. Because of that, `Alias`'s are ignored by the emitter (or, to be more precise: `Alias`'s reach the emitter already resolved. They won't be exported as their own type but directly substituted where they're needed).
@@ -143,12 +163,14 @@ Example:
 @server("https://api.example.com", "Server")
 namespace myProject { // remember to set in config!
   @get
-  op getSomething(): string;
+  op getSomething(): {@body body: string};
+  // if you want to use `typeguards-in-routes`, make sure
+  // to properly declare responses as a model with a `body`-property
 
   @get
   @route("{param}")
   @useAuth(NoAuth | BasicAuth)
-  op getSmthElse(@path param: string): string;
+  op getSmthElse(@path param: string): {@body body: string};
 
   @route("/subroute")
   namespace sub {
@@ -158,7 +180,7 @@ namespace myProject { // remember to set in config!
     op postSomething(
       @path post_param: int32,
       @body body: string
-    ): string;
+    ): {@body body: string};
   }
 }
 ```
@@ -167,37 +189,32 @@ namespace myProject { // remember to set in config!
 
 ```ts
 /* /path/to/outdir/routes_{root-namespace}.ts */
-export interface IRoute {
-  method: string
-  getUrl: (p: any) => string
-  auth: boolean | 'varies'
-};
-
 export const routes_myProject = {
   getSomething: {
     method: 'get',
     getUrl: () => 'https://api.example.com/',
-    auth: false
+    auth: false,
+    // with `typeguards-in-routes`
+    isRequestType: null,
+    isResponseType: (arg: any): boolean => typeof arg === 'string'
   },
   getSmthElse: {
     method: 'get',
     getUrl: (p: {param: string}) => `https://api.example.com/${p.param}`,
-    auth: 'varies
+    auth: 'varies',
+    // with `typeguards-in-routes`
+    isRequestType: null,
+    isResponseType: (arg: any): boolean => typeof arg === 'string'
   },
   sub: {
     postSomething: {
       method: 'post',
       getUrl: (p: {post_param: string}) => `https://api.example.com/subroute/post/${p.post_param}`,
-      auth: true
+      auth: true,
+      // with `typeguards-in-routes`
+      isRequestType: (arg: any): boolean => typeof arg === 'string',
+      isResponseType: (arg: any): boolean => typeof arg === 'string'
     }
   }
 } as const;
-```
-
-The `IRoute` interface should be used sparsely. Consider the following:
-
-```ts
-const foo: IRoute = routes_myProject.some.route;
-```
-
-Now `foo.getUrl` will have lost its signature and your IDE can no longer suggest its parameters (if any).
+```

package/dist/src/emit_routes.d.ts

@@ -1,3 +1,7 @@
 import { EmitContext, Namespace } from "@typespec/compiler";
-declare const emitRoutes: (context: EmitContext, namespace: Namespace, rootServer: string) => string;
+import { EmitterOptions } from "./lib.js";
+declare const emitRoutes: (context: EmitContext, namespace: Namespace, rootServer: string, options: EmitterOptions, knownTypeguards: Array<{
+    filename: string;
+    name: string;
+}>) => string;
 export default emitRoutes;

package/dist/src/emit_routes.js

@@ -1,30 +1,13 @@
-import { getDoc } from "@typespec/compiler";
+import { getDoc, } from "@typespec/compiler";
 import { getAuthentication, getHttpOperation } from "@typespec/http";
+import { getTypeguard } from "./emit_types_typeguards.js";
 import autogenerateWarning from "./helper_autogenerateWarning.js";
-const emitRoutes = (context, namespace, rootServer) => {
+const emitRoutes = (context, namespace, rootServer, options, knownTypeguards) => {
     const rootNode = `routes_${context.options["root-namespace"]}`;
+    const imports = [];
     let out = autogenerateWarning;
-    out +=
-        "/** This type is mostly meant for use in function signatures and `extends`' in generic functions.\n";
-    out += "  * eg: `const callApi(route: IRoute) => fetch(route.getUrl(...))`\n";
-    out +=
-        "  * It should not be used to type variables (eg.: `let x: IRoute`), because the resulting type\n";
-    out += "  * loses it's information about the getUrl parameters.\n";
-    out += "  */\n";
-    out += "export interface IRoute {\n";
-    out += "  method: string\n";
-    /* The "getUrl" type should really be more specific; something that at least shows that it's a Record.
-     * However, doing that, Typescript always complains about the actual fields (of an implemented function in the output)
-     * is missing from the type. I think, it's a TS issue...
-     */
-    out += "  getUrl: (p: any) => string\n";
-    out += "  auth: boolean | 'varies'\n";
-    out += "};\n\n";
     out += `const ${rootNode} = {\n`;
     const traverseNamespace = (n, nestLevel) => {
-        const line = (str, addLevels) => {
-            out += `${"  ".repeat(nestLevel + 1 + (addLevels ?? 0))}${str}\n`;
-        };
         // operations
         let opNum = 0;
         n.operations.forEach((op) => {
@@ -33,23 +16,23 @@ const emitRoutes = (context, namespace, rootServer) => {
             // jsdoc comment
             const doc = getDoc(context.program, op);
             if (doc)
-                line(`/** ${doc} */`);
-            line(`${op.name}: {`);
+                out = out.addLine(`/** ${doc} */`, nestLevel + 1);
+            out = out.addLine(`${op.name}: {`, nestLevel + 1);
             // http method
-            line(`method: '${httpOp[0].verb}',`, 1);
+            out = out.addLine(`method: '${httpOp[0].verb}',`, nestLevel + 2);
             // url parameters
             const pathParams = httpOp[0].parameters.parameters.filter((p) => p.type === "path");
             if (pathParams.length > 0) {
-                line("getUrl: (p: {", 1);
+                out = out.addLine("getUrl: (p: {", nestLevel + 2);
                 pathParams
                     .map((p) => `${p.name}: string`)
-                    .forEach((p, i) => line(p, 2));
+                    .forEach((p) => (out = out.addLine(p, nestLevel + 3)));
                 let fn = "}) => ";
                 fn += pathParams.reduce((sum, cur) => sum.replaceAll(`{${cur.name}}`, `${"$"}{p.${cur.name}}`), `\`${rootServer}${httpOp[0].path}\`,`);
-                line(fn, 1);
+                out = out.addLine(fn, nestLevel + 2);
             }
             else {
-                line(`getUrl: () => '${rootServer}${httpOp[0].path}',`, 1);
+                out = out.addLine(`getUrl: () => '${rootServer}${httpOp[0].path}',`, nestLevel + 2);
             }
             // auth
             let auth = false;
@@ -70,8 +53,59 @@ const emitRoutes = (context, namespace, rootServer) => {
                             ? true
                             : false;
             }
-            line(`auth: ${typeof auth === "string" ? `'${auth}'` : auth.toString()}`, 1);
-            line(`}${opNum < n.operations.size || n.namespaces.size > 0 ? "," : ""}`);
+            out = out.addLine(`auth: ${typeof auth === "string" ? `'${auth}'` : auth.toString()}${options["typeguards-in-routes"] ? "," : ""}`, nestLevel + 2);
+            // typeguards
+            const typeguardLines = (t) => {
+                const guard = getTypeguard(t, "arg", 0, knownTypeguards);
+                imports.push(...guard[1]);
+                return guard[0].split("\n");
+            };
+            if (options["typeguards-in-routes"]) {
+                if (!knownTypeguards) {
+                    console.warn("Typeguard Names List was empty when it shouldn't have been.");
+                    return;
+                }
+                if (op.parameters.properties.has("body")) {
+                    const lines = typeguardLines(op.parameters.properties.get("body").type);
+                    out = out.addLine(`isRequestType: ${lines.length === 0 ? "null" : `(arg: any): boolean => ${lines.shift()}`}${lines.length < 1 ? "," : ""}`, nestLevel + 2, lines.length === 1);
+                    if (lines.length > 0) {
+                        lines[lines.length - 1] += ",";
+                        lines.forEach((line, i, arr) => {
+                            out = out.addLine(line, lines.length > 1 ? nestLevel + (i < arr.length - 1 ? 3 : 2) : 0);
+                        });
+                    }
+                }
+                else
+                    out = out.addLine("isRequestType: null,", nestLevel + 2);
+                if (op.returnType &&
+                    op.returnType.kind &&
+                    op.returnType.kind !== "Intrinsic") {
+                    const lines = [];
+                    const addModelLines = (m) => {
+                        if (m.properties.has("body")) {
+                            lines.push(...typeguardLines(m.properties.get("body").type));
+                            // else (no "body" prop): stays empty -> 'null'
+                            // why?: unnamed model return type is likely to be / should be
+                            //   headers'n'stuff, so if there is no "body" property, play it safe
+                        }
+                    };
+                    if (op.returnType.kind === "Union") {
+                        op.returnType.variants.forEach((v) => {
+                            if (v.type.kind === "Model")
+                                addModelLines(v.type);
+                        });
+                    }
+                    if (op.returnType.kind === "Model")
+                        addModelLines(op.returnType);
+                    out = out.addLine(`isResponseType: ${lines.length === 0 ? "null" : `(arg: any): boolean => ${lines.shift()}`}${lines.length < 1 ? "," : ""}`, nestLevel + 2, lines.length === 1);
+                    lines.forEach((line, i, arr) => {
+                        out = out.addLine(line, lines.length > 1 ? nestLevel + (i < arr.length - 1 ? 3 : 2) : 0);
+                    });
+                }
+                else
+                    out = out.addLine("isResponseType: null", nestLevel + 2);
+            }
+            out = out.addLine(`}${opNum < n.operations.size || n.namespaces.size > 0 ? "," : ""}`, nestLevel + 1);
         });
         // namespaces
         let nsNum = 0;
@@ -79,15 +113,16 @@ const emitRoutes = (context, namespace, rootServer) => {
             nsNum++;
             const doc = getDoc(context.program, ns);
             if (doc)
-                line(`/** ${doc} */`);
-            line(`${ns.name}: {`);
+                out = out.addLine(`/** ${doc} */`, nestLevel + 1);
+            out = out.addLine(`${ns.name}: {`, nestLevel + 1);
             traverseNamespace(ns, nestLevel + 1);
-            line(`}${nsNum < n.namespaces.size ? "," : ""}`);
+            out = out.addLine(`}${nsNum < n.namespaces.size ? "," : ""}`, nestLevel + 1);
         });
     };
     traverseNamespace(namespace, 0);
     out += "} as const;\n";
     out += `export default ${rootNode};\n`;
+    out = `${imports.filter((x, i, arr) => arr.indexOf(x) === i).join("\n")}\n\n${out}`;
     return out;
 };
 export default emitRoutes;

package/dist/src/emit_routes.js.map

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

package/dist/src/emit_types.d.ts

@@ -1,8 +1,10 @@
 import { EmitContext, Namespace } from "@typespec/compiler";
-declare global {
-    interface String {
-        addLine(str: string, tabs?: number, continued?: boolean): string;
-    }
-}
-declare const emitTypes: (context: EmitContext, namespace: Namespace) => Record<string, string>;
+import { EmitterOptions } from "./lib.js";
+declare const emitTypes: (context: EmitContext, namespace: Namespace, options: EmitterOptions) => {
+    files: Record<string, string>;
+    typeguardedNames: Array<{
+        filename: string;
+        name: string;
+    }>;
+};
 export default emitTypes;

package/dist/src/emit_types.js

@@ -1,170 +1,64 @@
-import { getDoc, } from "@typespec/compiler";
+import { getDoc } from "@typespec/compiler";
+import { resolveEnum, resolveModel, resolveUnion, } from "./emit_types_resolve.js";
+import { getTypeguardModel } from "./emit_types_typeguards.js";
 import autogenerateWarning from "./helper_autogenerateWarning.js";
-String.prototype.addLine = function (str, tabs, continued) {
-    return `${this}${"  ".repeat(tabs ?? 0)}${str}${continued ? "" : "\n"}`;
-};
-const emitTypes = (context, namespace) => {
-    const out = {};
+const emitTypes = (context, namespace, options) => {
+    const out = { files: {}, typeguardedNames: [] };
     const traverseNamespace = (n) => {
-        let file = autogenerateWarning;
-        const resolvedNames = {
-            enums: [],
-            unions: [],
-            models: [],
-        };
-        const resolveType = (t, nestlevel) => {
-            let typeStr = "unknown";
-            switch (t.kind) {
-                case "Model":
-                    if (t.name === "Array") {
-                        typeStr = resolveArray(t, nestlevel);
-                    }
-                    else
-                        typeStr = resolveModel(t, nestlevel + 1);
-                    break;
-                case "Boolean":
-                    typeStr = "boolean";
-                    break;
-                case "Enum":
-                    typeStr = resolveEnum(t, nestlevel);
-                    break;
-                case "Intrinsic":
-                    typeStr = t.name;
-                    break;
-                case "Number":
-                    typeStr = t.valueAsString;
-                    break;
-                case "Scalar":
-                    typeStr = resolveScalar(t);
-                    break;
-                case "String":
-                    typeStr = `'${t.value}'`;
-                    break;
-                case "Tuple":
-                    typeStr = resolveTuple(t, nestlevel);
-                    break;
-                case "Union":
-                    typeStr = resolveUnion(t, nestlevel);
-                    break;
-                default:
-                    console.warn("Could not resolve type:", t.kind);
-            }
-            return typeStr;
-        };
-        const resolveArray = (a, nestlevel) => {
-            if (a.name !== "Array")
-                throw new Error(`Trying to parse model ${a.name} as Array`);
-            let ret = `${resolveType(a.indexer.value, nestlevel)}[]`;
-            return ret;
-        };
-        const resolveEnum = (e, nestlevel) => {
-            if (e.name && resolvedNames.enums.includes(e.name))
-                return e.name;
-            let ret = "{\n";
-            let i = 1;
-            e.members.forEach((p) => {
-                const val = p.value === undefined
-                    ? ""
-                    : " = " +
-                        (typeof p.value === "string"
-                            ? `'${p.value}'`
-                            : p.value.toString());
-                ret = ret.addLine(`${p.name}${val}${i < e.members.size ? "," : ""}`, nestlevel + 1);
-                i++;
-            });
-            ret = ret.addLine("}", nestlevel, true);
-            resolvedNames.enums.push(e.name);
-            return ret;
-        };
-        const resolveTuple = (t, nestlevel) => {
-            return `[${t.values.map((v) => resolveType(v, nestlevel)).join(", ")}]`;
-        };
-        const resolveUnion = (u, nestlevel) => {
-            if (u.name && resolvedNames.unions.includes(u.name))
-                return u.name;
-            return Array.from(u.variants)
-                .map((v) => resolveType(v[1].type, nestlevel))
-                .join(" | ");
-        };
-        const resolveScalar = (s) => {
-            let ret = "unknown";
-            if (!s.baseScalar) {
-                switch (s.name) {
-                    case "boolean":
-                        ret = "boolean";
-                        break;
-                    case "bytes":
-                        ret = "Uint8Array";
-                        break;
-                    case "duration":
-                    case "numeric":
-                        ret = "number";
-                        break;
-                    case "plainTime":
-                    case "string":
-                    case "url":
-                        ret = "string";
-                        break;
-                    case "offsetDateTime":
-                    case "plainDate":
-                    case "unixTimestamp32":
-                    case "utcDateTime":
-                        ret = "Date";
-                        break;
-                    default:
-                        console.warn("Could not resolve scalar:", s.name);
-                }
-            }
-            return s.baseScalar ? resolveScalar(s.baseScalar) : ret;
-        };
-        const resolveModel = (m, nestlevel = 0) => {
-            if (m.name && resolvedNames.models.includes(m.name))
-                return m.name;
-            let ret = "{\n";
-            let i = 1;
-            m.properties.forEach((p) => {
-                const doc = getDoc(context.program, p);
-                if (doc)
-                    ret = ret.addLine(`/** ${doc} */`, nestlevel + 1);
-                const typeStr = resolveType(p.type, nestlevel);
-                if (typeStr.includes("unknown"))
-                    console.warn(`Could not resolve property ${p.name} on ${m.name}`);
-                ret = ret.addLine(`${p.name}${p.optional ? "?" : ""}: ${typeStr}${i < m.properties.size ? "," : ""}`, nestlevel + 1);
-                i++;
-            });
-            ret = ret.addLine("}", nestlevel, true);
-            resolvedNames.models.push(m.name);
-            return ret;
-        };
+        let file = "";
         n.enums.forEach((e) => {
-            const resolved = resolveEnum(e, 0);
-            if (resolved) {
-                const doc = getDoc(context.program, e);
-                if (doc)
-                    file = file.addLine(`/** ${doc} */`);
-                file = file.addLine(`export enum ${e.name} ${resolved};\n`);
+            if (options["enable-types"]) {
+                const resolved = resolveEnum(e, 0, true);
+                if (resolved) {
+                    const doc = getDoc(context.program, e);
+                    if (doc)
+                        file = file.addLine(`/** ${doc} */`);
+                    file = file.addLine(`export enum ${e.name} ${resolved};\n`);
+                }
             }
         });
         n.unions.forEach((u) => {
-            const resolved = resolveUnion(u, 0);
-            if (resolved) {
-                const doc = getDoc(context.program, u);
-                if (doc)
-                    file = file.addLine(`/** ${doc} */`);
-                file = file.addLine(`export type ${u.name} = ${resolved};\n`);
+            if (options["enable-types"]) {
+                const resolved = resolveUnion(context, u, 0, true);
+                if (resolved) {
+                    const doc = getDoc(context.program, u);
+                    if (doc)
+                        file = file.addLine(`/** ${doc} */`);
+                    file = file.addLine(`export type ${u.name} = ${resolved};\n`);
+                }
             }
         });
         n.models.forEach((m) => {
-            const resolved = resolveModel(m);
-            if (resolved) {
-                const doc = getDoc(context.program, m);
-                if (doc)
-                    file = file.addLine(`/** ${doc} */`);
-                file = file.addLine(`export interface ${m.name} ${resolved};\n`);
+            if (options["enable-types"]) {
+                const resolved = resolveModel(context, m, 0, true);
+                if (resolved) {
+                    const doc = getDoc(context.program, m);
+                    if (doc)
+                        file = file.addLine(`/** ${doc} */`);
+                    file = file.addLine(`export interface ${m.name} ${resolved};`);
+                }
+            }
+            if (options["enable-typeguards"]) {
+                file = file.addLine(`export function is${m.name}(arg: any): arg is ${m.name} {`);
+                file = file.addLine("return (", 1);
+                getTypeguardModel(m, "arg")[0]
+                    .split("\n")
+                    .forEach((line) => {
+                    file = file.addLine(line, 1);
+                });
+                file = file.addLine(");", 1);
+                file = file.addLine("};");
+                out.typeguardedNames.push({
+                    filename: n.name.charAt(0).toUpperCase() + n.name.slice(1),
+                    name: m.name,
+                });
             }
+            file += "\n";
         });
+        if (file)
+            file = autogenerateWarning + file;
         // set output for this namespace
-        out[n.name.charAt(0).toUpperCase() + n.name.slice(1)] = file;
+        out.files[n.name.charAt(0).toUpperCase() + n.name.slice(1)] = file;
         // recursively iterate child namespaces
         n.namespaces.forEach((ns) => traverseNamespace(ns));
     };